diff --git a/.cargo/config.toml b/.cargo/config.toml
index 4e6f4107a70..791fa36685c 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,4 @@
 [env]
-WASI_SDK = { value = ".cargo/wasi-sdk-20.0", relative = true }
 # tree-sitter build fails with newer version of clang unless implicit-function-declaration is ignored
-CC_wasm32_wasi = { value = ".cargo/wasi-sdk-20.0/bin/clang -Wno-error=implicit-function-declaration", relative = true }
-AR_wasm32_wasi = { value = ".cargo/wasi-sdk-20.0/bin/ar", relative = true }
+CC_wasm32_wasi = { value = ".cargo/wasi-sdk-21.0/bin/clang -Wno-error=implicit-function-declaration", relative = true }
+AR_wasm32_wasi = { value = ".cargo/wasi-sdk-21.0/bin/ar", relative = true }
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2a46d04a3a6..fe3b7e2bda0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
   "updateContentCommand": "pnpm install",
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "18.16.0"
+      "version": "20.11.1"
     },
     "ghcr.io/devcontainers/features/aws-cli:1": {},
     "ghcr.io/devcontainers/features/terraform:1": {},
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 8b8c49edda6..5e7336642f7 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -5,7 +5,7 @@ body:
 - type: markdown
   attributes:
     value: |
-       :pray: Thanks for taking the time to fill out this bug report! Feel free to ping us on [Wing Slack](https://t.winglang.io/slack) if you have any questions or need help.
+       :pray: Thanks for taking the time to fill out this bug report! Feel free to ping us on [Wing Discord](https://t.winglang.io/discord) if you have any questions or need help.
 
 - type: markdown
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index aba4f81333f..f9cfcae9974 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Community Slack
-    url: https://t.winglang.io/slack
+  - name: Community Discord
+    url: https://t.winglang.io/discord
     about: Come hang out, geek out, ask questions, help friends!
diff --git a/.github/ISSUE_TEMPLATE/example.yml b/.github/ISSUE_TEMPLATE/example.yml
new file mode 100644
index 00000000000..a4a13c94e7e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/example.yml
@@ -0,0 +1,36 @@
+name: Missing Example 🚀
+description: Request for a missing example
+labels: ["✨ example","needs-discussion"]
+body:
+
+- type: markdown
+  attributes:
+    value: |
+      ## Missing Example
+
+- type: textarea
+  id: description
+  attributes:
+    label: Description
+    placeholder: |
+      Couldn't find what you are looking for in https://github.com/winglang/examples, just describe in as much detail what is your use case 
+      and what you are trying to build and we'll try to help out.
+  validations:
+    required: true
+
+- type: textarea
+  id: reference
+  attributes:
+    label: Reference
+    description:
+    placeholder: |
+      Optionally, put links or code snippets as a reference that can help us do a better job.
+
+- type: textarea
+  attributes:
+    label: Community Notes
+    value: |
+      <!-- Please keep this note for the community -->
+      * Please vote by adding a 👍 reaction to the issue to help us prioritize.
+      * If you are interested to work on this issue, please leave a comment.
+      * If this issue is labeled **needs-discussion**, it means the spec has not been finalized yet. Please reach out on the #dev channel in the [Wing Discord](https://t.winglang.io/discord).
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 8c478a2a89d..ae627be601d 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -5,28 +5,33 @@ body:
 - type: markdown
   attributes:
     value: |
-       :pray: Thanks for taking the time to fill out this enhancement request! Feel free to ping us on [Wing Slack](https://t.winglang.io/slack) if you have any questions or need help.
+       :pray: Thanks for taking the time to fill out this enhancement request! Feel free to ping us on [Wing Discord](https://t.winglang.io/discord) if you have any questions or need help.
+
 - type: markdown
   attributes:
     value: |
       ## Enhancement Request
+
 - type: textarea
-  id: spec
+  id: use-cases
   attributes:
-    label: Feature Spec
-    description:
+    label: Use Case
     placeholder: |
-      Describe the feature as if it was already released. Write a hypothetical doc/readme/changelog/contributing section for this new enhancement, code snippets and all.
+      What problem are you trying to solve? Describe a *concrete* example of something you are trying to do and as many details as possible
+      about your motivation, the environment, etc.
   validations:
     required: true
+
 - type: textarea
-  id: use-cases
+  id: proposal
   attributes:
-    label: Use Cases
+    label: Proposed Solution
+    description:
     placeholder: |
-      What problems does this solves? List of use cases this feature or enhancement is designed to address.
-  validations:
-    required: true
+      Optionally, describe how you would have ideally wanted Wing to support this use case.
+      This can be a hypothetical "user story" or syntax or a snippet of code that would have been your ideal experience.
+      The purpose of this section is not to design a complete solution but rather to inspire the designer on what a user would have intuitively expected the solution to look like.
+
 - type: textarea
   id: implementation-notes
   attributes:
@@ -34,6 +39,7 @@ body:
     description: 
     placeholder: |
       Any thoughts regarding how this should be implemented?
+
 - type: dropdown
   id: Component
   attributes:
@@ -53,11 +59,11 @@ body:
     - Documentation
     - Development Environment
     - Contributor Experience
+    - Libraries
     - Other
   validations:
     required: false
 
-
 - type: textarea
   attributes:
     label: Community Notes
@@ -65,4 +71,4 @@ body:
       <!-- Please keep this note for the community -->
       * Please vote by adding a 👍 reaction to the issue to help us prioritize.
       * If you are interested to work on this issue, please leave a comment.
-      * If this issue is labeled **needs-discussion**, it means the spec has not been finalized yet. Please reach out on the #dev channel in the [Wing Slack](https://t.winglang.io/slack).
+      * If this issue is labeled **needs-discussion**, it means the spec has not been finalized yet. Please reach out on the #dev channel in the [Wing Discord](https://t.winglang.io/discord).
diff --git a/.github/ISSUE_TEMPLATE/incident.yml b/.github/ISSUE_TEMPLATE/incident.yml
index 65377dc6b46..6d4ce36f118 100644
--- a/.github/ISSUE_TEMPLATE/incident.yml
+++ b/.github/ISSUE_TEMPLATE/incident.yml
@@ -32,12 +32,12 @@ body:
         - label: WORKAROUND - if there is one, make sure it is documented in the section above.
         - label: PRIORITIZE (P0/P1/P2 - see the definitions [here](https://www.winglang.io/contributing/maintainers/operations#severity-levels)).
         - label: (optional) CONTACT a relevant person who has more information about the incident.
-        - label: (optional) ANNOUNCE major incidents on Slack \#dev or \#general channels. "NOTICE - P0 incident started. {incident-description}. Track on {link to issue}".
+        - label: (optional) ANNOUNCE major incidents on Discord \#dev or \#general channels. "NOTICE - P0 incident started. {incident-description}. Track on {link to issue}".
         - label: HANDLE by reverting or forward fixing.
         - label: UPDATE the team on your actions in the created \#alert Slack thread throughout the incident.
         - label: RESOLVE the incident on [PagerDuty](https://monada.pagerduty.com/incidents) (BetterStack resolves automatically).
         - label: UPDATE the team on the issue closure.
-        - label: (optional) ANNOUNCE closure of major incidents on Slack \#dev or \#general channels. "NOTICE - P0 incident ended. {incident-resolution-description}. Track on {link to issue}".
+        - label: (optional) ANNOUNCE closure of major incidents on Discord \#dev or \#general channels. "NOTICE - P0 incident ended. {incident-resolution-description}. Track on {link to issue}".
         - label: UNPIN the incident issue.
-        - label: LESSONS LEARNED should be shared via the "post-mortem" workflow on \#dev Slack channel.
+        - label: LESSONS LEARNED should be shared via the "post-mortem" workflow on \#dev Discord channel.
         - label: CLOSE the incident issue.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 497046bde6b..cfbaa76ae34 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,8 +19,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  NODE_VERSION: "18.16.0"
-  PNPM_VERSION: "8.6.3"
+  NODE_VERSION: "20.11.1"
+  PNPM_VERSION: "8.15.1"
   CARGO_TERM_COLOR: always
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
@@ -41,12 +41,12 @@ jobs:
       bench-changed: ${{ fromJson(steps.turbo-diff.outputs.data)['hangar#bench'].changes }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
 
@@ -102,10 +102,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
 
@@ -129,7 +129,9 @@ jobs:
 
       - name: Install Playwright
         working-directory: apps/wing-console/console/app
-        run: pnpm exec playwright install --with-deps
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          pnpm exec playwright install --with-deps
 
       - name: Test
         run: pnpm test:ci
@@ -153,7 +155,7 @@ jobs:
       - build
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Dist Artifacts
         uses: actions/download-artifact@v3
@@ -162,7 +164,7 @@ jobs:
           path: dist
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
 
@@ -206,8 +208,7 @@ jobs:
       fail-fast: true
       matrix:
         runner: [windows, macos, ubuntu]
-        # Pinned 20 to 20.5.1 until https://github.com/nodejs/node/issues/49497 is released
-        node: ["18", "20.5.1"]
+        node: ["20", "18"]
         shard: ["1/2", "2/2"]
         full_run:
           # Do a full run on push or when the PR is labeled "pr/e2e-full"
@@ -218,14 +219,14 @@ jobs:
           - runner: windows
             full_run: false
           - runner: ubuntu
-            node: "20"
+            node: "18"
             full_run: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v3
         with:
           version: ${{ env.PNPM_VERSION }}
 
@@ -250,11 +251,11 @@ jobs:
         working-directory: tools/hangar
         run: |
           pnpm test:generate
-          pnpm run test --shard=${{ matrix.shard }} --update=${{ matrix.runner == 'ubuntu' && matrix.node == '18' }}
+          pnpm run vitest --shard=${{ matrix.shard }} --update=${{ matrix.runner == 'ubuntu' && matrix.node == '20' }}
 
       - name: Create mutation if needed
         # we only care about the diff in our standard dev env
-        if: matrix.runner == 'ubuntu' && matrix.node == '18'
+        if: matrix.runner == 'ubuntu' && matrix.node == '20'
         id: diff
         env:
           RAW_SHARD: ${{ matrix.shard }}
@@ -263,17 +264,17 @@ jobs:
           scripts/create_patch.sh "e2e-$SHARD.diff"
 
       - name: Upload mutation
-        if: matrix.runner == 'ubuntu' && matrix.node == '18' && steps.diff.outputs.diff == 'true'
+        if: matrix.runner == 'ubuntu' && matrix.node == '20' && steps.diff.outputs.diff == 'true'
         uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.diff.outputs.diff_name }}
           path: ${{ steps.diff.outputs.diff_name }}
 
-  aws-sdk-spec-test:
+  sdk-spec-test:
     needs:
       - build
     if: github.event_name == 'push' && needs.build.outputs.e2e-changed == 'true'
-    uses: ./.github/workflows/tf-aws-test.yml
+    uses: ./.github/workflows/sdk-spec-test.yml
     secrets: inherit
 
   console-preview:
@@ -288,7 +289,7 @@ jobs:
     if: ${{ needs.build.outputs.console-changed == 'true' && github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && !startsWith(github.head_ref, 'mergify/merge-queue/') }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Dist Artifacts
         uses: actions/download-artifact@v3
@@ -297,7 +298,7 @@ jobs:
           path: dist
 
       - name: Install flyctl
-        uses: superfly/flyctl-actions/setup-flyctl@1.4
+        uses: superfly/flyctl-actions/setup-flyctl@1.5
         with:
           version: ${{ env.FLY_VERSION }}
 
@@ -309,7 +310,7 @@ jobs:
             flyctl launch --no-deploy --copy-config --name "$APP_NAME" --image-label latest -o personal
             popd
           fi
-          flyctl deploy . --config ./apps/wing-console/console/app/preview/fly.toml --app "$APP_NAME" --image-label latest --vm-memory 512 --strategy immediate
+          flyctl deploy . --config ./apps/wing-console/console/app/preview/fly.toml --app "$APP_NAME" --image-label latest --vm-memory 1024 --strategy immediate
           flyctl scale count 1 --yes --app "$APP_NAME"
           echo "deploytime=$(TZ=UTC date +'%Y-%m-%d %H:%M')" >> $GITHUB_OUTPUT
 
@@ -332,11 +333,15 @@ jobs:
       - e2e-test
       - benchmark
       - test
-      - aws-sdk-spec-test
+      - sdk-spec-test
     steps:
       - name: Check failure
-        if: needs.build.result == 'failure' || needs.e2e-test.result == 'failure' || needs.benchmark.result == 'failure' || needs.test.result == 'failure' || needs.aws-sdk-spec-test.result == 'failure'
-        run: exit 1
+        # All jobs must either be sucessful or skipped
+        if: contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'failure') || contains(needs.*.result, 'action_required')|| contains(needs.*.result, 'stale')|| contains(needs.*.result, 'null')
+        run: |
+          echo "One or more jobs failed or were cancelled. Please check the logs."
+          echo '${{ toJson(needs) }}'
+          exit 1
       - name: Download patches
         uses: actions/download-artifact@v3
       - name: Check patches
@@ -375,7 +380,7 @@ jobs:
         run: npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_PUBLISH_TOKEN }}
 
       - name: Publish NPM packages
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         env:
           PACKAGE_VERSION: ${{ needs.build.outputs.version }}
         with:
@@ -385,7 +390,7 @@ jobs:
             set -o pipefail
 
             cd dist
-            PACKAGES=("@winglang/sdk" "@winglang/compiler" "@wingconsole/design-system" "@wingconsole/ui" "@wingconsole/server" "@wingconsole/app" "winglang" "@winglang/platform-awscdk")
+            PACKAGES=("@winglang/sdk" "@wingcloud/framework" "@winglang/compiler" "@wingconsole/design-system" "@wingconsole/ui" "@wingconsole/server" "@wingconsole/app" "winglang" "@winglang/platform-awscdk" "@winglang/compatibility-spy" "@winglang/wingtunnels")
             for PACKAGE in "${PACKAGES[@]}"; do
               # Check if already published
               VERSION_FOUND=$(npm view "$PACKAGE@$PACKAGE_VERSION" version --verbose || true)
@@ -415,7 +420,7 @@ jobs:
           dependencies: false
 
       - name: Write Changelog
-        uses: DamianReeves/write-file-action@v1.2
+        uses: DamianReeves/write-file-action@v1.3
         with:
           path: "CHANGELOG.md"
           contents: ${{ needs.build.outputs.changelog }}
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index aebc2d5c15d..43b34d4f457 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -33,13 +33,17 @@ jobs:
       - name: Install Wing
         run: |
           ${{ matrix.install_command }}
-      - name: Download examples/tests/valid/test_bucket.test.w
+      - name: Create and test each quickstart app
+        shell: bash
         run: |
-          curl -L https://raw.githubusercontent.com/winglang/wing/main/examples/tests/valid/test_bucket.test.w > test_bucket.test.w
-          cat test_bucket.test.w
-      - name: Run Test
-        run: |
-          wing test test_bucket.test.w
+          templates=$(wing new --list-templates)
+          for template in $templates; do
+            mkdir "$template"
+            cd "$_"
+            wing new "$template"
+            wing test main.w
+            cd ..
+          done
       - name: Download examples/tests/valid/hello.test.w
         run: |
           curl -L https://raw.githubusercontent.com/winglang/wing/main/examples/tests/valid/hello.test.w > hello.test.w
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
index f650d6f07de..8ebbebb7c0f 100644
--- a/.github/workflows/close-stale.yml
+++ b/.github/workflows/close-stale.yml
@@ -12,20 +12,21 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
         with:
+          days-before-issue-stale: 90
           days-before-pr-stale: 20
+          exempt-issue-labels: roadmap
           stale-issue-message: |
             Hi,
 
-            This issue hasn't seen activity in 60 days. Therefore, we are marking this issue as stale for now. It will be closed after 7 days.
+            This issue hasn't seen activity in 90 days. Therefore, we are marking this issue as stale for now. It will be closed after 7 days.
             Feel free to re-open this issue when there's an update or relevant information to be added.
             Thanks!
           stale-pr-message: |
             Hi,
 
             This PR has not seen activity in 20 days. Therefore, we are marking the PR as stale for now. It will be closed after 7 days.
-            If you need help with the PR, do not hesitate to reach out in the winglang community slack at [winglang.slack.com](https://winglang.slack.com).
+            If you need help with the PR, do not hesitate to reach out in the winglang community [Discord](https://t.winglang.io/discord).
             Feel free to re-open this PR when it is still relevant and ready to be worked on again.
             Thanks!
-
diff --git a/.github/workflows/delete-console-preview.yml b/.github/workflows/delete-console-preview.yml
index 6e21b6d6d1c..f3b1271637a 100644
--- a/.github/workflows/delete-console-preview.yml
+++ b/.github/workflows/delete-console-preview.yml
@@ -17,7 +17,7 @@ jobs:
     if: ${{ github.event.pull_request.head.repo.full_name == github.repository && !startsWith(github.head_ref, 'mergify/merge-queue/') }}
     steps:
       - name: Install flyctl
-        uses: superfly/flyctl-actions/setup-flyctl@1.4
+        uses: superfly/flyctl-actions/setup-flyctl@1.5
         with:
           version: ${{env.FLY_VERSION}}
 
diff --git a/.github/workflows/issue-backlogger.yml b/.github/workflows/issue-backlogger.yml
index 19e6e7f6e78..0c1b1840a59 100644
--- a/.github/workflows/issue-backlogger.yml
+++ b/.github/workflows/issue-backlogger.yml
@@ -10,7 +10,7 @@ jobs:
     name: "Add issue to backlog"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.4.0
+      - uses: actions/add-to-project@v0.5.0
         with:
           project-url: https://github.com/orgs/winglang/projects/2
           github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
diff --git a/.github/workflows/matrix-update.yml b/.github/workflows/matrix-update.yml
new file mode 100644
index 00000000000..f535ae3aeff
--- /dev/null
+++ b/.github/workflows/matrix-update.yml
@@ -0,0 +1,68 @@
+name: Compatibility matrix update
+on:
+  workflow_call: {}
+
+env:
+  NODE_VERSION: "20.11.1"
+  PNPM_VERSION: "8.15.1"
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: ${{ env.PNPM_VERSION }}
+
+      - name: Setup Node.js v18
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install pnpm Dependencies
+        run: pnpm install --frozen-lockfile --filter ./tools/compatibility-matrix-automation
+
+      - name: Download Output Files
+        uses: actions/download-artifact@v3
+        with:
+          name: out
+          path: out
+
+      - name: Run Update Script
+        run: |
+          cd tools/compatibility-matrix-automation
+          TEST_OUTPUT_FOLDER=../../out npx update-matrix
+
+      - name: Create a PR
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
+          title: "chore(docs): compatibility matrix update"
+          branch: "github-actions/updating-matrix"
+          base: main
+          add-paths: docs/**
+          commit-message: |-
+            Updates the [Compatibility Matrix](https://www.winglang.io/docs/standard-library/compatibility-matrix)
+
+            [Workflow Run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+
+            ------
+
+            *Automatically created via the "matrix-update" workflow*
+          body: |-
+            chore(docs): update compatibility matrix
+
+            [Workflow Run]: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+            ------
+
+            *Automatically created via the "matrix-update" workflow*
+          author: monabot <monabot@monada.co>
+          committer: monabot <monabot@monada.co>
+          signoff: true
+          labels: 📚 documentation
+          delete-branch: true
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
index 79e058d9625..8545ce7cc92 100644
--- a/.github/workflows/mutation.yml
+++ b/.github/workflows/mutation.yml
@@ -25,9 +25,9 @@ jobs:
     steps:
       - name: Download artifacts
         id: download-artifacts
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           run_id: ${{ github.event.workflow_run.id }}
           name: .+\.diff$
           name_is_regexp: true
@@ -37,7 +37,7 @@ jobs:
       - uses: marocchino/action-workflow_run-status@54b6e87d6cb552fc5f36dbe9a722a6048725917a
         if: steps.download-artifacts.outputs.found_artifact == 'true'
         with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Token check
         if: steps.download-artifacts.outputs.found_artifact == 'true'
@@ -50,11 +50,33 @@ jobs:
             It requires private repo read/write permissions." >> $GITHUB_STEP_SUMMARY
             exit 1
           fi
+      
+      - name: Find associated pull request
+        id: pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const mainRepo = context.payload.workflow_run.repository.full_name;
+            const headBranch = context.payload.workflow_run.head_branch;
+            console.log(`Searching for pull request in ${mainRepo} with head branch ${headBranch}`);
+
+            const response = await github.rest.search.issuesAndPullRequests({
+              q: `repo:${mainRepo} is:pr is:open head:${headBranch}`,
+              per_page: 1,
+            });
+            const prs = response.data.items;
+            if (prs.length < 1) {
+              throw new Error('No pull request found for the commit');
+            }
+            const prNumber = prs[0].number;
+            console.log(`Pull request number is ${prNumber}`);
+            return prNumber;
 
       - name: Unstable mutation comment
         if: steps.download-artifacts.outputs.found_artifact == 'true' && startsWith(github.event.workflow_run.head_commit.message, format('chore{0} self mutation', ':'))
         uses: thollander/actions-comment-pull-request@v2
         with:
+          pr_number: ${{ steps.pr.outputs.result }}
           mode: recreate
           message: |
             ### :x: Unstable Self-Mutation :x:
@@ -67,33 +89,29 @@ jobs:
             - Flakey tests (relying on one of the above)
           comment_tag: UnstableMutation
           GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }}
-      
+
       - name: Unstable mutation fail
         if: steps.download-artifacts.outputs.found_artifact == 'true' && startsWith(github.event.workflow_run.head_commit.message, format('chore{0} self mutation', ':'))
         run: exit 1
 
       - name: Disable Git Hooks
         if: steps.download-artifacts.outputs.found_artifact == 'true'
-        run: |
-          git config --global core.hooksPath /dev/null
+        run: git config --global core.hooksPath /dev/null
 
       - name: Update PR Branch
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
+        id: branch-update
         if: steps.download-artifacts.outputs.found_artifact == 'true'
         with:
           github-token: ${{ secrets.MUTATION_TOKEN }}
           script: |
-            // use API to get the PR data since we can't rely on the context across forks
-            const pulls = await github.rest.pulls.list({
-              per_page: 1,
+            const prContextData = await github.rest.pulls.get({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              head: `${context.payload.workflow_run.head_repository.full_name}:${context.payload.workflow_run.head_branch}`
+              pull_number: ${{ steps.pr.outputs.result }}
             });
-
-            const prContextData = pulls.data[0];
-            const prNumber = prContextData.number;
-            const originalSha = prContextData.head.sha;
+            const prNumber = prContextData.data.number;
+            const originalSha = prContextData.data.head.sha;
 
             try {
               console.log("Updating PR branch");
@@ -126,7 +144,7 @@ jobs:
 
       - name: Checkout Workflow Branch
         if: steps.download-artifacts.outputs.found_artifact == 'true'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.MUTATION_TOKEN }}
           ref: ${{ github.event.workflow_run.head_branch }}
@@ -161,24 +179,14 @@ jobs:
           git push origin HEAD:$HEAD_REF
 
       - name: Add label to block auto merge
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: steps.download-artifacts.outputs.found_artifact == 'true'
         with:
           github-token: ${{ secrets.MUTATION_TOKEN }}
           script: |
-            // use API to get the PR number since we can't rely on the context across forks
-            const pulls = await github.rest.pulls.list({
-              per_page: 1,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              head: `${context.payload.workflow_run.head_repository.full_name}:${context.payload.workflow_run.head_branch}`
-            });
-            const prNumber = pulls.data[0].number;
-            const labels = ["⚠️ pr/review-mutation"];
-
             await github.rest.issues.addLabels({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              issue_number: prNumber,
-              labels: labels
+              issue_number: ${{ steps.pr.outputs.result }},
+              labels: ["⚠️ pr/review-mutation"]
             });
diff --git a/.github/workflows/new-pull-request-comment.yml b/.github/workflows/new-pull-request-comment.yml
index fd054fc5033..30acb560032 100644
--- a/.github/workflows/new-pull-request-comment.yml
+++ b/.github/workflows/new-pull-request-comment.yml
@@ -1,13 +1,18 @@
 name: PR Creation Comment
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - opened
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   comment:
     runs-on: ubuntu-latest
+    if: ${{ !startsWith(github.head_ref, 'mergify/merge-queue/') }}
     steps:
       - name: Comment on new PR
         uses: thollander/actions-comment-pull-request@v2
@@ -15,7 +20,7 @@ jobs:
           message: |
             Thanks for opening this pull request! :tada:
             Please consult the [contributing guidelines](https://www.winglang.io/contributing) for details on how to contribute to this project.
-            If you need any assistence, don't hesitate to ping the relevant owner over [Slack](https://t.winglang.io/slack).
+            If you need any assistance, don't hesitate to ping the relevant owner over [Discord](https://t.winglang.io/discord).
 
             | Topic                                               | Owner                                                         |
             |-----------------------------------------------------|---------------------------------------------------------------|
@@ -24,7 +29,7 @@ jobs:
             | JSON, structs, primitives and collections           | `@hasanaburayyan`
             | Platforms and plugins                               | `@hasanaburayyan`
             | Frontend resources (website, react, etc)            | `@tsuf239`
-            | Language design                                     | `@eladb`
+            | Language design                                     | `@chriscbr`
             | VSCode extension and language server                | `@markmcculloh`
             | Compiler architecture, inflights, lifting           | `@yoav-steinberg`
             | Wing Testing Framework                              | `@tsuf239`
@@ -33,8 +38,8 @@ jobs:
             | Library Ecosystem                                   | `@chriscbr`
             | Documentation                                       | `@hasanaburayyan`
             | SDK test suite                                      | `@tsuf239` 
-            | Examples                                            | `@skorfmann`
+            | Examples                                            | `@hasanaburayyan`
             | Wing Playground                                     | `@eladcon`
 
           comment_tag: New PR
-          GITHUB_TOKEN: ${{secrets.PROJEN_GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/periodic-azure-clean.yml b/.github/workflows/periodic-azure-clean.yml
new file mode 100644
index 00000000000..3ac3e90dbaf
--- /dev/null
+++ b/.github/workflows/periodic-azure-clean.yml
@@ -0,0 +1,37 @@
+name: Periodic Azure cleanup
+
+on:
+  schedule:
+    - cron: "0 0 * * 1" # Every Saturday at midnight UTC, I assume the main build won't be triggered right before this one
+  workflow_dispatch: {}
+
+env:
+  MANUAL: ${{ github.event_name == 'workflow_dispatch' }}
+
+jobs:
+  azure-cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: test if is maintainer
+        uses: tspascoal/get-user-teams-membership@v3
+        id: testUserGroup
+        if: ${{ env.MANUAL == 'true' }}
+        with:
+          username: ${{ github.actor }}
+          team: "maintainers"
+          GITHUB_TOKEN: ${{ secrets.GH_GROUPS_READ_TOKEN }}
+      - name: cancel run if not allowed
+        if: ${{ env.MANUAL == 'true' && steps.testUserGroup.outputs.isTeamMember == 'false' }}
+        run: |
+          echo "User ${{github.actor}} is not allowed to dispatch this action."
+          exit 1
+
+      - name: Configure azure credentials
+        uses: azure/login@v2
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+      - name: Remove all resources
+        run: |
+          for rg in $(az group list --query "[].name" -o tsv); do
+            az group delete --name $rg --yes --no-wait
+           done
diff --git a/.github/workflows/pull-request-lint.yml b/.github/workflows/pull-request-lint.yml
index 8557952f519..ab8877b5e56 100644
--- a/.github/workflows/pull-request-lint.yml
+++ b/.github/workflows/pull-request-lint.yml
@@ -7,15 +7,14 @@ on:
       - synchronize
       - reopened
       - edited
-    branches-ignore:
-      - "mergify/merge-queue/*"
 
 jobs:
   validate:
     name: Validate PR title
     runs-on: ubuntu-latest
+    if: ${{ !startsWith(github.head_ref, 'mergify/merge-queue/') }}
     steps:
-      - uses: amannn/action-semantic-pull-request@v5.2.0
+      - uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -32,6 +31,8 @@ jobs:
             vscode
             platforms
             console
+            typescript
+            lsp
           types: |-
             feat
             fix
diff --git a/.github/workflows/sdk-spec-test.yml b/.github/workflows/sdk-spec-test.yml
new file mode 100644
index 00000000000..a3d790c4766
--- /dev/null
+++ b/.github/workflows/sdk-spec-test.yml
@@ -0,0 +1,240 @@
+name: SDK Spec Tests
+run-name: SDK Spec Tests (${{ inputs.repo || github.repository }}/${{inputs.ref || github.ref}}) for ${{inputs.target || 'all'}}
+on:
+  # release: #TODO: uncomment to enable unstable targets, at this moment there are none
+  # types:
+  # - published # runs only unstable targets
+  workflow_call: {}
+  workflow_dispatch:
+    inputs:
+      repo:
+        type: string
+        default: winglang/wing
+        description: "Full repo name (owner/name)"
+      ref:
+        type: string
+        default: main
+        description: "Ref to checkout. Must be present in the repo input."
+      target:
+        type: choice
+        default: all
+        description: "target to run at, can be one or all of them"
+        options:
+          - all-stable # tf-aws and sim
+          - all-unstable # tf-azure and soon tf-gcp
+          - all
+          - tf-aws
+          - tf-azure
+          - sim
+          - tf-gcp
+
+permissions:
+  contents: read
+  id-token: write
+
+env:
+  AWS_REGION: "us-east-1"
+  NODE_VERSION: "20.11.1"
+  # this variable indicates wheater to use wing cli from a local version (using the current repo code)
+  # or use the latest remote npm version
+  LOCAL_BUILD: ${{ github.workflow == 'build' }}
+  # indicates if the action triggered from a workflow_dispatch
+  MANUAL: ${{ github.event_name == 'workflow_dispatch' }}
+  REPO: ${{ inputs.repo || github.repository }}
+  REF: ${{ inputs.ref || github.ref }}
+  TARGET: ${{ inputs.target || (github.workflow == 'build' && 'all-stable') || (github.event_name == 'release' && 'all-unstable')  || 'all' }} #the build runs only stable targets, realease only unstable
+  PNPM_VERSION: "8.15.1"
+  AZURE_LOCATION: "East US"
+  CDK_STACK_NAME: "sdk-spec-tests"
+  GOOGLE_PROJECT_ID: "sdk-spec-tests"
+  GOOGLE_REGION: "us-central1"
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: test if is maintainer
+        uses: tspascoal/get-user-teams-membership@v3
+        id: testUserGroup
+        if: ${{ env.MANUAL == 'true' }}
+        with:
+          username: ${{ github.actor }}
+          team: "maintainers"
+          GITHUB_TOKEN: ${{ secrets.GH_GROUPS_READ_TOKEN }}
+      - name: cancel run if not allowed
+        if: ${{ env.MANUAL == 'true' && steps.testUserGroup.outputs.isTeamMember == 'false' }}
+        run: |
+          echo "User ${{github.actor}} is not allowed to dispatch this action."
+          exit 1
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{env.REPO}}
+          ref: ${{env.REF}}
+
+      - name: Get list of directories and save them to the output
+        id: setdirs
+        shell: bash
+        run: | # TODO: skipping std, math and external folders, when https://github.com/winglang/wing/issues/3168 is resolve- we'll skip only the external folder.
+          dirs=$(ls -d examples/tests/sdk_tests/*/ | sed 's/\/$//' | grep -v "external\|std\|math" | jq -R -s -c 'split("\n")[:-1]')
+          processed_dirs=$(echo "{ \"directory\": $dirs }" | jq -c '[ .directory[] | {directory: ., name: (split("/") | last)}]')
+          wrapped_dirs=$(echo $processed_dirs | jq -c .)
+          echo "dirs=$wrapped_dirs" >> $GITHUB_OUTPUT
+      - name: Get targets list
+        id: settargets
+        run: |
+          if [ "${{env.TARGET}}" = "all" ]; then
+            target='["tf-aws", "tf-azure", "tf-gcp"]'
+          elif [ "${{env.TARGET}}" = "all-stable" ]; then
+            target='["tf-aws", "sim", "tf-azure"]'
+          elif [ "${{env.TARGET}}" = "all-unstable" ]; then
+            target='["tf-gcp"]'
+          else
+           target='["${{env.TARGET}}"]'
+          fi
+          echo "targets=$target" >> $GITHUB_OUTPUT
+    outputs:
+      tests: ${{ steps.setdirs.outputs.dirs }}
+      targets: ${{ steps.settargets.outputs.targets }}
+
+  test:
+    needs: setup
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        test: ${{ fromJson(needs.setup.outputs.tests) }}
+        target: ${{ fromJson(needs.setup.outputs.targets) }}
+    name: ${{ matrix.test.name }} - ${{ matrix.target }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{env.REPO}}
+          ref: ${{env.REF}}
+
+      - name: Setup pnpm
+        if: ${{ env.MANUAL ==  'true' }}
+        uses: pnpm/action-setup@v3
+        with:
+          version: ${{ env.PNPM_VERSION }}
+
+      - name: Setup Node.js v18
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      ##################### install a local wing version #########################
+      - name: Download Dist Artifacts
+        if: ${{ env.LOCAL_BUILD ==  'true' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: dist
+          path: dist
+
+      - name: Install Wing from Dist
+        if: ${{ env.LOCAL_BUILD ==  'true' }}
+        run: |
+          mkdir localwing
+          cd localwing
+          npm init --yes
+          npm install ../dist/*-[0-9]*.[0-9]*.[0-9]*.tgz
+          ./node_modules/.bin/wing --version
+
+      #################### install a remote wing version ########################
+      - name: Install winglang globally
+        if: ${{ env.LOCAL_BUILD == 'false' && env.MANUAL == 'false'}}
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 3
+          retry_on: error
+          timeout_minutes: 5
+          command: npm install -g winglang
+      ########################################################################
+      - name: Installing external js modules
+        run: |
+          cd examples/tests/sdk_tests
+          npm install
+      - name: Configure AWS credentials
+        if: ${{ matrix.target == 'tf-aws' }}
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+      - name: Configure azure credentials
+        if: ${{ matrix.target == 'tf-azure' }}
+        uses: azure/login@v2
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Configure gcp credentials
+        id: gcp-auth
+        if: ${{ matrix.target == 'tf-gcp' }}
+        uses: google-github-actions/auth@v1
+        with:
+          workload_identity_provider: "projects/833985639028/locations/global/workloadIdentityPools/gh-action/providers/gh-action-provider"
+          service_account: "gh-action@sdk-spec-tests.iam.gserviceaccount.com"
+          # token_format: "id_token"
+          # id_token_audience: "gh-action@sdk-spec-tests.iam.gserviceaccount.com"
+          # create_credentials_file: true
+
+      - name: Set-up gcloud
+        if: ${{ matrix.target == 'tf-gcp' }}
+        uses: google-github-actions/setup-gcloud@v1
+
+      - name: export gcloud token
+        if: ${{ matrix.target == 'tf-gcp' }}
+        run: echo "GCP_ID_TOKEN=$(gcloud auth print-identity-token --impersonate-service-account=gh-action@sdk-spec-tests.iam.gserviceaccount.com)" >> $GITHUB_ENV
+
+      - name: Installing local dependencies
+        if: ${{ env.MANUAL == 'true' }}
+        uses: nick-fields/retry@v3
+        env:
+          TF_LOG: info
+          TF_LOG_PATH: ${{ runner.workspace }}/terraform.log
+        with:
+          max_attempts: 3
+          retry_on: error
+          timeout_minutes: 30
+          command: |
+            pnpm install
+            pnpm turbo compile -F=winglang
+
+      - name: Execute wing test in matrix directory
+        env:
+          TF_LOG: info
+          TF_LOG_PATH: ${{ runner.workspace }}/terraform.log
+        run: |
+          if  ${{ env.MANUAL == 'true' }}
+          then
+            WING_CLI=$(realpath apps/wing/bin/wing)
+          elif ${{ env.LOCAL_BUILD == 'false'}}
+          then 
+            WING_CLI=$(which wing)
+            # COMPATIBILITY="-t @winglang/compatibility-spy" //TODO: will be handled in a following PR
+          else
+            WING_CLI=$(realpath localwing/node_modules/.bin/wing)
+            COMPATIBILITY="-t  ../../../../localwing/node_modules/@winglang/compatibility-spy/lib"
+            echo $COMPATIBILITY
+          fi
+          cd ${{ matrix.test.directory }}
+          $WING_CLI test --snapshots=deploy -t ${{ matrix.target }} -p ${{ (matrix.target == 'tf-azure' && 2 ) || 10 }} --retry 3 $COMPATIBILITY *.test.w -o ../../../../out/${{ matrix.test.name }}-${{ matrix.target }}.json
+
+      - name: Upload Artifacts
+        if: ${{ env.LOCAL_BUILD ==  'true' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: out
+          path: out/*
+
+      - name: Output Terraform log
+        if: failure()
+        run: cat ${{ runner.workspace }}/terraform.log
+
+  update-matrix:
+    needs: test
+    if: ${{ github.workflow == 'build' }}
+    uses: ./.github/workflows/matrix-update.yml
+    secrets: inherit
diff --git a/.github/workflows/tf-aws-test.yml b/.github/workflows/tf-aws-test.yml
deleted file mode 100644
index 6cf0e1903e1..00000000000
--- a/.github/workflows/tf-aws-test.yml
+++ /dev/null
@@ -1,218 +0,0 @@
-name: SDK Spec Tests
-run-name: SDK Spec Tests (${{ inputs.repo || github.repository }}/${{inputs.ref || github.ref}}) for ${{inputs.target || 'all'}}
-on:
-  release:
-    types:
-      - published # runs only unstable targets
-  workflow_call: {}
-  workflow_dispatch:
-    inputs:
-      repo:
-        type: string
-        default: winglang/wing
-        description: "Full repo name (owner/name)"
-      ref:
-        type: string
-        default: main
-        description: "Ref to checkout. Must be present in the repo input."
-      target:
-        type: choice
-        default: all
-        description: "target to run at, can be one or all of them"
-        options:
-          - all-stable # tf-aws
-          - all-unstable # tf-azure and soon tf-gcp
-          - all
-          - tf-aws
-          - tf-azure
-          - tf-gcp
-
-permissions:
-  contents: read
-  id-token: write
-
-env:
-  AWS_REGION: "us-east-1"
-  NODE_VERSION: "18.16.0"
-  # this variable indicates wheater to use wing cli from a local version (using the current repo code)
-  # or use the latest remote npm version
-  LOCAL_BUILD: ${{ github.workflow == 'build' }}
-  # indicates if the action triggered from a workflow_dispatch
-  MANUAL: ${{ github.event_name == 'workflow_dispatch' }}
-  REPO: ${{ inputs.repo || github.repository }}
-  REF: ${{ inputs.ref || github.ref }}
-  TARGET: ${{ inputs.target || (github.workflow == 'build' && 'all-stable') || (github.event_name == 'release' && 'all-unstable')  || 'all' }} #the build runs only stable targets, realease only unstable
-  PNPM_VERSION: "8.6.3"
-  AZURE_LOCATION: "East US"
-  CDK_STACK_NAME: "sdk-spec-tests"
-  GOOGLE_PROJECT_ID: "sdk-spec-tests"
-  GOOGLE_REGION: "us-central1"
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: test if is maintainer
-        uses: tspascoal/get-user-teams-membership@v2
-        id: testUserGroup
-        if: ${{ env.MANUAL == 'true' }}
-        with:
-          username: ${{ github.actor }}
-          team: "maintainers"
-          GITHUB_TOKEN: ${{ secrets.GH_GROUPS_READ_TOKEN }}
-      - name: cancel run if not allowed
-        if: ${{ env.MANUAL == 'true' && steps.testUserGroup.outputs.isTeamMember == 'false' }}
-        run: |
-          echo "User ${{github.actor}} is not allowed to dispatch this action."
-          exit 1
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          repository: ${{env.REPO}}
-          ref: ${{env.REF}}
-
-      - name: Get list of directories and save them to the output
-        id: setdirs
-        shell: bash
-        run: | # TODO: skipping std and external folders, when https://github.com/winglang/wing/issues/3168 is resolve- we'll skip only the external folder.
-          dirs=$(ls -d examples/tests/sdk_tests/*/ | sed 's/\/$//' | grep -v "external\|std" | jq -R -s -c 'split("\n")[:-1]')
-          processed_dirs=$(echo "{ \"directory\": $dirs }" | jq -c '[ .directory[] | {directory: ., name: (split("/") | last)}]')
-          wrapped_dirs=$(echo $processed_dirs | jq -c .)
-          echo "dirs=$wrapped_dirs" >> $GITHUB_OUTPUT
-      - name: Get targets list
-        id: settargets
-        run: |
-          if [ "${{env.TARGET}}" = "all" ]; then
-            target='["tf-aws", "tf-azure", "tf-gcp"]'
-          elif [ "${{env.TARGET}}" = "all-stable" ]; then
-            target='["tf-aws"]'
-          elif [ "${{env.TARGET}}" = "all-unstable" ]; then
-            target='["tf-azure", "tf-gcp"]'
-          else
-           target='["${{env.TARGET}}"]'
-          fi
-          echo "targets=$target" >> $GITHUB_OUTPUT
-    outputs:
-      tests: ${{ steps.setdirs.outputs.dirs }}
-      targets: ${{ steps.settargets.outputs.targets }}
-
-  test-tf-aws:
-    needs: setup
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      max-parallel: 10
-      matrix:
-        test: ${{ fromJson(needs.setup.outputs.tests) }}
-        target: ${{ fromJson(needs.setup.outputs.targets) }}
-    name: ${{ matrix.test.name }} - ${{ matrix.target }}
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          repository: ${{env.REPO}}
-          ref: ${{env.REF}}
-
-      - name: Setup pnpm
-        if: ${{ env.MANUAL ==  'true' }}
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: ${{ env.PNPM_VERSION }}
-
-      - name: Setup Node.js v18
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-
-      ##################### install a local wing version #########################
-      - name: Download Dist Artifacts
-        if: ${{ env.LOCAL_BUILD ==  'true' }}
-        uses: actions/download-artifact@v3
-        with:
-          name: dist
-          path: dist
-
-      - name: Install Wing from Dist
-        if: ${{ env.LOCAL_BUILD ==  'true' }}
-        run: |
-          mkdir localwing
-          cd localwing
-          npm init --yes
-          npm install ../dist/*-[0-9]*.[0-9]*.[0-9]*.tgz
-          ./node_modules/.bin/wing --version
-
-      #################### install a remote wing version ########################
-      - name: Install winglang globally
-        if: ${{ env.LOCAL_BUILD == 'false' && env.MANUAL == 'false'}}
-        uses: nick-fields/retry@v2
-        with:
-          max_attempts: 3
-          retry_on: error
-          timeout_minutes: 5
-          command: npm install -g winglang
-      ########################################################################
-      - name: Installing external js modules
-        run: |
-          cd examples/tests/sdk_tests
-          npm install
-      - name: Configure AWS credentials
-        if: ${{ matrix.target == 'tf-aws'}}
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ env.AWS_REGION }}
-      - name: Configure azure credentials
-        if: ${{ matrix.target == 'tf-azure' }}
-        uses: azure/login@v1
-        with:
-          creds: ${{ secrets.AZURE_CREDENTIALS }}
-
-      - name: Configure gcp credentials
-        id: gcp-auth
-        if: ${{ matrix.target == 'tf-gcp' }}
-        uses: google-github-actions/auth@v1
-        with:
-          workload_identity_provider: "projects/833985639028/locations/global/workloadIdentityPools/gh-action/providers/gh-action-provider"
-          service_account: "gh-action@sdk-spec-tests.iam.gserviceaccount.com"
-          # token_format: "id_token"
-          # id_token_audience: "gh-action@sdk-spec-tests.iam.gserviceaccount.com"
-          # create_credentials_file: true
-
-      - name: Set-up gcloud
-        if: ${{ matrix.target == 'tf-gcp' }}
-        uses: google-github-actions/setup-gcloud@v1
-
-      - name: export gcloud token
-        if: ${{ matrix.target == 'tf-gcp' }}
-        run: echo "GCP_ID_TOKEN=$(gcloud auth print-identity-token --impersonate-service-account=gh-action@sdk-spec-tests.iam.gserviceaccount.com)" >> $GITHUB_ENV
-
-      - name: Installing local dependencies
-        if: ${{ env.MANUAL == 'true' }}
-        run: |
-          pnpm install
-          pnpm turbo compile -F=winglang
-      - name: Execute wing test in matrix directory
-        uses: nick-fields/retry@v2
-        env:
-          TF_LOG: info
-          TF_LOG_PATH: ${{ runner.workspace }}/terraform.log
-        with:
-          max_attempts: 3
-          retry_on: error
-          timeout_minutes: 60
-          command: |
-            if  ${{ env.MANUAL == 'true' }}
-            then   
-              WING_CLI=$(realpath apps/wing/bin/wing)
-            elif ${{ env.LOCAL_BUILD == 'false'}}
-            then 
-              WING_CLI=$(which wing)
-            else
-              WING_CLI=$(realpath localwing/node_modules/.bin/wing)
-            fi
-            cd ${{ matrix.test.directory }}
-            $WING_CLI test -t ${{ matrix.target }} *.test.w
-      - name: Output Terraform log
-        if: failure()
-        run: cat ${{ runner.workspace }}/terraform.log
diff --git a/.gitignore b/.gitignore
index b5c5dd29f51..781645e6836 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ target/
 
 # turbo
 .turbo/
+
+.history/
diff --git a/.mergify.yml b/.mergify.yml
index 913b0e5349e..d1f74cd2f13 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,14 +2,6 @@
 queue_rules:
   - name: default
     speculative_checks: 2
-    conditions:
-      - -files=.mergify.yml
-      - or:
-          - status-success=Quality Gate
-          - and:
-              - -files~=^(?!docs/|logo/)
-              # These files must be generated via wingsdk build
-              - -files~=^docs/docs/04-standard-library/[^/]+/[^/]+\.md$
 
 pull_request_rules:
   - name: automatic merge
@@ -19,7 +11,7 @@ pull_request_rules:
           Thanks for contributing, @{{author}}! This PR will now be added to the [merge queue](https://mergify.com/merge-queue), or immediately merged if `{{head}}` is up-to-date with `{{base}}` and the queue is empty.
       queue:
         name: default
-        method: squash
+        merge_method: squash
         commit_message_template: |-
           {{ title }} (#{{ number }})
           {{ body }}
@@ -29,6 +21,7 @@ pull_request_rules:
       - -label~=(🚧 pr/do-not-merge|⚠️ pr/review-mutation)
       - -merged
       - -closed
+      - -draft
       - branch-protection-review-decision=APPROVED
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
@@ -50,6 +43,7 @@ pull_request_rules:
       - -label~=(🚧 pr/do-not-merge|⚠️ pr/review-mutation|⚠️ mergify/review-config)
       - -merged
       - -closed
+      - -draft
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - "#review-threads-unresolved=0"
diff --git a/.node-version b/.node-version
index 3c79f30eca2..726a201e63a 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-18.16.0
\ No newline at end of file
+20.11.1
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 40c4ef8612b..28b847ba58d 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -2,4 +2,4 @@
 
 Wing follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
 
-Please review before contributing issues, pull requests, or joining the Wing Slack.
+Please review before contributing issues, pull requests, or joining the Wing Discord.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c2a3f2f6bcf..a8700c0cfab 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,8 +10,8 @@ any kind.
 The [Wing Contributor's Handbook] has tons of relevant information. If you can't find what you need
 here, please let us know by [submitting an issue].
 
-The best way to get started is by asking for help in the [#contrib] channel on
-the [Wing Slack].
+The best way to get started is by asking for help in the #help channel on
+the [Wing Discord].
 
 ## Quick Links
 
@@ -25,9 +25,8 @@ Here is a curated list of topics from the [Wing Contributor's Handbook]:
 
 ## Code of Conduct
 
-The Wing community follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md). Please review it before contributing issues, pull requests, or joining the [Wing Slack].
+The Wing community follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md). Please review it before contributing issues, pull requests, or joining the [Wing Discord].
 
-[Wing Slack]: https://t.winglang.io/slack
+[Wing Discord]: https://t.winglang.io/discord
 [Wing Contributor's Handbook]: https://www.winglang.io/contributing/
-[#contrib]: https://winglang.slack.com/archives/C04BJBTVDV4
 [submitting an issue]: https://github.com/winglang/wing/issues/new
diff --git a/Cargo.lock b/Cargo.lock
index c6feeb6674f..72b67505c2b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,48 +29,64 @@ dependencies = [
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "anstream"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
- "winapi",
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
 ]
 
 [[package]]
-name = "anyhow"
-version = "1.0.72"
+name = "anstyle"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
-name = "arrayref"
-version = "0.3.7"
+name = "anstyle-parse"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
 
 [[package]]
-name = "arrayvec"
-version = "0.7.4"
+name = "anstyle-query"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
 
 [[package]]
-name = "ascii"
-version = "1.1.0"
+name = "anstyle-wincon"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "arrayref"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
@@ -86,9 +102,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.3"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bitvec"
@@ -134,12 +150,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bumpalo"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
-
 [[package]]
 name = "bytecheck"
 version = "0.6.11"
@@ -162,12 +172,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "bytes"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
 [[package]]
 name = "camino"
 version = "1.1.6"
@@ -176,18 +180,9 @@ checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
 
 [[package]]
 name = "cfg-if"
@@ -196,26 +191,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "chunked_transfer"
-version = "1.4.1"
+name = "clap"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
 
 [[package]]
-name = "clap"
-version = "2.34.0"
+name = "clap_builder"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
+ "anstream",
+ "anstyle",
+ "clap_lex",
  "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
 ]
 
+[[package]]
+name = "clap_derive"
+version = "4.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "colored"
 version = "2.0.4"
@@ -227,16 +247,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "memchr",
-]
-
 [[package]]
 name = "console"
 version = "0.15.7"
@@ -275,22 +285,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.9"
@@ -330,12 +324,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -346,33 +334,13 @@ dependencies = [
  "crypto-common",
 ]
 
-[[package]]
-name = "dirs"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
 [[package]]
 name = "duplicate"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro-error",
 ]
 
@@ -396,41 +364,30 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "filetime"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
+ "redox_syscall",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -441,9 +398,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -491,12 +448,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
 [[package]]
 name = "globset"
 version = "0.4.12"
@@ -521,9 +472,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "heck"
@@ -532,13 +483,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
-name = "hermit-abi"
-version = "0.1.19"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
@@ -548,28 +496,13 @@ checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "home"
-version = "0.5.5"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "html-escape"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
-dependencies = [
- "utf8-width",
-]
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
 [[package]]
 name = "idna"
 version = "0.4.0"
@@ -592,20 +525,20 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.3",
  "serde",
 ]
 
 [[package]]
 name = "indoc"
-version = "2.0.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "insta"
@@ -629,16 +562,16 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi",
  "rustix",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
@@ -649,37 +582,6 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
-[[package]]
-name = "jni"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
-dependencies = [
- "cesu8",
- "cfg-if",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "js-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -688,19 +590,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "linked-hash-map"
@@ -710,21 +602,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "lsp-types"
-version = "0.94.0"
+version = "0.95.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
 dependencies = [
  "bitflags 1.3.2",
  "serde",
@@ -733,20 +625,11 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "memoffset"
@@ -767,25 +650,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "objc"
-version = "0.2.7"
+name = "nu-ansi-term"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
- "malloc_buf",
+ "overload",
+ "winapi",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parcel_sourcemap"
@@ -834,7 +718,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -888,7 +772,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -900,6 +784,12 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -932,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -961,9 +851,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.32"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -1004,75 +894,43 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "raw-window-handle"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall 0.2.16",
- "thiserror",
-]
-
 [[package]]
 name = "regex"
-version = "1.9.1"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.7.4",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.3.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.4",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "rend"
@@ -1111,23 +969,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustix"
-version = "0.38.6"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1142,54 +994,38 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "seahash"
 version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
-[[package]]
-name = "semver"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
-
 [[package]]
 name = "serde"
-version = "1.0.180"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.180"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.51",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
- "indexmap 2.0.0",
  "itoa",
  "ryu",
  "serde",
@@ -1203,7 +1039,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -1217,6 +1053,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "simdutf8"
 version = "0.1.4"
@@ -1236,10 +1081,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
 
 [[package]]
-name = "smallbitvec"
-version = "2.5.1"
+name = "smallvec"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ce4f9dc4a41b4c3476cc925f1efb11b66df373a8fde5d4b8915fa91b5d995e"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "speedy"
@@ -1259,35 +1104,35 @@ checksum = "7d395866cb6778625150f77a430cc0af764ce0300f6a3d3413477785fa34b6c7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.51",
 ]
 
 [[package]]
 name = "strsim"
-version = "0.8.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "strum"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.25.2"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
+checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.28",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -1303,9 +1148,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.28"
+version = "2.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1320,56 +1165,53 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.3.5",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "termcolor"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
- "unicode-width",
+ "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.44"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.44"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.51",
 ]
 
 [[package]]
-name = "tiny_http"
-version = "0.12.0"
+name = "thread_local"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
- "ascii",
- "chunked_transfer",
- "httpdate",
- "log",
+ "cfg-if",
+ "once_cell",
 ]
 
 [[package]]
@@ -1388,121 +1230,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
-name = "toml"
-version = "0.5.11"
+name = "tracing"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "serde",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
 ]
 
 [[package]]
-name = "tree-sitter"
-version = "0.20.10"
+name = "tracing-attributes"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "cc",
- "regex",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
 ]
 
 [[package]]
-name = "tree-sitter-cli"
-version = "0.20.8"
+name = "tracing-core"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae7e9d844d4d38e511a7b93fe8ced79f2a364c32fdea10d04546f1c8317d5a0c"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
- "ansi_term",
- "anyhow",
- "atty",
- "clap",
- "difference",
- "dirs",
- "glob",
- "html-escape",
- "indexmap 1.9.3",
- "lazy_static",
- "log",
- "regex",
- "regex-syntax 0.6.29",
- "rustc-hash",
- "semver",
- "serde",
- "serde_json",
- "smallbitvec",
- "tiny_http",
- "toml",
- "tree-sitter",
- "tree-sitter-config",
- "tree-sitter-highlight",
- "tree-sitter-loader",
- "tree-sitter-tags",
- "walkdir",
- "webbrowser",
- "which",
+ "once_cell",
+ "valuable",
 ]
 
 [[package]]
-name = "tree-sitter-config"
-version = "0.19.0"
+name = "tracing-log"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fec4cb27f052ead2246631b332dba0cb6af9a54ce012badee59c4b0ded5e03"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "anyhow",
- "dirs",
- "serde",
- "serde_json",
+ "log",
+ "once_cell",
+ "tracing-core",
 ]
 
 [[package]]
-name = "tree-sitter-highlight"
-version = "0.20.1"
+name = "tracing-subscriber"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "042342584c5a7a0b833d9fc4e2bdab3f9868ddc6c4b339a1e01451c6720868bc"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
- "regex",
- "thiserror",
- "tree-sitter",
+ "nu-ansi-term",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
-name = "tree-sitter-loader"
-version = "0.20.0"
+name = "tree-sitter"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b17eef4833c7c139abed66d562dfa23228e97e647597baf246fd56c21bbfaf"
+checksum = "688200d842c76dd88f9a7719ecb0483f79f5a766fb1c100756d5d8a059abc71b"
 dependencies = [
- "anyhow",
  "cc",
- "dirs",
- "libloading",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "tree-sitter",
- "tree-sitter-highlight",
- "tree-sitter-tags",
-]
-
-[[package]]
-name = "tree-sitter-tags"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05"
-dependencies = [
- "memchr",
  "regex",
- "thiserror",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-traversal"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8a158225e4a4d8505f071340bba9edd109b23f01b70540dccb7c799868f307"
-dependencies = [
- "tree-sitter",
 ]
 
 [[package]]
@@ -1511,7 +1302,6 @@ version = "0.0.0"
 dependencies = [
  "cc",
  "tree-sitter",
- "tree-sitter-cli",
 ]
 
 [[package]]
@@ -1547,12 +1337,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -1572,10 +1356,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "utf8-width"
-version = "0.1.6"
+name = "utf8parse"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
@@ -1588,10 +1372,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "vec_map"
-version = "0.8.2"
+name = "valuable"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "version_check"
@@ -1605,114 +1389,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff"
 
-[[package]]
-name = "walkdir"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.28",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.28",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-
-[[package]]
-name = "web-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webbrowser"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6"
-dependencies = [
- "core-foundation",
- "home",
- "jni",
- "log",
- "ndk-context",
- "objc",
- "raw-window-handle",
- "url",
- "web-sys",
-]
-
-[[package]]
-name = "which"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1762,6 +1444,15 @@ dependencies = [
  "windows-targets 0.48.1",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.3",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -1792,6 +1483,21 @@ dependencies = [
  "windows_x86_64_msvc 0.48.0",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.3",
+ "windows_aarch64_msvc 0.52.3",
+ "windows_i686_gnu 0.52.3",
+ "windows_i686_msvc 0.52.3",
+ "windows_x86_64_gnu 0.52.3",
+ "windows_x86_64_gnullvm 0.52.3",
+ "windows_x86_64_msvc 0.52.3",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -1804,6 +1510,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -1816,6 +1528,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -1828,6 +1546,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -1840,6 +1564,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -1852,6 +1582,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -1864,6 +1600,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -1876,6 +1618,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6"
+
 [[package]]
 name = "wingc"
 version = "0.0.0"
@@ -1887,7 +1635,7 @@ dependencies = [
  "derivative",
  "duplicate",
  "globset",
- "indexmap 2.0.0",
+ "indexmap 2.2.6",
  "indoc",
  "insta",
  "itertools",
@@ -1902,12 +1650,28 @@ dependencies = [
  "strum",
  "tempfile",
  "tree-sitter",
- "tree-sitter-traversal",
  "tree-sitter-wing",
  "uuid",
  "wingii",
 ]
 
+[[package]]
+name = "wingcli"
+version = "0.74.53"
+dependencies = [
+ "anstyle",
+ "camino",
+ "clap",
+ "home",
+ "lazy_static",
+ "strum",
+ "termcolor",
+ "tracing",
+ "tracing-subscriber",
+ "wingc",
+ "wingii",
+]
+
 [[package]]
 name = "wingii"
 version = "0.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 22981b3a6b7..8f769fec7a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "apps/wingcli-v2",
   "libs/tree-sitter-wing",
   "libs/wingc",
   "libs/wingii",
diff --git a/Privacy.md b/Privacy.md
new file mode 100644
index 00000000000..804b9d0c5ad
--- /dev/null
+++ b/Privacy.md
@@ -0,0 +1,162 @@
+# Privacy Notice
+
+**Last updated: October, 2023**
+
+This Privacy Notice describes how Wing Cloud Inc. (together with its affiliated companies - "Wing Cloud", "we", or "us") collects, stores, uses and discloses personal data when you interact with us, including when you visit or interact with any of our linked websites, including [https://www.wing.cloud](https://www.wing.cloud) and [https://www.winglang.io](https://www.winglang.io) ("sites"), participate in any of our events, interact with any of our online ads and content, emails, sales and marketing channels, integrations or communications under our control (collectively with our cloud-oriented programming language Winglang or any ensuing Wing Cloud products or services, the "Services").
+
+Please review this Privacy Notice carefully, and please use the information herein to make informed choices. If you have any concerns or questions about our privacy practices, please feel free to contact us. By accessing the sites, registering for an account, or making a purchase from us, you are agreeing to all of the terms set forth in this Privacy Notice.
+
+If you do not agree to this Privacy Notice, please do not use our sites, purchase our products, interact with our Services, or otherwise provide us with any information. Your continued use of our Services means that you agree to this privacy notice.
+
+You are not legally required to provide us with any personal data. If you do not wish to provide us with your personal data, or to have it processed by us or any of our service providers, please do not provide it to us and avoid any interaction with us or with any of our Services.
+
+Specifically, this Privacy Notice describes our practices regarding:
+
+
+1. [Data Collection & Processing](#data-collection--processing)
+2. [Data Uses & Lawful Bases for Processing](#data-uses--lawful-bases-for-processing)
+3. [Data Storage and Transfer](#data-storage-and-transfer)
+4. [How Long We Retain Your Personal Data](#how-long-we-retain-your-personal-data)
+5. [How We Share or Otherwise Disclose Your Personal Data](#how-we-share-or-otherwise-disclose-your-personal-data)
+6. [Cookies and Data Collection Technologies and Do Not Track](#cookies-and-data-collection-technologies-and-do-not-track)
+7. [Communications](#communications)
+8. [Data Security](#data-security)
+9. [Your Data Subject Rights](#your-data-subject-rights)
+10. [Data Controller/Processor](#data-controllerprocessor)
+11. [US Privacy Notices](#us-privacy-notices)
+12. [Additional Notice & Contact Details](#additional-notice--contact-details)
+
+
+## Data Collection & Processing
+
+When we use the term “personal data” in this Privacy Notice, we mean information that identifies, relates to, describes, is reasonably capable of being associated with, or could reasonably be linked, directly or indirectly, to an individual. It does not include aggregated or identified information that is maintained in a form that is not reasonably capable of being associated with or linked to an individual.
+
+Sometimes we collect personal data automatically when you interact with our Services and sometimes, we collect personal data directly from you. At times, we may collect personal data from other sources and third parties (such as our Business Customers, Partners, or Service Providers), even before our first direct interaction.
+
+We may collect or generate the following types of personal data in relation to the Services:
+
+- **Contact details:** you may provide us with contact and business information such as name, e-mail address, phone number, or job title through our Services, such as by submitting forms available on our sites (e.g. "Contact us" forms, subscription to our newsletters, etc.).
+- **Account data:** Certain Wing Cloud products or services may require registration. When you sign up and create your account, you may provide us with certain personal data such as e-mail address, hashed password or other information used for authentication and access control, profile picture, and any additional information you will choose to share via the Services. You may also choose to sign-up and login to our Services using your GitHub account. To do so, you may provide us with information connected to this account (e.g., e-mail address, username for that account, profile picture and other information listed in the “connect” screen). Please note that the personal data related to such an account will also be subject to that third-party’s terms and privacy policy. Hence, we recommend you to carefully read the terms and privacy policies of such third parties before connecting them to your use of our Services.
+- **Interactions and communications:** correspondence with us (e.g., for support purposes) via the Services or our social media pages (such as Twitter, Facebook), as well as via chats, surveys, feedback, calls and video recordings, and analyses thereof.
+- **Usage and analytics data:** connectivity, technical and behavioral usage data, user agent, IP addresses, device data (such as type, OS, device ID, browser version, locale and language settings used), activity, communication and performance logs, session recordings, issues and bugs, and the cookies and pixels installed or utilized on your device as you access or otherwise use the Services.
+
+When we offer our Services to business customers (“Business Customers”), we may also process personal data concerning their internal focal persons who directly engage with Wing Cloud concerning their organizational account, billing contacts and authorized signatories on behalf of the Business Customer; as well as the customer’s business needs and preferences, as identified to us or recognized through our engagement with such Business Customer. If you use our Services on behalf of your company which is a Business Customer of ours, please note that we may process certain aspects of your personal data as a Processor, on behalf of and under the instruction of the respective Business Customer. For additional details please refer to [Section 10](#h.30j0zll).
+
+## Data Uses & Lawful Bases for Processing
+
+We use your personal data as necessary for the following purposes and in reliance on the lawful bases detailed in the chart below:
+
+| Purpose | Lawful basis for processing |
+| --- | --- |
+| To facilitate, operate and provide our Services. | Performance of a Contract, Legitimate Interests, Consent (to the extent applicable) |
+| To authenticate your identity, and allow you to access our Services (for Wing Cloud Services requiring registration) | Legitimate Interests, Performance of a Contract |
+| To gain a better understanding on how you use and interact with our Services, and how we could improve your and others’ user experience and continue improving our offerings and the overall performance of our Services. | Legitimate Interest, Consent (to the extent applicable) |
+| To provide customer service and technical support. | Performance of a Contract, Legitimate Interest |
+| To support and enhance our data security measures, including for purposes of preventing and mitigating the risks of fraud, error or any illegal or prohibited activity. | Compliance with legal obligations, Legitimate interest, Performance of a Contract |
+| To comply with court orders and warrants, and prevent misuse of the Services, and to take any action in any related legal dispute and proceeding. | Compliance with legal obligations, Legitimate interest, Performance of a Contract |
+| To comply with applicable laws and regulations. | Compliance with legal obligations |
+| To contact you with general or personalized Service-related messages. | Performance of a Contract, Legitimate Interest |
+| To carry out, facilitate and optimize our marketing campaigns, ad management and sales operations, and to manage and deliver advertisements for our products and services more effectively, including on other websites and applications, and contact you with promotional messages that may be of specific interest you. | Consent (to the extent applicable), Legitimate Interest |
+| To explore and pursue growth opportunities by facilitating a stronger local presence and tailored experiences. | Legitimate Interest |
+| To facilitate, sponsor and offer certain events, contests and promotions. | Legitimate Interest, Consent (to the extent applicable) |
+| To create aggregated data, inferred non-personal data or anonymized or pseudonymized data (de-identified data), which we or our business partners may use to provide and improve our respective services, conduct research, or for any other purpose. | Legitimate Interest, Performance of a Contract, Compliance with legal obligations |
+
+If you reside or are using the Services in a territory governed by privacy laws under which “Consent” is the only or most appropriate lawful basis for the processing of personal data as described herein (in general, or specifically with respect to the types of personal data you expect or elect to process or have processed by us or via the Services, or due to nature of such processing), your acceptance of this Privacy Notice will be deemed as your consent to the processing of your personal data for all purposes detailed in this Privacy Notice, unless applicable law requires a different form of consent. If you wish to revoke such consent, please contact us at [privacy@wing.cloud](mailto:privacy@wing.cloud).
+
+## Data Storage and Transfer
+
+We and our authorized service providers (further detailed below) maintain, store and process personal data in the United States of America, Europe, Israel and other locations, as reasonably necessary for the proper performance and delivery of our Services, for our internal business purposes in the locations where Wing Cloud resides, or as may be required by law.
+
+While privacy laws may vary between jurisdictions, Wing Cloud is committed to protect personal data in accordance with this Privacy Notice and customary industry standards, and such appropriate lawful mechanisms and contractual terms requiring adequate data protection, regardless of any lesser legal requirements that may apply in the jurisdiction to which such data is transferred.
+
+Wing Cloud has offices in the United States and in Israel, the latter a jurisdiction which is considered by the European Commission, the Swiss Federal Data Protection and Information Commissioner (FDPIC), and the UK Secretary of State to have an adequate level of protection for personal data originating from the EEA, Switzerland and the UK, respectively. We transfer personal data from the EEA, Switzerland or the UK to Israel on this basis. For data transfers from the EEA, Switzerland or UK to countries that are not considered to be offering an adequate level of data protection, we and the relevant data exporters and importers have entered into updated Standard Contractual Clauses as approved by the European Commission, FDPIC and UK Information Commissioner’s Office (ICO).
+
+## How Long We Retain Your Personal Data
+
+We retain personal data for as long as we deem it as reasonably necessary in order to maintain and expand our relationship and provide you with our Services and offerings; in order to comply with our legal and contractual obligations; or to protect ourselves from any potential disputes (i.e., as required by laws applicable to log-keeping, records and bookkeeping, and in order to have proof and evidence concerning our relationship, should any legal issues arise following your discontinuance of use), all in accordance with our data retention policy and applicable laws.
+
+To determine the appropriate retention period for personal data, we consider the amount, nature, and sensitivity of the personal data, the potential risk of harm from unauthorized use or disclosure of your personal data, the purposes for which we process your personal data and the applicable legal requirements.
+
+Please note that except as required by applicable law or our specific agreements with you, we will not be obligated to retain your personal data for any particular period, and we are free to securely delete, anonymize or restrict access to it for any reason and at any time, with or without notice to you.
+
+If you have any questions about our data retention policy, please contact us by e-mail at [privacy@wing.cloud](mailto:privacy@wing.cloud).
+
+## How We Share or Otherwise Disclose Your Personal Data
+
+We disclose personal data in the following ways:
+
+- **Service Providers:** We engage selected third-party companies and individuals to perform services on our behalf or complementary to our own. Such service providers include hosting and server co-location services, communications and content delivery networks (CDNs), data security services, billing and payment processing services, fraud detection and prevention services, web and product analytics, e-mail distribution and monitoring services, session or activity recording services, remote access services, content transcription and analysis services, performance measurement, data optimization and marketing services, social and advertising networks, content and data enrichment providers, event production and hosting services, e-mail, voicemails, support, enablement and customer relation management systems, and our legal, financial, privacy and compliance advisors (collectively, “service providers”). Our service providers may have access to personal data, depending on each of their specific roles and purposes in facilitating and enhancing our Services, and may only use the data as determined in our agreements with them.
+- **Partnerships:** We may engage selected business and channel partners, resellers, distributors and providers of professional services related to our Services, which allow us to explore and pursue growth opportunities by facilitating a stronger local presence and tailored experiences for our customers, users and prospects. In such instances, we may share relevant contact, business and usage details with the respective partner, to allow them to engage with those entities and individuals for such purposes. If you directly engage with any of our partners, please note that any aspect of that engagement that is not directly related to the Services and directed by us is beyond the scope of Wing Cloud’s Terms of Service and this Privacy Notice, and may therefore be covered by the partner’s own terms and policies. Please review the privacy notices and terms of services of those businesses for more information about what each of those businesses does with your personal data.
+- **Service Integrations:** Our Services may allow or require connection or integration with third-party services, for example, GitHub. The provider of this connected or integrated third-party service may receive certain relevant data about or from your account on the Services, or share certain relevant data from your account on the third-party provider’s service with our Services, including personal data, depending on the nature and purpose of such integration. Note that we do not receive or store your passwords for any of these third-party services (but do typically require your API key in order to integrate with them).
+- **Event Sponsors:** If you attend an event or webinar organized by us, or download or access an asset on our sites related to such an event, webinar or other activity involving third-party sponsors or presenters, we may share your personal data with them. Depending on the applicable law, you may consent to such sharing via the registration form or by allowing your attendee badge to be scanned at a sponsor booth where relevant. In these circumstances, your personal data will be subject to the sponsors’ privacy statements. If you do not wish for your personal data to be shared, you may choose not to opt-in via the event/webinar registration, or elect to not have your badge scanned, or you can opt-out in accordance with Section 7 below.
+- **Sharing your Feedback or Recommendations:** If you submit a public review or feedback, note that we may (at our discretion) store and present your review on our sites and in our Services. If you wish to remove your public review, please contact us at [privacy@wing.cloud](mailto:privacy@wing.cloud).
+- **Business Customers:** Our Business Customers may have access to any personal data we process on their behalf in our capacity as a “processor” or a “service provider”, including personal data relating to their users, as it occurs in the context of their use of our Services.
+- **Legal Compliance:** We may disclose or allow government and law enforcement officials access to your personal data, in response to a subpoena, search warrant or court order (or similar requirement), or in compliance with applicable laws and regulations. Such disclosure or access may occur if we believe in good faith that: (a) we are legally compelled to do so; (b) disclosure is appropriate in connection with efforts to investigate, prevent, or take action regarding actual or suspected illegal activity, fraud, or other wrongdoing; or (c) such disclosure is required to protect our legitimate business interests, including the security or integrity of our products and services.
+- **Protecting Rights and Safety:** We may share personal data with others if we believe in good faith that this will help protect the rights, property or personal safety of Wing Cloud and our employees, any of our prospects, users or customers, or any members of the general public.
+- **Wing Cloud Subsidiaries and Affiliated Companies:** We may share personal data internally within our group, for the purposes described in this Privacy Notice. In addition, should Wing Cloud or any of its subsidiaries or affiliates undergo any change in control or ownership, including by means of merger, acquisition or purchase of substantially all or part of its assets, personal data may be shared with or transferred to the parties involved in such an event. We may disclose personal data to a third-party during negotiation of, in connection with or as an asset in such a corporate business transaction. Personal data may also be disclosed in the event of insolvency, bankruptcy or receivership.
+
+For the avoidance of doubt, Wing Cloud may share personal data in additional manners, pursuant to your explicit approval, or if we are legally obligated to do so, or if we have successfully rendered such data non-personal, non-identifiable and anonymous. We may transfer, share or otherwise use non-personal and non-identifiable data at our sole discretion and without the need for further approval.
+
+## Cookies and Data Collection Technologies and Do Not Track
+
+We and our service providers use “cookies”, anonymous identifiers, pixels, container tags and other technologies in order to provide our Services and ensure that they perform properly, to analyze our performance and marketing activities, for personalization purposes, for product development and improvements, and to personalize your experience.
+
+Cookies are packets of information sent to your web browser and then sent back by the browser each time it accesses the server that sent the cookie. Some cookies are removed when you close your browser tab or window. These are the “Session Cookies”. Some last for longer periods and are called “Persistent Cookies”. We use both types.
+
+We use Persistent Cookies to remember your log-in details and make it easier for you to log-in the next time you access the platform. We may use this type of cookies and Session Cookies for additional purposes, to facilitate the use of the Services’ features and tools. We may also use HTML5 local storage or Flash cookies for the above-mentioned purposes. These technologies differ from browser cookies in the amount and type of data they store, and how they store it.
+
+Whilst we do not change our practices in response to a “Do Not Track” signal in the HTTP header from a browser or mobile application, you can manage your cookies preferences, including whether or not to accept them and how to remove them, through your browser settings. Please bear in mind that disabling cookies may complicate or even prevent you from using the Services.
+
+We also use the web analytics tool Google Analytics. This tool helps us understand users’ behavior on our Services, including by tracking page content, and click/touch, movements, scrolls and keystroke activities. Further information about the privacy practices of our analytics service provider is available at: www.google.com/policies/privacy/partners. Further information about your option to opt-out of this analytics service is available at: [https://tools.google.com/dlpage/gaoptout](https://tools.google.com/dlpage/gaoptout).
+
+Please note that if you get a new computer, install a new browser, erase or otherwise alter your browser’s cookie file (including upgrading certain browsers), you may also clear the opt-out cookies installed once you opt-out, so an additional opt-out will be necessary to prevent additional tracking.
+
+For more information on our cookie and data collection technologies practices, you may also use the “Cookie settings” feature available in our Services depending on your location and activity on our Services, as applicable.
+
+## Communications
+
+We engage in service and promotional communications, through e-mail, phone, SMS and notifications.
+
+**Service Communications:** We may contact you with important information regarding our Services. For example, we may send you notifications (through any of the means available to us) of changes or updates to our Services, billing issues, log-in attempts or password reset notices, etc. Please note that you will not be able to opt out of receiving certain service communications which are integral to your use of some of our Services (like password resets or billing notices).
+
+**Promotional Communications:** We may also notify you about new features, additional offerings, events, special opportunities or any other information we think you will find valuable, as our customer, user or prospect, subject to any necessary collection of your consent as appropriate based on applicable laws. We may provide such notices through any of the contact means available to us (e.g., phone, mobile or e-mail), through the Services, or through our marketing campaigns on any other sites or platforms.
+
+If you do not wish to receive such promotional communications, you may notify us at any time by sending an e-mail to: [privacy@wing.cloud](mailto:privacy@wing.cloud) or by following the instructions contained in the promotional communications you receive.
+
+## Data Security
+
+We have implemented industry-standard physical, procedural and technical security measures, designed to secure your personal data, to minimize the risks of theft, damage, loss of information, or unauthorized access or use of information. However, we cannot guarantee that our Services will be immune from any wrongdoings, malfunctions, unlawful interceptions or access, or other kinds of abuse and misuse. If there is any unexpected activity or inaccurate information or if you have reason to believe that your information is no longer secure, or if you have any questions about our security, please contact us by e-mail at [privacy@wing.cloud](mailto:privacy@wing.cloud).
+
+## Your Data Subject Rights
+
+Individuals have rights concerning their personal data. Please contact us by e-mail at: [privacy@wing.cloud](mailto:privacy@wing.cloud) if you wish to exercise your privacy rights under any applicable law, including the EU or UK General Data Protection Regulation (GDPR), the California Consumer Privacy Act (CCPA), and others such as – to the extent applicable – the right to know/request access to (specific pieces of personal data collected; categories of personal data collected; categories of sources from whom the personal data was collected; purpose of collecting personal data; categories of third parties with whom we have shared personal data), to request correction or erasure of your personal data held with Wing Cloud, or to restrict or object to such personal data’s processing (including the right to direct us not to sell or share your personal data to third parties now or in the future, as described below), or to port such personal data, or the right to equal services and prices (e.g. freedom from discrimination) (each to the extent available to you under the laws which apply to you). Under some regulatory frameworks, such as the GDPR, you may also have the right to lodge a complaint with the relevant supervisory authority, as applicable. These rights are also subject to various exclusions and exceptions under applicable laws.
+
+We will not charge a fee to process or respond to your verifiable privacy request unless it is excessive, repetitive, or manifestly unfounded. If we determine that the request warrants a fee, we will tell you why we made that decision and provide you with a cost estimate before completing your request. Alternatively, we may refuse to comply with your request in such circumstances.
+
+To the extent applicable to you, you may also designate an authorized agent, in writing or through a power of attorney, to request to exercise your privacy rights on your behalf. The authorized agent may submit a request to exercise these rights by emailing us.
+
+Please note that when you or an authorized agent ask us to exercise any of your rights under this policy or applicable law, we may need to ask you to provide us with certain credentials to make sure that you are who you claim you are, to avoid disclosure to you of personal data related to others and to ask you to provide further information to better understand the nature and scope of data regarding which you request to exercise your rights. Such additional data may be then retained by us for legal, compliance and auditing purposes (e.g., as proof of the identity of the person submitting the request or proof of request fulfillment). We will not fulfill your request unless you have provided sufficient information that enables us to reasonably verify that you are the individual about whom we collected the personal data.
+
+Please also note that we may deny your request or we may retain certain elements of your personal data if it is necessary for us or our service providers. We will provide details of our reasoning to you in our correspondence on the matter.
+
+## Data Controller/Processor
+
+Certain data protection laws and regulations, such as the EU GDPR, UK GDPR, and CCPA, typically distinguish between two main roles for parties processing personal data: the “data controller” (or under the CCPA, “business”), who determines the purposes and means of processing; and the “data processor” (or under the CCPA, “service provider”), who processes the data on behalf of the data controller (or business). Below we explain how these roles apply to our Services, to the extent that such laws and regulations apply.
+
+Wing Cloud assumes the responsibilities of “data controller” (to the extent applicable under law) for the processing of all the personal data listed in Section 1 above as set forth in this Privacy Notice.
+
+However, when Wing Cloud processes personal data on behalf of its Business Customers, Wing Cloud will act as a “data processor” of such data and therefore process the data strictly in accordance with the relevant Business Customer’s reasonable instructions and as further stipulated in the Data Processing Addendum and other commercial agreements we may have with the Business Customer. As the data controllers of such personal data, our Business Customers are solely responsible for determining whether and how they wish to use our Services, and for complying with their obligations under applicable data protection laws and regulations, including handling data subject rights requests by their users and other individuals whose personal data they process through the Services.
+
+## Additional Notices & Contact Details
+
+**Updates and Amendments:** We may update and amend this Privacy Notice from time to time by posting an amended version on our Services. The amended version will be effective as of the date it is published. We will provide prior notice if we believe any substantial changes are involved via any of the communication means available to us or via the Services. After such notice period, all amendments shall be deemed accepted by you. In the event consent is required based on where you reside, you will be asked to consent prior to being allowed to access our Services subsequent to a Privacy Notice update/amendment.
+
+**External Links:** While our Services may contain links to other websites or services, we are not responsible for their privacy practices. We encourage you to pay attention when you leave our Services for the website or application of such third parties, and to read the privacy policies of each and every website and service you visit. This Privacy Notice applies only to our Services.
+
+**US State Laws Requirements:** This Privacy Notice describes the categories of personal information we may collect and the sources of such information (in Section 1 above), and our retention (Section 4) and deletion (Section 9) practices. We also included information about how we may process your information, which includes “business purposes” under the CCPA and similar US State Laws. If you would like to opt out of the “sale” or “sharing” (as such terms are defined under applicable U.S. State Laws including the CCPA) of your personal information, please contact us at privacy@wing.cloud. We may disclose personal information with third parties or allow them to collect personal information from our Services as described in Section 5 above, if those third parties are our Business Customers (in respect of users’ personal data processed on their behalf), or our authorized Service Providers or business partners who have agreed to our contractual limitations as to their retention, use, and disclosure of such personal data, or direct us to disclose your personal data to third parties. You may also designate an authorized agent, in writing or through a power of attorney, to request to exercise your privacy rights on your behalf. The authorized agent may submit a request to exercise these rights by emailing us at privacy@wing.cloud. Note that we will not discriminate against you by withholding our Services from you or providing a lower quality of service to you for requesting to exercise your rights under the law, to the extent possible.
+
+If you have any questions or would like to exercise your rights under any applicable US State Laws, you can contact us at privacy@wing.cloud.
+
+**Children:** Our Services are not designed to attract minors. We do not knowingly collect personal data from minors and do not wish to do so. If we learn that a person who is considered a minor according to applicable law is using the Services, we will attempt to prohibit and block such use and will make our best efforts to promptly delete any personal data stored with us with regard to such minor. If you believe that we might have any such data, please contact us by e-mail at [privacy@wing.cloud](mailto:privacy@wing.cloud).
+
+**Contacting Us:** If you have any comments or questions regarding our Privacy Notice, or if you have any concerns regarding your personal data held with us, please contact Wing Cloud at [privacy@wing.cloud](mailto:privacy@wing.cloud).
diff --git a/README.md b/README.md
index f7801ac32e2..1a26949ce74 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,58 @@
+
+
+
+<div align="center">
+  <img src="./apps/wing/logo/banner.gif" alt="Wing Banner" >
+</div>
+
 <h1 align="center">Welcome to the Wing Language! :wave:</h1>
 <p align="center">
-  <a href="https://www.winglang.io/learn/">Take a Tour</a>
-  ▪︎
-  <a href="https://www.winglang.io/docs/">Getting Started</a>
-  ▪︎
-  <a href="http://t.winglang.io/slack">Join Slack</a>
-  ▪︎
-  <a href="https://www.winglang.io/docs/category/faq">FAQ</a>
-  ▪︎
-  <a href="https://www.winglang.io/contributing/status#roadmap">Roadmap</a>
-  ▪︎
-  <a href="https://github.com/winglang/wing/issues">Issues</a>
-  ▪︎
-  <a href="https://github.com/winglang/wing/discussions">Discussions</a>
-  ▪︎
-  <a href="https://www.winglang.io/contributing/">Contribute</a>
+<a href="https://www.winglang.io/learn/">Take a Tour</a>
+▪︎
+<a href="https://www.winglang.io/docs/">Getting Started</a>
+▪︎
+<a href="http://t.winglang.io/discord">Join Discord</a>
+▪︎
+<a href="https://www.winglang.io/docs/category/faq">FAQ</a>
+▪︎
+<a href="https://www.winglang.io/contributing/status#roadmap">Roadmap</a>
+▪︎
+<a href="https://github.com/winglang/wing/issues">Issues</a>
+▪︎
+<a href="https://github.com/winglang/wing/discussions">Discussions</a>
+▪︎
+<a href="https://www.winglang.io/contributing/">Contribute</a>
+
 </p>
 
-**Winglang** is a new open-source programming language designed for the cloud (aka "*cloud-oriented*"). 
-Wing enables developers to build distributed systems that leverage cloud services as first-class citizens by combining infrastructure ***and*** application code in a safe and unified programming model (aka "*cloud-oriented*").
-Wing programs can be executed locally (*yes, no internet required*) using a fully-functional simulator, or deployed to any cloud provider (*yes, Wing programs are portable across providers*).
+**Winglang** is a new open-source programming language designed for the cloud (aka "_cloud-oriented_").
+Wing enables developers to build distributed systems that leverage cloud services as first-class citizens by combining infrastructure **_and_** application code in a safe and unified programming model (aka "_cloud-oriented_").
+Wing programs can be executed locally (_yes, no internet required_) using a fully-functional simulator, or deployed to any cloud provider (_yes, Wing programs are portable across providers_).
 
 The mission of Winglang is to bring back your creative flow and close the gap between imagination and creation.
 
-Developing for the cloud today requires mastering various layers of the cloud stack, IAM roles, networking, and numerous tools, along with finding creative ways to test and debug code. In addition, long deployment times hinder iteration cycles and take developers out of their creative flow. 
+Developing for the cloud today requires mastering various layers of the cloud stack, IAM roles, networking, and numerous tools, along with finding creative ways to test and debug code. In addition, long deployment times hinder iteration cycles and take developers out of their creative flow.
 
 Winglang addresses these pains by letting you work at a higher level of abstraction and allowing you to focus on business logic instead of cloud mechanics, only surfacing low-level details when it's needed.
 We also provide you with a set of tools that let you test your code locally, significantly faster than before.
 
-<p align="center">
-  <img src="./apps/wing/logo/demo.gif" alt="Wing Demo" height="360px">
-</p>
+<div align="center">
+  <img src="./apps/wing/logo/demo.gif" alt="Wing Demo" height="400px">
+</div>
 
-Wing is built by [Elad Ben-Israel](https://github.com/eladb), the guy behind the [AWS CDK](https://github.com/aws/aws-cdk), the gang at the [Wing Cloud team](https://www.wing.cloud/) and an amazing [community](https://t.winglang.io/slack) of contributors (also known as Wingnuts).
+Wing is built by [Elad Ben-Israel](https://github.com/eladb), the guy behind the [AWS CDK](https://github.com/aws/aws-cdk), the gang at the [Wing Cloud team](https://www.wing.cloud/) and an amazing [community](https://t.winglang.io/discord) of contributors (also known as Wingnuts).
 
 Click [here](https://www.youtube.com/watch?v=5_RhWwgGue0) to watch a short video introduction to the Wing language.
 
 ## Why do we think the cloud needs a programming language? 🤔
 
-Cloud applications are fundamentally different from applications that run on a single machine - 
+Cloud applications are fundamentally different from applications that run on a single machine -
 they are distributed systems that rely on cloud infrastructure to achieve their goals.
 
-In order to be able to express both infrastructure and application logic in a safe and unified programming model, 
-Winglang has two execution phases: *preflight* for infrastructure definitions and *inflight* for runtime code.
+In order to be able to express both infrastructure and application logic in a safe and unified programming model,
+Winglang has two execution phases: _preflight_ for infrastructure definitions and _inflight_ for runtime code.
 
-Preflight code is executed *during compilation* and produces the infrastructure configuration for your app (e.g. **Terraform**, **CloudFormation**, etc).
+Preflight code is executed _during compilation_ and produces the infrastructure configuration for your app (e.g. **Terraform**, **CloudFormation**, etc).
 Inflight code is compiled into **JavaScript** and executed within cloud compute platforms in Node.js environments.
 
 Let's look at a simple example:
@@ -62,14 +70,14 @@ queue.setConsumer(inflight (message) => {
 });
 ```
 
-`cloud.Queue`, `cloud.Counter` and `cloud.Bucket` are *preflight objects*.
-They represent cloud infrastructure resources. 
+`cloud.Queue`, `cloud.Counter` and `cloud.Bucket` are _preflight objects_.
+They represent cloud infrastructure resources.
 When compiled to a specific cloud provider, such as AWS, a Terraform file will be produced with the provider's implementation
-of these resources. The `queue.setConsumer()` method is a *preflight method* that configures the infrastructure to
-invoke a particular *inflight function* for each message in the queue.
+of these resources. The `queue.setConsumer()` method is a _preflight method_ that configures the infrastructure to
+invoke a particular _inflight function_ for each message in the queue.
 
 **Now comes the cool part:** the code that runs inside the inflight function interacts with the `counter` and the `bucket` objects
-through their *inflight methods* (`counter.inc()` and `bucket.put()`). These methods can only be
+through their _inflight methods_ (`counter.inc()` and `bucket.put()`). These methods can only be
 called from inflight scopes.
 
 ### Very cool, but what here cannot be done by a library or compiler extension?
@@ -82,16 +90,16 @@ You are welcome to read more about it [here](https://www.winglang.io/docs/faq/wh
 Wing was built from scratch to make it easy for building applications on any cloud.
 It includes an assembly of different features that serve that purpose:
 
-* [Cloud services](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-services) as first-class citizens, with [phase modifiers](https://www.winglang.io/contributing/rfcs/language-spec#13-phase-modifiers) for describing infrastructure and runtime code ([`preflight` and `inflight`](https://www.winglang.io/docs/concepts/inflights)). 
-* [Wing Cloud Library](https://www.winglang.io/docs/category/cloud-library) provides a standard set of resources that lets you write cloud portable code.
-* [Compiler plugins](https://www.winglang.io/docs/tools/compiler-plugins) that keep you in control by allowing you to customize the infrastructure definitions and run policy checks.
-* Use any resource in the Terraform ecosystem as first-class citizen in your app.
-* [JavaScript interoperability](https://www.winglang.io/contributing/rfcs/language-spec#5-interoperability).
-* Automatic generation of IAM policies and other cloud mechanics based on source code.
-* [Wing Console](https://www.winglang.io/docs/start-here/installation#wing-console) - a visual application-centric operations and management console, that lets you interact with...
-* A [simulator](https://www.winglang.io/docs/concepts/simulator) that can used for testing and debugging in milliseconds.
-* JSON as a [primitive data type](https://www.winglang.io/docs/language-reference#114-json-type) with schema validation support for each conversion to and from structs.
-* [Immutability by default](https://www.winglang.io/blog/2023/02/02/good-cognitive-friction#immutable-by-default), [implicit async code](https://www.winglang.io/contributing/rfcs/language-spec#113-asynchronous-model), and [safety from nulls and undefined](https://www.winglang.io/docs/language-reference#16-optionality).
+- [Cloud services](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-services) as first-class citizens, with [phase modifiers](https://www.winglang.io/contributing/rfcs/language-spec#13-phase-modifiers) for describing infrastructure and runtime code ([`preflight` and `inflight`](https://www.winglang.io/docs/concepts/inflights)).
+- [Wing Cloud Library](https://www.winglang.io/docs/category/cloud) provides a standard set of resources that lets you write cloud portable code.
+- [Custom platforms](https://www.winglang.io/docs/concepts/platforms) that keep you in control by allowing you to customize the infrastructure definitions and run policy checks.
+- Use any resource in the Terraform ecosystem as first-class citizen in your app.
+- [JavaScript interoperability](https://www.winglang.io/contributing/rfcs/language-spec#5-interoperability).
+- Automatic generation of IAM policies and other cloud mechanics based on source code.
+- [Wing Console](https://www.winglang.io/docs/start-here/installation#wing-console) - a visual application-centric operations and management console, that lets you interact with...
+- A [simulator](https://www.winglang.io/docs/concepts/simulator) that can used for testing and debugging in milliseconds.
+- JSON as a [primitive data type](https://www.winglang.io/docs/language-reference#114-json-type) with schema validation support for each conversion to and from structs.
+- [Immutability by default](https://www.winglang.io/blog/2023/02/02/good-cognitive-friction#immutable-by-default), [implicit async code](https://www.winglang.io/contributing/rfcs/language-spec#113-asynchronous-model), and [safety from nulls and undefined](https://www.winglang.io/docs/language-reference#16-optionality).
 
 For a more in-depth look at Wing's features and benefits, check out our [documentation](https://www.winglang.io/docs/).
 
@@ -114,13 +122,13 @@ It's a once-in-a-lifetime adventure into the Wing rabbit hole!
 
 Here are some questions we're commonly asked that are covered by our [FAQ](https://www.winglang.io/docs/category/faq):
 
-* [Who is behind this project?](https://www.winglang.io/docs/faq/who-is-behind-wing)
-* [Which clouds are supported by Wing?](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-clouds)
-* [Which provisioning engines are supported by Wing?](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-provisioning-engines)
+- [Who is behind this project?](https://www.winglang.io/docs/faq/who-is-behind-wing)
+- [Which clouds are supported by Wing?](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-clouds)
+- [Which provisioning engines are supported by Wing?](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-provisioning-engines)
 
 ## Community 💬
 
-Join our flock in the [Wing Slack](https://t.winglang.io/slack) community.
+Join our flock in the [Wing Discord](https://t.winglang.io/discord) community.
 We're here to help each other, answer questions, and share our cloud adventures.
 Alternatively, post any questions on [GitHub Discussions](https://github.com/winglang/wing/discussions).
 
@@ -140,9 +148,9 @@ We are incredibly grateful to our entire community for contributing bug fixes an
 
 ## License 📜
 
-Wing is licensed under the  [MIT License](./LICENSE.md).
+Wing is licensed under the [MIT License](./LICENSE.md).
 Contributions are made under our [contribution license](./CONTRIBUTION_LICENSE.md).
 
 Happy coding, and remember: the sky's the limit with Wing (yes, another pun)! 🌤️🚀
 
-[wing slack]: https://t.winglang.io/slack
+[wing discord]: https://t.winglang.io/discord
diff --git a/SECURITY.md b/SECURITY.md
index 631f7ff8eea..e474a827b29 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,3 +3,8 @@
 ## Reporting a Vulnerability
 
 To report a vulnerability, please email us at security@winglang.io
+
+
+### Owner
+
+For any questions regarding this document please contact @staycoolcall911
diff --git a/apps/jsii-docgen/.gitattributes b/apps/jsii-docgen/.gitattributes
index bc7ca563f01..dea333ed4d4 100644
--- a/apps/jsii-docgen/.gitattributes
+++ b/apps/jsii-docgen/.gitattributes
@@ -1,6 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen".
 
-*.snap linguist-generated
 /.eslintrc.json linguist-generated
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
diff --git a/apps/jsii-docgen/.gitignore b/apps/jsii-docgen/.gitignore
index 850eab149bb..853d6097a26 100644
--- a/apps/jsii-docgen/.gitignore
+++ b/apps/jsii-docgen/.gitignore
@@ -30,9 +30,6 @@ jspm_packages/
 .yarn-integrity
 .cache
 !/.projenrc.js
-/test-reports/
-junit.xml
-/coverage/
 !/.prettierignore
 !/.prettierrc.json
 !/.npmrc
diff --git a/apps/jsii-docgen/.npmignore b/apps/jsii-docgen/.npmignore
index b89fe79aff5..b3a612af0f0 100644
--- a/apps/jsii-docgen/.npmignore
+++ b/apps/jsii-docgen/.npmignore
@@ -1,8 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen".
 /.projen/
-/test-reports/
-junit.xml
-/coverage/
 /test/
 /tsconfig.dev.json
 /src/
diff --git a/apps/jsii-docgen/.projen/deps.json b/apps/jsii-docgen/.projen/deps.json
index 79ac7266541..d6c94e81f49 100644
--- a/apps/jsii-docgen/.projen/deps.json
+++ b/apps/jsii-docgen/.projen/deps.json
@@ -4,10 +4,6 @@
       "name": "@types/fs-extra",
       "type": "build"
     },
-    {
-      "name": "@types/jest",
-      "type": "build"
-    },
     {
       "name": "@types/node",
       "version": "^16",
@@ -61,23 +57,9 @@
       "version": "^8",
       "type": "build"
     },
-    {
-      "name": "jest",
-      "type": "build"
-    },
-    {
-      "name": "jest-junit",
-      "version": "^15",
-      "type": "build"
-    },
     {
       "name": "jsii",
-      "version": "~5.0.0",
-      "type": "build"
-    },
-    {
-      "name": "npm-check-updates",
-      "version": "^16",
+      "version": "~5.3.11",
       "type": "build"
     },
     {
@@ -89,17 +71,22 @@
       "type": "build"
     },
     {
-      "name": "ts-jest",
+      "name": "tsx",
       "type": "build"
     },
     {
-      "name": "ts-node",
+      "name": "typescript",
       "type": "build"
     },
     {
-      "name": "typescript",
+      "name": "vitest",
       "type": "build"
     },
+    {
+      "name": "@types/node",
+      "version": "^20.11.0",
+      "type": "devenv"
+    },
     {
       "name": "@jsii/spec",
       "type": "runtime"
diff --git a/apps/jsii-docgen/.projen/tasks.json b/apps/jsii-docgen/.projen/tasks.json
index 7caa2c9e2ec..d46892a8b91 100644
--- a/apps/jsii-docgen/.projen/tasks.json
+++ b/apps/jsii-docgen/.projen/tasks.json
@@ -74,7 +74,7 @@
       "description": "Synthesize project files",
       "steps": [
         {
-          "exec": "ts-node --project tsconfig.dev.json .projenrc.ts"
+          "exec": "tsx --tsconfig tsconfig.dev.json .projenrc.ts"
         }
       ]
     },
@@ -125,10 +125,6 @@
       "name": "post-compile",
       "description": "Runs after successful compilation"
     },
-    "post-upgrade": {
-      "name": "post-upgrade",
-      "description": "Runs after upgrading dependencies"
-    },
     "pre-compile": {
       "name": "pre-compile",
       "description": "Prepare the project for compilation"
@@ -138,55 +134,7 @@
       "description": "Run tests",
       "steps": [
         {
-          "exec": "jest --passWithNoTests --all --updateSnapshot --coverageProvider=v8 --testTimeout=30000"
-        }
-      ]
-    },
-    "test:watch": {
-      "name": "test:watch",
-      "description": "Run jest in watch mode",
-      "steps": [
-        {
-          "exec": "jest --watch"
-        }
-      ]
-    },
-    "upgrade": {
-      "name": "upgrade",
-      "description": "upgrade dependencies",
-      "env": {
-        "CI": "0"
-      },
-      "steps": [
-        {
-          "exec": "pnpm update npm-check-updates"
-        },
-        {
-          "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='jsii'"
-        },
-        {
-          "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='jsii'"
-        },
-        {
-          "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='jsii'"
-        },
-        {
-          "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='jsii'"
-        },
-        {
-          "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='jsii'"
-        },
-        {
-          "exec": "pnpm i --no-frozen-lockfile"
-        },
-        {
-          "exec": "pnpm update @types/fs-extra @types/jest @types/node @types/semver @types/yargs @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-config-prettier eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint jest jest-junit jsii npm-check-updates prettier projen ts-jest ts-node typescript @jsii/spec case fs-extra glob glob-promise jsii-reflect semver yargs"
-        },
-        {
-          "exec": "pnpm exec projen"
-        },
-        {
-          "spawn": "post-upgrade"
+          "exec": "vitest run --update"
         }
       ]
     },
diff --git a/apps/jsii-docgen/.projenrc.ts b/apps/jsii-docgen/.projenrc.ts
index 2ee950d10f4..4b9cd2c79ba 100644
--- a/apps/jsii-docgen/.projenrc.ts
+++ b/apps/jsii-docgen/.projenrc.ts
@@ -1,4 +1,4 @@
-import { typescript, javascript } from "projen";
+import { typescript, javascript, DependencyType } from "projen";
 
 const project = new typescript.TypeScriptProject({
   name: "@winglang/jsii-docgen",
@@ -15,11 +15,12 @@ const project = new typescript.TypeScriptProject({
     "jsii-docgen": "bin/jsii-docgen",
   },
   devDeps: [
-    "jsii@~5.0.0",
+    "vitest",
+    "tsx",
+    "jsii@~5.3.11",
     "@types/fs-extra",
     "@types/semver",
     "@types/yargs@^16",
-    "@types/node",
     "constructs",
   ],
   deps: [
@@ -38,8 +39,15 @@ const project = new typescript.TypeScriptProject({
   prettier: true,
   release: false,
   package: false,
+  jest: false,
+  depsUpgrade: false,
 });
 
+project.defaultTask!.reset("tsx --tsconfig tsconfig.dev.json .projenrc.ts");
+project.deps.removeDependency("ts-node");
+
+project.testTask.reset("vitest run --update");
+
 const libraryFixtures = ["construct-library"];
 
 // compile the test fixtures with jsii
@@ -59,11 +67,6 @@ project.tasks.addEnvironment("NODE_OPTIONS", "--max-old-space-size=7168");
 // Avoid a non JSII compatible package (see https://github.com/projen/projen/issues/2264)
 // project.package.addPackageResolutions("@types/babel__traverse@7.18.2");
 
-// override default test timeout from 5s to 30s
-project.testTask.reset(
-  "jest --passWithNoTests --all --updateSnapshot --coverageProvider=v8 --testTimeout=30000"
-);
-
 project.addFields({
   volta: {
     extends: "../../package.json",
@@ -73,4 +76,6 @@ project.addFields({
 project.package.file.addDeletionOverride("pnpm");
 project.tryRemoveFile(".npmrc");
 
+project.deps.addDependency("@types/node@^20.11.0", DependencyType.DEVENV);
+
 project.synth();
diff --git a/apps/jsii-docgen/package.json b/apps/jsii-docgen/package.json
index 1cae345dfe9..4a477f16c6d 100644
--- a/apps/jsii-docgen/package.json
+++ b/apps/jsii-docgen/package.json
@@ -17,11 +17,8 @@
     "eslint": "pnpm exec projen eslint",
     "package": "pnpm exec projen package",
     "post-compile": "pnpm exec projen post-compile",
-    "post-upgrade": "pnpm exec projen post-upgrade",
     "pre-compile": "pnpm exec projen pre-compile",
     "test": "pnpm exec projen test",
-    "test:watch": "pnpm exec projen test:watch",
-    "upgrade": "pnpm exec projen upgrade",
     "watch": "pnpm exec projen watch",
     "projen": "pnpm exec projen"
   },
@@ -33,82 +30,38 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^27.5.2",
-    "@types/node": "^16",
+    "@types/node": "^20.11.0",
     "@types/semver": "^7.5.1",
     "@types/yargs": "^16",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
-    "constructs": "^10.2.70",
+    "constructs": "^10.3",
     "eslint": "^8",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^27.5.1",
-    "jest-junit": "^15",
-    "jsii": "~5.0.0",
-    "npm-check-updates": "^16",
+    "jsii": "~5.3.11",
     "prettier": "^2.8.8",
     "projen": "^0.71.163",
-    "ts-jest": "^27.1.5",
-    "ts-node": "^10.9.1",
-    "typescript": "~4.9.5"
+    "tsx": "^4.7.0",
+    "typescript": "~5.3.3",
+    "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@jsii/spec": "^1.88.0",
+    "@jsii/spec": "^1.94.0",
     "case": "^1.6.3",
     "fs-extra": "^10.1.0",
     "glob": "^8.1.0",
     "glob-promise": "^6.0.3",
-    "jsii-reflect": "^1.88.0",
+    "jsii-reflect": "^1.94.0",
     "semver": "^7.5.4",
     "yargs": "^16"
   },
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "version": "0.0.0",
-  "jest": {
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.ts?(x)",
-      "<rootDir>/(test|src)/**/*(*.)@(spec|test).ts?(x)"
-    ],
-    "clearMocks": true,
-    "collectCoverage": true,
-    "coverageReporters": [
-      "json",
-      "lcov",
-      "clover",
-      "cobertura",
-      "text"
-    ],
-    "coverageDirectory": "coverage",
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "watchPathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "reporters": [
-      "default",
-      [
-        "jest-junit",
-        {
-          "outputDirectory": "test-reports"
-        }
-      ]
-    ],
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "tsconfig": "tsconfig.dev.json"
-      }
-    }
-  },
   "types": "lib/index.d.ts",
   "volta": {
     "extends": "../../package.json"
diff --git a/apps/jsii-docgen/src/cli.ts b/apps/jsii-docgen/src/cli.ts
index 2f2514c596c..2c26427da47 100644
--- a/apps/jsii-docgen/src/cli.ts
+++ b/apps/jsii-docgen/src/cli.ts
@@ -58,5 +58,5 @@ export async function main() {
 
 main().catch((e) => {
   console.error(e);
-  process.exit(1);
+  process.exitCode = 1;
 });
diff --git a/apps/jsii-docgen/src/docgen/transpile/wing.ts b/apps/jsii-docgen/src/docgen/transpile/wing.ts
index d95a4f2dbc1..523a40aa278 100644
--- a/apps/jsii-docgen/src/docgen/transpile/wing.ts
+++ b/apps/jsii-docgen/src/docgen/transpile/wing.ts
@@ -71,10 +71,11 @@ const formatSignature = (
   name: string,
   inputs: string[],
   returns?: string,
-  isInflight?: boolean
+  isInflight?: boolean,
+  isOptionalReturn?: boolean
 ) => {
   return `${isInflight ? "inflight " : ""}${name}(${formatArguments(inputs)})${
-    returns ? ": " + returns : ""
+    returns ? ": " + `${returns}${isOptionalReturn ? "?" : ""}` : ""
   }`;
 };
 
@@ -207,9 +208,11 @@ export class WingTranspile extends transpile.TranspileBase {
       : formatInvocation(type, inputs, name);
 
     let returnType: transpile.TranspiledTypeReference | undefined;
+    let isReturnOptional: boolean = false;
     if (reflect.Initializer.isInitializer(callable)) {
       returnType = this.typeReference(callable.parentType.reference);
     } else if (reflect.Method.isMethod(callable)) {
+      isReturnOptional = callable.returns.optional;
       returnType = this.typeReference(callable.returns.type);
     }
     const returns = returnType?.toString(typeToString);
@@ -220,7 +223,13 @@ export class WingTranspile extends transpile.TranspileBase {
       import: formatImport(type),
       parameters,
       signatures: [
-        formatSignature(name, inputs, returns, isInflightMethod(callable.docs)),
+        formatSignature(
+          name,
+          inputs,
+          returns,
+          isInflightMethod(callable.docs),
+          isReturnOptional
+        ),
       ],
       invocations: [invocation],
       returnType,
diff --git a/apps/jsii-docgen/src/docgen/view/api-reference.ts b/apps/jsii-docgen/src/docgen/view/api-reference.ts
index 8a408a03597..7d578422fef 100644
--- a/apps/jsii-docgen/src/docgen/view/api-reference.ts
+++ b/apps/jsii-docgen/src/docgen/view/api-reference.ts
@@ -78,7 +78,7 @@ export class ApiReference {
     this.constructs = new Constructs(
       transpile,
       classes,
-      this.searchableInterfaces(interfaces)
+      this.searchableInterfaces([...assembly.allInterfaces])
     );
     this.classes = new Classes(transpile, classes);
     this.structs = new Structs(transpile, interfaces);
diff --git a/apps/jsii-docgen/src/docgen/view/wing-filters.ts b/apps/jsii-docgen/src/docgen/view/wing-filters.ts
index 4d70a58f217..d840ac66a0f 100644
--- a/apps/jsii-docgen/src/docgen/view/wing-filters.ts
+++ b/apps/jsii-docgen/src/docgen/view/wing-filters.ts
@@ -7,7 +7,6 @@ export const VISIBLE_SUBMODULES = [
   "redis",
   "http",
   "math",
-  "regex",
 ];
 export const HIDDEN_METHODS = ["toString", "toJSON", "onLift"];
 export const HIDDEN_PROPS = ["node", "display"];
diff --git a/apps/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json b/apps/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json
index 3a1dcdfc192..f82a836e72a 100644
--- a/apps/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json
+++ b/apps/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json
@@ -24,15 +24,6 @@
     "email": "dummy@example.com",
     "organization": false
   },
-  "dependencies": {
-    "@aws-cdk/aws-events": "^1.204.0",
-    "@aws-cdk/aws-iam": "^1.204.0",
-    "@aws-cdk/aws-kms": "^1.204.0",
-    "@aws-cdk/aws-s3": "^1.204.0",
-    "@aws-cdk/cloud-assembly-schema": "^1.204.0",
-    "@aws-cdk/core": "^1.204.0",
-    "constructs": "^3.4.344"
-  },
   "peerDependencies": {
     "@aws-cdk/aws-events": "^1.204.0",
     "@aws-cdk/aws-iam": "^1.204.0",
@@ -40,13 +31,20 @@
     "@aws-cdk/aws-s3": "^1.204.0",
     "@aws-cdk/cloud-assembly-schema": "^1.204.0",
     "@aws-cdk/core": "^1.204.0",
-    "constructs": "^3.3.69"
+    "constructs": "^3.4.344"
   },
   "devDependencies": {
-    "@types/node": "^18.17.13",
+    "@aws-cdk/aws-events": "1.204.0",
+    "@aws-cdk/aws-iam": "1.204.0",
+    "@aws-cdk/aws-kms": "1.204.0",
+    "@aws-cdk/aws-s3": "1.204.0",
+    "@aws-cdk/cloud-assembly-schema": "1.204.0",
+    "@aws-cdk/core": "1.204.0",
+    "constructs": "3.4.344",
+    "@types/node": "^20.11.0",
     "@types/prettier": "2.6.0",
-    "jsii": "~5.0.21",
-    "typescript": "^4.9.5"
+    "jsii": "~5.3.11",
+    "typescript": "^5.3.3"
   },
   "license": "Apache-2.0",
   "version": "0.0.0"
diff --git a/apps/jsii-docgen/test/__snapshots__/cli.test.ts.snap b/apps/jsii-docgen/test/__snapshots__/cli.test.ts.snap
index 89ae002f2e1..698d0bdd805 100644
--- a/apps/jsii-docgen/test/__snapshots__/cli.test.ts.snap
+++ b/apps/jsii-docgen/test/__snapshots__/cli.test.ts.snap
@@ -1,13 +1,13 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`construct-library 1`] = `
-"# API Reference <a name=\\"API Reference\\" id=\\"api-reference\\"></a>
+"# API Reference <a name="API Reference" id="api-reference"></a>
 
-## Resources <a name=\\"Resources\\" id=\\"Resources\\"></a>
+## Resources <a name="Resources" id="Resources"></a>
 
-### GoodbyeBucket <a name=\\"GoodbyeBucket\\" id=\\"construct-library.submod1.GoodbyeBucket\\"></a>
+### GoodbyeBucket <a name="GoodbyeBucket" id="construct-library.submod1.GoodbyeBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.submod1.GoodbyeBucket.Initializer"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -17,63 +17,63 @@ new submod1.GoodbyeBucket(scope: Construct, id: string, props?: BucketProps)
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope\\">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.id\\">id</a></code> | <code>string</code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.props\\">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.id">id</a></code> | <code>string</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.props">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
 
 ---
 
-##### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope\\"></a>
+##### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-##### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.id\\"></a>
+##### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-##### \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.props\\"></a>
+##### \`props\`<sup>Optional</sup> <a name="props" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.props"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketProps
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.applyRemovalPolicy\\">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addEventNotification\\">addEventNotification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification\\">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification\\">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addToResourcePolicy\\">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.arnForObjects\\">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantDelete\\">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPublicAccess\\">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPut\\">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPutAcl\\">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantRead\\">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantReadWrite\\">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantWrite\\">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject\\">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject\\">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.s3UrlForObject\\">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject\\">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.urlForObject\\">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject\\">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addCorsRule\\">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addInventory\\">addInventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addLifecycleRule\\">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addMetric\\">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.goodbye\\">goodbye</a></code> | *No description.* |
-
----
-
-##### \`applyRemovalPolicy\` <a name=\\"applyRemovalPolicy\\" id=\\"construct-library.submod1.GoodbyeBucket.applyRemovalPolicy\\"></a>
+| <code><a href="#construct-library.submod1.GoodbyeBucket.applyRemovalPolicy">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addEventNotification">addEventNotification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addToResourcePolicy">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.arnForObjects">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantDelete">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPublicAccess">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPut">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPutAcl">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantRead">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantReadWrite">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantWrite">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.s3UrlForObject">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.urlForObject">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addCorsRule">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addInventory">addInventory</a></code> | Add an inventory configuration. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addLifecycleRule">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addMetric">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.goodbye">goodbye</a></code> | *No description.* |
+
+---
+
+##### \`applyRemovalPolicy\` <a name="applyRemovalPolicy" id="construct-library.submod1.GoodbyeBucket.applyRemovalPolicy"></a>
 
 \`\`\`typescript
 public applyRemovalPolicy(policy: RemovalPolicy): void
@@ -89,13 +89,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.submod1.GoodbyeBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.submod1.GoodbyeBucket.applyRemovalPolicy.parameter.policy"></a>
 
 - *Type:* @aws-cdk/core.RemovalPolicy
 
 ---
 
-##### \`addEventNotification\` <a name=\\"addEventNotification\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification\\"></a>
+##### \`addEventNotification\` <a name="addEventNotification" id="construct-library.submod1.GoodbyeBucket.addEventNotification"></a>
 
 \`\`\`typescript
 public addEventNotification(event: EventType, dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -114,7 +114,7 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.event"></a>
 
 - *Type:* @aws-cdk/aws-s3.EventType
 
@@ -122,7 +122,7 @@ The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -130,7 +130,7 @@ The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -142,7 +142,7 @@ for details about allowed filter rules.
 
 ---
 
-##### \`addObjectCreatedNotification\` <a name=\\"addObjectCreatedNotification\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification\\"></a>
+##### \`addObjectCreatedNotification\` <a name="addObjectCreatedNotification" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification"></a>
 
 \`\`\`typescript
 public addObjectCreatedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -153,7 +153,7 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -161,7 +161,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -169,7 +169,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addObjectRemovedNotification\` <a name=\\"addObjectRemovedNotification\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification\\"></a>
+##### \`addObjectRemovedNotification\` <a name="addObjectRemovedNotification" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification"></a>
 
 \`\`\`typescript
 public addObjectRemovedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -180,7 +180,7 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -188,7 +188,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -196,7 +196,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"construct-library.submod1.GoodbyeBucket.addToResourcePolicy\\"></a>
+##### \`addToResourcePolicy\` <a name="addToResourcePolicy" id="construct-library.submod1.GoodbyeBucket.addToResourcePolicy"></a>
 
 \`\`\`typescript
 public addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult
@@ -210,7 +210,7 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.submod1.GoodbyeBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.submod1.GoodbyeBucket.addToResourcePolicy.parameter.permission"></a>
 
 - *Type:* @aws-cdk/aws-iam.PolicyStatement
 
@@ -218,7 +218,7 @@ the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arnForObjects\` <a name=\\"arnForObjects\\" id=\\"construct-library.submod1.GoodbyeBucket.arnForObjects\\"></a>
+##### \`arnForObjects\` <a name="arnForObjects" id="construct-library.submod1.GoodbyeBucket.arnForObjects"></a>
 
 \`\`\`typescript
 public arnForObjects(keyPattern: string): string
@@ -226,19 +226,19 @@ public arnForObjects(keyPattern: string): string
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`keyPattern\`<sup>Required</sup> <a name=\\"keyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`keyPattern\`<sup>Required</sup> <a name="keyPattern" id="construct-library.submod1.GoodbyeBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantDelete\` <a name=\\"grantDelete\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete\\"></a>
+##### \`grantDelete\` <a name="grantDelete" id="construct-library.submod1.GoodbyeBucket.grantDelete"></a>
 
 \`\`\`typescript
 public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -246,7 +246,7 @@ public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantDelete.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -254,7 +254,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -262,7 +262,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPublicAccess\` <a name=\\"grantPublicAccess\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess\\"></a>
+##### \`grantPublicAccess\` <a name="grantPublicAccess" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess"></a>
 
 \`\`\`typescript
 public grantPublicAccess(allowedActions: string, keyPrefix?: string): Grant
@@ -275,8 +275,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -289,25 +289,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowedActions\`<sup>Required</sup> <a name=\\"allowedActions\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowedActions\`<sup>Required</sup> <a name="allowedActions" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* string
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`keyPrefix\`<sup>Optional</sup> <a name=\\"keyPrefix\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`keyPrefix\`<sup>Optional</sup> <a name="keyPrefix" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* string
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grantPut\` <a name=\\"grantPut\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut\\"></a>
+##### \`grantPut\` <a name="grantPut" id="construct-library.submod1.GoodbyeBucket.grantPut"></a>
 
 \`\`\`typescript
 public grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -318,7 +318,7 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantPut.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -326,7 +326,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -334,7 +334,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPutAcl\` <a name=\\"grantPutAcl\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl\\"></a>
+##### \`grantPutAcl\` <a name="grantPutAcl" id="construct-library.submod1.GoodbyeBucket.grantPutAcl"></a>
 
 \`\`\`typescript
 public grantPutAcl(identity: IGrantable, objectsKeyPattern?: string): Grant
@@ -346,19 +346,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantRead\` <a name=\\"grantRead\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead\\"></a>
+##### \`grantRead\` <a name="grantRead" id="construct-library.submod1.GoodbyeBucket.grantRead"></a>
 
 \`\`\`typescript
 public grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -369,7 +369,7 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantRead.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -377,7 +377,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -385,7 +385,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantReadWrite\` <a name=\\"grantReadWrite\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite\\"></a>
+##### \`grantReadWrite\` <a name="grantReadWrite" id="construct-library.submod1.GoodbyeBucket.grantReadWrite"></a>
 
 \`\`\`typescript
 public grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -404,19 +404,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`grantWrite\` <a name=\\"grantWrite\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite\\"></a>
+##### \`grantWrite\` <a name="grantWrite" id="construct-library.submod1.GoodbyeBucket.grantWrite"></a>
 
 \`\`\`typescript
 public grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -435,19 +435,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent\\"></a>
+##### \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent"></a>
 
 \`\`\`typescript
 public onCloudTrailEvent(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -458,7 +458,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* string
 
@@ -466,7 +466,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -474,7 +474,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailPutObject\` <a name=\\"onCloudTrailPutObject\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject\\"></a>
+##### \`onCloudTrailPutObject\` <a name="onCloudTrailPutObject" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject"></a>
 
 \`\`\`typescript
 public onCloudTrailPutObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -489,7 +489,7 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -497,7 +497,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -505,7 +505,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailWriteObject\` <a name=\\"onCloudTrailWriteObject\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject\\"></a>
+##### \`onCloudTrailWriteObject\` <a name="onCloudTrailWriteObject" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`typescript
 public onCloudTrailWriteObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -523,7 +523,7 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -531,7 +531,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -539,7 +539,7 @@ Options for adding the rule.
 
 ---
 
-##### \`s3UrlForObject\` <a name=\\"s3UrlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.s3UrlForObject\\"></a>
+##### \`s3UrlForObject\` <a name="s3UrlForObject" id="construct-library.submod1.GoodbyeBucket.s3UrlForObject"></a>
 
 \`\`\`typescript
 public s3UrlForObject(key?: string): string
@@ -550,7 +550,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -561,7 +561,7 @@ bucket is returned.
 
 ---
 
-##### \`transferAccelerationUrlForObject\` <a name=\\"transferAccelerationUrlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transferAccelerationUrlForObject\` <a name="transferAccelerationUrlForObject" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`typescript
 public transferAccelerationUrlForObject(key?: string, options?: TransferAccelerationUrlOptions): string
@@ -575,7 +575,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -586,7 +586,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.TransferAccelerationUrlOptions
 
@@ -594,7 +594,7 @@ Options for generating URL.
 
 ---
 
-##### \`urlForObject\` <a name=\\"urlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.urlForObject\\"></a>
+##### \`urlForObject\` <a name="urlForObject" id="construct-library.submod1.GoodbyeBucket.urlForObject"></a>
 
 \`\`\`typescript
 public urlForObject(key?: string): string
@@ -606,7 +606,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.urlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -617,7 +617,7 @@ bucket is returned.
 
 ---
 
-##### \`virtualHostedUrlForObject\` <a name=\\"virtualHostedUrlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtualHostedUrlForObject\` <a name="virtualHostedUrlForObject" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`typescript
 public virtualHostedUrlForObject(key?: string, options?: VirtualHostedStyleUrlOptions): string
@@ -630,7 +630,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -641,7 +641,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.VirtualHostedStyleUrlOptions
 
@@ -649,7 +649,7 @@ Options for generating URL.
 
 ---
 
-##### \`addCorsRule\` <a name=\\"addCorsRule\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule\\"></a>
+##### \`addCorsRule\` <a name="addCorsRule" id="construct-library.submod1.GoodbyeBucket.addCorsRule"></a>
 
 \`\`\`typescript
 public addCorsRule(rule: CorsRule): void
@@ -657,7 +657,7 @@ public addCorsRule(rule: CorsRule): void
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.CorsRule
 
@@ -665,7 +665,7 @@ The CORS configuration rule to add.
 
 ---
 
-##### \`addInventory\` <a name=\\"addInventory\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory\\"></a>
+##### \`addInventory\` <a name="addInventory" id="construct-library.submod1.GoodbyeBucket.addInventory"></a>
 
 \`\`\`typescript
 public addInventory(inventory: Inventory): void
@@ -673,7 +673,7 @@ public addInventory(inventory: Inventory): void
 
 Add an inventory configuration.
 
-###### \`inventory\`<sup>Required</sup> <a name=\\"inventory\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.inventory\\"></a>
+###### \`inventory\`<sup>Required</sup> <a name="inventory" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.inventory"></a>
 
 - *Type:* @aws-cdk/aws-s3.Inventory
 
@@ -681,7 +681,7 @@ configuration to add.
 
 ---
 
-##### \`addLifecycleRule\` <a name=\\"addLifecycleRule\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule\\"></a>
+##### \`addLifecycleRule\` <a name="addLifecycleRule" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule"></a>
 
 \`\`\`typescript
 public addLifecycleRule(rule: LifecycleRule): void
@@ -689,7 +689,7 @@ public addLifecycleRule(rule: LifecycleRule): void
 
 Add a lifecycle rule to the bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.LifecycleRule
 
@@ -697,7 +697,7 @@ The rule to add.
 
 ---
 
-##### \`addMetric\` <a name=\\"addMetric\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric\\"></a>
+##### \`addMetric\` <a name="addMetric" id="construct-library.submod1.GoodbyeBucket.addMetric"></a>
 
 \`\`\`typescript
 public addMetric(metric: BucketMetrics): void
@@ -705,7 +705,7 @@ public addMetric(metric: BucketMetrics): void
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`metric\`<sup>Required</sup> <a name=\\"metric\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric.parameter.metric\\"></a>
+###### \`metric\`<sup>Required</sup> <a name="metric" id="construct-library.submod1.GoodbyeBucket.addMetric.parameter.metric"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketMetrics
 
@@ -713,25 +713,25 @@ The metric configuration to add.
 
 ---
 
-##### \`goodbye\` <a name=\\"goodbye\\" id=\\"construct-library.submod1.GoodbyeBucket.goodbye\\"></a>
+##### \`goodbye\` <a name="goodbye" id="construct-library.submod1.GoodbyeBucket.goodbye"></a>
 
 \`\`\`typescript
 public goodbye(): void
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.isResource\\">isResource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketArn\\">fromBucketArn</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketAttributes\\">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketName\\">fromBucketName</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.validateBucketName\\">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.isResource">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketArn">fromBucketArn</a></code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketAttributes">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketName">fromBucketName</a></code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.validateBucketName">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`isResource\` <a name=\\"isResource\\" id=\\"construct-library.submod1.GoodbyeBucket.isResource\\"></a>
+##### \`isResource\` <a name="isResource" id="construct-library.submod1.GoodbyeBucket.isResource"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -741,13 +741,13 @@ submod1.GoodbyeBucket.isResource(construct: IConstruct)
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.submod1.GoodbyeBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.submod1.GoodbyeBucket.isResource.parameter.construct"></a>
 
 - *Type:* @aws-cdk/core.IConstruct
 
 ---
 
-##### \`fromBucketArn\` <a name=\\"fromBucketArn\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn\\"></a>
+##### \`fromBucketArn\` <a name="fromBucketArn" id="construct-library.submod1.GoodbyeBucket.fromBucketArn"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -755,25 +755,25 @@ import { submod1 } from 'construct-library'
 submod1.GoodbyeBucket.fromBucketArn(scope: Construct, id: string, bucketArn: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* string
 
 ---
 
-##### \`fromBucketAttributes\` <a name=\\"fromBucketAttributes\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes\\"></a>
+##### \`fromBucketAttributes\` <a name="fromBucketAttributes" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -783,7 +783,7 @@ submod1.GoodbyeBucket.fromBucketAttributes(scope: Construct, id: string, attrs:
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
@@ -791,7 +791,7 @@ The parent creating construct (usually \`this\`).
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.id"></a>
 
 - *Type:* string
 
@@ -799,7 +799,7 @@ The construct's name.
 
 ---
 
-###### \`attrs\`<sup>Required</sup> <a name=\\"attrs\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.attrs\\"></a>
+###### \`attrs\`<sup>Required</sup> <a name="attrs" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.attrs"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketAttributes
 
@@ -810,7 +810,7 @@ Can be obtained from a call to
 
 ---
 
-##### \`fromBucketName\` <a name=\\"fromBucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName\\"></a>
+##### \`fromBucketName\` <a name="fromBucketName" id="construct-library.submod1.GoodbyeBucket.fromBucketName"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -818,25 +818,25 @@ import { submod1 } from 'construct-library'
 submod1.GoodbyeBucket.fromBucketName(scope: Construct, id: string, bucketName: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* string
 
 ---
 
-##### \`validateBucketName\` <a name=\\"validateBucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.validateBucketName\\"></a>
+##### \`validateBucketName\` <a name="validateBucketName" id="construct-library.submod1.GoodbyeBucket.validateBucketName"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -846,7 +846,7 @@ submod1.GoodbyeBucket.validateBucketName(physicalName: string)
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physicalName\`<sup>Required</sup> <a name=\\"physicalName\\" id=\\"construct-library.submod1.GoodbyeBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physicalName\`<sup>Required</sup> <a name="physicalName" id="construct-library.submod1.GoodbyeBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* string
 
@@ -854,27 +854,27 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.node\\">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.env\\">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.stack\\">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketArn\\">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketDomainName\\">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName\\">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketName\\">bucketName</a></code> | <code>string</code> | The name of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName\\">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName\\">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl\\">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.encryptionKey\\">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.isWebsite\\">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.policy\\">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.node">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.env">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.stack">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketArn">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketDomainName">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketName">bucketName</a></code> | <code>string</code> | The name of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.encryptionKey">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.isWebsite">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.policy">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.submod1.GoodbyeBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.submod1.GoodbyeBucket.property.node"></a>
 
 \`\`\`typescript
 public readonly node: ConstructNode;
@@ -886,7 +886,7 @@ The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.submod1.GoodbyeBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.submod1.GoodbyeBucket.property.env"></a>
 
 \`\`\`typescript
 public readonly env: ResourceEnvironment;
@@ -905,7 +905,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.submod1.GoodbyeBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.submod1.GoodbyeBucket.property.stack"></a>
 
 \`\`\`typescript
 public readonly stack: Stack;
@@ -917,7 +917,7 @@ The stack in which this resource is defined.
 
 ---
 
-##### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketArn\\"></a>
+##### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.submod1.GoodbyeBucket.property.bucketArn"></a>
 
 \`\`\`typescript
 public readonly bucketArn: string;
@@ -929,7 +929,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucketDomainName\`<sup>Required</sup> <a name=\\"bucketDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketDomainName\\"></a>
+##### \`bucketDomainName\`<sup>Required</sup> <a name="bucketDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDomainName: string;
@@ -941,7 +941,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name=\\"bucketDualStackDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name="bucketDualStackDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDualStackDomainName: string;
@@ -953,7 +953,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketName\\"></a>
+##### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.submod1.GoodbyeBucket.property.bucketName"></a>
 
 \`\`\`typescript
 public readonly bucketName: string;
@@ -965,7 +965,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name=\\"bucketRegionalDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name="bucketRegionalDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketRegionalDomainName: string;
@@ -977,7 +977,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name=\\"bucketWebsiteDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name="bucketWebsiteDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteDomainName: string;
@@ -989,7 +989,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name=\\"bucketWebsiteUrl\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name="bucketWebsiteUrl" id="construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteUrl: string;
@@ -1001,7 +1001,7 @@ The URL of the static website.
 
 ---
 
-##### \`encryptionKey\`<sup>Optional</sup> <a name=\\"encryptionKey\\" id=\\"construct-library.submod1.GoodbyeBucket.property.encryptionKey\\"></a>
+##### \`encryptionKey\`<sup>Optional</sup> <a name="encryptionKey" id="construct-library.submod1.GoodbyeBucket.property.encryptionKey"></a>
 
 \`\`\`typescript
 public readonly encryptionKey: IKey;
@@ -1013,7 +1013,7 @@ Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`isWebsite\`<sup>Optional</sup> <a name=\\"isWebsite\\" id=\\"construct-library.submod1.GoodbyeBucket.property.isWebsite\\"></a>
+##### \`isWebsite\`<sup>Optional</sup> <a name="isWebsite" id="construct-library.submod1.GoodbyeBucket.property.isWebsite"></a>
 
 \`\`\`typescript
 public readonly isWebsite: boolean;
@@ -1025,7 +1025,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.submod1.GoodbyeBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.submod1.GoodbyeBucket.property.policy"></a>
 
 \`\`\`typescript
 public readonly policy: BucketPolicy;
@@ -1041,9 +1041,9 @@ first call to addToResourcePolicy(s).
 ---
 
 
-### GreeterBucket <a name=\\"GreeterBucket\\" id=\\"construct-library.GreeterBucket\\"></a>
+### GreeterBucket <a name="GreeterBucket" id="construct-library.GreeterBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.GreeterBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.GreeterBucket.Initializer"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -1053,63 +1053,63 @@ new GreeterBucket(scope: Construct, id: string, props?: BucketProps)
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.scope\\">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.id\\">id</a></code> | <code>string</code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.props\\">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.id">id</a></code> | <code>string</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.props">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
 
 ---
 
-##### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.scope\\"></a>
+##### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.Initializer.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-##### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.id\\"></a>
+##### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.Initializer.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-##### \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.props\\"></a>
+##### \`props\`<sup>Optional</sup> <a name="props" id="construct-library.GreeterBucket.Initializer.parameter.props"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketProps
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.applyRemovalPolicy\\">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.addEventNotification\\">addEventNotification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectCreatedNotification\\">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectRemovedNotification\\">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addToResourcePolicy\\">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#construct-library.GreeterBucket.arnForObjects\\">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantDelete\\">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPublicAccess\\">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPut\\">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPutAcl\\">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantRead\\">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantReadWrite\\">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantWrite\\">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailPutObject\\">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailWriteObject\\">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#construct-library.GreeterBucket.s3UrlForObject\\">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.transferAccelerationUrlForObject\\">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#construct-library.GreeterBucket.urlForObject\\">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.virtualHostedUrlForObject\\">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.addCorsRule\\">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addInventory\\">addInventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#construct-library.GreeterBucket.addLifecycleRule\\">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addMetric\\">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.greet\\">greet</a></code> | *No description.* |
-
----
-
-##### \`applyRemovalPolicy\` <a name=\\"applyRemovalPolicy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy\\"></a>
+| <code><a href="#construct-library.GreeterBucket.applyRemovalPolicy">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#construct-library.GreeterBucket.addEventNotification">addEventNotification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#construct-library.GreeterBucket.addObjectCreatedNotification">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addObjectRemovedNotification">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addToResourcePolicy">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#construct-library.GreeterBucket.arnForObjects">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#construct-library.GreeterBucket.grantDelete">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPublicAccess">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPut">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.grantPutAcl">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantRead">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantReadWrite">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantWrite">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailPutObject">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailWriteObject">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#construct-library.GreeterBucket.s3UrlForObject">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#construct-library.GreeterBucket.transferAccelerationUrlForObject">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#construct-library.GreeterBucket.urlForObject">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#construct-library.GreeterBucket.virtualHostedUrlForObject">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#construct-library.GreeterBucket.addCorsRule">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#construct-library.GreeterBucket.addInventory">addInventory</a></code> | Add an inventory configuration. |
+| <code><a href="#construct-library.GreeterBucket.addLifecycleRule">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addMetric">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.greet">greet</a></code> | *No description.* |
+
+---
+
+##### \`applyRemovalPolicy\` <a name="applyRemovalPolicy" id="construct-library.GreeterBucket.applyRemovalPolicy"></a>
 
 \`\`\`typescript
 public applyRemovalPolicy(policy: RemovalPolicy): void
@@ -1125,13 +1125,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy"></a>
 
 - *Type:* @aws-cdk/core.RemovalPolicy
 
 ---
 
-##### \`addEventNotification\` <a name=\\"addEventNotification\\" id=\\"construct-library.GreeterBucket.addEventNotification\\"></a>
+##### \`addEventNotification\` <a name="addEventNotification" id="construct-library.GreeterBucket.addEventNotification"></a>
 
 \`\`\`typescript
 public addEventNotification(event: EventType, dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -1150,7 +1150,7 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.GreeterBucket.addEventNotification.parameter.event"></a>
 
 - *Type:* @aws-cdk/aws-s3.EventType
 
@@ -1158,7 +1158,7 @@ The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addEventNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -1166,7 +1166,7 @@ The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addEventNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -1178,7 +1178,7 @@ for details about allowed filter rules.
 
 ---
 
-##### \`addObjectCreatedNotification\` <a name=\\"addObjectCreatedNotification\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification\\"></a>
+##### \`addObjectCreatedNotification\` <a name="addObjectCreatedNotification" id="construct-library.GreeterBucket.addObjectCreatedNotification"></a>
 
 \`\`\`typescript
 public addObjectCreatedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -1189,7 +1189,7 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -1197,7 +1197,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -1205,7 +1205,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addObjectRemovedNotification\` <a name=\\"addObjectRemovedNotification\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification\\"></a>
+##### \`addObjectRemovedNotification\` <a name="addObjectRemovedNotification" id="construct-library.GreeterBucket.addObjectRemovedNotification"></a>
 
 \`\`\`typescript
 public addObjectRemovedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -1216,7 +1216,7 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -1224,7 +1224,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -1232,7 +1232,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy\\"></a>
+##### \`addToResourcePolicy\` <a name="addToResourcePolicy" id="construct-library.GreeterBucket.addToResourcePolicy"></a>
 
 \`\`\`typescript
 public addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult
@@ -1246,7 +1246,7 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.GreeterBucket.addToResourcePolicy.parameter.permission"></a>
 
 - *Type:* @aws-cdk/aws-iam.PolicyStatement
 
@@ -1254,7 +1254,7 @@ the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arnForObjects\` <a name=\\"arnForObjects\\" id=\\"construct-library.GreeterBucket.arnForObjects\\"></a>
+##### \`arnForObjects\` <a name="arnForObjects" id="construct-library.GreeterBucket.arnForObjects"></a>
 
 \`\`\`typescript
 public arnForObjects(keyPattern: string): string
@@ -1262,19 +1262,19 @@ public arnForObjects(keyPattern: string): string
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`keyPattern\`<sup>Required</sup> <a name=\\"keyPattern\\" id=\\"construct-library.GreeterBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`keyPattern\`<sup>Required</sup> <a name="keyPattern" id="construct-library.GreeterBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantDelete\` <a name=\\"grantDelete\\" id=\\"construct-library.GreeterBucket.grantDelete\\"></a>
+##### \`grantDelete\` <a name="grantDelete" id="construct-library.GreeterBucket.grantDelete"></a>
 
 \`\`\`typescript
 public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1282,7 +1282,7 @@ public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantDelete.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -1290,7 +1290,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1298,7 +1298,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPublicAccess\` <a name=\\"grantPublicAccess\\" id=\\"construct-library.GreeterBucket.grantPublicAccess\\"></a>
+##### \`grantPublicAccess\` <a name="grantPublicAccess" id="construct-library.GreeterBucket.grantPublicAccess"></a>
 
 \`\`\`typescript
 public grantPublicAccess(allowedActions: string, keyPrefix?: string): Grant
@@ -1311,8 +1311,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -1325,25 +1325,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowedActions\`<sup>Required</sup> <a name=\\"allowedActions\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowedActions\`<sup>Required</sup> <a name="allowedActions" id="construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* string
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`keyPrefix\`<sup>Optional</sup> <a name=\\"keyPrefix\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`keyPrefix\`<sup>Optional</sup> <a name="keyPrefix" id="construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* string
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grantPut\` <a name=\\"grantPut\\" id=\\"construct-library.GreeterBucket.grantPut\\"></a>
+##### \`grantPut\` <a name="grantPut" id="construct-library.GreeterBucket.grantPut"></a>
 
 \`\`\`typescript
 public grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1354,7 +1354,7 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPut.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -1362,7 +1362,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1370,7 +1370,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPutAcl\` <a name=\\"grantPutAcl\\" id=\\"construct-library.GreeterBucket.grantPutAcl\\"></a>
+##### \`grantPutAcl\` <a name="grantPutAcl" id="construct-library.GreeterBucket.grantPutAcl"></a>
 
 \`\`\`typescript
 public grantPutAcl(identity: IGrantable, objectsKeyPattern?: string): Grant
@@ -1382,19 +1382,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPutAcl.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantRead\` <a name=\\"grantRead\\" id=\\"construct-library.GreeterBucket.grantRead\\"></a>
+##### \`grantRead\` <a name="grantRead" id="construct-library.GreeterBucket.grantRead"></a>
 
 \`\`\`typescript
 public grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1405,7 +1405,7 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantRead.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -1413,7 +1413,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1421,7 +1421,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantReadWrite\` <a name=\\"grantReadWrite\\" id=\\"construct-library.GreeterBucket.grantReadWrite\\"></a>
+##### \`grantReadWrite\` <a name="grantReadWrite" id="construct-library.GreeterBucket.grantReadWrite"></a>
 
 \`\`\`typescript
 public grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1440,19 +1440,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantReadWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`grantWrite\` <a name=\\"grantWrite\\" id=\\"construct-library.GreeterBucket.grantWrite\\"></a>
+##### \`grantWrite\` <a name="grantWrite" id="construct-library.GreeterBucket.grantWrite"></a>
 
 \`\`\`typescript
 public grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1471,19 +1471,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent\\"></a>
+##### \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="construct-library.GreeterBucket.onCloudTrailEvent"></a>
 
 \`\`\`typescript
 public onCloudTrailEvent(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -1494,7 +1494,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* string
 
@@ -1502,7 +1502,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -1510,7 +1510,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailPutObject\` <a name=\\"onCloudTrailPutObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject\\"></a>
+##### \`onCloudTrailPutObject\` <a name="onCloudTrailPutObject" id="construct-library.GreeterBucket.onCloudTrailPutObject"></a>
 
 \`\`\`typescript
 public onCloudTrailPutObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -1525,7 +1525,7 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -1533,7 +1533,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -1541,7 +1541,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailWriteObject\` <a name=\\"onCloudTrailWriteObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject\\"></a>
+##### \`onCloudTrailWriteObject\` <a name="onCloudTrailWriteObject" id="construct-library.GreeterBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`typescript
 public onCloudTrailWriteObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -1559,7 +1559,7 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -1567,7 +1567,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -1575,7 +1575,7 @@ Options for adding the rule.
 
 ---
 
-##### \`s3UrlForObject\` <a name=\\"s3UrlForObject\\" id=\\"construct-library.GreeterBucket.s3UrlForObject\\"></a>
+##### \`s3UrlForObject\` <a name="s3UrlForObject" id="construct-library.GreeterBucket.s3UrlForObject"></a>
 
 \`\`\`typescript
 public s3UrlForObject(key?: string): string
@@ -1586,7 +1586,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -1597,7 +1597,7 @@ bucket is returned.
 
 ---
 
-##### \`transferAccelerationUrlForObject\` <a name=\\"transferAccelerationUrlForObject\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transferAccelerationUrlForObject\` <a name="transferAccelerationUrlForObject" id="construct-library.GreeterBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`typescript
 public transferAccelerationUrlForObject(key?: string, options?: TransferAccelerationUrlOptions): string
@@ -1611,7 +1611,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -1622,7 +1622,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.TransferAccelerationUrlOptions
 
@@ -1630,7 +1630,7 @@ Options for generating URL.
 
 ---
 
-##### \`urlForObject\` <a name=\\"urlForObject\\" id=\\"construct-library.GreeterBucket.urlForObject\\"></a>
+##### \`urlForObject\` <a name="urlForObject" id="construct-library.GreeterBucket.urlForObject"></a>
 
 \`\`\`typescript
 public urlForObject(key?: string): string
@@ -1642,7 +1642,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.urlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -1653,7 +1653,7 @@ bucket is returned.
 
 ---
 
-##### \`virtualHostedUrlForObject\` <a name=\\"virtualHostedUrlForObject\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtualHostedUrlForObject\` <a name="virtualHostedUrlForObject" id="construct-library.GreeterBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`typescript
 public virtualHostedUrlForObject(key?: string, options?: VirtualHostedStyleUrlOptions): string
@@ -1666,7 +1666,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -1677,7 +1677,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.VirtualHostedStyleUrlOptions
 
@@ -1685,7 +1685,7 @@ Options for generating URL.
 
 ---
 
-##### \`addCorsRule\` <a name=\\"addCorsRule\\" id=\\"construct-library.GreeterBucket.addCorsRule\\"></a>
+##### \`addCorsRule\` <a name="addCorsRule" id="construct-library.GreeterBucket.addCorsRule"></a>
 
 \`\`\`typescript
 public addCorsRule(rule: CorsRule): void
@@ -1693,7 +1693,7 @@ public addCorsRule(rule: CorsRule): void
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addCorsRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.CorsRule
 
@@ -1701,7 +1701,7 @@ The CORS configuration rule to add.
 
 ---
 
-##### \`addInventory\` <a name=\\"addInventory\\" id=\\"construct-library.GreeterBucket.addInventory\\"></a>
+##### \`addInventory\` <a name="addInventory" id="construct-library.GreeterBucket.addInventory"></a>
 
 \`\`\`typescript
 public addInventory(inventory: Inventory): void
@@ -1709,7 +1709,7 @@ public addInventory(inventory: Inventory): void
 
 Add an inventory configuration.
 
-###### \`inventory\`<sup>Required</sup> <a name=\\"inventory\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.inventory\\"></a>
+###### \`inventory\`<sup>Required</sup> <a name="inventory" id="construct-library.GreeterBucket.addInventory.parameter.inventory"></a>
 
 - *Type:* @aws-cdk/aws-s3.Inventory
 
@@ -1717,7 +1717,7 @@ configuration to add.
 
 ---
 
-##### \`addLifecycleRule\` <a name=\\"addLifecycleRule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule\\"></a>
+##### \`addLifecycleRule\` <a name="addLifecycleRule" id="construct-library.GreeterBucket.addLifecycleRule"></a>
 
 \`\`\`typescript
 public addLifecycleRule(rule: LifecycleRule): void
@@ -1725,7 +1725,7 @@ public addLifecycleRule(rule: LifecycleRule): void
 
 Add a lifecycle rule to the bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addLifecycleRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.LifecycleRule
 
@@ -1733,7 +1733,7 @@ The rule to add.
 
 ---
 
-##### \`addMetric\` <a name=\\"addMetric\\" id=\\"construct-library.GreeterBucket.addMetric\\"></a>
+##### \`addMetric\` <a name="addMetric" id="construct-library.GreeterBucket.addMetric"></a>
 
 \`\`\`typescript
 public addMetric(metric: BucketMetrics): void
@@ -1741,7 +1741,7 @@ public addMetric(metric: BucketMetrics): void
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`metric\`<sup>Required</sup> <a name=\\"metric\\" id=\\"construct-library.GreeterBucket.addMetric.parameter.metric\\"></a>
+###### \`metric\`<sup>Required</sup> <a name="metric" id="construct-library.GreeterBucket.addMetric.parameter.metric"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketMetrics
 
@@ -1749,25 +1749,25 @@ The metric configuration to add.
 
 ---
 
-##### \`greet\` <a name=\\"greet\\" id=\\"construct-library.GreeterBucket.greet\\"></a>
+##### \`greet\` <a name="greet" id="construct-library.GreeterBucket.greet"></a>
 
 \`\`\`typescript
 public greet(): void
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.isResource\\">isResource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketArn\\">fromBucketArn</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketAttributes\\">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketName\\">fromBucketName</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.validateBucketName\\">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#construct-library.GreeterBucket.isResource">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketArn">fromBucketArn</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.fromBucketAttributes">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketName">fromBucketName</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.validateBucketName">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`isResource\` <a name=\\"isResource\\" id=\\"construct-library.GreeterBucket.isResource\\"></a>
+##### \`isResource\` <a name="isResource" id="construct-library.GreeterBucket.isResource"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -1777,13 +1777,13 @@ GreeterBucket.isResource(construct: IConstruct)
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.GreeterBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.GreeterBucket.isResource.parameter.construct"></a>
 
 - *Type:* @aws-cdk/core.IConstruct
 
 ---
 
-##### \`fromBucketArn\` <a name=\\"fromBucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn\\"></a>
+##### \`fromBucketArn\` <a name="fromBucketArn" id="construct-library.GreeterBucket.fromBucketArn"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -1791,25 +1791,25 @@ import { GreeterBucket } from 'construct-library'
 GreeterBucket.fromBucketArn(scope: Construct, id: string, bucketArn: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketArn.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketArn.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* string
 
 ---
 
-##### \`fromBucketAttributes\` <a name=\\"fromBucketAttributes\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes\\"></a>
+##### \`fromBucketAttributes\` <a name="fromBucketAttributes" id="construct-library.GreeterBucket.fromBucketAttributes"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -1819,7 +1819,7 @@ GreeterBucket.fromBucketAttributes(scope: Construct, id: string, attrs: BucketAt
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
@@ -1827,7 +1827,7 @@ The parent creating construct (usually \`this\`).
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.id"></a>
 
 - *Type:* string
 
@@ -1835,7 +1835,7 @@ The construct's name.
 
 ---
 
-###### \`attrs\`<sup>Required</sup> <a name=\\"attrs\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs\\"></a>
+###### \`attrs\`<sup>Required</sup> <a name="attrs" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketAttributes
 
@@ -1846,7 +1846,7 @@ Can be obtained from a call to
 
 ---
 
-##### \`fromBucketName\` <a name=\\"fromBucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName\\"></a>
+##### \`fromBucketName\` <a name="fromBucketName" id="construct-library.GreeterBucket.fromBucketName"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -1854,25 +1854,25 @@ import { GreeterBucket } from 'construct-library'
 GreeterBucket.fromBucketName(scope: Construct, id: string, bucketName: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketName.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketName.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* string
 
 ---
 
-##### \`validateBucketName\` <a name=\\"validateBucketName\\" id=\\"construct-library.GreeterBucket.validateBucketName\\"></a>
+##### \`validateBucketName\` <a name="validateBucketName" id="construct-library.GreeterBucket.validateBucketName"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -1882,7 +1882,7 @@ GreeterBucket.validateBucketName(physicalName: string)
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physicalName\`<sup>Required</sup> <a name=\\"physicalName\\" id=\\"construct-library.GreeterBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physicalName\`<sup>Required</sup> <a name="physicalName" id="construct-library.GreeterBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* string
 
@@ -1890,27 +1890,27 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.property.node\\">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.env\\">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.stack\\">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketArn\\">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDomainName\\">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDualStackDomainName\\">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketName\\">bucketName</a></code> | <code>string</code> | The name of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketRegionalDomainName\\">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteDomainName\\">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteUrl\\">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.encryptionKey\\">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.isWebsite\\">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.policy\\">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.node">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
+| <code><a href="#construct-library.GreeterBucket.property.env">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#construct-library.GreeterBucket.property.stack">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketArn">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDomainName">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDualStackDomainName">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketName">bucketName</a></code> | <code>string</code> | The name of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketRegionalDomainName">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteDomainName">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteUrl">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.encryptionKey">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.isWebsite">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#construct-library.GreeterBucket.property.policy">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.GreeterBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.GreeterBucket.property.node"></a>
 
 \`\`\`typescript
 public readonly node: ConstructNode;
@@ -1922,7 +1922,7 @@ The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.GreeterBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.GreeterBucket.property.env"></a>
 
 \`\`\`typescript
 public readonly env: ResourceEnvironment;
@@ -1941,7 +1941,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.GreeterBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.GreeterBucket.property.stack"></a>
 
 \`\`\`typescript
 public readonly stack: Stack;
@@ -1953,7 +1953,7 @@ The stack in which this resource is defined.
 
 ---
 
-##### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.property.bucketArn\\"></a>
+##### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.property.bucketArn"></a>
 
 \`\`\`typescript
 public readonly bucketArn: string;
@@ -1965,7 +1965,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucketDomainName\`<sup>Required</sup> <a name=\\"bucketDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDomainName\\"></a>
+##### \`bucketDomainName\`<sup>Required</sup> <a name="bucketDomainName" id="construct-library.GreeterBucket.property.bucketDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDomainName: string;
@@ -1977,7 +1977,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name=\\"bucketDualStackDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name="bucketDualStackDomainName" id="construct-library.GreeterBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDualStackDomainName: string;
@@ -1989,7 +1989,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.property.bucketName\\"></a>
+##### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.property.bucketName"></a>
 
 \`\`\`typescript
 public readonly bucketName: string;
@@ -2001,7 +2001,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name=\\"bucketRegionalDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name="bucketRegionalDomainName" id="construct-library.GreeterBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketRegionalDomainName: string;
@@ -2013,7 +2013,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name=\\"bucketWebsiteDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name="bucketWebsiteDomainName" id="construct-library.GreeterBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteDomainName: string;
@@ -2025,7 +2025,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name=\\"bucketWebsiteUrl\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name="bucketWebsiteUrl" id="construct-library.GreeterBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteUrl: string;
@@ -2037,7 +2037,7 @@ The URL of the static website.
 
 ---
 
-##### \`encryptionKey\`<sup>Optional</sup> <a name=\\"encryptionKey\\" id=\\"construct-library.GreeterBucket.property.encryptionKey\\"></a>
+##### \`encryptionKey\`<sup>Optional</sup> <a name="encryptionKey" id="construct-library.GreeterBucket.property.encryptionKey"></a>
 
 \`\`\`typescript
 public readonly encryptionKey: IKey;
@@ -2049,7 +2049,7 @@ Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`isWebsite\`<sup>Optional</sup> <a name=\\"isWebsite\\" id=\\"construct-library.GreeterBucket.property.isWebsite\\"></a>
+##### \`isWebsite\`<sup>Optional</sup> <a name="isWebsite" id="construct-library.GreeterBucket.property.isWebsite"></a>
 
 \`\`\`typescript
 public readonly isWebsite: boolean;
@@ -2061,7 +2061,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.GreeterBucket.property.policy"></a>
 
 \`\`\`typescript
 public readonly policy: BucketPolicy;
@@ -2084,13 +2084,13 @@ first call to addToResourcePolicy(s).
 `;
 
 exports[`specify language 1`] = `
-"# API Reference <a name=\\"API Reference\\" id=\\"api-reference\\"></a>
+"# API Reference <a name="API Reference" id="api-reference"></a>
 
-## Resources <a name=\\"Resources\\" id=\\"Resources\\"></a>
+## Resources <a name="Resources" id="Resources"></a>
 
-### GoodbyeBucket <a name=\\"GoodbyeBucket\\" id=\\"construct-library.submod1.GoodbyeBucket\\"></a>
+### GoodbyeBucket <a name="GoodbyeBucket" id="construct-library.submod1.GoodbyeBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.submod1.GoodbyeBucket.Initializer"></a>
 
 \`\`\`python
 from construct_library import submod1
@@ -2129,50 +2129,50 @@ submod1.GoodbyeBucket(
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope\\">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.id\\">id</a></code> | <code>str</code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.accessControl\\">access_control</a></code> | <code>aws_cdk.aws_s3.BucketAccessControl</code> | Specifies a canned ACL that grants predefined permissions to the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.autoDeleteObjects\\">auto_delete_objects</a></code> | <code>bool</code> | Whether all objects should be automatically deleted when the bucket is removed from the stack or when the stack is deleted. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.blockPublicAccess\\">block_public_access</a></code> | <code>aws_cdk.aws_s3.BlockPublicAccess</code> | The block public access configuration of this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketKeyEnabled\\">bucket_key_enabled</a></code> | <code>bool</code> | Specifies whether Amazon S3 should use an S3 Bucket Key with server-side encryption using KMS (SSE-KMS) for new objects in the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketName\\">bucket_name</a></code> | <code>str</code> | Physical name of this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.cors\\">cors</a></code> | <code>typing.List[aws_cdk.aws_s3.CorsRule]</code> | The CORS configuration of this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryption\\">encryption</a></code> | <code>aws_cdk.aws_s3.BucketEncryption</code> | The kind of server-side encryption to apply to this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryptionKey\\">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | External KMS key to use for bucket encryption. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.enforceSSL\\">enforce_ss_l</a></code> | <code>bool</code> | Enforces SSL for requests. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.eventBridgeEnabled\\">event_bridge_enabled</a></code> | <code>bool</code> | Whether this bucket should send notifications to Amazon EventBridge or not. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.intelligentTieringConfigurations\\">intelligent_tiering_configurations</a></code> | <code>typing.List[aws_cdk.aws_s3.IntelligentTieringConfiguration]</code> | Inteligent Tiering Configurations. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.inventories\\">inventories</a></code> | <code>typing.List[aws_cdk.aws_s3.Inventory]</code> | The inventory configuration of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.lifecycleRules\\">lifecycle_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.LifecycleRule]</code> | Rules that define how Amazon S3 manages objects during their lifetime. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.metrics\\">metrics</a></code> | <code>typing.List[aws_cdk.aws_s3.BucketMetrics]</code> | The metrics configuration of this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.notificationsHandlerRole\\">notifications_handler_role</a></code> | <code>aws_cdk.aws_iam.IRole</code> | The role to be used by the notifications handler. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.objectOwnership\\">object_ownership</a></code> | <code>aws_cdk.aws_s3.ObjectOwnership</code> | The objectOwnership of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.publicReadAccess\\">public_read_access</a></code> | <code>bool</code> | Grants public read access to all objects in the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.removalPolicy\\">removal_policy</a></code> | <code>aws_cdk.core.RemovalPolicy</code> | Policy to apply when the bucket is removed from this stack. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsBucket\\">server_access_logs_bucket</a></code> | <code>aws_cdk.aws_s3.IBucket</code> | Destination bucket for the server access logs. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsPrefix\\">server_access_logs_prefix</a></code> | <code>str</code> | Optional log file prefix to use for the bucket's access logs. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.transferAcceleration\\">transfer_acceleration</a></code> | <code>bool</code> | Whether this bucket should have transfer acceleration turned on or not. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.versioned\\">versioned</a></code> | <code>bool</code> | Whether this bucket should have versioning turned on or not. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteErrorDocument\\">website_error_document</a></code> | <code>str</code> | The name of the error document (e.g. \\"404.html\\") for the website. \`websiteIndexDocument\` must also be set if this is set. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteIndexDocument\\">website_index_document</a></code> | <code>str</code> | The name of the index document (e.g. \\"index.html\\") for the website. Enables static website hosting for this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRedirect\\">website_redirect</a></code> | <code>aws_cdk.aws_s3.RedirectTarget</code> | Specifies the redirect behavior of all requests to a website endpoint of a bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRoutingRules\\">website_routing_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.RoutingRule]</code> | Rules that define when a redirect is applied and the redirect behavior. |
-
----
-
-##### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope\\"></a>
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.id">id</a></code> | <code>str</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.accessControl">access_control</a></code> | <code>aws_cdk.aws_s3.BucketAccessControl</code> | Specifies a canned ACL that grants predefined permissions to the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.autoDeleteObjects">auto_delete_objects</a></code> | <code>bool</code> | Whether all objects should be automatically deleted when the bucket is removed from the stack or when the stack is deleted. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.blockPublicAccess">block_public_access</a></code> | <code>aws_cdk.aws_s3.BlockPublicAccess</code> | The block public access configuration of this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketKeyEnabled">bucket_key_enabled</a></code> | <code>bool</code> | Specifies whether Amazon S3 should use an S3 Bucket Key with server-side encryption using KMS (SSE-KMS) for new objects in the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketName">bucket_name</a></code> | <code>str</code> | Physical name of this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.cors">cors</a></code> | <code>typing.List[aws_cdk.aws_s3.CorsRule]</code> | The CORS configuration of this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryption">encryption</a></code> | <code>aws_cdk.aws_s3.BucketEncryption</code> | The kind of server-side encryption to apply to this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryptionKey">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | External KMS key to use for bucket encryption. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.enforceSSL">enforce_ss_l</a></code> | <code>bool</code> | Enforces SSL for requests. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.eventBridgeEnabled">event_bridge_enabled</a></code> | <code>bool</code> | Whether this bucket should send notifications to Amazon EventBridge or not. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.intelligentTieringConfigurations">intelligent_tiering_configurations</a></code> | <code>typing.List[aws_cdk.aws_s3.IntelligentTieringConfiguration]</code> | Inteligent Tiering Configurations. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.inventories">inventories</a></code> | <code>typing.List[aws_cdk.aws_s3.Inventory]</code> | The inventory configuration of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.lifecycleRules">lifecycle_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.LifecycleRule]</code> | Rules that define how Amazon S3 manages objects during their lifetime. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.metrics">metrics</a></code> | <code>typing.List[aws_cdk.aws_s3.BucketMetrics]</code> | The metrics configuration of this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.notificationsHandlerRole">notifications_handler_role</a></code> | <code>aws_cdk.aws_iam.IRole</code> | The role to be used by the notifications handler. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.objectOwnership">object_ownership</a></code> | <code>aws_cdk.aws_s3.ObjectOwnership</code> | The objectOwnership of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.publicReadAccess">public_read_access</a></code> | <code>bool</code> | Grants public read access to all objects in the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.removalPolicy">removal_policy</a></code> | <code>aws_cdk.core.RemovalPolicy</code> | Policy to apply when the bucket is removed from this stack. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsBucket">server_access_logs_bucket</a></code> | <code>aws_cdk.aws_s3.IBucket</code> | Destination bucket for the server access logs. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsPrefix">server_access_logs_prefix</a></code> | <code>str</code> | Optional log file prefix to use for the bucket's access logs. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.transferAcceleration">transfer_acceleration</a></code> | <code>bool</code> | Whether this bucket should have transfer acceleration turned on or not. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.versioned">versioned</a></code> | <code>bool</code> | Whether this bucket should have versioning turned on or not. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteErrorDocument">website_error_document</a></code> | <code>str</code> | The name of the error document (e.g. "404.html") for the website. \`websiteIndexDocument\` must also be set if this is set. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteIndexDocument">website_index_document</a></code> | <code>str</code> | The name of the index document (e.g. "index.html") for the website. Enables static website hosting for this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRedirect">website_redirect</a></code> | <code>aws_cdk.aws_s3.RedirectTarget</code> | Specifies the redirect behavior of all requests to a website endpoint of a bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRoutingRules">website_routing_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.RoutingRule]</code> | Rules that define when a redirect is applied and the redirect behavior. |
+
+---
+
+##### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-##### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.id\\"></a>
+##### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.id"></a>
 
 - *Type:* str
 
 ---
 
-##### \`access_control\`<sup>Optional</sup> <a name=\\"access_control\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.accessControl\\"></a>
+##### \`access_control\`<sup>Optional</sup> <a name="access_control" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.accessControl"></a>
 
 - *Type:* aws_cdk.aws_s3.BucketAccessControl
 - *Default:* BucketAccessControl.PRIVATE
@@ -2181,7 +2181,7 @@ Specifies a canned ACL that grants predefined permissions to the bucket.
 
 ---
 
-##### \`auto_delete_objects\`<sup>Optional</sup> <a name=\\"auto_delete_objects\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.autoDeleteObjects\\"></a>
+##### \`auto_delete_objects\`<sup>Optional</sup> <a name="auto_delete_objects" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.autoDeleteObjects"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -2197,7 +2197,7 @@ by deploying with CDK version \`1.126.0\` or later **before** switching this val
 
 ---
 
-##### \`block_public_access\`<sup>Optional</sup> <a name=\\"block_public_access\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.blockPublicAccess\\"></a>
+##### \`block_public_access\`<sup>Optional</sup> <a name="block_public_access" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.blockPublicAccess"></a>
 
 - *Type:* aws_cdk.aws_s3.BlockPublicAccess
 - *Default:* CloudFormation defaults will apply. New buckets and objects don't allow public access, but users can modify bucket policies or object permissions to allow public access
@@ -2208,7 +2208,7 @@ The block public access configuration of this bucket.
 
 ---
 
-##### \`bucket_key_enabled\`<sup>Optional</sup> <a name=\\"bucket_key_enabled\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketKeyEnabled\\"></a>
+##### \`bucket_key_enabled\`<sup>Optional</sup> <a name="bucket_key_enabled" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketKeyEnabled"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -2219,7 +2219,7 @@ Only relevant, when Encryption is set to {@link BucketEncryption.KMS}
 
 ---
 
-##### \`bucket_name\`<sup>Optional</sup> <a name=\\"bucket_name\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketName\\"></a>
+##### \`bucket_name\`<sup>Optional</sup> <a name="bucket_name" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.bucketName"></a>
 
 - *Type:* str
 - *Default:* Assigned by CloudFormation (recommended).
@@ -2228,7 +2228,7 @@ Physical name of this bucket.
 
 ---
 
-##### \`cors\`<sup>Optional</sup> <a name=\\"cors\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.cors\\"></a>
+##### \`cors\`<sup>Optional</sup> <a name="cors" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.cors"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.CorsRule]
 - *Default:* No CORS configuration.
@@ -2239,7 +2239,7 @@ The CORS configuration of this bucket.
 
 ---
 
-##### \`encryption\`<sup>Optional</sup> <a name=\\"encryption\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryption\\"></a>
+##### \`encryption\`<sup>Optional</sup> <a name="encryption" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryption"></a>
 
 - *Type:* aws_cdk.aws_s3.BucketEncryption
 - *Default:* \`Kms\` if \`encryptionKey\` is specified, or \`Unencrypted\` otherwise.
@@ -2251,20 +2251,20 @@ encryption key is not specified, a key will automatically be created.
 
 ---
 
-##### \`encryption_key\`<sup>Optional</sup> <a name=\\"encryption_key\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryptionKey\\"></a>
+##### \`encryption_key\`<sup>Optional</sup> <a name="encryption_key" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.encryptionKey"></a>
 
 - *Type:* aws_cdk.aws_kms.IKey
-- *Default:* If encryption is set to \\"Kms\\" and this property is undefined, a new KMS key will be created and associated with this bucket.
+- *Default:* If encryption is set to "Kms" and this property is undefined, a new KMS key will be created and associated with this bucket.
 
 External KMS key to use for bucket encryption.
 
-The 'encryption' property must be either not specified or set to \\"Kms\\".
-An error will be emitted if encryption is set to \\"Unencrypted\\" or
-\\"Managed\\".
+The 'encryption' property must be either not specified or set to "Kms".
+An error will be emitted if encryption is set to "Unencrypted" or
+"Managed".
 
 ---
 
-##### \`enforce_ss_l\`<sup>Optional</sup> <a name=\\"enforce_ss_l\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.enforceSSL\\"></a>
+##### \`enforce_ss_l\`<sup>Optional</sup> <a name="enforce_ss_l" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.enforceSSL"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -2277,7 +2277,7 @@ S3.5 of the AWS Foundational Security Best Practices Regarding S3.
 
 ---
 
-##### \`event_bridge_enabled\`<sup>Optional</sup> <a name=\\"event_bridge_enabled\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.eventBridgeEnabled\\"></a>
+##### \`event_bridge_enabled\`<sup>Optional</sup> <a name="event_bridge_enabled" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.eventBridgeEnabled"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -2286,7 +2286,7 @@ Whether this bucket should send notifications to Amazon EventBridge or not.
 
 ---
 
-##### \`intelligent_tiering_configurations\`<sup>Optional</sup> <a name=\\"intelligent_tiering_configurations\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.intelligentTieringConfigurations\\"></a>
+##### \`intelligent_tiering_configurations\`<sup>Optional</sup> <a name="intelligent_tiering_configurations" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.intelligentTieringConfigurations"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.IntelligentTieringConfiguration]
 - *Default:* No Intelligent Tiiering Configurations.
@@ -2297,7 +2297,7 @@ Inteligent Tiering Configurations.
 
 ---
 
-##### \`inventories\`<sup>Optional</sup> <a name=\\"inventories\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.inventories\\"></a>
+##### \`inventories\`<sup>Optional</sup> <a name="inventories" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.inventories"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.Inventory]
 - *Default:* No inventory configuration
@@ -2308,7 +2308,7 @@ The inventory configuration of the bucket.
 
 ---
 
-##### \`lifecycle_rules\`<sup>Optional</sup> <a name=\\"lifecycle_rules\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.lifecycleRules\\"></a>
+##### \`lifecycle_rules\`<sup>Optional</sup> <a name="lifecycle_rules" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.lifecycleRules"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.LifecycleRule]
 - *Default:* No lifecycle rules.
@@ -2317,7 +2317,7 @@ Rules that define how Amazon S3 manages objects during their lifetime.
 
 ---
 
-##### \`metrics\`<sup>Optional</sup> <a name=\\"metrics\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.metrics\\"></a>
+##### \`metrics\`<sup>Optional</sup> <a name="metrics" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.metrics"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.BucketMetrics]
 - *Default:* No metrics configuration.
@@ -2328,7 +2328,7 @@ The metrics configuration of this bucket.
 
 ---
 
-##### \`notifications_handler_role\`<sup>Optional</sup> <a name=\\"notifications_handler_role\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.notificationsHandlerRole\\"></a>
+##### \`notifications_handler_role\`<sup>Optional</sup> <a name="notifications_handler_role" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.notificationsHandlerRole"></a>
 
 - *Type:* aws_cdk.aws_iam.IRole
 - *Default:* a new role will be created.
@@ -2337,7 +2337,7 @@ The role to be used by the notifications handler.
 
 ---
 
-##### \`object_ownership\`<sup>Optional</sup> <a name=\\"object_ownership\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.objectOwnership\\"></a>
+##### \`object_ownership\`<sup>Optional</sup> <a name="object_ownership" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.objectOwnership"></a>
 
 - *Type:* aws_cdk.aws_s3.ObjectOwnership
 - *Default:* No ObjectOwnership configuration, uploading account will own the object.
@@ -2348,7 +2348,7 @@ The objectOwnership of the bucket.
 
 ---
 
-##### \`public_read_access\`<sup>Optional</sup> <a name=\\"public_read_access\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.publicReadAccess\\"></a>
+##### \`public_read_access\`<sup>Optional</sup> <a name="public_read_access" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.publicReadAccess"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -2359,7 +2359,7 @@ Similar to calling \`bucket.grantPublicAccess()\`
 
 ---
 
-##### \`removal_policy\`<sup>Optional</sup> <a name=\\"removal_policy\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.removalPolicy\\"></a>
+##### \`removal_policy\`<sup>Optional</sup> <a name="removal_policy" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.removalPolicy"></a>
 
 - *Type:* aws_cdk.core.RemovalPolicy
 - *Default:* The bucket will be orphaned.
@@ -2368,27 +2368,27 @@ Policy to apply when the bucket is removed from this stack.
 
 ---
 
-##### \`server_access_logs_bucket\`<sup>Optional</sup> <a name=\\"server_access_logs_bucket\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsBucket\\"></a>
+##### \`server_access_logs_bucket\`<sup>Optional</sup> <a name="server_access_logs_bucket" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsBucket"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucket
-- *Default:* If \\"serverAccessLogsPrefix\\" undefined - access logs disabled, otherwise - log to current bucket.
+- *Default:* If "serverAccessLogsPrefix" undefined - access logs disabled, otherwise - log to current bucket.
 
 Destination bucket for the server access logs.
 
 ---
 
-##### \`server_access_logs_prefix\`<sup>Optional</sup> <a name=\\"server_access_logs_prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsPrefix\\"></a>
+##### \`server_access_logs_prefix\`<sup>Optional</sup> <a name="server_access_logs_prefix" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.serverAccessLogsPrefix"></a>
 
 - *Type:* str
 - *Default:* No log file prefix
 
 Optional log file prefix to use for the bucket's access logs.
 
-If defined without \\"serverAccessLogsBucket\\", enables access logs to current bucket with this prefix.
+If defined without "serverAccessLogsBucket", enables access logs to current bucket with this prefix.
 
 ---
 
-##### \`transfer_acceleration\`<sup>Optional</sup> <a name=\\"transfer_acceleration\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.transferAcceleration\\"></a>
+##### \`transfer_acceleration\`<sup>Optional</sup> <a name="transfer_acceleration" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.transferAcceleration"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -2397,7 +2397,7 @@ Whether this bucket should have transfer acceleration turned on or not.
 
 ---
 
-##### \`versioned\`<sup>Optional</sup> <a name=\\"versioned\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.versioned\\"></a>
+##### \`versioned\`<sup>Optional</sup> <a name="versioned" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.versioned"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -2406,36 +2406,36 @@ Whether this bucket should have versioning turned on or not.
 
 ---
 
-##### \`website_error_document\`<sup>Optional</sup> <a name=\\"website_error_document\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteErrorDocument\\"></a>
+##### \`website_error_document\`<sup>Optional</sup> <a name="website_error_document" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteErrorDocument"></a>
 
 - *Type:* str
 - *Default:* No error document.
 
-The name of the error document (e.g. \\"404.html\\") for the website. \`websiteIndexDocument\` must also be set if this is set.
+The name of the error document (e.g. "404.html") for the website. \`websiteIndexDocument\` must also be set if this is set.
 
 ---
 
-##### \`website_index_document\`<sup>Optional</sup> <a name=\\"website_index_document\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteIndexDocument\\"></a>
+##### \`website_index_document\`<sup>Optional</sup> <a name="website_index_document" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteIndexDocument"></a>
 
 - *Type:* str
 - *Default:* No index document.
 
-The name of the index document (e.g. \\"index.html\\") for the website. Enables static website hosting for this bucket.
+The name of the index document (e.g. "index.html") for the website. Enables static website hosting for this bucket.
 
 ---
 
-##### \`website_redirect\`<sup>Optional</sup> <a name=\\"website_redirect\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRedirect\\"></a>
+##### \`website_redirect\`<sup>Optional</sup> <a name="website_redirect" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRedirect"></a>
 
 - *Type:* aws_cdk.aws_s3.RedirectTarget
 - *Default:* No redirection.
 
 Specifies the redirect behavior of all requests to a website endpoint of a bucket.
 
-If you specify this property, you can't specify \\"websiteIndexDocument\\", \\"websiteErrorDocument\\" nor , \\"websiteRoutingRules\\".
+If you specify this property, you can't specify "websiteIndexDocument", "websiteErrorDocument" nor , "websiteRoutingRules".
 
 ---
 
-##### \`website_routing_rules\`<sup>Optional</sup> <a name=\\"website_routing_rules\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRoutingRules\\"></a>
+##### \`website_routing_rules\`<sup>Optional</sup> <a name="website_routing_rules" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.websiteRoutingRules"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.RoutingRule]
 - *Default:* No redirection rules.
@@ -2444,39 +2444,39 @@ Rules that define when a redirect is applied and the redirect behavior.
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.applyRemovalPolicy\\">apply_removal_policy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addEventNotification\\">add_event_notification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification\\">add_object_created_notification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification\\">add_object_removed_notification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addToResourcePolicy\\">add_to_resource_policy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.arnForObjects\\">arn_for_objects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantDelete\\">grant_delete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPublicAccess\\">grant_public_access</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPut\\">grant_put</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPutAcl\\">grant_put_acl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantRead\\">grant_read</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantReadWrite\\">grant_read_write</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantWrite\\">grant_write</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailEvent\\">on_cloud_trail_event</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject\\">on_cloud_trail_put_object</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject\\">on_cloud_trail_write_object</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.s3UrlForObject\\">s3_url_for_object</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject\\">transfer_acceleration_url_for_object</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.urlForObject\\">url_for_object</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject\\">virtual_hosted_url_for_object</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addCorsRule\\">add_cors_rule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addInventory\\">add_inventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addLifecycleRule\\">add_lifecycle_rule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addMetric\\">add_metric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.goodbye\\">goodbye</a></code> | *No description.* |
-
----
-
-##### \`apply_removal_policy\` <a name=\\"apply_removal_policy\\" id=\\"construct-library.submod1.GoodbyeBucket.applyRemovalPolicy\\"></a>
+| <code><a href="#construct-library.submod1.GoodbyeBucket.applyRemovalPolicy">apply_removal_policy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addEventNotification">add_event_notification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification">add_object_created_notification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification">add_object_removed_notification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addToResourcePolicy">add_to_resource_policy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.arnForObjects">arn_for_objects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantDelete">grant_delete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPublicAccess">grant_public_access</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPut">grant_put</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPutAcl">grant_put_acl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantRead">grant_read</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantReadWrite">grant_read_write</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantWrite">grant_write</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailEvent">on_cloud_trail_event</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject">on_cloud_trail_put_object</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject">on_cloud_trail_write_object</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.s3UrlForObject">s3_url_for_object</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject">transfer_acceleration_url_for_object</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.urlForObject">url_for_object</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject">virtual_hosted_url_for_object</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addCorsRule">add_cors_rule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addInventory">add_inventory</a></code> | Add an inventory configuration. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addLifecycleRule">add_lifecycle_rule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addMetric">add_metric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.goodbye">goodbye</a></code> | *No description.* |
+
+---
+
+##### \`apply_removal_policy\` <a name="apply_removal_policy" id="construct-library.submod1.GoodbyeBucket.applyRemovalPolicy"></a>
 
 \`\`\`python
 def apply_removal_policy(
@@ -2494,13 +2494,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.submod1.GoodbyeBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.submod1.GoodbyeBucket.applyRemovalPolicy.parameter.policy"></a>
 
 - *Type:* aws_cdk.core.RemovalPolicy
 
 ---
 
-##### \`add_event_notification\` <a name=\\"add_event_notification\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification\\"></a>
+##### \`add_event_notification\` <a name="add_event_notification" id="construct-library.submod1.GoodbyeBucket.addEventNotification"></a>
 
 \`\`\`python
 def add_event_notification(
@@ -2524,7 +2524,7 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.event"></a>
 
 - *Type:* aws_cdk.aws_s3.EventType
 
@@ -2532,7 +2532,7 @@ The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.dest"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucketNotificationDestination
 
@@ -2540,7 +2540,7 @@ The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -2548,7 +2548,7 @@ S3 keys must have the specified prefix.
 
 ---
 
-###### \`suffix\`<sup>Optional</sup> <a name=\\"suffix\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.suffix\\"></a>
+###### \`suffix\`<sup>Optional</sup> <a name="suffix" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.suffix"></a>
 
 - *Type:* str
 
@@ -2556,7 +2556,7 @@ S3 keys must have the specified suffix.
 
 ---
 
-##### \`add_object_created_notification\` <a name=\\"add_object_created_notification\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification\\"></a>
+##### \`add_object_created_notification\` <a name="add_object_created_notification" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification"></a>
 
 \`\`\`python
 def add_object_created_notification(
@@ -2571,7 +2571,7 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.dest"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucketNotificationDestination
 
@@ -2579,7 +2579,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -2587,7 +2587,7 @@ S3 keys must have the specified prefix.
 
 ---
 
-###### \`suffix\`<sup>Optional</sup> <a name=\\"suffix\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.suffix\\"></a>
+###### \`suffix\`<sup>Optional</sup> <a name="suffix" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.suffix"></a>
 
 - *Type:* str
 
@@ -2595,7 +2595,7 @@ S3 keys must have the specified suffix.
 
 ---
 
-##### \`add_object_removed_notification\` <a name=\\"add_object_removed_notification\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification\\"></a>
+##### \`add_object_removed_notification\` <a name="add_object_removed_notification" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification"></a>
 
 \`\`\`python
 def add_object_removed_notification(
@@ -2610,7 +2610,7 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.dest"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucketNotificationDestination
 
@@ -2618,7 +2618,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -2626,7 +2626,7 @@ S3 keys must have the specified prefix.
 
 ---
 
-###### \`suffix\`<sup>Optional</sup> <a name=\\"suffix\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.suffix\\"></a>
+###### \`suffix\`<sup>Optional</sup> <a name="suffix" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.suffix"></a>
 
 - *Type:* str
 
@@ -2634,7 +2634,7 @@ S3 keys must have the specified suffix.
 
 ---
 
-##### \`add_to_resource_policy\` <a name=\\"add_to_resource_policy\\" id=\\"construct-library.submod1.GoodbyeBucket.addToResourcePolicy\\"></a>
+##### \`add_to_resource_policy\` <a name="add_to_resource_policy" id="construct-library.submod1.GoodbyeBucket.addToResourcePolicy"></a>
 
 \`\`\`python
 def add_to_resource_policy(
@@ -2650,7 +2650,7 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.submod1.GoodbyeBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.submod1.GoodbyeBucket.addToResourcePolicy.parameter.permission"></a>
 
 - *Type:* aws_cdk.aws_iam.PolicyStatement
 
@@ -2658,7 +2658,7 @@ the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arn_for_objects\` <a name=\\"arn_for_objects\\" id=\\"construct-library.submod1.GoodbyeBucket.arnForObjects\\"></a>
+##### \`arn_for_objects\` <a name="arn_for_objects" id="construct-library.submod1.GoodbyeBucket.arnForObjects"></a>
 
 \`\`\`python
 def arn_for_objects(
@@ -2668,19 +2668,19 @@ def arn_for_objects(
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`key_pattern\`<sup>Required</sup> <a name=\\"key_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`key_pattern\`<sup>Required</sup> <a name="key_pattern" id="construct-library.submod1.GoodbyeBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grant_delete\` <a name=\\"grant_delete\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete\\"></a>
+##### \`grant_delete\` <a name="grant_delete" id="construct-library.submod1.GoodbyeBucket.grantDelete"></a>
 
 \`\`\`python
 def grant_delete(
@@ -2691,7 +2691,7 @@ def grant_delete(
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantDelete.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -2699,7 +2699,7 @@ The principal.
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.submod1.GoodbyeBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
@@ -2707,7 +2707,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grant_public_access\` <a name=\\"grant_public_access\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess\\"></a>
+##### \`grant_public_access\` <a name="grant_public_access" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess"></a>
 
 \`\`\`python
 def grant_public_access(
@@ -2723,8 +2723,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -2737,25 +2737,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowed_actions\`<sup>Required</sup> <a name=\\"allowed_actions\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowed_actions\`<sup>Required</sup> <a name="allowed_actions" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* str
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`key_prefix\`<sup>Optional</sup> <a name=\\"key_prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`key_prefix\`<sup>Optional</sup> <a name="key_prefix" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* str
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grant_put\` <a name=\\"grant_put\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut\\"></a>
+##### \`grant_put\` <a name="grant_put" id="construct-library.submod1.GoodbyeBucket.grantPut"></a>
 
 \`\`\`python
 def grant_put(
@@ -2769,7 +2769,7 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantPut.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -2777,7 +2777,7 @@ The principal.
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.submod1.GoodbyeBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
@@ -2785,7 +2785,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grant_put_acl\` <a name=\\"grant_put_acl\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl\\"></a>
+##### \`grant_put_acl\` <a name="grant_put_acl" id="construct-library.submod1.GoodbyeBucket.grantPutAcl"></a>
 
 \`\`\`python
 def grant_put_acl(
@@ -2800,19 +2800,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grant_read\` <a name=\\"grant_read\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead\\"></a>
+##### \`grant_read\` <a name="grant_read" id="construct-library.submod1.GoodbyeBucket.grantRead"></a>
 
 \`\`\`python
 def grant_read(
@@ -2826,7 +2826,7 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantRead.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -2834,7 +2834,7 @@ The principal.
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.submod1.GoodbyeBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
@@ -2842,7 +2842,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grant_read_write\` <a name=\\"grant_read_write\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite\\"></a>
+##### \`grant_read_write\` <a name="grant_read_write" id="construct-library.submod1.GoodbyeBucket.grantReadWrite"></a>
 
 \`\`\`python
 def grant_read_write(
@@ -2864,19 +2864,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
 ---
 
-##### \`grant_write\` <a name=\\"grant_write\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite\\"></a>
+##### \`grant_write\` <a name="grant_write" id="construct-library.submod1.GoodbyeBucket.grantWrite"></a>
 
 \`\`\`python
 def grant_write(
@@ -2898,19 +2898,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantWrite.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.submod1.GoodbyeBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
 ---
 
-##### \`on_cloud_trail_event\` <a name=\\"on_cloud_trail_event\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent\\"></a>
+##### \`on_cloud_trail_event\` <a name="on_cloud_trail_event" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent"></a>
 
 \`\`\`python
 def on_cloud_trail_event(
@@ -2928,7 +2928,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* str
 
@@ -2936,7 +2936,7 @@ The id of the rule.
 
 ---
 
-###### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.description\\"></a>
+###### \`description\`<sup>Optional</sup> <a name="description" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -2945,7 +2945,7 @@ A description of the rule's purpose.
 
 ---
 
-###### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.eventPattern\\"></a>
+###### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -2960,7 +2960,7 @@ on top of that filtering.
 
 ---
 
-###### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.ruleName\\"></a>
+###### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -2969,7 +2969,7 @@ A name for the rule.
 
 ---
 
-###### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.target\\"></a>
+###### \`target\`<sup>Optional</sup> <a name="target" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -2978,7 +2978,7 @@ The target to register for the event.
 
 ---
 
-###### \`paths\`<sup>Optional</sup> <a name=\\"paths\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.paths\\"></a>
+###### \`paths\`<sup>Optional</sup> <a name="paths" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.paths"></a>
 
 - *Type:* typing.List[str]
 - *Default:* Watch changes to all objects
@@ -2987,7 +2987,7 @@ Only watch changes to these object paths.
 
 ---
 
-##### \`on_cloud_trail_put_object\` <a name=\\"on_cloud_trail_put_object\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject\\"></a>
+##### \`on_cloud_trail_put_object\` <a name="on_cloud_trail_put_object" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject"></a>
 
 \`\`\`python
 def on_cloud_trail_put_object(
@@ -3009,7 +3009,7 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.id"></a>
 
 - *Type:* str
 
@@ -3017,7 +3017,7 @@ The id of the rule.
 
 ---
 
-###### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.description\\"></a>
+###### \`description\`<sup>Optional</sup> <a name="description" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -3026,7 +3026,7 @@ A description of the rule's purpose.
 
 ---
 
-###### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.eventPattern\\"></a>
+###### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -3041,7 +3041,7 @@ on top of that filtering.
 
 ---
 
-###### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.ruleName\\"></a>
+###### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -3050,7 +3050,7 @@ A name for the rule.
 
 ---
 
-###### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.target\\"></a>
+###### \`target\`<sup>Optional</sup> <a name="target" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -3059,7 +3059,7 @@ The target to register for the event.
 
 ---
 
-###### \`paths\`<sup>Optional</sup> <a name=\\"paths\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.paths\\"></a>
+###### \`paths\`<sup>Optional</sup> <a name="paths" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.paths"></a>
 
 - *Type:* typing.List[str]
 - *Default:* Watch changes to all objects
@@ -3068,7 +3068,7 @@ Only watch changes to these object paths.
 
 ---
 
-##### \`on_cloud_trail_write_object\` <a name=\\"on_cloud_trail_write_object\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject\\"></a>
+##### \`on_cloud_trail_write_object\` <a name="on_cloud_trail_write_object" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`python
 def on_cloud_trail_write_object(
@@ -3093,7 +3093,7 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.id"></a>
 
 - *Type:* str
 
@@ -3101,7 +3101,7 @@ The id of the rule.
 
 ---
 
-###### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.description\\"></a>
+###### \`description\`<sup>Optional</sup> <a name="description" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -3110,7 +3110,7 @@ A description of the rule's purpose.
 
 ---
 
-###### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.eventPattern\\"></a>
+###### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -3125,7 +3125,7 @@ on top of that filtering.
 
 ---
 
-###### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.ruleName\\"></a>
+###### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -3134,7 +3134,7 @@ A name for the rule.
 
 ---
 
-###### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.target\\"></a>
+###### \`target\`<sup>Optional</sup> <a name="target" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -3143,7 +3143,7 @@ The target to register for the event.
 
 ---
 
-###### \`paths\`<sup>Optional</sup> <a name=\\"paths\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.paths\\"></a>
+###### \`paths\`<sup>Optional</sup> <a name="paths" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.paths"></a>
 
 - *Type:* typing.List[str]
 - *Default:* Watch changes to all objects
@@ -3152,7 +3152,7 @@ Only watch changes to these object paths.
 
 ---
 
-##### \`s3_url_for_object\` <a name=\\"s3_url_for_object\\" id=\\"construct-library.submod1.GoodbyeBucket.s3UrlForObject\\"></a>
+##### \`s3_url_for_object\` <a name="s3_url_for_object" id="construct-library.submod1.GoodbyeBucket.s3UrlForObject"></a>
 
 \`\`\`python
 def s3_url_for_object(
@@ -3165,7 +3165,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -3176,7 +3176,7 @@ bucket is returned.
 
 ---
 
-##### \`transfer_acceleration_url_for_object\` <a name=\\"transfer_acceleration_url_for_object\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transfer_acceleration_url_for_object\` <a name="transfer_acceleration_url_for_object" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`python
 def transfer_acceleration_url_for_object(
@@ -3193,7 +3193,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -3204,7 +3204,7 @@ bucket is returned.
 
 ---
 
-###### \`dual_stack\`<sup>Optional</sup> <a name=\\"dual_stack\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.dualStack\\"></a>
+###### \`dual_stack\`<sup>Optional</sup> <a name="dual_stack" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.dualStack"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -3213,7 +3213,7 @@ Dual-stack support to connect to the bucket over IPv6.
 
 ---
 
-##### \`url_for_object\` <a name=\\"url_for_object\\" id=\\"construct-library.submod1.GoodbyeBucket.urlForObject\\"></a>
+##### \`url_for_object\` <a name="url_for_object" id="construct-library.submod1.GoodbyeBucket.urlForObject"></a>
 
 \`\`\`python
 def url_for_object(
@@ -3227,7 +3227,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.urlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -3238,7 +3238,7 @@ bucket is returned.
 
 ---
 
-##### \`virtual_hosted_url_for_object\` <a name=\\"virtual_hosted_url_for_object\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtual_hosted_url_for_object\` <a name="virtual_hosted_url_for_object" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`python
 def virtual_hosted_url_for_object(
@@ -3254,7 +3254,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -3265,7 +3265,7 @@ bucket is returned.
 
 ---
 
-###### \`regional\`<sup>Optional</sup> <a name=\\"regional\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.regional\\"></a>
+###### \`regional\`<sup>Optional</sup> <a name="regional" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.regional"></a>
 
 - *Type:* bool
 - *Default:* true
@@ -3274,7 +3274,7 @@ Specifies the URL includes the region.
 
 ---
 
-##### \`add_cors_rule\` <a name=\\"add_cors_rule\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule\\"></a>
+##### \`add_cors_rule\` <a name="add_cors_rule" id="construct-library.submod1.GoodbyeBucket.addCorsRule"></a>
 
 \`\`\`python
 def add_cors_rule(
@@ -3289,7 +3289,7 @@ def add_cors_rule(
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`allowed_methods\`<sup>Required</sup> <a name=\\"allowed_methods\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.allowedMethods\\"></a>
+###### \`allowed_methods\`<sup>Required</sup> <a name="allowed_methods" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.allowedMethods"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.HttpMethods]
 
@@ -3297,7 +3297,7 @@ An HTTP method that you allow the origin to execute.
 
 ---
 
-###### \`allowed_origins\`<sup>Required</sup> <a name=\\"allowed_origins\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.allowedOrigins\\"></a>
+###### \`allowed_origins\`<sup>Required</sup> <a name="allowed_origins" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.allowedOrigins"></a>
 
 - *Type:* typing.List[str]
 
@@ -3305,7 +3305,7 @@ One or more origins you want customers to be able to access the bucket from.
 
 ---
 
-###### \`allowed_headers\`<sup>Optional</sup> <a name=\\"allowed_headers\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.allowedHeaders\\"></a>
+###### \`allowed_headers\`<sup>Optional</sup> <a name="allowed_headers" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.allowedHeaders"></a>
 
 - *Type:* typing.List[str]
 - *Default:* No headers allowed.
@@ -3314,7 +3314,7 @@ Headers that are specified in the Access-Control-Request-Headers header.
 
 ---
 
-###### \`exposed_headers\`<sup>Optional</sup> <a name=\\"exposed_headers\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.exposedHeaders\\"></a>
+###### \`exposed_headers\`<sup>Optional</sup> <a name="exposed_headers" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.exposedHeaders"></a>
 
 - *Type:* typing.List[str]
 - *Default:* No headers exposed.
@@ -3323,7 +3323,7 @@ One or more headers in the response that you want customers to be able to access
 
 ---
 
-###### \`id\`<sup>Optional</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.id\\"></a>
+###### \`id\`<sup>Optional</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.id"></a>
 
 - *Type:* str
 - *Default:* No id specified.
@@ -3332,7 +3332,7 @@ A unique identifier for this rule.
 
 ---
 
-###### \`max_age\`<sup>Optional</sup> <a name=\\"max_age\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.maxAge\\"></a>
+###### \`max_age\`<sup>Optional</sup> <a name="max_age" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.maxAge"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No caching.
@@ -3341,7 +3341,7 @@ The time in seconds that your browser is to cache the preflight response for the
 
 ---
 
-##### \`add_inventory\` <a name=\\"add_inventory\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory\\"></a>
+##### \`add_inventory\` <a name="add_inventory" id="construct-library.submod1.GoodbyeBucket.addInventory"></a>
 
 \`\`\`python
 def add_inventory(
@@ -3358,7 +3358,7 @@ def add_inventory(
 
 Add an inventory configuration.
 
-###### \`destination\`<sup>Required</sup> <a name=\\"destination\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.destination\\"></a>
+###### \`destination\`<sup>Required</sup> <a name="destination" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.destination"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryDestination
 
@@ -3366,7 +3366,7 @@ The destination of the inventory.
 
 ---
 
-###### \`enabled\`<sup>Optional</sup> <a name=\\"enabled\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.enabled\\"></a>
+###### \`enabled\`<sup>Optional</sup> <a name="enabled" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.enabled"></a>
 
 - *Type:* bool
 - *Default:* true
@@ -3375,7 +3375,7 @@ Whether the inventory is enabled or disabled.
 
 ---
 
-###### \`format\`<sup>Optional</sup> <a name=\\"format\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.format\\"></a>
+###### \`format\`<sup>Optional</sup> <a name="format" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.format"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryFormat
 - *Default:* InventoryFormat.CSV
@@ -3384,7 +3384,7 @@ The format of the inventory.
 
 ---
 
-###### \`frequency\`<sup>Optional</sup> <a name=\\"frequency\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.frequency\\"></a>
+###### \`frequency\`<sup>Optional</sup> <a name="frequency" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.frequency"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryFrequency
 - *Default:* InventoryFrequency.WEEKLY
@@ -3393,7 +3393,7 @@ Frequency at which the inventory should be generated.
 
 ---
 
-###### \`include_object_versions\`<sup>Optional</sup> <a name=\\"include_object_versions\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.includeObjectVersions\\"></a>
+###### \`include_object_versions\`<sup>Optional</sup> <a name="include_object_versions" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.includeObjectVersions"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryObjectVersion
 - *Default:* InventoryObjectVersion.ALL
@@ -3402,7 +3402,7 @@ If the inventory should contain all the object versions or only the current one.
 
 ---
 
-###### \`inventory_id\`<sup>Optional</sup> <a name=\\"inventory_id\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.inventoryId\\"></a>
+###### \`inventory_id\`<sup>Optional</sup> <a name="inventory_id" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.inventoryId"></a>
 
 - *Type:* str
 - *Default:* generated ID.
@@ -3411,7 +3411,7 @@ The inventory configuration ID.
 
 ---
 
-###### \`objects_prefix\`<sup>Optional</sup> <a name=\\"objects_prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.objectsPrefix\\"></a>
+###### \`objects_prefix\`<sup>Optional</sup> <a name="objects_prefix" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.objectsPrefix"></a>
 
 - *Type:* str
 - *Default:* No objects prefix
@@ -3420,7 +3420,7 @@ The inventory will only include objects that meet the prefix filter criteria.
 
 ---
 
-###### \`optional_fields\`<sup>Optional</sup> <a name=\\"optional_fields\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.optionalFields\\"></a>
+###### \`optional_fields\`<sup>Optional</sup> <a name="optional_fields" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.optionalFields"></a>
 
 - *Type:* typing.List[str]
 - *Default:* No optional fields.
@@ -3429,7 +3429,7 @@ A list of optional fields to be included in the inventory result.
 
 ---
 
-##### \`add_lifecycle_rule\` <a name=\\"add_lifecycle_rule\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule\\"></a>
+##### \`add_lifecycle_rule\` <a name="add_lifecycle_rule" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule"></a>
 
 \`\`\`python
 def add_lifecycle_rule(
@@ -3452,7 +3452,7 @@ def add_lifecycle_rule(
 
 Add a lifecycle rule to the bucket.
 
-###### \`abort_incomplete_multipart_upload_after\`<sup>Optional</sup> <a name=\\"abort_incomplete_multipart_upload_after\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.abortIncompleteMultipartUploadAfter\\"></a>
+###### \`abort_incomplete_multipart_upload_after\`<sup>Optional</sup> <a name="abort_incomplete_multipart_upload_after" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.abortIncompleteMultipartUploadAfter"></a>
 
 - *Type:* aws_cdk.core.Duration
 - *Default:* Incomplete uploads are never aborted
@@ -3466,7 +3466,7 @@ associated with the multipart upload.
 
 ---
 
-###### \`enabled\`<sup>Optional</sup> <a name=\\"enabled\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.enabled\\"></a>
+###### \`enabled\`<sup>Optional</sup> <a name="enabled" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.enabled"></a>
 
 - *Type:* bool
 - *Default:* true
@@ -3475,7 +3475,7 @@ Whether this rule is enabled.
 
 ---
 
-###### \`expiration\`<sup>Optional</sup> <a name=\\"expiration\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.expiration\\"></a>
+###### \`expiration\`<sup>Optional</sup> <a name="expiration" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.expiration"></a>
 
 - *Type:* aws_cdk.core.Duration
 - *Default:* No expiration timeout
@@ -3488,7 +3488,7 @@ expiration time must also be later than the transition time.
 
 ---
 
-###### \`expiration_date\`<sup>Optional</sup> <a name=\\"expiration_date\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.expirationDate\\"></a>
+###### \`expiration_date\`<sup>Optional</sup> <a name="expiration_date" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.expirationDate"></a>
 
 - *Type:* datetime.datetime
 - *Default:* No expiration date
@@ -3503,7 +3503,7 @@ expiration time must also be later than the transition time.
 
 ---
 
-###### \`expired_object_delete_marker\`<sup>Optional</sup> <a name=\\"expired_object_delete_marker\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.expiredObjectDeleteMarker\\"></a>
+###### \`expired_object_delete_marker\`<sup>Optional</sup> <a name="expired_object_delete_marker" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.expiredObjectDeleteMarker"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -3514,7 +3514,7 @@ If set to true, the delete marker will be expired.
 
 ---
 
-###### \`id\`<sup>Optional</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.id\\"></a>
+###### \`id\`<sup>Optional</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.id"></a>
 
 - *Type:* str
 
@@ -3524,7 +3524,7 @@ The value cannot be more than 255 characters.
 
 ---
 
-###### \`noncurrent_version_expiration\`<sup>Optional</sup> <a name=\\"noncurrent_version_expiration\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.noncurrentVersionExpiration\\"></a>
+###### \`noncurrent_version_expiration\`<sup>Optional</sup> <a name="noncurrent_version_expiration" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.noncurrentVersionExpiration"></a>
 
 - *Type:* aws_cdk.core.Duration
 - *Default:* No noncurrent version expiration
@@ -3540,7 +3540,7 @@ transition time.
 
 ---
 
-###### \`noncurrent_versions_to_retain\`<sup>Optional</sup> <a name=\\"noncurrent_versions_to_retain\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.noncurrentVersionsToRetain\\"></a>
+###### \`noncurrent_versions_to_retain\`<sup>Optional</sup> <a name="noncurrent_versions_to_retain" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.noncurrentVersionsToRetain"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No noncurrent versions to retain
@@ -3552,7 +3552,7 @@ Amazon S3 permanently deletes them.
 
 ---
 
-###### \`noncurrent_version_transitions\`<sup>Optional</sup> <a name=\\"noncurrent_version_transitions\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.noncurrentVersionTransitions\\"></a>
+###### \`noncurrent_version_transitions\`<sup>Optional</sup> <a name="noncurrent_version_transitions" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.noncurrentVersionTransitions"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.NoncurrentVersionTransition]
 
@@ -3565,7 +3565,7 @@ must be later than the transition time.
 
 ---
 
-###### \`object_size_greater_than\`<sup>Optional</sup> <a name=\\"object_size_greater_than\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.objectSizeGreaterThan\\"></a>
+###### \`object_size_greater_than\`<sup>Optional</sup> <a name="object_size_greater_than" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.objectSizeGreaterThan"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No rule
@@ -3574,7 +3574,7 @@ Specifies the minimum object size in bytes for this rule to apply to.
 
 ---
 
-###### \`object_size_less_than\`<sup>Optional</sup> <a name=\\"object_size_less_than\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.objectSizeLessThan\\"></a>
+###### \`object_size_less_than\`<sup>Optional</sup> <a name="object_size_less_than" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.objectSizeLessThan"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No rule
@@ -3583,7 +3583,7 @@ Specifies the maximum object size in bytes for this rule to apply to.
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.prefix"></a>
 
 - *Type:* str
 - *Default:* Rule applies to all objects
@@ -3592,7 +3592,7 @@ Object key prefix that identifies one or more objects to which this rule applies
 
 ---
 
-###### \`tag_filters\`<sup>Optional</sup> <a name=\\"tag_filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.tagFilters\\"></a>
+###### \`tag_filters\`<sup>Optional</sup> <a name="tag_filters" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.tagFilters"></a>
 
 - *Type:* typing.Mapping[typing.Any]
 - *Default:* Rule applies to all objects
@@ -3601,7 +3601,7 @@ The TagFilter property type specifies tags to use to identify a subset of object
 
 ---
 
-###### \`transitions\`<sup>Optional</sup> <a name=\\"transitions\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.transitions\\"></a>
+###### \`transitions\`<sup>Optional</sup> <a name="transitions" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.transitions"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.Transition]
 - *Default:* No transition rules
@@ -3614,7 +3614,7 @@ expiration time must also be later than the transition time.
 
 ---
 
-##### \`add_metric\` <a name=\\"add_metric\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric\\"></a>
+##### \`add_metric\` <a name="add_metric" id="construct-library.submod1.GoodbyeBucket.addMetric"></a>
 
 \`\`\`python
 def add_metric(
@@ -3626,7 +3626,7 @@ def add_metric(
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.addMetric.parameter.id"></a>
 
 - *Type:* str
 
@@ -3634,7 +3634,7 @@ The ID used to identify the metrics configuration.
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.submod1.GoodbyeBucket.addMetric.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -3642,7 +3642,7 @@ The prefix that an object must have to be included in the metrics results.
 
 ---
 
-###### \`tag_filters\`<sup>Optional</sup> <a name=\\"tag_filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric.parameter.tagFilters\\"></a>
+###### \`tag_filters\`<sup>Optional</sup> <a name="tag_filters" id="construct-library.submod1.GoodbyeBucket.addMetric.parameter.tagFilters"></a>
 
 - *Type:* typing.Mapping[typing.Any]
 
@@ -3652,25 +3652,25 @@ The metrics configuration includes only objects that meet the filter's criteria.
 
 ---
 
-##### \`goodbye\` <a name=\\"goodbye\\" id=\\"construct-library.submod1.GoodbyeBucket.goodbye\\"></a>
+##### \`goodbye\` <a name="goodbye" id="construct-library.submod1.GoodbyeBucket.goodbye"></a>
 
 \`\`\`python
 def goodbye() -> None
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.isResource\\">is_resource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketArn\\">from_bucket_arn</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketAttributes\\">from_bucket_attributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketName\\">from_bucket_name</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.validateBucketName\\">validate_bucket_name</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.isResource">is_resource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketArn">from_bucket_arn</a></code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketAttributes">from_bucket_attributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketName">from_bucket_name</a></code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.validateBucketName">validate_bucket_name</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`is_resource\` <a name=\\"is_resource\\" id=\\"construct-library.submod1.GoodbyeBucket.isResource\\"></a>
+##### \`is_resource\` <a name="is_resource" id="construct-library.submod1.GoodbyeBucket.isResource"></a>
 
 \`\`\`python
 from construct_library import submod1
@@ -3682,13 +3682,13 @@ submod1.GoodbyeBucket.is_resource(
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.submod1.GoodbyeBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.submod1.GoodbyeBucket.isResource.parameter.construct"></a>
 
 - *Type:* aws_cdk.core.IConstruct
 
 ---
 
-##### \`from_bucket_arn\` <a name=\\"from_bucket_arn\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn\\"></a>
+##### \`from_bucket_arn\` <a name="from_bucket_arn" id="construct-library.submod1.GoodbyeBucket.fromBucketArn"></a>
 
 \`\`\`python
 from construct_library import submod1
@@ -3700,25 +3700,25 @@ submod1.GoodbyeBucket.from_bucket_arn(
 )
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.id"></a>
 
 - *Type:* str
 
 ---
 
-###### \`bucket_arn\`<sup>Required</sup> <a name=\\"bucket_arn\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucket_arn\`<sup>Required</sup> <a name="bucket_arn" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* str
 
 ---
 
-##### \`from_bucket_attributes\` <a name=\\"from_bucket_attributes\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes\\"></a>
+##### \`from_bucket_attributes\` <a name="from_bucket_attributes" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes"></a>
 
 \`\`\`python
 from construct_library import submod1
@@ -3743,7 +3743,7 @@ submod1.GoodbyeBucket.from_bucket_attributes(
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
@@ -3751,7 +3751,7 @@ The parent creating construct (usually \`this\`).
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.id"></a>
 
 - *Type:* str
 
@@ -3759,7 +3759,7 @@ The construct's name.
 
 ---
 
-###### \`account\`<sup>Optional</sup> <a name=\\"account\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.account\\"></a>
+###### \`account\`<sup>Optional</sup> <a name="account" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.account"></a>
 
 - *Type:* str
 - *Default:* it's assumed the bucket belongs to the same account as the scope it's being imported into
@@ -3768,7 +3768,7 @@ The account this existing bucket belongs to.
 
 ---
 
-###### \`bucket_arn\`<sup>Optional</sup> <a name=\\"bucket_arn\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketArn\\"></a>
+###### \`bucket_arn\`<sup>Optional</sup> <a name="bucket_arn" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketArn"></a>
 
 - *Type:* str
 
@@ -3779,7 +3779,7 @@ defined in order to initialize a bucket ref.
 
 ---
 
-###### \`bucket_domain_name\`<sup>Optional</sup> <a name=\\"bucket_domain_name\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketDomainName\\"></a>
+###### \`bucket_domain_name\`<sup>Optional</sup> <a name="bucket_domain_name" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketDomainName"></a>
 
 - *Type:* str
 - *Default:* Inferred from bucket name
@@ -3788,7 +3788,7 @@ The domain name of the bucket.
 
 ---
 
-###### \`bucket_dual_stack_domain_name\`<sup>Optional</sup> <a name=\\"bucket_dual_stack_domain_name\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketDualStackDomainName\\"></a>
+###### \`bucket_dual_stack_domain_name\`<sup>Optional</sup> <a name="bucket_dual_stack_domain_name" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketDualStackDomainName"></a>
 
 - *Type:* str
 
@@ -3796,7 +3796,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-###### \`bucket_name\`<sup>Optional</sup> <a name=\\"bucket_name\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketName\\"></a>
+###### \`bucket_name\`<sup>Optional</sup> <a name="bucket_name" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketName"></a>
 
 - *Type:* str
 
@@ -3809,7 +3809,7 @@ policy, won't work.
 
 ---
 
-###### \`bucket_regional_domain_name\`<sup>Optional</sup> <a name=\\"bucket_regional_domain_name\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketRegionalDomainName\\"></a>
+###### \`bucket_regional_domain_name\`<sup>Optional</sup> <a name="bucket_regional_domain_name" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketRegionalDomainName"></a>
 
 - *Type:* str
 
@@ -3817,7 +3817,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-###### \`bucket_website_new_url_format\`<sup>Optional</sup> <a name=\\"bucket_website_new_url_format\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketWebsiteNewUrlFormat\\"></a>
+###### \`bucket_website_new_url_format\`<sup>Optional</sup> <a name="bucket_website_new_url_format" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketWebsiteNewUrlFormat"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -3829,7 +3829,7 @@ regions launched since 2014.
 
 ---
 
-###### \`bucket_website_url\`<sup>Optional</sup> <a name=\\"bucket_website_url\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketWebsiteUrl\\"></a>
+###### \`bucket_website_url\`<sup>Optional</sup> <a name="bucket_website_url" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.bucketWebsiteUrl"></a>
 
 - *Type:* str
 - *Default:* Inferred from bucket name
@@ -3838,13 +3838,13 @@ The website URL of the bucket (if static web hosting is enabled).
 
 ---
 
-###### \`encryption_key\`<sup>Optional</sup> <a name=\\"encryption_key\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.encryptionKey\\"></a>
+###### \`encryption_key\`<sup>Optional</sup> <a name="encryption_key" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.encryptionKey"></a>
 
 - *Type:* aws_cdk.aws_kms.IKey
 
 ---
 
-###### \`is_website\`<sup>Optional</sup> <a name=\\"is_website\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.isWebsite\\"></a>
+###### \`is_website\`<sup>Optional</sup> <a name="is_website" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.isWebsite"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -3853,7 +3853,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-###### \`notifications_handler_role\`<sup>Optional</sup> <a name=\\"notifications_handler_role\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.notificationsHandlerRole\\"></a>
+###### \`notifications_handler_role\`<sup>Optional</sup> <a name="notifications_handler_role" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.notificationsHandlerRole"></a>
 
 - *Type:* aws_cdk.aws_iam.IRole
 - *Default:* a new role will be created.
@@ -3862,7 +3862,7 @@ The role to be used by the notifications handler.
 
 ---
 
-###### \`region\`<sup>Optional</sup> <a name=\\"region\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.region\\"></a>
+###### \`region\`<sup>Optional</sup> <a name="region" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.region"></a>
 
 - *Type:* str
 - *Default:* it's assumed the bucket is in the same region as the scope it's being imported into
@@ -3871,7 +3871,7 @@ The region this existing bucket is in.
 
 ---
 
-##### \`from_bucket_name\` <a name=\\"from_bucket_name\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName\\"></a>
+##### \`from_bucket_name\` <a name="from_bucket_name" id="construct-library.submod1.GoodbyeBucket.fromBucketName"></a>
 
 \`\`\`python
 from construct_library import submod1
@@ -3883,25 +3883,25 @@ submod1.GoodbyeBucket.from_bucket_name(
 )
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.id"></a>
 
 - *Type:* str
 
 ---
 
-###### \`bucket_name\`<sup>Required</sup> <a name=\\"bucket_name\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucket_name\`<sup>Required</sup> <a name="bucket_name" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* str
 
 ---
 
-##### \`validate_bucket_name\` <a name=\\"validate_bucket_name\\" id=\\"construct-library.submod1.GoodbyeBucket.validateBucketName\\"></a>
+##### \`validate_bucket_name\` <a name="validate_bucket_name" id="construct-library.submod1.GoodbyeBucket.validateBucketName"></a>
 
 \`\`\`python
 from construct_library import submod1
@@ -3913,7 +3913,7 @@ submod1.GoodbyeBucket.validate_bucket_name(
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physical_name\`<sup>Required</sup> <a name=\\"physical_name\\" id=\\"construct-library.submod1.GoodbyeBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physical_name\`<sup>Required</sup> <a name="physical_name" id="construct-library.submod1.GoodbyeBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* str
 
@@ -3921,27 +3921,27 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.node\\">node</a></code> | <code>aws_cdk.core.ConstructNode</code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.env\\">env</a></code> | <code>aws_cdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.stack\\">stack</a></code> | <code>aws_cdk.core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketArn\\">bucket_arn</a></code> | <code>str</code> | The ARN of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketDomainName\\">bucket_domain_name</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName\\">bucket_dual_stack_domain_name</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketName\\">bucket_name</a></code> | <code>str</code> | The name of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName\\">bucket_regional_domain_name</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName\\">bucket_website_domain_name</a></code> | <code>str</code> | The Domain name of the static website. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl\\">bucket_website_url</a></code> | <code>str</code> | The URL of the static website. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.encryptionKey\\">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.isWebsite\\">is_website</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.policy\\">policy</a></code> | <code>aws_cdk.aws_s3.BucketPolicy</code> | The resource policy associated with this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.node">node</a></code> | <code>aws_cdk.core.ConstructNode</code> | The construct tree node associated with this construct. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.env">env</a></code> | <code>aws_cdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.stack">stack</a></code> | <code>aws_cdk.core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketArn">bucket_arn</a></code> | <code>str</code> | The ARN of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketDomainName">bucket_domain_name</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName">bucket_dual_stack_domain_name</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketName">bucket_name</a></code> | <code>str</code> | The name of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName">bucket_regional_domain_name</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName">bucket_website_domain_name</a></code> | <code>str</code> | The Domain name of the static website. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl">bucket_website_url</a></code> | <code>str</code> | The URL of the static website. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.encryptionKey">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.isWebsite">is_website</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.policy">policy</a></code> | <code>aws_cdk.aws_s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.submod1.GoodbyeBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.submod1.GoodbyeBucket.property.node"></a>
 
 \`\`\`python
 node: ConstructNode
@@ -3953,7 +3953,7 @@ The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.submod1.GoodbyeBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.submod1.GoodbyeBucket.property.env"></a>
 
 \`\`\`python
 env: ResourceEnvironment
@@ -3972,7 +3972,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.submod1.GoodbyeBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.submod1.GoodbyeBucket.property.stack"></a>
 
 \`\`\`python
 stack: Stack
@@ -3984,7 +3984,7 @@ The stack in which this resource is defined.
 
 ---
 
-##### \`bucket_arn\`<sup>Required</sup> <a name=\\"bucket_arn\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketArn\\"></a>
+##### \`bucket_arn\`<sup>Required</sup> <a name="bucket_arn" id="construct-library.submod1.GoodbyeBucket.property.bucketArn"></a>
 
 \`\`\`python
 bucket_arn: str
@@ -3996,7 +3996,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucket_domain_name\`<sup>Required</sup> <a name=\\"bucket_domain_name\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketDomainName\\"></a>
+##### \`bucket_domain_name\`<sup>Required</sup> <a name="bucket_domain_name" id="construct-library.submod1.GoodbyeBucket.property.bucketDomainName"></a>
 
 \`\`\`python
 bucket_domain_name: str
@@ -4008,7 +4008,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucket_dual_stack_domain_name\`<sup>Required</sup> <a name=\\"bucket_dual_stack_domain_name\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucket_dual_stack_domain_name\`<sup>Required</sup> <a name="bucket_dual_stack_domain_name" id="construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`python
 bucket_dual_stack_domain_name: str
@@ -4020,7 +4020,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucket_name\`<sup>Required</sup> <a name=\\"bucket_name\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketName\\"></a>
+##### \`bucket_name\`<sup>Required</sup> <a name="bucket_name" id="construct-library.submod1.GoodbyeBucket.property.bucketName"></a>
 
 \`\`\`python
 bucket_name: str
@@ -4032,7 +4032,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucket_regional_domain_name\`<sup>Required</sup> <a name=\\"bucket_regional_domain_name\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucket_regional_domain_name\`<sup>Required</sup> <a name="bucket_regional_domain_name" id="construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`python
 bucket_regional_domain_name: str
@@ -4044,7 +4044,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucket_website_domain_name\`<sup>Required</sup> <a name=\\"bucket_website_domain_name\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucket_website_domain_name\`<sup>Required</sup> <a name="bucket_website_domain_name" id="construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`python
 bucket_website_domain_name: str
@@ -4056,7 +4056,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucket_website_url\`<sup>Required</sup> <a name=\\"bucket_website_url\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucket_website_url\`<sup>Required</sup> <a name="bucket_website_url" id="construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`python
 bucket_website_url: str
@@ -4068,7 +4068,7 @@ The URL of the static website.
 
 ---
 
-##### \`encryption_key\`<sup>Optional</sup> <a name=\\"encryption_key\\" id=\\"construct-library.submod1.GoodbyeBucket.property.encryptionKey\\"></a>
+##### \`encryption_key\`<sup>Optional</sup> <a name="encryption_key" id="construct-library.submod1.GoodbyeBucket.property.encryptionKey"></a>
 
 \`\`\`python
 encryption_key: IKey
@@ -4080,7 +4080,7 @@ Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`is_website\`<sup>Optional</sup> <a name=\\"is_website\\" id=\\"construct-library.submod1.GoodbyeBucket.property.isWebsite\\"></a>
+##### \`is_website\`<sup>Optional</sup> <a name="is_website" id="construct-library.submod1.GoodbyeBucket.property.isWebsite"></a>
 
 \`\`\`python
 is_website: bool
@@ -4092,7 +4092,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.submod1.GoodbyeBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.submod1.GoodbyeBucket.property.policy"></a>
 
 \`\`\`python
 policy: BucketPolicy
@@ -4108,9 +4108,9 @@ first call to addToResourcePolicy(s).
 ---
 
 
-### GreeterBucket <a name=\\"GreeterBucket\\" id=\\"construct-library.GreeterBucket\\"></a>
+### GreeterBucket <a name="GreeterBucket" id="construct-library.GreeterBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.GreeterBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.GreeterBucket.Initializer"></a>
 
 \`\`\`python
 import construct_library
@@ -4149,50 +4149,50 @@ construct_library.GreeterBucket(
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.scope\\">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.id\\">id</a></code> | <code>str</code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.accessControl\\">access_control</a></code> | <code>aws_cdk.aws_s3.BucketAccessControl</code> | Specifies a canned ACL that grants predefined permissions to the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.autoDeleteObjects\\">auto_delete_objects</a></code> | <code>bool</code> | Whether all objects should be automatically deleted when the bucket is removed from the stack or when the stack is deleted. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.blockPublicAccess\\">block_public_access</a></code> | <code>aws_cdk.aws_s3.BlockPublicAccess</code> | The block public access configuration of this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.bucketKeyEnabled\\">bucket_key_enabled</a></code> | <code>bool</code> | Specifies whether Amazon S3 should use an S3 Bucket Key with server-side encryption using KMS (SSE-KMS) for new objects in the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.bucketName\\">bucket_name</a></code> | <code>str</code> | Physical name of this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.cors\\">cors</a></code> | <code>typing.List[aws_cdk.aws_s3.CorsRule]</code> | The CORS configuration of this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.encryption\\">encryption</a></code> | <code>aws_cdk.aws_s3.BucketEncryption</code> | The kind of server-side encryption to apply to this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.encryptionKey\\">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | External KMS key to use for bucket encryption. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.enforceSSL\\">enforce_ss_l</a></code> | <code>bool</code> | Enforces SSL for requests. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.eventBridgeEnabled\\">event_bridge_enabled</a></code> | <code>bool</code> | Whether this bucket should send notifications to Amazon EventBridge or not. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.intelligentTieringConfigurations\\">intelligent_tiering_configurations</a></code> | <code>typing.List[aws_cdk.aws_s3.IntelligentTieringConfiguration]</code> | Inteligent Tiering Configurations. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.inventories\\">inventories</a></code> | <code>typing.List[aws_cdk.aws_s3.Inventory]</code> | The inventory configuration of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.lifecycleRules\\">lifecycle_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.LifecycleRule]</code> | Rules that define how Amazon S3 manages objects during their lifetime. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.metrics\\">metrics</a></code> | <code>typing.List[aws_cdk.aws_s3.BucketMetrics]</code> | The metrics configuration of this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.notificationsHandlerRole\\">notifications_handler_role</a></code> | <code>aws_cdk.aws_iam.IRole</code> | The role to be used by the notifications handler. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.objectOwnership\\">object_ownership</a></code> | <code>aws_cdk.aws_s3.ObjectOwnership</code> | The objectOwnership of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.publicReadAccess\\">public_read_access</a></code> | <code>bool</code> | Grants public read access to all objects in the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.removalPolicy\\">removal_policy</a></code> | <code>aws_cdk.core.RemovalPolicy</code> | Policy to apply when the bucket is removed from this stack. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsBucket\\">server_access_logs_bucket</a></code> | <code>aws_cdk.aws_s3.IBucket</code> | Destination bucket for the server access logs. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsPrefix\\">server_access_logs_prefix</a></code> | <code>str</code> | Optional log file prefix to use for the bucket's access logs. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.transferAcceleration\\">transfer_acceleration</a></code> | <code>bool</code> | Whether this bucket should have transfer acceleration turned on or not. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.versioned\\">versioned</a></code> | <code>bool</code> | Whether this bucket should have versioning turned on or not. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.websiteErrorDocument\\">website_error_document</a></code> | <code>str</code> | The name of the error document (e.g. \\"404.html\\") for the website. \`websiteIndexDocument\` must also be set if this is set. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.websiteIndexDocument\\">website_index_document</a></code> | <code>str</code> | The name of the index document (e.g. \\"index.html\\") for the website. Enables static website hosting for this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.websiteRedirect\\">website_redirect</a></code> | <code>aws_cdk.aws_s3.RedirectTarget</code> | Specifies the redirect behavior of all requests to a website endpoint of a bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.websiteRoutingRules\\">website_routing_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.RoutingRule]</code> | Rules that define when a redirect is applied and the redirect behavior. |
-
----
-
-##### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.scope\\"></a>
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.id">id</a></code> | <code>str</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.accessControl">access_control</a></code> | <code>aws_cdk.aws_s3.BucketAccessControl</code> | Specifies a canned ACL that grants predefined permissions to the bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.autoDeleteObjects">auto_delete_objects</a></code> | <code>bool</code> | Whether all objects should be automatically deleted when the bucket is removed from the stack or when the stack is deleted. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.blockPublicAccess">block_public_access</a></code> | <code>aws_cdk.aws_s3.BlockPublicAccess</code> | The block public access configuration of this bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.bucketKeyEnabled">bucket_key_enabled</a></code> | <code>bool</code> | Specifies whether Amazon S3 should use an S3 Bucket Key with server-side encryption using KMS (SSE-KMS) for new objects in the bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.bucketName">bucket_name</a></code> | <code>str</code> | Physical name of this bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.cors">cors</a></code> | <code>typing.List[aws_cdk.aws_s3.CorsRule]</code> | The CORS configuration of this bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.encryption">encryption</a></code> | <code>aws_cdk.aws_s3.BucketEncryption</code> | The kind of server-side encryption to apply to this bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.encryptionKey">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | External KMS key to use for bucket encryption. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.enforceSSL">enforce_ss_l</a></code> | <code>bool</code> | Enforces SSL for requests. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.eventBridgeEnabled">event_bridge_enabled</a></code> | <code>bool</code> | Whether this bucket should send notifications to Amazon EventBridge or not. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.intelligentTieringConfigurations">intelligent_tiering_configurations</a></code> | <code>typing.List[aws_cdk.aws_s3.IntelligentTieringConfiguration]</code> | Inteligent Tiering Configurations. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.inventories">inventories</a></code> | <code>typing.List[aws_cdk.aws_s3.Inventory]</code> | The inventory configuration of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.lifecycleRules">lifecycle_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.LifecycleRule]</code> | Rules that define how Amazon S3 manages objects during their lifetime. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.metrics">metrics</a></code> | <code>typing.List[aws_cdk.aws_s3.BucketMetrics]</code> | The metrics configuration of this bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.notificationsHandlerRole">notifications_handler_role</a></code> | <code>aws_cdk.aws_iam.IRole</code> | The role to be used by the notifications handler. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.objectOwnership">object_ownership</a></code> | <code>aws_cdk.aws_s3.ObjectOwnership</code> | The objectOwnership of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.publicReadAccess">public_read_access</a></code> | <code>bool</code> | Grants public read access to all objects in the bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.removalPolicy">removal_policy</a></code> | <code>aws_cdk.core.RemovalPolicy</code> | Policy to apply when the bucket is removed from this stack. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsBucket">server_access_logs_bucket</a></code> | <code>aws_cdk.aws_s3.IBucket</code> | Destination bucket for the server access logs. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsPrefix">server_access_logs_prefix</a></code> | <code>str</code> | Optional log file prefix to use for the bucket's access logs. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.transferAcceleration">transfer_acceleration</a></code> | <code>bool</code> | Whether this bucket should have transfer acceleration turned on or not. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.versioned">versioned</a></code> | <code>bool</code> | Whether this bucket should have versioning turned on or not. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.websiteErrorDocument">website_error_document</a></code> | <code>str</code> | The name of the error document (e.g. "404.html") for the website. \`websiteIndexDocument\` must also be set if this is set. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.websiteIndexDocument">website_index_document</a></code> | <code>str</code> | The name of the index document (e.g. "index.html") for the website. Enables static website hosting for this bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.websiteRedirect">website_redirect</a></code> | <code>aws_cdk.aws_s3.RedirectTarget</code> | Specifies the redirect behavior of all requests to a website endpoint of a bucket. |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.websiteRoutingRules">website_routing_rules</a></code> | <code>typing.List[aws_cdk.aws_s3.RoutingRule]</code> | Rules that define when a redirect is applied and the redirect behavior. |
+
+---
+
+##### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.Initializer.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-##### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.id\\"></a>
+##### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.Initializer.parameter.id"></a>
 
 - *Type:* str
 
 ---
 
-##### \`access_control\`<sup>Optional</sup> <a name=\\"access_control\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.accessControl\\"></a>
+##### \`access_control\`<sup>Optional</sup> <a name="access_control" id="construct-library.GreeterBucket.Initializer.parameter.accessControl"></a>
 
 - *Type:* aws_cdk.aws_s3.BucketAccessControl
 - *Default:* BucketAccessControl.PRIVATE
@@ -4201,7 +4201,7 @@ Specifies a canned ACL that grants predefined permissions to the bucket.
 
 ---
 
-##### \`auto_delete_objects\`<sup>Optional</sup> <a name=\\"auto_delete_objects\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.autoDeleteObjects\\"></a>
+##### \`auto_delete_objects\`<sup>Optional</sup> <a name="auto_delete_objects" id="construct-library.GreeterBucket.Initializer.parameter.autoDeleteObjects"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -4217,7 +4217,7 @@ by deploying with CDK version \`1.126.0\` or later **before** switching this val
 
 ---
 
-##### \`block_public_access\`<sup>Optional</sup> <a name=\\"block_public_access\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.blockPublicAccess\\"></a>
+##### \`block_public_access\`<sup>Optional</sup> <a name="block_public_access" id="construct-library.GreeterBucket.Initializer.parameter.blockPublicAccess"></a>
 
 - *Type:* aws_cdk.aws_s3.BlockPublicAccess
 - *Default:* CloudFormation defaults will apply. New buckets and objects don't allow public access, but users can modify bucket policies or object permissions to allow public access
@@ -4228,7 +4228,7 @@ The block public access configuration of this bucket.
 
 ---
 
-##### \`bucket_key_enabled\`<sup>Optional</sup> <a name=\\"bucket_key_enabled\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.bucketKeyEnabled\\"></a>
+##### \`bucket_key_enabled\`<sup>Optional</sup> <a name="bucket_key_enabled" id="construct-library.GreeterBucket.Initializer.parameter.bucketKeyEnabled"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -4239,7 +4239,7 @@ Only relevant, when Encryption is set to {@link BucketEncryption.KMS}
 
 ---
 
-##### \`bucket_name\`<sup>Optional</sup> <a name=\\"bucket_name\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.bucketName\\"></a>
+##### \`bucket_name\`<sup>Optional</sup> <a name="bucket_name" id="construct-library.GreeterBucket.Initializer.parameter.bucketName"></a>
 
 - *Type:* str
 - *Default:* Assigned by CloudFormation (recommended).
@@ -4248,7 +4248,7 @@ Physical name of this bucket.
 
 ---
 
-##### \`cors\`<sup>Optional</sup> <a name=\\"cors\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.cors\\"></a>
+##### \`cors\`<sup>Optional</sup> <a name="cors" id="construct-library.GreeterBucket.Initializer.parameter.cors"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.CorsRule]
 - *Default:* No CORS configuration.
@@ -4259,7 +4259,7 @@ The CORS configuration of this bucket.
 
 ---
 
-##### \`encryption\`<sup>Optional</sup> <a name=\\"encryption\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.encryption\\"></a>
+##### \`encryption\`<sup>Optional</sup> <a name="encryption" id="construct-library.GreeterBucket.Initializer.parameter.encryption"></a>
 
 - *Type:* aws_cdk.aws_s3.BucketEncryption
 - *Default:* \`Kms\` if \`encryptionKey\` is specified, or \`Unencrypted\` otherwise.
@@ -4271,20 +4271,20 @@ encryption key is not specified, a key will automatically be created.
 
 ---
 
-##### \`encryption_key\`<sup>Optional</sup> <a name=\\"encryption_key\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.encryptionKey\\"></a>
+##### \`encryption_key\`<sup>Optional</sup> <a name="encryption_key" id="construct-library.GreeterBucket.Initializer.parameter.encryptionKey"></a>
 
 - *Type:* aws_cdk.aws_kms.IKey
-- *Default:* If encryption is set to \\"Kms\\" and this property is undefined, a new KMS key will be created and associated with this bucket.
+- *Default:* If encryption is set to "Kms" and this property is undefined, a new KMS key will be created and associated with this bucket.
 
 External KMS key to use for bucket encryption.
 
-The 'encryption' property must be either not specified or set to \\"Kms\\".
-An error will be emitted if encryption is set to \\"Unencrypted\\" or
-\\"Managed\\".
+The 'encryption' property must be either not specified or set to "Kms".
+An error will be emitted if encryption is set to "Unencrypted" or
+"Managed".
 
 ---
 
-##### \`enforce_ss_l\`<sup>Optional</sup> <a name=\\"enforce_ss_l\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.enforceSSL\\"></a>
+##### \`enforce_ss_l\`<sup>Optional</sup> <a name="enforce_ss_l" id="construct-library.GreeterBucket.Initializer.parameter.enforceSSL"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -4297,7 +4297,7 @@ S3.5 of the AWS Foundational Security Best Practices Regarding S3.
 
 ---
 
-##### \`event_bridge_enabled\`<sup>Optional</sup> <a name=\\"event_bridge_enabled\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.eventBridgeEnabled\\"></a>
+##### \`event_bridge_enabled\`<sup>Optional</sup> <a name="event_bridge_enabled" id="construct-library.GreeterBucket.Initializer.parameter.eventBridgeEnabled"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -4306,7 +4306,7 @@ Whether this bucket should send notifications to Amazon EventBridge or not.
 
 ---
 
-##### \`intelligent_tiering_configurations\`<sup>Optional</sup> <a name=\\"intelligent_tiering_configurations\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.intelligentTieringConfigurations\\"></a>
+##### \`intelligent_tiering_configurations\`<sup>Optional</sup> <a name="intelligent_tiering_configurations" id="construct-library.GreeterBucket.Initializer.parameter.intelligentTieringConfigurations"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.IntelligentTieringConfiguration]
 - *Default:* No Intelligent Tiiering Configurations.
@@ -4317,7 +4317,7 @@ Inteligent Tiering Configurations.
 
 ---
 
-##### \`inventories\`<sup>Optional</sup> <a name=\\"inventories\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.inventories\\"></a>
+##### \`inventories\`<sup>Optional</sup> <a name="inventories" id="construct-library.GreeterBucket.Initializer.parameter.inventories"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.Inventory]
 - *Default:* No inventory configuration
@@ -4328,7 +4328,7 @@ The inventory configuration of the bucket.
 
 ---
 
-##### \`lifecycle_rules\`<sup>Optional</sup> <a name=\\"lifecycle_rules\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.lifecycleRules\\"></a>
+##### \`lifecycle_rules\`<sup>Optional</sup> <a name="lifecycle_rules" id="construct-library.GreeterBucket.Initializer.parameter.lifecycleRules"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.LifecycleRule]
 - *Default:* No lifecycle rules.
@@ -4337,7 +4337,7 @@ Rules that define how Amazon S3 manages objects during their lifetime.
 
 ---
 
-##### \`metrics\`<sup>Optional</sup> <a name=\\"metrics\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.metrics\\"></a>
+##### \`metrics\`<sup>Optional</sup> <a name="metrics" id="construct-library.GreeterBucket.Initializer.parameter.metrics"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.BucketMetrics]
 - *Default:* No metrics configuration.
@@ -4348,7 +4348,7 @@ The metrics configuration of this bucket.
 
 ---
 
-##### \`notifications_handler_role\`<sup>Optional</sup> <a name=\\"notifications_handler_role\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.notificationsHandlerRole\\"></a>
+##### \`notifications_handler_role\`<sup>Optional</sup> <a name="notifications_handler_role" id="construct-library.GreeterBucket.Initializer.parameter.notificationsHandlerRole"></a>
 
 - *Type:* aws_cdk.aws_iam.IRole
 - *Default:* a new role will be created.
@@ -4357,7 +4357,7 @@ The role to be used by the notifications handler.
 
 ---
 
-##### \`object_ownership\`<sup>Optional</sup> <a name=\\"object_ownership\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.objectOwnership\\"></a>
+##### \`object_ownership\`<sup>Optional</sup> <a name="object_ownership" id="construct-library.GreeterBucket.Initializer.parameter.objectOwnership"></a>
 
 - *Type:* aws_cdk.aws_s3.ObjectOwnership
 - *Default:* No ObjectOwnership configuration, uploading account will own the object.
@@ -4368,7 +4368,7 @@ The objectOwnership of the bucket.
 
 ---
 
-##### \`public_read_access\`<sup>Optional</sup> <a name=\\"public_read_access\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.publicReadAccess\\"></a>
+##### \`public_read_access\`<sup>Optional</sup> <a name="public_read_access" id="construct-library.GreeterBucket.Initializer.parameter.publicReadAccess"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -4379,7 +4379,7 @@ Similar to calling \`bucket.grantPublicAccess()\`
 
 ---
 
-##### \`removal_policy\`<sup>Optional</sup> <a name=\\"removal_policy\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.removalPolicy\\"></a>
+##### \`removal_policy\`<sup>Optional</sup> <a name="removal_policy" id="construct-library.GreeterBucket.Initializer.parameter.removalPolicy"></a>
 
 - *Type:* aws_cdk.core.RemovalPolicy
 - *Default:* The bucket will be orphaned.
@@ -4388,27 +4388,27 @@ Policy to apply when the bucket is removed from this stack.
 
 ---
 
-##### \`server_access_logs_bucket\`<sup>Optional</sup> <a name=\\"server_access_logs_bucket\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsBucket\\"></a>
+##### \`server_access_logs_bucket\`<sup>Optional</sup> <a name="server_access_logs_bucket" id="construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsBucket"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucket
-- *Default:* If \\"serverAccessLogsPrefix\\" undefined - access logs disabled, otherwise - log to current bucket.
+- *Default:* If "serverAccessLogsPrefix" undefined - access logs disabled, otherwise - log to current bucket.
 
 Destination bucket for the server access logs.
 
 ---
 
-##### \`server_access_logs_prefix\`<sup>Optional</sup> <a name=\\"server_access_logs_prefix\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsPrefix\\"></a>
+##### \`server_access_logs_prefix\`<sup>Optional</sup> <a name="server_access_logs_prefix" id="construct-library.GreeterBucket.Initializer.parameter.serverAccessLogsPrefix"></a>
 
 - *Type:* str
 - *Default:* No log file prefix
 
 Optional log file prefix to use for the bucket's access logs.
 
-If defined without \\"serverAccessLogsBucket\\", enables access logs to current bucket with this prefix.
+If defined without "serverAccessLogsBucket", enables access logs to current bucket with this prefix.
 
 ---
 
-##### \`transfer_acceleration\`<sup>Optional</sup> <a name=\\"transfer_acceleration\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.transferAcceleration\\"></a>
+##### \`transfer_acceleration\`<sup>Optional</sup> <a name="transfer_acceleration" id="construct-library.GreeterBucket.Initializer.parameter.transferAcceleration"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -4417,7 +4417,7 @@ Whether this bucket should have transfer acceleration turned on or not.
 
 ---
 
-##### \`versioned\`<sup>Optional</sup> <a name=\\"versioned\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.versioned\\"></a>
+##### \`versioned\`<sup>Optional</sup> <a name="versioned" id="construct-library.GreeterBucket.Initializer.parameter.versioned"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -4426,36 +4426,36 @@ Whether this bucket should have versioning turned on or not.
 
 ---
 
-##### \`website_error_document\`<sup>Optional</sup> <a name=\\"website_error_document\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.websiteErrorDocument\\"></a>
+##### \`website_error_document\`<sup>Optional</sup> <a name="website_error_document" id="construct-library.GreeterBucket.Initializer.parameter.websiteErrorDocument"></a>
 
 - *Type:* str
 - *Default:* No error document.
 
-The name of the error document (e.g. \\"404.html\\") for the website. \`websiteIndexDocument\` must also be set if this is set.
+The name of the error document (e.g. "404.html") for the website. \`websiteIndexDocument\` must also be set if this is set.
 
 ---
 
-##### \`website_index_document\`<sup>Optional</sup> <a name=\\"website_index_document\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.websiteIndexDocument\\"></a>
+##### \`website_index_document\`<sup>Optional</sup> <a name="website_index_document" id="construct-library.GreeterBucket.Initializer.parameter.websiteIndexDocument"></a>
 
 - *Type:* str
 - *Default:* No index document.
 
-The name of the index document (e.g. \\"index.html\\") for the website. Enables static website hosting for this bucket.
+The name of the index document (e.g. "index.html") for the website. Enables static website hosting for this bucket.
 
 ---
 
-##### \`website_redirect\`<sup>Optional</sup> <a name=\\"website_redirect\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.websiteRedirect\\"></a>
+##### \`website_redirect\`<sup>Optional</sup> <a name="website_redirect" id="construct-library.GreeterBucket.Initializer.parameter.websiteRedirect"></a>
 
 - *Type:* aws_cdk.aws_s3.RedirectTarget
 - *Default:* No redirection.
 
 Specifies the redirect behavior of all requests to a website endpoint of a bucket.
 
-If you specify this property, you can't specify \\"websiteIndexDocument\\", \\"websiteErrorDocument\\" nor , \\"websiteRoutingRules\\".
+If you specify this property, you can't specify "websiteIndexDocument", "websiteErrorDocument" nor , "websiteRoutingRules".
 
 ---
 
-##### \`website_routing_rules\`<sup>Optional</sup> <a name=\\"website_routing_rules\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.websiteRoutingRules\\"></a>
+##### \`website_routing_rules\`<sup>Optional</sup> <a name="website_routing_rules" id="construct-library.GreeterBucket.Initializer.parameter.websiteRoutingRules"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.RoutingRule]
 - *Default:* No redirection rules.
@@ -4464,39 +4464,39 @@ Rules that define when a redirect is applied and the redirect behavior.
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.applyRemovalPolicy\\">apply_removal_policy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.addEventNotification\\">add_event_notification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectCreatedNotification\\">add_object_created_notification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectRemovedNotification\\">add_object_removed_notification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addToResourcePolicy\\">add_to_resource_policy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#construct-library.GreeterBucket.arnForObjects\\">arn_for_objects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantDelete\\">grant_delete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPublicAccess\\">grant_public_access</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPut\\">grant_put</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPutAcl\\">grant_put_acl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantRead\\">grant_read</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantReadWrite\\">grant_read_write</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantWrite\\">grant_write</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailEvent\\">on_cloud_trail_event</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailPutObject\\">on_cloud_trail_put_object</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailWriteObject\\">on_cloud_trail_write_object</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#construct-library.GreeterBucket.s3UrlForObject\\">s3_url_for_object</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.transferAccelerationUrlForObject\\">transfer_acceleration_url_for_object</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#construct-library.GreeterBucket.urlForObject\\">url_for_object</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.virtualHostedUrlForObject\\">virtual_hosted_url_for_object</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.addCorsRule\\">add_cors_rule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addInventory\\">add_inventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#construct-library.GreeterBucket.addLifecycleRule\\">add_lifecycle_rule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addMetric\\">add_metric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.greet\\">greet</a></code> | *No description.* |
-
----
-
-##### \`apply_removal_policy\` <a name=\\"apply_removal_policy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy\\"></a>
+| <code><a href="#construct-library.GreeterBucket.applyRemovalPolicy">apply_removal_policy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#construct-library.GreeterBucket.addEventNotification">add_event_notification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#construct-library.GreeterBucket.addObjectCreatedNotification">add_object_created_notification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addObjectRemovedNotification">add_object_removed_notification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addToResourcePolicy">add_to_resource_policy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#construct-library.GreeterBucket.arnForObjects">arn_for_objects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#construct-library.GreeterBucket.grantDelete">grant_delete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPublicAccess">grant_public_access</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPut">grant_put</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.grantPutAcl">grant_put_acl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantRead">grant_read</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantReadWrite">grant_read_write</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantWrite">grant_write</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailEvent">on_cloud_trail_event</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailPutObject">on_cloud_trail_put_object</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailWriteObject">on_cloud_trail_write_object</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#construct-library.GreeterBucket.s3UrlForObject">s3_url_for_object</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#construct-library.GreeterBucket.transferAccelerationUrlForObject">transfer_acceleration_url_for_object</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#construct-library.GreeterBucket.urlForObject">url_for_object</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#construct-library.GreeterBucket.virtualHostedUrlForObject">virtual_hosted_url_for_object</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#construct-library.GreeterBucket.addCorsRule">add_cors_rule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#construct-library.GreeterBucket.addInventory">add_inventory</a></code> | Add an inventory configuration. |
+| <code><a href="#construct-library.GreeterBucket.addLifecycleRule">add_lifecycle_rule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addMetric">add_metric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.greet">greet</a></code> | *No description.* |
+
+---
+
+##### \`apply_removal_policy\` <a name="apply_removal_policy" id="construct-library.GreeterBucket.applyRemovalPolicy"></a>
 
 \`\`\`python
 def apply_removal_policy(
@@ -4514,13 +4514,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy"></a>
 
 - *Type:* aws_cdk.core.RemovalPolicy
 
 ---
 
-##### \`add_event_notification\` <a name=\\"add_event_notification\\" id=\\"construct-library.GreeterBucket.addEventNotification\\"></a>
+##### \`add_event_notification\` <a name="add_event_notification" id="construct-library.GreeterBucket.addEventNotification"></a>
 
 \`\`\`python
 def add_event_notification(
@@ -4544,7 +4544,7 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.GreeterBucket.addEventNotification.parameter.event"></a>
 
 - *Type:* aws_cdk.aws_s3.EventType
 
@@ -4552,7 +4552,7 @@ The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addEventNotification.parameter.dest"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucketNotificationDestination
 
@@ -4560,7 +4560,7 @@ The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.GreeterBucket.addEventNotification.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -4568,7 +4568,7 @@ S3 keys must have the specified prefix.
 
 ---
 
-###### \`suffix\`<sup>Optional</sup> <a name=\\"suffix\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.suffix\\"></a>
+###### \`suffix\`<sup>Optional</sup> <a name="suffix" id="construct-library.GreeterBucket.addEventNotification.parameter.suffix"></a>
 
 - *Type:* str
 
@@ -4576,7 +4576,7 @@ S3 keys must have the specified suffix.
 
 ---
 
-##### \`add_object_created_notification\` <a name=\\"add_object_created_notification\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification\\"></a>
+##### \`add_object_created_notification\` <a name="add_object_created_notification" id="construct-library.GreeterBucket.addObjectCreatedNotification"></a>
 
 \`\`\`python
 def add_object_created_notification(
@@ -4591,7 +4591,7 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucketNotificationDestination
 
@@ -4599,7 +4599,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -4607,7 +4607,7 @@ S3 keys must have the specified prefix.
 
 ---
 
-###### \`suffix\`<sup>Optional</sup> <a name=\\"suffix\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.suffix\\"></a>
+###### \`suffix\`<sup>Optional</sup> <a name="suffix" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.suffix"></a>
 
 - *Type:* str
 
@@ -4615,7 +4615,7 @@ S3 keys must have the specified suffix.
 
 ---
 
-##### \`add_object_removed_notification\` <a name=\\"add_object_removed_notification\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification\\"></a>
+##### \`add_object_removed_notification\` <a name="add_object_removed_notification" id="construct-library.GreeterBucket.addObjectRemovedNotification"></a>
 
 \`\`\`python
 def add_object_removed_notification(
@@ -4630,7 +4630,7 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest"></a>
 
 - *Type:* aws_cdk.aws_s3.IBucketNotificationDestination
 
@@ -4638,7 +4638,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -4646,7 +4646,7 @@ S3 keys must have the specified prefix.
 
 ---
 
-###### \`suffix\`<sup>Optional</sup> <a name=\\"suffix\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.suffix\\"></a>
+###### \`suffix\`<sup>Optional</sup> <a name="suffix" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.suffix"></a>
 
 - *Type:* str
 
@@ -4654,7 +4654,7 @@ S3 keys must have the specified suffix.
 
 ---
 
-##### \`add_to_resource_policy\` <a name=\\"add_to_resource_policy\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy\\"></a>
+##### \`add_to_resource_policy\` <a name="add_to_resource_policy" id="construct-library.GreeterBucket.addToResourcePolicy"></a>
 
 \`\`\`python
 def add_to_resource_policy(
@@ -4670,7 +4670,7 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.GreeterBucket.addToResourcePolicy.parameter.permission"></a>
 
 - *Type:* aws_cdk.aws_iam.PolicyStatement
 
@@ -4678,7 +4678,7 @@ the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arn_for_objects\` <a name=\\"arn_for_objects\\" id=\\"construct-library.GreeterBucket.arnForObjects\\"></a>
+##### \`arn_for_objects\` <a name="arn_for_objects" id="construct-library.GreeterBucket.arnForObjects"></a>
 
 \`\`\`python
 def arn_for_objects(
@@ -4688,19 +4688,19 @@ def arn_for_objects(
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`key_pattern\`<sup>Required</sup> <a name=\\"key_pattern\\" id=\\"construct-library.GreeterBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`key_pattern\`<sup>Required</sup> <a name="key_pattern" id="construct-library.GreeterBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grant_delete\` <a name=\\"grant_delete\\" id=\\"construct-library.GreeterBucket.grantDelete\\"></a>
+##### \`grant_delete\` <a name="grant_delete" id="construct-library.GreeterBucket.grantDelete"></a>
 
 \`\`\`python
 def grant_delete(
@@ -4711,7 +4711,7 @@ def grant_delete(
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantDelete.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -4719,7 +4719,7 @@ The principal.
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
@@ -4727,7 +4727,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grant_public_access\` <a name=\\"grant_public_access\\" id=\\"construct-library.GreeterBucket.grantPublicAccess\\"></a>
+##### \`grant_public_access\` <a name="grant_public_access" id="construct-library.GreeterBucket.grantPublicAccess"></a>
 
 \`\`\`python
 def grant_public_access(
@@ -4743,8 +4743,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -4757,25 +4757,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowed_actions\`<sup>Required</sup> <a name=\\"allowed_actions\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowed_actions\`<sup>Required</sup> <a name="allowed_actions" id="construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* str
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`key_prefix\`<sup>Optional</sup> <a name=\\"key_prefix\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`key_prefix\`<sup>Optional</sup> <a name="key_prefix" id="construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* str
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grant_put\` <a name=\\"grant_put\\" id=\\"construct-library.GreeterBucket.grantPut\\"></a>
+##### \`grant_put\` <a name="grant_put" id="construct-library.GreeterBucket.grantPut"></a>
 
 \`\`\`python
 def grant_put(
@@ -4789,7 +4789,7 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPut.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -4797,7 +4797,7 @@ The principal.
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
@@ -4805,7 +4805,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grant_put_acl\` <a name=\\"grant_put_acl\\" id=\\"construct-library.GreeterBucket.grantPutAcl\\"></a>
+##### \`grant_put_acl\` <a name="grant_put_acl" id="construct-library.GreeterBucket.grantPutAcl"></a>
 
 \`\`\`python
 def grant_put_acl(
@@ -4820,19 +4820,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPutAcl.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grant_read\` <a name=\\"grant_read\\" id=\\"construct-library.GreeterBucket.grantRead\\"></a>
+##### \`grant_read\` <a name="grant_read" id="construct-library.GreeterBucket.grantRead"></a>
 
 \`\`\`python
 def grant_read(
@@ -4846,7 +4846,7 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantRead.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -4854,7 +4854,7 @@ The principal.
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
@@ -4862,7 +4862,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grant_read_write\` <a name=\\"grant_read_write\\" id=\\"construct-library.GreeterBucket.grantReadWrite\\"></a>
+##### \`grant_read_write\` <a name="grant_read_write" id="construct-library.GreeterBucket.grantReadWrite"></a>
 
 \`\`\`python
 def grant_read_write(
@@ -4884,19 +4884,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantReadWrite.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
 ---
 
-##### \`grant_write\` <a name=\\"grant_write\\" id=\\"construct-library.GreeterBucket.grantWrite\\"></a>
+##### \`grant_write\` <a name="grant_write" id="construct-library.GreeterBucket.grantWrite"></a>
 
 \`\`\`python
 def grant_write(
@@ -4918,19 +4918,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantWrite.parameter.identity"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-###### \`objects_key_pattern\`<sup>Optional</sup> <a name=\\"objects_key_pattern\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objects_key_pattern\`<sup>Optional</sup> <a name="objects_key_pattern" id="construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* typing.Any
 
 ---
 
-##### \`on_cloud_trail_event\` <a name=\\"on_cloud_trail_event\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent\\"></a>
+##### \`on_cloud_trail_event\` <a name="on_cloud_trail_event" id="construct-library.GreeterBucket.onCloudTrailEvent"></a>
 
 \`\`\`python
 def on_cloud_trail_event(
@@ -4948,7 +4948,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* str
 
@@ -4956,7 +4956,7 @@ The id of the rule.
 
 ---
 
-###### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.description\\"></a>
+###### \`description\`<sup>Optional</sup> <a name="description" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -4965,7 +4965,7 @@ A description of the rule's purpose.
 
 ---
 
-###### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.eventPattern\\"></a>
+###### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -4980,7 +4980,7 @@ on top of that filtering.
 
 ---
 
-###### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.ruleName\\"></a>
+###### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -4989,7 +4989,7 @@ A name for the rule.
 
 ---
 
-###### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.target\\"></a>
+###### \`target\`<sup>Optional</sup> <a name="target" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -4998,7 +4998,7 @@ The target to register for the event.
 
 ---
 
-###### \`paths\`<sup>Optional</sup> <a name=\\"paths\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.paths\\"></a>
+###### \`paths\`<sup>Optional</sup> <a name="paths" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.paths"></a>
 
 - *Type:* typing.List[str]
 - *Default:* Watch changes to all objects
@@ -5007,7 +5007,7 @@ Only watch changes to these object paths.
 
 ---
 
-##### \`on_cloud_trail_put_object\` <a name=\\"on_cloud_trail_put_object\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject\\"></a>
+##### \`on_cloud_trail_put_object\` <a name="on_cloud_trail_put_object" id="construct-library.GreeterBucket.onCloudTrailPutObject"></a>
 
 \`\`\`python
 def on_cloud_trail_put_object(
@@ -5029,7 +5029,7 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.id"></a>
 
 - *Type:* str
 
@@ -5037,7 +5037,7 @@ The id of the rule.
 
 ---
 
-###### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.description\\"></a>
+###### \`description\`<sup>Optional</sup> <a name="description" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -5046,7 +5046,7 @@ A description of the rule's purpose.
 
 ---
 
-###### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.eventPattern\\"></a>
+###### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -5061,7 +5061,7 @@ on top of that filtering.
 
 ---
 
-###### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.ruleName\\"></a>
+###### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -5070,7 +5070,7 @@ A name for the rule.
 
 ---
 
-###### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.target\\"></a>
+###### \`target\`<sup>Optional</sup> <a name="target" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -5079,7 +5079,7 @@ The target to register for the event.
 
 ---
 
-###### \`paths\`<sup>Optional</sup> <a name=\\"paths\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.paths\\"></a>
+###### \`paths\`<sup>Optional</sup> <a name="paths" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.paths"></a>
 
 - *Type:* typing.List[str]
 - *Default:* Watch changes to all objects
@@ -5088,7 +5088,7 @@ Only watch changes to these object paths.
 
 ---
 
-##### \`on_cloud_trail_write_object\` <a name=\\"on_cloud_trail_write_object\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject\\"></a>
+##### \`on_cloud_trail_write_object\` <a name="on_cloud_trail_write_object" id="construct-library.GreeterBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`python
 def on_cloud_trail_write_object(
@@ -5113,7 +5113,7 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.id"></a>
 
 - *Type:* str
 
@@ -5121,7 +5121,7 @@ The id of the rule.
 
 ---
 
-###### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.description\\"></a>
+###### \`description\`<sup>Optional</sup> <a name="description" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -5130,7 +5130,7 @@ A description of the rule's purpose.
 
 ---
 
-###### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.eventPattern\\"></a>
+###### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -5145,7 +5145,7 @@ on top of that filtering.
 
 ---
 
-###### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.ruleName\\"></a>
+###### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -5154,7 +5154,7 @@ A name for the rule.
 
 ---
 
-###### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.target\\"></a>
+###### \`target\`<sup>Optional</sup> <a name="target" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -5163,7 +5163,7 @@ The target to register for the event.
 
 ---
 
-###### \`paths\`<sup>Optional</sup> <a name=\\"paths\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.paths\\"></a>
+###### \`paths\`<sup>Optional</sup> <a name="paths" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.paths"></a>
 
 - *Type:* typing.List[str]
 - *Default:* Watch changes to all objects
@@ -5172,7 +5172,7 @@ Only watch changes to these object paths.
 
 ---
 
-##### \`s3_url_for_object\` <a name=\\"s3_url_for_object\\" id=\\"construct-library.GreeterBucket.s3UrlForObject\\"></a>
+##### \`s3_url_for_object\` <a name="s3_url_for_object" id="construct-library.GreeterBucket.s3UrlForObject"></a>
 
 \`\`\`python
 def s3_url_for_object(
@@ -5185,7 +5185,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -5196,7 +5196,7 @@ bucket is returned.
 
 ---
 
-##### \`transfer_acceleration_url_for_object\` <a name=\\"transfer_acceleration_url_for_object\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transfer_acceleration_url_for_object\` <a name="transfer_acceleration_url_for_object" id="construct-library.GreeterBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`python
 def transfer_acceleration_url_for_object(
@@ -5213,7 +5213,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -5224,7 +5224,7 @@ bucket is returned.
 
 ---
 
-###### \`dual_stack\`<sup>Optional</sup> <a name=\\"dual_stack\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.dualStack\\"></a>
+###### \`dual_stack\`<sup>Optional</sup> <a name="dual_stack" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.dualStack"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -5233,7 +5233,7 @@ Dual-stack support to connect to the bucket over IPv6.
 
 ---
 
-##### \`url_for_object\` <a name=\\"url_for_object\\" id=\\"construct-library.GreeterBucket.urlForObject\\"></a>
+##### \`url_for_object\` <a name="url_for_object" id="construct-library.GreeterBucket.urlForObject"></a>
 
 \`\`\`python
 def url_for_object(
@@ -5247,7 +5247,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.urlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -5258,7 +5258,7 @@ bucket is returned.
 
 ---
 
-##### \`virtual_hosted_url_for_object\` <a name=\\"virtual_hosted_url_for_object\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtual_hosted_url_for_object\` <a name="virtual_hosted_url_for_object" id="construct-library.GreeterBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`python
 def virtual_hosted_url_for_object(
@@ -5274,7 +5274,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -5285,7 +5285,7 @@ bucket is returned.
 
 ---
 
-###### \`regional\`<sup>Optional</sup> <a name=\\"regional\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.regional\\"></a>
+###### \`regional\`<sup>Optional</sup> <a name="regional" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.regional"></a>
 
 - *Type:* bool
 - *Default:* true
@@ -5294,7 +5294,7 @@ Specifies the URL includes the region.
 
 ---
 
-##### \`add_cors_rule\` <a name=\\"add_cors_rule\\" id=\\"construct-library.GreeterBucket.addCorsRule\\"></a>
+##### \`add_cors_rule\` <a name="add_cors_rule" id="construct-library.GreeterBucket.addCorsRule"></a>
 
 \`\`\`python
 def add_cors_rule(
@@ -5309,7 +5309,7 @@ def add_cors_rule(
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`allowed_methods\`<sup>Required</sup> <a name=\\"allowed_methods\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.allowedMethods\\"></a>
+###### \`allowed_methods\`<sup>Required</sup> <a name="allowed_methods" id="construct-library.GreeterBucket.addCorsRule.parameter.allowedMethods"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.HttpMethods]
 
@@ -5317,7 +5317,7 @@ An HTTP method that you allow the origin to execute.
 
 ---
 
-###### \`allowed_origins\`<sup>Required</sup> <a name=\\"allowed_origins\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.allowedOrigins\\"></a>
+###### \`allowed_origins\`<sup>Required</sup> <a name="allowed_origins" id="construct-library.GreeterBucket.addCorsRule.parameter.allowedOrigins"></a>
 
 - *Type:* typing.List[str]
 
@@ -5325,7 +5325,7 @@ One or more origins you want customers to be able to access the bucket from.
 
 ---
 
-###### \`allowed_headers\`<sup>Optional</sup> <a name=\\"allowed_headers\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.allowedHeaders\\"></a>
+###### \`allowed_headers\`<sup>Optional</sup> <a name="allowed_headers" id="construct-library.GreeterBucket.addCorsRule.parameter.allowedHeaders"></a>
 
 - *Type:* typing.List[str]
 - *Default:* No headers allowed.
@@ -5334,7 +5334,7 @@ Headers that are specified in the Access-Control-Request-Headers header.
 
 ---
 
-###### \`exposed_headers\`<sup>Optional</sup> <a name=\\"exposed_headers\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.exposedHeaders\\"></a>
+###### \`exposed_headers\`<sup>Optional</sup> <a name="exposed_headers" id="construct-library.GreeterBucket.addCorsRule.parameter.exposedHeaders"></a>
 
 - *Type:* typing.List[str]
 - *Default:* No headers exposed.
@@ -5343,7 +5343,7 @@ One or more headers in the response that you want customers to be able to access
 
 ---
 
-###### \`id\`<sup>Optional</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.id\\"></a>
+###### \`id\`<sup>Optional</sup> <a name="id" id="construct-library.GreeterBucket.addCorsRule.parameter.id"></a>
 
 - *Type:* str
 - *Default:* No id specified.
@@ -5352,7 +5352,7 @@ A unique identifier for this rule.
 
 ---
 
-###### \`max_age\`<sup>Optional</sup> <a name=\\"max_age\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.maxAge\\"></a>
+###### \`max_age\`<sup>Optional</sup> <a name="max_age" id="construct-library.GreeterBucket.addCorsRule.parameter.maxAge"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No caching.
@@ -5361,7 +5361,7 @@ The time in seconds that your browser is to cache the preflight response for the
 
 ---
 
-##### \`add_inventory\` <a name=\\"add_inventory\\" id=\\"construct-library.GreeterBucket.addInventory\\"></a>
+##### \`add_inventory\` <a name="add_inventory" id="construct-library.GreeterBucket.addInventory"></a>
 
 \`\`\`python
 def add_inventory(
@@ -5378,7 +5378,7 @@ def add_inventory(
 
 Add an inventory configuration.
 
-###### \`destination\`<sup>Required</sup> <a name=\\"destination\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.destination\\"></a>
+###### \`destination\`<sup>Required</sup> <a name="destination" id="construct-library.GreeterBucket.addInventory.parameter.destination"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryDestination
 
@@ -5386,7 +5386,7 @@ The destination of the inventory.
 
 ---
 
-###### \`enabled\`<sup>Optional</sup> <a name=\\"enabled\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.enabled\\"></a>
+###### \`enabled\`<sup>Optional</sup> <a name="enabled" id="construct-library.GreeterBucket.addInventory.parameter.enabled"></a>
 
 - *Type:* bool
 - *Default:* true
@@ -5395,7 +5395,7 @@ Whether the inventory is enabled or disabled.
 
 ---
 
-###### \`format\`<sup>Optional</sup> <a name=\\"format\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.format\\"></a>
+###### \`format\`<sup>Optional</sup> <a name="format" id="construct-library.GreeterBucket.addInventory.parameter.format"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryFormat
 - *Default:* InventoryFormat.CSV
@@ -5404,7 +5404,7 @@ The format of the inventory.
 
 ---
 
-###### \`frequency\`<sup>Optional</sup> <a name=\\"frequency\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.frequency\\"></a>
+###### \`frequency\`<sup>Optional</sup> <a name="frequency" id="construct-library.GreeterBucket.addInventory.parameter.frequency"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryFrequency
 - *Default:* InventoryFrequency.WEEKLY
@@ -5413,7 +5413,7 @@ Frequency at which the inventory should be generated.
 
 ---
 
-###### \`include_object_versions\`<sup>Optional</sup> <a name=\\"include_object_versions\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.includeObjectVersions\\"></a>
+###### \`include_object_versions\`<sup>Optional</sup> <a name="include_object_versions" id="construct-library.GreeterBucket.addInventory.parameter.includeObjectVersions"></a>
 
 - *Type:* aws_cdk.aws_s3.InventoryObjectVersion
 - *Default:* InventoryObjectVersion.ALL
@@ -5422,7 +5422,7 @@ If the inventory should contain all the object versions or only the current one.
 
 ---
 
-###### \`inventory_id\`<sup>Optional</sup> <a name=\\"inventory_id\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.inventoryId\\"></a>
+###### \`inventory_id\`<sup>Optional</sup> <a name="inventory_id" id="construct-library.GreeterBucket.addInventory.parameter.inventoryId"></a>
 
 - *Type:* str
 - *Default:* generated ID.
@@ -5431,7 +5431,7 @@ The inventory configuration ID.
 
 ---
 
-###### \`objects_prefix\`<sup>Optional</sup> <a name=\\"objects_prefix\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.objectsPrefix\\"></a>
+###### \`objects_prefix\`<sup>Optional</sup> <a name="objects_prefix" id="construct-library.GreeterBucket.addInventory.parameter.objectsPrefix"></a>
 
 - *Type:* str
 - *Default:* No objects prefix
@@ -5440,7 +5440,7 @@ The inventory will only include objects that meet the prefix filter criteria.
 
 ---
 
-###### \`optional_fields\`<sup>Optional</sup> <a name=\\"optional_fields\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.optionalFields\\"></a>
+###### \`optional_fields\`<sup>Optional</sup> <a name="optional_fields" id="construct-library.GreeterBucket.addInventory.parameter.optionalFields"></a>
 
 - *Type:* typing.List[str]
 - *Default:* No optional fields.
@@ -5449,7 +5449,7 @@ A list of optional fields to be included in the inventory result.
 
 ---
 
-##### \`add_lifecycle_rule\` <a name=\\"add_lifecycle_rule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule\\"></a>
+##### \`add_lifecycle_rule\` <a name="add_lifecycle_rule" id="construct-library.GreeterBucket.addLifecycleRule"></a>
 
 \`\`\`python
 def add_lifecycle_rule(
@@ -5472,7 +5472,7 @@ def add_lifecycle_rule(
 
 Add a lifecycle rule to the bucket.
 
-###### \`abort_incomplete_multipart_upload_after\`<sup>Optional</sup> <a name=\\"abort_incomplete_multipart_upload_after\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.abortIncompleteMultipartUploadAfter\\"></a>
+###### \`abort_incomplete_multipart_upload_after\`<sup>Optional</sup> <a name="abort_incomplete_multipart_upload_after" id="construct-library.GreeterBucket.addLifecycleRule.parameter.abortIncompleteMultipartUploadAfter"></a>
 
 - *Type:* aws_cdk.core.Duration
 - *Default:* Incomplete uploads are never aborted
@@ -5486,7 +5486,7 @@ associated with the multipart upload.
 
 ---
 
-###### \`enabled\`<sup>Optional</sup> <a name=\\"enabled\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.enabled\\"></a>
+###### \`enabled\`<sup>Optional</sup> <a name="enabled" id="construct-library.GreeterBucket.addLifecycleRule.parameter.enabled"></a>
 
 - *Type:* bool
 - *Default:* true
@@ -5495,7 +5495,7 @@ Whether this rule is enabled.
 
 ---
 
-###### \`expiration\`<sup>Optional</sup> <a name=\\"expiration\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.expiration\\"></a>
+###### \`expiration\`<sup>Optional</sup> <a name="expiration" id="construct-library.GreeterBucket.addLifecycleRule.parameter.expiration"></a>
 
 - *Type:* aws_cdk.core.Duration
 - *Default:* No expiration timeout
@@ -5508,7 +5508,7 @@ expiration time must also be later than the transition time.
 
 ---
 
-###### \`expiration_date\`<sup>Optional</sup> <a name=\\"expiration_date\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.expirationDate\\"></a>
+###### \`expiration_date\`<sup>Optional</sup> <a name="expiration_date" id="construct-library.GreeterBucket.addLifecycleRule.parameter.expirationDate"></a>
 
 - *Type:* datetime.datetime
 - *Default:* No expiration date
@@ -5523,7 +5523,7 @@ expiration time must also be later than the transition time.
 
 ---
 
-###### \`expired_object_delete_marker\`<sup>Optional</sup> <a name=\\"expired_object_delete_marker\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.expiredObjectDeleteMarker\\"></a>
+###### \`expired_object_delete_marker\`<sup>Optional</sup> <a name="expired_object_delete_marker" id="construct-library.GreeterBucket.addLifecycleRule.parameter.expiredObjectDeleteMarker"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -5534,7 +5534,7 @@ If set to true, the delete marker will be expired.
 
 ---
 
-###### \`id\`<sup>Optional</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.id\\"></a>
+###### \`id\`<sup>Optional</sup> <a name="id" id="construct-library.GreeterBucket.addLifecycleRule.parameter.id"></a>
 
 - *Type:* str
 
@@ -5544,7 +5544,7 @@ The value cannot be more than 255 characters.
 
 ---
 
-###### \`noncurrent_version_expiration\`<sup>Optional</sup> <a name=\\"noncurrent_version_expiration\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.noncurrentVersionExpiration\\"></a>
+###### \`noncurrent_version_expiration\`<sup>Optional</sup> <a name="noncurrent_version_expiration" id="construct-library.GreeterBucket.addLifecycleRule.parameter.noncurrentVersionExpiration"></a>
 
 - *Type:* aws_cdk.core.Duration
 - *Default:* No noncurrent version expiration
@@ -5560,7 +5560,7 @@ transition time.
 
 ---
 
-###### \`noncurrent_versions_to_retain\`<sup>Optional</sup> <a name=\\"noncurrent_versions_to_retain\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.noncurrentVersionsToRetain\\"></a>
+###### \`noncurrent_versions_to_retain\`<sup>Optional</sup> <a name="noncurrent_versions_to_retain" id="construct-library.GreeterBucket.addLifecycleRule.parameter.noncurrentVersionsToRetain"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No noncurrent versions to retain
@@ -5572,7 +5572,7 @@ Amazon S3 permanently deletes them.
 
 ---
 
-###### \`noncurrent_version_transitions\`<sup>Optional</sup> <a name=\\"noncurrent_version_transitions\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.noncurrentVersionTransitions\\"></a>
+###### \`noncurrent_version_transitions\`<sup>Optional</sup> <a name="noncurrent_version_transitions" id="construct-library.GreeterBucket.addLifecycleRule.parameter.noncurrentVersionTransitions"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.NoncurrentVersionTransition]
 
@@ -5585,7 +5585,7 @@ must be later than the transition time.
 
 ---
 
-###### \`object_size_greater_than\`<sup>Optional</sup> <a name=\\"object_size_greater_than\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.objectSizeGreaterThan\\"></a>
+###### \`object_size_greater_than\`<sup>Optional</sup> <a name="object_size_greater_than" id="construct-library.GreeterBucket.addLifecycleRule.parameter.objectSizeGreaterThan"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No rule
@@ -5594,7 +5594,7 @@ Specifies the minimum object size in bytes for this rule to apply to.
 
 ---
 
-###### \`object_size_less_than\`<sup>Optional</sup> <a name=\\"object_size_less_than\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.objectSizeLessThan\\"></a>
+###### \`object_size_less_than\`<sup>Optional</sup> <a name="object_size_less_than" id="construct-library.GreeterBucket.addLifecycleRule.parameter.objectSizeLessThan"></a>
 
 - *Type:* typing.Union[int, float]
 - *Default:* No rule
@@ -5603,7 +5603,7 @@ Specifies the maximum object size in bytes for this rule to apply to.
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.GreeterBucket.addLifecycleRule.parameter.prefix"></a>
 
 - *Type:* str
 - *Default:* Rule applies to all objects
@@ -5612,7 +5612,7 @@ Object key prefix that identifies one or more objects to which this rule applies
 
 ---
 
-###### \`tag_filters\`<sup>Optional</sup> <a name=\\"tag_filters\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.tagFilters\\"></a>
+###### \`tag_filters\`<sup>Optional</sup> <a name="tag_filters" id="construct-library.GreeterBucket.addLifecycleRule.parameter.tagFilters"></a>
 
 - *Type:* typing.Mapping[typing.Any]
 - *Default:* Rule applies to all objects
@@ -5621,7 +5621,7 @@ The TagFilter property type specifies tags to use to identify a subset of object
 
 ---
 
-###### \`transitions\`<sup>Optional</sup> <a name=\\"transitions\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.transitions\\"></a>
+###### \`transitions\`<sup>Optional</sup> <a name="transitions" id="construct-library.GreeterBucket.addLifecycleRule.parameter.transitions"></a>
 
 - *Type:* typing.List[aws_cdk.aws_s3.Transition]
 - *Default:* No transition rules
@@ -5634,7 +5634,7 @@ expiration time must also be later than the transition time.
 
 ---
 
-##### \`add_metric\` <a name=\\"add_metric\\" id=\\"construct-library.GreeterBucket.addMetric\\"></a>
+##### \`add_metric\` <a name="add_metric" id="construct-library.GreeterBucket.addMetric"></a>
 
 \`\`\`python
 def add_metric(
@@ -5646,7 +5646,7 @@ def add_metric(
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.addMetric.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.addMetric.parameter.id"></a>
 
 - *Type:* str
 
@@ -5654,7 +5654,7 @@ The ID used to identify the metrics configuration.
 
 ---
 
-###### \`prefix\`<sup>Optional</sup> <a name=\\"prefix\\" id=\\"construct-library.GreeterBucket.addMetric.parameter.prefix\\"></a>
+###### \`prefix\`<sup>Optional</sup> <a name="prefix" id="construct-library.GreeterBucket.addMetric.parameter.prefix"></a>
 
 - *Type:* str
 
@@ -5662,7 +5662,7 @@ The prefix that an object must have to be included in the metrics results.
 
 ---
 
-###### \`tag_filters\`<sup>Optional</sup> <a name=\\"tag_filters\\" id=\\"construct-library.GreeterBucket.addMetric.parameter.tagFilters\\"></a>
+###### \`tag_filters\`<sup>Optional</sup> <a name="tag_filters" id="construct-library.GreeterBucket.addMetric.parameter.tagFilters"></a>
 
 - *Type:* typing.Mapping[typing.Any]
 
@@ -5672,25 +5672,25 @@ The metrics configuration includes only objects that meet the filter's criteria.
 
 ---
 
-##### \`greet\` <a name=\\"greet\\" id=\\"construct-library.GreeterBucket.greet\\"></a>
+##### \`greet\` <a name="greet" id="construct-library.GreeterBucket.greet"></a>
 
 \`\`\`python
 def greet() -> None
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.isResource\\">is_resource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketArn\\">from_bucket_arn</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketAttributes\\">from_bucket_attributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketName\\">from_bucket_name</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.validateBucketName\\">validate_bucket_name</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#construct-library.GreeterBucket.isResource">is_resource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketArn">from_bucket_arn</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.fromBucketAttributes">from_bucket_attributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketName">from_bucket_name</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.validateBucketName">validate_bucket_name</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`is_resource\` <a name=\\"is_resource\\" id=\\"construct-library.GreeterBucket.isResource\\"></a>
+##### \`is_resource\` <a name="is_resource" id="construct-library.GreeterBucket.isResource"></a>
 
 \`\`\`python
 import construct_library
@@ -5702,13 +5702,13 @@ construct_library.GreeterBucket.is_resource(
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.GreeterBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.GreeterBucket.isResource.parameter.construct"></a>
 
 - *Type:* aws_cdk.core.IConstruct
 
 ---
 
-##### \`from_bucket_arn\` <a name=\\"from_bucket_arn\\" id=\\"construct-library.GreeterBucket.fromBucketArn\\"></a>
+##### \`from_bucket_arn\` <a name="from_bucket_arn" id="construct-library.GreeterBucket.fromBucketArn"></a>
 
 \`\`\`python
 import construct_library
@@ -5720,25 +5720,25 @@ construct_library.GreeterBucket.from_bucket_arn(
 )
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketArn.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketArn.parameter.id"></a>
 
 - *Type:* str
 
 ---
 
-###### \`bucket_arn\`<sup>Required</sup> <a name=\\"bucket_arn\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucket_arn\`<sup>Required</sup> <a name="bucket_arn" id="construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* str
 
 ---
 
-##### \`from_bucket_attributes\` <a name=\\"from_bucket_attributes\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes\\"></a>
+##### \`from_bucket_attributes\` <a name="from_bucket_attributes" id="construct-library.GreeterBucket.fromBucketAttributes"></a>
 
 \`\`\`python
 import construct_library
@@ -5763,7 +5763,7 @@ construct_library.GreeterBucket.from_bucket_attributes(
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
@@ -5771,7 +5771,7 @@ The parent creating construct (usually \`this\`).
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.id"></a>
 
 - *Type:* str
 
@@ -5779,7 +5779,7 @@ The construct's name.
 
 ---
 
-###### \`account\`<sup>Optional</sup> <a name=\\"account\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.account\\"></a>
+###### \`account\`<sup>Optional</sup> <a name="account" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.account"></a>
 
 - *Type:* str
 - *Default:* it's assumed the bucket belongs to the same account as the scope it's being imported into
@@ -5788,7 +5788,7 @@ The account this existing bucket belongs to.
 
 ---
 
-###### \`bucket_arn\`<sup>Optional</sup> <a name=\\"bucket_arn\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketArn\\"></a>
+###### \`bucket_arn\`<sup>Optional</sup> <a name="bucket_arn" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketArn"></a>
 
 - *Type:* str
 
@@ -5799,7 +5799,7 @@ defined in order to initialize a bucket ref.
 
 ---
 
-###### \`bucket_domain_name\`<sup>Optional</sup> <a name=\\"bucket_domain_name\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketDomainName\\"></a>
+###### \`bucket_domain_name\`<sup>Optional</sup> <a name="bucket_domain_name" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketDomainName"></a>
 
 - *Type:* str
 - *Default:* Inferred from bucket name
@@ -5808,7 +5808,7 @@ The domain name of the bucket.
 
 ---
 
-###### \`bucket_dual_stack_domain_name\`<sup>Optional</sup> <a name=\\"bucket_dual_stack_domain_name\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketDualStackDomainName\\"></a>
+###### \`bucket_dual_stack_domain_name\`<sup>Optional</sup> <a name="bucket_dual_stack_domain_name" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketDualStackDomainName"></a>
 
 - *Type:* str
 
@@ -5816,7 +5816,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-###### \`bucket_name\`<sup>Optional</sup> <a name=\\"bucket_name\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketName\\"></a>
+###### \`bucket_name\`<sup>Optional</sup> <a name="bucket_name" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketName"></a>
 
 - *Type:* str
 
@@ -5829,7 +5829,7 @@ policy, won't work.
 
 ---
 
-###### \`bucket_regional_domain_name\`<sup>Optional</sup> <a name=\\"bucket_regional_domain_name\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketRegionalDomainName\\"></a>
+###### \`bucket_regional_domain_name\`<sup>Optional</sup> <a name="bucket_regional_domain_name" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketRegionalDomainName"></a>
 
 - *Type:* str
 
@@ -5837,7 +5837,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-###### \`bucket_website_new_url_format\`<sup>Optional</sup> <a name=\\"bucket_website_new_url_format\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketWebsiteNewUrlFormat\\"></a>
+###### \`bucket_website_new_url_format\`<sup>Optional</sup> <a name="bucket_website_new_url_format" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketWebsiteNewUrlFormat"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -5849,7 +5849,7 @@ regions launched since 2014.
 
 ---
 
-###### \`bucket_website_url\`<sup>Optional</sup> <a name=\\"bucket_website_url\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketWebsiteUrl\\"></a>
+###### \`bucket_website_url\`<sup>Optional</sup> <a name="bucket_website_url" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.bucketWebsiteUrl"></a>
 
 - *Type:* str
 - *Default:* Inferred from bucket name
@@ -5858,13 +5858,13 @@ The website URL of the bucket (if static web hosting is enabled).
 
 ---
 
-###### \`encryption_key\`<sup>Optional</sup> <a name=\\"encryption_key\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.encryptionKey\\"></a>
+###### \`encryption_key\`<sup>Optional</sup> <a name="encryption_key" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.encryptionKey"></a>
 
 - *Type:* aws_cdk.aws_kms.IKey
 
 ---
 
-###### \`is_website\`<sup>Optional</sup> <a name=\\"is_website\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.isWebsite\\"></a>
+###### \`is_website\`<sup>Optional</sup> <a name="is_website" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.isWebsite"></a>
 
 - *Type:* bool
 - *Default:* false
@@ -5873,7 +5873,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-###### \`notifications_handler_role\`<sup>Optional</sup> <a name=\\"notifications_handler_role\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.notificationsHandlerRole\\"></a>
+###### \`notifications_handler_role\`<sup>Optional</sup> <a name="notifications_handler_role" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.notificationsHandlerRole"></a>
 
 - *Type:* aws_cdk.aws_iam.IRole
 - *Default:* a new role will be created.
@@ -5882,7 +5882,7 @@ The role to be used by the notifications handler.
 
 ---
 
-###### \`region\`<sup>Optional</sup> <a name=\\"region\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.region\\"></a>
+###### \`region\`<sup>Optional</sup> <a name="region" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.region"></a>
 
 - *Type:* str
 - *Default:* it's assumed the bucket is in the same region as the scope it's being imported into
@@ -5891,7 +5891,7 @@ The region this existing bucket is in.
 
 ---
 
-##### \`from_bucket_name\` <a name=\\"from_bucket_name\\" id=\\"construct-library.GreeterBucket.fromBucketName\\"></a>
+##### \`from_bucket_name\` <a name="from_bucket_name" id="construct-library.GreeterBucket.fromBucketName"></a>
 
 \`\`\`python
 import construct_library
@@ -5903,25 +5903,25 @@ construct_library.GreeterBucket.from_bucket_name(
 )
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketName.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketName.parameter.id"></a>
 
 - *Type:* str
 
 ---
 
-###### \`bucket_name\`<sup>Required</sup> <a name=\\"bucket_name\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucket_name\`<sup>Required</sup> <a name="bucket_name" id="construct-library.GreeterBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* str
 
 ---
 
-##### \`validate_bucket_name\` <a name=\\"validate_bucket_name\\" id=\\"construct-library.GreeterBucket.validateBucketName\\"></a>
+##### \`validate_bucket_name\` <a name="validate_bucket_name" id="construct-library.GreeterBucket.validateBucketName"></a>
 
 \`\`\`python
 import construct_library
@@ -5933,7 +5933,7 @@ construct_library.GreeterBucket.validate_bucket_name(
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physical_name\`<sup>Required</sup> <a name=\\"physical_name\\" id=\\"construct-library.GreeterBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physical_name\`<sup>Required</sup> <a name="physical_name" id="construct-library.GreeterBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* str
 
@@ -5941,27 +5941,27 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.property.node\\">node</a></code> | <code>aws_cdk.core.ConstructNode</code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.env\\">env</a></code> | <code>aws_cdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.stack\\">stack</a></code> | <code>aws_cdk.core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketArn\\">bucket_arn</a></code> | <code>str</code> | The ARN of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDomainName\\">bucket_domain_name</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDualStackDomainName\\">bucket_dual_stack_domain_name</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketName\\">bucket_name</a></code> | <code>str</code> | The name of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketRegionalDomainName\\">bucket_regional_domain_name</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteDomainName\\">bucket_website_domain_name</a></code> | <code>str</code> | The Domain name of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteUrl\\">bucket_website_url</a></code> | <code>str</code> | The URL of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.encryptionKey\\">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.isWebsite\\">is_website</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.policy\\">policy</a></code> | <code>aws_cdk.aws_s3.BucketPolicy</code> | The resource policy associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.node">node</a></code> | <code>aws_cdk.core.ConstructNode</code> | The construct tree node associated with this construct. |
+| <code><a href="#construct-library.GreeterBucket.property.env">env</a></code> | <code>aws_cdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#construct-library.GreeterBucket.property.stack">stack</a></code> | <code>aws_cdk.core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketArn">bucket_arn</a></code> | <code>str</code> | The ARN of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDomainName">bucket_domain_name</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDualStackDomainName">bucket_dual_stack_domain_name</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketName">bucket_name</a></code> | <code>str</code> | The name of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketRegionalDomainName">bucket_regional_domain_name</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteDomainName">bucket_website_domain_name</a></code> | <code>str</code> | The Domain name of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteUrl">bucket_website_url</a></code> | <code>str</code> | The URL of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.encryptionKey">encryption_key</a></code> | <code>aws_cdk.aws_kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.isWebsite">is_website</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#construct-library.GreeterBucket.property.policy">policy</a></code> | <code>aws_cdk.aws_s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.GreeterBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.GreeterBucket.property.node"></a>
 
 \`\`\`python
 node: ConstructNode
@@ -5973,7 +5973,7 @@ The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.GreeterBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.GreeterBucket.property.env"></a>
 
 \`\`\`python
 env: ResourceEnvironment
@@ -5992,7 +5992,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.GreeterBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.GreeterBucket.property.stack"></a>
 
 \`\`\`python
 stack: Stack
@@ -6004,7 +6004,7 @@ The stack in which this resource is defined.
 
 ---
 
-##### \`bucket_arn\`<sup>Required</sup> <a name=\\"bucket_arn\\" id=\\"construct-library.GreeterBucket.property.bucketArn\\"></a>
+##### \`bucket_arn\`<sup>Required</sup> <a name="bucket_arn" id="construct-library.GreeterBucket.property.bucketArn"></a>
 
 \`\`\`python
 bucket_arn: str
@@ -6016,7 +6016,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucket_domain_name\`<sup>Required</sup> <a name=\\"bucket_domain_name\\" id=\\"construct-library.GreeterBucket.property.bucketDomainName\\"></a>
+##### \`bucket_domain_name\`<sup>Required</sup> <a name="bucket_domain_name" id="construct-library.GreeterBucket.property.bucketDomainName"></a>
 
 \`\`\`python
 bucket_domain_name: str
@@ -6028,7 +6028,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucket_dual_stack_domain_name\`<sup>Required</sup> <a name=\\"bucket_dual_stack_domain_name\\" id=\\"construct-library.GreeterBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucket_dual_stack_domain_name\`<sup>Required</sup> <a name="bucket_dual_stack_domain_name" id="construct-library.GreeterBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`python
 bucket_dual_stack_domain_name: str
@@ -6040,7 +6040,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucket_name\`<sup>Required</sup> <a name=\\"bucket_name\\" id=\\"construct-library.GreeterBucket.property.bucketName\\"></a>
+##### \`bucket_name\`<sup>Required</sup> <a name="bucket_name" id="construct-library.GreeterBucket.property.bucketName"></a>
 
 \`\`\`python
 bucket_name: str
@@ -6052,7 +6052,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucket_regional_domain_name\`<sup>Required</sup> <a name=\\"bucket_regional_domain_name\\" id=\\"construct-library.GreeterBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucket_regional_domain_name\`<sup>Required</sup> <a name="bucket_regional_domain_name" id="construct-library.GreeterBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`python
 bucket_regional_domain_name: str
@@ -6064,7 +6064,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucket_website_domain_name\`<sup>Required</sup> <a name=\\"bucket_website_domain_name\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucket_website_domain_name\`<sup>Required</sup> <a name="bucket_website_domain_name" id="construct-library.GreeterBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`python
 bucket_website_domain_name: str
@@ -6076,7 +6076,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucket_website_url\`<sup>Required</sup> <a name=\\"bucket_website_url\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucket_website_url\`<sup>Required</sup> <a name="bucket_website_url" id="construct-library.GreeterBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`python
 bucket_website_url: str
@@ -6088,7 +6088,7 @@ The URL of the static website.
 
 ---
 
-##### \`encryption_key\`<sup>Optional</sup> <a name=\\"encryption_key\\" id=\\"construct-library.GreeterBucket.property.encryptionKey\\"></a>
+##### \`encryption_key\`<sup>Optional</sup> <a name="encryption_key" id="construct-library.GreeterBucket.property.encryptionKey"></a>
 
 \`\`\`python
 encryption_key: IKey
@@ -6100,7 +6100,7 @@ Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`is_website\`<sup>Optional</sup> <a name=\\"is_website\\" id=\\"construct-library.GreeterBucket.property.isWebsite\\"></a>
+##### \`is_website\`<sup>Optional</sup> <a name="is_website" id="construct-library.GreeterBucket.property.isWebsite"></a>
 
 \`\`\`python
 is_website: bool
@@ -6112,7 +6112,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.GreeterBucket.property.policy"></a>
 
 \`\`\`python
 policy: BucketPolicy
@@ -6135,13 +6135,13 @@ first call to addToResourcePolicy(s).
 `;
 
 exports[`specify root submodule 1`] = `
-"# API Reference <a name=\\"API Reference\\" id=\\"api-reference\\"></a>
+"# API Reference <a name="API Reference" id="api-reference"></a>
 
-## Resources <a name=\\"Resources\\" id=\\"Resources\\"></a>
+## Resources <a name="Resources" id="Resources"></a>
 
-### GreeterBucket <a name=\\"GreeterBucket\\" id=\\"construct-library.GreeterBucket\\"></a>
+### GreeterBucket <a name="GreeterBucket" id="construct-library.GreeterBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.GreeterBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.GreeterBucket.Initializer"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -6151,63 +6151,63 @@ new GreeterBucket(scope: Construct, id: string, props?: BucketProps)
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.scope\\">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.id\\">id</a></code> | <code>string</code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.props\\">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.id">id</a></code> | <code>string</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.props">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
 
 ---
 
-##### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.scope\\"></a>
+##### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.Initializer.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-##### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.id\\"></a>
+##### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.Initializer.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-##### \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.props\\"></a>
+##### \`props\`<sup>Optional</sup> <a name="props" id="construct-library.GreeterBucket.Initializer.parameter.props"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketProps
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.applyRemovalPolicy\\">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.addEventNotification\\">addEventNotification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectCreatedNotification\\">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectRemovedNotification\\">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addToResourcePolicy\\">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#construct-library.GreeterBucket.arnForObjects\\">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantDelete\\">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPublicAccess\\">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPut\\">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPutAcl\\">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantRead\\">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantReadWrite\\">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantWrite\\">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailPutObject\\">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailWriteObject\\">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#construct-library.GreeterBucket.s3UrlForObject\\">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.transferAccelerationUrlForObject\\">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#construct-library.GreeterBucket.urlForObject\\">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.virtualHostedUrlForObject\\">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.addCorsRule\\">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addInventory\\">addInventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#construct-library.GreeterBucket.addLifecycleRule\\">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addMetric\\">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.greet\\">greet</a></code> | *No description.* |
-
----
-
-##### \`applyRemovalPolicy\` <a name=\\"applyRemovalPolicy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy\\"></a>
+| <code><a href="#construct-library.GreeterBucket.applyRemovalPolicy">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#construct-library.GreeterBucket.addEventNotification">addEventNotification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#construct-library.GreeterBucket.addObjectCreatedNotification">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addObjectRemovedNotification">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addToResourcePolicy">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#construct-library.GreeterBucket.arnForObjects">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#construct-library.GreeterBucket.grantDelete">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPublicAccess">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPut">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.grantPutAcl">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantRead">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantReadWrite">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantWrite">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailPutObject">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailWriteObject">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#construct-library.GreeterBucket.s3UrlForObject">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#construct-library.GreeterBucket.transferAccelerationUrlForObject">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#construct-library.GreeterBucket.urlForObject">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#construct-library.GreeterBucket.virtualHostedUrlForObject">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#construct-library.GreeterBucket.addCorsRule">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#construct-library.GreeterBucket.addInventory">addInventory</a></code> | Add an inventory configuration. |
+| <code><a href="#construct-library.GreeterBucket.addLifecycleRule">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addMetric">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.greet">greet</a></code> | *No description.* |
+
+---
+
+##### \`applyRemovalPolicy\` <a name="applyRemovalPolicy" id="construct-library.GreeterBucket.applyRemovalPolicy"></a>
 
 \`\`\`typescript
 public applyRemovalPolicy(policy: RemovalPolicy): void
@@ -6223,13 +6223,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy"></a>
 
 - *Type:* @aws-cdk/core.RemovalPolicy
 
 ---
 
-##### \`addEventNotification\` <a name=\\"addEventNotification\\" id=\\"construct-library.GreeterBucket.addEventNotification\\"></a>
+##### \`addEventNotification\` <a name="addEventNotification" id="construct-library.GreeterBucket.addEventNotification"></a>
 
 \`\`\`typescript
 public addEventNotification(event: EventType, dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -6248,7 +6248,7 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.GreeterBucket.addEventNotification.parameter.event"></a>
 
 - *Type:* @aws-cdk/aws-s3.EventType
 
@@ -6256,7 +6256,7 @@ The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addEventNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -6264,7 +6264,7 @@ The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addEventNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -6276,7 +6276,7 @@ for details about allowed filter rules.
 
 ---
 
-##### \`addObjectCreatedNotification\` <a name=\\"addObjectCreatedNotification\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification\\"></a>
+##### \`addObjectCreatedNotification\` <a name="addObjectCreatedNotification" id="construct-library.GreeterBucket.addObjectCreatedNotification"></a>
 
 \`\`\`typescript
 public addObjectCreatedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -6287,7 +6287,7 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -6295,7 +6295,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -6303,7 +6303,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addObjectRemovedNotification\` <a name=\\"addObjectRemovedNotification\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification\\"></a>
+##### \`addObjectRemovedNotification\` <a name="addObjectRemovedNotification" id="construct-library.GreeterBucket.addObjectRemovedNotification"></a>
 
 \`\`\`typescript
 public addObjectRemovedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -6314,7 +6314,7 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -6322,7 +6322,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -6330,7 +6330,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy\\"></a>
+##### \`addToResourcePolicy\` <a name="addToResourcePolicy" id="construct-library.GreeterBucket.addToResourcePolicy"></a>
 
 \`\`\`typescript
 public addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult
@@ -6344,7 +6344,7 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.GreeterBucket.addToResourcePolicy.parameter.permission"></a>
 
 - *Type:* @aws-cdk/aws-iam.PolicyStatement
 
@@ -6352,7 +6352,7 @@ the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arnForObjects\` <a name=\\"arnForObjects\\" id=\\"construct-library.GreeterBucket.arnForObjects\\"></a>
+##### \`arnForObjects\` <a name="arnForObjects" id="construct-library.GreeterBucket.arnForObjects"></a>
 
 \`\`\`typescript
 public arnForObjects(keyPattern: string): string
@@ -6360,19 +6360,19 @@ public arnForObjects(keyPattern: string): string
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`keyPattern\`<sup>Required</sup> <a name=\\"keyPattern\\" id=\\"construct-library.GreeterBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`keyPattern\`<sup>Required</sup> <a name="keyPattern" id="construct-library.GreeterBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantDelete\` <a name=\\"grantDelete\\" id=\\"construct-library.GreeterBucket.grantDelete\\"></a>
+##### \`grantDelete\` <a name="grantDelete" id="construct-library.GreeterBucket.grantDelete"></a>
 
 \`\`\`typescript
 public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -6380,7 +6380,7 @@ public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantDelete.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -6388,7 +6388,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -6396,7 +6396,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPublicAccess\` <a name=\\"grantPublicAccess\\" id=\\"construct-library.GreeterBucket.grantPublicAccess\\"></a>
+##### \`grantPublicAccess\` <a name="grantPublicAccess" id="construct-library.GreeterBucket.grantPublicAccess"></a>
 
 \`\`\`typescript
 public grantPublicAccess(allowedActions: string, keyPrefix?: string): Grant
@@ -6409,8 +6409,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -6423,25 +6423,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowedActions\`<sup>Required</sup> <a name=\\"allowedActions\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowedActions\`<sup>Required</sup> <a name="allowedActions" id="construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* string
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`keyPrefix\`<sup>Optional</sup> <a name=\\"keyPrefix\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`keyPrefix\`<sup>Optional</sup> <a name="keyPrefix" id="construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* string
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grantPut\` <a name=\\"grantPut\\" id=\\"construct-library.GreeterBucket.grantPut\\"></a>
+##### \`grantPut\` <a name="grantPut" id="construct-library.GreeterBucket.grantPut"></a>
 
 \`\`\`typescript
 public grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -6452,7 +6452,7 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPut.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -6460,7 +6460,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -6468,7 +6468,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPutAcl\` <a name=\\"grantPutAcl\\" id=\\"construct-library.GreeterBucket.grantPutAcl\\"></a>
+##### \`grantPutAcl\` <a name="grantPutAcl" id="construct-library.GreeterBucket.grantPutAcl"></a>
 
 \`\`\`typescript
 public grantPutAcl(identity: IGrantable, objectsKeyPattern?: string): Grant
@@ -6480,19 +6480,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPutAcl.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantRead\` <a name=\\"grantRead\\" id=\\"construct-library.GreeterBucket.grantRead\\"></a>
+##### \`grantRead\` <a name="grantRead" id="construct-library.GreeterBucket.grantRead"></a>
 
 \`\`\`typescript
 public grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -6503,7 +6503,7 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantRead.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -6511,7 +6511,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -6519,7 +6519,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantReadWrite\` <a name=\\"grantReadWrite\\" id=\\"construct-library.GreeterBucket.grantReadWrite\\"></a>
+##### \`grantReadWrite\` <a name="grantReadWrite" id="construct-library.GreeterBucket.grantReadWrite"></a>
 
 \`\`\`typescript
 public grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -6538,19 +6538,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantReadWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`grantWrite\` <a name=\\"grantWrite\\" id=\\"construct-library.GreeterBucket.grantWrite\\"></a>
+##### \`grantWrite\` <a name="grantWrite" id="construct-library.GreeterBucket.grantWrite"></a>
 
 \`\`\`typescript
 public grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -6569,19 +6569,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent\\"></a>
+##### \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="construct-library.GreeterBucket.onCloudTrailEvent"></a>
 
 \`\`\`typescript
 public onCloudTrailEvent(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -6592,7 +6592,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* string
 
@@ -6600,7 +6600,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -6608,7 +6608,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailPutObject\` <a name=\\"onCloudTrailPutObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject\\"></a>
+##### \`onCloudTrailPutObject\` <a name="onCloudTrailPutObject" id="construct-library.GreeterBucket.onCloudTrailPutObject"></a>
 
 \`\`\`typescript
 public onCloudTrailPutObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -6623,7 +6623,7 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -6631,7 +6631,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -6639,7 +6639,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailWriteObject\` <a name=\\"onCloudTrailWriteObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject\\"></a>
+##### \`onCloudTrailWriteObject\` <a name="onCloudTrailWriteObject" id="construct-library.GreeterBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`typescript
 public onCloudTrailWriteObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -6657,7 +6657,7 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -6665,7 +6665,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -6673,7 +6673,7 @@ Options for adding the rule.
 
 ---
 
-##### \`s3UrlForObject\` <a name=\\"s3UrlForObject\\" id=\\"construct-library.GreeterBucket.s3UrlForObject\\"></a>
+##### \`s3UrlForObject\` <a name="s3UrlForObject" id="construct-library.GreeterBucket.s3UrlForObject"></a>
 
 \`\`\`typescript
 public s3UrlForObject(key?: string): string
@@ -6684,7 +6684,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -6695,7 +6695,7 @@ bucket is returned.
 
 ---
 
-##### \`transferAccelerationUrlForObject\` <a name=\\"transferAccelerationUrlForObject\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transferAccelerationUrlForObject\` <a name="transferAccelerationUrlForObject" id="construct-library.GreeterBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`typescript
 public transferAccelerationUrlForObject(key?: string, options?: TransferAccelerationUrlOptions): string
@@ -6709,7 +6709,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -6720,7 +6720,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.TransferAccelerationUrlOptions
 
@@ -6728,7 +6728,7 @@ Options for generating URL.
 
 ---
 
-##### \`urlForObject\` <a name=\\"urlForObject\\" id=\\"construct-library.GreeterBucket.urlForObject\\"></a>
+##### \`urlForObject\` <a name="urlForObject" id="construct-library.GreeterBucket.urlForObject"></a>
 
 \`\`\`typescript
 public urlForObject(key?: string): string
@@ -6740,7 +6740,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.urlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -6751,7 +6751,7 @@ bucket is returned.
 
 ---
 
-##### \`virtualHostedUrlForObject\` <a name=\\"virtualHostedUrlForObject\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtualHostedUrlForObject\` <a name="virtualHostedUrlForObject" id="construct-library.GreeterBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`typescript
 public virtualHostedUrlForObject(key?: string, options?: VirtualHostedStyleUrlOptions): string
@@ -6764,7 +6764,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -6775,7 +6775,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.VirtualHostedStyleUrlOptions
 
@@ -6783,7 +6783,7 @@ Options for generating URL.
 
 ---
 
-##### \`addCorsRule\` <a name=\\"addCorsRule\\" id=\\"construct-library.GreeterBucket.addCorsRule\\"></a>
+##### \`addCorsRule\` <a name="addCorsRule" id="construct-library.GreeterBucket.addCorsRule"></a>
 
 \`\`\`typescript
 public addCorsRule(rule: CorsRule): void
@@ -6791,7 +6791,7 @@ public addCorsRule(rule: CorsRule): void
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addCorsRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.CorsRule
 
@@ -6799,7 +6799,7 @@ The CORS configuration rule to add.
 
 ---
 
-##### \`addInventory\` <a name=\\"addInventory\\" id=\\"construct-library.GreeterBucket.addInventory\\"></a>
+##### \`addInventory\` <a name="addInventory" id="construct-library.GreeterBucket.addInventory"></a>
 
 \`\`\`typescript
 public addInventory(inventory: Inventory): void
@@ -6807,7 +6807,7 @@ public addInventory(inventory: Inventory): void
 
 Add an inventory configuration.
 
-###### \`inventory\`<sup>Required</sup> <a name=\\"inventory\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.inventory\\"></a>
+###### \`inventory\`<sup>Required</sup> <a name="inventory" id="construct-library.GreeterBucket.addInventory.parameter.inventory"></a>
 
 - *Type:* @aws-cdk/aws-s3.Inventory
 
@@ -6815,7 +6815,7 @@ configuration to add.
 
 ---
 
-##### \`addLifecycleRule\` <a name=\\"addLifecycleRule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule\\"></a>
+##### \`addLifecycleRule\` <a name="addLifecycleRule" id="construct-library.GreeterBucket.addLifecycleRule"></a>
 
 \`\`\`typescript
 public addLifecycleRule(rule: LifecycleRule): void
@@ -6823,7 +6823,7 @@ public addLifecycleRule(rule: LifecycleRule): void
 
 Add a lifecycle rule to the bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addLifecycleRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.LifecycleRule
 
@@ -6831,7 +6831,7 @@ The rule to add.
 
 ---
 
-##### \`addMetric\` <a name=\\"addMetric\\" id=\\"construct-library.GreeterBucket.addMetric\\"></a>
+##### \`addMetric\` <a name="addMetric" id="construct-library.GreeterBucket.addMetric"></a>
 
 \`\`\`typescript
 public addMetric(metric: BucketMetrics): void
@@ -6839,7 +6839,7 @@ public addMetric(metric: BucketMetrics): void
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`metric\`<sup>Required</sup> <a name=\\"metric\\" id=\\"construct-library.GreeterBucket.addMetric.parameter.metric\\"></a>
+###### \`metric\`<sup>Required</sup> <a name="metric" id="construct-library.GreeterBucket.addMetric.parameter.metric"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketMetrics
 
@@ -6847,25 +6847,25 @@ The metric configuration to add.
 
 ---
 
-##### \`greet\` <a name=\\"greet\\" id=\\"construct-library.GreeterBucket.greet\\"></a>
+##### \`greet\` <a name="greet" id="construct-library.GreeterBucket.greet"></a>
 
 \`\`\`typescript
 public greet(): void
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.isResource\\">isResource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketArn\\">fromBucketArn</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketAttributes\\">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketName\\">fromBucketName</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.validateBucketName\\">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#construct-library.GreeterBucket.isResource">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketArn">fromBucketArn</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.fromBucketAttributes">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketName">fromBucketName</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.validateBucketName">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`isResource\` <a name=\\"isResource\\" id=\\"construct-library.GreeterBucket.isResource\\"></a>
+##### \`isResource\` <a name="isResource" id="construct-library.GreeterBucket.isResource"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -6875,13 +6875,13 @@ GreeterBucket.isResource(construct: IConstruct)
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.GreeterBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.GreeterBucket.isResource.parameter.construct"></a>
 
 - *Type:* @aws-cdk/core.IConstruct
 
 ---
 
-##### \`fromBucketArn\` <a name=\\"fromBucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn\\"></a>
+##### \`fromBucketArn\` <a name="fromBucketArn" id="construct-library.GreeterBucket.fromBucketArn"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -6889,25 +6889,25 @@ import { GreeterBucket } from 'construct-library'
 GreeterBucket.fromBucketArn(scope: Construct, id: string, bucketArn: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketArn.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketArn.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* string
 
 ---
 
-##### \`fromBucketAttributes\` <a name=\\"fromBucketAttributes\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes\\"></a>
+##### \`fromBucketAttributes\` <a name="fromBucketAttributes" id="construct-library.GreeterBucket.fromBucketAttributes"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -6917,7 +6917,7 @@ GreeterBucket.fromBucketAttributes(scope: Construct, id: string, attrs: BucketAt
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
@@ -6925,7 +6925,7 @@ The parent creating construct (usually \`this\`).
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.id"></a>
 
 - *Type:* string
 
@@ -6933,7 +6933,7 @@ The construct's name.
 
 ---
 
-###### \`attrs\`<sup>Required</sup> <a name=\\"attrs\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs\\"></a>
+###### \`attrs\`<sup>Required</sup> <a name="attrs" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketAttributes
 
@@ -6944,7 +6944,7 @@ Can be obtained from a call to
 
 ---
 
-##### \`fromBucketName\` <a name=\\"fromBucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName\\"></a>
+##### \`fromBucketName\` <a name="fromBucketName" id="construct-library.GreeterBucket.fromBucketName"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -6952,25 +6952,25 @@ import { GreeterBucket } from 'construct-library'
 GreeterBucket.fromBucketName(scope: Construct, id: string, bucketName: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.GreeterBucket.fromBucketName.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.GreeterBucket.fromBucketName.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* string
 
 ---
 
-##### \`validateBucketName\` <a name=\\"validateBucketName\\" id=\\"construct-library.GreeterBucket.validateBucketName\\"></a>
+##### \`validateBucketName\` <a name="validateBucketName" id="construct-library.GreeterBucket.validateBucketName"></a>
 
 \`\`\`typescript
 import { GreeterBucket } from 'construct-library'
@@ -6980,7 +6980,7 @@ GreeterBucket.validateBucketName(physicalName: string)
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physicalName\`<sup>Required</sup> <a name=\\"physicalName\\" id=\\"construct-library.GreeterBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physicalName\`<sup>Required</sup> <a name="physicalName" id="construct-library.GreeterBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* string
 
@@ -6988,27 +6988,27 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.property.node\\">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.env\\">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.stack\\">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketArn\\">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDomainName\\">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDualStackDomainName\\">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketName\\">bucketName</a></code> | <code>string</code> | The name of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketRegionalDomainName\\">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteDomainName\\">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteUrl\\">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.encryptionKey\\">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.isWebsite\\">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.policy\\">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.node">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
+| <code><a href="#construct-library.GreeterBucket.property.env">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#construct-library.GreeterBucket.property.stack">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketArn">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDomainName">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDualStackDomainName">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketName">bucketName</a></code> | <code>string</code> | The name of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketRegionalDomainName">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteDomainName">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteUrl">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.encryptionKey">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.isWebsite">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#construct-library.GreeterBucket.property.policy">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.GreeterBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.GreeterBucket.property.node"></a>
 
 \`\`\`typescript
 public readonly node: ConstructNode;
@@ -7020,7 +7020,7 @@ The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.GreeterBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.GreeterBucket.property.env"></a>
 
 \`\`\`typescript
 public readonly env: ResourceEnvironment;
@@ -7039,7 +7039,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.GreeterBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.GreeterBucket.property.stack"></a>
 
 \`\`\`typescript
 public readonly stack: Stack;
@@ -7051,7 +7051,7 @@ The stack in which this resource is defined.
 
 ---
 
-##### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.property.bucketArn\\"></a>
+##### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.property.bucketArn"></a>
 
 \`\`\`typescript
 public readonly bucketArn: string;
@@ -7063,7 +7063,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucketDomainName\`<sup>Required</sup> <a name=\\"bucketDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDomainName\\"></a>
+##### \`bucketDomainName\`<sup>Required</sup> <a name="bucketDomainName" id="construct-library.GreeterBucket.property.bucketDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDomainName: string;
@@ -7075,7 +7075,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name=\\"bucketDualStackDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name="bucketDualStackDomainName" id="construct-library.GreeterBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDualStackDomainName: string;
@@ -7087,7 +7087,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.property.bucketName\\"></a>
+##### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.property.bucketName"></a>
 
 \`\`\`typescript
 public readonly bucketName: string;
@@ -7099,7 +7099,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name=\\"bucketRegionalDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name="bucketRegionalDomainName" id="construct-library.GreeterBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketRegionalDomainName: string;
@@ -7111,7 +7111,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name=\\"bucketWebsiteDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name="bucketWebsiteDomainName" id="construct-library.GreeterBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteDomainName: string;
@@ -7123,7 +7123,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name=\\"bucketWebsiteUrl\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name="bucketWebsiteUrl" id="construct-library.GreeterBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteUrl: string;
@@ -7135,7 +7135,7 @@ The URL of the static website.
 
 ---
 
-##### \`encryptionKey\`<sup>Optional</sup> <a name=\\"encryptionKey\\" id=\\"construct-library.GreeterBucket.property.encryptionKey\\"></a>
+##### \`encryptionKey\`<sup>Optional</sup> <a name="encryptionKey" id="construct-library.GreeterBucket.property.encryptionKey"></a>
 
 \`\`\`typescript
 public readonly encryptionKey: IKey;
@@ -7147,7 +7147,7 @@ Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`isWebsite\`<sup>Optional</sup> <a name=\\"isWebsite\\" id=\\"construct-library.GreeterBucket.property.isWebsite\\"></a>
+##### \`isWebsite\`<sup>Optional</sup> <a name="isWebsite" id="construct-library.GreeterBucket.property.isWebsite"></a>
 
 \`\`\`typescript
 public readonly isWebsite: boolean;
@@ -7159,7 +7159,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.GreeterBucket.property.policy"></a>
 
 \`\`\`typescript
 public readonly policy: BucketPolicy;
@@ -7182,13 +7182,13 @@ first call to addToResourcePolicy(s).
 `;
 
 exports[`specify submodule 1`] = `
-"# API Reference <a name=\\"API Reference\\" id=\\"api-reference\\"></a>
+"# API Reference <a name="API Reference" id="api-reference"></a>
 
-## Resources <a name=\\"Resources\\" id=\\"Resources\\"></a>
+## Resources <a name="Resources" id="Resources"></a>
 
-### GoodbyeBucket <a name=\\"GoodbyeBucket\\" id=\\"construct-library.submod1.GoodbyeBucket\\"></a>
+### GoodbyeBucket <a name="GoodbyeBucket" id="construct-library.submod1.GoodbyeBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.submod1.GoodbyeBucket.Initializer"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -7198,63 +7198,63 @@ new submod1.GoodbyeBucket(scope: Construct, id: string, props?: BucketProps)
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope\\">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.id\\">id</a></code> | <code>string</code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.Initializer.parameter.props\\">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.id">id</a></code> | <code>string</code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.Initializer.parameter.props">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
 
 ---
 
-##### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope\\"></a>
+##### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-##### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.id\\"></a>
+##### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-##### \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"construct-library.submod1.GoodbyeBucket.Initializer.parameter.props\\"></a>
+##### \`props\`<sup>Optional</sup> <a name="props" id="construct-library.submod1.GoodbyeBucket.Initializer.parameter.props"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketProps
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.applyRemovalPolicy\\">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addEventNotification\\">addEventNotification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification\\">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification\\">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addToResourcePolicy\\">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.arnForObjects\\">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantDelete\\">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPublicAccess\\">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPut\\">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantPutAcl\\">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantRead\\">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantReadWrite\\">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.grantWrite\\">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject\\">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject\\">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.s3UrlForObject\\">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject\\">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.urlForObject\\">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject\\">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addCorsRule\\">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addInventory\\">addInventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addLifecycleRule\\">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.addMetric\\">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.goodbye\\">goodbye</a></code> | *No description.* |
-
----
-
-##### \`applyRemovalPolicy\` <a name=\\"applyRemovalPolicy\\" id=\\"construct-library.submod1.GoodbyeBucket.applyRemovalPolicy\\"></a>
+| <code><a href="#construct-library.submod1.GoodbyeBucket.applyRemovalPolicy">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addEventNotification">addEventNotification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addToResourcePolicy">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.arnForObjects">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantDelete">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPublicAccess">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPut">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantPutAcl">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantRead">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantReadWrite">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.grantWrite">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.s3UrlForObject">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.urlForObject">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addCorsRule">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addInventory">addInventory</a></code> | Add an inventory configuration. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addLifecycleRule">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.addMetric">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.goodbye">goodbye</a></code> | *No description.* |
+
+---
+
+##### \`applyRemovalPolicy\` <a name="applyRemovalPolicy" id="construct-library.submod1.GoodbyeBucket.applyRemovalPolicy"></a>
 
 \`\`\`typescript
 public applyRemovalPolicy(policy: RemovalPolicy): void
@@ -7270,13 +7270,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.submod1.GoodbyeBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.submod1.GoodbyeBucket.applyRemovalPolicy.parameter.policy"></a>
 
 - *Type:* @aws-cdk/core.RemovalPolicy
 
 ---
 
-##### \`addEventNotification\` <a name=\\"addEventNotification\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification\\"></a>
+##### \`addEventNotification\` <a name="addEventNotification" id="construct-library.submod1.GoodbyeBucket.addEventNotification"></a>
 
 \`\`\`typescript
 public addEventNotification(event: EventType, dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -7295,7 +7295,7 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.event"></a>
 
 - *Type:* @aws-cdk/aws-s3.EventType
 
@@ -7303,7 +7303,7 @@ The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -7311,7 +7311,7 @@ The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.submod1.GoodbyeBucket.addEventNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -7323,7 +7323,7 @@ for details about allowed filter rules.
 
 ---
 
-##### \`addObjectCreatedNotification\` <a name=\\"addObjectCreatedNotification\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification\\"></a>
+##### \`addObjectCreatedNotification\` <a name="addObjectCreatedNotification" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification"></a>
 
 \`\`\`typescript
 public addObjectCreatedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -7334,7 +7334,7 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -7342,7 +7342,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.submod1.GoodbyeBucket.addObjectCreatedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -7350,7 +7350,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addObjectRemovedNotification\` <a name=\\"addObjectRemovedNotification\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification\\"></a>
+##### \`addObjectRemovedNotification\` <a name="addObjectRemovedNotification" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification"></a>
 
 \`\`\`typescript
 public addObjectRemovedNotification(dest: IBucketNotificationDestination, filters: NotificationKeyFilter): void
@@ -7361,7 +7361,7 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -7369,7 +7369,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.submod1.GoodbyeBucket.addObjectRemovedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -7377,7 +7377,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"construct-library.submod1.GoodbyeBucket.addToResourcePolicy\\"></a>
+##### \`addToResourcePolicy\` <a name="addToResourcePolicy" id="construct-library.submod1.GoodbyeBucket.addToResourcePolicy"></a>
 
 \`\`\`typescript
 public addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult
@@ -7391,7 +7391,7 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.submod1.GoodbyeBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.submod1.GoodbyeBucket.addToResourcePolicy.parameter.permission"></a>
 
 - *Type:* @aws-cdk/aws-iam.PolicyStatement
 
@@ -7399,7 +7399,7 @@ the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arnForObjects\` <a name=\\"arnForObjects\\" id=\\"construct-library.submod1.GoodbyeBucket.arnForObjects\\"></a>
+##### \`arnForObjects\` <a name="arnForObjects" id="construct-library.submod1.GoodbyeBucket.arnForObjects"></a>
 
 \`\`\`typescript
 public arnForObjects(keyPattern: string): string
@@ -7407,19 +7407,19 @@ public arnForObjects(keyPattern: string): string
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`keyPattern\`<sup>Required</sup> <a name=\\"keyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`keyPattern\`<sup>Required</sup> <a name="keyPattern" id="construct-library.submod1.GoodbyeBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantDelete\` <a name=\\"grantDelete\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete\\"></a>
+##### \`grantDelete\` <a name="grantDelete" id="construct-library.submod1.GoodbyeBucket.grantDelete"></a>
 
 \`\`\`typescript
 public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -7427,7 +7427,7 @@ public grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantDelete.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -7435,7 +7435,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -7443,7 +7443,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPublicAccess\` <a name=\\"grantPublicAccess\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess\\"></a>
+##### \`grantPublicAccess\` <a name="grantPublicAccess" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess"></a>
 
 \`\`\`typescript
 public grantPublicAccess(allowedActions: string, keyPrefix?: string): Grant
@@ -7456,8 +7456,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -7470,25 +7470,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowedActions\`<sup>Required</sup> <a name=\\"allowedActions\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowedActions\`<sup>Required</sup> <a name="allowedActions" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* string
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`keyPrefix\`<sup>Optional</sup> <a name=\\"keyPrefix\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`keyPrefix\`<sup>Optional</sup> <a name="keyPrefix" id="construct-library.submod1.GoodbyeBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* string
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grantPut\` <a name=\\"grantPut\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut\\"></a>
+##### \`grantPut\` <a name="grantPut" id="construct-library.submod1.GoodbyeBucket.grantPut"></a>
 
 \`\`\`typescript
 public grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -7499,7 +7499,7 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantPut.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -7507,7 +7507,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -7515,7 +7515,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPutAcl\` <a name=\\"grantPutAcl\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl\\"></a>
+##### \`grantPutAcl\` <a name="grantPutAcl" id="construct-library.submod1.GoodbyeBucket.grantPutAcl"></a>
 
 \`\`\`typescript
 public grantPutAcl(identity: IGrantable, objectsKeyPattern?: string): Grant
@@ -7527,19 +7527,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* string
 
 ---
 
-##### \`grantRead\` <a name=\\"grantRead\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead\\"></a>
+##### \`grantRead\` <a name="grantRead" id="construct-library.submod1.GoodbyeBucket.grantRead"></a>
 
 \`\`\`typescript
 public grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -7550,7 +7550,7 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantRead.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -7558,7 +7558,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -7566,7 +7566,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantReadWrite\` <a name=\\"grantReadWrite\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite\\"></a>
+##### \`grantReadWrite\` <a name="grantReadWrite" id="construct-library.submod1.GoodbyeBucket.grantReadWrite"></a>
 
 \`\`\`typescript
 public grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -7585,19 +7585,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`grantWrite\` <a name=\\"grantWrite\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite\\"></a>
+##### \`grantWrite\` <a name="grantWrite" id="construct-library.submod1.GoodbyeBucket.grantWrite"></a>
 
 \`\`\`typescript
 public grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -7616,19 +7616,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.submod1.GoodbyeBucket.grantWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.submod1.GoodbyeBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.submod1.GoodbyeBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent\\"></a>
+##### \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent"></a>
 
 \`\`\`typescript
 public onCloudTrailEvent(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -7639,7 +7639,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* string
 
@@ -7647,7 +7647,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -7655,7 +7655,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailPutObject\` <a name=\\"onCloudTrailPutObject\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject\\"></a>
+##### \`onCloudTrailPutObject\` <a name="onCloudTrailPutObject" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject"></a>
 
 \`\`\`typescript
 public onCloudTrailPutObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -7670,7 +7670,7 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -7678,7 +7678,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.onCloudTrailPutObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -7686,7 +7686,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailWriteObject\` <a name=\\"onCloudTrailWriteObject\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject\\"></a>
+##### \`onCloudTrailWriteObject\` <a name="onCloudTrailWriteObject" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`typescript
 public onCloudTrailWriteObject(id: string, options?: OnCloudTrailBucketEventOptions): Rule
@@ -7704,7 +7704,7 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.id"></a>
 
 - *Type:* string
 
@@ -7712,7 +7712,7 @@ The id of the rule.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.onCloudTrailWriteObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -7720,7 +7720,7 @@ Options for adding the rule.
 
 ---
 
-##### \`s3UrlForObject\` <a name=\\"s3UrlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.s3UrlForObject\\"></a>
+##### \`s3UrlForObject\` <a name="s3UrlForObject" id="construct-library.submod1.GoodbyeBucket.s3UrlForObject"></a>
 
 \`\`\`typescript
 public s3UrlForObject(key?: string): string
@@ -7731,7 +7731,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -7742,7 +7742,7 @@ bucket is returned.
 
 ---
 
-##### \`transferAccelerationUrlForObject\` <a name=\\"transferAccelerationUrlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transferAccelerationUrlForObject\` <a name="transferAccelerationUrlForObject" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`typescript
 public transferAccelerationUrlForObject(key?: string, options?: TransferAccelerationUrlOptions): string
@@ -7756,7 +7756,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -7767,7 +7767,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.transferAccelerationUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.TransferAccelerationUrlOptions
 
@@ -7775,7 +7775,7 @@ Options for generating URL.
 
 ---
 
-##### \`urlForObject\` <a name=\\"urlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.urlForObject\\"></a>
+##### \`urlForObject\` <a name="urlForObject" id="construct-library.submod1.GoodbyeBucket.urlForObject"></a>
 
 \`\`\`typescript
 public urlForObject(key?: string): string
@@ -7787,7 +7787,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.urlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -7798,7 +7798,7 @@ bucket is returned.
 
 ---
 
-##### \`virtualHostedUrlForObject\` <a name=\\"virtualHostedUrlForObject\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtualHostedUrlForObject\` <a name="virtualHostedUrlForObject" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`typescript
 public virtualHostedUrlForObject(key?: string, options?: VirtualHostedStyleUrlOptions): string
@@ -7811,7 +7811,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* string
 
@@ -7822,7 +7822,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.submod1.GoodbyeBucket.virtualHostedUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.VirtualHostedStyleUrlOptions
 
@@ -7830,7 +7830,7 @@ Options for generating URL.
 
 ---
 
-##### \`addCorsRule\` <a name=\\"addCorsRule\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule\\"></a>
+##### \`addCorsRule\` <a name="addCorsRule" id="construct-library.submod1.GoodbyeBucket.addCorsRule"></a>
 
 \`\`\`typescript
 public addCorsRule(rule: CorsRule): void
@@ -7838,7 +7838,7 @@ public addCorsRule(rule: CorsRule): void
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.submod1.GoodbyeBucket.addCorsRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.CorsRule
 
@@ -7846,7 +7846,7 @@ The CORS configuration rule to add.
 
 ---
 
-##### \`addInventory\` <a name=\\"addInventory\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory\\"></a>
+##### \`addInventory\` <a name="addInventory" id="construct-library.submod1.GoodbyeBucket.addInventory"></a>
 
 \`\`\`typescript
 public addInventory(inventory: Inventory): void
@@ -7854,7 +7854,7 @@ public addInventory(inventory: Inventory): void
 
 Add an inventory configuration.
 
-###### \`inventory\`<sup>Required</sup> <a name=\\"inventory\\" id=\\"construct-library.submod1.GoodbyeBucket.addInventory.parameter.inventory\\"></a>
+###### \`inventory\`<sup>Required</sup> <a name="inventory" id="construct-library.submod1.GoodbyeBucket.addInventory.parameter.inventory"></a>
 
 - *Type:* @aws-cdk/aws-s3.Inventory
 
@@ -7862,7 +7862,7 @@ configuration to add.
 
 ---
 
-##### \`addLifecycleRule\` <a name=\\"addLifecycleRule\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule\\"></a>
+##### \`addLifecycleRule\` <a name="addLifecycleRule" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule"></a>
 
 \`\`\`typescript
 public addLifecycleRule(rule: LifecycleRule): void
@@ -7870,7 +7870,7 @@ public addLifecycleRule(rule: LifecycleRule): void
 
 Add a lifecycle rule to the bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.submod1.GoodbyeBucket.addLifecycleRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.LifecycleRule
 
@@ -7878,7 +7878,7 @@ The rule to add.
 
 ---
 
-##### \`addMetric\` <a name=\\"addMetric\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric\\"></a>
+##### \`addMetric\` <a name="addMetric" id="construct-library.submod1.GoodbyeBucket.addMetric"></a>
 
 \`\`\`typescript
 public addMetric(metric: BucketMetrics): void
@@ -7886,7 +7886,7 @@ public addMetric(metric: BucketMetrics): void
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`metric\`<sup>Required</sup> <a name=\\"metric\\" id=\\"construct-library.submod1.GoodbyeBucket.addMetric.parameter.metric\\"></a>
+###### \`metric\`<sup>Required</sup> <a name="metric" id="construct-library.submod1.GoodbyeBucket.addMetric.parameter.metric"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketMetrics
 
@@ -7894,25 +7894,25 @@ The metric configuration to add.
 
 ---
 
-##### \`goodbye\` <a name=\\"goodbye\\" id=\\"construct-library.submod1.GoodbyeBucket.goodbye\\"></a>
+##### \`goodbye\` <a name="goodbye" id="construct-library.submod1.GoodbyeBucket.goodbye"></a>
 
 \`\`\`typescript
 public goodbye(): void
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.isResource\\">isResource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketArn\\">fromBucketArn</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketAttributes\\">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.fromBucketName\\">fromBucketName</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.validateBucketName\\">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.isResource">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketArn">fromBucketArn</a></code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketAttributes">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.fromBucketName">fromBucketName</a></code> | *No description.* |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.validateBucketName">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`isResource\` <a name=\\"isResource\\" id=\\"construct-library.submod1.GoodbyeBucket.isResource\\"></a>
+##### \`isResource\` <a name="isResource" id="construct-library.submod1.GoodbyeBucket.isResource"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -7922,13 +7922,13 @@ submod1.GoodbyeBucket.isResource(construct: IConstruct)
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.submod1.GoodbyeBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.submod1.GoodbyeBucket.isResource.parameter.construct"></a>
 
 - *Type:* @aws-cdk/core.IConstruct
 
 ---
 
-##### \`fromBucketArn\` <a name=\\"fromBucketArn\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn\\"></a>
+##### \`fromBucketArn\` <a name="fromBucketArn" id="construct-library.submod1.GoodbyeBucket.fromBucketArn"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -7936,25 +7936,25 @@ import { submod1 } from 'construct-library'
 submod1.GoodbyeBucket.fromBucketArn(scope: Construct, id: string, bucketArn: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.submod1.GoodbyeBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* string
 
 ---
 
-##### \`fromBucketAttributes\` <a name=\\"fromBucketAttributes\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes\\"></a>
+##### \`fromBucketAttributes\` <a name="fromBucketAttributes" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -7964,7 +7964,7 @@ submod1.GoodbyeBucket.fromBucketAttributes(scope: Construct, id: string, attrs:
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
@@ -7972,7 +7972,7 @@ The parent creating construct (usually \`this\`).
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.id"></a>
 
 - *Type:* string
 
@@ -7980,7 +7980,7 @@ The construct's name.
 
 ---
 
-###### \`attrs\`<sup>Required</sup> <a name=\\"attrs\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.attrs\\"></a>
+###### \`attrs\`<sup>Required</sup> <a name="attrs" id="construct-library.submod1.GoodbyeBucket.fromBucketAttributes.parameter.attrs"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketAttributes
 
@@ -7991,7 +7991,7 @@ Can be obtained from a call to
 
 ---
 
-##### \`fromBucketName\` <a name=\\"fromBucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName\\"></a>
+##### \`fromBucketName\` <a name="fromBucketName" id="construct-library.submod1.GoodbyeBucket.fromBucketName"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -7999,25 +7999,25 @@ import { submod1 } from 'construct-library'
 submod1.GoodbyeBucket.fromBucketName(scope: Construct, id: string, bucketName: string)
 \`\`\`
 
-###### \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.scope\\"></a>
+###### \`scope\`<sup>Required</sup> <a name="scope" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.scope"></a>
 
 - *Type:* constructs.Construct
 
 ---
 
-###### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.id\\"></a>
+###### \`id\`<sup>Required</sup> <a name="id" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-###### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.submod1.GoodbyeBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* string
 
 ---
 
-##### \`validateBucketName\` <a name=\\"validateBucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.validateBucketName\\"></a>
+##### \`validateBucketName\` <a name="validateBucketName" id="construct-library.submod1.GoodbyeBucket.validateBucketName"></a>
 
 \`\`\`typescript
 import { submod1 } from 'construct-library'
@@ -8027,7 +8027,7 @@ submod1.GoodbyeBucket.validateBucketName(physicalName: string)
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physicalName\`<sup>Required</sup> <a name=\\"physicalName\\" id=\\"construct-library.submod1.GoodbyeBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physicalName\`<sup>Required</sup> <a name="physicalName" id="construct-library.submod1.GoodbyeBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* string
 
@@ -8035,27 +8035,27 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.node\\">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.env\\">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.stack\\">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketArn\\">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketDomainName\\">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName\\">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketName\\">bucketName</a></code> | <code>string</code> | The name of the bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName\\">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName\\">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl\\">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.encryptionKey\\">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.isWebsite\\">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#construct-library.submod1.GoodbyeBucket.property.policy\\">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.node">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.env">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.stack">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketArn">bucketArn</a></code> | <code>string</code> | The ARN of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketDomainName">bucketDomainName</a></code> | <code>string</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName">bucketDualStackDomainName</a></code> | <code>string</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketName">bucketName</a></code> | <code>string</code> | The name of the bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName">bucketRegionalDomainName</a></code> | <code>string</code> | The regional domain name of the specified bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName">bucketWebsiteDomainName</a></code> | <code>string</code> | The Domain name of the static website. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl">bucketWebsiteUrl</a></code> | <code>string</code> | The URL of the static website. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.encryptionKey">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.isWebsite">isWebsite</a></code> | <code>boolean</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#construct-library.submod1.GoodbyeBucket.property.policy">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.submod1.GoodbyeBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.submod1.GoodbyeBucket.property.node"></a>
 
 \`\`\`typescript
 public readonly node: ConstructNode;
@@ -8067,7 +8067,7 @@ The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.submod1.GoodbyeBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.submod1.GoodbyeBucket.property.env"></a>
 
 \`\`\`typescript
 public readonly env: ResourceEnvironment;
@@ -8086,7 +8086,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.submod1.GoodbyeBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.submod1.GoodbyeBucket.property.stack"></a>
 
 \`\`\`typescript
 public readonly stack: Stack;
@@ -8098,7 +8098,7 @@ The stack in which this resource is defined.
 
 ---
 
-##### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketArn\\"></a>
+##### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.submod1.GoodbyeBucket.property.bucketArn"></a>
 
 \`\`\`typescript
 public readonly bucketArn: string;
@@ -8110,7 +8110,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucketDomainName\`<sup>Required</sup> <a name=\\"bucketDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketDomainName\\"></a>
+##### \`bucketDomainName\`<sup>Required</sup> <a name="bucketDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDomainName: string;
@@ -8122,7 +8122,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name=\\"bucketDualStackDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name="bucketDualStackDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketDualStackDomainName: string;
@@ -8134,7 +8134,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketName\\"></a>
+##### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.submod1.GoodbyeBucket.property.bucketName"></a>
 
 \`\`\`typescript
 public readonly bucketName: string;
@@ -8146,7 +8146,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name=\\"bucketRegionalDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name="bucketRegionalDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketRegionalDomainName: string;
@@ -8158,7 +8158,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name=\\"bucketWebsiteDomainName\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name="bucketWebsiteDomainName" id="construct-library.submod1.GoodbyeBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteDomainName: string;
@@ -8170,7 +8170,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name=\\"bucketWebsiteUrl\\" id=\\"construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name="bucketWebsiteUrl" id="construct-library.submod1.GoodbyeBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`typescript
 public readonly bucketWebsiteUrl: string;
@@ -8182,7 +8182,7 @@ The URL of the static website.
 
 ---
 
-##### \`encryptionKey\`<sup>Optional</sup> <a name=\\"encryptionKey\\" id=\\"construct-library.submod1.GoodbyeBucket.property.encryptionKey\\"></a>
+##### \`encryptionKey\`<sup>Optional</sup> <a name="encryptionKey" id="construct-library.submod1.GoodbyeBucket.property.encryptionKey"></a>
 
 \`\`\`typescript
 public readonly encryptionKey: IKey;
@@ -8194,7 +8194,7 @@ Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`isWebsite\`<sup>Optional</sup> <a name=\\"isWebsite\\" id=\\"construct-library.submod1.GoodbyeBucket.property.isWebsite\\"></a>
+##### \`isWebsite\`<sup>Optional</sup> <a name="isWebsite" id="construct-library.submod1.GoodbyeBucket.property.isWebsite"></a>
 
 \`\`\`typescript
 public readonly isWebsite: boolean;
@@ -8206,7 +8206,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.submod1.GoodbyeBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.submod1.GoodbyeBucket.property.policy"></a>
 
 \`\`\`typescript
 public readonly policy: BucketPolicy;
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/class.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/class.test.ts.snap
index 8ef91366526..f309449451a 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/class.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/class.test.ts.snap
@@ -1,11 +1,11 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
-  "constants": Array [],
+{
+  "constants": [],
   "displayName": "AuthorizationToken",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html",
     ],
     "summary": "Authorization token to access private ECR repositories in the current environment via Docker CLI.",
@@ -13,29 +13,29 @@ Object {
   "fqn": "Amazon.CDK.AWS.ECR.AuthorizationToken",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken",
   "initializer": undefined,
-  "instanceMethods": Array [],
-  "interfaces": Array [],
-  "properties": Array [],
-  "staticMethods": Array [
-    Object {
+  "instanceMethods": [],
+  "interfaces": [],
+  "properties": [],
+  "staticMethods": [
+    {
       "displayName": "GrantRead",
-      "docs": Object {
+      "docs": {
         "summary": "Grant access to retrieve an authorization token.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.AuthorizationToken.GrantRead",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.AuthorizationToken.GrantRead.parameter.Grantee",
           "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "Amazon.CDK.AWS.IAM.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -55,22 +55,22 @@ AuthorizationToken.GrantRead(IGrantable Grantee);",
 `;
 
 exports[`csharp snapshot 2`] = `
-" AuthorizationToken <a name=\\"AuthorizationToken\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken\\"></a>
+" AuthorizationToken <a name="AuthorizationToken" id="@aws-cdk/aws-ecr.AuthorizationToken"></a>
 
 Authorization token to access private ECR repositories in the current environment via Docker CLI.
 
 > [https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)
 
 
-# Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+# Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\">GrantRead</a></code> | Grant access to retrieve an authorization token. |
+| <code><a href="#@aws-cdk/aws-ecr.AuthorizationToken.grantRead">GrantRead</a></code> | Grant access to retrieve an authorization token. |
 
 ---
 
-## \`GrantRead\` <a name=\\"GrantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+## \`GrantRead\` <a name="GrantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`csharp
 using Amazon.CDK.AWS.ECR;
@@ -80,7 +80,7 @@ AuthorizationToken.GrantRead(IGrantable Grantee);
 
 Grant access to retrieve an authorization token.
 
-### \`Grantee\`<sup>Required</sup> <a name=\\"Grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+### \`Grantee\`<sup>Required</sup> <a name="Grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* Amazon.CDK.AWS.IAM.IGrantable
 
@@ -91,11 +91,11 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`go snapshot 1`] = `
-Object {
-  "constants": Array [],
+{
+  "constants": [],
   "displayName": "AuthorizationToken",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html",
     ],
     "summary": "Authorization token to access private ECR repositories in the current environment via Docker CLI.",
@@ -103,29 +103,29 @@ Object {
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.AuthorizationToken",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken",
   "initializer": undefined,
-  "instanceMethods": Array [],
-  "interfaces": Array [],
-  "properties": Array [],
-  "staticMethods": Array [
-    Object {
+  "instanceMethods": [],
+  "interfaces": [],
+  "properties": [],
+  "staticMethods": [
+    {
       "displayName": "GrantRead",
-      "docs": Object {
+      "docs": {
         "summary": "Grant access to retrieve an authorization token.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.AuthorizationToken.GrantRead",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.AuthorizationToken.GrantRead.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -136,7 +136,7 @@ Object {
           },
         },
       ],
-      "usage": "import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+      "usage": "import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 awscdkawsecr.AuthorizationToken_GrantRead(grantee IGrantable)",
     },
@@ -145,32 +145,32 @@ awscdkawsecr.AuthorizationToken_GrantRead(grantee IGrantable)",
 `;
 
 exports[`go snapshot 2`] = `
-" AuthorizationToken <a name=\\"AuthorizationToken\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken\\"></a>
+" AuthorizationToken <a name="AuthorizationToken" id="@aws-cdk/aws-ecr.AuthorizationToken"></a>
 
 Authorization token to access private ECR repositories in the current environment via Docker CLI.
 
 > [https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)
 
 
-# Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+# Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\">GrantRead</a></code> | Grant access to retrieve an authorization token. |
+| <code><a href="#@aws-cdk/aws-ecr.AuthorizationToken.grantRead">GrantRead</a></code> | Grant access to retrieve an authorization token. |
 
 ---
 
-## \`GrantRead\` <a name=\\"GrantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+## \`GrantRead\` <a name="GrantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`go
-import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 awscdkawsecr.AuthorizationToken_GrantRead(grantee IGrantable)
 \`\`\`
 
 Grant access to retrieve an authorization token.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable
 
@@ -181,11 +181,11 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`java snapshot 1`] = `
-Object {
-  "constants": Array [],
+{
+  "constants": [],
   "displayName": "AuthorizationToken",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html",
     ],
     "summary": "Authorization token to access private ECR repositories in the current environment via Docker CLI.",
@@ -193,29 +193,29 @@ Object {
   "fqn": "software.amazon.awscdk.services.ecr.AuthorizationToken",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken",
   "initializer": undefined,
-  "instanceMethods": Array [],
-  "interfaces": Array [],
-  "properties": Array [],
-  "staticMethods": Array [
-    Object {
+  "instanceMethods": [],
+  "interfaces": [],
+  "properties": [],
+  "staticMethods": [
+    {
       "displayName": "grantRead",
-      "docs": Object {
+      "docs": {
         "summary": "Grant access to retrieve an authorization token.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.AuthorizationToken.grantRead",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.AuthorizationToken.grantRead.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "software.amazon.awscdk.services.iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -235,22 +235,22 @@ AuthorizationToken.grantRead(IGrantable grantee)",
 `;
 
 exports[`java snapshot 2`] = `
-" AuthorizationToken <a name=\\"AuthorizationToken\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken\\"></a>
+" AuthorizationToken <a name="AuthorizationToken" id="@aws-cdk/aws-ecr.AuthorizationToken"></a>
 
 Authorization token to access private ECR repositories in the current environment via Docker CLI.
 
 > [https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)
 
 
-# Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+# Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\">grantRead</a></code> | Grant access to retrieve an authorization token. |
+| <code><a href="#@aws-cdk/aws-ecr.AuthorizationToken.grantRead">grantRead</a></code> | Grant access to retrieve an authorization token. |
 
 ---
 
-## \`grantRead\` <a name=\\"grantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+## \`grantRead\` <a name="grantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`java
 import software.amazon.awscdk.services.ecr.AuthorizationToken;
@@ -260,7 +260,7 @@ AuthorizationToken.grantRead(IGrantable grantee)
 
 Grant access to retrieve an authorization token.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* software.amazon.awscdk.services.iam.IGrantable
 
@@ -271,11 +271,11 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`python snapshot 1`] = `
-Object {
-  "constants": Array [],
+{
+  "constants": [],
   "displayName": "AuthorizationToken",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html",
     ],
     "summary": "Authorization token to access private ECR repositories in the current environment via Docker CLI.",
@@ -283,29 +283,29 @@ Object {
   "fqn": "aws_cdk.aws_ecr.AuthorizationToken",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken",
   "initializer": undefined,
-  "instanceMethods": Array [],
-  "interfaces": Array [],
-  "properties": Array [],
-  "staticMethods": Array [
-    Object {
+  "instanceMethods": [],
+  "interfaces": [],
+  "properties": [],
+  "staticMethods": [
+    {
       "displayName": "grant_read",
-      "docs": Object {
+      "docs": {
         "summary": "Grant access to retrieve an authorization token.",
       },
       "fqn": "aws_cdk.aws_ecr.AuthorizationToken.grant_read",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "aws_cdk.aws_ecr.AuthorizationToken.grant_read.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "aws_cdk.aws_iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -327,22 +327,22 @@ aws_cdk.aws_ecr.AuthorizationToken.grant_read(
 `;
 
 exports[`python snapshot 2`] = `
-" AuthorizationToken <a name=\\"AuthorizationToken\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken\\"></a>
+" AuthorizationToken <a name="AuthorizationToken" id="@aws-cdk/aws-ecr.AuthorizationToken"></a>
 
 Authorization token to access private ECR repositories in the current environment via Docker CLI.
 
 > [https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)
 
 
-# Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+# Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\">grant_read</a></code> | Grant access to retrieve an authorization token. |
+| <code><a href="#@aws-cdk/aws-ecr.AuthorizationToken.grantRead">grant_read</a></code> | Grant access to retrieve an authorization token. |
 
 ---
 
-## \`grant_read\` <a name=\\"grant_read\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+## \`grant_read\` <a name="grant_read" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`python
 import aws_cdk.aws_ecr
@@ -354,7 +354,7 @@ aws_cdk.aws_ecr.AuthorizationToken.grant_read(
 
 Grant access to retrieve an authorization token.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -365,11 +365,11 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
-  "constants": Array [],
+{
+  "constants": [],
   "displayName": "AuthorizationToken",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html",
     ],
     "summary": "Authorization token to access private ECR repositories in the current environment via Docker CLI.",
@@ -377,29 +377,29 @@ Object {
   "fqn": "@aws-cdk/aws-ecr.AuthorizationToken",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken",
   "initializer": undefined,
-  "instanceMethods": Array [],
-  "interfaces": Array [],
-  "properties": Array [],
-  "staticMethods": Array [
-    Object {
+  "instanceMethods": [],
+  "interfaces": [],
+  "properties": [],
+  "staticMethods": [
+    {
       "displayName": "grantRead",
-      "docs": Object {
+      "docs": {
         "summary": "Grant access to retrieve an authorization token.",
       },
       "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -419,22 +419,22 @@ AuthorizationToken.grantRead(grantee: IGrantable)",
 `;
 
 exports[`typescript snapshot 2`] = `
-" AuthorizationToken <a name=\\"AuthorizationToken\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken\\"></a>
+" AuthorizationToken <a name="AuthorizationToken" id="@aws-cdk/aws-ecr.AuthorizationToken"></a>
 
 Authorization token to access private ECR repositories in the current environment via Docker CLI.
 
 > [https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)
 
 
-# Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+# Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\">grantRead</a></code> | Grant access to retrieve an authorization token. |
+| <code><a href="#@aws-cdk/aws-ecr.AuthorizationToken.grantRead">grantRead</a></code> | Grant access to retrieve an authorization token. |
 
 ---
 
-## \`grantRead\` <a name=\\"grantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+## \`grantRead\` <a name="grantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`typescript
 import { AuthorizationToken } from '@aws-cdk/aws-ecr'
@@ -444,7 +444,7 @@ AuthorizationToken.grantRead(grantee: IGrantable)
 
 Grant access to retrieve an authorization token.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -455,11 +455,11 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
-  "constants": Array [],
+{
+  "constants": [],
   "displayName": "AuthorizationToken",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html",
     ],
     "summary": "Authorization token to access private ECR repositories in the current environment via Docker CLI.",
@@ -467,29 +467,29 @@ Object {
   "fqn": "@aws-cdk/aws-ecr.AuthorizationToken",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken",
   "initializer": undefined,
-  "instanceMethods": Array [],
-  "interfaces": Array [],
-  "properties": Array [],
-  "staticMethods": Array [
-    Object {
+  "instanceMethods": [],
+  "interfaces": [],
+  "properties": [],
+  "staticMethods": [
+    {
       "displayName": "grantRead",
-      "docs": Object {
+      "docs": {
         "summary": "Grant access to retrieve an authorization token.",
       },
       "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -500,7 +500,7 @@ Object {
           },
         },
       ],
-      "usage": "bring { AuthorizationToken } from \\"@aws-cdk/aws-ecr\\";
+      "usage": "bring { AuthorizationToken } from "@aws-cdk/aws-ecr";
 
 AuthorizationToken.grantRead(grantee: IGrantable);",
     },
@@ -509,32 +509,32 @@ AuthorizationToken.grantRead(grantee: IGrantable);",
 `;
 
 exports[`wing snapshot 2`] = `
-" AuthorizationToken <a name=\\"AuthorizationToken\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken\\"></a>
+" AuthorizationToken <a name="AuthorizationToken" id="@aws-cdk/aws-ecr.AuthorizationToken"></a>
 
 Authorization token to access private ECR repositories in the current environment via Docker CLI.
 
 > [https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)
 
 
-# Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+# Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\">grantRead</a></code> | Grant access to retrieve an authorization token. |
+| <code><a href="#@aws-cdk/aws-ecr.AuthorizationToken.grantRead">grantRead</a></code> | Grant access to retrieve an authorization token. |
 
 ---
 
-## \`grantRead\` <a name=\\"grantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+## \`grantRead\` <a name="grantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`wing
-bring { AuthorizationToken } from \\"@aws-cdk/aws-ecr\\";
+bring { AuthorizationToken } from "@aws-cdk/aws-ecr";
 
 AuthorizationToken.grantRead(grantee: IGrantable);
 \`\`\`
 
 Grant access to retrieve an authorization token.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/documentation.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/documentation.test.ts.snap
index 26504ef1ef9..dbdf1a7f2ef 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/documentation.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/documentation.test.ts.snap
@@ -1,33 +1,33 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`wing single package 1`] = `
-Object {
-  "apiReference": Object {
-    "classes": Array [],
-    "constructs": Array [
-      Object {
-        "constants": Array [],
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`wing > single package 1`] = `
+{
+  "apiReference": {
+    "classes": [],
+    "constructs": [
+      {
+        "constants": [],
         "displayName": "GreeterBucket",
-        "docs": Object {},
+        "docs": {},
         "fqn": "construct-library.GreeterBucket",
         "id": "construct-library.GreeterBucket",
         "inflight": undefined,
-        "initializer": Object {
+        "initializer": {
           "displayName": "Initializer",
           "fqn": "construct-library.GreeterBucket.Initializer",
           "id": "construct-library.GreeterBucket.Initializer",
-          "parameters": Array [
-            Object {
+          "parameters": [
+            {
               "default": undefined,
               "displayName": "props",
-              "docs": Object {},
+              "docs": {},
               "fqn": "construct-library.GreeterBucket.Initializer.parameter.props",
               "id": "construct-library.GreeterBucket.Initializer.parameter.props",
               "optional": true,
-              "type": Object {
+              "type": {
                 "formattingPattern": "%",
-                "types": Array [
-                  Object {
+                "types": [
+                  {
                     "displayName": "BucketProps",
                     "fqn": "@aws-cdk/aws-s3.BucketProps",
                     "id": "@aws-cdk/aws-s3.BucketProps",
@@ -38,14 +38,14 @@ Object {
               },
             },
           ],
-          "usage": "bring { GreeterBucket } from \\"construct-library\\";
+          "usage": "bring { GreeterBucket } from "construct-library";
 
 new GreeterBucket(props?: BucketProps);",
         },
-        "instanceMethods": Array [
-          Object {
+        "instanceMethods": [
+          {
             "displayName": "applyRemovalPolicy",
-            "docs": Object {
+            "docs": {
               "remarks": "The Removal Policy controls what happens to this resource when it stops
 being managed by CloudFormation, either because you've removed it from the
 CDK application or because you've made a change that requires the resource
@@ -57,18 +57,18 @@ account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).",
             },
             "fqn": "construct-library.GreeterBucket.applyRemovalPolicy",
             "id": "construct-library.GreeterBucket.applyRemovalPolicy",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "policy",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy",
                 "id": "construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "RemovalPolicy",
                       "fqn": "@aws-cdk/core.RemovalPolicy",
                       "id": "@aws-cdk/core.RemovalPolicy",
@@ -81,33 +81,33 @@ account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).",
             ],
             "usage": "applyRemovalPolicy(policy: RemovalPolicy): void",
           },
-          Object {
+          {
             "displayName": "addEventNotification",
-            "docs": Object {
+            "docs": {
               "example": "   declare const myLambda: lambda.Function;
    const bucket = new s3.Bucket(this, 'MyBucket');
    bucket.addEventNotification(s3.EventType.OBJECT_CREATED, new s3n.LambdaDestination(myLambda), {prefix: 'home/myusername/*'});",
-              "links": Array [
+              "links": [
                 "https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html",
               ],
               "summary": "Adds a bucket notification event destination.",
             },
             "fqn": "construct-library.GreeterBucket.addEventNotification",
             "id": "construct-library.GreeterBucket.addEventNotification",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "event",
-                "docs": Object {
+                "docs": {
                   "summary": "The event to trigger the notification.",
                 },
                 "fqn": "construct-library.GreeterBucket.addEventNotification.parameter.event",
                 "id": "construct-library.GreeterBucket.addEventNotification.parameter.event",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "EventType",
                       "fqn": "@aws-cdk/aws-s3.EventType",
                       "id": "@aws-cdk/aws-s3.EventType",
@@ -117,19 +117,19 @@ account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "dest",
-                "docs": Object {
+                "docs": {
                   "summary": "The notification destination (Lambda, SNS Topic or SQS Queue).",
                 },
                 "fqn": "construct-library.GreeterBucket.addEventNotification.parameter.dest",
                 "id": "construct-library.GreeterBucket.addEventNotification.parameter.dest",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IBucketNotificationDestination",
                       "fqn": "@aws-cdk/aws-s3.IBucketNotificationDestination",
                       "id": "@aws-cdk/aws-s3.IBucketNotificationDestination",
@@ -139,10 +139,10 @@ account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "filters",
-                "docs": Object {
+                "docs": {
                   "remarks": "Each filter must include a \`prefix\` and/or \`suffix\`
 that will be matched against the s3 object key. Refer to the S3 Developer Guide
 for details about allowed filter rules.",
@@ -151,10 +151,10 @@ for details about allowed filter rules.",
                 "fqn": "construct-library.GreeterBucket.addEventNotification.parameter.filters",
                 "id": "construct-library.GreeterBucket.addEventNotification.parameter.filters",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "NotificationKeyFilter",
                       "fqn": "@aws-cdk/aws-s3.NotificationKeyFilter",
                       "id": "@aws-cdk/aws-s3.NotificationKeyFilter",
@@ -167,29 +167,29 @@ for details about allowed filter rules.",
             ],
             "usage": "addEventNotification(event: EventType, dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void",
           },
-          Object {
+          {
             "displayName": "addObjectCreatedNotification",
-            "docs": Object {
+            "docs": {
               "remarks": "This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.",
               "summary": "Subscribes a destination to receive notifications when an object is created in the bucket.",
             },
             "fqn": "construct-library.GreeterBucket.addObjectCreatedNotification",
             "id": "construct-library.GreeterBucket.addObjectCreatedNotification",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "dest",
-                "docs": Object {
+                "docs": {
                   "summary": "The notification destination (see onEvent).",
                 },
                 "fqn": "construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest",
                 "id": "construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IBucketNotificationDestination",
                       "fqn": "@aws-cdk/aws-s3.IBucketNotificationDestination",
                       "id": "@aws-cdk/aws-s3.IBucketNotificationDestination",
@@ -199,19 +199,19 @@ for details about allowed filter rules.",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "filters",
-                "docs": Object {
+                "docs": {
                   "summary": "Filters (see onEvent).",
                 },
                 "fqn": "construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters",
                 "id": "construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "NotificationKeyFilter",
                       "fqn": "@aws-cdk/aws-s3.NotificationKeyFilter",
                       "id": "@aws-cdk/aws-s3.NotificationKeyFilter",
@@ -224,29 +224,29 @@ for details about allowed filter rules.",
             ],
             "usage": "addObjectCreatedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void",
           },
-          Object {
+          {
             "displayName": "addObjectRemovedNotification",
-            "docs": Object {
+            "docs": {
               "remarks": "This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.",
               "summary": "Subscribes a destination to receive notifications when an object is removed from the bucket.",
             },
             "fqn": "construct-library.GreeterBucket.addObjectRemovedNotification",
             "id": "construct-library.GreeterBucket.addObjectRemovedNotification",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "dest",
-                "docs": Object {
+                "docs": {
                   "summary": "The notification destination (see onEvent).",
                 },
                 "fqn": "construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest",
                 "id": "construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IBucketNotificationDestination",
                       "fqn": "@aws-cdk/aws-s3.IBucketNotificationDestination",
                       "id": "@aws-cdk/aws-s3.IBucketNotificationDestination",
@@ -256,19 +256,19 @@ for details about allowed filter rules.",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "filters",
-                "docs": Object {
+                "docs": {
                   "summary": "Filters (see onEvent).",
                 },
                 "fqn": "construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters",
                 "id": "construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "NotificationKeyFilter",
                       "fqn": "@aws-cdk/aws-s3.NotificationKeyFilter",
                       "id": "@aws-cdk/aws-s3.NotificationKeyFilter",
@@ -281,9 +281,9 @@ for details about allowed filter rules.",
             ],
             "usage": "addObjectRemovedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void",
           },
-          Object {
+          {
             "displayName": "addToResourcePolicy",
-            "docs": Object {
+            "docs": {
               "remarks": "Note that the policy statement may or may not be added to the policy.
 For example, when an \`IBucket\` is created from an existing bucket,
 it's not possible to tell whether the bucket already has a policy
@@ -293,20 +293,20 @@ So it's safest to do nothing in these cases.",
             },
             "fqn": "construct-library.GreeterBucket.addToResourcePolicy",
             "id": "construct-library.GreeterBucket.addToResourcePolicy",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "permission",
-                "docs": Object {
+                "docs": {
                   "summary": "the policy statement to be added to the bucket's policy.",
                 },
                 "fqn": "construct-library.GreeterBucket.addToResourcePolicy.parameter.permission",
                 "id": "construct-library.GreeterBucket.addToResourcePolicy.parameter.permission",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "PolicyStatement",
                       "fqn": "@aws-cdk/aws-iam.PolicyStatement",
                       "id": "@aws-cdk/aws-iam.PolicyStatement",
@@ -319,10 +319,10 @@ So it's safest to do nothing in these cases.",
             ],
             "usage": "addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult",
           },
-          Object {
+          {
             "displayName": "arnForObjects",
-            "docs": Object {
-              "remarks": "To represent all keys, specify \`\`\\"*\\"\`\`.
+            "docs": {
+              "remarks": "To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
@@ -331,42 +331,42 @@ If you need to specify a keyPattern with multiple components, concatenate them i
             },
             "fqn": "construct-library.GreeterBucket.arnForObjects",
             "id": "construct-library.GreeterBucket.arnForObjects",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "keyPattern",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.arnForObjects.parameter.keyPattern",
                 "id": "construct-library.GreeterBucket.arnForObjects.parameter.keyPattern",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
             "usage": "arnForObjects(keyPattern: str): str",
           },
-          Object {
+          {
             "displayName": "grantDelete",
-            "docs": Object {
+            "docs": {
               "summary": "Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.",
             },
             "fqn": "construct-library.GreeterBucket.grantDelete",
             "id": "construct-library.GreeterBucket.grantDelete",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "identity",
-                "docs": Object {
+                "docs": {
                   "summary": "The principal.",
                 },
                 "fqn": "construct-library.GreeterBucket.grantDelete.parameter.identity",
                 "id": "construct-library.GreeterBucket.grantDelete.parameter.identity",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IGrantable",
                       "fqn": "@aws-cdk/aws-iam.IGrantable",
                       "id": "@aws-cdk/aws-iam.IGrantable",
@@ -376,32 +376,32 @@ If you need to specify a keyPattern with multiple components, concatenate them i
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "objectsKeyPattern",
-                "docs": Object {
+                "docs": {
                   "summary": "Restrict the permission to a certain key pattern (default '*').",
                 },
                 "fqn": "construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern",
                 "id": "construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "any",
                 },
               },
             ],
             "usage": "grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant",
           },
-          Object {
+          {
             "displayName": "grantPublicAccess",
-            "docs": Object {
+            "docs": {
               "remarks": "IMPORTANT: This permission allows anyone to perform actions on S3 objects
 in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -417,60 +417,60 @@ impossible to modify the policy of an existing bucket.",
             },
             "fqn": "construct-library.GreeterBucket.grantPublicAccess",
             "id": "construct-library.GreeterBucket.grantPublicAccess",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "allowedActions",
-                "docs": Object {
-                  "remarks": "Default is \\"s3:GetObject\\".",
+                "docs": {
+                  "remarks": "Default is "s3:GetObject".",
                   "summary": "the set of S3 actions to allow.",
                 },
                 "fqn": "construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions",
                 "id": "construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "keyPrefix",
-                "docs": Object {
-                  "summary": "the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".",
+                "docs": {
+                  "summary": "the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".",
                 },
                 "fqn": "construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix",
                 "id": "construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
             "usage": "grantPublicAccess(...allowedActions: Array<str>, keyPrefix?: str): Grant",
           },
-          Object {
+          {
             "displayName": "grantPut",
-            "docs": Object {
+            "docs": {
               "remarks": "If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.",
               "summary": "Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal.",
             },
             "fqn": "construct-library.GreeterBucket.grantPut",
             "id": "construct-library.GreeterBucket.grantPut",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "identity",
-                "docs": Object {
+                "docs": {
                   "summary": "The principal.",
                 },
                 "fqn": "construct-library.GreeterBucket.grantPut.parameter.identity",
                 "id": "construct-library.GreeterBucket.grantPut.parameter.identity",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IGrantable",
                       "fqn": "@aws-cdk/aws-iam.IGrantable",
                       "id": "@aws-cdk/aws-iam.IGrantable",
@@ -480,25 +480,25 @@ of written files will also be granted to the same principal.",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "objectsKeyPattern",
-                "docs": Object {
+                "docs": {
                   "summary": "Restrict the permission to a certain key pattern (default '*').",
                 },
                 "fqn": "construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern",
                 "id": "construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "any",
                 },
               },
             ],
             "usage": "grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant",
           },
-          Object {
+          {
             "displayName": "grantPutAcl",
-            "docs": Object {
+            "docs": {
               "remarks": "If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag set,
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.",
@@ -506,18 +506,18 @@ in this case, if you need to modify object ACLs, call this method explicitly.",
             },
             "fqn": "construct-library.GreeterBucket.grantPutAcl",
             "id": "construct-library.GreeterBucket.grantPutAcl",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "identity",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.grantPutAcl.parameter.identity",
                 "id": "construct-library.GreeterBucket.grantPutAcl.parameter.identity",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IGrantable",
                       "fqn": "@aws-cdk/aws-iam.IGrantable",
                       "id": "@aws-cdk/aws-iam.IGrantable",
@@ -527,43 +527,43 @@ in this case, if you need to modify object ACLs, call this method explicitly.",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "objectsKeyPattern",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern",
                 "id": "construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
             "usage": "grantPutAcl(identity: IGrantable, objectsKeyPattern?: str): Grant",
           },
-          Object {
+          {
             "displayName": "grantRead",
-            "docs": Object {
+            "docs": {
               "remarks": "If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.",
               "summary": "Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User).",
             },
             "fqn": "construct-library.GreeterBucket.grantRead",
             "id": "construct-library.GreeterBucket.grantRead",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "identity",
-                "docs": Object {
+                "docs": {
                   "summary": "The principal.",
                 },
                 "fqn": "construct-library.GreeterBucket.grantRead.parameter.identity",
                 "id": "construct-library.GreeterBucket.grantRead.parameter.identity",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IGrantable",
                       "fqn": "@aws-cdk/aws-iam.IGrantable",
                       "id": "@aws-cdk/aws-iam.IGrantable",
@@ -573,25 +573,25 @@ of the bucket will also be granted to the same principal.",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "objectsKeyPattern",
-                "docs": Object {
+                "docs": {
                   "summary": "Restrict the permission to a certain key pattern (default '*').",
                 },
                 "fqn": "construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern",
                 "id": "construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "any",
                 },
               },
             ],
             "usage": "grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant",
           },
-          Object {
+          {
             "displayName": "grantReadWrite",
-            "docs": Object {
+            "docs": {
               "remarks": "If an encryption key is used, permission to use the key for
 encrypt/decrypt will also be granted.
 
@@ -606,18 +606,18 @@ use the {@link grantPutAcl} method.",
             },
             "fqn": "construct-library.GreeterBucket.grantReadWrite",
             "id": "construct-library.GreeterBucket.grantReadWrite",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "identity",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.grantReadWrite.parameter.identity",
                 "id": "construct-library.GreeterBucket.grantReadWrite.parameter.identity",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IGrantable",
                       "fqn": "@aws-cdk/aws-iam.IGrantable",
                       "id": "@aws-cdk/aws-iam.IGrantable",
@@ -627,23 +627,23 @@ use the {@link grantPutAcl} method.",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "objectsKeyPattern",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern",
                 "id": "construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "any",
                 },
               },
             ],
             "usage": "grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant",
           },
-          Object {
+          {
             "displayName": "grantWrite",
-            "docs": Object {
+            "docs": {
               "remarks": "If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
@@ -658,18 +658,18 @@ use the {@link grantPutAcl} method.",
             },
             "fqn": "construct-library.GreeterBucket.grantWrite",
             "id": "construct-library.GreeterBucket.grantWrite",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "identity",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.grantWrite.parameter.identity",
                 "id": "construct-library.GreeterBucket.grantWrite.parameter.identity",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IGrantable",
                       "fqn": "@aws-cdk/aws-iam.IGrantable",
                       "id": "@aws-cdk/aws-iam.IGrantable",
@@ -679,43 +679,43 @@ use the {@link grantPutAcl} method.",
                   ],
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "objectsKeyPattern",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern",
                 "id": "construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "any",
                 },
               },
             ],
             "usage": "grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant",
           },
-          Object {
+          {
             "displayName": "onCloudTrailEvent",
-            "docs": Object {
+            "docs": {
               "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
               "summary": "Define a CloudWatch event that triggers when something happens to this repository.",
             },
             "fqn": "construct-library.GreeterBucket.onCloudTrailEvent",
             "id": "construct-library.GreeterBucket.onCloudTrailEvent",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "options",
-                "docs": Object {
+                "docs": {
                   "summary": "Options for adding the rule.",
                 },
                 "fqn": "construct-library.GreeterBucket.onCloudTrailEvent.parameter.options",
                 "id": "construct-library.GreeterBucket.onCloudTrailEvent.parameter.options",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "OnCloudTrailBucketEventOptions",
                       "fqn": "@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions",
                       "id": "@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions",
@@ -728,9 +728,9 @@ that captures the event. This method will not create the Trail.",
             ],
             "usage": "onCloudTrailEvent(options?: OnCloudTrailBucketEventOptions): Rule",
           },
-          Object {
+          {
             "displayName": "onCloudTrailPutObject",
-            "docs": Object {
+            "docs": {
               "remarks": "Note that some tools like \`aws s3 cp\` will automatically use either
 PutObject or the multipart upload API depending on the file size,
 so using \`onCloudTrailWriteObject\` may be preferable.
@@ -741,20 +741,20 @@ that captures the event. This method will not create the Trail.",
             },
             "fqn": "construct-library.GreeterBucket.onCloudTrailPutObject",
             "id": "construct-library.GreeterBucket.onCloudTrailPutObject",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "options",
-                "docs": Object {
+                "docs": {
                   "summary": "Options for adding the rule.",
                 },
                 "fqn": "construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options",
                 "id": "construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "OnCloudTrailBucketEventOptions",
                       "fqn": "@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions",
                       "id": "@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions",
@@ -767,9 +767,9 @@ that captures the event. This method will not create the Trail.",
             ],
             "usage": "onCloudTrailPutObject(options?: OnCloudTrailBucketEventOptions): Rule",
           },
-          Object {
+          {
             "displayName": "onCloudTrailWriteObject",
-            "docs": Object {
+            "docs": {
               "remarks": "This includes
 the events PutObject, CopyObject, and CompleteMultipartUpload.
 
@@ -783,20 +783,20 @@ that captures the event. This method will not create the Trail.",
             },
             "fqn": "construct-library.GreeterBucket.onCloudTrailWriteObject",
             "id": "construct-library.GreeterBucket.onCloudTrailWriteObject",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "options",
-                "docs": Object {
+                "docs": {
                   "summary": "Options for adding the rule.",
                 },
                 "fqn": "construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options",
                 "id": "construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "OnCloudTrailBucketEventOptions",
                       "fqn": "@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions",
                       "id": "@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions",
@@ -809,20 +809,20 @@ that captures the event. This method will not create the Trail.",
             ],
             "usage": "onCloudTrailWriteObject(options?: OnCloudTrailBucketEventOptions): Rule",
           },
-          Object {
+          {
             "displayName": "s3UrlForObject",
-            "docs": Object {
+            "docs": {
               "remarks": "- \`s3://onlybucket\`
 - \`s3://bucket/key\`",
               "summary": "The S3 URL of an S3 object. For example:.",
             },
             "fqn": "construct-library.GreeterBucket.s3UrlForObject",
             "id": "construct-library.GreeterBucket.s3UrlForObject",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "key",
-                "docs": Object {
+                "docs": {
                   "remarks": "If not specified, the S3 URL of the
 bucket is returned.",
                   "summary": "The S3 key of the object.",
@@ -830,16 +830,16 @@ bucket is returned.",
                 "fqn": "construct-library.GreeterBucket.s3UrlForObject.parameter.key",
                 "id": "construct-library.GreeterBucket.s3UrlForObject.parameter.key",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
             "usage": "s3UrlForObject(key?: str): str",
           },
-          Object {
+          {
             "displayName": "transferAccelerationUrlForObject",
-            "docs": Object {
+            "docs": {
               "remarks": "Specify \`dualStack: true\` at the options
 for dual-stack endpoint (connect to the bucket over IPv6). For example:
 
@@ -849,11 +849,11 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
             },
             "fqn": "construct-library.GreeterBucket.transferAccelerationUrlForObject",
             "id": "construct-library.GreeterBucket.transferAccelerationUrlForObject",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "key",
-                "docs": Object {
+                "docs": {
                   "remarks": "If not specified, the URL of the
 bucket is returned.",
                   "summary": "The S3 key of the object.",
@@ -861,23 +861,23 @@ bucket is returned.",
                 "fqn": "construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key",
                 "id": "construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "options",
-                "docs": Object {
+                "docs": {
                   "summary": "Options for generating URL.",
                 },
                 "fqn": "construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options",
                 "id": "construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "TransferAccelerationUrlOptions",
                       "fqn": "@aws-cdk/aws-s3.TransferAccelerationUrlOptions",
                       "id": "@aws-cdk/aws-s3.TransferAccelerationUrlOptions",
@@ -890,9 +890,9 @@ bucket is returned.",
             ],
             "usage": "transferAccelerationUrlForObject(key?: str, options?: TransferAccelerationUrlOptions): str",
           },
-          Object {
+          {
             "displayName": "urlForObject",
-            "docs": Object {
+            "docs": {
               "remarks": "- \`https://s3.us-west-1.amazonaws.com/onlybucket\`
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`",
@@ -900,11 +900,11 @@ bucket is returned.",
             },
             "fqn": "construct-library.GreeterBucket.urlForObject",
             "id": "construct-library.GreeterBucket.urlForObject",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "key",
-                "docs": Object {
+                "docs": {
                   "remarks": "If not specified, the URL of the
 bucket is returned.",
                   "summary": "The S3 key of the object.",
@@ -912,16 +912,16 @@ bucket is returned.",
                 "fqn": "construct-library.GreeterBucket.urlForObject.parameter.key",
                 "id": "construct-library.GreeterBucket.urlForObject.parameter.key",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
             "usage": "urlForObject(key?: str): str",
           },
-          Object {
+          {
             "displayName": "virtualHostedUrlForObject",
-            "docs": Object {
+            "docs": {
               "remarks": "- \`https://only-bucket.s3.us-west-1.amazonaws.com\`
 - \`https://bucket.s3.us-west-1.amazonaws.com/key\`
 - \`https://bucket.s3.amazonaws.com/key\`
@@ -930,11 +930,11 @@ bucket is returned.",
             },
             "fqn": "construct-library.GreeterBucket.virtualHostedUrlForObject",
             "id": "construct-library.GreeterBucket.virtualHostedUrlForObject",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "key",
-                "docs": Object {
+                "docs": {
                   "remarks": "If not specified, the URL of the
 bucket is returned.",
                   "summary": "The S3 key of the object.",
@@ -942,23 +942,23 @@ bucket is returned.",
                 "fqn": "construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key",
                 "id": "construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
-              Object {
+              {
                 "default": undefined,
                 "displayName": "options",
-                "docs": Object {
+                "docs": {
                   "summary": "Options for generating URL.",
                 },
                 "fqn": "construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options",
                 "id": "construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options",
                 "optional": true,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "VirtualHostedStyleUrlOptions",
                       "fqn": "@aws-cdk/aws-s3.VirtualHostedStyleUrlOptions",
                       "id": "@aws-cdk/aws-s3.VirtualHostedStyleUrlOptions",
@@ -971,27 +971,27 @@ bucket is returned.",
             ],
             "usage": "virtualHostedUrlForObject(key?: str, options?: VirtualHostedStyleUrlOptions): str",
           },
-          Object {
+          {
             "displayName": "addCorsRule",
-            "docs": Object {
+            "docs": {
               "summary": "Adds a cross-origin access configuration for objects in an Amazon S3 bucket.",
             },
             "fqn": "construct-library.GreeterBucket.addCorsRule",
             "id": "construct-library.GreeterBucket.addCorsRule",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "rule",
-                "docs": Object {
+                "docs": {
                   "summary": "The CORS configuration rule to add.",
                 },
                 "fqn": "construct-library.GreeterBucket.addCorsRule.parameter.rule",
                 "id": "construct-library.GreeterBucket.addCorsRule.parameter.rule",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "CorsRule",
                       "fqn": "@aws-cdk/aws-s3.CorsRule",
                       "id": "@aws-cdk/aws-s3.CorsRule",
@@ -1004,27 +1004,27 @@ bucket is returned.",
             ],
             "usage": "addCorsRule(rule: CorsRule): void",
           },
-          Object {
+          {
             "displayName": "addInventory",
-            "docs": Object {
+            "docs": {
               "summary": "Add an inventory configuration.",
             },
             "fqn": "construct-library.GreeterBucket.addInventory",
             "id": "construct-library.GreeterBucket.addInventory",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "inventory",
-                "docs": Object {
+                "docs": {
                   "summary": "configuration to add.",
                 },
                 "fqn": "construct-library.GreeterBucket.addInventory.parameter.inventory",
                 "id": "construct-library.GreeterBucket.addInventory.parameter.inventory",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "Inventory",
                       "fqn": "@aws-cdk/aws-s3.Inventory",
                       "id": "@aws-cdk/aws-s3.Inventory",
@@ -1037,27 +1037,27 @@ bucket is returned.",
             ],
             "usage": "addInventory(inventory: Inventory): void",
           },
-          Object {
+          {
             "displayName": "addLifecycleRule",
-            "docs": Object {
+            "docs": {
               "summary": "Add a lifecycle rule to the bucket.",
             },
             "fqn": "construct-library.GreeterBucket.addLifecycleRule",
             "id": "construct-library.GreeterBucket.addLifecycleRule",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "rule",
-                "docs": Object {
+                "docs": {
                   "summary": "The rule to add.",
                 },
                 "fqn": "construct-library.GreeterBucket.addLifecycleRule.parameter.rule",
                 "id": "construct-library.GreeterBucket.addLifecycleRule.parameter.rule",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "LifecycleRule",
                       "fqn": "@aws-cdk/aws-s3.LifecycleRule",
                       "id": "@aws-cdk/aws-s3.LifecycleRule",
@@ -1070,27 +1070,27 @@ bucket is returned.",
             ],
             "usage": "addLifecycleRule(rule: LifecycleRule): void",
           },
-          Object {
+          {
             "displayName": "addMetric",
-            "docs": Object {
+            "docs": {
               "summary": "Adds a metrics configuration for the CloudWatch request metrics from the bucket.",
             },
             "fqn": "construct-library.GreeterBucket.addMetric",
             "id": "construct-library.GreeterBucket.addMetric",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "metric",
-                "docs": Object {
+                "docs": {
                   "summary": "The metric configuration to add.",
                 },
                 "fqn": "construct-library.GreeterBucket.addMetric.parameter.metric",
                 "id": "construct-library.GreeterBucket.addMetric.parameter.metric",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "BucketMetrics",
                       "fqn": "@aws-cdk/aws-s3.BucketMetrics",
                       "id": "@aws-cdk/aws-s3.BucketMetrics",
@@ -1103,30 +1103,30 @@ bucket is returned.",
             ],
             "usage": "addMetric(metric: BucketMetrics): void",
           },
-          Object {
+          {
             "displayName": "greet",
-            "docs": Object {},
+            "docs": {},
             "fqn": "construct-library.GreeterBucket.greet",
             "id": "construct-library.GreeterBucket.greet",
-            "parameters": Array [],
+            "parameters": [],
             "usage": "greet(): void",
           },
         ],
-        "interfaces": Array [],
-        "properties": Array [
-          Object {
+        "interfaces": [],
+        "properties": [
+          {
             "default": undefined,
             "displayName": "node",
-            "docs": Object {
+            "docs": {
               "summary": "The construct tree node associated with this construct.",
             },
             "fqn": "construct-library.GreeterBucket.property.node",
             "id": "construct-library.GreeterBucket.property.node",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "%",
-              "types": Array [
-                Object {
+              "types": [
+                {
                   "displayName": "ConstructNode",
                   "fqn": "@aws-cdk/core.ConstructNode",
                   "id": "@aws-cdk/core.ConstructNode",
@@ -1137,10 +1137,10 @@ bucket is returned.",
             },
             "usage": "node: ConstructNode;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "env",
-            "docs": Object {
+            "docs": {
               "remarks": "For resources that are created and managed by the CDK
 (generally, those created by creating new class instances like Role, Bucket, etc.),
 this is always the same as the environment of the stack they belong to;
@@ -1152,10 +1152,10 @@ that might be different than the stack they were imported into.",
             "fqn": "construct-library.GreeterBucket.property.env",
             "id": "construct-library.GreeterBucket.property.env",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "%",
-              "types": Array [
-                Object {
+              "types": [
+                {
                   "displayName": "ResourceEnvironment",
                   "fqn": "@aws-cdk/core.ResourceEnvironment",
                   "id": "@aws-cdk/core.ResourceEnvironment",
@@ -1166,19 +1166,19 @@ that might be different than the stack they were imported into.",
             },
             "usage": "env: ResourceEnvironment;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "stack",
-            "docs": Object {
+            "docs": {
               "summary": "The stack in which this resource is defined.",
             },
             "fqn": "construct-library.GreeterBucket.property.stack",
             "id": "construct-library.GreeterBucket.property.stack",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "%",
-              "types": Array [
-                Object {
+              "types": [
+                {
                   "displayName": "Stack",
                   "fqn": "@aws-cdk/core.Stack",
                   "id": "@aws-cdk/core.Stack",
@@ -1189,117 +1189,117 @@ that might be different than the stack they were imported into.",
             },
             "usage": "stack: Stack;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "bucketArn",
-            "docs": Object {
+            "docs": {
               "summary": "The ARN of the bucket.",
             },
             "fqn": "construct-library.GreeterBucket.property.bucketArn",
             "id": "construct-library.GreeterBucket.property.bucketArn",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "str",
             },
             "usage": "bucketArn: str;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "bucketDomainName",
-            "docs": Object {
+            "docs": {
               "summary": "The IPv4 DNS name of the specified bucket.",
             },
             "fqn": "construct-library.GreeterBucket.property.bucketDomainName",
             "id": "construct-library.GreeterBucket.property.bucketDomainName",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "str",
             },
             "usage": "bucketDomainName: str;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "bucketDualStackDomainName",
-            "docs": Object {
+            "docs": {
               "summary": "The IPv6 DNS name of the specified bucket.",
             },
             "fqn": "construct-library.GreeterBucket.property.bucketDualStackDomainName",
             "id": "construct-library.GreeterBucket.property.bucketDualStackDomainName",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "str",
             },
             "usage": "bucketDualStackDomainName: str;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "bucketName",
-            "docs": Object {
+            "docs": {
               "summary": "The name of the bucket.",
             },
             "fqn": "construct-library.GreeterBucket.property.bucketName",
             "id": "construct-library.GreeterBucket.property.bucketName",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "str",
             },
             "usage": "bucketName: str;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "bucketRegionalDomainName",
-            "docs": Object {
+            "docs": {
               "summary": "The regional domain name of the specified bucket.",
             },
             "fqn": "construct-library.GreeterBucket.property.bucketRegionalDomainName",
             "id": "construct-library.GreeterBucket.property.bucketRegionalDomainName",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "str",
             },
             "usage": "bucketRegionalDomainName: str;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "bucketWebsiteDomainName",
-            "docs": Object {
+            "docs": {
               "summary": "The Domain name of the static website.",
             },
             "fqn": "construct-library.GreeterBucket.property.bucketWebsiteDomainName",
             "id": "construct-library.GreeterBucket.property.bucketWebsiteDomainName",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "str",
             },
             "usage": "bucketWebsiteDomainName: str;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "bucketWebsiteUrl",
-            "docs": Object {
+            "docs": {
               "summary": "The URL of the static website.",
             },
             "fqn": "construct-library.GreeterBucket.property.bucketWebsiteUrl",
             "id": "construct-library.GreeterBucket.property.bucketWebsiteUrl",
             "optional": undefined,
-            "type": Object {
+            "type": {
               "formattingPattern": "str",
             },
             "usage": "bucketWebsiteUrl: str;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "encryptionKey",
-            "docs": Object {
+            "docs": {
               "summary": "Optional KMS encryption key associated with this bucket.",
             },
             "fqn": "construct-library.GreeterBucket.property.encryptionKey",
             "id": "construct-library.GreeterBucket.property.encryptionKey",
             "optional": true,
-            "type": Object {
+            "type": {
               "formattingPattern": "%",
-              "types": Array [
-                Object {
+              "types": [
+                {
                   "displayName": "IKey",
                   "fqn": "@aws-cdk/aws-kms.IKey",
                   "id": "@aws-cdk/aws-kms.IKey",
@@ -1310,24 +1310,24 @@ that might be different than the stack they were imported into.",
             },
             "usage": "encryptionKey: IKey;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "isWebsite",
-            "docs": Object {
+            "docs": {
               "summary": "If this bucket has been configured for static website hosting.",
             },
             "fqn": "construct-library.GreeterBucket.property.isWebsite",
             "id": "construct-library.GreeterBucket.property.isWebsite",
             "optional": true,
-            "type": Object {
+            "type": {
               "formattingPattern": "bool",
             },
             "usage": "isWebsite: bool;",
           },
-          Object {
+          {
             "default": undefined,
             "displayName": "policy",
-            "docs": Object {
+            "docs": {
               "remarks": "If \`autoCreatePolicy\` is true, a \`BucketPolicy\` will be created upon the
 first call to addToResourcePolicy(s).",
               "summary": "The resource policy associated with this bucket.",
@@ -1335,10 +1335,10 @@ first call to addToResourcePolicy(s).",
             "fqn": "construct-library.GreeterBucket.property.policy",
             "id": "construct-library.GreeterBucket.property.policy",
             "optional": true,
-            "type": Object {
+            "type": {
               "formattingPattern": "%",
-              "types": Array [
-                Object {
+              "types": [
+                {
                   "displayName": "BucketPolicy",
                   "fqn": "@aws-cdk/aws-s3.BucketPolicy",
                   "id": "@aws-cdk/aws-s3.BucketPolicy",
@@ -1350,26 +1350,26 @@ first call to addToResourcePolicy(s).",
             "usage": "policy: BucketPolicy;",
           },
         ],
-        "staticMethods": Array [
-          Object {
+        "staticMethods": [
+          {
             "displayName": "isResource",
-            "docs": Object {
+            "docs": {
               "summary": "Check whether the given construct is a Resource.",
             },
             "fqn": "construct-library.GreeterBucket.isResource",
             "id": "construct-library.GreeterBucket.isResource",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "construct",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.isResource.parameter.construct",
                 "id": "construct-library.GreeterBucket.isResource.parameter.construct",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "IConstruct",
                       "fqn": "@aws-cdk/core.IConstruct",
                       "id": "@aws-cdk/core.IConstruct",
@@ -1380,44 +1380,44 @@ first call to addToResourcePolicy(s).",
                 },
               },
             ],
-            "usage": "bring { GreeterBucket } from \\"construct-library\\";
+            "usage": "bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.isResource(construct: IConstruct);",
           },
-          Object {
+          {
             "displayName": "fromBucketArn",
-            "docs": Object {},
+            "docs": {},
             "fqn": "construct-library.GreeterBucket.fromBucketArn",
             "id": "construct-library.GreeterBucket.fromBucketArn",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "bucketArn",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn",
                 "id": "construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
-            "usage": "bring { GreeterBucket } from \\"construct-library\\";
+            "usage": "bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketArn(bucketArn: str);",
           },
-          Object {
+          {
             "displayName": "fromBucketAttributes",
-            "docs": Object {
+            "docs": {
               "summary": "Creates a Bucket construct that represents an external bucket.",
             },
             "fqn": "construct-library.GreeterBucket.fromBucketAttributes",
             "id": "construct-library.GreeterBucket.fromBucketAttributes",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "attrs",
-                "docs": Object {
+                "docs": {
                   "remarks": "Can be obtained from a call to
 \`bucket.export()\` or manually created.",
                   "summary": "A \`BucketAttributes\` object.",
@@ -1425,10 +1425,10 @@ GreeterBucket.fromBucketArn(bucketArn: str);",
                 "fqn": "construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs",
                 "id": "construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "%",
-                  "types": Array [
-                    Object {
+                  "types": [
+                    {
                       "displayName": "BucketAttributes",
                       "fqn": "@aws-cdk/aws-s3.BucketAttributes",
                       "id": "@aws-cdk/aws-s3.BucketAttributes",
@@ -1439,67 +1439,67 @@ GreeterBucket.fromBucketArn(bucketArn: str);",
                 },
               },
             ],
-            "usage": "bring { GreeterBucket } from \\"construct-library\\";
+            "usage": "bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketAttributes(attrs: BucketAttributes);",
           },
-          Object {
+          {
             "displayName": "fromBucketName",
-            "docs": Object {},
+            "docs": {},
             "fqn": "construct-library.GreeterBucket.fromBucketName",
             "id": "construct-library.GreeterBucket.fromBucketName",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "bucketName",
-                "docs": Object {},
+                "docs": {},
                 "fqn": "construct-library.GreeterBucket.fromBucketName.parameter.bucketName",
                 "id": "construct-library.GreeterBucket.fromBucketName.parameter.bucketName",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
-            "usage": "bring { GreeterBucket } from \\"construct-library\\";
+            "usage": "bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketName(bucketName: str);",
           },
-          Object {
+          {
             "displayName": "validateBucketName",
-            "docs": Object {
+            "docs": {
               "summary": "Thrown an exception if the given bucket name is not valid.",
             },
             "fqn": "construct-library.GreeterBucket.validateBucketName",
             "id": "construct-library.GreeterBucket.validateBucketName",
-            "parameters": Array [
-              Object {
+            "parameters": [
+              {
                 "default": undefined,
                 "displayName": "physicalName",
-                "docs": Object {
+                "docs": {
                   "summary": "name of the bucket.",
                 },
                 "fqn": "construct-library.GreeterBucket.validateBucketName.parameter.physicalName",
                 "id": "construct-library.GreeterBucket.validateBucketName.parameter.physicalName",
                 "optional": undefined,
-                "type": Object {
+                "type": {
                   "formattingPattern": "str",
                 },
               },
             ],
-            "usage": "bring { GreeterBucket } from \\"construct-library\\";
+            "usage": "bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.validateBucketName(physicalName: str);",
           },
         ],
       },
     ],
-    "enums": Array [],
-    "interfaces": Array [],
-    "structs": Array [],
+    "enums": [],
+    "interfaces": [],
+    "structs": [],
   },
   "language": "wing",
-  "metadata": Object {
+  "metadata": {
     "packageName": "construct-library",
     "packageVersion": "0.0.0",
     "submodule": undefined,
@@ -1512,70 +1512,70 @@ for construct libraries.",
 }
 `;
 
-exports[`wing single package 2`] = `
+exports[`wing > single package 2`] = `
 "# construct-library
 
 This is a test project to make sure the \`jsii-docgen\` cli property renders API documentation
 for construct libraries.
-# API Reference <a name=\\"API Reference\\" id=\\"api-reference\\"></a>
+# API Reference <a name="API Reference" id="api-reference"></a>
 
-## Resources <a name=\\"Resources\\" id=\\"Resources\\"></a>
+## Resources <a name="Resources" id="Resources"></a>
 
-### GreeterBucket <a name=\\"GreeterBucket\\" id=\\"construct-library.GreeterBucket\\"></a>
+### GreeterBucket <a name="GreeterBucket" id="construct-library.GreeterBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.GreeterBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.GreeterBucket.Initializer"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 new GreeterBucket(props?: BucketProps);
 \`\`\`
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.Initializer.parameter.props\\">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.Initializer.parameter.props">props</a></code> | <code>@aws-cdk/aws-s3.BucketProps</code> | *No description.* |
 
 ---
 
-##### \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.props\\"></a>
+##### \`props\`<sup>Optional</sup> <a name="props" id="construct-library.GreeterBucket.Initializer.parameter.props"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketProps
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.applyRemovalPolicy\\">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.addEventNotification\\">addEventNotification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectCreatedNotification\\">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addObjectRemovedNotification\\">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addToResourcePolicy\\">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#construct-library.GreeterBucket.arnForObjects\\">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantDelete\\">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPublicAccess\\">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPut\\">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantPutAcl\\">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.grantRead\\">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantReadWrite\\">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#construct-library.GreeterBucket.grantWrite\\">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailPutObject\\">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#construct-library.GreeterBucket.onCloudTrailWriteObject\\">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#construct-library.GreeterBucket.s3UrlForObject\\">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.transferAccelerationUrlForObject\\">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#construct-library.GreeterBucket.urlForObject\\">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.virtualHostedUrlForObject\\">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#construct-library.GreeterBucket.addCorsRule\\">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addInventory\\">addInventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#construct-library.GreeterBucket.addLifecycleRule\\">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.addMetric\\">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.greet\\">greet</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.applyRemovalPolicy">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#construct-library.GreeterBucket.addEventNotification">addEventNotification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#construct-library.GreeterBucket.addObjectCreatedNotification">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addObjectRemovedNotification">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addToResourcePolicy">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#construct-library.GreeterBucket.arnForObjects">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#construct-library.GreeterBucket.grantDelete">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPublicAccess">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantPut">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.grantPutAcl">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#construct-library.GreeterBucket.grantRead">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantReadWrite">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#construct-library.GreeterBucket.grantWrite">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailPutObject">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#construct-library.GreeterBucket.onCloudTrailWriteObject">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#construct-library.GreeterBucket.s3UrlForObject">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#construct-library.GreeterBucket.transferAccelerationUrlForObject">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#construct-library.GreeterBucket.urlForObject">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#construct-library.GreeterBucket.virtualHostedUrlForObject">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#construct-library.GreeterBucket.addCorsRule">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#construct-library.GreeterBucket.addInventory">addInventory</a></code> | Add an inventory configuration. |
+| <code><a href="#construct-library.GreeterBucket.addLifecycleRule">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#construct-library.GreeterBucket.addMetric">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#construct-library.GreeterBucket.greet">greet</a></code> | *No description.* |
 
 ---
 
-##### \`applyRemovalPolicy\` <a name=\\"applyRemovalPolicy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy\\"></a>
+##### \`applyRemovalPolicy\` <a name="applyRemovalPolicy" id="construct-library.GreeterBucket.applyRemovalPolicy"></a>
 
 \`\`\`wing
 applyRemovalPolicy(policy: RemovalPolicy): void
@@ -1591,13 +1591,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy"></a>
 
 - *Type:* @aws-cdk/core.RemovalPolicy
 
 ---
 
-##### \`addEventNotification\` <a name=\\"addEventNotification\\" id=\\"construct-library.GreeterBucket.addEventNotification\\"></a>
+##### \`addEventNotification\` <a name="addEventNotification" id="construct-library.GreeterBucket.addEventNotification"></a>
 
 \`\`\`wing
 addEventNotification(event: EventType, dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -1616,7 +1616,7 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.GreeterBucket.addEventNotification.parameter.event"></a>
 
 - *Type:* @aws-cdk/aws-s3.EventType
 
@@ -1624,7 +1624,7 @@ The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addEventNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -1632,7 +1632,7 @@ The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addEventNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -1644,7 +1644,7 @@ for details about allowed filter rules.
 
 ---
 
-##### \`addObjectCreatedNotification\` <a name=\\"addObjectCreatedNotification\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification\\"></a>
+##### \`addObjectCreatedNotification\` <a name="addObjectCreatedNotification" id="construct-library.GreeterBucket.addObjectCreatedNotification"></a>
 
 \`\`\`wing
 addObjectCreatedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -1655,7 +1655,7 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -1663,7 +1663,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -1671,7 +1671,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addObjectRemovedNotification\` <a name=\\"addObjectRemovedNotification\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification\\"></a>
+##### \`addObjectRemovedNotification\` <a name="addObjectRemovedNotification" id="construct-library.GreeterBucket.addObjectRemovedNotification"></a>
 
 \`\`\`wing
 addObjectRemovedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -1682,7 +1682,7 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest"></a>
 
 - *Type:* @aws-cdk/aws-s3.IBucketNotificationDestination
 
@@ -1690,7 +1690,7 @@ The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters"></a>
 
 - *Type:* @aws-cdk/aws-s3.NotificationKeyFilter
 
@@ -1698,7 +1698,7 @@ Filters (see onEvent).
 
 ---
 
-##### \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy\\"></a>
+##### \`addToResourcePolicy\` <a name="addToResourcePolicy" id="construct-library.GreeterBucket.addToResourcePolicy"></a>
 
 \`\`\`wing
 addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult
@@ -1712,7 +1712,7 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.GreeterBucket.addToResourcePolicy.parameter.permission"></a>
 
 - *Type:* @aws-cdk/aws-iam.PolicyStatement
 
@@ -1720,7 +1720,7 @@ the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arnForObjects\` <a name=\\"arnForObjects\\" id=\\"construct-library.GreeterBucket.arnForObjects\\"></a>
+##### \`arnForObjects\` <a name="arnForObjects" id="construct-library.GreeterBucket.arnForObjects"></a>
 
 \`\`\`wing
 arnForObjects(keyPattern: str): str
@@ -1728,19 +1728,19 @@ arnForObjects(keyPattern: str): str
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`keyPattern\`<sup>Required</sup> <a name=\\"keyPattern\\" id=\\"construct-library.GreeterBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`keyPattern\`<sup>Required</sup> <a name="keyPattern" id="construct-library.GreeterBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grantDelete\` <a name=\\"grantDelete\\" id=\\"construct-library.GreeterBucket.grantDelete\\"></a>
+##### \`grantDelete\` <a name="grantDelete" id="construct-library.GreeterBucket.grantDelete"></a>
 
 \`\`\`wing
 grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1748,7 +1748,7 @@ grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantDelete.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -1756,7 +1756,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1764,7 +1764,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPublicAccess\` <a name=\\"grantPublicAccess\\" id=\\"construct-library.GreeterBucket.grantPublicAccess\\"></a>
+##### \`grantPublicAccess\` <a name="grantPublicAccess" id="construct-library.GreeterBucket.grantPublicAccess"></a>
 
 \`\`\`wing
 grantPublicAccess(...allowedActions: Array<str>, keyPrefix?: str): Grant
@@ -1777,8 +1777,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -1791,25 +1791,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowedActions\`<sup>Required</sup> <a name=\\"allowedActions\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowedActions\`<sup>Required</sup> <a name="allowedActions" id="construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* str
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`keyPrefix\`<sup>Optional</sup> <a name=\\"keyPrefix\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`keyPrefix\`<sup>Optional</sup> <a name="keyPrefix" id="construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* str
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grantPut\` <a name=\\"grantPut\\" id=\\"construct-library.GreeterBucket.grantPut\\"></a>
+##### \`grantPut\` <a name="grantPut" id="construct-library.GreeterBucket.grantPut"></a>
 
 \`\`\`wing
 grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1820,7 +1820,7 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPut.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -1828,7 +1828,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1836,7 +1836,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPutAcl\` <a name=\\"grantPutAcl\\" id=\\"construct-library.GreeterBucket.grantPutAcl\\"></a>
+##### \`grantPutAcl\` <a name="grantPutAcl" id="construct-library.GreeterBucket.grantPutAcl"></a>
 
 \`\`\`wing
 grantPutAcl(identity: IGrantable, objectsKeyPattern?: str): Grant
@@ -1848,19 +1848,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPutAcl.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grantRead\` <a name=\\"grantRead\\" id=\\"construct-library.GreeterBucket.grantRead\\"></a>
+##### \`grantRead\` <a name="grantRead" id="construct-library.GreeterBucket.grantRead"></a>
 
 \`\`\`wing
 grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1871,7 +1871,7 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantRead.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -1879,7 +1879,7 @@ The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1887,7 +1887,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantReadWrite\` <a name=\\"grantReadWrite\\" id=\\"construct-library.GreeterBucket.grantReadWrite\\"></a>
+##### \`grantReadWrite\` <a name="grantReadWrite" id="construct-library.GreeterBucket.grantReadWrite"></a>
 
 \`\`\`wing
 grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1906,19 +1906,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantReadWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`grantWrite\` <a name=\\"grantWrite\\" id=\\"construct-library.GreeterBucket.grantWrite\\"></a>
+##### \`grantWrite\` <a name="grantWrite" id="construct-library.GreeterBucket.grantWrite"></a>
 
 \`\`\`wing
 grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1937,19 +1937,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantWrite.parameter.identity"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent\\"></a>
+##### \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="construct-library.GreeterBucket.onCloudTrailEvent"></a>
 
 \`\`\`wing
 onCloudTrailEvent(options?: OnCloudTrailBucketEventOptions): Rule
@@ -1960,7 +1960,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -1968,7 +1968,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailPutObject\` <a name=\\"onCloudTrailPutObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject\\"></a>
+##### \`onCloudTrailPutObject\` <a name="onCloudTrailPutObject" id="construct-library.GreeterBucket.onCloudTrailPutObject"></a>
 
 \`\`\`wing
 onCloudTrailPutObject(options?: OnCloudTrailBucketEventOptions): Rule
@@ -1983,7 +1983,7 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -1991,7 +1991,7 @@ Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailWriteObject\` <a name=\\"onCloudTrailWriteObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject\\"></a>
+##### \`onCloudTrailWriteObject\` <a name="onCloudTrailWriteObject" id="construct-library.GreeterBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`wing
 onCloudTrailWriteObject(options?: OnCloudTrailBucketEventOptions): Rule
@@ -2009,7 +2009,7 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.OnCloudTrailBucketEventOptions
 
@@ -2017,7 +2017,7 @@ Options for adding the rule.
 
 ---
 
-##### \`s3UrlForObject\` <a name=\\"s3UrlForObject\\" id=\\"construct-library.GreeterBucket.s3UrlForObject\\"></a>
+##### \`s3UrlForObject\` <a name="s3UrlForObject" id="construct-library.GreeterBucket.s3UrlForObject"></a>
 
 \`\`\`wing
 s3UrlForObject(key?: str): str
@@ -2028,7 +2028,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -2039,7 +2039,7 @@ bucket is returned.
 
 ---
 
-##### \`transferAccelerationUrlForObject\` <a name=\\"transferAccelerationUrlForObject\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transferAccelerationUrlForObject\` <a name="transferAccelerationUrlForObject" id="construct-library.GreeterBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`wing
 transferAccelerationUrlForObject(key?: str, options?: TransferAccelerationUrlOptions): str
@@ -2053,7 +2053,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -2064,7 +2064,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.TransferAccelerationUrlOptions
 
@@ -2072,7 +2072,7 @@ Options for generating URL.
 
 ---
 
-##### \`urlForObject\` <a name=\\"urlForObject\\" id=\\"construct-library.GreeterBucket.urlForObject\\"></a>
+##### \`urlForObject\` <a name="urlForObject" id="construct-library.GreeterBucket.urlForObject"></a>
 
 \`\`\`wing
 urlForObject(key?: str): str
@@ -2084,7 +2084,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.urlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -2095,7 +2095,7 @@ bucket is returned.
 
 ---
 
-##### \`virtualHostedUrlForObject\` <a name=\\"virtualHostedUrlForObject\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtualHostedUrlForObject\` <a name="virtualHostedUrlForObject" id="construct-library.GreeterBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`wing
 virtualHostedUrlForObject(key?: str, options?: VirtualHostedStyleUrlOptions): str
@@ -2108,7 +2108,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -2119,7 +2119,7 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-s3.VirtualHostedStyleUrlOptions
 
@@ -2127,7 +2127,7 @@ Options for generating URL.
 
 ---
 
-##### \`addCorsRule\` <a name=\\"addCorsRule\\" id=\\"construct-library.GreeterBucket.addCorsRule\\"></a>
+##### \`addCorsRule\` <a name="addCorsRule" id="construct-library.GreeterBucket.addCorsRule"></a>
 
 \`\`\`wing
 addCorsRule(rule: CorsRule): void
@@ -2135,7 +2135,7 @@ addCorsRule(rule: CorsRule): void
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addCorsRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.CorsRule
 
@@ -2143,7 +2143,7 @@ The CORS configuration rule to add.
 
 ---
 
-##### \`addInventory\` <a name=\\"addInventory\\" id=\\"construct-library.GreeterBucket.addInventory\\"></a>
+##### \`addInventory\` <a name="addInventory" id="construct-library.GreeterBucket.addInventory"></a>
 
 \`\`\`wing
 addInventory(inventory: Inventory): void
@@ -2151,7 +2151,7 @@ addInventory(inventory: Inventory): void
 
 Add an inventory configuration.
 
-###### \`inventory\`<sup>Required</sup> <a name=\\"inventory\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.inventory\\"></a>
+###### \`inventory\`<sup>Required</sup> <a name="inventory" id="construct-library.GreeterBucket.addInventory.parameter.inventory"></a>
 
 - *Type:* @aws-cdk/aws-s3.Inventory
 
@@ -2159,7 +2159,7 @@ configuration to add.
 
 ---
 
-##### \`addLifecycleRule\` <a name=\\"addLifecycleRule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule\\"></a>
+##### \`addLifecycleRule\` <a name="addLifecycleRule" id="construct-library.GreeterBucket.addLifecycleRule"></a>
 
 \`\`\`wing
 addLifecycleRule(rule: LifecycleRule): void
@@ -2167,7 +2167,7 @@ addLifecycleRule(rule: LifecycleRule): void
 
 Add a lifecycle rule to the bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addLifecycleRule.parameter.rule"></a>
 
 - *Type:* @aws-cdk/aws-s3.LifecycleRule
 
@@ -2175,7 +2175,7 @@ The rule to add.
 
 ---
 
-##### \`addMetric\` <a name=\\"addMetric\\" id=\\"construct-library.GreeterBucket.addMetric\\"></a>
+##### \`addMetric\` <a name="addMetric" id="construct-library.GreeterBucket.addMetric"></a>
 
 \`\`\`wing
 addMetric(metric: BucketMetrics): void
@@ -2183,7 +2183,7 @@ addMetric(metric: BucketMetrics): void
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`metric\`<sup>Required</sup> <a name=\\"metric\\" id=\\"construct-library.GreeterBucket.addMetric.parameter.metric\\"></a>
+###### \`metric\`<sup>Required</sup> <a name="metric" id="construct-library.GreeterBucket.addMetric.parameter.metric"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketMetrics
 
@@ -2191,65 +2191,65 @@ The metric configuration to add.
 
 ---
 
-##### \`greet\` <a name=\\"greet\\" id=\\"construct-library.GreeterBucket.greet\\"></a>
+##### \`greet\` <a name="greet" id="construct-library.GreeterBucket.greet"></a>
 
 \`\`\`wing
 greet(): void
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.isResource\\">isResource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketArn\\">fromBucketArn</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketAttributes\\">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.fromBucketName\\">fromBucketName</a></code> | *No description.* |
-| <code><a href=\\"#construct-library.GreeterBucket.validateBucketName\\">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#construct-library.GreeterBucket.isResource">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketArn">fromBucketArn</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.fromBucketAttributes">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#construct-library.GreeterBucket.fromBucketName">fromBucketName</a></code> | *No description.* |
+| <code><a href="#construct-library.GreeterBucket.validateBucketName">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`isResource\` <a name=\\"isResource\\" id=\\"construct-library.GreeterBucket.isResource\\"></a>
+##### \`isResource\` <a name="isResource" id="construct-library.GreeterBucket.isResource"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.isResource(construct: IConstruct);
 \`\`\`
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.GreeterBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.GreeterBucket.isResource.parameter.construct"></a>
 
 - *Type:* @aws-cdk/core.IConstruct
 
 ---
 
-##### \`fromBucketArn\` <a name=\\"fromBucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn\\"></a>
+##### \`fromBucketArn\` <a name="fromBucketArn" id="construct-library.GreeterBucket.fromBucketArn"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketArn(bucketArn: str);
 \`\`\`
 
-###### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* str
 
 ---
 
-##### \`fromBucketAttributes\` <a name=\\"fromBucketAttributes\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes\\"></a>
+##### \`fromBucketAttributes\` <a name="fromBucketAttributes" id="construct-library.GreeterBucket.fromBucketAttributes"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketAttributes(attrs: BucketAttributes);
 \`\`\`
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`attrs\`<sup>Required</sup> <a name=\\"attrs\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs\\"></a>
+###### \`attrs\`<sup>Required</sup> <a name="attrs" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs"></a>
 
 - *Type:* @aws-cdk/aws-s3.BucketAttributes
 
@@ -2260,31 +2260,31 @@ Can be obtained from a call to
 
 ---
 
-##### \`fromBucketName\` <a name=\\"fromBucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName\\"></a>
+##### \`fromBucketName\` <a name="fromBucketName" id="construct-library.GreeterBucket.fromBucketName"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketName(bucketName: str);
 \`\`\`
 
-###### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* str
 
 ---
 
-##### \`validateBucketName\` <a name=\\"validateBucketName\\" id=\\"construct-library.GreeterBucket.validateBucketName\\"></a>
+##### \`validateBucketName\` <a name="validateBucketName" id="construct-library.GreeterBucket.validateBucketName"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.validateBucketName(physicalName: str);
 \`\`\`
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physicalName\`<sup>Required</sup> <a name=\\"physicalName\\" id=\\"construct-library.GreeterBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physicalName\`<sup>Required</sup> <a name="physicalName" id="construct-library.GreeterBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* str
 
@@ -2292,27 +2292,27 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#construct-library.GreeterBucket.property.node\\">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.env\\">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.stack\\">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketArn\\">bucketArn</a></code> | <code>str</code> | The ARN of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDomainName\\">bucketDomainName</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketDualStackDomainName\\">bucketDualStackDomainName</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketName\\">bucketName</a></code> | <code>str</code> | The name of the bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketRegionalDomainName\\">bucketRegionalDomainName</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteDomainName\\">bucketWebsiteDomainName</a></code> | <code>str</code> | The Domain name of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.bucketWebsiteUrl\\">bucketWebsiteUrl</a></code> | <code>str</code> | The URL of the static website. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.encryptionKey\\">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.isWebsite\\">isWebsite</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#construct-library.GreeterBucket.property.policy\\">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.node">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node associated with this construct. |
+| <code><a href="#construct-library.GreeterBucket.property.env">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#construct-library.GreeterBucket.property.stack">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketArn">bucketArn</a></code> | <code>str</code> | The ARN of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDomainName">bucketDomainName</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketDualStackDomainName">bucketDualStackDomainName</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketName">bucketName</a></code> | <code>str</code> | The name of the bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketRegionalDomainName">bucketRegionalDomainName</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteDomainName">bucketWebsiteDomainName</a></code> | <code>str</code> | The Domain name of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.bucketWebsiteUrl">bucketWebsiteUrl</a></code> | <code>str</code> | The URL of the static website. |
+| <code><a href="#construct-library.GreeterBucket.property.encryptionKey">encryptionKey</a></code> | <code>@aws-cdk/aws-kms.IKey</code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#construct-library.GreeterBucket.property.isWebsite">isWebsite</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#construct-library.GreeterBucket.property.policy">policy</a></code> | <code>@aws-cdk/aws-s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.GreeterBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.GreeterBucket.property.node"></a>
 
 \`\`\`wing
 node: ConstructNode;
@@ -2324,7 +2324,7 @@ The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.GreeterBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.GreeterBucket.property.env"></a>
 
 \`\`\`wing
 env: ResourceEnvironment;
@@ -2343,7 +2343,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.GreeterBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.GreeterBucket.property.stack"></a>
 
 \`\`\`wing
 stack: Stack;
@@ -2355,7 +2355,7 @@ The stack in which this resource is defined.
 
 ---
 
-##### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.property.bucketArn\\"></a>
+##### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.property.bucketArn"></a>
 
 \`\`\`wing
 bucketArn: str;
@@ -2367,7 +2367,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucketDomainName\`<sup>Required</sup> <a name=\\"bucketDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDomainName\\"></a>
+##### \`bucketDomainName\`<sup>Required</sup> <a name="bucketDomainName" id="construct-library.GreeterBucket.property.bucketDomainName"></a>
 
 \`\`\`wing
 bucketDomainName: str;
@@ -2379,7 +2379,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name=\\"bucketDualStackDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name="bucketDualStackDomainName" id="construct-library.GreeterBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`wing
 bucketDualStackDomainName: str;
@@ -2391,7 +2391,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.property.bucketName\\"></a>
+##### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.property.bucketName"></a>
 
 \`\`\`wing
 bucketName: str;
@@ -2403,7 +2403,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name=\\"bucketRegionalDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name="bucketRegionalDomainName" id="construct-library.GreeterBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`wing
 bucketRegionalDomainName: str;
@@ -2415,7 +2415,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name=\\"bucketWebsiteDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name="bucketWebsiteDomainName" id="construct-library.GreeterBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`wing
 bucketWebsiteDomainName: str;
@@ -2427,7 +2427,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name=\\"bucketWebsiteUrl\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name="bucketWebsiteUrl" id="construct-library.GreeterBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`wing
 bucketWebsiteUrl: str;
@@ -2439,7 +2439,7 @@ The URL of the static website.
 
 ---
 
-##### \`encryptionKey\`<sup>Optional</sup> <a name=\\"encryptionKey\\" id=\\"construct-library.GreeterBucket.property.encryptionKey\\"></a>
+##### \`encryptionKey\`<sup>Optional</sup> <a name="encryptionKey" id="construct-library.GreeterBucket.property.encryptionKey"></a>
 
 \`\`\`wing
 encryptionKey: IKey;
@@ -2451,7 +2451,7 @@ Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`isWebsite\`<sup>Optional</sup> <a name=\\"isWebsite\\" id=\\"construct-library.GreeterBucket.property.isWebsite\\"></a>
+##### \`isWebsite\`<sup>Optional</sup> <a name="isWebsite" id="construct-library.GreeterBucket.property.isWebsite"></a>
 
 \`\`\`wing
 isWebsite: bool;
@@ -2463,7 +2463,7 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.GreeterBucket.property.policy"></a>
 
 \`\`\`wing
 policy: BucketPolicy;
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/enum.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/enum.test.ts.snap
index 5a8b506b786..7e5349478fc 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/enum.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/enum.test.ts.snap
@@ -1,25 +1,25 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "displayName": "TagMutability",
-  "docs": Object {
+  "docs": {
     "summary": "The tag mutability setting for your repository.",
   },
   "fqn": "Amazon.CDK.AWS.ECR.TagMutability",
   "id": "@aws-cdk/aws-ecr.TagMutability",
-  "members": Array [
-    Object {
+  "members": [
+    {
       "displayName": "MUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "allow image tags to be overwritten.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.TagMutability.MUTABLE",
       "id": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
     },
-    Object {
+    {
       "displayName": "IMMUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "all image tags within the repository will be immutable which will prevent them from being overwritten.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.TagMutability.IMMUTABLE",
@@ -30,27 +30,27 @@ Object {
 `;
 
 exports[`csharp snapshot 2`] = `
-" TagMutability <a name=\\"TagMutability\\" id=\\"@aws-cdk/aws-ecr.TagMutability\\"></a>
+" TagMutability <a name="TagMutability" id="@aws-cdk/aws-ecr.TagMutability"></a>
 
 The tag mutability setting for your repository.
 
-# Members <a name=\\"Members\\" id=\\"Members\\"></a>
+# Members <a name="Members" id="Members"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.MUTABLE\\">MUTABLE</a></code> | allow image tags to be overwritten. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.MUTABLE">MUTABLE</a></code> | allow image tags to be overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
 
 ---
 
-## \`MUTABLE\` <a name=\\"MUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.MUTABLE\\"></a>
+## \`MUTABLE\` <a name="MUTABLE" id="@aws-cdk/aws-ecr.TagMutability.MUTABLE"></a>
 
 allow image tags to be overwritten.
 
 ---
 
 
-## \`IMMUTABLE\` <a name=\\"IMMUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\"></a>
+## \`IMMUTABLE\` <a name="IMMUTABLE" id="@aws-cdk/aws-ecr.TagMutability.IMMUTABLE"></a>
 
 all image tags within the repository will be immutable which will prevent them from being overwritten.
 
@@ -60,25 +60,25 @@ all image tags within the repository will be immutable which will prevent them f
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "displayName": "TagMutability",
-  "docs": Object {
+  "docs": {
     "summary": "The tag mutability setting for your repository.",
   },
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.TagMutability",
   "id": "@aws-cdk/aws-ecr.TagMutability",
-  "members": Array [
-    Object {
+  "members": [
+    {
       "displayName": "TagMutability_MUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "allow image tags to be overwritten.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.TagMutability_MUTABLE",
       "id": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
     },
-    Object {
+    {
       "displayName": "TagMutability_IMMUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "all image tags within the repository will be immutable which will prevent them from being overwritten.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.TagMutability_IMMUTABLE",
@@ -89,27 +89,27 @@ Object {
 `;
 
 exports[`go snapshot 2`] = `
-" TagMutability <a name=\\"TagMutability\\" id=\\"@aws-cdk/aws-ecr.TagMutability\\"></a>
+" TagMutability <a name="TagMutability" id="@aws-cdk/aws-ecr.TagMutability"></a>
 
 The tag mutability setting for your repository.
 
-# Members <a name=\\"Members\\" id=\\"Members\\"></a>
+# Members <a name="Members" id="Members"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.MUTABLE\\">TagMutability_MUTABLE</a></code> | allow image tags to be overwritten. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\">TagMutability_IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.MUTABLE">TagMutability_MUTABLE</a></code> | allow image tags to be overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE">TagMutability_IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
 
 ---
 
-## \`TagMutability_MUTABLE\` <a name=\\"TagMutability_MUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.MUTABLE\\"></a>
+## \`TagMutability_MUTABLE\` <a name="TagMutability_MUTABLE" id="@aws-cdk/aws-ecr.TagMutability.MUTABLE"></a>
 
 allow image tags to be overwritten.
 
 ---
 
 
-## \`TagMutability_IMMUTABLE\` <a name=\\"TagMutability_IMMUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\"></a>
+## \`TagMutability_IMMUTABLE\` <a name="TagMutability_IMMUTABLE" id="@aws-cdk/aws-ecr.TagMutability.IMMUTABLE"></a>
 
 all image tags within the repository will be immutable which will prevent them from being overwritten.
 
@@ -119,25 +119,25 @@ all image tags within the repository will be immutable which will prevent them f
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "displayName": "TagMutability",
-  "docs": Object {
+  "docs": {
     "summary": "The tag mutability setting for your repository.",
   },
   "fqn": "software.amazon.awscdk.services.ecr.TagMutability",
   "id": "@aws-cdk/aws-ecr.TagMutability",
-  "members": Array [
-    Object {
+  "members": [
+    {
       "displayName": "MUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "allow image tags to be overwritten.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.TagMutability.MUTABLE",
       "id": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
     },
-    Object {
+    {
       "displayName": "IMMUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "all image tags within the repository will be immutable which will prevent them from being overwritten.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.TagMutability.IMMUTABLE",
@@ -148,27 +148,27 @@ Object {
 `;
 
 exports[`java snapshot 2`] = `
-" TagMutability <a name=\\"TagMutability\\" id=\\"@aws-cdk/aws-ecr.TagMutability\\"></a>
+" TagMutability <a name="TagMutability" id="@aws-cdk/aws-ecr.TagMutability"></a>
 
 The tag mutability setting for your repository.
 
-# Members <a name=\\"Members\\" id=\\"Members\\"></a>
+# Members <a name="Members" id="Members"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.MUTABLE\\">MUTABLE</a></code> | allow image tags to be overwritten. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.MUTABLE">MUTABLE</a></code> | allow image tags to be overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
 
 ---
 
-## \`MUTABLE\` <a name=\\"MUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.MUTABLE\\"></a>
+## \`MUTABLE\` <a name="MUTABLE" id="@aws-cdk/aws-ecr.TagMutability.MUTABLE"></a>
 
 allow image tags to be overwritten.
 
 ---
 
 
-## \`IMMUTABLE\` <a name=\\"IMMUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\"></a>
+## \`IMMUTABLE\` <a name="IMMUTABLE" id="@aws-cdk/aws-ecr.TagMutability.IMMUTABLE"></a>
 
 all image tags within the repository will be immutable which will prevent them from being overwritten.
 
@@ -178,25 +178,25 @@ all image tags within the repository will be immutable which will prevent them f
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "displayName": "TagMutability",
-  "docs": Object {
+  "docs": {
     "summary": "The tag mutability setting for your repository.",
   },
   "fqn": "aws_cdk.aws_ecr.TagMutability",
   "id": "@aws-cdk/aws-ecr.TagMutability",
-  "members": Array [
-    Object {
+  "members": [
+    {
       "displayName": "MUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "allow image tags to be overwritten.",
       },
       "fqn": "aws_cdk.aws_ecr.TagMutability.MUTABLE",
       "id": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
     },
-    Object {
+    {
       "displayName": "IMMUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "all image tags within the repository will be immutable which will prevent them from being overwritten.",
       },
       "fqn": "aws_cdk.aws_ecr.TagMutability.IMMUTABLE",
@@ -207,27 +207,27 @@ Object {
 `;
 
 exports[`python snapshot 2`] = `
-" TagMutability <a name=\\"TagMutability\\" id=\\"@aws-cdk/aws-ecr.TagMutability\\"></a>
+" TagMutability <a name="TagMutability" id="@aws-cdk/aws-ecr.TagMutability"></a>
 
 The tag mutability setting for your repository.
 
-# Members <a name=\\"Members\\" id=\\"Members\\"></a>
+# Members <a name="Members" id="Members"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.MUTABLE\\">MUTABLE</a></code> | allow image tags to be overwritten. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.MUTABLE">MUTABLE</a></code> | allow image tags to be overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
 
 ---
 
-## \`MUTABLE\` <a name=\\"MUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.MUTABLE\\"></a>
+## \`MUTABLE\` <a name="MUTABLE" id="@aws-cdk/aws-ecr.TagMutability.MUTABLE"></a>
 
 allow image tags to be overwritten.
 
 ---
 
 
-## \`IMMUTABLE\` <a name=\\"IMMUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\"></a>
+## \`IMMUTABLE\` <a name="IMMUTABLE" id="@aws-cdk/aws-ecr.TagMutability.IMMUTABLE"></a>
 
 all image tags within the repository will be immutable which will prevent them from being overwritten.
 
@@ -237,25 +237,25 @@ all image tags within the repository will be immutable which will prevent them f
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "displayName": "TagMutability",
-  "docs": Object {
+  "docs": {
     "summary": "The tag mutability setting for your repository.",
   },
   "fqn": "@aws-cdk/aws-ecr.TagMutability",
   "id": "@aws-cdk/aws-ecr.TagMutability",
-  "members": Array [
-    Object {
+  "members": [
+    {
       "displayName": "MUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "allow image tags to be overwritten.",
       },
       "fqn": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
       "id": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
     },
-    Object {
+    {
       "displayName": "IMMUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "all image tags within the repository will be immutable which will prevent them from being overwritten.",
       },
       "fqn": "@aws-cdk/aws-ecr.TagMutability.IMMUTABLE",
@@ -266,27 +266,27 @@ Object {
 `;
 
 exports[`typescript snapshot 2`] = `
-" TagMutability <a name=\\"TagMutability\\" id=\\"@aws-cdk/aws-ecr.TagMutability\\"></a>
+" TagMutability <a name="TagMutability" id="@aws-cdk/aws-ecr.TagMutability"></a>
 
 The tag mutability setting for your repository.
 
-# Members <a name=\\"Members\\" id=\\"Members\\"></a>
+# Members <a name="Members" id="Members"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.MUTABLE\\">MUTABLE</a></code> | allow image tags to be overwritten. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.MUTABLE">MUTABLE</a></code> | allow image tags to be overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
 
 ---
 
-## \`MUTABLE\` <a name=\\"MUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.MUTABLE\\"></a>
+## \`MUTABLE\` <a name="MUTABLE" id="@aws-cdk/aws-ecr.TagMutability.MUTABLE"></a>
 
 allow image tags to be overwritten.
 
 ---
 
 
-## \`IMMUTABLE\` <a name=\\"IMMUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\"></a>
+## \`IMMUTABLE\` <a name="IMMUTABLE" id="@aws-cdk/aws-ecr.TagMutability.IMMUTABLE"></a>
 
 all image tags within the repository will be immutable which will prevent them from being overwritten.
 
@@ -296,25 +296,25 @@ all image tags within the repository will be immutable which will prevent them f
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "displayName": "TagMutability",
-  "docs": Object {
+  "docs": {
     "summary": "The tag mutability setting for your repository.",
   },
   "fqn": "@aws-cdk/aws-ecr.TagMutability",
   "id": "@aws-cdk/aws-ecr.TagMutability",
-  "members": Array [
-    Object {
+  "members": [
+    {
       "displayName": "MUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "allow image tags to be overwritten.",
       },
       "fqn": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
       "id": "@aws-cdk/aws-ecr.TagMutability.MUTABLE",
     },
-    Object {
+    {
       "displayName": "IMMUTABLE",
-      "docs": Object {
+      "docs": {
         "summary": "all image tags within the repository will be immutable which will prevent them from being overwritten.",
       },
       "fqn": "@aws-cdk/aws-ecr.TagMutability.IMMUTABLE",
@@ -325,27 +325,27 @@ Object {
 `;
 
 exports[`wing snapshot 2`] = `
-" TagMutability <a name=\\"TagMutability\\" id=\\"@aws-cdk/aws-ecr.TagMutability\\"></a>
+" TagMutability <a name="TagMutability" id="@aws-cdk/aws-ecr.TagMutability"></a>
 
 The tag mutability setting for your repository.
 
-# Members <a name=\\"Members\\" id=\\"Members\\"></a>
+# Members <a name="Members" id="Members"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.MUTABLE\\">MUTABLE</a></code> | allow image tags to be overwritten. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.MUTABLE">MUTABLE</a></code> | allow image tags to be overwritten. |
+| <code><a href="#@aws-cdk/aws-ecr.TagMutability.IMMUTABLE">IMMUTABLE</a></code> | all image tags within the repository will be immutable which will prevent them from being overwritten. |
 
 ---
 
-## \`MUTABLE\` <a name=\\"MUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.MUTABLE\\"></a>
+## \`MUTABLE\` <a name="MUTABLE" id="@aws-cdk/aws-ecr.TagMutability.MUTABLE"></a>
 
 allow image tags to be overwritten.
 
 ---
 
 
-## \`IMMUTABLE\` <a name=\\"IMMUTABLE\\" id=\\"@aws-cdk/aws-ecr.TagMutability.IMMUTABLE\\"></a>
+## \`IMMUTABLE\` <a name="IMMUTABLE" id="@aws-cdk/aws-ecr.TagMutability.IMMUTABLE"></a>
 
 all image tags within the repository will be immutable which will prevent them from being overwritten.
 
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/initializer.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/initializer.test.ts.snap
index e1de583dfe0..8a10bd7cc22 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/initializer.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/initializer.test.ts.snap
@@ -1,24 +1,24 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "displayName": "Initializer",
   "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepository.Initializer",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "Scope",
-      "docs": Object {
+      "docs": {
         "summary": "- scope in which this resource is defined.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepository.Initializer.parameter.Scope",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Construct",
             "fqn": "Amazon.CDK.Construct",
             "id": "@aws-cdk/core.Construct",
@@ -28,32 +28,32 @@ Object {
         ],
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Id",
-      "docs": Object {
+      "docs": {
         "summary": "- scoped id of the resource.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepository.Initializer.parameter.Id",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Props",
-      "docs": Object {
+      "docs": {
         "summary": "- resource properties.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepository.Initializer.parameter.Props",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "CfnPublicRepositoryProps",
             "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepositoryProps",
             "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
@@ -71,7 +71,7 @@ new CfnPublicRepository(Construct Scope, string Id, CfnPublicRepositoryProps Pro
 `;
 
 exports[`csharp snapshot 2`] = `
-" Initializers <a name=\\"Initializers\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer\\"></a>
+" Initializers <a name="Initializers" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer"></a>
 
 \`\`\`csharp
 using Amazon.CDK.AWS.ECR;
@@ -81,13 +81,13 @@ new CfnPublicRepository(Construct Scope, string Id, CfnPublicRepositoryProps Pro
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\">Scope</a></code> | <code>Amazon.CDK.Construct</code> | - scope in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\">Id</a></code> | <code>string</code> | - scoped id of the resource. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\">Props</a></code> | <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a></code> | - resource properties. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope">Scope</a></code> | <code>Amazon.CDK.Construct</code> | - scope in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id">Id</a></code> | <code>string</code> | - scoped id of the resource. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props">Props</a></code> | <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a></code> | - resource properties. |
 
 ---
 
-# \`Scope\`<sup>Required</sup> <a name=\\"Scope\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\"></a>
+# \`Scope\`<sup>Required</sup> <a name="Scope" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope"></a>
 
 - *Type:* Amazon.CDK.Construct
 
@@ -95,7 +95,7 @@ scope in which this resource is defined.
 
 ---
 
-# \`Id\`<sup>Required</sup> <a name=\\"Id\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\"></a>
+# \`Id\`<sup>Required</sup> <a name="Id" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id"></a>
 
 - *Type:* string
 
@@ -103,9 +103,9 @@ scoped id of the resource.
 
 ---
 
-# \`Props\`<sup>Optional</sup> <a name=\\"Props\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\"></a>
+# \`Props\`<sup>Optional</sup> <a name="Props" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a>
 
 resource properties.
 
@@ -114,24 +114,24 @@ resource properties.
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "displayName": "Initializer",
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepository.Initializer",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "scope",
-      "docs": Object {
+      "docs": {
         "summary": "- scope in which this resource is defined.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepository.Initializer.parameter.scope",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Construct",
             "fqn": "github.com/aws/aws-cdk-go/awscdk/awscdkcore.Construct",
             "id": "@aws-cdk/core.Construct",
@@ -141,32 +141,32 @@ Object {
         ],
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "id",
-      "docs": Object {
+      "docs": {
         "summary": "- scoped id of the resource.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepository.Initializer.parameter.id",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "*string",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "props",
-      "docs": Object {
+      "docs": {
         "summary": "- resource properties.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepository.Initializer.parameter.props",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "CfnPublicRepositoryProps",
             "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepositoryProps",
             "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
@@ -177,30 +177,30 @@ Object {
       },
     },
   ],
-  "usage": "import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+  "usage": "import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 awscdkawsecr.NewCfnPublicRepository(scope Construct, id *string, props CfnPublicRepositoryProps) CfnPublicRepository",
 }
 `;
 
 exports[`go snapshot 2`] = `
-" Initializers <a name=\\"Initializers\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer\\"></a>
+" Initializers <a name="Initializers" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer"></a>
 
 \`\`\`go
-import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 awscdkawsecr.NewCfnPublicRepository(scope Construct, id *string, props CfnPublicRepositoryProps) CfnPublicRepository
 \`\`\`
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\">scope</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.Construct</code> | - scope in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\">id</a></code> | <code>*string</code> | - scoped id of the resource. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\">props</a></code> | <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a></code> | - resource properties. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope">scope</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.Construct</code> | - scope in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id">id</a></code> | <code>*string</code> | - scoped id of the resource. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props">props</a></code> | <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a></code> | - resource properties. |
 
 ---
 
-# \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\"></a>
+# \`scope\`<sup>Required</sup> <a name="scope" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awscdkcore.Construct
 
@@ -208,7 +208,7 @@ scope in which this resource is defined.
 
 ---
 
-# \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\"></a>
+# \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id"></a>
 
 - *Type:* *string
 
@@ -216,9 +216,9 @@ scoped id of the resource.
 
 ---
 
-# \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\"></a>
+# \`props\`<sup>Optional</sup> <a name="props" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a>
 
 resource properties.
 
@@ -227,24 +227,24 @@ resource properties.
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "displayName": "Initializer",
   "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.Initializer",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "scope",
-      "docs": Object {
+      "docs": {
         "summary": "- scope in which this resource is defined.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.Initializer.parameter.scope",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Construct",
             "fqn": "software.amazon.awscdk.core.Construct",
             "id": "@aws-cdk/core.Construct",
@@ -254,24 +254,24 @@ Object {
         ],
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "id",
-      "docs": Object {
+      "docs": {
         "summary": "- scoped id of the resource.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.Initializer.parameter.id",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.String",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryCatalogData",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -279,15 +279,15 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.Object",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryName",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -295,15 +295,15 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.Initializer.parameter.repositoryName",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.String",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryPolicyText",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -311,15 +311,15 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.Object",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -327,13 +327,13 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.Initializer.parameter.tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.util.List<%>",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "software.amazon.awscdk.core.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -358,7 +358,7 @@ CfnPublicRepository.Builder.create(Construct scope, java.lang.String id)
 `;
 
 exports[`java snapshot 2`] = `
-" Initializers <a name=\\"Initializers\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer\\"></a>
+" Initializers <a name="Initializers" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer"></a>
 
 \`\`\`java
 import software.amazon.awscdk.services.ecr.CfnPublicRepository;
@@ -373,16 +373,16 @@ CfnPublicRepository.Builder.create(Construct scope, java.lang.String id)
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\">scope</a></code> | <code>software.amazon.awscdk.core.Construct</code> | - scope in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\">id</a></code> | <code>java.lang.String</code> | - scoped id of the resource. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData\\">repositoryCatalogData</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName\\">repositoryName</a></code> | <code>java.lang.String</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText\\">repositoryPolicyText</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags\\">tags</a></code> | <code>java.util.List<software.amazon.awscdk.core.CfnTag></code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope">scope</a></code> | <code>software.amazon.awscdk.core.Construct</code> | - scope in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id">id</a></code> | <code>java.lang.String</code> | - scoped id of the resource. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData">repositoryCatalogData</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName">repositoryName</a></code> | <code>java.lang.String</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText">repositoryPolicyText</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags">tags</a></code> | <code>java.util.List<software.amazon.awscdk.core.CfnTag></code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-# \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\"></a>
+# \`scope\`<sup>Required</sup> <a name="scope" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope"></a>
 
 - *Type:* software.amazon.awscdk.core.Construct
 
@@ -390,7 +390,7 @@ scope in which this resource is defined.
 
 ---
 
-# \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\"></a>
+# \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id"></a>
 
 - *Type:* java.lang.String
 
@@ -398,7 +398,7 @@ scoped id of the resource.
 
 ---
 
-# \`repositoryCatalogData\`<sup>Optional</sup> <a name=\\"repositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData\\"></a>
+# \`repositoryCatalogData\`<sup>Optional</sup> <a name="repositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData"></a>
 
 - *Type:* java.lang.Object
 
@@ -408,7 +408,7 @@ scoped id of the resource.
 
 ---
 
-# \`repositoryName\`<sup>Optional</sup> <a name=\\"repositoryName\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName\\"></a>
+# \`repositoryName\`<sup>Optional</sup> <a name="repositoryName" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName"></a>
 
 - *Type:* java.lang.String
 
@@ -418,7 +418,7 @@ scoped id of the resource.
 
 ---
 
-# \`repositoryPolicyText\`<sup>Optional</sup> <a name=\\"repositoryPolicyText\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText\\"></a>
+# \`repositoryPolicyText\`<sup>Optional</sup> <a name="repositoryPolicyText" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText"></a>
 
 - *Type:* java.lang.Object
 
@@ -428,7 +428,7 @@ scoped id of the resource.
 
 ---
 
-# \`tags\`<sup>Optional</sup> <a name=\\"tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags\\"></a>
+# \`tags\`<sup>Optional</sup> <a name="tags" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags"></a>
 
 - *Type:* java.util.List<software.amazon.awscdk.core.CfnTag>
 
@@ -441,24 +441,24 @@ scoped id of the resource.
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "displayName": "Initializer",
   "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.Initializer",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "scope",
-      "docs": Object {
+      "docs": {
         "summary": "- scope in which this resource is defined.",
       },
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.Initializer.parameter.scope",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Construct",
             "fqn": "aws_cdk.core.Construct",
             "id": "@aws-cdk/core.Construct",
@@ -468,24 +468,24 @@ Object {
         ],
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "id",
-      "docs": Object {
+      "docs": {
         "summary": "- scoped id of the resource.",
       },
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.Initializer.parameter.id",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_catalog_data",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -493,15 +493,15 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.Initializer.parameter.repository_catalog_data",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "typing.Any",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_name",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -509,15 +509,15 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.Initializer.parameter.repository_name",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_policy_text",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -525,15 +525,15 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.Initializer.parameter.repository_policy_text",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "typing.Any",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -541,13 +541,13 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.Initializer.parameter.tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "typing.List[%]",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "aws_cdk.core.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -574,7 +574,7 @@ aws_cdk.aws_ecr.CfnPublicRepository(
 `;
 
 exports[`python snapshot 2`] = `
-" Initializers <a name=\\"Initializers\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer\\"></a>
+" Initializers <a name="Initializers" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer"></a>
 
 \`\`\`python
 import aws_cdk.aws_ecr
@@ -591,16 +591,16 @@ aws_cdk.aws_ecr.CfnPublicRepository(
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\">scope</a></code> | <code>aws_cdk.core.Construct</code> | - scope in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\">id</a></code> | <code>str</code> | - scoped id of the resource. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData\\">repository_catalog_data</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName\\">repository_name</a></code> | <code>str</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText\\">repository_policy_text</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags\\">tags</a></code> | <code>typing.List[aws_cdk.core.CfnTag]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope">scope</a></code> | <code>aws_cdk.core.Construct</code> | - scope in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id">id</a></code> | <code>str</code> | - scoped id of the resource. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData">repository_catalog_data</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName">repository_name</a></code> | <code>str</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText">repository_policy_text</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags">tags</a></code> | <code>typing.List[aws_cdk.core.CfnTag]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-# \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\"></a>
+# \`scope\`<sup>Required</sup> <a name="scope" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope"></a>
 
 - *Type:* aws_cdk.core.Construct
 
@@ -608,7 +608,7 @@ scope in which this resource is defined.
 
 ---
 
-# \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\"></a>
+# \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id"></a>
 
 - *Type:* str
 
@@ -616,7 +616,7 @@ scoped id of the resource.
 
 ---
 
-# \`repository_catalog_data\`<sup>Optional</sup> <a name=\\"repository_catalog_data\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData\\"></a>
+# \`repository_catalog_data\`<sup>Optional</sup> <a name="repository_catalog_data" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryCatalogData"></a>
 
 - *Type:* typing.Any
 
@@ -626,7 +626,7 @@ scoped id of the resource.
 
 ---
 
-# \`repository_name\`<sup>Optional</sup> <a name=\\"repository_name\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName\\"></a>
+# \`repository_name\`<sup>Optional</sup> <a name="repository_name" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryName"></a>
 
 - *Type:* str
 
@@ -636,7 +636,7 @@ scoped id of the resource.
 
 ---
 
-# \`repository_policy_text\`<sup>Optional</sup> <a name=\\"repository_policy_text\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText\\"></a>
+# \`repository_policy_text\`<sup>Optional</sup> <a name="repository_policy_text" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.repositoryPolicyText"></a>
 
 - *Type:* typing.Any
 
@@ -646,7 +646,7 @@ scoped id of the resource.
 
 ---
 
-# \`tags\`<sup>Optional</sup> <a name=\\"tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags\\"></a>
+# \`tags\`<sup>Optional</sup> <a name="tags" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.tags"></a>
 
 - *Type:* typing.List[aws_cdk.core.CfnTag]
 
@@ -659,24 +659,24 @@ scoped id of the resource.
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "displayName": "Initializer",
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "scope",
-      "docs": Object {
+      "docs": {
         "summary": "- scope in which this resource is defined.",
       },
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Construct",
             "fqn": "@aws-cdk/core.Construct",
             "id": "@aws-cdk/core.Construct",
@@ -686,32 +686,32 @@ Object {
         ],
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "id",
-      "docs": Object {
+      "docs": {
         "summary": "- scoped id of the resource.",
       },
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "props",
-      "docs": Object {
+      "docs": {
         "summary": "- resource properties.",
       },
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "CfnPublicRepositoryProps",
             "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
             "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
@@ -729,7 +729,7 @@ new CfnPublicRepository(scope: Construct, id: string, props?: CfnPublicRepositor
 `;
 
 exports[`typescript snapshot 2`] = `
-" Initializers <a name=\\"Initializers\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer\\"></a>
+" Initializers <a name="Initializers" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer"></a>
 
 \`\`\`typescript
 import { CfnPublicRepository } from '@aws-cdk/aws-ecr'
@@ -739,13 +739,13 @@ new CfnPublicRepository(scope: Construct, id: string, props?: CfnPublicRepositor
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\">scope</a></code> | <code>@aws-cdk/core.Construct</code> | - scope in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\">id</a></code> | <code>string</code> | - scoped id of the resource. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\">props</a></code> | <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a></code> | - resource properties. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope">scope</a></code> | <code>@aws-cdk/core.Construct</code> | - scope in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id">id</a></code> | <code>string</code> | - scoped id of the resource. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props">props</a></code> | <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a></code> | - resource properties. |
 
 ---
 
-# \`scope\`<sup>Required</sup> <a name=\\"scope\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope\\"></a>
+# \`scope\`<sup>Required</sup> <a name="scope" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.scope"></a>
 
 - *Type:* @aws-cdk/core.Construct
 
@@ -753,7 +753,7 @@ scope in which this resource is defined.
 
 ---
 
-# \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id\\"></a>
+# \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.id"></a>
 
 - *Type:* string
 
@@ -761,9 +761,9 @@ scoped id of the resource.
 
 ---
 
-# \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\"></a>
+# \`props\`<sup>Optional</sup> <a name="props" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a>
 
 resource properties.
 
@@ -772,24 +772,24 @@ resource properties.
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "displayName": "Initializer",
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "props",
-      "docs": Object {
+      "docs": {
         "summary": "- resource properties.",
       },
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "CfnPublicRepositoryProps",
             "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
             "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
@@ -800,30 +800,30 @@ Object {
       },
     },
   ],
-  "usage": "bring { CfnPublicRepository } from \\"@aws-cdk/aws-ecr\\";
+  "usage": "bring { CfnPublicRepository } from "@aws-cdk/aws-ecr";
 
 new CfnPublicRepository(props?: CfnPublicRepositoryProps);",
 }
 `;
 
 exports[`wing snapshot 2`] = `
-" Initializers <a name=\\"Initializers\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer\\"></a>
+" Initializers <a name="Initializers" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer"></a>
 
 \`\`\`wing
-bring { CfnPublicRepository } from \\"@aws-cdk/aws-ecr\\";
+bring { CfnPublicRepository } from "@aws-cdk/aws-ecr";
 
 new CfnPublicRepository(props?: CfnPublicRepositoryProps);
 \`\`\`
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\">props</a></code> | <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a></code> | - resource properties. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props">props</a></code> | <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a></code> | - resource properties. |
 
 ---
 
-# \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props\\"></a>
+# \`props\`<sup>Optional</sup> <a name="props" id="@aws-cdk/aws-ecr.CfnPublicRepository.Initializer.parameter.props"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\">CfnPublicRepositoryProps</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps">CfnPublicRepositoryProps</a>
 
 resource properties.
 
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/instance-method.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/instance-method.test.ts.snap
index d1b54ef6120..ef87f9247fe 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/instance-method.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/instance-method.test.ts.snap
@@ -1,27 +1,27 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "displayName": "Inspect",
-  "docs": Object {
+  "docs": {
     "summary": "Examines the CloudFormation resource and discloses attributes.",
   },
   "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepository.Inspect",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "Inspector",
-      "docs": Object {
+      "docs": {
         "summary": "- tree inspector to collect and process attributes.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepository.Inspect.parameter.Inspector",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "TreeInspector",
             "fqn": "Amazon.CDK.TreeInspector",
             "id": "@aws-cdk/core.TreeInspector",
@@ -37,7 +37,7 @@ Object {
 `;
 
 exports[`csharp snapshot 2`] = `
-" \`Inspect\` <a name=\\"Inspect\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect\\"></a>
+" \`Inspect\` <a name="Inspect" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect"></a>
 
 \`\`\`csharp
 private void Inspect(TreeInspector Inspector)
@@ -45,7 +45,7 @@ private void Inspect(TreeInspector Inspector)
 
 Examines the CloudFormation resource and discloses attributes.
 
-# \`Inspector\`<sup>Required</sup> <a name=\\"Inspector\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector\\"></a>
+# \`Inspector\`<sup>Required</sup> <a name="Inspector" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector"></a>
 
 - *Type:* Amazon.CDK.TreeInspector
 
@@ -56,27 +56,27 @@ tree inspector to collect and process attributes.
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "displayName": "Inspect",
-  "docs": Object {
+  "docs": {
     "summary": "Examines the CloudFormation resource and discloses attributes.",
   },
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepository.Inspect",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "inspector",
-      "docs": Object {
+      "docs": {
         "summary": "- tree inspector to collect and process attributes.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepository.Inspect.parameter.inspector",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "TreeInspector",
             "fqn": "github.com/aws/aws-cdk-go/awscdk/awscdkcore.TreeInspector",
             "id": "@aws-cdk/core.TreeInspector",
@@ -92,7 +92,7 @@ Object {
 `;
 
 exports[`go snapshot 2`] = `
-" \`Inspect\` <a name=\\"Inspect\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect\\"></a>
+" \`Inspect\` <a name="Inspect" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect"></a>
 
 \`\`\`go
 func Inspect(inspector TreeInspector)
@@ -100,7 +100,7 @@ func Inspect(inspector TreeInspector)
 
 Examines the CloudFormation resource and discloses attributes.
 
-# \`inspector\`<sup>Required</sup> <a name=\\"inspector\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector\\"></a>
+# \`inspector\`<sup>Required</sup> <a name="inspector" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awscdkcore.TreeInspector
 
@@ -111,27 +111,27 @@ tree inspector to collect and process attributes.
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "displayName": "inspect",
-  "docs": Object {
+  "docs": {
     "summary": "Examines the CloudFormation resource and discloses attributes.",
   },
   "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.inspect",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "inspector",
-      "docs": Object {
+      "docs": {
         "summary": "- tree inspector to collect and process attributes.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepository.inspect.parameter.inspector",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "TreeInspector",
             "fqn": "software.amazon.awscdk.core.TreeInspector",
             "id": "@aws-cdk/core.TreeInspector",
@@ -147,7 +147,7 @@ Object {
 `;
 
 exports[`java snapshot 2`] = `
-" \`inspect\` <a name=\\"inspect\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect\\"></a>
+" \`inspect\` <a name="inspect" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect"></a>
 
 \`\`\`java
 public void inspect(TreeInspector inspector)
@@ -155,7 +155,7 @@ public void inspect(TreeInspector inspector)
 
 Examines the CloudFormation resource and discloses attributes.
 
-# \`inspector\`<sup>Required</sup> <a name=\\"inspector\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector\\"></a>
+# \`inspector\`<sup>Required</sup> <a name="inspector" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector"></a>
 
 - *Type:* software.amazon.awscdk.core.TreeInspector
 
@@ -166,27 +166,27 @@ tree inspector to collect and process attributes.
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "displayName": "inspect",
-  "docs": Object {
+  "docs": {
     "summary": "Examines the CloudFormation resource and discloses attributes.",
   },
   "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.inspect",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "inspector",
-      "docs": Object {
+      "docs": {
         "summary": "- tree inspector to collect and process attributes.",
       },
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepository.inspect.parameter.inspector",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "TreeInspector",
             "fqn": "aws_cdk.core.TreeInspector",
             "id": "@aws-cdk/core.TreeInspector",
@@ -204,7 +204,7 @@ Object {
 `;
 
 exports[`python snapshot 2`] = `
-" \`inspect\` <a name=\\"inspect\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect\\"></a>
+" \`inspect\` <a name="inspect" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect"></a>
 
 \`\`\`python
 def inspect(
@@ -214,7 +214,7 @@ def inspect(
 
 Examines the CloudFormation resource and discloses attributes.
 
-# \`inspector\`<sup>Required</sup> <a name=\\"inspector\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector\\"></a>
+# \`inspector\`<sup>Required</sup> <a name="inspector" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector"></a>
 
 - *Type:* aws_cdk.core.TreeInspector
 
@@ -225,27 +225,27 @@ tree inspector to collect and process attributes.
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "displayName": "inspect",
-  "docs": Object {
+  "docs": {
     "summary": "Examines the CloudFormation resource and discloses attributes.",
   },
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "inspector",
-      "docs": Object {
+      "docs": {
         "summary": "- tree inspector to collect and process attributes.",
       },
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "TreeInspector",
             "fqn": "@aws-cdk/core.TreeInspector",
             "id": "@aws-cdk/core.TreeInspector",
@@ -261,7 +261,7 @@ Object {
 `;
 
 exports[`typescript snapshot 2`] = `
-" \`inspect\` <a name=\\"inspect\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect\\"></a>
+" \`inspect\` <a name="inspect" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect"></a>
 
 \`\`\`typescript
 public inspect(inspector: TreeInspector): void
@@ -269,7 +269,7 @@ public inspect(inspector: TreeInspector): void
 
 Examines the CloudFormation resource and discloses attributes.
 
-# \`inspector\`<sup>Required</sup> <a name=\\"inspector\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector\\"></a>
+# \`inspector\`<sup>Required</sup> <a name="inspector" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector"></a>
 
 - *Type:* @aws-cdk/core.TreeInspector
 
@@ -280,27 +280,27 @@ tree inspector to collect and process attributes.
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "displayName": "inspect",
-  "docs": Object {
+  "docs": {
     "summary": "Examines the CloudFormation resource and discloses attributes.",
   },
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "inspector",
-      "docs": Object {
+      "docs": {
         "summary": "- tree inspector to collect and process attributes.",
       },
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "TreeInspector",
             "fqn": "@aws-cdk/core.TreeInspector",
             "id": "@aws-cdk/core.TreeInspector",
@@ -316,7 +316,7 @@ Object {
 `;
 
 exports[`wing snapshot 2`] = `
-" \`inspect\` <a name=\\"inspect\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect\\"></a>
+" \`inspect\` <a name="inspect" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect"></a>
 
 \`\`\`wing
 inspect(inspector: TreeInspector): void
@@ -324,7 +324,7 @@ inspect(inspector: TreeInspector): void
 
 Examines the CloudFormation resource and discloses attributes.
 
-# \`inspector\`<sup>Required</sup> <a name=\\"inspector\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector\\"></a>
+# \`inspector\`<sup>Required</sup> <a name="inspector" id="@aws-cdk/aws-ecr.CfnPublicRepository.inspect.parameter.inspector"></a>
 
 - *Type:* @aws-cdk/core.TreeInspector
 
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/interface.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/interface.test.ts.snap
index 8792e6cd812..b5fe5ef533f 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/interface.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/interface.test.ts.snap
@@ -1,29 +1,29 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "displayName": "IRepository",
-  "docs": Object {
+  "docs": {
     "summary": "Represents an ECR repository.",
   },
   "fqn": "Amazon.CDK.AWS.ECR.IRepository",
   "id": "@aws-cdk/aws-ecr.IRepository",
-  "implementations": Array [
-    Object {
+  "implementations": [
+    {
       "displayName": "Repository",
       "fqn": "Amazon.CDK.AWS.ECR.Repository",
       "id": "@aws-cdk/aws-ecr.Repository",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "RepositoryBase",
       "fqn": "Amazon.CDK.AWS.ECR.RepositoryBase",
       "id": "@aws-cdk/aws-ecr.RepositoryBase",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "IRepository",
       "fqn": "Amazon.CDK.AWS.ECR.IRepository",
       "id": "@aws-cdk/aws-ecr.IRepository",
@@ -31,26 +31,26 @@ Object {
       "packageVersion": "1.106.0",
     },
   ],
-  "instanceMethods": Array [
-    Object {
+  "instanceMethods": [
+    {
       "displayName": "AddToResourcePolicy",
-      "docs": Object {
+      "docs": {
         "summary": "Add a policy statement to the repository's resource policy.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.AddToResourcePolicy",
       "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Statement",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.AddToResourcePolicy.parameter.Statement",
           "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "PolicyStatement",
                 "fqn": "Amazon.CDK.AWS.IAM.PolicyStatement",
                 "id": "@aws-cdk/aws-iam.PolicyStatement",
@@ -63,25 +63,25 @@ Object {
       ],
       "usage": "private AddToResourcePolicyResult AddToResourcePolicy(PolicyStatement Statement)",
     },
-    Object {
+    {
       "displayName": "Grant",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given principal identity permissions to perform the actions on this repository.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.Grant",
       "id": "@aws-cdk/aws-ecr.IRepository.grant",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.Grant.parameter.Grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "Amazon.CDK.AWS.IAM.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -91,39 +91,39 @@ Object {
             ],
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "Actions",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.Grant.parameter.Actions",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
       ],
       "usage": "private Grant Grant(IGrantable Grantee, string Actions)",
     },
-    Object {
+    {
       "displayName": "GrantPull",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull images in this repository.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.GrantPull",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPull",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.GrantPull.parameter.Grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "Amazon.CDK.AWS.IAM.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -136,25 +136,25 @@ Object {
       ],
       "usage": "private Grant GrantPull(IGrantable Grantee)",
     },
-    Object {
+    {
       "displayName": "GrantPullPush",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull and push images to this repository.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.GrantPullPush",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.GrantPullPush.parameter.Grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "Amazon.CDK.AWS.IAM.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -167,42 +167,42 @@ Object {
       ],
       "usage": "private Grant GrantPullPush(IGrantable Grantee)",
     },
-    Object {
+    {
       "displayName": "OnCloudTrailEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Define a CloudWatch event that triggers when something happens to this repository.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnCloudTrailEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnCloudTrailEvent.parameter.Id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "Options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnCloudTrailEvent.parameter.Options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "Amazon.CDK.AWS.Events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -215,42 +215,42 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "private Rule OnCloudTrailEvent(string Id, OnEventOptions Options = null)",
     },
-    Object {
+    {
       "displayName": "OnCloudTrailImagePushed",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnCloudTrailImagePushed",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnCloudTrailImagePushed.parameter.Id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "Options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnCloudTrailImagePushed.parameter.Options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnCloudTrailImagePushedOptions",
                 "fqn": "Amazon.CDK.AWS.ECR.OnCloudTrailImagePushedOptions",
                 "id": "@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions",
@@ -263,38 +263,38 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "private Rule OnCloudTrailImagePushed(string Id, OnCloudTrailImagePushedOptions Options = null)",
     },
-    Object {
+    {
       "displayName": "OnEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Use
 \`rule.addEventPattern(pattern)\` to specify a filter.",
         "summary": "Defines a CloudWatch event rule which triggers for repository events.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Id",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnEvent.parameter.Id",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "Options",
-          "docs": Object {},
+          "docs": {},
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnEvent.parameter.Options",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "Amazon.CDK.AWS.Events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -307,40 +307,40 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "private Rule OnEvent(string Id, OnEventOptions Options = null)",
     },
-    Object {
+    {
       "displayName": "OnImageScanCompleted",
-      "docs": Object {
+      "docs": {
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnImageScanCompleted",
       "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnImageScanCompleted.parameter.Id",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "Options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.OnImageScanCompleted.parameter.Options",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnImageScanCompletedOptions",
                 "fqn": "Amazon.CDK.AWS.ECR.OnImageScanCompletedOptions",
                 "id": "@aws-cdk/aws-ecr.OnImageScanCompletedOptions",
@@ -353,50 +353,50 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "private Rule OnImageScanCompleted(string Id, OnImageScanCompletedOptions Options = null)",
     },
-    Object {
+    {
       "displayName": "RepositoryUriForDigest",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.RepositoryUriForDigest",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Digest",
-          "docs": Object {
-            "summary": "Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).",
+          "docs": {
+            "summary": "Image digest to use (tools usually default to the image with the "latest" tag if omitted).",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.RepositoryUriForDigest.parameter.Digest",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
       ],
       "usage": "private string RepositoryUriForDigest(string Digest = null)",
     },
-    Object {
+    {
       "displayName": "RepositoryUriForTag",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.RepositoryUriForTag",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "Tag",
-          "docs": Object {
-            "summary": "Image tag to use (tools usually default to \\"latest\\" if omitted).",
+          "docs": {
+            "summary": "Image tag to use (tools usually default to "latest" if omitted).",
           },
           "fqn": "Amazon.CDK.AWS.ECR.IRepository.RepositoryUriForTag.parameter.Tag",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
@@ -404,8 +404,8 @@ that captures the event. This method will not create the Trail.",
       "usage": "private string RepositoryUriForTag(string Tag = null)",
     },
   ],
-  "interfaces": Array [
-    Object {
+  "interfaces": [
+    {
       "displayName": "IResource",
       "fqn": "Amazon.CDK.IResource",
       "id": "@aws-cdk/core.IResource",
@@ -413,20 +413,20 @@ that captures the event. This method will not create the Trail.",
       "packageVersion": "1.106.0",
     },
   ],
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "Node",
-      "docs": Object {
+      "docs": {
         "summary": "The construct tree node for this construct.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.property.Node",
       "id": "@aws-cdk/aws-ecr.IRepository.property.node",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ConstructNode",
             "fqn": "Amazon.CDK.ConstructNode",
             "id": "@aws-cdk/core.ConstructNode",
@@ -437,10 +437,10 @@ that captures the event. This method will not create the Trail.",
       },
       "usage": "public ConstructNode Node { get; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Env",
-      "docs": Object {
+      "docs": {
         "remarks": "For resources that are created and managed by the CDK
 (generally, those created by creating new class instances like Role, Bucket, etc.),
 this is always the same as the environment of the stack they belong to;
@@ -452,10 +452,10 @@ that might be different than the stack they were imported into.",
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.property.Env",
       "id": "@aws-cdk/aws-ecr.IRepository.property.env",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ResourceEnvironment",
             "fqn": "Amazon.CDK.ResourceEnvironment",
             "id": "@aws-cdk/core.ResourceEnvironment",
@@ -466,19 +466,19 @@ that might be different than the stack they were imported into.",
       },
       "usage": "public ResourceEnvironment Env { get; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Stack",
-      "docs": Object {
+      "docs": {
         "summary": "The stack in which this resource is defined.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.property.Stack",
       "id": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Stack",
             "fqn": "Amazon.CDK.Stack",
             "id": "@aws-cdk/core.Stack",
@@ -489,45 +489,45 @@ that might be different than the stack they were imported into.",
       },
       "usage": "public Stack Stack { get; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryArn",
-      "docs": Object {
+      "docs": {
         "summary": "The ARN of the repository.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.property.RepositoryArn",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public string RepositoryArn { get; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryName",
-      "docs": Object {
+      "docs": {
         "summary": "The name of the repository.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.property.RepositoryName",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public string RepositoryName { get; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryUri",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY",
         "summary": "The URI of this repository (represents the latest image):.",
       },
       "fqn": "Amazon.CDK.AWS.ECR.IRepository.property.RepositoryUri",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public string RepositoryUri { get; }",
@@ -537,32 +537,32 @@ that might be different than the stack they were imported into.",
 `;
 
 exports[`csharp snapshot 2`] = `
-" IRepository <a name=\\"IRepository\\" id=\\"@aws-cdk/aws-ecr.IRepository\\"></a>
+" IRepository <a name="IRepository" id="@aws-cdk/aws-ecr.IRepository"></a>
 
 - *Extends:* Amazon.CDK.IResource
 
-- *Implemented By:* <a href=\\"#@aws-cdk/aws-ecr.Repository\\">Repository</a>, <a href=\\"#@aws-cdk/aws-ecr.RepositoryBase\\">RepositoryBase</a>, <a href=\\"#@aws-cdk/aws-ecr.IRepository\\">IRepository</a>
+- *Implemented By:* <a href="#@aws-cdk/aws-ecr.Repository">Repository</a>, <a href="#@aws-cdk/aws-ecr.RepositoryBase">RepositoryBase</a>, <a href="#@aws-cdk/aws-ecr.IRepository">IRepository</a>
 
 Represents an ECR repository.
 
-# Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+# Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\">AddToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grant\\">Grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPull\\">GrantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPullPush\\">GrantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\">OnCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\">OnCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onEvent\\">OnEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\">OnImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\">RepositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\">RepositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy">AddToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grant">Grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPull">GrantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPullPush">GrantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent">OnCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed">OnCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onEvent">OnEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted">OnImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest">RepositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag">RepositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
 
 ---
 
-## \`AddToResourcePolicy\` <a name=\\"AddToResourcePolicy\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\"></a>
+## \`AddToResourcePolicy\` <a name="AddToResourcePolicy" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy"></a>
 
 \`\`\`csharp
 private AddToResourcePolicyResult AddToResourcePolicy(PolicyStatement Statement)
@@ -570,13 +570,13 @@ private AddToResourcePolicyResult AddToResourcePolicy(PolicyStatement Statement)
 
 Add a policy statement to the repository's resource policy.
 
-### \`Statement\`<sup>Required</sup> <a name=\\"Statement\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement\\"></a>
+### \`Statement\`<sup>Required</sup> <a name="Statement" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement"></a>
 
 - *Type:* Amazon.CDK.AWS.IAM.PolicyStatement
 
 ---
 
-## \`Grant\` <a name=\\"Grant\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant\\"></a>
+## \`Grant\` <a name="Grant" id="@aws-cdk/aws-ecr.IRepository.grant"></a>
 
 \`\`\`csharp
 private Grant Grant(IGrantable Grantee, string Actions)
@@ -584,19 +584,19 @@ private Grant Grant(IGrantable Grantee, string Actions)
 
 Grant the given principal identity permissions to perform the actions on this repository.
 
-### \`Grantee\`<sup>Required</sup> <a name=\\"Grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee\\"></a>
+### \`Grantee\`<sup>Required</sup> <a name="Grantee" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee"></a>
 
 - *Type:* Amazon.CDK.AWS.IAM.IGrantable
 
 ---
 
-### \`Actions\`<sup>Required</sup> <a name=\\"Actions\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.actions\\"></a>
+### \`Actions\`<sup>Required</sup> <a name="Actions" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.actions"></a>
 
 - *Type:* string
 
 ---
 
-## \`GrantPull\` <a name=\\"GrantPull\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull\\"></a>
+## \`GrantPull\` <a name="GrantPull" id="@aws-cdk/aws-ecr.IRepository.grantPull"></a>
 
 \`\`\`csharp
 private Grant GrantPull(IGrantable Grantee)
@@ -604,13 +604,13 @@ private Grant GrantPull(IGrantable Grantee)
 
 Grant the given identity permissions to pull images in this repository.
 
-### \`Grantee\`<sup>Required</sup> <a name=\\"Grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee\\"></a>
+### \`Grantee\`<sup>Required</sup> <a name="Grantee" id="@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee"></a>
 
 - *Type:* Amazon.CDK.AWS.IAM.IGrantable
 
 ---
 
-## \`GrantPullPush\` <a name=\\"GrantPullPush\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush\\"></a>
+## \`GrantPullPush\` <a name="GrantPullPush" id="@aws-cdk/aws-ecr.IRepository.grantPullPush"></a>
 
 \`\`\`csharp
 private Grant GrantPullPush(IGrantable Grantee)
@@ -618,13 +618,13 @@ private Grant GrantPullPush(IGrantable Grantee)
 
 Grant the given identity permissions to pull and push images to this repository.
 
-### \`Grantee\`<sup>Required</sup> <a name=\\"Grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee\\"></a>
+### \`Grantee\`<sup>Required</sup> <a name="Grantee" id="@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee"></a>
 
 - *Type:* Amazon.CDK.AWS.IAM.IGrantable
 
 ---
 
-## \`OnCloudTrailEvent\` <a name=\\"OnCloudTrailEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\"></a>
+## \`OnCloudTrailEvent\` <a name="OnCloudTrailEvent" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent"></a>
 
 \`\`\`csharp
 private Rule OnCloudTrailEvent(string Id, OnEventOptions Options = null)
@@ -635,7 +635,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`Id\`<sup>Required</sup> <a name=\\"Id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id\\"></a>
+### \`Id\`<sup>Required</sup> <a name="Id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* string
 
@@ -643,7 +643,7 @@ The id of the rule.
 
 ---
 
-### \`Options\`<sup>Optional</sup> <a name=\\"Options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options\\"></a>
+### \`Options\`<sup>Optional</sup> <a name="Options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* Amazon.CDK.AWS.Events.OnEventOptions
 
@@ -651,7 +651,7 @@ Options for adding the rule.
 
 ---
 
-## \`OnCloudTrailImagePushed\` <a name=\\"OnCloudTrailImagePushed\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\"></a>
+## \`OnCloudTrailImagePushed\` <a name="OnCloudTrailImagePushed" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed"></a>
 
 \`\`\`csharp
 private Rule OnCloudTrailImagePushed(string Id, OnCloudTrailImagePushedOptions Options = null)
@@ -662,7 +662,7 @@ Defines an AWS CloudWatch event rule that can trigger a target when an image is
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`Id\`<sup>Required</sup> <a name=\\"Id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id\\"></a>
+### \`Id\`<sup>Required</sup> <a name="Id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id"></a>
 
 - *Type:* string
 
@@ -670,15 +670,15 @@ The id of the rule.
 
 ---
 
-### \`Options\`<sup>Optional</sup> <a name=\\"Options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options\\"></a>
+### \`Options\`<sup>Optional</sup> <a name="Options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions\\">OnCloudTrailImagePushedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions">OnCloudTrailImagePushedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`OnEvent\` <a name=\\"OnEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent\\"></a>
+## \`OnEvent\` <a name="OnEvent" id="@aws-cdk/aws-ecr.IRepository.onEvent"></a>
 
 \`\`\`csharp
 private Rule OnEvent(string Id, OnEventOptions Options = null)
@@ -689,19 +689,19 @@ Defines a CloudWatch event rule which triggers for repository events.
 Use
 \`rule.addEventPattern(pattern)\` to specify a filter.
 
-### \`Id\`<sup>Required</sup> <a name=\\"Id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id\\"></a>
+### \`Id\`<sup>Required</sup> <a name="Id" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-### \`Options\`<sup>Optional</sup> <a name=\\"Options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options\\"></a>
+### \`Options\`<sup>Optional</sup> <a name="Options" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options"></a>
 
 - *Type:* Amazon.CDK.AWS.Events.OnEventOptions
 
 ---
 
-## \`OnImageScanCompleted\` <a name=\\"OnImageScanCompleted\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\"></a>
+## \`OnImageScanCompleted\` <a name="OnImageScanCompleted" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted"></a>
 
 \`\`\`csharp
 private Rule OnImageScanCompleted(string Id, OnImageScanCompletedOptions Options = null)
@@ -709,7 +709,7 @@ private Rule OnImageScanCompleted(string Id, OnImageScanCompletedOptions Options
 
 Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.
 
-### \`Id\`<sup>Required</sup> <a name=\\"Id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id\\"></a>
+### \`Id\`<sup>Required</sup> <a name="Id" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id"></a>
 
 - *Type:* string
 
@@ -717,15 +717,15 @@ The id of the rule.
 
 ---
 
-### \`Options\`<sup>Optional</sup> <a name=\\"Options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options\\"></a>
+### \`Options\`<sup>Optional</sup> <a name="Options" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnImageScanCompletedOptions\\">OnImageScanCompletedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnImageScanCompletedOptions">OnImageScanCompletedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`RepositoryUriForDigest\` <a name=\\"RepositoryUriForDigest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\"></a>
+## \`RepositoryUriForDigest\` <a name="RepositoryUriForDigest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest"></a>
 
 \`\`\`csharp
 private string RepositoryUriForDigest(string Digest = null)
@@ -735,15 +735,15 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]
 
-### \`Digest\`<sup>Optional</sup> <a name=\\"Digest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest\\"></a>
+### \`Digest\`<sup>Optional</sup> <a name="Digest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest"></a>
 
 - *Type:* string
 
-Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).
+Image digest to use (tools usually default to the image with the "latest" tag if omitted).
 
 ---
 
-## \`RepositoryUriForTag\` <a name=\\"RepositoryUriForTag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\"></a>
+## \`RepositoryUriForTag\` <a name="RepositoryUriForTag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag"></a>
 
 \`\`\`csharp
 private string RepositoryUriForTag(string Tag = null)
@@ -753,28 +753,28 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]
 
-### \`Tag\`<sup>Optional</sup> <a name=\\"Tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag\\"></a>
+### \`Tag\`<sup>Optional</sup> <a name="Tag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag"></a>
 
 - *Type:* string
 
-Image tag to use (tools usually default to \\"latest\\" if omitted).
+Image tag to use (tools usually default to "latest" if omitted).
 
 ---
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.node\\">Node</a></code> | <code>Amazon.CDK.ConstructNode</code> | The construct tree node for this construct. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.env\\">Env</a></code> | <code>Amazon.CDK.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.stack\\">Stack</a></code> | <code>Amazon.CDK.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\">RepositoryArn</a></code> | <code>string</code> | The ARN of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryName\\">RepositoryName</a></code> | <code>string</code> | The name of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\">RepositoryUri</a></code> | <code>string</code> | The URI of this repository (represents the latest image):. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.node">Node</a></code> | <code>Amazon.CDK.ConstructNode</code> | The construct tree node for this construct. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.env">Env</a></code> | <code>Amazon.CDK.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.stack">Stack</a></code> | <code>Amazon.CDK.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryArn">RepositoryArn</a></code> | <code>string</code> | The ARN of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryName">RepositoryName</a></code> | <code>string</code> | The name of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryUri">RepositoryUri</a></code> | <code>string</code> | The URI of this repository (represents the latest image):. |
 
 ---
 
-## \`Node\`<sup>Required</sup> <a name=\\"Node\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.node\\"></a>
+## \`Node\`<sup>Required</sup> <a name="Node" id="@aws-cdk/aws-ecr.IRepository.property.node"></a>
 
 \`\`\`csharp
 public ConstructNode Node { get; }
@@ -786,7 +786,7 @@ The construct tree node for this construct.
 
 ---
 
-## \`Env\`<sup>Required</sup> <a name=\\"Env\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.env\\"></a>
+## \`Env\`<sup>Required</sup> <a name="Env" id="@aws-cdk/aws-ecr.IRepository.property.env"></a>
 
 \`\`\`csharp
 public ResourceEnvironment Env { get; }
@@ -805,7 +805,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-## \`Stack\`<sup>Required</sup> <a name=\\"Stack\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.stack\\"></a>
+## \`Stack\`<sup>Required</sup> <a name="Stack" id="@aws-cdk/aws-ecr.IRepository.property.stack"></a>
 
 \`\`\`csharp
 public Stack Stack { get; }
@@ -817,7 +817,7 @@ The stack in which this resource is defined.
 
 ---
 
-## \`RepositoryArn\`<sup>Required</sup> <a name=\\"RepositoryArn\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\"></a>
+## \`RepositoryArn\`<sup>Required</sup> <a name="RepositoryArn" id="@aws-cdk/aws-ecr.IRepository.property.repositoryArn"></a>
 
 \`\`\`csharp
 public string RepositoryArn { get; }
@@ -829,7 +829,7 @@ The ARN of the repository.
 
 ---
 
-## \`RepositoryName\`<sup>Required</sup> <a name=\\"RepositoryName\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryName\\"></a>
+## \`RepositoryName\`<sup>Required</sup> <a name="RepositoryName" id="@aws-cdk/aws-ecr.IRepository.property.repositoryName"></a>
 
 \`\`\`csharp
 public string RepositoryName { get; }
@@ -841,7 +841,7 @@ The name of the repository.
 
 ---
 
-## \`RepositoryUri\`<sup>Required</sup> <a name=\\"RepositoryUri\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\"></a>
+## \`RepositoryUri\`<sup>Required</sup> <a name="RepositoryUri" id="@aws-cdk/aws-ecr.IRepository.property.repositoryUri"></a>
 
 \`\`\`csharp
 public string RepositoryUri { get; }
@@ -858,29 +858,29 @@ ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "displayName": "IRepository",
-  "docs": Object {
+  "docs": {
     "summary": "Represents an ECR repository.",
   },
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository",
   "id": "@aws-cdk/aws-ecr.IRepository",
-  "implementations": Array [
-    Object {
+  "implementations": [
+    {
       "displayName": "Repository",
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.Repository",
       "id": "@aws-cdk/aws-ecr.Repository",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "RepositoryBase",
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.RepositoryBase",
       "id": "@aws-cdk/aws-ecr.RepositoryBase",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "IRepository",
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository",
       "id": "@aws-cdk/aws-ecr.IRepository",
@@ -888,26 +888,26 @@ Object {
       "packageVersion": "1.106.0",
     },
   ],
-  "instanceMethods": Array [
-    Object {
+  "instanceMethods": [
+    {
       "displayName": "AddToResourcePolicy",
-      "docs": Object {
+      "docs": {
         "summary": "Add a policy statement to the repository's resource policy.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.AddToResourcePolicy",
       "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "statement",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.AddToResourcePolicy.parameter.statement",
           "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "PolicyStatement",
                 "fqn": "github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.PolicyStatement",
                 "id": "@aws-cdk/aws-iam.PolicyStatement",
@@ -920,25 +920,25 @@ Object {
       ],
       "usage": "func AddToResourcePolicy(statement PolicyStatement) AddToResourcePolicyResult",
     },
-    Object {
+    {
       "displayName": "Grant",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given principal identity permissions to perform the actions on this repository.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.Grant",
       "id": "@aws-cdk/aws-ecr.IRepository.grant",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.Grant.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -948,39 +948,39 @@ Object {
             ],
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "actions",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.Grant.parameter.actions",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "*string",
           },
         },
       ],
       "usage": "func Grant(grantee IGrantable, actions *string) Grant",
     },
-    Object {
+    {
       "displayName": "GrantPull",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull images in this repository.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.GrantPull",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPull",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.GrantPull.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -993,25 +993,25 @@ Object {
       ],
       "usage": "func GrantPull(grantee IGrantable) Grant",
     },
-    Object {
+    {
       "displayName": "GrantPullPush",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull and push images to this repository.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.GrantPullPush",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.GrantPullPush.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -1024,42 +1024,42 @@ Object {
       ],
       "usage": "func GrantPullPush(grantee IGrantable) Grant",
     },
-    Object {
+    {
       "displayName": "OnCloudTrailEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Define a CloudWatch event that triggers when something happens to this repository.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnCloudTrailEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnCloudTrailEvent.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "*string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnCloudTrailEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "github.com/aws/aws-cdk-go/awscdkawsevents/awscdkawsevents.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -1072,42 +1072,42 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "func OnCloudTrailEvent(id *string, options OnEventOptions) Rule",
     },
-    Object {
+    {
       "displayName": "OnCloudTrailImagePushed",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnCloudTrailImagePushed",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnCloudTrailImagePushed.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "*string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnCloudTrailImagePushed.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnCloudTrailImagePushedOptions",
                 "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.OnCloudTrailImagePushedOptions",
                 "id": "@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions",
@@ -1120,38 +1120,38 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "func OnCloudTrailImagePushed(id *string, options OnCloudTrailImagePushedOptions) Rule",
     },
-    Object {
+    {
       "displayName": "OnEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Use
 \`rule.addEventPattern(pattern)\` to specify a filter.",
         "summary": "Defines a CloudWatch event rule which triggers for repository events.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnEvent.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "*string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {},
+          "docs": {},
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "github.com/aws/aws-cdk-go/awscdkawsevents/awscdkawsevents.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -1164,40 +1164,40 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "func OnEvent(id *string, options OnEventOptions) Rule",
     },
-    Object {
+    {
       "displayName": "OnImageScanCompleted",
-      "docs": Object {
+      "docs": {
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnImageScanCompleted",
       "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnImageScanCompleted.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "*string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.OnImageScanCompleted.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnImageScanCompletedOptions",
                 "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.OnImageScanCompletedOptions",
                 "id": "@aws-cdk/aws-ecr.OnImageScanCompletedOptions",
@@ -1210,50 +1210,50 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "func OnImageScanCompleted(id *string, options OnImageScanCompletedOptions) Rule",
     },
-    Object {
+    {
       "displayName": "RepositoryUriForDigest",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.RepositoryUriForDigest",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "digest",
-          "docs": Object {
-            "summary": "Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).",
+          "docs": {
+            "summary": "Image digest to use (tools usually default to the image with the "latest" tag if omitted).",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.RepositoryUriForDigest.parameter.digest",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "*string",
           },
         },
       ],
       "usage": "func RepositoryUriForDigest(digest *string) *string",
     },
-    Object {
+    {
       "displayName": "RepositoryUriForTag",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.RepositoryUriForTag",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "tag",
-          "docs": Object {
-            "summary": "Image tag to use (tools usually default to \\"latest\\" if omitted).",
+          "docs": {
+            "summary": "Image tag to use (tools usually default to "latest" if omitted).",
           },
           "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.RepositoryUriForTag.parameter.tag",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "*string",
           },
         },
@@ -1261,8 +1261,8 @@ that captures the event. This method will not create the Trail.",
       "usage": "func RepositoryUriForTag(tag *string) *string",
     },
   ],
-  "interfaces": Array [
-    Object {
+  "interfaces": [
+    {
       "displayName": "IResource",
       "fqn": "github.com/aws/aws-cdk-go/awscdk/awscdkcore.IResource",
       "id": "@aws-cdk/core.IResource",
@@ -1270,20 +1270,20 @@ that captures the event. This method will not create the Trail.",
       "packageVersion": "1.106.0",
     },
   ],
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "Node",
-      "docs": Object {
+      "docs": {
         "summary": "The construct tree node for this construct.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.property.Node",
       "id": "@aws-cdk/aws-ecr.IRepository.property.node",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ConstructNode",
             "fqn": "github.com/aws/aws-cdk-go/awscdk/awscdkcore.ConstructNode",
             "id": "@aws-cdk/core.ConstructNode",
@@ -1294,10 +1294,10 @@ that captures the event. This method will not create the Trail.",
       },
       "usage": "func Node() ConstructNode",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Env",
-      "docs": Object {
+      "docs": {
         "remarks": "For resources that are created and managed by the CDK
 (generally, those created by creating new class instances like Role, Bucket, etc.),
 this is always the same as the environment of the stack they belong to;
@@ -1309,10 +1309,10 @@ that might be different than the stack they were imported into.",
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.property.Env",
       "id": "@aws-cdk/aws-ecr.IRepository.property.env",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ResourceEnvironment",
             "fqn": "github.com/aws/aws-cdk-go/awscdk/awscdkcore.ResourceEnvironment",
             "id": "@aws-cdk/core.ResourceEnvironment",
@@ -1323,19 +1323,19 @@ that might be different than the stack they were imported into.",
       },
       "usage": "func Env() ResourceEnvironment",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Stack",
-      "docs": Object {
+      "docs": {
         "summary": "The stack in which this resource is defined.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.property.Stack",
       "id": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Stack",
             "fqn": "github.com/aws/aws-cdk-go/awscdk/awscdkcore.Stack",
             "id": "@aws-cdk/core.Stack",
@@ -1346,45 +1346,45 @@ that might be different than the stack they were imported into.",
       },
       "usage": "func Stack() Stack",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryArn",
-      "docs": Object {
+      "docs": {
         "summary": "The ARN of the repository.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.property.RepositoryArn",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "*string",
       },
       "usage": "func RepositoryArn() *string",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryName",
-      "docs": Object {
+      "docs": {
         "summary": "The name of the repository.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.property.RepositoryName",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "*string",
       },
       "usage": "func RepositoryName() *string",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryUri",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY",
         "summary": "The URI of this repository (represents the latest image):.",
       },
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.IRepository.property.RepositoryUri",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "*string",
       },
       "usage": "func RepositoryUri() *string",
@@ -1394,32 +1394,32 @@ that might be different than the stack they were imported into.",
 `;
 
 exports[`go snapshot 2`] = `
-" IRepository <a name=\\"IRepository\\" id=\\"@aws-cdk/aws-ecr.IRepository\\"></a>
+" IRepository <a name="IRepository" id="@aws-cdk/aws-ecr.IRepository"></a>
 
 - *Extends:* github.com/aws/aws-cdk-go/awscdk/awscdkcore.IResource
 
-- *Implemented By:* <a href=\\"#@aws-cdk/aws-ecr.Repository\\">Repository</a>, <a href=\\"#@aws-cdk/aws-ecr.RepositoryBase\\">RepositoryBase</a>, <a href=\\"#@aws-cdk/aws-ecr.IRepository\\">IRepository</a>
+- *Implemented By:* <a href="#@aws-cdk/aws-ecr.Repository">Repository</a>, <a href="#@aws-cdk/aws-ecr.RepositoryBase">RepositoryBase</a>, <a href="#@aws-cdk/aws-ecr.IRepository">IRepository</a>
 
 Represents an ECR repository.
 
-# Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+# Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\">AddToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grant\\">Grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPull\\">GrantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPullPush\\">GrantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\">OnCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\">OnCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onEvent\\">OnEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\">OnImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\">RepositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\">RepositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy">AddToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grant">Grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPull">GrantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPullPush">GrantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent">OnCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed">OnCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onEvent">OnEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted">OnImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest">RepositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag">RepositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
 
 ---
 
-## \`AddToResourcePolicy\` <a name=\\"AddToResourcePolicy\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\"></a>
+## \`AddToResourcePolicy\` <a name="AddToResourcePolicy" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy"></a>
 
 \`\`\`go
 func AddToResourcePolicy(statement PolicyStatement) AddToResourcePolicyResult
@@ -1427,13 +1427,13 @@ func AddToResourcePolicy(statement PolicyStatement) AddToResourcePolicyResult
 
 Add a policy statement to the repository's resource policy.
 
-### \`statement\`<sup>Required</sup> <a name=\\"statement\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement\\"></a>
+### \`statement\`<sup>Required</sup> <a name="statement" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.PolicyStatement
 
 ---
 
-## \`Grant\` <a name=\\"Grant\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant\\"></a>
+## \`Grant\` <a name="Grant" id="@aws-cdk/aws-ecr.IRepository.grant"></a>
 
 \`\`\`go
 func Grant(grantee IGrantable, actions *string) Grant
@@ -1441,19 +1441,19 @@ func Grant(grantee IGrantable, actions *string) Grant
 
 Grant the given principal identity permissions to perform the actions on this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable
 
 ---
 
-### \`actions\`<sup>Required</sup> <a name=\\"actions\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.actions\\"></a>
+### \`actions\`<sup>Required</sup> <a name="actions" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.actions"></a>
 
 - *Type:* *string
 
 ---
 
-## \`GrantPull\` <a name=\\"GrantPull\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull\\"></a>
+## \`GrantPull\` <a name="GrantPull" id="@aws-cdk/aws-ecr.IRepository.grantPull"></a>
 
 \`\`\`go
 func GrantPull(grantee IGrantable) Grant
@@ -1461,13 +1461,13 @@ func GrantPull(grantee IGrantable) Grant
 
 Grant the given identity permissions to pull images in this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable
 
 ---
 
-## \`GrantPullPush\` <a name=\\"GrantPullPush\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush\\"></a>
+## \`GrantPullPush\` <a name="GrantPullPush" id="@aws-cdk/aws-ecr.IRepository.grantPullPush"></a>
 
 \`\`\`go
 func GrantPullPush(grantee IGrantable) Grant
@@ -1475,13 +1475,13 @@ func GrantPullPush(grantee IGrantable) Grant
 
 Grant the given identity permissions to pull and push images to this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable
 
 ---
 
-## \`OnCloudTrailEvent\` <a name=\\"OnCloudTrailEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\"></a>
+## \`OnCloudTrailEvent\` <a name="OnCloudTrailEvent" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent"></a>
 
 \`\`\`go
 func OnCloudTrailEvent(id *string, options OnEventOptions) Rule
@@ -1492,7 +1492,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* *string
 
@@ -1500,7 +1500,7 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdkawsevents/awscdkawsevents.OnEventOptions
 
@@ -1508,7 +1508,7 @@ Options for adding the rule.
 
 ---
 
-## \`OnCloudTrailImagePushed\` <a name=\\"OnCloudTrailImagePushed\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\"></a>
+## \`OnCloudTrailImagePushed\` <a name="OnCloudTrailImagePushed" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed"></a>
 
 \`\`\`go
 func OnCloudTrailImagePushed(id *string, options OnCloudTrailImagePushedOptions) Rule
@@ -1519,7 +1519,7 @@ Defines an AWS CloudWatch event rule that can trigger a target when an image is
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id"></a>
 
 - *Type:* *string
 
@@ -1527,15 +1527,15 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions\\">OnCloudTrailImagePushedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions">OnCloudTrailImagePushedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`OnEvent\` <a name=\\"OnEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent\\"></a>
+## \`OnEvent\` <a name="OnEvent" id="@aws-cdk/aws-ecr.IRepository.onEvent"></a>
 
 \`\`\`go
 func OnEvent(id *string, options OnEventOptions) Rule
@@ -1546,19 +1546,19 @@ Defines a CloudWatch event rule which triggers for repository events.
 Use
 \`rule.addEventPattern(pattern)\` to specify a filter.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id"></a>
 
 - *Type:* *string
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdkawsevents/awscdkawsevents.OnEventOptions
 
 ---
 
-## \`OnImageScanCompleted\` <a name=\\"OnImageScanCompleted\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\"></a>
+## \`OnImageScanCompleted\` <a name="OnImageScanCompleted" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted"></a>
 
 \`\`\`go
 func OnImageScanCompleted(id *string, options OnImageScanCompletedOptions) Rule
@@ -1566,7 +1566,7 @@ func OnImageScanCompleted(id *string, options OnImageScanCompletedOptions) Rule
 
 Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id"></a>
 
 - *Type:* *string
 
@@ -1574,15 +1574,15 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnImageScanCompletedOptions\\">OnImageScanCompletedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnImageScanCompletedOptions">OnImageScanCompletedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`RepositoryUriForDigest\` <a name=\\"RepositoryUriForDigest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\"></a>
+## \`RepositoryUriForDigest\` <a name="RepositoryUriForDigest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest"></a>
 
 \`\`\`go
 func RepositoryUriForDigest(digest *string) *string
@@ -1592,15 +1592,15 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]
 
-### \`digest\`<sup>Optional</sup> <a name=\\"digest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest\\"></a>
+### \`digest\`<sup>Optional</sup> <a name="digest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest"></a>
 
 - *Type:* *string
 
-Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).
+Image digest to use (tools usually default to the image with the "latest" tag if omitted).
 
 ---
 
-## \`RepositoryUriForTag\` <a name=\\"RepositoryUriForTag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\"></a>
+## \`RepositoryUriForTag\` <a name="RepositoryUriForTag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag"></a>
 
 \`\`\`go
 func RepositoryUriForTag(tag *string) *string
@@ -1610,28 +1610,28 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]
 
-### \`tag\`<sup>Optional</sup> <a name=\\"tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag\\"></a>
+### \`tag\`<sup>Optional</sup> <a name="tag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag"></a>
 
 - *Type:* *string
 
-Image tag to use (tools usually default to \\"latest\\" if omitted).
+Image tag to use (tools usually default to "latest" if omitted).
 
 ---
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.node\\">Node</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.ConstructNode</code> | The construct tree node for this construct. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.env\\">Env</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.stack\\">Stack</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\">RepositoryArn</a></code> | <code>*string</code> | The ARN of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryName\\">RepositoryName</a></code> | <code>*string</code> | The name of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\">RepositoryUri</a></code> | <code>*string</code> | The URI of this repository (represents the latest image):. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.node">Node</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.ConstructNode</code> | The construct tree node for this construct. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.env">Env</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.stack">Stack</a></code> | <code>github.com/aws/aws-cdk-go/awscdk/awscdkcore.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryArn">RepositoryArn</a></code> | <code>*string</code> | The ARN of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryName">RepositoryName</a></code> | <code>*string</code> | The name of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryUri">RepositoryUri</a></code> | <code>*string</code> | The URI of this repository (represents the latest image):. |
 
 ---
 
-## \`Node\`<sup>Required</sup> <a name=\\"Node\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.node\\"></a>
+## \`Node\`<sup>Required</sup> <a name="Node" id="@aws-cdk/aws-ecr.IRepository.property.node"></a>
 
 \`\`\`go
 func Node() ConstructNode
@@ -1643,7 +1643,7 @@ The construct tree node for this construct.
 
 ---
 
-## \`Env\`<sup>Required</sup> <a name=\\"Env\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.env\\"></a>
+## \`Env\`<sup>Required</sup> <a name="Env" id="@aws-cdk/aws-ecr.IRepository.property.env"></a>
 
 \`\`\`go
 func Env() ResourceEnvironment
@@ -1662,7 +1662,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-## \`Stack\`<sup>Required</sup> <a name=\\"Stack\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.stack\\"></a>
+## \`Stack\`<sup>Required</sup> <a name="Stack" id="@aws-cdk/aws-ecr.IRepository.property.stack"></a>
 
 \`\`\`go
 func Stack() Stack
@@ -1674,7 +1674,7 @@ The stack in which this resource is defined.
 
 ---
 
-## \`RepositoryArn\`<sup>Required</sup> <a name=\\"RepositoryArn\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\"></a>
+## \`RepositoryArn\`<sup>Required</sup> <a name="RepositoryArn" id="@aws-cdk/aws-ecr.IRepository.property.repositoryArn"></a>
 
 \`\`\`go
 func RepositoryArn() *string
@@ -1686,7 +1686,7 @@ The ARN of the repository.
 
 ---
 
-## \`RepositoryName\`<sup>Required</sup> <a name=\\"RepositoryName\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryName\\"></a>
+## \`RepositoryName\`<sup>Required</sup> <a name="RepositoryName" id="@aws-cdk/aws-ecr.IRepository.property.repositoryName"></a>
 
 \`\`\`go
 func RepositoryName() *string
@@ -1698,7 +1698,7 @@ The name of the repository.
 
 ---
 
-## \`RepositoryUri\`<sup>Required</sup> <a name=\\"RepositoryUri\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\"></a>
+## \`RepositoryUri\`<sup>Required</sup> <a name="RepositoryUri" id="@aws-cdk/aws-ecr.IRepository.property.repositoryUri"></a>
 
 \`\`\`go
 func RepositoryUri() *string
@@ -1715,29 +1715,29 @@ ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "displayName": "IRepository",
-  "docs": Object {
+  "docs": {
     "summary": "Represents an ECR repository.",
   },
   "fqn": "software.amazon.awscdk.services.ecr.IRepository",
   "id": "@aws-cdk/aws-ecr.IRepository",
-  "implementations": Array [
-    Object {
+  "implementations": [
+    {
       "displayName": "Repository",
       "fqn": "software.amazon.awscdk.services.ecr.Repository",
       "id": "@aws-cdk/aws-ecr.Repository",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "RepositoryBase",
       "fqn": "software.amazon.awscdk.services.ecr.RepositoryBase",
       "id": "@aws-cdk/aws-ecr.RepositoryBase",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "IRepository",
       "fqn": "software.amazon.awscdk.services.ecr.IRepository",
       "id": "@aws-cdk/aws-ecr.IRepository",
@@ -1745,26 +1745,26 @@ Object {
       "packageVersion": "1.106.0",
     },
   ],
-  "instanceMethods": Array [
-    Object {
+  "instanceMethods": [
+    {
       "displayName": "addToResourcePolicy",
-      "docs": Object {
+      "docs": {
         "summary": "Add a policy statement to the repository's resource policy.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.addToResourcePolicy",
       "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "statement",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.addToResourcePolicy.parameter.statement",
           "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "PolicyStatement",
                 "fqn": "software.amazon.awscdk.services.iam.PolicyStatement",
                 "id": "@aws-cdk/aws-iam.PolicyStatement",
@@ -1777,25 +1777,25 @@ Object {
       ],
       "usage": "public AddToResourcePolicyResult addToResourcePolicy(PolicyStatement statement)",
     },
-    Object {
+    {
       "displayName": "grant",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given principal identity permissions to perform the actions on this repository.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.grant",
       "id": "@aws-cdk/aws-ecr.IRepository.grant",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.grant.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "software.amazon.awscdk.services.iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -1805,39 +1805,39 @@ Object {
             ],
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "actions",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.grant.parameter.actions",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "java.lang.String",
           },
         },
       ],
       "usage": "public Grant grant(IGrantable grantee, java.lang.String actions)",
     },
-    Object {
+    {
       "displayName": "grantPull",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull images in this repository.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.grantPull",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPull",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.grantPull.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "software.amazon.awscdk.services.iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -1850,25 +1850,25 @@ Object {
       ],
       "usage": "public Grant grantPull(IGrantable grantee)",
     },
-    Object {
+    {
       "displayName": "grantPullPush",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull and push images to this repository.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.grantPullPush",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.grantPullPush.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "software.amazon.awscdk.services.iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -1881,42 +1881,42 @@ Object {
       ],
       "usage": "public Grant grantPullPush(IGrantable grantee)",
     },
-    Object {
+    {
       "displayName": "onCloudTrailEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Define a CloudWatch event that triggers when something happens to this repository.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.onCloudTrailEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onCloudTrailEvent.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "java.lang.String",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onCloudTrailEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "software.amazon.awscdk.services.events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -1930,42 +1930,42 @@ that captures the event. This method will not create the Trail.",
       "usage": "public Rule onCloudTrailEvent(java.lang.String id)
 public Rule onCloudTrailEvent(java.lang.String id, OnEventOptions options)",
     },
-    Object {
+    {
       "displayName": "onCloudTrailImagePushed",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.onCloudTrailImagePushed",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onCloudTrailImagePushed.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "java.lang.String",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnCloudTrailImagePushedOptions",
                 "fqn": "software.amazon.awscdk.services.ecr.OnCloudTrailImagePushedOptions",
                 "id": "@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions",
@@ -1979,38 +1979,38 @@ that captures the event. This method will not create the Trail.",
       "usage": "public Rule onCloudTrailImagePushed(java.lang.String id)
 public Rule onCloudTrailImagePushed(java.lang.String id, OnCloudTrailImagePushedOptions options)",
     },
-    Object {
+    {
       "displayName": "onEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Use
 \`rule.addEventPattern(pattern)\` to specify a filter.",
         "summary": "Defines a CloudWatch event rule which triggers for repository events.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.onEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onEvent.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "java.lang.String",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {},
+          "docs": {},
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "software.amazon.awscdk.services.events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -2024,40 +2024,40 @@ public Rule onCloudTrailImagePushed(java.lang.String id, OnCloudTrailImagePushed
       "usage": "public Rule onEvent(java.lang.String id)
 public Rule onEvent(java.lang.String id, OnEventOptions options)",
     },
-    Object {
+    {
       "displayName": "onImageScanCompleted",
-      "docs": Object {
+      "docs": {
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.onImageScanCompleted",
       "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onImageScanCompleted.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "java.lang.String",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.onImageScanCompleted.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnImageScanCompletedOptions",
                 "fqn": "software.amazon.awscdk.services.ecr.OnImageScanCompletedOptions",
                 "id": "@aws-cdk/aws-ecr.OnImageScanCompletedOptions",
@@ -2071,25 +2071,25 @@ public Rule onEvent(java.lang.String id, OnEventOptions options)",
       "usage": "public Rule onImageScanCompleted(java.lang.String id)
 public Rule onImageScanCompleted(java.lang.String id, OnImageScanCompletedOptions options)",
     },
-    Object {
+    {
       "displayName": "repositoryUriForDigest",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.repositoryUriForDigest",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "digest",
-          "docs": Object {
-            "summary": "Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).",
+          "docs": {
+            "summary": "Image digest to use (tools usually default to the image with the "latest" tag if omitted).",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "java.lang.String",
           },
         },
@@ -2097,25 +2097,25 @@ public Rule onImageScanCompleted(java.lang.String id, OnImageScanCompletedOption
       "usage": "public java.lang.String repositoryUriForDigest()
 public java.lang.String repositoryUriForDigest(java.lang.String digest)",
     },
-    Object {
+    {
       "displayName": "repositoryUriForTag",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.repositoryUriForTag",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "tag",
-          "docs": Object {
-            "summary": "Image tag to use (tools usually default to \\"latest\\" if omitted).",
+          "docs": {
+            "summary": "Image tag to use (tools usually default to "latest" if omitted).",
           },
           "fqn": "software.amazon.awscdk.services.ecr.IRepository.repositoryUriForTag.parameter.tag",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "java.lang.String",
           },
         },
@@ -2124,8 +2124,8 @@ public java.lang.String repositoryUriForDigest(java.lang.String digest)",
 public java.lang.String repositoryUriForTag(java.lang.String tag)",
     },
   ],
-  "interfaces": Array [
-    Object {
+  "interfaces": [
+    {
       "displayName": "IResource",
       "fqn": "software.amazon.awscdk.core.IResource",
       "id": "@aws-cdk/core.IResource",
@@ -2133,20 +2133,20 @@ public java.lang.String repositoryUriForTag(java.lang.String tag)",
       "packageVersion": "1.106.0",
     },
   ],
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "node",
-      "docs": Object {
+      "docs": {
         "summary": "The construct tree node for this construct.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.property.node",
       "id": "@aws-cdk/aws-ecr.IRepository.property.node",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ConstructNode",
             "fqn": "software.amazon.awscdk.core.ConstructNode",
             "id": "@aws-cdk/core.ConstructNode",
@@ -2157,10 +2157,10 @@ public java.lang.String repositoryUriForTag(java.lang.String tag)",
       },
       "usage": "public ConstructNode getNode();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "env",
-      "docs": Object {
+      "docs": {
         "remarks": "For resources that are created and managed by the CDK
 (generally, those created by creating new class instances like Role, Bucket, etc.),
 this is always the same as the environment of the stack they belong to;
@@ -2172,10 +2172,10 @@ that might be different than the stack they were imported into.",
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.property.env",
       "id": "@aws-cdk/aws-ecr.IRepository.property.env",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ResourceEnvironment",
             "fqn": "software.amazon.awscdk.core.ResourceEnvironment",
             "id": "@aws-cdk/core.ResourceEnvironment",
@@ -2186,19 +2186,19 @@ that might be different than the stack they were imported into.",
       },
       "usage": "public ResourceEnvironment getEnv();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "stack",
-      "docs": Object {
+      "docs": {
         "summary": "The stack in which this resource is defined.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.property.stack",
       "id": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Stack",
             "fqn": "software.amazon.awscdk.core.Stack",
             "id": "@aws-cdk/core.Stack",
@@ -2209,45 +2209,45 @@ that might be different than the stack they were imported into.",
       },
       "usage": "public Stack getStack();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryArn",
-      "docs": Object {
+      "docs": {
         "summary": "The ARN of the repository.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.property.repositoryArn",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.String",
       },
       "usage": "public java.lang.String getRepositoryArn();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryName",
-      "docs": Object {
+      "docs": {
         "summary": "The name of the repository.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.property.repositoryName",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.String",
       },
       "usage": "public java.lang.String getRepositoryName();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryUri",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY",
         "summary": "The URI of this repository (represents the latest image):.",
       },
       "fqn": "software.amazon.awscdk.services.ecr.IRepository.property.repositoryUri",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.String",
       },
       "usage": "public java.lang.String getRepositoryUri();",
@@ -2257,32 +2257,32 @@ that might be different than the stack they were imported into.",
 `;
 
 exports[`java snapshot 2`] = `
-" IRepository <a name=\\"IRepository\\" id=\\"@aws-cdk/aws-ecr.IRepository\\"></a>
+" IRepository <a name="IRepository" id="@aws-cdk/aws-ecr.IRepository"></a>
 
 - *Extends:* software.amazon.awscdk.core.IResource
 
-- *Implemented By:* <a href=\\"#@aws-cdk/aws-ecr.Repository\\">Repository</a>, <a href=\\"#@aws-cdk/aws-ecr.RepositoryBase\\">RepositoryBase</a>, <a href=\\"#@aws-cdk/aws-ecr.IRepository\\">IRepository</a>
+- *Implemented By:* <a href="#@aws-cdk/aws-ecr.Repository">Repository</a>, <a href="#@aws-cdk/aws-ecr.RepositoryBase">RepositoryBase</a>, <a href="#@aws-cdk/aws-ecr.IRepository">IRepository</a>
 
 Represents an ECR repository.
 
-# Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+# Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\">addToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grant\\">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPull\\">grantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPullPush\\">grantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\">onCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onEvent\\">onEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\">onImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\">repositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\">repositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy">addToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grant">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPull">grantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPullPush">grantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed">onCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onEvent">onEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted">onImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest">repositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag">repositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
 
 ---
 
-## \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\"></a>
+## \`addToResourcePolicy\` <a name="addToResourcePolicy" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy"></a>
 
 \`\`\`java
 public AddToResourcePolicyResult addToResourcePolicy(PolicyStatement statement)
@@ -2290,13 +2290,13 @@ public AddToResourcePolicyResult addToResourcePolicy(PolicyStatement statement)
 
 Add a policy statement to the repository's resource policy.
 
-### \`statement\`<sup>Required</sup> <a name=\\"statement\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement\\"></a>
+### \`statement\`<sup>Required</sup> <a name="statement" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement"></a>
 
 - *Type:* software.amazon.awscdk.services.iam.PolicyStatement
 
 ---
 
-## \`grant\` <a name=\\"grant\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant\\"></a>
+## \`grant\` <a name="grant" id="@aws-cdk/aws-ecr.IRepository.grant"></a>
 
 \`\`\`java
 public Grant grant(IGrantable grantee, java.lang.String actions)
@@ -2304,19 +2304,19 @@ public Grant grant(IGrantable grantee, java.lang.String actions)
 
 Grant the given principal identity permissions to perform the actions on this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee"></a>
 
 - *Type:* software.amazon.awscdk.services.iam.IGrantable
 
 ---
 
-### \`actions\`<sup>Required</sup> <a name=\\"actions\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.actions\\"></a>
+### \`actions\`<sup>Required</sup> <a name="actions" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.actions"></a>
 
 - *Type:* java.lang.String
 
 ---
 
-## \`grantPull\` <a name=\\"grantPull\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull\\"></a>
+## \`grantPull\` <a name="grantPull" id="@aws-cdk/aws-ecr.IRepository.grantPull"></a>
 
 \`\`\`java
 public Grant grantPull(IGrantable grantee)
@@ -2324,13 +2324,13 @@ public Grant grantPull(IGrantable grantee)
 
 Grant the given identity permissions to pull images in this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee"></a>
 
 - *Type:* software.amazon.awscdk.services.iam.IGrantable
 
 ---
 
-## \`grantPullPush\` <a name=\\"grantPullPush\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush\\"></a>
+## \`grantPullPush\` <a name="grantPullPush" id="@aws-cdk/aws-ecr.IRepository.grantPullPush"></a>
 
 \`\`\`java
 public Grant grantPullPush(IGrantable grantee)
@@ -2338,13 +2338,13 @@ public Grant grantPullPush(IGrantable grantee)
 
 Grant the given identity permissions to pull and push images to this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee"></a>
 
 - *Type:* software.amazon.awscdk.services.iam.IGrantable
 
 ---
 
-## \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\"></a>
+## \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent"></a>
 
 \`\`\`java
 public Rule onCloudTrailEvent(java.lang.String id)
@@ -2356,7 +2356,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* java.lang.String
 
@@ -2364,7 +2364,7 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* software.amazon.awscdk.services.events.OnEventOptions
 
@@ -2372,7 +2372,7 @@ Options for adding the rule.
 
 ---
 
-## \`onCloudTrailImagePushed\` <a name=\\"onCloudTrailImagePushed\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\"></a>
+## \`onCloudTrailImagePushed\` <a name="onCloudTrailImagePushed" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed"></a>
 
 \`\`\`java
 public Rule onCloudTrailImagePushed(java.lang.String id)
@@ -2384,7 +2384,7 @@ Defines an AWS CloudWatch event rule that can trigger a target when an image is
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id"></a>
 
 - *Type:* java.lang.String
 
@@ -2392,15 +2392,15 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions\\">OnCloudTrailImagePushedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions">OnCloudTrailImagePushedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`onEvent\` <a name=\\"onEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent\\"></a>
+## \`onEvent\` <a name="onEvent" id="@aws-cdk/aws-ecr.IRepository.onEvent"></a>
 
 \`\`\`java
 public Rule onEvent(java.lang.String id)
@@ -2412,19 +2412,19 @@ Defines a CloudWatch event rule which triggers for repository events.
 Use
 \`rule.addEventPattern(pattern)\` to specify a filter.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id"></a>
 
 - *Type:* java.lang.String
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options"></a>
 
 - *Type:* software.amazon.awscdk.services.events.OnEventOptions
 
 ---
 
-## \`onImageScanCompleted\` <a name=\\"onImageScanCompleted\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\"></a>
+## \`onImageScanCompleted\` <a name="onImageScanCompleted" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted"></a>
 
 \`\`\`java
 public Rule onImageScanCompleted(java.lang.String id)
@@ -2433,7 +2433,7 @@ public Rule onImageScanCompleted(java.lang.String id, OnImageScanCompletedOption
 
 Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id"></a>
 
 - *Type:* java.lang.String
 
@@ -2441,15 +2441,15 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnImageScanCompletedOptions\\">OnImageScanCompletedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnImageScanCompletedOptions">OnImageScanCompletedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`repositoryUriForDigest\` <a name=\\"repositoryUriForDigest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\"></a>
+## \`repositoryUriForDigest\` <a name="repositoryUriForDigest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest"></a>
 
 \`\`\`java
 public java.lang.String repositoryUriForDigest()
@@ -2460,15 +2460,15 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]
 
-### \`digest\`<sup>Optional</sup> <a name=\\"digest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest\\"></a>
+### \`digest\`<sup>Optional</sup> <a name="digest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest"></a>
 
 - *Type:* java.lang.String
 
-Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).
+Image digest to use (tools usually default to the image with the "latest" tag if omitted).
 
 ---
 
-## \`repositoryUriForTag\` <a name=\\"repositoryUriForTag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\"></a>
+## \`repositoryUriForTag\` <a name="repositoryUriForTag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag"></a>
 
 \`\`\`java
 public java.lang.String repositoryUriForTag()
@@ -2479,28 +2479,28 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]
 
-### \`tag\`<sup>Optional</sup> <a name=\\"tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag\\"></a>
+### \`tag\`<sup>Optional</sup> <a name="tag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag"></a>
 
 - *Type:* java.lang.String
 
-Image tag to use (tools usually default to \\"latest\\" if omitted).
+Image tag to use (tools usually default to "latest" if omitted).
 
 ---
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.node\\">node</a></code> | <code>software.amazon.awscdk.core.ConstructNode</code> | The construct tree node for this construct. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.env\\">env</a></code> | <code>software.amazon.awscdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.stack\\">stack</a></code> | <code>software.amazon.awscdk.core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\">repositoryArn</a></code> | <code>java.lang.String</code> | The ARN of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryName\\">repositoryName</a></code> | <code>java.lang.String</code> | The name of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\">repositoryUri</a></code> | <code>java.lang.String</code> | The URI of this repository (represents the latest image):. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.node">node</a></code> | <code>software.amazon.awscdk.core.ConstructNode</code> | The construct tree node for this construct. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.env">env</a></code> | <code>software.amazon.awscdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.stack">stack</a></code> | <code>software.amazon.awscdk.core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryArn">repositoryArn</a></code> | <code>java.lang.String</code> | The ARN of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryName">repositoryName</a></code> | <code>java.lang.String</code> | The name of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryUri">repositoryUri</a></code> | <code>java.lang.String</code> | The URI of this repository (represents the latest image):. |
 
 ---
 
-## \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.node\\"></a>
+## \`node\`<sup>Required</sup> <a name="node" id="@aws-cdk/aws-ecr.IRepository.property.node"></a>
 
 \`\`\`java
 public ConstructNode getNode();
@@ -2512,7 +2512,7 @@ The construct tree node for this construct.
 
 ---
 
-## \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.env\\"></a>
+## \`env\`<sup>Required</sup> <a name="env" id="@aws-cdk/aws-ecr.IRepository.property.env"></a>
 
 \`\`\`java
 public ResourceEnvironment getEnv();
@@ -2531,7 +2531,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-## \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.stack\\"></a>
+## \`stack\`<sup>Required</sup> <a name="stack" id="@aws-cdk/aws-ecr.IRepository.property.stack"></a>
 
 \`\`\`java
 public Stack getStack();
@@ -2543,7 +2543,7 @@ The stack in which this resource is defined.
 
 ---
 
-## \`repositoryArn\`<sup>Required</sup> <a name=\\"repositoryArn\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\"></a>
+## \`repositoryArn\`<sup>Required</sup> <a name="repositoryArn" id="@aws-cdk/aws-ecr.IRepository.property.repositoryArn"></a>
 
 \`\`\`java
 public java.lang.String getRepositoryArn();
@@ -2555,7 +2555,7 @@ The ARN of the repository.
 
 ---
 
-## \`repositoryName\`<sup>Required</sup> <a name=\\"repositoryName\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryName\\"></a>
+## \`repositoryName\`<sup>Required</sup> <a name="repositoryName" id="@aws-cdk/aws-ecr.IRepository.property.repositoryName"></a>
 
 \`\`\`java
 public java.lang.String getRepositoryName();
@@ -2567,7 +2567,7 @@ The name of the repository.
 
 ---
 
-## \`repositoryUri\`<sup>Required</sup> <a name=\\"repositoryUri\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\"></a>
+## \`repositoryUri\`<sup>Required</sup> <a name="repositoryUri" id="@aws-cdk/aws-ecr.IRepository.property.repositoryUri"></a>
 
 \`\`\`java
 public java.lang.String getRepositoryUri();
@@ -2584,29 +2584,29 @@ ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "displayName": "IRepository",
-  "docs": Object {
+  "docs": {
     "summary": "Represents an ECR repository.",
   },
   "fqn": "aws_cdk.aws_ecr.IRepository",
   "id": "@aws-cdk/aws-ecr.IRepository",
-  "implementations": Array [
-    Object {
+  "implementations": [
+    {
       "displayName": "Repository",
       "fqn": "aws_cdk.aws_ecr.Repository",
       "id": "@aws-cdk/aws-ecr.Repository",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "RepositoryBase",
       "fqn": "aws_cdk.aws_ecr.RepositoryBase",
       "id": "@aws-cdk/aws-ecr.RepositoryBase",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "IRepository",
       "fqn": "aws_cdk.aws_ecr.IRepository",
       "id": "@aws-cdk/aws-ecr.IRepository",
@@ -2614,26 +2614,26 @@ Object {
       "packageVersion": "1.106.0",
     },
   ],
-  "instanceMethods": Array [
-    Object {
+  "instanceMethods": [
+    {
       "displayName": "add_to_resource_policy",
-      "docs": Object {
+      "docs": {
         "summary": "Add a policy statement to the repository's resource policy.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.add_to_resource_policy",
       "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "statement",
-          "docs": Object {},
+          "docs": {},
           "fqn": "aws_cdk.aws_ecr.IRepository.add_to_resource_policy.parameter.statement",
           "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "PolicyStatement",
                 "fqn": "aws_cdk.aws_iam.PolicyStatement",
                 "id": "@aws-cdk/aws-iam.PolicyStatement",
@@ -2648,25 +2648,25 @@ Object {
   statement: PolicyStatement
 ) -> AddToResourcePolicyResult",
     },
-    Object {
+    {
       "displayName": "grant",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given principal identity permissions to perform the actions on this repository.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.grant",
       "id": "@aws-cdk/aws-ecr.IRepository.grant",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "aws_cdk.aws_ecr.IRepository.grant.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "aws_cdk.aws_iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -2676,14 +2676,14 @@ Object {
             ],
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "actions",
-          "docs": Object {},
+          "docs": {},
           "fqn": "aws_cdk.aws_ecr.IRepository.grant.parameter.actions",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
@@ -2693,25 +2693,25 @@ Object {
   actions: str
 ) -> Grant",
     },
-    Object {
+    {
       "displayName": "grant_pull",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull images in this repository.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.grant_pull",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPull",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "aws_cdk.aws_ecr.IRepository.grant_pull.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "aws_cdk.aws_iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -2726,25 +2726,25 @@ Object {
   grantee: IGrantable
 ) -> Grant",
     },
-    Object {
+    {
       "displayName": "grant_pull_push",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull and push images to this repository.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.grant_pull_push",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "aws_cdk.aws_ecr.IRepository.grant_pull_push.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "aws_cdk.aws_iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -2759,47 +2759,47 @@ Object {
   grantee: IGrantable
 ) -> Grant",
     },
-    Object {
+    {
       "displayName": "on_cloud_trail_event",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Define a CloudWatch event that triggers when something happens to this repository.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_event",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_event.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No description",
           "displayName": "description",
-          "docs": Object {
+          "docs": {
             "summary": "A description of the rule's purpose.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_event.parameter.description",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.description",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No additional filtering based on an event pattern.",
           "displayName": "event_pattern",
-          "docs": Object {
-            "links": Array [
+          "docs": {
+            "links": [
               "https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html",
             ],
             "remarks": "The method that generates the rule probably imposes some type of event
@@ -2810,10 +2810,10 @@ on top of that filtering.",
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_event.parameter.event_pattern",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.eventPattern",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "EventPattern",
                 "fqn": "aws_cdk.aws_events.EventPattern",
                 "id": "@aws-cdk/aws-events.EventPattern",
@@ -2823,32 +2823,32 @@ on top of that filtering.",
             ],
           },
         },
-        Object {
+        {
           "default": "AWS CloudFormation generates a unique physical ID.",
           "displayName": "rule_name",
-          "docs": Object {
+          "docs": {
             "summary": "A name for the rule.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_event.parameter.rule_name",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.ruleName",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No target is added to the rule. Use \`addTarget()\` to add a target.",
           "displayName": "target",
-          "docs": Object {
+          "docs": {
             "summary": "The target to register for the event.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_event.parameter.target",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.target",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IRuleTarget",
                 "fqn": "aws_cdk.aws_events.IRuleTarget",
                 "id": "@aws-cdk/aws-events.IRuleTarget",
@@ -2867,47 +2867,47 @@ on top of that filtering.",
   target: IRuleTarget = None
 ) -> Rule",
     },
-    Object {
+    {
       "displayName": "on_cloud_trail_image_pushed",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_image_pushed",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_image_pushed.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No description",
           "displayName": "description",
-          "docs": Object {
+          "docs": {
             "summary": "A description of the rule's purpose.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_image_pushed.parameter.description",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.description",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No additional filtering based on an event pattern.",
           "displayName": "event_pattern",
-          "docs": Object {
-            "links": Array [
+          "docs": {
+            "links": [
               "https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html",
             ],
             "remarks": "The method that generates the rule probably imposes some type of event
@@ -2918,10 +2918,10 @@ on top of that filtering.",
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_image_pushed.parameter.event_pattern",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.eventPattern",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "EventPattern",
                 "fqn": "aws_cdk.aws_events.EventPattern",
                 "id": "@aws-cdk/aws-events.EventPattern",
@@ -2931,32 +2931,32 @@ on top of that filtering.",
             ],
           },
         },
-        Object {
+        {
           "default": "AWS CloudFormation generates a unique physical ID.",
           "displayName": "rule_name",
-          "docs": Object {
+          "docs": {
             "summary": "A name for the rule.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_image_pushed.parameter.rule_name",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.ruleName",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No target is added to the rule. Use \`addTarget()\` to add a target.",
           "displayName": "target",
-          "docs": Object {
+          "docs": {
             "summary": "The target to register for the event.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_image_pushed.parameter.target",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.target",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IRuleTarget",
                 "fqn": "aws_cdk.aws_events.IRuleTarget",
                 "id": "@aws-cdk/aws-events.IRuleTarget",
@@ -2966,16 +2966,16 @@ on top of that filtering.",
             ],
           },
         },
-        Object {
+        {
           "default": "- Watch changes to all tags",
           "displayName": "image_tag",
-          "docs": Object {
+          "docs": {
             "summary": "Only watch changes to this image tag.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_cloud_trail_image_pushed.parameter.image_tag",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.imageTag",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
@@ -2989,45 +2989,45 @@ on top of that filtering.",
   image_tag: str = None
 ) -> Rule",
     },
-    Object {
+    {
       "displayName": "on_event",
-      "docs": Object {
+      "docs": {
         "remarks": "Use
 \`rule.addEventPattern(pattern)\` to specify a filter.",
         "summary": "Defines a CloudWatch event rule which triggers for repository events.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.on_event",
       "id": "@aws-cdk/aws-ecr.IRepository.onEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {},
+          "docs": {},
           "fqn": "aws_cdk.aws_ecr.IRepository.on_event.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No description",
           "displayName": "description",
-          "docs": Object {
+          "docs": {
             "summary": "A description of the rule's purpose.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_event.parameter.description",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.description",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No additional filtering based on an event pattern.",
           "displayName": "event_pattern",
-          "docs": Object {
-            "links": Array [
+          "docs": {
+            "links": [
               "https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html",
             ],
             "remarks": "The method that generates the rule probably imposes some type of event
@@ -3038,10 +3038,10 @@ on top of that filtering.",
           "fqn": "aws_cdk.aws_ecr.IRepository.on_event.parameter.event_pattern",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.eventPattern",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "EventPattern",
                 "fqn": "aws_cdk.aws_events.EventPattern",
                 "id": "@aws-cdk/aws-events.EventPattern",
@@ -3051,32 +3051,32 @@ on top of that filtering.",
             ],
           },
         },
-        Object {
+        {
           "default": "AWS CloudFormation generates a unique physical ID.",
           "displayName": "rule_name",
-          "docs": Object {
+          "docs": {
             "summary": "A name for the rule.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_event.parameter.rule_name",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.ruleName",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No target is added to the rule. Use \`addTarget()\` to add a target.",
           "displayName": "target",
-          "docs": Object {
+          "docs": {
             "summary": "The target to register for the event.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_event.parameter.target",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.target",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IRuleTarget",
                 "fqn": "aws_cdk.aws_events.IRuleTarget",
                 "id": "@aws-cdk/aws-events.IRuleTarget",
@@ -3095,45 +3095,45 @@ on top of that filtering.",
   target: IRuleTarget = None
 ) -> Rule",
     },
-    Object {
+    {
       "displayName": "on_image_scan_completed",
-      "docs": Object {
+      "docs": {
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.on_image_scan_completed",
       "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_image_scan_completed.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No description",
           "displayName": "description",
-          "docs": Object {
+          "docs": {
             "summary": "A description of the rule's purpose.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_image_scan_completed.parameter.description",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.description",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No additional filtering based on an event pattern.",
           "displayName": "event_pattern",
-          "docs": Object {
-            "links": Array [
+          "docs": {
+            "links": [
               "https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html",
             ],
             "remarks": "The method that generates the rule probably imposes some type of event
@@ -3144,10 +3144,10 @@ on top of that filtering.",
           "fqn": "aws_cdk.aws_ecr.IRepository.on_image_scan_completed.parameter.event_pattern",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.eventPattern",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "EventPattern",
                 "fqn": "aws_cdk.aws_events.EventPattern",
                 "id": "@aws-cdk/aws-events.EventPattern",
@@ -3157,32 +3157,32 @@ on top of that filtering.",
             ],
           },
         },
-        Object {
+        {
           "default": "AWS CloudFormation generates a unique physical ID.",
           "displayName": "rule_name",
-          "docs": Object {
+          "docs": {
             "summary": "A name for the rule.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_image_scan_completed.parameter.rule_name",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.ruleName",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
-        Object {
+        {
           "default": "- No target is added to the rule. Use \`addTarget()\` to add a target.",
           "displayName": "target",
-          "docs": Object {
+          "docs": {
             "summary": "The target to register for the event.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_image_scan_completed.parameter.target",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.target",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IRuleTarget",
                 "fqn": "aws_cdk.aws_events.IRuleTarget",
                 "id": "@aws-cdk/aws-events.IRuleTarget",
@@ -3192,20 +3192,20 @@ on top of that filtering.",
             ],
           },
         },
-        Object {
+        {
           "default": "- Watch the changes to the repository with all image tags",
           "displayName": "image_tags",
-          "docs": Object {
+          "docs": {
             "remarks": "Leave it undefined to watch the full repository.",
             "summary": "Only watch changes to the image tags spedified.",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.on_image_scan_completed.parameter.image_tags",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.imageTags",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "typing.List[%]",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "formattingPattern": "str",
               },
             ],
@@ -3221,25 +3221,25 @@ on top of that filtering.",
   image_tags: typing.List[str] = None
 ) -> Rule",
     },
-    Object {
+    {
       "displayName": "repository_uri_for_digest",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.repository_uri_for_digest",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "digest",
-          "docs": Object {
-            "summary": "Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).",
+          "docs": {
+            "summary": "Image digest to use (tools usually default to the image with the "latest" tag if omitted).",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.repository_uri_for_digest.parameter.digest",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
@@ -3248,25 +3248,25 @@ on top of that filtering.",
   digest: str = None
 ) -> str",
     },
-    Object {
+    {
       "displayName": "repository_uri_for_tag",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.repository_uri_for_tag",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "tag",
-          "docs": Object {
-            "summary": "Image tag to use (tools usually default to \\"latest\\" if omitted).",
+          "docs": {
+            "summary": "Image tag to use (tools usually default to "latest" if omitted).",
           },
           "fqn": "aws_cdk.aws_ecr.IRepository.repository_uri_for_tag.parameter.tag",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
@@ -3276,8 +3276,8 @@ on top of that filtering.",
 ) -> str",
     },
   ],
-  "interfaces": Array [
-    Object {
+  "interfaces": [
+    {
       "displayName": "IResource",
       "fqn": "aws_cdk.core.IResource",
       "id": "@aws-cdk/core.IResource",
@@ -3285,20 +3285,20 @@ on top of that filtering.",
       "packageVersion": "1.106.0",
     },
   ],
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "node",
-      "docs": Object {
+      "docs": {
         "summary": "The construct tree node for this construct.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.property.node",
       "id": "@aws-cdk/aws-ecr.IRepository.property.node",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ConstructNode",
             "fqn": "aws_cdk.core.ConstructNode",
             "id": "@aws-cdk/core.ConstructNode",
@@ -3309,10 +3309,10 @@ on top of that filtering.",
       },
       "usage": "node: ConstructNode",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "env",
-      "docs": Object {
+      "docs": {
         "remarks": "For resources that are created and managed by the CDK
 (generally, those created by creating new class instances like Role, Bucket, etc.),
 this is always the same as the environment of the stack they belong to;
@@ -3324,10 +3324,10 @@ that might be different than the stack they were imported into.",
       "fqn": "aws_cdk.aws_ecr.IRepository.property.env",
       "id": "@aws-cdk/aws-ecr.IRepository.property.env",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ResourceEnvironment",
             "fqn": "aws_cdk.core.ResourceEnvironment",
             "id": "@aws-cdk/core.ResourceEnvironment",
@@ -3338,19 +3338,19 @@ that might be different than the stack they were imported into.",
       },
       "usage": "env: ResourceEnvironment",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "stack",
-      "docs": Object {
+      "docs": {
         "summary": "The stack in which this resource is defined.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.property.stack",
       "id": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Stack",
             "fqn": "aws_cdk.core.Stack",
             "id": "@aws-cdk/core.Stack",
@@ -3361,45 +3361,45 @@ that might be different than the stack they were imported into.",
       },
       "usage": "stack: Stack",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_arn",
-      "docs": Object {
+      "docs": {
         "summary": "The ARN of the repository.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.property.repository_arn",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repository_arn: str",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_name",
-      "docs": Object {
+      "docs": {
         "summary": "The name of the repository.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.property.repository_name",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repository_name: str",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_uri",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY",
         "summary": "The URI of this repository (represents the latest image):.",
       },
       "fqn": "aws_cdk.aws_ecr.IRepository.property.repository_uri",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repository_uri: str",
@@ -3409,32 +3409,32 @@ that might be different than the stack they were imported into.",
 `;
 
 exports[`python snapshot 2`] = `
-" IRepository <a name=\\"IRepository\\" id=\\"@aws-cdk/aws-ecr.IRepository\\"></a>
+" IRepository <a name="IRepository" id="@aws-cdk/aws-ecr.IRepository"></a>
 
 - *Extends:* aws_cdk.core.IResource
 
-- *Implemented By:* <a href=\\"#@aws-cdk/aws-ecr.Repository\\">Repository</a>, <a href=\\"#@aws-cdk/aws-ecr.RepositoryBase\\">RepositoryBase</a>, <a href=\\"#@aws-cdk/aws-ecr.IRepository\\">IRepository</a>
+- *Implemented By:* <a href="#@aws-cdk/aws-ecr.Repository">Repository</a>, <a href="#@aws-cdk/aws-ecr.RepositoryBase">RepositoryBase</a>, <a href="#@aws-cdk/aws-ecr.IRepository">IRepository</a>
 
 Represents an ECR repository.
 
-# Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+# Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\">add_to_resource_policy</a></code> | Add a policy statement to the repository's resource policy. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grant\\">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPull\\">grant_pull</a></code> | Grant the given identity permissions to pull images in this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPullPush\\">grant_pull_push</a></code> | Grant the given identity permissions to pull and push images to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\">on_cloud_trail_event</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\">on_cloud_trail_image_pushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onEvent\\">on_event</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\">on_image_scan_completed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\">repository_uri_for_digest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\">repository_uri_for_tag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy">add_to_resource_policy</a></code> | Add a policy statement to the repository's resource policy. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grant">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPull">grant_pull</a></code> | Grant the given identity permissions to pull images in this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPullPush">grant_pull_push</a></code> | Grant the given identity permissions to pull and push images to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent">on_cloud_trail_event</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed">on_cloud_trail_image_pushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onEvent">on_event</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted">on_image_scan_completed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest">repository_uri_for_digest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag">repository_uri_for_tag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
 
 ---
 
-## \`add_to_resource_policy\` <a name=\\"add_to_resource_policy\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\"></a>
+## \`add_to_resource_policy\` <a name="add_to_resource_policy" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy"></a>
 
 \`\`\`python
 def add_to_resource_policy(
@@ -3444,13 +3444,13 @@ def add_to_resource_policy(
 
 Add a policy statement to the repository's resource policy.
 
-### \`statement\`<sup>Required</sup> <a name=\\"statement\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement\\"></a>
+### \`statement\`<sup>Required</sup> <a name="statement" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement"></a>
 
 - *Type:* aws_cdk.aws_iam.PolicyStatement
 
 ---
 
-## \`grant\` <a name=\\"grant\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant\\"></a>
+## \`grant\` <a name="grant" id="@aws-cdk/aws-ecr.IRepository.grant"></a>
 
 \`\`\`python
 def grant(
@@ -3461,19 +3461,19 @@ def grant(
 
 Grant the given principal identity permissions to perform the actions on this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-### \`actions\`<sup>Required</sup> <a name=\\"actions\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.actions\\"></a>
+### \`actions\`<sup>Required</sup> <a name="actions" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.actions"></a>
 
 - *Type:* str
 
 ---
 
-## \`grant_pull\` <a name=\\"grant_pull\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull\\"></a>
+## \`grant_pull\` <a name="grant_pull" id="@aws-cdk/aws-ecr.IRepository.grantPull"></a>
 
 \`\`\`python
 def grant_pull(
@@ -3483,13 +3483,13 @@ def grant_pull(
 
 Grant the given identity permissions to pull images in this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-## \`grant_pull_push\` <a name=\\"grant_pull_push\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush\\"></a>
+## \`grant_pull_push\` <a name="grant_pull_push" id="@aws-cdk/aws-ecr.IRepository.grantPullPush"></a>
 
 \`\`\`python
 def grant_pull_push(
@@ -3499,13 +3499,13 @@ def grant_pull_push(
 
 Grant the given identity permissions to pull and push images to this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
 ---
 
-## \`on_cloud_trail_event\` <a name=\\"on_cloud_trail_event\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\"></a>
+## \`on_cloud_trail_event\` <a name="on_cloud_trail_event" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent"></a>
 
 \`\`\`python
 def on_cloud_trail_event(
@@ -3522,7 +3522,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* str
 
@@ -3530,7 +3530,7 @@ The id of the rule.
 
 ---
 
-### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.description\\"></a>
+### \`description\`<sup>Optional</sup> <a name="description" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -3539,7 +3539,7 @@ A description of the rule's purpose.
 
 ---
 
-### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.eventPattern\\"></a>
+### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -3554,7 +3554,7 @@ on top of that filtering.
 
 ---
 
-### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.ruleName\\"></a>
+### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -3563,7 +3563,7 @@ A name for the rule.
 
 ---
 
-### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.target\\"></a>
+### \`target\`<sup>Optional</sup> <a name="target" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -3572,7 +3572,7 @@ The target to register for the event.
 
 ---
 
-## \`on_cloud_trail_image_pushed\` <a name=\\"on_cloud_trail_image_pushed\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\"></a>
+## \`on_cloud_trail_image_pushed\` <a name="on_cloud_trail_image_pushed" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed"></a>
 
 \`\`\`python
 def on_cloud_trail_image_pushed(
@@ -3590,7 +3590,7 @@ Defines an AWS CloudWatch event rule that can trigger a target when an image is
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id"></a>
 
 - *Type:* str
 
@@ -3598,7 +3598,7 @@ The id of the rule.
 
 ---
 
-### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.description\\"></a>
+### \`description\`<sup>Optional</sup> <a name="description" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -3607,7 +3607,7 @@ A description of the rule's purpose.
 
 ---
 
-### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.eventPattern\\"></a>
+### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -3622,7 +3622,7 @@ on top of that filtering.
 
 ---
 
-### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.ruleName\\"></a>
+### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -3631,7 +3631,7 @@ A name for the rule.
 
 ---
 
-### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.target\\"></a>
+### \`target\`<sup>Optional</sup> <a name="target" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -3640,7 +3640,7 @@ The target to register for the event.
 
 ---
 
-### \`image_tag\`<sup>Optional</sup> <a name=\\"image_tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.imageTag\\"></a>
+### \`image_tag\`<sup>Optional</sup> <a name="image_tag" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.imageTag"></a>
 
 - *Type:* str
 - *Default:* Watch changes to all tags
@@ -3649,7 +3649,7 @@ Only watch changes to this image tag.
 
 ---
 
-## \`on_event\` <a name=\\"on_event\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent\\"></a>
+## \`on_event\` <a name="on_event" id="@aws-cdk/aws-ecr.IRepository.onEvent"></a>
 
 \`\`\`python
 def on_event(
@@ -3666,13 +3666,13 @@ Defines a CloudWatch event rule which triggers for repository events.
 Use
 \`rule.addEventPattern(pattern)\` to specify a filter.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id"></a>
 
 - *Type:* str
 
 ---
 
-### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.description\\"></a>
+### \`description\`<sup>Optional</sup> <a name="description" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -3681,7 +3681,7 @@ A description of the rule's purpose.
 
 ---
 
-### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.eventPattern\\"></a>
+### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -3696,7 +3696,7 @@ on top of that filtering.
 
 ---
 
-### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.ruleName\\"></a>
+### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -3705,7 +3705,7 @@ A name for the rule.
 
 ---
 
-### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.target\\"></a>
+### \`target\`<sup>Optional</sup> <a name="target" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -3714,7 +3714,7 @@ The target to register for the event.
 
 ---
 
-## \`on_image_scan_completed\` <a name=\\"on_image_scan_completed\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\"></a>
+## \`on_image_scan_completed\` <a name="on_image_scan_completed" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted"></a>
 
 \`\`\`python
 def on_image_scan_completed(
@@ -3729,7 +3729,7 @@ def on_image_scan_completed(
 
 Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id"></a>
 
 - *Type:* str
 
@@ -3737,7 +3737,7 @@ The id of the rule.
 
 ---
 
-### \`description\`<sup>Optional</sup> <a name=\\"description\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.description\\"></a>
+### \`description\`<sup>Optional</sup> <a name="description" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.description"></a>
 
 - *Type:* str
 - *Default:* No description
@@ -3746,7 +3746,7 @@ A description of the rule's purpose.
 
 ---
 
-### \`event_pattern\`<sup>Optional</sup> <a name=\\"event_pattern\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.eventPattern\\"></a>
+### \`event_pattern\`<sup>Optional</sup> <a name="event_pattern" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.eventPattern"></a>
 
 - *Type:* aws_cdk.aws_events.EventPattern
 - *Default:* No additional filtering based on an event pattern.
@@ -3761,7 +3761,7 @@ on top of that filtering.
 
 ---
 
-### \`rule_name\`<sup>Optional</sup> <a name=\\"rule_name\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.ruleName\\"></a>
+### \`rule_name\`<sup>Optional</sup> <a name="rule_name" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.ruleName"></a>
 
 - *Type:* str
 - *Default:* AWS CloudFormation generates a unique physical ID.
@@ -3770,7 +3770,7 @@ A name for the rule.
 
 ---
 
-### \`target\`<sup>Optional</sup> <a name=\\"target\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.target\\"></a>
+### \`target\`<sup>Optional</sup> <a name="target" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.target"></a>
 
 - *Type:* aws_cdk.aws_events.IRuleTarget
 - *Default:* No target is added to the rule. Use \`addTarget()\` to add a target.
@@ -3779,7 +3779,7 @@ The target to register for the event.
 
 ---
 
-### \`image_tags\`<sup>Optional</sup> <a name=\\"image_tags\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.imageTags\\"></a>
+### \`image_tags\`<sup>Optional</sup> <a name="image_tags" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.imageTags"></a>
 
 - *Type:* typing.List[str]
 - *Default:* Watch the changes to the repository with all image tags
@@ -3790,7 +3790,7 @@ Leave it undefined to watch the full repository.
 
 ---
 
-## \`repository_uri_for_digest\` <a name=\\"repository_uri_for_digest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\"></a>
+## \`repository_uri_for_digest\` <a name="repository_uri_for_digest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest"></a>
 
 \`\`\`python
 def repository_uri_for_digest(
@@ -3802,15 +3802,15 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]
 
-### \`digest\`<sup>Optional</sup> <a name=\\"digest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest\\"></a>
+### \`digest\`<sup>Optional</sup> <a name="digest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest"></a>
 
 - *Type:* str
 
-Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).
+Image digest to use (tools usually default to the image with the "latest" tag if omitted).
 
 ---
 
-## \`repository_uri_for_tag\` <a name=\\"repository_uri_for_tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\"></a>
+## \`repository_uri_for_tag\` <a name="repository_uri_for_tag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag"></a>
 
 \`\`\`python
 def repository_uri_for_tag(
@@ -3822,28 +3822,28 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]
 
-### \`tag\`<sup>Optional</sup> <a name=\\"tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag\\"></a>
+### \`tag\`<sup>Optional</sup> <a name="tag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag"></a>
 
 - *Type:* str
 
-Image tag to use (tools usually default to \\"latest\\" if omitted).
+Image tag to use (tools usually default to "latest" if omitted).
 
 ---
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.node\\">node</a></code> | <code>aws_cdk.core.ConstructNode</code> | The construct tree node for this construct. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.env\\">env</a></code> | <code>aws_cdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.stack\\">stack</a></code> | <code>aws_cdk.core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\">repository_arn</a></code> | <code>str</code> | The ARN of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryName\\">repository_name</a></code> | <code>str</code> | The name of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\">repository_uri</a></code> | <code>str</code> | The URI of this repository (represents the latest image):. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.node">node</a></code> | <code>aws_cdk.core.ConstructNode</code> | The construct tree node for this construct. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.env">env</a></code> | <code>aws_cdk.core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.stack">stack</a></code> | <code>aws_cdk.core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryArn">repository_arn</a></code> | <code>str</code> | The ARN of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryName">repository_name</a></code> | <code>str</code> | The name of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryUri">repository_uri</a></code> | <code>str</code> | The URI of this repository (represents the latest image):. |
 
 ---
 
-## \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.node\\"></a>
+## \`node\`<sup>Required</sup> <a name="node" id="@aws-cdk/aws-ecr.IRepository.property.node"></a>
 
 \`\`\`python
 node: ConstructNode
@@ -3855,7 +3855,7 @@ The construct tree node for this construct.
 
 ---
 
-## \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.env\\"></a>
+## \`env\`<sup>Required</sup> <a name="env" id="@aws-cdk/aws-ecr.IRepository.property.env"></a>
 
 \`\`\`python
 env: ResourceEnvironment
@@ -3874,7 +3874,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-## \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.stack\\"></a>
+## \`stack\`<sup>Required</sup> <a name="stack" id="@aws-cdk/aws-ecr.IRepository.property.stack"></a>
 
 \`\`\`python
 stack: Stack
@@ -3886,7 +3886,7 @@ The stack in which this resource is defined.
 
 ---
 
-## \`repository_arn\`<sup>Required</sup> <a name=\\"repository_arn\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\"></a>
+## \`repository_arn\`<sup>Required</sup> <a name="repository_arn" id="@aws-cdk/aws-ecr.IRepository.property.repositoryArn"></a>
 
 \`\`\`python
 repository_arn: str
@@ -3898,7 +3898,7 @@ The ARN of the repository.
 
 ---
 
-## \`repository_name\`<sup>Required</sup> <a name=\\"repository_name\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryName\\"></a>
+## \`repository_name\`<sup>Required</sup> <a name="repository_name" id="@aws-cdk/aws-ecr.IRepository.property.repositoryName"></a>
 
 \`\`\`python
 repository_name: str
@@ -3910,7 +3910,7 @@ The name of the repository.
 
 ---
 
-## \`repository_uri\`<sup>Required</sup> <a name=\\"repository_uri\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\"></a>
+## \`repository_uri\`<sup>Required</sup> <a name="repository_uri" id="@aws-cdk/aws-ecr.IRepository.property.repositoryUri"></a>
 
 \`\`\`python
 repository_uri: str
@@ -3927,29 +3927,29 @@ ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "displayName": "IRepository",
-  "docs": Object {
+  "docs": {
     "summary": "Represents an ECR repository.",
   },
   "fqn": "@aws-cdk/aws-ecr.IRepository",
   "id": "@aws-cdk/aws-ecr.IRepository",
-  "implementations": Array [
-    Object {
+  "implementations": [
+    {
       "displayName": "Repository",
       "fqn": "@aws-cdk/aws-ecr.Repository",
       "id": "@aws-cdk/aws-ecr.Repository",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "RepositoryBase",
       "fqn": "@aws-cdk/aws-ecr.RepositoryBase",
       "id": "@aws-cdk/aws-ecr.RepositoryBase",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "IRepository",
       "fqn": "@aws-cdk/aws-ecr.IRepository",
       "id": "@aws-cdk/aws-ecr.IRepository",
@@ -3957,26 +3957,26 @@ Object {
       "packageVersion": "1.106.0",
     },
   ],
-  "instanceMethods": Array [
-    Object {
+  "instanceMethods": [
+    {
       "displayName": "addToResourcePolicy",
-      "docs": Object {
+      "docs": {
         "summary": "Add a policy statement to the repository's resource policy.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
       "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "statement",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "PolicyStatement",
                 "fqn": "@aws-cdk/aws-iam.PolicyStatement",
                 "id": "@aws-cdk/aws-iam.PolicyStatement",
@@ -3989,25 +3989,25 @@ Object {
       ],
       "usage": "public addToResourcePolicy(statement: PolicyStatement): AddToResourcePolicyResult",
     },
-    Object {
+    {
       "displayName": "grant",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given principal identity permissions to perform the actions on this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.grant",
       "id": "@aws-cdk/aws-ecr.IRepository.grant",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -4017,39 +4017,39 @@ Object {
             ],
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "actions",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
       ],
       "usage": "public grant(grantee: IGrantable, actions: string): Grant",
     },
-    Object {
+    {
       "displayName": "grantPull",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull images in this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.grantPull",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPull",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -4062,25 +4062,25 @@ Object {
       ],
       "usage": "public grantPull(grantee: IGrantable): Grant",
     },
-    Object {
+    {
       "displayName": "grantPullPush",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull and push images to this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -4093,42 +4093,42 @@ Object {
       ],
       "usage": "public grantPullPush(grantee: IGrantable): Grant",
     },
-    Object {
+    {
       "displayName": "onCloudTrailEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Define a CloudWatch event that triggers when something happens to this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "@aws-cdk/aws-events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -4141,42 +4141,42 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "public onCloudTrailEvent(id: string, options?: OnEventOptions): Rule",
     },
-    Object {
+    {
       "displayName": "onCloudTrailImagePushed",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnCloudTrailImagePushedOptions",
                 "fqn": "@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions",
                 "id": "@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions",
@@ -4189,38 +4189,38 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "public onCloudTrailImagePushed(id: string, options?: OnCloudTrailImagePushedOptions): Rule",
     },
-    Object {
+    {
       "displayName": "onEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Use
 \`rule.addEventPattern(pattern)\` to specify a filter.",
         "summary": "Defines a CloudWatch event rule which triggers for repository events.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "@aws-cdk/aws-events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -4233,40 +4233,40 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "public onEvent(id: string, options?: OnEventOptions): Rule",
     },
-    Object {
+    {
       "displayName": "onImageScanCompleted",
-      "docs": Object {
+      "docs": {
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
       "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "id",
-          "docs": Object {
+          "docs": {
             "summary": "The id of the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnImageScanCompletedOptions",
                 "fqn": "@aws-cdk/aws-ecr.OnImageScanCompletedOptions",
                 "id": "@aws-cdk/aws-ecr.OnImageScanCompletedOptions",
@@ -4279,50 +4279,50 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "public onImageScanCompleted(id: string, options?: OnImageScanCompletedOptions): Rule",
     },
-    Object {
+    {
       "displayName": "repositoryUriForDigest",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "digest",
-          "docs": Object {
-            "summary": "Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).",
+          "docs": {
+            "summary": "Image digest to use (tools usually default to the image with the "latest" tag if omitted).",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
       ],
       "usage": "public repositoryUriForDigest(digest?: string): string",
     },
-    Object {
+    {
       "displayName": "repositoryUriForTag",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "tag",
-          "docs": Object {
-            "summary": "Image tag to use (tools usually default to \\"latest\\" if omitted).",
+          "docs": {
+            "summary": "Image tag to use (tools usually default to "latest" if omitted).",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "string",
           },
         },
@@ -4330,8 +4330,8 @@ that captures the event. This method will not create the Trail.",
       "usage": "public repositoryUriForTag(tag?: string): string",
     },
   ],
-  "interfaces": Array [
-    Object {
+  "interfaces": [
+    {
       "displayName": "IResource",
       "fqn": "@aws-cdk/core.IResource",
       "id": "@aws-cdk/core.IResource",
@@ -4339,20 +4339,20 @@ that captures the event. This method will not create the Trail.",
       "packageVersion": "1.106.0",
     },
   ],
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "node",
-      "docs": Object {
+      "docs": {
         "summary": "The construct tree node for this construct.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.node",
       "id": "@aws-cdk/aws-ecr.IRepository.property.node",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ConstructNode",
             "fqn": "@aws-cdk/core.ConstructNode",
             "id": "@aws-cdk/core.ConstructNode",
@@ -4363,10 +4363,10 @@ that captures the event. This method will not create the Trail.",
       },
       "usage": "public readonly node: ConstructNode;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "env",
-      "docs": Object {
+      "docs": {
         "remarks": "For resources that are created and managed by the CDK
 (generally, those created by creating new class instances like Role, Bucket, etc.),
 this is always the same as the environment of the stack they belong to;
@@ -4378,10 +4378,10 @@ that might be different than the stack they were imported into.",
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.env",
       "id": "@aws-cdk/aws-ecr.IRepository.property.env",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ResourceEnvironment",
             "fqn": "@aws-cdk/core.ResourceEnvironment",
             "id": "@aws-cdk/core.ResourceEnvironment",
@@ -4392,19 +4392,19 @@ that might be different than the stack they were imported into.",
       },
       "usage": "public readonly env: ResourceEnvironment;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "stack",
-      "docs": Object {
+      "docs": {
         "summary": "The stack in which this resource is defined.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "id": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Stack",
             "fqn": "@aws-cdk/core.Stack",
             "id": "@aws-cdk/core.Stack",
@@ -4415,45 +4415,45 @@ that might be different than the stack they were imported into.",
       },
       "usage": "public readonly stack: Stack;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryArn",
-      "docs": Object {
+      "docs": {
         "summary": "The ARN of the repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public readonly repositoryArn: string;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryName",
-      "docs": Object {
+      "docs": {
         "summary": "The name of the repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public readonly repositoryName: string;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryUri",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY",
         "summary": "The URI of this repository (represents the latest image):.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public readonly repositoryUri: string;",
@@ -4463,32 +4463,32 @@ that might be different than the stack they were imported into.",
 `;
 
 exports[`typescript snapshot 2`] = `
-" IRepository <a name=\\"IRepository\\" id=\\"@aws-cdk/aws-ecr.IRepository\\"></a>
+" IRepository <a name="IRepository" id="@aws-cdk/aws-ecr.IRepository"></a>
 
 - *Extends:* @aws-cdk/core.IResource
 
-- *Implemented By:* <a href=\\"#@aws-cdk/aws-ecr.Repository\\">Repository</a>, <a href=\\"#@aws-cdk/aws-ecr.RepositoryBase\\">RepositoryBase</a>, <a href=\\"#@aws-cdk/aws-ecr.IRepository\\">IRepository</a>
+- *Implemented By:* <a href="#@aws-cdk/aws-ecr.Repository">Repository</a>, <a href="#@aws-cdk/aws-ecr.RepositoryBase">RepositoryBase</a>, <a href="#@aws-cdk/aws-ecr.IRepository">IRepository</a>
 
 Represents an ECR repository.
 
-# Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+# Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\">addToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grant\\">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPull\\">grantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPullPush\\">grantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\">onCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onEvent\\">onEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\">onImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\">repositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\">repositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy">addToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grant">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPull">grantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPullPush">grantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed">onCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onEvent">onEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted">onImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest">repositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag">repositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
 
 ---
 
-## \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\"></a>
+## \`addToResourcePolicy\` <a name="addToResourcePolicy" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy"></a>
 
 \`\`\`typescript
 public addToResourcePolicy(statement: PolicyStatement): AddToResourcePolicyResult
@@ -4496,13 +4496,13 @@ public addToResourcePolicy(statement: PolicyStatement): AddToResourcePolicyResul
 
 Add a policy statement to the repository's resource policy.
 
-### \`statement\`<sup>Required</sup> <a name=\\"statement\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement\\"></a>
+### \`statement\`<sup>Required</sup> <a name="statement" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement"></a>
 
 - *Type:* @aws-cdk/aws-iam.PolicyStatement
 
 ---
 
-## \`grant\` <a name=\\"grant\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant\\"></a>
+## \`grant\` <a name="grant" id="@aws-cdk/aws-ecr.IRepository.grant"></a>
 
 \`\`\`typescript
 public grant(grantee: IGrantable, actions: string): Grant
@@ -4510,19 +4510,19 @@ public grant(grantee: IGrantable, actions: string): Grant
 
 Grant the given principal identity permissions to perform the actions on this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-### \`actions\`<sup>Required</sup> <a name=\\"actions\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.actions\\"></a>
+### \`actions\`<sup>Required</sup> <a name="actions" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.actions"></a>
 
 - *Type:* string
 
 ---
 
-## \`grantPull\` <a name=\\"grantPull\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull\\"></a>
+## \`grantPull\` <a name="grantPull" id="@aws-cdk/aws-ecr.IRepository.grantPull"></a>
 
 \`\`\`typescript
 public grantPull(grantee: IGrantable): Grant
@@ -4530,13 +4530,13 @@ public grantPull(grantee: IGrantable): Grant
 
 Grant the given identity permissions to pull images in this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-## \`grantPullPush\` <a name=\\"grantPullPush\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush\\"></a>
+## \`grantPullPush\` <a name="grantPullPush" id="@aws-cdk/aws-ecr.IRepository.grantPullPush"></a>
 
 \`\`\`typescript
 public grantPullPush(grantee: IGrantable): Grant
@@ -4544,13 +4544,13 @@ public grantPullPush(grantee: IGrantable): Grant
 
 Grant the given identity permissions to pull and push images to this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-## \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\"></a>
+## \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent"></a>
 
 \`\`\`typescript
 public onCloudTrailEvent(id: string, options?: OnEventOptions): Rule
@@ -4561,7 +4561,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.id"></a>
 
 - *Type:* string
 
@@ -4569,7 +4569,7 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-events.OnEventOptions
 
@@ -4577,7 +4577,7 @@ Options for adding the rule.
 
 ---
 
-## \`onCloudTrailImagePushed\` <a name=\\"onCloudTrailImagePushed\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\"></a>
+## \`onCloudTrailImagePushed\` <a name="onCloudTrailImagePushed" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed"></a>
 
 \`\`\`typescript
 public onCloudTrailImagePushed(id: string, options?: OnCloudTrailImagePushedOptions): Rule
@@ -4588,7 +4588,7 @@ Defines an AWS CloudWatch event rule that can trigger a target when an image is
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.id"></a>
 
 - *Type:* string
 
@@ -4596,15 +4596,15 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions\\">OnCloudTrailImagePushedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions">OnCloudTrailImagePushedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`onEvent\` <a name=\\"onEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent\\"></a>
+## \`onEvent\` <a name="onEvent" id="@aws-cdk/aws-ecr.IRepository.onEvent"></a>
 
 \`\`\`typescript
 public onEvent(id: string, options?: OnEventOptions): Rule
@@ -4615,19 +4615,19 @@ Defines a CloudWatch event rule which triggers for repository events.
 Use
 \`rule.addEventPattern(pattern)\` to specify a filter.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.id"></a>
 
 - *Type:* string
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-events.OnEventOptions
 
 ---
 
-## \`onImageScanCompleted\` <a name=\\"onImageScanCompleted\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\"></a>
+## \`onImageScanCompleted\` <a name="onImageScanCompleted" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted"></a>
 
 \`\`\`typescript
 public onImageScanCompleted(id: string, options?: OnImageScanCompletedOptions): Rule
@@ -4635,7 +4635,7 @@ public onImageScanCompleted(id: string, options?: OnImageScanCompletedOptions):
 
 Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.
 
-### \`id\`<sup>Required</sup> <a name=\\"id\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id\\"></a>
+### \`id\`<sup>Required</sup> <a name="id" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.id"></a>
 
 - *Type:* string
 
@@ -4643,15 +4643,15 @@ The id of the rule.
 
 ---
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnImageScanCompletedOptions\\">OnImageScanCompletedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnImageScanCompletedOptions">OnImageScanCompletedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`repositoryUriForDigest\` <a name=\\"repositoryUriForDigest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\"></a>
+## \`repositoryUriForDigest\` <a name="repositoryUriForDigest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest"></a>
 
 \`\`\`typescript
 public repositoryUriForDigest(digest?: string): string
@@ -4661,15 +4661,15 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]
 
-### \`digest\`<sup>Optional</sup> <a name=\\"digest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest\\"></a>
+### \`digest\`<sup>Optional</sup> <a name="digest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest"></a>
 
 - *Type:* string
 
-Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).
+Image digest to use (tools usually default to the image with the "latest" tag if omitted).
 
 ---
 
-## \`repositoryUriForTag\` <a name=\\"repositoryUriForTag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\"></a>
+## \`repositoryUriForTag\` <a name="repositoryUriForTag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag"></a>
 
 \`\`\`typescript
 public repositoryUriForTag(tag?: string): string
@@ -4679,28 +4679,28 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]
 
-### \`tag\`<sup>Optional</sup> <a name=\\"tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag\\"></a>
+### \`tag\`<sup>Optional</sup> <a name="tag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag"></a>
 
 - *Type:* string
 
-Image tag to use (tools usually default to \\"latest\\" if omitted).
+Image tag to use (tools usually default to "latest" if omitted).
 
 ---
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.node\\">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node for this construct. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.env\\">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.stack\\">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\">repositoryArn</a></code> | <code>string</code> | The ARN of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryName\\">repositoryName</a></code> | <code>string</code> | The name of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\">repositoryUri</a></code> | <code>string</code> | The URI of this repository (represents the latest image):. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.node">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node for this construct. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.env">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.stack">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryArn">repositoryArn</a></code> | <code>string</code> | The ARN of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryName">repositoryName</a></code> | <code>string</code> | The name of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryUri">repositoryUri</a></code> | <code>string</code> | The URI of this repository (represents the latest image):. |
 
 ---
 
-## \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.node\\"></a>
+## \`node\`<sup>Required</sup> <a name="node" id="@aws-cdk/aws-ecr.IRepository.property.node"></a>
 
 \`\`\`typescript
 public readonly node: ConstructNode;
@@ -4712,7 +4712,7 @@ The construct tree node for this construct.
 
 ---
 
-## \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.env\\"></a>
+## \`env\`<sup>Required</sup> <a name="env" id="@aws-cdk/aws-ecr.IRepository.property.env"></a>
 
 \`\`\`typescript
 public readonly env: ResourceEnvironment;
@@ -4731,7 +4731,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-## \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.stack\\"></a>
+## \`stack\`<sup>Required</sup> <a name="stack" id="@aws-cdk/aws-ecr.IRepository.property.stack"></a>
 
 \`\`\`typescript
 public readonly stack: Stack;
@@ -4743,7 +4743,7 @@ The stack in which this resource is defined.
 
 ---
 
-## \`repositoryArn\`<sup>Required</sup> <a name=\\"repositoryArn\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\"></a>
+## \`repositoryArn\`<sup>Required</sup> <a name="repositoryArn" id="@aws-cdk/aws-ecr.IRepository.property.repositoryArn"></a>
 
 \`\`\`typescript
 public readonly repositoryArn: string;
@@ -4755,7 +4755,7 @@ The ARN of the repository.
 
 ---
 
-## \`repositoryName\`<sup>Required</sup> <a name=\\"repositoryName\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryName\\"></a>
+## \`repositoryName\`<sup>Required</sup> <a name="repositoryName" id="@aws-cdk/aws-ecr.IRepository.property.repositoryName"></a>
 
 \`\`\`typescript
 public readonly repositoryName: string;
@@ -4767,7 +4767,7 @@ The name of the repository.
 
 ---
 
-## \`repositoryUri\`<sup>Required</sup> <a name=\\"repositoryUri\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\"></a>
+## \`repositoryUri\`<sup>Required</sup> <a name="repositoryUri" id="@aws-cdk/aws-ecr.IRepository.property.repositoryUri"></a>
 
 \`\`\`typescript
 public readonly repositoryUri: string;
@@ -4784,29 +4784,29 @@ ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "displayName": "IRepository",
-  "docs": Object {
+  "docs": {
     "summary": "Represents an ECR repository.",
   },
   "fqn": "@aws-cdk/aws-ecr.IRepository",
   "id": "@aws-cdk/aws-ecr.IRepository",
-  "implementations": Array [
-    Object {
+  "implementations": [
+    {
       "displayName": "Repository",
       "fqn": "@aws-cdk/aws-ecr.Repository",
       "id": "@aws-cdk/aws-ecr.Repository",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "RepositoryBase",
       "fqn": "@aws-cdk/aws-ecr.RepositoryBase",
       "id": "@aws-cdk/aws-ecr.RepositoryBase",
       "packageName": "@aws-cdk/aws-ecr",
       "packageVersion": "1.106.0",
     },
-    Object {
+    {
       "displayName": "IRepository",
       "fqn": "@aws-cdk/aws-ecr.IRepository",
       "id": "@aws-cdk/aws-ecr.IRepository",
@@ -4814,26 +4814,26 @@ Object {
       "packageVersion": "1.106.0",
     },
   ],
-  "instanceMethods": Array [
-    Object {
+  "instanceMethods": [
+    {
       "displayName": "addToResourcePolicy",
-      "docs": Object {
+      "docs": {
         "summary": "Add a policy statement to the repository's resource policy.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
       "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "statement",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "id": "@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "PolicyStatement",
                 "fqn": "@aws-cdk/aws-iam.PolicyStatement",
                 "id": "@aws-cdk/aws-iam.PolicyStatement",
@@ -4846,25 +4846,25 @@ Object {
       ],
       "usage": "addToResourcePolicy(statement: PolicyStatement): AddToResourcePolicyResult",
     },
-    Object {
+    {
       "displayName": "grant",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given principal identity permissions to perform the actions on this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.grant",
       "id": "@aws-cdk/aws-ecr.IRepository.grant",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -4874,39 +4874,39 @@ Object {
             ],
           },
         },
-        Object {
+        {
           "default": undefined,
           "displayName": "actions",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "id": "@aws-cdk/aws-ecr.IRepository.grant.parameter.actions",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
       ],
       "usage": "grant(grantee: IGrantable, ...actions: Array<str>): Grant",
     },
-    Object {
+    {
       "displayName": "grantPull",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull images in this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.grantPull",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPull",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -4919,25 +4919,25 @@ Object {
       ],
       "usage": "grantPull(grantee: IGrantable): Grant",
     },
-    Object {
+    {
       "displayName": "grantPullPush",
-      "docs": Object {
+      "docs": {
         "summary": "Grant the given identity permissions to pull and push images to this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
       "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "grantee",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "id": "@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee",
           "optional": undefined,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "IGrantable",
                 "fqn": "@aws-cdk/aws-iam.IGrantable",
                 "id": "@aws-cdk/aws-iam.IGrantable",
@@ -4950,29 +4950,29 @@ Object {
       ],
       "usage": "grantPullPush(grantee: IGrantable): Grant",
     },
-    Object {
+    {
       "displayName": "onCloudTrailEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Define a CloudWatch event that triggers when something happens to this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "@aws-cdk/aws-events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -4985,29 +4985,29 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "onCloudTrailEvent(options?: OnEventOptions): Rule",
     },
-    Object {
+    {
       "displayName": "onCloudTrailImagePushed",
-      "docs": Object {
+      "docs": {
         "remarks": "Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.",
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
       "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnCloudTrailImagePushedOptions",
                 "fqn": "@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions",
                 "id": "@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions",
@@ -5020,27 +5020,27 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "onCloudTrailImagePushed(options?: OnCloudTrailImagePushedOptions): Rule",
     },
-    Object {
+    {
       "displayName": "onEvent",
-      "docs": Object {
+      "docs": {
         "remarks": "Use
 \`rule.addEventPattern(pattern)\` to specify a filter.",
         "summary": "Defines a CloudWatch event rule which triggers for repository events.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onEvent",
       "id": "@aws-cdk/aws-ecr.IRepository.onEvent",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {},
+          "docs": {},
           "fqn": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnEventOptions",
                 "fqn": "@aws-cdk/aws-events.OnEventOptions",
                 "id": "@aws-cdk/aws-events.OnEventOptions",
@@ -5053,27 +5053,27 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "onEvent(options?: OnEventOptions): Rule",
     },
-    Object {
+    {
       "displayName": "onImageScanCompleted",
-      "docs": Object {
+      "docs": {
         "summary": "Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
       "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "options",
-          "docs": Object {
+          "docs": {
             "summary": "Options for adding the rule.",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options",
           "id": "@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "OnImageScanCompletedOptions",
                 "fqn": "@aws-cdk/aws-ecr.OnImageScanCompletedOptions",
                 "id": "@aws-cdk/aws-ecr.OnImageScanCompletedOptions",
@@ -5086,50 +5086,50 @@ that captures the event. This method will not create the Trail.",
       ],
       "usage": "onImageScanCompleted(options?: OnImageScanCompletedOptions): Rule",
     },
-    Object {
+    {
       "displayName": "repositoryUriForDigest",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "digest",
-          "docs": Object {
-            "summary": "Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).",
+          "docs": {
+            "summary": "Image digest to use (tools usually default to the image with the "latest" tag if omitted).",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
       ],
       "usage": "repositoryUriForDigest(digest?: str): str",
     },
-    Object {
+    {
       "displayName": "repositoryUriForTag",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]",
         "summary": "Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
       "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag",
-      "parameters": Array [
-        Object {
+      "parameters": [
+        {
           "default": undefined,
           "displayName": "tag",
-          "docs": Object {
-            "summary": "Image tag to use (tools usually default to \\"latest\\" if omitted).",
+          "docs": {
+            "summary": "Image tag to use (tools usually default to "latest" if omitted).",
           },
           "fqn": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "id": "@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag",
           "optional": true,
-          "type": Object {
+          "type": {
             "formattingPattern": "str",
           },
         },
@@ -5137,8 +5137,8 @@ that captures the event. This method will not create the Trail.",
       "usage": "repositoryUriForTag(tag?: str): str",
     },
   ],
-  "interfaces": Array [
-    Object {
+  "interfaces": [
+    {
       "displayName": "IResource",
       "fqn": "@aws-cdk/core.IResource",
       "id": "@aws-cdk/core.IResource",
@@ -5146,20 +5146,20 @@ that captures the event. This method will not create the Trail.",
       "packageVersion": "1.106.0",
     },
   ],
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "node",
-      "docs": Object {
+      "docs": {
         "summary": "The construct tree node for this construct.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.node",
       "id": "@aws-cdk/aws-ecr.IRepository.property.node",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ConstructNode",
             "fqn": "@aws-cdk/core.ConstructNode",
             "id": "@aws-cdk/core.ConstructNode",
@@ -5170,10 +5170,10 @@ that captures the event. This method will not create the Trail.",
       },
       "usage": "node: ConstructNode;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "env",
-      "docs": Object {
+      "docs": {
         "remarks": "For resources that are created and managed by the CDK
 (generally, those created by creating new class instances like Role, Bucket, etc.),
 this is always the same as the environment of the stack they belong to;
@@ -5185,10 +5185,10 @@ that might be different than the stack they were imported into.",
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.env",
       "id": "@aws-cdk/aws-ecr.IRepository.property.env",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "ResourceEnvironment",
             "fqn": "@aws-cdk/core.ResourceEnvironment",
             "id": "@aws-cdk/core.ResourceEnvironment",
@@ -5199,19 +5199,19 @@ that might be different than the stack they were imported into.",
       },
       "usage": "env: ResourceEnvironment;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "stack",
-      "docs": Object {
+      "docs": {
         "summary": "The stack in which this resource is defined.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "id": "@aws-cdk/aws-ecr.IRepository.property.stack",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "Stack",
             "fqn": "@aws-cdk/core.Stack",
             "id": "@aws-cdk/core.Stack",
@@ -5222,45 +5222,45 @@ that might be different than the stack they were imported into.",
       },
       "usage": "stack: Stack;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryArn",
-      "docs": Object {
+      "docs": {
         "summary": "The ARN of the repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryArn",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repositoryArn: str;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryName",
-      "docs": Object {
+      "docs": {
         "summary": "The name of the repository.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryName",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repositoryName: str;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryUri",
-      "docs": Object {
+      "docs": {
         "remarks": "ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY",
         "summary": "The URI of this repository (represents the latest image):.",
       },
       "fqn": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "id": "@aws-cdk/aws-ecr.IRepository.property.repositoryUri",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repositoryUri: str;",
@@ -5270,32 +5270,32 @@ that might be different than the stack they were imported into.",
 `;
 
 exports[`wing snapshot 2`] = `
-" IRepository <a name=\\"IRepository\\" id=\\"@aws-cdk/aws-ecr.IRepository\\"></a>
+" IRepository <a name="IRepository" id="@aws-cdk/aws-ecr.IRepository"></a>
 
 - *Extends:* @aws-cdk/core.IResource
 
-- *Implemented By:* <a href=\\"#@aws-cdk/aws-ecr.Repository\\">Repository</a>, <a href=\\"#@aws-cdk/aws-ecr.RepositoryBase\\">RepositoryBase</a>, <a href=\\"#@aws-cdk/aws-ecr.IRepository\\">IRepository</a>
+- *Implemented By:* <a href="#@aws-cdk/aws-ecr.Repository">Repository</a>, <a href="#@aws-cdk/aws-ecr.RepositoryBase">RepositoryBase</a>, <a href="#@aws-cdk/aws-ecr.IRepository">IRepository</a>
 
 Represents an ECR repository.
 
-# Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+# Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\">addToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grant\\">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPull\\">grantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.grantPullPush\\">grantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\">onCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onEvent\\">onEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\">onImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\">repositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\">repositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.addToResourcePolicy">addToResourcePolicy</a></code> | Add a policy statement to the repository's resource policy. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grant">grant</a></code> | Grant the given principal identity permissions to perform the actions on this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPull">grantPull</a></code> | Grant the given identity permissions to pull images in this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.grantPullPush">grantPullPush</a></code> | Grant the given identity permissions to pull and push images to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed">onCloudTrailImagePushed</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when an image is pushed to this repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onEvent">onEvent</a></code> | Defines a CloudWatch event rule which triggers for repository events. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.onImageScanCompleted">onImageScanCompleted</a></code> | Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest">repositoryUriForDigest</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.repositoryUriForTag">repositoryUriForTag</a></code> | Returns the URI of the repository for a certain tag. Can be used in \`docker push/pull\`. |
 
 ---
 
-## \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy\\"></a>
+## \`addToResourcePolicy\` <a name="addToResourcePolicy" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy"></a>
 
 \`\`\`wing
 addToResourcePolicy(statement: PolicyStatement): AddToResourcePolicyResult
@@ -5303,13 +5303,13 @@ addToResourcePolicy(statement: PolicyStatement): AddToResourcePolicyResult
 
 Add a policy statement to the repository's resource policy.
 
-### \`statement\`<sup>Required</sup> <a name=\\"statement\\" id=\\"@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement\\"></a>
+### \`statement\`<sup>Required</sup> <a name="statement" id="@aws-cdk/aws-ecr.IRepository.addToResourcePolicy.parameter.statement"></a>
 
 - *Type:* @aws-cdk/aws-iam.PolicyStatement
 
 ---
 
-## \`grant\` <a name=\\"grant\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant\\"></a>
+## \`grant\` <a name="grant" id="@aws-cdk/aws-ecr.IRepository.grant"></a>
 
 \`\`\`wing
 grant(grantee: IGrantable, ...actions: Array<str>): Grant
@@ -5317,19 +5317,19 @@ grant(grantee: IGrantable, ...actions: Array<str>): Grant
 
 Grant the given principal identity permissions to perform the actions on this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-### \`actions\`<sup>Required</sup> <a name=\\"actions\\" id=\\"@aws-cdk/aws-ecr.IRepository.grant.parameter.actions\\"></a>
+### \`actions\`<sup>Required</sup> <a name="actions" id="@aws-cdk/aws-ecr.IRepository.grant.parameter.actions"></a>
 
 - *Type:* str
 
 ---
 
-## \`grantPull\` <a name=\\"grantPull\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull\\"></a>
+## \`grantPull\` <a name="grantPull" id="@aws-cdk/aws-ecr.IRepository.grantPull"></a>
 
 \`\`\`wing
 grantPull(grantee: IGrantable): Grant
@@ -5337,13 +5337,13 @@ grantPull(grantee: IGrantable): Grant
 
 Grant the given identity permissions to pull images in this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPull.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-## \`grantPullPush\` <a name=\\"grantPullPush\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush\\"></a>
+## \`grantPullPush\` <a name="grantPullPush" id="@aws-cdk/aws-ecr.IRepository.grantPullPush"></a>
 
 \`\`\`wing
 grantPullPush(grantee: IGrantable): Grant
@@ -5351,13 +5351,13 @@ grantPullPush(grantee: IGrantable): Grant
 
 Grant the given identity permissions to pull and push images to this repository.
 
-### \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee\\"></a>
+### \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.IRepository.grantPullPush.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
 ---
 
-## \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent\\"></a>
+## \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent"></a>
 
 \`\`\`wing
 onCloudTrailEvent(options?: OnEventOptions): Rule
@@ -5368,7 +5368,7 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-events.OnEventOptions
 
@@ -5376,7 +5376,7 @@ Options for adding the rule.
 
 ---
 
-## \`onCloudTrailImagePushed\` <a name=\\"onCloudTrailImagePushed\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed\\"></a>
+## \`onCloudTrailImagePushed\` <a name="onCloudTrailImagePushed" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed"></a>
 
 \`\`\`wing
 onCloudTrailImagePushed(options?: OnCloudTrailImagePushedOptions): Rule
@@ -5387,15 +5387,15 @@ Defines an AWS CloudWatch event rule that can trigger a target when an image is
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onCloudTrailImagePushed.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions\\">OnCloudTrailImagePushedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnCloudTrailImagePushedOptions">OnCloudTrailImagePushedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`onEvent\` <a name=\\"onEvent\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent\\"></a>
+## \`onEvent\` <a name="onEvent" id="@aws-cdk/aws-ecr.IRepository.onEvent"></a>
 
 \`\`\`wing
 onEvent(options?: OnEventOptions): Rule
@@ -5406,13 +5406,13 @@ Defines a CloudWatch event rule which triggers for repository events.
 Use
 \`rule.addEventPattern(pattern)\` to specify a filter.
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onEvent.parameter.options"></a>
 
 - *Type:* @aws-cdk/aws-events.OnEventOptions
 
 ---
 
-## \`onImageScanCompleted\` <a name=\\"onImageScanCompleted\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted\\"></a>
+## \`onImageScanCompleted\` <a name="onImageScanCompleted" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted"></a>
 
 \`\`\`wing
 onImageScanCompleted(options?: OnImageScanCompletedOptions): Rule
@@ -5420,15 +5420,15 @@ onImageScanCompleted(options?: OnImageScanCompletedOptions): Rule
 
 Defines an AWS CloudWatch event rule that can trigger a target when the image scan is completed.
 
-### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options\\"></a>
+### \`options\`<sup>Optional</sup> <a name="options" id="@aws-cdk/aws-ecr.IRepository.onImageScanCompleted.parameter.options"></a>
 
-- *Type:* <a href=\\"#@aws-cdk/aws-ecr.OnImageScanCompletedOptions\\">OnImageScanCompletedOptions</a>
+- *Type:* <a href="#@aws-cdk/aws-ecr.OnImageScanCompletedOptions">OnImageScanCompletedOptions</a>
 
 Options for adding the rule.
 
 ---
 
-## \`repositoryUriForDigest\` <a name=\\"repositoryUriForDigest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest\\"></a>
+## \`repositoryUriForDigest\` <a name="repositoryUriForDigest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest"></a>
 
 \`\`\`wing
 repositoryUriForDigest(digest?: str): str
@@ -5438,15 +5438,15 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[@DIGEST]
 
-### \`digest\`<sup>Optional</sup> <a name=\\"digest\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest\\"></a>
+### \`digest\`<sup>Optional</sup> <a name="digest" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForDigest.parameter.digest"></a>
 
 - *Type:* str
 
-Image digest to use (tools usually default to the image with the \\"latest\\" tag if omitted).
+Image digest to use (tools usually default to the image with the "latest" tag if omitted).
 
 ---
 
-## \`repositoryUriForTag\` <a name=\\"repositoryUriForTag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag\\"></a>
+## \`repositoryUriForTag\` <a name="repositoryUriForTag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag"></a>
 
 \`\`\`wing
 repositoryUriForTag(tag?: str): str
@@ -5456,28 +5456,28 @@ Returns the URI of the repository for a certain tag. Can be used in \`docker pus
 
 ACCOUNT.dkr.ecr.REGION.amazonaws.com/REPOSITORY[:TAG]
 
-### \`tag\`<sup>Optional</sup> <a name=\\"tag\\" id=\\"@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag\\"></a>
+### \`tag\`<sup>Optional</sup> <a name="tag" id="@aws-cdk/aws-ecr.IRepository.repositoryUriForTag.parameter.tag"></a>
 
 - *Type:* str
 
-Image tag to use (tools usually default to \\"latest\\" if omitted).
+Image tag to use (tools usually default to "latest" if omitted).
 
 ---
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.node\\">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node for this construct. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.env\\">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.stack\\">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\">repositoryArn</a></code> | <code>str</code> | The ARN of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryName\\">repositoryName</a></code> | <code>str</code> | The name of the repository. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\">repositoryUri</a></code> | <code>str</code> | The URI of this repository (represents the latest image):. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.node">node</a></code> | <code>@aws-cdk/core.ConstructNode</code> | The construct tree node for this construct. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.env">env</a></code> | <code>@aws-cdk/core.ResourceEnvironment</code> | The environment this resource belongs to. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.stack">stack</a></code> | <code>@aws-cdk/core.Stack</code> | The stack in which this resource is defined. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryArn">repositoryArn</a></code> | <code>str</code> | The ARN of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryName">repositoryName</a></code> | <code>str</code> | The name of the repository. |
+| <code><a href="#@aws-cdk/aws-ecr.IRepository.property.repositoryUri">repositoryUri</a></code> | <code>str</code> | The URI of this repository (represents the latest image):. |
 
 ---
 
-## \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.node\\"></a>
+## \`node\`<sup>Required</sup> <a name="node" id="@aws-cdk/aws-ecr.IRepository.property.node"></a>
 
 \`\`\`wing
 node: ConstructNode;
@@ -5489,7 +5489,7 @@ The construct tree node for this construct.
 
 ---
 
-## \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.env\\"></a>
+## \`env\`<sup>Required</sup> <a name="env" id="@aws-cdk/aws-ecr.IRepository.property.env"></a>
 
 \`\`\`wing
 env: ResourceEnvironment;
@@ -5508,7 +5508,7 @@ that might be different than the stack they were imported into.
 
 ---
 
-## \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.stack\\"></a>
+## \`stack\`<sup>Required</sup> <a name="stack" id="@aws-cdk/aws-ecr.IRepository.property.stack"></a>
 
 \`\`\`wing
 stack: Stack;
@@ -5520,7 +5520,7 @@ The stack in which this resource is defined.
 
 ---
 
-## \`repositoryArn\`<sup>Required</sup> <a name=\\"repositoryArn\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryArn\\"></a>
+## \`repositoryArn\`<sup>Required</sup> <a name="repositoryArn" id="@aws-cdk/aws-ecr.IRepository.property.repositoryArn"></a>
 
 \`\`\`wing
 repositoryArn: str;
@@ -5532,7 +5532,7 @@ The ARN of the repository.
 
 ---
 
-## \`repositoryName\`<sup>Required</sup> <a name=\\"repositoryName\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryName\\"></a>
+## \`repositoryName\`<sup>Required</sup> <a name="repositoryName" id="@aws-cdk/aws-ecr.IRepository.property.repositoryName"></a>
 
 \`\`\`wing
 repositoryName: str;
@@ -5544,7 +5544,7 @@ The name of the repository.
 
 ---
 
-## \`repositoryUri\`<sup>Required</sup> <a name=\\"repositoryUri\\" id=\\"@aws-cdk/aws-ecr.IRepository.property.repositoryUri\\"></a>
+## \`repositoryUri\`<sup>Required</sup> <a name="repositoryUri" id="@aws-cdk/aws-ecr.IRepository.property.repositoryUri"></a>
 
 \`\`\`wing
 repositoryUri: str;
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/markdown.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/markdown.test.ts.snap
index 6721cd97140..297ab7d54c1 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/markdown.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/markdown.test.ts.snap
@@ -1,69 +1,69 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`complex link formatter wing snapshot 1`] = `
+exports[`complex link formatter > wing snapshot 1`] = `
 "# construct-library
 
 This is a test project to make sure the \`jsii-docgen\` cli property renders API documentation
 for construct libraries.
-# API Reference <a name=\\"API Reference\\" id=\\"api-reference\\"></a>
+# API Reference <a name="API Reference" id="api-reference"></a>
 
-## Resources <a name=\\"Resources\\" id=\\"Resources\\"></a>
+## Resources <a name="Resources" id="Resources"></a>
 
-### GreeterBucket <a name=\\"GreeterBucket\\" id=\\"GreeterBucket\\"></a>
+### GreeterBucket <a name="GreeterBucket" id="GreeterBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"GreeterBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="GreeterBucket.Initializer"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 new GreeterBucket(props?: BucketProps);
 \`\`\`
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.Initializer.parameter.props?lang=python\\">props</a></code> | <code><a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketProps?lang=python\\">BucketProps</a></code> | *No description.* |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.Initializer.parameter.props?lang=python">props</a></code> | <code><a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketProps?lang=python">BucketProps</a></code> | *No description.* |
 
 ---
 
-##### \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"GreeterBucket.Initializer.parameter.props\\"></a>
+##### \`props\`<sup>Optional</sup> <a name="props" id="GreeterBucket.Initializer.parameter.props"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketProps?lang=python\\">BucketProps</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketProps?lang=python">BucketProps</a>
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.applyRemovalPolicy?lang=python\\">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addEventNotification?lang=python\\">addEventNotification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addObjectCreatedNotification?lang=python\\">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addObjectRemovedNotification?lang=python\\">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addToResourcePolicy?lang=python\\">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.arnForObjects?lang=python\\">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.grantDelete?lang=python\\">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.grantPublicAccess?lang=python\\">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.grantPut?lang=python\\">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.grantPutAcl?lang=python\\">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.grantRead?lang=python\\">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.grantReadWrite?lang=python\\">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.grantWrite?lang=python\\">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.onCloudTrailEvent?lang=python\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.onCloudTrailPutObject?lang=python\\">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.onCloudTrailWriteObject?lang=python\\">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.s3UrlForObject?lang=python\\">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.transferAccelerationUrlForObject?lang=python\\">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.urlForObject?lang=python\\">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.virtualHostedUrlForObject?lang=python\\">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addCorsRule?lang=python\\">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addInventory?lang=python\\">addInventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addLifecycleRule?lang=python\\">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.addMetric?lang=python\\">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.greet?lang=python\\">greet</a></code> | *No description.* |
-
----
-
-##### \`applyRemovalPolicy\` <a name=\\"applyRemovalPolicy\\" id=\\"GreeterBucket.applyRemovalPolicy\\"></a>
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.applyRemovalPolicy?lang=python">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addEventNotification?lang=python">addEventNotification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addObjectCreatedNotification?lang=python">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addObjectRemovedNotification?lang=python">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addToResourcePolicy?lang=python">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.arnForObjects?lang=python">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.grantDelete?lang=python">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.grantPublicAccess?lang=python">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.grantPut?lang=python">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.grantPutAcl?lang=python">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.grantRead?lang=python">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.grantReadWrite?lang=python">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.grantWrite?lang=python">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.onCloudTrailEvent?lang=python">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.onCloudTrailPutObject?lang=python">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.onCloudTrailWriteObject?lang=python">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.s3UrlForObject?lang=python">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.transferAccelerationUrlForObject?lang=python">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.urlForObject?lang=python">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.virtualHostedUrlForObject?lang=python">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addCorsRule?lang=python">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addInventory?lang=python">addInventory</a></code> | Add an inventory configuration. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addLifecycleRule?lang=python">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.addMetric?lang=python">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.greet?lang=python">greet</a></code> | *No description.* |
+
+---
+
+##### \`applyRemovalPolicy\` <a name="applyRemovalPolicy" id="GreeterBucket.applyRemovalPolicy"></a>
 
 \`\`\`wing
 applyRemovalPolicy(policy: RemovalPolicy): void
@@ -79,13 +79,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"GreeterBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="GreeterBucket.applyRemovalPolicy.parameter.policy"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/RemovalPolicy?lang=python\\">RemovalPolicy</a>
+- *Type:* <a href="/packages/@aws-cdk/core/v/99.99.99/api/RemovalPolicy?lang=python">RemovalPolicy</a>
 
 ---
 
-##### \`addEventNotification\` <a name=\\"addEventNotification\\" id=\\"GreeterBucket.addEventNotification\\"></a>
+##### \`addEventNotification\` <a name="addEventNotification" id="GreeterBucket.addEventNotification"></a>
 
 \`\`\`wing
 addEventNotification(event: EventType, dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -104,25 +104,25 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"GreeterBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="GreeterBucket.addEventNotification.parameter.event"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/EventType?lang=python\\">EventType</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/EventType?lang=python">EventType</a>
 
 The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"GreeterBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="GreeterBucket.addEventNotification.parameter.dest"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/IBucketNotificationDestination?lang=python\\">IBucketNotificationDestination</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/IBucketNotificationDestination?lang=python">IBucketNotificationDestination</a>
 
 The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"GreeterBucket.addEventNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="GreeterBucket.addEventNotification.parameter.filters"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/NotificationKeyFilter?lang=python\\">NotificationKeyFilter</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/NotificationKeyFilter?lang=python">NotificationKeyFilter</a>
 
 S3 object key filter rules to determine which objects trigger this event.
 
@@ -132,7 +132,7 @@ for details about allowed filter rules.
 
 ---
 
-##### \`addObjectCreatedNotification\` <a name=\\"addObjectCreatedNotification\\" id=\\"GreeterBucket.addObjectCreatedNotification\\"></a>
+##### \`addObjectCreatedNotification\` <a name="addObjectCreatedNotification" id="GreeterBucket.addObjectCreatedNotification"></a>
 
 \`\`\`wing
 addObjectCreatedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -143,23 +143,23 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"GreeterBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="GreeterBucket.addObjectCreatedNotification.parameter.dest"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/IBucketNotificationDestination?lang=python\\">IBucketNotificationDestination</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/IBucketNotificationDestination?lang=python">IBucketNotificationDestination</a>
 
 The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"GreeterBucket.addObjectCreatedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="GreeterBucket.addObjectCreatedNotification.parameter.filters"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/NotificationKeyFilter?lang=python\\">NotificationKeyFilter</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/NotificationKeyFilter?lang=python">NotificationKeyFilter</a>
 
 Filters (see onEvent).
 
 ---
 
-##### \`addObjectRemovedNotification\` <a name=\\"addObjectRemovedNotification\\" id=\\"GreeterBucket.addObjectRemovedNotification\\"></a>
+##### \`addObjectRemovedNotification\` <a name="addObjectRemovedNotification" id="GreeterBucket.addObjectRemovedNotification"></a>
 
 \`\`\`wing
 addObjectRemovedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -170,23 +170,23 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"GreeterBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="GreeterBucket.addObjectRemovedNotification.parameter.dest"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/IBucketNotificationDestination?lang=python\\">IBucketNotificationDestination</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/IBucketNotificationDestination?lang=python">IBucketNotificationDestination</a>
 
 The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"GreeterBucket.addObjectRemovedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="GreeterBucket.addObjectRemovedNotification.parameter.filters"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/NotificationKeyFilter?lang=python\\">NotificationKeyFilter</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/NotificationKeyFilter?lang=python">NotificationKeyFilter</a>
 
 Filters (see onEvent).
 
 ---
 
-##### \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"GreeterBucket.addToResourcePolicy\\"></a>
+##### \`addToResourcePolicy\` <a name="addToResourcePolicy" id="GreeterBucket.addToResourcePolicy"></a>
 
 \`\`\`wing
 addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult
@@ -200,15 +200,15 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"GreeterBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="GreeterBucket.addToResourcePolicy.parameter.permission"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-iam/v/99.99.99/api/PolicyStatement?lang=python\\">PolicyStatement</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-iam/v/99.99.99/api/PolicyStatement?lang=python">PolicyStatement</a>
 
 the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arnForObjects\` <a name=\\"arnForObjects\\" id=\\"GreeterBucket.arnForObjects\\"></a>
+##### \`arnForObjects\` <a name="arnForObjects" id="GreeterBucket.arnForObjects"></a>
 
 \`\`\`wing
 arnForObjects(keyPattern: str): str
@@ -216,19 +216,19 @@ arnForObjects(keyPattern: str): str
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`keyPattern\`<sup>Required</sup> <a name=\\"keyPattern\\" id=\\"GreeterBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`keyPattern\`<sup>Required</sup> <a name="keyPattern" id="GreeterBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grantDelete\` <a name=\\"grantDelete\\" id=\\"GreeterBucket.grantDelete\\"></a>
+##### \`grantDelete\` <a name="grantDelete" id="GreeterBucket.grantDelete"></a>
 
 \`\`\`wing
 grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -236,15 +236,15 @@ grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"GreeterBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="GreeterBucket.grantDelete.parameter.identity"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python\\">IGrantable</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python">IGrantable</a>
 
 The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"GreeterBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="GreeterBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -252,7 +252,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPublicAccess\` <a name=\\"grantPublicAccess\\" id=\\"GreeterBucket.grantPublicAccess\\"></a>
+##### \`grantPublicAccess\` <a name="grantPublicAccess" id="GreeterBucket.grantPublicAccess"></a>
 
 \`\`\`wing
 grantPublicAccess(...allowedActions: Array<str>, keyPrefix?: str): Grant
@@ -265,8 +265,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -279,25 +279,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowedActions\`<sup>Required</sup> <a name=\\"allowedActions\\" id=\\"GreeterBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowedActions\`<sup>Required</sup> <a name="allowedActions" id="GreeterBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* str
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`keyPrefix\`<sup>Optional</sup> <a name=\\"keyPrefix\\" id=\\"GreeterBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`keyPrefix\`<sup>Optional</sup> <a name="keyPrefix" id="GreeterBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* str
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grantPut\` <a name=\\"grantPut\\" id=\\"GreeterBucket.grantPut\\"></a>
+##### \`grantPut\` <a name="grantPut" id="GreeterBucket.grantPut"></a>
 
 \`\`\`wing
 grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -308,15 +308,15 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"GreeterBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="GreeterBucket.grantPut.parameter.identity"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python\\">IGrantable</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python">IGrantable</a>
 
 The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"GreeterBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="GreeterBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -324,7 +324,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPutAcl\` <a name=\\"grantPutAcl\\" id=\\"GreeterBucket.grantPutAcl\\"></a>
+##### \`grantPutAcl\` <a name="grantPutAcl" id="GreeterBucket.grantPutAcl"></a>
 
 \`\`\`wing
 grantPutAcl(identity: IGrantable, objectsKeyPattern?: str): Grant
@@ -336,19 +336,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"GreeterBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="GreeterBucket.grantPutAcl.parameter.identity"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python\\">IGrantable</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python">IGrantable</a>
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"GreeterBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="GreeterBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grantRead\` <a name=\\"grantRead\\" id=\\"GreeterBucket.grantRead\\"></a>
+##### \`grantRead\` <a name="grantRead" id="GreeterBucket.grantRead"></a>
 
 \`\`\`wing
 grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -359,15 +359,15 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"GreeterBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="GreeterBucket.grantRead.parameter.identity"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python\\">IGrantable</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python">IGrantable</a>
 
 The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"GreeterBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="GreeterBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -375,7 +375,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantReadWrite\` <a name=\\"grantReadWrite\\" id=\\"GreeterBucket.grantReadWrite\\"></a>
+##### \`grantReadWrite\` <a name="grantReadWrite" id="GreeterBucket.grantReadWrite"></a>
 
 \`\`\`wing
 grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -394,19 +394,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"GreeterBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="GreeterBucket.grantReadWrite.parameter.identity"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python\\">IGrantable</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python">IGrantable</a>
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"GreeterBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="GreeterBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`grantWrite\` <a name=\\"grantWrite\\" id=\\"GreeterBucket.grantWrite\\"></a>
+##### \`grantWrite\` <a name="grantWrite" id="GreeterBucket.grantWrite"></a>
 
 \`\`\`wing
 grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -425,19 +425,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"GreeterBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="GreeterBucket.grantWrite.parameter.identity"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python\\">IGrantable</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-iam/v/99.99.99/api/IGrantable?lang=python">IGrantable</a>
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"GreeterBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="GreeterBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"GreeterBucket.onCloudTrailEvent\\"></a>
+##### \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="GreeterBucket.onCloudTrailEvent"></a>
 
 \`\`\`wing
 onCloudTrailEvent(options?: OnCloudTrailBucketEventOptions): Rule
@@ -448,15 +448,15 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"GreeterBucket.onCloudTrailEvent.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="GreeterBucket.onCloudTrailEvent.parameter.options"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/OnCloudTrailBucketEventOptions?lang=python\\">OnCloudTrailBucketEventOptions</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/OnCloudTrailBucketEventOptions?lang=python">OnCloudTrailBucketEventOptions</a>
 
 Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailPutObject\` <a name=\\"onCloudTrailPutObject\\" id=\\"GreeterBucket.onCloudTrailPutObject\\"></a>
+##### \`onCloudTrailPutObject\` <a name="onCloudTrailPutObject" id="GreeterBucket.onCloudTrailPutObject"></a>
 
 \`\`\`wing
 onCloudTrailPutObject(options?: OnCloudTrailBucketEventOptions): Rule
@@ -471,15 +471,15 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"GreeterBucket.onCloudTrailPutObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="GreeterBucket.onCloudTrailPutObject.parameter.options"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/OnCloudTrailBucketEventOptions?lang=python\\">OnCloudTrailBucketEventOptions</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/OnCloudTrailBucketEventOptions?lang=python">OnCloudTrailBucketEventOptions</a>
 
 Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailWriteObject\` <a name=\\"onCloudTrailWriteObject\\" id=\\"GreeterBucket.onCloudTrailWriteObject\\"></a>
+##### \`onCloudTrailWriteObject\` <a name="onCloudTrailWriteObject" id="GreeterBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`wing
 onCloudTrailWriteObject(options?: OnCloudTrailBucketEventOptions): Rule
@@ -497,15 +497,15 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"GreeterBucket.onCloudTrailWriteObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="GreeterBucket.onCloudTrailWriteObject.parameter.options"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/OnCloudTrailBucketEventOptions?lang=python\\">OnCloudTrailBucketEventOptions</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/OnCloudTrailBucketEventOptions?lang=python">OnCloudTrailBucketEventOptions</a>
 
 Options for adding the rule.
 
 ---
 
-##### \`s3UrlForObject\` <a name=\\"s3UrlForObject\\" id=\\"GreeterBucket.s3UrlForObject\\"></a>
+##### \`s3UrlForObject\` <a name="s3UrlForObject" id="GreeterBucket.s3UrlForObject"></a>
 
 \`\`\`wing
 s3UrlForObject(key?: str): str
@@ -516,7 +516,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"GreeterBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="GreeterBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -527,7 +527,7 @@ bucket is returned.
 
 ---
 
-##### \`transferAccelerationUrlForObject\` <a name=\\"transferAccelerationUrlForObject\\" id=\\"GreeterBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transferAccelerationUrlForObject\` <a name="transferAccelerationUrlForObject" id="GreeterBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`wing
 transferAccelerationUrlForObject(key?: str, options?: TransferAccelerationUrlOptions): str
@@ -541,7 +541,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"GreeterBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="GreeterBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -552,15 +552,15 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"GreeterBucket.transferAccelerationUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="GreeterBucket.transferAccelerationUrlForObject.parameter.options"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/TransferAccelerationUrlOptions?lang=python\\">TransferAccelerationUrlOptions</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/TransferAccelerationUrlOptions?lang=python">TransferAccelerationUrlOptions</a>
 
 Options for generating URL.
 
 ---
 
-##### \`urlForObject\` <a name=\\"urlForObject\\" id=\\"GreeterBucket.urlForObject\\"></a>
+##### \`urlForObject\` <a name="urlForObject" id="GreeterBucket.urlForObject"></a>
 
 \`\`\`wing
 urlForObject(key?: str): str
@@ -572,7 +572,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"GreeterBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="GreeterBucket.urlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -583,7 +583,7 @@ bucket is returned.
 
 ---
 
-##### \`virtualHostedUrlForObject\` <a name=\\"virtualHostedUrlForObject\\" id=\\"GreeterBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtualHostedUrlForObject\` <a name="virtualHostedUrlForObject" id="GreeterBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`wing
 virtualHostedUrlForObject(key?: str, options?: VirtualHostedStyleUrlOptions): str
@@ -596,7 +596,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"GreeterBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="GreeterBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -607,15 +607,15 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"GreeterBucket.virtualHostedUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="GreeterBucket.virtualHostedUrlForObject.parameter.options"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/VirtualHostedStyleUrlOptions?lang=python\\">VirtualHostedStyleUrlOptions</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/VirtualHostedStyleUrlOptions?lang=python">VirtualHostedStyleUrlOptions</a>
 
 Options for generating URL.
 
 ---
 
-##### \`addCorsRule\` <a name=\\"addCorsRule\\" id=\\"GreeterBucket.addCorsRule\\"></a>
+##### \`addCorsRule\` <a name="addCorsRule" id="GreeterBucket.addCorsRule"></a>
 
 \`\`\`wing
 addCorsRule(rule: CorsRule): void
@@ -623,15 +623,15 @@ addCorsRule(rule: CorsRule): void
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"GreeterBucket.addCorsRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="GreeterBucket.addCorsRule.parameter.rule"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/CorsRule?lang=python\\">CorsRule</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/CorsRule?lang=python">CorsRule</a>
 
 The CORS configuration rule to add.
 
 ---
 
-##### \`addInventory\` <a name=\\"addInventory\\" id=\\"GreeterBucket.addInventory\\"></a>
+##### \`addInventory\` <a name="addInventory" id="GreeterBucket.addInventory"></a>
 
 \`\`\`wing
 addInventory(inventory: Inventory): void
@@ -639,15 +639,15 @@ addInventory(inventory: Inventory): void
 
 Add an inventory configuration.
 
-###### \`inventory\`<sup>Required</sup> <a name=\\"inventory\\" id=\\"GreeterBucket.addInventory.parameter.inventory\\"></a>
+###### \`inventory\`<sup>Required</sup> <a name="inventory" id="GreeterBucket.addInventory.parameter.inventory"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/Inventory?lang=python\\">Inventory</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/Inventory?lang=python">Inventory</a>
 
 configuration to add.
 
 ---
 
-##### \`addLifecycleRule\` <a name=\\"addLifecycleRule\\" id=\\"GreeterBucket.addLifecycleRule\\"></a>
+##### \`addLifecycleRule\` <a name="addLifecycleRule" id="GreeterBucket.addLifecycleRule"></a>
 
 \`\`\`wing
 addLifecycleRule(rule: LifecycleRule): void
@@ -655,15 +655,15 @@ addLifecycleRule(rule: LifecycleRule): void
 
 Add a lifecycle rule to the bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"GreeterBucket.addLifecycleRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="GreeterBucket.addLifecycleRule.parameter.rule"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/LifecycleRule?lang=python\\">LifecycleRule</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/LifecycleRule?lang=python">LifecycleRule</a>
 
 The rule to add.
 
 ---
 
-##### \`addMetric\` <a name=\\"addMetric\\" id=\\"GreeterBucket.addMetric\\"></a>
+##### \`addMetric\` <a name="addMetric" id="GreeterBucket.addMetric"></a>
 
 \`\`\`wing
 addMetric(metric: BucketMetrics): void
@@ -671,75 +671,75 @@ addMetric(metric: BucketMetrics): void
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`metric\`<sup>Required</sup> <a name=\\"metric\\" id=\\"GreeterBucket.addMetric.parameter.metric\\"></a>
+###### \`metric\`<sup>Required</sup> <a name="metric" id="GreeterBucket.addMetric.parameter.metric"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketMetrics?lang=python\\">BucketMetrics</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketMetrics?lang=python">BucketMetrics</a>
 
 The metric configuration to add.
 
 ---
 
-##### \`greet\` <a name=\\"greet\\" id=\\"GreeterBucket.greet\\"></a>
+##### \`greet\` <a name="greet" id="GreeterBucket.greet"></a>
 
 \`\`\`wing
 greet(): void
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.isResource?lang=python\\">isResource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.fromBucketArn?lang=python\\">fromBucketArn</a></code> | *No description.* |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.fromBucketAttributes?lang=python\\">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.fromBucketName?lang=python\\">fromBucketName</a></code> | *No description.* |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.validateBucketName?lang=python\\">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.isResource?lang=python">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.fromBucketArn?lang=python">fromBucketArn</a></code> | *No description.* |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.fromBucketAttributes?lang=python">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.fromBucketName?lang=python">fromBucketName</a></code> | *No description.* |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.validateBucketName?lang=python">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`isResource\` <a name=\\"isResource\\" id=\\"GreeterBucket.isResource\\"></a>
+##### \`isResource\` <a name="isResource" id="GreeterBucket.isResource"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.isResource(construct: IConstruct);
 \`\`\`
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"GreeterBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="GreeterBucket.isResource.parameter.construct"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/IConstruct?lang=python\\">IConstruct</a>
+- *Type:* <a href="/packages/@aws-cdk/core/v/99.99.99/api/IConstruct?lang=python">IConstruct</a>
 
 ---
 
-##### \`fromBucketArn\` <a name=\\"fromBucketArn\\" id=\\"GreeterBucket.fromBucketArn\\"></a>
+##### \`fromBucketArn\` <a name="fromBucketArn" id="GreeterBucket.fromBucketArn"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketArn(bucketArn: str);
 \`\`\`
 
-###### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"GreeterBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="GreeterBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* str
 
 ---
 
-##### \`fromBucketAttributes\` <a name=\\"fromBucketAttributes\\" id=\\"GreeterBucket.fromBucketAttributes\\"></a>
+##### \`fromBucketAttributes\` <a name="fromBucketAttributes" id="GreeterBucket.fromBucketAttributes"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketAttributes(attrs: BucketAttributes);
 \`\`\`
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`attrs\`<sup>Required</sup> <a name=\\"attrs\\" id=\\"GreeterBucket.fromBucketAttributes.parameter.attrs\\"></a>
+###### \`attrs\`<sup>Required</sup> <a name="attrs" id="GreeterBucket.fromBucketAttributes.parameter.attrs"></a>
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketAttributes?lang=python\\">BucketAttributes</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketAttributes?lang=python">BucketAttributes</a>
 
 A \`BucketAttributes\` object.
 
@@ -748,31 +748,31 @@ Can be obtained from a call to
 
 ---
 
-##### \`fromBucketName\` <a name=\\"fromBucketName\\" id=\\"GreeterBucket.fromBucketName\\"></a>
+##### \`fromBucketName\` <a name="fromBucketName" id="GreeterBucket.fromBucketName"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketName(bucketName: str);
 \`\`\`
 
-###### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"GreeterBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="GreeterBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* str
 
 ---
 
-##### \`validateBucketName\` <a name=\\"validateBucketName\\" id=\\"GreeterBucket.validateBucketName\\"></a>
+##### \`validateBucketName\` <a name="validateBucketName" id="GreeterBucket.validateBucketName"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.validateBucketName(physicalName: str);
 \`\`\`
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physicalName\`<sup>Required</sup> <a name=\\"physicalName\\" id=\\"GreeterBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physicalName\`<sup>Required</sup> <a name="physicalName" id="GreeterBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* str
 
@@ -780,45 +780,45 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.node?lang=python\\">node</a></code> | <code><a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/ConstructNode?lang=python\\">ConstructNode</a></code> | The construct tree node associated with this construct. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.env?lang=python\\">env</a></code> | <code><a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/ResourceEnvironment?lang=python\\">ResourceEnvironment</a></code> | The environment this resource belongs to. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.stack?lang=python\\">stack</a></code> | <code><a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/Stack?lang=python\\">Stack</a></code> | The stack in which this resource is defined. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketArn?lang=python\\">bucketArn</a></code> | <code>str</code> | The ARN of the bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketDomainName?lang=python\\">bucketDomainName</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketDualStackDomainName?lang=python\\">bucketDualStackDomainName</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketName?lang=python\\">bucketName</a></code> | <code>str</code> | The name of the bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketRegionalDomainName?lang=python\\">bucketRegionalDomainName</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketWebsiteDomainName?lang=python\\">bucketWebsiteDomainName</a></code> | <code>str</code> | The Domain name of the static website. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketWebsiteUrl?lang=python\\">bucketWebsiteUrl</a></code> | <code>str</code> | The URL of the static website. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.encryptionKey?lang=python\\">encryptionKey</a></code> | <code><a href=\\"/packages/@aws-cdk/aws-kms/v/99.99.99/api/IKey?lang=python\\">IKey</a></code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.isWebsite?lang=python\\">isWebsite</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"/packages/construct-library/v/0.0.0/api/GreeterBucket.property.policy?lang=python\\">policy</a></code> | <code><a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketPolicy?lang=python\\">BucketPolicy</a></code> | The resource policy associated with this bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.node?lang=python">node</a></code> | <code><a href="/packages/@aws-cdk/core/v/99.99.99/api/ConstructNode?lang=python">ConstructNode</a></code> | The construct tree node associated with this construct. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.env?lang=python">env</a></code> | <code><a href="/packages/@aws-cdk/core/v/99.99.99/api/ResourceEnvironment?lang=python">ResourceEnvironment</a></code> | The environment this resource belongs to. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.stack?lang=python">stack</a></code> | <code><a href="/packages/@aws-cdk/core/v/99.99.99/api/Stack?lang=python">Stack</a></code> | The stack in which this resource is defined. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketArn?lang=python">bucketArn</a></code> | <code>str</code> | The ARN of the bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketDomainName?lang=python">bucketDomainName</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketDualStackDomainName?lang=python">bucketDualStackDomainName</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketName?lang=python">bucketName</a></code> | <code>str</code> | The name of the bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketRegionalDomainName?lang=python">bucketRegionalDomainName</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketWebsiteDomainName?lang=python">bucketWebsiteDomainName</a></code> | <code>str</code> | The Domain name of the static website. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.bucketWebsiteUrl?lang=python">bucketWebsiteUrl</a></code> | <code>str</code> | The URL of the static website. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.encryptionKey?lang=python">encryptionKey</a></code> | <code><a href="/packages/@aws-cdk/aws-kms/v/99.99.99/api/IKey?lang=python">IKey</a></code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.isWebsite?lang=python">isWebsite</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="/packages/construct-library/v/0.0.0/api/GreeterBucket.property.policy?lang=python">policy</a></code> | <code><a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketPolicy?lang=python">BucketPolicy</a></code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"GreeterBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="GreeterBucket.property.node"></a>
 
 \`\`\`wing
 node: ConstructNode;
 \`\`\`
 
-- *Type:* <a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/ConstructNode?lang=python\\">ConstructNode</a>
+- *Type:* <a href="/packages/@aws-cdk/core/v/99.99.99/api/ConstructNode?lang=python">ConstructNode</a>
 
 The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"GreeterBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="GreeterBucket.property.env"></a>
 
 \`\`\`wing
 env: ResourceEnvironment;
 \`\`\`
 
-- *Type:* <a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/ResourceEnvironment?lang=python\\">ResourceEnvironment</a>
+- *Type:* <a href="/packages/@aws-cdk/core/v/99.99.99/api/ResourceEnvironment?lang=python">ResourceEnvironment</a>
 
 The environment this resource belongs to.
 
@@ -831,19 +831,19 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"GreeterBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="GreeterBucket.property.stack"></a>
 
 \`\`\`wing
 stack: Stack;
 \`\`\`
 
-- *Type:* <a href=\\"/packages/@aws-cdk/core/v/99.99.99/api/Stack?lang=python\\">Stack</a>
+- *Type:* <a href="/packages/@aws-cdk/core/v/99.99.99/api/Stack?lang=python">Stack</a>
 
 The stack in which this resource is defined.
 
 ---
 
-##### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"GreeterBucket.property.bucketArn\\"></a>
+##### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="GreeterBucket.property.bucketArn"></a>
 
 \`\`\`wing
 bucketArn: str;
@@ -855,7 +855,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucketDomainName\`<sup>Required</sup> <a name=\\"bucketDomainName\\" id=\\"GreeterBucket.property.bucketDomainName\\"></a>
+##### \`bucketDomainName\`<sup>Required</sup> <a name="bucketDomainName" id="GreeterBucket.property.bucketDomainName"></a>
 
 \`\`\`wing
 bucketDomainName: str;
@@ -867,7 +867,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name=\\"bucketDualStackDomainName\\" id=\\"GreeterBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name="bucketDualStackDomainName" id="GreeterBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`wing
 bucketDualStackDomainName: str;
@@ -879,7 +879,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"GreeterBucket.property.bucketName\\"></a>
+##### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="GreeterBucket.property.bucketName"></a>
 
 \`\`\`wing
 bucketName: str;
@@ -891,7 +891,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name=\\"bucketRegionalDomainName\\" id=\\"GreeterBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name="bucketRegionalDomainName" id="GreeterBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`wing
 bucketRegionalDomainName: str;
@@ -903,7 +903,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name=\\"bucketWebsiteDomainName\\" id=\\"GreeterBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name="bucketWebsiteDomainName" id="GreeterBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`wing
 bucketWebsiteDomainName: str;
@@ -915,7 +915,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name=\\"bucketWebsiteUrl\\" id=\\"GreeterBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name="bucketWebsiteUrl" id="GreeterBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`wing
 bucketWebsiteUrl: str;
@@ -927,19 +927,19 @@ The URL of the static website.
 
 ---
 
-##### \`encryptionKey\`<sup>Optional</sup> <a name=\\"encryptionKey\\" id=\\"GreeterBucket.property.encryptionKey\\"></a>
+##### \`encryptionKey\`<sup>Optional</sup> <a name="encryptionKey" id="GreeterBucket.property.encryptionKey"></a>
 
 \`\`\`wing
 encryptionKey: IKey;
 \`\`\`
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-kms/v/99.99.99/api/IKey?lang=python\\">IKey</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-kms/v/99.99.99/api/IKey?lang=python">IKey</a>
 
 Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`isWebsite\`<sup>Optional</sup> <a name=\\"isWebsite\\" id=\\"GreeterBucket.property.isWebsite\\"></a>
+##### \`isWebsite\`<sup>Optional</sup> <a name="isWebsite" id="GreeterBucket.property.isWebsite"></a>
 
 \`\`\`wing
 isWebsite: bool;
@@ -951,13 +951,13 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"GreeterBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="GreeterBucket.property.policy"></a>
 
 \`\`\`wing
 policy: BucketPolicy;
 \`\`\`
 
-- *Type:* <a href=\\"/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketPolicy?lang=python\\">BucketPolicy</a>
+- *Type:* <a href="/packages/@aws-cdk/aws-s3/v/99.99.99/api/BucketPolicy?lang=python">BucketPolicy</a>
 
 The resource policy associated with this bucket.
 
@@ -973,70 +973,70 @@ first call to addToResourcePolicy(s).
 "
 `;
 
-exports[`simple link formatter wing snapshot 1`] = `
+exports[`simple link formatter > wing snapshot 1`] = `
 "# construct-library
 
 This is a test project to make sure the \`jsii-docgen\` cli property renders API documentation
 for construct libraries.
-# API Reference <a name=\\"API Reference\\" id=\\"api-reference\\"></a>
+# API Reference <a name="API Reference" id="api-reference"></a>
 
-## Resources <a name=\\"Resources\\" id=\\"Resources\\"></a>
+## Resources <a name="Resources" id="Resources"></a>
 
-### GreeterBucket <a name=\\"GreeterBucket\\" id=\\"construct-library.GreeterBucket\\"></a>
+### GreeterBucket <a name="GreeterBucket" id="construct-library.GreeterBucket"></a>
 
-#### Initializers <a name=\\"Initializers\\" id=\\"construct-library.GreeterBucket.Initializer\\"></a>
+#### Initializers <a name="Initializers" id="construct-library.GreeterBucket.Initializer"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 new GreeterBucket(props?: BucketProps);
 \`\`\`
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.Initializer.parameter.props\\">props</a></code> | <code><a href=\\"#custom-@aws-cdk/aws-s3.BucketProps\\">BucketProps</a></code> | *No description.* |
+| <code><a href="#custom-construct-library.GreeterBucket.Initializer.parameter.props">props</a></code> | <code><a href="#custom-@aws-cdk/aws-s3.BucketProps">BucketProps</a></code> | *No description.* |
 
 ---
 
-##### \`props\`<sup>Optional</sup> <a name=\\"props\\" id=\\"construct-library.GreeterBucket.Initializer.parameter.props\\"></a>
+##### \`props\`<sup>Optional</sup> <a name="props" id="construct-library.GreeterBucket.Initializer.parameter.props"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.BucketProps\\">BucketProps</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.BucketProps">BucketProps</a>
 
 ---
 
-#### Methods <a name=\\"Methods\\" id=\\"Methods\\"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.applyRemovalPolicy\\">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addEventNotification\\">addEventNotification</a></code> | Adds a bucket notification event destination. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addObjectCreatedNotification\\">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addObjectRemovedNotification\\">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addToResourcePolicy\\">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.arnForObjects\\">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.grantDelete\\">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.grantPublicAccess\\">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.grantPut\\">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.grantPutAcl\\">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.grantRead\\">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.grantReadWrite\\">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.grantWrite\\">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.onCloudTrailEvent\\">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.onCloudTrailPutObject\\">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.onCloudTrailWriteObject\\">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.s3UrlForObject\\">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.transferAccelerationUrlForObject\\">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.urlForObject\\">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.virtualHostedUrlForObject\\">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addCorsRule\\">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addInventory\\">addInventory</a></code> | Add an inventory configuration. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addLifecycleRule\\">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.addMetric\\">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.greet\\">greet</a></code> | *No description.* |
-
----
-
-##### \`applyRemovalPolicy\` <a name=\\"applyRemovalPolicy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy\\"></a>
+| <code><a href="#custom-construct-library.GreeterBucket.applyRemovalPolicy">applyRemovalPolicy</a></code> | Apply the given removal policy to this resource. |
+| <code><a href="#custom-construct-library.GreeterBucket.addEventNotification">addEventNotification</a></code> | Adds a bucket notification event destination. |
+| <code><a href="#custom-construct-library.GreeterBucket.addObjectCreatedNotification">addObjectCreatedNotification</a></code> | Subscribes a destination to receive notifications when an object is created in the bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.addObjectRemovedNotification">addObjectRemovedNotification</a></code> | Subscribes a destination to receive notifications when an object is removed from the bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.addToResourcePolicy">addToResourcePolicy</a></code> | Adds a statement to the resource policy for a principal (i.e. account/role/service) to perform actions on this bucket and/or its contents. Use \`bucketArn\` and \`arnForObjects(keys)\` to obtain ARNs for this bucket or objects. |
+| <code><a href="#custom-construct-library.GreeterBucket.arnForObjects">arnForObjects</a></code> | Returns an ARN that represents all objects within the bucket that match the key pattern specified. |
+| <code><a href="#custom-construct-library.GreeterBucket.grantDelete">grantDelete</a></code> | Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.grantPublicAccess">grantPublicAccess</a></code> | Allows unrestricted access to objects from this bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.grantPut">grantPut</a></code> | Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM principal. |
+| <code><a href="#custom-construct-library.GreeterBucket.grantPutAcl">grantPutAcl</a></code> | Grant the given IAM identity permissions to modify the ACLs of objects in the given Bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.grantRead">grantRead</a></code> | Grant read permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#custom-construct-library.GreeterBucket.grantReadWrite">grantReadWrite</a></code> | Grants read/write permissions for this bucket and it's contents to an IAM principal (Role/Group/User). |
+| <code><a href="#custom-construct-library.GreeterBucket.grantWrite">grantWrite</a></code> | Grant write permissions to this bucket to an IAM principal. |
+| <code><a href="#custom-construct-library.GreeterBucket.onCloudTrailEvent">onCloudTrailEvent</a></code> | Define a CloudWatch event that triggers when something happens to this repository. |
+| <code><a href="#custom-construct-library.GreeterBucket.onCloudTrailPutObject">onCloudTrailPutObject</a></code> | Defines an AWS CloudWatch event that triggers when an object is uploaded to the specified paths (keys) in this bucket using the PutObject API call. |
+| <code><a href="#custom-construct-library.GreeterBucket.onCloudTrailWriteObject">onCloudTrailWriteObject</a></code> | Defines an AWS CloudWatch event that triggers when an object at the specified paths (keys) in this bucket are written to. |
+| <code><a href="#custom-construct-library.GreeterBucket.s3UrlForObject">s3UrlForObject</a></code> | The S3 URL of an S3 object. For example:. |
+| <code><a href="#custom-construct-library.GreeterBucket.transferAccelerationUrlForObject">transferAccelerationUrlForObject</a></code> | The https Transfer Acceleration URL of an S3 object. |
+| <code><a href="#custom-construct-library.GreeterBucket.urlForObject">urlForObject</a></code> | The https URL of an S3 object. Specify \`regional: false\` at the options for non-regional URLs. For example:. |
+| <code><a href="#custom-construct-library.GreeterBucket.virtualHostedUrlForObject">virtualHostedUrlForObject</a></code> | The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the options for non-regional URL. For example:. |
+| <code><a href="#custom-construct-library.GreeterBucket.addCorsRule">addCorsRule</a></code> | Adds a cross-origin access configuration for objects in an Amazon S3 bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.addInventory">addInventory</a></code> | Add an inventory configuration. |
+| <code><a href="#custom-construct-library.GreeterBucket.addLifecycleRule">addLifecycleRule</a></code> | Add a lifecycle rule to the bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.addMetric">addMetric</a></code> | Adds a metrics configuration for the CloudWatch request metrics from the bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.greet">greet</a></code> | *No description.* |
+
+---
+
+##### \`applyRemovalPolicy\` <a name="applyRemovalPolicy" id="construct-library.GreeterBucket.applyRemovalPolicy"></a>
 
 \`\`\`wing
 applyRemovalPolicy(policy: RemovalPolicy): void
@@ -1052,13 +1052,13 @@ to be replaced.
 The resource can be deleted (\`RemovalPolicy.DESTROY\`), or left in your AWS
 account for data recovery and cleanup later (\`RemovalPolicy.RETAIN\`).
 
-###### \`policy\`<sup>Required</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy\\"></a>
+###### \`policy\`<sup>Required</sup> <a name="policy" id="construct-library.GreeterBucket.applyRemovalPolicy.parameter.policy"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/core.RemovalPolicy\\">RemovalPolicy</a>
+- *Type:* <a href="#custom-@aws-cdk/core.RemovalPolicy">RemovalPolicy</a>
 
 ---
 
-##### \`addEventNotification\` <a name=\\"addEventNotification\\" id=\\"construct-library.GreeterBucket.addEventNotification\\"></a>
+##### \`addEventNotification\` <a name="addEventNotification" id="construct-library.GreeterBucket.addEventNotification"></a>
 
 \`\`\`wing
 addEventNotification(event: EventType, dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -1077,25 +1077,25 @@ Adds a bucket notification event destination.
 \`\`\`
 
 
-###### \`event\`<sup>Required</sup> <a name=\\"event\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.event\\"></a>
+###### \`event\`<sup>Required</sup> <a name="event" id="construct-library.GreeterBucket.addEventNotification.parameter.event"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.EventType\\">EventType</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.EventType">EventType</a>
 
 The event to trigger the notification.
 
 ---
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addEventNotification.parameter.dest"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.IBucketNotificationDestination\\">IBucketNotificationDestination</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.IBucketNotificationDestination">IBucketNotificationDestination</a>
 
 The notification destination (Lambda, SNS Topic or SQS Queue).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addEventNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addEventNotification.parameter.filters"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.NotificationKeyFilter\\">NotificationKeyFilter</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.NotificationKeyFilter">NotificationKeyFilter</a>
 
 S3 object key filter rules to determine which objects trigger this event.
 
@@ -1105,7 +1105,7 @@ for details about allowed filter rules.
 
 ---
 
-##### \`addObjectCreatedNotification\` <a name=\\"addObjectCreatedNotification\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification\\"></a>
+##### \`addObjectCreatedNotification\` <a name="addObjectCreatedNotification" id="construct-library.GreeterBucket.addObjectCreatedNotification"></a>
 
 \`\`\`wing
 addObjectCreatedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -1116,23 +1116,23 @@ Subscribes a destination to receive notifications when an object is created in t
 This is identical to calling
 \`onEvent(EventType.OBJECT_CREATED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.dest"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.IBucketNotificationDestination\\">IBucketNotificationDestination</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.IBucketNotificationDestination">IBucketNotificationDestination</a>
 
 The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectCreatedNotification.parameter.filters"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.NotificationKeyFilter\\">NotificationKeyFilter</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.NotificationKeyFilter">NotificationKeyFilter</a>
 
 Filters (see onEvent).
 
 ---
 
-##### \`addObjectRemovedNotification\` <a name=\\"addObjectRemovedNotification\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification\\"></a>
+##### \`addObjectRemovedNotification\` <a name="addObjectRemovedNotification" id="construct-library.GreeterBucket.addObjectRemovedNotification"></a>
 
 \`\`\`wing
 addObjectRemovedNotification(dest: IBucketNotificationDestination, ...filters: Array<NotificationKeyFilter>): void
@@ -1143,23 +1143,23 @@ Subscribes a destination to receive notifications when an object is removed from
 This is identical to calling
 \`onEvent(EventType.OBJECT_REMOVED)\`.
 
-###### \`dest\`<sup>Required</sup> <a name=\\"dest\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest\\"></a>
+###### \`dest\`<sup>Required</sup> <a name="dest" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.dest"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.IBucketNotificationDestination\\">IBucketNotificationDestination</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.IBucketNotificationDestination">IBucketNotificationDestination</a>
 
 The notification destination (see onEvent).
 
 ---
 
-###### \`filters\`<sup>Required</sup> <a name=\\"filters\\" id=\\"construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters\\"></a>
+###### \`filters\`<sup>Required</sup> <a name="filters" id="construct-library.GreeterBucket.addObjectRemovedNotification.parameter.filters"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.NotificationKeyFilter\\">NotificationKeyFilter</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.NotificationKeyFilter">NotificationKeyFilter</a>
 
 Filters (see onEvent).
 
 ---
 
-##### \`addToResourcePolicy\` <a name=\\"addToResourcePolicy\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy\\"></a>
+##### \`addToResourcePolicy\` <a name="addToResourcePolicy" id="construct-library.GreeterBucket.addToResourcePolicy"></a>
 
 \`\`\`wing
 addToResourcePolicy(permission: PolicyStatement): AddToResourcePolicyResult
@@ -1173,15 +1173,15 @@ it's not possible to tell whether the bucket already has a policy
 attached, let alone to re-use that policy to add more statements to it.
 So it's safest to do nothing in these cases.
 
-###### \`permission\`<sup>Required</sup> <a name=\\"permission\\" id=\\"construct-library.GreeterBucket.addToResourcePolicy.parameter.permission\\"></a>
+###### \`permission\`<sup>Required</sup> <a name="permission" id="construct-library.GreeterBucket.addToResourcePolicy.parameter.permission"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-iam.PolicyStatement\\">PolicyStatement</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-iam.PolicyStatement">PolicyStatement</a>
 
 the policy statement to be added to the bucket's policy.
 
 ---
 
-##### \`arnForObjects\` <a name=\\"arnForObjects\\" id=\\"construct-library.GreeterBucket.arnForObjects\\"></a>
+##### \`arnForObjects\` <a name="arnForObjects" id="construct-library.GreeterBucket.arnForObjects"></a>
 
 \`\`\`wing
 arnForObjects(keyPattern: str): str
@@ -1189,19 +1189,19 @@ arnForObjects(keyPattern: str): str
 
 Returns an ARN that represents all objects within the bucket that match the key pattern specified.
 
-To represent all keys, specify \`\`\\"*\\"\`\`.
+To represent all keys, specify \`\`"*"\`\`.
 
 If you need to specify a keyPattern with multiple components, concatenate them into a single string, e.g.:
 
    arnForObjects(\`home/\${team}/\${user}/*\`)
 
-###### \`keyPattern\`<sup>Required</sup> <a name=\\"keyPattern\\" id=\\"construct-library.GreeterBucket.arnForObjects.parameter.keyPattern\\"></a>
+###### \`keyPattern\`<sup>Required</sup> <a name="keyPattern" id="construct-library.GreeterBucket.arnForObjects.parameter.keyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grantDelete\` <a name=\\"grantDelete\\" id=\\"construct-library.GreeterBucket.grantDelete\\"></a>
+##### \`grantDelete\` <a name="grantDelete" id="construct-library.GreeterBucket.grantDelete"></a>
 
 \`\`\`wing
 grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1209,15 +1209,15 @@ grantDelete(identity: IGrantable, objectsKeyPattern?: any): Grant
 
 Grants s3:DeleteObject* permission to an IAM principal for objects in this bucket.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantDelete.parameter.identity"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-iam.IGrantable\\">IGrantable</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-iam.IGrantable">IGrantable</a>
 
 The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantDelete.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1225,7 +1225,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPublicAccess\` <a name=\\"grantPublicAccess\\" id=\\"construct-library.GreeterBucket.grantPublicAccess\\"></a>
+##### \`grantPublicAccess\` <a name="grantPublicAccess" id="construct-library.GreeterBucket.grantPublicAccess"></a>
 
 \`\`\`wing
 grantPublicAccess(...allowedActions: Array<str>, keyPrefix?: str): Grant
@@ -1238,8 +1238,8 @@ in this bucket, which is useful for when you configure your bucket as a
 website and want everyone to be able to read objects in the bucket without
 needing to authenticate.
 
-Without arguments, this method will grant read (\\"s3:GetObject\\") access to
-all objects (\\"*\\") in the bucket.
+Without arguments, this method will grant read ("s3:GetObject") access to
+all objects ("*") in the bucket.
 
 The method returns the \`iam.Grant\` object, which can then be modified
 as needed. For example, you can add a condition that will restrict access only
@@ -1252,25 +1252,25 @@ Note that if this \`IBucket\` refers to an existing bucket, possibly not
 managed by CloudFormation, this method will have no effect, since it's
 impossible to modify the policy of an existing bucket.
 
-###### \`allowedActions\`<sup>Required</sup> <a name=\\"allowedActions\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions\\"></a>
+###### \`allowedActions\`<sup>Required</sup> <a name="allowedActions" id="construct-library.GreeterBucket.grantPublicAccess.parameter.allowedActions"></a>
 
 - *Type:* str
 
 the set of S3 actions to allow.
 
-Default is \\"s3:GetObject\\".
+Default is "s3:GetObject".
 
 ---
 
-###### \`keyPrefix\`<sup>Optional</sup> <a name=\\"keyPrefix\\" id=\\"construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix\\"></a>
+###### \`keyPrefix\`<sup>Optional</sup> <a name="keyPrefix" id="construct-library.GreeterBucket.grantPublicAccess.parameter.keyPrefix"></a>
 
 - *Type:* str
 
-the prefix of S3 object keys (e.g. \`home/*\`). Default is \\"*\\".
+the prefix of S3 object keys (e.g. \`home/*\`). Default is "*".
 
 ---
 
-##### \`grantPut\` <a name=\\"grantPut\\" id=\\"construct-library.GreeterBucket.grantPut\\"></a>
+##### \`grantPut\` <a name="grantPut" id="construct-library.GreeterBucket.grantPut"></a>
 
 \`\`\`wing
 grantPut(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1281,15 +1281,15 @@ Grants s3:PutObject* and s3:Abort* permissions for this bucket to an IAM princip
 If encryption is used, permission to use the key to encrypt the contents
 of written files will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPut.parameter.identity"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-iam.IGrantable\\">IGrantable</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-iam.IGrantable">IGrantable</a>
 
 The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPut.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1297,7 +1297,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantPutAcl\` <a name=\\"grantPutAcl\\" id=\\"construct-library.GreeterBucket.grantPutAcl\\"></a>
+##### \`grantPutAcl\` <a name="grantPutAcl" id="construct-library.GreeterBucket.grantPutAcl"></a>
 
 \`\`\`wing
 grantPutAcl(identity: IGrantable, objectsKeyPattern?: str): Grant
@@ -1309,19 +1309,19 @@ If your application has the '@aws-cdk/aws-s3:grantWriteWithoutAcl' feature flag
 calling {@link grantWrite} or {@link grantReadWrite} no longer grants permissions to modify the ACLs of the objects;
 in this case, if you need to modify object ACLs, call this method explicitly.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantPutAcl.parameter.identity"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-iam.IGrantable\\">IGrantable</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-iam.IGrantable">IGrantable</a>
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantPutAcl.parameter.objectsKeyPattern"></a>
 
 - *Type:* str
 
 ---
 
-##### \`grantRead\` <a name=\\"grantRead\\" id=\\"construct-library.GreeterBucket.grantRead\\"></a>
+##### \`grantRead\` <a name="grantRead" id="construct-library.GreeterBucket.grantRead"></a>
 
 \`\`\`wing
 grantRead(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1332,15 +1332,15 @@ Grant read permissions for this bucket and it's contents to an IAM principal (Ro
 If encryption is used, permission to use the key to decrypt the contents
 of the bucket will also be granted to the same principal.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantRead.parameter.identity"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-iam.IGrantable\\">IGrantable</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-iam.IGrantable">IGrantable</a>
 
 The principal.
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantRead.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
@@ -1348,7 +1348,7 @@ Restrict the permission to a certain key pattern (default '*').
 
 ---
 
-##### \`grantReadWrite\` <a name=\\"grantReadWrite\\" id=\\"construct-library.GreeterBucket.grantReadWrite\\"></a>
+##### \`grantReadWrite\` <a name="grantReadWrite" id="construct-library.GreeterBucket.grantReadWrite"></a>
 
 \`\`\`wing
 grantReadWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1367,19 +1367,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantReadWrite.parameter.identity"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-iam.IGrantable\\">IGrantable</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-iam.IGrantable">IGrantable</a>
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantReadWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`grantWrite\` <a name=\\"grantWrite\\" id=\\"construct-library.GreeterBucket.grantWrite\\"></a>
+##### \`grantWrite\` <a name="grantWrite" id="construct-library.GreeterBucket.grantWrite"></a>
 
 \`\`\`wing
 grantWrite(identity: IGrantable, objectsKeyPattern?: any): Grant
@@ -1398,19 +1398,19 @@ in the \`context\` key of your cdk.json file.
 If you've already updated, but still need the principal to have permissions to modify the ACLs,
 use the {@link grantPutAcl} method.
 
-###### \`identity\`<sup>Required</sup> <a name=\\"identity\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.identity\\"></a>
+###### \`identity\`<sup>Required</sup> <a name="identity" id="construct-library.GreeterBucket.grantWrite.parameter.identity"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-iam.IGrantable\\">IGrantable</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-iam.IGrantable">IGrantable</a>
 
 ---
 
-###### \`objectsKeyPattern\`<sup>Optional</sup> <a name=\\"objectsKeyPattern\\" id=\\"construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern\\"></a>
+###### \`objectsKeyPattern\`<sup>Optional</sup> <a name="objectsKeyPattern" id="construct-library.GreeterBucket.grantWrite.parameter.objectsKeyPattern"></a>
 
 - *Type:* any
 
 ---
 
-##### \`onCloudTrailEvent\` <a name=\\"onCloudTrailEvent\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent\\"></a>
+##### \`onCloudTrailEvent\` <a name="onCloudTrailEvent" id="construct-library.GreeterBucket.onCloudTrailEvent"></a>
 
 \`\`\`wing
 onCloudTrailEvent(options?: OnCloudTrailBucketEventOptions): Rule
@@ -1421,15 +1421,15 @@ Define a CloudWatch event that triggers when something happens to this repositor
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailEvent.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailEvent.parameter.options"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions\\">OnCloudTrailBucketEventOptions</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions">OnCloudTrailBucketEventOptions</a>
 
 Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailPutObject\` <a name=\\"onCloudTrailPutObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject\\"></a>
+##### \`onCloudTrailPutObject\` <a name="onCloudTrailPutObject" id="construct-library.GreeterBucket.onCloudTrailPutObject"></a>
 
 \`\`\`wing
 onCloudTrailPutObject(options?: OnCloudTrailBucketEventOptions): Rule
@@ -1444,15 +1444,15 @@ so using \`onCloudTrailWriteObject\` may be preferable.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailPutObject.parameter.options"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions\\">OnCloudTrailBucketEventOptions</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions">OnCloudTrailBucketEventOptions</a>
 
 Options for adding the rule.
 
 ---
 
-##### \`onCloudTrailWriteObject\` <a name=\\"onCloudTrailWriteObject\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject\\"></a>
+##### \`onCloudTrailWriteObject\` <a name="onCloudTrailWriteObject" id="construct-library.GreeterBucket.onCloudTrailWriteObject"></a>
 
 \`\`\`wing
 onCloudTrailWriteObject(options?: OnCloudTrailBucketEventOptions): Rule
@@ -1470,15 +1470,15 @@ so using this method may be preferable to \`onCloudTrailPutObject\`.
 Requires that there exists at least one CloudTrail Trail in your account
 that captures the event. This method will not create the Trail.
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.onCloudTrailWriteObject.parameter.options"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions\\">OnCloudTrailBucketEventOptions</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.OnCloudTrailBucketEventOptions">OnCloudTrailBucketEventOptions</a>
 
 Options for adding the rule.
 
 ---
 
-##### \`s3UrlForObject\` <a name=\\"s3UrlForObject\\" id=\\"construct-library.GreeterBucket.s3UrlForObject\\"></a>
+##### \`s3UrlForObject\` <a name="s3UrlForObject" id="construct-library.GreeterBucket.s3UrlForObject"></a>
 
 \`\`\`wing
 s3UrlForObject(key?: str): str
@@ -1489,7 +1489,7 @@ The S3 URL of an S3 object. For example:.
 \`s3://onlybucket\`
 - \`s3://bucket/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.s3UrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.s3UrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -1500,7 +1500,7 @@ bucket is returned.
 
 ---
 
-##### \`transferAccelerationUrlForObject\` <a name=\\"transferAccelerationUrlForObject\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject\\"></a>
+##### \`transferAccelerationUrlForObject\` <a name="transferAccelerationUrlForObject" id="construct-library.GreeterBucket.transferAccelerationUrlForObject"></a>
 
 \`\`\`wing
 transferAccelerationUrlForObject(key?: str, options?: TransferAccelerationUrlOptions): str
@@ -1514,7 +1514,7 @@ for dual-stack endpoint (connect to the bucket over IPv6). For example:
 - \`https://bucket.s3-accelerate.amazonaws.com\`
 - \`https://bucket.s3-accelerate.amazonaws.com/key\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -1525,15 +1525,15 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.transferAccelerationUrlForObject.parameter.options"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.TransferAccelerationUrlOptions\\">TransferAccelerationUrlOptions</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.TransferAccelerationUrlOptions">TransferAccelerationUrlOptions</a>
 
 Options for generating URL.
 
 ---
 
-##### \`urlForObject\` <a name=\\"urlForObject\\" id=\\"construct-library.GreeterBucket.urlForObject\\"></a>
+##### \`urlForObject\` <a name="urlForObject" id="construct-library.GreeterBucket.urlForObject"></a>
 
 \`\`\`wing
 urlForObject(key?: str): str
@@ -1545,7 +1545,7 @@ The https URL of an S3 object. Specify \`regional: false\` at the options for no
 - \`https://s3.us-west-1.amazonaws.com/bucket/key\`
 - \`https://s3.cn-north-1.amazonaws.com.cn/china-bucket/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.urlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.urlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -1556,7 +1556,7 @@ bucket is returned.
 
 ---
 
-##### \`virtualHostedUrlForObject\` <a name=\\"virtualHostedUrlForObject\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject\\"></a>
+##### \`virtualHostedUrlForObject\` <a name="virtualHostedUrlForObject" id="construct-library.GreeterBucket.virtualHostedUrlForObject"></a>
 
 \`\`\`wing
 virtualHostedUrlForObject(key?: str, options?: VirtualHostedStyleUrlOptions): str
@@ -1569,7 +1569,7 @@ The virtual hosted-style URL of an S3 object. Specify \`regional: false\` at the
 - \`https://bucket.s3.amazonaws.com/key\`
 - \`https://china-bucket.s3.cn-north-1.amazonaws.com.cn/mykey\`
 
-###### \`key\`<sup>Optional</sup> <a name=\\"key\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key\\"></a>
+###### \`key\`<sup>Optional</sup> <a name="key" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.key"></a>
 
 - *Type:* str
 
@@ -1580,15 +1580,15 @@ bucket is returned.
 
 ---
 
-###### \`options\`<sup>Optional</sup> <a name=\\"options\\" id=\\"construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options\\"></a>
+###### \`options\`<sup>Optional</sup> <a name="options" id="construct-library.GreeterBucket.virtualHostedUrlForObject.parameter.options"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.VirtualHostedStyleUrlOptions\\">VirtualHostedStyleUrlOptions</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.VirtualHostedStyleUrlOptions">VirtualHostedStyleUrlOptions</a>
 
 Options for generating URL.
 
 ---
 
-##### \`addCorsRule\` <a name=\\"addCorsRule\\" id=\\"construct-library.GreeterBucket.addCorsRule\\"></a>
+##### \`addCorsRule\` <a name="addCorsRule" id="construct-library.GreeterBucket.addCorsRule"></a>
 
 \`\`\`wing
 addCorsRule(rule: CorsRule): void
@@ -1596,15 +1596,15 @@ addCorsRule(rule: CorsRule): void
 
 Adds a cross-origin access configuration for objects in an Amazon S3 bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addCorsRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addCorsRule.parameter.rule"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.CorsRule\\">CorsRule</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.CorsRule">CorsRule</a>
 
 The CORS configuration rule to add.
 
 ---
 
-##### \`addInventory\` <a name=\\"addInventory\\" id=\\"construct-library.GreeterBucket.addInventory\\"></a>
+##### \`addInventory\` <a name="addInventory" id="construct-library.GreeterBucket.addInventory"></a>
 
 \`\`\`wing
 addInventory(inventory: Inventory): void
@@ -1612,15 +1612,15 @@ addInventory(inventory: Inventory): void
 
 Add an inventory configuration.
 
-###### \`inventory\`<sup>Required</sup> <a name=\\"inventory\\" id=\\"construct-library.GreeterBucket.addInventory.parameter.inventory\\"></a>
+###### \`inventory\`<sup>Required</sup> <a name="inventory" id="construct-library.GreeterBucket.addInventory.parameter.inventory"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.Inventory\\">Inventory</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.Inventory">Inventory</a>
 
 configuration to add.
 
 ---
 
-##### \`addLifecycleRule\` <a name=\\"addLifecycleRule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule\\"></a>
+##### \`addLifecycleRule\` <a name="addLifecycleRule" id="construct-library.GreeterBucket.addLifecycleRule"></a>
 
 \`\`\`wing
 addLifecycleRule(rule: LifecycleRule): void
@@ -1628,15 +1628,15 @@ addLifecycleRule(rule: LifecycleRule): void
 
 Add a lifecycle rule to the bucket.
 
-###### \`rule\`<sup>Required</sup> <a name=\\"rule\\" id=\\"construct-library.GreeterBucket.addLifecycleRule.parameter.rule\\"></a>
+###### \`rule\`<sup>Required</sup> <a name="rule" id="construct-library.GreeterBucket.addLifecycleRule.parameter.rule"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.LifecycleRule\\">LifecycleRule</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.LifecycleRule">LifecycleRule</a>
 
 The rule to add.
 
 ---
 
-##### \`addMetric\` <a name=\\"addMetric\\" id=\\"construct-library.GreeterBucket.addMetric\\"></a>
+##### \`addMetric\` <a name="addMetric" id="construct-library.GreeterBucket.addMetric"></a>
 
 \`\`\`wing
 addMetric(metric: BucketMetrics): void
@@ -1644,75 +1644,75 @@ addMetric(metric: BucketMetrics): void
 
 Adds a metrics configuration for the CloudWatch request metrics from the bucket.
 
-###### \`metric\`<sup>Required</sup> <a name=\\"metric\\" id=\\"construct-library.GreeterBucket.addMetric.parameter.metric\\"></a>
+###### \`metric\`<sup>Required</sup> <a name="metric" id="construct-library.GreeterBucket.addMetric.parameter.metric"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.BucketMetrics\\">BucketMetrics</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.BucketMetrics">BucketMetrics</a>
 
 The metric configuration to add.
 
 ---
 
-##### \`greet\` <a name=\\"greet\\" id=\\"construct-library.GreeterBucket.greet\\"></a>
+##### \`greet\` <a name="greet" id="construct-library.GreeterBucket.greet"></a>
 
 \`\`\`wing
 greet(): void
 \`\`\`
 
-#### Static Functions <a name=\\"Static Functions\\" id=\\"Static Functions\\"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.isResource\\">isResource</a></code> | Check whether the given construct is a Resource. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.fromBucketArn\\">fromBucketArn</a></code> | *No description.* |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.fromBucketAttributes\\">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.fromBucketName\\">fromBucketName</a></code> | *No description.* |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.validateBucketName\\">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
+| <code><a href="#custom-construct-library.GreeterBucket.isResource">isResource</a></code> | Check whether the given construct is a Resource. |
+| <code><a href="#custom-construct-library.GreeterBucket.fromBucketArn">fromBucketArn</a></code> | *No description.* |
+| <code><a href="#custom-construct-library.GreeterBucket.fromBucketAttributes">fromBucketAttributes</a></code> | Creates a Bucket construct that represents an external bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.fromBucketName">fromBucketName</a></code> | *No description.* |
+| <code><a href="#custom-construct-library.GreeterBucket.validateBucketName">validateBucketName</a></code> | Thrown an exception if the given bucket name is not valid. |
 
 ---
 
-##### \`isResource\` <a name=\\"isResource\\" id=\\"construct-library.GreeterBucket.isResource\\"></a>
+##### \`isResource\` <a name="isResource" id="construct-library.GreeterBucket.isResource"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.isResource(construct: IConstruct);
 \`\`\`
 
 Check whether the given construct is a Resource.
 
-###### \`construct\`<sup>Required</sup> <a name=\\"construct\\" id=\\"construct-library.GreeterBucket.isResource.parameter.construct\\"></a>
+###### \`construct\`<sup>Required</sup> <a name="construct" id="construct-library.GreeterBucket.isResource.parameter.construct"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/core.IConstruct\\">IConstruct</a>
+- *Type:* <a href="#custom-@aws-cdk/core.IConstruct">IConstruct</a>
 
 ---
 
-##### \`fromBucketArn\` <a name=\\"fromBucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn\\"></a>
+##### \`fromBucketArn\` <a name="fromBucketArn" id="construct-library.GreeterBucket.fromBucketArn"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketArn(bucketArn: str);
 \`\`\`
 
-###### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn\\"></a>
+###### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.fromBucketArn.parameter.bucketArn"></a>
 
 - *Type:* str
 
 ---
 
-##### \`fromBucketAttributes\` <a name=\\"fromBucketAttributes\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes\\"></a>
+##### \`fromBucketAttributes\` <a name="fromBucketAttributes" id="construct-library.GreeterBucket.fromBucketAttributes"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketAttributes(attrs: BucketAttributes);
 \`\`\`
 
 Creates a Bucket construct that represents an external bucket.
 
-###### \`attrs\`<sup>Required</sup> <a name=\\"attrs\\" id=\\"construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs\\"></a>
+###### \`attrs\`<sup>Required</sup> <a name="attrs" id="construct-library.GreeterBucket.fromBucketAttributes.parameter.attrs"></a>
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.BucketAttributes\\">BucketAttributes</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.BucketAttributes">BucketAttributes</a>
 
 A \`BucketAttributes\` object.
 
@@ -1721,31 +1721,31 @@ Can be obtained from a call to
 
 ---
 
-##### \`fromBucketName\` <a name=\\"fromBucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName\\"></a>
+##### \`fromBucketName\` <a name="fromBucketName" id="construct-library.GreeterBucket.fromBucketName"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.fromBucketName(bucketName: str);
 \`\`\`
 
-###### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.fromBucketName.parameter.bucketName\\"></a>
+###### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.fromBucketName.parameter.bucketName"></a>
 
 - *Type:* str
 
 ---
 
-##### \`validateBucketName\` <a name=\\"validateBucketName\\" id=\\"construct-library.GreeterBucket.validateBucketName\\"></a>
+##### \`validateBucketName\` <a name="validateBucketName" id="construct-library.GreeterBucket.validateBucketName"></a>
 
 \`\`\`wing
-bring { GreeterBucket } from \\"construct-library\\";
+bring { GreeterBucket } from "construct-library";
 
 GreeterBucket.validateBucketName(physicalName: str);
 \`\`\`
 
 Thrown an exception if the given bucket name is not valid.
 
-###### \`physicalName\`<sup>Required</sup> <a name=\\"physicalName\\" id=\\"construct-library.GreeterBucket.validateBucketName.parameter.physicalName\\"></a>
+###### \`physicalName\`<sup>Required</sup> <a name="physicalName" id="construct-library.GreeterBucket.validateBucketName.parameter.physicalName"></a>
 
 - *Type:* str
 
@@ -1753,45 +1753,45 @@ name of the bucket.
 
 ---
 
-#### Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.node\\">node</a></code> | <code><a href=\\"#custom-@aws-cdk/core.ConstructNode\\">ConstructNode</a></code> | The construct tree node associated with this construct. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.env\\">env</a></code> | <code><a href=\\"#custom-@aws-cdk/core.ResourceEnvironment\\">ResourceEnvironment</a></code> | The environment this resource belongs to. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.stack\\">stack</a></code> | <code><a href=\\"#custom-@aws-cdk/core.Stack\\">Stack</a></code> | The stack in which this resource is defined. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.bucketArn\\">bucketArn</a></code> | <code>str</code> | The ARN of the bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.bucketDomainName\\">bucketDomainName</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.bucketDualStackDomainName\\">bucketDualStackDomainName</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.bucketName\\">bucketName</a></code> | <code>str</code> | The name of the bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.bucketRegionalDomainName\\">bucketRegionalDomainName</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.bucketWebsiteDomainName\\">bucketWebsiteDomainName</a></code> | <code>str</code> | The Domain name of the static website. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.bucketWebsiteUrl\\">bucketWebsiteUrl</a></code> | <code>str</code> | The URL of the static website. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.encryptionKey\\">encryptionKey</a></code> | <code><a href=\\"#custom-@aws-cdk/aws-kms.IKey\\">IKey</a></code> | Optional KMS encryption key associated with this bucket. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.isWebsite\\">isWebsite</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
-| <code><a href=\\"#custom-construct-library.GreeterBucket.property.policy\\">policy</a></code> | <code><a href=\\"#custom-@aws-cdk/aws-s3.BucketPolicy\\">BucketPolicy</a></code> | The resource policy associated with this bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.node">node</a></code> | <code><a href="#custom-@aws-cdk/core.ConstructNode">ConstructNode</a></code> | The construct tree node associated with this construct. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.env">env</a></code> | <code><a href="#custom-@aws-cdk/core.ResourceEnvironment">ResourceEnvironment</a></code> | The environment this resource belongs to. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.stack">stack</a></code> | <code><a href="#custom-@aws-cdk/core.Stack">Stack</a></code> | The stack in which this resource is defined. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.bucketArn">bucketArn</a></code> | <code>str</code> | The ARN of the bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.bucketDomainName">bucketDomainName</a></code> | <code>str</code> | The IPv4 DNS name of the specified bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.bucketDualStackDomainName">bucketDualStackDomainName</a></code> | <code>str</code> | The IPv6 DNS name of the specified bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.bucketName">bucketName</a></code> | <code>str</code> | The name of the bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.bucketRegionalDomainName">bucketRegionalDomainName</a></code> | <code>str</code> | The regional domain name of the specified bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.bucketWebsiteDomainName">bucketWebsiteDomainName</a></code> | <code>str</code> | The Domain name of the static website. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.bucketWebsiteUrl">bucketWebsiteUrl</a></code> | <code>str</code> | The URL of the static website. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.encryptionKey">encryptionKey</a></code> | <code><a href="#custom-@aws-cdk/aws-kms.IKey">IKey</a></code> | Optional KMS encryption key associated with this bucket. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.isWebsite">isWebsite</a></code> | <code>bool</code> | If this bucket has been configured for static website hosting. |
+| <code><a href="#custom-construct-library.GreeterBucket.property.policy">policy</a></code> | <code><a href="#custom-@aws-cdk/aws-s3.BucketPolicy">BucketPolicy</a></code> | The resource policy associated with this bucket. |
 
 ---
 
-##### \`node\`<sup>Required</sup> <a name=\\"node\\" id=\\"construct-library.GreeterBucket.property.node\\"></a>
+##### \`node\`<sup>Required</sup> <a name="node" id="construct-library.GreeterBucket.property.node"></a>
 
 \`\`\`wing
 node: ConstructNode;
 \`\`\`
 
-- *Type:* <a href=\\"#custom-@aws-cdk/core.ConstructNode\\">ConstructNode</a>
+- *Type:* <a href="#custom-@aws-cdk/core.ConstructNode">ConstructNode</a>
 
 The construct tree node associated with this construct.
 
 ---
 
-##### \`env\`<sup>Required</sup> <a name=\\"env\\" id=\\"construct-library.GreeterBucket.property.env\\"></a>
+##### \`env\`<sup>Required</sup> <a name="env" id="construct-library.GreeterBucket.property.env"></a>
 
 \`\`\`wing
 env: ResourceEnvironment;
 \`\`\`
 
-- *Type:* <a href=\\"#custom-@aws-cdk/core.ResourceEnvironment\\">ResourceEnvironment</a>
+- *Type:* <a href="#custom-@aws-cdk/core.ResourceEnvironment">ResourceEnvironment</a>
 
 The environment this resource belongs to.
 
@@ -1804,19 +1804,19 @@ that might be different than the stack they were imported into.
 
 ---
 
-##### \`stack\`<sup>Required</sup> <a name=\\"stack\\" id=\\"construct-library.GreeterBucket.property.stack\\"></a>
+##### \`stack\`<sup>Required</sup> <a name="stack" id="construct-library.GreeterBucket.property.stack"></a>
 
 \`\`\`wing
 stack: Stack;
 \`\`\`
 
-- *Type:* <a href=\\"#custom-@aws-cdk/core.Stack\\">Stack</a>
+- *Type:* <a href="#custom-@aws-cdk/core.Stack">Stack</a>
 
 The stack in which this resource is defined.
 
 ---
 
-##### \`bucketArn\`<sup>Required</sup> <a name=\\"bucketArn\\" id=\\"construct-library.GreeterBucket.property.bucketArn\\"></a>
+##### \`bucketArn\`<sup>Required</sup> <a name="bucketArn" id="construct-library.GreeterBucket.property.bucketArn"></a>
 
 \`\`\`wing
 bucketArn: str;
@@ -1828,7 +1828,7 @@ The ARN of the bucket.
 
 ---
 
-##### \`bucketDomainName\`<sup>Required</sup> <a name=\\"bucketDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDomainName\\"></a>
+##### \`bucketDomainName\`<sup>Required</sup> <a name="bucketDomainName" id="construct-library.GreeterBucket.property.bucketDomainName"></a>
 
 \`\`\`wing
 bucketDomainName: str;
@@ -1840,7 +1840,7 @@ The IPv4 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name=\\"bucketDualStackDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketDualStackDomainName\\"></a>
+##### \`bucketDualStackDomainName\`<sup>Required</sup> <a name="bucketDualStackDomainName" id="construct-library.GreeterBucket.property.bucketDualStackDomainName"></a>
 
 \`\`\`wing
 bucketDualStackDomainName: str;
@@ -1852,7 +1852,7 @@ The IPv6 DNS name of the specified bucket.
 
 ---
 
-##### \`bucketName\`<sup>Required</sup> <a name=\\"bucketName\\" id=\\"construct-library.GreeterBucket.property.bucketName\\"></a>
+##### \`bucketName\`<sup>Required</sup> <a name="bucketName" id="construct-library.GreeterBucket.property.bucketName"></a>
 
 \`\`\`wing
 bucketName: str;
@@ -1864,7 +1864,7 @@ The name of the bucket.
 
 ---
 
-##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name=\\"bucketRegionalDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketRegionalDomainName\\"></a>
+##### \`bucketRegionalDomainName\`<sup>Required</sup> <a name="bucketRegionalDomainName" id="construct-library.GreeterBucket.property.bucketRegionalDomainName"></a>
 
 \`\`\`wing
 bucketRegionalDomainName: str;
@@ -1876,7 +1876,7 @@ The regional domain name of the specified bucket.
 
 ---
 
-##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name=\\"bucketWebsiteDomainName\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteDomainName\\"></a>
+##### \`bucketWebsiteDomainName\`<sup>Required</sup> <a name="bucketWebsiteDomainName" id="construct-library.GreeterBucket.property.bucketWebsiteDomainName"></a>
 
 \`\`\`wing
 bucketWebsiteDomainName: str;
@@ -1888,7 +1888,7 @@ The Domain name of the static website.
 
 ---
 
-##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name=\\"bucketWebsiteUrl\\" id=\\"construct-library.GreeterBucket.property.bucketWebsiteUrl\\"></a>
+##### \`bucketWebsiteUrl\`<sup>Required</sup> <a name="bucketWebsiteUrl" id="construct-library.GreeterBucket.property.bucketWebsiteUrl"></a>
 
 \`\`\`wing
 bucketWebsiteUrl: str;
@@ -1900,19 +1900,19 @@ The URL of the static website.
 
 ---
 
-##### \`encryptionKey\`<sup>Optional</sup> <a name=\\"encryptionKey\\" id=\\"construct-library.GreeterBucket.property.encryptionKey\\"></a>
+##### \`encryptionKey\`<sup>Optional</sup> <a name="encryptionKey" id="construct-library.GreeterBucket.property.encryptionKey"></a>
 
 \`\`\`wing
 encryptionKey: IKey;
 \`\`\`
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-kms.IKey\\">IKey</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-kms.IKey">IKey</a>
 
 Optional KMS encryption key associated with this bucket.
 
 ---
 
-##### \`isWebsite\`<sup>Optional</sup> <a name=\\"isWebsite\\" id=\\"construct-library.GreeterBucket.property.isWebsite\\"></a>
+##### \`isWebsite\`<sup>Optional</sup> <a name="isWebsite" id="construct-library.GreeterBucket.property.isWebsite"></a>
 
 \`\`\`wing
 isWebsite: bool;
@@ -1924,13 +1924,13 @@ If this bucket has been configured for static website hosting.
 
 ---
 
-##### \`policy\`<sup>Optional</sup> <a name=\\"policy\\" id=\\"construct-library.GreeterBucket.property.policy\\"></a>
+##### \`policy\`<sup>Optional</sup> <a name="policy" id="construct-library.GreeterBucket.property.policy"></a>
 
 \`\`\`wing
 policy: BucketPolicy;
 \`\`\`
 
-- *Type:* <a href=\\"#custom-@aws-cdk/aws-s3.BucketPolicy\\">BucketPolicy</a>
+- *Type:* <a href="#custom-@aws-cdk/aws-s3.BucketPolicy">BucketPolicy</a>
 
 The resource policy associated with this bucket.
 
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/parameter.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/parameter.test.ts.snap
index 949dd6218d4..fdf0d7ff7ef 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/parameter.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/parameter.test.ts.snap
@@ -1,17 +1,17 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "Grantee",
-  "docs": Object {},
+  "docs": {},
   "fqn": "Amazon.CDK.AWS.ECR.AuthorizationToken.GrantRead.parameter.Grantee",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "optional": undefined,
-  "type": Object {
+  "type": {
     "formattingPattern": "%",
-    "types": Array [
-      Object {
+    "types": [
+      {
         "displayName": "IGrantable",
         "fqn": "Amazon.CDK.AWS.IAM.IGrantable",
         "id": "@aws-cdk/aws-iam.IGrantable",
@@ -24,7 +24,7 @@ Object {
 `;
 
 exports[`csharp snapshot 2`] = `
-" \`Grantee\`<sup>Required</sup> <a name=\\"Grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+" \`Grantee\`<sup>Required</sup> <a name="Grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* Amazon.CDK.AWS.IAM.IGrantable
 
@@ -33,17 +33,17 @@ exports[`csharp snapshot 2`] = `
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "grantee",
-  "docs": Object {},
+  "docs": {},
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.AuthorizationToken.GrantRead.parameter.grantee",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "optional": undefined,
-  "type": Object {
+  "type": {
     "formattingPattern": "%",
-    "types": Array [
-      Object {
+    "types": [
+      {
         "displayName": "IGrantable",
         "fqn": "github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable",
         "id": "@aws-cdk/aws-iam.IGrantable",
@@ -56,7 +56,7 @@ Object {
 `;
 
 exports[`go snapshot 2`] = `
-" \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+" \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable
 
@@ -65,17 +65,17 @@ exports[`go snapshot 2`] = `
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "grantee",
-  "docs": Object {},
+  "docs": {},
   "fqn": "software.amazon.awscdk.services.ecr.AuthorizationToken.grantRead.parameter.grantee",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "optional": undefined,
-  "type": Object {
+  "type": {
     "formattingPattern": "%",
-    "types": Array [
-      Object {
+    "types": [
+      {
         "displayName": "IGrantable",
         "fqn": "software.amazon.awscdk.services.iam.IGrantable",
         "id": "@aws-cdk/aws-iam.IGrantable",
@@ -88,7 +88,7 @@ Object {
 `;
 
 exports[`java snapshot 2`] = `
-" \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+" \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* software.amazon.awscdk.services.iam.IGrantable
 
@@ -97,7 +97,7 @@ exports[`java snapshot 2`] = `
 `;
 
 exports[`newlines in "defaults" are removed 1`] = `
-" \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+" \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 - *Default:* default option with a newline
@@ -107,17 +107,17 @@ exports[`newlines in "defaults" are removed 1`] = `
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "grantee",
-  "docs": Object {},
+  "docs": {},
   "fqn": "aws_cdk.aws_ecr.AuthorizationToken.grant_read.parameter.grantee",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "optional": undefined,
-  "type": Object {
+  "type": {
     "formattingPattern": "%",
-    "types": Array [
-      Object {
+    "types": [
+      {
         "displayName": "IGrantable",
         "fqn": "aws_cdk.aws_iam.IGrantable",
         "id": "@aws-cdk/aws-iam.IGrantable",
@@ -130,7 +130,7 @@ Object {
 `;
 
 exports[`python snapshot 2`] = `
-" \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+" \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -139,17 +139,17 @@ exports[`python snapshot 2`] = `
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "grantee",
-  "docs": Object {},
+  "docs": {},
   "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "optional": undefined,
-  "type": Object {
+  "type": {
     "formattingPattern": "%",
-    "types": Array [
-      Object {
+    "types": [
+      {
         "displayName": "IGrantable",
         "fqn": "@aws-cdk/aws-iam.IGrantable",
         "id": "@aws-cdk/aws-iam.IGrantable",
@@ -162,7 +162,7 @@ Object {
 `;
 
 exports[`typescript snapshot 2`] = `
-" \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+" \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -171,17 +171,17 @@ exports[`typescript snapshot 2`] = `
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "grantee",
-  "docs": Object {},
+  "docs": {},
   "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
   "optional": undefined,
-  "type": Object {
+  "type": {
     "formattingPattern": "%",
-    "types": Array [
-      Object {
+    "types": [
+      {
         "displayName": "IGrantable",
         "fqn": "@aws-cdk/aws-iam.IGrantable",
         "id": "@aws-cdk/aws-iam.IGrantable",
@@ -194,7 +194,7 @@ Object {
 `;
 
 exports[`wing snapshot 2`] = `
-" \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+" \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/property.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/property.test.ts.snap
index 71dda23ddd6..bbe0ae9a138 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/property.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/property.test.ts.snap
@@ -1,11 +1,11 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "RepositoryCatalogData",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
     ],
     "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -13,7 +13,7 @@ Object {
   "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepositoryProps.property.RepositoryCatalogData",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "optional": true,
-  "type": Object {
+  "type": {
     "formattingPattern": "object",
   },
   "usage": "public object RepositoryCatalogData { get; set; }",
@@ -21,7 +21,7 @@ Object {
 `;
 
 exports[`csharp snapshot 2`] = `
-" \`RepositoryCatalogData\`<sup>Optional</sup> <a name=\\"RepositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+" \`RepositoryCatalogData\`<sup>Optional</sup> <a name="RepositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`csharp
 public object RepositoryCatalogData { get; set; }
@@ -38,11 +38,11 @@ public object RepositoryCatalogData { get; set; }
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "RepositoryCatalogData",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
     ],
     "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -50,7 +50,7 @@ Object {
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepositoryProps.property.RepositoryCatalogData",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "optional": true,
-  "type": Object {
+  "type": {
     "formattingPattern": "interface{}",
   },
   "usage": "RepositoryCatalogData interface{}",
@@ -58,7 +58,7 @@ Object {
 `;
 
 exports[`go snapshot 2`] = `
-" \`RepositoryCatalogData\`<sup>Optional</sup> <a name=\\"RepositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+" \`RepositoryCatalogData\`<sup>Optional</sup> <a name="RepositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`go
 RepositoryCatalogData interface{}
@@ -75,11 +75,11 @@ RepositoryCatalogData interface{}
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "repositoryCatalogData",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
     ],
     "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -87,7 +87,7 @@ Object {
   "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "optional": true,
-  "type": Object {
+  "type": {
     "formattingPattern": "java.lang.Object",
   },
   "usage": "public java.lang.Object getRepositoryCatalogData();",
@@ -95,7 +95,7 @@ Object {
 `;
 
 exports[`java snapshot 2`] = `
-" \`repositoryCatalogData\`<sup>Optional</sup> <a name=\\"repositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+" \`repositoryCatalogData\`<sup>Optional</sup> <a name="repositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`java
 public java.lang.Object getRepositoryCatalogData();
@@ -112,11 +112,11 @@ public java.lang.Object getRepositoryCatalogData();
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "repository_catalog_data",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
     ],
     "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -124,7 +124,7 @@ Object {
   "fqn": "aws_cdk.aws_ecr.CfnPublicRepositoryProps.property.repository_catalog_data",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "optional": true,
-  "type": Object {
+  "type": {
     "formattingPattern": "typing.Any",
   },
   "usage": "repository_catalog_data: typing.Any",
@@ -132,7 +132,7 @@ Object {
 `;
 
 exports[`python snapshot 2`] = `
-" \`repository_catalog_data\`<sup>Optional</sup> <a name=\\"repository_catalog_data\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+" \`repository_catalog_data\`<sup>Optional</sup> <a name="repository_catalog_data" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`python
 repository_catalog_data: typing.Any
@@ -149,11 +149,11 @@ repository_catalog_data: typing.Any
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "repositoryCatalogData",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
     ],
     "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -161,7 +161,7 @@ Object {
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "optional": true,
-  "type": Object {
+  "type": {
     "formattingPattern": "any",
   },
   "usage": "public readonly repositoryCatalogData: any;",
@@ -169,7 +169,7 @@ Object {
 `;
 
 exports[`typescript snapshot 2`] = `
-" \`repositoryCatalogData\`<sup>Optional</sup> <a name=\\"repositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+" \`repositoryCatalogData\`<sup>Optional</sup> <a name="repositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`typescript
 public readonly repositoryCatalogData: any;
@@ -186,11 +186,11 @@ public readonly repositoryCatalogData: any;
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "default": undefined,
   "displayName": "repositoryCatalogData",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
     ],
     "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -198,7 +198,7 @@ Object {
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
   "optional": true,
-  "type": Object {
+  "type": {
     "formattingPattern": "any",
   },
   "usage": "repositoryCatalogData: any;",
@@ -206,7 +206,7 @@ Object {
 `;
 
 exports[`wing snapshot 2`] = `
-" \`repositoryCatalogData\`<sup>Optional</sup> <a name=\\"repositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+" \`repositoryCatalogData\`<sup>Optional</sup> <a name="repositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`wing
 repositoryCatalogData: any;
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/static-function.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/static-function.test.ts.snap
index b96d52c24c8..31afd61b70f 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/static-function.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/static-function.test.ts.snap
@@ -1,25 +1,25 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "displayName": "GrantRead",
-  "docs": Object {
+  "docs": {
     "summary": "Grant access to retrieve an authorization token.",
   },
   "fqn": "Amazon.CDK.AWS.ECR.AuthorizationToken.GrantRead",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "Grantee",
-      "docs": Object {},
+      "docs": {},
       "fqn": "Amazon.CDK.AWS.ECR.AuthorizationToken.GrantRead.parameter.Grantee",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "IGrantable",
             "fqn": "Amazon.CDK.AWS.IAM.IGrantable",
             "id": "@aws-cdk/aws-iam.IGrantable",
@@ -37,7 +37,7 @@ AuthorizationToken.GrantRead(IGrantable Grantee);",
 `;
 
 exports[`csharp snapshot 2`] = `
-" \`GrantRead\` <a name=\\"GrantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+" \`GrantRead\` <a name="GrantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`csharp
 using Amazon.CDK.AWS.ECR;
@@ -47,7 +47,7 @@ AuthorizationToken.GrantRead(IGrantable Grantee);
 
 Grant access to retrieve an authorization token.
 
-# \`Grantee\`<sup>Required</sup> <a name=\\"Grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+# \`Grantee\`<sup>Required</sup> <a name="Grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* Amazon.CDK.AWS.IAM.IGrantable
 
@@ -56,25 +56,25 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "displayName": "GrantRead",
-  "docs": Object {
+  "docs": {
     "summary": "Grant access to retrieve an authorization token.",
   },
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.AuthorizationToken.GrantRead",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "grantee",
-      "docs": Object {},
+      "docs": {},
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.AuthorizationToken.GrantRead.parameter.grantee",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "IGrantable",
             "fqn": "github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable",
             "id": "@aws-cdk/aws-iam.IGrantable",
@@ -85,24 +85,24 @@ Object {
       },
     },
   ],
-  "usage": "import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+  "usage": "import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 awscdkawsecr.AuthorizationToken_GrantRead(grantee IGrantable)",
 }
 `;
 
 exports[`go snapshot 2`] = `
-" \`GrantRead\` <a name=\\"GrantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+" \`GrantRead\` <a name="GrantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`go
-import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 awscdkawsecr.AuthorizationToken_GrantRead(grantee IGrantable)
 \`\`\`
 
 Grant access to retrieve an authorization token.
 
-# \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+# \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* github.com/aws/aws-cdk-go/awscdk/awsiam/awscdkawsiam.IGrantable
 
@@ -111,25 +111,25 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "displayName": "grantRead",
-  "docs": Object {
+  "docs": {
     "summary": "Grant access to retrieve an authorization token.",
   },
   "fqn": "software.amazon.awscdk.services.ecr.AuthorizationToken.grantRead",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "grantee",
-      "docs": Object {},
+      "docs": {},
       "fqn": "software.amazon.awscdk.services.ecr.AuthorizationToken.grantRead.parameter.grantee",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "IGrantable",
             "fqn": "software.amazon.awscdk.services.iam.IGrantable",
             "id": "@aws-cdk/aws-iam.IGrantable",
@@ -147,7 +147,7 @@ AuthorizationToken.grantRead(IGrantable grantee)",
 `;
 
 exports[`java snapshot 2`] = `
-" \`grantRead\` <a name=\\"grantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+" \`grantRead\` <a name="grantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`java
 import software.amazon.awscdk.services.ecr.AuthorizationToken;
@@ -157,7 +157,7 @@ AuthorizationToken.grantRead(IGrantable grantee)
 
 Grant access to retrieve an authorization token.
 
-# \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+# \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* software.amazon.awscdk.services.iam.IGrantable
 
@@ -166,25 +166,25 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "displayName": "grant_read",
-  "docs": Object {
+  "docs": {
     "summary": "Grant access to retrieve an authorization token.",
   },
   "fqn": "aws_cdk.aws_ecr.AuthorizationToken.grant_read",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "grantee",
-      "docs": Object {},
+      "docs": {},
       "fqn": "aws_cdk.aws_ecr.AuthorizationToken.grant_read.parameter.grantee",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "IGrantable",
             "fqn": "aws_cdk.aws_iam.IGrantable",
             "id": "@aws-cdk/aws-iam.IGrantable",
@@ -204,7 +204,7 @@ aws_cdk.aws_ecr.AuthorizationToken.grant_read(
 `;
 
 exports[`python snapshot 2`] = `
-" \`grant_read\` <a name=\\"grant_read\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+" \`grant_read\` <a name="grant_read" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`python
 import aws_cdk.aws_ecr
@@ -216,7 +216,7 @@ aws_cdk.aws_ecr.AuthorizationToken.grant_read(
 
 Grant access to retrieve an authorization token.
 
-# \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+# \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* aws_cdk.aws_iam.IGrantable
 
@@ -225,25 +225,25 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "displayName": "grantRead",
-  "docs": Object {
+  "docs": {
     "summary": "Grant access to retrieve an authorization token.",
   },
   "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "grantee",
-      "docs": Object {},
+      "docs": {},
       "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "IGrantable",
             "fqn": "@aws-cdk/aws-iam.IGrantable",
             "id": "@aws-cdk/aws-iam.IGrantable",
@@ -261,7 +261,7 @@ AuthorizationToken.grantRead(grantee: IGrantable)",
 `;
 
 exports[`typescript snapshot 2`] = `
-" \`grantRead\` <a name=\\"grantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+" \`grantRead\` <a name="grantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`typescript
 import { AuthorizationToken } from '@aws-cdk/aws-ecr'
@@ -271,7 +271,7 @@ AuthorizationToken.grantRead(grantee: IGrantable)
 
 Grant access to retrieve an authorization token.
 
-# \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+# \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
@@ -280,25 +280,25 @@ Grant access to retrieve an authorization token.
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "displayName": "grantRead",
-  "docs": Object {
+  "docs": {
     "summary": "Grant access to retrieve an authorization token.",
   },
   "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
   "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead",
-  "parameters": Array [
-    Object {
+  "parameters": [
+    {
       "default": undefined,
       "displayName": "grantee",
-      "docs": Object {},
+      "docs": {},
       "fqn": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "id": "@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee",
       "optional": undefined,
-      "type": Object {
+      "type": {
         "formattingPattern": "%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "displayName": "IGrantable",
             "fqn": "@aws-cdk/aws-iam.IGrantable",
             "id": "@aws-cdk/aws-iam.IGrantable",
@@ -309,24 +309,24 @@ Object {
       },
     },
   ],
-  "usage": "bring { AuthorizationToken } from \\"@aws-cdk/aws-ecr\\";
+  "usage": "bring { AuthorizationToken } from "@aws-cdk/aws-ecr";
 
 AuthorizationToken.grantRead(grantee: IGrantable);",
 }
 `;
 
 exports[`wing snapshot 2`] = `
-" \`grantRead\` <a name=\\"grantRead\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead\\"></a>
+" \`grantRead\` <a name="grantRead" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead"></a>
 
 \`\`\`wing
-bring { AuthorizationToken } from \\"@aws-cdk/aws-ecr\\";
+bring { AuthorizationToken } from "@aws-cdk/aws-ecr";
 
 AuthorizationToken.grantRead(grantee: IGrantable);
 \`\`\`
 
 Grant access to retrieve an authorization token.
 
-# \`grantee\`<sup>Required</sup> <a name=\\"grantee\\" id=\\"@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee\\"></a>
+# \`grantee\`<sup>Required</sup> <a name="grantee" id="@aws-cdk/aws-ecr.AuthorizationToken.grantRead.parameter.grantee"></a>
 
 - *Type:* @aws-cdk/aws-iam.IGrantable
 
diff --git a/apps/jsii-docgen/test/docgen/view/__snapshots__/struct.test.ts.snap b/apps/jsii-docgen/test/docgen/view/__snapshots__/struct.test.ts.snap
index 70c5fcef23c..e6137398bbf 100644
--- a/apps/jsii-docgen/test/docgen/view/__snapshots__/struct.test.ts.snap
+++ b/apps/jsii-docgen/test/docgen/view/__snapshots__/struct.test.ts.snap
@@ -1,22 +1,22 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`csharp snapshot 1`] = `
-Object {
+{
   "displayName": "CfnPublicRepositoryProps",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html",
     ],
     "summary": "Properties for defining a \`AWS::ECR::PublicRepository\`.",
   },
   "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepositoryProps",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "RepositoryCatalogData",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -24,16 +24,16 @@ Object {
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepositoryProps.property.RepositoryCatalogData",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "object",
       },
       "usage": "public object RepositoryCatalogData { get; set; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryName",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -41,16 +41,16 @@ Object {
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepositoryProps.property.RepositoryName",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public string RepositoryName { get; set; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryPolicyText",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -58,16 +58,16 @@ Object {
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepositoryProps.property.RepositoryPolicyText",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "object",
       },
       "usage": "public object RepositoryPolicyText { get; set; }",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -75,13 +75,13 @@ Object {
       "fqn": "Amazon.CDK.AWS.ECR.CfnPublicRepositoryProps.property.Tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "%[]",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "Amazon.CDK.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -107,13 +107,13 @@ new CfnPublicRepositoryProps {
 `;
 
 exports[`csharp snapshot 2`] = `
-" CfnPublicRepositoryProps <a name=\\"CfnPublicRepositoryProps\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\"></a>
+" CfnPublicRepositoryProps <a name="CfnPublicRepositoryProps" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps"></a>
 
 Properties for defining a \`AWS::ECR::PublicRepository\`.
 
 > [http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html)
 
-# Initializer <a name=\\"Initializer\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer\\"></a>
+# Initializer <a name="Initializer" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer"></a>
 
 \`\`\`csharp
 using Amazon.CDK.AWS.ECR;
@@ -126,18 +126,18 @@ new CfnPublicRepositoryProps {
 };
 \`\`\`
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\">RepositoryCatalogData</a></code> | <code>object</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\">RepositoryName</a></code> | <code>string</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\">RepositoryPolicyText</a></code> | <code>object</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\">Tags</a></code> | <code>Amazon.CDK.CfnTag[]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData">RepositoryCatalogData</a></code> | <code>object</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName">RepositoryName</a></code> | <code>string</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText">RepositoryPolicyText</a></code> | <code>object</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags">Tags</a></code> | <code>Amazon.CDK.CfnTag[]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-## \`RepositoryCatalogData\`<sup>Optional</sup> <a name=\\"RepositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+## \`RepositoryCatalogData\`<sup>Optional</sup> <a name="RepositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`csharp
 public object RepositoryCatalogData { get; set; }
@@ -151,7 +151,7 @@ public object RepositoryCatalogData { get; set; }
 
 ---
 
-## \`RepositoryName\`<sup>Optional</sup> <a name=\\"RepositoryName\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\"></a>
+## \`RepositoryName\`<sup>Optional</sup> <a name="RepositoryName" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName"></a>
 
 \`\`\`csharp
 public string RepositoryName { get; set; }
@@ -165,7 +165,7 @@ public string RepositoryName { get; set; }
 
 ---
 
-## \`RepositoryPolicyText\`<sup>Optional</sup> <a name=\\"RepositoryPolicyText\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\"></a>
+## \`RepositoryPolicyText\`<sup>Optional</sup> <a name="RepositoryPolicyText" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText"></a>
 
 \`\`\`csharp
 public object RepositoryPolicyText { get; set; }
@@ -179,7 +179,7 @@ public object RepositoryPolicyText { get; set; }
 
 ---
 
-## \`Tags\`<sup>Optional</sup> <a name=\\"Tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\"></a>
+## \`Tags\`<sup>Optional</sup> <a name="Tags" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags"></a>
 
 \`\`\`csharp
 public CfnTag[] Tags { get; set; }
@@ -196,22 +196,22 @@ public CfnTag[] Tags { get; set; }
 `;
 
 exports[`go snapshot 1`] = `
-Object {
+{
   "displayName": "CfnPublicRepositoryProps",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html",
     ],
     "summary": "Properties for defining a \`AWS::ECR::PublicRepository\`.",
   },
   "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepositoryProps",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "RepositoryCatalogData",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -219,16 +219,16 @@ Object {
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepositoryProps.property.RepositoryCatalogData",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "interface{}",
       },
       "usage": "RepositoryCatalogData interface{}",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryName",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -236,16 +236,16 @@ Object {
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepositoryProps.property.RepositoryName",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "*string",
       },
       "usage": "RepositoryName *string",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "RepositoryPolicyText",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -253,16 +253,16 @@ Object {
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepositoryProps.property.RepositoryPolicyText",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "interface{}",
       },
       "usage": "RepositoryPolicyText interface{}",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "Tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -270,13 +270,13 @@ Object {
       "fqn": "github.com/aws/aws-cdk-go/awscdkawsecr.CfnPublicRepositoryProps.property.Tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "*[]%",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "github.com/aws/aws-cdk-go/awscdk/awscdkcore.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -290,7 +290,7 @@ Object {
       "usage": "Tags *[]CfnTag",
     },
   ],
-  "usage": "import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+  "usage": "import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 &awscdkawsecr.CfnPublicRepositoryProps {
 	RepositoryCatalogData: interface{},
@@ -302,16 +302,16 @@ Object {
 `;
 
 exports[`go snapshot 2`] = `
-" CfnPublicRepositoryProps <a name=\\"CfnPublicRepositoryProps\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\"></a>
+" CfnPublicRepositoryProps <a name="CfnPublicRepositoryProps" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps"></a>
 
 Properties for defining a \`AWS::ECR::PublicRepository\`.
 
 > [http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html)
 
-# Initializer <a name=\\"Initializer\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer\\"></a>
+# Initializer <a name="Initializer" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer"></a>
 
 \`\`\`go
-import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
+import "github.com/aws/aws-cdk-go/awscdkawsecr"
 
 &awscdkawsecr.CfnPublicRepositoryProps {
 	RepositoryCatalogData: interface{},
@@ -321,18 +321,18 @@ import \\"github.com/aws/aws-cdk-go/awscdkawsecr\\"
 }
 \`\`\`
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\">RepositoryCatalogData</a></code> | <code>interface{}</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\">RepositoryName</a></code> | <code>*string</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\">RepositoryPolicyText</a></code> | <code>interface{}</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\">Tags</a></code> | <code>*[]github.com/aws/aws-cdk-go/awscdk/awscdkcore.CfnTag</code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData">RepositoryCatalogData</a></code> | <code>interface{}</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName">RepositoryName</a></code> | <code>*string</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText">RepositoryPolicyText</a></code> | <code>interface{}</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags">Tags</a></code> | <code>*[]github.com/aws/aws-cdk-go/awscdk/awscdkcore.CfnTag</code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-## \`RepositoryCatalogData\`<sup>Optional</sup> <a name=\\"RepositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+## \`RepositoryCatalogData\`<sup>Optional</sup> <a name="RepositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`go
 RepositoryCatalogData interface{}
@@ -346,7 +346,7 @@ RepositoryCatalogData interface{}
 
 ---
 
-## \`RepositoryName\`<sup>Optional</sup> <a name=\\"RepositoryName\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\"></a>
+## \`RepositoryName\`<sup>Optional</sup> <a name="RepositoryName" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName"></a>
 
 \`\`\`go
 RepositoryName *string
@@ -360,7 +360,7 @@ RepositoryName *string
 
 ---
 
-## \`RepositoryPolicyText\`<sup>Optional</sup> <a name=\\"RepositoryPolicyText\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\"></a>
+## \`RepositoryPolicyText\`<sup>Optional</sup> <a name="RepositoryPolicyText" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText"></a>
 
 \`\`\`go
 RepositoryPolicyText interface{}
@@ -374,7 +374,7 @@ RepositoryPolicyText interface{}
 
 ---
 
-## \`Tags\`<sup>Optional</sup> <a name=\\"Tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\"></a>
+## \`Tags\`<sup>Optional</sup> <a name="Tags" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags"></a>
 
 \`\`\`go
 Tags *[]CfnTag
@@ -391,22 +391,22 @@ Tags *[]CfnTag
 `;
 
 exports[`java snapshot 1`] = `
-Object {
+{
   "displayName": "CfnPublicRepositoryProps",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html",
     ],
     "summary": "Properties for defining a \`AWS::ECR::PublicRepository\`.",
   },
   "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepositoryProps",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "repositoryCatalogData",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -414,16 +414,16 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.Object",
       },
       "usage": "public java.lang.Object getRepositoryCatalogData();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryName",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -431,16 +431,16 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepositoryProps.property.repositoryName",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.String",
       },
       "usage": "public java.lang.String getRepositoryName();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryPolicyText",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -448,16 +448,16 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.lang.Object",
       },
       "usage": "public java.lang.Object getRepositoryPolicyText();",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -465,13 +465,13 @@ Object {
       "fqn": "software.amazon.awscdk.services.ecr.CfnPublicRepositoryProps.property.tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "java.util.List<%>",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "software.amazon.awscdk.core.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -497,13 +497,13 @@ CfnPublicRepositoryProps.builder()
 `;
 
 exports[`java snapshot 2`] = `
-" CfnPublicRepositoryProps <a name=\\"CfnPublicRepositoryProps\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\"></a>
+" CfnPublicRepositoryProps <a name="CfnPublicRepositoryProps" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps"></a>
 
 Properties for defining a \`AWS::ECR::PublicRepository\`.
 
 > [http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html)
 
-# Initializer <a name=\\"Initializer\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer\\"></a>
+# Initializer <a name="Initializer" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer"></a>
 
 \`\`\`java
 import software.amazon.awscdk.services.ecr.CfnPublicRepositoryProps;
@@ -516,18 +516,18 @@ CfnPublicRepositoryProps.builder()
     .build();
 \`\`\`
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\">repositoryCatalogData</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\">repositoryName</a></code> | <code>java.lang.String</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\">repositoryPolicyText</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\">tags</a></code> | <code>java.util.List<software.amazon.awscdk.core.CfnTag></code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData">repositoryCatalogData</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName">repositoryName</a></code> | <code>java.lang.String</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText">repositoryPolicyText</a></code> | <code>java.lang.Object</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags">tags</a></code> | <code>java.util.List<software.amazon.awscdk.core.CfnTag></code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-## \`repositoryCatalogData\`<sup>Optional</sup> <a name=\\"repositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+## \`repositoryCatalogData\`<sup>Optional</sup> <a name="repositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`java
 public java.lang.Object getRepositoryCatalogData();
@@ -541,7 +541,7 @@ public java.lang.Object getRepositoryCatalogData();
 
 ---
 
-## \`repositoryName\`<sup>Optional</sup> <a name=\\"repositoryName\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\"></a>
+## \`repositoryName\`<sup>Optional</sup> <a name="repositoryName" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName"></a>
 
 \`\`\`java
 public java.lang.String getRepositoryName();
@@ -555,7 +555,7 @@ public java.lang.String getRepositoryName();
 
 ---
 
-## \`repositoryPolicyText\`<sup>Optional</sup> <a name=\\"repositoryPolicyText\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\"></a>
+## \`repositoryPolicyText\`<sup>Optional</sup> <a name="repositoryPolicyText" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText"></a>
 
 \`\`\`java
 public java.lang.Object getRepositoryPolicyText();
@@ -569,7 +569,7 @@ public java.lang.Object getRepositoryPolicyText();
 
 ---
 
-## \`tags\`<sup>Optional</sup> <a name=\\"tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\"></a>
+## \`tags\`<sup>Optional</sup> <a name="tags" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags"></a>
 
 \`\`\`java
 public java.util.List<CfnTag> getTags();
@@ -586,22 +586,22 @@ public java.util.List<CfnTag> getTags();
 `;
 
 exports[`python snapshot 1`] = `
-Object {
+{
   "displayName": "CfnPublicRepositoryProps",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html",
     ],
     "summary": "Properties for defining a \`AWS::ECR::PublicRepository\`.",
   },
   "fqn": "aws_cdk.aws_ecr.CfnPublicRepositoryProps",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "repository_catalog_data",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -609,16 +609,16 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepositoryProps.property.repository_catalog_data",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "typing.Any",
       },
       "usage": "repository_catalog_data: typing.Any",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_name",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -626,16 +626,16 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepositoryProps.property.repository_name",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repository_name: str",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repository_policy_text",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -643,16 +643,16 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepositoryProps.property.repository_policy_text",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "typing.Any",
       },
       "usage": "repository_policy_text: typing.Any",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -660,13 +660,13 @@ Object {
       "fqn": "aws_cdk.aws_ecr.CfnPublicRepositoryProps.property.tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "typing.List[%]",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "aws_cdk.core.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -692,13 +692,13 @@ aws_cdk.aws_ecr.CfnPublicRepositoryProps(
 `;
 
 exports[`python snapshot 2`] = `
-" CfnPublicRepositoryProps <a name=\\"CfnPublicRepositoryProps\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\"></a>
+" CfnPublicRepositoryProps <a name="CfnPublicRepositoryProps" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps"></a>
 
 Properties for defining a \`AWS::ECR::PublicRepository\`.
 
 > [http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html)
 
-# Initializer <a name=\\"Initializer\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer\\"></a>
+# Initializer <a name="Initializer" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer"></a>
 
 \`\`\`python
 import aws_cdk.aws_ecr
@@ -711,18 +711,18 @@ aws_cdk.aws_ecr.CfnPublicRepositoryProps(
 )
 \`\`\`
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\">repository_catalog_data</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\">repository_name</a></code> | <code>str</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\">repository_policy_text</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\">tags</a></code> | <code>typing.List[aws_cdk.core.CfnTag]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData">repository_catalog_data</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName">repository_name</a></code> | <code>str</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText">repository_policy_text</a></code> | <code>typing.Any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags">tags</a></code> | <code>typing.List[aws_cdk.core.CfnTag]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-## \`repository_catalog_data\`<sup>Optional</sup> <a name=\\"repository_catalog_data\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+## \`repository_catalog_data\`<sup>Optional</sup> <a name="repository_catalog_data" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`python
 repository_catalog_data: typing.Any
@@ -736,7 +736,7 @@ repository_catalog_data: typing.Any
 
 ---
 
-## \`repository_name\`<sup>Optional</sup> <a name=\\"repository_name\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\"></a>
+## \`repository_name\`<sup>Optional</sup> <a name="repository_name" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName"></a>
 
 \`\`\`python
 repository_name: str
@@ -750,7 +750,7 @@ repository_name: str
 
 ---
 
-## \`repository_policy_text\`<sup>Optional</sup> <a name=\\"repository_policy_text\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\"></a>
+## \`repository_policy_text\`<sup>Optional</sup> <a name="repository_policy_text" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText"></a>
 
 \`\`\`python
 repository_policy_text: typing.Any
@@ -764,7 +764,7 @@ repository_policy_text: typing.Any
 
 ---
 
-## \`tags\`<sup>Optional</sup> <a name=\\"tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\"></a>
+## \`tags\`<sup>Optional</sup> <a name="tags" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags"></a>
 
 \`\`\`python
 tags: typing.List[CfnTag]
@@ -781,22 +781,22 @@ tags: typing.List[CfnTag]
 `;
 
 exports[`typescript snapshot 1`] = `
-Object {
+{
   "displayName": "CfnPublicRepositoryProps",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html",
     ],
     "summary": "Properties for defining a \`AWS::ECR::PublicRepository\`.",
   },
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "repositoryCatalogData",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -804,16 +804,16 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "any",
       },
       "usage": "public readonly repositoryCatalogData: any;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryName",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -821,16 +821,16 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "string",
       },
       "usage": "public readonly repositoryName: string;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryPolicyText",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -838,16 +838,16 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "any",
       },
       "usage": "public readonly repositoryPolicyText: any;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -855,13 +855,13 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "%[]",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "@aws-cdk/core.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -882,13 +882,13 @@ const cfnPublicRepositoryProps: CfnPublicRepositoryProps = { ... }",
 `;
 
 exports[`typescript snapshot 2`] = `
-" CfnPublicRepositoryProps <a name=\\"CfnPublicRepositoryProps\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\"></a>
+" CfnPublicRepositoryProps <a name="CfnPublicRepositoryProps" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps"></a>
 
 Properties for defining a \`AWS::ECR::PublicRepository\`.
 
 > [http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html)
 
-# Initializer <a name=\\"Initializer\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer\\"></a>
+# Initializer <a name="Initializer" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer"></a>
 
 \`\`\`typescript
 import { CfnPublicRepositoryProps } from '@aws-cdk/aws-ecr'
@@ -896,18 +896,18 @@ import { CfnPublicRepositoryProps } from '@aws-cdk/aws-ecr'
 const cfnPublicRepositoryProps: CfnPublicRepositoryProps = { ... }
 \`\`\`
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\">repositoryCatalogData</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\">repositoryName</a></code> | <code>string</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\">repositoryPolicyText</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\">tags</a></code> | <code>@aws-cdk/core.CfnTag[]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData">repositoryCatalogData</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName">repositoryName</a></code> | <code>string</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText">repositoryPolicyText</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags">tags</a></code> | <code>@aws-cdk/core.CfnTag[]</code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-## \`repositoryCatalogData\`<sup>Optional</sup> <a name=\\"repositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+## \`repositoryCatalogData\`<sup>Optional</sup> <a name="repositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`typescript
 public readonly repositoryCatalogData: any;
@@ -921,7 +921,7 @@ public readonly repositoryCatalogData: any;
 
 ---
 
-## \`repositoryName\`<sup>Optional</sup> <a name=\\"repositoryName\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\"></a>
+## \`repositoryName\`<sup>Optional</sup> <a name="repositoryName" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName"></a>
 
 \`\`\`typescript
 public readonly repositoryName: string;
@@ -935,7 +935,7 @@ public readonly repositoryName: string;
 
 ---
 
-## \`repositoryPolicyText\`<sup>Optional</sup> <a name=\\"repositoryPolicyText\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\"></a>
+## \`repositoryPolicyText\`<sup>Optional</sup> <a name="repositoryPolicyText" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText"></a>
 
 \`\`\`typescript
 public readonly repositoryPolicyText: any;
@@ -949,7 +949,7 @@ public readonly repositoryPolicyText: any;
 
 ---
 
-## \`tags\`<sup>Optional</sup> <a name=\\"tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\"></a>
+## \`tags\`<sup>Optional</sup> <a name="tags" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags"></a>
 
 \`\`\`typescript
 public readonly tags: CfnTag[];
@@ -966,22 +966,22 @@ public readonly tags: CfnTag[];
 `;
 
 exports[`wing snapshot 1`] = `
-Object {
+{
   "displayName": "CfnPublicRepositoryProps",
-  "docs": Object {
-    "links": Array [
+  "docs": {
+    "links": [
       "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html",
     ],
     "summary": "Properties for defining a \`AWS::ECR::PublicRepository\`.",
   },
   "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
   "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps",
-  "properties": Array [
-    Object {
+  "properties": [
+    {
       "default": undefined,
       "displayName": "repositoryCatalogData",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryCatalogData\`.",
@@ -989,16 +989,16 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "any",
       },
       "usage": "repositoryCatalogData: any;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryName",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryName\`.",
@@ -1006,16 +1006,16 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "str",
       },
       "usage": "repositoryName: str;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "repositoryPolicyText",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext",
         ],
         "summary": "\`AWS::ECR::PublicRepository.RepositoryPolicyText\`.",
@@ -1023,16 +1023,16 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "any",
       },
       "usage": "repositoryPolicyText: any;",
     },
-    Object {
+    {
       "default": undefined,
       "displayName": "tags",
-      "docs": Object {
-        "links": Array [
+      "docs": {
+        "links": [
           "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags",
         ],
         "summary": "\`AWS::ECR::PublicRepository.Tags\`.",
@@ -1040,13 +1040,13 @@ Object {
       "fqn": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "id": "@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags",
       "optional": true,
-      "type": Object {
+      "type": {
         "formattingPattern": "MutArray&lt;%&gt;",
-        "types": Array [
-          Object {
+        "types": [
+          {
             "formattingPattern": "%",
-            "types": Array [
-              Object {
+            "types": [
+              {
                 "displayName": "CfnTag",
                 "fqn": "@aws-cdk/core.CfnTag",
                 "id": "@aws-cdk/core.CfnTag",
@@ -1060,39 +1060,39 @@ Object {
       "usage": "tags: MutArray&lt;CfnTag&gt;;",
     },
   ],
-  "usage": "bring { CfnPublicRepositoryProps } from \\"@aws-cdk/aws-ecr\\";
+  "usage": "bring { CfnPublicRepositoryProps } from "@aws-cdk/aws-ecr";
 
 let CfnPublicRepositoryProps = CfnPublicRepositoryProps{ ... };",
 }
 `;
 
 exports[`wing snapshot 2`] = `
-" CfnPublicRepositoryProps <a name=\\"CfnPublicRepositoryProps\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps\\"></a>
+" CfnPublicRepositoryProps <a name="CfnPublicRepositoryProps" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps"></a>
 
 Properties for defining a \`AWS::ECR::PublicRepository\`.
 
 > [http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html)
 
-# Initializer <a name=\\"Initializer\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer\\"></a>
+# Initializer <a name="Initializer" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.Initializer"></a>
 
 \`\`\`wing
-bring { CfnPublicRepositoryProps } from \\"@aws-cdk/aws-ecr\\";
+bring { CfnPublicRepositoryProps } from "@aws-cdk/aws-ecr";
 
 let CfnPublicRepositoryProps = CfnPublicRepositoryProps{ ... };
 \`\`\`
 
-# Properties <a name=\\"Properties\\" id=\\"Properties\\"></a>
+# Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\">repositoryCatalogData</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\">repositoryName</a></code> | <code>str</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\">repositoryPolicyText</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
-| <code><a href=\\"#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\">tags</a></code> | <code>MutArray&lt;@aws-cdk/core.CfnTag&gt;</code> | \`AWS::ECR::PublicRepository.Tags\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData">repositoryCatalogData</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryCatalogData\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName">repositoryName</a></code> | <code>str</code> | \`AWS::ECR::PublicRepository.RepositoryName\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText">repositoryPolicyText</a></code> | <code>any</code> | \`AWS::ECR::PublicRepository.RepositoryPolicyText\`. |
+| <code><a href="#@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags">tags</a></code> | <code>MutArray&lt;@aws-cdk/core.CfnTag&gt;</code> | \`AWS::ECR::PublicRepository.Tags\`. |
 
 ---
 
-## \`repositoryCatalogData\`<sup>Optional</sup> <a name=\\"repositoryCatalogData\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData\\"></a>
+## \`repositoryCatalogData\`<sup>Optional</sup> <a name="repositoryCatalogData" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryCatalogData"></a>
 
 \`\`\`wing
 repositoryCatalogData: any;
@@ -1106,7 +1106,7 @@ repositoryCatalogData: any;
 
 ---
 
-## \`repositoryName\`<sup>Optional</sup> <a name=\\"repositoryName\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName\\"></a>
+## \`repositoryName\`<sup>Optional</sup> <a name="repositoryName" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryName"></a>
 
 \`\`\`wing
 repositoryName: str;
@@ -1120,7 +1120,7 @@ repositoryName: str;
 
 ---
 
-## \`repositoryPolicyText\`<sup>Optional</sup> <a name=\\"repositoryPolicyText\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText\\"></a>
+## \`repositoryPolicyText\`<sup>Optional</sup> <a name="repositoryPolicyText" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.repositoryPolicyText"></a>
 
 \`\`\`wing
 repositoryPolicyText: any;
@@ -1134,7 +1134,7 @@ repositoryPolicyText: any;
 
 ---
 
-## \`tags\`<sup>Optional</sup> <a name=\\"tags\\" id=\\"@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags\\"></a>
+## \`tags\`<sup>Optional</sup> <a name="tags" id="@aws-cdk/aws-ecr.CfnPublicRepositoryProps.property.tags"></a>
 
 \`\`\`wing
 tags: MutArray<CfnTag>;
diff --git a/apps/jsii-docgen/test/docgen/view/_npm.test.ts b/apps/jsii-docgen/test/docgen/view/_npm.test.ts
index 7860fc640a5..95aaebde150 100644
--- a/apps/jsii-docgen/test/docgen/view/_npm.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/_npm.test.ts
@@ -2,6 +2,7 @@ import { ChildProcess, spawn } from "child_process";
 import { EventEmitter } from "events";
 import { tmpdir } from "os";
 import { Readable, Writable } from "stream";
+import { vi } from "vitest";
 import {
   NoSpaceLeftOnDevice,
   NpmError,
@@ -11,11 +12,8 @@ import { Npm } from "../../../src/docgen/view/_npm";
 
 const TMPDIR = tmpdir();
 
-jest.mock("child_process");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const mockSpawn = require("child_process").spawn as jest.MockedFunction<
-  typeof spawn
->;
+vi.mock("child_process");
+const mockSpawn = vi.mocked(spawn);
 
 test("NoSpaceLeftOnDevice error", () => {
   // GIVEN
@@ -184,6 +182,8 @@ class MockChildProcess extends EventEmitter implements ChildProcess {
   public unref(): never {
     throw new UnsupportedCallError();
   }
+
+  [Symbol.dispose](): void {}
 }
 
 export class UnsupportedCallError extends Error {
diff --git a/apps/jsii-docgen/test/docgen/view/class.test.ts b/apps/jsii-docgen/test/docgen/view/class.test.ts
index 23a26729b33..5e05c8b3da6 100644
--- a/apps/jsii-docgen/test/docgen/view/class.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/class.test.ts
@@ -19,7 +19,7 @@ const findClass = (): reflect.ClassType => {
   throw new Error("Assembly does not contain a class");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const klass = new Class(transpile, findClass()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/documentation.test.ts b/apps/jsii-docgen/test/docgen/view/documentation.test.ts
index db753452ebd..6d82cef5cc9 100644
--- a/apps/jsii-docgen/test/docgen/view/documentation.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/documentation.test.ts
@@ -1,8 +1,6 @@
 import * as path from "path";
 import { Documentation, Language } from "../../../src";
 
-jest.setTimeout(30 * 1000);
-
 describe("wing", () => {
   test("single package", async () => {
     const docs = await Documentation.forProject(
diff --git a/apps/jsii-docgen/test/docgen/view/enum.test.ts b/apps/jsii-docgen/test/docgen/view/enum.test.ts
index 8567c392e64..ebfb4c68d94 100644
--- a/apps/jsii-docgen/test/docgen/view/enum.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/enum.test.ts
@@ -19,7 +19,7 @@ const findEnum = (): reflect.EnumType => {
   throw new Error("Assembly does not contain an emum");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const enu = new Enum(transpile, findEnum()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/initializer.test.ts b/apps/jsii-docgen/test/docgen/view/initializer.test.ts
index a08a3993959..68f123959c5 100644
--- a/apps/jsii-docgen/test/docgen/view/initializer.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/initializer.test.ts
@@ -21,7 +21,7 @@ const findInitializer = (): reflect.Initializer => {
   throw new Error("Assembly does not contain an initializer");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const init = new Initializer(transpile, findInitializer()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/instance-method.test.ts b/apps/jsii-docgen/test/docgen/view/instance-method.test.ts
index a61f6093bc9..59c45fe6979 100644
--- a/apps/jsii-docgen/test/docgen/view/instance-method.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/instance-method.test.ts
@@ -23,7 +23,7 @@ const findInstanceMethod = (): reflect.Method => {
   throw new Error("Assembly does not contain an instance method");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const method = new InstanceMethod(transpile, findInstanceMethod()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/interface.test.ts b/apps/jsii-docgen/test/docgen/view/interface.test.ts
index c33683ef436..f324b656fca 100644
--- a/apps/jsii-docgen/test/docgen/view/interface.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/interface.test.ts
@@ -21,7 +21,7 @@ const findInterface = (): reflect.InterfaceType => {
   throw new Error("Assembly does not contain an interface");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const iface = new Interface(transpile, findInterface()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/markdown.test.ts b/apps/jsii-docgen/test/docgen/view/markdown.test.ts
index 2eb6a26537f..5b6ec39c8c3 100644
--- a/apps/jsii-docgen/test/docgen/view/markdown.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/markdown.test.ts
@@ -2,8 +2,6 @@ import * as path from "path";
 import { Documentation, Language } from "../../../src";
 import { JsiiEntity } from "../../../src/docgen/schema";
 
-jest.setTimeout(60 * 1000);
-
 let docs: Documentation;
 
 beforeAll(async () => {
diff --git a/apps/jsii-docgen/test/docgen/view/parameter.test.ts b/apps/jsii-docgen/test/docgen/view/parameter.test.ts
index 8f01f9ef66e..a1dc5c34bfb 100644
--- a/apps/jsii-docgen/test/docgen/view/parameter.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/parameter.test.ts
@@ -24,7 +24,7 @@ const findParameter = (): reflect.Parameter => {
   throw new Error("Assembly does not contain a parameter");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const param = new Parameter(transpile, findParameter()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/property.test.ts b/apps/jsii-docgen/test/docgen/view/property.test.ts
index d8342f0e94c..f10f4192ca1 100644
--- a/apps/jsii-docgen/test/docgen/view/property.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/property.test.ts
@@ -21,7 +21,7 @@ const findProperty = (): reflect.Property => {
   throw new Error("Assembly does not contain a property");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const prop = new Property(transpile, findProperty()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/static-function.test.ts b/apps/jsii-docgen/test/docgen/view/static-function.test.ts
index 02584d40b78..a41240b0f5b 100644
--- a/apps/jsii-docgen/test/docgen/view/static-function.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/static-function.test.ts
@@ -23,7 +23,7 @@ const findStaticFunction = (): reflect.Method => {
   throw new Error("Assembly does not contain a static function");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const func = new StaticFunction(transpile, findStaticFunction()).toJson();
diff --git a/apps/jsii-docgen/test/docgen/view/struct.test.ts b/apps/jsii-docgen/test/docgen/view/struct.test.ts
index 3c199a6a06d..c377d72db77 100644
--- a/apps/jsii-docgen/test/docgen/view/struct.test.ts
+++ b/apps/jsii-docgen/test/docgen/view/struct.test.ts
@@ -21,7 +21,7 @@ const findStruct = (): reflect.InterfaceType => {
   throw new Error("Assembly does not contain a struct");
 };
 
-test.each(Language.values())("%s snapshot", (language) => {
+test.each(Language.values().map((l) => l.name))("%s snapshot", (language) => {
   const { transpile } = LANGUAGE_SPECIFIC[language.toString()];
   const markdown = new MarkdownRenderer({ language, ...metadata });
   const struct = new Struct(transpile, findStruct()).toJson();
diff --git a/apps/jsii-docgen/turbo.json b/apps/jsii-docgen/turbo.json
index 583ed6ae5d6..ceb2ceab59a 100644
--- a/apps/jsii-docgen/turbo.json
+++ b/apps/jsii-docgen/turbo.json
@@ -4,6 +4,9 @@
   "pipeline": {
     "compile": {
       "outputs": ["lib/**"]
+    },
+    "test": {
+      "outputs": ["test/**/*.snap"]
     }
   }
 }
diff --git a/apps/jsii-docgen/vitest.config.mts b/apps/jsii-docgen/vitest.config.mts
new file mode 100644
index 00000000000..1e5c12fc0ab
--- /dev/null
+++ b/apps/jsii-docgen/vitest.config.mts
@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["test/**/*.test.ts"],
+    globals: true,
+    testTimeout: 60000,
+  },
+});
diff --git a/apps/vscode-wing/.projen/deps.json b/apps/vscode-wing/.projen/deps.json
index 432892546f0..24b6d81e897 100644
--- a/apps/vscode-wing/.projen/deps.json
+++ b/apps/vscode-wing/.projen/deps.json
@@ -40,16 +40,6 @@
       "name": "@vscode/vsce",
       "type": "build"
     },
-    {
-      "name": "@wingconsole/app",
-      "version": "workspace:^",
-      "type": "build"
-    },
-    {
-      "name": "@wingconsole/server",
-      "version": "workspace:^",
-      "type": "build"
-    },
     {
       "name": "eslint-config-prettier",
       "type": "build"
@@ -80,11 +70,6 @@
       "version": "^2.6.7",
       "type": "build"
     },
-    {
-      "name": "npm-check-updates",
-      "version": "^16",
-      "type": "build"
-    },
     {
       "name": "open",
       "type": "build"
@@ -98,11 +83,11 @@
       "type": "build"
     },
     {
-      "name": "ts-node",
+      "name": "tsup",
       "type": "build"
     },
     {
-      "name": "tsup",
+      "name": "tsx",
       "type": "build"
     },
     {
@@ -125,6 +110,11 @@
     {
       "name": "ws",
       "type": "build"
+    },
+    {
+      "name": "@types/node",
+      "version": "^20.11.0",
+      "type": "devenv"
     }
   ],
   "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"."
diff --git a/apps/vscode-wing/.projen/tasks.json b/apps/vscode-wing/.projen/tasks.json
index 07e05df05de..8d6ab3ccc74 100644
--- a/apps/vscode-wing/.projen/tasks.json
+++ b/apps/vscode-wing/.projen/tasks.json
@@ -70,7 +70,7 @@
       "description": "Synthesize project files",
       "steps": [
         {
-          "exec": "ts-node --project tsconfig.dev.json .projenrc.ts"
+          "exec": "tsx --tsconfig tsconfig.dev.json .projenrc.ts"
         }
       ]
     },
@@ -137,10 +137,6 @@
       "name": "post-compile",
       "description": "Runs after successful compilation"
     },
-    "post-upgrade": {
-      "name": "post-upgrade",
-      "description": "Runs after upgrading dependencies"
-    },
     "pre-compile": {
       "name": "pre-compile",
       "description": "Prepare the project for compilation"
@@ -154,45 +150,6 @@
         }
       ]
     },
-    "upgrade": {
-      "name": "upgrade",
-      "description": "upgrade dependencies",
-      "env": {
-        "CI": "0"
-      },
-      "steps": [
-        {
-          "exec": "pnpm update npm-check-updates"
-        },
-        {
-          "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='@wingconsole/app,@wingconsole/server,winglang'"
-        },
-        {
-          "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='@wingconsole/app,@wingconsole/server,winglang'"
-        },
-        {
-          "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='@wingconsole/app,@wingconsole/server,winglang'"
-        },
-        {
-          "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='@wingconsole/app,@wingconsole/server,winglang'"
-        },
-        {
-          "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='@wingconsole/app,@wingconsole/server,winglang'"
-        },
-        {
-          "exec": "pnpm i --no-frozen-lockfile"
-        },
-        {
-          "exec": "pnpm update @trpc/client @types/node-fetch @types/node @types/vscode @types/which @types/ws @typescript-eslint/eslint-plugin @typescript-eslint/parser @vscode/vsce @wingconsole/app @wingconsole/server eslint-config-prettier eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint node-fetch npm-check-updates open prettier projen ts-node tsup typescript vscode-languageclient which winglang ws"
-        },
-        {
-          "exec": "pnpm exec projen"
-        },
-        {
-          "spawn": "post-upgrade"
-        }
-      ]
-    },
     "watch": {
       "name": "watch",
       "description": "Watch & compile in the background",
diff --git a/apps/vscode-wing/.projenrc.ts b/apps/vscode-wing/.projenrc.ts
index 32cbf87b50b..4c3bd1faad5 100644
--- a/apps/vscode-wing/.projenrc.ts
+++ b/apps/vscode-wing/.projenrc.ts
@@ -1,4 +1,4 @@
-import { IgnoreFile } from "projen";
+import { IgnoreFile, DependencyType } from "projen";
 import { NodePackageManager } from "projen/lib/javascript";
 import { TypeScriptAppProject } from "projen/lib/typescript";
 import { VSCodeExtensionContributions } from "./src/project/vscode_types";
@@ -35,6 +35,7 @@ const project = new TypeScriptAppProject({
   buildWorkflow: false,
   jest: false,
   github: false,
+  depsUpgrade: false,
   npmignoreEnabled: false,
   entrypoint: "lib/extension.js",
   eslintOptions: {
@@ -60,18 +61,19 @@ const project = new TypeScriptAppProject({
     "@trpc/client",
     "ws",
     "open",
+    "tsx",
     "node-fetch@^2.6.7",
-    "@types/node",
     "@types/which",
     "@vscode/vsce",
     "@types/node-fetch",
     "@types/ws",
-    "@wingconsole/app@workspace:^",
-    "@wingconsole/server@workspace:^",
     "winglang@workspace:^",
   ],
 });
 
+project.defaultTask!.reset("tsx --tsconfig tsconfig.dev.json .projenrc.ts");
+project.deps.removeDependency("ts-node");
+
 // because we're bundling, allow dev deps in src
 project.eslint?.allowDevDeps("src/**");
 
@@ -93,6 +95,7 @@ vscodeIgnore.addPatterns(
 );
 
 const contributes: VSCodeExtensionContributions = {
+  breakpoints: [{ language: "wing" }],
   languages: [
     {
       id: "wing",
@@ -105,6 +108,50 @@ const contributes: VSCodeExtensionContributions = {
       },
     },
   ],
+  debuggers: [
+    {
+      type: "wing",
+      label: "Wing Debug",
+      program: "",
+      languages: ["wing"],
+      configurationAttributes: {
+        launch: {
+          entrypoint: {
+            type: "string",
+            description: "The entrypoint to run",
+            default: "${file}",
+          },
+          arguments: {
+            type: "string",
+            description: "Wing CLI arguments",
+            default: "test",
+          },
+        },
+      },
+      initialConfigurations: [
+        {
+          label: "Wing Debug: Launch",
+          description: "Launch a Wing program",
+          body: {
+            type: "wing",
+            request: "launch",
+            name: "Launch",
+          },
+        },
+      ],
+      configurationSnippets: [
+        {
+          label: "Wing Debug: Launch",
+          description: "Launch a Wing program",
+          body: {
+            type: "wing",
+            request: "launch",
+            name: "Launch",
+          },
+        },
+      ],
+    },
+  ],
   grammars: [
     {
       language: "wing",
@@ -130,61 +177,14 @@ const contributes: VSCodeExtensionContributions = {
         dark: "resources/icon-dark.svg",
       },
     },
-    {
-      command: "wing.openFile",
-      title: "Open source file",
-      icon: {
-        light: "resources/icon-light.svg",
-        dark: "resources/icon-dark.svg",
-      },
-    },
-    {
-      command: "wingConsole.openResource",
-      title: "Open resource",
-    },
-    {
-      command: "wingConsole.runTest",
-      title: "Run test",
-      icon: {
-        light: "resources/play-light.svg",
-        dark: "resources/play-dark.svg",
-      },
-    },
-    {
-      command: "wingConsole.runAllTests",
-      title: "Run all tests",
-      icon: {
-        light: "resources/play-all-light.svg",
-        dark: "resources/play-all-dark.svg",
-      },
-    },
   ],
   menus: {
     "editor/title": [
       {
-        when: "resourceLangId == wing && activeWebviewPanelId != 'wing.console'",
+        when: "resourceLangId == wing",
         command: "wing.openConsole",
         group: "navigation",
       },
-      {
-        when: "resourceLangId != wing && activeWebviewPanelId == 'wing.console'",
-        command: "wing.openFile",
-        group: "navigation",
-      },
-    ],
-    "view/item/context": [
-      {
-        command: "wingConsole.runTest",
-        when: "view == consoleTestsExplorer",
-        group: "inline",
-      },
-    ],
-    "explorer/context": [
-      {
-        command: "wingConsole.runAllTests",
-        when: "view == consoleTestsExplorer",
-        group: "inline",
-      },
     ],
   },
   configuration: [
@@ -199,18 +199,6 @@ const contributes: VSCodeExtensionContributions = {
       },
     },
   ],
-  views: {
-    explorer: [
-      {
-        id: "consoleExplorer",
-        name: "Wing Resources",
-      },
-      {
-        id: "consoleTestsExplorer",
-        name: "Wing Tests",
-      },
-    ],
-  },
 };
 
 project.addFields({
@@ -223,7 +211,7 @@ project.addFields({
     vscode: `^${VSCODE_BASE_VERSION}`,
   },
   categories: ["Programming Languages"],
-  activationEvents: ["onLanguage:wing"],
+  activationEvents: ["onLanguage:wing", "onDebug"],
   contributes,
 });
 
@@ -251,4 +239,6 @@ project.tryRemoveFile(".npmrc");
 
 project.addTask("dev").exec("node scripts/dev.mjs");
 
+project.deps.addDependency("@types/node@^20.11.0", DependencyType.DEVENV);
+
 project.synth();
diff --git a/apps/vscode-wing/LICENSE b/apps/vscode-wing/LICENSE
index 8baea73aae7..99cf6257708 100644
--- a/apps/vscode-wing/LICENSE
+++ b/apps/vscode-wing/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2023 Wing Cloud
+Copyright (c) 2024 Wing Cloud
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/apps/vscode-wing/README.md b/apps/vscode-wing/README.md
index 22d2feb617c..7253e69c173 100644
--- a/apps/vscode-wing/README.md
+++ b/apps/vscode-wing/README.md
@@ -2,7 +2,7 @@
 <p align="center">
   <a href="https://www.winglang.io/docs/">Docs</a>
   ▪︎
-  <a href="http://t.winglang.io/slack">Community</a>
+  <a href="http://t.winglang.io/discord">Community</a>
   ▪︎
   <a href="https://www.winglang.io/docs/category/faq">FAQ</a>
   ▪︎
diff --git a/apps/vscode-wing/language-configuration.json b/apps/vscode-wing/language-configuration.json
index fd88e1791b2..29a6cef2f4a 100644
--- a/apps/vscode-wing/language-configuration.json
+++ b/apps/vscode-wing/language-configuration.json
@@ -1,51 +1,64 @@
 {
-    "comments": {
-        "lineComment": "//",
-        "blockComment": [ "/*", "*/" ]
+  "comments": {
+    "lineComment": "//",
+    "blockComment": ["/*", "*/"]
+  },
+  "wordPattern": "([a-zA-Z_$@][A-Za-z_$0-9]*)",
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    {
+      "open": "{",
+      "close": "}"
     },
-    "wordPattern": "/([a-zA-Z_$][A-Za-z_$0-9]*)/",
-    "brackets": [
-        ["{", "}"],
-        ["[", "]"],
-        ["(", ")"]
-    ],
-    "autoClosingPairs": [
-        ["{", "}"],
-        ["[", "]"],
-        ["(", ")"],
-        ["\"", "\""],
-        ["'", "'"],
-        ["/*", "*/"]
-    ],
-    "surroundingPairs": [
-        ["{", "}"],
-        ["[", "]"],
-        ["(", ")"],
-        ["\"", "\""],
-        ["'", "'"]
-    ],
-    "folding": {
-        "markers": {
-            "start": "^\\s*//\\s*#?region\\b",
-            "end": "^\\s*//\\s*#?endregion\\b"
-        }
+    {
+      "open": "[",
+      "close": "]"
     },
-    "indentationRules": {
-        "increaseIndentPattern": "^\\s*(\\b(if|function|class|proc)\\b.*\\{[^}\"'`]*|\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$",
-        "decreaseIndentPattern": "^\\s*(\\b(else)\\b.*\\}|\\})$"
+    {
+      "open": "(",
+      "close": ")"
     },
-    "colorizedBracketPairs": [
-        [
-            "(",
-            ")"
-        ],
-        [
-            "[",
-            "]"
-        ],
-        [
-            "{",
-            "}"
-        ]
-    ],
-}
\ No newline at end of file
+    {
+      "open": "\"",
+      "close": "\""
+    },
+    {
+      "open": "/*",
+      "close": "*/"
+    }
+  ],
+  "surroundingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    ["\"", "\""]
+  ],
+  "folding": {
+    "markers": {
+      "start": "^\\s*//\\s*#?region\\b",
+      "end": "^\\s*//\\s*#?endregion\\b"
+    }
+  },
+  "indentationRules": {
+    "increaseIndentPattern": "^\\s*(\\b(if|function|class|proc)\\b.*\\{[^}\"'`]*|\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$",
+    "decreaseIndentPattern": "^\\s*(\\b(else)\\b.*\\}|\\})$"
+  },
+  "colorizedBracketPairs": [
+    ["(", ")"],
+    ["[", "]"],
+    ["{", "}"]
+  ],
+  "onEnterRules": [
+    {
+      "beforeText": "^\\s*///.*",
+      "action": {
+        "indent": "none",
+        "appendText": "/// "
+      }
+    }
+  ]
+}
diff --git a/apps/vscode-wing/package.json b/apps/vscode-wing/package.json
index 07fe5fe8c69..a54c41344e5 100644
--- a/apps/vscode-wing/package.json
+++ b/apps/vscode-wing/package.json
@@ -15,10 +15,8 @@
     "eslint": "pnpm exec projen eslint",
     "package": "pnpm exec projen package",
     "post-compile": "pnpm exec projen post-compile",
-    "post-upgrade": "pnpm exec projen post-upgrade",
     "pre-compile": "pnpm exec projen pre-compile",
     "test": "pnpm exec projen test",
-    "upgrade": "pnpm exec projen upgrade",
     "watch": "pnpm exec projen watch",
     "projen": "pnpm exec projen"
   },
@@ -29,8 +27,8 @@
     "organization": true
   },
   "devDependencies": {
-    "@trpc/client": "^10.38.1",
-    "@types/node": "^16",
+    "@trpc/client": "^10.45.2",
+    "@types/node": "^20.11.0",
     "@types/node-fetch": "^2.6.4",
     "@types/vscode": "^1.70.0",
     "@types/which": "^3.0.0",
@@ -38,8 +36,6 @@
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
     "@vscode/vsce": "^2.21.0",
-    "@wingconsole/app": "workspace:^",
-    "@wingconsole/server": "workspace:^",
     "eslint": "^8",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-node": "^0.3.9",
@@ -47,13 +43,12 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^4.2.1",
     "node-fetch": "^2.6.7",
-    "npm-check-updates": "^16",
     "open": "^8.4.2",
     "prettier": "^2.8.8",
     "projen": "^0.71.163",
-    "ts-node": "^10.9.1",
-    "tsup": "^6.7.0",
-    "typescript": "^4.9.5",
+    "tsup": "^8.0.2",
+    "tsx": "^4.7.0",
+    "typescript": "^5.3.3",
     "vscode-languageclient": "^8.1.0",
     "which": "^4.0.0",
     "winglang": "workspace:^",
@@ -89,9 +84,15 @@
     "Programming Languages"
   ],
   "activationEvents": [
-    "onLanguage:wing"
+    "onLanguage:wing",
+    "onDebug"
   ],
   "contributes": {
+    "breakpoints": [
+      {
+        "language": "wing"
+      }
+    ],
     "languages": [
       {
         "id": "wing",
@@ -110,6 +111,52 @@
         }
       }
     ],
+    "debuggers": [
+      {
+        "type": "wing",
+        "label": "Wing Debug",
+        "program": "",
+        "languages": [
+          "wing"
+        ],
+        "configurationAttributes": {
+          "launch": {
+            "entrypoint": {
+              "type": "string",
+              "description": "The entrypoint to run",
+              "default": "${file}"
+            },
+            "arguments": {
+              "type": "string",
+              "description": "Wing CLI arguments",
+              "default": "test"
+            }
+          }
+        },
+        "initialConfigurations": [
+          {
+            "label": "Wing Debug: Launch",
+            "description": "Launch a Wing program",
+            "body": {
+              "type": "wing",
+              "request": "launch",
+              "name": "Launch"
+            }
+          }
+        ],
+        "configurationSnippets": [
+          {
+            "label": "Wing Debug: Launch",
+            "description": "Launch a Wing program",
+            "body": {
+              "type": "wing",
+              "request": "launch",
+              "name": "Launch"
+            }
+          }
+        ]
+      }
+    ],
     "grammars": [
       {
         "language": "wing",
@@ -135,61 +182,14 @@
           "light": "resources/icon-light.svg",
           "dark": "resources/icon-dark.svg"
         }
-      },
-      {
-        "command": "wing.openFile",
-        "title": "Open source file",
-        "icon": {
-          "light": "resources/icon-light.svg",
-          "dark": "resources/icon-dark.svg"
-        }
-      },
-      {
-        "command": "wingConsole.openResource",
-        "title": "Open resource"
-      },
-      {
-        "command": "wingConsole.runTest",
-        "title": "Run test",
-        "icon": {
-          "light": "resources/play-light.svg",
-          "dark": "resources/play-dark.svg"
-        }
-      },
-      {
-        "command": "wingConsole.runAllTests",
-        "title": "Run all tests",
-        "icon": {
-          "light": "resources/play-all-light.svg",
-          "dark": "resources/play-all-dark.svg"
-        }
       }
     ],
     "menus": {
       "editor/title": [
         {
-          "when": "resourceLangId == wing && activeWebviewPanelId != 'wing.console'",
+          "when": "resourceLangId == wing",
           "command": "wing.openConsole",
           "group": "navigation"
-        },
-        {
-          "when": "resourceLangId != wing && activeWebviewPanelId == 'wing.console'",
-          "command": "wing.openFile",
-          "group": "navigation"
-        }
-      ],
-      "view/item/context": [
-        {
-          "command": "wingConsole.runTest",
-          "when": "view == consoleTestsExplorer",
-          "group": "inline"
-        }
-      ],
-      "explorer/context": [
-        {
-          "command": "wingConsole.runAllTests",
-          "when": "view == consoleTestsExplorer",
-          "group": "inline"
         }
       ]
     },
@@ -203,19 +203,7 @@
           }
         }
       }
-    ],
-    "views": {
-      "explorer": [
-        {
-          "id": "consoleExplorer",
-          "name": "Wing Resources"
-        },
-        {
-          "id": "consoleTestsExplorer",
-          "name": "Wing Tests"
-        }
-      ]
-    }
+    ]
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/apps/vscode-wing/resources/icon-dark.svg b/apps/vscode-wing/resources/icon-dark.svg
index a9aec13f73f..4a2f9cc0f68 100644
--- a/apps/vscode-wing/resources/icon-dark.svg
+++ b/apps/vscode-wing/resources/icon-dark.svg
@@ -1,26 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{clip-path:url(#SVGID_00000101799737835081300490000010164374447524173704_);}
-	.st1{fill:#F1F0F1;}
-</style>
-<g>
-	<defs>
-		<rect id="SVGID_1_" x="1" y="3.9" width="14" height="8.1"/>
-	</defs>
-	<clipPath id="SVGID_00000052103370697508697250000002786547111936429463_">
-		<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-	</clipPath>
-	<g style="clip-path:url(#SVGID_00000052103370697508697250000002786547111936429463_);">
-		<path class="st1" d="M11.6,3.9c-0.7,0-1.3,0.3-1.8,1C9.3,5.7,8.9,6.8,8.6,7.8C8.4,8.3,8.2,8.8,8,9.3c-0.2-0.5-0.4-1-0.6-1.4
-			C7.1,6.8,6.7,5.7,6.1,5c-0.5-0.7-1.1-1-1.8-1H1v0.9c0.2,0,0.6,0.1,1,0.7c0.5,0.7,0.8,1.7,1.2,2.6c0.7,1.9,1.4,3.9,3.1,3.9
-			c0.6,0,1.2-0.3,1.7-0.9c0.5,0.6,1,0.9,1.7,0.9c1.6,0,2.4-2,3.1-3.9c0.4-1,0.7-2,1.2-2.7c0.4-0.6,0.8-0.7,1-0.7V3.9H11.6
-			C11.6,3.9,11.6,3.9,11.6,3.9z M6.3,11.2c-1,0-1.6-1.7-2.2-3.3C3.7,6.8,3.3,5.7,2.8,5c0-0.1-0.1-0.1-0.1-0.2h1.7
-			c0.2,0,0.6,0.1,1,0.7c0.5,0.7,0.8,1.7,1.2,2.6c0.3,0.7,0.6,1.5,0.9,2.1C7,11.1,6.6,11.2,6.3,11.2L6.3,11.2L6.3,11.2z M13.2,5
-			c-0.5,0.8-0.9,1.8-1.3,2.9c-0.6,1.6-1.2,3.3-2.2,3.3c-0.3,0-0.7-0.1-1.2-0.9c0.3-0.6,0.6-1.4,0.9-2.2c0.4-1,0.7-2,1.2-2.7
-			c0.4-0.6,0.8-0.7,1-0.7h1.7C13.4,4.8,13.3,4.9,13.2,5L13.2,5L13.2,5z"/>
-	</g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 16 16">
+  <defs>
+    <path id="a" d="M1 3.9h14V12H1z"/>
+  </defs>
+  <clipPath id="b">
+    <use xlink:href="#a" overflow="visible"/>
+  </clipPath>
+  <g clip-path="url(#b)">
+    <path fill="#f1f0f1" d="M11.6 3.9c-.7 0-1.3.3-1.8 1-.5.8-.9 1.9-1.2 2.9L8 9.3c-.2-.5-.4-1-.6-1.4-.3-1.1-.7-2.2-1.3-2.9-.5-.7-1.1-1-1.8-1H1v.9c.2 0 .6.1 1 .7.5.7.8 1.7 1.2 2.6.7 1.9 1.4 3.9 3.1 3.9.6 0 1.2-.3 1.7-.9.5.6 1 .9 1.7.9 1.6 0 2.4-2 3.1-3.9.4-1 .7-2 1.2-2.7.4-.6.8-.7 1-.7v-.9h-3.4zm-5.3 7.3c-1 0-1.6-1.7-2.2-3.3-.4-1.1-.8-2.2-1.3-2.9 0-.1-.1-.1-.1-.2h1.7c.2 0 .6.1 1 .7.5.7.8 1.7 1.2 2.6.3.7.6 1.5.9 2.1-.5.9-.9 1-1.2 1zM13.2 5c-.5.8-.9 1.8-1.3 2.9-.6 1.6-1.2 3.3-2.2 3.3-.3 0-.7-.1-1.2-.9.3-.6.6-1.4.9-2.2.4-1 .7-2 1.2-2.7.4-.6.8-.7 1-.7h1.7c.1.1 0 .2-.1.3z"/>
+  </g>
 </svg>
diff --git a/apps/vscode-wing/resources/icon-light.svg b/apps/vscode-wing/resources/icon-light.svg
index bfc34382868..695b0133d54 100644
--- a/apps/vscode-wing/resources/icon-light.svg
+++ b/apps/vscode-wing/resources/icon-light.svg
@@ -1,28 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 16 16">
   <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #111414;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" x="1" y="3.94" width="14" height="8.12"/>
+    <clipPath id="a">
+      <path fill="none" stroke-width="0" d="M1 3.94h14v8.12H1z"/>
     </clipPath>
   </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="m11.64,3.94c-.67,0-1.26.35-1.76,1.04-.54.75-.93,1.82-1.32,2.86-.18.49-.37.99-.56,1.45-.2-.46-.38-.96-.56-1.45-.38-1.04-.78-2.12-1.32-2.86-.5-.69-1.09-1.04-1.76-1.04H1v.89c.24,0,.6.07,1.04.68.47.65.84,1.66,1.2,2.65.71,1.92,1.44,3.91,3.08,3.91.64,0,1.19-.31,1.68-.94.49.63,1.04.94,1.68.94,1.64,0,2.37-1.99,3.08-3.91.36-.98.74-2,1.2-2.65.44-.61.8-.68,1.04-.68v-.89h-3.36,0Zm-5.32,7.23c-1.02,0-1.64-1.69-2.24-3.33-.38-1.04-.78-2.12-1.32-2.86-.04-.05-.08-.1-.12-.15h1.72c.24,0,.6.07,1.04.68.47.65.84,1.66,1.2,2.65.27.74.55,1.51.89,2.15-.49.77-.9.87-1.17.87h0Zm6.92-6.19c-.54.75-.93,1.82-1.32,2.87-.6,1.63-1.22,3.32-2.24,3.32-.27,0-.68-.09-1.17-.87.33-.64.61-1.41.89-2.15.36-.99.74-2,1.2-2.65.44-.61.8-.68,1.04-.68h1.72s-.08.1-.12.15h0Z"/>
+  <g clip-path="url(#a)">
+    <path fill="#111414" d="M11.64 3.94c-.67 0-1.26.35-1.76 1.04-.54.75-.93 1.82-1.32 2.86-.18.49-.37.99-.56 1.45-.2-.46-.38-.96-.56-1.45-.38-1.04-.78-2.12-1.32-2.86-.5-.69-1.09-1.04-1.76-1.04H1v.89c.24 0 .6.07 1.04.68.47.65.84 1.66 1.2 2.65.71 1.92 1.44 3.91 3.08 3.91.64 0 1.19-.31 1.68-.94.49.63 1.04.94 1.68.94 1.64 0 2.37-1.99 3.08-3.91.36-.98.74-2 1.2-2.65.44-.61.8-.68 1.04-.68v-.89h-3.36Zm-5.32 7.23c-1.02 0-1.64-1.69-2.24-3.33C3.7 6.8 3.3 5.72 2.76 4.98l-.12-.15h1.72c.24 0 .6.07 1.04.68.47.65.84 1.66 1.2 2.65.27.74.55 1.51.89 2.15-.49.77-.9.87-1.17.87Zm6.92-6.19c-.54.75-.93 1.82-1.32 2.87-.6 1.63-1.22 3.32-2.24 3.32-.27 0-.68-.09-1.17-.87.33-.64.61-1.41.89-2.15.36-.99.74-2 1.2-2.65.44-.61.8-.68 1.04-.68h1.72l-.12.15Z"/>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/apps/vscode-wing/resources/play-all-dark.svg b/apps/vscode-wing/resources/play-all-dark.svg
deleted file mode 100644
index a8ff8f57595..00000000000
--- a/apps/vscode-wing/resources/play-all-dark.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-        strokeWidth="1.5"
-        stroke="#2ad5c1" height="16" width="16"
-        aria-hidden="true"
-      >
-        <path d="M5 8.69c0-.87.93-1.4 1.68-.98l7.11 4.06a1.13 1.13 0 0 1 0 1.96l-7.1 4.06A1.13 1.13 0 0 1 5 16.8V8.69zm5.75 0c0-.87.93-1.4 1.68-.98l7.11 4.06a1.13 1.13 0 0 1 0 1.96l-7.1 4.06a1.13 1.13 0 0 1-1.69-.98l0 -1M10.76 10l0 -1.5" />
-      </svg>
diff --git a/apps/vscode-wing/resources/play-all-light.svg b/apps/vscode-wing/resources/play-all-light.svg
deleted file mode 100644
index b2883623d14..00000000000
--- a/apps/vscode-wing/resources/play-all-light.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-        strokeWidth="1.5"
-        stroke="#000000" height="16" width="16"
-        aria-hidden="true"
-      >
-        <path d="M5 8.69c0-.87.93-1.4 1.68-.98l7.11 4.06a1.13 1.13 0 0 1 0 1.96l-7.1 4.06A1.13 1.13 0 0 1 5 16.8V8.69zm5.75 0c0-.87.93-1.4 1.68-.98l7.11 4.06a1.13 1.13 0 0 1 0 1.96l-7.1 4.06a1.13 1.13 0 0 1-1.69-.98l0 -1M10.76 10l0 -1.5" />
-      </svg>
diff --git a/apps/vscode-wing/resources/play-dark.svg b/apps/vscode-wing/resources/play-dark.svg
deleted file mode 100644
index 6e208f956e7..00000000000
--- a/apps/vscode-wing/resources/play-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" height="16" width="16">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
-</svg>
diff --git a/apps/vscode-wing/resources/play-light.svg b/apps/vscode-wing/resources/play-light.svg
deleted file mode 100644
index 032a2f0a2c5..00000000000
--- a/apps/vscode-wing/resources/play-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" height="16" width="16">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/archive-box.svg b/apps/vscode-wing/resources/resource-icons/dark/archive-box.svg
deleted file mode 100644
index f6ef06fab73..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/archive-box.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 7.5l-.625 10.632a2.25 2.25 0 01-2.247 2.118H6.622a2.25 2.25 0 01-2.247-2.118L3.75 7.5M10 11.25h4M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/beaker.svg b/apps/vscode-wing/resources/resource-icons/dark/beaker.svg
deleted file mode 100644
index c45c483c366..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/beaker.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M9.75 3.104v5.714a2.25 2.25 0 01-.659 1.591L5 14.5M9.75 3.104c-.251.023-.501.05-.75.082m.75-.082a24.301 24.301 0 014.5 0m0 0v5.714c0 .597.237 1.17.659 1.591L19.8 15.3M14.25 3.104c.251.023.501.05.75.082M19.8 15.3l-1.57.393A9.065 9.065 0 0112 15a9.065 9.065 0 00-6.23-.693L5 14.5m14.8.8l1.402 1.402c1.232 1.232.65 3.318-1.067 3.611A48.309 48.309 0 0112 21c-2.773 0-5.491-.235-8.135-.687-1.718-.293-2.3-2.379-1.067-3.61L5 14.5"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/bolt.svg b/apps/vscode-wing/resources/resource-icons/dark/bolt.svg
deleted file mode 100644
index 61574e4aee3..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/bolt.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/calculator.svg b/apps/vscode-wing/resources/resource-icons/dark/calculator.svg
deleted file mode 100644
index d79e9726463..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/calculator.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 15.75V18m-7.5-6.75h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V13.5zm0 2.25h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V18zm2.498-6.75h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V13.5zm0 2.25h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V18zm2.504-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zm0 2.25h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V18zm2.498-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zM8.25 6h7.5v2.25h-7.5V6zM12 2.25c-1.892 0-3.758.11-5.593.322C5.307 2.7 4.5 3.65 4.5 4.757V19.5a2.25 2.25 0 002.25 2.25h10.5a2.25 2.25 0 002.25-2.25V4.757c0-1.108-.806-2.057-1.907-2.185A48.507 48.507 0 0012 2.25z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/clock.svg b/apps/vscode-wing/resources/resource-icons/dark/clock.svg
deleted file mode 100644
index 87eab2dc2dc..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/clock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/cloud.svg b/apps/vscode-wing/resources/resource-icons/dark/cloud.svg
deleted file mode 100644
index 4eb9e708fbb..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/cloud.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 15a4.5 4.5 0 004.5 4.5H18a3.75 3.75 0 001.332-7.257 3 3 0 00-3.758-3.848 5.25 5.25 0 00-10.233 2.33A4.502 4.502 0 002.25 15z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/cube.svg b/apps/vscode-wing/resources/resource-icons/dark/cube.svg
deleted file mode 100644
index 8ce57410c00..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/cube.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M21 7.5l-9-5.25L3 7.5m18 0l-9 5.25m9-5.25v9l-9 5.25M3 7.5l9 5.25M3 7.5v9l9 5.25m0-9v9"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/globe-alt.svg b/apps/vscode-wing/resources/resource-icons/dark/globe-alt.svg
deleted file mode 100644
index ab078d2abb6..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/globe-alt.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/megaphone.svg b/apps/vscode-wing/resources/resource-icons/dark/megaphone.svg
deleted file mode 100644
index f5c85040fe1..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/megaphone.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M10.34 15.84c-.688-.06-1.386-.09-2.09-.09H7.5a4.5 4.5 0 110-9h.75c.704 0 1.402-.03 2.09-.09m0 9.18c.253.962.584 1.892.985 2.783.247.55.06 1.21-.463 1.511l-.657.38c-.551.318-1.26.117-1.527-.461a20.845 20.845 0 01-1.44-4.282m3.102.069a18.03 18.03 0 01-.59-4.59c0-1.586.205-3.124.59-4.59m0 9.18a23.848 23.848 0 018.835 2.535M10.34 6.66a23.847 23.847 0 008.835-2.535m0 0A23.74 23.74 0 0018.795 3m.38 1.125a23.91 23.91 0 011.014 5.395m-1.014 8.855c-.118.38-.245.754-.38 1.125m.38-1.125a23.91 23.91 0 001.014-5.395m0-3.46c.495.413.811 1.035.811 1.73 0 .695-.316 1.317-.811 1.73m0-3.46a24.347 24.347 0 010 3.46"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/queue-list.svg b/apps/vscode-wing/resources/resource-icons/dark/queue-list.svg
deleted file mode 100644
index 7eec9855d33..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/queue-list.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 12h16.5m-16.5 3.75h16.5M3.75 19.5h16.5M5.625 4.5h12.75a1.875 1.875 0 010 3.75H5.625a1.875 1.875 0 010-3.75z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/redis.svg b/apps/vscode-wing/resources/resource-icons/dark/redis.svg
deleted file mode 100644
index 66e31bd3336..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/redis.svg
+++ /dev/null
@@ -1,11 +0,0 @@
- <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 32 32"
-          fill="none"
-          currentColor="#2ad5c1"
-        >
-          <path
-            fill="#2ad5c1"
-            d="M32 19.1c0 .3-.4.7-1.3 1.1-1.7.9-10.5 4.5-12.4 5.5-1.9 1-3 1-4.4.3-1.5-.7-11-4.5-12.6-5.4-.9-.4-1.3-.7-1.3-1v3.2c0 .3.4.7 1.3 1 1.7.9 11.1 4.7 12.6 5.4 1.5.7 2.5.7 4.4-.3 1.9-1 10.7-4.6 12.4-5.5 1-.4 1.3-.8 1.3-1V19zm0-5.3c0 .4-.4.7-1.3 1.1-1.7 1-10.5 4.6-12.4 5.5-1.9 1-3 1-4.4.3-1.5-.7-11-4.5-12.6-5.3C.4 15 0 14.6 0 14.3v3.2c0 .4.4.7 1.3 1.1l12.6 5.3c1.5.7 2.5.8 4.4-.2 1.9-1 10.7-4.6 12.4-5.5 1-.5 1.3-.8 1.3-1.2v-3.2zm0-5.4c0-.3-.4-.6-1.3-1L18.6 2.8c-1.7-.6-2.4-.6-4.4.1l-13 5c-.8.4-1.2.7-1.2 1v3.3c0 .3.4.6 1.3 1l12.6 5.4c1.5.7 2.5.7 4.4-.3 1.9-1 10.7-4.6 12.5-5.5.8-.5 1.2-.8 1.2-1.1V8.4zm-20.5 3 7.4-1.1-2.3 3.3zm16.4-3-4.9 2-4.4-1.7 4.9-2zm-13-3.1L14.4 4l2.2.9 2.1-.7-.6 1.3 2.2.8-2.8.3-.6 1.5-1-1.6-3.2-.3zM9.6 7.2c2.2 0 4 .7 4 1.5 0 .9-1.9 1.5-4 1.5s-4-.6-4-1.5c0-.8 1.8-1.5 4-1.5z"
-          />
-        </svg>
diff --git a/apps/vscode-wing/resources/resource-icons/dark/table-cells.svg b/apps/vscode-wing/resources/resource-icons/dark/table-cells.svg
deleted file mode 100644
index 3902cf36eb9..00000000000
--- a/apps/vscode-wing/resources/resource-icons/dark/table-cells.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2ad5c1" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M3.375 19.5h17.25m-17.25 0a1.125 1.125 0 01-1.125-1.125M3.375 19.5h7.5c.621 0 1.125-.504 1.125-1.125m-9.75 0V5.625m0 12.75v-1.5c0-.621.504-1.125 1.125-1.125m18.375 2.625V5.625m0 12.75c0 .621-.504 1.125-1.125 1.125m1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125m0 3.75h-7.5A1.125 1.125 0 0112 18.375m9.75-12.75c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125m19.5 0v1.5c0 .621-.504 1.125-1.125 1.125M2.25 5.625v1.5c0 .621.504 1.125 1.125 1.125m0 0h17.25m-17.25 0h7.5c.621 0 1.125.504 1.125 1.125M3.375 8.25c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125m17.25-3.75h-7.5c-.621 0-1.125.504-1.125 1.125m8.625-1.125c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125M12 10.875v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 10.875c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125M13.125 12h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125M20.625 12c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5M12 14.625v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 14.625c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125m0 1.5v-1.5m0 0c0-.621.504-1.125 1.125-1.125m0 0h7.5"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/archive-box.svg b/apps/vscode-wing/resources/resource-icons/light/archive-box.svg
deleted file mode 100644
index 897ecf080e6..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/archive-box.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 7.5l-.625 10.632a2.25 2.25 0 01-2.247 2.118H6.622a2.25 2.25 0 01-2.247-2.118L3.75 7.5M10 11.25h4M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/beaker.svg b/apps/vscode-wing/resources/resource-icons/light/beaker.svg
deleted file mode 100644
index 6bd47ac6aa2..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/beaker.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M9.75 3.104v5.714a2.25 2.25 0 01-.659 1.591L5 14.5M9.75 3.104c-.251.023-.501.05-.75.082m.75-.082a24.301 24.301 0 014.5 0m0 0v5.714c0 .597.237 1.17.659 1.591L19.8 15.3M14.25 3.104c.251.023.501.05.75.082M19.8 15.3l-1.57.393A9.065 9.065 0 0112 15a9.065 9.065 0 00-6.23-.693L5 14.5m14.8.8l1.402 1.402c1.232 1.232.65 3.318-1.067 3.611A48.309 48.309 0 0112 21c-2.773 0-5.491-.235-8.135-.687-1.718-.293-2.3-2.379-1.067-3.61L5 14.5"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/bolt.svg b/apps/vscode-wing/resources/resource-icons/light/bolt.svg
deleted file mode 100644
index 52b44d7d5b1..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/bolt.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/calculator.svg b/apps/vscode-wing/resources/resource-icons/light/calculator.svg
deleted file mode 100644
index f8c51446893..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/calculator.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 15.75V18m-7.5-6.75h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V13.5zm0 2.25h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V18zm2.498-6.75h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V13.5zm0 2.25h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V18zm2.504-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zm0 2.25h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V18zm2.498-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zM8.25 6h7.5v2.25h-7.5V6zM12 2.25c-1.892 0-3.758.11-5.593.322C5.307 2.7 4.5 3.65 4.5 4.757V19.5a2.25 2.25 0 002.25 2.25h10.5a2.25 2.25 0 002.25-2.25V4.757c0-1.108-.806-2.057-1.907-2.185A48.507 48.507 0 0012 2.25z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/clock.svg b/apps/vscode-wing/resources/resource-icons/light/clock.svg
deleted file mode 100644
index f9ade369484..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/clock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/cloud.svg b/apps/vscode-wing/resources/resource-icons/light/cloud.svg
deleted file mode 100644
index 6ca053e0754..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/cloud.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 15a4.5 4.5 0 004.5 4.5H18a3.75 3.75 0 001.332-7.257 3 3 0 00-3.758-3.848 5.25 5.25 0 00-10.233 2.33A4.502 4.502 0 002.25 15z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/cube.svg b/apps/vscode-wing/resources/resource-icons/light/cube.svg
deleted file mode 100644
index 7bd64203b32..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/cube.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M21 7.5l-9-5.25L3 7.5m18 0l-9 5.25m9-5.25v9l-9 5.25M3 7.5l9 5.25M3 7.5v9l9 5.25m0-9v9"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/globe-alt.svg b/apps/vscode-wing/resources/resource-icons/light/globe-alt.svg
deleted file mode 100644
index 4733d467555..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/globe-alt.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/megaphone.svg b/apps/vscode-wing/resources/resource-icons/light/megaphone.svg
deleted file mode 100644
index 8d077b760b5..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/megaphone.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M10.34 15.84c-.688-.06-1.386-.09-2.09-.09H7.5a4.5 4.5 0 110-9h.75c.704 0 1.402-.03 2.09-.09m0 9.18c.253.962.584 1.892.985 2.783.247.55.06 1.21-.463 1.511l-.657.38c-.551.318-1.26.117-1.527-.461a20.845 20.845 0 01-1.44-4.282m3.102.069a18.03 18.03 0 01-.59-4.59c0-1.586.205-3.124.59-4.59m0 9.18a23.848 23.848 0 018.835 2.535M10.34 6.66a23.847 23.847 0 008.835-2.535m0 0A23.74 23.74 0 0018.795 3m.38 1.125a23.91 23.91 0 011.014 5.395m-1.014 8.855c-.118.38-.245.754-.38 1.125m.38-1.125a23.91 23.91 0 001.014-5.395m0-3.46c.495.413.811 1.035.811 1.73 0 .695-.316 1.317-.811 1.73m0-3.46a24.347 24.347 0 010 3.46"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/queue-list.svg b/apps/vscode-wing/resources/resource-icons/light/queue-list.svg
deleted file mode 100644
index fc0f71ee8d4..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/queue-list.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 12h16.5m-16.5 3.75h16.5M3.75 19.5h16.5M5.625 4.5h12.75a1.875 1.875 0 010 3.75H5.625a1.875 1.875 0 010-3.75z"/>
-</svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/redis.svg b/apps/vscode-wing/resources/resource-icons/light/redis.svg
deleted file mode 100644
index 930dc657380..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/redis.svg
+++ /dev/null
@@ -1,11 +0,0 @@
- <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 32 32"
-          fill="none"
-          currentColor="#000000"
-        >
-          <path
-            fill="#000000"
-            d="M32 19.1c0 .3-.4.7-1.3 1.1-1.7.9-10.5 4.5-12.4 5.5-1.9 1-3 1-4.4.3-1.5-.7-11-4.5-12.6-5.4-.9-.4-1.3-.7-1.3-1v3.2c0 .3.4.7 1.3 1 1.7.9 11.1 4.7 12.6 5.4 1.5.7 2.5.7 4.4-.3 1.9-1 10.7-4.6 12.4-5.5 1-.4 1.3-.8 1.3-1V19zm0-5.3c0 .4-.4.7-1.3 1.1-1.7 1-10.5 4.6-12.4 5.5-1.9 1-3 1-4.4.3-1.5-.7-11-4.5-12.6-5.3C.4 15 0 14.6 0 14.3v3.2c0 .4.4.7 1.3 1.1l12.6 5.3c1.5.7 2.5.8 4.4-.2 1.9-1 10.7-4.6 12.4-5.5 1-.5 1.3-.8 1.3-1.2v-3.2zm0-5.4c0-.3-.4-.6-1.3-1L18.6 2.8c-1.7-.6-2.4-.6-4.4.1l-13 5c-.8.4-1.2.7-1.2 1v3.3c0 .3.4.6 1.3 1l12.6 5.4c1.5.7 2.5.7 4.4-.3 1.9-1 10.7-4.6 12.5-5.5.8-.5 1.2-.8 1.2-1.1V8.4zm-20.5 3 7.4-1.1-2.3 3.3zm16.4-3-4.9 2-4.4-1.7 4.9-2zm-13-3.1L14.4 4l2.2.9 2.1-.7-.6 1.3 2.2.8-2.8.3-.6 1.5-1-1.6-3.2-.3zM9.6 7.2c2.2 0 4 .7 4 1.5 0 .9-1.9 1.5-4 1.5s-4-.6-4-1.5c0-.8 1.8-1.5 4-1.5z"
-          />
-        </svg>
diff --git a/apps/vscode-wing/resources/resource-icons/light/table-cells.svg b/apps/vscode-wing/resources/resource-icons/light/table-cells.svg
deleted file mode 100644
index eedec1524f4..00000000000
--- a/apps/vscode-wing/resources/resource-icons/light/table-cells.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" aria-hidden="true">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M3.375 19.5h17.25m-17.25 0a1.125 1.125 0 01-1.125-1.125M3.375 19.5h7.5c.621 0 1.125-.504 1.125-1.125m-9.75 0V5.625m0 12.75v-1.5c0-.621.504-1.125 1.125-1.125m18.375 2.625V5.625m0 12.75c0 .621-.504 1.125-1.125 1.125m1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125m0 3.75h-7.5A1.125 1.125 0 0112 18.375m9.75-12.75c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125m19.5 0v1.5c0 .621-.504 1.125-1.125 1.125M2.25 5.625v1.5c0 .621.504 1.125 1.125 1.125m0 0h17.25m-17.25 0h7.5c.621 0 1.125.504 1.125 1.125M3.375 8.25c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125m17.25-3.75h-7.5c-.621 0-1.125.504-1.125 1.125m8.625-1.125c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125M12 10.875v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 10.875c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125M13.125 12h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125M20.625 12c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5M12 14.625v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 14.625c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125m0 1.5v-1.5m0 0c0-.621.504-1.125 1.125-1.125m0 0h7.5"/>
-</svg>
diff --git a/apps/vscode-wing/src/bin-helper.ts b/apps/vscode-wing/src/bin-helper.ts
index 31265d47562..3fbc9b1a7f6 100644
--- a/apps/vscode-wing/src/bin-helper.ts
+++ b/apps/vscode-wing/src/bin-helper.ts
@@ -80,7 +80,7 @@ export async function getWingBin(): Promise<string | null> {
     Loggers.default.appendLine(
       `"which ${configuredWingBin}" => "${whichPath}"`
     );
-    return resolvePath(whichPath);
+    return await resolvePath(whichPath);
   } catch (e) {
     const choice = await window.showWarningMessage(
       `Unable to find wing from "${configuredWingBin}" (not in PATH). Install globally with \`npm install -g winglang@latest\`? (${e})`,
@@ -120,7 +120,7 @@ export async function resolvePath(p: string) {
       if (!vResult) {
         return null;
       } else {
-        return resolvePath(vResult);
+        return await resolvePath(vResult);
       }
     }
 
diff --git a/apps/vscode-wing/src/console/console-manager.ts b/apps/vscode-wing/src/console/console-manager.ts
deleted file mode 100644
index 0a52cfb9c6b..00000000000
--- a/apps/vscode-wing/src/console/console-manager.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-import {
-  window,
-  WebviewPanel,
-  commands,
-  TreeView,
-  ViewColumn,
-  Uri,
-  ExtensionContext,
-  Position,
-  Range,
-} from "vscode";
-
-import {
-  ResourceItem,
-  ResourcesExplorerProvider,
-} from "./explorer-providers/ResourcesExplorerProvider";
-import {
-  TestItem,
-  TestsExplorerProvider,
-} from "./explorer-providers/TestsExplorerProvider";
-import { type Client } from "./services/client";
-import { VIEW_TYPE_CONSOLE } from "../constants";
-import { Loggers } from "../logging";
-
-export interface ConsoleInstance {
-  id: string;
-  wingfile: string;
-  url: string;
-  client: Client;
-  onDidClose: () => void;
-}
-
-export interface ConsoleManager {
-  addInstance: (instance: ConsoleInstance) => Promise<void>;
-  getInstance: (instanceId: string) => ConsoleInstance | undefined;
-  closeInstance: (instanceId: string) => void;
-  setActiveInstance: (instanceId: string) => Promise<void>;
-  activeInstances: () => boolean;
-  getActiveInstanceId: () => string | undefined;
-  stopAll: () => Promise<void>;
-}
-
-export const createConsoleManager = (
-  context: ExtensionContext
-): ConsoleManager => {
-  const instances: Record<string, ConsoleInstance> = {};
-  const resourcesExplorer = new ResourcesExplorerProvider();
-  const testsExplorer = new TestsExplorerProvider();
-
-  let activeInstanceId: string | undefined;
-  let webviewPanel: WebviewPanel | undefined;
-  let explorerView: TreeView<ResourceItem> | undefined;
-  let testsExplorerView: TreeView<TestItem> | undefined;
-
-  let timeout: NodeJS.Timeout | undefined;
-  let logsTimestamp: number = 0;
-
-  const registerCommands = () => {
-    commands.registerCommand("wingConsole.openResource", async (resourceId) => {
-      if (!activeInstanceId) {
-        return;
-      }
-      const activePanel = getInstance(activeInstanceId);
-      if (!activePanel) {
-        return;
-      }
-      await activePanel.client.setSelectedNode(resourceId);
-    });
-
-    commands.registerCommand("wingConsole.runTest", async (test: TestItem) => {
-      if (!activeInstanceId) {
-        return;
-      }
-      const activePanel = getInstance(activeInstanceId);
-      if (!activePanel) {
-        return;
-      }
-      const tests = testsExplorer.getTests();
-      testsExplorer.update(
-        tests.map((testItem) => {
-          if (testItem.id === test.id) {
-            return {
-              ...test,
-              status: "running",
-            };
-          }
-          return testItem;
-        })
-      );
-      await activePanel.client.runTest(test.id);
-    });
-
-    commands.registerCommand("wingConsole.runAllTests", async () => {
-      if (!activeInstanceId) {
-        return;
-      }
-      const activePanel = getInstance(activeInstanceId);
-      if (!activePanel) {
-        return;
-      }
-      const tests = testsExplorer.getTests();
-      testsExplorer.update(
-        tests.map((testItem) => {
-          return {
-            ...testItem,
-            status: "running",
-          };
-        })
-      );
-      await activePanel.client.runAllTests();
-    });
-  };
-
-  const updateLogs = async (instance: ConsoleInstance) => {
-    const logs = await instance.client.getLogs({ time: logsTimestamp });
-
-    logs.forEach((log) => {
-      Loggers.console.appendLine(`[${log.level}] ${log.message}`);
-    });
-    logsTimestamp = Date.now();
-  };
-
-  const getTheme = () => {
-    const theme = window.activeColorTheme.kind;
-    if (theme === 1) {
-      return "light";
-    }
-    return "dark";
-  };
-
-  const getInstance = (instanceId: string) => {
-    if (!instanceId) {
-      return;
-    }
-    return instances[instanceId];
-  };
-
-  const addInstance = async (instance: ConsoleInstance) => {
-    Loggers.console.appendLine(
-      `Wing Console is running at http://${instance.url}`
-    );
-
-    instance.client.onInvalidateQuery({
-      onData: async (key) => {
-        if (activeInstanceId !== instance.id) {
-          return;
-        }
-        if (timeout) {
-          clearTimeout(timeout);
-        }
-        timeout = setTimeout(async () => {
-          if (!key || key === "app.logs") {
-            await updateLogs(instance);
-          }
-          resourcesExplorer.update(await instance.client.listResources());
-          testsExplorer.update(await instance.client.listTests());
-        }, 300);
-      },
-      onError: (err) => {
-        Loggers.console.appendLine(err);
-      },
-    });
-
-    instance.client.onOpenFileInEditor({
-      onData: async (data) => {
-        const path = data?.path;
-        const line = data?.line - 1 || 0;
-        const column = data?.column || 0;
-
-        const openEditor = window.visibleTextEditors.find((editor) => {
-          return editor.document.uri.fsPath === path;
-        });
-
-        if (!openEditor || !openEditor.viewColumn) {
-          await commands.executeCommand(
-            "vscode.open",
-            Uri.file(path),
-            new Position(line, column)
-          );
-          return;
-        }
-
-        await commands.executeCommand("workbench.action.focusFirstEditorGroup");
-        for (let i = 0; i < openEditor.viewColumn - 1; i++) {
-          await commands.executeCommand("workbench.action.focusNextGroup");
-        }
-        await window.showTextDocument(openEditor.document, {
-          selection: new Range(
-            new Position(line, column),
-            new Position(line, column)
-          ),
-        });
-      },
-      onError: (err) => {
-        Loggers.console.appendLine(err);
-      },
-    });
-
-    instances[instance.id] = instance;
-
-    await setActiveInstance(instance.id);
-  };
-
-  const setActiveInstance = async (instanceId: string) => {
-    const instance = getInstance(instanceId);
-    if (!instance) {
-      return;
-    }
-
-    if (!webviewPanel) {
-      webviewPanel = window.createWebviewPanel(
-        VIEW_TYPE_CONSOLE,
-        `Console`,
-        ViewColumn.Beside,
-        {
-          enableScripts: true,
-          enableCommandUris: true,
-        }
-      );
-
-      webviewPanel.iconPath = {
-        light: Uri.joinPath(
-          context.extensionUri,
-          "resources",
-          "icon-light.svg"
-        ),
-        dark: Uri.joinPath(context.extensionUri, "resources", "icon-dark.svg"),
-      };
-
-      webviewPanel.onDidDispose(async () => {
-        resourcesExplorer.clear();
-        testsExplorer.clear();
-        webviewPanel = undefined;
-        activeInstanceId = undefined;
-
-        Object.keys(instances).forEach(async (id) => {
-          await closeInstance(id);
-        });
-      });
-      Loggers.console.show();
-    }
-
-    webviewPanel.title = `${instance.wingfile} - [console]`;
-    webviewPanel.webview.html = `
-      <!DOCTYPE html>
-        <html lang="en">
-        <head>
-            <meta charset="UTF-8">
-            <style>
-              body { margin: 0; padding: 0; }
-              iframe { display: block; height: 100vh; width: 100vw; border: none; }
-            </style>
-        </head>
-        <script>
-          const instanceUrl = "${instance.url}";
-          const layout = 4;
-          const theme = "${getTheme()}";
-
-          // Used to force reload the iframe
-          const time = "${Date.now()}";
-
-          const color = getComputedStyle(document.documentElement).getPropertyValue('--vscode-menu-background').replace("#", "");
-          document.addEventListener('DOMContentLoaded', () => {
-            const iframe = document.querySelector('iframe');
-            const iframeSrc = \`http://\${instanceUrl}?layout=\${layout}&theme=\${theme}&color=\${color}\`;
-            iframe.src = iframeSrc;
-          });
-      </script>
-      <body>
-        <iframe src=""/>
-      </body>
-      </html>`;
-
-    resourcesExplorer.update(await instance.client.listResources());
-    testsExplorer.update(await instance.client.listTests());
-    await updateLogs(instance);
-
-    explorerView = window.createTreeView("consoleExplorer", {
-      treeDataProvider: resourcesExplorer,
-    });
-
-    testsExplorerView = window.createTreeView("consoleTestsExplorer", {
-      treeDataProvider: testsExplorer,
-    });
-
-    context.subscriptions.push(webviewPanel, explorerView, testsExplorerView);
-    activeInstanceId = instanceId;
-  };
-
-  const closeInstance = async (instanceId: string) => {
-    const instance = getInstance(instanceId);
-    if (!instance) {
-      return;
-    }
-    Loggers.console.appendLine(
-      `Closing Console instance: '${instance.wingfile}'`
-    );
-
-    instance.client.close();
-    instance.onDidClose();
-    resourcesExplorer.clear();
-    testsExplorer.clear();
-    activeInstanceId = undefined;
-    delete instances[instanceId];
-
-    if (Object.keys(instances).length === 0) {
-      webviewPanel?.dispose();
-      webviewPanel = undefined;
-    }
-  };
-
-  registerCommands();
-
-  return {
-    addInstance,
-    getInstance,
-    closeInstance,
-    setActiveInstance,
-    activeInstances: () => {
-      return Object.keys(instances).length > 0;
-    },
-    getActiveInstanceId: () => {
-      return activeInstanceId;
-    },
-    stopAll: async () => {
-      Object.keys(instances).forEach(async (id) => {
-        await closeInstance(id);
-      });
-    },
-  };
-};
diff --git a/apps/vscode-wing/src/console/explorer-providers/ResourcesExplorerProvider.ts b/apps/vscode-wing/src/console/explorer-providers/ResourcesExplorerProvider.ts
deleted file mode 100644
index bb33ab796c1..00000000000
--- a/apps/vscode-wing/src/console/explorer-providers/ResourcesExplorerProvider.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import path from "path";
-import type { ExplorerItem } from "@wingconsole/server";
-import {
-  TreeItemCollapsibleState,
-  TreeItem,
-  TreeDataProvider,
-  Event,
-  EventEmitter,
-  ProviderResult,
-} from "vscode";
-
-export class ResourcesExplorerProvider
-  implements TreeDataProvider<ResourceItem>
-{
-  private node?: ExplorerItem;
-
-  private _onDidChangeTreeData: EventEmitter<
-    ResourceItem | undefined | null | void
-  > = new EventEmitter<ResourceItem | undefined | null | void>();
-
-  readonly onDidChangeTreeData: Event<ResourceItem | undefined | null | void> =
-    this._onDidChangeTreeData.event;
-
-  constructor(node?: ExplorerItem) {
-    this.node = node;
-  }
-
-  public refresh(): void {
-    this._onDidChangeTreeData.fire();
-  }
-
-  public update(item?: ExplorerItem): void {
-    this.node = item;
-    this.refresh();
-  }
-
-  public clear(): void {
-    this.update();
-  }
-
-  public getTreeItem(element: ResourceItem): TreeItem {
-    return {
-      ...element,
-      command: {
-        command: "wingConsole.openResource",
-        arguments: [element.id],
-        title: "Select Resource",
-      },
-    };
-  }
-
-  private getResource(id: string): ExplorerItem | undefined {
-    if (!this.node) {
-      return undefined;
-    }
-    const searchChild = (node: ExplorerItem): ExplorerItem | undefined => {
-      if (node.id === id) {
-        return node;
-      }
-
-      if (!node.childItems) {
-        return;
-      }
-      for (const child of node.childItems) {
-        const resource = searchChild(child);
-        if (resource) {
-          return resource;
-        }
-      }
-
-      return;
-    };
-
-    return searchChild(this.node);
-  }
-
-  private getParentResource(id: string): ExplorerItem | undefined {
-    if (!this.node) {
-      return;
-    }
-
-    const searchParent = (node: ExplorerItem): ExplorerItem | undefined => {
-      if (!node.childItems) {
-        return;
-      }
-      for (const child of node.childItems) {
-        if (child.id === id) {
-          return node;
-        }
-        const resource = searchParent(child);
-        if (resource) {
-          return resource;
-        }
-      }
-      return;
-    };
-
-    return searchParent(this.node);
-  }
-
-  public getParent(element: ResourceItem): ProviderResult<ResourceItem> {
-    if (!this.node || !element.id) {
-      return null;
-    }
-
-    const parentItem = this.getParentResource(element.id);
-
-    if (!parentItem) {
-      return;
-    }
-
-    return new ResourceItem(
-      parentItem.id,
-      parentItem.label,
-      parentItem.type,
-      TreeItemCollapsibleState.Expanded
-    );
-  }
-
-  public getChildren(element?: ResourceItem): Thenable<ResourceItem[]> {
-    if (!this.node) {
-      return Promise.resolve([]);
-    }
-    if (!element || !element.id) {
-      return Promise.resolve([
-        new ResourceItem(
-          this.node.id,
-          this.node.label,
-          this.node.type,
-          TreeItemCollapsibleState.Expanded
-        ),
-      ]);
-    }
-
-    const childItem = this.getResource(element.id);
-
-    if (!childItem?.childItems) {
-      return Promise.resolve([]);
-    }
-
-    return Promise.resolve(
-      childItem.childItems.map((child: ExplorerItem) => {
-        return new ResourceItem(
-          child.id,
-          child.label,
-          child.type || "",
-          child.childItems?.length && child.childItems.length > 0
-            ? TreeItemCollapsibleState.Expanded
-            : TreeItemCollapsibleState.None
-        );
-      })
-    );
-  }
-}
-
-export class ResourceItem extends TreeItem {
-  constructor(
-    id: string,
-    label?: string,
-    type?: string,
-    state?: TreeItemCollapsibleState
-  ) {
-    super(label || "", state);
-
-    this.id = id;
-    this.tooltip = label;
-
-    this.iconPath = {
-      light: path.join(
-        __filename,
-        "../../resources/resource-icons/light",
-        `${this.getResourceIconName(type, id)}.svg`
-      ),
-      dark: path.join(
-        __filename,
-        "../../resources/resource-icons/dark",
-        `${this.getResourceIconName(type, id)}.svg`
-      ),
-    };
-  }
-
-  private matchTest = (resourceId: string) => {
-    const isTest = /(\/test$|\/test:([^/\\])+$)/;
-    const isTestHandler = /(\/test$|\/test:.*\/Handler$)/;
-
-    return isTest.test(resourceId) || isTestHandler.test(resourceId);
-  };
-
-  private getResourceIconName = (
-    resourceType: string | undefined,
-    resourceId?: string
-  ) => {
-    if (resourceId && this.matchTest(resourceId)) {
-      return "beaker";
-    }
-    switch (resourceType) {
-      case "@winglang/sdk.cloud.Bucket": {
-        return "archive-box";
-      }
-      case "@winglang/sdk.cloud.Function": {
-        return "bolt";
-      }
-      case "@winglang/sdk.cloud.Queue": {
-        return "queue-list";
-      }
-      case "@winglang/sdk.cloud.Website": {
-        return "globe-alt";
-      }
-      case "@winglang/sdk.cloud.Counter": {
-        return "calculator";
-      }
-      case "@winglang/sdk.cloud.Topic": {
-        return "megaphone";
-      }
-      case "@winglang/sdk.cloud.Api": {
-        return "cloud";
-      }
-      case "@winglang/sdk.ex.Table": {
-        return "table-cells";
-      }
-      case "@winglang/sdk.cloud.Schedule": {
-        return "clock";
-      }
-      case "@winglang/sdk.ex.Redis": {
-        return "redis";
-      }
-      case "@winglang/sdk.std.Test": {
-        return "beaker";
-      }
-      default: {
-        return "cube";
-      }
-    }
-  };
-}
diff --git a/apps/vscode-wing/src/console/explorer-providers/TestsExplorerProvider.ts b/apps/vscode-wing/src/console/explorer-providers/TestsExplorerProvider.ts
deleted file mode 100644
index 7e1a8eeacd0..00000000000
--- a/apps/vscode-wing/src/console/explorer-providers/TestsExplorerProvider.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import {
-  TreeDataProvider,
-  TreeItem,
-  TreeItemCollapsibleState,
-  Event,
-  EventEmitter,
-  ThemeIcon,
-} from "vscode";
-
-export type TestStatus = "success" | "error" | "running" | "pending";
-
-export class TestsExplorerProvider implements TreeDataProvider<TestItem> {
-  private tests: TestItem[] = [];
-
-  private _onDidChangeTreeData: EventEmitter<
-    TestItem | undefined | null | void
-  > = new EventEmitter<TestItem | undefined | null | void>();
-
-  readonly onDidChangeTreeData: Event<TestItem | undefined | null | void> =
-    this._onDidChangeTreeData.event;
-
-  constructor(tests?: TestItem[]) {
-    this.tests = tests || [];
-  }
-
-  public refresh(): void {
-    this._onDidChangeTreeData.fire();
-  }
-
-  public update(tests: TestItem[]): void {
-    this.tests = tests;
-    this.refresh();
-  }
-
-  public clear(): void {
-    this.update([]);
-  }
-
-  public getTests(): TestItem[] {
-    return this.tests;
-  }
-
-  public getTreeItem(element: TestItem): TreeItem {
-    return element;
-  }
-
-  public getChildren(element?: TestItem): Thenable<TestItem[]> {
-    if (!element) {
-      return Promise.resolve(
-        this.tests.map((test) => {
-          return new TestItem(test.id, test.label, test.time, test.status);
-        })
-      );
-    }
-    return Promise.resolve([]);
-  }
-}
-
-export class TestItem extends TreeItem {
-  constructor(
-    public readonly id: string,
-    public readonly label?: string,
-    public readonly time?: number,
-    public readonly status?: TestStatus
-  ) {
-    super(label || "", TreeItemCollapsibleState.None);
-    this.tooltip = this.label;
-    this.id = id;
-
-    this.description =
-      time && status !== "pending" ? `${status} (${time}ms)` : "";
-
-    let iconName = "issues";
-    if (status === "success") {
-      iconName = "check";
-    } else if (status === "error") {
-      iconName = "error";
-    } else if (status === "running") {
-      iconName = "sync~spin";
-    }
-    this.iconPath = new ThemeIcon(iconName);
-  }
-}
diff --git a/apps/vscode-wing/src/console/index.ts b/apps/vscode-wing/src/console/index.ts
deleted file mode 100644
index fc7cab254dc..00000000000
--- a/apps/vscode-wing/src/console/index.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { execSync, spawn } from "child_process";
-import path from "path";
-import fetch from "node-fetch";
-
-const globalAny = global as any;
-globalAny.fetch = fetch;
-globalAny.WebSocket = ws;
-
-import { ExtensionContext, window, workspace } from "vscode";
-import ws from "ws";
-import { type ConsoleManager, createConsoleManager } from "./console-manager";
-import { createClient } from "./services/client";
-import { Loggers } from "../logging";
-
-export class WingConsoleManager {
-  consoleManager: ConsoleManager;
-
-  wingBin: string | undefined;
-
-  constructor(public readonly context: ExtensionContext) {
-    this.consoleManager = createConsoleManager(this.context);
-
-    window.onDidChangeActiveTextEditor(async (editor) => {
-      const instanceId = editor?.document.uri.fsPath;
-      if (
-        this.consoleManager.activeInstances() &&
-        this.consoleManager.getActiveInstanceId() !== instanceId
-      ) {
-        await this.openConsole();
-      }
-    });
-
-    window.onDidChangeActiveColorTheme(async () => {
-      const activeInstanceId = this.consoleManager.getActiveInstanceId();
-      if (activeInstanceId) {
-        await this.consoleManager.setActiveInstance(activeInstanceId);
-      }
-    });
-
-    workspace.onDidCloseTextDocument(async (textDocument) => {
-      if (textDocument.languageId !== "wing") {
-        return;
-      }
-      const instance = this.consoleManager.getInstance(textDocument.uri.fsPath);
-      if (instance) {
-        this.consoleManager.closeInstance(instance.id);
-      }
-    });
-  }
-
-  public setWingBin(wingBin: string) {
-    this.wingBin = wingBin;
-  }
-
-  public async stop() {
-    await this.consoleManager.stopAll();
-  }
-
-  public async openConsole() {
-    // get the current active file
-    const editor = window.activeTextEditor;
-    if (!editor) {
-      return;
-    }
-    const document = editor.document;
-    if (document.languageId !== "wing") {
-      return;
-    }
-    const wingfilePath = document.uri.fsPath;
-    const wingfile = path.basename(wingfilePath);
-
-    if (this.consoleManager.getInstance(wingfilePath)) {
-      await this.consoleManager.setActiveInstance(wingfilePath);
-      return;
-    }
-
-    // TODO: Use createConsoleApp from "bin-helper" instead of spawn to open the console after fixing after fixing https://github.com/winglang/wing/issues/3678
-    if (!this.wingBin) {
-      Loggers.default.appendLine(
-        `Unable to open console: no wing binary found`
-      );
-      return;
-    }
-    const cp = spawn(
-      this.wingBin,
-      ["it", "--no-open", "--no-update-check", wingfilePath],
-      {
-        stdio: ["ignore", "pipe", "pipe"],
-        windowsHide: true,
-        shell: false,
-        detached: process.platform !== "win32",
-      }
-    );
-
-    const onDidClose = () => {
-      if (process.platform === "win32") {
-        try {
-          execSync(`taskkill /pid ${cp.pid} /T /F`);
-        } catch (error) {
-          Loggers.default.appendLine(
-            `Failed to kill the process with taskkill: ${error}`
-          );
-
-          cp.kill();
-        }
-      } else {
-        if (cp.pid) {
-          process.kill(-cp.pid, "SIGTERM");
-        }
-      }
-    };
-
-    cp.on("error", async (err) => {
-      Loggers.default.appendLine(err.toString());
-      if (err) {
-        Loggers.default.appendLine(`Wing Console Closed: ${err}`);
-        this.consoleManager.closeInstance(wingfilePath);
-      }
-    });
-    cp.stdout?.once("data", async (data) => {
-      // get localhost url from stdout
-      const urlMatch = data.toString().match(/localhost:\d+/);
-      if (!urlMatch) {
-        // there should be an error message in a different event
-        return;
-      }
-      const url = urlMatch[0];
-
-      await this.consoleManager.addInstance({
-        id: wingfilePath,
-        wingfile,
-        url,
-        client: createClient(url),
-        onDidClose,
-      });
-    });
-
-    process.once("exit", onDidClose);
-  }
-
-  public async openFile() {
-    const activePanelId = this.consoleManager?.getActiveInstanceId();
-    if (activePanelId) {
-      const document = await workspace.openTextDocument(activePanelId);
-
-      await window.showTextDocument(document);
-    }
-  }
-}
diff --git a/apps/vscode-wing/src/console/services/client.ts b/apps/vscode-wing/src/console/services/client.ts
deleted file mode 100644
index 5e40eab7f50..00000000000
--- a/apps/vscode-wing/src/console/services/client.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import {
-  createTRPCProxyClient,
-  httpLink,
-  createWSClient,
-  splitLink,
-  wsLink,
-} from "@trpc/client";
-
-import type { ExplorerItem, Router, LogEntry } from "@wingconsole/server";
-
-import { TestItem } from "../explorer-providers/TestsExplorerProvider";
-
-export interface SubscriptionOptions {
-  onData: (data: any) => void;
-  onError: (error: any) => void;
-}
-
-export interface Client {
-  url: string;
-  getLogs: ({ time }: { time?: number }) => Promise<LogEntry[]>;
-  selectedNode: () => Promise<string | undefined>;
-  setSelectedNode: (resourcePath: string) => Promise<void>;
-  listTests: () => Promise<TestItem[]>;
-  runTest: (resourcePath: string) => Promise<any>;
-  runAllTests: () => Promise<any>;
-  listResources: () => Promise<ExplorerItem>;
-  onInvalidateQuery: (options: SubscriptionOptions) => void;
-  onOpenFileInEditor: (options: SubscriptionOptions) => void;
-  close: () => void;
-}
-
-export const createClient = (host: string): Client => {
-  const url = `${host}/trpc`;
-
-  const wsClient = createWSClient({
-    url: `ws://${url}`,
-  });
-
-  const client = createTRPCProxyClient<Router>({
-    links: [
-      splitLink({
-        condition(op) {
-          return op.type === "subscription";
-        },
-        true: wsLink({
-          client: wsClient,
-        }),
-        false: httpLink({
-          url: `http://${url}`,
-        }),
-      }),
-    ],
-  });
-
-  const getLogs = ({ time }: { time?: number }) => {
-    return client["app.logs"].query({
-      filters: {
-        level: {
-          verbose: true,
-          info: true,
-          warn: true,
-          error: true,
-        },
-        text: "",
-        timestamp: time || 0,
-      },
-    });
-  };
-
-  const selectedNode = () => {
-    return client["app.selectedNode"].query();
-  };
-
-  const setSelectedNode = (resourcePath: string) => {
-    return client["app.selectNode"].mutate({
-      resourcePath,
-    });
-  };
-
-  const listTests = (): Promise<TestItem[]> => {
-    return client["test.list"].query();
-  };
-
-  const runTest = (resourcePath: string) => {
-    return client["test.run"].mutate({
-      resourcePath,
-    });
-  };
-
-  const runAllTests = () => {
-    return client["test.runAll"].mutate();
-  };
-
-  const listResources = () => {
-    return client["app.explorerTree"].query();
-  };
-
-  const onInvalidateQuery = (options: SubscriptionOptions) => {
-    return client["app.invalidateQuery"].subscribe(undefined, options);
-  };
-
-  const onOpenFileInEditor = (options: SubscriptionOptions) => {
-    return client["app.openFileInEditorSubscription"].subscribe(
-      undefined,
-      options
-    );
-  };
-
-  const close = () => {
-    wsClient.close();
-  };
-
-  return {
-    url,
-    getLogs,
-    selectedNode,
-    setSelectedNode,
-    listTests,
-    runTest,
-    runAllTests,
-    listResources,
-    onInvalidateQuery,
-    onOpenFileInEditor,
-    close,
-  };
-};
diff --git a/apps/vscode-wing/src/constants.ts b/apps/vscode-wing/src/constants.ts
index e515ac8fcd4..4c9d22340bb 100644
--- a/apps/vscode-wing/src/constants.ts
+++ b/apps/vscode-wing/src/constants.ts
@@ -1,7 +1,6 @@
 export const LANGUAGE_SERVER_NAME = "Wing Language Server";
 export const LANGUAGE_SERVER_ID = "wing-language-server";
 export const COMMAND_OPEN_CONSOLE = "wing.openConsole";
-export const COMMAND_OPEN_FILE = "wing.openFile";
+
 export const CFG_WING = "wing";
 export const CFG_WING_BIN = "bin";
-export const VIEW_TYPE_CONSOLE = "wing.console";
diff --git a/apps/vscode-wing/src/extension.ts b/apps/vscode-wing/src/extension.ts
index fd355b34ba6..e1ba44be087 100644
--- a/apps/vscode-wing/src/extension.ts
+++ b/apps/vscode-wing/src/extension.ts
@@ -1,37 +1,115 @@
 import { FSWatcher, watch } from "fs";
+import { readFile } from "fs/promises";
+import { join } from "path";
 import {
   commands,
   ExtensionContext,
   languages,
   workspace,
   window,
+  debug,
+  DebugConfiguration,
 } from "vscode";
 import { getWingBin, updateStatusBar } from "./bin-helper";
-import { WingConsoleManager } from "./console";
-import { CFG_WING, CFG_WING_BIN } from "./constants";
+import { CFG_WING, CFG_WING_BIN, COMMAND_OPEN_CONSOLE } from "./constants";
 import { Loggers } from "./logging";
 import { LanguageServerManager } from "./lsp";
 
 let wingBinWatcher: FSWatcher | undefined;
-let wingConsoleContext: WingConsoleManager | undefined;
 let languageServerManager: LanguageServerManager | undefined;
 
 export async function deactivate() {
   wingBinWatcher?.close();
   await languageServerManager?.stop();
-  await wingConsoleContext?.stop();
 }
 
 export async function activate(context: ExtensionContext) {
   // For some reason, the word pattern is not set correctly by the language config file
   // https://github.com/microsoft/vscode/issues/42649
+  const languageConfig = JSON.parse(
+    await readFile(join(__dirname, "..", "language-configuration.json"), "utf8")
+  );
   languages.setLanguageConfiguration("wing", {
-    wordPattern: /([a-zA-Z_$][A-Za-z_$0-9]*)/,
+    brackets: languageConfig.brackets,
+    comments: languageConfig.comments,
+    autoClosingPairs: languageConfig.autoClosingPairs,
+    wordPattern: new RegExp(languageConfig.wordPattern, "g"),
+    indentationRules: {
+      increaseIndentPattern: new RegExp(
+        languageConfig.indentationRules.increaseIndentPattern
+      ),
+      decreaseIndentPattern: new RegExp(
+        languageConfig.indentationRules.decreaseIndentPattern
+      ),
+    },
   });
 
-  wingConsoleContext = new WingConsoleManager(context);
   languageServerManager = new LanguageServerManager();
 
+  debug.registerDebugConfigurationProvider("wing", {
+    async resolveDebugConfiguration(_, _config: DebugConfiguration) {
+      Loggers.default.appendLine(
+        `Resolving debug configuration... ${JSON.stringify(_config)}`
+      );
+      const editor = window.activeTextEditor;
+
+      const currentFilename = editor?.document.fileName;
+      let chosenFile;
+      if (
+        currentFilename?.endsWith("main.w") ||
+        currentFilename?.endsWith(".test.w")
+      ) {
+        chosenFile = currentFilename;
+      } else {
+        let uriOptions = await workspace.findFiles(
+          `**/*.{main,test}.w`,
+          "**/{node_modules,target}/**"
+        );
+        uriOptions.concat(
+          await workspace.findFiles(`**/main.w`, "**/{node_modules,target}/**")
+        );
+
+        const entrypoint = await window.showQuickPick(
+          uriOptions.map((f) => f.fsPath),
+          {
+            placeHolder: "Choose entrypoint to debug",
+          }
+        );
+
+        if (!entrypoint) {
+          return;
+        }
+
+        chosenFile = entrypoint;
+      }
+
+      const command = await window.showInputBox({
+        title: `Debugging ${chosenFile}`,
+        prompt: "Wing CLI arguments",
+        value: "test",
+      });
+
+      if (!command) {
+        return;
+      }
+
+      const currentWingBin = await getWingBin();
+
+      // Use builtin node debugger
+      return {
+        name: `Debug ${chosenFile}`,
+        request: "launch",
+        type: "node",
+        args: [currentWingBin, command, chosenFile],
+        runtimeSourcemapPausePatterns: [
+          "${workspaceFolder}/**/target/**/*.cjs",
+        ],
+        autoAttachChildProcesses: true,
+        pauseForSourceMap: true,
+      };
+    },
+  });
+
   const wingBinChanged = async () => {
     Loggers.default.appendLine(`Setting up wing bin...`);
     const currentWingBin = await getWingBin();
@@ -56,24 +134,8 @@ export async function activate(context: ExtensionContext) {
         Loggers.default.appendLine(`Using wing from "${currentWingBin}"`);
 
         languageServerManager?.setWingBin(currentWingBin);
-        wingConsoleContext?.setWingBin(currentWingBin);
 
         await languageServerManager?.start();
-
-        // restart the language server and reset any open console windows
-        if (wingConsoleContext?.consoleManager?.activeInstances()) {
-          const chooseReload = await window.showInformationMessage(
-            `Wing has been updated and there are open consoles. Would you like to close them? (This will reset their state)`,
-            "Yes",
-            "No (Close and reopen console to use new version)"
-          );
-
-          if (chooseReload === "Yes") {
-            await wingConsoleContext?.stop();
-          }
-        } else {
-          await wingConsoleContext?.stop();
-        }
       } else {
         void window.showErrorMessage(`wing not found at "${currentWingBin}"`);
       }
@@ -82,6 +144,24 @@ export async function activate(context: ExtensionContext) {
     }
   };
 
+  const wingIt = async () => {
+    const filePath = window.activeTextEditor?.document.fileName;
+    if (!filePath) {
+      return;
+    }
+    const terminalName = `Wing it: ${filePath.split("/").pop()}`;
+
+    const existingTerminal = window.terminals.find(
+      (t) => t.name === terminalName
+    );
+    if (existingTerminal) {
+      existingTerminal.dispose();
+    }
+    const terminal = window.createTerminal(terminalName);
+    terminal.show();
+    terminal.sendText(`wing it "${filePath}"`);
+  };
+
   //watch for config changes
   workspace.onDidChangeConfiguration(async (e) => {
     // see if WING_BIN has changed
@@ -92,12 +172,7 @@ export async function activate(context: ExtensionContext) {
 
   // add command to preview wing files
   context.subscriptions.push(
-    commands.registerCommand("wing.openFile", () =>
-      wingConsoleContext?.openFile()
-    ),
-    commands.registerCommand("wing.openConsole", () =>
-      wingConsoleContext?.openConsole()
-    )
+    commands.registerCommand(COMMAND_OPEN_CONSOLE, wingIt)
   );
 
   await wingBinChanged();
diff --git a/apps/vscode-wing/src/lsp.ts b/apps/vscode-wing/src/lsp.ts
index d2f2d90bc94..8bfccdcda58 100644
--- a/apps/vscode-wing/src/lsp.ts
+++ b/apps/vscode-wing/src/lsp.ts
@@ -1,3 +1,4 @@
+import { workspace } from "vscode";
 import { LanguageClientOptions } from "vscode-languageclient";
 import {
   LanguageClient,
@@ -40,6 +41,13 @@ export class LanguageServerManager {
       debug: run,
     };
     let clientOptions: LanguageClientOptions = {
+      initializationOptions: {
+        parameterHints: workspace
+          .getConfiguration("editor.parameterHints", {
+            languageId: "wing",
+          })
+          .get<boolean>("enabled", true),
+      },
       documentSelector: [
         { scheme: "file", language: "wing", pattern: "**/*.w" },
       ],
diff --git a/apps/vscode-wing/src/project/vscode_types.ts b/apps/vscode-wing/src/project/vscode_types.ts
index e62ee2b0e27..25c8648fcef 100644
--- a/apps/vscode-wing/src/project/vscode_types.ts
+++ b/apps/vscode-wing/src/project/vscode_types.ts
@@ -52,6 +52,13 @@ export interface VSCodeDebugger {
   readonly label?: string;
   readonly type: string;
   readonly runtime?: string;
+  readonly program?: string;
+  readonly languages: string[];
+  readonly request?: string;
+  readonly variables?: string;
+  readonly configurationAttributes?: any;
+  readonly initialConfigurations?: any[];
+  readonly configurationSnippets?: any[];
 }
 
 export interface VSCodeGrammar {
diff --git a/apps/vscode-wing/syntaxes/wing.tmLanguage.json b/apps/vscode-wing/syntaxes/wing.tmLanguage.json
index 119c5e26e6f..7a8a94f04de 100644
--- a/apps/vscode-wing/syntaxes/wing.tmLanguage.json
+++ b/apps/vscode-wing/syntaxes/wing.tmLanguage.json
@@ -6,6 +6,15 @@
     {
       "include": "#template-string"
     },
+    {
+      "include": "#non-interpolated-string"
+    },
+    {
+      "include": "#object-keys"
+    },
+    {
+      "include": "#members"
+    },
     {
       "include": "#keywords"
     },
@@ -22,13 +31,23 @@
       "include": "#constants"
     },
     {
-      "include": "#identifiers"
+      "include": "#intrinsics"
     },
     {
-      "include": "#members"
+      "include": "#identifiers"
     }
   ],
   "repository": {
+    "non-interpolated-string": {
+      "name": "string.quoted.double.wing",
+      "begin": "#\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#string-character-escape"
+        }
+      ]
+    },
     "template-string": {
       "name": "string.quoted.double.wing",
       "begin": "\"",
@@ -141,7 +160,7 @@
         },
         {
           "name": "support.class.wing",
-          "match": "\\b(void|str|num|bool|any|duration|Map|Set|MutMap|MutSet|Array|MutArray|Promise|Json|MutJson)\\b"
+          "match": "\\b(void|str|num|bool|any|duration|regex|datetime|stringable|Map|Set|MutMap|MutSet|Array|MutArray|Promise|Json|MutJson)\\b"
         }
       ]
     },
@@ -177,6 +196,14 @@
         }
       ]
     },
+    "intrinsics": {
+      "patterns": [
+        {
+          "name": "meta.preprocessor.wing",
+          "match": "(@[a-zA-Z_]*)"
+        }
+      ]
+    },
     "members": {
       "patterns": [
         {
@@ -188,6 +215,18 @@
           }
         }
       ]
+    },
+    "object-keys": {
+      "patterns": [
+        {
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\s*:",
+          "captures": {
+            "1": {
+              "name": "variable.wing"
+            }
+          }
+        }
+      ]
     }
   }
 }
diff --git a/apps/wing-api-checker/.gitattributes b/apps/wing-api-checker/.gitattributes
index bc7ca563f01..dea333ed4d4 100644
--- a/apps/wing-api-checker/.gitattributes
+++ b/apps/wing-api-checker/.gitattributes
@@ -1,6 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen".
 
-*.snap linguist-generated
 /.eslintrc.json linguist-generated
 /.gitattributes linguist-generated
 /.gitignore linguist-generated
diff --git a/apps/wing-api-checker/.gitignore b/apps/wing-api-checker/.gitignore
index 2eb962ca898..3e7f20f1a2b 100644
--- a/apps/wing-api-checker/.gitignore
+++ b/apps/wing-api-checker/.gitignore
@@ -30,9 +30,6 @@ jspm_packages/
 .yarn-integrity
 .cache
 !/.projenrc.js
-/test-reports/
-junit.xml
-/coverage/
 /dist/changelog.md
 /dist/version.txt
 !/.prettierignore
diff --git a/apps/wing-api-checker/.npmignore b/apps/wing-api-checker/.npmignore
index ac4ecda24b5..ae983a39ac4 100644
--- a/apps/wing-api-checker/.npmignore
+++ b/apps/wing-api-checker/.npmignore
@@ -1,8 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen".
 /.projen/
-/test-reports/
-junit.xml
-/coverage/
 /dist/changelog.md
 /dist/version.txt
 /test/
diff --git a/apps/wing-api-checker/.projen/deps.json b/apps/wing-api-checker/.projen/deps.json
index 1adb2467a25..7588501bf08 100644
--- a/apps/wing-api-checker/.projen/deps.json
+++ b/apps/wing-api-checker/.projen/deps.json
@@ -1,9 +1,5 @@
 {
   "dependencies": [
-    {
-      "name": "@types/jest",
-      "type": "build"
-    },
     {
       "name": "@types/node",
       "version": "^16",
@@ -48,20 +44,6 @@
       "version": "^8",
       "type": "build"
     },
-    {
-      "name": "jest",
-      "type": "build"
-    },
-    {
-      "name": "jest-junit",
-      "version": "^15",
-      "type": "build"
-    },
-    {
-      "name": "npm-check-updates",
-      "version": "^16",
-      "type": "build"
-    },
     {
       "name": "prettier",
       "type": "build"
@@ -76,16 +58,17 @@
       "type": "build"
     },
     {
-      "name": "ts-jest",
+      "name": "tsx",
       "type": "build"
     },
     {
-      "name": "ts-node",
+      "name": "typescript",
       "type": "build"
     },
     {
-      "name": "typescript",
-      "type": "build"
+      "name": "@types/node",
+      "version": "^20.11.0",
+      "type": "devenv"
     },
     {
       "name": "chalk",
diff --git a/apps/wing-api-checker/.projen/tasks.json b/apps/wing-api-checker/.projen/tasks.json
index 05641fb5850..694c5fcbbcc 100644
--- a/apps/wing-api-checker/.projen/tasks.json
+++ b/apps/wing-api-checker/.projen/tasks.json
@@ -87,7 +87,7 @@
       "description": "Synthesize project files",
       "steps": [
         {
-          "exec": "ts-node --project tsconfig.dev.json .projenrc.ts"
+          "exec": "tsx --tsconfig tsconfig.dev.json .projenrc.ts"
         }
       ]
     },
@@ -138,10 +138,6 @@
       "name": "post-compile",
       "description": "Runs after successful compilation"
     },
-    "post-upgrade": {
-      "name": "post-upgrade",
-      "description": "Runs after upgrading dependencies"
-    },
     "pre-compile": {
       "name": "pre-compile",
       "description": "Prepare the project for compilation"
@@ -174,24 +170,11 @@
       "name": "test",
       "description": "Run tests",
       "steps": [
-        {
-          "exec": "jest --passWithNoTests --updateSnapshot",
-          "receiveArgs": true
-        },
         {
           "spawn": "eslint"
         }
       ]
     },
-    "test:watch": {
-      "name": "test:watch",
-      "description": "Run jest in watch mode",
-      "steps": [
-        {
-          "exec": "jest --watch"
-        }
-      ]
-    },
     "unbump": {
       "name": "unbump",
       "description": "Restores version to 0.0.0",
@@ -208,45 +191,6 @@
         }
       ]
     },
-    "upgrade": {
-      "name": "upgrade",
-      "description": "upgrade dependencies",
-      "env": {
-        "CI": "0"
-      },
-      "steps": [
-        {
-          "exec": "pnpm update npm-check-updates"
-        },
-        {
-          "exec": "npm-check-updates --dep dev --upgrade --target=minor"
-        },
-        {
-          "exec": "npm-check-updates --dep bundle --upgrade --target=minor"
-        },
-        {
-          "exec": "npm-check-updates --dep peer --upgrade --target=minor"
-        },
-        {
-          "exec": "npm-check-updates --dep prod --upgrade --target=minor"
-        },
-        {
-          "exec": "npm-check-updates --dep optional --upgrade --target=minor"
-        },
-        {
-          "exec": "pnpm i --no-frozen-lockfile"
-        },
-        {
-          "exec": "pnpm update @types/jest @types/node @types/yargs @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint jest jest-junit npm-check-updates prettier projen standard-version ts-jest ts-node typescript chalk chokidar glob-promise jsii-reflect yargs"
-        },
-        {
-          "exec": "pnpm exec projen"
-        },
-        {
-          "spawn": "post-upgrade"
-        }
-      ]
-    },
     "watch": {
       "name": "watch",
       "description": "Watch & compile in the background",
diff --git a/apps/wing-api-checker/.projenrc.ts b/apps/wing-api-checker/.projenrc.ts
index 3e0268cd960..0f80ed73906 100644
--- a/apps/wing-api-checker/.projenrc.ts
+++ b/apps/wing-api-checker/.projenrc.ts
@@ -1,4 +1,4 @@
-import { javascript, typescript } from "projen";
+import { javascript, typescript, DependencyType } from "projen";
 
 const project = new typescript.TypeScriptProject({
   defaultReleaseBranch: "main",
@@ -19,10 +19,15 @@ const project = new typescript.TypeScriptProject({
   projenrcTs: true,
   prettier: true,
   package: false,
+  depsUpgrade: false,
+  jest: false,
   deps: ["chalk", "chokidar", "glob-promise", "jsii-reflect", "yargs"],
-  devDeps: ["@types/node@^18", "@types/yargs"],
+  devDeps: ["@types/yargs", "tsx"],
 });
 
+project.defaultTask!.reset("tsx --tsconfig tsconfig.dev.json .projenrc.ts");
+project.deps.removeDependency("ts-node");
+
 const bumpTask = project.tasks.tryFind("bump")!;
 bumpTask.reset(
   "pnpm version ${PROJEN_BUMP_VERSION:-0.0.0} --allow-same-version"
@@ -37,4 +42,6 @@ project.addFields({
 project.package.file.addDeletionOverride("pnpm");
 project.tryRemoveFile(".npmrc");
 
+project.deps.addDependency("@types/node@^20.11.0", DependencyType.DEVENV);
+
 project.synth();
diff --git a/apps/wing-api-checker/LICENSE b/apps/wing-api-checker/LICENSE
index 8baea73aae7..99cf6257708 100644
--- a/apps/wing-api-checker/LICENSE
+++ b/apps/wing-api-checker/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2023 Wing Cloud
+Copyright (c) 2024 Wing Cloud
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/apps/wing-api-checker/package.json b/apps/wing-api-checker/package.json
index 86287db9682..c482999bf96 100644
--- a/apps/wing-api-checker/package.json
+++ b/apps/wing-api-checker/package.json
@@ -17,13 +17,10 @@
     "eslint": "pnpm exec projen eslint",
     "package": "pnpm exec projen package",
     "post-compile": "pnpm exec projen post-compile",
-    "post-upgrade": "pnpm exec projen post-upgrade",
     "pre-compile": "pnpm exec projen pre-compile",
     "release": "pnpm exec projen release",
     "test": "pnpm exec projen test",
-    "test:watch": "pnpm exec projen test:watch",
     "unbump": "pnpm exec projen unbump",
-    "upgrade": "pnpm exec projen upgrade",
     "watch": "pnpm exec projen watch",
     "projen": "pnpm exec projen"
   },
@@ -34,8 +31,7 @@
     "organization": true
   },
   "devDependencies": {
-    "@types/jest": "^29.5.4",
-    "@types/node": "^16",
+    "@types/node": "^20.11.0",
     "@types/yargs": "^16.0.5",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
@@ -45,66 +41,22 @@
     "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.6.4",
-    "jest-junit": "^15",
-    "npm-check-updates": "^16",
     "prettier": "^2.8.8",
     "projen": "^0.71.163",
     "standard-version": "^9",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "tsx": "^4.7.0",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "glob-promise": "^6.0.3",
-    "jsii-reflect": "^1.88.0",
+    "jsii-reflect": "^1.94.0",
     "yargs": "^17.7.2"
   },
   "main": "lib/index.js",
   "license": "MIT",
   "version": "0.0.0",
-  "jest": {
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.ts?(x)",
-      "<rootDir>/(test|src)/**/*(*.)@(spec|test).ts?(x)"
-    ],
-    "clearMocks": true,
-    "collectCoverage": true,
-    "coverageReporters": [
-      "json",
-      "lcov",
-      "clover",
-      "cobertura",
-      "text"
-    ],
-    "coverageDirectory": "coverage",
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "watchPathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "reporters": [
-      "default",
-      [
-        "jest-junit",
-        {
-          "outputDirectory": "test-reports"
-        }
-      ]
-    ],
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "tsconfig": "tsconfig.dev.json"
-      }
-    }
-  },
   "types": "lib/index.d.ts",
   "volta": {
     "extends": "../../package.json"
diff --git a/apps/wing-api-checker/src/index.ts b/apps/wing-api-checker/src/index.ts
index d8a2e6c95be..21235403782 100644
--- a/apps/wing-api-checker/src/index.ts
+++ b/apps/wing-api-checker/src/index.ts
@@ -29,6 +29,16 @@ async function generateWarnings(packageDir: string): Promise<number> {
     warnings += 1;
   }
 
+  const IResource = interfaces.find((x) => x.name === "IResource");
+  if (!IResource) {
+    throw new Error("IResource not found");
+  }
+
+  const IInflight = interfaces.find((x) => x.name === "IInflight");
+  if (!IInflight) {
+    throw new Error("IInflight not found");
+  }
+
   for (const cls of classes) {
     if (!cls.docs.summary) {
       warn(`Missing docstring for ${cls.fqn} (${loc(cls)})`);
@@ -40,6 +50,21 @@ async function generateWarnings(packageDir: string): Promise<number> {
         );
       }
     }
+    if (
+      cls.getInterfaces(true).includes(IResource) ||
+      cls.getInterfaces(true).includes(IInflight)
+    ) {
+      if (
+        cls.docs.customTag("inflight") === undefined &&
+        cls.docs.customTag("noinflight") === undefined
+      ) {
+        warn(
+          `Missing @inflight in docstring for ${cls.fqn} (${loc(
+            cls
+          )}). Suppress with @noinflight.`
+        );
+      }
+    }
   }
 
   for (const iface of interfaces) {
@@ -57,7 +82,11 @@ async function generateWarnings(packageDir: string): Promise<number> {
     if (iface.name.endsWith("Props")) {
       for (const prop of iface.allProperties) {
         if (prop.optional && !prop.docs.docs.default) {
-          warn(`Missing @default for ${iface.fqn}.${prop.name} (${loc(prop)})`);
+          warn(
+            `Missing @default in docstring for ${iface.fqn}.${prop.name} (${loc(
+              prop
+            )})`
+          );
         }
       }
     }
@@ -109,12 +138,12 @@ async function main() {
   } else {
     const warnings = await generateWarnings(packageDir);
     if (warnings > 0) {
-      process.exit(1);
+      process.exitCode = 1;
     }
   }
 }
 
 main().catch((e) => {
   console.error(e);
-  process.exit(1);
+  process.exitCode = 1;
 });
diff --git a/apps/wing-api-checker/test/hello.test.ts b/apps/wing-api-checker/test/hello.test.ts
deleted file mode 100644
index a5f8b253bff..00000000000
--- a/apps/wing-api-checker/test/hello.test.ts
+++ /dev/null
@@ -1 +0,0 @@
-test.todo("hello world!");
diff --git a/apps/wing-console/console/app/.gitignore b/apps/wing-console/console/app/.gitignore
index 431fd5d9336..c6bb5bcd69f 100644
--- a/apps/wing-console/console/app/.gitignore
+++ b/apps/wing-console/console/app/.gitignore
@@ -3,3 +3,4 @@
 /**/target/*.wsim.*/
 /playwright-report/
 /test-results/
+/web/.env
diff --git a/apps/wing-console/console/app/assets/openChrome.applescript b/apps/wing-console/console/app/assets/openChrome.applescript
new file mode 100644
index 00000000000..9ce22932319
--- /dev/null
+++ b/apps/wing-console/console/app/assets/openChrome.applescript
@@ -0,0 +1,95 @@
+(*
+Copyright (c) 2015-present, Facebook, Inc.
+
+This source code is licensed under the MIT license found in the
+LICENSE file at
+https://github.com/facebookincubator/create-react-app/blob/master/LICENSE
+*)
+
+property targetTab: null
+property targetTabIndex: -1
+property targetWindow: null
+property theProgram: "Google Chrome"
+
+on run argv
+  set theURL to item 1 of argv
+
+  -- Allow requested program to be optional,
+  -- default to Google Chrome
+  if (count of argv) > 1 then
+    set theProgram to item 2 of argv
+  end if
+
+  using terms from application "Google Chrome"
+    tell application theProgram
+
+      if (count every window) = 0 then
+        make new window
+      end if
+
+      -- 1: Looking for tab running debugger
+      -- then, Reload debugging tab if found
+      -- then return
+      set found to my lookupTabWithUrl(theURL)
+      if found then
+        set targetWindow's active tab index to targetTabIndex
+        tell targetTab to reload
+        tell targetWindow to activate
+        set index of targetWindow to 1
+        return
+      end if
+
+      -- 2: Looking for Empty tab
+      -- In case debugging tab was not found
+      -- We try to find an empty tab instead
+      set found to my lookupTabWithUrl("chrome://newtab/")
+      if found then
+        set targetWindow's active tab index to targetTabIndex
+        set URL of targetTab to theURL
+        tell targetWindow to activate
+        return
+      end if
+
+      -- 3: Create new tab
+      -- both debugging and empty tab were not found
+      -- make a new tab with url
+      tell window 1
+        activate
+        make new tab with properties {URL:theURL}
+      end tell
+    end tell
+  end using terms from
+end run
+
+-- Function:
+-- Lookup tab with given url
+-- if found, store tab, index, and window in properties
+-- (properties were declared on top of file)
+on lookupTabWithUrl(lookupUrl)
+  using terms from application "Google Chrome"
+    tell application theProgram
+      -- Find a tab with the given url
+      set found to false
+      set theTabIndex to -1
+      repeat with theWindow in every window
+        set theTabIndex to 0
+        repeat with theTab in every tab of theWindow
+          set theTabIndex to theTabIndex + 1
+          if (theTab's URL as string) contains lookupUrl then
+            -- assign tab, tab index, and window to properties
+            set targetTab to theTab
+            set targetTabIndex to theTabIndex
+            set targetWindow to theWindow
+            set found to true
+            exit repeat
+          end if
+        end repeat
+
+        if found then
+          exit repeat
+        end if
+      end repeat
+    end tell
+  end using terms from
+  return found
+end lookupTabWithUrl
diff --git a/apps/wing-console/console/app/demo/main.w b/apps/wing-console/console/app/demo/main.w
index 8687468a476..b0209cc3ddc 100644
--- a/apps/wing-console/console/app/demo/main.w
+++ b/apps/wing-console/console/app/demo/main.w
@@ -1,19 +1,62 @@
 bring cloud;
 bring ex;
+bring ui;
+
 // @see https://github.com/winglang/wing/issues/4237 it crashes the Console preview env.
 //let secret = new cloud.Secret(name: "my-secret");
 
 let bucket = new cloud.Bucket();
 let queue = new cloud.Queue();
 let api = new cloud.Api();
+let counter = new cloud.Counter(initial: 0);
+
+class myBucket {
+  b: cloud.Bucket;
+  new() {
+    this.b = new cloud.Bucket();
+    new ui.FileBrowser("File Browser",
+      {
+        put: inflight (fileName: str, fileContent:str) => {
+          this.b.put(fileName, fileContent);
+        },
+        delete: inflight (fileName: str) => {
+          this.b.delete(fileName);
+        },
+        get: inflight (fileName: str) => {
+          return this.b.get(fileName);
+        },
+        list: inflight () => {return this.b.list();},
+      }
+    );
+
+    new cloud.Service(
+      inflight () => {
+        this.b.put("hello.txt", "Hello, GET!");
+        return inflight () => {
+        };
+      },
+    );
+  }
+  pub inflight put(key: str, value: str) {
+    this.b.put(key, value);
+  }
+}
+
+let myB = new myBucket() as "MyUIComponentBucket";
+
+let putfucn = new cloud.Function(inflight () => {
+    myB.put("test", "Test");
+}) as "PutFileInCustomBucket";
 
 api.get("/test-get", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  bucket.put("hello.txt", "Hello, GET!");
   return cloud.ApiResponse {
     status: 200,
     body: Json.stringify(req.query)
   };
 });
 api.post("/test-post", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  counter.inc();
   return cloud.ApiResponse {
     status: 200,
     body: "Hello, POST!"
@@ -21,15 +64,15 @@ api.post("/test-post", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
 });
 
 let handler = inflight (message: str): str => {
-  bucket.put("hello.txt", "Hello, {message}!");
+   counter.inc();
+  bucket.put("hello{counter.peek()}.txt", "Hello, {message}!");
   log("Hello, {message}!");
   return message;
 };
 
 queue.setConsumer(handler);
 
-let counter = new cloud.Counter(initial: 0);
-new cloud.Function(inflight (message: str): str => {
+new cloud.Function(inflight (message: str?): str? => {
   counter.inc();
   log("Counter is now {counter.inc(0)}");
   return message;
@@ -64,6 +107,7 @@ let table = new ex.Table(
 let rateSchedule = new cloud.Schedule(cloud.ScheduleProps{
   rate: 5m
 }) as "Rate Schedule";
+nodeof(rateSchedule).expanded = true;
 
 rateSchedule.onTick(inflight () => {
   log("Rate schedule ticked!");
@@ -79,7 +123,7 @@ new cloud.Service(
 );
 
 let cronSchedule = new cloud.Schedule(cloud.ScheduleProps{
-  cron: "* * * * ?"
+  cron: "* * * * *"
 }) as "Cron Schedule";
 
 // cronSchedule.onTick(inflight () => {
@@ -119,3 +163,157 @@ test "Add fixtures" {
   counter.set(0);
   counter.inc(100);
 }
+
+class WidgetService {
+  data: cloud.Bucket;
+  counter: cloud.Counter;
+  bucket: myBucket;
+
+  new() {
+    this.data = new cloud.Bucket();
+    this.counter = new cloud.Counter();
+    this.bucket = new myBucket() as "MyInternalBucket";
+    
+    // a field displays a labeled value, with optional refreshing
+    new ui.Field(
+      "Total widgets",
+      inflight () => { return this.countWidgets(); },
+      refreshRate: 5s,
+    ) as "TotalWidgets";
+
+    // a link field displays a clickable link
+    new ui.Field(
+      "Widgets Link",
+      inflight () => { return "https://winglang.io"; },
+      link: true,
+    ) as "WidgetsLink";
+
+    // a button lets you invoke any inflight function
+    new ui.Button("Add widget", inflight () => { this.addWidget(); });
+  }
+
+  pub inflight addWidget() {
+    let id = this.counter.inc();
+    this.data.put("widget-{id}", "my data");
+  }
+
+  inflight countWidgets(): str {
+    return "{this.data.list().length}";
+  }
+}
+
+let widget = new WidgetService();
+
+new cloud.Function(inflight () => {
+  widget.addWidget();
+}) as "AddWidget";
+
+class ApiUsersService {
+  api: cloud.Api; 
+  db: cloud.Bucket;
+  
+  new() {
+    this.api = new cloud.Api();
+    this.db = new cloud.Bucket();
+    
+    this.api.post("/users", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {  
+      let input = Json.tryParse(request.body ?? "") ?? "";
+      let name = input.tryGet("name")?.tryAsStr() ?? "";
+      if name == "" {
+        return cloud.ApiResponse {
+          status: 400,
+          body: "Body parameter 'name' is required"
+        };
+      }
+      this.db.put("user-{name}", Json.stringify(input));
+      return cloud.ApiResponse {
+        status: 200,
+        body: Json.stringify(input)
+      };
+    });
+    this.api.get("/users", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+      let name = request.query.tryGet("name") ?? "";
+      
+      if name != "" {
+        try {
+          return cloud.ApiResponse {
+            status: 200,
+            body: this.db.get("user-{name}")
+          };
+        } catch {
+          return cloud.ApiResponse {
+            status: 404,
+            body: "User not found"
+          };
+        }
+      }
+      
+      return cloud.ApiResponse {
+        status: 200,
+        body: Json.stringify(this.db.list())
+      };
+    });
+
+    new ui.HttpClient(
+      "Test HttpClient UI component",
+      inflight () => {
+        return this.api.url;
+      },
+      inflight () => {
+        return Json.stringify({
+          "paths": {
+            "/users": {
+              "post": {
+                "summary": "Create a new user",
+                "parameters": [
+                  {
+                    "in": "header",
+                    "name": "accept",
+                  },
+                ],
+                "requestBody": {
+                  "required": true,
+                  "content": {
+                    "application/json": {
+                      "schema": {
+                        "type": "object",
+                        "required": [
+                          "name",
+                        ],
+                        "properties": {
+                          "name": {
+                            "type": "string",
+                            "description": "The name of the user"
+                          },
+                          "email": {
+                            "type": "string",
+                            "description": "The email of the user",
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+              },
+              "get": {
+                "summary": "List all widgets",
+                "parameters": [
+                  {
+                    "in": "query",
+                    "name": "name",
+                    "schema": {
+                      "type": "string"
+                    },
+                    "description": "The name of the user"
+                  }
+                ],
+              }
+            },
+          }
+        });
+      }
+   );
+  }
+}
+
+new ApiUsersService();
diff --git a/apps/wing-console/console/app/package.json b/apps/wing-console/console/app/package.json
index 6953ff6ff7c..4ffde93d2f5 100644
--- a/apps/wing-console/console/app/package.json
+++ b/apps/wing-console/console/app/package.json
@@ -7,11 +7,12 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
+    "assets",
     "dist"
   ],
   "scripts": {
     "preview": "node scripts/preview.mjs",
-    "dev": "tsx watch scripts/dev.mjs",
+    "dev": "node scripts/dev.mjs",
     "compile": "tsup",
     "eslint": "eslint --ext .js,.cjs,.ts,.cts,.mts,.tsx --no-error-on-unmatched-pattern . --fix",
     "test:playwright": "playwright test --update-snapshots",
@@ -21,34 +22,35 @@
     "@segment/analytics-node": "^1.1.0",
     "@wingconsole/server": "workspace:^",
     "cross-spawn": "^7.0.3",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
+    "open": "^8.4.2",
     "picocolors": "^1.0.0"
   },
   "devDependencies": {
     "@ibm/plex": "^6.3.0",
     "@playwright/test": "^1.37.1",
-    "@tailwindcss/forms": "^0.5.3",
+    "@tailwindcss/forms": "^0.5.7",
+    "@types/cross-spawn": "^6.0.6",
     "@types/express": "^4.17.17",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "@vitejs/plugin-react": "^4.0.4",
-    "@vitest/coverage-c8": "^0.31.4",
+    "@vitejs/plugin-react": "^4.2.1",
+    "@vitest/coverage-v8": "^1.6.0",
     "@wingconsole/eslint-plugin": "workspace:^",
     "@wingconsole/tsconfig": "workspace:^",
     "@wingconsole/ui": "workspace:^",
     "autoprefixer": "^10.4.15",
     "bump-pack": "workspace:^",
-    "conf": "^11.0.2",
+    "dotenv": "^16.3.1",
     "eslint": "^8.48.0",
     "nanoid": "^4.0.2",
-    "open": "^9.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "tailwindcss": "^3.3.3",
-    "tsup": "^6.7.0",
-    "tsx": "^3.12.8",
+    "tailwindcss": "^3.4.3",
+    "tsup": "^8.0.2",
+    "tsx": "^4.7.0",
     "typescript": "^5.2.2",
-    "vite": "^4.4.9"
+    "vite": "^4.5.2"
   },
   "volta": {
     "extends": "../../../../package.json"
diff --git a/apps/wing-console/console/app/preview/Dockerfile b/apps/wing-console/console/app/preview/Dockerfile
index ddd95c512a1..aa779e67232 100644
--- a/apps/wing-console/console/app/preview/Dockerfile
+++ b/apps/wing-console/console/app/preview/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.16.0-alpine
+FROM node:20.11.0-alpine
 
 WORKDIR /app
 
@@ -8,4 +8,7 @@ COPY apps/wing-console/console/app/demo demo
 
 RUN npm init -y && npm install --no-package-lock ./dist/*-[0-9]*.[0-9]*.[0-9]*.tgz
 
+ENV WING_DISABLE_ANALYTICS=true
+ENV NO_SIGN_IN=true
+
 ENTRYPOINT ["node", "dist/index.mjs"]
diff --git a/apps/wing-console/console/app/preview/index.mjs b/apps/wing-console/console/app/preview/index.mjs
index 3ae492fbe28..106f9f01de8 100644
--- a/apps/wing-console/console/app/preview/index.mjs
+++ b/apps/wing-console/console/app/preview/index.mjs
@@ -1,4 +1,5 @@
 import { fileURLToPath } from "node:url";
+
 import { createConsoleApp } from "@wingconsole/app";
 
 await createConsoleApp({
diff --git a/apps/wing-console/console/app/scripts/config.mjs b/apps/wing-console/console/app/scripts/config.mjs
index 88f603c1597..fa01fd0913e 100644
--- a/apps/wing-console/console/app/scripts/config.mjs
+++ b/apps/wing-console/console/app/scripts/config.mjs
@@ -1,9 +1,8 @@
 import { fileURLToPath } from "node:url";
 
 import react from "@vitejs/plugin-react";
-import * as vite from "vite";
 
-/** @type vite.InlineConfig */
+/** @type {import("vite".InlineConfig)} */
 export const viteConfig = {
   configFile: false,
   root: fileURLToPath(new URL("../web", import.meta.url)),
diff --git a/apps/wing-console/console/app/scripts/dev.mjs b/apps/wing-console/console/app/scripts/dev.mjs
index 0fed1ab4db1..02ac7b3923d 100644
--- a/apps/wing-console/console/app/scripts/dev.mjs
+++ b/apps/wing-console/console/app/scripts/dev.mjs
@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
 
@@ -5,7 +6,8 @@ import { createConsoleServer } from "@wingconsole/server";
 import { createServer as createViteServer } from "vite";
 
 import { viteConfig } from "./config.mjs";
-import { openBrowser } from "./open.mjs";
+
+const require = createRequire(import.meta.url);
 
 const options = parseArgs({
   options: {
@@ -15,44 +17,53 @@ const options = parseArgs({
   },
 });
 
-const consoleServer = await createConsoleServer({
-  wingfile:
-    options.values.wingfile ??
-    fileURLToPath(new URL("../demo/main.w", import.meta.url)),
-  requestedPort: 1214,
-  log: {
-    info: console.log,
-    error: console.error,
-    verbose: console.log,
-  },
-  config: {
-    addEventListener(event, listener) {},
-    removeEventListener(event, listener) {},
-    get(key) {
-      return;
+(async () => {
+  const consoleServer = await createConsoleServer({
+    wingfile:
+      options.values.wingfile ??
+      fileURLToPath(new URL("../demo/main.w", import.meta.url)),
+    requestedPort: 1214,
+    log: {
+      info: console.log,
+      error: console.error,
+      verbose: console.log,
     },
-    set(key, value) {},
-  },
-  hostUtils: {
-    async openExternal(url) {
-      openBrowser(url, {});
+    config: {
+      addEventListener(event, listener) {},
+      removeEventListener(event, listener) {},
+      get(key) {},
+      set(key, value) {},
     },
-  },
-  requireAcceptTerms: true,
-});
+    hostUtils: {
+      async openExternal(url) {
+        const { openBrowser } = require("../src/open.js");
+        openBrowser(url);
+      },
+    },
+    requireAcceptTerms: true,
+    analyticsAnonymousId: undefined,
+    async requireSignIn() {
+      return options.requireSignIn ?? false;
+    },
+  });
 
-const vite = await createViteServer({
-  ...viteConfig,
-  server: {
-    proxy: {
-      "/trpc": {
-        target: `http://localhost:${consoleServer.port}`,
-        changeOrigin: true,
-        ws: true,
+  const vite = await createViteServer({
+    ...viteConfig,
+    server: {
+      proxy: {
+        "/trpc": {
+          target: `http://localhost:${consoleServer.port}`,
+          changeOrigin: true,
+          ws: true,
+        },
       },
+      open: true,
     },
-    open: true,
-  },
-});
+  });
 
-await vite.listen();
+  await vite.listen();
+})().catch((error) => {
+  console.error(error);
+  // eslint-disable-next-line unicorn/no-process-exit
+  process.exit(1);
+});
diff --git a/apps/wing-console/console/app/scripts/open.mjs b/apps/wing-console/console/app/scripts/open.mjs
deleted file mode 100644
index e40eefe81d9..00000000000
--- a/apps/wing-console/console/app/scripts/open.mjs
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * The following is modified based on source found in
- * https://github.com/vitejs/vite
- *
- * MIT Licensed
- * Copyright (c) 2015-present, Facebook, Inc.
- * https://github.com/vitejs/vite/blob/master/LICENSE
- *
- */
-
-import { exec } from "node:child_process";
-import { join } from "node:path";
-
-import spawn from "cross-spawn";
-import open from "open";
-import colors from "picocolors";
-
-/**
- * Reads the BROWSER environment variable and decides what to do with it.
- */
-export function openBrowser(url, opt, logger) {
-  // The browser executable to open.
-  // See https://github.com/sindresorhus/open#app for documentation.
-  const browser = typeof opt === "string" ? opt : process.env.BROWSER || "";
-  if (browser.toLowerCase().endsWith(".js")) {
-    executeNodeScript(browser, url, logger);
-  } else if (browser.toLowerCase() !== "none") {
-    const browserArguments = process.env.BROWSER_ARGS
-      ? process.env.BROWSER_ARGS.split(" ")
-      : [];
-    startBrowserProcess(browser, browserArguments, url);
-  }
-}
-
-function executeNodeScript(scriptPath, url) {
-  const extraArguments = process.argv.slice(2);
-  const child = spawn(process.execPath, [scriptPath, ...extraArguments, url], {
-    stdio: "inherit",
-  });
-  child.on("close", (code) => {
-    if (code !== 0) {
-      console.error(
-        colors.red(
-          `\nThe script specified as BROWSER environment variable failed.\n\n${colors.cyan(
-            scriptPath,
-          )} exited with code ${code}.`,
-        ),
-      );
-    }
-  });
-}
-
-const supportedChromiumBrowsers = [
-  "Google Chrome Canary",
-  "Google Chrome Dev",
-  "Google Chrome Beta",
-  "Google Chrome",
-  "Microsoft Edge",
-  "Brave Browser",
-  "Vivaldi",
-  "Chromium",
-];
-
-async function startBrowserProcess(browser, browserArguments, url) {
-  // If we're on OS X, the user hasn't specifically
-  // requested a different browser, we can try opening
-  // a Chromium browser with AppleScript. This lets us reuse an
-  // existing tab when possible instead of creating a new one.
-  const preferredOSXBrowser =
-    browser === "google chrome" ? "Google Chrome" : browser;
-  const shouldTryOpenChromeWithAppleScript =
-    process.platform === "darwin" &&
-    (!preferredOSXBrowser ||
-      supportedChromiumBrowsers.includes(preferredOSXBrowser));
-
-  if (shouldTryOpenChromeWithAppleScript) {
-    try {
-      const ps = await execAsync("ps cax");
-      const openedBrowser =
-        preferredOSXBrowser && ps.includes(preferredOSXBrowser)
-          ? preferredOSXBrowser
-          : supportedChromiumBrowsers.find((b) => ps.includes(b));
-      if (openedBrowser) {
-        // Try our best to reuse existing tab with AppleScript
-        await execAsync(
-          `osascript openChrome.applescript "${encodeURI(
-            url,
-          )}" "${openedBrowser}"`,
-          {
-            cwd: join(VITE_PACKAGE_DIR, "bin"),
-          },
-        );
-        return true;
-      }
-    } catch {
-      // Ignore errors
-    }
-  }
-
-  // Another special case: on OS X, check if BROWSER has been set to "open".
-  // In this case, instead of passing the string `open` to `open` function (which won't work),
-  // just ignore it (thus ensuring the intended behavior, i.e. opening the system browser):
-  // https://github.com/facebook/create-react-app/pull/1690#issuecomment-283518768
-  if (process.platform === "darwin" && browser === "open") {
-    browser = undefined;
-  }
-
-  // Fallback to open
-  // (It will always open new tab)
-  try {
-    const options = browser
-      ? { app: { name: browser, arguments: browserArguments } }
-      : {};
-    open(url, options).catch(() => {}); // Prevent `unhandledRejection` error.
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function execAsync(command, options) {
-  return new Promise((resolve, reject) => {
-    exec(command, options, (error, stdout) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(stdout.toString());
-      }
-    });
-  });
-}
diff --git a/apps/wing-console/console/app/scripts/preview.mjs b/apps/wing-console/console/app/scripts/preview.mjs
index 98a1bd53863..4cfeaf392e3 100644
--- a/apps/wing-console/console/app/scripts/preview.mjs
+++ b/apps/wing-console/console/app/scripts/preview.mjs
@@ -1,9 +1,10 @@
+import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
 
 import { createConsoleApp } from "../dist/index.js";
 
-import { openBrowser } from "./open.mjs";
+const require = createRequire(import.meta.url);
 
 const options = parseArgs({
   options: {
@@ -13,15 +14,22 @@ const options = parseArgs({
   },
 });
 
-const { port } = await createConsoleApp({
-  wingfile:
-    options.values.wingfile ??
-    fileURLToPath(new URL("../demo/main.w", import.meta.url)),
-  requestedPort: 1214,
-  hostUtils: {
-    async openExternal(url) {
-      openBrowser(url);
+(async () => {
+  const { port } = await createConsoleApp({
+    wingfile:
+      options.values.wingfile ??
+      fileURLToPath(new URL("../demo/main.w", import.meta.url)),
+    requestedPort: 1214,
+    hostUtils: {
+      async openExternal(url) {
+        const { openBrowser } = require("../src/open.js");
+        openBrowser(url);
+      },
     },
-  },
+    open: true,
+  });
+})().catch((error) => {
+  console.error(error);
+  // eslint-disable-next-line unicorn/no-process-exit
+  process.exit(1);
 });
-openBrowser(`http://localhost:${port}`);
diff --git a/apps/wing-console/console/app/src/index.ts b/apps/wing-console/console/app/src/index.ts
index 3819fba7618..5ceeffea337 100644
--- a/apps/wing-console/console/app/src/index.ts
+++ b/apps/wing-console/console/app/src/index.ts
@@ -1,14 +1,13 @@
-import {
-  createConsoleServer,
+import type {
   CreateConsoleServerOptions,
   LogInterface,
   Updater,
   Config,
   HostUtils,
   Trace,
-  isTermsAccepted,
   LayoutConfig,
 } from "@wingconsole/server";
+import { createConsoleServer, isTermsAccepted } from "@wingconsole/server";
 import express from "express";
 
 import { createAnalytics } from "./analytics.js";
@@ -36,8 +35,12 @@ export interface CreateConsoleAppOptions {
   expressApp?: express.Express;
   onExpressCreated?: CreateConsoleServerOptions["onExpressCreated"];
   requireAcceptTerms?: boolean;
+  requireSignIn?: boolean;
   layoutConfig?: LayoutConfig;
   platform?: string[];
+  stateDir?: string;
+  open?: boolean;
+  watchGlobs?: string[];
 }
 
 const staticDir = `${__dirname}/vite`;
@@ -59,6 +62,23 @@ export const createConsoleApp = async (options: CreateConsoleAppOptions) => {
 
   const server = await createConsoleServer({
     ...options,
+    analyticsAnonymousId: analyticsStorage.getAnonymousId(),
+    analytics,
+    async requireSignIn() {
+      if (options.requireSignIn !== undefined) {
+        return options.requireSignIn;
+      }
+
+      // The VSCode extension for Wing will use this to determine whether to show the sign in prompt.
+      const noSignIn = process.env.NO_SIGN_IN === "true";
+      if (noSignIn) {
+        return false;
+      }
+      return analyticsStorage.getRequireSignIn();
+    },
+    async notifySignedIn() {
+      analyticsStorage.notifySignedIn();
+    },
     onExpressCreated(app) {
       app.use(express.static(staticDir));
       options.onExpressCreated?.(app);
@@ -110,12 +130,11 @@ export const createConsoleApp = async (options: CreateConsoleAppOptions) => {
         action,
         ...properties,
       });
-      // resrouce specific event
-      analytics.track(`console_${resourceName}_${action}`, properties);
     },
     log: options.log ?? {
       info() {},
       error: console.error,
+      warning() {},
       verbose() {},
     },
     config: options.config ?? {
@@ -127,5 +146,11 @@ export const createConsoleApp = async (options: CreateConsoleAppOptions) => {
       set(key, value) {},
     },
   });
+
+  if (options.open) {
+    const { openBrowser } = await import("./open.js");
+    openBrowser(`http://localhost:${server.port}/`);
+  }
+
   return server;
 };
diff --git a/apps/wing-console/console/app/src/open.ts b/apps/wing-console/console/app/src/open.ts
new file mode 100644
index 00000000000..5f09db067d7
--- /dev/null
+++ b/apps/wing-console/console/app/src/open.ts
@@ -0,0 +1,134 @@
+/**
+ * The following is modified based on source found in
+ * https://github.com/vitejs/vite
+ *
+ * MIT Licensed
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * https://github.com/vitejs/vite/blob/master/LICENSE
+ *
+ */
+
+import { type ExecOptions, exec } from "node:child_process";
+
+import spawn from "cross-spawn";
+import open from "open";
+import colors from "picocolors";
+
+/**
+ * Reads the BROWSER environment variable and decides what to do with it.
+ */
+export function openBrowser(url: string) {
+  // The browser executable to open.
+  // See https://github.com/sindresorhus/open#app for documentation.
+  const browser = process.env.BROWSER || "";
+  if (browser.toLowerCase().endsWith(".js")) {
+    executeNodeScript(browser, url);
+  } else if (browser.toLowerCase() !== "none") {
+    const browserArguments = process.env.BROWSER_ARGS
+      ? process.env.BROWSER_ARGS.split(" ")
+      : [];
+    startBrowserProcess(browser, browserArguments, url);
+  }
+}
+
+function executeNodeScript(scriptPath: string, url: string) {
+  const extraArguments = process.argv.slice(2);
+  const child = spawn(process.execPath, [scriptPath, ...extraArguments, url], {
+    stdio: "inherit",
+  });
+  child.on("close", (code) => {
+    if (code !== 0) {
+      console.error(
+        colors.red(
+          `\nThe script specified as BROWSER environment variable failed.\n\n${colors.cyan(
+            scriptPath,
+          )} exited with code ${code}.`,
+        ),
+      );
+    }
+  });
+}
+
+const supportedChromiumBrowsers = [
+  "Google Chrome Canary",
+  "Google Chrome Dev",
+  "Google Chrome Beta",
+  "Google Chrome",
+  "Microsoft Edge",
+  "Brave Browser",
+  "Vivaldi",
+  "Chromium",
+];
+
+async function startBrowserProcess(
+  browser: string | undefined,
+  browserArguments: string[],
+  url: string,
+) {
+  // If we're on OS X, the user hasn't specifically
+  // requested a different browser, we can try opening
+  // a Chromium browser with AppleScript. This lets us reuse an
+  // existing tab when possible instead of creating a new one.
+  const preferredOSXBrowser =
+    browser === "google chrome" ? "Google Chrome" : browser;
+  const shouldTryOpenChromeWithAppleScript =
+    process.platform === "darwin" &&
+    (!preferredOSXBrowser ||
+      supportedChromiumBrowsers.includes(preferredOSXBrowser));
+
+  if (shouldTryOpenChromeWithAppleScript) {
+    try {
+      const ps = await execAsync("ps cax", {});
+      const openedBrowser =
+        preferredOSXBrowser && ps.includes(preferredOSXBrowser)
+          ? preferredOSXBrowser
+          : supportedChromiumBrowsers.find((b) => ps.includes(b));
+      if (openedBrowser) {
+        // Try our best to reuse existing tab with AppleScript
+        await execAsync(
+          `osascript openChrome.applescript "${encodeURI(
+            url,
+          )}" "${openedBrowser}"`,
+          {
+            cwd: `${__dirname}/../assets`,
+          },
+        );
+        return true;
+      }
+    } catch {
+      // Ignore errors
+    }
+  }
+
+  // Another special case: on OS X, check if BROWSER has been set to "open".
+  // In this case, instead of passing the string `open` to `open` function (which won't work),
+  // just ignore it (thus ensuring the intended behavior, i.e. opening the system browser):
+  // https://github.com/facebook/create-react-app/pull/1690#issuecomment-283518768
+  if (process.platform === "darwin" && browser === "open") {
+    browser = undefined;
+  }
+
+  // Fallback to open
+  // (It will always open new tab)
+  try {
+    const options = browser
+      ? { app: { name: browser, arguments: browserArguments } }
+      : {};
+    open(url, options).catch(() => {}); // Prevent `unhandledRejection` error.
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function execAsync(command: string, options: ExecOptions) {
+  return new Promise<string>((resolve, reject) => {
+    exec(command, options, (error, stdout) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve(stdout.toString());
+      }
+    });
+  });
+}
diff --git a/apps/wing-console/console/app/src/storage.ts b/apps/wing-console/console/app/src/storage.ts
index cfcf12d436b..96757ecefbe 100644
--- a/apps/wing-console/console/app/src/storage.ts
+++ b/apps/wing-console/console/app/src/storage.ts
@@ -21,6 +21,8 @@ export interface AnalyticsConfig {
   disclaimerDisplayed?: boolean;
   /** optional opt out value */
   optOut?: boolean;
+  /** whether sign in is required */
+  requireSignIn?: boolean;
 }
 
 /**
@@ -79,6 +81,21 @@ export class AnalyticsStorage {
     return config.anonymousId;
   }
 
+  public getRequireSignIn(): boolean {
+    let config = this.loadConfig();
+    if (config.requireSignIn == undefined) {
+      config.requireSignIn = true;
+      this.saveConfig(config);
+    }
+    return config.requireSignIn;
+  }
+
+  public notifySignedIn() {
+    let config = this.loadConfig();
+    config.requireSignIn = false;
+    this.saveConfig(config);
+  }
+
   private generateAnonymousId(): string {
     return randomBytes(16).toString("hex");
   }
diff --git a/apps/wing-console/console/app/test/cloud.api/index.test.ts b/apps/wing-console/console/app/test/cloud.api/index.test.ts
index deff140301d..b3dccf278e0 100644
--- a/apps/wing-console/console/app/test/cloud.api/index.test.ts
+++ b/apps/wing-console/console/app/test/cloud.api/index.test.ts
@@ -1,4 +1,5 @@
-import { Page, expect, test } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 
 import { describe } from "../describe.js";
 import { getResourceNode } from "../helpers.js";
@@ -9,7 +10,7 @@ const runApiTest = async (
   route: string,
   response: string,
 ) => {
-  await getResourceNode(page, "root/Default/cloud.Api").click();
+  await getResourceNode(page, "root/Default/Api").click();
 
   await page.getByTestId("cloud.api:method-toggle").click();
   await page.getByTestId(`cloud.api:method-entry-${method}`).click();
@@ -28,27 +29,27 @@ const runApiTest = async (
 };
 
 describe(`${__dirname}/main.w`, () => {
-  test("get method", async ({ page }) => {
+  test.skip("get method", async ({ page }) => {
     await runApiTest(page, "GET", "/test-get", "Hello GET!");
   });
 
-  test("post method", async ({ page }) => {
+  test.skip("post method", async ({ page }) => {
     await runApiTest(page, "POST", "/test-post", "Hello POST!");
   });
 
-  test("put method", async ({ page }) => {
+  test.skip("put method", async ({ page }) => {
     await runApiTest(page, "PUT", "/test-put", "Hello PUT!");
   });
 
-  test("delete method", async ({ page }) => {
+  test.skip("delete method", async ({ page }) => {
     await runApiTest(page, "DELETE", "/test-delete", "Hello DELETE!");
   });
 
-  test("patch method", async ({ page }) => {
+  test.skip("patch method", async ({ page }) => {
     await runApiTest(page, "PATCH", "/test-patch", "Hello PATCH!");
   });
 
-  test("options method", async ({ page }) => {
+  test.skip("options method", async ({ page }) => {
     await runApiTest(page, "OPTIONS", "/test-options", "Hello OPTIONS!");
   });
 });
diff --git a/apps/wing-console/console/app/test/cloud.bucket/index.test.ts b/apps/wing-console/console/app/test/cloud.bucket/index.test.ts
index 059ab9e8c38..877c90f9650 100644
--- a/apps/wing-console/console/app/test/cloud.bucket/index.test.ts
+++ b/apps/wing-console/console/app/test/cloud.bucket/index.test.ts
@@ -4,8 +4,8 @@ import { describe } from "../describe.js";
 import { getResourceNode } from "../helpers.js";
 
 describe(`${__dirname}/main.w`, () => {
-  test("opens file preview", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Bucket").click();
+  test.skip("opens file preview", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Bucket").click();
 
     await page.getByTestId("cloud.bucket:files-entry-test.txt").click();
 
@@ -14,8 +14,8 @@ describe(`${__dirname}/main.w`, () => {
     await expect(preview).toHaveText("Hello World!");
   });
 
-  test("deletes a file", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Bucket").click();
+  test.skip("deletes a file", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Bucket").click();
 
     const file = page.getByTestId("cloud.bucket:files-entry-test.txt");
 
diff --git a/apps/wing-console/console/app/test/cloud.counter/index.test.ts b/apps/wing-console/console/app/test/cloud.counter/index.test.ts
index 22d7dcfc8de..4b5794832a9 100644
--- a/apps/wing-console/console/app/test/cloud.counter/index.test.ts
+++ b/apps/wing-console/console/app/test/cloud.counter/index.test.ts
@@ -4,8 +4,8 @@ import { describe } from "../describe.js";
 import { getResourceNode } from "../helpers.js";
 
 describe(`${__dirname}/main.w`, () => {
-  test("increase counter", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Counter").click();
+  test.skip("increase counter", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Counter").click();
 
     const currentValue = page.getByTestId("cloud.counter:current-value");
 
@@ -16,20 +16,20 @@ describe(`${__dirname}/main.w`, () => {
     await expect(currentValue).toHaveValue("1");
   });
 
-  test("decreases counter", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Counter").click();
+  test.skip("decreases counter", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Counter").click();
 
     const currentValue = page.getByTestId("cloud.counter:current-value");
 
-    await expect(currentValue).toHaveValue("0");
+    await expect(currentValue).toHaveValue("1");
 
     await page.getByTestId("cloud.counter:decrease").click();
 
-    await expect(currentValue).toHaveValue("-1");
+    await expect(currentValue).toHaveValue("0");
   });
 
-  test("resets counter", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Counter").click();
+  test.skip("resets counter", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Counter").click();
 
     const currentValue = page.getByTestId("cloud.counter:current-value");
 
diff --git a/apps/wing-console/console/app/test/cloud.function/index.test.ts b/apps/wing-console/console/app/test/cloud.function/index.test.ts
index 4d4eb58c372..976fba5249d 100644
--- a/apps/wing-console/console/app/test/cloud.function/index.test.ts
+++ b/apps/wing-console/console/app/test/cloud.function/index.test.ts
@@ -4,8 +4,8 @@ import { describe } from "../describe.js";
 import { getResourceNode } from "../helpers.js";
 
 describe(`${__dirname}/main.w`, () => {
-  test("executes function and shows response", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Function").click();
+  test.skip("executes function and shows response", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Function").click();
 
     await page.getByTestId("cloud.function:invoke").click();
 
diff --git a/apps/wing-console/console/app/test/cloud.queue/index.test.ts b/apps/wing-console/console/app/test/cloud.queue/index.test.ts
index fd4dc72c964..5038b00eaac 100644
--- a/apps/wing-console/console/app/test/cloud.queue/index.test.ts
+++ b/apps/wing-console/console/app/test/cloud.queue/index.test.ts
@@ -4,8 +4,8 @@ import { describe } from "../describe.js";
 import { getResourceNode } from "../helpers.js";
 
 describe(`${__dirname}/main.w`, () => {
-  test("pushes message", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Queue").click();
+  test.skip("pushes message", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Queue").click();
 
     await page.getByTestId("cloud.queue:message").fill("Hello world!");
 
@@ -16,8 +16,8 @@ describe(`${__dirname}/main.w`, () => {
     await expect(approxSize).toHaveText("1");
   });
 
-  test("purges message", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Queue").click();
+  test.skip("purges message", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Queue").click();
 
     await page.getByTestId("cloud.queue:message").fill("Hello world!");
 
diff --git a/apps/wing-console/console/app/test/cloud.topic/index.test.ts b/apps/wing-console/console/app/test/cloud.topic/index.test.ts
index 0ad500a1a06..3c14826abb5 100644
--- a/apps/wing-console/console/app/test/cloud.topic/index.test.ts
+++ b/apps/wing-console/console/app/test/cloud.topic/index.test.ts
@@ -4,8 +4,8 @@ import { describe } from "../describe.js";
 import { getResourceNode } from "../helpers.js";
 
 describe(`${__dirname}/main.w`, () => {
-  test("publishes message", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Topic").click();
+  test.skip("publishes message", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Topic").click();
 
     await page.getByTestId("cloud.topic:message").fill("Hello world!");
 
diff --git a/apps/wing-console/console/app/test/cloud.website/index.test.ts b/apps/wing-console/console/app/test/cloud.website/index.test.ts
index 2a547ad335f..2b3ebfed04b 100644
--- a/apps/wing-console/console/app/test/cloud.website/index.test.ts
+++ b/apps/wing-console/console/app/test/cloud.website/index.test.ts
@@ -4,11 +4,7 @@ import { describe } from "../describe.js";
 import { getResourceNode } from "../helpers.js";
 
 describe(`${__dirname}/main.w`, () => {
-  test("open website", async ({ page }) => {
-    await getResourceNode(page, "root/Default/cloud.Website").click();
-
-    // not working when app mode is not "local"
-    // const url = await page.getByTestId("cloud.website:url").inputValue();
-    //expect(url).toMatch(/http:\/\/127.0.0.1:\d+/);
+  test.skip("open website", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Website").click();
   });
 });
diff --git a/apps/wing-console/console/app/test/describe.ts b/apps/wing-console/console/app/test/describe.ts
index 658d35666bf..a9e258b04ca 100644
--- a/apps/wing-console/console/app/test/describe.ts
+++ b/apps/wing-console/console/app/test/describe.ts
@@ -26,12 +26,19 @@ import { createConsoleApp } from "../dist/index.js";
  * `describe(wingfile, callback)`. Any tests added in
  * this callback will belong to the group.
  */
-export const describe = (wingfile: string, callback: () => void) => {
+export const describe = (
+  wingfile: string,
+  callback: () => void,
+  options?: {
+    requireSignIn?: boolean;
+  },
+) => {
   let server: { port: number; close: () => void } | undefined;
 
   test.beforeEach(async ({ page }) => {
     server = await createConsoleApp({
       wingfile: path.resolve(__dirname, wingfile),
+      requireSignIn: options?.requireSignIn ?? false,
     });
 
     await page.goto(`http://localhost:${server.port}/`);
diff --git a/apps/wing-console/console/app/test/ex.dynamodb-table/index.test.ts b/apps/wing-console/console/app/test/ex.dynamodb-table/index.test.ts
deleted file mode 100644
index 6450455eb9b..00000000000
--- a/apps/wing-console/console/app/test/ex.dynamodb-table/index.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { type Page, expect, test } from "@playwright/test";
-
-import { describe } from "../describe.js";
-import { getResourceNode } from "../helpers.js";
-
-const addRow = async (page: Page, data?: Record<string, any>) => {
-  await page.getByTestId("ex.DynamodbTable:new-row").click();
-  await page.getByTestId("ex.DynamodbTable:new-row").fill(JSON.stringify(data));
-
-  const addRowButton = page.getByTestId("ex.DynamodbTable:add-row");
-  await addRowButton.click();
-
-  const row = page.getByTestId("ex.DynamodbTable:row-0");
-  await expect(row).toBeVisible();
-};
-
-describe(`${__dirname}/main.w`, () => {
-  test("adds new item", async ({ page }) => {
-    await getResourceNode(page, "root/Default/ex.DynamodbTable").click();
-
-    await addRow(page, { id: "1", key1: "value1", key2: "value2" });
-  });
-
-  test("removes row", async ({ page }) => {
-    await getResourceNode(page, "root/Default/ex.DynamodbTable").click();
-
-    await addRow(page, { id: "1", key1: "value1", key2: "value2" });
-
-    const deleteButton = page.getByTestId("ex.DynamodbTable:remove-row-0");
-    await expect(deleteButton).toBeEnabled();
-    await deleteButton.click();
-
-    const row = page.getByTestId("ex.DynamodbTable:row-0");
-    await expect(row).toBeHidden();
-  });
-});
diff --git a/apps/wing-console/console/app/test/ex.dynamodb-table/main.w b/apps/wing-console/console/app/test/ex.dynamodb-table/main.w
deleted file mode 100644
index 5c7dc90019e..00000000000
--- a/apps/wing-console/console/app/test/ex.dynamodb-table/main.w
+++ /dev/null
@@ -1,7 +0,0 @@
-bring ex;
-
-new ex.DynamodbTable({
-  name: "table",
-  attributeDefinitions: { "id": "S" },
-  hashKey: "id"
-  });
diff --git a/apps/wing-console/console/app/test/ex.redis/index.test.ts b/apps/wing-console/console/app/test/ex.redis/index.test.ts
index 058a4d6c21a..c289842664b 100644
--- a/apps/wing-console/console/app/test/ex.redis/index.test.ts
+++ b/apps/wing-console/console/app/test/ex.redis/index.test.ts
@@ -21,8 +21,8 @@ describe(`${__dirname}/main.w`, () => {
     test.skip(!isDockerAvailable(), "Docker is not available");
   });
 
-  test("opens redis help", async ({ page }) => {
-    await getResourceNode(page, "root/Default/ex.Redis").click();
+  test.skip("opens redis help", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Redis").click();
 
     const input = page.getByTestId("ex.redis:input");
 
@@ -39,8 +39,8 @@ describe(`${__dirname}/main.w`, () => {
     );
   });
 
-  test("navigates history", async ({ page }) => {
-    await getResourceNode(page, "root/Default/ex.Redis").click();
+  test.skip("navigates history", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Redis").click();
 
     const input = page.getByTestId("ex.redis:input");
 
diff --git a/apps/wing-console/console/app/test/ex.table/index.test.ts b/apps/wing-console/console/app/test/ex.table/index.test.ts
index 9c0e93cebed..2158c9031ee 100644
--- a/apps/wing-console/console/app/test/ex.table/index.test.ts
+++ b/apps/wing-console/console/app/test/ex.table/index.test.ts
@@ -29,14 +29,14 @@ const addRow = async (
 };
 
 describe(`${__dirname}/main.w`, () => {
-  test("adds new row", async ({ page }) => {
-    await getResourceNode(page, "root/Default/ex.Table").click();
+  test.skip("adds new row", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Table").click();
 
     await addRow(page, "Hello World!");
   });
 
-  test("edits row", async ({ page }) => {
-    await getResourceNode(page, "root/Default/ex.Table").click();
+  test.skip("edits row", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Table").click();
 
     const rowId = "Hello World!";
 
@@ -54,8 +54,8 @@ describe(`${__dirname}/main.w`, () => {
     expect(editedValue).toBe("Hello World! 2");
   });
 
-  test("removes row", async ({ page }) => {
-    await getResourceNode(page, "root/Default/ex.Table").click();
+  test.skip("removes row", async ({ page }) => {
+    await getResourceNode(page, "root/Default/Table").click();
 
     const rowId = "Hello World!";
 
diff --git a/apps/wing-console/console/app/test/health/health.test.ts b/apps/wing-console/console/app/test/health/health.test.ts
new file mode 100644
index 00000000000..3926dec0934
--- /dev/null
+++ b/apps/wing-console/console/app/test/health/health.test.ts
@@ -0,0 +1,10 @@
+import { expect, test } from "@playwright/test";
+
+import { describe } from "../describe.js";
+
+describe(`${__dirname}/main.w`, () => {
+  test("Health check", async ({ page }) => {
+    const appState = page.getByTestId("app-state");
+    await expect(appState).toContainText("success");
+  });
+});
diff --git a/apps/wing-console/console/app/test/health/main.w b/apps/wing-console/console/app/test/health/main.w
new file mode 100644
index 00000000000..6758e443e08
--- /dev/null
+++ b/apps/wing-console/console/app/test/health/main.w
@@ -0,0 +1,2 @@
+bring cloud;
+
diff --git a/apps/wing-console/console/app/test/helpers.ts b/apps/wing-console/console/app/test/helpers.ts
index 96cf711d1e9..80e8134b96d 100644
--- a/apps/wing-console/console/app/test/helpers.ts
+++ b/apps/wing-console/console/app/test/helpers.ts
@@ -1,4 +1,4 @@
-import { Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
 
 export const getResourceNode = (page: Page, path: string) => {
   return page.locator(
diff --git a/apps/wing-console/console/app/test/login/login.test.ts b/apps/wing-console/console/app/test/login/login.test.ts
new file mode 100644
index 00000000000..e0ccde0af0e
--- /dev/null
+++ b/apps/wing-console/console/app/test/login/login.test.ts
@@ -0,0 +1,40 @@
+import { expect, test } from "@playwright/test";
+
+import { describe } from "../describe.js";
+
+describe(
+  `${__dirname}/main.w`,
+  () => {
+    test("Sign in modal is visible when required", async ({ page }) => {
+      const signinModal = page.getByTestId("signin-modal");
+      await expect(signinModal).toBeVisible();
+    });
+  },
+  { requireSignIn: true },
+);
+
+describe(
+  `${__dirname}/main.w`,
+  () => {
+    test("GitHub button is clickable", async ({ page }) => {
+      const githubLoginButton = page.getByTestId("signin-github-button");
+      await expect(githubLoginButton).toBeVisible();
+      await expect(githubLoginButton).toBeEnabled();
+      await githubLoginButton.click();
+    });
+  },
+  { requireSignIn: true },
+);
+
+describe(
+  `${__dirname}/main.w`,
+  () => {
+    test("Google button is clickable", async ({ page }) => {
+      const googleSignInButton = page.getByTestId("signin-google-button");
+      await expect(googleSignInButton).toBeVisible();
+      await expect(googleSignInButton).toBeEnabled();
+      await googleSignInButton.click();
+    });
+  },
+  { requireSignIn: true },
+);
diff --git a/apps/wing-console/console/app/test/login/main.w b/apps/wing-console/console/app/test/login/main.w
new file mode 100644
index 00000000000..6758e443e08
--- /dev/null
+++ b/apps/wing-console/console/app/test/login/main.w
@@ -0,0 +1,2 @@
+bring cloud;
+
diff --git a/apps/wing-console/console/app/tsup.config.ts b/apps/wing-console/console/app/tsup.config.ts
index 0b716cc2bfa..57055523620 100644
--- a/apps/wing-console/console/app/tsup.config.ts
+++ b/apps/wing-console/console/app/tsup.config.ts
@@ -9,7 +9,6 @@ export default defineConfig({
   format: ["cjs"],
   env: {
     SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY ?? "",
-    WING_DISABLE_ANALYTICS: process.env.WING_DISABLE_ANALYTICS ?? "",
   },
   dts: true,
   clean: true,
diff --git a/apps/wing-console/console/app/turbo.json b/apps/wing-console/console/app/turbo.json
index 475d88883d9..e26803eb250 100644
--- a/apps/wing-console/console/app/turbo.json
+++ b/apps/wing-console/console/app/turbo.json
@@ -2,9 +2,12 @@
   "$schema": "https://turborepo.org/schema.json",
   "extends": ["//"],
   "pipeline": {
+    "dev": {
+      "dependsOn": ["^compile"]
+    },
     "compile": {
       "outputs": ["dist/**"],
-      "env": ["SEGMENT_WRITE_KEY"]
+      "env": ["SEGMENT_WRITE_KEY", "VITE_WING_CLOUD_SIGN_IN_URL"]
     },
     "package": {
       "outputs": ["../../../../dist/wingconsole-app-*.tgz"]
diff --git a/apps/wing-console/console/app/web/.env.example b/apps/wing-console/console/app/web/.env.example
new file mode 100644
index 00000000000..9b5e61b7ffd
--- /dev/null
+++ b/apps/wing-console/console/app/web/.env.example
@@ -0,0 +1 @@
+VITE_WING_CLOUD_SIGN_IN_URL=http://localhost:3900/wrpc/console.signIn
diff --git a/apps/wing-console/console/app/web/env.d.ts b/apps/wing-console/console/app/web/env.d.ts
new file mode 100644
index 00000000000..11f02fe2a00
--- /dev/null
+++ b/apps/wing-console/console/app/web/env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/apps/wing-console/console/app/web/index.css b/apps/wing-console/console/app/web/index.css
index 480c5d565e3..9418e103e02 100644
--- a/apps/wing-console/console/app/web/index.css
+++ b/apps/wing-console/console/app/web/index.css
@@ -1,8 +1,4 @@
-@import "@ibm/plex/IBM-Plex-Sans/fonts/split/woff2/IBMPlexSans-Regular.css";
-@import "@ibm/plex/IBM-Plex-Sans/fonts/split/woff2/IBMPlexSans-Medium.css";
-@import "@ibm/plex/IBM-Plex-Sans/fonts/split/woff2/IBMPlexSans-Italic.css";
-@import "@ibm/plex/IBM-Plex-Mono/fonts/split/woff2/IBMPlexMono-Regular.css";
-@import "@ibm/plex/IBM-Plex-Mono/fonts/split/woff2/IBMPlexMono-Medium.css";
+@import "@ibm/plex/css/ibm-plex.css";
 
 @tailwind base;
 @tailwind components;
diff --git a/apps/wing-console/console/app/web/index.tsx b/apps/wing-console/console/app/web/index.tsx
index 3786d2399e3..923ee4bf404 100644
--- a/apps/wing-console/console/app/web/index.tsx
+++ b/apps/wing-console/console/app/web/index.tsx
@@ -18,6 +18,14 @@ ReactDOM.createRoot(document.querySelector("#root")!).render(
         // Playground and Learn need to be able to listen to all traces.
         window.parent.postMessage({ trace }, "*");
       }}
+      wingCloudSignInUrl={
+        import.meta.env.VITE_WING_CLOUD_SIGN_IN_URL ??
+        "https://wing.cloud/wrpc/console.signIn"
+      }
+      googleSignInURL={
+        import.meta.env.VITE_GOOGLE_SIGN_IN_URL ??
+        "https://wing.cloud/wrpc/console.signIn/google"
+      }
     />
   </React.StrictMode>,
 );
diff --git a/apps/wing-console/console/design-system/package.json b/apps/wing-console/console/design-system/package.json
index 10681df0432..c08958d447a 100644
--- a/apps/wing-console/console/design-system/package.json
+++ b/apps/wing-console/console/design-system/package.json
@@ -31,33 +31,34 @@
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.0.18",
     "@popperjs/core": "^2.11.8",
-    "@tailwindcss/forms": "^0.5.3",
-    "classnames": "^2.3.2",
+    "@tailwindcss/forms": "^0.5.7",
+    "@tailwindcss/typography": "^0.5.12",
+    "classnames": "^2.5.1",
     "lodash.uniq": "^4.5.0",
     "nanoid": "^4.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-popper": "^2.3.0",
-    "tailwindcss": "^3.3.3"
+    "tailwindcss": "^3.4.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.11",
+    "@babel/core": "^7.23.9",
     "@storybook/react": "^7.4.0",
     "@testing-library/react": "^14.0.0",
     "@types/lodash.uniq": "^4.5.7",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "@vitejs/plugin-react": "^4.0.4",
-    "@vitest/coverage-c8": "^0.31.4",
+    "@vitejs/plugin-react": "^4.2.1",
+    "@vitest/coverage-v8": "^1.6.0",
     "@wingconsole/eslint-plugin": "workspace:^",
     "@wingconsole/tsconfig": "workspace:^",
     "bump-pack": "workspace:^",
     "eslint": "^8.48.0",
     "happy-dom": "^9.20.3",
-    "tsup": "^7.2.0",
+    "tsup": "^8.0.2",
     "typescript": "^5.2.2",
-    "vite": "^4.4.9",
-    "vitest": "^0.31.4",
+    "vite": "^4.5.2",
+    "vitest": "^1.6.0",
     "webpack": "^5.88.2"
   },
   "volta": {
diff --git a/apps/wing-console/console/design-system/src/attribute.tsx b/apps/wing-console/console/design-system/src/attribute.tsx
index 8e9717a89a2..e2344df3859 100644
--- a/apps/wing-console/console/design-system/src/attribute.tsx
+++ b/apps/wing-console/console/design-system/src/attribute.tsx
@@ -1,5 +1,7 @@
+import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid";
 import classNames from "classnames";
-import { PropsWithChildren, useId } from "react";
+import type { PropsWithChildren } from "react";
+import { useId } from "react";
 
 import { Link } from "./link.js";
 import { useTheme } from "./theme-provider.js";
@@ -12,6 +14,7 @@ interface AttributeProps {
   noLeftPadding?: boolean;
   centerLabel?: boolean;
   dataTestId?: string;
+  className?: string;
 }
 
 export const Attribute = ({
@@ -23,6 +26,7 @@ export const Attribute = ({
   noLeftPadding = false,
   centerLabel = true,
   dataTestId,
+  className,
 }: PropsWithChildren<AttributeProps>) => {
   const { theme } = useTheme();
   const id = useId();
@@ -32,15 +36,38 @@ export const Attribute = ({
         "flex flex-row",
         !noLeftPadding && "pl-4",
         centerLabel && "items-center",
+        className,
       )}
     >
       <label htmlFor={id} className={classNames(theme.text2, "min-w-[100px]")}>
         {name}
       </label>
       {value !== undefined && type === "url" && (
-        <div className="truncate">
-          <Link id={id} href={url} dataTestid={dataTestId}>
+        <div
+          className={
+            (classNames(
+              theme.bgInput,
+              theme.textInput,
+              theme.focusInput,
+              theme.borderInput,
+            ),
+            "truncate")
+          }
+        >
+          <Link
+            className={"flex focus:ring-opacity-0"}
+            id={id}
+            href={url}
+            dataTestid={dataTestId}
+            target={"_blank"}
+          >
             {value}
+            <ArrowTopRightOnSquareIcon
+              className={classNames(
+                theme.text2,
+                "text-sm flex ml-2 h-4 w-4 cursor-pointer",
+              )}
+            />
           </Link>
         </div>
       )}
diff --git a/apps/wing-console/console/design-system/src/button.tsx b/apps/wing-console/console/design-system/src/button.tsx
index 5cbd2f81c11..86b2f80ee1f 100644
--- a/apps/wing-console/console/design-system/src/button.tsx
+++ b/apps/wing-console/console/design-system/src/button.tsx
@@ -1,7 +1,8 @@
 import classNames from "classnames";
-import { PropsWithChildren, forwardRef } from "react";
+import type { PropsWithChildren } from "react";
+import { forwardRef } from "react";
 
-import { IconComponent } from "./resource-icon.js";
+import type { IconComponent } from "./resource-icon.js";
 import { useTheme } from "./theme-provider.js";
 
 interface ButtonProps {
@@ -49,7 +50,7 @@ export const Button = forwardRef<
         ref={ref}
         type={type}
         className={classNames(
-          "inline-flex gap-2 items-center text-xs font-medium outline-none rounded",
+          "inline-flex gap-2 items-center text-xs font-normal outline-none rounded",
           theme.focusInput,
           primary &&
             !transparent && [
diff --git a/apps/wing-console/console/design-system/src/combobox.tsx b/apps/wing-console/console/design-system/src/combobox.tsx
index 194408f6178..0abfbaa12a9 100644
--- a/apps/wing-console/console/design-system/src/combobox.tsx
+++ b/apps/wing-console/console/design-system/src/combobox.tsx
@@ -26,6 +26,7 @@ export interface ComboboxProps {
   showSelected?: boolean;
   renderItem?: (item: Item) => JSX.Element;
   dataTestid?: string;
+  autoComplete?: boolean;
 }
 
 export const Combobox = ({
@@ -43,6 +44,7 @@ export const Combobox = ({
   showSelected = true,
   renderItem,
   dataTestid,
+  autoComplete = true,
 }: ComboboxProps) => {
   const { theme } = useTheme();
 
@@ -88,6 +90,7 @@ export const Combobox = ({
               ref={inputRef}
               as="input"
               placeholder={placeholder}
+              autoComplete={autoComplete ? "on" : "off"}
               className={classNames(
                 inputClassName,
                 theme.bgInput,
diff --git a/apps/wing-console/console/design-system/src/file-preview.stories.tsx b/apps/wing-console/console/design-system/src/file-preview.stories.tsx
index 6957713bb7e..ea162066aca 100644
--- a/apps/wing-console/console/design-system/src/file-preview.stories.tsx
+++ b/apps/wing-console/console/design-system/src/file-preview.stories.tsx
@@ -1,4 +1,4 @@
-import { Meta, StoryObj } from "@storybook/react";
+import type { Meta, StoryObj } from "@storybook/react";
 
 import { FilePreview } from "./file-preview.js";
 
diff --git a/apps/wing-console/console/design-system/src/headless/tree-context.ts b/apps/wing-console/console/design-system/src/headless/tree-context.ts
index 05f5afa1022..be29f8ef9d1 100644
--- a/apps/wing-console/console/design-system/src/headless/tree-context.ts
+++ b/apps/wing-console/console/design-system/src/headless/tree-context.ts
@@ -1,4 +1,5 @@
-import { createContext, useContext, KeyboardEvent } from "react";
+import type { KeyboardEvent } from "react";
+import { createContext, useContext } from "react";
 
 export interface TreeContext {
   expandedItems: string[];
diff --git a/apps/wing-console/console/design-system/src/headless/tree-item.tsx b/apps/wing-console/console/design-system/src/headless/tree-item.tsx
index 95319842771..e30b4891ead 100644
--- a/apps/wing-console/console/design-system/src/headless/tree-item.tsx
+++ b/apps/wing-console/console/design-system/src/headless/tree-item.tsx
@@ -1,14 +1,12 @@
+import type { PropsWithChildren, ReactNode, KeyboardEvent } from "react";
 import {
   createContext,
-  PropsWithChildren,
-  ReactNode,
   useCallback,
   useContext,
   useEffect,
   useMemo,
   useRef,
   useState,
-  KeyboardEvent,
 } from "react";
 
 import { useTreeContext } from "./tree-context.js";
@@ -123,6 +121,12 @@ export const TreeItem = ({
   });
   const canBeExpanded = !!children;
 
+  useEffect(() => {
+    if (selected) {
+      ref.current?.scrollIntoView();
+    }
+  }, [selected, ref]);
+
   return (
     <li
       ref={ref}
diff --git a/apps/wing-console/console/design-system/src/headless/tree-view.tsx b/apps/wing-console/console/design-system/src/headless/tree-view.tsx
index cdaae16aa53..022f82019f3 100644
--- a/apps/wing-console/console/design-system/src/headless/tree-view.tsx
+++ b/apps/wing-console/console/design-system/src/headless/tree-view.tsx
@@ -1,10 +1,5 @@
-import {
-  PropsWithChildren,
-  useCallback,
-  useEffect,
-  useState,
-  KeyboardEvent,
-} from "react";
+import type { PropsWithChildren, KeyboardEvent } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 import { useControlled } from "../utils/use-controlled.js";
 
diff --git a/apps/wing-console/console/design-system/src/icons/dynamodb-icon.tsx b/apps/wing-console/console/design-system/src/icons/dynamodb-icon.tsx
deleted file mode 100644
index 6ddfe996f8b..00000000000
--- a/apps/wing-console/console/design-system/src/icons/dynamodb-icon.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { forwardRef } from "react";
-
-type DynamoDBIconProps = React.PropsWithoutRef<
-  React.SVGProps<SVGSVGElement>
-> & {
-  title?: string;
-  titleId?: string;
-} & React.RefAttributes<SVGSVGElement>;
-
-export const DynamoDBIcon = forwardRef<SVGSVGElement, DynamoDBIconProps>(
-  ({ title, titleId, ...props }, svgRef) => {
-    return (
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        preserveAspectRatio="xMidYMid"
-        viewBox="0 0 256 289"
-        aria-hidden="true"
-        ref={svgRef}
-        aria-labelledby={titleId}
-        {...props}
-      >
-        {title && <title id={titleId}>{title}</title>}
-        <path
-          fill="#5294CF"
-          d="M165.3 288.5h3.5l57.2-28.6 1-1.4V30l-1-1.4L168.8 0h-3.6v288.5"
-        />
-        <path
-          fill="#1F5B98"
-          d="M90.7 288.5h-3.5L30 259.9l-1.2-2L28.2 31l1.8-2.5L87.2 0h3.6v288.5"
-        />
-        <path fill="#2D72B8" d="M87.3 0h81.4v288.5H87.3V0z" />
-        <path
-          fill="#1A476F"
-          d="m256 137.8-2-.5-27.6-2.5-.4.2-57.3-2.3H87.3L30 135V91.2l57.3-13.3h81.4L226 91.2l21.1 11.2v-7.2l8.9-1-1-1.8-28-20.2-.9.3-57.3-17.7H87.3L30 72.5V28.6L0 63.7v30.7l.2-.2 8.7 1v7.3L0 107.3v30.5h.2l8.7.1v12.8l-7.5.1-1.4-.1v30.5l8.9 4.8v7.4l-8.5 1-.4-.3v30.6L30 260v-44l57.3 17.8h81.4l57.5-17.8.8.3 27.8-19.8 1.2-2-8.9-1v-7.3l-1.2-.4-19 10.2-.7 1.5-57.5 13.2H87.3L30 197.3v-43.8l57.3 2.2v.1h81.4l57.3-2.3 1.3.6 26.8-2.3 1.9-1-8.9-.1v-12.8l8.9-.1"
-        />
-        <path
-          fill="#2D72B8"
-          d="M226 216v43.9l30-35.2v-30.4l-29.8 21.6h-.2m0-18.5h.2l29.8-16v-30.7l-30 2.8v44m.2-106.3h-.2V135l30 2.8V107l-29.8-15.9m0-18.5L256 94.2V63.7l-30-35v43.8h.2v.2"
-        />
-      </svg>
-    );
-  },
-);
diff --git a/apps/wing-console/console/design-system/src/input.tsx b/apps/wing-console/console/design-system/src/input.tsx
index ef2c18dbe44..2dfd9c63a92 100644
--- a/apps/wing-console/console/design-system/src/input.tsx
+++ b/apps/wing-console/console/design-system/src/input.tsx
@@ -1,7 +1,7 @@
 import classNames from "classnames";
 import { forwardRef } from "react";
 
-import { IconComponent } from "./resource-icon.js";
+import type { IconComponent } from "./resource-icon.js";
 import { useTheme } from "./theme-provider.js";
 
 export interface InputProps {
diff --git a/apps/wing-console/console/design-system/src/inspector-section-heading.tsx b/apps/wing-console/console/design-system/src/inspector-section-heading.tsx
index c1aed7fb474..0bf9c91478b 100644
--- a/apps/wing-console/console/design-system/src/inspector-section-heading.tsx
+++ b/apps/wing-console/console/design-system/src/inspector-section-heading.tsx
@@ -1,7 +1,7 @@
 import { ChevronDownIcon, ChevronRightIcon } from "@heroicons/react/20/solid";
 import classNames from "classnames";
 
-import { IconComponent } from "./resource-icon.js";
+import type { IconComponent } from "./resource-icon.js";
 import { useTheme } from "./theme-provider.js";
 
 export interface InspectorSectionHeadingProps {
diff --git a/apps/wing-console/console/design-system/src/inspector-section.tsx b/apps/wing-console/console/design-system/src/inspector-section.tsx
index 340e9b5fcfb..129d6eedffe 100644
--- a/apps/wing-console/console/design-system/src/inspector-section.tsx
+++ b/apps/wing-console/console/design-system/src/inspector-section.tsx
@@ -1,7 +1,7 @@
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 import { InspectorSectionHeading } from "./inspector-section-heading.js";
-import { IconComponent } from "./resource-icon.js";
+import type { IconComponent } from "./resource-icon.js";
 
 export interface InspectorSectionProps {
   open?: boolean;
diff --git a/apps/wing-console/console/design-system/src/key-value-list.tsx b/apps/wing-console/console/design-system/src/key-value-list.tsx
index e51fbde78ac..018c999e6f3 100644
--- a/apps/wing-console/console/design-system/src/key-value-list.tsx
+++ b/apps/wing-console/console/design-system/src/key-value-list.tsx
@@ -14,7 +14,10 @@ import { useTheme } from "./theme-provider.js";
 
 export interface KeyValueItem {
   key: string;
-  value: string;
+  value?: string;
+  type?: string;
+  required?: boolean;
+  description?: string;
 }
 
 export interface UseKeyValueListOptions {
@@ -70,6 +73,8 @@ export interface KeyValueListProps {
   readonly?: boolean;
   className?: string;
   placeholder?: string;
+  filter?: boolean;
+  autoComplete?: boolean;
 }
 
 export const KeyValueList = ({
@@ -88,6 +93,8 @@ export const KeyValueList = ({
   valueDisabled = false,
   readonly = false,
   placeholder = "No items",
+  filter = true,
+  autoComplete = true,
 }: KeyValueListProps) => {
   const { theme } = useTheme();
 
@@ -133,6 +140,7 @@ export const KeyValueList = ({
       {editItems.map((item, index) => (
         <div key={index} className="gap-1 flex">
           <Combobox
+            autoComplete={autoComplete}
             placeholder={keyPlaceholder}
             items={comboboxItems}
             value={item.key}
@@ -154,14 +162,17 @@ export const KeyValueList = ({
             )}
             disabled={disabled}
             readonly={readonly || keyDisabled}
-            filter={false}
+            filter={filter}
             showSelected={false}
           />
 
           <Combobox
-            placeholder={valuePlaceholder}
+            autoComplete={autoComplete}
+            placeholder={`${item.type ?? valuePlaceholder} ${
+              item.required === true ? " (required)" : ""
+            }${item.description ? ` - ${item.description}` : ""}`}
             items={comboboxValues}
-            value={item.value}
+            value={item.value ?? ""}
             onChange={(value) => {
               onItemChange(index, {
                 key: item.key,
diff --git a/apps/wing-console/console/design-system/src/left-resizable-widget.tsx b/apps/wing-console/console/design-system/src/left-resizable-widget.tsx
index f1b57c48c76..597e1140c4d 100644
--- a/apps/wing-console/console/design-system/src/left-resizable-widget.tsx
+++ b/apps/wing-console/console/design-system/src/left-resizable-widget.tsx
@@ -1,5 +1,6 @@
 import classNames from "classnames";
-import { createRef, memo, ReactNode, useState } from "react";
+import type { ReactNode } from "react";
+import { createRef, memo, useState } from "react";
 
 export interface LeftResizableWidgetProps {
   className?: string;
diff --git a/apps/wing-console/console/design-system/src/listbox.tsx b/apps/wing-console/console/design-system/src/listbox.tsx
index 09bc4861612..58f3b49a435 100644
--- a/apps/wing-console/console/design-system/src/listbox.tsx
+++ b/apps/wing-console/console/design-system/src/listbox.tsx
@@ -1,7 +1,12 @@
 import { Listbox as HeadlessListbox, Transition } from "@headlessui/react";
-import { CheckIcon, ChevronUpDownIcon } from "@heroicons/react/20/solid";
+import {
+  CheckIcon,
+  ChevronUpDownIcon,
+  MagnifyingGlassIcon,
+} from "@heroicons/react/20/solid";
 import classNames from "classnames";
-import { Fragment, useEffect, useState } from "react";
+import type { ForwardRefExoticComponent, SVGProps } from "react";
+import { Fragment, useEffect, useMemo, useState } from "react";
 import { createPortal } from "react-dom";
 import { usePopper } from "react-popper";
 
@@ -11,11 +16,13 @@ import { useTheme } from "./theme-provider.js";
 export interface ListboxItem {
   value: string;
   label: string;
+  icon?: ForwardRefExoticComponent<SVGProps<SVGSVGElement>>;
 }
 
 export interface ListboxProps {
   label?: string;
-  icon?: React.ForwardRefExoticComponent<React.SVGProps<SVGSVGElement>>;
+  renderLabel?: (selected?: string[]) => JSX.Element;
+  icon?: ForwardRefExoticComponent<SVGProps<SVGSVGElement>>;
   className?: string;
   items: ListboxItem[];
   defaultSelection?: string[];
@@ -23,10 +30,14 @@ export interface ListboxProps {
   selected?: string[];
   onChange?: (selected: string[]) => void;
   disabled?: boolean;
+  defaultLabel?: string;
+  showSearch?: boolean;
+  notFoundLabel?: string;
 }
 
 export const Listbox = ({
   label,
+  renderLabel,
   icon,
   className,
   items,
@@ -35,6 +46,9 @@ export const Listbox = ({
   selected,
   onChange,
   disabled = false,
+  defaultLabel = "Default",
+  showSearch = false,
+  notFoundLabel = "No results found",
 }: ListboxProps) => {
   const { theme } = useTheme();
 
@@ -57,6 +71,17 @@ export const Listbox = ({
     return () => root.remove();
   }, [root]);
 
+  const [search, setSearch] = useState("");
+
+  const filteredItems = useMemo(() => {
+    if (search === "") {
+      return items;
+    }
+    return items.filter((item) =>
+      item.label.toLocaleLowerCase().includes(search.toLocaleLowerCase()),
+    );
+  }, [search, items]);
+
   return (
     <HeadlessListbox
       value={selected}
@@ -77,7 +102,12 @@ export const Listbox = ({
             icon={icon}
             transparent={transparent}
           >
-            {label && <span className="block truncate">{label}</span>}
+            {renderLabel && (
+              <span className="block truncate">{renderLabel(selected)}</span>
+            )}
+            {!renderLabel && label && (
+              <span className="block truncate">{label}</span>
+            )}
             <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-1.5">
               <ChevronUpDownIcon
                 className={classNames(theme.textInput, "h-4 w-4")}
@@ -103,69 +133,121 @@ export const Listbox = ({
               <HeadlessListbox.Options
                 className={classNames(
                   theme.bgInput,
-                  theme.textInput,
-                  "z-10 m-1 max-h-60 w-full overflow-auto rounded-md",
+                  "z-10 m-1 w-full rounded-md",
                   "py-1 text-xs shadow-lg ring-1 ring-black ring-opacity-5 outline-none",
                 )}
               >
-                {defaultSelection && (
-                  <>
-                    {/* TODO: Fix a11y */}
-                    {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions */}
-                    <li
-                      className={classNames(
-                        "relative cursor-default select-none py-2 pl-10 pr-4",
-                      )}
-                      onClick={() => onChange?.(defaultSelection)}
-                    >
-                      <span className={`block truncate font-normal`}>
-                        Default
-                      </span>
-                    </li>
+                {showSearch && (
+                  <div className="pb-1">
+                    <div className="px-1 relative">
+                      <div className="pointer-events-none absolute inset-y-0 left-1 flex items-center pl-2">
+                        <MagnifyingGlassIcon
+                          className={classNames("size-4", theme.text2)}
+                          aria-hidden="true"
+                        />
+                      </div>
+                      <input
+                        type="text"
+                        className={classNames(
+                          theme.borderInput,
+                          "pl-8",
+                          "inline-flex gap-2 items-center px-2.5 py-1.5 border text-xs rounded",
+                          "outline-none w-full shadow-inner",
+                          theme.bg3,
+                          theme.textInput,
+                          theme.focusInput,
+                        )}
+                        placeholder="Search..."
+                        value={search}
+                        onChange={(event) => setSearch(event.target.value)}
+                      />
+                    </div>
+                  </div>
+                )}
 
-                    <div className="relative">
-                      <div
-                        className="absolute inset-0 flex items-center"
-                        aria-hidden="true"
+                <div className="overflow-auto max-h-80">
+                  {defaultSelection && (
+                    <>
+                      {/* TODO: Fix a11y */}
+                      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions */}
+                      <li
+                        className={classNames(
+                          "relative cursor-default select-none py-2 pl-10 pr-4",
+                          theme.bgInputHover,
+                          theme.text1,
+                        )}
+                        onClick={() => onChange?.(defaultSelection)}
                       >
-                        <div
-                          className={classNames(
-                            theme.borderInput,
-                            "w-full border-t",
+                        <span
+                          className={classNames("block truncate font-normal")}
+                        >
+                          {defaultLabel}
+                        </span>
+                        {defaultSelection?.length === 0 &&
+                          selected?.length === 0 && (
+                            <span className="absolute inset-y-0 left-0 flex items-center pl-3 text-sky-600">
+                              <CheckIcon
+                                className="h-4 w-4"
+                                aria-hidden="true"
+                              />
+                            </span>
                           )}
-                        ></div>
-                      </div>
+                      </li>
+                      <div
+                        className={classNames(
+                          "border-slate-100 dark:border-slate-700",
+                          "w-full border-t",
+                        )}
+                      />
+                    </>
+                  )}
+
+                  {filteredItems.length === 0 && search !== "" && (
+                    <div
+                      className={classNames(
+                        theme.text2,
+                        "py-2 px-4",
+                        "w-full text-center",
+                      )}
+                    >
+                      {notFoundLabel}
                     </div>
-                  </>
-                )}
+                  )}
 
-                {items.map((item, index) => (
-                  <HeadlessListbox.Option
-                    key={index}
-                    className={({ active }) =>
-                      classNames(
-                        "relative cursor-default select-none py-2 pl-10 pr-4",
-                        active && theme.bgInputHover,
-                      )
-                    }
-                    value={item.value}
-                  >
-                    <span
-                      className={`block truncate ${
-                        selected?.includes(item.value)
-                          ? "font-medium"
-                          : "font-normal"
-                      }`}
+                  {filteredItems.map((item, index) => (
+                    <HeadlessListbox.Option
+                      key={index}
+                      className={({ active }) =>
+                        classNames(
+                          "relative cursor-default select-none py-2 pl-10 pr-4",
+                          active && theme.bgInputHover,
+                        )
+                      }
+                      value={item.value}
                     >
-                      {item.label}
-                    </span>
-                    {selected?.includes(item.value) ? (
-                      <span className="absolute inset-y-0 left-0 flex items-center pl-3 text-sky-600">
-                        <CheckIcon className="h-4 w-4" aria-hidden="true" />
+                      <span
+                        className={classNames(
+                          "truncate flex items-center gap-2",
+                          selected?.includes(item.value)
+                            ? theme.text1
+                            : "text-slate-850 dark:text-slate-300",
+                        )}
+                      >
+                        {item.icon && (
+                          <item.icon
+                            className={classNames("size-4", theme.text2)}
+                          />
+                        )}
+                        {item.label}
                       </span>
-                    ) : undefined}
-                  </HeadlessListbox.Option>
-                ))}
+                      {selected?.includes(item.value) && (
+                        <span className="absolute inset-y-0 left-0 flex items-center pl-3 text-sky-600">
+                          <CheckIcon className="size-4" aria-hidden="true" />
+                        </span>
+                      )}
+                    </HeadlessListbox.Option>
+                  ))}
+                </div>
               </HeadlessListbox.Options>
             </div>
           </Transition>,
diff --git a/apps/wing-console/console/design-system/src/loader.tsx b/apps/wing-console/console/design-system/src/loader.tsx
index 83f7c72a51b..ea6d33eef96 100644
--- a/apps/wing-console/console/design-system/src/loader.tsx
+++ b/apps/wing-console/console/design-system/src/loader.tsx
@@ -1,4 +1,5 @@
-import { SpinnerLoader, SpinnerLoaderSize } from "./spinner-loader.js";
+import type { SpinnerLoaderSize } from "./spinner-loader.js";
+import { SpinnerLoader } from "./spinner-loader.js";
 
 export const Loader = ({
   size,
diff --git a/apps/wing-console/console/design-system/src/modal.tsx b/apps/wing-console/console/design-system/src/modal.tsx
index 8b1dffa16ce..c4206692b30 100644
--- a/apps/wing-console/console/design-system/src/modal.tsx
+++ b/apps/wing-console/console/design-system/src/modal.tsx
@@ -1,12 +1,13 @@
 import { Dialog, Transition } from "@headlessui/react";
 import classNames from "classnames";
-import { Fragment, ReactNode } from "react";
+import type { ReactNode } from "react";
+import { Fragment } from "react";
 
 import { useTheme } from "./theme-provider.js";
 
 export interface ModalProps {
   visible: boolean;
-  setVisible: (visible: boolean) => void;
+  setVisible?: (visible: boolean) => void;
   className?: string;
   children?: ReactNode;
 }
@@ -23,8 +24,8 @@ export const Modal = ({
     <Transition.Root show={visible} as={Fragment}>
       <Dialog
         as="div"
-        className="relative z-10"
-        onClose={() => setVisible(false)}
+        className="relative z-50"
+        onClose={() => setVisible?.(false)}
       >
         <Transition.Child
           as={Fragment}
@@ -36,15 +37,12 @@ export const Modal = ({
           leaveTo="opacity-0"
         >
           <div
-            className={classNames(
-              "fixed inset-0 bg-opacity-40 dark:bg-opacity-70 transition-opacity",
-              theme.bg1,
-            )}
+            className={classNames("fixed inset-0 transition-all backdrop-blur")}
           />
         </Transition.Child>
 
         <div className="fixed inset-0 z-10 overflow-y-auto">
-          <div className="flex min-h-full justify-center text-center items-center p-0">
+          <div className="flex justify-center text-center pt-24">
             <Transition.Child
               as={Fragment}
               enter="ease-out duration-300"
diff --git a/apps/wing-console/console/design-system/src/notification.tsx b/apps/wing-console/console/design-system/src/notification.tsx
index 3b447e8b361..0d0676ab42b 100644
--- a/apps/wing-console/console/design-system/src/notification.tsx
+++ b/apps/wing-console/console/design-system/src/notification.tsx
@@ -6,10 +6,10 @@ import {
 } from "@heroicons/react/24/outline";
 import classNames from "classnames";
 import { nanoid } from "nanoid";
+import type { PropsWithChildren } from "react";
 import {
   createContext,
   Fragment,
-  PropsWithChildren,
   useContext,
   useEffect,
   useMemo,
@@ -70,7 +70,7 @@ function NotificationsContainer() {
       {/* Global notification live region, render this permanently at the end of the document */}
       <div
         aria-live="assertive"
-        className="fixed inset-0 flex items-end px-4 py-6 pointer-events-none sm:p-6 sm:items-start z-10"
+        className="fixed inset-0 flex items-end px-4 py-6 pointer-events-none sm:p-6 sm:items-start z-50"
       >
         <div className="w-full flex flex-col items-center space-y-4 sm:items-end">
           {/* Notification panel, dynamically insert this into the live region when it needs to be displayed */}
diff --git a/apps/wing-console/console/design-system/src/pill.tsx b/apps/wing-console/console/design-system/src/pill.tsx
index f42c34fa134..88163a298e2 100644
--- a/apps/wing-console/console/design-system/src/pill.tsx
+++ b/apps/wing-console/console/design-system/src/pill.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 import { useTheme } from "./theme-provider.js";
 export interface PillProps {
diff --git a/apps/wing-console/console/design-system/src/progress-bar.stories.tsx b/apps/wing-console/console/design-system/src/progress-bar.stories.tsx
index ce9e742e78b..2b440c33c82 100644
--- a/apps/wing-console/console/design-system/src/progress-bar.stories.tsx
+++ b/apps/wing-console/console/design-system/src/progress-bar.stories.tsx
@@ -1,4 +1,4 @@
-import { Meta, StoryObj } from "@storybook/react";
+import type { Meta, StoryObj } from "@storybook/react";
 
 import { ProgressBar } from "./progress-bar.js";
 
diff --git a/apps/wing-console/console/design-system/src/resource-icon.tsx b/apps/wing-console/console/design-system/src/resource-icon.tsx
index 1aee016ed69..62a6aa65b0e 100644
--- a/apps/wing-console/console/design-system/src/resource-icon.tsx
+++ b/apps/wing-console/console/design-system/src/resource-icon.tsx
@@ -1,6 +1,7 @@
 import classNames from "classnames";
-import { FunctionComponent, SVGProps } from "react";
+import type { FunctionComponent, SVGProps } from "react";
 
+import type { Colors } from "./utils/colors.js";
 import {
   getResourceIconColors,
   getResourceIconComponent,
@@ -14,6 +15,8 @@ export interface ResourceIconProps extends IconProps {
   darkenOnGroupHover?: boolean;
   forceDarken?: boolean;
   solid?: boolean;
+  color?: Colors | string;
+  icon?: string;
 }
 
 export interface IconComponent extends FunctionComponent<IconProps> {}
@@ -30,11 +33,13 @@ export const ResourceIcon = ({
   const Component = getResourceIconComponent(resourceType, {
     solid,
     resourceId: resourcePath,
+    icon: props.icon,
   });
   const colors = getResourceIconColors({
     resourceType,
     darkenOnGroupHover,
     forceDarken,
+    color: props.color,
   });
   return <Component className={classNames(className, colors)} {...props} />;
 };
diff --git a/apps/wing-console/console/design-system/src/response-input.tsx b/apps/wing-console/console/design-system/src/response-input.tsx
index 10f89b89334..5d3bdd99a82 100644
--- a/apps/wing-console/console/design-system/src/response-input.tsx
+++ b/apps/wing-console/console/design-system/src/response-input.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 import { SpinnerLoader } from "./spinner-loader.js";
 import { useTheme } from "./theme-provider.js";
diff --git a/apps/wing-console/console/design-system/src/right-resizable-widget.tsx b/apps/wing-console/console/design-system/src/right-resizable-widget.tsx
index 72090f2bc03..d3f39a6ec5f 100644
--- a/apps/wing-console/console/design-system/src/right-resizable-widget.tsx
+++ b/apps/wing-console/console/design-system/src/right-resizable-widget.tsx
@@ -1,5 +1,6 @@
 import classNames from "classnames";
-import { createRef, memo, ReactNode, useState } from "react";
+import type { ReactNode } from "react";
+import { createRef, memo, useState } from "react";
 
 export interface RightResizableWidgetProps {
   className?: string;
diff --git a/apps/wing-console/console/design-system/src/row-input.tsx b/apps/wing-console/console/design-system/src/row-input.tsx
index bf8a9229a2f..c121b293c9d 100644
--- a/apps/wing-console/console/design-system/src/row-input.tsx
+++ b/apps/wing-console/console/design-system/src/row-input.tsx
@@ -1,5 +1,6 @@
 import classNames from "classnames";
-import { RefObject, memo, useMemo, useState } from "react";
+import type { RefObject } from "react";
+import { memo, useMemo, useState } from "react";
 
 import { useTheme } from "./theme-provider.js";
 
@@ -67,7 +68,7 @@ export const RowInput = memo(
           type === "checkbox" && [
             theme.focusInput,
             theme.bg4,
-            "w-4 h-4 dark:ring-offset-gray-800",
+            "w-4 h-4 dark:ring-offset-slate-800",
           ],
           type === "date" &&
             !value &&
diff --git a/apps/wing-console/console/design-system/src/scrollable-area.tsx b/apps/wing-console/console/design-system/src/scrollable-area.tsx
index e20b2043e4f..59aeada15dd 100644
--- a/apps/wing-console/console/design-system/src/scrollable-area.tsx
+++ b/apps/wing-console/console/design-system/src/scrollable-area.tsx
@@ -1,11 +1,6 @@
 import classNames from "classnames";
-import {
-  PropsWithChildren,
-  forwardRef,
-  memo,
-  useEffect,
-  useState,
-} from "react";
+import type { PropsWithChildren } from "react";
+import { forwardRef, memo, useEffect, useState } from "react";
 
 import { useTheme } from "./theme-provider.js";
 
@@ -33,7 +28,7 @@ export const ScrollableArea = memo(
       ref,
     ) => {
       const { theme } = useTheme();
-      const [isScrolledToBottom, setIsScrolledToBottom] = useState(false);
+      const [isScrolledToBottom, setIsScrolledToBottom] = useState(true);
       useEffect(() => {
         onScrolledToBottomChange?.(isScrolledToBottom);
       }, [isScrolledToBottom, onScrolledToBottomChange]);
diff --git a/apps/wing-console/console/design-system/src/skeleton-loader.tsx b/apps/wing-console/console/design-system/src/skeleton-loader.tsx
index 140ba5afc8b..6c86712ff79 100644
--- a/apps/wing-console/console/design-system/src/skeleton-loader.tsx
+++ b/apps/wing-console/console/design-system/src/skeleton-loader.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 export interface SkeletonProps {
   className?: string;
diff --git a/apps/wing-console/console/design-system/src/slide-over.tsx b/apps/wing-console/console/design-system/src/slide-over.tsx
index 0e774527db0..8010e7092f2 100644
--- a/apps/wing-console/console/design-system/src/slide-over.tsx
+++ b/apps/wing-console/console/design-system/src/slide-over.tsx
@@ -1,6 +1,7 @@
 import { Dialog, Transition } from "@headlessui/react";
 import { XMarkIcon } from "@heroicons/react/24/outline";
-import { Fragment, PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
+import { Fragment } from "react";
 
 export interface SlideOverProps {
   title: string;
diff --git a/apps/wing-console/console/design-system/src/spinner-loader.stories.tsx b/apps/wing-console/console/design-system/src/spinner-loader.stories.tsx
index 207f9bed41f..ff1e15a25fe 100644
--- a/apps/wing-console/console/design-system/src/spinner-loader.stories.tsx
+++ b/apps/wing-console/console/design-system/src/spinner-loader.stories.tsx
@@ -1,4 +1,4 @@
-import { Meta, StoryObj } from "@storybook/react";
+import type { Meta, StoryObj } from "@storybook/react";
 
 import { SpinnerLoader } from "./spinner-loader.js";
 
diff --git a/apps/wing-console/console/design-system/src/table-row.tsx b/apps/wing-console/console/design-system/src/table-row.tsx
index 6d1e7fc5440..3c8756e14c4 100644
--- a/apps/wing-console/console/design-system/src/table-row.tsx
+++ b/apps/wing-console/console/design-system/src/table-row.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import { ChangeEvent, RefObject } from "react";
+import type { ChangeEvent, RefObject } from "react";
 
 import { RowInput } from "./row-input.js";
 
diff --git a/apps/wing-console/console/design-system/src/tabs.tsx b/apps/wing-console/console/design-system/src/tabs.tsx
index b8f518ecc91..dc4e578ecbf 100644
--- a/apps/wing-console/console/design-system/src/tabs.tsx
+++ b/apps/wing-console/console/design-system/src/tabs.tsx
@@ -1,5 +1,6 @@
 import classNames from "classnames";
-import { ReactNode, memo, useEffect, useState } from "react";
+import type { ReactNode } from "react";
+import { memo, useEffect, useState } from "react";
 
 import { ScrollableArea } from "./scrollable-area.js";
 import { useTheme } from "./theme-provider.js";
diff --git a/apps/wing-console/console/design-system/src/text-highlight.tsx b/apps/wing-console/console/design-system/src/text-highlight.tsx
index 09177a87812..960f526d6ae 100644
--- a/apps/wing-console/console/design-system/src/text-highlight.tsx
+++ b/apps/wing-console/console/design-system/src/text-highlight.tsx
@@ -1,6 +1,7 @@
 import { memo, useEffect, useState } from "react";
 
-import { Theme, useTheme } from "./theme-provider.js";
+import type { Theme } from "./theme-provider.js";
+import { useTheme } from "./theme-provider.js";
 
 export interface TextHighlightProps {
   id?: string;
diff --git a/apps/wing-console/console/design-system/src/theme-provider.tsx b/apps/wing-console/console/design-system/src/theme-provider.tsx
index 38a09094b9d..45c44ae0177 100644
--- a/apps/wing-console/console/design-system/src/theme-provider.tsx
+++ b/apps/wing-console/console/design-system/src/theme-provider.tsx
@@ -1,6 +1,6 @@
+import type { PropsWithChildren } from "react";
 import {
   createContext,
-  PropsWithChildren,
   useCallback,
   useContext,
   useEffect,
@@ -50,8 +50,8 @@ export const DefaultTheme: Theme = {
   bg2Hover: "hover:bg-slate-200 dark:hover:bg-slate-750",
   bg3Hover: "hover:bg-slate-150 dark:hover:bg-slate-650",
   bg4Hover: "hover:bg-slate-50 dark:hover:bg-slate-500",
-  border3: "border-slate-300 dark:border-slate-900",
-  border4: "border-slate-200 dark:border-slate-800",
+  border3: "border-slate-300 dark:border-slate-800",
+  border4: "border-slate-200 dark:border-slate-600",
   text1: "text-slate-900 dark:text-slate-250",
   text2: "text-slate-500 dark:text-slate-400",
   text1Hover: "hover:text-slate-950 dark:hover:text-slate-200",
@@ -64,7 +64,7 @@ export const DefaultTheme: Theme = {
     "text-slate-900 placeholder:text-slate-500 dark:text-slate-300 dark:placeholder:text-slate-500",
   focusInput:
     "focus:ring-2 focus:ring-sky-500/50 focus:border-sky-500 outline-none",
-  borderInput: "border-slate-300 dark:border-slate-900",
+  borderInput: "border-slate-300 dark:border-slate-800",
   focusWithin:
     "focus-within:ring-2 focus-within:ring-sky-500/50 focus-within:border-sky-500 outline-none",
   scrollbar:
@@ -211,7 +211,7 @@ export const buildTheme = (color?: string): Theme => {
 
 export interface ThemeProviderProps {
   theme: Theme;
-  mode: Mode;
+  mode?: Mode;
   setThemeMode?: (mode: Mode) => void;
   mediaTheme?: Mode;
 }
diff --git a/apps/wing-console/console/design-system/src/toolbar-button.tsx b/apps/wing-console/console/design-system/src/toolbar-button.tsx
index 58f33acca17..6e76bc6c809 100644
--- a/apps/wing-console/console/design-system/src/toolbar-button.tsx
+++ b/apps/wing-console/console/design-system/src/toolbar-button.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 import { useTheme } from "./theme-provider.js";
 
diff --git a/apps/wing-console/console/design-system/src/toolbar.tsx b/apps/wing-console/console/design-system/src/toolbar.tsx
index e7e28513ceb..9a9d124bd1d 100644
--- a/apps/wing-console/console/design-system/src/toolbar.tsx
+++ b/apps/wing-console/console/design-system/src/toolbar.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 import { useTheme } from "./theme-provider.js";
 
diff --git a/apps/wing-console/console/design-system/src/top-resizable-widget.tsx b/apps/wing-console/console/design-system/src/top-resizable-widget.tsx
index e9692cc4b71..6f9a548ac4a 100644
--- a/apps/wing-console/console/design-system/src/top-resizable-widget.tsx
+++ b/apps/wing-console/console/design-system/src/top-resizable-widget.tsx
@@ -1,5 +1,6 @@
 import classNames from "classnames";
-import { createRef, memo, ReactNode, useState } from "react";
+import type { ReactNode } from "react";
+import { createRef, memo, useState } from "react";
 
 export interface TopResizableWidgetProps {
   className?: string;
diff --git a/apps/wing-console/console/design-system/src/tree-item.tsx b/apps/wing-console/console/design-system/src/tree-item.tsx
index f434ff86815..41de784fa5f 100644
--- a/apps/wing-console/console/design-system/src/tree-item.tsx
+++ b/apps/wing-console/console/design-system/src/tree-item.tsx
@@ -1,6 +1,7 @@
 import { ChevronRightIcon } from "@heroicons/react/24/outline";
 import classNames from "classnames";
-import { PropsWithChildren, ReactNode, KeyboardEvent, memo } from "react";
+import type { PropsWithChildren, ReactNode, KeyboardEvent } from "react";
+import { memo } from "react";
 
 import { TreeItem as HeadlessTreeItem } from "./headless/tree-item.js";
 import { useTheme } from "./theme-provider.js";
@@ -11,6 +12,7 @@ export interface TreeItemProps {
   secondaryLabel?: ReactNode | (() => JSX.Element);
   icon?: ReactNode;
   title?: string;
+  selectable?: boolean;
   onKeyDown?: (event: KeyboardEvent<HTMLElement>) => void;
 }
 
@@ -20,6 +22,7 @@ export const TreeItem = memo(
     secondaryLabel,
     title,
     icon,
+    selectable = true,
     children,
     ...props
   }: PropsWithChildren<TreeItemProps>) => {
@@ -35,11 +38,13 @@ export const TreeItem = memo(
               "flex items-center gap-1.5",
               "px-2 py-0.5",
               "select-none",
-              "cursor-pointer",
               "border border-transparent",
-              item.focused && "group-focus:border-sky-500",
-              item.selected && theme.bg2,
-              !item.selected && theme.bg2Hover,
+              selectable && [
+                "cursor-pointer",
+                item.focused && "group-focus:border-sky-500",
+                item.selected && theme.bg2,
+                !item.selected && theme.bg2Hover,
+              ],
             )}
             title={title}
           >
diff --git a/apps/wing-console/console/design-system/src/tree-view.stories.tsx b/apps/wing-console/console/design-system/src/tree-view.stories.tsx
index 0e152cc28a2..e20f824d73c 100644
--- a/apps/wing-console/console/design-system/src/tree-view.stories.tsx
+++ b/apps/wing-console/console/design-system/src/tree-view.stories.tsx
@@ -1,5 +1,5 @@
 import { CubeIcon } from "@heroicons/react/24/outline";
-import { Meta, StoryObj } from "@storybook/react";
+import type { Meta, StoryObj } from "@storybook/react";
 
 import { TreeItem } from "./tree-item.js";
 import { TreeView } from "./tree-view.js";
diff --git a/apps/wing-console/console/design-system/src/tree-view.tsx b/apps/wing-console/console/design-system/src/tree-view.tsx
index 910cf77539a..1dbb6a66c7a 100644
--- a/apps/wing-console/console/design-system/src/tree-view.tsx
+++ b/apps/wing-console/console/design-system/src/tree-view.tsx
@@ -1,4 +1,4 @@
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 import { TreeView as HeadlessTreeView } from "./headless/tree-view.js";
 
diff --git a/apps/wing-console/console/design-system/src/tree.tsx b/apps/wing-console/console/design-system/src/tree.tsx
index 3fb8ab8b609..ed36d92c91b 100644
--- a/apps/wing-console/console/design-system/src/tree.tsx
+++ b/apps/wing-console/console/design-system/src/tree.tsx
@@ -1,13 +1,7 @@
 import classNames from "classnames";
 import uniq from "lodash.uniq";
-import {
-  useState,
-  KeyboardEvent,
-  useEffect,
-  Ref,
-  useCallback,
-  forwardRef,
-} from "react";
+import type { KeyboardEvent, Ref } from "react";
+import { useState, useEffect, useCallback, forwardRef } from "react";
 
 import { useTheme } from "./theme-provider.js";
 
diff --git a/apps/wing-console/console/design-system/src/utils/colors.ts b/apps/wing-console/console/design-system/src/utils/colors.ts
new file mode 100644
index 00000000000..db18c2bc15b
--- /dev/null
+++ b/apps/wing-console/console/design-system/src/utils/colors.ts
@@ -0,0 +1,12 @@
+export type Colors =
+  | "orange"
+  | "sky"
+  | "emerald"
+  | "lime"
+  | "pink"
+  | "amber"
+  | "cyan"
+  | "purple"
+  | "red"
+  | "violet"
+  | "slate";
diff --git a/apps/wing-console/console/design-system/src/utils/icon-utils.ts b/apps/wing-console/console/design-system/src/utils/icon-utils.ts
index fec043de71f..121a7b49a54 100644
--- a/apps/wing-console/console/design-system/src/utils/icon-utils.ts
+++ b/apps/wing-console/console/design-system/src/utils/icon-utils.ts
@@ -1,35 +1,10 @@
-import {
-  ArchiveBoxIcon,
-  BeakerIcon,
-  BoltIcon,
-  CalculatorIcon,
-  ClockIcon,
-  CloudIcon,
-  CubeIcon,
-  GlobeAltIcon,
-  MegaphoneIcon,
-  QueueListIcon,
-  TableCellsIcon,
-  KeyIcon,
-} from "@heroicons/react/24/outline";
-import {
-  ArchiveBoxIcon as SolidArchiveBoxIcon,
-  BeakerIcon as SolidBeakerIcon,
-  BoltIcon as SolidBoltIcon,
-  CalculatorIcon as SolidCalculatorIcon,
-  ClockIcon as SolidClockIcon,
-  CloudIcon as SolidCloudIcon,
-  GlobeAltIcon as SolidGlobeAltIcon,
-  MegaphoneIcon as SolidMegaphoneIcon,
-  QueueListIcon as SolidQueueListIcon,
-  TableCellsIcon as SolidTableCellsIcon,
-  KeyIcon as SolidKeyIcon,
-} from "@heroicons/react/24/solid";
+import * as OutlineHeroIcons from "@heroicons/react/24/outline";
+import * as SolidHeroIcons from "@heroicons/react/24/solid";
 
-import { DynamoDBIcon } from "../icons/dynamodb-icon.js";
-import { ReactIcon } from "../icons/react-icon.js";
 import { RedisIcon } from "../icons/redis-icon.js";
 
+import type { Colors } from "./colors.js";
+
 const isTest = /(\/test$|\/test:([^/\\])+$)/;
 const isTestHandler = /(\/test$|\/test:.*\/Handler$)/;
 
@@ -37,163 +12,241 @@ const matchTest = (path: string) => {
   return isTest.test(path);
 };
 
+const getHeroIconName = (heroiconId: string): string => {
+  const parts = heroiconId.split("-");
+  const resourceName = parts
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join("");
+  return `${resourceName}Icon`;
+};
+
 export const getResourceIconComponent = (
   resourceType: string | undefined,
-  { solid = true, resourceId }: { solid?: boolean; resourceId?: string } = {},
+  {
+    solid = true,
+    resourceId,
+    icon,
+  }: { solid?: boolean; resourceId?: string; icon?: string } = {},
 ) => {
+  const iconSet = solid ? SolidHeroIcons : OutlineHeroIcons;
+
   if (resourceId && matchTest(resourceId)) {
-    return solid ? SolidBeakerIcon : BeakerIcon;
+    return iconSet.BeakerIcon;
+  }
+  if (icon) {
+    // icon is a heroicon id string, e.g. "academic-cap" so we need to convert it to the actual component
+    // @ts-ignore
+    let iconComponent = iconSet[getHeroIconName(icon)];
+    if (iconComponent) {
+      return iconComponent;
+    }
   }
+
   switch (resourceType) {
     case "@winglang/sdk.cloud.Bucket": {
-      return solid ? SolidArchiveBoxIcon : ArchiveBoxIcon;
+      return iconSet.ArchiveBoxIcon;
     }
     case "@winglang/sdk.cloud.Function": {
-      return solid ? SolidBoltIcon : BoltIcon;
+      return iconSet.BoltIcon;
     }
     case "@winglang/sdk.cloud.Queue": {
-      return solid ? SolidQueueListIcon : QueueListIcon;
+      return iconSet.QueueListIcon;
     }
     case "@winglang/sdk.cloud.Website": {
-      return solid ? SolidGlobeAltIcon : GlobeAltIcon;
-    }
-    case "@winglang/sdk.ex.ReactApp": {
-      return ReactIcon;
+      return iconSet.GlobeAltIcon;
     }
     case "@winglang/sdk.cloud.Counter": {
-      return solid ? SolidCalculatorIcon : CalculatorIcon;
+      return iconSet.CalculatorIcon;
     }
     case "@winglang/sdk.cloud.Topic": {
-      return solid ? SolidMegaphoneIcon : MegaphoneIcon;
+      return iconSet.MegaphoneIcon;
     }
     case "@winglang/sdk.cloud.Api": {
-      return solid ? SolidCloudIcon : CloudIcon;
+      return iconSet.CloudIcon;
     }
     case "@winglang/sdk.ex.Table": {
-      return solid ? SolidTableCellsIcon : TableCellsIcon;
+      return iconSet.TableCellsIcon;
     }
     case "@winglang/sdk.cloud.Schedule": {
-      return solid ? SolidClockIcon : ClockIcon;
+      return iconSet.ClockIcon;
     }
     case "@winglang/sdk.ex.Redis": {
       return RedisIcon;
     }
     case "@winglang/sdk.std.Test": {
-      return solid ? SolidBeakerIcon : BeakerIcon;
+      return iconSet.BeakerIcon;
     }
     case "@winglang/sdk.cloud.Secret": {
-      return solid ? SolidKeyIcon : KeyIcon;
+      return iconSet.KeyIcon;
     }
-    case "@winglang/sdk.ex.DynamodbTable": {
-      return DynamoDBIcon;
+    case "@winglang/sdk.cloud.Endpoint": {
+      return iconSet.LinkIcon;
     }
     default: {
-      return CubeIcon;
+      return iconSet.CubeIcon;
     }
   }
 };
 
+interface ColorSet {
+  default: string;
+  groupHover: string;
+  forceDarken: string;
+}
+
+const colors: Record<Colors, ColorSet> = {
+  orange: {
+    default: "text-orange-500 dark:text-orange-400",
+    groupHover: "group-hover:text-orange-600 dark:group-hover:text-orange-300",
+    forceDarken: "text-orange-600 dark:text-orange-300",
+  },
+  sky: {
+    default: "text-sky-500 dark:text-sky-400",
+    groupHover: "group-hover:text-sky-600 dark:group-hover:text-sky-300",
+    forceDarken: "text-sky-600 dark:text-sky-300",
+  },
+  emerald: {
+    default: "text-emerald-500 dark:text-emerald-400",
+    groupHover:
+      "group-hover:text-emerald-600 dark:group-hover:text-emerald-300",
+    forceDarken: "text-emerald-600 dark:text-emerald-300",
+  },
+  lime: {
+    default: "text-lime-500 dark:text-lime-400",
+    groupHover: "group-hover:text-lime-600 dark:group-hover:text-lime-300",
+    forceDarken: "text-lime-600 dark:text-lime-300",
+  },
+  pink: {
+    default: "text-pink-500 dark:text-pink-400",
+    groupHover: "group-hover:text-pink-600 dark:group-hover:text-pink-300",
+    forceDarken: "text-pink-600 dark:text-pink-300",
+  },
+  amber: {
+    default: "text-amber-500 dark:text-amber-400",
+    groupHover: "group-hover:text-amber-600 dark:group-hover:text-amber-300",
+    forceDarken: "text-amber-600 dark:text-amber-300",
+  },
+  cyan: {
+    default: "text-cyan-500 dark:text-cyan-400",
+    groupHover: "group-hover:text-cyan-600 dark:group-hover:text-cyan-300",
+    forceDarken: "text-cyan-600 dark:text-cyan-300",
+  },
+  purple: {
+    default: "text-purple-500 dark:text-purple-400",
+    groupHover: "group-hover:text-purple-600 dark:group-hover:text-purple-300",
+    forceDarken: "text-purple-600 dark:text-purple-300",
+  },
+  red: {
+    default: "text-red-700 dark:text-red-400",
+    groupHover: "group-hover:text-red-700 dark:group-hover:text-red-300",
+    forceDarken: "text-red-700 dark:text-red-300",
+  },
+  violet: {
+    default: "text-violet-700 dark:text-violet-400",
+    groupHover: "group-hover:text-violet-700 dark:group-hover:text-violet-300",
+    forceDarken: "text-violet-700 dark:text-violet-300",
+  },
+  slate: {
+    default: "text-slate-500 dark:text-slate-400",
+    groupHover: "group-hover:text-slate-600 dark:group-hover:text-slate-300",
+    forceDarken: "text-slate-600 dark:text-slate-300",
+  },
+};
+
 export const getResourceIconColors = (options: {
   resourceType: string | undefined;
   darkenOnGroupHover?: boolean;
   forceDarken?: boolean;
+  color?: Colors | string;
 }) => {
+  let color: Colors =
+    options.color && Object.keys(colors).includes(options.color)
+      ? (options.color as Colors)
+      : "slate";
+
+  let defaultColor = [
+    colors[color].default,
+    options.darkenOnGroupHover && colors[color].groupHover,
+    options.forceDarken && colors[color].forceDarken,
+  ];
+
+  if (options.color) {
+    return defaultColor;
+  }
+
   switch (options.resourceType) {
     case "@winglang/sdk.cloud.Bucket": {
       return [
-        "text-orange-500 dark:text-orange-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-orange-600 dark:group-hover:text-orange-300",
-        options.forceDarken && "text-orange-600 dark:text-orange-300",
+        colors.orange.default,
+        options.darkenOnGroupHover && colors.orange.groupHover,
+        options.forceDarken && colors.orange.forceDarken,
       ];
     }
     case "@winglang/sdk.cloud.Function": {
       return [
-        "text-sky-500 dark:text-sky-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-sky-600 dark:group-hover:text-sky-300",
-        options.forceDarken && "text-sky-600 dark:text-sky-300",
+        colors.sky.default,
+        options.darkenOnGroupHover && colors.sky.groupHover,
+        options.forceDarken && colors.sky.forceDarken,
       ];
     }
     case "@winglang/sdk.cloud.Queue": {
       return [
-        "text-emerald-500 dark:text-emerald-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-emerald-600 dark:group-hover:text-emerald-300",
-        options.forceDarken && "text-emerald-600 dark:text-emerald-300",
+        colors.emerald.default,
+        options.darkenOnGroupHover && colors.emerald.groupHover,
+        options.forceDarken && colors.emerald.forceDarken,
       ];
     }
     case "@winglang/sdk.cloud.Counter": {
       return [
-        "text-lime-500 dark:text-lime-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-lime-600 dark:group-hover:text-lime-300",
-        options.forceDarken && "text-lime-600 dark:text-lime-300",
+        colors.lime.default,
+        options.darkenOnGroupHover && colors.lime.groupHover,
+        options.forceDarken && colors.lime.forceDarken,
       ];
     }
     case "@winglang/sdk.cloud.Topic": {
       return [
-        "text-pink-500 dark:text-pink-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-pink-600 dark:group-hover:text-pink-300",
-        options.forceDarken && "text-pink-600 dark:text-pink-300",
+        colors.pink.default,
+        options.darkenOnGroupHover && colors.pink.groupHover,
+        options.forceDarken && colors.pink.forceDarken,
       ];
     }
     case "@winglang/sdk.cloud.Api": {
       return [
-        "text-amber-500 dark:text-amber-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-amber-600 dark:group-hover:text-amber-300",
-        options.forceDarken && "text-amber-600 dark:text-amber-300",
+        colors.amber.default,
+        options.darkenOnGroupHover && colors.amber.groupHover,
+        options.forceDarken && colors.amber.forceDarken,
       ];
     }
     case "@winglang/sdk.ex.Table": {
       return [
-        "text-cyan-500 dark:text-cyan-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-cyan-600 dark:group-hover:text-cyan-300",
-        options.forceDarken && "text-cyan-600 dark:text-cyan-300",
+        colors.cyan.default,
+        options.darkenOnGroupHover && colors.cyan.groupHover,
+        options.forceDarken && colors.cyan.forceDarken,
       ];
     }
     case "@winglang/sdk.cloud.Schedule": {
       return [
-        "text-purple-500 dark:text-purple-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-purple-600 dark:group-hover:text-purple-300",
-        options.forceDarken && "text-purple-600 dark:text-purple-300",
+        colors.purple.default,
+        options.darkenOnGroupHover && colors.purple.groupHover,
+        options.forceDarken && colors.purple.forceDarken,
       ];
     }
     case "@winglang/sdk.ex.Redis": {
       return [
-        "text-red-700 dark:text-red-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-red-700 dark:group-hover:text-red-300",
-        options.forceDarken && "text-red-700 dark:text-red-300",
+        colors.red.default,
+        options.darkenOnGroupHover && colors.red.groupHover,
+        options.forceDarken && colors.red.forceDarken,
       ];
     }
     case "@winglang/sdk.cloud.Website": {
       return [
-        "text-violet-700 dark:text-violet-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-violet-700 dark:group-hover:text-violet-300",
-        options.forceDarken && "text-violet-700 dark:text-violet-300",
-      ];
-    }
-    case "@winglang/sdk.ex.ReactApp": {
-      return [
-        "text-sky-500 dark:text-sky-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-sky-600 dark:group-hover:text-sky-300",
-        options.forceDarken && "text-sky-600 dark:text-sky-300",
+        colors.violet.default,
+        options.darkenOnGroupHover && colors.violet.groupHover,
+        options.forceDarken && colors.violet.forceDarken,
       ];
     }
     default: {
-      return [
-        "text-slate-500 dark:text-slate-400",
-        options.darkenOnGroupHover &&
-          "group-hover:text-slate-600 dark:group-hover:text-slate-300",
-        options.forceDarken && "text-slate-600 dark:text-slate-300",
-      ];
+      return defaultColor;
     }
   }
 };
diff --git a/apps/wing-console/console/design-system/tailwind-plugin.cjs b/apps/wing-console/console/design-system/tailwind-plugin.cjs
index 7c6be5d0e03..0c835d4d4ef 100644
--- a/apps/wing-console/console/design-system/tailwind-plugin.cjs
+++ b/apps/wing-console/console/design-system/tailwind-plugin.cjs
@@ -1,4 +1,5 @@
 const forms = require("@tailwindcss/forms");
+const typography = require("@tailwindcss/typography");
 const colors = require("tailwindcss/colors");
 const defaultTheme = require("tailwindcss/defaultTheme");
 const flattenColorPalette = require("tailwindcss/lib/util/flattenColorPalette.js");
@@ -159,7 +160,7 @@ const scrollbarPlugin =
     });
   });
 
-module.exports.plugins = [forms, scrollbarPlugin];
+module.exports.plugins = [typography, forms, scrollbarPlugin];
 module.exports.content = [
   `${__dirname}/src/**/*.{ts,tsx,js,jsx}`,
   `${__dirname}/dist/index.js`,
diff --git a/apps/wing-console/console/server/package.json b/apps/wing-console/console/server/package.json
index 1388bde3663..d716f8dd72e 100644
--- a/apps/wing-console/console/server/package.json
+++ b/apps/wing-console/console/server/package.json
@@ -26,36 +26,36 @@
     "ms": "^2.1.3"
   },
   "devDependencies": {
-    "@trpc/server": "^10.38.1",
+    "@trpc/server": "^10.45.2",
     "@types/cors": "^2.8.13",
     "@types/express": "^4.17.17",
     "@types/lodash.uniqby": "^4.7.7",
     "@types/ws": "^8.5.5",
-    "@vitest/coverage-c8": "^0.31.4",
+    "@vitest/coverage-v8": "^1.6.0",
     "@wingconsole/error-message": "workspace:^",
     "@wingconsole/eslint-plugin": "workspace:^",
     "@wingconsole/tsconfig": "workspace:^",
     "bump-pack": "workspace:^",
     "chokidar": "^3.5.3",
-    "conf": "^11.0.2",
-    "constructs": "^10.2.70",
+    "constructs": "^10.3",
     "cors": "^2.8.5",
     "emittery": "^1.0.1",
+    "env-paths": "^3.0.0",
     "esbuild-plugin-raw": "^0.1.7",
     "eslint": "^8.48.0",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "get-port": "^6.1.2",
     "lodash.uniqby": "^4.7.0",
     "nanoid": "^4.0.2",
     "node-fetch": "^3.3.2",
     "redis": "^4.6.8",
-    "tsup": "^6.7.0",
+    "tsup": "^8.0.2",
     "typescript": "^5.2.2",
-    "vitest": "^0.31.4",
+    "vitest": "^1.6.0",
     "ws": "^8.13.0",
     "zod": "^3.22.2"
   },
   "volta": {
     "extends": "../../../../package.json"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/wing-console/console/server/src/consoleLogger.ts b/apps/wing-console/console/server/src/consoleLogger.ts
index 7363a7ea20c..78a958e96da 100644
--- a/apps/wing-console/console/server/src/consoleLogger.ts
+++ b/apps/wing-console/console/server/src/consoleLogger.ts
@@ -1,7 +1,7 @@
 import { errorMessage } from "@wingconsole/error-message";
 import { nanoid } from "nanoid";
 
-import { LogInterface } from "./utils/LogInterface.js";
+import type { LogInterface } from "./utils/LogInterface.js";
 
 export type LogLevel = "verbose" | "info" | "warn" | "error";
 
@@ -31,6 +31,7 @@ export interface ConsoleLogger {
   verbose: (message: string, source?: LogSource, context?: LogContext) => void;
   log: (message: string, source?: LogSource, context?: LogContext) => void;
   error: (message: unknown, source?: LogSource, context?: LogContext) => void;
+  warning: (message: string, source?: LogSource, context?: LogContext) => void;
 }
 
 export interface CreateConsoleLoggerOptions {
@@ -68,6 +69,18 @@ export const createConsoleLogger = ({
       });
       onLog("info", message);
     },
+    warning(message, source, context) {
+      log.warning(message);
+      this.messages.push({
+        id: `${nanoid()}`,
+        timestamp: Date.now(),
+        level: "warn",
+        message,
+        source: source ?? "console",
+        ctx: context,
+      });
+      onLog("warn", message);
+    },
     error(error, source, context) {
       log.error(error);
       const message = errorMessage(error);
diff --git a/apps/wing-console/console/server/src/expressServer.ts b/apps/wing-console/console/server/src/expressServer.ts
index 78c9d169d14..803002cdef4 100644
--- a/apps/wing-console/console/server/src/expressServer.ts
+++ b/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 { simulator } from "@winglang/sdk";
+import type { simulator } from "@winglang/sdk";
 import cors from "cors";
 import type Emittery from "emittery";
 import express from "express";
@@ -13,7 +13,9 @@ import type { HostUtils } from "./hostUtils.js";
 import { mergeAllRouters } from "./router/index.js";
 import type { State, Trace } from "./types.js";
 import type { Updater } from "./updater.js";
+import type { Analytics } from "./utils/analytics.js";
 import type {
+  FileLink,
   LayoutConfig,
   RouterContext,
   TestsStateManager,
@@ -22,12 +24,15 @@ import { getWingVersion } from "./utils/getWingVersion.js";
 import type { LogInterface } from "./utils/LogInterface.js";
 
 export interface CreateExpressServerOptions {
-  simulatorInstance(): Promise<simulator.Simulator>;
+  simulatorInstance(): simulator.Simulator;
+  restartSimulator(): Promise<void>;
+  testSimulatorInstance(): Promise<simulator.Simulator>;
   consoleLogger: ConsoleLogger;
   errorMessage(): string | undefined;
   emitter: Emittery<{
     invalidateQuery: string | undefined;
     trace: Trace;
+    openFileInEditor: FileLink;
   }>;
   log: LogInterface;
   updater?: Updater;
@@ -43,10 +48,16 @@ export interface CreateExpressServerOptions {
   getSelectedNode: () => string | undefined;
   setSelectedNode: (node: string) => void;
   testsStateManager: () => TestsStateManager;
+  analyticsAnonymousId?: string;
+  analytics?: Analytics;
+  requireSignIn?: () => Promise<boolean>;
+  notifySignedIn?: () => Promise<void>;
 }
 
 export const createExpressServer = async ({
   simulatorInstance,
+  restartSimulator,
+  testSimulatorInstance,
   consoleLogger,
   errorMessage,
   emitter,
@@ -64,6 +75,10 @@ export const createExpressServer = async ({
   getSelectedNode,
   setSelectedNode,
   testsStateManager,
+  analyticsAnonymousId,
+  analytics,
+  requireSignIn,
+  notifySignedIn,
 }: CreateExpressServerOptions) => {
   const app = expressApp ?? express();
   app.use(cors());
@@ -74,6 +89,12 @@ export const createExpressServer = async ({
       async simulator() {
         return await simulatorInstance();
       },
+      async restartSimulator() {
+        return await restartSimulator();
+      },
+      async testSimulator() {
+        return await testSimulatorInstance();
+      },
       async appDetails() {
         return {
           wingVersion: await getWingVersion(),
@@ -94,6 +115,10 @@ export const createExpressServer = async ({
       getSelectedNode,
       setSelectedNode,
       testsStateManager,
+      analyticsAnonymousId,
+      analytics,
+      requireSignIn,
+      notifySignedIn,
     };
   };
   app.use(
@@ -126,11 +151,16 @@ export const createExpressServer = async ({
   log.info(`Server is listening on port ${port}`);
 
   const wss = new WebSocketServer({ server });
-  applyWSSHandler({
+  const handler = applyWSSHandler({
     wss,
     router,
     createContext,
   });
 
+  process.on("SIGTERM", () => {
+    handler.broadcastReconnectNotification();
+    wss.close();
+  });
+
   return { port, server };
 };
diff --git a/apps/wing-console/console/server/src/index.ts b/apps/wing-console/console/server/src/index.ts
index 610707224d1..031dd2bb721 100644
--- a/apps/wing-console/console/server/src/index.ts
+++ b/apps/wing-console/console/server/src/index.ts
@@ -1,9 +1,13 @@
+import { mkdtempSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
 import type { inferRouterInputs } from "@trpc/server";
-import { prettyPrintError } from "@winglang/sdk/lib/util/enhanced-error.js";
 import Emittery from "emittery";
 import type { Express } from "express";
 
 import type { Config } from "./config.js";
+import type { LogSource } from "./consoleLogger.js";
 import { type ConsoleLogger, createConsoleLogger } from "./consoleLogger.js";
 import { createExpressServer } from "./expressServer.js";
 import type { HostUtils } from "./hostUtils.js";
@@ -11,12 +15,15 @@ import type { Router } from "./router/index.js";
 import type { Trace } from "./types.js";
 import type { State } from "./types.js";
 import type { Updater } from "./updater.js";
+import type { Analytics } from "./utils/analytics.js";
 import { createCompiler } from "./utils/compiler.js";
-import {
+import type {
+  FileLink,
   LayoutConfig,
   TestItem,
   TestsStateManager,
 } from "./utils/createRouter.js";
+import { formatTraceError } from "./utils/format-wing-error.js";
 import type { LogInterface } from "./utils/LogInterface.js";
 import { createSimulator } from "./utils/simulator.js";
 
@@ -36,6 +43,7 @@ export type { Config } from "./config.js";
 export type { Router } from "./router/index.js";
 export type { HostUtils } from "./hostUtils.js";
 export type { RouterContext } from "./utils/createRouter.js";
+export type { RouterMeta } from "./utils/createRouter.js";
 export type { MapNode, MapEdge } from "./router/app.js";
 export type { InternalTestResult } from "./router/test.js";
 export type { Column } from "./router/table.js";
@@ -52,6 +60,10 @@ export type RouteNames = keyof inferRouterInputs<Router> | undefined;
 
 export { isTermsAccepted } from "./utils/terms-and-conditions.js";
 
+const enableSimUpdates =
+  process.env.WING_ENABLE_INPLACE_UPDATES === "true" ||
+  process.env.WING_ENABLE_INPLACE_UPDATES === "1";
+
 export interface CreateConsoleServerOptions {
   wingfile: string;
   log: LogInterface;
@@ -65,6 +77,12 @@ export interface CreateConsoleServerOptions {
   requireAcceptTerms?: boolean;
   layoutConfig?: LayoutConfig;
   platform?: string[];
+  stateDir?: string;
+  analyticsAnonymousId?: string;
+  analytics?: Analytics;
+  requireSignIn?: () => Promise<boolean>;
+  notifySignedIn?: () => Promise<void>;
+  watchGlobs?: string[];
 }
 
 export const createConsoleServer = async ({
@@ -80,10 +98,17 @@ export const createConsoleServer = async ({
   requireAcceptTerms,
   layoutConfig,
   platform,
+  stateDir,
+  analyticsAnonymousId,
+  analytics,
+  requireSignIn,
+  notifySignedIn,
+  watchGlobs,
 }: CreateConsoleServerOptions) => {
   const emitter = new Emittery<{
     invalidateQuery: RouteNames;
     trace: Trace;
+    openFileInEditor: FileLink;
   }>();
 
   const invalidateQuery = async (query: RouteNames) => {
@@ -107,11 +132,20 @@ export const createConsoleServer = async ({
     log,
   });
 
-  const compiler = createCompiler({ wingfile, platform });
+  const compiler = createCompiler({
+    wingfile,
+    platform,
+    testing: false,
+    stateDir,
+    watchGlobs,
+  });
   let isStarting = false;
   let isStopping = false;
 
-  const simulator = createSimulator();
+  const simulator = createSimulator({
+    stateDir,
+    enableSimUpdates,
+  });
   if (onTrace) {
     simulator.on("trace", onTrace);
   }
@@ -122,6 +156,17 @@ export const createConsoleServer = async ({
     }
   });
 
+  const testCompiler = createCompiler({
+    wingfile,
+    platform,
+    testing: true,
+    watchGlobs,
+  });
+  const testSimulator = createSimulator({ enableSimUpdates });
+  testCompiler.on("compiled", ({ simfile }) => {
+    testSimulator.start(simfile);
+  });
+
   let lastErrorMessage = "";
   let selectedNode = "";
   let tests: TestItem[] = [];
@@ -164,6 +209,9 @@ export const createConsoleServer = async ({
   });
   simulator.on("started", () => {
     appState = "success";
+
+    // Clear tests when simulator is restarted
+    testsStateManager().setTests([]);
     invalidateQuery(undefined);
     isStarting = false;
   });
@@ -178,30 +226,44 @@ export const createConsoleServer = async ({
     const message = `${
       trace.data.message ?? JSON.stringify(trace.data, undefined, 2)
     }`;
-    if (trace.type === "log") {
-      consoleLogger.log(message, "simulator", {
-        sourceType: trace.sourceType,
-        sourcePath: trace.sourcePath,
-      });
-    } else {
-      consoleLogger.verbose(message, "simulator", {
-        sourceType: trace.sourceType,
-        sourcePath: trace.sourcePath,
-      });
-    }
-    if (trace.data.status === "failure") {
-      let output = await prettyPrintError(trace.data.error);
 
-      // Remove ANSI color codes
-      const regex =
-        /[\u001B\u009B][#();?[]*(?:\d{1,4}(?:;\d{0,4})*)?[\d<=>A-ORZcf-nqry]/g;
+    const source = logSourceFromTraceType(trace);
 
-      output = output.replaceAll(regex, "");
+    switch (trace.level) {
+      case "verbose": {
+        consoleLogger.verbose(message, source, {
+          sourceType: trace.sourceType,
+          sourcePath: trace.sourcePath,
+        });
+        break;
+      }
 
-      consoleLogger.error(output, "user", {
-        sourceType: trace.sourceType,
-        sourcePath: trace.sourcePath,
-      });
+      case "info": {
+        consoleLogger.log(message, source, {
+          sourceType: trace.sourceType,
+          sourcePath: trace.sourcePath,
+        });
+        break;
+      }
+
+      case "warning": {
+        consoleLogger.warning(message, source, {
+          sourceType: trace.sourceType,
+          sourcePath: trace.sourcePath,
+        });
+        break;
+      }
+
+      case "error": {
+        const output = trace.data.error
+          ? await formatTraceError(trace.data.error)
+          : message;
+
+        consoleLogger.error(output, source, {
+          sourceType: trace.sourceType,
+          sourcePath: trace.sourcePath,
+        });
+      }
     }
 
     if (
@@ -221,15 +283,24 @@ export const createConsoleServer = async ({
 
   const { server, port } = await createExpressServer({
     consoleLogger,
+    testSimulatorInstance() {
+      // TODO: The test simulator instance isn't using the statedir anyway. Fix this later.
+      // const statedir = mkdtempSync(join(tmpdir(), "wing-console-test-"));
+      return testSimulator.waitForInstance();
+    },
     simulatorInstance() {
       return simulator.instance();
     },
+    restartSimulator() {
+      return simulator.reload();
+    },
     errorMessage() {
       return lastErrorMessage;
     },
     emitter: emitter as Emittery<{
       invalidateQuery: string | undefined;
       trace: Trace;
+      openFileInEditor: FileLink;
     }>,
     log,
     updater,
@@ -251,6 +322,10 @@ export const createConsoleServer = async ({
       selectedNode = node;
     },
     testsStateManager,
+    analyticsAnonymousId,
+    analytics,
+    requireSignIn,
+    notifySignedIn,
   });
 
   const close = async (callback?: () => void) => {
@@ -266,6 +341,7 @@ export const createConsoleServer = async ({
         server.close(),
         compiler.stop(),
         simulator.stop(),
+        testSimulator.stop(),
       ]);
     } catch (error) {
       log.error(error);
@@ -279,3 +355,17 @@ export const createConsoleServer = async ({
     close,
   };
 };
+
+function logSourceFromTraceType(trace: Trace): LogSource {
+  switch (trace.type) {
+    case "simulator": {
+      return "simulator";
+    }
+
+    case "resource": {
+      return "compiler";
+    }
+  }
+
+  return "user";
+}
diff --git a/apps/wing-console/console/server/src/router/api.ts b/apps/wing-console/console/server/src/router/api.ts
index 258635a81e5..46cf6a51971 100644
--- a/apps/wing-console/console/server/src/router/api.ts
+++ b/apps/wing-console/console/server/src/router/api.ts
@@ -3,7 +3,8 @@ import fetch from "node-fetch";
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { ApiSchema, OpenApiSpec } from "../wingsdk.js";
+import type { ApiSchema } from "../wingsdk.js";
+import { OpenApiSpec } from "../wingsdk.js";
 
 export const createApiRouter = () => {
   return createRouter({
@@ -26,6 +27,12 @@ export const createApiRouter = () => {
       }),
 
     "api.fetch": createProcedure
+      .meta({
+        analytics: {
+          action: "fetch",
+          resource: "Api",
+        },
+      })
       .input(
         z.object({
           url: z.string(),
diff --git a/apps/wing-console/console/server/src/router/app.ts b/apps/wing-console/console/server/src/router/app.ts
index 247645af552..0b1da9c121f 100644
--- a/apps/wing-console/console/server/src/router/app.ts
+++ b/apps/wing-console/console/server/src/router/app.ts
@@ -4,25 +4,17 @@ import uniqby from "lodash.uniqby";
 import { z } from "zod";
 
 import type { Trace } from "../types.js";
-import { ConstructTreeNode } from "../utils/construct-tree.js";
-import {
+import type { ConstructTreeNode } from "../utils/construct-tree.js";
+import type {
   Node,
   NodeDisplay,
-  buildConstructTreeNodeMap,
   NodeConnection,
   ConstructTreeNodeMap,
 } from "../utils/constructTreeNodeMap.js";
-import {
-  FileLink,
-  createProcedure,
-  createRouter,
-} from "../utils/createRouter.js";
-import {
-  isTermsAccepted,
-  acceptTerms,
-  getLicense,
-} from "../utils/terms-and-conditions.js";
-import { Simulator } from "../wingsdk.js";
+import { buildConstructTreeNodeMap } from "../utils/constructTreeNodeMap.js";
+import type { FileLink } from "../utils/createRouter.js";
+import { createProcedure, createRouter } from "../utils/createRouter.js";
+import type { Simulator } from "../wingsdk.js";
 
 const isTest = /(\/test$|\/test:([^/\\])+$)/;
 const isTestHandler = /(\/test$|\/test:.*\/Handler$)/;
@@ -56,19 +48,33 @@ export const createAppRouter = () => {
     "app.wingfile": createProcedure.query(({ ctx }) => {
       return ctx.wingfile.split("/").pop();
     }),
-    "app.termsConfig": createProcedure.query(({ ctx }) => {
+    "app.layoutConfig": createProcedure.query(async ({ ctx }) => {
       return {
-        requireAcceptTerms: ctx.requireAcceptTerms,
-        accepted: isTermsAccepted(),
-        license: getLicense(),
+        config: ctx.layoutConfig,
       };
     }),
-    "app.acceptTerms": createProcedure.mutation(() => {
-      acceptTerms(true);
+    "app.reset": createProcedure.mutation(async ({ ctx }) => {
+      ctx.logger.verbose("Resetting simulator...", "console", {
+        messageType: "info",
+      });
+      await ctx.restartSimulator();
+      ctx.logger.verbose("Simulator reset.", "console", {
+        messageType: "info",
+      });
     }),
-    "app.layoutConfig": createProcedure.query(async ({ ctx }) => {
+    "app.logsFilters": createProcedure.query(async ({ ctx }) => {
+      const simulator = await ctx.simulator();
+
+      const resources = simulator.listResources().map((resourceId) => {
+        const config = simulator.tryGetResourceConfig(resourceId);
+        return {
+          id: resourceId,
+          type: config?.type,
+        };
+      });
+
       return {
-        config: ctx.layoutConfig,
+        resources,
       };
     }),
     "app.logs": createProcedure
@@ -83,20 +89,60 @@ export const createAppRouter = () => {
             }),
             timestamp: z.number(),
             text: z.string(),
+            resourceIds: z.array(z.string()),
+            resourceTypes: z.array(z.string()),
           }),
         }),
       )
       .query(async ({ ctx, input }) => {
-        return ctx.logger.messages.filter(
-          (entry) =>
-            input.filters.level[entry.level] &&
-            entry.timestamp &&
-            entry.timestamp >= input.filters.timestamp &&
-            (!input.filters.text ||
-              `${entry.message}${entry.ctx?.sourcePath}`
-                .toLowerCase()
-                .includes(input.filters.text.toLowerCase())),
-        );
+        const filters = input.filters;
+        const lowerCaseText = filters.text?.toLowerCase();
+        let noVerboseLogsCount = 0;
+
+        const filteredLogs = ctx.logger.messages.filter((entry) => {
+          // Filter by timestamp
+          if (entry.timestamp && entry.timestamp < filters.timestamp) {
+            return false;
+          }
+          if (entry.level !== "verbose") {
+            noVerboseLogsCount++;
+          }
+          // Filter by level
+          if (!filters.level[entry.level]) {
+            return false;
+          }
+          // Filter by resourceIds
+          if (
+            filters.resourceIds.length > 0 &&
+            (!entry.ctx?.sourcePath ||
+              !filters.resourceIds.includes(entry.ctx.sourcePath))
+          ) {
+            return false;
+          }
+          // Filter by resourceTypes
+          if (
+            filters.resourceTypes.length > 0 &&
+            (!entry.ctx?.sourceType ||
+              !filters.resourceTypes.includes(entry.ctx.sourceType))
+          ) {
+            return false;
+          }
+          // Filter by text
+          if (
+            lowerCaseText &&
+            !`${entry.message}${entry.ctx?.sourcePath}`
+              .toLowerCase()
+              .includes(lowerCaseText)
+          ) {
+            return false;
+          }
+          return true;
+        });
+
+        return {
+          logs: filteredLogs,
+          hiddenLogs: noVerboseLogsCount - filteredLogs.length,
+        };
       }),
     "app.error": createProcedure.query(({ ctx }) => {
       return ctx.errorMessage();
@@ -106,6 +152,7 @@ export const createAppRouter = () => {
         z
           .object({
             showTests: z.boolean().optional(),
+            includeHiddens: z.boolean().optional(),
           })
           .optional(),
       )
@@ -116,6 +163,7 @@ export const createAppRouter = () => {
           shakeTree(tree),
           simulator,
           input?.showTests,
+          input?.includeHiddens,
         );
       }),
     "app.nodeIds": createProcedure
@@ -145,151 +193,6 @@ export const createAppRouter = () => {
         getNodeIds(node);
         return list;
       }),
-    "app.selectNode": createProcedure
-      .input(
-        z.object({
-          resourcePath: z.string().optional(),
-        }),
-      )
-      .mutation(async ({ ctx, input }) => {
-        ctx.setSelectedNode(input.resourcePath ?? "");
-      }),
-    "app.selectedNode": createProcedure.query(async ({ ctx }) => {
-      return ctx.getSelectedNode();
-    }),
-    "app.childRelationships": createProcedure
-      .input(
-        z.object({
-          path: z.string().optional(),
-          showTests: z.boolean().optional(),
-        }),
-      )
-      .query(async ({ ctx, input }) => {
-        const simulator = await ctx.simulator();
-        const { tree } = simulator.tree().rawData();
-        const connections = simulator.connections();
-        const nodeMap = buildConstructTreeNodeMap(shakeTree(tree));
-
-        const node = nodeMap.get(input.path);
-        const children = nodeMap.getAll(node?.children ?? []);
-
-        return children
-          .filter((node) => {
-            if (node.display?.hidden) {
-              return false;
-            }
-
-            if (!input.showTests && matchTest(node.path)) {
-              return false;
-            }
-
-            return true;
-          })
-          .map((node) => ({
-            node: {
-              id: node.id,
-              path: node.path,
-              type: getResourceType(node, simulator),
-              display: node.display,
-            },
-            inbound:
-              connections
-                ?.filter(({ source, target }) => {
-                  if (target !== node.path) {
-                    return false;
-                  }
-
-                  const sourceNode = nodeMap.get(source);
-                  if (!sourceNode) {
-                    throw new Error(
-                      `Could not find node for resource ${source}`,
-                    );
-                  }
-
-                  const targetNode = nodeMap.get(target);
-                  if (!targetNode) {
-                    throw new Error(
-                      `Could not find node for resource ${target}`,
-                    );
-                  }
-
-                  if (
-                    sourceNode.display?.hidden ||
-                    targetNode.display?.hidden
-                  ) {
-                    return false;
-                  }
-
-                  if (
-                    !input.showTests &&
-                    (matchTest(sourceNode.path) || matchTest(targetNode.path))
-                  ) {
-                    return false;
-                  }
-
-                  return true;
-                })
-                .map((connection) => {
-                  const node = nodeMap.get(connection.source)!;
-                  return {
-                    relationshipType: connection.name,
-                    node: {
-                      id: node.id,
-                      path: node.path,
-                      type: getResourceType(node, simulator),
-                    },
-                  };
-                }) ?? [],
-            outbound:
-              connections
-                ?.filter(({ source, target }) => {
-                  if (source !== node.path) {
-                    return false;
-                  }
-
-                  const sourceNode = nodeMap.get(source);
-                  if (!sourceNode) {
-                    throw new Error(
-                      `Could not find node for resource ${source}`,
-                    );
-                  }
-
-                  const targetNode = nodeMap.get(target);
-                  if (!targetNode) {
-                    throw new Error(
-                      `Could not find node for resource ${target}`,
-                    );
-                  }
-
-                  if (
-                    sourceNode.display?.hidden ||
-                    targetNode.display?.hidden
-                  ) {
-                    return false;
-                  }
-
-                  if (
-                    !input.showTests &&
-                    (matchTest(sourceNode.path) || matchTest(targetNode.path))
-                  ) {
-                    return false;
-                  }
-
-                  return true;
-                })
-                .map((connection) => {
-                  const node = nodeMap.get(connection.target)!;
-                  return {
-                    relationshipType: connection.name,
-                    node: {
-                      id: node.id,
-                      path: node.path,
-                      type: getResourceType(node, simulator),
-                    },
-                  };
-                }) ?? [],
-          }));
-      }),
     "app.nodeBreadcrumbs": createProcedure
       .input(
         z.object({
@@ -370,7 +273,7 @@ export const createAppRouter = () => {
         if (!node) {
           throw new TRPCError({
             code: "NOT_FOUND",
-            message: "Node was not found.",
+            message: `Node was not found for path ${path}`,
           });
         }
 
@@ -382,32 +285,7 @@ export const createAppRouter = () => {
         const connections = uniqby(simulator.connections(), (connection) => {
           return `${connection.source}-${connection.target}`;
         }).filter((connection) => {
-          const sourceNode = nodeMap.get(connection.source);
-          if (!sourceNode) {
-            throw new Error(
-              `Could not find node for resource ${connection.source}`,
-            );
-          }
-
-          const targetNode = nodeMap.get(connection.target);
-          if (!targetNode) {
-            throw new Error(
-              `Could not find node for resource ${connection.target}`,
-            );
-          }
-
-          if (sourceNode.display?.hidden || targetNode.display?.hidden) {
-            return false;
-          }
-
-          if (
-            !showTests &&
-            (matchTest(sourceNode.path) || matchTest(targetNode.path))
-          ) {
-            return false;
-          }
-
-          return true;
+          return connectionsBasicFilter(connection, nodeMap, !!showTests);
         });
 
         const config = simulator.tryGetResourceConfig(node.path);
@@ -416,33 +294,52 @@ export const createAppRouter = () => {
           node: {
             id: node.id,
             path: node.path,
+            display: node.display,
             type: getResourceType(node, simulator),
             props: config?.props,
             attributes: config?.attrs,
           },
           inbound: connections
             .filter(({ target }) => {
-              return target === node.path;
+              return isFoundInPath(node, nodeMap, target, true);
             })
             .map((connection) => {
               const node = nodeMap.get(connection.source)!;
+              const attachToParent = node?.display?.hidden && node?.parent;
+              const sourceNode = attachToParent
+                ? nodeMap.get(node.parent)!
+                : node;
+
               return {
-                id: node.id,
-                path: node.path,
-                type: getResourceType(node, simulator),
+                id: sourceNode.id,
+                path: sourceNode.path,
+                type: getResourceType(sourceNode, simulator),
+                display: sourceNode.display,
               };
+            })
+            .filter(({ path }) => {
+              return path !== node.path;
             }),
           outbound: connections
             .filter(({ source }) => {
-              return source === node.path;
+              return isFoundInPath(node, nodeMap, source, true);
             })
             .map((connection) => {
               const node = nodeMap.get(connection.target)!;
+              const attachToParent = node?.display?.hidden && node?.parent;
+              const targetNode = attachToParent
+                ? nodeMap.get(node.parent)!
+                : node;
+
               return {
-                id: node.id,
-                path: node.path,
-                type: getResourceType(node, simulator),
+                id: targetNode.id,
+                path: targetNode.path,
+                type: getResourceType(targetNode, simulator),
+                display: targetNode.display,
               };
+            })
+            .filter(({ path }) => {
+              return path !== node.path;
             }),
         };
       }),
@@ -450,82 +347,58 @@ export const createAppRouter = () => {
       .input(
         z.object({
           edgeId: z.string(),
-          showTests: z.boolean().optional(),
         }),
       )
       .query(async ({ ctx, input }) => {
-        const { edgeId, showTests } = input;
+        const { edgeId } = input;
         const simulator = await ctx.simulator();
 
         const { tree } = simulator.tree().rawData();
         const nodeMap = buildConstructTreeNodeMap(shakeTree(tree));
 
-        const sourcePath = edgeId.split("->")[0]?.trim();
-        const targetPath = edgeId.split("->")[1]?.trim();
+        let [, sourcePath, _sourceInflight, , targetPath, targetInflight] =
+          edgeId.match(/^(.+?)#(.*?)#(.*?)#(.+?)#(.*?)#(.*?)$/i) ?? [];
+
+        targetPath = targetPath?.startsWith("#")
+          ? targetPath.slice(1)
+          : targetPath;
+
         const sourceNode = nodeMap.get(sourcePath);
         if (!sourceNode) {
           throw new TRPCError({
             code: "NOT_FOUND",
-            message: "Node was not found.",
+            message: `Could not find node for resource ${sourcePath}`,
           });
         }
-        const connections = simulator.connections();
 
-        const connection = connections?.find(
-          (connection) =>
-            sourceNode.path === connection.source &&
-            connection.target === targetPath,
-        );
-        const targetNode = nodeMap.get(connection?.target);
+        const targetNode = nodeMap.get(targetPath);
         if (!targetNode) {
-          throw new Error(
-            `Could not find node for resource ${connection?.target}`,
-          );
+          throw new TRPCError({
+            code: "NOT_FOUND",
+            message: `Could not find node for resource ${targetPath}`,
+          });
         }
 
-        const inflights = sourceNode.display?.hidden
-          ? []
-          : connections
-              ?.filter(({ source, target, name }) => {
-                if (source !== sourcePath) {
-                  return false;
-                }
-
-                if (target !== targetPath) {
-                  return false;
-                }
-
-                if (name === "$inflight_init()") {
-                  return false;
-                }
-
-                if (
-                  !showTests &&
-                  (matchTest(sourceNode.path) || matchTest(targetNode.path))
-                ) {
-                  return false;
-                }
-
-                return true;
-              })
-              .map((connection) => {
-                return {
-                  name: connection.name,
-                };
-              }) ?? [];
-
         return {
           source: {
             id: sourceNode.id,
             path: sourceNode.path,
             type: getResourceType(sourceNode, simulator),
+            display: sourceNode.display,
           },
           target: {
             id: targetNode?.id ?? "",
             path: targetNode?.path ?? "",
             type: (targetNode && getResourceType(targetNode, simulator)) ?? "",
+            display: targetNode.display,
           },
-          inflights,
+          inflights: targetInflight
+            ? [
+                {
+                  name: targetInflight,
+                },
+              ]
+            : [],
         };
       }),
     "app.invalidateQuery": createProcedure.subscription(({ ctx }) => {
@@ -544,42 +417,17 @@ export const createAppRouter = () => {
         };
       });
     }),
-    "app.map": createProcedure
-      .input(
-        z
-          .object({
-            showTests: z.boolean().optional(),
-          })
-          .optional(),
-      )
-      .query(async ({ ctx, input }) => {
-        const simulator = await ctx.simulator();
+    "app.map": createProcedure.query(async ({ ctx }) => {
+      const simulator = await ctx.simulator();
 
-        const { tree } = simulator.tree().rawData();
-        const connections = simulator.connections();
-        const shakedTree = shakeTree(tree);
-        const nodeMap = buildConstructTreeNodeMap(shakedTree);
-        const nodes = [
-          createMapNodeFromConstructTreeNode(
-            shakedTree,
-            simulator,
-            input?.showTests,
-          ),
-        ];
-        const edges = uniqby(
-          createMapEdgesFromConnectionData(
-            nodeMap,
-            connections,
-            input?.showTests,
-          ),
-          (edge) => edge.id,
-        );
+      const { tree } = simulator.tree().rawData();
+      const connections = simulator.connections();
 
-        return {
-          nodes,
-          edges,
-        };
-      }),
+      return {
+        tree,
+        connections,
+      };
+    }),
     "app.state": createProcedure.query(async ({ ctx }) => {
       return ctx.appState();
     }),
@@ -613,6 +461,45 @@ export const createAppRouter = () => {
         launch(`${input.path}:${input.line}:${input.column}`);
       }),
 
+    "app.getResourceUI": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .query(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const ui = simulator.getResourceUI(input.resourcePath);
+        return ui as Array<{
+          kind: string;
+          label: string;
+          handler: string | Record<string, string>;
+        }>;
+      }),
+
+    "app.analytics": createProcedure.query(async ({ ctx }) => {
+      const requireSignIn = (await ctx.requireSignIn?.()) ?? false;
+      if (requireSignIn) {
+        ctx.analytics?.track("console_sign_in_shown");
+      }
+      return {
+        anonymousId: ctx.analyticsAnonymousId,
+        requireSignIn,
+      };
+    }),
+
+    "app.analytics.signInClicked": createProcedure.mutation(async ({ ctx }) => {
+      ctx.analytics?.track("console_sign_in_clicked");
+      return {};
+    }),
+
+    "app.analytics.notifySignedIn": createProcedure.mutation(
+      async ({ ctx }) => {
+        ctx.analytics?.track("console_sign_in_completed");
+        await ctx.notifySignedIn?.();
+      },
+    ),
+
     /**
      * Warning! Subscribing to this procedure will override the default behavior of opening files in the editor
      * provided by the "app.openFileInEditor" procedure.
@@ -637,11 +524,14 @@ function createExplorerItemFromConstructTreeNode(
   node: ConstructTreeNode,
   simulator: Simulator,
   showTests = false,
+  includeHiddens = false,
 ): ExplorerItem {
+  const cloudResourceType = node.constructInfo?.fqn?.split(".").at(-1);
+
   const label =
-    node.display?.sourceModule === "@winglang/sdk" && node.display?.title
-      ? node.display?.title
-      : node.id;
+    node.display?.title === cloudResourceType
+      ? node.id
+      : node.display?.title ?? node.id;
 
   return {
     id: node.path,
@@ -652,11 +542,17 @@ function createExplorerItemFromConstructTreeNode(
       ? Object.values(node.children)
           .filter((node) => {
             return (
-              !node.display?.hidden && (showTests || !matchTest(node.path))
+              (includeHiddens || !node.display?.hidden) &&
+              (showTests || !matchTest(node.path))
             );
           })
           .map((node) =>
-            createExplorerItemFromConstructTreeNode(node, simulator),
+            createExplorerItemFromConstructTreeNode(
+              node,
+              simulator,
+              showTests,
+              includeHiddens,
+            ),
           )
       : undefined,
   };
@@ -712,47 +608,6 @@ export interface MapEdge {
   target: string;
 }
 
-function createMapEdgesFromConnectionData(
-  nodeMap: ConstructTreeNodeMap,
-  connections: NodeConnection[],
-  showTests = false,
-): MapEdge[] {
-  return [
-    ...connections
-      .filter(({ source, target }) => {
-        const sourceNode = nodeMap.get(source);
-        if (!sourceNode) {
-          throw new Error(`Could not find node for resource ${source}`);
-        }
-
-        const targetNode = nodeMap.get(target);
-        if (!targetNode) {
-          throw new Error(`Could not find node for resource ${target}`);
-        }
-
-        if (sourceNode.display?.hidden || targetNode.display?.hidden) {
-          return false;
-        }
-
-        if (
-          !showTests &&
-          (matchTest(sourceNode.path) || matchTest(targetNode.path))
-        ) {
-          return false;
-        }
-
-        return true;
-      })
-      ?.map((connection: NodeConnection) => {
-        return {
-          id: `${connection.source} -> ${connection.target}`,
-          source: connection.source,
-          target: connection.target,
-        };
-      }),
-  ].flat();
-}
-
 function getResourceType(
   node: Node | ConstructTreeNode,
   simulator: Simulator,
@@ -768,3 +623,75 @@ function getResourceType(
     "constructs.Construct"
   );
 }
+
+const connectionsBasicFilter = (
+  connection: NodeConnection,
+  nodeMap: ConstructTreeNodeMap,
+  showTests: boolean,
+) => {
+  const sourceNode = nodeMap.get(connection.source);
+  if (!sourceNode) {
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: `Could not find node for resource ${connection.source}`,
+    });
+  }
+
+  const targetNode = nodeMap.get(connection.target);
+  if (!targetNode) {
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: `Could not find node for resource ${connection.target}`,
+    });
+  }
+
+  // Hide self loops.
+  if (sourceNode.path === targetNode.path) {
+    return false;
+  }
+
+  // Hide connections that go from a node to a parent.
+  if (sourceNode.path.startsWith(`${targetNode.path}/`)) {
+    return false;
+  }
+
+  if (targetNode.display?.hidden && targetNode.parent === "root") {
+    return false;
+  }
+
+  if (
+    !showTests &&
+    (matchTest(sourceNode.path) || matchTest(targetNode.path))
+  ) {
+    return false;
+  }
+
+  return true;
+};
+
+const isFoundInPath = (
+  node: Node,
+  nodeMap: ConstructTreeNodeMap,
+  pathToFind: string,
+  tryHiddenChildren = true,
+) => {
+  const possiblePaths = [
+    node.path,
+    ...(tryHiddenChildren
+      ? node.children.map((c) => {
+          const child = nodeMap.get(c);
+          return (child?.display?.hidden && child?.path) ?? "";
+        })
+      : []),
+  ];
+  return possiblePaths.includes(pathToFind);
+};
+
+const getVisualNodePath = (
+  originalNodePath: string,
+  nodeMap: ConstructTreeNodeMap,
+): string => {
+  const originalNode = nodeMap.get(originalNodePath);
+  const attachToParent = originalNode?.display?.hidden && originalNode.parent;
+  return attachToParent ? originalNode.parent! : originalNodePath;
+};
diff --git a/apps/wing-console/console/server/src/router/bucket.ts b/apps/wing-console/console/server/src/router/bucket.ts
index c2f8a7c9fd9..06d7a4f7726 100644
--- a/apps/wing-console/console/server/src/router/bucket.ts
+++ b/apps/wing-console/console/server/src/router/bucket.ts
@@ -1,13 +1,17 @@
-import fs from "node:fs";
-
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { IBucketClient } from "../wingsdk.js";
+import type { IBucketClient } from "../wingsdk.js";
 
 export const createBucketRouter = () => {
   return createRouter({
     "bucket.put": createProcedure
+      .meta({
+        analytics: {
+          resource: "Bucket",
+          action: "put",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -24,6 +28,12 @@ export const createBucketRouter = () => {
         return response;
       }),
     "bucket.get": createProcedure
+      .meta({
+        analytics: {
+          resource: "Bucket",
+          action: "get",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -39,6 +49,12 @@ export const createBucketRouter = () => {
         return response;
       }),
     "bucket.download": createProcedure
+      .meta({
+        analytics: {
+          resource: "Bucket",
+          action: "get",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -54,6 +70,12 @@ export const createBucketRouter = () => {
         return response;
       }),
     "bucket.list": createProcedure
+      .meta({
+        analytics: {
+          resource: "Bucket",
+          action: "list",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -68,6 +90,12 @@ export const createBucketRouter = () => {
         return response;
       }),
     "bucket.delete": createProcedure
+      .meta({
+        analytics: {
+          resource: "Bucket",
+          action: "delete",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
diff --git a/apps/wing-console/console/server/src/router/counter.ts b/apps/wing-console/console/server/src/router/counter.ts
index 07c51b7ad6e..d7895d18840 100644
--- a/apps/wing-console/console/server/src/router/counter.ts
+++ b/apps/wing-console/console/server/src/router/counter.ts
@@ -1,11 +1,17 @@
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { ICounterClient } from "../wingsdk.js";
+import type { ICounterClient } from "../wingsdk.js";
 
 export const createCounterRouter = () => {
   return createRouter({
     "counter.inc": createProcedure
+      .meta({
+        analytics: {
+          action: "inc",
+          resource: "Counter",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -21,6 +27,12 @@ export const createCounterRouter = () => {
         return response;
       }),
     "counter.dec": createProcedure
+      .meta({
+        analytics: {
+          action: "dec",
+          resource: "Counter",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -36,6 +48,12 @@ export const createCounterRouter = () => {
         return response;
       }),
     "counter.peek": createProcedure
+      .meta({
+        analytics: {
+          action: "peek",
+          resource: "Counter",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -53,6 +71,12 @@ export const createCounterRouter = () => {
         return response;
       }),
     "counter.set": createProcedure
+      .meta({
+        analytics: {
+          action: "set",
+          resource: "Counter",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
diff --git a/apps/wing-console/console/server/src/router/dynamodb-table.ts b/apps/wing-console/console/server/src/router/dynamodb-table.ts
deleted file mode 100644
index cf8cce89b92..00000000000
--- a/apps/wing-console/console/server/src/router/dynamodb-table.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { z } from "zod";
-
-import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { DynamodbTableSchema, IDynamodbTableClient, Json } from "../wingsdk.js";
-
-export const createDynamodbTableRouter = () => {
-  return createRouter({
-    "dynamodb-table.info": createProcedure
-      .input(
-        z.object({
-          resourcePath: z.string(),
-        }),
-      )
-      .query(async ({ input, ctx }) => {
-        const simulator = await ctx.simulator();
-        const schema = simulator.getResourceConfig(
-          input.resourcePath,
-        ) as DynamodbTableSchema;
-        const client = simulator.getResource(
-          input.resourcePath,
-        ) as IDynamodbTableClient;
-        const rows = await client.scan();
-        const attributeDefinitions = schema.props.attributeDefinitions;
-        const hashKey = schema.props.hashKey;
-        const rangeKey = schema.props.rangeKey;
-        return {
-          name: schema.props.name,
-          attributeDefinitions,
-          hashKey,
-          rangeKey,
-          rows,
-        };
-      }),
-    "dynamodb-table.get": createProcedure
-      .input(
-        z.object({
-          resourcePath: z.string(),
-          key: z.record(z.any()),
-        }),
-      )
-      .query(async ({ input, ctx }) => {
-        const simulator = await ctx.simulator();
-        const client = simulator.getResource(
-          input.resourcePath,
-        ) as IDynamodbTableClient;
-        const { item } = await client.getItem(input.key as any);
-        return item;
-      }),
-    "dynamodb-table.insert": createProcedure
-      .input(
-        z.object({
-          resourcePath: z.string(),
-          data: z.record(z.any()),
-        }),
-      )
-      .mutation(async ({ input, ctx }) => {
-        const simulator = await ctx.simulator();
-        const client = simulator.getResource(
-          input.resourcePath,
-        ) as IDynamodbTableClient;
-
-        await client.putItem({ item: input.data as Json });
-      }),
-    "dynamodb-table.delete": createProcedure
-      .input(
-        z.object({
-          resourcePath: z.string(),
-          data: z.record(z.any()),
-        }),
-      )
-      .mutation(async ({ input, ctx }) => {
-        const simulator = await ctx.simulator();
-        const client = simulator.getResource(
-          input.resourcePath,
-        ) as IDynamodbTableClient;
-
-        const schema = simulator.getResourceConfig(
-          input.resourcePath,
-        ) as DynamodbTableSchema;
-        const itemKey = {
-          [schema.props.hashKey]: input.data[schema.props.hashKey],
-          ...(schema.props.rangeKey
-            ? { [schema.props.rangeKey]: input.data[schema.props.rangeKey] }
-            : {}),
-        };
-        return await client.deleteItem({ key: itemKey as Json });
-      }),
-  });
-};
diff --git a/apps/wing-console/console/server/src/router/endpoint.ts b/apps/wing-console/console/server/src/router/endpoint.ts
new file mode 100644
index 00000000000..55af918f0d0
--- /dev/null
+++ b/apps/wing-console/console/server/src/router/endpoint.ts
@@ -0,0 +1,101 @@
+import { ENDPOINT_FQN } from "@winglang/sdk/lib/cloud/endpoint.js";
+import { type Endpoint } from "@winglang/sdk/lib/target-sim/endpoint.inflight.js";
+import * as z from "zod";
+
+import { createProcedure, createRouter } from "../utils/createRouter.js";
+import type { EndpointSchema, Simulator } from "../wingsdk.js";
+
+export type EndpointExposeStatus = "connected" | "disconnected" | "connecting";
+
+const listEndpoints = (simulator: Simulator) => {
+  const endpoints = simulator
+    .listResources()
+    .map((r) => simulator.getResourceConfig(r))
+    .filter((r) => {
+      return r.type === ENDPOINT_FQN;
+    })
+    .map((r) => r as EndpointSchema);
+  return endpoints;
+};
+
+const getExposeStatus = (
+  simulator: Simulator,
+  resourcePath: string,
+): Promise<EndpointExposeStatus> => {
+  const client = simulator.tryGetResource(resourcePath) as Endpoint;
+  if (!client) {
+    throw new Error(`Resource not found: ${resourcePath}`);
+  }
+  return client.exposeStatus();
+};
+
+const getEndpointDetails = async (
+  simulator: Simulator,
+  endpoint: EndpointSchema,
+) => {
+  const exposeStatus = await getExposeStatus(simulator, endpoint.path);
+  return {
+    id: endpoint.path,
+    // The slice is for removing `"root/Default/"` from `endpoint.path`.
+    label: endpoint.attrs.label ?? endpoint.path.slice(13),
+    url: endpoint.attrs.url,
+    localUrl: endpoint.attrs.inputUrl,
+    browserSupport: endpoint.props.browserSupport ?? false,
+    exposeStatus,
+  };
+};
+
+export const createEndpointRouter = () => {
+  return createRouter({
+    "endpoint.list": createProcedure.query(async ({ input, ctx }) => {
+      if (ctx.appState() !== "success") {
+        return [];
+      }
+      const simulator = await ctx.simulator();
+      const endpoints = listEndpoints(simulator);
+      return Promise.all(
+        endpoints.map(async (endpoint) => {
+          return getEndpointDetails(simulator, endpoint);
+        }),
+      );
+    }),
+    "endpoint.get": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .query(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const endpoint = simulator.getResourceConfig(
+          input.resourcePath,
+        ) as EndpointSchema;
+
+        return getEndpointDetails(simulator, endpoint);
+      }),
+    "endpoint.expose": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .mutation(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(input.resourcePath) as Endpoint;
+        await client.expose();
+        await simulator.reload(false);
+      }),
+    "endpoint.hide": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .mutation(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(input.resourcePath) as Endpoint;
+        await client.hide();
+        await simulator.reload(false);
+      }),
+  });
+};
diff --git a/apps/wing-console/console/server/src/router/file-browser.ts b/apps/wing-console/console/server/src/router/file-browser.ts
new file mode 100644
index 00000000000..c5e5813c5ae
--- /dev/null
+++ b/apps/wing-console/console/server/src/router/file-browser.ts
@@ -0,0 +1,96 @@
+import { z } from "zod";
+
+import { createProcedure, createRouter } from "../utils/createRouter.js";
+import type { IFunctionClient } from "../wingsdk.js";
+
+export const createFileBrowserRouter = () => {
+  return createRouter({
+    "fileBrowser.get": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+          fileName: z.string(),
+        }),
+      )
+      .query(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+        return await client.invoke(
+          JSON.stringify({ fileName: input.fileName }),
+        );
+      }),
+
+    "fileBrowser.list": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .query(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(input.resourcePath);
+        return (await client.invoke()) as string[];
+      }),
+
+    "fileBrowser.put": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+          fileName: z.string(),
+          fileContent: z.string(),
+        }),
+      )
+      .mutation(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+        return await client.invoke(
+          JSON.stringify({
+            fileName: input.fileName,
+            fileContent: input.fileContent,
+          }),
+        );
+      }),
+
+    "fileBrowser.delete": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+          fileName: z.string(),
+        }),
+      )
+      .mutation(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+        return await client.invoke(
+          JSON.stringify({
+            fileName: input.fileName,
+          }),
+        );
+      }),
+
+    "fileBrowser.download": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+          fileName: z.string(),
+        }),
+      )
+      .mutation(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+        return await client.invoke(
+          JSON.stringify({
+            fileName: input.fileName,
+          }),
+        );
+      }),
+  });
+};
diff --git a/apps/wing-console/console/server/src/router/function.ts b/apps/wing-console/console/server/src/router/function.ts
index 0da3e59a00e..3f5abb8618d 100644
--- a/apps/wing-console/console/server/src/router/function.ts
+++ b/apps/wing-console/console/server/src/router/function.ts
@@ -1,12 +1,12 @@
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { IFunctionClient } from "../wingsdk.js";
+import type { IFunctionClient } from "../wingsdk.js";
 
 export type ResponseEnvelope =
   | {
       success: true;
-      response: string;
+      response: string | undefined;
     }
   | {
       success: false;
@@ -32,6 +32,12 @@ export const isErrorLike = (value: unknown): value is ErrorLike => {
 export const createFunctionRouter = () => {
   return createRouter({
     "function.invoke": createProcedure
+      .meta({
+        analytics: {
+          action: "invoke",
+          resource: "Function",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
diff --git a/apps/wing-console/console/server/src/router/http-client.ts b/apps/wing-console/console/server/src/router/http-client.ts
new file mode 100644
index 00000000000..64ff12617de
--- /dev/null
+++ b/apps/wing-console/console/server/src/router/http-client.ts
@@ -0,0 +1,44 @@
+import { z } from "zod";
+
+import { createProcedure, createRouter } from "../utils/createRouter.js";
+import type { IFunctionClient } from "../wingsdk.js";
+
+export const createHttpClientRouter = () => {
+  return createRouter({
+    "httpClient.getUrl": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .query(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const getUrlClient = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+
+        const url = await getUrlClient.invoke("");
+        return {
+          url,
+        };
+      }),
+
+    "httpClient.getOpenApiSpec": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .query(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const getApiSpecClient = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+
+        const openApiSpec = await getApiSpecClient.invoke("");
+        return {
+          openApiSpec: JSON.parse(openApiSpec ?? "{}"),
+        };
+      }),
+  });
+};
diff --git a/apps/wing-console/console/server/src/router/index.ts b/apps/wing-console/console/server/src/router/index.ts
index f82c874b6de..4a5e645b330 100644
--- a/apps/wing-console/console/server/src/router/index.ts
+++ b/apps/wing-console/console/server/src/router/index.ts
@@ -5,14 +5,17 @@ import { createAppRouter } from "./app.js";
 import { createBucketRouter } from "./bucket.js";
 import { createConfigRouter } from "./config.js";
 import { createCounterRouter } from "./counter.js";
-import { createDynamodbTableRouter } from "./dynamodb-table.js";
+import { createEndpointRouter } from "./endpoint.js";
+import { createFileBrowserRouter } from "./file-browser.js";
 import { createFunctionRouter } from "./function.js";
+import { createHttpClientRouter } from "./http-client.js";
 import { createQueueRouter } from "./queue.js";
-import { createReactAppRouter } from "./react-app.js";
 import { createRedisRouter } from "./redis.js";
 import { createTableRouter } from "./table.js";
 import { createTestRouter } from "./test.js";
 import { createTopicRouter } from "./topic.js";
+import { createUiButtonRouter } from "./ui-button.js";
+import { createUiFieldRouter } from "./ui-field.js";
 import { createUpdaterRouter } from "./updater.js";
 import { createWebsiteRouter } from "./website.js";
 
@@ -32,9 +35,12 @@ export const mergeAllRouters = () => {
     createUpdaterRouter(),
     createRedisRouter(),
     createWebsiteRouter(),
-    createReactAppRouter(),
     createConfigRouter(),
-    createDynamodbTableRouter(),
+    createEndpointRouter(),
+    createUiButtonRouter(),
+    createUiFieldRouter(),
+    createHttpClientRouter(),
+    createFileBrowserRouter(),
   );
 
   return { router };
diff --git a/apps/wing-console/console/server/src/router/queue.ts b/apps/wing-console/console/server/src/router/queue.ts
index 226b8afd3a5..6200d2c2b4f 100644
--- a/apps/wing-console/console/server/src/router/queue.ts
+++ b/apps/wing-console/console/server/src/router/queue.ts
@@ -1,11 +1,17 @@
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { IQueueClient } from "../wingsdk.js";
+import type { IQueueClient } from "../wingsdk.js";
 
 export const createQueueRouter = () => {
   return createRouter({
     "queue.purge": createProcedure
+      .meta({
+        analytics: {
+          action: "purge",
+          resource: "Queue",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -19,6 +25,12 @@ export const createQueueRouter = () => {
         return client.purge();
       }),
     "queue.approxSize": createProcedure
+      .meta({
+        analytics: {
+          action: "approxSize",
+          resource: "Queue",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -32,6 +44,12 @@ export const createQueueRouter = () => {
         return client.approxSize();
       }),
     "queue.push": createProcedure
+      .meta({
+        analytics: {
+          action: "push",
+          resource: "Queue",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
diff --git a/apps/wing-console/console/server/src/router/react-app.ts b/apps/wing-console/console/server/src/router/react-app.ts
deleted file mode 100644
index 7e470b8c768..00000000000
--- a/apps/wing-console/console/server/src/router/react-app.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ReactAppSchema } from "@winglang/sdk/lib/target-sim/schema-resources";
-import { z } from "zod";
-
-import { createProcedure, createRouter } from "../utils/createRouter.js";
-
-export const createReactAppRouter = () => {
-  return createRouter({
-    "reactApp.url": createProcedure
-      .input(
-        z.object({
-          resourcePath: z.string(),
-        }),
-      )
-      .query(async ({ input, ctx }) => {
-        const simulator = await ctx.simulator();
-        const config = simulator.getResourceConfig(
-          input.resourcePath,
-        ) as ReactAppSchema;
-        if (!config || !config.props?.url) {
-          return "";
-        }
-        return config.props.url;
-      }),
-  });
-};
diff --git a/apps/wing-console/console/server/src/router/redis.ts b/apps/wing-console/console/server/src/router/redis.ts
index 36fc3b9b9c0..e8c261ec126 100644
--- a/apps/wing-console/console/server/src/router/redis.ts
+++ b/apps/wing-console/console/server/src/router/redis.ts
@@ -3,7 +3,7 @@ import { createClient } from "redis";
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { IRedisClient } from "../wingsdk.js";
+import type { IRedisClient } from "../wingsdk.js";
 
 const parseRedisErrorMessage = (response: string) => {
   const emptyArgumentsText = ", with args beginning with: ";
@@ -32,6 +32,12 @@ export const createRedisRouter = () => {
         };
       }),
     "redis.exec": createProcedure
+      .meta({
+        analytics: {
+          action: "sendCommand",
+          resource: "Redis",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
diff --git a/apps/wing-console/console/server/src/router/table.ts b/apps/wing-console/console/server/src/router/table.ts
index 322fa39c3dd..cfbd8d499a3 100644
--- a/apps/wing-console/console/server/src/router/table.ts
+++ b/apps/wing-console/console/server/src/router/table.ts
@@ -2,7 +2,8 @@ import { ColumnType as SdkColumnType } from "@winglang/sdk/lib/ex/table.js";
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { TableSchema, ITableClient, Json } from "../wingsdk.js";
+import type { TableSchema, ITableClient } from "../wingsdk.js";
+import { Json } from "../wingsdk.js";
 
 type ColumnType = "string" | "number" | "boolean" | "date" | "json";
 
@@ -68,6 +69,12 @@ const parseRow = (row: any, schema: Column[]): any => {
 export const createTableRouter = () => {
   return createRouter({
     "table.info": createProcedure
+      .meta({
+        analytics: {
+          resource: "Table",
+          action: "list",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -91,6 +98,12 @@ export const createTableRouter = () => {
         };
       }),
     "table.get": createProcedure
+      .meta({
+        analytics: {
+          resource: "Table",
+          action: "get",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -105,6 +118,12 @@ export const createTableRouter = () => {
         return await client.get(input.id);
       }),
     "table.insert": createProcedure
+      .meta({
+        analytics: {
+          resource: "Table",
+          action: "insert",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -127,6 +146,12 @@ export const createTableRouter = () => {
         await client.insert(id, parseRow(input.data, columns));
       }),
     "table.update": createProcedure
+      .meta({
+        analytics: {
+          resource: "Table",
+          action: "update",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
@@ -149,6 +174,12 @@ export const createTableRouter = () => {
         return await client.update(id, parseRow(input.data, columns));
       }),
     "table.delete": createProcedure
+      .meta({
+        analytics: {
+          resource: "Table",
+          action: "delete",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
diff --git a/apps/wing-console/console/server/src/router/test.ts b/apps/wing-console/console/server/src/router/test.ts
index 45d99378c8c..660ebb20fa1 100644
--- a/apps/wing-console/console/server/src/router/test.ts
+++ b/apps/wing-console/console/server/src/router/test.ts
@@ -1,9 +1,10 @@
-import { TestResult } from "@winglang/sdk/lib/std";
+import { TraceType, type TestResult } from "@winglang/sdk/lib/std";
 import { z } from "zod";
 
-import { ConsoleLogger } from "../consoleLogger.js";
+import type { ConsoleLogger } from "../consoleLogger.js";
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { ITestRunnerClient, Simulator } from "../wingsdk.js";
+import { formatTraceError } from "../utils/format-wing-error.js";
+import type { ITestRunnerClient, Simulator } from "../wingsdk.js";
 
 const getTestName = (testPath: string) => {
   const test = testPath.split("/").pop() ?? testPath;
@@ -17,16 +18,18 @@ const listTests = (simulator: Simulator): Promise<string[]> => {
   return testRunner.listTests();
 };
 
+const reloadSimulator = async (simulator: Simulator, logger: ConsoleLogger) => {
+  logger.verbose("Reloading simulator...", "console", {
+    messageType: "info",
+  });
+  await simulator.reload(true);
+};
+
 const runTest = async (
   simulator: Simulator,
   resourcePath: string,
   logger: ConsoleLogger,
 ): Promise<InternalTestResult> => {
-  logger.log("Reloading simulator...", "console", {
-    messageType: "info",
-  });
-  await simulator.reload();
-
   const client = simulator.getResource(
     "root/cloud.TestRunner",
   ) as ITestRunnerClient;
@@ -41,6 +44,13 @@ const runTest = async (
   const startTime = Date.now();
   try {
     const t = await client.runTest(resourcePath);
+    for (const log of t.traces) {
+      if (log.type === TraceType.LOG) {
+        logger.log(log.data.message, "simulator");
+      } else {
+        logger.verbose(log.data.message, "simulator");
+      }
+    }
     result = {
       ...result,
       ...t,
@@ -57,7 +67,11 @@ const runTest = async (
         messageType: "success",
       },
     );
-  } catch {
+  } catch (error: any) {
+    let output = await formatTraceError(error?.message);
+    logger.log(output, "console", {
+      messageType: "fail",
+    });
     logger.log(
       `Test "${getTestName(resourcePath)}" failed (${
         Date.now() - startTime
@@ -80,7 +94,7 @@ export interface InternalTestResult extends TestResult {
 export const createTestRouter = () => {
   return createRouter({
     "test.list": createProcedure.query(async ({ input, ctx }) => {
-      const simulator = await ctx.simulator();
+      const simulator = await ctx.testSimulator();
       const list = await listTests(simulator);
 
       const testsState = ctx.testsStateManager();
@@ -93,6 +107,7 @@ export const createTestRouter = () => {
           label: getTestName(resourcePath),
           status: test?.status ?? "pending",
           time: test?.time ?? 0,
+          datetime: test?.datetime,
         };
       });
     }),
@@ -103,8 +118,9 @@ export const createTestRouter = () => {
         }),
       )
       .mutation(async ({ input, ctx }) => {
+        await reloadSimulator(await ctx.testSimulator(), ctx.logger);
         const response = await runTest(
-          await ctx.simulator(),
+          await ctx.testSimulator(),
           input.resourcePath,
           ctx.logger,
         );
@@ -115,12 +131,14 @@ export const createTestRouter = () => {
           label: getTestName(input.resourcePath),
           status: response.error ? "error" : "success",
           time: response.time,
+          datetime: Date.now(),
         });
 
         return response;
       }),
     "test.runAll": createProcedure.mutation(async ({ ctx }) => {
-      const simulator = await ctx.simulator();
+      const simulator = await ctx.testSimulator();
+      await reloadSimulator(simulator, ctx.logger);
       const testsState = ctx.testsStateManager();
 
       const testList = await listTests(simulator);
@@ -133,6 +151,7 @@ export const createTestRouter = () => {
           label: getTestName(resourcePath),
           status: response.error ? "error" : "success",
           time: response.time,
+          datetime: Date.now(),
         });
       }
 
diff --git a/apps/wing-console/console/server/src/router/topic.ts b/apps/wing-console/console/server/src/router/topic.ts
index 5bf8a3607a6..f2ec701fdae 100644
--- a/apps/wing-console/console/server/src/router/topic.ts
+++ b/apps/wing-console/console/server/src/router/topic.ts
@@ -1,11 +1,17 @@
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { ITopicClient } from "../wingsdk.js";
+import type { ITopicClient } from "../wingsdk.js";
 
 export const createTopicRouter = () => {
   return createRouter({
     "topic.publish": createProcedure
+      .meta({
+        analytics: {
+          action: "publish",
+          resource: "Topic",
+        },
+      })
       .input(
         z.object({
           resourcePath: z.string(),
diff --git a/apps/wing-console/console/server/src/router/ui-button.ts b/apps/wing-console/console/server/src/router/ui-button.ts
new file mode 100644
index 00000000000..2a237b32862
--- /dev/null
+++ b/apps/wing-console/console/server/src/router/ui-button.ts
@@ -0,0 +1,22 @@
+import { z } from "zod";
+
+import { createProcedure, createRouter } from "../utils/createRouter.js";
+import type { IFunctionClient } from "../wingsdk.js";
+
+export const createUiButtonRouter = () => {
+  return createRouter({
+    "uiButton.invoke": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .mutation(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+        await client.invoke("");
+      }),
+  });
+};
diff --git a/apps/wing-console/console/server/src/router/ui-field.ts b/apps/wing-console/console/server/src/router/ui-field.ts
new file mode 100644
index 00000000000..7d66c6d9d93
--- /dev/null
+++ b/apps/wing-console/console/server/src/router/ui-field.ts
@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+import { createProcedure, createRouter } from "../utils/createRouter.js";
+import type { IFunctionClient } from "../wingsdk.js";
+
+export const createUiFieldRouter = () => {
+  return createRouter({
+    "uiField.get": createProcedure
+      .input(
+        z.object({
+          resourcePath: z.string(),
+        }),
+      )
+      .query(async ({ input, ctx }) => {
+        const simulator = await ctx.simulator();
+        const client = simulator.getResource(
+          input.resourcePath,
+        ) as IFunctionClient;
+        return {
+          value: await client.invoke(""),
+        };
+      }),
+  });
+};
diff --git a/apps/wing-console/console/server/src/router/website.ts b/apps/wing-console/console/server/src/router/website.ts
index 921cad5e0e3..f7d0164a4e1 100644
--- a/apps/wing-console/console/server/src/router/website.ts
+++ b/apps/wing-console/console/server/src/router/website.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 
 import { createProcedure, createRouter } from "../utils/createRouter.js";
-import { WebsiteSchema } from "../wingsdk.js";
+import type { WebsiteSchema } from "../wingsdk.js";
 
 export const createWebsiteRouter = () => {
   return createRouter({
diff --git a/apps/wing-console/console/server/src/utils/LogInterface.ts b/apps/wing-console/console/server/src/utils/LogInterface.ts
index 22cd6ee6e5b..f8e252f909a 100644
--- a/apps/wing-console/console/server/src/utils/LogInterface.ts
+++ b/apps/wing-console/console/server/src/utils/LogInterface.ts
@@ -1,5 +1,6 @@
 export interface LogInterface {
   info(message?: any, ...optionalParameters: any[]): void;
   verbose(message?: any, ...optionalParameters: any[]): void;
+  warning(message?: any, ...optionalParameters: any[]): void;
   error(message?: any, ...optionalParameters: any[]): void;
 }
diff --git a/apps/wing-console/console/server/src/utils/analytics.ts b/apps/wing-console/console/server/src/utils/analytics.ts
new file mode 100644
index 00000000000..a5ada9f69f6
--- /dev/null
+++ b/apps/wing-console/console/server/src/utils/analytics.ts
@@ -0,0 +1,3 @@
+export interface Analytics {
+  track(event: string, properties?: Record<string, any>): void;
+}
diff --git a/apps/wing-console/console/server/src/utils/compiler.ts b/apps/wing-console/console/server/src/utils/compiler.ts
index 3df90af5c54..47786262c76 100644
--- a/apps/wing-console/console/server/src/utils/compiler.ts
+++ b/apps/wing-console/console/server/src/utils/compiler.ts
@@ -24,11 +24,17 @@ export interface Compiler {
 export interface CreateCompilerProps {
   wingfile: string;
   platform?: string[];
+  testing?: boolean;
+  stateDir?: string;
+  watchGlobs?: string[];
 }
 
 export const createCompiler = ({
   wingfile,
   platform = [wing.BuiltinPlatform.SIM],
+  testing = false,
+  stateDir,
+  watchGlobs,
 }: CreateCompilerProps): Compiler => {
   const events = new Emittery<CompilerEvents>();
   let isCompiling = false;
@@ -44,6 +50,7 @@ export const createCompiler = ({
       await events.emit("compiling");
       const simfile = await wing.compile(wingfile, {
         platform,
+        testing,
       });
       await events.emit("compiled", { simfile });
     } catch (error) {
@@ -72,14 +79,20 @@ export const createCompiler = ({
   };
 
   const dirname = path.dirname(wingfile);
-  //TODO: infer React App resource folders from source files https://github.com/winglang/wing/issues/3956
-  const ignoreList = [
-    `${dirname}/target/**`,
-    "**/node_modules/**",
-    "**/.git/**",
+
+  const pathsToWatch = [
+    `!**/node_modules/**`,
+    `!**/.git/**`,
+    `!${dirname}/target/**`,
+    dirname,
+    ...(watchGlobs ?? []),
   ];
-  const watcher = chokidar.watch(dirname, {
-    ignored: ignoreList,
+
+  if (stateDir) {
+    pathsToWatch.push(`!${stateDir}`);
+  }
+
+  const watcher = chokidar.watch(pathsToWatch, {
     ignoreInitial: true,
   });
   watcher.on("change", recompile);
diff --git a/apps/wing-console/console/server/src/utils/construct-tree.ts b/apps/wing-console/console/server/src/utils/construct-tree.ts
index 909e7d5f94a..7053dc38d07 100644
--- a/apps/wing-console/console/server/src/utils/construct-tree.ts
+++ b/apps/wing-console/console/server/src/utils/construct-tree.ts
@@ -1,4 +1,4 @@
-import { NodeDisplay } from "./constructTreeNodeMap.js";
+import type { NodeDisplay } from "./constructTreeNodeMap.js";
 
 /**
  * A node in the construct tree.
diff --git a/apps/wing-console/console/server/src/utils/constructTreeNodeMap.ts b/apps/wing-console/console/server/src/utils/constructTreeNodeMap.ts
index 06ee81f801c..e1a620f4d1d 100644
--- a/apps/wing-console/console/server/src/utils/constructTreeNodeMap.ts
+++ b/apps/wing-console/console/server/src/utils/constructTreeNodeMap.ts
@@ -1,10 +1,12 @@
-import { ConstructInfo, ConstructTreeNode } from "./construct-tree.js";
+import type { ConstructInfo, ConstructTreeNode } from "./construct-tree.js";
 
 export interface NodeDisplay {
   title?: string;
   description?: string;
   sourceModule?: string;
   hidden?: boolean;
+  color?: string;
+  icon?: string;
 }
 
 export interface NodeConnection {
diff --git a/apps/wing-console/console/server/src/utils/createRouter.ts b/apps/wing-console/console/server/src/utils/createRouter.ts
index b0f48b99846..7cce8677d2d 100644
--- a/apps/wing-console/console/server/src/utils/createRouter.ts
+++ b/apps/wing-console/console/server/src/utils/createRouter.ts
@@ -1,12 +1,14 @@
 import { initTRPC } from "@trpc/server";
-import { simulator } from "@winglang/sdk";
+import type { simulator } from "@winglang/sdk";
 import type Emittery from "emittery";
 
-import { Config } from "../config.js";
-import { ConsoleLogger } from "../consoleLogger.js";
-import { HostUtils } from "../hostUtils.js";
+import type { Config } from "../config.js";
+import type { ConsoleLogger } from "../consoleLogger.js";
+import type { HostUtils } from "../hostUtils.js";
 import type { State, Trace } from "../types.js";
-import { Updater } from "../updater.js";
+import type { Updater } from "../updater.js";
+
+import type { Analytics } from "./analytics.js";
 
 export type QueryNames = {
   query:
@@ -24,7 +26,7 @@ export type RouterEvents = {
   invalidateQuery: QueryNames;
 };
 
-export type LayoutComponentType = "explorer" | "tests" | "logs";
+export type LayoutComponentType = "explorer" | "tests" | "logs" | "endpoints";
 
 export interface LayoutComponent {
   type: LayoutComponentType;
@@ -39,13 +41,13 @@ export interface LayoutPanel {
 export interface LayoutConfig {
   leftPanel?: LayoutPanel;
   bottomPanel?: LayoutPanel;
+  rightPanel?: LayoutPanel;
   statusBar?: {
     hide?: boolean;
     showThemeToggle?: boolean;
   };
   errorScreen?: {
     position?: "default" | "bottom";
-    displayTitle?: boolean;
     displayLinks?: boolean;
   };
   panels?: {
@@ -59,6 +61,7 @@ export interface TestItem {
   id: string;
   label: string;
   status: TestStatus;
+  datetime: number;
   time?: number;
 }
 
@@ -74,8 +77,17 @@ export interface FileLink {
   column?: number;
 }
 
+export interface RouterMeta {
+  analytics?: {
+    action: string;
+    resource: string;
+  };
+}
+
 export interface RouterContext {
   simulator(): Promise<simulator.Simulator>;
+  restartSimulator(): Promise<void>;
+  testSimulator(): Promise<simulator.Simulator>;
   appDetails(): Promise<{
     wingVersion: string | undefined;
   }>;
@@ -96,9 +108,13 @@ export interface RouterContext {
   getSelectedNode: () => string | undefined;
   setSelectedNode: (node: string) => void;
   testsStateManager: () => TestsStateManager;
+  analyticsAnonymousId?: string;
+  requireSignIn?: () => Promise<boolean>;
+  notifySignedIn?: () => Promise<void>;
+  analytics?: Analytics;
 }
 
-const t = initTRPC.context<RouterContext>().create();
+const t = initTRPC.context<RouterContext>().meta<RouterMeta>().create();
 export const createRouter = t.router;
 export const mergeRouters = t.mergeRouters;
 export const middleware = t.middleware;
@@ -113,6 +129,20 @@ const invalidateQueriesAfterMutation = middleware(async (options) => {
   return result;
 });
 
-export const createProcedure = t.procedure.use(
-  invalidateQueriesAfterMutation,
-) as typeof t.procedure;
+const sendUserResourceInteractionAnalyticsEvent = middleware(
+  async (options) => {
+    const analytics = options.ctx.analytics;
+    const meta = options.meta?.analytics;
+    if (analytics && meta) {
+      analytics.track("user_resource_interaction", {
+        resource: meta.resource,
+        action: meta.action,
+      });
+    }
+    return await options.next();
+  },
+);
+
+export const createProcedure = t.procedure
+  .use(invalidateQueriesAfterMutation)
+  .use(sendUserResourceInteractionAnalyticsEvent) as typeof t.procedure;
diff --git a/apps/wing-console/console/server/src/utils/format-wing-error.ts b/apps/wing-console/console/server/src/utils/format-wing-error.ts
index 7dcdb78ce31..28c6da3a03f 100644
--- a/apps/wing-console/console/server/src/utils/format-wing-error.ts
+++ b/apps/wing-console/console/server/src/utils/format-wing-error.ts
@@ -3,17 +3,8 @@ import { relative, resolve } from "node:path";
 
 import { CompileError, PreflightError } from "@winglang/compiler";
 import { prettyPrintError } from "@winglang/sdk/lib/util/enhanced-error";
-import { CHARS_ASCII, emitDiagnostic, File, Label } from "codespan-wasm";
-
-function offsetFromLineAndColumn(source: string, line: number, column: number) {
-  const lines = source.split("\n");
-  let offset = 0;
-  for (let index = 0; index < line; index++) {
-    offset += lines[index]!.length + 1;
-  }
-  offset += column;
-  return offset;
-}
+import type { File, Label } from "codespan-wasm";
+import { CHARS_ASCII, emitDiagnostic } from "codespan-wasm";
 
 export const formatWingError = async (error: unknown, entryPoint?: string) => {
   try {
@@ -32,39 +23,27 @@ export const formatWingError = async (error: unknown, entryPoint?: string) => {
         if (span !== null && span !== undefined && span.file_id) {
           // `span` should only be null if source file couldn't be read etc.
           const source = await readFile(span.file_id, "utf8");
-          const start = offsetFromLineAndColumn(
-            source,
-            span.start.line,
-            span.start.col,
-          );
-          const end = offsetFromLineAndColumn(
-            source,
-            span.end.line,
-            span.end.col,
-          );
+          const start = span.start_offset;
+          const end = span.end_offset;
           const filePath = relative(cwd, span.file_id);
           files.push({ name: filePath, source });
           labels.push({
             fileId: filePath,
             rangeStart: start,
             rangeEnd: end,
-            message,
+            message: "",
             style: "primary",
           });
         }
 
         for (const annotation of annotations) {
+          // file_id might be "" if the span is synthetic (see #2521)
+          if (!annotation.span?.file_id) {
+            continue;
+          }
           const source = await readFile(annotation.span.file_id, "utf8");
-          const start = offsetFromLineAndColumn(
-            source,
-            annotation.span.start.line,
-            annotation.span.start.col,
-          );
-          const end = offsetFromLineAndColumn(
-            source,
-            annotation.span.end.line,
-            annotation.span.end.col,
-          );
+          const start = annotation.span.start_offset;
+          const end = annotation.span.end_offset;
           const filePath = relative(cwd, annotation.span.file_id);
           files.push({ name: filePath, source });
           labels.push({
@@ -98,6 +77,7 @@ export const formatWingError = async (error: unknown, entryPoint?: string) => {
       output.push(
         await prettyPrintError(error.causedBy, {
           sourceEntrypoint: resolve(entryPoint ?? "."),
+          resetCache: true,
         }),
       );
 
@@ -126,3 +106,13 @@ export const formatWingError = async (error: unknown, entryPoint?: string) => {
     return `Unexpected error: ${error}`;
   }
 };
+
+export const formatTraceError = async (error: string): Promise<string> => {
+  let output = await prettyPrintError(error, { resetCache: true });
+
+  // Remove ANSI color codes
+  const regex =
+    /[\u001B\u009B][#();?[]*(?:\d{1,4}(?:;\d{0,4})*)?[\d<=>A-ORZcf-nqry]/g;
+
+  return output.replaceAll(regex, "");
+};
diff --git a/apps/wing-console/console/server/src/utils/simulator.ts b/apps/wing-console/console/server/src/utils/simulator.ts
index fa98c7a8fca..b418af988d9 100644
--- a/apps/wing-console/console/server/src/utils/simulator.ts
+++ b/apps/wing-console/console/server/src/utils/simulator.ts
@@ -14,15 +14,22 @@ export interface SimulatorEvents {
 }
 
 export interface Simulator {
-  instance(): Promise<simulator.Simulator>;
+  waitForInstance(statedir?: string): Promise<simulator.Simulator>;
+  instance(): simulator.Simulator;
   start(simfile: string): Promise<void>;
   stop(): Promise<void>;
+  reload(): Promise<void>;
   on<T extends keyof SimulatorEvents>(
     event: T,
     listener: (event: SimulatorEvents[T]) => void | Promise<void>,
   ): void;
 }
 
+export interface CreateSimulatorProps {
+  stateDir?: string;
+  enableSimUpdates?: boolean;
+}
+
 const stopSilently = async (simulator: simulator.Simulator) => {
   try {
     await simulator.stop();
@@ -38,27 +45,41 @@ const stopSilently = async (simulator: simulator.Simulator) => {
   }
 };
 
-export const createSimulator = (): Simulator => {
+export const createSimulator = (props?: CreateSimulatorProps): Simulator => {
   const events = new Emittery<SimulatorEvents>();
   let instance: simulator.Simulator | undefined;
+  const handleExistingInstance = async (simfile: string): Promise<boolean> => {
+    if (!instance) {
+      return true;
+    }
+    if (props?.enableSimUpdates) {
+      await events.emit("starting", { instance });
+      await instance.update(simfile);
+      await events.emit("started");
+      return false;
+    } else {
+      await events.emit("stopping");
+      await stopSilently(instance);
+      return true;
+    }
+  };
   const start = async (simfile: string) => {
     try {
-      if (instance) {
-        await events.emit("stopping");
-        await stopSilently(instance);
+      const shouldStartSim = await handleExistingInstance(simfile);
+      if (shouldStartSim) {
+        instance = new simulator.Simulator({
+          simfile,
+          stateDir: props?.stateDir,
+        });
+        instance.onTrace({
+          callback(trace) {
+            events.emit("trace", trace);
+          },
+        });
+        await events.emit("starting", { instance });
+        await instance.start();
+        await events.emit("started");
       }
-
-      instance = new simulator.Simulator({ simfile });
-      instance.onTrace({
-        callback(trace) {
-          events.emit("trace", trace);
-        },
-      });
-
-      await events.emit("starting", { instance });
-
-      await instance.start();
-      await events.emit("started");
     } catch (error) {
       await events.emit(
         "error",
@@ -72,18 +93,37 @@ export const createSimulator = (): Simulator => {
     }
   };
 
+  const reload = async () => {
+    if (instance) {
+      await events.emit("starting", { instance });
+      await instance.reload(true);
+      await events.emit("started");
+    } else {
+      throw new Error("Simulator not started");
+    }
+  };
+
   return {
-    async instance() {
+    async waitForInstance() {
       return (
         instance ?? events.once("starting").then(({ instance }) => instance)
       );
     },
+    instance() {
+      if (!instance) {
+        throw new Error("Simulator is not available yet");
+      }
+      return instance;
+    },
     async start(simfile: string) {
       await start(simfile);
     },
     async stop() {
       await instance?.stop();
     },
+    async reload() {
+      await reload();
+    },
     on(event, listener) {
       events.on(event, listener);
     },
diff --git a/apps/wing-console/console/server/src/utils/terms-and-conditions.ts b/apps/wing-console/console/server/src/utils/terms-and-conditions.ts
index b835a0823f7..f2061463699 100644
--- a/apps/wing-console/console/server/src/utils/terms-and-conditions.ts
+++ b/apps/wing-console/console/server/src/utils/terms-and-conditions.ts
@@ -1,5 +1,6 @@
-// @ts-ignore-next-line
-import Conf from "conf";
+import * as fs from "node:fs";
+
+import envPaths from "env-paths";
 
 // @ts-ignore-next-line
 import License from "../../LICENSE.md?raw";
@@ -7,21 +8,47 @@ import License from "../../LICENSE.md?raw";
 const PROJECT_NAME = "@wingconsole/server";
 const CONFIG_KEY = "termsAndConditions";
 
+const paths = envPaths(PROJECT_NAME);
+
+const configFilename = `${paths.config}/config.json`;
+
+const getConfig = () => {
+  if (!fs.existsSync(configFilename)) {
+    return;
+  }
+
+  try {
+    return JSON.stringify(
+      fs.readFileSync(configFilename, "utf8"),
+    ) as unknown as Record<string, any>;
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const saveConfig = (config: Record<string, any>) => {
+  try {
+    fs.mkdirSync(paths.config, { recursive: true });
+    fs.writeFileSync(configFilename, JSON.stringify(config, undefined, 2));
+  } catch (error) {
+    console.error(error);
+  }
+};
+
 export const isTermsAccepted = (): boolean => {
-  const config = new Conf({
-    projectName: PROJECT_NAME,
-  });
+  const config = getConfig();
 
-  const accepted = config.get(CONFIG_KEY) as boolean;
+  const accepted = config?.[CONFIG_KEY];
   return accepted === true;
 };
 
 export const acceptTerms = (value: boolean) => {
-  const config = new Conf({
-    projectName: PROJECT_NAME,
-  });
+  const config = getConfig();
 
-  config.set(CONFIG_KEY, value);
+  saveConfig({
+    ...config,
+    [CONFIG_KEY]: value,
+  });
 };
 
 export const getLicense = (): string => {
diff --git a/apps/wing-console/console/server/src/wingsdk.ts b/apps/wing-console/console/server/src/wingsdk.ts
index b2e83431f09..3c865304d9e 100644
--- a/apps/wing-console/console/server/src/wingsdk.ts
+++ b/apps/wing-console/console/server/src/wingsdk.ts
@@ -1,3 +1,11 @@
+import type { BaseResourceSchema } from "@winglang/sdk/lib/simulator/index.js";
+import type {
+  ApiSchema as ApiSchema_,
+  TableSchema as TableSchema_,
+  WebsiteSchema as WebsiteSchema_,
+  EndpointSchema as EndpointSchema_,
+} from "@winglang/sdk/lib/target-sim/schema-resources.js";
+
 export {
   Simulator,
   type WingSimulatorSchema,
@@ -13,20 +21,23 @@ export type {
   ICounterClient,
   ITopicClient,
   IApiClient,
+  IEndpointClient,
   OpenApiSpec,
 } from "@winglang/sdk/lib/cloud/index.js";
 
 export type { ITestRunnerClient } from "@winglang/sdk/lib/std/index.js";
 
-export type {
-  IRedisClient,
-  ITableClient,
-  IDynamodbTableClient,
-} from "@winglang/sdk/lib/ex/index.js";
+export type { IRedisClient, ITableClient } from "@winglang/sdk/lib/ex/index.js";
 
-export type {
-  ApiSchema,
-  DynamodbTableSchema,
-  TableSchema,
-  WebsiteSchema,
-} from "@winglang/sdk/lib/target-sim/schema-resources.js";
+export type ApiSchema = BaseResourceSchema & {
+  props: ApiSchema_;
+};
+export type TableSchema = BaseResourceSchema & {
+  props: TableSchema_;
+};
+export type WebsiteSchema = BaseResourceSchema & {
+  props: WebsiteSchema_;
+};
+export type EndpointSchema = BaseResourceSchema & {
+  props: EndpointSchema_;
+};
diff --git a/apps/wing-console/console/ui/package.json b/apps/wing-console/console/ui/package.json
index 94e32a951b3..e895f67dd32 100644
--- a/apps/wing-console/console/ui/package.json
+++ b/apps/wing-console/console/ui/package.json
@@ -33,13 +33,11 @@
     "@heroicons/react": "^2.0.18",
     "@popperjs/core": "^2.11.8",
     "@tanstack/react-query": "^4.33.0",
-    "@trpc/client": "^10.38.1",
-    "@trpc/react-query": "^10.38.1",
-    "@trpc/server": "^10.38.1",
+    "@trpc/client": "^10.45.2",
+    "@trpc/react-query": "^10.45.2",
+    "@trpc/server": "^10.45.2",
     "@wingconsole/design-system": "workspace:^",
-    "classnames": "^2.3.2",
-    "d3-selection": "^3.0.0",
-    "d3-zoom": "^3.0.0",
+    "classnames": "^2.5.1",
     "elkjs": "^0.8.2",
     "framer-motion": "^10.16.2",
     "jszip": "^3.10.1",
@@ -49,11 +47,13 @@
     "lodash.throttle": "^4.1.1",
     "lodash.uniqby": "^4.7.0",
     "nanoid": "^4.0.2",
+    "react-dom": "^18.2.0",
     "react-markdown": "^9.0.1",
+    "react-use": "^17.4.2",
     "zod": "^3.22.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.11",
+    "@babel/core": "^7.23.9",
     "@storybook/addon-essentials": "^7.4.0",
     "@storybook/addon-interactions": "^7.4.0",
     "@storybook/addon-links": "^7.4.0",
@@ -68,23 +68,25 @@
     "@types/lodash.throttle": "^4.1.7",
     "@types/lodash.uniqby": "^4.7.7",
     "@types/react": "^18.2.21",
-    "@vitejs/plugin-react-swc": "^3.3.2",
+    "@types/react-dom": "^18.2.7",
+    "@vitejs/plugin-react-swc": "^3.6.0",
     "@wingconsole/design-system": "workspace:^",
     "@wingconsole/eslint-plugin": "workspace:^",
     "@wingconsole/server": "workspace:^",
     "@wingconsole/tsconfig": "workspace:^",
     "@wingconsole/use-loading": "workspace:^",
     "@wingconsole/use-persistent-state": "workspace:^",
+    "@winglang/sdk": "workspace:^",
     "autoprefixer": "^10.4.15",
     "bump-pack": "workspace:^",
     "eslint": "^8.48.0",
     "react": "^18.2.0",
     "storybook": "^7.4.0",
-    "tailwindcss": "^3.3.3",
-    "tsup": "^7.2.0",
+    "tailwindcss": "^3.4.3",
+    "tsup": "^8.0.2",
     "typescript": "^5.2.2",
-    "vite": "^4.4.9",
-    "vitest": "^0.31.4",
+    "vite": "^4.5.2",
+    "vitest": "^1.6.0",
     "webpack": "^5.88.2"
   },
   "volta": {
diff --git a/apps/wing-console/console/ui/src/App.tsx b/apps/wing-console/console/ui/src/App.tsx
index 18fd1d64ea9..1747306463a 100644
--- a/apps/wing-console/console/ui/src/App.tsx
+++ b/apps/wing-console/console/ui/src/App.tsx
@@ -5,10 +5,13 @@ import {
   buildTheme,
 } from "@wingconsole/design-system";
 import type { Trace } from "@wingconsole/server";
+import { PersistentStateProvider } from "@wingconsole/use-persistent-state";
 
-import { LayoutProvider, LayoutType } from "./layout/layout-provider.js";
-import { trpc } from "./services/trpc.js";
-import { TestsContextProvider } from "./tests-context.js";
+import type { LayoutType } from "./features/layout/layout-provider.js";
+import { LayoutProvider } from "./features/layout/layout-provider.js";
+import { SelectionContextProvider } from "./features/selection-context/selection-context.js";
+import { TestsContextProvider } from "./features/tests-pane/tests-context.js";
+import { trpc } from "./trpc.js";
 
 export interface AppProps {
   layout?: LayoutType;
@@ -41,23 +44,23 @@ export const App = ({ layout, theme, color, onTrace }: AppProps) => {
   const layoutConfig = trpc["app.layoutConfig"].useQuery();
   const appDetails = trpc["app.details"].useQuery();
   const appState = trpc["app.state"].useQuery();
-  const themeMode = trpc["config.getThemeMode"].useQuery();
 
   return (
-    <ThemeProvider
-      mode={theme ?? themeMode?.data?.mode ?? "auto"}
-      theme={buildTheme(color)}
-    >
+    <ThemeProvider theme={buildTheme(color)}>
       <NotificationsProvider>
         <TestsContextProvider>
-          <LayoutProvider
-            layoutType={layout}
-            layoutProps={{
-              cloudAppState: appState.data ?? "compiling",
-              wingVersion: appDetails.data?.wingVersion,
-              layoutConfig: layoutConfig.data?.config,
-            }}
-          ></LayoutProvider>
+          <SelectionContextProvider>
+            <PersistentStateProvider>
+              <LayoutProvider
+                layoutType={layout}
+                layoutProps={{
+                  cloudAppState: appState.data ?? "compiling",
+                  wingVersion: appDetails.data?.wingVersion,
+                  layoutConfig: layoutConfig.data?.config,
+                }}
+              />
+            </PersistentStateProvider>
+          </SelectionContextProvider>
         </TestsContextProvider>
       </NotificationsProvider>
     </ThemeProvider>
diff --git a/apps/wing-console/console/ui/src/AppContext.ts b/apps/wing-console/console/ui/src/AppContext.ts
index 899bbfb0efe..6d15d8b7456 100644
--- a/apps/wing-console/console/ui/src/AppContext.ts
+++ b/apps/wing-console/console/ui/src/AppContext.ts
@@ -5,6 +5,8 @@ export type AppMode = "remote" | "local";
 export interface AppContextValue {
   appMode: AppMode;
   title: string;
+  githubSignInURL?: string;
+  googleSignInURL?: string;
 }
 
 export const AppContext = React.createContext<AppContextValue>({
diff --git a/apps/wing-console/console/ui/src/Console.tsx b/apps/wing-console/console/ui/src/Console.tsx
index 75bd3240105..f50f5460d62 100644
--- a/apps/wing-console/console/ui/src/Console.tsx
+++ b/apps/wing-console/console/ui/src/Console.tsx
@@ -1,13 +1,14 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { httpLink, wsLink, splitLink, createWSClient } from "@trpc/client";
-import { Mode } from "@wingconsole/design-system";
-import { Trace } from "@wingconsole/server";
-import { useEffect, useMemo } from "react";
+import type { Mode } from "@wingconsole/design-system";
+import type { Trace } from "@wingconsole/server";
+import { useEffect, useMemo, useState } from "react";
 
 import { App } from "./App.js";
 import { AppContext } from "./AppContext.js";
-import { LayoutType } from "./layout/layout-provider.js";
-import { trpc } from "./services/trpc.js";
+import { LayoutType } from "./features/layout/layout-provider.js";
+import { WebSocketProvider } from "./features/websocket-state/use-websocket.js";
+import { trpc } from "./trpc.js";
 
 export const Console = ({
   trpcUrl,
@@ -17,6 +18,8 @@ export const Console = ({
   theme,
   color,
   onTrace,
+  wingCloudSignInUrl: githubSignInURL,
+  googleSignInURL,
 }: {
   trpcUrl: string;
   wsUrl: string;
@@ -25,37 +28,46 @@ export const Console = ({
   theme?: Mode;
   color?: string;
   onTrace?: (trace: Trace) => void;
+  wingCloudSignInUrl?: string;
+  googleSignInURL?: string;
 }) => {
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        networkMode: "always",
-        refetchOnWindowFocus: false,
-        keepPreviousData: true,
-      },
-      mutations: {
-        networkMode: "always",
-      },
-    },
-  });
-  const wsClient = createWSClient({
-    url: wsUrl,
-  });
-  const trpcClient = trpc.createClient({
-    links: [
-      splitLink({
-        condition(op) {
-          return op.type === "subscription";
+  const [queryClient] = useState(
+    () =>
+      new QueryClient({
+        defaultOptions: {
+          queries: {
+            networkMode: "always",
+            refetchOnWindowFocus: false,
+            keepPreviousData: true,
+          },
+          mutations: {
+            networkMode: "always",
+          },
         },
-        true: wsLink({
-          client: wsClient,
-        }),
-        false: httpLink({
-          url: trpcUrl,
-        }),
       }),
-    ],
-  });
+  );
+  const [wsClient] = useState(() =>
+    createWSClient({
+      url: wsUrl,
+    }),
+  );
+  const [trpcClient] = useState(() =>
+    trpc.createClient({
+      links: [
+        splitLink({
+          condition(op) {
+            return op.type === "subscription";
+          },
+          true: wsLink({
+            client: wsClient,
+          }),
+          false: httpLink({
+            url: trpcUrl,
+          }),
+        }),
+      ],
+    }),
+  );
 
   let windowTitle = title ?? "Wing Console";
 
@@ -102,10 +114,24 @@ export const Console = ({
   }, [layout]);
 
   return (
-    <AppContext.Provider value={{ appMode, title: windowTitle }}>
+    <AppContext.Provider
+      value={{
+        appMode,
+        title: windowTitle,
+        githubSignInURL,
+        googleSignInURL,
+      }}
+    >
       <trpc.Provider client={trpcClient} queryClient={queryClient}>
         <QueryClientProvider client={queryClient}>
-          <App layout={layout} theme={theme} color={color} onTrace={onTrace} />
+          <WebSocketProvider webSocket={wsClient.getConnection()}>
+            <App
+              layout={layout}
+              theme={theme}
+              color={color}
+              onTrace={onTrace}
+            />
+          </WebSocketProvider>
         </QueryClientProvider>
       </trpc.Provider>
     </AppContext.Provider>
diff --git a/apps/wing-console/console/ui/src/features/api-interaction-view.tsx b/apps/wing-console/console/ui/src/features/api-interaction-view.tsx
deleted file mode 100644
index 7252d1ed19e..00000000000
--- a/apps/wing-console/console/ui/src/features/api-interaction-view.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { OpenApiSpec } from "@wingconsole/server/src/wingsdk";
-import { memo, useCallback, useContext, useState } from "react";
-
-import { AppContext } from "../AppContext.js";
-import { useApi } from "../services/use-api.js";
-import { ApiResponse } from "../shared/api.js";
-import { ApiInteraction } from "../ui/api-interaction.js";
-
-export interface ApiViewProps {
-  resourcePath: string;
-}
-
-export const ApiInteractionView = memo(({ resourcePath }: ApiViewProps) => {
-  const { appMode } = useContext(AppContext);
-  const [schemaData, setSchemaData] = useState<OpenApiSpec>();
-  const [apiResponse, setApiResponse] = useState<ApiResponse>();
-  const onFetchDataUpdate = useCallback(
-    (data: ApiResponse) => setApiResponse(data),
-    [],
-  );
-  const onSchemaDataUpdate = useCallback(
-    (data: OpenApiSpec) => setSchemaData(data),
-    [],
-  );
-  const { isLoading, callFetch } = useApi({
-    resourcePath,
-    onSchemaDataUpdate,
-    onFetchDataUpdate,
-  });
-
-  return (
-    <ApiInteraction
-      resourceId={resourcePath}
-      appMode={appMode}
-      schemaData={schemaData}
-      callFetch={callFetch}
-      isLoading={isLoading}
-      apiResponse={apiResponse}
-    />
-  );
-});
diff --git a/apps/wing-console/console/ui/src/features/auto-updater.tsx b/apps/wing-console/console/ui/src/features/auto-updater.tsx
deleted file mode 100644
index dd1b7f61d70..00000000000
--- a/apps/wing-console/console/ui/src/features/auto-updater.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { ArrowPathIcon } from "@heroicons/react/24/outline";
-import {
-  ProgressBar,
-  ToolbarButton,
-  useTheme,
-} from "@wingconsole/design-system";
-import classNames from "classnames";
-import { useEffect, useState } from "react";
-
-import { trpc } from "../services/trpc.js";
-
-export const AutoUpdater = () => {
-  const { theme } = useTheme();
-
-  const enabled = trpc["updater.enabled"].useQuery();
-  const { data: currentStatus } = trpc["updater.currentStatus"].useQuery(
-    undefined,
-    {
-      enabled: enabled.data?.enabled,
-    },
-  );
-  const checkForUpdates = trpc["updater.checkForUpdates"].useMutation();
-  const quitAndInstall = trpc["updater.quitAndInstall"].useMutation();
-
-  const [nextVersion, setNextVersion] = useState<string>("");
-
-  useEffect(() => {
-    if (enabled?.data?.enabled) {
-      checkForUpdates.mutate();
-    }
-  }, [checkForUpdates, enabled?.data?.enabled]);
-
-  useEffect(() => {
-    if (currentStatus?.status?.version) {
-      setNextVersion(currentStatus?.status.version);
-    }
-  }, [currentStatus?.status?.version]);
-
-  const getText = () => {
-    switch (currentStatus?.status?.status) {
-      case "checking-for-update":
-      case "update-available": {
-        return "Checking for updates...";
-      }
-      case "download-progress": {
-        return "Downloading V" + nextVersion + ":";
-      }
-      case "error": {
-        return "Failed to update Wing Console";
-      }
-      default: {
-        return "";
-      }
-    }
-  };
-
-  // updater is not available
-  if (!enabled.data?.enabled) {
-    return <></>;
-  }
-
-  return (
-    <div className={classNames("flex space-x-1 min-w-[3rem]", theme.text2)}>
-      <span
-        className={classNames([
-          currentStatus?.status?.status === "error"
-            ? "text-red-500"
-            : theme.text2,
-          "flex",
-        ])}
-      >
-        {getText()}
-        {currentStatus?.status?.status === "update-downloaded" && (
-          <ToolbarButton
-            onClick={() => {
-              quitAndInstall.mutate();
-            }}
-          >
-            <span>Restart to update</span>
-            <ArrowPathIcon className="w-4 h-4" />
-          </ToolbarButton>
-        )}
-      </span>
-      {currentStatus?.status?.progress &&
-      currentStatus?.status?.status === "download-progress" ? (
-        <div className={classNames(["self-center flex w-24", theme.text2])}>
-          <ProgressBar
-            progress={currentStatus?.status?.progress || 0}
-            size="sm"
-          />
-        </div>
-      ) : undefined}
-    </div>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/features/blue-screen-of-death/blue-screen-of-death.tsx b/apps/wing-console/console/ui/src/features/blue-screen-of-death/blue-screen-of-death.tsx
new file mode 100644
index 00000000000..45d6adb1738
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/blue-screen-of-death/blue-screen-of-death.tsx
@@ -0,0 +1,78 @@
+import { useNotifications } from "@wingconsole/design-system";
+import classNames from "classnames";
+import { memo, useCallback, useEffect, useMemo, useState } from "react";
+
+import { trpc } from "../../trpc.js";
+import { OpenFileInEditorButton, createHtmlLink } from "../../use-file-link.js";
+
+export const BlueScreenOfDeath = memo(
+  ({ displayLinks = true }: { displayLinks?: boolean }) => {
+    const errorQuery = trpc["app.error"].useQuery();
+
+    const error = useMemo(() => {
+      return errorQuery.data ?? "";
+    }, [errorQuery.data]);
+
+    const [formattedPathsError, setFormattedPathsError] = useState("");
+    const { showNotification } = useNotifications();
+
+    const copyError = useCallback(() => {
+      navigator.clipboard.writeText(error);
+      showNotification("Error copied to clipboard", { type: "success" });
+    }, [error, showNotification]);
+
+    useEffect(() => {
+      if (!displayLinks) {
+        setFormattedPathsError(error);
+        return;
+      }
+      setFormattedPathsError(
+        createHtmlLink(
+          error,
+          "underline text-slate-300 hover:text-slate-400 cursor-pointer",
+          true,
+        ),
+      );
+    }, [error, displayLinks]);
+
+    return (
+      <div
+        className={classNames(
+          "absolute h-full w-full z-50 px-10 py-10 bg-[#004295] overflow-auto flex justify-center items-center",
+        )}
+        data-testid="blue-screen-of-death"
+      >
+        <div className="h-full w-full text-md font-share-tech text-white max-w-7xl break-words space-y-4">
+          <div className="flex items-center gap-x-4">
+            <button
+              onClick={copyError}
+              className={classNames(
+                "text-center px-4 py-1 transition-all",
+                "bg-slate-400 hover:bg-slate-450 px-4 text-[#004295]",
+              )}
+            >
+              Copy
+            </button>
+          </div>
+          <div className="space-y-4">
+            <OpenFileInEditorButton className="cursor-text select-text">
+              <div className="py-4">
+                <span
+                  className="outline-none whitespace-pre-wrap"
+                  dangerouslySetInnerHTML={{ __html: formattedPathsError }}
+                />
+              </div>
+            </OpenFileInEditorButton>
+
+            {displayLinks && (
+              <div className="w-full text-center pb-4">
+                Click on any error reference to navigate to your IDE{" "}
+                <span className="animate-ping">_</span>
+              </div>
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/bucket-interaction-view.tsx b/apps/wing-console/console/ui/src/features/bucket-interaction-view.tsx
deleted file mode 100644
index b6983d9772d..00000000000
--- a/apps/wing-console/console/ui/src/features/bucket-interaction-view.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { TreeEntry } from "@wingconsole/design-system";
-import { FormEventHandler, memo, useCallback, useMemo, useState } from "react";
-
-import { useBucket } from "../services/use-bucket.js";
-import { BucketInteraction } from "../ui/bucket-interaction.js";
-
-export interface BucketViewProps {
-  resourcePath: string;
-}
-
-export const BucketInteractionView = memo(
-  ({ resourcePath }: BucketViewProps) => {
-    const [entries, setEntries] = useState<TreeEntry[]>([]);
-    const [selectedEntries, setSelectedEntries] = useState<string[]>([]);
-    const [currentFile, setCurrentFile] = useState<string>();
-
-    const onFileListChange = useCallback((files: string[]) => {
-      setEntries(
-        files.map((file) => ({
-          id: file,
-          name: file,
-        })) ?? [],
-      );
-      setCurrentFile(undefined);
-      setSelectedEntries([]);
-    }, []);
-
-    const {
-      uploadFiles,
-      downloadFile,
-      downloadFiles,
-      deleteFile,
-      currentFileContent,
-      isLoading,
-    } = useBucket({
-      resourcePath,
-      onFileListChange,
-      currentFile,
-    });
-
-    const [fileInputId, setFileInputId] = useState(new Date().toString());
-
-    const uploadSelectedEntries: FormEventHandler<HTMLInputElement> =
-      useCallback(
-        async (event) => {
-          await uploadFiles(event.currentTarget.files ?? new FileList());
-          // force re-render to avoid problems uploading the same file twice
-          setFileInputId(new Date().toString());
-        },
-        [uploadFiles],
-      );
-
-    const deleteSelectedEntries = useCallback(async () => {
-      if (currentFile) {
-        setCurrentFile(undefined);
-      }
-      await deleteFile(selectedEntries);
-      setSelectedEntries([]);
-    }, [currentFile, deleteFile, selectedEntries]);
-
-    const downloadSelectedEntries = useCallback(async () => {
-      await downloadFiles(selectedEntries);
-      setSelectedEntries([]);
-    }, [selectedEntries, downloadFiles]);
-
-    const downloadCurrentFile = useCallback(async () => {
-      if (!currentFile || !currentFileContent) {
-        return;
-      }
-      downloadFile(currentFile, currentFileContent);
-    }, [currentFile, currentFileContent, downloadFile]);
-
-    return (
-      <BucketInteraction
-        isLoading={isLoading}
-        entries={entries}
-        selectedEntries={selectedEntries}
-        selectedFile={currentFile ?? ""}
-        selectedFileData={currentFileContent}
-        fileInputId={fileInputId}
-        onDeleteSelectedFilesClick={deleteSelectedEntries}
-        onDownloadSelectedFilesClick={downloadSelectedEntries}
-        onDownloadCurrentFileClick={downloadCurrentFile}
-        onUploadSelectedFilesClick={uploadSelectedEntries}
-        onSelectedEntriesChange={setSelectedEntries}
-        onCurrentEntryChange={setCurrentFile}
-      />
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/features/console-logs-filters.tsx b/apps/wing-console/console/ui/src/features/console-logs-filters.tsx
deleted file mode 100644
index 8fd61d02afc..00000000000
--- a/apps/wing-console/console/ui/src/features/console-logs-filters.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { MagnifyingGlassIcon, NoSymbolIcon } from "@heroicons/react/24/outline";
-import { Button, Input, Listbox } from "@wingconsole/design-system";
-import { LogLevel } from "@wingconsole/server";
-import debounce from "lodash.debounce";
-import { memo, useCallback, useEffect, useState } from "react";
-
-const logLevels = ["verbose", "info", "warn", "error"] as const;
-
-const logLevelNames = {
-  verbose: "Verbose",
-  info: "Info",
-  warn: "Warnings",
-  error: "Errors",
-} as const;
-
-export interface ConsoleLogsFiltersProps {
-  selectedLogTypeFilters: LogLevel[];
-  setSelectedLogTypeFilters: (types: LogLevel[]) => void;
-  clearLogs: () => void;
-  isLoading: boolean;
-  onSearch: (search: string) => void;
-}
-
-export const ConsoleLogsFilters = memo(
-  ({
-    selectedLogTypeFilters,
-    setSelectedLogTypeFilters,
-    clearLogs,
-    isLoading,
-    onSearch,
-  }: ConsoleLogsFiltersProps) => {
-    const [searchText, setSearchText] = useState("");
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    const debouncedOnSearch = useCallback(debounce(onSearch, 300), [onSearch]);
-    useEffect(() => {
-      debouncedOnSearch(searchText);
-    }, [debouncedOnSearch, searchText]);
-
-    const [defaultSelection, setDefaultSelection] = useState<string[]>();
-    const [combinationName, setCombinationName] = useState<string>();
-
-    useEffect(() => {
-      if (selectedLogTypeFilters.length === 4) {
-        setCombinationName("All levels");
-      } else if (
-        selectedLogTypeFilters.length === 3 &&
-        selectedLogTypeFilters.includes("verbose") === false
-      ) {
-        setCombinationName("Default levels");
-      } else if (selectedLogTypeFilters.length === 0) {
-        setCombinationName("Hide all");
-      } else if (
-        selectedLogTypeFilters.length === 1 &&
-        selectedLogTypeFilters[0]
-      ) {
-        setCombinationName(`${logLevelNames[selectedLogTypeFilters[0]]} only`);
-      } else {
-        setCombinationName("Custom levels");
-      }
-    }, [selectedLogTypeFilters]);
-
-    useEffect(() => {
-      setDefaultSelection(selectedLogTypeFilters);
-    }, [selectedLogTypeFilters]);
-
-    return (
-      <div className="flex px-2 space-x-2 pt-1">
-        <Button
-          icon={NoSymbolIcon}
-          className="px-1.5"
-          onClick={clearLogs}
-          title="Clear logs"
-        />
-
-        <Input
-          value={searchText}
-          className="min-w-[14rem]"
-          leftIcon={MagnifyingGlassIcon}
-          type="text"
-          placeholder="Filter..."
-          onChange={(event) => setSearchText(event.target.value)}
-        />
-
-        <Listbox
-          label={combinationName}
-          items={logLevels.map((type) => ({
-            value: type,
-            label: logLevelNames[type],
-          }))}
-          selected={selectedLogTypeFilters}
-          onChange={setSelectedLogTypeFilters as any}
-          defaultSelection={defaultSelection}
-        />
-      </div>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/features/dynamodb-table-interaction-view.tsx b/apps/wing-console/console/ui/src/features/dynamodb-table-interaction-view.tsx
deleted file mode 100644
index ce89f955aa8..00000000000
--- a/apps/wing-console/console/ui/src/features/dynamodb-table-interaction-view.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { useNotifications, Attribute } from "@wingconsole/design-system";
-import { memo, useCallback, useEffect, useState } from "react";
-
-import { useDynamodbTable } from "../services/use-dynamodb-table.js";
-import {
-  DynamodbTableInteraction,
-  RawRow,
-} from "../ui/dynamodb-table-interaction.js";
-
-export interface DynamodbTableInteractionViewProps {
-  resourcePath: string;
-}
-
-export const DynamodbTableInteractionView = memo(
-  ({ resourcePath }: DynamodbTableInteractionViewProps) => {
-    const notifications = useNotifications();
-
-    const showError = useCallback(
-      (error: string) => {
-        notifications.showNotification("Error", {
-          body: error,
-          type: "error",
-        });
-      },
-      [notifications],
-    );
-
-    const { table, removeRow, addRow, loading } = useDynamodbTable({
-      resourcePath,
-    });
-
-    const [rows, setRows] = useState<{ data: {}; error: string }[]>([]);
-
-    const onAddRow = useCallback(
-      async (data: RawRow) => {
-        try {
-          if (data.error) {
-            showError(`Row error: ${data.error}`);
-            return;
-          }
-
-          const row = JSON.parse(data.data);
-          await addRow(row);
-        } catch (error: any) {
-          showError(`Failed to add row: ${error.message}`);
-        }
-      },
-      [addRow, showError],
-    );
-
-    const onRemoveRow = useCallback(
-      async (index: number) => {
-        await removeRow(index);
-      },
-      [removeRow],
-    );
-
-    useEffect(() => {
-      if (table.data?.rows) {
-        const rows = table.data.rows.items.map((row) => {
-          return {
-            data: row,
-            error: "",
-          };
-        });
-        setRows(rows);
-      }
-    }, [table.data?.rows]);
-
-    return (
-      <div className="h-full flex-1 flex flex-col text-sm">
-        <div className="flex flex-col gap-2">
-          <div className="flex flex-col space-y-1">
-            <div className="w-full">
-              <Attribute name="Name" value={table.data?.name} noLeftPadding />
-            </div>
-
-            {table.data && (
-              <div className="flex items-center gap-2 justify-end">
-                <DynamodbTableInteraction
-                  rows={rows}
-                  hashKey={table.data.hashKey}
-                  rangeKey={table.data.rangeKey}
-                  onAddRow={onAddRow}
-                  onRemoveRow={onRemoveRow}
-                  loading={loading}
-                />
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/features/endpoints-pane/endpoint-item.ts b/apps/wing-console/console/ui/src/features/endpoints-pane/endpoint-item.ts
new file mode 100644
index 00000000000..9bc7a5f0cee
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/endpoints-pane/endpoint-item.ts
@@ -0,0 +1,10 @@
+export type EndpointExposeStatus = "connected" | "disconnected" | "connecting";
+
+export interface EndpointItem {
+  id: string;
+  label: string;
+  url: string;
+  localUrl: string;
+  browserSupport: boolean;
+  exposeStatus: EndpointExposeStatus;
+}
diff --git a/apps/wing-console/console/ui/src/features/endpoints-pane/endpoint-tree.tsx b/apps/wing-console/console/ui/src/features/endpoints-pane/endpoint-tree.tsx
new file mode 100644
index 00000000000..41c26ae0c76
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/endpoints-pane/endpoint-tree.tsx
@@ -0,0 +1,122 @@
+import {
+  GlobeAltIcon,
+  LinkIcon,
+  ShareIcon,
+  EyeSlashIcon,
+} from "@heroicons/react/24/outline";
+import {
+  ScrollableArea,
+  Toolbar,
+  TreeItem,
+  TreeView,
+  useTheme,
+} from "@wingconsole/design-system";
+import classNames from "classnames";
+
+import type { EndpointItem } from "./endpoint-item.js";
+import { NoEndpoints } from "./no-endpoints.js";
+
+export interface EndpointTreeProps {
+  endpointList: EndpointItem[];
+  exposeEndpoint: (resourcePath: string) => void;
+  hideEndpoint: (resourcePath: string) => void;
+}
+
+export const EndpointTree = ({
+  endpointList,
+  exposeEndpoint,
+  hideEndpoint,
+}: EndpointTreeProps) => {
+  const { theme } = useTheme();
+
+  return (
+    <div
+      className={classNames("w-full h-full flex flex-col", theme.bg3)}
+      data-testid="endpoint-tree-menu"
+    >
+      <Toolbar title="Endpoints"></Toolbar>
+
+      <div className="relative grow">
+        <div className="absolute inset-0">
+          <ScrollableArea
+            overflowY
+            className={classNames(
+              "h-full w-full text-sm flex flex-col gap-1",
+              theme.bg3,
+              theme.text2,
+            )}
+          >
+            <div className="flex flex-col">
+              {endpointList.length === 0 && <NoEndpoints />}
+              <TreeView>
+                {endpointList.map((endpoint) => (
+                  <TreeItem
+                    key={endpoint.id}
+                    itemId={endpoint.id}
+                    selectable={false}
+                    label={
+                      <a
+                        href={endpoint.url}
+                        target="_blank"
+                        rel="noreferrer"
+                        className="hover:underline text-sky-500 hover:text-sky-600"
+                      >
+                        {endpoint.label}
+                      </a>
+                    }
+                    title={endpoint.url}
+                    icon={
+                      <>
+                        {endpoint.browserSupport && (
+                          <GlobeAltIcon
+                            className={classNames("w-4 h-4", theme.text1)}
+                          />
+                        )}
+                        {!endpoint.browserSupport && (
+                          <LinkIcon
+                            className={classNames("w-4 h-4", theme.text1)}
+                          />
+                        )}
+                      </>
+                    }
+                    secondaryLabel={
+                      <>
+                        {endpoint.exposeStatus !== "connected" && (
+                          <ShareIcon
+                            className={classNames(
+                              "w-4 h-4",
+                              theme.text1,
+                              endpoint.exposeStatus === "connecting"
+                                ? "cursor-not-allowed"
+                                : "cursor-pointer",
+                            )}
+                            title="Open a tunnel for this endpoint"
+                            onClick={() => {
+                              exposeEndpoint(endpoint.id);
+                            }}
+                          />
+                        )}
+                        {endpoint.exposeStatus === "connected" && (
+                          <EyeSlashIcon
+                            className={classNames(
+                              "w-4 h-4 cursor-pointer",
+                              theme.text1,
+                            )}
+                            title="Close the tunnel for this endpoint"
+                            onClick={() => {
+                              hideEndpoint(endpoint.id);
+                            }}
+                          />
+                        )}
+                      </>
+                    }
+                  />
+                ))}
+              </TreeView>
+            </div>
+          </ScrollableArea>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/endpoints-pane/endpoints-tree-view.tsx b/apps/wing-console/console/ui/src/features/endpoints-pane/endpoints-tree-view.tsx
new file mode 100644
index 00000000000..4b635b0f700
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/endpoints-pane/endpoints-tree-view.tsx
@@ -0,0 +1,17 @@
+import { memo } from "react";
+
+import { useEndpoints } from "../inspector-pane/resource-panes/use-endpoints.js";
+
+import { EndpointTree } from "./endpoint-tree.js";
+
+export const EndpointsTreeView = memo(() => {
+  const { endpointList, exposeEndpoint, hideEndpoint } = useEndpoints();
+
+  return (
+    <EndpointTree
+      endpointList={endpointList}
+      exposeEndpoint={exposeEndpoint}
+      hideEndpoint={hideEndpoint}
+    />
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/endpoints-pane/no-endpoints.tsx b/apps/wing-console/console/ui/src/features/endpoints-pane/no-endpoints.tsx
new file mode 100644
index 00000000000..34d46f1bcd4
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/endpoints-pane/no-endpoints.tsx
@@ -0,0 +1,27 @@
+import { useTheme } from "@wingconsole/design-system";
+import classNames from "classnames";
+
+export const NoEndpoints = () => {
+  const { theme } = useTheme();
+  return (
+    <div
+      className={classNames(
+        theme.text2,
+        "flex flex-col text-xs px-3 py-2 items-center",
+      )}
+    >
+      <div>There are no endpoints.</div>
+      <div>
+        <span>Learn how to add endpoints </span>
+        <a
+          className="text-sky-500 hover:text-sky-600"
+          href="https://www.winglang.io/docs/standard-library/cloud/endpoint"
+          target="_blank"
+          rel="noreferrer"
+        >
+          here.
+        </a>
+      </div>
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/assert.ts b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/assert.ts
new file mode 100644
index 00000000000..893d04210eb
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/assert.ts
@@ -0,0 +1,5 @@
+export function assert(value: unknown, message?: string): asserts value {
+  if (!value) {
+    throw new Error(message ?? "Assertion failed");
+  }
+}
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph-generator.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph-generator.tsx
new file mode 100644
index 00000000000..46e8e8b020e
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph-generator.tsx
@@ -0,0 +1,241 @@
+import type { ElkExtendedEdge, ElkNode, ElkPort } from "elkjs";
+import ELK from "elkjs/lib/elk.bundled.js";
+import {
+  type FunctionComponent,
+  type PropsWithChildren,
+  createContext,
+  useContext,
+  useEffect,
+  useState,
+  useRef,
+  memo,
+  createElement,
+  type RefObject,
+} from "react";
+
+import { assert } from "./assert.js";
+import {
+  NodeChildrenContext,
+  type NodeChildrenProps,
+} from "./node-children.js";
+import { NodeContext, type NodeProps } from "./node.js";
+import { PortContext, type PortProps } from "./port.js";
+import type { ElkOptions, IntrinsicElements } from "./types.js";
+
+const ElkNodeContext = createContext<ElkNode>({
+  id: "",
+});
+
+const NodeRefContext = createContext<RefObject<Element> | undefined>(undefined);
+
+const NodeComponent = <K extends keyof IntrinsicElements = "div">({
+  elk,
+  as,
+  children,
+  ...props
+}: NodeProps<K>) => {
+  const [node] = useState<ElkNode>(() => ({
+    ...elk,
+  }));
+
+  const parent = useContext(ElkNodeContext);
+  useEffect(() => {
+    parent.children =
+      parent.children?.filter((child) => child.id !== elk.id) ?? [];
+    parent.children.push(node);
+    return () => {
+      parent.children =
+        parent.children?.filter((child) => child.id !== elk.id) ?? [];
+    };
+  });
+
+  const ref = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    const rect = ref.current?.getBoundingClientRect();
+    node.layoutOptions = {
+      ...node.layoutOptions,
+      "elk.nodeSize.constraints": "MINIMUM_SIZE",
+      "elk.nodeSize.minimum": `[${rect?.width ?? 0}, ${rect?.height ?? 0}]`,
+    };
+  });
+
+  return createElement(
+    as ?? "div",
+    { ...props, style: { ...props.style, position: "relative" }, ref },
+    <ElkNodeContext.Provider value={node}>
+      <NodeRefContext.Provider value={ref}>{children}</NodeRefContext.Provider>
+    </ElkNodeContext.Provider>,
+  );
+};
+
+const NodeChildrenComponent = <K extends keyof IntrinsicElements = "div">({
+  as,
+  children,
+  ...props
+}: NodeChildrenProps<K>) => {
+  const node = useContext(ElkNodeContext);
+
+  const nodeRef = useContext(NodeRefContext);
+  const ref = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    const nodeRect = nodeRef?.current?.getBoundingClientRect();
+    assert(nodeRect);
+    const childrenRect = ref.current?.getBoundingClientRect();
+    assert(childrenRect);
+    const padding = {
+      top: childrenRect.top - nodeRect.top,
+      left: childrenRect.left - nodeRect.left,
+      bottom: nodeRect.bottom - childrenRect.bottom,
+      right: nodeRect.right - childrenRect.right,
+    };
+    node.layoutOptions = {
+      ...node.layoutOptions,
+      "elk.padding": `[top=${padding.top},left=${padding.left},bottom=${padding.bottom},right=${padding.right}]`,
+    };
+  });
+
+  return createElement(as ?? "div", { ...props, ref }, children);
+};
+
+const PortComponent = <K extends keyof IntrinsicElements = "div">({
+  elk,
+  as,
+  children,
+  ...props
+}: PortProps<K>) => {
+  const [port] = useState<ElkPort>(() => ({
+    ...elk,
+  }));
+
+  const parent = useContext(ElkNodeContext);
+  useEffect(() => {
+    parent.ports = parent.ports?.filter((child) => child.id !== elk.id) ?? [];
+    parent.ports.push(port);
+    return () => {
+      parent.ports = parent.ports?.filter((child) => child.id !== elk.id) ?? [];
+    };
+  });
+
+  const ref = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    const rect = ref.current?.getBoundingClientRect();
+    port.layoutOptions = {
+      ...port.layoutOptions,
+      "elk.nodeSize.constraints": "MINIMUM_SIZE",
+      "elk.nodeSize.minimum": `[${rect?.width ?? 0}, ${rect?.height ?? 0}]`,
+    };
+  });
+
+  return createElement(
+    as ?? "div",
+    { ...props, style: { ...props.style, position: "absolute" }, ref },
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "space-around",
+      }}
+    >
+      <div style={{ position: "absolute" }}>{children}</div>
+    </div>,
+  );
+};
+
+export interface GraphGeneratorProps {
+  elk: ElkOptions;
+  edges?: ElkExtendedEdge[];
+  onGraph?: (graph: ElkNode) => void;
+}
+
+export const GraphGenerator: FunctionComponent<
+  PropsWithChildren<GraphGeneratorProps>
+> = memo(({ onGraph, ...props }) => {
+  const [root] = useState<ElkNode>(() => ({
+    ...props.elk,
+  }));
+
+  const [jsonGraph, setJsonGraph] = useState<string>();
+  useEffect(() => {
+    const nodeMap = new Map<string, ElkNode>();
+    const processNode = (node: ElkNode) => {
+      nodeMap.set(node.id, node);
+      for (const port of node.ports ?? []) {
+        nodeMap.set(port.id, port);
+      }
+      for (const child of node.children ?? []) {
+        processNode(child);
+      }
+    };
+    processNode(root);
+    const edges = (props.edges ?? []).filter((edge) => {
+      return (
+        edge.sources.every((source) => {
+          const exists = nodeMap.has(source);
+          if (!exists) {
+            console.warn(`Edge source ${source} does not exist in node map`);
+          }
+          return exists;
+        }) &&
+        edge.targets.every((target) => {
+          const exists = nodeMap.has(target);
+          if (!exists) {
+            console.warn(`Edge target ${target} does not exist in node map`);
+          }
+          return exists;
+        })
+      );
+    });
+
+    setJsonGraph(() => {
+      // Remove $H properties from JSON and sort children by id.
+      const processNode = (node: ElkNode) => {
+        delete (node as any).$H;
+        const children = node.children ?? [];
+        node.children = children.sort((a, b) => a.id.localeCompare(b.id));
+        for (const child of node.children) {
+          processNode(child);
+        }
+      };
+
+      processNode(root);
+
+      return JSON.stringify({ ...root, edges });
+    });
+  }, [root, props.edges]);
+
+  useEffect(() => {
+    if (!jsonGraph) {
+      return;
+    }
+
+    let abort = false;
+
+    const elk = new ELK();
+
+    void elk
+      .layout(JSON.parse(jsonGraph))
+      .then((graph) => {
+        if (abort) {
+          return;
+        }
+
+        onGraph?.(graph);
+      })
+      .catch((error) => console.error("elk layout error:", error));
+    return () => {
+      abort = true;
+    };
+  }, [jsonGraph, onGraph]);
+
+  return (
+    <ElkNodeContext.Provider value={root}>
+      <NodeContext.Provider value={NodeComponent}>
+        <NodeChildrenContext.Provider value={NodeChildrenComponent}>
+          <PortContext.Provider value={PortComponent}>
+            {props.children}
+          </PortContext.Provider>
+        </NodeChildrenContext.Provider>
+      </NodeContext.Provider>
+    </ElkNodeContext.Provider>
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph-renderer.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph-renderer.tsx
new file mode 100644
index 00000000000..1822773e1d5
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph-renderer.tsx
@@ -0,0 +1,222 @@
+import type { ElkNode } from "elkjs";
+import {
+  type FunctionComponent,
+  type PropsWithChildren,
+  createContext,
+  useContext,
+  memo,
+  createElement,
+  useMemo,
+  useEffect,
+  useRef,
+  useState,
+} from "react";
+import { createPortal } from "react-dom";
+
+import { assert } from "./assert.js";
+import {
+  NodeChildrenContext,
+  type NodeChildrenProps,
+} from "./node-children.js";
+import { NodeContext, type NodeProps } from "./node.js";
+import { PortContext, type PortProps } from "./port.js";
+import type { IntrinsicElements, EdgeComponent } from "./types.js";
+
+const DepthContext = createContext<number>(0);
+
+const ElkNodeContext = createContext<ElkNode>({
+  id: "",
+});
+
+const OriginsContext = createContext<Map<string, { x: number; y: number }>>(
+  new Map(),
+);
+
+// eslint-disable-next-line unicorn/no-null
+const PortalContext = createContext<HTMLElement | null>(null);
+
+const NodeComponent = <K extends keyof IntrinsicElements = "div">({
+  elk,
+  as,
+  children,
+  ...props
+}: NodeProps<K>) => {
+  const portal = useContext(PortalContext);
+  assert(portal);
+
+  const depth = useContext(DepthContext);
+
+  const parent = useContext(ElkNodeContext);
+  const node = useMemo(
+    () => parent.children?.find((child) => child.id === elk.id),
+    [elk.id, parent.children],
+  );
+
+  const origins = useContext(OriginsContext);
+  const origin = origins.get(elk.id);
+
+  return createPortal(
+    createElement(
+      as ?? "div",
+      {
+        ...props,
+        style: {
+          ...props.style,
+          position: "absolute",
+          top: `${origin?.y ?? 0}px`,
+          left: `${origin?.x ?? 0}px`,
+          width: `${node?.width ?? 0}px`,
+          height: `${node?.height ?? 0}px`,
+          zIndex: depth,
+        },
+      },
+      node ? (
+        <DepthContext.Provider value={depth + 1}>
+          <ElkNodeContext.Provider key="children" value={node}>
+            {children}
+          </ElkNodeContext.Provider>
+        </DepthContext.Provider>
+      ) : (
+        <></>
+      ),
+    ),
+    portal,
+  );
+};
+
+const NodeChildrenComponent = <K extends keyof IntrinsicElements = "div">({
+  as,
+  children,
+  ...props
+}: NodeChildrenProps<K>) => {
+  return createElement(as ?? "div", props, children);
+};
+
+const PortComponent = <K extends keyof IntrinsicElements = "div">({
+  elk,
+  as,
+  children,
+  ...props
+}: PortProps<K>) => {
+  const node = useContext(ElkNodeContext);
+  const port = useMemo(
+    () => node.ports?.find((port) => port.id === elk.id),
+    [elk.id, node.ports],
+  );
+  assert(port);
+
+  return createElement(
+    as ?? "div",
+    {
+      ...props,
+      style: {
+        ...props.style,
+        position: "absolute",
+        top: `${port.y ?? 0}px`,
+        left: `${port.x ?? 0}px`,
+      },
+    },
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "space-around",
+      }}
+    >
+      <div style={{ position: "absolute" }}>{children}</div>
+    </div>,
+  );
+};
+
+const DefaultEdge: EdgeComponent = memo(
+  ({ edge, offsetX = 0, offsetY = 0 }) => {
+    const d = useMemo(() => {
+      return edge.sections
+        ?.map((section) => {
+          const points =
+            [...(section.bendPoints ?? []), section.endPoint]
+              ?.map((point) => `L${point.x},${point.y}`)
+              .join(" ") ?? "";
+
+          return `M${section.startPoint.x},${section.startPoint.y} ${points}`;
+        })
+        .join(" ");
+    }, [edge.sections]);
+
+    return (
+      <g transform={`translate(${offsetX} ${offsetY})`}>
+        <path d={d} fill="none" stroke="black" />
+      </g>
+    );
+  },
+);
+
+export interface GraphRendererProps {
+  graph: ElkNode;
+  edgeComponent?: EdgeComponent;
+}
+
+export const GraphRenderer: FunctionComponent<
+  PropsWithChildren<GraphRendererProps>
+> = memo((props) => {
+  const Edge = props.edgeComponent ?? DefaultEdge;
+
+  const origins = useMemo(() => {
+    const origins = new Map<string, { x: number; y: number }>();
+    const mapNode = (node: ElkNode, offsetX: number, offsetY: number) => {
+      const x = offsetX + (node.x ?? 0);
+      const y = offsetY + (node.y ?? 0);
+      origins.set(node.id, { x, y });
+      for (const child of Object.values(node.children ?? {})) {
+        mapNode(child, x, y);
+      }
+    };
+    mapNode(props.graph, 0, 0);
+    return origins;
+  }, [props.graph]);
+
+  const portalTarget = useRef<HTMLDivElement | null>(null);
+  const [portal, setPortal] = useState<HTMLDivElement | undefined>();
+  useEffect(() => {
+    setPortal(portalTarget.current ?? undefined);
+  }, []);
+
+  return (
+    <div
+      style={{
+        position: "relative",
+        width: `${props.graph.width ?? 0}px`,
+        height: `${props.graph.height ?? 0}px`,
+      }}
+    >
+      {props.graph.edges?.map((edge) => (
+        <Edge
+          key={edge.id}
+          edge={edge}
+          offsetX={origins.get((edge as any).container)?.x}
+          offsetY={origins.get((edge as any).container)?.y}
+          graphWidth={props.graph.width!}
+          graphHeight={props.graph.height!}
+        />
+      ))}
+
+      <div ref={portalTarget} />
+
+      {portal && (
+        <OriginsContext.Provider value={origins}>
+          <ElkNodeContext.Provider value={props.graph}>
+            <PortalContext.Provider value={portal}>
+              <NodeContext.Provider value={NodeComponent}>
+                <NodeChildrenContext.Provider value={NodeChildrenComponent}>
+                  <PortContext.Provider value={PortComponent}>
+                    {props.children}
+                  </PortContext.Provider>
+                </NodeChildrenContext.Provider>
+              </NodeContext.Provider>
+            </PortalContext.Provider>
+          </ElkNodeContext.Provider>
+        </OriginsContext.Provider>
+      )}
+    </div>
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph.tsx
new file mode 100644
index 00000000000..2120c8fef70
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/graph.tsx
@@ -0,0 +1,88 @@
+import type { ElkExtendedEdge, ElkNode } from "elkjs";
+import {
+  memo,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type DetailedHTMLProps,
+  type FunctionComponent,
+  type HTMLAttributes,
+  type PropsWithChildren,
+} from "react";
+import { createPortal } from "react-dom";
+
+import { MapBackground } from "../map-background.js";
+import type { ZoomPaneRef } from "../zoom-pane.js";
+import { ZoomPane } from "../zoom-pane.js";
+
+import { GraphGenerator } from "./graph-generator.js";
+import { GraphRenderer } from "./graph-renderer.js";
+import type { EdgeComponent, ElkOptions } from "./types.js";
+
+export interface GraphProps
+  extends DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
+  elk: ElkOptions;
+  edges?: ElkExtendedEdge[];
+  edgeComponent?: EdgeComponent;
+}
+
+export const Graph: FunctionComponent<PropsWithChildren<GraphProps>> = memo(
+  (props) => {
+    const { elk, edges, edgeComponent, ...divProps } = props;
+
+    const [graph, setGraph] = useState<ElkNode>();
+
+    const zoomPaneRef = useRef<ZoomPaneRef>(null);
+
+    const mapSize = useMemo(() => {
+      if (!graph) {
+        return;
+      }
+
+      return {
+        width: graph.width!,
+        height: graph.height!,
+      };
+    }, [graph]);
+
+    useEffect(() => {
+      zoomPaneRef.current?.zoomToFit();
+    }, [graph]);
+
+    const mapBackgroundRef = useRef<HTMLDivElement>(null);
+
+    return (
+      <>
+        {createPortal(
+          <div className="fixed pointer-events-none invisible size-0">
+            <GraphGenerator elk={elk} edges={edges} onGraph={setGraph}>
+              {props.children}
+            </GraphGenerator>
+          </div>,
+          document.body,
+        )}
+
+        <div ref={mapBackgroundRef}></div>
+
+        <ZoomPane
+          ref={zoomPaneRef}
+          boundingBox={mapSize}
+          className="w-full h-full"
+          data-testid="map-pane"
+        >
+          {mapBackgroundRef.current &&
+            createPortal(<MapBackground hideDots />, mapBackgroundRef.current)}
+
+          <div {...divProps}>
+            {graph && (
+              <GraphRenderer graph={graph} edgeComponent={edgeComponent}>
+                {props.children}
+              </GraphRenderer>
+            )}
+          </div>
+        </ZoomPane>
+      </>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/node-children.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/node-children.tsx
new file mode 100644
index 00000000000..522e23ce852
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/node-children.tsx
@@ -0,0 +1,34 @@
+import {
+  type FunctionComponent,
+  useContext,
+  createContext,
+  type ReactNode,
+  createElement,
+} from "react";
+
+import type { IntrinsicElements } from "./types.js";
+
+export type NodeChildrenProps<K extends keyof IntrinsicElements> = {
+  as?: K;
+  children?: ReactNode;
+} & IntrinsicElements[K];
+
+const DefaultComponent = <K extends keyof IntrinsicElements = "div">({
+  as,
+  children,
+  ...props
+}: NodeChildrenProps<K>) => {
+  return createElement(as ?? "div", props, children);
+};
+
+export const NodeChildrenContext =
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  createContext<FunctionComponent<NodeChildrenProps<any>>>(DefaultComponent);
+
+export const NodeChildren = <K extends keyof IntrinsicElements = "div">({
+  children,
+  ...props
+}: NodeChildrenProps<K>) => {
+  const Component = useContext(NodeChildrenContext);
+  return createElement(Component, props, children);
+};
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/node.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/node.tsx
new file mode 100644
index 00000000000..990a7266e1d
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/node.tsx
@@ -0,0 +1,35 @@
+import {
+  type FunctionComponent,
+  useContext,
+  createContext,
+  type ReactNode,
+  createElement,
+} from "react";
+
+import type { ElkOptions, IntrinsicElements } from "./types.js";
+
+export type NodeProps<K extends keyof IntrinsicElements> = {
+  elk: ElkOptions;
+  as?: K;
+  children?: ReactNode;
+} & IntrinsicElements[K];
+
+const DefaultComponent = <K extends keyof IntrinsicElements = "div">({
+  as,
+  children,
+  ...props
+}: NodeProps<K>) => {
+  return createElement(as ?? "div", props, children);
+};
+
+export const NodeContext =
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  createContext<FunctionComponent<NodeProps<any>>>(DefaultComponent);
+
+export const Node = <K extends keyof IntrinsicElements = "div">({
+  children,
+  ...props
+}: NodeProps<K>) => {
+  const Component = useContext(NodeContext);
+  return createElement(Component, props, children);
+};
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/port.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/port.tsx
new file mode 100644
index 00000000000..202799e391b
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/port.tsx
@@ -0,0 +1,35 @@
+import {
+  useContext,
+  createContext,
+  type ReactNode,
+  createElement,
+  type FunctionComponent,
+} from "react";
+
+import type { ElkOptions, IntrinsicElements } from "./types.js";
+
+export type PortProps<K extends keyof IntrinsicElements> = {
+  elk: ElkOptions;
+  as?: K;
+  children?: ReactNode;
+} & IntrinsicElements[K];
+
+const DefaultComponent = <K extends keyof IntrinsicElements = "div">({
+  as,
+  children,
+  ...props
+}: PortProps<K>) => {
+  return createElement(as ?? "div", props, children);
+};
+
+export const PortContext =
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  createContext<FunctionComponent<PortProps<any>>>(DefaultComponent);
+
+export const Port = <K extends keyof IntrinsicElements = "div">({
+  children,
+  ...props
+}: PortProps<K>) => {
+  const Component = useContext(PortContext);
+  return createElement(Component, props, children);
+};
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/types.ts b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/types.ts
new file mode 100644
index 00000000000..a2c13a7c1c1
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/elk-flow/types.ts
@@ -0,0 +1,22 @@
+import type { ElkExtendedEdge, ElkNode } from "elkjs";
+import type { FunctionComponent } from "react";
+
+// export type IntrinsicElements = JSX.IntrinsicElements;
+export interface IntrinsicElements {
+  div: JSX.IntrinsicElements["div"];
+}
+
+export interface ElkOptions {
+  id: string;
+  layoutOptions?: Record<string, string>;
+}
+
+export interface EdgeComponentProps {
+  edge: ElkExtendedEdge;
+  offsetX?: number;
+  offsetY?: number;
+  graphWidth: number;
+  graphHeight: number;
+}
+
+export type EdgeComponent = FunctionComponent<EdgeComponentProps>;
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/explorer.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/explorer.tsx
new file mode 100644
index 00000000000..a1addffbbb4
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/explorer.tsx
@@ -0,0 +1,34 @@
+import { memo, useCallback, useState } from "react";
+
+import { useSelectionContext } from "../selection-context/selection-context.js";
+
+import { MapView } from "./map-view.js";
+
+export const Explorer = memo(() => {
+  const {
+    selectedItems,
+    setSelectedItems,
+    expand,
+    collapse,
+    expandedItems,
+    selectedEdgeId,
+    setSelectedEdgeId,
+  } = useSelectionContext();
+
+  const setSelectedItemSingle = useCallback(
+    (nodeId: string | undefined) => setSelectedItems(nodeId ? [nodeId] : []),
+    [setSelectedItems],
+  );
+
+  return (
+    <MapView
+      selectedNodeId={selectedItems[0]}
+      onSelectedNodeIdChange={setSelectedItemSingle}
+      selectedEdgeId={selectedEdgeId}
+      onSelectedEdgeIdChange={setSelectedEdgeId}
+      onExpand={expand}
+      onCollapse={collapse}
+      expandedItems={expandedItems}
+    />
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/map-background.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/map-background.tsx
new file mode 100644
index 00000000000..cc6f0c01bd5
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/map-background.tsx
@@ -0,0 +1,49 @@
+import type { FunctionComponent } from "react";
+import { useId } from "react";
+
+import { useZoomPane } from "./zoom-pane.js";
+
+export interface MapBackgroundProps {
+  hideDots?: boolean;
+}
+
+export const MapBackground: FunctionComponent<MapBackgroundProps> = ({
+  hideDots,
+}) => {
+  const { viewTransform } = useZoomPane();
+  const patternSize = 12 * viewTransform.z;
+  const dotSize = 1 * viewTransform.z;
+  const id = useId();
+  return (
+    // Reference: https://github.com/xyflow/xyflow/blob/13897512d3c57e72c2e27b14ffa129412289d948/packages/react/src/additional-components/Background/Background.tsx#L52-L86.
+    <svg className="absolute w-full h-full top-0 left-0 bg-slate-50 dark:bg-slate-600 text-slate-200 dark:text-slate-550">
+      {!hideDots && (
+        <>
+          <pattern
+            id={id}
+            x={(-viewTransform.x * viewTransform.z) % patternSize}
+            y={(-viewTransform.y * viewTransform.z) % patternSize}
+            width={patternSize}
+            height={patternSize}
+            patternUnits="userSpaceOnUse"
+            patternTransform={`translate(-${viewTransform.z},-${viewTransform.z})`}
+          >
+            <circle
+              cx={dotSize}
+              cy={dotSize}
+              r={dotSize}
+              fill="currentColor"
+            ></circle>
+          </pattern>
+          <rect
+            x="0"
+            y="0"
+            width="100%"
+            height="100%"
+            fill={`url(#${id})`}
+          ></rect>
+        </>
+      )}
+    </svg>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/ui/map-controls.stories.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/map-controls.stories.tsx
similarity index 89%
rename from apps/wing-console/console/ui/src/ui/map-controls.stories.tsx
rename to apps/wing-console/console/ui/src/features/explorer-pane/map-controls.stories.tsx
index d7d0ceea868..ae001d5bf50 100644
--- a/apps/wing-console/console/ui/src/ui/map-controls.stories.tsx
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/map-controls.stories.tsx
@@ -1,4 +1,4 @@
-import { ComponentStory, ComponentMeta } from "@storybook/react";
+import type { ComponentStory, ComponentMeta } from "@storybook/react";
 
 import { MapControls } from "./map-controls.js";
 import { ZoomPaneProvider } from "./zoom-pane.js";
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/map-controls.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/map-controls.tsx
new file mode 100644
index 00000000000..c7c30fdb77e
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/map-controls.tsx
@@ -0,0 +1,40 @@
+import {
+  ArrowsPointingOutIcon,
+  MagnifyingGlassMinusIcon,
+  MagnifyingGlassPlusIcon,
+} from "@heroicons/react/24/solid";
+import { Toolbar, ToolbarButton } from "@wingconsole/design-system";
+
+export interface MapControlsProps {
+  onZoomIn?: () => void;
+  onZoomOut?: () => void;
+  onZoomToFit?: () => void;
+}
+
+export const MapControls = ({
+  onZoomIn,
+  onZoomOut,
+  onZoomToFit,
+}: MapControlsProps) => {
+  return (
+    <div className="flex justify-normal items-center">
+      <div className="grow" />
+
+      <div>
+        <Toolbar>
+          <ToolbarButton title="Zoom out" onClick={onZoomOut}>
+            <MagnifyingGlassMinusIcon className="size-4" />
+          </ToolbarButton>
+
+          <ToolbarButton title="Zoom in" onClick={onZoomIn}>
+            <MagnifyingGlassPlusIcon className="size-4" />
+          </ToolbarButton>
+
+          <ToolbarButton title="Zoom to fit" onClick={onZoomToFit}>
+            <ArrowsPointingOutIcon className="size-4" />
+          </ToolbarButton>
+        </Toolbar>
+      </div>
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/map-view.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/map-view.tsx
new file mode 100644
index 00000000000..f2550b41fb7
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/map-view.tsx
@@ -0,0 +1,768 @@
+import { ChevronDownIcon, ChevronRightIcon } from "@heroicons/react/24/outline";
+import {
+  ResourceIcon,
+  SpinnerLoader,
+  useTheme,
+} from "@wingconsole/design-system";
+import type { ConstructTreeNode } from "@winglang/sdk/lib/core/index.js";
+import clsx from "classnames";
+import { type ElkPoint, type LayoutOptions } from "elkjs";
+import type { FunctionComponent, PropsWithChildren } from "react";
+import { memo, useCallback, useMemo } from "react";
+import { useKeyPressEvent } from "react-use";
+
+import { assert } from "./elk-flow/assert.js";
+import { Graph } from "./elk-flow/graph.js";
+import { NodeChildren } from "./elk-flow/node-children.js";
+import { Node } from "./elk-flow/node.js";
+import { Port } from "./elk-flow/port.js";
+import type { EdgeComponent, EdgeComponentProps } from "./elk-flow/types.js";
+import { useMap } from "./use-map.js";
+
+const Z_INDICES = {
+  EDGE: "z-[1000]",
+  EDGE_HIGHLIGHTED: "z-[1001]",
+  EDGE_SELECTED: "z-[1002]",
+  EDGE_HOVERED: "hover:z-[1003]",
+};
+
+const SPACING_BASE_VALUE = 32;
+const PORT_ANCHOR = 0;
+const EDGE_ROUNDED_RADIUS = 10;
+// For more configuration options, refer to: https://eclipse.dev/elk/reference/options.html
+const baseLayoutOptions: LayoutOptions = {
+  "elk.alignment": "CENTER",
+  "elk.hierarchyHandling": "INCLUDE_CHILDREN",
+  "elk.algorithm": "org.eclipse.elk.layered",
+  "elk.layered.spacing.baseValue": `${SPACING_BASE_VALUE}`, // See https://eclipse.dev/elk/reference/options/org-eclipse-elk-layered-spacing-baseValue.html.
+};
+interface WrapperProps {
+  name: string;
+  fqn: string;
+  highlight?: boolean;
+  onClick?: () => void;
+  color?: string;
+  icon?: string;
+  collapsed?: boolean;
+  onCollapse?: (value: boolean) => void;
+}
+
+const Wrapper: FunctionComponent<PropsWithChildren<WrapperProps>> = memo(
+  ({
+    name,
+    fqn,
+    highlight,
+    onClick,
+    collapsed = false,
+    onCollapse = (value: boolean) => {},
+    children,
+    color,
+    icon,
+  }) => {
+    /* eslint-disable jsx-a11y/no-static-element-interactions */
+    /* eslint-disable jsx-a11y/click-events-have-key-events */
+    return (
+      <div
+        className={clsx(
+          "w-full h-full",
+          "rounded-lg",
+          "bg-white dark:bg-slate-700",
+          highlight && "bg-sky-50 dark:bg-sky-900",
+          "border",
+          "outline outline-0 outline-sky-200/50 dark:outline-sky-500/50",
+          !highlight && "border-slate-200 dark:border-slate-800",
+          highlight && "outline-4 border-sky-400 dark:border-sky-500",
+          "shadow",
+          "transition-all",
+          "cursor-pointer",
+        )}
+        onClick={(event) => {
+          event.stopPropagation();
+          onClick?.();
+        }}
+      >
+        <div
+          className={clsx(
+            "px-2.5 py-1 flex items-center gap-1.5",
+            "border-b border-slate-200 dark:border-slate-800",
+            "cursor-pointer",
+          )}
+        >
+          <ResourceIcon
+            className="size-4 -ml-0.5"
+            resourceType={fqn}
+            icon={icon}
+            color={color}
+          />
+
+          <span
+            className={clsx(
+              "text-xs font-medium leading-relaxed tracking-wide whitespace-nowrap",
+              !highlight && " text-slate-600 dark:text-slate-300",
+              highlight && "text-sky-600 dark:text-sky-300",
+            )}
+          >
+            {name}
+          </span>
+          <div className="flex grow justify-end">
+            <div
+              className="pl-1"
+              onClick={() => {
+                onCollapse(!collapsed);
+              }}
+            >
+              {collapsed && (
+                <ChevronRightIcon
+                  className={clsx(
+                    "size-4",
+                    "hover:text-sky-600 dark:hover:text-sky-300 transition-colors",
+                  )}
+                />
+              )}
+              {!collapsed && (
+                <ChevronDownIcon
+                  className={clsx(
+                    "size-4",
+                    "hover:text-sky-600 dark:hover:text-sky-300 transition-colors",
+                  )}
+                />
+              )}
+            </div>
+          </div>
+        </div>
+        {!collapsed && children}
+      </div>
+    );
+  },
+);
+
+interface ContainerNodeProps {
+  id: string;
+  name: string;
+  pseudoContainer?: boolean;
+  resourceType?: string;
+  highlight?: boolean;
+  onClick?: () => void;
+  collapsed?: boolean;
+  onCollapse?: (value: boolean) => void;
+  color?: string;
+  icon?: string;
+}
+
+const ContainerNode: FunctionComponent<PropsWithChildren<ContainerNodeProps>> =
+  memo((props) => {
+    return (
+      <Node
+        elk={{
+          id: props.id,
+          layoutOptions: {
+            ...baseLayoutOptions,
+          },
+        }}
+        className={clsx("inline-block", "group")}
+        data-elk-id={props.id}
+      >
+        <div className={clsx("w-full h-full relative")}>
+          <Wrapper
+            name={props.name}
+            fqn={props.resourceType!}
+            highlight={props.highlight}
+            onClick={props.onClick}
+            onCollapse={props.onCollapse}
+            collapsed={props.collapsed}
+            color={props.color}
+            icon={props.icon}
+          >
+            <div className="p-4">
+              <NodeChildren>
+                <div className="absolute">{props.children}</div>
+              </NodeChildren>
+            </div>
+          </Wrapper>
+        </div>
+      </Node>
+    );
+  });
+
+interface ConstructNodeProps {
+  id: string;
+  name: string;
+  fqn: string;
+  inflights: {
+    id: string;
+    name: string;
+    sourceOccupied?: boolean;
+    targetOccupied?: boolean;
+  }[];
+  highlight?: boolean;
+  hasChildNodes?: boolean;
+  onSelectedNodeIdChange: (id: string | undefined) => void;
+  color?: string;
+  onCollapse: (value: boolean) => void;
+  collapsed: boolean;
+  icon?: string;
+}
+
+const ConstructNode: FunctionComponent<PropsWithChildren<ConstructNodeProps>> =
+  memo(
+    ({
+      id,
+      name,
+      onSelectedNodeIdChange,
+      highlight,
+      fqn,
+      inflights,
+      children,
+      hasChildNodes,
+      color,
+      onCollapse,
+      collapsed,
+      icon,
+    }) => {
+      const select = useCallback(
+        () => onSelectedNodeIdChange(id),
+        [onSelectedNodeIdChange, id],
+      );
+
+      const renderedNode = (
+        <Node
+          elk={{
+            id,
+            layoutOptions: {
+              "elk.algorithm": "org.eclipse.elk.layered",
+              "elk.aspectRatio": "0.1",
+              "elk.layered.spacing.baseValue": "1",
+              "elk.portConstraints": "FIXED_SIDE",
+            },
+          }}
+          className={clsx(
+            "inline-block group/construct cursor-pointer",
+            hasChildNodes && "pointer-events-none",
+          )}
+          data-elk-id={id}
+        >
+          {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
+          <div
+            className={clsx(
+              "w-full h-full",
+              !hasChildNodes && [
+                "rounded-lg",
+                "bg-white dark:bg-slate-700",
+                highlight && "bg-sky-50 dark:bg-sky-900",
+                "border",
+                "outline outline-0 outline-sky-200/50 dark:outline-sky-500/50",
+                !highlight && "border-slate-200 dark:border-slate-800",
+                highlight && "outline-4 border-sky-400 dark:border-sky-500",
+                "shadow",
+                "transition-all",
+              ],
+            )}
+            onClick={(event) => {
+              event.stopPropagation();
+              select();
+            }}
+          >
+            <Port
+              elk={{
+                id: `${id}##source`,
+                layoutOptions: {
+                  "elk.port.side": "EAST",
+                  "elk.port.anchor": `[${PORT_ANCHOR},0]`,
+                },
+              }}
+            />
+
+            <Port
+              elk={{
+                id: `${id}##target`,
+                layoutOptions: {
+                  "elk.port.side": "WEST",
+                  "elk.port.anchor": `[-${PORT_ANCHOR},0]`,
+                },
+              }}
+            />
+
+            {!hasChildNodes && (
+              // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+              <div
+                className={clsx(
+                  "px-2.5 py-1 flex items-center gap-1.5",
+                  inflights.length > 0 &&
+                    "border-b border-slate-200 dark:border-slate-800",
+                )}
+              >
+                <ResourceIcon
+                  className="size-4 -ml-0.5"
+                  resourceType={fqn}
+                  color={color}
+                  icon={icon}
+                />
+
+                <span
+                  className={clsx(
+                    "text-xs font-medium leading-relaxed tracking-wide whitespace-nowrap",
+                    !highlight && " text-slate-600 dark:text-slate-300",
+                    highlight && "text-sky-600 dark:text-sky-300",
+                  )}
+                >
+                  {name}
+                </span>
+                {collapsed && (
+                  <div
+                    className="flex grow justify-end pl-1"
+                    onClick={() => {
+                      if (collapsed) {
+                        onCollapse(false);
+                      }
+                    }}
+                  >
+                    <ChevronRightIcon
+                      className={clsx(
+                        "size-4",
+                        "hover:text-sky-600 dark:hover:text-sky-300 transition-colors",
+                      )}
+                    />
+                  </div>
+                )}
+              </div>
+            )}
+
+            <div className="pl-2">
+              <NodeChildren className="text-xs">
+                <div className="absolute">
+                  {inflights.map((inflight) => (
+                    <Node
+                      key={inflight.id}
+                      elk={{
+                        id: inflight.id,
+                        layoutOptions: {
+                          "elk.portConstraints": "FIXED_SIDE",
+                        },
+                      }}
+                      className={clsx("inline-block pointer-events-none")}
+                    >
+                      <div>
+                        <div
+                          className={clsx(
+                            "px-2.5 py-1.5 text-xs whitespace-nowrap",
+                            "text-slate-600 dark:text-slate-300",
+                            "font-mono",
+                          )}
+                        >
+                          <span>{inflight.name}</span>
+                        </div>
+                      </div>
+
+                      <Port
+                        elk={{
+                          id: `${inflight.id}#source`,
+                          layoutOptions: {
+                            "elk.port.side": "EAST",
+                            "elk.port.anchor": `[${PORT_ANCHOR},0]`,
+                          },
+                        }}
+                      />
+
+                      <Port
+                        elk={{
+                          id: `${inflight.id}#target`,
+                          layoutOptions: {
+                            "elk.port.side": "WEST",
+                            "elk.port.anchor": `[-${PORT_ANCHOR},0]`,
+                          },
+                        }}
+                      />
+                    </Node>
+                  ))}
+                </div>
+              </NodeChildren>
+            </div>
+          </div>
+        </Node>
+      );
+
+      if (hasChildNodes) {
+        return (
+          <ContainerNode
+            id={`${id}#container`}
+            name={name}
+            pseudoContainer
+            resourceType={fqn}
+            highlight={highlight}
+            onClick={select}
+            onCollapse={onCollapse}
+            collapsed={collapsed}
+            color={color}
+            icon={icon}
+          >
+            <NodeChildren>
+              {inflights.length > 0 && renderedNode}
+
+              {children}
+            </NodeChildren>
+
+            <Port
+              elk={{
+                id: `${id}##source`,
+                layoutOptions: {
+                  "elk.port.side": "EAST",
+                  "elk.port.anchor": `[${PORT_ANCHOR},0]`,
+                },
+              }}
+            />
+
+            <Port
+              elk={{
+                id: `${id}##target`,
+                layoutOptions: {
+                  "elk.port.side": "WEST",
+                  "elk.port.anchor": `[-${PORT_ANCHOR},0]`,
+                },
+              }}
+            />
+          </ContainerNode>
+        );
+      }
+
+      return renderedNode;
+    },
+  );
+
+/**
+ * Returns the middle point between two points with a given radius.
+ */
+const midPoint = (pt1: ElkPoint, pt2: ElkPoint, radius: number) => {
+  const distance = Math.sqrt((pt2.x - pt1.x) ** 2 + (pt2.y - pt1.y) ** 2);
+  const radiusCapped = Math.min(radius, distance / 2);
+  const diffX = (pt2.x - pt1.x) / distance;
+  const diffY = (pt2.y - pt1.y) / distance;
+  return { x: pt2.x - radiusCapped * diffX, y: pt2.y - radiusCapped * diffY };
+};
+
+const RoundedEdge: FunctionComponent<
+  EdgeComponentProps & {
+    selected?: boolean;
+    highlighted?: boolean;
+    onClick?: () => void;
+  }
+> = memo(
+  ({
+    edge,
+    offsetX = 0,
+    offsetY = 0,
+    graphWidth,
+    graphHeight,
+    selected,
+    highlighted,
+    onClick,
+  }) => {
+    const points = useMemo(
+      () =>
+        edge.sections?.flatMap((section) => [
+          section.startPoint,
+          ...(section.bendPoints ?? []),
+          section.endPoint,
+        ]) ?? [],
+      [edge.sections],
+    );
+
+    const additionalPoints = useMemo(() => {
+      const additionalPoints: ElkPoint[] = [];
+      {
+        const startPoint = points[0];
+        assert(startPoint);
+        additionalPoints.push(startPoint);
+      }
+      for (let index = 0; index < points.length - 2; index++) {
+        const [start, middle, end] = points.slice(index, index + 3);
+        assert(start && middle && end);
+        additionalPoints.push(
+          midPoint(start, middle, EDGE_ROUNDED_RADIUS),
+          middle,
+          midPoint(end, middle, EDGE_ROUNDED_RADIUS),
+        );
+      }
+      {
+        const lastPoint = points.at(-1);
+        assert(lastPoint);
+        additionalPoints.push(lastPoint);
+      }
+      return additionalPoints;
+    }, [points]);
+
+    const d = useMemo(() => {
+      if (additionalPoints.length === 0) {
+        return "";
+      }
+
+      if (additionalPoints.length === 2) {
+        const [start, end] = additionalPoints;
+        assert(start);
+        assert(end);
+        return `M${start.x},${start.y} L${end.x},${end.y}`;
+      }
+
+      let path = "";
+      for (
+        let index = 0;
+        index < additionalPoints.length - 1;
+        index = index + 3
+      ) {
+        const [start, c1, c2, c3] = additionalPoints.slice(index, index + 4);
+        if (!start) {
+          return path;
+        }
+        if (c1 && c2 && c3) {
+          path = `${path} M${start.x},${start.y} L${c1.x},${c1.y} Q${c2.x},${c2.y} ${c3.x},${c3.y}`;
+        } else if (c1) {
+          path = `${path} L${c1.x},${c1.y}`;
+        }
+      }
+      return path;
+    }, [additionalPoints]);
+
+    const lastPoint = additionalPoints.at(-1);
+
+    return (
+      <svg
+        width={graphWidth}
+        height={graphHeight}
+        className={clsx(
+          "absolute inset-0 pointer-events-none",
+          !highlighted && Z_INDICES.EDGE,
+          highlighted && !selected && Z_INDICES.EDGE_HIGHLIGHTED,
+          selected && Z_INDICES.EDGE_SELECTED,
+          Z_INDICES.EDGE_HOVERED,
+          "cursor-pointer",
+        )}
+      >
+        <g
+          className={clsx(
+            "fill-none stroke-1 group pointer-events-auto",
+            "transition-colors",
+            !selected &&
+              !highlighted && ["stroke-slate-300 dark:stroke-slate-500"],
+            (selected || highlighted) && "stroke-sky-500 dark:stroke-sky-400",
+            "hover:stroke-sky-500",
+            "dark:hover:stroke-sky-300",
+          )}
+          transform={`translate(${offsetX} ${offsetY})`}
+          onClick={(event) => {
+            event.stopPropagation();
+            onClick?.();
+          }}
+        >
+          <path className="stroke-[8] opacity-0" d={d}>
+            <title>
+              {edge.id} (from {edge.sources.join(",")} to{" "}
+              {edge.targets.join(",")})
+            </title>
+          </path>
+          <path
+            className={clsx(
+              "stroke-[6] stroke-sky-100 dark:stroke-sky-700",
+              !selected && "opacity-0",
+              selected && "opacity-100",
+              "group-hover:opacity-100",
+              "transition-opacity",
+            )}
+            d={d}
+          />
+          <path d={d} />
+          <path
+            className={clsx(
+              "transition-colors",
+              "stroke-none",
+              !selected &&
+                !highlighted && ["fill-slate-300 dark:fill-slate-500"],
+              (selected || highlighted) && "fill-sky-500 dark:fill-sky-400",
+              "group-hover:fill-sky-500",
+              "dark:group-hover:fill-sky-300",
+            )}
+            d={`M${(lastPoint?.x ?? 0) - 4} ${
+              (lastPoint?.y ?? 0) - 2
+            } v4 l5 -2 z`}
+          />
+        </g>
+      </svg>
+    );
+  },
+);
+
+const getNodePathFromEdge = (edge: string) => {
+  const [, path] = edge.match(/^(.+?)#/i) ?? [];
+  return path;
+};
+
+export interface MapViewV2Props {
+  selectedNodeId: string | undefined;
+  onSelectedNodeIdChange: (id: string | undefined) => void;
+  selectedEdgeId?: string;
+  onSelectedEdgeIdChange?: (id: string | undefined) => void;
+  onExpand: (path: string) => void;
+  onCollapse: (path: string) => void;
+  expandedItems: string[];
+}
+
+export const MapView = memo(
+  ({
+    selectedNodeId,
+    onSelectedNodeIdChange,
+    selectedEdgeId,
+    onSelectedEdgeIdChange,
+    onExpand,
+    onCollapse,
+    expandedItems,
+  }: MapViewV2Props) => {
+    const { nodeInfo, isNodeHidden, rootNodes, edges } = useMap({
+      expandedItems,
+    });
+
+    const RenderEdge = useCallback<EdgeComponent>(
+      (props) => {
+        return (
+          <RoundedEdge
+            {...props}
+            selected={selectedEdgeId === props.edge.id}
+            highlighted={
+              props.edge.sources.some(
+                (path) => getNodePathFromEdge(path) === selectedNodeId,
+              ) ||
+              props.edge.targets.some(
+                (path) => getNodePathFromEdge(path) === selectedNodeId,
+              )
+            }
+            onClick={() => onSelectedEdgeIdChange?.(props.edge.id)}
+          />
+        );
+      },
+      [selectedEdgeId, selectedNodeId, onSelectedEdgeIdChange],
+    );
+
+    const RenderNode = useCallback<
+      FunctionComponent<{
+        constructTreeNode: ConstructTreeNode;
+        selectedNodeId: string | undefined;
+        onSelectedNodeIdChange: (id: string | undefined) => void;
+      }>
+    >(
+      (props) => {
+        const node = props.constructTreeNode;
+        if (isNodeHidden(node.path)) {
+          return <></>;
+        }
+
+        const info = nodeInfo?.get(node.path);
+        if (!info) {
+          return <></>;
+        }
+
+        const childNodes = Object.values(node.children ?? {}).filter(
+          (node) => !isNodeHidden(node.path),
+        );
+
+        const fqn = node.constructInfo?.fqn;
+
+        const cloudResourceType = fqn?.split(".").at(-1);
+
+        const name =
+          node.display?.title === cloudResourceType
+            ? node.id
+            : node.display?.title ?? node.id;
+
+        const children = Object.values(node.children ?? {});
+        const canBeExpanded =
+          !!node.children && children.some((child) => !child.display?.hidden);
+        const collapsed = canBeExpanded && !expandedItems.includes(node.path);
+
+        return (
+          <ConstructNode
+            id={node.path}
+            name={name ?? ""}
+            fqn={fqn ?? ""}
+            color={node.display?.color}
+            icon={node.display?.icon}
+            inflights={info.type === "construct" ? info.inflights : []}
+            onSelectedNodeIdChange={props.onSelectedNodeIdChange}
+            highlight={props.selectedNodeId === node.path}
+            hasChildNodes={childNodes.length > 0}
+            collapsed={collapsed}
+            onCollapse={(collapse) => {
+              if (collapse) {
+                onCollapse(node.path);
+              } else {
+                onExpand(node.path);
+              }
+            }}
+          >
+            {childNodes.map((child) => (
+              <RenderNode
+                key={child.id}
+                constructTreeNode={child}
+                selectedNodeId={props.selectedNodeId}
+                onSelectedNodeIdChange={props.onSelectedNodeIdChange}
+              />
+            ))}
+          </ConstructNode>
+        );
+      },
+      [isNodeHidden, nodeInfo, onCollapse, onExpand, expandedItems],
+    );
+
+    const { theme } = useTheme();
+
+    const unselectedNode = useCallback(() => {
+      onSelectedNodeIdChange?.("root");
+    }, [onSelectedNodeIdChange]);
+
+    useKeyPressEvent("Escape", unselectedNode);
+
+    return (
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+      <div
+        className={clsx("h-full flex flex-col", theme.bg4)}
+        onClick={unselectedNode}
+      >
+        <div className="grow relative">
+          {!rootNodes && (
+            <div
+              className={clsx(
+                "absolute h-full w-full bg-white/70 dark:bg-slate-600/70",
+                "transition-all",
+                "z-10",
+              )}
+            >
+              <div className="absolute z-10 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
+                <SpinnerLoader data-testid="main-view-loader" />
+              </div>
+            </div>
+          )}
+          <div className="absolute inset-0">
+            {rootNodes && (
+              <Graph
+                elk={{
+                  id: "root",
+                  layoutOptions: {
+                    ...baseLayoutOptions,
+                    "elk.padding": "[top=24,left=20,bottom=20,right=20]",
+                  },
+                }}
+                edges={edges}
+                edgeComponent={RenderEdge}
+              >
+                {rootNodes.map((node) => (
+                  <RenderNode
+                    key={node.id}
+                    constructTreeNode={node}
+                    selectedNodeId={selectedNodeId}
+                    onSelectedNodeIdChange={onSelectedNodeIdChange}
+                  />
+                ))}
+              </Graph>
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/use-map.bridge-connections.test.ts b/apps/wing-console/console/ui/src/features/explorer-pane/use-map.bridge-connections.test.ts
new file mode 100644
index 00000000000..62b14b9708b
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/use-map.bridge-connections.test.ts
@@ -0,0 +1,427 @@
+/* eslint-disable unicorn/consistent-function-scoping */
+import { expect, test } from "vitest";
+
+import type {
+  Connection,
+  GetNodeId,
+  IsNodeHidden,
+  GetConnectionId,
+} from "./use-map.bridge-connections.js";
+import { bridgeConnections } from "./use-map.bridge-connections.js";
+
+const isNodeHidden: IsNodeHidden<string> = (path: string) =>
+  path.startsWith("h");
+const getNodeId: GetNodeId<string> = (path: string) => path;
+const getConnectionId: GetConnectionId<string> = (connection) =>
+  `${connection.source}#${connection.target}`;
+const resolveNode = (path: string) => {
+  const parts = path.split("/");
+  for (const [index, part] of Object.entries(parts)) {
+    if (isNodeHidden(part)) {
+      return parts.slice(0, Number(index)).join("/");
+    }
+  }
+  return path;
+};
+
+test("happy path", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "2",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "2",
+    },
+  ]);
+});
+
+test("creates one-level bridges", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "h2",
+    },
+    {
+      source: "h2",
+      target: "3",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "3",
+    },
+  ]);
+});
+
+test("creates multi-level bridges", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "h2",
+    },
+    {
+      source: "h2",
+      target: "h3",
+    },
+    {
+      source: "h3",
+      target: "4",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "4",
+    },
+  ]);
+});
+
+test("creates graph bridges", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "h1",
+    },
+    {
+      source: "2",
+      target: "h1",
+    },
+    {
+      source: "h1",
+      target: "h2",
+    },
+    {
+      source: "3",
+      target: "h2",
+    },
+    {
+      source: "h2",
+      target: "h3",
+    },
+    {
+      source: "h3",
+      target: "4",
+    },
+    {
+      source: "h3",
+      target: "5",
+    },
+    {
+      source: "h2",
+      target: "6",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "4",
+    },
+    {
+      source: "1",
+      target: "5",
+    },
+    {
+      source: "1",
+      target: "6",
+    },
+    {
+      source: "2",
+      target: "4",
+    },
+    {
+      source: "2",
+      target: "5",
+    },
+    {
+      source: "2",
+      target: "6",
+    },
+    {
+      source: "3",
+      target: "4",
+    },
+    {
+      source: "3",
+      target: "5",
+    },
+    {
+      source: "3",
+      target: "6",
+    },
+  ]);
+});
+
+test("handles cyclic graph correctly", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "2",
+    },
+    {
+      source: "2",
+      target: "3",
+    },
+    {
+      source: "3",
+      target: "1",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "2",
+    },
+    {
+      source: "2",
+      target: "3",
+    },
+    {
+      source: "3",
+      target: "1",
+    },
+  ]);
+});
+
+test("handles cyclic graph with hidden nodes correctly", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "h2",
+    },
+    {
+      source: "h2",
+      target: "3",
+    },
+    {
+      source: "3",
+      target: "1",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "3",
+    },
+    {
+      source: "3",
+      target: "1",
+    },
+  ]);
+});
+
+test("handles hidden leafs correctly", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "h1",
+      target: "2",
+    },
+    {
+      source: "2",
+      target: "h3",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([]);
+});
+
+test("handles hidden leafs correctly", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "h1",
+      target: "2",
+    },
+    {
+      source: "2",
+      target: "h3",
+    },
+    {
+      source: "h3",
+      target: "4",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "2",
+      target: "4",
+    },
+  ]);
+});
+
+test("handles hidden leafs correctly", () => {
+  const connections: Connection<{ path: string }>[] = [
+    {
+      source: { path: "h1" },
+      target: { path: "2" },
+    },
+    {
+      source: { path: "2" },
+      target: { path: "h3" },
+    },
+    {
+      source: { path: "h3" },
+      target: { path: "4" },
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden(node) {
+        return node.path.startsWith("h");
+      },
+      getNodeId(node) {
+        return node.path;
+      },
+      getConnectionId(connection) {
+        return `${connection.source.path}#${connection.target.path}`;
+      },
+      resolveNode(node) {
+        const path = resolveNode(node.path);
+        if (!path) {
+          return;
+        }
+
+        return {
+          path,
+        };
+      },
+    }),
+  ).toEqual([
+    {
+      source: { path: "2" },
+      target: { path: "4" },
+    },
+  ]);
+});
+
+test("upcasts connections", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "2/h3",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "2",
+    },
+  ]);
+});
+
+test("upcasts connections", () => {
+  const connections: Connection<string>[] = [
+    {
+      source: "1",
+      target: "2/h4/5/h6",
+    },
+    {
+      source: "2/h3",
+      target: "3",
+    },
+  ];
+
+  expect(
+    bridgeConnections({
+      connections,
+      isNodeHidden,
+      getNodeId,
+      getConnectionId,
+      resolveNode,
+    }),
+  ).toEqual([
+    {
+      source: "1",
+      target: "2",
+    },
+    {
+      source: "2",
+      target: "3",
+    },
+  ]);
+});
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/use-map.bridge-connections.ts b/apps/wing-console/console/ui/src/features/explorer-pane/use-map.bridge-connections.ts
new file mode 100644
index 00000000000..ebcfcfd1448
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/use-map.bridge-connections.ts
@@ -0,0 +1,112 @@
+import uniqby from "lodash.uniqby";
+
+export type Connection<T> = {
+  source: T;
+  target: T;
+};
+
+export type GetConnectionId<T> = (connection: Connection<T>) => string;
+export type IsNodeHidden<T> = (node: T) => boolean;
+export type GetNodeId<T> = (node: T) => string;
+export type ResolveNode<T> = (node: T) => T | undefined;
+
+const resolveConnections = <T>(
+  node: T,
+  type: "source" | "target",
+  allConnections: Connection<T>[],
+  isNodeHidden: IsNodeHidden<T>,
+  getNodeId: GetNodeId<T>,
+  resolveNode: ResolveNode<T>,
+): T[] => {
+  const resolvedNode = resolveNode(node);
+  if (resolvedNode) {
+    return [resolvedNode];
+  }
+
+  const connections = allConnections.filter(
+    (c) => getNodeId(c[type]) === getNodeId(node),
+  );
+  const invertedType = type === "source" ? "target" : "source";
+  const nodes = uniqby(
+    connections.map((connection) => connection[invertedType]),
+    (node) => getNodeId(node),
+  );
+
+  return uniqby(
+    nodes.flatMap((node) => {
+      return resolveConnections(
+        node,
+        type,
+        allConnections,
+        isNodeHidden,
+        getNodeId,
+        resolveNode,
+      );
+    }),
+    (node) => getNodeId(node),
+  );
+};
+
+export interface BridgeConnectionsOptions<T> {
+  /**
+   * A list of connections to bridge.
+   */
+  connections: Connection<T>[];
+
+  /**
+   * Returns whether a node is hidden.
+   */
+  isNodeHidden: IsNodeHidden<T>;
+
+  /**
+   * Returns a unique identifier for a node.
+   */
+  getNodeId: GetNodeId<T>;
+
+  /**
+   * Returns a unique identifier for a connection.
+   */
+  getConnectionId: GetConnectionId<T>;
+
+  /**
+   * Allows resolving a node to a different one.
+   *
+   * This is useful when a node is hidden and should be replaced by another one (e.g. a parent node).
+   */
+  resolveNode: ResolveNode<T>;
+}
+
+export const bridgeConnections = <T>(options: BridgeConnectionsOptions<T>) => {
+  return uniqby(
+    options.connections.flatMap((connection) => {
+      const sources = resolveConnections(
+        connection.source,
+        "target",
+        options.connections,
+        options.isNodeHidden,
+        options.getNodeId,
+        options.resolveNode,
+      );
+      const targets = resolveConnections(
+        connection.target,
+        "source",
+        options.connections,
+        options.isNodeHidden,
+        options.getNodeId,
+        options.resolveNode,
+      );
+      return uniqby(
+        sources.flatMap((source) => {
+          return targets.map((target) => {
+            return {
+              source,
+              target,
+            };
+          });
+        }),
+        options.getConnectionId,
+      );
+    }),
+    options.getConnectionId,
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/use-map.ts b/apps/wing-console/console/ui/src/features/explorer-pane/use-map.ts
new file mode 100644
index 00000000000..4361945cb85
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/use-map.ts
@@ -0,0 +1,399 @@
+import type { ConstructTreeNode } from "@winglang/sdk/lib/core/tree.js";
+import type { ConnectionData } from "@winglang/sdk/lib/simulator/index.js";
+import type { ElkExtendedEdge } from "elkjs";
+import uniqBy from "lodash.uniqby";
+import { useCallback, useEffect, useMemo } from "react";
+
+import { trpc } from "../../trpc.js";
+
+import { bridgeConnections } from "./use-map.bridge-connections.js";
+
+export type NodeInflight = {
+  id: string;
+  name: string;
+  sourceOccupied?: boolean;
+  targetOccupied?: boolean;
+};
+
+export type NodeV2 =
+  | {
+      type: "container";
+      children: string[];
+    }
+  | {
+      type: "autoId";
+    }
+  | {
+      type: "function";
+    }
+  | {
+      type: "scheduler";
+    }
+  | {
+      type: "endpoint";
+    }
+  | {
+      type: "construct";
+      inflights: NodeInflight[];
+    };
+
+const getNodeType = (
+  node: ConstructTreeNode,
+  hasInflightConnections: boolean,
+): NodeV2["type"] => {
+  if (node.constructInfo?.fqn === "@winglang/sdk.cloud.Function") {
+    return "function";
+  }
+  if (node.constructInfo?.fqn === "@winglang/sdk.std.AutoIdResource") {
+    return "autoId";
+  }
+  if (node.constructInfo?.fqn === "@winglang/sdk.cloud.Schedule") {
+    return "scheduler";
+  }
+  if (node.constructInfo?.fqn === "@winglang/sdk.cloud.Endpoint") {
+    return "endpoint";
+  }
+
+  const hasVisibleChildren = Object.values(node.children ?? {}).some(
+    (child) => !child.display?.hidden,
+  );
+
+  if (
+    node.constructInfo?.fqn === "@winglang/sdk.cloud.Api" ||
+    hasInflightConnections ||
+    !hasVisibleChildren
+  ) {
+    return "construct";
+  }
+
+  return "container";
+};
+
+const getNodeInflights = (
+  node: ConstructTreeNode,
+  connections: {
+    source: { id: string; operation: string | undefined };
+    target: { id: string; operation: string | undefined };
+  }[],
+): NodeInflight[] => {
+  const inflights = new Array<string>();
+  for (const connection of connections.filter(
+    (connection) => connection.target.id === node.path,
+  )) {
+    const targetOp = connection.target.operation;
+    if (targetOp) {
+      inflights.push(targetOp);
+    }
+  }
+  for (const connection of connections.filter(
+    (connection) => connection.source.id === node.path,
+  )) {
+    const sourceOp = connection.source.operation;
+    if (sourceOp) {
+      inflights.push(sourceOp);
+    }
+  }
+  return uniqBy(inflights, (inflight) => inflight).map((connection) => ({
+    id: `${node.path}#${connection}`,
+    name: connection,
+    sourceOccupied: connections.some(
+      (otherConnection) =>
+        otherConnection.source.id === node.path &&
+        otherConnection.source.operation === connection,
+    ),
+    targetOccupied: connections.some(
+      (otherConnection) =>
+        otherConnection.target.id === node.path &&
+        otherConnection.target.operation === connection,
+    ),
+  }));
+};
+
+export interface UseMapOptions {
+  expandedItems: string[];
+}
+
+export const useMap = ({ expandedItems }: UseMapOptions) => {
+  const query = trpc["app.map"].useQuery();
+  const { tree: rawTree, connections: rawConnections } = query.data ?? {};
+
+  const nodeFqns = useMemo(() => {
+    if (!rawTree) {
+      return;
+    }
+
+    const nodeTypes = new Map<string, string | undefined>();
+    const processNode = (node: ConstructTreeNode) => {
+      nodeTypes.set(node.path, node.constructInfo?.fqn);
+      for (const child of Object.values(node.children ?? {})) {
+        processNode(child);
+      }
+    };
+    processNode(rawTree);
+    return nodeTypes;
+  }, [rawTree]);
+
+  const nodeTypes = useMemo(() => {
+    if (!rawTree) {
+      return;
+    }
+
+    const nodeTypes = new Map<string, NodeV2["type"]>();
+    const processNode = (node: ConstructTreeNode) => {
+      nodeTypes.set(
+        node.path,
+        getNodeType(
+          node,
+          rawConnections?.some(
+            (connection) =>
+              connection.source === node.path ||
+              connection.target === node.path,
+          ) ?? false,
+        ),
+      );
+      for (const child of Object.values(node.children ?? {})) {
+        processNode(child);
+      }
+    };
+    processNode(rawTree);
+    return nodeTypes;
+  }, [rawTree, rawConnections]);
+
+  const hiddenMap = useMemo(() => {
+    const hiddenMap = new Map<string, boolean>();
+    const traverse = (node: ConstructTreeNode, forceHidden?: boolean) => {
+      const hidden = forceHidden || node.display?.hidden || false;
+
+      hiddenMap.set(node.path, hidden);
+
+      const children = Object.values(node.children ?? {});
+      const canBeExpanded =
+        !!node.children && children.some((child) => !child.display?.hidden);
+      const collapsed = canBeExpanded && !expandedItems.includes(node.path);
+
+      for (const child of children) {
+        traverse(child, hidden || collapsed);
+      }
+    };
+    const pseudoRoot = rawTree?.children?.["Default"];
+    for (const child of Object.values(pseudoRoot?.children ?? {})) {
+      traverse(child!);
+    }
+    return hiddenMap;
+  }, [rawTree, expandedItems]);
+
+  const isNodeHidden = useCallback(
+    (path: string) => {
+      const nodePath = path.match(/^(.+?)#/)?.[1] ?? path;
+      return hiddenMap.get(nodePath) === true;
+    },
+    [hiddenMap],
+  );
+
+  const resolveNodePath = useCallback(
+    (path: string) => {
+      const parts = path.split("/");
+      for (const [index, part] of Object.entries(parts)) {
+        const path = parts.slice(0, Number(index) + 1).join("/");
+        if (isNodeHidden(path)) {
+          return parts.slice(0, Number(index)).join("/");
+        }
+      }
+      return path;
+    },
+    [isNodeHidden],
+  );
+
+  const resolveNode = useCallback(
+    (path: string) => {
+      const nodePath = path.match(/^(.+?)#/)?.[1] ?? path;
+      return resolveNodePath(nodePath);
+    },
+    [resolveNodePath],
+  );
+
+  const rootNodes = useMemo(() => {
+    if (!rawTree) {
+      return;
+    }
+
+    const children = rawTree?.children?.["Default"]?.children;
+    return children ? (Object.values(children) as ConstructTreeNode[]) : [];
+  }, [rawTree]);
+
+  const connections = useMemo(() => {
+    if (!rawConnections || !nodeFqns) {
+      return;
+    }
+
+    return bridgeConnections({
+      connections:
+        rawConnections
+          .map((connection) => {
+            // Convert invokeAsync to invoke, since they
+            // are the same to the map view.
+            return {
+              ...connection,
+              sourceOp:
+                connection.sourceOp === "invokeAsync"
+                  ? "invoke"
+                  : connection.sourceOp,
+              targetOp:
+                connection.targetOp === "invokeAsync"
+                  ? "invoke"
+                  : connection.targetOp,
+            };
+          })
+          .filter((connection) => {
+            return connection.source !== connection.target;
+          })
+          .map((connection) => {
+            return {
+              source: {
+                id: connection.source,
+                nodeFqn: nodeFqns.get(connection.source),
+                operation: connection.sourceOp,
+              },
+              target: {
+                id: connection.target,
+                nodeFqn: nodeFqns.get(connection.target),
+                operation: connection.targetOp,
+              },
+            };
+          }) ?? [],
+      isNodeHidden: (node) => isNodeHidden(node.id),
+      getNodeId: (node) => node.id,
+      getConnectionId: (connection) =>
+        `${connection.source.id}#${connection.source.operation}##${connection.target.id}#${connection.target.operation}`,
+      resolveNode: (node) => {
+        const path = resolveNode(node.id);
+        return {
+          id: path,
+          nodeFqn: nodeFqns.get(path),
+          // Make the operation anonymous if the node is hidden.
+          operation: path === node.id ? node.operation : undefined,
+        };
+      },
+    })
+      .filter((connection) => {
+        // Filter connections that go to parents.
+        return !connection.source.id.startsWith(`${connection.target.id}/`);
+      })
+      .filter((connection) => {
+        // Filter connections that go to themselves.
+        return connection.source.id !== connection.target.id;
+      });
+  }, [rawConnections, nodeFqns, isNodeHidden, resolveNode]);
+
+  const getConnectionId = useCallback(
+    (
+      nodePath: string,
+      nodeFqn: string | undefined,
+      operation: string | undefined,
+      type: "source" | "target",
+    ) => {
+      if (isNodeHidden(nodePath)) {
+        return nodePath;
+      }
+
+      if (nodeFqn === "@winglang/sdk.cloud.Function") {
+        return `${nodePath}##${type}`;
+      }
+
+      if (operation) {
+        return `${nodePath}#${operation}#${type}`;
+      }
+
+      return `${nodePath}##${type}`;
+    },
+    [isNodeHidden],
+  );
+
+  const edges = useMemo<ElkExtendedEdge[]>(() => {
+    return (
+      connections?.map((connection) => {
+        const source = getConnectionId(
+          connection.source.id,
+          connection.source.nodeFqn,
+          connection.source.operation,
+          "source",
+        );
+        const target = getConnectionId(
+          connection.target.id,
+          connection.target.nodeFqn,
+          connection.target.operation,
+          "target",
+        );
+        return {
+          id: `${source}#${target}`,
+          sources: [source],
+          targets: [target],
+        };
+      }) ?? []
+    );
+  }, [connections, getConnectionId]);
+
+  const nodeInfo = useMemo(() => {
+    if (!rawTree || !rawConnections) {
+      return;
+    }
+
+    const nodeMap = new Map<string, NodeV2>();
+    const processNode = (node: ConstructTreeNode) => {
+      const nodeType = getNodeType(
+        node,
+        connections?.some(
+          (connection) =>
+            connection.source.id === node.path ||
+            connection.target.id === node.path,
+        ) ?? false,
+      );
+      const inflights = getNodeInflights(node, connections ?? []);
+      switch (nodeType) {
+        case "container": {
+          nodeMap.set(node.path, {
+            type: nodeType,
+            children: Object.values(node.children ?? {}).map((child) => {
+              return child.path;
+            }),
+          });
+          break;
+        }
+        case "autoId": {
+          nodeMap.set(node.path, {
+            type: nodeType,
+          });
+          break;
+        }
+        case "function": {
+          nodeMap.set(node.path, {
+            type: nodeType,
+          });
+          break;
+        }
+        default: {
+          nodeMap.set(node.path, {
+            type: "construct",
+            inflights,
+          });
+        }
+      }
+      for (const child of Object.values(node.children ?? {})) {
+        processNode(child);
+      }
+    };
+    processNode(rawTree);
+    return nodeMap;
+  }, [rawTree, rawConnections, connections]);
+
+  return {
+    rawTree,
+    rawConnections,
+    nodeInfo,
+    nodeTypes,
+    rootNodes,
+    connections,
+    isNodeHidden,
+    edges,
+  };
+};
diff --git a/apps/wing-console/console/ui/src/features/explorer-pane/zoom-pane.tsx b/apps/wing-console/console/ui/src/features/explorer-pane/zoom-pane.tsx
new file mode 100644
index 00000000000..07abaa1185b
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/explorer-pane/zoom-pane.tsx
@@ -0,0 +1,440 @@
+import { Button, useTheme } from "@wingconsole/design-system";
+import classNames from "classnames";
+import {
+  createContext,
+  forwardRef,
+  useCallback,
+  useContext,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import type { DetailedHTMLProps, HTMLAttributes } from "react";
+import type { ReactNode } from "react";
+import { useEvent } from "react-use";
+
+import { MapControls } from "./map-controls.js";
+
+export interface Viewport {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+type BoundingBox = Viewport;
+
+export interface ZoomPaneContextValue {
+  zoomIn(): void;
+  zoomOut(): void;
+  zoomToFit(viewport?: Viewport, skipAnimation?: boolean): void;
+}
+
+export interface Transform {
+  x: number;
+  y: number;
+  z: number;
+}
+
+export const IDENTITY_TRANSFORM: Transform = { x: 0, y: 0, z: 1 };
+
+/**
+ * Convert a point from global coordinates to local coordinates.
+ */
+const toLocal = (x: number, y: number, transform: Transform) => {
+  return {
+    x: transform.x + x / transform.z,
+    y: transform.y + y / transform.z,
+  };
+};
+
+/**
+ * Whether the bounding boxes overlap.
+ */
+const boundingBoxOverlap = (a: BoundingBox, b: BoundingBox) => {
+  return (
+    a.x < b.x + b.width &&
+    a.x + a.width > b.x &&
+    a.y < b.y + b.height &&
+    a.y + a.height > b.y
+  );
+};
+const MIN_ZOOM_LEVEL = 0.125;
+const MAX_ZOOM_LEVEL = 1.5;
+const ZOOM_SENSITIVITY = 1.35;
+const MOVE_SENSITIVITY = 1.5;
+const WHEEL_SENSITIVITY = 0.01;
+
+export interface ZoomPaneProviderProps {
+  children: ReactNode | ((value: ZoomPaneContextValue) => ReactNode);
+}
+
+export interface ZoomPaneProps
+  extends DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
+  boundingBox?: { width: number; height: number };
+}
+
+export interface ZoomPaneRef {
+  zoomToFit(viewport?: Viewport): void;
+}
+
+const context = createContext({
+  viewTransform: IDENTITY_TRANSFORM,
+});
+
+export const useZoomPane = () => {
+  return useContext(context);
+};
+
+export const ZoomPane = forwardRef<ZoomPaneRef, ZoomPaneProps>((props, ref) => {
+  const { boundingBox, children, className, onClick, ...divProps } = props;
+
+  const [viewTransform, setViewTransform] = useState(IDENTITY_TRANSFORM);
+  const containerRef = useRef<HTMLDivElement>(null);
+  const targetRef = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    const target = targetRef.current;
+    if (!target) {
+      throw new Error("target is undefined");
+    }
+    target.style.transform = `translate(${
+      -viewTransform.x * viewTransform.z
+    }px, ${-viewTransform.y * viewTransform.z}px) scale(${viewTransform.z})`;
+  }, [viewTransform]);
+
+  const onWheel = useCallback((event: WheelEvent) => {
+    event.preventDefault();
+    const boundingRect = (
+      event.currentTarget as HTMLDivElement
+    ).getBoundingClientRect();
+    setViewTransform((viewTransform) => {
+      if (event.ctrlKey) {
+        const localCursor = toLocal(
+          event.x - boundingRect.left,
+          event.y - boundingRect.top,
+          viewTransform,
+        );
+        const dx = localCursor.x - viewTransform.x;
+        const dy = localCursor.y - viewTransform.y;
+
+        const z = Math.min(
+          MAX_ZOOM_LEVEL,
+          Math.max(
+            MIN_ZOOM_LEVEL,
+            viewTransform.z * Math.exp(-event.deltaY * WHEEL_SENSITIVITY),
+          ),
+        );
+        const dz = z / viewTransform.z;
+
+        return {
+          x: viewTransform.x + dx - dx / dz,
+          y: viewTransform.y + dy - dy / dz,
+          z: z,
+        };
+      } else {
+        return {
+          x:
+            viewTransform.x +
+            (event.deltaX * MOVE_SENSITIVITY) / viewTransform.z,
+          y:
+            viewTransform.y +
+            (event.deltaY * MOVE_SENSITIVITY) / viewTransform.z,
+          z: viewTransform.z,
+        };
+      }
+    });
+  }, []);
+  useEvent("wheel", onWheel as (event: Event) => void, containerRef.current, {
+    // Use passive: false to prevent the default behavior of scrolling the page.
+    passive: false,
+  });
+
+  const [isDragging, setDragging] = useState(false);
+
+  // Use ref to keep track of whether the user was dragging,
+  // and stop emitting `onClick` events if the user was dragging.
+  const wasDragging = useRef(false);
+
+  // Keep track of whether the space key is pressed so we can show the user the grab cursor.
+  // The map is draggable using click only when space is pressed.
+  const [isSpacePressed, setSpacePressed] = useState(false);
+  useEffect(() => {
+    const listener = (event: KeyboardEvent) => {
+      // Pressing option+cmd+i on Mac (which is used to open the devtools) fires a keydown event with key " " on Chrome.
+      if (event.altKey) {
+        return;
+      }
+
+      if (event.key === " ") {
+        setSpacePressed(event.type === "keydown");
+      }
+    };
+    window.addEventListener("keydown", listener);
+    window.addEventListener("keyup", listener);
+    return () => {
+      window.removeEventListener("keydown", listener);
+      window.removeEventListener("keyup", listener);
+    };
+  }, []);
+
+  const dragStart = useRef({ x: 0, y: 0 });
+  useEvent(
+    "mousedown",
+    useCallback(
+      (event: MouseEvent) => {
+        if (!isSpacePressed) {
+          return;
+        }
+
+        setDragging(true);
+        dragStart.current = { x: event.x, y: event.y };
+        wasDragging.current = false;
+      },
+      [isSpacePressed],
+    ) as (event: Event) => void,
+    containerRef.current,
+  );
+
+  useEvent(
+    "mousemove",
+    useCallback(
+      (event: MouseEvent) => {
+        if (!isSpacePressed) {
+          return;
+        }
+
+        wasDragging.current = true;
+
+        if (!isDragging) {
+          return;
+        }
+
+        const diff = {
+          x: dragStart.current.x - event.x,
+          y: dragStart.current.y - event.y,
+        };
+        dragStart.current = { x: event.x, y: event.y };
+
+        setViewTransform((viewTransform) => {
+          return {
+            x: viewTransform.x + diff.x / viewTransform.z,
+            y: viewTransform.y + diff.y / viewTransform.z,
+            z: viewTransform.z,
+          };
+        });
+      },
+      [isSpacePressed, isDragging],
+    ) as (event: Event) => void,
+  );
+
+  useEvent(
+    "mouseup",
+    useCallback(() => {
+      setDragging(false);
+    }, []),
+  );
+
+  useEvent(
+    "click",
+    useCallback(
+      (event: any): void => {
+        if (isSpacePressed) {
+          return;
+        }
+        onClick?.(event);
+        wasDragging.current = false;
+      },
+      [isSpacePressed, onClick],
+    ),
+    containerRef.current,
+  );
+
+  const zoomIn = useCallback(() => {
+    const container = containerRef.current;
+    if (!container) {
+      return;
+    }
+    const boundingRect = container.getBoundingClientRect();
+    setViewTransform((viewTransform) => {
+      const localCursor = toLocal(
+        boundingRect.width / 2,
+        boundingRect.height / 2,
+        viewTransform,
+      );
+      const dx = localCursor.x - viewTransform.x;
+      const dy = localCursor.y - viewTransform.y;
+
+      const z = Math.min(
+        MAX_ZOOM_LEVEL,
+        Math.max(MIN_ZOOM_LEVEL, viewTransform.z * ZOOM_SENSITIVITY),
+      );
+      const dz = z / viewTransform.z;
+      return {
+        x: viewTransform.x + dx - dx / dz,
+        y: viewTransform.y + dy - dy / dz,
+        z: z,
+      };
+    });
+  }, []);
+
+  const zoomOut = useCallback(() => {
+    const container = containerRef.current;
+    if (!container) {
+      return;
+    }
+    const boundingRect = container.getBoundingClientRect();
+    setViewTransform((viewTransform) => {
+      const localCursor = toLocal(
+        boundingRect.width / 2,
+        boundingRect.height / 2,
+        viewTransform,
+      );
+      const dx = localCursor.x - viewTransform.x;
+      const dy = localCursor.y - viewTransform.y;
+      const z = Math.min(
+        MAX_ZOOM_LEVEL,
+        Math.max(MIN_ZOOM_LEVEL, viewTransform.z / ZOOM_SENSITIVITY),
+      );
+      const dz = z / viewTransform.z;
+      return {
+        x: viewTransform.x + dx - dx / dz,
+        y: viewTransform.y + dy - dy / dz,
+        z: z,
+      };
+    });
+  }, []);
+
+  const zoomToFit = useCallback(
+    (viewport?: Viewport) => {
+      const container = containerRef.current;
+      if (!container) {
+        return;
+      }
+      const boundingRect = container.getBoundingClientRect();
+      setViewTransform(() => {
+        viewport ??= {
+          x: 0,
+          y: 0,
+          width: boundingBox?.width ?? boundingRect.width,
+          height: boundingBox?.height ?? boundingRect.height,
+        };
+
+        // Scale contents to fit.
+        const zx = boundingRect.width / viewport.width;
+        const zy = boundingRect.height / viewport.height;
+        const z = Math.min(
+          MAX_ZOOM_LEVEL,
+          Math.max(MIN_ZOOM_LEVEL, Math.min(zx, zy)),
+        );
+
+        // Center contents.
+        const dx = (boundingRect.width - viewport.width * z) / 2 / z;
+        const dy = (boundingRect.height - viewport.height * z) / 2 / z;
+
+        return {
+          x: viewport.x - dx,
+          y: viewport.y - dy,
+          z,
+        };
+      });
+    },
+    [boundingBox],
+  );
+
+  useImperativeHandle(
+    ref,
+    () => {
+      return {
+        zoomToFit,
+      };
+    },
+    [zoomToFit],
+  );
+
+  // Whether the bounding box is out of bounds of the transform view.
+  const outOfBounds = useMemo(() => {
+    const container = containerRef.current;
+    if (!container) {
+      return false;
+    }
+    const containerBoundingBox = container.getBoundingClientRect();
+
+    if (!boundingBox) {
+      return false;
+    }
+
+    const viewBoundingBox = {
+      x: viewTransform.x,
+      y: viewTransform.y,
+      width: containerBoundingBox.width / viewTransform.z,
+      height: containerBoundingBox.height / viewTransform.z,
+    };
+
+    return !boundingBoxOverlap(viewBoundingBox, {
+      x: 0,
+      y: 0,
+      width: boundingBox.width,
+      height: boundingBox.height,
+    });
+  }, [viewTransform, boundingBox]);
+
+  const { theme } = useTheme();
+
+  return (
+    <div
+      ref={containerRef}
+      {...divProps}
+      className={classNames(className, "relative overflow-hidden")}
+    >
+      <div ref={targetRef} className="absolute inset-0 origin-top-left">
+        <context.Provider value={{ viewTransform }}>
+          {children}
+        </context.Provider>
+      </div>
+
+      <div className="relative z-10 flex">
+        <div className="absolute cursor-grab backdrop-blur right-0">
+          <MapControls
+            onZoomIn={zoomIn}
+            onZoomOut={zoomOut}
+            onZoomToFit={zoomToFit}
+          />
+        </div>
+      </div>
+
+      {outOfBounds && (
+        <div className="absolute inset-0 z-10 flex justify-around items-center">
+          <div
+            className={classNames(
+              "p-4 rounded flex flex-col justify-around gap-2",
+            )}
+          >
+            <p
+              className={classNames(
+                theme.text1,
+                theme.bg4,
+                "px-2 py-0.5 rounded",
+              )}
+            >
+              The map is out of bounds
+            </p>
+            <div className="flex justify-around">
+              <Button onClick={() => zoomToFit()}>Fit map to screen</Button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {isSpacePressed && (
+        <div
+          className={classNames("absolute inset-0", {
+            "cursor-grab": !isDragging,
+            "cursor-grabbing": isDragging,
+          })}
+        ></div>
+      )}
+    </div>
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/hierarchy-pane/hierarchy.tsx b/apps/wing-console/console/ui/src/features/hierarchy-pane/hierarchy.tsx
new file mode 100644
index 00000000000..edc805d55b2
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/hierarchy-pane/hierarchy.tsx
@@ -0,0 +1,114 @@
+import {
+  SquareStackMinusIcon,
+  SquareStackPlusIcon,
+  Toolbar,
+  ToolbarButton,
+  TreeItem,
+  TreeView,
+  useTheme,
+  ResourceIcon,
+  ScrollableArea,
+} from "@wingconsole/design-system";
+import type { ExplorerItem } from "@wingconsole/server";
+import classNames from "classnames";
+import { memo } from "react";
+
+import { useSelectionContext } from "../selection-context/selection-context.js";
+
+import { NoResources } from "./no-resources.js";
+import { useHierarchy, type TreeMenuItem } from "./use-hierarchy.js";
+
+const renderTreeItems = (items: TreeMenuItem[]) => {
+  return items.map((item) => {
+    return (
+      <TreeItem
+        key={item.id}
+        itemId={item.id}
+        label={item.label}
+        icon={item.icon}
+      >
+        {item.children &&
+          item.children.length > 0 &&
+          renderTreeItems(item.children)}
+      </TreeItem>
+    );
+  });
+};
+
+const createTreeMenuItemFromExplorerTreeItem = (
+  item: ExplorerItem,
+): TreeMenuItem => {
+  return {
+    id: item.id,
+    label: item.label,
+    icon: item.type ? (
+      <ResourceIcon
+        resourceType={item.type}
+        resourcePath={item.label}
+        className="w-4 h-4"
+        color={item.display?.color}
+        icon={item.display?.icon}
+      />
+    ) : undefined,
+    children: item.childItems?.map((item) =>
+      createTreeMenuItemFromExplorerTreeItem(item),
+    ),
+  };
+};
+
+export interface HierarchyProps {
+  loading?: boolean;
+  "data-testid"?: string;
+}
+
+export const Hierarchy = memo((props: HierarchyProps) => {
+  const { theme } = useTheme();
+  const hierarchy = useHierarchy();
+  const selectionContext = useSelectionContext();
+  return (
+    <div
+      className={classNames("w-full h-full flex flex-col", theme.bg3)}
+      data-testid={props["data-testid"]}
+    >
+      <Toolbar title="Explorer">
+        <ToolbarButton onClick={selectionContext.expandAll} title="Expand All">
+          <SquareStackPlusIcon className="w-4 h-4 rotate-90" />
+        </ToolbarButton>
+
+        <ToolbarButton
+          onClick={selectionContext.collapseAll}
+          title="Collapse All"
+        >
+          <SquareStackMinusIcon className="w-4 h-4 rotate-90" />
+        </ToolbarButton>
+      </Toolbar>
+
+      <div className="relative grow">
+        <div className="absolute inset-0">
+          <ScrollableArea
+            overflowY
+            className={classNames(
+              "h-full w-full text-sm flex flex-col gap-1",
+              theme.bg3,
+              theme.text2,
+            )}
+          >
+            <div className="flex flex-col">
+              {hierarchy.items && hierarchy.items.length === 0 && (
+                <NoResources />
+              )}
+              <TreeView
+                expandedItems={selectionContext.expandedItems}
+                onExpandedItemsChange={selectionContext.setExpandedItems}
+                selectedItems={selectionContext.selectedItems}
+                onSelectedItemsChange={selectionContext.setSelectedItems}
+              >
+                {hierarchy.items && renderTreeItems(hierarchy.items)}
+              </TreeView>
+            </div>
+          </ScrollableArea>
+        </div>
+      </div>
+    </div>
+  );
+});
diff --git a/apps/wing-console/console/ui/src/ui/no-resources.tsx b/apps/wing-console/console/ui/src/features/hierarchy-pane/no-resources.tsx
similarity index 89%
rename from apps/wing-console/console/ui/src/ui/no-resources.tsx
rename to apps/wing-console/console/ui/src/features/hierarchy-pane/no-resources.tsx
index 11927288933..ccf32e9a706 100644
--- a/apps/wing-console/console/ui/src/ui/no-resources.tsx
+++ b/apps/wing-console/console/ui/src/features/hierarchy-pane/no-resources.tsx
@@ -15,7 +15,7 @@ export const NoResources = () => {
         <span>Learn how to add resources </span>
         <a
           className="text-sky-500 hover:text-sky-600"
-          href="https://www.winglang.io/docs/category/cloud-library"
+          href="https://www.winglang.io/docs/category/cloud"
           target="_blank"
           rel="noreferrer"
         >
diff --git a/apps/wing-console/console/ui/src/features/hierarchy-pane/use-hierarchy.tsx b/apps/wing-console/console/ui/src/features/hierarchy-pane/use-hierarchy.tsx
new file mode 100644
index 00000000000..755e1f14b6d
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/hierarchy-pane/use-hierarchy.tsx
@@ -0,0 +1,110 @@
+import { ResourceIcon } from "@wingconsole/design-system";
+import type { ExplorerItem } from "@wingconsole/server";
+import { useCallback, useEffect, useState } from "react";
+import type { ReactNode } from "react";
+
+import { trpc } from "../../trpc.js";
+import { useSelectionContext } from "../selection-context/selection-context.js";
+
+export interface TreeMenuItem {
+  id: string;
+  icon?: React.ReactNode;
+  label: string;
+  secondaryLabel?: string | ReactNode | ((item: TreeMenuItem) => ReactNode);
+  children?: TreeMenuItem[];
+  expanded?: boolean;
+}
+
+const createTreeMenuItemFromExplorerTreeItem = (
+  item: ExplorerItem,
+): TreeMenuItem => {
+  return {
+    id: item.id,
+    label: item.label,
+    icon: item.type ? (
+      <ResourceIcon
+        resourceType={item.type}
+        resourcePath={item.id}
+        className="w-4 h-4"
+        color={item.display?.color}
+        icon={item.display?.icon}
+      />
+    ) : undefined,
+    expanded: item.display?.expanded,
+    children: item.childItems?.map((item) =>
+      createTreeMenuItemFromExplorerTreeItem(item),
+    ),
+  };
+};
+
+export const useHierarchy = () => {
+  const [items, setItems] = useState<TreeMenuItem[] | undefined>();
+
+  const { setSelectedItems, setExpandedItems, setAvailableItems } =
+    useSelectionContext();
+
+  useEffect(() => {
+    setAvailableItems(items ?? []);
+  }, [items, setAvailableItems]);
+
+  const tree = trpc["app.explorerTree"].useQuery();
+
+  const [selectedNode, setSelectedNode] = useState<string>("");
+
+  const nodeIds = trpc["app.nodeIds"].useQuery();
+
+  useEffect(() => {
+    if (!tree.data) {
+      return;
+    }
+    // Remove the root node by taking the children.
+    const items = createTreeMenuItemFromExplorerTreeItem(tree.data).children;
+    setItems(items ?? []);
+  }, [tree.data, setItems]);
+
+  useEffect(() => {
+    if (!nodeIds.data) {
+      return;
+    }
+
+    if (!selectedNode || !nodeIds.data?.includes(selectedNode)) {
+      setSelectedNode("");
+    }
+  }, [selectedNode, nodeIds.data, setSelectedNode]);
+
+  useEffect(() => {
+    if (!selectedNode) {
+      return;
+    }
+    setSelectedItems([selectedNode]);
+  }, [selectedNode, setSelectedItems]);
+
+  useEffect(() => {
+    // Expand automatically if there is only one item and it is not explicitly set to be collapsed.
+    if (items?.length === 1 && items[0] && items[0].expanded !== false) {
+      setExpandedItems([items[0].id]);
+      return;
+    }
+    const getExpandedNodes = (items: TreeMenuItem[]): string[] => {
+      let expandedNodes: string[] = [];
+      for (const item of items) {
+        if (item.expanded === true) {
+          expandedNodes.push(item.id);
+        }
+        if (item.children && item.children.length > 0) {
+          expandedNodes = [
+            ...expandedNodes,
+            ...getExpandedNodes(item.children),
+          ];
+        }
+      }
+      return expandedNodes;
+    };
+
+    setExpandedItems(getExpandedNodes(items ?? []));
+  }, [items, setExpandedItems]);
+
+  return {
+    items,
+  };
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/inspector.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/inspector.tsx
new file mode 100644
index 00000000000..881b15f1037
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/inspector.tsx
@@ -0,0 +1,64 @@
+import { memo, useCallback, useContext } from "react";
+
+import { trpc } from "../../trpc.js";
+import { useSelectionContext } from "../selection-context/selection-context.js";
+import { TestsContext } from "../tests-pane/tests-context.js";
+
+import { EdgeMetadata } from "./resource-panes/edge-metadata.js";
+import { ResourceMetadata } from "./resource-panes/resource-metadata.js";
+
+export const Inspector = memo(() => {
+  const { expand, setSelectedItems, selectedItems, selectedEdgeId } =
+    useSelectionContext();
+
+  const { showTests } = useContext(TestsContext);
+
+  const metadata = trpc["app.nodeMetadata"].useQuery(
+    {
+      path: selectedItems[0],
+      showTests,
+    },
+    {
+      enabled: selectedItems.length > 0,
+    },
+  );
+
+  const edgeMetadata = trpc["app.edgeMetadata"].useQuery(
+    {
+      edgeId: selectedEdgeId || "",
+    },
+    {
+      enabled: !!selectedEdgeId,
+    },
+  );
+
+  const onConnectionNodeClick = useCallback(
+    (path: string) => {
+      expand(path);
+      setSelectedItems([path]);
+    },
+    [expand, setSelectedItems],
+  );
+
+  return (
+    <>
+      {metadata.data && (
+        <ResourceMetadata
+          node={metadata.data?.node}
+          inbound={metadata.data?.inbound}
+          outbound={metadata.data?.outbound}
+          onConnectionNodeClick={onConnectionNodeClick}
+        />
+      )}
+
+      {selectedEdgeId && edgeMetadata.data && (
+        <EdgeMetadata
+          source={edgeMetadata.data.source}
+          target={edgeMetadata.data.target}
+          inflights={edgeMetadata.data.inflights}
+          onConnectionNodeClick={onConnectionNodeClick}
+        />
+      )}
+    </>
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-interaction-view.tsx
new file mode 100644
index 00000000000..9b8171f1bb5
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-interaction-view.tsx
@@ -0,0 +1,51 @@
+import type { OpenApiSpec } from "@wingconsole/server/src/wingsdk";
+import { createPersistentState } from "@wingconsole/use-persistent-state";
+import { memo, useCallback, useContext, useState } from "react";
+
+import { AppContext } from "../../../AppContext.js";
+import { trpc } from "../../../trpc.js";
+
+import { ApiInteraction } from "./api-interaction.js";
+import type { ApiResponse } from "./api.js";
+import { useApi } from "./use-api.js";
+
+export interface ApiViewProps {
+  resourcePath: string;
+}
+
+export const ApiInteractionView = memo(({ resourcePath }: ApiViewProps) => {
+  const { appMode } = useContext(AppContext);
+  const { usePersistentState } = createPersistentState(resourcePath);
+
+  const [apiResponse, setApiResponse] = usePersistentState<
+    ApiResponse | undefined
+  >();
+  const onFetchDataUpdate = useCallback(
+    (data: ApiResponse) => {
+      if (!data) {
+        return;
+      }
+      setApiResponse(data);
+    },
+    [setApiResponse],
+  );
+
+  const schema = trpc["api.schema"].useQuery({ resourcePath });
+
+  const { isLoading, callFetch } = useApi({
+    onFetchDataUpdate,
+  });
+
+  return (
+    <ApiInteraction
+      resourceId={resourcePath}
+      appMode={appMode}
+      url={schema.data?.url}
+      openApiSpec={schema.data?.openApiSpec as OpenApiSpec}
+      callFetch={callFetch}
+      isLoading={isLoading}
+      apiResponse={apiResponse}
+      resetApiResponse={() => setApiResponse(undefined)}
+    />
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-interaction.tsx
new file mode 100644
index 00000000000..fb46bc59066
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-interaction.tsx
@@ -0,0 +1,571 @@
+import type { KeyValueItem } from "@wingconsole/design-system";
+import {
+  Attribute,
+  Button,
+  Combobox,
+  KeyValueList,
+  Select,
+  Tabs,
+  TextArea,
+  useKeyValueList,
+  useTheme,
+} from "@wingconsole/design-system";
+import type { OpenApiSpec } from "@wingconsole/server/src/wingsdk.js";
+import { createPersistentState } from "@wingconsole/use-persistent-state";
+import classNames from "classnames";
+import { memo, useCallback, useEffect, useId, useState } from "react";
+
+import type { AppMode } from "../../../AppContext.js";
+
+import { ApiResponseBodyPanel } from "./api-response-body-panel.js";
+import { ApiResponseHeadersPanel } from "./api-response-headers-panel.js";
+import type { ApiRequest, ApiResponse, ApiRoute } from "./api.js";
+import {
+  getParametersFromOpenApi,
+  getHeaderValues,
+  getRoutesFromOpenApi,
+  HTTP_HEADERS,
+  HTTP_METHODS,
+  getRequestBodyFromOpenApi,
+} from "./api.js";
+
+export interface ApiInteractionProps {
+  resourceId: string;
+  appMode?: AppMode;
+  apiResponse?: ApiResponse;
+  url: string;
+  openApiSpec: OpenApiSpec;
+  callFetch: (data: ApiRequest) => void;
+  isLoading: boolean;
+  resetApiResponse?: () => void;
+}
+
+export const ApiInteraction = memo(
+  ({
+    resourceId,
+    appMode,
+    apiResponse,
+    callFetch,
+    url,
+    openApiSpec,
+    isLoading,
+    resetApiResponse = () => {},
+  }: ApiInteractionProps) => {
+    const { theme } = useTheme();
+
+    const { usePersistentState } = createPersistentState(resourceId);
+
+    const [routes, setRoutes] = useState<ApiRoute[]>([]);
+
+    const [currentHeaderKey, setCurrentHeaderKey] = usePersistentState("");
+    const [currentHeaderValues, setCurrentHeaderValues] = usePersistentState<
+      string[]
+    >([]);
+    const [currentMethod, setCurrentMethod] = usePersistentState("GET");
+
+    const [currentRoute, setCurrentRoute] = usePersistentState("");
+
+    const bodyId = useId();
+    const [isBodyEdited, setIsBodyEdited] = usePersistentState(false);
+    const [body, setBody] = usePersistentState("");
+    const [bodyPlaceholder, setBodyPlaceholder] = usePersistentState<
+      string | undefined
+    >();
+
+    const [currentOptionsTab, setCurrentOptionsTab] =
+      usePersistentState("headers");
+
+    const [currentResponseTab, setCurrentResponseTab] =
+      usePersistentState("body");
+
+    const {
+      items: headers,
+      addItem: addHeader,
+      removeItem: removeHeader,
+      editItem: editHeader,
+      setItems: setHeaders,
+    } = useKeyValueList({
+      useState: usePersistentState,
+    });
+
+    const {
+      items: queryParameters,
+      addItem: addQueryParameter,
+      removeItem: removeQueryParameter,
+      editItem: editQueryParameter,
+      setItems: setQueryParameters,
+    } = useKeyValueList({
+      useState: usePersistentState,
+    });
+
+    const {
+      items: pathVariables,
+      editItem: editPathVariable,
+      setItems: setPathVariables,
+    } = useKeyValueList({
+      useState: usePersistentState,
+    });
+
+    // TODO revisit
+    const openResponseTab = useCallback(
+      (tabId: string) => {
+        setCurrentResponseTab(tabId);
+      },
+      [setCurrentResponseTab],
+    );
+
+    const openOptionTab = useCallback(
+      (tabId: string) => {
+        setCurrentOptionsTab(tabId);
+      },
+      [setCurrentOptionsTab],
+    );
+
+    const apiCall = useCallback(async () => {
+      if (!url || !currentMethod || !currentRoute) {
+        return;
+      }
+      callFetch({
+        url,
+        route: currentRoute,
+        variables: pathVariables.map((variable) => {
+          return {
+            key: variable.key,
+            value: variable.value ?? "",
+          };
+        }),
+        method: currentMethod,
+        headers: headers.map((header) => {
+          return {
+            key: header.key,
+            value: header.value ?? "",
+          };
+        }),
+        body,
+      });
+    }, [
+      url,
+      currentMethod,
+      currentRoute,
+      callFetch,
+      pathVariables,
+      headers,
+      body,
+    ]);
+
+    const loadDataFromOpenApi = useCallback(
+      (path: string, method: string) => {
+        setHeaders((headers) => {
+          const headersFromSpec = getParametersFromOpenApi({
+            path: path,
+            method: method,
+            openApi: openApiSpec,
+            type: "header",
+          });
+          const newHeaders = headersFromSpec.filter(
+            (header) =>
+              !headers.some(
+                (existingHeader) => existingHeader.key === header.key,
+              ),
+          );
+          return [
+            ...headers.filter((header) => header.value !== ""),
+            ...newHeaders,
+          ];
+        });
+
+        setQueryParameters((queryParameters) => {
+          const queryParametersFromSpec = getParametersFromOpenApi({
+            path: path,
+            method: method,
+            openApi: openApiSpec,
+            type: "query",
+          });
+          const newQueryParameters = queryParametersFromSpec.filter(
+            (parameter) =>
+              !queryParameters.some(
+                (existingParameter) => existingParameter.key === parameter.key,
+              ),
+          );
+          return [
+            ...queryParameters.filter((parameter) => parameter.value !== ""),
+            ...newQueryParameters,
+          ];
+        });
+
+        setPathVariables((pathVariables) => {
+          const variablesFromSpec = getParametersFromOpenApi({
+            path: path,
+            method: method,
+            openApi: openApiSpec,
+            type: "path",
+          });
+          const newPathVariables = variablesFromSpec.filter(
+            (variable) =>
+              !pathVariables.some(
+                (existingVariable) => existingVariable.key === variable.key,
+              ),
+          );
+          return [
+            ...pathVariables.filter((variable) => variable.value !== ""),
+            ...newPathVariables,
+          ];
+        });
+
+        // Set the body
+        const bodyFromSpec = getRequestBodyFromOpenApi(
+          path,
+          method,
+          openApiSpec,
+        );
+        const body = bodyFromSpec
+          ? JSON.stringify(bodyFromSpec, undefined, 2)
+          : undefined;
+
+        if (!isBodyEdited) {
+          setBody(body ?? "");
+        }
+        setBodyPlaceholder(body);
+      },
+      [
+        openApiSpec,
+        setHeaders,
+        setBody,
+        isBodyEdited,
+        setBodyPlaceholder,
+        setQueryParameters,
+        setPathVariables,
+      ],
+    );
+
+    const handleMethodChange = useCallback(
+      (route: string, method: string) => {
+        setCurrentMethod(method);
+        loadDataFromOpenApi(route, method);
+      },
+      [setCurrentMethod, loadDataFromOpenApi],
+    );
+
+    const handleRouteChange = useCallback(
+      (value: string) => {
+        let [method, route] = value.split(" ");
+        if (!route) {
+          method = currentMethod;
+          route = value;
+        }
+
+        const newRoute = route && !route.startsWith("/") ? `/${route}` : route;
+        setCurrentRoute(newRoute);
+
+        const search = newRoute.split(/\?(.*)/s)[1];
+        const urlParameters = new URLSearchParams(search || "");
+
+        const path = newRoute.split(/\?(.*)/s)[0] || "";
+
+        const isListedRoute = routes.some(
+          (item) => item.route === path && item.method === method,
+        );
+
+        if (!isListedRoute) {
+          setBodyPlaceholder(undefined);
+        }
+
+        setQueryParameters(() => {
+          const newUrlParameters: KeyValueItem[] = [];
+          for (const [key, value] of urlParameters.entries()) {
+            newUrlParameters.push({
+              key,
+              value,
+            });
+          }
+          return newUrlParameters;
+        });
+
+        setPathVariables(() => {
+          const newPathVariables: KeyValueItem[] = [];
+
+          const matches = newRoute.matchAll(/{(\w+)}/g) || [];
+          for (const match of matches) {
+            if (!match[1]) {
+              continue;
+            }
+            newPathVariables.push({
+              key: match[1],
+              value: "",
+            });
+          }
+          return newPathVariables;
+        });
+
+        if (isListedRoute && method) {
+          setCurrentMethod(method);
+          loadDataFromOpenApi(path, method);
+        }
+        resetApiResponse();
+      },
+      [
+        routes,
+        setBodyPlaceholder,
+        setCurrentRoute,
+        setCurrentMethod,
+        currentMethod,
+        setPathVariables,
+        setQueryParameters,
+        loadDataFromOpenApi,
+        resetApiResponse,
+      ],
+    );
+
+    // load the routes from the open api spec on mount
+    useEffect(() => {
+      setRoutes(getRoutesFromOpenApi(openApiSpec));
+    }, [openApiSpec]);
+
+    // Load the possible values for the current header key
+    useEffect(() => {
+      if (!currentHeaderKey) {
+        setCurrentHeaderValues([]);
+        return;
+      }
+      setCurrentHeaderValues(getHeaderValues(currentHeaderKey));
+    }, [currentHeaderKey, setCurrentHeaderValues]);
+
+    // Sync the query parameters with the current route.
+    useEffect(() => {
+      if (!currentRoute) {
+        return;
+      }
+      const urlParameters = new URLSearchParams();
+      for (const item of queryParameters) {
+        urlParameters.append(item.key, item.value ?? "");
+      }
+      let newRoute = currentRoute.split("?")[0] || "";
+      if (urlParameters.toString()) {
+        newRoute = `${newRoute}?${urlParameters.toString()}`;
+      }
+      setCurrentRoute(newRoute);
+    }, [currentRoute, queryParameters, setCurrentRoute]);
+
+    // TODO: Refactor inline functions below. For example, with `useCallback` or with additional memo components.
+    return (
+      <div className="h-full flex-1 flex flex-col text-sm space-y-1">
+        <div className="relative grow">
+          {appMode === "local" && (
+            <Attribute name="URL" value={url} noLeftPadding />
+          )}
+          <div className="space-y-4 flex-col grow mt-4">
+            <div className="flex gap-1 w-full">
+              <div className="group flex grow relative gap-x-1">
+                <div
+                  className={classNames(
+                    theme.bgInput,
+                    theme.textInput,
+                    theme.borderInput,
+                    theme.focusWithin,
+                    "flex relative",
+                    "text-xs w-full",
+                    "border rounded",
+                    "transition ease-in-out",
+                  )}
+                >
+                  <Select
+                    items={HTTP_METHODS.map((method) => {
+                      return { label: method, value: method };
+                    })}
+                    value={currentMethod}
+                    onChange={(value) =>
+                      handleMethodChange(currentRoute, value)
+                    }
+                    btnClassName={classNames(
+                      theme.bgInput,
+                      theme.bgInputHover,
+                      theme.borderInput,
+                      "text-xs text-left outline-none w-[5.5rem] rounded-l",
+                      "px-2.5 py-1.5",
+                      "border-r",
+                    )}
+                    showSelected={false}
+                    dataTestid="cloud.api:method"
+                  />
+                  <Combobox
+                    placeholder="Enter a route"
+                    autoComplete={false}
+                    items={routes.map((route) => {
+                      return {
+                        label: `${route.method} ${route.route}`,
+                        value: `${route.method} ${route.route}`,
+                      };
+                    })}
+                    filter={false}
+                    value={currentRoute}
+                    onChange={handleRouteChange}
+                    className="w-full"
+                    inputClassName={classNames(
+                      "border-none focus-none text-xs outline-none w-full rounded-r",
+                      "px-2.5 py-1.5",
+                      "focus:ring-0",
+                    )}
+                    showSelected={false}
+                    renderItem={(item) => {
+                      const [method, route] = item.value.split(" ");
+                      return (
+                        <div
+                          className="flex items-center pl-2"
+                          data-testid={`cloud.api:route-${route}`}
+                        >
+                          <span className="shrink-0 w-[78px]">{method}</span>
+                          <span className="w-full">{route}</span>
+                        </div>
+                      );
+                    }}
+                    dataTestid="cloud.api:route"
+                  />
+                </div>
+                <Button
+                  primary
+                  onClick={apiCall}
+                  disabled={!currentMethod || !currentRoute}
+                  dataTestid="cloud.api:send"
+                >
+                  Send
+                </Button>
+              </div>
+            </div>
+            <div>
+              <Tabs
+                small
+                tabs={[
+                  {
+                    id: "headers",
+                    name: "Headers",
+                    count: headers.length,
+                    panel: (
+                      <div className="pt-2 px-1">
+                        <KeyValueList
+                          items={headers}
+                          onAddItem={addHeader}
+                          onRemoveItem={removeHeader}
+                          onEditItem={editHeader}
+                          disabled={isLoading}
+                          keysList={Object.keys(HTTP_HEADERS)}
+                          valuesList={currentHeaderValues}
+                          onKeyChange={setCurrentHeaderKey}
+                          autoComplete={false}
+                        />
+                      </div>
+                    ),
+                  },
+                  {
+                    id: "params",
+                    name: "Params",
+                    count: queryParameters.length + pathVariables.length,
+                    panel: (
+                      <div className="pt-2 space-y-2 px-1">
+                        <div className="space-y-1">
+                          {pathVariables.length > 0 && (
+                            <div className={classNames("text-sm", theme.text2)}>
+                              Query params
+                            </div>
+                          )}
+
+                          <KeyValueList
+                            items={queryParameters}
+                            onAddItem={addQueryParameter}
+                            onRemoveItem={removeQueryParameter}
+                            onEditItem={editQueryParameter}
+                            disabled={isLoading}
+                            autoComplete={false}
+                          />
+                        </div>
+                        {pathVariables.length > 0 && (
+                          <div className="space-y-1">
+                            <div className={classNames("text-sm", theme.text2)}>
+                              Path variables
+                            </div>
+
+                            <KeyValueList
+                              items={pathVariables}
+                              onEditItem={editPathVariable}
+                              disabled={isLoading}
+                              keyDisabled={true}
+                              autoComplete={false}
+                            />
+                          </div>
+                        )}
+                      </div>
+                    ),
+                  },
+                  {
+                    id: "body",
+                    name: `Body ${isBodyEdited ? "*" : ""}`,
+                    panel: (
+                      <div className="pt-2 px-1">
+                        <TextArea
+                          id={bodyId}
+                          containerClassName="w-full"
+                          className="text-sm min-h-[6rem]"
+                          placeholder={bodyPlaceholder ?? "Body..."}
+                          value={body}
+                          onInput={(event) => {
+                            const value = event.currentTarget.value;
+                            setBody(value);
+                            setIsBodyEdited(
+                              value !== "" && value !== bodyPlaceholder,
+                            );
+                          }}
+                        />
+                      </div>
+                    ),
+                  },
+                ]}
+                currentTabId={currentOptionsTab}
+                onTabChange={openOptionTab}
+                transparent
+              />
+            </div>
+            <div>
+              <span className={classNames(theme.text2, "font-medium")}>
+                Response
+              </span>
+              <div className="mt-1">
+                <Tabs
+                  small
+                  tabs={[
+                    {
+                      id: "body",
+                      name: "Body",
+                      panel: (
+                        <div className="px-1">
+                          <ApiResponseBodyPanel
+                            response={apiResponse}
+                            isLoading={isLoading}
+                            dataTestid="cloud.api:response-body"
+                          />
+                        </div>
+                      ),
+                    },
+                    {
+                      id: "headers",
+                      name: "Headers",
+                      panel: (
+                        <div className="px-1">
+                          <ApiResponseHeadersPanel
+                            headers={apiResponse?.headers ?? []}
+                            isLoading={isLoading}
+                          />
+                        </div>
+                      ),
+                    },
+                  ]}
+                  currentTabId={currentResponseTab}
+                  onTabChange={openResponseTab}
+                  transparent
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/ui/api-response-body-panel.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-response-body-panel.tsx
similarity index 97%
rename from apps/wing-console/console/ui/src/ui/api-response-body-panel.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-response-body-panel.tsx
index a253df9fae1..0a3bc2b2404 100644
--- a/apps/wing-console/console/ui/src/ui/api-response-body-panel.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-response-body-panel.tsx
@@ -1,7 +1,7 @@
 import { useTheme, JsonResponseInput } from "@wingconsole/design-system";
 import classNames from "classnames";
 
-import { ApiResponse } from "../shared/api.js";
+import type { ApiResponse } from "./api.js";
 
 const getResponseColor: (status: number) => string = (status) => {
   if (status >= 200 && status < 300) {
diff --git a/apps/wing-console/console/ui/src/ui/api-response-headers-panel.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-response-headers-panel.tsx
similarity index 88%
rename from apps/wing-console/console/ui/src/ui/api-response-headers-panel.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-response-headers-panel.tsx
index 4a802b8cf03..10a3e9d914e 100644
--- a/apps/wing-console/console/ui/src/ui/api-response-headers-panel.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api-response-headers-panel.tsx
@@ -1,6 +1,6 @@
 import { KeyValueList, ResponseInput } from "@wingconsole/design-system";
 
-import { ApiResponseHeader } from "../shared/api.js";
+import type { ApiResponseHeader } from "../shared/api.js";
 
 export interface ApiHeadersPanelProps {
   headers: ApiResponseHeader[];
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api.ts
new file mode 100644
index 00000000000..a310e72ba44
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/api.ts
@@ -0,0 +1,197 @@
+import type { OpenApiSpec } from "@wingconsole/server/src/wingsdk";
+
+export const HTTP_METHODS = [
+  "GET",
+  "HEAD",
+  "POST",
+  "PUT",
+  "DELETE",
+  "CONNECT",
+  "OPTIONS",
+  "PATCH",
+];
+
+export const HTTP_HEADERS = {
+  accept: [
+    "text/html",
+    "text/plain",
+    "application/json",
+    "application/xml",
+    "application/javascript",
+    "application/octet-stream",
+    "multipart/form-data",
+    "application/x-www-form-urlencoded",
+  ],
+  "accept-charset": ["utf8", "iso-8859-1", "windows-1252"],
+  "accept-encoding": ["gzip", "deflate", "br"],
+  authorization: [],
+  "cache-control": [
+    "no-cache",
+    "no-store",
+    "max-age=<seconds>",
+    "max-stale=<seconds>",
+    "min-fresh=<seconds>",
+    "only-if-cached",
+  ],
+  connection: ["keep-alive", "close"],
+  "content-length": [],
+  "content-type": [
+    "application/json",
+    "application/x-www-form-urlencoded",
+    "multipart/form-data",
+  ],
+  cookie: [],
+  origin: [],
+  "user-agent": [],
+};
+
+export interface ApiResponseHeader {
+  key: string;
+  value: string;
+}
+
+export interface ApiResponse {
+  status: number;
+  statusText: string;
+  textResponse: string;
+  duration: number;
+  headers: ApiResponseHeader[];
+}
+
+export interface ApiRequest {
+  url: string;
+  route: string;
+  variables: { value: string; key: string }[];
+  method: string;
+  headers: { value: string; key: string }[];
+  body: string;
+}
+
+export interface ApiRoute {
+  method: string;
+  route: string;
+}
+
+export const getHeaderValues = (header: string): string[] => {
+  const key = header as keyof typeof HTTP_HEADERS;
+  if (key in HTTP_HEADERS) {
+    return HTTP_HEADERS[key];
+  }
+  return [];
+};
+
+export const getRoutesFromOpenApi = (openApi: OpenApiSpec): ApiRoute[] => {
+  let routes: ApiRoute[] = [];
+
+  if (!openApi?.paths) {
+    return routes;
+  }
+
+  for (const route of Object.keys(openApi.paths)) {
+    const methods = Object.keys(openApi.paths[route]);
+    for (const method of methods) {
+      routes.push({
+        method: method.replace(/^\//, "").toUpperCase(),
+        route,
+      });
+    }
+  }
+  return routes;
+};
+
+export interface Parameter {
+  key: string;
+  value: string;
+  type: string;
+  required: boolean;
+  description?: string;
+}
+
+export interface GetParametersFromOpenApiProps {
+  path: string;
+  method?: string;
+  openApi: OpenApiSpec;
+  type: "query" | "header" | "path";
+}
+
+export const getParametersFromOpenApi = ({
+  path,
+  method = "",
+  openApi,
+  type,
+}: GetParametersFromOpenApiProps): Parameter[] => {
+  try {
+    if (!openApi?.paths[path]) {
+      return [];
+    }
+    const pathParameters = openApi.paths[path].parameters;
+    const methodParameters =
+      openApi.paths[path][method.toLowerCase()]?.parameters;
+
+    const parametersList = [
+      ...(pathParameters || []),
+      ...(methodParameters || []),
+    ];
+
+    let parameters = [];
+    for (const parameter of parametersList) {
+      if (parameter.in === type) {
+        const required = parameter.required || false;
+        const type = parameter.schema?.type || "string";
+        parameters.push({
+          key: parameter.name,
+          value: "",
+          type: type as string,
+          required: required,
+          description: parameter.description,
+        });
+      }
+    }
+
+    return parameters;
+  } catch (error) {
+    console.log(error);
+    return [];
+  }
+};
+
+export const getRequestBodyFromOpenApi = (
+  path: string,
+  method: string,
+  openApi: OpenApiSpec,
+): Record<string, string> | undefined => {
+  try {
+    const requestBody =
+      openApi?.paths[path]?.[method.toLowerCase()]?.requestBody;
+    if (!requestBody) {
+      return undefined;
+    }
+
+    const jsonContentType = requestBody.content?.["application/json"];
+    if (!jsonContentType) {
+      return undefined;
+    }
+
+    const schema = jsonContentType.schema;
+    if (!schema) {
+      return undefined;
+    }
+
+    const bodyProperties = schema.properties;
+
+    let response = {} as Record<string, string>;
+    for (const key in bodyProperties) {
+      const type = bodyProperties[key].type;
+      const required = schema.required?.includes(key) ? "required" : "optional";
+      const description = bodyProperties[key].description;
+      response[key] = `${type} (${required}) ${
+        description ? `- ${description}` : ""
+      }`;
+    }
+
+    return response;
+  } catch (error) {
+    console.log(error);
+    return {};
+  }
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/bucket-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/bucket-interaction-view.tsx
new file mode 100644
index 00000000000..0bf11329cc6
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/bucket-interaction-view.tsx
@@ -0,0 +1,38 @@
+import { memo, useState } from "react";
+
+import { FileBrowserView } from "./file-browser-view.js";
+import { useBucket } from "./use-bucket.js";
+
+export interface BucketViewProps {
+  resourcePath: string;
+}
+
+export const BucketInteractionView = memo(
+  ({ resourcePath }: BucketViewProps) => {
+    const [currentFile, setCurrentFile] = useState<string>();
+
+    const {
+      uploadFiles,
+      downloadFiles,
+      deleteFile,
+      currentFileContent,
+      isLoading,
+      files,
+    } = useBucket({
+      resourcePath,
+      currentFile,
+    });
+
+    return (
+      <FileBrowserView
+        isLoading={isLoading}
+        files={files}
+        deleteFilesHandler={deleteFile}
+        downloadFilesHandler={downloadFiles}
+        uploadFilesHandler={uploadFiles}
+        currentFileContent={currentFileContent}
+        onCurrentFileChange={setCurrentFile}
+      />
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/ui/bucket-metadata.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/bucket-metadata.tsx
similarity index 89%
rename from apps/wing-console/console/ui/src/ui/bucket-metadata.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/bucket-metadata.tsx
index cc131852fd0..2e77d4c8043 100644
--- a/apps/wing-console/console/ui/src/ui/bucket-metadata.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/bucket-metadata.tsx
@@ -1,7 +1,7 @@
 import { useTheme, Attribute } from "@wingconsole/design-system";
 import classNames from "classnames";
 
-import { MetadataNode } from "./resource-metadata.js";
+import type { MetadataNode } from "./resource-metadata.js";
 
 export interface BucketMetadataProps {
   node: MetadataNode;
diff --git a/apps/wing-console/console/ui/src/features/counter-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-interaction-view.tsx
similarity index 80%
rename from apps/wing-console/console/ui/src/features/counter-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-interaction-view.tsx
index b7ee205e5af..acf656a69e4 100644
--- a/apps/wing-console/console/ui/src/features/counter-interaction-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-interaction-view.tsx
@@ -1,7 +1,7 @@
 import { memo } from "react";
 
-import { useCounter } from "../services/use-counter.js";
-import { CounterInteraction } from "../ui/counter-interaction.js";
+import { CounterInteraction } from "./counter-interaction.js";
+import { useCounter } from "./use-counter.js";
 
 export interface CounterInteractionViewProps {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/ui/counter-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-interaction.tsx
similarity index 100%
rename from apps/wing-console/console/ui/src/ui/counter-interaction.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-interaction.tsx
diff --git a/apps/wing-console/console/ui/src/ui/counter-metadata.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-metadata.tsx
similarity index 90%
rename from apps/wing-console/console/ui/src/ui/counter-metadata.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-metadata.tsx
index eca059a4152..2b98a63fa5f 100644
--- a/apps/wing-console/console/ui/src/ui/counter-metadata.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/counter-metadata.tsx
@@ -2,7 +2,7 @@ import { useTheme, Attribute } from "@wingconsole/design-system";
 import classNames from "classnames";
 import { memo } from "react";
 
-import { MetadataNode } from "./resource-metadata.js";
+import type { MetadataNode } from "./resource-metadata.js";
 
 export interface CounterMetadataProps {
   node: MetadataNode;
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-file-browser.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-file-browser.tsx
new file mode 100644
index 00000000000..8937b7e3c3a
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-file-browser.tsx
@@ -0,0 +1,151 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+
+import { trpc } from "../../../trpc.js";
+import { useDownloadFile } from "../../../use-download-file.js";
+import { useUploadFile } from "../../../use-upload-file.js";
+
+import { FileBrowserView } from "./file-browser-view.js";
+
+export interface CustomResourceFileBrowserProps {
+  label: string;
+  putHandler: string;
+  deleteHandler: string;
+  getHandler: string;
+  listHandler: string;
+}
+
+export const CustomResourceFileBrowser = ({
+  listHandler,
+  deleteHandler,
+  putHandler,
+  getHandler,
+}: CustomResourceFileBrowserProps) => {
+  const { download: downloadFileLocally, downloadFiles: downloadFilesLocally } =
+    useDownloadFile();
+  const { readBlob } = useUploadFile();
+
+  const [currentFile, setCurrentFile] = useState<string>();
+
+  const listQuery = trpc["fileBrowser.list"].useQuery(
+    {
+      resourcePath: listHandler,
+    },
+    { enabled: !!listHandler },
+  );
+
+  const currentFileContentQuery = trpc["fileBrowser.get"].useQuery(
+    {
+      fileName: currentFile ?? "",
+      resourcePath: getHandler,
+    },
+    {
+      enabled: currentFile !== undefined,
+      keepPreviousData: false,
+    },
+  );
+
+  const deleteMutation = trpc["fileBrowser.delete"].useMutation();
+  const downloadMutation = trpc["fileBrowser.download"].useMutation();
+  const putMutation = trpc["fileBrowser.put"].useMutation();
+
+  const [currentFileContent, setCurrentFileContent] = useState<string>();
+
+  const [files, setFiles] = useState<string[]>([]);
+
+  useEffect(() => {
+    if (currentFileContentQuery.data) {
+      setCurrentFileContent(currentFileContentQuery.data);
+    }
+  }, [currentFileContentQuery.data]);
+
+  useEffect(() => {
+    if (listQuery.data) {
+      setFiles(listQuery.data);
+    }
+  }, [listQuery.data]);
+
+  const deleteFiles = useCallback(
+    async (files: string[]) => {
+      for (const file of files) {
+        await deleteMutation.mutateAsync({
+          resourcePath: deleteHandler,
+          fileName: file,
+        });
+      }
+    },
+    [deleteHandler, deleteMutation],
+  );
+
+  const downloadFiles = useCallback(
+    async (files: string[]) => {
+      if (files.length === 0) {
+        return;
+      }
+      if (files.length === 1 && files[0]) {
+        const content =
+          currentFileContent ||
+          (await downloadMutation.mutate({
+            resourcePath: getHandler,
+            fileName: files[0],
+          }));
+        void downloadFileLocally(files[0], content || "");
+      }
+      if (files.length > 1) {
+        const promises = files.map(async (file) => {
+          const content = await downloadMutation.mutateAsync({
+            resourcePath: getHandler,
+            fileName: file,
+          });
+          return { filename: file, content };
+        });
+
+        const result = await Promise.all(promises);
+        void downloadFilesLocally(result);
+      }
+    },
+    [
+      downloadFileLocally,
+      downloadFilesLocally,
+      getHandler,
+      downloadMutation,
+      currentFileContent,
+    ],
+  );
+
+  const putFile = useCallback(
+    (fileName: string, fileContent: string) => {
+      return putMutation.mutateAsync({
+        resourcePath: putHandler,
+        fileName,
+        fileContent,
+      });
+    },
+    [putHandler, putMutation],
+  );
+
+  const uploadFiles = useCallback(
+    async (files: FileList) => {
+      for (const file of files) {
+        const fileContent = await readBlob(file.name, file);
+        void putFile(file.name, fileContent);
+      }
+    },
+    [putFile, readBlob],
+  );
+
+  const isLoading = useMemo(() => {
+    return currentFileContentQuery.isFetching;
+  }, [currentFileContentQuery.isFetching]);
+
+  return (
+    <FileBrowserView
+      isLoading={isLoading}
+      files={files}
+      deleteFilesHandler={deleteFiles}
+      downloadFilesHandler={downloadFiles}
+      uploadFilesHandler={uploadFiles}
+      currentFileContent={currentFileContent}
+      onCurrentFileChange={setCurrentFile}
+    />
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-http-client.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-http-client.tsx
new file mode 100644
index 00000000000..9ae0dbacb4e
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-http-client.tsx
@@ -0,0 +1,79 @@
+import { Attribute } from "@wingconsole/design-system";
+import { createPersistentState } from "@wingconsole/use-persistent-state";
+import { useContext } from "react";
+
+import { AppContext } from "../../../AppContext.js";
+import { trpc } from "../../../trpc.js";
+
+import { ApiInteraction } from "./api-interaction.js";
+import type { ApiResponse } from "./api.js";
+import { useApi } from "./use-api.js";
+
+export interface CustomResourceHttpClientItemProps {
+  label: string;
+  getUrlHandler: string;
+  getApiSpecHandler: string;
+}
+
+export const CustomResourceHttpClientItem = ({
+  label,
+  getUrlHandler,
+  getApiSpecHandler,
+}: CustomResourceHttpClientItemProps) => {
+  const { appMode } = useContext(AppContext);
+  const { usePersistentState } = createPersistentState(getApiSpecHandler);
+
+  const [openApiSpec, setOpenApiSpec] = usePersistentState<ApiResponse>();
+
+  const urlData = trpc["httpClient.getUrl"].useQuery(
+    {
+      resourcePath: getUrlHandler,
+    },
+    { enabled: !!getUrlHandler },
+  );
+
+  trpc["httpClient.getOpenApiSpec"].useQuery(
+    {
+      resourcePath: getApiSpecHandler,
+    },
+    {
+      enabled: !!getApiSpecHandler,
+      onSuccess: (data) => setOpenApiSpec(data.openApiSpec),
+    },
+  );
+
+  const [apiResponse, setApiResponse] = usePersistentState<
+    ApiResponse | undefined
+  >();
+
+  const { callFetch, isLoading } = useApi({
+    onFetchDataUpdate: (data: ApiResponse) => {
+      if (!data) {
+        return;
+      }
+      setApiResponse(data);
+    },
+  });
+
+  return (
+    <div className="pl-4">
+      <div className="mb-1">
+        <Attribute name="Name" value={label} noLeftPadding />
+      </div>
+      {urlData.data?.url && openApiSpec && (
+        <ApiInteraction
+          resourceId={getUrlHandler}
+          url={urlData.data.url}
+          appMode={appMode}
+          openApiSpec={openApiSpec}
+          callFetch={callFetch}
+          isLoading={isLoading}
+          apiResponse={apiResponse}
+          resetApiResponse={() => {
+            setApiResponse(undefined);
+          }}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-item.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-item.tsx
new file mode 100644
index 00000000000..81f1dce8e56
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-item.tsx
@@ -0,0 +1,72 @@
+import type {
+  UIComponent,
+  UIField,
+  UIButton,
+  UISection,
+} from "@winglang/sdk/lib/core";
+
+import type {
+  UIFileBrowser,
+  UIHttpClient,
+} from "../../../../../../libs/wingsdk/lib/core/index.js";
+
+import { CustomResourceFileBrowser } from "./custom-resource-file-browser.js";
+import { CustomResourceHttpClientItem } from "./custom-resource-http-client.js";
+import { CustomResourceUiButtonItem } from "./custom-resource-ui-button.js";
+import { CustomResourceUiFieldItem } from "./custom-resource-ui-field.js";
+
+const getUiComponent = (item: UIComponent) => {
+  if (item.kind === "field") {
+    return item as UIField;
+  }
+  if (item.kind === "button") {
+    return item as UIButton;
+  }
+  if (item.kind === "section") {
+    return item as UISection;
+  }
+  if (item.kind === "file-browser") {
+    return item as UIFileBrowser;
+  }
+  if (item.kind === "http-client") {
+    return item as UIHttpClient;
+  }
+  return item;
+};
+
+export const CustomResourceUiItem = ({ item }: { item: UIComponent }) => {
+  const uiComponent = getUiComponent(item);
+  return (
+    <>
+      {uiComponent.kind === "field" && (
+        <CustomResourceUiFieldItem
+          label={uiComponent.label}
+          handlerPath={uiComponent.handler}
+          link={uiComponent.link}
+        />
+      )}
+      {uiComponent.kind === "button" && (
+        <CustomResourceUiButtonItem
+          label={uiComponent.label}
+          handlerPath={uiComponent.handler}
+        />
+      )}
+      {uiComponent.kind === "file-browser" && (
+        <CustomResourceFileBrowser
+          label={uiComponent.label}
+          putHandler={uiComponent.putHandler}
+          getHandler={uiComponent.getHandler}
+          listHandler={uiComponent.listHandler}
+          deleteHandler={uiComponent.deleteHandler}
+        />
+      )}
+      {uiComponent.kind === "http-client" && (
+        <CustomResourceHttpClientItem
+          label={uiComponent.label}
+          getUrlHandler={uiComponent.getUrlHandler}
+          getApiSpecHandler={uiComponent.getApiSpecHandler}
+        />
+      )}
+    </>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-ui-button.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-ui-button.tsx
new file mode 100644
index 00000000000..04ff1707092
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-ui-button.tsx
@@ -0,0 +1,36 @@
+import { useTheme, Button } from "@wingconsole/design-system";
+import classNames from "classnames";
+import { useCallback, useId } from "react";
+
+import { trpc } from "../../../trpc.js";
+
+export interface CustomResourceUiButtomItemProps {
+  label: string;
+  handlerPath: string;
+}
+
+export const CustomResourceUiButtonItem = ({
+  label,
+  handlerPath,
+}: CustomResourceUiButtomItemProps) => {
+  const { theme } = useTheme();
+  const { mutate: invokeMutation } = trpc["uiButton.invoke"].useMutation();
+  const invoke = useCallback(() => {
+    invokeMutation({
+      resourcePath: handlerPath,
+    });
+  }, [handlerPath, invokeMutation]);
+
+  const id = useId();
+  return (
+    <div className="pl-4 flex flex-row items-center">
+      <label
+        htmlFor={id}
+        className={classNames("min-w-[100px] invisible", theme.text2)}
+      >
+        {label}
+      </label>
+      <Button id={id} title={label} label={label} onClick={invoke} />
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-ui-field.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-ui-field.tsx
new file mode 100644
index 00000000000..211217894e6
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/custom-resource-ui-field.tsx
@@ -0,0 +1,33 @@
+import { Attribute } from "@wingconsole/design-system";
+import { Link } from "@wingconsole/design-system";
+
+import { trpc } from "../../../trpc.js";
+
+export interface CustomResourceUiFieldItemProps {
+  label: string;
+  handlerPath: string;
+  link: boolean;
+}
+
+export const CustomResourceUiFieldItem = ({
+  label,
+  handlerPath,
+  link,
+}: CustomResourceUiFieldItemProps) => {
+  const field = trpc["uiField.get"].useQuery(
+    {
+      resourcePath: handlerPath,
+    },
+    { enabled: !!handlerPath },
+  );
+  const fieldValue = field.data?.value ?? "";
+  return (
+    <Attribute name={label} value={link ? undefined : fieldValue}>
+      {link && (
+        <Link id={label} href={fieldValue} target="_blank">
+          {fieldValue}
+        </Link>
+      )}
+    </Attribute>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/ui/edge-metadata.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/edge-metadata.tsx
similarity index 93%
rename from apps/wing-console/console/ui/src/ui/edge-metadata.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/edge-metadata.tsx
index edf3f16cc1f..c64b3cdf881 100644
--- a/apps/wing-console/console/ui/src/ui/edge-metadata.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/edge-metadata.tsx
@@ -14,7 +14,7 @@ import {
 import classNames from "classnames";
 import { useCallback, useMemo, useState } from "react";
 
-import { MetadataNode } from "./resource-metadata.js";
+import type { MetadataNode } from "./resource-metadata.js";
 
 export interface EdgeMetadataProps {
   source: MetadataNode;
@@ -109,6 +109,8 @@ export const EdgeMetadata = ({
                     className="w-4 h-4"
                     resourceType={source.type}
                     resourcePath={source.path}
+                    color={source.display?.color}
+                    icon={source.display?.icon}
                   />
                 </div>
                 <div className="truncate">{source.id}</div>
@@ -132,6 +134,8 @@ export const EdgeMetadata = ({
                     className="w-4 h-4"
                     resourceType={target.type}
                     resourcePath={target.path}
+                    color={target.display?.color}
+                    icon={target.display?.icon}
                   />
                 </div>
                 <div className="truncate">{target.id}</div>
@@ -140,7 +144,7 @@ export const EdgeMetadata = ({
           </Attribute>
 
           <div className="border-t border-transparent">
-            <Attribute name="Access" centerLabel={false}>
+            <Attribute name="Connections" centerLabel={false}>
               <div className="w-full">
                 <Tree
                   entries={entries}
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/endpoint-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/endpoint-interaction-view.tsx
new file mode 100644
index 00000000000..d76273a2368
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/endpoint-interaction-view.tsx
@@ -0,0 +1,30 @@
+import { memo } from "react";
+
+import { EndpointInteraction } from "./endpoint-interaction.js";
+import { useEndpoints } from "./use-endpoints.js";
+
+export interface EndpointInteractionViewProps {
+  resourcePath: string;
+}
+
+export const EndpointInteractionView = memo(
+  ({ resourcePath }: EndpointInteractionViewProps) => {
+    const { getEndpoint, exposeEndpoint, hideEndpoint } = useEndpoints();
+
+    const endpoint = getEndpoint(resourcePath);
+    const handleExposeEndpoint = () => {
+      exposeEndpoint(resourcePath);
+    };
+    const handleHideEndpoint = () => {
+      hideEndpoint(resourcePath);
+    };
+
+    return (
+      <EndpointInteraction
+        endpoint={endpoint}
+        exposeEndpoint={handleExposeEndpoint}
+        hideEndpoint={handleHideEndpoint}
+      />
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/endpoint-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/endpoint-interaction.tsx
new file mode 100644
index 00000000000..a79456a5c22
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/endpoint-interaction.tsx
@@ -0,0 +1,85 @@
+import { useTheme, Button, Attribute } from "@wingconsole/design-system";
+import classNames from "classnames";
+import { useId, useMemo } from "react";
+
+import type { EndpointItem } from "../../endpoints-pane/endpoint-item.js";
+
+export interface EndpointInteractionProps {
+  endpoint: EndpointItem | undefined;
+  exposeEndpoint: () => void;
+  hideEndpoint: () => void;
+}
+
+export const EndpointInteraction = ({
+  endpoint,
+  exposeEndpoint,
+  hideEndpoint,
+}: EndpointInteractionProps) => {
+  const { theme } = useTheme();
+
+  const toggleId = useId();
+  const publicUrl = useMemo(() => {
+    if (!endpoint) {
+      return "";
+    }
+
+    if (endpoint.exposeStatus === "connected") {
+      return endpoint.url;
+    }
+
+    return "<not exposed>";
+  }, [endpoint]);
+
+  return (
+    <div
+      className={classNames(
+        "h-full flex flex-1 flex-col",
+        theme.bg3,
+        theme.text2,
+      )}
+    >
+      <div className="flex flex-col gap-1">
+        <Attribute name="Local URL" value={endpoint?.localUrl} noLeftPadding />
+
+        <Attribute name="Public URL" value={publicUrl} noLeftPadding />
+
+        <div className="flex flex-row items-center">
+          <label
+            htmlFor={toggleId}
+            className="min-w-[100px] invisible text-slate-500 dark:text-slate-400"
+          >
+            Toggle exposed
+          </label>
+
+          {(endpoint?.exposeStatus === "disconnected" ||
+            endpoint?.exposeStatus === "connecting") && (
+            <Button
+              id={toggleId}
+              small
+              title="Open a tunnel for this endpoint"
+              disabled={endpoint.exposeStatus === "connecting"}
+              className="px-0.5 h-7 content-end"
+              onClick={exposeEndpoint}
+            >
+              {endpoint.exposeStatus === "connecting"
+                ? "Exposing..."
+                : "Expose"}
+            </Button>
+          )}
+
+          {endpoint?.exposeStatus === "connected" && (
+            <Button
+              id={toggleId}
+              small
+              title="Close the tunnel for this endpoint"
+              className="px-0.5 h-7 content-end"
+              onClick={hideEndpoint}
+            >
+              Hide
+            </Button>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/file-browser-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/file-browser-view.tsx
new file mode 100644
index 00000000000..3f757a362f1
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/file-browser-view.tsx
@@ -0,0 +1,94 @@
+import type { TreeEntry } from "@wingconsole/design-system";
+import type { FormEventHandler } from "react";
+import { useCallback, useEffect, useState } from "react";
+
+import { FileBrowser } from "./file-browser.js";
+
+export interface FileBrowserViewProps {
+  isLoading: boolean;
+  files: string[];
+  deleteFilesHandler: (files: string[]) => Promise<void>;
+  downloadFilesHandler: (files: string[]) => Promise<void>;
+  uploadFilesHandler: (fileList: FileList) => Promise<void>;
+  currentFileContent: string | undefined;
+  onCurrentFileChange: (file: string | undefined) => void;
+}
+export const FileBrowserView = ({
+  files,
+  uploadFilesHandler,
+  deleteFilesHandler,
+  downloadFilesHandler,
+  currentFileContent,
+  onCurrentFileChange,
+  isLoading,
+}: FileBrowserViewProps) => {
+  const [fileEntries, setFileEntries] = useState<TreeEntry[]>([]);
+  const [selectedFiles, setSelectedFiles] = useState<string[]>([]);
+  const [currentFile, setCurrentFile] = useState<string>();
+  const [fileInputId, setFileInputId] = useState(new Date().toString());
+
+  useEffect(() => {
+    setFileEntries(
+      files.map((file) => ({
+        id: file,
+        name: file,
+      })) ?? [],
+    );
+  }, [files]);
+
+  useEffect(() => {
+    if (currentFile && !fileEntries.some((file) => file.id === currentFile)) {
+      setCurrentFile(undefined);
+    }
+  }, [fileEntries, currentFile]);
+
+  useEffect(() => {
+    onCurrentFileChange(currentFile);
+  }, [currentFile, onCurrentFileChange]);
+
+  const uploadSelectedFiles: FormEventHandler<HTMLInputElement> = useCallback(
+    async (event) => {
+      await uploadFilesHandler(event.currentTarget.files ?? new FileList());
+      // force re-render to avoid problems uploading the same file twice
+      setFileInputId(new Date().toString());
+    },
+    [uploadFilesHandler],
+  );
+
+  const deleteSelectedFiles = useCallback(async () => {
+    if (currentFile) {
+      setCurrentFile(undefined);
+    }
+    await deleteFilesHandler(selectedFiles);
+    setSelectedFiles([]);
+  }, [currentFile, deleteFilesHandler, selectedFiles]);
+
+  const downloadSelectedFiles = useCallback(async () => {
+    await downloadFilesHandler(selectedFiles);
+    setSelectedFiles([]);
+  }, [selectedFiles, downloadFilesHandler]);
+
+  const downloadCurrentFile = useCallback(async () => {
+    if (!currentFile) {
+      return;
+    }
+    void downloadFilesHandler([currentFile]);
+  }, [currentFile, downloadFilesHandler]);
+
+  return (
+    <FileBrowser
+      isLoading={isLoading}
+      files={fileEntries}
+      selectedFiles={selectedFiles}
+      selectedFile={currentFile ?? ""}
+      selectedFileData={currentFileContent}
+      fileInputId={fileInputId}
+      onDeleteSelectedFilesClick={deleteSelectedFiles}
+      onDownloadSelectedFilesClick={downloadSelectedFiles}
+      onDownloadCurrentFileClick={downloadCurrentFile}
+      onUploadSelectedFilesClick={uploadSelectedFiles}
+      onSelectedEntriesChange={setSelectedFiles}
+      onCurrentEntryChange={setCurrentFile}
+    />
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/file-browser.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/file-browser.tsx
new file mode 100644
index 00000000000..2d4bc72596d
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/file-browser.tsx
@@ -0,0 +1,216 @@
+import {
+  ArrowDownTrayIcon,
+  ArrowTopRightOnSquareIcon,
+  XMarkIcon,
+} from "@heroicons/react/24/outline";
+import type { TreeEntry } from "@wingconsole/design-system";
+import {
+  Button,
+  FilePreview,
+  Modal,
+  ResponseInput,
+  ToolbarButton,
+  Tree,
+  getPreviewType,
+  useTheme,
+} from "@wingconsole/design-system";
+import classNames from "classnames";
+import type { FormEvent } from "react";
+import { useCallback, useContext, useMemo, useRef, useState } from "react";
+
+import { LayoutContext, LayoutType } from "../../layout/layout-provider.js";
+
+export interface FileBrowserProps {
+  selectedFiles: string[];
+  files: TreeEntry[];
+  fileInputId: string;
+  selectedFile: string;
+  isLoading: boolean;
+  selectedFileData: string | undefined;
+  onDownloadSelectedFilesClick: () => void;
+  onDownloadCurrentFileClick: () => void;
+  onDeleteSelectedFilesClick: () => void;
+  onUploadSelectedFilesClick: (event: FormEvent<HTMLInputElement>) => void;
+  onSelectedEntriesChange: (entries: string[]) => void;
+  onCurrentEntryChange: (index: string | undefined) => void;
+}
+
+export const FileBrowser = ({
+  selectedFiles,
+  files,
+  fileInputId,
+  selectedFileData,
+  selectedFile,
+  isLoading,
+  onDownloadSelectedFilesClick,
+  onDownloadCurrentFileClick,
+  onDeleteSelectedFilesClick,
+  onUploadSelectedFilesClick,
+  onSelectedEntriesChange,
+  onCurrentEntryChange,
+}: FileBrowserProps) => {
+  const { theme } = useTheme();
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const previewType = useMemo(() => {
+    return getPreviewType(selectedFile ?? "");
+  }, [selectedFile]);
+
+  const [validPreviewTypes] = useState(
+    () => new Set(["image", "video", "pdf", "text"]),
+  );
+  const [showPreview, setShowPreview] = useState(false);
+
+  const currentRef = useRef<HTMLButtonElement>(null);
+
+  const closePreview = useCallback(() => {
+    setShowPreview(false);
+    currentRef.current?.focus();
+  }, []);
+
+  const layoutType = useContext(LayoutContext);
+
+  const onOpenEntry = useCallback(() => {
+    if (validPreviewTypes.has(previewType)) {
+      setShowPreview(true);
+    }
+  }, [previewType, validPreviewTypes]);
+
+  return (
+    <div className="h-full flex-1 flex flex-col text-sm space-y-1.5">
+      <div className="flex justify-between items-center gap-1">
+        <div className="flex items-center gap-1">
+          <Button
+            label="Download"
+            disabled={selectedFiles.length === 0}
+            onClick={onDownloadSelectedFilesClick}
+            dataTestid="cloud.bucket:download"
+          />
+          <Button
+            label="Delete"
+            disabled={selectedFiles.length === 0}
+            onClick={onDeleteSelectedFilesClick}
+            dataTestid="cloud.bucket:delete-file"
+          />
+        </div>
+
+        <div>
+          <input
+            key={fileInputId}
+            ref={fileInputRef}
+            type="file"
+            className="hidden"
+            onInput={onUploadSelectedFilesClick}
+            multiple
+          />
+          <Button
+            label="Upload"
+            onClick={() => {
+              fileInputRef.current?.click();
+            }}
+            dataTestid="cloud.bucket:upload"
+          />
+        </div>
+      </div>
+
+      {files.length === 0 && (
+        <div
+          className={classNames(
+            theme.bgInput,
+            theme.text2,
+            theme.borderInput,
+            "px-2.5 py-1.5",
+            "outline-none rounded text-center inline-block w-full text-xs",
+          )}
+          data-testid="cloud.bucket:empty-state"
+        >
+          No files
+        </div>
+      )}
+      {files.length > 0 && (
+        <Tree
+          currentRef={currentRef}
+          entries={files}
+          selectedEntries={selectedFiles}
+          onCurrentChange={onCurrentEntryChange}
+          onSelectionChange={onSelectedEntriesChange}
+          onOpenEntry={onOpenEntry}
+          dataTestid="cloud.bucket:files"
+          className={classNames(
+            "overflow-y-auto resize-y",
+            layoutType === LayoutType.Tutorial && "min-h-[4rem]",
+            layoutType !== LayoutType.Tutorial && "h-48 min-h-[6rem]",
+          )}
+        />
+      )}
+
+      {selectedFile && (
+        <div className="space-y-1 pt-2">
+          <div className={classNames(theme.text2, "text-sm flex gap-x-1")}>
+            <span className={theme.text1}>File:</span>
+            <span className="truncate">{selectedFile}</span>
+            <div className="grow" />
+            {validPreviewTypes.has(previewType) && (
+              <ToolbarButton title="Open" onClick={() => setShowPreview(true)}>
+                <ArrowTopRightOnSquareIcon className="w-4 h-4" />
+                <span>Open</span>
+              </ToolbarButton>
+            )}
+          </div>
+          <ResponseInput
+            empty={!selectedFileData}
+            loading={!showPreview && isLoading}
+          >
+            <FilePreview
+              filename={selectedFile}
+              content={selectedFileData ?? ""}
+              className={classNames(
+                previewType === "image" && "max-h-[25rem]",
+                previewType === "pdf" && "min-h-[25rem]",
+                previewType === "text" &&
+                  "max-h-[30rem] resize-y overflow-y-auto",
+              )}
+              dataTestid="cloud.bucket:file-preview"
+            />
+          </ResponseInput>
+        </div>
+      )}
+
+      <Modal
+        visible={showPreview}
+        setVisible={closePreview}
+        className="max-w-[80vw] space-y-1.5"
+      >
+        <div className={classNames(theme.text2, "text-md flex space-x-1")}>
+          <span className={theme.text1}>File:</span>
+          <span className="truncate">{selectedFile}</span>
+          <div className="grow" />
+          <ToolbarButton
+            title="Download"
+            disabled={!selectedFile || !selectedFileData}
+            onClick={onDownloadCurrentFileClick}
+          >
+            <ArrowDownTrayIcon className="w-5 h-5" />
+          </ToolbarButton>
+          <ToolbarButton title="Close" onClick={closePreview}>
+            <XMarkIcon className="w-5 h-5" />
+          </ToolbarButton>
+        </div>
+        <FilePreview
+          filename={selectedFile ?? ""}
+          content={selectedFileData ?? ""}
+          className={classNames(
+            previewType === "image" &&
+              "min-h-[15rem] min-w-[15rem] max-h-[70vh]",
+            previewType === "video" && "min-w-[70vw]",
+            previewType === "pdf" && "min-h-[70vh] min-w-[50vw]",
+            previewType === "text" && [
+              "min-w-[15rem] min-h-[20rem] max-h-[80vh] max-w-[75vw] w-full",
+              "resize overflow-auto",
+            ],
+          )}
+        />
+      </Modal>
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/function-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-interaction-view.tsx
similarity index 78%
rename from apps/wing-console/console/ui/src/features/function-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-interaction-view.tsx
index 2bba13d4ab6..b73910027f6 100644
--- a/apps/wing-console/console/ui/src/features/function-interaction-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-interaction-view.tsx
@@ -1,7 +1,7 @@
 import { memo } from "react";
 
-import { useFunction } from "../services/use-function.js";
-import { FunctionInteraction } from "../ui/function-interaction.js";
+import { FunctionInteraction } from "./function-interaction.js";
+import { useFunction } from "./use-function.js";
 
 export interface FunctionViewProps {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/ui/function-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-interaction.tsx
similarity index 100%
rename from apps/wing-console/console/ui/src/ui/function-interaction.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-interaction.tsx
diff --git a/apps/wing-console/console/ui/src/ui/function-metadata.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-metadata.tsx
similarity index 91%
rename from apps/wing-console/console/ui/src/ui/function-metadata.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-metadata.tsx
index c058705e09d..dccfb50b207 100644
--- a/apps/wing-console/console/ui/src/ui/function-metadata.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/function-metadata.tsx
@@ -1,7 +1,7 @@
 import { useTheme, Attribute } from "@wingconsole/design-system";
 import classNames from "classnames";
 
-import { MetadataNode } from "./resource-metadata.js";
+import type { MetadataNode } from "./resource-metadata.js";
 
 export interface FunctionMetadataProps {
   node: MetadataNode;
diff --git a/apps/wing-console/console/ui/src/features/queue-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-interaction-view.tsx
similarity index 76%
rename from apps/wing-console/console/ui/src/features/queue-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-interaction-view.tsx
index e10ef18f9de..3185a394c1e 100644
--- a/apps/wing-console/console/ui/src/features/queue-interaction-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-interaction-view.tsx
@@ -1,7 +1,7 @@
 import { memo } from "react";
 
-import { useQueue } from "../services/use-queue.js";
-import { QueueInteraction } from "../ui/queue-interaction.js";
+import { QueueInteraction } from "./queue-interaction.js";
+import { useQueue } from "./use-queue.js";
 
 export interface QueueViewProps {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/ui/queue-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-interaction.tsx
similarity index 100%
rename from apps/wing-console/console/ui/src/ui/queue-interaction.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-interaction.tsx
diff --git a/apps/wing-console/console/ui/src/features/queue-metadata-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-metadata-view.tsx
similarity index 80%
rename from apps/wing-console/console/ui/src/features/queue-metadata-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-metadata-view.tsx
index 4266a56395f..c47736b5891 100644
--- a/apps/wing-console/console/ui/src/features/queue-metadata-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-metadata-view.tsx
@@ -1,9 +1,9 @@
 import { useNotifications } from "@wingconsole/design-system";
 import { memo, useCallback } from "react";
 
-import { useQueue } from "../services/use-queue.js";
-import { QueueMetadata } from "../ui/queue-metadata.js";
-import { MetadataNode } from "../ui/resource-metadata.js";
+import { QueueMetadata } from "./queue-metadata.js";
+import type { MetadataNode } from "./resource-metadata.js";
+import { useQueue } from "./use-queue.js";
 
 export interface QueueMetadataProps {
   node: MetadataNode;
diff --git a/apps/wing-console/console/ui/src/ui/queue-metadata.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-metadata.tsx
similarity index 100%
rename from apps/wing-console/console/ui/src/ui/queue-metadata.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/queue-metadata.tsx
diff --git a/apps/wing-console/console/ui/src/features/redis-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/redis-interaction-view.tsx
similarity index 87%
rename from apps/wing-console/console/ui/src/features/redis-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/redis-interaction-view.tsx
index eb4bd557dbb..778de91a833 100644
--- a/apps/wing-console/console/ui/src/features/redis-interaction-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/redis-interaction-view.tsx
@@ -1,11 +1,9 @@
 import { createPersistentState } from "@wingconsole/use-persistent-state";
-import { memo, useCallback, useEffect, useState } from "react";
+import { memo, useCallback } from "react";
 
-import { useOpenExternal } from "../services/use-open-external.js";
-import { useRedis } from "../services/use-redis.js";
-import { TerminalHistoryItem } from "../shared/ternimal.js";
-import { useTerminalHistory } from "../shared/use-terminal-history.js";
-import { RedisInteraction } from "../ui/redis-interaction.js";
+import { RedisInteraction } from "./redis-interaction.js";
+import { useRedis } from "./use-redis.js";
+import { useTerminalHistory } from "./use-terminal-history.js";
 
 export interface RedisViewProps {
   resourcePath: string;
@@ -29,7 +27,6 @@ export const RedisInteractionView = memo(({ resourcePath }: RedisViewProps) => {
     useState: usePersistentState,
   });
 
-  const { open } = useOpenExternal();
   const { isLoading, redisUrl, execCommand } = useRedis({ resourcePath });
 
   const executeCommand = useCallback(
@@ -42,7 +39,7 @@ export const RedisInteractionView = memo(({ resourcePath }: RedisViewProps) => {
 
       switch (command.toLowerCase()) {
         case "help": {
-          open(REDIS_HELP_URL);
+          window.open(REDIS_HELP_URL, "_blank");
           updateTerminalHistory([
             { type: "message", message: command },
             {
@@ -70,7 +67,6 @@ export const RedisInteractionView = memo(({ resourcePath }: RedisViewProps) => {
     },
     [
       execCommand,
-      open,
       updateCommandHistory,
       updateTerminalHistory,
       clearTerminalHistory,
diff --git a/apps/wing-console/console/ui/src/ui/redis-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/redis-interaction.tsx
similarity index 98%
rename from apps/wing-console/console/ui/src/ui/redis-interaction.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/redis-interaction.tsx
index cc7070a0984..c5485a1ebbf 100644
--- a/apps/wing-console/console/ui/src/ui/redis-interaction.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/redis-interaction.tsx
@@ -2,7 +2,7 @@ import { Attribute, useTheme } from "@wingconsole/design-system";
 import classNames from "classnames";
 import { useCallback, useEffect, useId, useRef } from "react";
 
-import { TerminalHistoryItem } from "../shared/ternimal.js";
+import type { TerminalHistoryItem } from "../shared/terminal.js";
 
 const REDIS_PROMPT = "redis>";
 
diff --git a/apps/wing-console/console/ui/src/features/resource-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/resource-interaction-view.tsx
similarity index 86%
rename from apps/wing-console/console/ui/src/features/resource-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/resource-interaction-view.tsx
index 87ee71b52bd..6701856714b 100644
--- a/apps/wing-console/console/ui/src/features/resource-interaction-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/resource-interaction-view.tsx
@@ -3,10 +3,9 @@ import { memo, useCallback } from "react";
 import { ApiInteractionView } from "./api-interaction-view.js";
 import { BucketInteractionView } from "./bucket-interaction-view.js";
 import { CounterInteractionView } from "./counter-interaction-view.js";
-import { DynamodbTableInteractionView } from "./dynamodb-table-interaction-view.js";
+import { EndpointInteractionView } from "./endpoint-interaction-view.js";
 import { FunctionInteractionView } from "./function-interaction-view.js";
 import { QueueInteractionView } from "./queue-interaction-view.js";
-import { ReactAppInteractionView } from "./react-app-interaction-view.js";
 import { RedisInteractionView } from "./redis-interaction-view.js";
 import { ScheduleInteractionView } from "./schedule-interaction-view.js";
 import { TableInteractionView } from "./table-interaction-view.js";
@@ -50,14 +49,11 @@ export const ResourceInteractionView = memo(
         case "@winglang/sdk.ex.Redis": {
           return <RedisInteractionView resourcePath={resourcePath} />;
         }
-        case "@winglang/sdk.ex.ReactApp": {
-          return <ReactAppInteractionView resourcePath={resourcePath} />;
-        }
         case "@winglang/sdk.cloud.Website": {
           return <WebsiteInteractionView resourcePath={resourcePath} />;
         }
-        case "@winglang/sdk.ex.DynamodbTable": {
-          return <DynamodbTableInteractionView resourcePath={resourcePath} />;
+        case "@winglang/sdk.cloud.Endpoint": {
+          return <EndpointInteractionView resourcePath={resourcePath} />;
         }
         default: {
           return <UnsupportedInteractionView resourceType={resourceType} />;
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/resource-metadata.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/resource-metadata.tsx
new file mode 100644
index 00000000000..48fe84d1e8d
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/resource-metadata.tsx
@@ -0,0 +1,477 @@
+import { CubeIcon } from "@heroicons/react/20/solid";
+import {
+  CubeTransparentIcon,
+  CursorArrowRaysIcon,
+} from "@heroicons/react/24/outline";
+import type { IconComponent } from "@wingconsole/design-system";
+import {
+  useTheme,
+  InspectorSection,
+  Pill,
+  ResourceIcon,
+  getResourceIconComponent,
+  Attribute,
+  ScrollableArea,
+} from "@wingconsole/design-system";
+import type { NodeDisplay } from "@wingconsole/server";
+import classNames from "classnames";
+import { memo, useCallback, useMemo, useState } from "react";
+
+import { trpc } from "../../../trpc.js";
+
+import { BucketMetadata } from "./bucket-metadata.js";
+import { CounterMetadata } from "./counter-metadata.js";
+import { CustomResourceUiItem } from "./custom-resource-item.js";
+import { FunctionMetadata } from "./function-metadata.js";
+import { QueueMetadataView } from "./queue-metadata-view.js";
+import { ResourceInteractionView } from "./resource-interaction-view.js";
+import { ScheduleMetadata } from "./schedule-metadata.js";
+
+interface AttributeGroup {
+  groupName: string;
+  actionName?: string;
+  icon?: IconComponent;
+}
+
+interface ConnectionsGroup {
+  groupName: string;
+  type: "inbound" | "outbound";
+  connections: {
+    id: string;
+    path: string;
+    icon: React.ReactNode;
+  }[];
+}
+
+interface Relationship {
+  id: string;
+  path: string;
+  type: string;
+  display?: NodeDisplay;
+}
+
+export interface MetadataNode {
+  id: string;
+  path: string;
+  type: string;
+  display?: NodeDisplay;
+  props?:
+    | {
+        [key: string]: any;
+      }
+    | undefined;
+}
+
+export interface MetadataProps {
+  node: MetadataNode;
+  inbound?: Relationship[];
+  outbound?: Relationship[];
+  onConnectionNodeClick?: (path: string) => void;
+}
+
+export const ResourceMetadata = memo(
+  ({ node, inbound, outbound }: MetadataProps) => {
+    const { theme } = useTheme();
+    const [openInspectorSections, setOpenInspectorSections] = useState(() => [
+      "resourceUI",
+      "interact",
+      "interact-actions",
+    ]);
+
+    const icon = useMemo(() => {
+      return getResourceIconComponent(node.type, {
+        resourceId: node.id,
+        icon: node.display?.icon,
+      });
+    }, [node]);
+
+    const { resourceGroup } = useMemo(() => {
+      const connectionsGroupsArray: ConnectionsGroup[] = [];
+      let resourceGroup: AttributeGroup | undefined;
+      if (node.props) {
+        switch (node.type) {
+          case "@winglang/sdk.cloud.Function": {
+            resourceGroup = {
+              groupName: "Function",
+              actionName: "Invoke",
+              icon,
+            };
+            break;
+          }
+          case "@winglang/sdk.cloud.Queue": {
+            resourceGroup = {
+              groupName: "Queue",
+              actionName: "Push Message",
+              icon,
+            };
+
+            break;
+          }
+          case "@winglang/sdk.cloud.Bucket": {
+            resourceGroup = {
+              groupName: "Bucket",
+              actionName: "Files",
+              icon,
+            };
+
+            break;
+          }
+          case "@winglang/sdk.cloud.Counter": {
+            resourceGroup = {
+              groupName: "Counter",
+              icon,
+            };
+
+            break;
+          }
+          case "@winglang/sdk.cloud.Topic": {
+            resourceGroup = {
+              groupName: "Topic",
+              actionName: "Publish Message",
+              icon,
+            };
+
+            break;
+          }
+          case "@winglang/sdk.cloud.Api": {
+            resourceGroup = {
+              groupName: "Api",
+              icon,
+            };
+
+            break;
+          }
+          case "@winglang/sdk.ex.Table": {
+            resourceGroup = {
+              groupName: "Table",
+              icon,
+            };
+
+            break;
+          }
+          case "@winglang/sdk.cloud.Schedule": {
+            resourceGroup = {
+              groupName: "Schedule",
+              icon,
+            };
+
+            break;
+          }
+          case "@winglang/sdk.ex.Redis": {
+            resourceGroup = {
+              groupName: "Redis",
+              icon,
+            };
+
+            break;
+          }
+        }
+      }
+
+      if (inbound && inbound.length > 0) {
+        connectionsGroupsArray.push({
+          groupName: "Inbound",
+          type: "inbound",
+          connections: inbound.map((relationship) => ({
+            id: relationship.id,
+            path: relationship.path,
+            icon: (
+              <ResourceIcon
+                resourceType={relationship.type}
+                resourcePath={relationship.path}
+                className="w-4 h-4"
+                color={relationship.display?.color}
+                icon={relationship.display?.icon}
+              />
+            ),
+          })),
+        });
+      }
+      if (outbound && outbound.length > 0) {
+        connectionsGroupsArray.push({
+          groupName: "Outbound",
+          type: "outbound",
+          connections: outbound.map((relationship) => ({
+            id: relationship.id,
+            path: relationship.path,
+            icon: (
+              <ResourceIcon
+                resourceType={relationship.type}
+                resourcePath={relationship.path}
+                className="w-4 h-4"
+                color={relationship.display?.color}
+                icon={relationship.display?.icon}
+              />
+            ),
+          })),
+        });
+      }
+      return {
+        resourceGroup,
+        connectionsGroups: connectionsGroupsArray,
+      };
+    }, [node, inbound, outbound, icon]);
+
+    const nodeLabel = useMemo(() => {
+      const cloudResourceTypeName = node.type.split(".").at(-1) || "";
+      const compilerNamed =
+        !!node.display?.title && node.display?.title !== cloudResourceTypeName;
+      return compilerNamed ? node.display?.title : node.id;
+    }, [node]);
+
+    const toggleInspectorSection = useCallback((section: string) => {
+      setOpenInspectorSections(([...sections]) => {
+        const index = sections.indexOf(section);
+        if (index === -1) {
+          sections.push(section);
+          return sections;
+        } else {
+          sections.splice(index, 1);
+          return sections;
+        }
+      });
+    }, []);
+
+    const resourceUI = trpc["app.getResourceUI"].useQuery({
+      resourcePath: node.path,
+    });
+
+    return (
+      <ScrollableArea
+        overflowY
+        className={classNames("h-full text-sm", theme.bg3, theme.text1)}
+        dataTestid={`resource-metadata:${node.path}`}
+      >
+        <div className="flex items-center gap-2 px-2 py-2">
+          <div className="flex-shrink-0">
+            <ResourceIcon
+              className="w-6 h-6"
+              resourceType={node.type}
+              resourcePath={node.path}
+              color={node.display?.color}
+              icon={node.display?.icon}
+            />
+          </div>
+
+          <div className="flex flex-col min-w-0">
+            <div className="text-sm font-medium truncate">{nodeLabel}</div>
+            <div className="flex">
+              <Pill>{node.type}</Pill>
+            </div>
+          </div>
+        </div>
+        {resourceUI.data && resourceUI.data.length > 0 && (
+          <InspectorSection
+            icon={icon ?? CubeIcon}
+            text={nodeLabel ?? "Properties"}
+            open={openInspectorSections.includes("resourceUI")}
+            onClick={() => toggleInspectorSection("resourceUI")}
+            headingClassName="pl-2"
+          >
+            <div className={classNames("border-t", theme.border4)}>
+              <div
+                className={classNames(
+                  "px-2 py-1.5 flex flex-col gap-y-1 gap-x-4",
+                  theme.bg3,
+                  theme.text1,
+                )}
+              >
+                {resourceUI.data.map((item, index) => (
+                  <CustomResourceUiItem key={index} item={item} />
+                ))}
+              </div>
+            </div>
+          </InspectorSection>
+        )}
+
+        {(node.type.startsWith("@winglang/sdk.cloud") ||
+          node.type.startsWith("@winglang/sdk.redis") ||
+          node.type.startsWith("@winglang/sdk.ex")) && (
+          <>
+            <InspectorSection
+              text={resourceGroup?.groupName || "Interact"}
+              icon={resourceGroup?.icon || CursorArrowRaysIcon}
+              open={openInspectorSections.includes("interact")}
+              onClick={() => toggleInspectorSection("interact")}
+              headingClassName="pl-2"
+            >
+              <div
+                className={classNames(
+                  "border-t",
+                  theme.border4,
+                  theme.bg3,
+                  theme.text1,
+                )}
+              >
+                {resourceGroup?.groupName && (
+                  <>
+                    {node.type === "@winglang/sdk.cloud.Function" && (
+                      <FunctionMetadata node={node} />
+                    )}
+                    {node.type === "@winglang/sdk.cloud.Queue" && (
+                      <QueueMetadataView node={node} />
+                    )}
+                    {node.type === "@winglang/sdk.cloud.Bucket" && (
+                      <BucketMetadata node={node} />
+                    )}
+                    {node.type === "@winglang/sdk.cloud.Counter" && (
+                      <CounterMetadata node={node} />
+                    )}
+                    {node.type === "@winglang/sdk.cloud.Schedule" && (
+                      <ScheduleMetadata node={node} />
+                    )}
+                    {resourceGroup?.actionName && (
+                      <InspectorSection
+                        text={resourceGroup.actionName}
+                        open={openInspectorSections.includes(
+                          "interact-actions",
+                        )}
+                        onClick={() =>
+                          toggleInspectorSection("interact-actions")
+                        }
+                        subection
+                        headingClassName="pl-2"
+                      >
+                        <div className="pl-6 pr-2 pb-2 h-full relative">
+                          <ResourceInteractionView
+                            key={node.path}
+                            resourceType={node.type}
+                            resourcePath={node.path}
+                          />
+                        </div>
+                      </InspectorSection>
+                    )}
+                  </>
+                )}
+                {(!resourceGroup?.groupName || !resourceGroup?.actionName) && (
+                  <div className="pl-6 pr-2 py-1 relative">
+                    <ResourceInteractionView
+                      key={node.path}
+                      resourceType={node.type}
+                      resourcePath={node.path}
+                    />
+                  </div>
+                )}
+              </div>
+            </InspectorSection>
+          </>
+        )}
+
+        {node && (
+          <>
+            <InspectorSection
+              text="Node"
+              icon={CubeTransparentIcon}
+              open={openInspectorSections.includes("node")}
+              onClick={() => toggleInspectorSection("node")}
+              headingClassName="pl-2"
+            >
+              <div className={classNames("border-t", theme.border4)}>
+                <div
+                  className={classNames(
+                    "px-2 py-1.5 flex flex-col gap-y-1 gap-x-4",
+                    theme.bg3,
+                    theme.text1,
+                  )}
+                >
+                  <Attribute name="ID" value={node.id} />
+                  <Attribute name="Path" value={node.path} />
+                  <Attribute name="Type" value={node.type} />
+                  {node.display?.description && (
+                    <Attribute
+                      name="Description"
+                      value={node.display.description}
+                    />
+                  )}
+                </div>
+              </div>
+            </InspectorSection>
+
+            {/* Need to fix the relationships data. */}
+            {/* {connectionsGroups && connectionsGroups.length > 0 && (
+              <InspectorSection
+                text="Relationships"
+                open={openInspectorSections.includes("relationships")}
+                icon={ArrowPathRoundedSquareIcon}
+                onClick={() => toggleInspectorSection("relationships")}
+                headingClassName="pl-2"
+              >
+                <div className={classNames("border-t", theme.border4)}>
+                  {connectionsGroups.map((connectionGroup) => (
+                    <div key={connectionGroup.groupName}>
+                      <div
+                        className={classNames(
+                          "relative",
+                          theme.bg3,
+                          theme.text1,
+                        )}
+                      >
+                        {connectionGroup.connections.map(
+                          (connection, index) => (
+                            <button
+                              key={`${connection.path}_${index}`}
+                              className={classNames(
+                                theme.bg3,
+                                theme.bg3Hover,
+                                theme.text1,
+                                "w-full flex-shrink-0 max-w-full truncate shadow-sm text-sm pl-4 pr-2 py-1 flex items-center gap-1 min-w-0",
+                              )}
+                              title={connection.path}
+                              onClick={() =>
+                                onConnectionNodeClick?.(connection.path)
+                              }
+                            >
+                              <div
+                                className={classNames(
+                                  "flex-0 flex-shrink-0 flex items-center gap-2 min-w-[100px]",
+                                  theme.text1,
+                                )}
+                              >
+                                <div className="pl-2 flex-0 flex-shrink-0">
+                                  {connectionGroup.type === "inbound" ? (
+                                    <ArrowLeftOnRectangleIcon
+                                      className="w-4 h-4 rotate-180 text-green-500"
+                                      aria-hidden="true"
+                                    />
+                                  ) : (
+                                    <ArrowRightOnRectangleIcon
+                                      className="w-4 h-4 text-red-500"
+                                      aria-hidden="true"
+                                    />
+                                  )}
+                                </div>
+                                <span
+                                  className={classNames(
+                                    "uppercase text-xs",
+                                    theme.text1,
+                                  )}
+                                >
+                                  {connectionGroup.type === "inbound"
+                                    ? "In"
+                                    : "Out"}
+                                </span>
+                              </div>
+
+                              <div className="flex items-center gap-1.5 ml-2 5 min-w-0">
+                                <div className="flex-shrink-0 -ml-1">
+                                  {connection.icon}
+                                </div>
+                                <div className="truncate">{connection.id}</div>
+                              </div>
+                            </button>
+                          ),
+                        )}
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              </InspectorSection>
+            )} */}
+
+            <div className={classNames(theme.border3, "border-t")}></div>
+          </>
+        )}
+      </ScrollableArea>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/schedule-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/schedule-interaction-view.tsx
similarity index 100%
rename from apps/wing-console/console/ui/src/features/schedule-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/schedule-interaction-view.tsx
diff --git a/apps/wing-console/console/ui/src/ui/schedule-metadata.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/schedule-metadata.tsx
similarity index 86%
rename from apps/wing-console/console/ui/src/ui/schedule-metadata.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/schedule-metadata.tsx
index 71bf105a760..22db9b538aa 100644
--- a/apps/wing-console/console/ui/src/ui/schedule-metadata.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/schedule-metadata.tsx
@@ -1,7 +1,7 @@
 import { useTheme, Attribute } from "@wingconsole/design-system";
 import classNames from "classnames";
 
-import { MetadataNode } from "./resource-metadata.js";
+import type { MetadataNode } from "../by-feature/inspector/resource-metadata.js";
 
 export interface ScheduleMetadataProps {
   node: MetadataNode;
diff --git a/apps/wing-console/console/ui/src/features/table-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction-view.tsx
similarity index 95%
rename from apps/wing-console/console/ui/src/features/table-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction-view.tsx
index 03cb5326013..72ec8eb3f8d 100644
--- a/apps/wing-console/console/ui/src/features/table-interaction-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction-view.tsx
@@ -1,8 +1,9 @@
 import { useNotifications, Attribute } from "@wingconsole/design-system";
 import { memo, useCallback, useEffect, useState } from "react";
 
-import { useTable } from "../services/use-table.js";
-import { Row, RowData, TableInteraction } from "../ui/table-interaction.js";
+import type { Row, RowData } from "./table-interaction.js";
+import { TableInteraction } from "./table-interaction.js";
+import { useTable } from "./use-table.js";
 
 export interface TableInteractionViewProps {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/ui/table-interaction.stories.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction.stories.tsx
similarity index 97%
rename from apps/wing-console/console/ui/src/ui/table-interaction.stories.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction.stories.tsx
index 05bee9f32dd..f7c134675e0 100644
--- a/apps/wing-console/console/ui/src/ui/table-interaction.stories.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction.stories.tsx
@@ -1,4 +1,4 @@
-import { Meta, StoryObj } from "@storybook/react";
+import type { Meta, StoryObj } from "@storybook/react";
 
 import { TableInteraction } from "./table-interaction.js";
 
diff --git a/apps/wing-console/console/ui/src/ui/table-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction.tsx
similarity index 99%
rename from apps/wing-console/console/ui/src/ui/table-interaction.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction.tsx
index 3e3012082b4..60916ca174a 100644
--- a/apps/wing-console/console/ui/src/ui/table-interaction.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/table-interaction.tsx
@@ -1,8 +1,8 @@
 import { PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
+import type { Column } from "@wingconsole/design-system";
 import {
   SpinnerLoader,
   useTheme,
-  Column,
   TableRow,
   getInputType,
 } from "@wingconsole/design-system";
diff --git a/apps/wing-console/console/ui/src/shared/ternimal.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/terminal.ts
similarity index 100%
rename from apps/wing-console/console/ui/src/shared/ternimal.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/terminal.ts
diff --git a/apps/wing-console/console/ui/src/features/topic-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/topic-interaction-view.tsx
similarity index 86%
rename from apps/wing-console/console/ui/src/features/topic-interaction-view.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/topic-interaction-view.tsx
index 73708bde83d..7e862ddd2b2 100644
--- a/apps/wing-console/console/ui/src/features/topic-interaction-view.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/topic-interaction-view.tsx
@@ -1,8 +1,8 @@
 import { useNotifications } from "@wingconsole/design-system";
 import { memo, useCallback } from "react";
 
-import { useTopic } from "../services/use-topic.js";
-import { TopicInteraction } from "../ui/topic-interaction.js";
+import { TopicInteraction } from "./topic-interaction.js";
+import { useTopic } from "./use-topic.js";
 
 export interface TopicViewProps {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/ui/topic-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/topic-interaction.tsx
similarity index 100%
rename from apps/wing-console/console/ui/src/ui/topic-interaction.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/topic-interaction.tsx
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/unsupported-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/unsupported-interaction-view.tsx
new file mode 100644
index 00000000000..348e535f2d0
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/unsupported-interaction-view.tsx
@@ -0,0 +1,13 @@
+import { memo } from "react";
+
+import { UnsupportedInteraction } from "./unsupported-interaction.js";
+
+export interface UnsupportedInteractionViewProps {
+  resourceType: string;
+}
+
+export const UnsupportedInteractionView = memo(
+  ({ resourceType }: UnsupportedInteractionViewProps) => {
+    return <UnsupportedInteraction resourceType={resourceType} />;
+  },
+);
diff --git a/apps/wing-console/console/ui/src/ui/unsupported-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/unsupported-interaction.tsx
similarity index 91%
rename from apps/wing-console/console/ui/src/ui/unsupported-interaction.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/unsupported-interaction.tsx
index 43d147f6187..aebd735194d 100644
--- a/apps/wing-console/console/ui/src/ui/unsupported-interaction.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/unsupported-interaction.tsx
@@ -4,14 +4,12 @@ import classNames from "classnames";
 
 export interface UnsupportedInteractionProps {
   resourceType: string;
-  onOpenIssueClick: (url: string) => void;
 }
 
 const newIssueUrl = "https://github.com/winglang/wing/issues/new/choose";
 
 export const UnsupportedInteraction = ({
   resourceType,
-  onOpenIssueClick,
 }: UnsupportedInteractionProps) => {
   const { theme } = useTheme();
 
@@ -38,7 +36,7 @@ export const UnsupportedInteraction = ({
             </h3>
             <div className="mt-2">
               <Button
-                onClick={() => onOpenIssueClick(newIssueUrl)}
+                onClick={() => window.open(newIssueUrl, "_blank")}
                 label="Open an issue"
               />
             </div>
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-api.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-api.ts
new file mode 100644
index 00000000000..e8526ea276b
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-api.ts
@@ -0,0 +1,43 @@
+import { useCallback, useEffect, useMemo } from "react";
+
+import { trpc } from "../../../trpc.js";
+
+import type { ApiRequest } from "./api.js";
+
+export interface UseApiOptions {
+  onFetchDataUpdate: (data: any) => void;
+}
+
+export const useApi = ({ onFetchDataUpdate }: UseApiOptions) => {
+  const fetch = trpc["api.fetch"].useMutation();
+
+  useEffect(() => {
+    onFetchDataUpdate(fetch.data);
+  }, [fetch.data, onFetchDataUpdate]);
+
+  const callFetch = useCallback(
+    async ({ url, route, method, variables, headers, body }: ApiRequest) => {
+      if (!url || !method || !route) {
+        return;
+      }
+      await fetch.mutateAsync({
+        url,
+        route,
+        variables,
+        method,
+        headers,
+        body,
+      });
+    },
+    [fetch],
+  );
+
+  const isLoading = useMemo(() => {
+    return fetch.isLoading;
+  }, [fetch.isLoading]);
+
+  return {
+    isLoading,
+    callFetch,
+  };
+};
diff --git a/apps/wing-console/console/ui/src/services/use-bucket.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-bucket.ts
similarity index 87%
rename from apps/wing-console/console/ui/src/services/use-bucket.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-bucket.ts
index 1494e933124..4707b40976b 100644
--- a/apps/wing-console/console/ui/src/services/use-bucket.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-bucket.ts
@@ -1,20 +1,15 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
-import { useDownloadFile } from "../shared/use-download-file.js";
-import { useUploadFile } from "../shared/use-upload-file.js";
-
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
+import { useDownloadFile } from "../../../use-download-file.js";
+import { useUploadFile } from "../../../use-upload-file.js";
 
 export interface UseBucketOptions {
   resourcePath: string;
-  onFileListChange: (files: string[]) => void;
   currentFile?: string;
 }
-export const useBucket = ({
-  resourcePath,
-  onFileListChange,
-  currentFile,
-}: UseBucketOptions) => {
+export const useBucket = ({ resourcePath, currentFile }: UseBucketOptions) => {
+  const [files, setFiles] = useState<string[]>([]);
   const { readBlob } = useUploadFile();
   const { download: downloadFileLocally, downloadFiles: downloadFilesLocally } =
     useDownloadFile();
@@ -23,7 +18,7 @@ export const useBucket = ({
     { resourcePath },
     {
       onSuccess(data) {
-        onFileListChange(data);
+        setFiles(data);
       },
     },
   );
@@ -49,8 +44,9 @@ export const useBucket = ({
   }, [currentFileContentQuery.data]);
 
   useEffect(() => {
-    onFileListChange(list.data ?? []);
-  }, [list.data, onFileListChange]);
+    if (!list.data) return;
+    setFiles([...list.data]);
+  }, [list.data]);
 
   const putFile = useCallback(
     (fileName: string, fileContent: string) => {
@@ -130,5 +126,6 @@ export const useBucket = ({
     deleteFile,
     currentFileContent,
     isLoading,
+    files,
   };
 };
diff --git a/apps/wing-console/console/ui/src/services/use-counter.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-counter.ts
similarity index 96%
rename from apps/wing-console/console/ui/src/services/use-counter.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-counter.ts
index f19139df0ad..34fe3a177fd 100644
--- a/apps/wing-console/console/ui/src/services/use-counter.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-counter.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
 
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
 
 export interface UseCounterOptions {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-endpoints.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-endpoints.ts
new file mode 100644
index 00000000000..cd0a5749eaf
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-endpoints.ts
@@ -0,0 +1,40 @@
+import { useEffect, useState, useCallback } from "react";
+
+import { trpc } from "../../../trpc.js";
+import type { EndpointItem } from "../../endpoints-pane/endpoint-item.js";
+
+export const useEndpoints = () => {
+  const [endpointList, setEndpointList] = useState<EndpointItem[]>([]);
+
+  const endpointListQuery = trpc["endpoint.list"].useQuery();
+
+  useEffect(() => {
+    return setEndpointList(endpointListQuery.data ?? []);
+  }, [endpointListQuery.data]);
+
+  const exposeEndpointMutation = trpc["endpoint.expose"].useMutation();
+  const exposeEndpoint = (resourcePath: string) => {
+    exposeEndpointMutation.mutate({ resourcePath });
+    setTimeout(endpointListQuery.refetch);
+  };
+
+  const hideEndpointMutation = trpc["endpoint.hide"].useMutation();
+  const hideEndpoint = (resourcePath: string) => {
+    hideEndpointMutation.mutate({ resourcePath });
+    setTimeout(endpointListQuery.refetch);
+  };
+
+  const getEndpoint = useCallback(
+    (resourcePath: string) => {
+      return endpointList.find((endpoint) => endpoint.id === resourcePath);
+    },
+    [endpointList],
+  );
+
+  return {
+    getEndpoint,
+    endpointList,
+    exposeEndpoint,
+    hideEndpoint,
+  };
+};
diff --git a/apps/wing-console/console/ui/src/services/use-function.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-function.ts
similarity index 94%
rename from apps/wing-console/console/ui/src/services/use-function.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-function.ts
index 8a006c814de..b4210760277 100644
--- a/apps/wing-console/console/ui/src/services/use-function.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-function.ts
@@ -1,6 +1,6 @@
 import { useMemo, useState } from "react";
 
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
 export interface UseFunctionOptions {
   resourcePath: string;
 }
diff --git a/apps/wing-console/console/ui/src/services/use-queue.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-queue.ts
similarity index 96%
rename from apps/wing-console/console/ui/src/services/use-queue.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-queue.ts
index e2775e776eb..fc278f82dfd 100644
--- a/apps/wing-console/console/ui/src/services/use-queue.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-queue.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
 
 export interface UseQueueOptions {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/services/use-redis.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-redis.ts
similarity index 94%
rename from apps/wing-console/console/ui/src/services/use-redis.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-redis.ts
index 74b6fdca7c5..d788ba29ef8 100644
--- a/apps/wing-console/console/ui/src/services/use-redis.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-redis.ts
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useState } from "react";
 
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
 
 export interface UseRedisOptions {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/services/use-table.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-table.tsx
similarity index 97%
rename from apps/wing-console/console/ui/src/services/use-table.tsx
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-table.tsx
index 2f46c0734e9..aed43ac274d 100644
--- a/apps/wing-console/console/ui/src/services/use-table.tsx
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-table.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from "react";
 
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
 
 export interface UseTableOptions {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/shared/use-terminal-history.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-terminal-history.ts
similarity index 95%
rename from apps/wing-console/console/ui/src/shared/use-terminal-history.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-terminal-history.ts
index 22d3019ee74..27543958c91 100644
--- a/apps/wing-console/console/ui/src/shared/use-terminal-history.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-terminal-history.ts
@@ -1,6 +1,6 @@
 import { useCallback, useState as useReactState } from "react";
 
-import { TerminalHistoryItem } from "./ternimal.js";
+import type { TerminalHistoryItem } from "./terminal.js";
 
 export interface UseTerminalHistoryOptions {
   useState?: typeof useReactState;
diff --git a/apps/wing-console/console/ui/src/services/use-topic.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-topic.ts
similarity index 89%
rename from apps/wing-console/console/ui/src/services/use-topic.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-topic.ts
index 78c78c0c1fa..1f8dfea8728 100644
--- a/apps/wing-console/console/ui/src/services/use-topic.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-topic.ts
@@ -1,4 +1,4 @@
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
 
 export interface UseTopicOptions {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/services/use-website.ts b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-website.ts
similarity index 90%
rename from apps/wing-console/console/ui/src/services/use-website.ts
rename to apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-website.ts
index 43bc2ece78f..6a9941ea0fc 100644
--- a/apps/wing-console/console/ui/src/services/use-website.ts
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/use-website.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 
-import { trpc } from "./trpc.js";
+import { trpc } from "../../../trpc.js";
 
 export interface UseWebsiteOptions {
   resourcePath: string;
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/website-interaction-view.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/website-interaction-view.tsx
new file mode 100644
index 00000000000..7249bc3ad35
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/website-interaction-view.tsx
@@ -0,0 +1,18 @@
+import { memo, useContext } from "react";
+
+import { AppContext } from "../../../AppContext.js";
+
+import { useWebsite } from "./use-website.js";
+import { WebsiteInteraction } from "./website-interaction.js";
+
+export interface WebsiteInteractionViewProps {
+  resourcePath: string;
+}
+export const WebsiteInteractionView = memo(
+  ({ resourcePath }: WebsiteInteractionViewProps) => {
+    const { appMode } = useContext(AppContext);
+    const { url } = useWebsite({ resourcePath });
+
+    return <WebsiteInteraction appMode={appMode} url={url} />;
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/website-interaction.tsx b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/website-interaction.tsx
new file mode 100644
index 00000000000..27b6416f901
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/inspector-pane/resource-panes/website-interaction.tsx
@@ -0,0 +1,31 @@
+import { Attribute } from "@wingconsole/design-system";
+
+import type { AppMode } from "../../../AppContext.js";
+
+export interface WebsiteInteractionProps {
+  url: string;
+  appMode: AppMode;
+}
+export const WebsiteInteraction = ({
+  appMode,
+  url,
+}: WebsiteInteractionProps) => {
+  return (
+    <div className="h-full flex-1 flex flex-col text-sm space-y-1">
+      <div className="relative grow flex-row flex items-center">
+        {appMode === "local" && (
+          <>
+            <Attribute
+              name="URL"
+              type={"url"}
+              value={url}
+              url={url}
+              noLeftPadding
+              dataTestId="cloud.website:open-url"
+            />
+          </>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/layout/default-layout.tsx b/apps/wing-console/console/ui/src/features/layout/default-layout.tsx
new file mode 100644
index 00000000000..5370593d21e
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/layout/default-layout.tsx
@@ -0,0 +1,375 @@
+import {
+  LeftResizableWidget,
+  RightResizableWidget,
+  TopResizableWidget,
+  USE_EXTERNAL_THEME_COLOR,
+  useTheme,
+} from "@wingconsole/design-system";
+import type { State, LayoutConfig, LayoutComponent } from "@wingconsole/server";
+import { useLoading } from "@wingconsole/use-loading";
+import classNames from "classnames";
+import { useCallback, useEffect, useMemo } from "react";
+
+import { BlueScreenOfDeath } from "../blue-screen-of-death/blue-screen-of-death.js";
+import { EndpointsTreeView } from "../endpoints-pane/endpoints-tree-view.js";
+import { Explorer } from "../explorer-pane/explorer.js";
+import { Hierarchy } from "../hierarchy-pane/hierarchy.js";
+import { Inspector } from "../inspector-pane/inspector.js";
+import { LogsWidget } from "../logs-pane/logs.js";
+import { useSelectionContext } from "../selection-context/selection-context.js";
+import { SignInModal } from "../sign-in/sign-in.js";
+import { StatusBar } from "../status-bar/status-bar.js";
+import { TestsTreeView } from "../tests-pane/tests-tree-view.js";
+import { WebSocketState } from "../websocket-state/websocket-state.js";
+
+import { useLayout } from "./use-layout.js";
+
+export interface LayoutProps {
+  cloudAppState: State;
+  wingVersion: string | undefined;
+  layoutConfig?: LayoutConfig;
+}
+
+const defaultLayoutConfig: LayoutConfig = {
+  leftPanel: {
+    components: [
+      {
+        type: "explorer",
+      },
+      {
+        type: "endpoints",
+      },
+      {
+        type: "tests",
+      },
+    ],
+  },
+  bottomPanel: {
+    components: [
+      {
+        type: "logs",
+      },
+    ],
+  },
+  statusBar: {
+    hide: false,
+    showThemeToggle: true,
+  },
+  errorScreen: {
+    position: "default",
+    displayLinks: true,
+  },
+  panels: {
+    rounded: false,
+  },
+};
+
+export const DefaultLayout = ({
+  cloudAppState,
+  wingVersion,
+  layoutConfig,
+}: LayoutProps) => {
+  const { theme } = useTheme();
+
+  const { loading, showTests, onResourceClick, title } = useLayout({
+    cloudAppState,
+  });
+
+  const { selectedItems, setSelectedItems } = useSelectionContext();
+
+  useEffect(() => {
+    document.title = title;
+  }, [title]);
+
+  const { loading: deferredLoading, setLoading: setDeferredLoading } =
+    useLoading({
+      delay: 800,
+      duration: 100,
+    });
+  useEffect(() => {
+    setDeferredLoading(loading);
+  }, [loading, setDeferredLoading]);
+
+  const layout: LayoutConfig = useMemo(() => {
+    return {
+      ...defaultLayoutConfig,
+      ...layoutConfig,
+    };
+  }, [layoutConfig]);
+
+  const selectedItemId = useMemo(() => selectedItems.at(0), [selectedItems]);
+
+  const onTestsSelectedItemsChange = useCallback(
+    (items: string[]) => {
+      if (!showTests) {
+        return;
+      }
+      setSelectedItems(items);
+    },
+    [showTests, setSelectedItems],
+  );
+
+  const renderLayoutComponent = useCallback(
+    (component: LayoutComponent) => {
+      switch (component.type) {
+        case "explorer": {
+          return (
+            <div key={component.type} className="flex grow">
+              <Hierarchy loading={loading} data-testid="explorer-tree-menu" />
+            </div>
+          );
+        }
+        case "tests": {
+          return (
+            <TestsTreeView
+              key={component.type}
+              onSelectedItemsChange={onTestsSelectedItemsChange}
+              selectedItemId={showTests ? selectedItemId : undefined}
+            />
+          );
+        }
+        case "logs": {
+          return (
+            <div
+              key={component.type}
+              className={classNames(
+                "flex-1 flex flex-col min-w-[10rem]",
+                theme.bg3,
+              )}
+            >
+              <LogsWidget onResourceClick={onResourceClick} />
+            </div>
+          );
+        }
+        case "endpoints": {
+          return <EndpointsTreeView key={component.type} />;
+        }
+      }
+    },
+    [
+      loading,
+      selectedItemId,
+      onTestsSelectedItemsChange,
+      showTests,
+      theme.bg3,
+      onResourceClick,
+    ],
+  );
+
+  return (
+    <>
+      <SignInModal />
+      <WebSocketState />
+
+      <div className={classNames("w-full h-full", theme.bg1)}>
+        <div
+          data-testid="default-layout"
+          className={classNames(
+            "w-full h-full flex flex-col select-none",
+            theme.text2,
+            layout?.panels?.rounded && "pt-1",
+          )}
+        >
+          <div
+            className={classNames(
+              "w-full h-full flex flex-col select-none",
+              "gap-0.5",
+            )}
+          >
+            {/* Middle panels */}
+            {cloudAppState !== "error" && (
+              <>
+                {loading && (
+                  <div
+                    data-testid="loading-overlay"
+                    className="fixed inset-0"
+                  />
+                )}
+
+                <div className="flex-1 flex relative gap-0.5">
+                  {!layout.leftPanel?.hide &&
+                    layout.leftPanel?.components?.length && (
+                      <RightResizableWidget
+                        className={classNames(
+                          USE_EXTERNAL_THEME_COLOR,
+                          "h-full flex flex-col w-80 min-w-[10rem] min-h-[10rem] gap-0.5",
+                        )}
+                      >
+                        {layout.leftPanel?.components.map(
+                          (component: LayoutComponent, index: number) => {
+                            const panelComponent = (
+                              <div
+                                className={classNames(
+                                  layout.panels?.rounded &&
+                                    "rounded-lg overflow-hidden",
+                                  index === 0 && "flex grow",
+                                  index > 0 && "h-full",
+                                )}
+                              >
+                                {renderLayoutComponent(component)}
+                              </div>
+                            );
+
+                            if (index > 0) {
+                              return (
+                                <TopResizableWidget
+                                  key={component.type}
+                                  className="h-1/5"
+                                >
+                                  {panelComponent}
+                                </TopResizableWidget>
+                              );
+                            }
+                            return (
+                              <div
+                                key={index}
+                                className={classNames(
+                                  "flex grow",
+                                  layout.panels?.rounded &&
+                                    "rounded-lg overflow-hidden",
+                                )}
+                              >
+                                {panelComponent}
+                              </div>
+                            );
+                          },
+                        )}
+                      </RightResizableWidget>
+                    )}
+
+                  <div className="flex-1 flex flex-col">
+                    <div className="flex-1 flex gap-0.5">
+                      <div
+                        className={classNames(
+                          "flex-1 flex flex-col",
+                          USE_EXTERNAL_THEME_COLOR,
+                          layout.panels?.rounded &&
+                            "rounded-lg overflow-hidden",
+                        )}
+                        data-testid="map-view"
+                      >
+                        <Explorer />
+                      </div>
+                      {!layout.rightPanel?.hide && (
+                        <LeftResizableWidget
+                          className={classNames(
+                            theme.border4,
+                            "flex-shrink w-80 min-w-[10rem] z-10",
+                            USE_EXTERNAL_THEME_COLOR,
+                          )}
+                        >
+                          <div
+                            className={classNames(
+                              "w-full h-full relative",
+                              theme.bg3,
+                              layout.panels?.rounded &&
+                                "rounded-lg overflow-hidden",
+                            )}
+                          >
+                            <Inspector />
+                          </div>
+                        </LeftResizableWidget>
+                      )}
+                    </div>
+                  </div>
+                </div>
+              </>
+            )}
+
+            {cloudAppState === "error" &&
+              layout.errorScreen?.position === "default" && (
+                <div className="flex-1 flex relative">
+                  <BlueScreenOfDeath />
+                </div>
+              )}
+
+            {/* Bottom panel */}
+            {!layout.bottomPanel?.hide && (
+              <TopResizableWidget
+                className={classNames(
+                  USE_EXTERNAL_THEME_COLOR,
+                  "relative flex",
+                  theme.text2,
+                  "min-h-[5rem]",
+                  "gap-0.5",
+                  (layout.bottomPanel?.size === "small" && "h-[8rem]") ||
+                    "h-[15rem]",
+                )}
+              >
+                {layout.bottomPanel?.components?.map(
+                  (component: LayoutComponent, index: number) => {
+                    const panelComponent = (
+                      <div
+                        key={index}
+                        className={classNames(
+                          layout.panels?.rounded &&
+                            "rounded-lg overflow-hidden",
+                          "flex grow w-full",
+                        )}
+                      >
+                        {renderLayoutComponent(component)}
+                      </div>
+                    );
+
+                    if (
+                      layout.bottomPanel?.components?.length &&
+                      layout.bottomPanel.components.length > 1 &&
+                      index !== layout.bottomPanel.components.length - 1
+                    ) {
+                      return (
+                        <RightResizableWidget
+                          key={component.type}
+                          className={classNames(
+                            "h-full w-1/4 flex flex-col min-w-[10rem] min-h-[10rem]",
+                          )}
+                        >
+                          {panelComponent}
+                        </RightResizableWidget>
+                      );
+                    }
+                    return panelComponent;
+                  },
+                )}
+              </TopResizableWidget>
+            )}
+          </div>
+
+          {cloudAppState === "error" &&
+            layout.errorScreen?.position === "bottom" && (
+              <>
+                <div className="fixed inset-0 flex justify-center items-center z-50 bg-black bg-opacity-40" />
+
+                <div className="fixed bottom-0 max-h-[80vh] w-full z-50">
+                  <TopResizableWidget
+                    className={classNames(
+                      theme.border4,
+                      "absolute flex",
+                      theme.bg3,
+                      theme.text2,
+                      "min-h-[5rem] h-[30rem]",
+                    )}
+                  >
+                    <BlueScreenOfDeath
+                      displayLinks={layout.errorScreen?.displayLinks}
+                    />
+                  </TopResizableWidget>
+                </div>
+              </>
+            )}
+
+          {/* Footer */}
+          {!layout.statusBar?.hide && (
+            <div className={classNames(USE_EXTERNAL_THEME_COLOR)}>
+              <StatusBar
+                wingVersion={wingVersion}
+                cloudAppState={cloudAppState}
+                isError={cloudAppState === "error"}
+                showThemeToggle={layout.statusBar?.showThemeToggle}
+              />
+            </div>
+          )}
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/layout/layout-provider.tsx b/apps/wing-console/console/ui/src/features/layout/layout-provider.tsx
similarity index 82%
rename from apps/wing-console/console/ui/src/layout/layout-provider.tsx
rename to apps/wing-console/console/ui/src/features/layout/layout-provider.tsx
index 95f5e95e769..f37c2be73ea 100644
--- a/apps/wing-console/console/ui/src/layout/layout-provider.tsx
+++ b/apps/wing-console/console/ui/src/features/layout/layout-provider.tsx
@@ -1,6 +1,7 @@
 import { createContext } from "react";
 
-import { DefaultLayout, LayoutProps } from "./default-layout.js";
+import type { LayoutProps } from "./default-layout.js";
+import { DefaultLayout } from "./default-layout.js";
 
 export enum LayoutType {
   Default = 1,
@@ -8,6 +9,7 @@ export enum LayoutType {
   Tutorial,
   Vscode,
   WingCloud,
+  Map,
 }
 
 export const LayoutContext = createContext(LayoutType.Default);
@@ -62,7 +64,6 @@ export function LayoutProvider({
         },
         errorScreen: {
           position: "bottom",
-          displayTitle: false,
           displayLinks: false,
         },
         statusBar: {
@@ -93,6 +94,23 @@ export function LayoutProvider({
       };
       break;
     }
+    case LayoutType.Map: {
+      layoutConfig = {
+        leftPanel: {
+          hide: true,
+        },
+        bottomPanel: {
+          hide: true,
+        },
+        statusBar: {
+          hide: true,
+        },
+        rightPanel: {
+          hide: true,
+        },
+      };
+      break;
+    }
   }
 
   return (
diff --git a/apps/wing-console/console/ui/src/features/layout/use-layout.ts b/apps/wing-console/console/ui/src/features/layout/use-layout.ts
new file mode 100644
index 00000000000..d1b6b9733df
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/layout/use-layout.ts
@@ -0,0 +1,54 @@
+import type { State } from "@wingconsole/server";
+import { useLoading } from "@wingconsole/use-loading";
+import { useEffect, useContext, useMemo, useCallback } from "react";
+
+import { trpc } from "../../trpc.js";
+import { useSelectionContext } from "../selection-context/selection-context.js";
+import { TestsContext } from "../tests-pane/tests-context.js";
+
+export interface UseLayoutProps {
+  cloudAppState: State;
+}
+
+export const useLayout = ({ cloudAppState }: UseLayoutProps) => {
+  const { setSelectedItems } = useSelectionContext();
+
+  const { showTests } = useContext(TestsContext);
+
+  const wingfileQuery = trpc["app.wingfile"].useQuery();
+  const wingfile = useMemo(() => {
+    return wingfileQuery.data;
+  }, [wingfileQuery.data]);
+  const title = useMemo(() => {
+    if (!wingfile) {
+      return "Wing Console";
+    }
+    return `${wingfile} - Wing Console`;
+  }, [wingfile]);
+
+  const { loading, setLoading } = useLoading({
+    duration: 400,
+  });
+
+  useEffect(() => {
+    setLoading(
+      cloudAppState === "loadingSimulator" || cloudAppState === "compiling",
+    ),
+      [cloudAppState];
+  });
+
+  const onResourceClick = useCallback(
+    (path: string) => {
+      setSelectedItems([path]);
+    },
+    [setSelectedItems],
+  );
+
+  return {
+    loading,
+    showTests,
+    onResourceClick,
+    title,
+    wingfile,
+  };
+};
diff --git a/apps/wing-console/console/ui/src/features/logs-pane/console-logs-filters.tsx b/apps/wing-console/console/ui/src/features/logs-pane/console-logs-filters.tsx
new file mode 100644
index 00000000000..be6708edc69
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/logs-pane/console-logs-filters.tsx
@@ -0,0 +1,330 @@
+import {
+  ExclamationTriangleIcon,
+  MagnifyingGlassIcon,
+  NoSymbolIcon,
+} from "@heroicons/react/24/outline";
+import {
+  Button,
+  getResourceIconComponent,
+  Input,
+  Listbox,
+  useTheme,
+} from "@wingconsole/design-system";
+import type { LogLevel } from "@wingconsole/server";
+import classNames from "classnames";
+import debounce from "lodash.debounce";
+import uniqby from "lodash.uniqby";
+import { memo, useCallback, useEffect, useMemo, useState } from "react";
+
+export const LOG_LEVELS: LogLevel[] = ["verbose", "info", "warn", "error"];
+
+const logLevelNames = {
+  verbose: "Verbose",
+  info: "Info",
+  warn: "Warnings",
+  error: "Errors",
+} as const;
+
+interface Resource {
+  id: string;
+  type?: string;
+}
+
+export interface ConsoleLogsFiltersProps {
+  selectedLogTypeFilters: LogLevel[];
+  setSelectedLogTypeFilters: (types: LogLevel[]) => void;
+  clearLogs: () => void;
+  onSearch: (search: string) => void;
+  resources?: Resource[];
+  selectedResourceIds: string[];
+  setSelectedResourceIds: (ids: string[]) => void;
+  selectedResourceTypes: string[];
+  setSelectedResourceTypes: (types: string[]) => void;
+  onResetFilters: () => void;
+  shownLogs: number;
+  hiddenLogs: number;
+}
+
+const getResourceIdLabel = (id: string) => id;
+
+const getResourceTypeLabel = (type?: string) =>
+  type?.replaceAll("@winglang/", "") ?? "";
+
+export const ConsoleLogsFilters = memo(
+  ({
+    selectedLogTypeFilters,
+    setSelectedLogTypeFilters,
+    clearLogs,
+    onSearch,
+    resources,
+    selectedResourceIds,
+    setSelectedResourceIds,
+    selectedResourceTypes,
+    setSelectedResourceTypes,
+    onResetFilters,
+    shownLogs,
+    hiddenLogs,
+  }: ConsoleLogsFiltersProps) => {
+    const { theme } = useTheme();
+
+    const [searchText, setSearchText] = useState("");
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const debouncedOnSearch = useCallback(debounce(onSearch, 300), [onSearch]);
+    useEffect(() => {
+      debouncedOnSearch(searchText);
+    }, [debouncedOnSearch, searchText]);
+
+    const [defaultLogTypeSelection] = useState(selectedLogTypeFilters.sort());
+    const resetFiltersDisabled = useMemo(() => {
+      return (
+        selectedLogTypeFilters === defaultLogTypeSelection &&
+        selectedResourceIds.length === 0 &&
+        selectedResourceTypes.length === 0
+      );
+    }, [
+      defaultLogTypeSelection,
+      selectedLogTypeFilters,
+      selectedResourceIds,
+      selectedResourceTypes,
+    ]);
+
+    const renderResourceIdsLabel = useCallback(
+      (selected?: string[]) => {
+        if (!selected || selected.length === 0) {
+          return <span className="truncate">All resources</span>;
+        }
+
+        const type = selected[0] as string;
+        const Icon = getResourceIconComponent(type);
+        return (
+          <span className="flex items-center truncate gap-1">
+            <Icon className={classNames("size-4 shrink-0", theme.text2)} />
+            <span className="truncate">{getResourceIdLabel(type)}</span>
+            {selected.length > 1 && (
+              <span className="opacity-80">
+                {" "}
+                and {selected.length - 1} more
+              </span>
+            )}
+          </span>
+        );
+      },
+      [theme.text2],
+    );
+
+    const renderResourceTypesLabel = useCallback((selected?: string[]) => {
+      if (!selected || selected.length === 0) {
+        return <span className="truncate">All types</span>;
+      }
+
+      const type = selected[0] as string;
+      const Icon = getResourceIconComponent(selected[0]);
+      return (
+        <span className="flex items-center truncate gap-1">
+          <Icon className="size-4 shrink-0" />
+          <span className="truncate">{getResourceTypeLabel(type)}</span>
+          {selected.length > 1 && (
+            <span className="opacity-80"> and {selected.length - 1} more</span>
+          )}
+        </span>
+      );
+    }, []);
+
+    const resourceIdItems = useMemo(() => {
+      if (!resources) {
+        return [];
+      }
+      let filteredResources = resources;
+
+      // filter resources by selected types
+      if (selectedResourceTypes.length > 0) {
+        filteredResources = resources.filter((resource) => {
+          return (
+            selectedResourceIds.includes(resource.id) ||
+            selectedResourceTypes.includes(resource.type ?? "")
+          );
+        });
+      }
+
+      return filteredResources.map((resource) => ({
+        label: getResourceIdLabel(resource.id),
+        value: resource.id,
+        icon: getResourceIconComponent(resource.type),
+      }));
+    }, [resources, selectedResourceTypes, selectedResourceIds]);
+
+    const resourceTypeItems = useMemo(() => {
+      if (!resources) {
+        return [];
+      }
+      const resourceTypes = uniqby(
+        resources
+          .sort((a, b) => a.type?.localeCompare(b.type ?? "") ?? 0)
+          .filter((resource) => resource.type !== undefined),
+        (resource) => resource.type,
+      );
+
+      return resourceTypes.map((resource) => ({
+        label: getResourceTypeLabel(resource.type),
+        value: resource.type ?? "",
+        icon: getResourceIconComponent(resource.type),
+      }));
+    }, [resources]);
+
+    const logTypeLabel = useMemo(() => {
+      if (selectedLogTypeFilters.length === LOG_LEVELS.length) {
+        return "All levels";
+      } else if (
+        selectedLogTypeFilters.sort().toString() ===
+        defaultLogTypeSelection.sort().toString()
+      ) {
+        return "Default levels";
+      } else if (selectedLogTypeFilters.length === 0) {
+        return "Hide all";
+      } else if (
+        selectedLogTypeFilters.length === 1 &&
+        selectedLogTypeFilters[0]
+      ) {
+        return `${logLevelNames[selectedLogTypeFilters[0]]} only`;
+      } else {
+        return "Custom levels";
+      }
+    }, [selectedLogTypeFilters, defaultLogTypeSelection]);
+
+    const showIncompatibleResourceTypeWarning = useMemo(() => {
+      if (!resources || selectedResourceTypes.length === 0) {
+        return false;
+      }
+      return selectedResourceIds.some((id) => {
+        const resource = resources?.find((r) => r.id === id);
+        return resource && !selectedResourceTypes.includes(resource.type ?? "");
+      });
+    }, [resources, selectedResourceIds, selectedResourceTypes]);
+
+    const showAllLogsHiddenWarning = useMemo(() => {
+      return shownLogs === 0 && hiddenLogs > 0;
+    }, [shownLogs, hiddenLogs]);
+
+    return (
+      <div className="flex flex-col gap-1">
+        <div className="flex px-2 space-x-2 py-1 overflow-x-auto">
+          <Button
+            icon={NoSymbolIcon}
+            className="px-1.5"
+            onClick={clearLogs}
+            title="Clear logs"
+          />
+          <Input
+            value={searchText}
+            className="max-w-[8rem] md:min-w-[14rem]"
+            leftIcon={MagnifyingGlassIcon}
+            type="text"
+            placeholder="Filter..."
+            onChange={(event) => setSearchText(event.target.value)}
+          />
+          <Listbox
+            label={logTypeLabel}
+            items={LOG_LEVELS.map((type) => ({
+              value: type,
+              label: logLevelNames[type],
+            }))}
+            selected={selectedLogTypeFilters}
+            onChange={setSelectedLogTypeFilters as any}
+            defaultSelection={defaultLogTypeSelection}
+          />
+
+          <Listbox
+            className="max-w-[8rem] md:max-w-[14rem]"
+            renderLabel={renderResourceTypesLabel}
+            items={resourceTypeItems}
+            selected={selectedResourceTypes}
+            onChange={setSelectedResourceTypes}
+            defaultLabel="All types"
+            defaultSelection={[]}
+            showSearch
+            notFoundLabel="No types found for the given query"
+          />
+
+          <Listbox
+            className="max-w-[8rem] md:max-w-[14rem]"
+            renderLabel={renderResourceIdsLabel}
+            items={resourceIdItems}
+            selected={selectedResourceIds}
+            onChange={setSelectedResourceIds}
+            defaultLabel="All resources"
+            defaultSelection={[]}
+            showSearch
+            notFoundLabel="No resources found for the given query"
+          />
+
+          <button
+            disabled={resetFiltersDisabled}
+            onClick={onResetFilters}
+            title="Reset filters"
+            className={classNames(
+              "inline-flex gap-2 items-center text-xs font-normal outline-none rounded",
+              "whitespace-nowrap",
+              "border shadow-sm px-2.5 py-1.5",
+              theme.borderInput,
+              theme.textInput,
+              resetFiltersDisabled && "cursor-not-allowed opacity-50",
+              !resetFiltersDisabled && [
+                "cursor-pointer",
+                theme.bgInputHover,
+                theme.focusInput,
+              ],
+            )}
+          >
+            Reset filters
+          </button>
+        </div>
+
+        {(showIncompatibleResourceTypeWarning || showAllLogsHiddenWarning) && (
+          <div
+            className={classNames(
+              "flex px-2 py-1 text-xs gap-2",
+              "text-slate-600 dark:text-slate-300 font-light",
+              theme.bg4,
+            )}
+          >
+            <div className="flex gap-1">
+              {showIncompatibleResourceTypeWarning && (
+                <span className="flex gap-1">
+                  <ExclamationTriangleIcon className="size-4" />
+                  The selected resource Ids and resource type filters are
+                  incompatible.
+                </span>
+              )}
+              {!showIncompatibleResourceTypeWarning &&
+                showAllLogsHiddenWarning && (
+                  <>
+                    <span>
+                      All logs entries are hidden by the current filters.
+                    </span>
+                    <span className="italic opacity-80">
+                      ({hiddenLogs} hidden{" "}
+                      {hiddenLogs > 1 ? "entries" : "entry"})
+                    </span>
+                  </>
+                )}
+            </div>
+
+            <button
+              onClick={onResetFilters}
+              className={classNames(
+                "text-xs underline cursor-pointer rounded",
+                "px-1 outline-none transition-all",
+                theme.focusInput,
+                theme.text1,
+                theme.text1Hover,
+              )}
+            >
+              Reset filters
+            </button>
+          </div>
+        )}
+      </div>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/console-logs.tsx b/apps/wing-console/console/ui/src/features/logs-pane/console-logs.tsx
similarity index 79%
rename from apps/wing-console/console/ui/src/features/console-logs.tsx
rename to apps/wing-console/console/ui/src/features/logs-pane/console-logs.tsx
index 04dda199630..3c6be8f0e5c 100644
--- a/apps/wing-console/console/ui/src/features/console-logs.tsx
+++ b/apps/wing-console/console/ui/src/features/logs-pane/console-logs.tsx
@@ -4,14 +4,12 @@ import {
   XCircleIcon,
 } from "@heroicons/react/24/outline";
 import { useTheme, ResourceIcon } from "@wingconsole/design-system";
-import { LogEntry } from "@wingconsole/server";
+import type { LogEntry } from "@wingconsole/server";
 import classNames from "classnames";
 import Linkify from "linkify-react";
 import throttle from "lodash.throttle";
 import { Fragment, memo, useEffect, useMemo, useRef, useState } from "react";
 
-import { OpenFileInEditorButton } from "../shared/use-file-link.js";
-
 const dateTimeFormat = new Intl.DateTimeFormat(undefined, {
   hour: "2-digit",
   minute: "2-digit",
@@ -30,6 +28,14 @@ function logText(log: LogEntry, expanded: boolean) {
   return expanded ? log.message : log.message?.split("\n")?.[0];
 }
 
+function nodePathBaseName(nodePath: string) {
+  return nodePath.split("/").at(-1);
+}
+
+function nodePathParentName(nodePath: string) {
+  return nodePath.split("/").slice(2, -1).join("/");
+}
+
 const LogEntryRow = memo(
   ({ log, showIcons = true, onRowClick, onResourceClick }: LogEntryProps) => {
     const { theme } = useTheme();
@@ -67,6 +73,16 @@ const LogEntryRow = memo(
       [expanded],
     );
 
+    const resourceName = useMemo(
+      () => log.ctx?.label || nodePathBaseName(log.ctx?.sourcePath ?? ""),
+      [log.ctx?.label, log.ctx?.sourcePath],
+    );
+
+    const parentName = useMemo(
+      () => nodePathParentName(log.ctx?.sourcePath ?? ""),
+      [log.ctx?.sourcePath],
+    );
+
     return (
       <Fragment>
         {/*TODO: Fix a11y*/}
@@ -107,18 +123,20 @@ const LogEntryRow = memo(
           )}
 
           {log.timestamp && !log.ctx?.hideTimestamp && (
-            <div className={classNames(theme.text2, "flex-shrink-0")}>
+            <div
+              className={classNames(
+                theme.text2,
+                "flex-shrink-0 select-none pointer-events-none",
+              )}
+            >
               {dateTimeFormat.format(log.timestamp)}
             </div>
           )}
           <div
-            className={classNames(
-              "cursor-default select-text min-w-0 text-left grow",
-              {
-                truncate: !expanded,
-                "ml-2": log.timestamp && !log.ctx?.hideTimestamp,
-              },
-            )}
+            className={classNames("min-w-0 text-left grow", {
+              truncate: !expanded,
+              "ml-2": log.timestamp && !log.ctx?.hideTimestamp,
+            })}
           >
             {canBeExpanded && (
               <button
@@ -167,23 +185,28 @@ const LogEntryRow = memo(
           </div>
 
           {onResourceClick && (
-            <div className="justify-end ml-1 flex space-x-1">
+            <div className="ml-1 flex gap-1 select-none">
+              {parentName && (
+                <span className="text-slate-400">{parentName}/</span>
+              )}
               {log.ctx?.sourceType && (
-                <ResourceIcon
-                  resourceType={log.ctx.sourceType}
-                  resourcePath={log.ctx.sourcePath}
-                  className="h-4 w-4"
-                />
+                <span className="p-0.5">
+                  <ResourceIcon
+                    resourceType={log.ctx.sourceType}
+                    resourcePath={log.ctx.sourcePath}
+                    className="h-4 w-4"
+                  />
+                </span>
               )}
               <button
                 onClick={() => onResourceClick(log)}
                 className={classNames(
                   "flex cursor-pointer underline truncate",
-                  theme.text2,
+                  theme.text1,
                   theme.text3Hover,
                 )}
               >
-                {log.ctx?.label || log.ctx?.sourcePath}
+                {resourceName}
               </button>
             </div>
           )}
@@ -198,6 +221,7 @@ export interface ConsoleLogsProps {
   onRowClick?: (log: LogEntry) => void;
   onResourceClick?: (log: LogEntry) => void;
   showIcons?: boolean;
+  hiddenLogs: number;
 }
 
 export const ConsoleLogs = memo(
@@ -206,11 +230,15 @@ export const ConsoleLogs = memo(
     onRowClick,
     onResourceClick,
     showIcons = true,
+    hiddenLogs,
   }: ConsoleLogsProps) => {
     const { theme } = useTheme();
 
     return (
-      <div className="w-full gap-x-2 text-2xs font-mono" data-testid="logs">
+      <div
+        className="w-full h-full gap-x-2 text-2xs font-mono select-text"
+        data-testid="logs"
+      >
         {logs.map((log) => (
           <LogEntryRow
             key={`${log.id}`}
@@ -220,8 +248,8 @@ export const ConsoleLogs = memo(
             showIcons={showIcons}
           />
         ))}
-        {logs.length === 0 && (
-          <div className={classNames(theme.text1, "text-2xs px-2")}>
+        {logs.length === 0 && hiddenLogs === 0 && (
+          <div className={classNames(theme.text1, "text-2xs px-2 select-none")}>
             No logs
           </div>
         )}
diff --git a/apps/wing-console/console/ui/src/features/logs-pane/logs.tsx b/apps/wing-console/console/ui/src/features/logs-pane/logs.tsx
new file mode 100644
index 00000000000..48bd981062c
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/logs-pane/logs.tsx
@@ -0,0 +1,138 @@
+import {
+  ScrollableArea,
+  USE_EXTERNAL_THEME_COLOR,
+  useTheme,
+} from "@wingconsole/design-system";
+import type { LogEntry, LogLevel } from "@wingconsole/server";
+import classNames from "classnames";
+import { useState, useRef, useEffect, useCallback, memo } from "react";
+
+import { trpc } from "../../trpc.js";
+
+import { ConsoleLogsFilters } from "./console-logs-filters.js";
+import { ConsoleLogs } from "./console-logs.js";
+
+const DEFAULT_LOG_LEVELS: LogLevel[] = ["info", "warn", "error"];
+
+export interface LogsWidgetProps {
+  onResourceClick?: (path: string) => void;
+}
+
+export const LogsWidget = memo(({ onResourceClick }: LogsWidgetProps) => {
+  const { theme } = useTheme();
+
+  const [selectedLogTypeFilters, setSelectedLogTypeFilters] = useState(
+    () => DEFAULT_LOG_LEVELS,
+  );
+  const [searchText, setSearchText] = useState("");
+
+  const [selectedResourceIds, setSelectedResourceIds] = useState<string[]>([]);
+  const [selectedResourceTypes, setSelectedResourceTypes] = useState<string[]>(
+    [],
+  );
+
+  const [logsTimeFilter, setLogsTimeFilter] = useState(0);
+
+  const filters = trpc["app.logsFilters"].useQuery();
+
+  const logs = trpc["app.logs"].useQuery(
+    {
+      filters: {
+        level: {
+          verbose: selectedLogTypeFilters.includes("verbose"),
+          info: selectedLogTypeFilters.includes("info"),
+          warn: selectedLogTypeFilters.includes("warn"),
+          error: selectedLogTypeFilters.includes("error"),
+        },
+        text: searchText,
+        timestamp: logsTimeFilter,
+        resourceIds: selectedResourceIds,
+        resourceTypes: selectedResourceTypes,
+      },
+    },
+    {
+      keepPreviousData: true,
+    },
+  );
+
+  const scrollableRef = useRef<HTMLDivElement>(null);
+  const [scrolledToBottom, setScrolledToBottom] = useState(true);
+  const [initialScroll, setInitialScroll] = useState(true);
+
+  useEffect(() => {
+    const element = scrollableRef.current;
+    if (!element) {
+      return;
+    }
+
+    if (!logs.data) {
+      return;
+    }
+
+    if (initialScroll || scrolledToBottom) {
+      setInitialScroll(false);
+      element.scrollTo({
+        top: element.scrollHeight,
+        behavior: initialScroll ? "instant" : "smooth",
+      });
+    }
+  }, [initialScroll, logs.data, scrolledToBottom]);
+
+  const onLogClick = useCallback(
+    (log: LogEntry) => {
+      const path = log.ctx?.sourcePath;
+      if (path) {
+        onResourceClick?.(path);
+      }
+    },
+    [onResourceClick],
+  );
+
+  const clearLogs = useCallback(() => setLogsTimeFilter(Date.now()), []);
+
+  const resetFilters = useCallback(() => {
+    setSelectedLogTypeFilters(DEFAULT_LOG_LEVELS);
+    setSelectedResourceIds([]);
+    setSelectedResourceTypes([]);
+    setSearchText("");
+  }, []);
+
+  return (
+    <div className="relative h-full flex flex-col gap-2">
+      <ConsoleLogsFilters
+        selectedLogTypeFilters={selectedLogTypeFilters}
+        setSelectedLogTypeFilters={setSelectedLogTypeFilters}
+        clearLogs={clearLogs}
+        onSearch={setSearchText}
+        resources={filters.data?.resources ?? []}
+        selectedResourceIds={selectedResourceIds}
+        setSelectedResourceIds={setSelectedResourceIds}
+        selectedResourceTypes={selectedResourceTypes}
+        setSelectedResourceTypes={setSelectedResourceTypes}
+        onResetFilters={resetFilters}
+        shownLogs={logs.data?.logs.length ?? 0}
+        hiddenLogs={logs.data?.hiddenLogs ?? 0}
+      />
+
+      <div className="relative h-full">
+        <ScrollableArea
+          ref={scrollableRef}
+          overflowY
+          className={classNames(
+            "pb-1.5",
+            theme.bg3,
+            theme.text2,
+            USE_EXTERNAL_THEME_COLOR,
+          )}
+          onScrolledToBottomChange={setScrolledToBottom}
+        >
+          <ConsoleLogs
+            logs={logs.data?.logs ?? []}
+            hiddenLogs={logs.data?.hiddenLogs ?? 0}
+            onResourceClick={onLogClick}
+          />
+        </ScrollableArea>
+      </div>
+    </div>
+  );
+});
diff --git a/apps/wing-console/console/ui/src/features/map-view.tsx b/apps/wing-console/console/ui/src/features/map-view.tsx
deleted file mode 100644
index 49caf84c008..00000000000
--- a/apps/wing-console/console/ui/src/features/map-view.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import {
-  useTheme,
-  ResourceIcon,
-  SpinnerLoader,
-} from "@wingconsole/design-system";
-import { MapNode } from "@wingconsole/server";
-import classNames from "classnames";
-import { memo, useState } from "react";
-
-import { useMap } from "../services/use-map.js";
-import { ContainerNode } from "../ui/elk-map-nodes.js";
-import { ElkMap } from "../ui/elk-map.js";
-import { MapControls } from "../ui/map-controls.js";
-import { ZoomPaneProvider } from "../ui/zoom-pane.js";
-
-export interface MapViewProps {
-  selectedNodeId?: string;
-  showTests?: boolean;
-  showMapControls?: boolean;
-  onSelectedNodeIdChange?: (id: string | undefined) => void;
-  selectedEdgeId?: string;
-  onSelectedEdgeIdChange?: (id: string | undefined) => void;
-}
-
-const Node = memo(
-  ({
-    node,
-    depth,
-    selected,
-  }: {
-    node: MapNode;
-    depth: number;
-    selected: boolean;
-  }) => {
-    return (
-      <div className="h-full flex flex-col relative">
-        <ContainerNode
-          nodeId={node.id}
-          display={node.data?.display}
-          name={node.data?.label}
-          open={node.children && node.children?.length > 0}
-          selected={selected}
-          resourceType={node.data?.type}
-          icon={(props) => (
-            <ResourceIcon
-              resourceType={node.data?.type}
-              resourcePath={node.data?.path}
-              solid
-              {...props}
-            />
-          )}
-          depth={depth}
-        />
-      </div>
-    );
-  },
-);
-
-export const MapView = memo(
-  ({
-    showMapControls = true,
-    showTests,
-    selectedNodeId,
-    onSelectedNodeIdChange,
-    selectedEdgeId,
-    onSelectedEdgeIdChange,
-  }: MapViewProps) => {
-    const { mapData } = useMap({ showTests: showTests ?? false });
-    const { theme } = useTheme();
-    const [hoverMapControls, setHoverMapControls] = useState(false);
-
-    return (
-      <ZoomPaneProvider>
-        <div className={classNames("h-full flex flex-col", theme.bg4)}>
-          <div className="grow relative cursor-grab bg-slate-50 dark:bg-slate-500">
-            {showMapControls && (
-              <div className="right-0 absolute z-10">
-                <div
-                  className={classNames(
-                    "transition-opacity",
-                    "absolute inset-0 rounded-bl",
-                    theme.bg4,
-                    (hoverMapControls && "opacity-80") || "opacity-60",
-                  )}
-                />
-                <div
-                  className="relative group/map-controls"
-                  onMouseEnter={() => {
-                    setHoverMapControls(true);
-                  }}
-                  onMouseLeave={() => {
-                    setHoverMapControls(false);
-                  }}
-                >
-                  <MapControls />
-                </div>
-              </div>
-            )}
-            <div
-              className={classNames(
-                "absolute h-full w-full bg-white/70 dark:bg-slate-600/70",
-                "transition-all",
-                !mapData && "opacity-100 z-10",
-                mapData && "opacity-0 -z-10",
-              )}
-            >
-              <div className="absolute z-10 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
-                <SpinnerLoader data-testid="main-view-loader" />
-              </div>
-            </div>
-
-            <div className="absolute inset-0">
-              <ElkMap
-                nodes={mapData?.nodes ?? []}
-                edges={mapData?.edges ?? []}
-                selectedNodeId={selectedNodeId}
-                onSelectedNodeIdChange={onSelectedNodeIdChange}
-                selectedEdgeId={selectedEdgeId}
-                onSelectedEdgeIdChange={onSelectedEdgeIdChange}
-                // @ts-ignore-next-line
-                node={Node}
-              />
-            </div>
-          </div>
-        </div>
-      </ZoomPaneProvider>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/features/react-app-interaction-view.tsx b/apps/wing-console/console/ui/src/features/react-app-interaction-view.tsx
deleted file mode 100644
index d3e14ebdaca..00000000000
--- a/apps/wing-console/console/ui/src/features/react-app-interaction-view.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { memo, useContext } from "react";
-
-import { AppContext } from "../AppContext.js";
-import { useOpenExternal } from "../services/use-open-external.js";
-import { useReactApp } from "../services/use-react-app.js";
-import { WebsiteInteraction } from "../ui/website-interaction.js";
-
-export interface ReactAppInteractionViewProps {
-  resourcePath: string;
-}
-export const ReactAppInteractionView = memo(
-  ({ resourcePath }: ReactAppInteractionViewProps) => {
-    const { appMode } = useContext(AppContext);
-    const { open } = useOpenExternal();
-    const { url } = useReactApp({ resourcePath });
-
-    return <WebsiteInteraction appMode={appMode} onUrlClick={open} url={url} />;
-  },
-);
diff --git a/apps/wing-console/console/ui/src/features/selection-context/selection-context.tsx b/apps/wing-console/console/ui/src/features/selection-context/selection-context.tsx
new file mode 100644
index 00000000000..c50436ceaab
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/selection-context/selection-context.tsx
@@ -0,0 +1,131 @@
+import type { FunctionComponent, PropsWithChildren } from "react";
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from "react";
+
+export interface SelectionItem {
+  id: string;
+  children?: SelectionItem[];
+}
+
+const Context = createContext({
+  setAvailableItems(items: SelectionItem[]) {},
+  selectedItems: new Array<string>(),
+  setSelectedItems(items: string[]) {},
+  expandedItems: new Array<string>(),
+  setExpandedItems(items: string[]) {},
+  toggle(itemId: string) {},
+  expandAll() {},
+  collapseAll() {},
+  expand(itemId: string) {},
+  collapse(itemId: string) {},
+  selectedEdgeId: undefined as string | undefined,
+  setSelectedEdgeId(edgeId: string | undefined) {},
+});
+
+export const SelectionContextProvider: FunctionComponent<PropsWithChildren> = (
+  props,
+) => {
+  const [availableItems, setAvailableItems] = useState(
+    () => new Array<SelectionItem>(),
+  );
+
+  const [selectedItems, setSelectedItems] = useState(() => ["root"]);
+  const [expandedItems, setExpandedItems] = useState(() => new Array<string>());
+
+  const toggle = useCallback((itemId: string) => {
+    setExpandedItems(([...openedMenuItems]) => {
+      const index = openedMenuItems.indexOf(itemId);
+      if (index !== -1) {
+        openedMenuItems.splice(index, 1);
+        return openedMenuItems;
+      }
+
+      openedMenuItems.push(itemId);
+      return openedMenuItems;
+    });
+  }, []);
+
+  const expandAll = useCallback(() => {
+    const itemIds = [];
+    const stack = [...availableItems];
+    while (stack.length > 0) {
+      const item = stack.pop();
+      if (!item) {
+        continue;
+      }
+
+      itemIds.push(item.id);
+
+      if (item.children) {
+        stack.push(...item.children);
+      }
+    }
+
+    setExpandedItems(itemIds);
+  }, [availableItems]);
+
+  const collapseAll = useCallback(() => {
+    setExpandedItems([]);
+  }, []);
+
+  const expand = useCallback((itemId: string) => {
+    setExpandedItems(([...openedMenuItems]) => {
+      const index = openedMenuItems.indexOf(itemId);
+      if (index !== -1) {
+        return openedMenuItems;
+      }
+
+      openedMenuItems.push(itemId);
+      return openedMenuItems;
+    });
+  }, []);
+
+  const collapse = useCallback((itemId: string) => {
+    setExpandedItems(([...openedMenuItems]) => {
+      const index = openedMenuItems.indexOf(itemId);
+      if (index === -1) {
+        return openedMenuItems;
+      }
+
+      openedMenuItems.splice(index, 1);
+      return openedMenuItems;
+    });
+  }, []);
+
+  const [selectedEdgeId, setSelectedEdgeId] = useState<string>();
+
+  return (
+    <Context.Provider
+      value={{
+        setAvailableItems,
+        selectedItems,
+        setSelectedItems: useCallback((selectedItems) => {
+          setSelectedEdgeId(undefined);
+          setSelectedItems(selectedItems);
+        }, []),
+        expandedItems,
+        setExpandedItems,
+        toggle,
+        expandAll,
+        collapseAll,
+        expand,
+        collapse,
+        selectedEdgeId,
+        setSelectedEdgeId: useCallback((edgeId) => {
+          setSelectedItems([]);
+          setSelectedEdgeId(edgeId);
+        }, []),
+      }}
+      {...props}
+    />
+  );
+};
+
+export const useSelectionContext = () => {
+  return useContext(Context);
+};
diff --git a/apps/wing-console/console/ui/src/features/sign-in/github-icon.tsx b/apps/wing-console/console/ui/src/features/sign-in/github-icon.tsx
new file mode 100644
index 00000000000..42f00f1b0c6
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/sign-in/github-icon.tsx
@@ -0,0 +1,30 @@
+import { forwardRef } from "react";
+
+type GithubIconProps = React.PropsWithoutRef<React.SVGProps<SVGSVGElement>> & {
+  title?: string;
+  titleId?: string;
+} & React.RefAttributes<SVGSVGElement>;
+
+export const GithubIcon = forwardRef<SVGSVGElement, GithubIconProps>(
+  ({ title, titleId, ...props }, svgRef) => {
+    return (
+      <svg
+        viewBox="0 0 98 96"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+        ref={svgRef}
+        aria-labelledby={titleId}
+        {...props}
+      >
+        {title && <title id={titleId}>{title}</title>}
+
+        <path
+          fill="currentColor"
+          fillRule="evenodd"
+          d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z"
+          clipRule="evenodd"
+        />
+      </svg>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/sign-in/google-icon.tsx b/apps/wing-console/console/ui/src/features/sign-in/google-icon.tsx
new file mode 100644
index 00000000000..7ee8da19fec
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/sign-in/google-icon.tsx
@@ -0,0 +1,39 @@
+import { forwardRef } from "react";
+
+type GoogleIconProps = React.PropsWithoutRef<React.SVGProps<SVGSVGElement>> & {
+  title?: string;
+  titleId?: string;
+} & React.RefAttributes<SVGSVGElement>;
+
+export const GoogleIcon = forwardRef<SVGSVGElement, GoogleIconProps>(
+  ({ title, titleId, ...props }, svgRef) => {
+    return (
+      <svg
+        viewBox="0 0 48 48"
+        xmlns="http://www.w3.org/2000/svg"
+        ref={svgRef}
+        aria-labelledby={titleId}
+        {...props}
+      >
+        {title && <title id={titleId}>{title}</title>}
+
+        <path
+          fill="#FFC107"
+          d="M43.611 20.083H42V20H24v8h11.303c-1.649 4.657-6.08 8-11.303 8-6.627 0-12-5.373-12-12s5.373-12 12-12c3.059 0 5.842 1.154 7.961 3.039l5.657-5.657C34.046 6.053 29.268 4 24 4 12.955 4 4 12.955 4 24s8.955 20 20 20 20-8.955 20-20c0-1.341-.138-2.65-.389-3.917z"
+        />
+        <path
+          fill="#FF3D00"
+          d="m6.306 14.691 6.571 4.819C14.655 15.108 18.961 12 24 12c3.059 0 5.842 1.154 7.961 3.039l5.657-5.657C34.046 6.053 29.268 4 24 4 16.318 4 9.656 8.337 6.306 14.691z"
+        />
+        <path
+          fill="#4CAF50"
+          d="M24 44c5.166 0 9.86-1.977 13.409-5.192l-6.19-5.238A11.91 11.91 0 0 1 24 36c-5.202 0-9.619-3.317-11.283-7.946l-6.522 5.025C9.505 39.556 16.227 44 24 44z"
+        />
+        <path
+          fill="#1976D2"
+          d="M43.611 20.083H42V20H24v8h11.303a12.04 12.04 0 0 1-4.087 5.571l.003-.002 6.19 5.238C36.971 39.205 44 34 44 24c0-1.341-.138-2.65-.389-3.917z"
+        />
+      </svg>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/sign-in/sign-in.tsx b/apps/wing-console/console/ui/src/features/sign-in/sign-in.tsx
new file mode 100644
index 00000000000..1a588cd1226
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/sign-in/sign-in.tsx
@@ -0,0 +1,202 @@
+import {
+  Button,
+  Link,
+  Loader,
+  Modal,
+  useTheme,
+} from "@wingconsole/design-system";
+import classNames from "classnames";
+import { useCallback, useContext, useEffect, useMemo, useState } from "react";
+import { useSearchParam } from "react-use";
+
+import { AppContext } from "../../AppContext.js";
+import { trpc } from "../../trpc.js";
+
+import { GithubIcon } from "./github-icon.js";
+import { GoogleIcon } from "./google-icon.js";
+
+/**
+ * The name of the query parameter that is passed from
+ * Wing Cloud after to the Console after signing in.
+ */
+const SIGNED_IN_QUERY_PARAMETER = "signedIn";
+
+/**
+ * The URL to the Console Terms and Conditions file.
+ */
+const TERMS_AND_CONDITIONS_URL =
+  "https://github.com/winglang/wing/blob/main/apps/wing-console/LICENSE.md";
+
+/**
+ * Returns true if the Console should dismiss the sign in modal.
+ *
+ * It checks for the existence of the `signedIn` query parameter in the URL,
+ * which is what we get after the user signs in with GitHub in Wing Cloud.
+ */
+const useShouldNotifySignedIn = () => {
+  const signedIn = useSearchParam(SIGNED_IN_QUERY_PARAMETER);
+  return useMemo(() => {
+    return signedIn !== null;
+  }, [signedIn]);
+};
+
+/**
+ * Notifies the Wing Console after the user signs in with GitHub.
+ *
+ * Also, removes the query param from the URL for a neater experience.
+ */
+const useNotifyAfterSigningIn = () => {
+  const { mutate: notify } = trpc["app.analytics.notifySignedIn"].useMutation();
+  const shouldNotifySignedIn = useShouldNotifySignedIn();
+  useEffect(() => {
+    if (!shouldNotifySignedIn) {
+      return;
+    }
+
+    // Trigger the notify call.
+    notify();
+
+    // Remove the `signedIn` query parameter from the URL.
+    const url = new URL(location.href);
+    url.searchParams.delete(SIGNED_IN_QUERY_PARAMETER);
+    history.replaceState({}, document.title, url);
+  }, [shouldNotifySignedIn, notify]);
+};
+
+/**
+ * Returns a function that can be used to sign in the user.
+ */
+const useSignIn = () => {
+  const { githubSignInURL, googleSignInURL } = useContext(AppContext);
+  const { mutateAsync: reportSignInClicked } =
+    trpc["app.analytics.signInClicked"].useMutation();
+  const analytics = trpc["app.analytics"].useQuery();
+
+  const signInWithGithub = useCallback(async () => {
+    await reportSignInClicked();
+    const url = new URL(githubSignInURL!);
+    url.searchParams.append("port", location.port);
+    url.searchParams.append("anonymousId", `${analytics.data?.anonymousId}`);
+    location.href = url.toString();
+  }, [reportSignInClicked, githubSignInURL, analytics.data?.anonymousId]);
+
+  const signInWithGoogle = useCallback(async () => {
+    await reportSignInClicked();
+    const url = new URL(googleSignInURL!);
+    url.searchParams.append("port", location.port);
+    url.searchParams.append("anonymousId", `${analytics.data?.anonymousId}`);
+    location.href = url.toString();
+  }, [reportSignInClicked, googleSignInURL, analytics.data?.anonymousId]);
+
+  return {
+    signInWithGithub,
+    signInWithGoogle,
+  };
+};
+
+/**
+ * Returns true if the user should be required to sign in.
+ */
+const useSignInRequired = () => {
+  const shouldNotifySignedIn = useShouldNotifySignedIn();
+  const analytics = trpc["app.analytics"].useQuery();
+  const [signInRequired, setSignInRequired] = useState(false);
+  useEffect(() => {
+    // Skip if offline.
+    if (navigator.onLine === false) {
+      return;
+    }
+
+    if (analytics.data?.requireSignIn && !shouldNotifySignedIn) {
+      setSignInRequired(true);
+    } else {
+      setSignInRequired(false);
+    }
+  }, [analytics.data?.requireSignIn, shouldNotifySignedIn]);
+  return signInRequired;
+};
+
+export interface SignInModalProps {}
+
+export const SignInModal = (props: SignInModalProps) => {
+  const { theme } = useTheme();
+  const { signInWithGithub, signInWithGoogle } = useSignIn();
+  const signInRequired = useSignInRequired();
+  useNotifyAfterSigningIn();
+
+  const [githubIsLoading, setGithubIsLoading] = useState(false);
+  const [googleIsLoading, setGoogleIsLoading] = useState(false);
+
+  const isLoading = useMemo(() => {
+    return githubIsLoading || googleIsLoading;
+  }, [githubIsLoading, googleIsLoading]);
+
+  return (
+    <Modal visible={signInRequired}>
+      <div
+        className="flex flex-col gap-4 max-w-lg items-center"
+        data-testid="signin-modal"
+      >
+        <h3
+          className={classNames(
+            theme.text1,
+            "text-base font-semibold leading-6",
+          )}
+        >
+          Wing Console
+        </h3>
+
+        <p className={classNames(theme.text2, "text-sm text-center")}>
+          Please sign in to help us improve your experience in Wing Console and
+          Wing CLI.
+        </p>
+
+        <div className="flex justify-around">
+          <div className="flex flex-col gap-2.5">
+            <Button
+              disabled={isLoading}
+              onClick={() => {
+                setGithubIsLoading(true);
+                void signInWithGithub();
+              }}
+              dataTestid="signin-github-button"
+            >
+              {githubIsLoading ? (
+                <Loader size="xs" />
+              ) : (
+                <GithubIcon className="w-4 h-4" />
+              )}
+              <span className="text-sm">Continue with GitHub</span>
+            </Button>
+
+            <Button
+              disabled={isLoading}
+              onClick={() => {
+                setGoogleIsLoading(true);
+                void signInWithGoogle();
+              }}
+              dataTestid="signin-google-button"
+            >
+              {googleIsLoading ? (
+                <Loader size="xs" />
+              ) : (
+                <GoogleIcon className="w-4 h-4" />
+              )}
+              <span className="text-sm">Continue with Google</span>
+            </Button>
+          </div>
+        </div>
+
+        <div className="flex justify-around">
+          <p className={classNames(theme.text2, "text-xs")}>
+            By signing up, you agree to our{" "}
+            <Link href={TERMS_AND_CONDITIONS_URL} target="_blank">
+              Terms and Conditions
+            </Link>
+            .
+          </p>
+        </div>
+      </div>
+    </Modal>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/status-bar/discord-button.tsx b/apps/wing-console/console/ui/src/features/status-bar/discord-button.tsx
new file mode 100644
index 00000000000..58069b8ef0c
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/status-bar/discord-button.tsx
@@ -0,0 +1,30 @@
+import { useTheme } from "@wingconsole/design-system";
+import classNames from "classnames";
+
+import { DiscordIcon } from "./discord-icon.js";
+
+const WING_DISCORD_URL = "https://t.winglang.io/discord";
+
+const openDiscordLink = () => {
+  open(WING_DISCORD_URL, "_blank");
+};
+
+export const DiscordButton = () => {
+  const { theme } = useTheme();
+
+  return (
+    <button
+      className={classNames(
+        "font-medium flex focus:outline-none",
+        "transition-color duration-300 cursor-pointer",
+        "gap-x-1.5 p-1 items-center justify-center",
+        "text-slate-800 dark:text-slate-250",
+        theme.bg2Hover,
+      )}
+      onClick={() => openDiscordLink()}
+      title="Join our Discord community!"
+    >
+      <DiscordIcon className="size-4" />
+    </button>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/status-bar/discord-icon.tsx b/apps/wing-console/console/ui/src/features/status-bar/discord-icon.tsx
new file mode 100644
index 00000000000..e6fc7914852
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/status-bar/discord-icon.tsx
@@ -0,0 +1,28 @@
+import { forwardRef } from "react";
+
+type DiscordIconProps = React.PropsWithoutRef<React.SVGProps<SVGSVGElement>> & {
+  title?: string;
+  titleId?: string;
+} & React.RefAttributes<SVGSVGElement>;
+
+export const DiscordIcon = forwardRef<SVGSVGElement, DiscordIconProps>(
+  ({ title, titleId, ...props }, svgRef) => {
+    return (
+      <svg
+        viewBox="0 -29 256 256"
+        xmlns="http://www.w3.org/2000/svg"
+        ref={svgRef}
+        aria-labelledby={titleId}
+        {...props}
+      >
+        {title && <title id={titleId}>{title}</title>}
+
+        <path
+          fill="currentColor"
+          stroke="currentColor"
+          d="M217 17c-17-8-34-14-53-17l-7 14c-19-3-39-3-58 0L92 0C73 3 56 9 39 17 6 67-3 116 1 165c22 17 44 27 65 33l14-23-22-10 5-5c42 20 88 20 130 0l5 5-22 10 14 23c21-6 43-16 65-33 5-56-9-105-38-148ZM85 135c-12 0-23-12-23-26s11-26 23-26c13 0 24 12 23 26 1 14-10 26-23 26Zm86 0c-13 0-23-12-23-26s10-26 23-26c12 0 23 12 23 26s-11 26-23 26Z"
+        />
+      </svg>
+    );
+  },
+);
diff --git a/apps/wing-console/console/ui/src/features/status-bar/reset-button.tsx b/apps/wing-console/console/ui/src/features/status-bar/reset-button.tsx
new file mode 100644
index 00000000000..38738a78689
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/status-bar/reset-button.tsx
@@ -0,0 +1,59 @@
+import { ArrowPathIcon } from "@heroicons/react/24/outline";
+import { Button, Modal, useTheme } from "@wingconsole/design-system";
+import classNames from "classnames";
+import { useCallback, useState } from "react";
+
+import { trpc } from "../../trpc.js";
+
+export const ResetButton = ({ disabled }: { disabled?: boolean }) => {
+  const { theme } = useTheme();
+
+  const resetMutation = trpc["app.reset"].useMutation();
+  const [showRestartModal, setShowRestartModal] = useState(false);
+
+  const restart = useCallback(async () => {
+    setShowRestartModal(false);
+    await resetMutation.mutateAsync();
+  }, [resetMutation]);
+
+  return (
+    <>
+      <button
+        onClick={() => setShowRestartModal(true)}
+        className={classNames(
+          "flex items-center gap-x-1 px-1 py-0.5",
+          theme.bg2Hover,
+          "transition-all",
+          disabled && "cursor-not-allowed opacity-50",
+        )}
+        disabled={resetMutation.isLoading || disabled}
+      >
+        <ArrowPathIcon className="size-3.5" />
+        <span>Reset</span>
+      </button>
+
+      <Modal visible={showRestartModal}>
+        <div className="flex flex-col gap-4 max-w-lg items-center">
+          <h3
+            className={classNames(
+              theme.text1,
+              "text-base font-semibold leading-6",
+            )}
+          >
+            Reset Application
+          </h3>
+          <p className={classNames(theme.text2, "text-sm text-center")}>
+            Are you sure you want to reset all state and restart the
+            application?
+          </p>
+          <div className="flex justify-around gap-2">
+            <Button onClick={() => setShowRestartModal(false)}>Cancel</Button>{" "}
+            <Button onClick={restart} dataTestid="restart-simulator-button">
+              Reset
+            </Button>
+          </div>
+        </div>
+      </Modal>
+    </>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/status-bar/status-bar.tsx b/apps/wing-console/console/ui/src/features/status-bar/status-bar.tsx
new file mode 100644
index 00000000000..369ba1dcfbd
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/status-bar/status-bar.tsx
@@ -0,0 +1,78 @@
+import { useTheme, Loader } from "@wingconsole/design-system";
+import type { State } from "@wingconsole/server";
+import classNames from "classnames";
+
+import { DiscordButton } from "./discord-button.js";
+import { ResetButton } from "./reset-button.js";
+import { ThemeToggle } from "./theme-toggle.js";
+
+export interface StatusBarProps {
+  wingVersion?: string;
+  cloudAppState: State;
+  isError?: boolean;
+  showThemeToggle?: boolean;
+}
+
+export const StatusBar = ({
+  wingVersion = "",
+  cloudAppState,
+  isError = false,
+  showThemeToggle = false,
+}: StatusBarProps) => {
+  const { theme } = useTheme();
+  const loading =
+    cloudAppState === "loadingSimulator" || cloudAppState === "compiling";
+  const cloudAppStateString = {
+    compiling: "compiling",
+    loadingSimulator: "loading simulator",
+    success: "success",
+    error: "error",
+  };
+
+  return (
+    <footer
+      className={classNames(
+        theme.bg1,
+        theme.text1,
+        theme.border3,
+        "px-4 flex gap-2 items-center text-2xs w-full relative z-10",
+      )}
+    >
+      {/*left side*/}
+      <div className="flex gap-2 items-center">
+        <ResetButton disabled={loading} />
+        <div title={wingVersion} className="truncate space-x-1">
+          {wingVersion && (
+            <div className="flex gap-1 px-1 py-0.5">
+              <span>Wing</span>
+              <span className={classNames(theme.text2)}>v{wingVersion}</span>
+            </div>
+          )}
+        </div>
+
+        <div className="flex gap-1 px-1 py-0.5">
+          <span>Status:</span>
+          <span className={classNames(theme.text2)}>
+            <span
+              data-testid="app-state"
+              className={classNames([
+                isError ? "text-red-500" : theme.text2,
+                "flex",
+              ])}
+            >
+              {loading && <Loader size="xs" className={"mr-1"} />}
+              {cloudAppStateString[cloudAppState]}
+            </span>
+          </span>
+        </div>
+      </div>
+      {/*center*/}
+      <div className="grow"></div>
+      {/*right side*/}
+      <div className="flex gap-2 items-center">
+        <DiscordButton />
+        {showThemeToggle && <ThemeToggle />}
+      </div>
+    </footer>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/features/status-bar/theme-toggle.tsx b/apps/wing-console/console/ui/src/features/status-bar/theme-toggle.tsx
new file mode 100644
index 00000000000..6a0bb956094
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/status-bar/theme-toggle.tsx
@@ -0,0 +1,83 @@
+import {
+  MoonIcon as MoonIconOutline,
+  SunIcon as SunIconOutline,
+} from "@heroicons/react/24/outline";
+import {
+  MoonIcon as MoonIconSolid,
+  SunIcon as SunIconSolid,
+} from "@heroicons/react/24/solid";
+import type { Mode } from "@wingconsole/design-system";
+import { useTheme } from "@wingconsole/design-system";
+import classNames from "classnames";
+import { useCallback, useMemo } from "react";
+
+const AutoIcon = ({ currentTheme }: { currentTheme?: Mode }) => {
+  return (
+    <div className="relative size-4 flex">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        fill={currentTheme === "light" ? "currentColor" : "none"}
+        viewBox="0 0 24 24"
+        strokeWidth="1.5"
+        stroke="currentColor"
+        className="absolute size-3.5 left-[1.5px] top-[0px] -rotate-[22deg]"
+      >
+        <path
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          d="M12 3v2.25m6.364.386-1.591 1.591M21 12h-2.25m-.386 6.364-1.591-1.591M12 1.591M5.25 5.636M15.75 12a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z"
+        />
+      </svg>
+
+      {currentTheme === "light" ? (
+        <MoonIconOutline className="absolute bottom-0 left-0 size-3" />
+      ) : (
+        <MoonIconSolid className="absolute bottom-0 left-0 size-3" />
+      )}
+    </div>
+  );
+};
+
+export const ThemeToggle = () => {
+  const { theme, setThemeMode, mode, mediaTheme } = useTheme();
+
+  const currentTheme = useMemo(() => {
+    if (mode === "auto") {
+      return mediaTheme;
+    }
+    return mode;
+  }, [mode, mediaTheme]);
+
+  const toggleThemeMode = useCallback(() => {
+    const newMode =
+      // eslint-disable-next-line unicorn/no-nested-ternary
+      mode === "light" ? "auto" : mode === "auto" ? "dark" : "light";
+    setThemeMode?.(newMode);
+  }, [setThemeMode, mode]);
+
+  return (
+    <button
+      className={classNames(
+        "text-slate-800 dark:text-slate-250",
+        "font-medium flex focus:outline-none",
+        "transition-color duration-300 cursor-pointer",
+        "gap-x-1 p-1",
+        theme.bg2Hover,
+      )}
+      onClick={toggleThemeMode}
+      title="Toggle theme"
+    >
+      {mode === "auto" && (
+        <div className="relative size-4 flex">
+          <AutoIcon currentTheme={currentTheme} />
+        </div>
+      )}
+      {mode !== "auto" && (
+        <>
+          {currentTheme === "light" && <SunIconSolid className="h-4" />}
+          {currentTheme === "dark" && <MoonIconSolid className="h-4" />}
+        </>
+      )}
+    </button>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/ui/no-tests.tsx b/apps/wing-console/console/ui/src/features/tests-pane/no-tests.tsx
similarity index 100%
rename from apps/wing-console/console/ui/src/ui/no-tests.tsx
rename to apps/wing-console/console/ui/src/features/tests-pane/no-tests.tsx
diff --git a/apps/wing-console/console/ui/src/shared/test-item.ts b/apps/wing-console/console/ui/src/features/tests-pane/test-item.ts
similarity index 100%
rename from apps/wing-console/console/ui/src/shared/test-item.ts
rename to apps/wing-console/console/ui/src/features/tests-pane/test-item.ts
diff --git a/apps/wing-console/console/ui/src/ui/test-tree.tsx b/apps/wing-console/console/ui/src/features/tests-pane/test-tree.tsx
similarity index 98%
rename from apps/wing-console/console/ui/src/ui/test-tree.tsx
rename to apps/wing-console/console/ui/src/features/tests-pane/test-tree.tsx
index 465da6d198a..986c5716583 100644
--- a/apps/wing-console/console/ui/src/ui/test-tree.tsx
+++ b/apps/wing-console/console/ui/src/features/tests-pane/test-tree.tsx
@@ -17,7 +17,7 @@ import {
 import classNames from "classnames";
 import { useMemo } from "react";
 
-import { TestItem } from "../shared/test-item.js";
+import type { TestItem } from "../shared/test-item.js";
 
 import { NoTests } from "./no-tests.js";
 
diff --git a/apps/wing-console/console/ui/src/tests-context.tsx b/apps/wing-console/console/ui/src/features/tests-pane/tests-context.tsx
similarity index 87%
rename from apps/wing-console/console/ui/src/tests-context.tsx
rename to apps/wing-console/console/ui/src/features/tests-pane/tests-context.tsx
index 3369b1cc8f3..45fcfefc817 100644
--- a/apps/wing-console/console/ui/src/tests-context.tsx
+++ b/apps/wing-console/console/ui/src/features/tests-pane/tests-context.tsx
@@ -1,4 +1,5 @@
-import { PropsWithChildren, createContext, useState } from "react";
+import type { PropsWithChildren } from "react";
+import { createContext, useState } from "react";
 
 export const TestsContext = createContext<{
   showTests: boolean;
diff --git a/apps/wing-console/console/ui/src/features/tests-tree-view.tsx b/apps/wing-console/console/ui/src/features/tests-pane/tests-tree-view.tsx
similarity index 84%
rename from apps/wing-console/console/ui/src/features/tests-tree-view.tsx
rename to apps/wing-console/console/ui/src/features/tests-pane/tests-tree-view.tsx
index e20e38b4ce2..6749562532e 100644
--- a/apps/wing-console/console/ui/src/features/tests-tree-view.tsx
+++ b/apps/wing-console/console/ui/src/features/tests-pane/tests-tree-view.tsx
@@ -1,7 +1,7 @@
 import { memo } from "react";
 
-import { useTests } from "../services/use-tests.js";
-import { TestTree } from "../ui/test-tree.js";
+import { TestTree } from "./test-tree.js";
+import { useTests } from "./use-tests.js";
 
 export interface TestsTreeViewProps {
   onSelectedItemsChange?: (items: string[]) => void;
diff --git a/apps/wing-console/console/ui/src/services/use-tests.ts b/apps/wing-console/console/ui/src/features/tests-pane/use-tests.ts
similarity index 84%
rename from apps/wing-console/console/ui/src/services/use-tests.ts
rename to apps/wing-console/console/ui/src/features/tests-pane/use-tests.ts
index 2f269f3e731..17d4365fde4 100644
--- a/apps/wing-console/console/ui/src/services/use-tests.ts
+++ b/apps/wing-console/console/ui/src/features/tests-pane/use-tests.ts
@@ -1,13 +1,9 @@
-import { inferRouterOutputs } from "@trpc/server";
-import { Router } from "@wingconsole/server";
 import { useContext, useEffect, useState } from "react";
 
-import { TestItem, TestStatus } from "../shared/test-item.js";
-import { TestsContext } from "../tests-context.js";
+import { trpc } from "../../trpc.js";
 
-import { trpc } from "./trpc.js";
-
-type RouterOutput = inferRouterOutputs<Router>;
+import type { TestItem, TestStatus } from "./test-item.js";
+import { TestsContext } from "./tests-context.js";
 
 export const useTests = () => {
   const [testList, setTestList] = useState<TestItem[]>([]);
diff --git a/apps/wing-console/console/ui/src/features/unsupported-interaction-view.tsx b/apps/wing-console/console/ui/src/features/unsupported-interaction-view.tsx
deleted file mode 100644
index 9978f4ee6a3..00000000000
--- a/apps/wing-console/console/ui/src/features/unsupported-interaction-view.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { memo } from "react";
-
-import { useOpenExternal } from "../services/use-open-external.js";
-import { UnsupportedInteraction } from "../ui/unsupported-interaction.js";
-
-export interface UnsupportedInteractionViewProps {
-  resourceType: string;
-}
-
-export const UnsupportedInteractionView = memo(
-  ({ resourceType }: UnsupportedInteractionViewProps) => {
-    const { open } = useOpenExternal();
-
-    return (
-      <UnsupportedInteraction
-        onOpenIssueClick={open}
-        resourceType={resourceType}
-      />
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/features/website-interaction-view.tsx b/apps/wing-console/console/ui/src/features/website-interaction-view.tsx
deleted file mode 100644
index 4f71a93c2d3..00000000000
--- a/apps/wing-console/console/ui/src/features/website-interaction-view.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { memo, useContext } from "react";
-
-import { AppContext } from "../AppContext.js";
-import { useOpenExternal } from "../services/use-open-external.js";
-import { useWebsite } from "../services/use-website.js";
-import { WebsiteInteraction } from "../ui/website-interaction.js";
-
-export interface WebsiteInteractionViewProps {
-  resourcePath: string;
-}
-export const WebsiteInteractionView = memo(
-  ({ resourcePath }: WebsiteInteractionViewProps) => {
-    const { appMode } = useContext(AppContext);
-    const { open } = useOpenExternal();
-    const { url } = useWebsite({ resourcePath });
-
-    return <WebsiteInteraction appMode={appMode} onUrlClick={open} url={url} />;
-  },
-);
diff --git a/apps/wing-console/console/ui/src/features/websocket-state/use-websocket.tsx b/apps/wing-console/console/ui/src/features/websocket-state/use-websocket.tsx
new file mode 100644
index 00000000000..5daf54961df
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/websocket-state/use-websocket.tsx
@@ -0,0 +1,50 @@
+import {
+  type ReactNode,
+  createContext,
+  useContext,
+  useState,
+  useEffect,
+} from "react";
+
+const WebSocketContext = createContext<WebSocket | undefined>(undefined);
+
+export const WebSocketProvider = ({
+  webSocket,
+  children,
+}: {
+  webSocket: WebSocket;
+  children: ReactNode;
+}) => {
+  return (
+    <WebSocketContext.Provider value={webSocket}>
+      {children}
+    </WebSocketContext.Provider>
+  );
+};
+
+export const useWebSocketState = () => {
+  const webSocket = useContext(WebSocketContext);
+  if (!webSocket) {
+    throw new Error("useWebSocket must be used within WebSocketProvider");
+  }
+
+  const [webSocketState, setWebSocketState] = useState<
+    "open" | "closed" | "error"
+  >("closed");
+  useEffect(() => {
+    const onStateChange = () => {
+      setWebSocketState(
+        webSocket.readyState === WebSocket.OPEN ? "open" : "closed",
+      );
+    };
+    onStateChange();
+    webSocket.addEventListener("close", onStateChange);
+    webSocket.addEventListener("open", onStateChange);
+    return () => {
+      webSocket.removeEventListener("close", onStateChange);
+      webSocket.removeEventListener("open", onStateChange);
+    };
+  }, [webSocket]);
+
+  return { webSocketState };
+};
diff --git a/apps/wing-console/console/ui/src/features/websocket-state/websocket-state.tsx b/apps/wing-console/console/ui/src/features/websocket-state/websocket-state.tsx
new file mode 100644
index 00000000000..315aed6899e
--- /dev/null
+++ b/apps/wing-console/console/ui/src/features/websocket-state/websocket-state.tsx
@@ -0,0 +1,50 @@
+import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
+import { Modal } from "@wingconsole/design-system";
+import { useEffect, useState } from "react";
+
+import { useWebSocketState } from "./use-websocket.js";
+
+export const WebSocketState = () => {
+  const { webSocketState } = useWebSocketState();
+
+  const [webSocketWasOpen, setWebSocketWasOpen] = useState(false);
+  useEffect(() => {
+    if (webSocketState === "open") {
+      setWebSocketWasOpen(true);
+    }
+  }, [webSocketState]);
+
+  const showConnectionLost = webSocketState !== "open" && webSocketWasOpen;
+
+  return (
+    <div>
+      <Modal visible={showConnectionLost}>
+        <div>
+          <div className="sm:flex sm:items-start">
+            <div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
+              <ExclamationTriangleIcon
+                className="h-6 w-6 text-red-600"
+                aria-hidden="true"
+              />
+            </div>
+            <div className="mt-3 text-center sm:ml-4 sm:mt-0 sm:text-left">
+              <h3 className="text-base font-semibold leading-6 text-slate-900 dark:text-slate-200">
+                Connection Lost
+              </h3>
+              <div className="mt-2">
+                <p className="text-sm text-slate-500 dark:text-slate-400">
+                  The connection to the server was lost.
+                </p>
+              </div>
+              <div className="mt-2">
+                <p className="text-sm text-slate-500 dark:text-slate-400">
+                  Please, try restarting the Wing Console.
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </Modal>
+    </div>
+  );
+};
diff --git a/apps/wing-console/console/ui/src/index.ts b/apps/wing-console/console/ui/src/index.ts
index cdaee3c6d5e..100ea78f520 100644
--- a/apps/wing-console/console/ui/src/index.ts
+++ b/apps/wing-console/console/ui/src/index.ts
@@ -1,3 +1,5 @@
 export * from "./Console.js";
 
 export type { RouterContext } from "@wingconsole/server";
+
+export type * from "@trpc/server";
diff --git a/apps/wing-console/console/ui/src/layout/default-layout.tsx b/apps/wing-console/console/ui/src/layout/default-layout.tsx
deleted file mode 100644
index 16fae1a8247..00000000000
--- a/apps/wing-console/console/ui/src/layout/default-layout.tsx
+++ /dev/null
@@ -1,471 +0,0 @@
-import {
-  SpinnerLoader,
-  LeftResizableWidget,
-  RightResizableWidget,
-  ScrollableArea,
-  TopResizableWidget,
-  USE_EXTERNAL_THEME_COLOR,
-} from "@wingconsole/design-system";
-import type { State, LayoutConfig, LayoutComponent } from "@wingconsole/server";
-import { useLoading } from "@wingconsole/use-loading";
-import { PersistentStateProvider } from "@wingconsole/use-persistent-state";
-import classNames from "classnames";
-import { useCallback, useEffect, useMemo, useState } from "react";
-
-import { MapView } from "../features/map-view.js";
-import { TestsTreeView } from "../features/tests-tree-view.js";
-import { BlueScreenOfDeath } from "../ui/blue-screen-of-death.js";
-import { EdgeMetadata } from "../ui/edge-metadata.js";
-import { Explorer } from "../ui/explorer.js";
-import { ResourceMetadata } from "../ui/resource-metadata.js";
-import { LogsWidget } from "../widgets/logs.js";
-
-import { StatusBar } from "./status-bar.js";
-import { TermsAndConditionsModal } from "./terms-and-conditions-modal.js";
-import { useLayout } from "./use-layout.js";
-
-export interface LayoutProps {
-  cloudAppState: State;
-  wingVersion: string | undefined;
-  layoutConfig?: LayoutConfig;
-}
-
-const defaultLayoutConfig: LayoutConfig = {
-  leftPanel: {
-    components: [
-      {
-        type: "explorer",
-      },
-      {
-        type: "tests",
-      },
-    ],
-  },
-  bottomPanel: {
-    components: [
-      {
-        type: "logs",
-      },
-    ],
-  },
-  statusBar: {
-    hide: false,
-    showThemeToggle: true,
-  },
-  errorScreen: {
-    position: "default",
-    displayTitle: true,
-    displayLinks: true,
-  },
-  panels: {
-    rounded: false,
-  },
-};
-
-export const DefaultLayout = ({
-  cloudAppState,
-  wingVersion,
-  layoutConfig,
-}: LayoutProps) => {
-  const {
-    items,
-    selectedItems,
-    setSelectedItems,
-    expandedItems,
-    setExpandedItems,
-    expand,
-    expandAll,
-    collapseAll,
-    theme,
-    errorMessage,
-    loading,
-    metadata,
-    selectedEdgeId,
-    setSelectedEdgeId,
-    edgeMetadata,
-    showTests,
-    onResourceClick,
-    title,
-    termsConfig,
-    acceptTerms,
-  } = useLayout({
-    cloudAppState,
-  });
-
-  useEffect(() => {
-    document.title = title;
-  }, [title]);
-
-  const { loading: deferredLoading, setLoading: setDeferredLoading } =
-    useLoading({
-      delay: 800,
-      duration: 100,
-    });
-  useEffect(() => {
-    setDeferredLoading(loading);
-  }, [loading, setDeferredLoading]);
-
-  const showTerms = useMemo(() => {
-    if (!termsConfig.data) {
-      return false;
-    }
-    return termsConfig.data.requireAcceptTerms && !termsConfig.data.accepted;
-  }, [termsConfig.data]);
-
-  const layout: LayoutConfig = useMemo(() => {
-    return {
-      ...defaultLayoutConfig,
-      ...layoutConfig,
-    };
-  }, [layoutConfig]);
-
-  const renderApp = useMemo(() => {
-    return !(
-      layout.errorScreen?.position === "default" && cloudAppState === "error"
-    );
-  }, [layout.errorScreen?.position, cloudAppState]);
-
-  const selectedItemId = useMemo(() => selectedItems.at(0), [selectedItems]);
-
-  const onTestsSelectedItemsChange = useCallback(
-    (items: string[]) => {
-      if (!showTests) {
-        return;
-      }
-      setSelectedItems(items);
-    },
-    [showTests, setSelectedItems],
-  );
-
-  const renderLayoutComponent = useCallback(
-    (component: LayoutComponent) => {
-      switch (component.type) {
-        case "explorer": {
-          return (
-            <div key={component.type} className="flex grow">
-              <Explorer
-                loading={loading}
-                items={items}
-                selectedItemId={selectedItemId}
-                onSelectedItemsChange={setSelectedItems}
-                expandedItems={expandedItems}
-                onExpandedItemsChange={setExpandedItems}
-                onExpandAll={expandAll}
-                onCollapseAll={collapseAll}
-                data-testid="explorer-tree-menu"
-              />
-            </div>
-          );
-        }
-        case "tests": {
-          return (
-            <TestsTreeView
-              key={component.type}
-              onSelectedItemsChange={onTestsSelectedItemsChange}
-              selectedItemId={showTests ? selectedItemId : undefined}
-            />
-          );
-        }
-        case "logs": {
-          return (
-            <div
-              key={component.type}
-              className={classNames(
-                "flex-1 flex flex-col min-w-[10rem]",
-                theme.bg3,
-              )}
-            >
-              <LogsWidget
-                loading={deferredLoading}
-                onResourceClick={onResourceClick}
-              />
-            </div>
-          );
-        }
-      }
-    },
-    [
-      loading,
-      items,
-      selectedItemId,
-      setSelectedItems,
-      expandedItems,
-      setExpandedItems,
-      expandAll,
-      collapseAll,
-      onTestsSelectedItemsChange,
-      showTests,
-      theme.bg3,
-      deferredLoading,
-      onResourceClick,
-    ],
-  );
-
-  const onConnectionNodeClick = useCallback(
-    (path: string) => {
-      expand(path);
-      setSelectedItems([path]);
-    },
-    [expand, setSelectedItems],
-  );
-
-  return (
-    <>
-      {showTerms && (
-        <TermsAndConditionsModal
-          visible={true}
-          onAccept={() => acceptTerms()}
-          license={termsConfig.data?.license ?? ""}
-        />
-      )}
-
-      <div className={classNames("w-full h-full", theme.bg1)}>
-        <div
-          data-testid="default-layout"
-          className={classNames(
-            "w-full h-full flex flex-col select-none",
-            theme.text2,
-            showTerms && "blur-sm",
-            "gap-0.5",
-            layout?.panels?.rounded && "pt-1",
-          )}
-        >
-          <PersistentStateProvider>
-            {cloudAppState === "error" &&
-              layout.errorScreen?.position === "default" && (
-                <div className="flex-1 flex relative">
-                  <BlueScreenOfDeath
-                    title={"An error has occurred:"}
-                    error={errorMessage.data ?? ""}
-                    displayLinks={layout.errorScreen?.displayLinks}
-                    displayWingTitle={layout.errorScreen?.displayTitle}
-                  />
-                </div>
-              )}
-
-            {renderApp && (
-              <>
-                {loading && (
-                  <div
-                    data-testid="loading-overlay"
-                    className="fixed inset-0"
-                  />
-                )}
-
-                <div className="flex-1 flex relative gap-0.5">
-                  <div
-                    className={classNames(
-                      "absolute h-full w-full bg-white/70 dark:bg-slate-600/70",
-                      "transition-all",
-                      deferredLoading && "opacity-100 z-50",
-                      !deferredLoading && "opacity-100 -z-10",
-                    )}
-                  >
-                    <div className="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
-                      <SpinnerLoader data-testid="main-view-loader" />
-                    </div>
-                  </div>
-
-                  {!layout.leftPanel?.hide &&
-                    layout.leftPanel?.components?.length && (
-                      <RightResizableWidget
-                        className={classNames(
-                          USE_EXTERNAL_THEME_COLOR,
-                          "h-full flex flex-col w-80 min-w-[10rem] min-h-[10rem] gap-0.5",
-                        )}
-                      >
-                        {layout.leftPanel?.components.map(
-                          (component: LayoutComponent, index: number) => {
-                            const panelComponent = (
-                              <div
-                                className={classNames(
-                                  layout.panels?.rounded &&
-                                    "rounded-lg overflow-hidden",
-                                  index === 0 && "flex grow",
-                                  index > 0 && "h-full",
-                                )}
-                              >
-                                {renderLayoutComponent(component)}
-                              </div>
-                            );
-
-                            if (index > 0) {
-                              return (
-                                <TopResizableWidget
-                                  key={component.type}
-                                  className="h-1/3"
-                                >
-                                  {panelComponent}
-                                </TopResizableWidget>
-                              );
-                            }
-                            return (
-                              <div
-                                key={index}
-                                className={classNames(
-                                  "flex grow",
-                                  layout.panels?.rounded &&
-                                    "rounded-lg overflow-hidden",
-                                )}
-                              >
-                                {panelComponent}
-                              </div>
-                            );
-                          },
-                        )}
-                      </RightResizableWidget>
-                    )}
-
-                  <div className="flex-1 flex flex-col">
-                    <div className="flex-1 flex gap-0.5">
-                      <div
-                        className={classNames(
-                          "flex-1 flex flex-col",
-                          USE_EXTERNAL_THEME_COLOR,
-                          layout.panels?.rounded &&
-                            "rounded-lg overflow-hidden",
-                        )}
-                        data-testid="map-view"
-                      >
-                        <MapView
-                          showTests={showTests}
-                          selectedNodeId={selectedItems[0]}
-                          onSelectedNodeIdChange={(nodeId) =>
-                            setSelectedItems(nodeId ? [nodeId] : [])
-                          }
-                          selectedEdgeId={selectedEdgeId}
-                          onSelectedEdgeIdChange={setSelectedEdgeId}
-                        />
-                      </div>
-
-                      <LeftResizableWidget
-                        className={classNames(
-                          theme.border4,
-                          "flex-shrink w-80 min-w-[10rem] z-10",
-                          USE_EXTERNAL_THEME_COLOR,
-                        )}
-                      >
-                        <div
-                          className={classNames(
-                            "w-full h-full relative",
-                            theme.bg3,
-                            layout.panels?.rounded &&
-                              "rounded-lg overflow-hidden",
-                          )}
-                        >
-                          {metadata.data && (
-                            <ResourceMetadata
-                              node={metadata.data?.node}
-                              inbound={metadata.data?.inbound}
-                              outbound={metadata.data?.outbound}
-                              onConnectionNodeClick={onConnectionNodeClick}
-                            />
-                          )}
-
-                          {selectedEdgeId && edgeMetadata.data && (
-                            <EdgeMetadata
-                              source={edgeMetadata.data.source}
-                              target={edgeMetadata.data.target}
-                              inflights={edgeMetadata.data.inflights}
-                              onConnectionNodeClick={onConnectionNodeClick}
-                            />
-                          )}
-                        </div>
-                      </LeftResizableWidget>
-                    </div>
-                  </div>
-                </div>
-
-                {!layout.bottomPanel?.hide && (
-                  <TopResizableWidget
-                    className={classNames(
-                      USE_EXTERNAL_THEME_COLOR,
-                      "relative flex",
-                      theme.text2,
-                      "min-h-[5rem]",
-                      "gap-0.5",
-                      (layout.bottomPanel?.size === "small" && "h-[8rem]") ||
-                        "h-[15rem]",
-                    )}
-                  >
-                    {layout.bottomPanel?.components?.map(
-                      (component: LayoutComponent, index: number) => {
-                        const panelComponent = (
-                          <div
-                            key={index}
-                            className={classNames(
-                              layout.panels?.rounded &&
-                                "rounded-lg overflow-hidden",
-                              "flex grow",
-                            )}
-                          >
-                            {renderLayoutComponent(component)}
-                          </div>
-                        );
-
-                        if (
-                          layout.bottomPanel?.components?.length &&
-                          layout.bottomPanel.components.length > 1 &&
-                          index !== layout.bottomPanel.components.length - 1
-                        ) {
-                          return (
-                            <RightResizableWidget
-                              key={component.type}
-                              className={classNames(
-                                "h-full w-1/4 flex flex-col min-w-[10rem] min-h-[10rem]",
-                              )}
-                            >
-                              {panelComponent}
-                            </RightResizableWidget>
-                          );
-                        }
-                        return panelComponent;
-                      },
-                    )}
-                  </TopResizableWidget>
-                )}
-
-                {cloudAppState === "error" &&
-                  layout.errorScreen?.position === "bottom" && (
-                    <>
-                      <div className="fixed inset-0 flex justify-center items-center z-50 bg-black bg-opacity-40" />
-
-                      <div className="fixed bottom-0 max-h-[80vh] w-full z-50">
-                        <TopResizableWidget
-                          className={classNames(
-                            theme.border4,
-                            "absolute flex",
-                            theme.bg3,
-                            theme.text2,
-                            "min-h-[5rem] h-[30rem]",
-                          )}
-                        >
-                          <BlueScreenOfDeath
-                            title={"An error has occurred:"}
-                            error={errorMessage.data ?? ""}
-                            displayLinks={layout.errorScreen?.displayLinks}
-                            displayWingTitle={layout.errorScreen?.displayTitle}
-                          />
-                        </TopResizableWidget>
-                      </div>
-                    </>
-                  )}
-              </>
-            )}
-
-            {!layout.statusBar?.hide && (
-              <div className={classNames(USE_EXTERNAL_THEME_COLOR)}>
-                <StatusBar
-                  wingVersion={wingVersion}
-                  cloudAppState={cloudAppState}
-                  isError={cloudAppState === "error"}
-                  showThemeToggle={layout.statusBar?.showThemeToggle}
-                />
-              </div>
-            )}
-          </PersistentStateProvider>
-        </div>
-      </div>
-    </>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/layout/header.tsx b/apps/wing-console/console/ui/src/layout/header.tsx
deleted file mode 100644
index bf9e64b01b2..00000000000
--- a/apps/wing-console/console/ui/src/layout/header.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useTheme } from "@wingconsole/design-system";
-import classNames from "classnames";
-
-import { ThemeToggle } from "./theme-toggle.js";
-
-export interface HeaderProps {
-  title: string;
-  showThemeToggle?: boolean;
-}
-
-export const Header = ({ title, showThemeToggle = true }: HeaderProps) => {
-  const { theme } = useTheme();
-
-  return (
-    <div
-      className={classNames(
-        "w-full h-8 draggable-frame border-b flex items-center px-4",
-        theme.bg3,
-        theme.border3,
-        theme.text2,
-      )}
-    >
-      <div className="w-1/3 grow" />
-      <div className="w-1/3 justify-center items-center text-center gap-x-1 flex">
-        <div>{title}</div>
-      </div>
-      <div className="w-1/3 flex space-x-1 justify-end">
-        {showThemeToggle && <ThemeToggle />}
-      </div>
-    </div>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/layout/status-bar.tsx b/apps/wing-console/console/ui/src/layout/status-bar.tsx
deleted file mode 100644
index 0a64a41962a..00000000000
--- a/apps/wing-console/console/ui/src/layout/status-bar.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useTheme, Loader } from "@wingconsole/design-system";
-import { State } from "@wingconsole/server";
-import classNames from "classnames";
-
-import { AutoUpdater } from "../features/auto-updater.js";
-
-import { ThemeToggle } from "./theme-toggle.js";
-
-export interface StatusBarProps {
-  wingVersion?: string;
-  cloudAppState: State;
-  isError?: boolean;
-  showThemeToggle?: boolean;
-}
-
-export const StatusBar = ({
-  wingVersion = "",
-  cloudAppState,
-  isError = false,
-  showThemeToggle = false,
-}: StatusBarProps) => {
-  const { theme } = useTheme();
-  const loading =
-    cloudAppState === "loadingSimulator" || cloudAppState === "compiling";
-  const cloudAppStateString = {
-    compiling: "compiling",
-    loadingSimulator: "loading simulator",
-    success: "success",
-    error: "error",
-  };
-  return (
-    <footer
-      className={classNames(
-        theme.bg3,
-        theme.text1,
-        theme.border3,
-        "py-1 px-4 flex text-2xs w-full relative z-10",
-      )}
-    >
-      {/*left side*/}
-      <div className="w-full flex space-x-6">
-        <div title={wingVersion} className="truncate space-x-1 min-w-[7rem]">
-          {wingVersion && (
-            <>
-              <span>Wing</span>
-              <span className={classNames(theme.text2)}>v{wingVersion}</span>
-            </>
-          )}
-        </div>
-
-        <div className="flex space-x-1">
-          <span>Status:</span>
-          <span className={classNames(theme.text2)}>
-            <span
-              className={classNames([
-                isError ? "text-red-500" : theme.text2,
-                "flex",
-              ])}
-            >
-              {loading && <Loader size="xs" className={"mr-1"} />}
-              {cloudAppStateString[cloudAppState]}
-            </span>
-          </span>
-        </div>
-      </div>
-      {/*right side*/}
-      <div className="w-full flex space-x-0 justify-end">
-        <AutoUpdater />
-        {showThemeToggle && <ThemeToggle />}
-      </div>
-    </footer>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/layout/terms-and-conditions-modal.tsx b/apps/wing-console/console/ui/src/layout/terms-and-conditions-modal.tsx
deleted file mode 100644
index ea11ba4fd27..00000000000
--- a/apps/wing-console/console/ui/src/layout/terms-and-conditions-modal.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Button, Checkbox, Input, useTheme } from "@wingconsole/design-system";
-import classNames from "classnames";
-import { useId, useState } from "react";
-import ReactMarkdown from "react-markdown";
-
-export interface TermsAndConditionsModalProps {
-  visible: boolean;
-  onAccept: () => void;
-  license: string;
-}
-
-export const TermsAndConditionsModal = ({
-  visible,
-  onAccept,
-  license,
-}: TermsAndConditionsModalProps) => {
-  const { theme } = useTheme();
-
-  const [checked, setChecked] = useState(false);
-
-  const id = useId();
-
-  return (
-    visible && (
-      <div className="fixed inset-0 flex justify-center items-center z-50 bg-black bg-opacity-40">
-        <div
-          className={classNames(
-            "p-6 rounded-lg shadow-lg space-y-2",
-            theme.bgInput,
-            theme.textInput,
-          )}
-        >
-          <h1 className="text-lg font-bold">Terms and Conditions</h1>
-          <div className="text-sm max-w-[40rem] max-h-[30rem] overflow-auto pr-4">
-            <div className="space-y-3">
-              <ReactMarkdown
-                // eslint-disable-next-line react/no-children-prop
-                children={license}
-              />
-            </div>
-          </div>
-
-          <div className="pt-2">
-            <div className="space-x-2 items-center flex">
-              <Checkbox
-                id={id}
-                checked={checked}
-                onChange={(event) => setChecked(event.target.checked)}
-                className="cursor-pointer"
-              />
-              <label htmlFor={id} className="cursor-pointer select-none">
-                I have read and agree to the terms and conditions.
-              </label>
-            </div>
-            <div className="flex justify-end">
-              <Button primary onClick={onAccept} disabled={!checked}>
-                Close
-              </Button>
-            </div>
-          </div>
-        </div>
-      </div>
-    )
-  );
-};
diff --git a/apps/wing-console/console/ui/src/layout/theme-toggle.tsx b/apps/wing-console/console/ui/src/layout/theme-toggle.tsx
deleted file mode 100644
index beecb9a227e..00000000000
--- a/apps/wing-console/console/ui/src/layout/theme-toggle.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { MoonIcon, SunIcon } from "@heroicons/react/24/outline";
-import { useTheme } from "@wingconsole/design-system";
-import classNames from "classnames";
-import { useCallback, useMemo } from "react";
-
-export const ThemeToggle = () => {
-  const { theme, setThemeMode, mode, mediaTheme } = useTheme();
-
-  const currentTheme = useMemo(() => {
-    if (mode === "auto") {
-      return mediaTheme;
-    }
-    return mode;
-  }, [mode, mediaTheme]);
-
-  const toggleThemeMode = useCallback(() => {
-    const newMode =
-      // eslint-disable-next-line unicorn/no-nested-ternary
-      mode === "light" ? "auto" : mode === "auto" ? "dark" : "light";
-    setThemeMode?.(newMode);
-  }, [setThemeMode, mode]);
-
-  return (
-    <button
-      className={classNames(
-        theme.textInput,
-        "rounded-3xl font-medium flex focus:outline-none",
-        "hover:bg-slate-200 hover:dark:bg-slate-600",
-        "transition-color duration-300 cursor-pointer",
-        "gap-x-1 p-1",
-      )}
-      onClick={toggleThemeMode}
-    >
-      {currentTheme === "light" && <SunIcon className="h-4" />}
-      {currentTheme === "dark" && <MoonIcon className="h-4" />}
-      {mode === "auto" && (
-        <div className="font-light capitalize text-xs">{mode}</div>
-      )}
-    </button>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/layout/use-layout.tsx b/apps/wing-console/console/ui/src/layout/use-layout.tsx
deleted file mode 100644
index a751451655f..00000000000
--- a/apps/wing-console/console/ui/src/layout/use-layout.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useTheme } from "@wingconsole/design-system";
-import type { State } from "@wingconsole/server";
-import { useLoading } from "@wingconsole/use-loading";
-import { useEffect, useState, useContext, useMemo, useCallback } from "react";
-
-import { trpc } from "../services/trpc.js";
-import { useExplorer } from "../services/use-explorer.js";
-import { TestsContext } from "../tests-context.js";
-
-export interface UseLayoutProps {
-  cloudAppState: State;
-}
-
-export const useLayout = ({ cloudAppState }: UseLayoutProps) => {
-  const { theme } = useTheme();
-
-  const {
-    items,
-    selectedItems,
-    setSelectedItems,
-    expandedItems,
-    setExpandedItems,
-    expand,
-    expandAll,
-    collapseAll,
-  } = useExplorer();
-
-  const errorMessage = trpc["app.error"].useQuery();
-  const { showTests } = useContext(TestsContext);
-
-  const [selectedEdgeId, setSelectedEdgeId] = useState<string>();
-
-  const onSelectedItemsChange = useCallback(
-    (items: string[]) => {
-      setSelectedEdgeId(undefined);
-      setSelectedItems(items);
-    },
-    [setSelectedItems],
-  );
-
-  const onSelectedEdgeIdChange = useCallback(
-    (edgeId: string | undefined) => {
-      onSelectedItemsChange([]);
-      setSelectedEdgeId(edgeId);
-    },
-    [onSelectedItemsChange],
-  );
-
-  const wingfile = trpc["app.wingfile"].useQuery();
-  const title = useMemo(() => {
-    if (!wingfile.data) {
-      return "Wing Console";
-    }
-    return `${wingfile.data} - Wing Console`;
-  }, [wingfile.data]);
-
-  const termsConfig = trpc["app.termsConfig"].useQuery();
-  const acceptTerms = trpc["app.acceptTerms"].useMutation();
-
-  const metadata = trpc["app.nodeMetadata"].useQuery(
-    {
-      path: selectedItems[0],
-      showTests,
-    },
-    {
-      enabled: selectedItems.length > 0,
-    },
-  );
-
-  const edgeMetadata = trpc["app.edgeMetadata"].useQuery(
-    {
-      edgeId: selectedEdgeId || "",
-      showTests,
-    },
-    {
-      enabled: !!selectedEdgeId,
-    },
-  );
-
-  const { loading, setLoading } = useLoading({
-    duration: 400,
-  });
-
-  useEffect(() => {
-    setLoading(
-      cloudAppState === "loadingSimulator" || cloudAppState === "compiling",
-    ),
-      [cloudAppState, items.length];
-  });
-
-  const onResourceClick = useCallback(
-    (path: string) => {
-      setSelectedItems([path]);
-    },
-    [setSelectedItems],
-  );
-
-  return {
-    items,
-    selectedItems,
-    setSelectedItems: onSelectedItemsChange,
-    expandedItems,
-    setExpandedItems,
-    expand,
-    expandAll,
-    collapseAll,
-    theme,
-    errorMessage,
-    loading,
-    metadata,
-    selectedEdgeId,
-    setSelectedEdgeId: onSelectedEdgeIdChange,
-    edgeMetadata,
-    showTests,
-    onResourceClick,
-    title,
-    wingfile,
-    termsConfig,
-    acceptTerms: acceptTerms.mutate,
-  };
-};
diff --git a/apps/wing-console/console/ui/src/services/use-api.ts b/apps/wing-console/console/ui/src/services/use-api.ts
deleted file mode 100644
index 5a5af9ff3ae..00000000000
--- a/apps/wing-console/console/ui/src/services/use-api.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { useCallback, useEffect, useMemo } from "react";
-
-import { ApiRequest } from "../shared/api.js";
-
-import { trpc } from "./trpc.js";
-
-export interface UseApiOptions {
-  resourcePath: string;
-  onFetchDataUpdate: (data: any) => void;
-  onSchemaDataUpdate: (data: any) => void;
-}
-
-export const useApi = ({
-  resourcePath,
-  onFetchDataUpdate,
-  onSchemaDataUpdate,
-}: UseApiOptions) => {
-  const fetch = trpc["api.fetch"].useMutation();
-  const schema = trpc["api.schema"].useQuery({ resourcePath });
-
-  useEffect(() => {
-    // if (!fetch.data?.textResponse) {
-    //   return;
-    // }
-    onFetchDataUpdate(fetch.data);
-  }, [fetch.data, onFetchDataUpdate]);
-
-  useEffect(() => {
-    if (!schema.data) {
-      return;
-    }
-    onSchemaDataUpdate(schema.data);
-  }, [onSchemaDataUpdate, schema.data]);
-
-  const callFetch = useCallback(
-    async ({ url, route, method, variables, headers, body }: ApiRequest) => {
-      if (!url || !method || !route) {
-        return;
-      }
-      await fetch.mutateAsync({
-        url,
-        route,
-        variables,
-        method,
-        headers,
-        body,
-      });
-    },
-    [fetch],
-  );
-
-  const isLoading = useMemo(() => {
-    return fetch.isLoading || schema.isLoading;
-  }, [fetch.isLoading, schema.isLoading]);
-
-  return {
-    isLoading,
-    callFetch,
-  };
-};
diff --git a/apps/wing-console/console/ui/src/services/use-dynamodb-table.ts b/apps/wing-console/console/ui/src/services/use-dynamodb-table.ts
deleted file mode 100644
index 29ba199fc98..00000000000
--- a/apps/wing-console/console/ui/src/services/use-dynamodb-table.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useCallback, useMemo } from "react";
-
-import { trpc } from "./trpc.js";
-
-export interface UseTableOptions {
-  resourcePath: string;
-}
-
-export const useDynamodbTable = ({ resourcePath }: UseTableOptions) => {
-  const table = trpc["dynamodb-table.info"].useQuery({ resourcePath });
-  const tableInsert = trpc["dynamodb-table.insert"].useMutation();
-  const tableDelete = trpc["dynamodb-table.delete"].useMutation();
-
-  const addRow = useCallback(
-    async (row: any) => {
-      await tableInsert.mutateAsync({
-        resourcePath,
-        data: row,
-      });
-    },
-    [tableInsert, resourcePath],
-  );
-
-  const removeRow = useCallback(
-    async (index: number) => {
-      const row = table.data?.rows.items[index];
-      if (!row) {
-        return;
-      }
-      await tableDelete.mutateAsync({
-        resourcePath,
-        data: row,
-      });
-    },
-    [tableDelete, resourcePath, table.data?.rows],
-  );
-
-  const loading = useMemo(() => {
-    return table.isFetching || tableInsert.isLoading || tableDelete.isLoading;
-  }, [tableInsert.isLoading, tableDelete.isLoading, table.isFetching]);
-
-  return {
-    table,
-    addRow,
-    removeRow,
-    loading,
-  };
-};
diff --git a/apps/wing-console/console/ui/src/services/use-explorer.tsx b/apps/wing-console/console/ui/src/services/use-explorer.tsx
deleted file mode 100644
index 7f3da790a54..00000000000
--- a/apps/wing-console/console/ui/src/services/use-explorer.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { ResourceIcon } from "@wingconsole/design-system";
-import { ExplorerItem } from "@wingconsole/server";
-import { useCallback, useEffect } from "react";
-
-import { TreeMenuItem, useTreeMenuItems } from "../ui/use-tree-menu-items.js";
-
-import { trpc } from "./trpc.js";
-
-const createTreeMenuItemFromExplorerTreeItem = (
-  item: ExplorerItem,
-): TreeMenuItem => {
-  return {
-    id: item.id,
-    label: item.label,
-    icon: item.type ? (
-      <ResourceIcon
-        resourceType={item.type}
-        resourcePath={item.id}
-        className="w-4 h-4"
-      />
-    ) : undefined,
-    children: item.childItems?.map((item) =>
-      createTreeMenuItemFromExplorerTreeItem(item),
-    ),
-  };
-};
-
-export const useExplorer = () => {
-  const {
-    items,
-    setItems,
-    selectedItems,
-    setSelectedItems,
-    expandedItems,
-    setExpandedItems,
-    expand,
-    expandAll,
-    collapseAll,
-  } = useTreeMenuItems({
-    selectedItemIds: ["root"],
-  });
-
-  const tree = trpc["app.explorerTree"].useQuery();
-
-  const { mutate: setSelectedNode } = trpc["app.selectNode"].useMutation();
-  const selectedNode = trpc["app.selectedNode"].useQuery();
-  const nodeIds = trpc["app.nodeIds"].useQuery();
-
-  const onSelectedItemsChange = useCallback(
-    (selectedItems: string[]) => {
-      setSelectedItems(selectedItems);
-      setSelectedNode({
-        resourcePath: selectedItems[0] ?? "",
-      });
-    },
-    [setSelectedNode, setSelectedItems],
-  );
-
-  useEffect(() => {
-    if (!tree.data) {
-      return;
-    }
-    // Remove the root node by taking the children.
-    const items = createTreeMenuItemFromExplorerTreeItem(tree.data).children;
-    setItems(items ?? []);
-  }, [tree.data, setItems]);
-
-  useEffect(() => {
-    if (!nodeIds.data) {
-      return;
-    }
-
-    if (!selectedNode.data || !nodeIds.data?.includes(selectedNode.data)) {
-      setSelectedNode({
-        resourcePath: "root",
-      });
-    }
-  }, [selectedNode.data, nodeIds.data, setSelectedNode]);
-
-  useEffect(() => {
-    if (!selectedNode.data) {
-      return;
-    }
-    setSelectedItems([selectedNode.data]);
-  }, [selectedNode.data, setSelectedItems]);
-
-  useEffect(() => {
-    expandAll();
-  }, [items, expandAll]);
-
-  return {
-    items,
-    selectedItems,
-    setSelectedItems: onSelectedItemsChange,
-    expandedItems,
-    setExpandedItems,
-    expand,
-    expandAll,
-    collapseAll,
-  };
-};
diff --git a/apps/wing-console/console/ui/src/services/use-map.ts b/apps/wing-console/console/ui/src/services/use-map.ts
deleted file mode 100644
index 8d3d4c1bf4c..00000000000
--- a/apps/wing-console/console/ui/src/services/use-map.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useEffect, useState } from "react";
-
-import { trpc } from "./trpc.js";
-
-export interface UseMapOptions {
-  showTests: boolean;
-}
-export const useMap = ({ showTests }: UseMapOptions) => {
-  const map = trpc["app.map"].useQuery({
-    showTests: showTests,
-  });
-
-  const [mapData, setMapData] = useState(map.data);
-
-  useEffect(() => {
-    setMapData(map.data);
-  }, [map.data]);
-
-  return {
-    mapData,
-  };
-};
diff --git a/apps/wing-console/console/ui/src/services/use-react-app.ts b/apps/wing-console/console/ui/src/services/use-react-app.ts
deleted file mode 100644
index a68d642b5c4..00000000000
--- a/apps/wing-console/console/ui/src/services/use-react-app.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useEffect, useState } from "react";
-
-import { trpc } from "./trpc.js";
-
-export interface UseReactAppOptions {
-  resourcePath: string;
-}
-
-export const useReactApp = ({ resourcePath }: UseReactAppOptions) => {
-  const websiteUrl = trpc["reactApp.url"].useQuery({ resourcePath });
-  const [url, setUrl] = useState("");
-
-  useEffect(() => {
-    setUrl(websiteUrl.data ?? "");
-  }, [websiteUrl.data]);
-
-  return {
-    url,
-  };
-};
diff --git a/apps/wing-console/console/ui/src/shared/Edge.ts b/apps/wing-console/console/ui/src/shared/Edge.ts
deleted file mode 100644
index 5447cfdb117..00000000000
--- a/apps/wing-console/console/ui/src/shared/Edge.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface Edge {
-  id: string;
-  source: string;
-  target: string;
-}
diff --git a/apps/wing-console/console/ui/src/shared/Node.ts b/apps/wing-console/console/ui/src/shared/Node.ts
deleted file mode 100644
index 09e82115bab..00000000000
--- a/apps/wing-console/console/ui/src/shared/Node.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type Node<T = undefined> = {
-  id: string;
-  children?: Node<T>[];
-  data?: T;
-};
diff --git a/apps/wing-console/console/ui/src/shared/api.ts b/apps/wing-console/console/ui/src/shared/api.ts
deleted file mode 100644
index 13309803839..00000000000
--- a/apps/wing-console/console/ui/src/shared/api.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { KeyValueItem } from "@wingconsole/design-system";
-import { OpenApiSpec } from "@wingconsole/server/src/wingsdk";
-
-export const HTTP_METHODS = [
-  "GET",
-  "HEAD",
-  "POST",
-  "PUT",
-  "DELETE",
-  "CONNECT",
-  "OPTIONS",
-  "PATCH",
-];
-
-export const HTTP_HEADERS = {
-  accept: [
-    "text/html",
-    "text/plain",
-    "application/json",
-    "application/xml",
-    "application/javascript",
-    "application/octet-stream",
-    "multipart/form-data",
-    "application/x-www-form-urlencoded",
-  ],
-  "accept-charset": ["utf8", "iso-8859-1", "windows-1252"],
-  "accept-encoding": ["gzip", "deflate", "br"],
-  authorization: [],
-  "cache-control": [
-    "no-cache",
-    "no-store",
-    "max-age=<seconds>",
-    "max-stale=<seconds>",
-    "min-fresh=<seconds>",
-    "only-if-cached",
-  ],
-  connection: ["keep-alive", "close"],
-  "content-length": [],
-  "content-type": [
-    "application/json",
-    "application/x-www-form-urlencoded",
-    "multipart/form-data",
-  ],
-  cookie: [],
-  origin: [],
-  "user-agent": [],
-};
-
-export interface ApiResponseHeader {
-  key: string;
-  value: string;
-}
-
-export interface ApiResponse {
-  status: number;
-  statusText: string;
-  textResponse: string;
-  duration: number;
-  headers: ApiResponseHeader[];
-}
-
-export interface ApiRequest {
-  url: string;
-  route: string;
-  variables: { value: string; key: string }[];
-  method: string;
-  headers: { value: string; key: string }[];
-  body: string;
-}
-
-export interface ApiRoute {
-  method: string;
-  route: string;
-}
-
-export const getHeaderValues = (header: string): string[] => {
-  const key = header as keyof typeof HTTP_HEADERS;
-  if (key in HTTP_HEADERS) {
-    return HTTP_HEADERS[key];
-  }
-  return [];
-};
-
-export const getRoutesFromOpenApi = (openApi: OpenApiSpec): ApiRoute[] => {
-  let routes: ApiRoute[] = [];
-  for (const route of Object.keys(openApi.paths)) {
-    const methods = Object.keys(openApi.paths[route]);
-    for (const method of methods) {
-      routes.push({
-        method: method.replace(/^\//, "").toUpperCase(),
-        route,
-      });
-    }
-  }
-  return routes;
-};
diff --git a/apps/wing-console/console/ui/src/services/trpc.ts b/apps/wing-console/console/ui/src/trpc.ts
similarity index 100%
rename from apps/wing-console/console/ui/src/services/trpc.ts
rename to apps/wing-console/console/ui/src/trpc.ts
diff --git a/apps/wing-console/console/ui/src/ui/api-interaction.tsx b/apps/wing-console/console/ui/src/ui/api-interaction.tsx
deleted file mode 100644
index 5c6dd68d685..00000000000
--- a/apps/wing-console/console/ui/src/ui/api-interaction.tsx
+++ /dev/null
@@ -1,436 +0,0 @@
-import {
-  Attribute,
-  Button,
-  Combobox,
-  KeyValueList,
-  Select,
-  Tabs,
-  TextArea,
-  useKeyValueList,
-  useTheme,
-} from "@wingconsole/design-system";
-import { createPersistentState } from "@wingconsole/use-persistent-state";
-import classNames from "classnames";
-import { memo, useCallback, useEffect, useId, useState } from "react";
-
-import { AppMode } from "../AppContext.js";
-import {
-  ApiRequest,
-  ApiResponse,
-  ApiRoute,
-  getHeaderValues,
-  getRoutesFromOpenApi,
-  HTTP_HEADERS,
-  HTTP_METHODS,
-} from "../shared/api.js";
-
-import { ApiResponseBodyPanel } from "./api-response-body-panel.js";
-import { ApiResponseHeadersPanel } from "./api-response-headers-panel.js";
-
-export interface ApiInteractionProps {
-  resourceId: string;
-  appMode: AppMode;
-  apiResponse?: ApiResponse;
-  schemaData: any;
-  callFetch: (data: ApiRequest) => void;
-  isLoading: boolean;
-}
-
-export const ApiInteraction = memo(
-  ({
-    resourceId,
-    appMode,
-    apiResponse,
-    callFetch,
-    schemaData,
-    isLoading,
-  }: ApiInteractionProps) => {
-    const { theme } = useTheme();
-
-    const { usePersistentState } = createPersistentState(resourceId);
-    const bodyId = useId();
-
-    const [url, setUrl] = useState("");
-    const [routes, setRoutes] = useState<ApiRoute[]>([]);
-
-    const [valuesList, setValuesList] = useState<string[]>([]);
-
-    const [currentHeaderKey, setCurrentHeaderKey] = usePersistentState("");
-    const [currentRoute, setCurrentRoute] = usePersistentState("");
-
-    const [currentMethod, setCurrentMethod] = usePersistentState("GET");
-    const [body, setBody] = usePersistentState("");
-
-    const [currentOptionsTab, setCurrentOptionsTab] =
-      usePersistentState("headers");
-    const [currentResponseTab, setCurrentResponseTab] =
-      usePersistentState("body");
-
-    const {
-      items: headers,
-      addItem: addHeader,
-      removeItem: removeHeader,
-      editItem: editHeader,
-      removeAll: removeAllHeaders,
-    } = useKeyValueList({
-      useState: usePersistentState,
-    });
-
-    const {
-      items: queryParameters,
-      addItem: addQueryParameter,
-      removeItem: removeQueryParameter,
-      editItem: editQueryParameter,
-      setItems: setQueryParameters,
-      removeAll: removeAllQueryParameters,
-    } = useKeyValueList({
-      useState: usePersistentState,
-    });
-
-    const {
-      items: pathVariables,
-      editItem: editPathVariable,
-      setItems: setPathVariables,
-    } = useKeyValueList({
-      useState: usePersistentState,
-    });
-
-    const apiCall = useCallback(async () => {
-      if (!url || !currentMethod || !currentRoute) {
-        return;
-      }
-      callFetch({
-        url,
-        route: currentRoute,
-        variables: pathVariables,
-        method: currentMethod,
-        headers,
-        body,
-      });
-    }, [
-      url,
-      currentMethod,
-      currentRoute,
-      callFetch,
-      pathVariables,
-      headers,
-      body,
-    ]);
-
-    // TODO revisit
-    const openResponseTab = useCallback(
-      (tabId: string) => {
-        setCurrentResponseTab(tabId);
-      },
-      [setCurrentResponseTab],
-    );
-    const openOptionTab = useCallback(
-      (tabId: string) => {
-        setCurrentOptionsTab(tabId);
-      },
-      [setCurrentOptionsTab],
-    );
-
-    useEffect(() => {
-      if (!currentHeaderKey) {
-        setValuesList([]);
-        return;
-      }
-      setValuesList(getHeaderValues(currentHeaderKey));
-    }, [currentHeaderKey]);
-
-    const handleRouteChange = useCallback(
-      (value: string) => {
-        const newRoute = value && !value.startsWith("/") ? `/${value}` : value;
-        setCurrentRoute(newRoute);
-        const search = newRoute.split(/\?(.*)/s)[1];
-        const urlParameters = new URLSearchParams(search || "");
-
-        setQueryParameters(() => {
-          const newUrlParameters: {
-            key: string;
-            value: string;
-          }[] = [];
-          for (const [key, value] of urlParameters.entries()) {
-            newUrlParameters.push({
-              key,
-              value,
-            });
-          }
-          return newUrlParameters;
-        });
-
-        setPathVariables(() => {
-          const newPathVariables: {
-            key: string;
-            value: string;
-          }[] = [];
-
-          const matches = newRoute.matchAll(/{(\w+)}/g) || [];
-          for (const match of matches) {
-            if (!match[1]) {
-              continue;
-            }
-            newPathVariables.push({
-              key: match[1],
-              value: "",
-            });
-          }
-          return newPathVariables;
-        });
-      },
-      [setCurrentRoute, setPathVariables, setQueryParameters],
-    );
-
-    useEffect(() => {
-      if (!currentRoute) {
-        return;
-      }
-      const urlParameters = new URLSearchParams();
-      for (const item of queryParameters) {
-        urlParameters.append(item.key, item.value);
-      }
-      let newRoute = currentRoute.split("?")[0] || "";
-      if (urlParameters.toString()) {
-        newRoute = `${newRoute}?${urlParameters.toString()}`;
-      }
-      setCurrentRoute(newRoute);
-    }, [currentRoute, queryParameters, setCurrentRoute]);
-
-    useEffect(() => {
-      if (!schemaData) {
-        return;
-      }
-
-      setUrl(schemaData.url);
-      const routes = getRoutesFromOpenApi(schemaData.openApiSpec);
-      setRoutes(routes);
-      const methods = routes
-        .filter((item) => {
-          return item.route === currentRoute;
-        })
-        .map((route) => route.method);
-      if (methods.length > 0 && methods[0]) {
-        setCurrentMethod(methods[0]);
-      }
-    }, [currentRoute, schemaData, setCurrentMethod]);
-
-    // TODO: Refactor inline functions below. For example, with `useCallback` or with additional memo components.
-
-    return (
-      <div className="h-full flex-1 flex flex-col text-sm space-y-1">
-        <div className="relative grow">
-          {appMode === "local" && (
-            <Attribute name="URL" value={url} noLeftPadding />
-          )}
-          <div className="space-y-2 flex-col grow mt-4">
-            <div className="flex gap-1 w-full">
-              <div className="group flex grow relative gap-x-1">
-                <div
-                  className={classNames(
-                    theme.bgInput,
-                    theme.textInput,
-                    theme.borderInput,
-                    theme.focusWithin,
-                    "flex relative",
-                    "text-xs w-full",
-                    "border rounded",
-                    "transition ease-in-out",
-                  )}
-                >
-                  <Select
-                    items={HTTP_METHODS.map((method) => {
-                      return { label: method, value: method };
-                    })}
-                    value={currentMethod}
-                    onChange={(method) => {
-                      setCurrentMethod(method);
-                    }}
-                    btnClassName={classNames(
-                      theme.bgInput,
-                      theme.bgInputHover,
-                      theme.borderInput,
-                      "text-xs text-left outline-none w-[5.5rem] rounded-l",
-                      "px-2.5 py-1.5",
-                      "border-r",
-                    )}
-                    showSelected={false}
-                    dataTestid="cloud.api:method"
-                  />
-                  <Combobox
-                    placeholder="Enter a route"
-                    items={routes.map((route) => {
-                      return {
-                        label: `${route.method} ${route.route}`,
-                        value: `${route.method} ${route.route}`,
-                      };
-                    })}
-                    value={currentRoute}
-                    onChange={(value) => {
-                      const [method, route] = value.split(" ");
-                      if (method && HTTP_METHODS.includes(method) && route) {
-                        setCurrentMethod(method);
-                        handleRouteChange(route);
-                      } else {
-                        handleRouteChange(value);
-                      }
-                    }}
-                    className="w-full"
-                    inputClassName={classNames(
-                      "border-none focus-none text-xs outline-none w-full rounded-r",
-                      "px-2.5 py-1.5",
-                      "focus:ring-0",
-                    )}
-                    showSelected={false}
-                    renderItem={(item) => {
-                      const [method, route] = item.value.split(" ");
-                      return (
-                        <div
-                          className="flex items-center pl-2"
-                          data-testid={`cloud.api:route-${route}`}
-                        >
-                          <span className="shrink-0 w-[78px]">{method}</span>
-                          <span className="w-full">{route}</span>
-                        </div>
-                      );
-                    }}
-                    dataTestid="cloud.api:route"
-                  />
-                </div>
-                <Button
-                  primary
-                  onClick={apiCall}
-                  disabled={!currentMethod || !currentRoute}
-                  dataTestid="cloud.api:send"
-                >
-                  Send
-                </Button>
-              </div>
-            </div>
-            <div>
-              <Tabs
-                small
-                tabs={[
-                  {
-                    id: "headers",
-                    name: "Headers",
-                    count: headers.length,
-                    panel: (
-                      <div className="pt-2">
-                        <KeyValueList
-                          items={headers}
-                          onAddItem={addHeader}
-                          onRemoveItem={removeHeader}
-                          onEditItem={editHeader}
-                          disabled={isLoading}
-                          keysList={Object.keys(HTTP_HEADERS)}
-                          valuesList={valuesList}
-                          onKeyChange={setCurrentHeaderKey}
-                        />
-                      </div>
-                    ),
-                  },
-                  {
-                    id: "params",
-                    name: "Params",
-                    count: queryParameters.length + pathVariables.length,
-                    panel: (
-                      <div className="pt-2 space-y-2">
-                        <div className="space-y-1">
-                          {pathVariables.length > 0 && (
-                            <div className={classNames("text-sm", theme.text2)}>
-                              Query params
-                            </div>
-                          )}
-
-                          <KeyValueList
-                            items={queryParameters}
-                            onAddItem={addQueryParameter}
-                            onRemoveItem={removeQueryParameter}
-                            onEditItem={editQueryParameter}
-                            disabled={isLoading}
-                          />
-                        </div>
-                        {pathVariables.length > 0 && (
-                          <div className="space-y-1">
-                            <div className={classNames("text-sm", theme.text2)}>
-                              Path variables
-                            </div>
-
-                            <KeyValueList
-                              items={pathVariables}
-                              onEditItem={editPathVariable}
-                              disabled={isLoading}
-                              keyDisabled={true}
-                            />
-                          </div>
-                        )}
-                      </div>
-                    ),
-                  },
-                  {
-                    id: "body",
-                    name: `Body`,
-                    panel: (
-                      <div className="pt-2">
-                        <TextArea
-                          id={bodyId}
-                          containerClassName="w-full"
-                          className="text-sm min-h-[2rem]"
-                          placeholder="Body..."
-                          value={body}
-                          onInput={(event) =>
-                            setBody(event.currentTarget.value)
-                          }
-                        />
-                      </div>
-                    ),
-                  },
-                ]}
-                currentTabId={currentOptionsTab}
-                onTabChange={openOptionTab}
-                transparent
-              />
-            </div>
-            <div>
-              <span className={classNames(theme.text2, "font-medium")}>
-                Response
-              </span>
-              <div className="mt-1">
-                <Tabs
-                  small
-                  tabs={[
-                    {
-                      id: "body",
-                      name: "Body",
-                      panel: (
-                        <ApiResponseBodyPanel
-                          response={apiResponse}
-                          isLoading={isLoading}
-                          dataTestid="cloud.api:response-body"
-                        />
-                      ),
-                    },
-                    {
-                      id: "headers",
-                      name: "Headers",
-                      panel: (
-                        <ApiResponseHeadersPanel
-                          headers={apiResponse?.headers ?? []}
-                          isLoading={isLoading}
-                        />
-                      ),
-                    },
-                  ]}
-                  currentTabId={currentResponseTab}
-                  onTabChange={openResponseTab}
-                  transparent
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/ui/blue-screen-of-death.tsx b/apps/wing-console/console/ui/src/ui/blue-screen-of-death.tsx
deleted file mode 100644
index 05d93225399..00000000000
--- a/apps/wing-console/console/ui/src/ui/blue-screen-of-death.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import classNames from "classnames";
-import { memo, useEffect, useState } from "react";
-
-import {
-  OpenFileInEditorButton,
-  createHtmlLink,
-} from "../shared/use-file-link.js";
-
-export const BlueScreenOfDeath = memo(
-  ({
-    title,
-    error = "",
-    displayLinks = true,
-    displayWingTitle = true,
-  }: {
-    title: string;
-    error: string;
-    displayLinks?: boolean;
-    displayWingTitle?: boolean;
-  }) => {
-    const [formattedPathsError, setFormattedPathsError] = useState("");
-
-    useEffect(() => {
-      if (!displayLinks) {
-        setFormattedPathsError(error);
-        return;
-      }
-      setFormattedPathsError(
-        createHtmlLink(
-          error,
-          "underline text-slate-300 hover:text-slate-400",
-          true,
-        ),
-      );
-    }, [error, displayLinks]);
-
-    return (
-      <div
-        className={classNames(
-          "absolute h-full w-full z-50 px-10 py-20 bg-[#004295] overflow-auto flex justify-center items-center",
-        )}
-        data-testid="blue-screen-of-death"
-      >
-        <div className="h-full w-full text-md font-share-tech text-white max-w-7xl break-words space-y-4">
-          {displayWingTitle && (
-            <div className="w-full flex justify-center">
-              <span className="bg-slate-400 px-4 text-[#004295]">Wing</span>
-            </div>
-          )}
-          <div className="space-y-4">
-            <div>{title}</div>
-            <div className="py-4">
-              <OpenFileInEditorButton>
-                <span
-                  className="outline-none select-text whitespace-pre-wrap"
-                  dangerouslySetInnerHTML={{ __html: formattedPathsError }}
-                />
-              </OpenFileInEditorButton>
-            </div>
-            {displayLinks && (
-              <div className="w-full text-center py-4">
-                Click on any error reference to navigate to your IDE{" "}
-                <span className="animate-ping">_</span>
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/ui/bucket-interaction.tsx b/apps/wing-console/console/ui/src/ui/bucket-interaction.tsx
deleted file mode 100644
index 26b3d40722f..00000000000
--- a/apps/wing-console/console/ui/src/ui/bucket-interaction.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-import {
-  ArrowDownTrayIcon,
-  ArrowTopRightOnSquareIcon,
-  XMarkIcon,
-} from "@heroicons/react/24/outline";
-import {
-  Button,
-  FilePreview,
-  Modal,
-  ResponseInput,
-  ToolbarButton,
-  Tree,
-  TreeEntry,
-  getPreviewType,
-  useTheme,
-} from "@wingconsole/design-system";
-import classNames from "classnames";
-import {
-  FormEvent,
-  useCallback,
-  useContext,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-
-import { LayoutContext, LayoutType } from "../layout/layout-provider.js";
-
-export interface BucketInteractionProps {
-  selectedEntries: string[];
-  entries: TreeEntry[];
-  fileInputId: string;
-  selectedFile: string;
-  isLoading: boolean;
-  selectedFileData: string | undefined;
-  onDownloadSelectedFilesClick: () => void;
-  onDownloadCurrentFileClick: () => void;
-  onDeleteSelectedFilesClick: () => void;
-  onUploadSelectedFilesClick: (event: FormEvent<HTMLInputElement>) => void;
-  onSelectedEntriesChange: (entries: string[]) => void;
-  onCurrentEntryChange: (index: string | undefined) => void;
-}
-
-export const BucketInteraction = ({
-  selectedEntries,
-  entries,
-  fileInputId,
-  selectedFileData,
-  selectedFile,
-  isLoading,
-  onDownloadSelectedFilesClick,
-  onDownloadCurrentFileClick,
-  onDeleteSelectedFilesClick,
-  onUploadSelectedFilesClick,
-  onSelectedEntriesChange,
-  onCurrentEntryChange,
-}: BucketInteractionProps) => {
-  const { theme } = useTheme();
-  const fileInputRef = useRef<HTMLInputElement>(null);
-
-  const previewType = useMemo(() => {
-    return getPreviewType(selectedFile ?? "");
-  }, [selectedFile]);
-
-  const [validPreviewTypes] = useState(
-    () => new Set(["image", "video", "pdf", "text"]),
-  );
-  const [showPreview, setShowPreview] = useState(false);
-
-  const currentRef = useRef<HTMLButtonElement>(null);
-
-  const closePreview = useCallback(() => {
-    setShowPreview(false);
-    currentRef.current?.focus();
-  }, []);
-
-  const layoutType = useContext(LayoutContext);
-
-  const onOpenEntry = useCallback(() => {
-    if (validPreviewTypes.has(previewType)) {
-      setShowPreview(true);
-    }
-  }, [previewType, validPreviewTypes]);
-
-  return (
-    <div className="h-full flex-1 flex flex-col text-sm space-y-1.5">
-      <div className="flex justify-between items-center gap-1">
-        <div className="flex items-center gap-1">
-          <Button
-            label="Download"
-            disabled={selectedEntries.length === 0}
-            onClick={onDownloadSelectedFilesClick}
-            dataTestid="cloud.bucket:download"
-          />
-          <Button
-            label="Delete"
-            disabled={selectedEntries.length === 0}
-            onClick={onDeleteSelectedFilesClick}
-            dataTestid="cloud.bucket:delete-file"
-          />
-        </div>
-
-        <div>
-          <input
-            key={fileInputId}
-            ref={fileInputRef}
-            type="file"
-            className="hidden"
-            onInput={onUploadSelectedFilesClick}
-            multiple
-          />
-          <Button
-            label="Upload"
-            onClick={() => {
-              fileInputRef.current?.click();
-            }}
-            dataTestid="cloud.bucket:upload"
-          />
-        </div>
-      </div>
-
-      {entries.length === 0 && (
-        <div
-          className={classNames(
-            theme.bgInput,
-            theme.text2,
-            theme.borderInput,
-            "px-2.5 py-1.5",
-            "outline-none rounded text-center inline-block w-full text-xs",
-          )}
-          data-testid="cloud.bucket:empty-state"
-        >
-          No files
-        </div>
-      )}
-      {entries.length > 0 && (
-        <Tree
-          currentRef={currentRef}
-          entries={entries}
-          selectedEntries={selectedEntries}
-          onCurrentChange={onCurrentEntryChange}
-          onSelectionChange={onSelectedEntriesChange}
-          onOpenEntry={onOpenEntry}
-          dataTestid="cloud.bucket:files"
-          className={classNames(
-            "overflow-y-auto resize-y",
-            layoutType === LayoutType.Tutorial && "min-h-[4rem]",
-            layoutType !== LayoutType.Tutorial && "h-48 min-h-[6rem]",
-          )}
-        />
-      )}
-
-      {selectedFile && (
-        <div className="space-y-1 pt-2">
-          <div className={classNames(theme.text2, "text-sm flex gap-x-1")}>
-            <span className={theme.text1}>File:</span>
-            <span className="truncate">{selectedFile}</span>
-            <div className="grow" />
-            {validPreviewTypes.has(previewType) && (
-              <ToolbarButton title="Open" onClick={() => setShowPreview(true)}>
-                <ArrowTopRightOnSquareIcon className="w-4 h-4" />
-                <span>Open</span>
-              </ToolbarButton>
-            )}
-          </div>
-          <ResponseInput
-            empty={!selectedFileData}
-            loading={!showPreview && isLoading}
-          >
-            <FilePreview
-              filename={selectedFile}
-              content={selectedFileData ?? ""}
-              className={classNames(
-                previewType === "image" && "max-h-[25rem]",
-                previewType === "pdf" && "min-h-[25rem]",
-                previewType === "text" &&
-                  "max-h-[30rem] resize-y overflow-y-auto",
-              )}
-              dataTestid="cloud.bucket:file-preview"
-            />
-          </ResponseInput>
-        </div>
-      )}
-
-      <Modal
-        visible={showPreview}
-        setVisible={closePreview}
-        className="max-w-[80vw] space-y-1.5"
-      >
-        <div className={classNames(theme.text2, "text-md flex space-x-1")}>
-          <span className={theme.text1}>File:</span>
-          <span className="truncate">{selectedFile}</span>
-          <div className="grow" />
-          <ToolbarButton
-            title="Download"
-            disabled={!selectedFile || !selectedFileData}
-            onClick={onDownloadCurrentFileClick}
-          >
-            <ArrowDownTrayIcon className="w-5 h-5" />
-          </ToolbarButton>
-          <ToolbarButton title="Close" onClick={closePreview}>
-            <XMarkIcon className="w-5 h-5" />
-          </ToolbarButton>
-        </div>
-        <FilePreview
-          filename={selectedFile ?? ""}
-          content={selectedFileData ?? ""}
-          className={classNames(
-            previewType === "image" &&
-              "min-h-[15rem] min-w-[15rem] max-h-[70vh]",
-            previewType === "video" && "min-w-[70vw]",
-            previewType === "pdf" && "min-h-[70vh] min-w-[50vw]",
-            previewType === "text" && [
-              "min-w-[15rem] min-h-[20rem] max-h-[80vh] max-w-[75vw] w-full",
-              "resize overflow-auto",
-            ],
-          )}
-        />
-      </Modal>
-    </div>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/ui/dynamodb-table-interaction.tsx b/apps/wing-console/console/ui/src/ui/dynamodb-table-interaction.tsx
deleted file mode 100644
index b3baabe9d2d..00000000000
--- a/apps/wing-console/console/ui/src/ui/dynamodb-table-interaction.tsx
+++ /dev/null
@@ -1,330 +0,0 @@
-import { PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
-import {
-  SpinnerLoader,
-  useTheme,
-  Column,
-  getInputType,
-  TableRow,
-} from "@wingconsole/design-system";
-import classNames from "classnames";
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
-
-export type RowData = Record<string, any>;
-
-export type Row = {
-  data: RowData;
-  error?: string;
-};
-
-export type RawRow = {
-  data: string;
-  error?: string;
-};
-
-export interface TableInteractionProps {
-  hashKey: string;
-  rangeKey?: string;
-  rows?: Row[];
-  onAddRow?: (row: RawRow) => void;
-  onRemoveRow?: (index: number) => void;
-  disabled?: boolean;
-  readonly?: boolean;
-  loading?: boolean;
-}
-
-export const DynamodbTableInteraction = memo(
-  ({
-    hashKey,
-    rangeKey,
-    rows = [],
-    onAddRow = (row: RawRow) => {},
-    onRemoveRow = (index: number) => {},
-    disabled = false,
-    readonly = false,
-    loading = false,
-  }: TableInteractionProps) => {
-    const { theme } = useTheme();
-
-    const [newRow, setNewRow] = useState<RawRow>({ data: "", error: "" });
-    const [internalRows, setInternalRows] = useState<Row[]>([]);
-    const inputRef = useRef<HTMLInputElement>(null);
-
-    const columns = useMemo(() => {
-      let keys = new Set<string>();
-      for (let row of rows) {
-        for (let key of Object.keys(row.data)) {
-          if (key !== hashKey && key !== rangeKey) {
-            keys.add(key);
-          }
-        }
-      }
-
-      const result: Column[] = [
-        {
-          name: hashKey,
-          type: "string",
-        },
-        ...(rangeKey
-          ? [
-              {
-                name: rangeKey,
-                type: "string",
-              },
-            ]
-          : []),
-      ];
-
-      for (let key of [...keys.values()].sort()) {
-        result.push({ name: key, type: "string" });
-      }
-
-      return result;
-    }, [hashKey, rangeKey, rows]);
-
-    const addRow = useCallback(async () => {
-      onAddRow(newRow);
-    }, [newRow, onAddRow]);
-
-    const updateNewRow = useCallback(
-      (newValue: any) => {
-        let error = "";
-        try {
-          const row = JSON.parse(newValue);
-          if (row[hashKey] === undefined) {
-            error = `missing hash key ${hashKey}`;
-          } else if (rangeKey && row[rangeKey] === undefined) {
-            error = `missing range key ${rangeKey}`;
-          }
-        } catch {
-          error = "not a valid JSON";
-        }
-
-        setNewRow({
-          data: newValue,
-          error,
-        });
-      },
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      [newRow, hashKey, rangeKey],
-    );
-
-    useEffect(() => {
-      setNewRow({ data: "", error: "" });
-      setInternalRows(rows);
-    }, [rows]);
-
-    useEffect(() => {
-      inputRef.current?.focus();
-    }, [internalRows.length]);
-
-    const headerSuffix = useCallback(
-      (name: string) => {
-        switch (name) {
-          case hashKey:
-          case rangeKey: {
-            return "*";
-          }
-          default: {
-            return "";
-          }
-        }
-      },
-      [hashKey, rangeKey],
-    );
-
-    return (
-      <div className="inline-block align-middle w-full mt-1">
-        <div
-          className={classNames(
-            "relative min-h-[2rem] max-h-[30rem]",
-            "overflow-auto shadow ring-1 ring-black ring-opacity-5 rounded border px-1",
-            theme.textInput,
-            theme.borderInput,
-            theme.focusWithin,
-            theme.bgInput,
-          )}
-        >
-          {loading && (
-            <div
-              className={classNames(
-                "absolute inset-0 z-50 bg-white/70 dark:bg-slate-800/70",
-              )}
-            >
-              <div className="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
-                <SpinnerLoader size="sm" />
-              </div>
-            </div>
-          )}
-          <table
-            className="w-full border-separate"
-            style={{
-              borderSpacing: "0px 4px",
-            }}
-          >
-            <thead>
-              <tr
-                className={classNames(
-                  theme.bgInput,
-                  "px-1 sticky top-[4px] z-10 border-spacing-x-0",
-                  "ring-2 ring-white dark:ring-slate-800",
-                )}
-              >
-                {columns.map(({ name, type }, index) => (
-                  <th
-                    key={index}
-                    className={classNames(
-                      "text-sm p-1.5",
-                      "border-b border-slate-300 dark:border-slate-700",
-                      getInputType(type) === "checkbox"
-                        ? "text-center"
-                        : "text-left",
-                    )}
-                  >
-                    {`${name}${headerSuffix(name)}`}
-                  </th>
-                ))}
-                <th
-                  className={classNames(
-                    "w-0",
-                    "border-b border-slate-300 dark:border-slate-700",
-                  )}
-                ></th>
-              </tr>
-            </thead>
-            <tbody className="spacing-y-1">
-              {internalRows.length === 0 && (
-                <tr>
-                  <td
-                    colSpan={columns.length + 1}
-                    className={classNames(
-                      "text-center text-xs pt-4",
-                      theme.text2,
-                    )}
-                  >
-                    No rows
-                  </td>
-                </tr>
-              )}
-              {internalRows.map(({ data: row, error }, index) => (
-                <TableRow
-                  key={index}
-                  row={row}
-                  placeholder="null"
-                  error={error}
-                  columns={columns}
-                  primaryKey={hashKey}
-                  disabled={disabled}
-                  readonly={true}
-                  actions={
-                    <>
-                      {!readonly && (
-                        <button
-                          className={classNames(
-                            "outline-none rounded p-1.5",
-                            theme.bg4Hover,
-                            theme.textInput,
-                            theme.borderInput,
-                            theme.focusInput,
-                            disabled && "opacity-50 cursor-not-allowed",
-                          )}
-                          onClick={() => onRemoveRow(index)}
-                          disabled={disabled}
-                          data-testid={`ex.DynamodbTable:remove-row-${index}`}
-                        >
-                          <TrashIcon className="w-4 h-4" />
-                        </button>
-                      )}
-                    </>
-                  }
-                  dataTestid={`ex.DynamodbTable:row-${index}`}
-                />
-              ))}
-              <>
-                <tr className="sticky bottom-[35px] z-10">
-                  <td className="p-0">
-                    <div className="-mb-[6px]">
-                      <div
-                        className={classNames(
-                          "inline-block whitespace-nowrap",
-                          theme.bg3,
-                          "text-[0.60rem] font-medium tracking-wide text-slate-400 dark:text-slate-350",
-                          "leading-none px-2 pt-1.5 pb-1",
-                          "rounded-t",
-                        )}
-                      >
-                        NEW ROW
-                      </div>
-                    </div>
-                  </td>
-                </tr>
-                <tr className="sticky bottom-[4px] z-10">
-                  <td
-                    colSpan={columns.length}
-                    className={classNames(
-                      "first:rounded-bl text-left",
-                      theme.bg3,
-                    )}
-                  >
-                    <div className="flex p-0.5">
-                      <textarea
-                        className={classNames(
-                          theme.borderInput,
-                          "rounded text-sm relative",
-                          "text-sm ring-0 focus:ring-0 bg-transparent",
-                          "border-0 p-0 m-0 appearance-none rounded",
-                          "placeholder:italic",
-                          "w-full",
-                          "flex-1",
-                          "px-1",
-                          "min-h-[2rem]",
-                          theme.textInput,
-                          theme.focusInput,
-                          newRow.error && [
-                            "rounded ring-2 ring-red-800/50",
-                            "dark:ring-red-500/50 dark:border-red-500/50",
-                          ],
-                        )}
-                        rows={2}
-                        placeholder="Json Item..."
-                        value={newRow.data}
-                        onInput={(event) =>
-                          updateNewRow(event.currentTarget.value)
-                        }
-                        data-testid="ex.DynamodbTable:new-row"
-                      />
-                    </div>
-                  </td>
-                  <td
-                    className={classNames(
-                      "first:rounded-bl -mb-2.5 text-left",
-                      theme.bg3,
-                      "align-bottom",
-                    )}
-                  >
-                    <button
-                      className={classNames(
-                        "inline-flex gap-2 items-center text-xs font-medium outline-none rounded",
-                        "p-1.5",
-                        theme.bg4Hover,
-                        theme.bgInputHover,
-                        theme.textInput,
-                        theme.focusInput,
-                        (disabled || !newRow.data) &&
-                          "opacity-50 cursor-not-allowed",
-                      )}
-                      onClick={addRow}
-                      disabled={disabled || !newRow.data}
-                      data-testid="ex.DynamodbTable:add-row"
-                    >
-                      <PlusIcon className="w-4 h-4" />
-                    </button>
-                  </td>
-                </tr>
-              </>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/ui/edge-item.tsx b/apps/wing-console/console/ui/src/ui/edge-item.tsx
deleted file mode 100644
index 20651854e18..00000000000
--- a/apps/wing-console/console/ui/src/ui/edge-item.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import classNames from "classnames";
-import { ElkExtendedEdge } from "elkjs/lib/elk.bundled.js";
-import { motion } from "framer-motion";
-import { memo, useMemo, useState } from "react";
-
-export const EdgeItem = memo(
-  ({
-    edge,
-    offset = { x: 0, y: 0 },
-    markerStart,
-    markerEnd,
-    highlighted,
-    fade,
-    transitionDuration,
-    selected,
-    onMouseEnter,
-    onMouseLeave,
-    onClick,
-  }: {
-    edge: ElkExtendedEdge;
-    offset?: { x: number; y: number };
-    markerStart?: string;
-    markerEnd?: string;
-    highlighted?: boolean;
-    fade?: boolean;
-    transitionDuration?: number;
-    selected?: boolean;
-    onMouseEnter?: () => void;
-    onMouseLeave?: () => void;
-    onClick?: (id: string) => void;
-  }) => {
-    const d = useMemo(() => {
-      return edge.sections
-        ?.map((section) => {
-          const points =
-            [...(section.bendPoints ?? []), section.endPoint]
-              ?.map((point) => `L${point.x},${point.y}`)
-              .join(" ") ?? "";
-
-          return `M${section.startPoint.x},${section.startPoint.y} ${points}`;
-        })
-        .join(" ");
-    }, [edge.sections]);
-
-    const [source] = edge.sources;
-    const [target] = edge.targets;
-    const goesOutside =
-      source?.split("/").slice(0, -1).join("/") !==
-      target?.split("/").slice(0, -1).join("/");
-    return (
-      <g
-        className={classNames(
-          "stroke-1 fill-none cursor-pointer hover:stroke-[1.5px]",
-          highlighted && "stroke-sky-500",
-          selected && "stroke-[1.5px] stroke-sky-500",
-          !highlighted && !selected && "stroke-slate-400 dark:stroke-slate-800",
-          fade && "opacity-40",
-          "transition-all",
-        )}
-      >
-        <motion.path
-          initial={{
-            opacity: 0,
-          }}
-          animate={{
-            opacity: 1,
-          }}
-          style={{ translateX: offset.x, translateY: offset.y }}
-          transition={{ duration: transitionDuration }}
-          exit={{
-            opacity: 0,
-          }}
-          markerStart={`url(#${markerStart})`}
-          markerEnd={`url(#${markerEnd})`}
-          d={d}
-          strokeDasharray={goesOutside ? "3" : undefined}
-        />
-        <motion.path
-          onMouseEnter={onMouseEnter}
-          onMouseLeave={onMouseLeave}
-          onClick={() => onClick?.(edge.id)}
-          className="opacity-0 pointer-events-auto"
-          style={{ translateX: offset.x, translateY: offset.y }}
-          markerStart={`url(#${markerStart})`}
-          markerEnd={`url(#${markerEnd})`}
-          d={d}
-          strokeWidth="8"
-        />
-      </g>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/ui/elk-map-nodes.tsx b/apps/wing-console/console/ui/src/ui/elk-map-nodes.tsx
deleted file mode 100644
index abc12ab9465..00000000000
--- a/apps/wing-console/console/ui/src/ui/elk-map-nodes.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-import { useTheme, IconComponent } from "@wingconsole/design-system";
-import { BaseResourceSchema, NodeDisplay } from "@wingconsole/server";
-import classNames from "classnames";
-import { PropsWithChildren, memo, useMemo } from "react";
-
-const getResourceBorderColor = (
-  resourceType: BaseResourceSchema["type"] | undefined,
-) => {
-  switch (resourceType) {
-    case "@winglang/sdk.cloud.Bucket": {
-      return "border-t border-t-orange-500 group-hover:border-t-orange-500 group-focus:border-t-orange-500 dark:border-t-orange-500 dark:group-hover:border-t-orange-500 dark:group-focus:border-t-orange-500";
-    }
-    case "@winglang/sdk.cloud.Function": {
-      return "border-t border-t-sky-500 group-hover:border-t-sky-500 group-focus:border-t-sky-500 dark:border-t-sky-500 dark:group-hover:border-t-sky-500 dark:group-focus:border-t-sky-500";
-    }
-    case "@winglang/sdk.cloud.Queue": {
-      return "border-t border-t-emerald-500 group-hover:border-t-emerald-500 group-focus:border-t-emerald-500 dark:border-t-emerald-500 dark:group-hover:border-t-emerald-500 dark:group-focus:border-t-emerald-500";
-    }
-    case "@winglang/sdk.cloud.Counter": {
-      return "border-t border-t-lime-500 group-hover:border-t-lime-500 group-focus:border-t-lime-500 dark:border-t-lime-500 dark:group-hover:border-t-lime-500 dark:group-focus:border-t-lime-500";
-    }
-    case "@winglang/sdk.cloud.Topic": {
-      return "border-t border-t-pink-500 group-hover:border-t-pink-500 group-focus:border-t-pink-500 dark:border-t-pink-500 dark:group-hover:border-t-pink-500 dark:group-focus:border-t-pink-500";
-    }
-    case "@winglang/sdk.cloud.Api": {
-      return "border-t border-t-amber-500 group-hover:border-t-amber-500 group-focus:border-t-amber-500 dark:border-t-amber-500 dark:group-hover:border-t-amber-500 dark:group-focus:border-t-amber-500";
-    }
-    case "@winglang/sdk.ex.Table": {
-      return "border-t border-t-cyan-500 group-hover:border-t-cyan-500 group-focus:border-t-cyan-500 dark:border-t-cyan-500 dark:group-hover:border-t-cyan-500 dark:group-focus:border-t-cyan-500";
-    }
-    case "@winglang/sdk.cloud.Schedule": {
-      return "border-t border-t-purple-500 group-hover:border-t-purple-500 group-focus:border-t-purple-500 dark:border-t-purple-500 dark:group-hover:border-t-purple-500 dark:group-focus:border-t-purple-500";
-    }
-    case "@winglang/sdk.ex.Redis": {
-      return "border-t border-t-red-700 group-hover:border-t-red-700 group-focus:border-t-red-700 dark:border-t-red-700 dark:group-hover:border-t-red-700 dark:group-focus:border-t-red-700";
-    }
-    case "@winglang/sdk.cloud.Website": {
-      return "border-t border-t-violet-500 group-hover:border-t-violet-500 group-focus:border-t-violet-500 dark:border-t-violet-500 dark:group-hover:border-t-violet-500 dark:group-focus:border-t-violet-500";
-    }
-    case "@winglang/sdk.ex.ReactApp": {
-      return "border-t border-t-sky-500 group-hover:border-t-sky-500 group-focus:border-t-sky-500 dark:border-t-sky-500 dark:group-hover:border-t-sky-500 dark:group-focus:border-t-sky-500";
-    }
-  }
-};
-
-export interface ContainerNodeProps {
-  nodeId: string;
-  name: string | undefined;
-  display?: NodeDisplay;
-  icon?: IconComponent;
-  open?: boolean;
-  hideBottomBar?: boolean;
-  selected?: boolean;
-  resourceType: BaseResourceSchema["type"] | undefined;
-  depth: number;
-  onClick?: () => void;
-  onMouseEnter?: () => void;
-}
-
-export const ContainerNode = memo(
-  ({
-    open,
-    icon: Icon,
-    hideBottomBar,
-    selected,
-    onClick,
-    onMouseEnter,
-    resourceType,
-    depth,
-    display,
-    ...props
-  }: PropsWithChildren<ContainerNodeProps>) => {
-    const { theme } = useTheme();
-    const borderColor = useMemo(
-      () => getResourceBorderColor(resourceType),
-      [resourceType],
-    );
-
-    const compilerNamed = useMemo(() => {
-      if (!display) {
-        return false;
-      }
-      return display.sourceModule === "@winglang/sdk" && display.title;
-    }, [display]);
-
-    return (
-      // TODO: Fix a11y
-      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-      <div
-        className={classNames(
-          "flex flex-col group flex-1",
-          "outline outline-0 outline-sky-200/50 dark:outline-sky-500/50",
-          "transition-all",
-          "rounded",
-          "cursor-default",
-          open && "shadow-lg",
-          !open && "shadow",
-          {
-            "outline-4": selected,
-            "hover:outline-2": !selected,
-          },
-        )}
-        tabIndex={-1}
-        onClick={onClick}
-        onMouseEnter={onMouseEnter}
-      >
-        <div
-          className={classNames(
-            "flex relative",
-            "rounded overflow-hidden",
-            borderColor,
-            "group-focus:border-sky-300 dark:group-focus:border-sky-500",
-            theme.bg3,
-            {
-              "rounded-b-none": open,
-              "border-b-0": open,
-              [theme.border3]: !selected,
-              "border-sky-300 dark:border-sky-500": selected,
-            },
-            "min-h-[32px]",
-            "cursor-pointer",
-          )}
-        >
-          {Icon && (
-            <div
-              className={classNames(
-                theme.bg4,
-                "px-2 py-1",
-                "flex items-center",
-                "transition-all",
-                "rounded-bl",
-                open && "rounded-bl-none",
-                "border-r",
-                {
-                  [theme.border3]: !selected,
-                  "border-sky-300 dark:border-sky-500": selected,
-                },
-              )}
-            >
-              <Icon className="w-5 h-5" />
-            </div>
-          )}
-          <div
-            className={classNames(
-              "flex-1 flex items-center",
-              "px-2.5 py-2",
-              "rounded-br",
-              !borderColor && "rounded-tr",
-              "group-focus:border-sky-300 dark:group-focus:border-sky-500",
-              "transition-all",
-              {
-                "border-sky-300 dark:border-sky-500": selected,
-                "rounded-br-none": open,
-                "rounded-l": !Icon,
-              },
-            )}
-            data-testid={`map-node:${props.nodeId}`}
-          >
-            <div className="flex flex-col">
-              <div
-                className={classNames(
-                  "leading-tight",
-                  "truncate",
-                  "transition-all",
-                  "text-xs",
-                  compilerNamed && ["text-slate-600 dark:text-slate-350"],
-                  !compilerNamed && [theme.text1],
-                )}
-              >
-                {compilerNamed ? display?.title : props.name}
-              </div>
-            </div>
-          </div>
-        </div>
-        {open && (
-          <div
-            className={classNames(
-              "flex-1 flex items-stretch",
-              "border-t",
-              "group-focus:border-sky-200 dark:group-focus:border-sky-400",
-              {
-                [theme.border3]: !selected,
-                "border-sky-200 dark:border-sky-400": selected,
-              },
-            )}
-          >
-            <div
-              className={classNames(
-                "flex-1 rounded-b",
-                depth % 2 === 0
-                  ? "bg-white dark:bg-slate-500"
-                  : "bg-slate-50 dark:bg-slate-550",
-                // The classes below are commented out because they cause rendering flashes while zooming.
-                // "border-x border-b border-dashed",
-                // "group-focus:border-sky-300 dark:group-focus:border-sky-500",
-                // "transition-all",
-                // "shadow-inner",
-                // {
-                //   [theme.border3]: !selected,
-                //   "border-sky-300 dark:border-sky-500": selected,
-                // },
-              )}
-            />
-          </div>
-        )}
-      </div>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/ui/elk-map.stories.tsx b/apps/wing-console/console/ui/src/ui/elk-map.stories.tsx
deleted file mode 100644
index 65b1d45f8de..00000000000
--- a/apps/wing-console/console/ui/src/ui/elk-map.stories.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Meta, StoryObj } from "@storybook/react";
-
-import { ElkMap } from "./elk-map.js";
-
-const meta = {
-  title: "UI/MapView/ElkMap",
-  component: ElkMap,
-  tags: ["autodocs"],
-} satisfies Meta<typeof ElkMap>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
-  args: {
-    nodes: [
-      {
-        id: "1",
-        data: {
-          className: "w-4 h-4 bg-red-500",
-        },
-      },
-      {
-        id: "2",
-        data: {
-          className: "w-12 h-4 bg-blue-500",
-        },
-      },
-    ],
-    // @ts-ignore
-    node: (props) => <div className={props.node.data.className} />,
-  },
-};
diff --git a/apps/wing-console/console/ui/src/ui/elk-map.tsx b/apps/wing-console/console/ui/src/ui/elk-map.tsx
deleted file mode 100644
index a2d1c7db370..00000000000
--- a/apps/wing-console/console/ui/src/ui/elk-map.tsx
+++ /dev/null
@@ -1,631 +0,0 @@
-import classNames from "classnames";
-import ELK, {
-  ElkExtendedEdge,
-  ElkNode,
-  LayoutOptions,
-} from "elkjs/lib/elk.bundled.js";
-import { AnimatePresence, motion } from "framer-motion";
-import {
-  FC,
-  Fragment,
-  memo,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
-
-import { Edge } from "../shared/Edge.js";
-import { Node } from "../shared/Node.js";
-
-import { EdgeItem } from "./edge-item.js";
-import { useNodeStaticData } from "./use-node-static-data.js";
-import { ZoomPane, useZoomPaneContext } from "./zoom-pane.js";
-
-const durationClass = "duration-500";
-
-// For more configuration options, refer to: https://eclipse.dev/elk/reference/options.html
-const layoutOptions: LayoutOptions = {
-  "elk.hierarchyHandling": "INCLUDE_CHILDREN",
-  "elk.direction": "RIGHT",
-  "elk.alignment": "CENTER",
-  "elk.algorithm": "org.eclipse.elk.layered",
-  "elk.layered.layering.strategy": "MIN_WIDTH",
-  "elk.layered.layering.nodePromotion.strategy": "DUMMYNODE_PERCENTAGE",
-  "elk.layered.nodePlacement.strategy": "INTERACTIVE",
-  "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP",
-  "elk.nodeSize.constraints": "USE_MINIMUM_SIZE",
-  "elk.layered.spacing.baseValue": "32",
-  "elk.edgeRouting": "ORTHOGONAL",
-  "elk.padding": "[top=52,left=20,bottom=20,right=20]",
-};
-
-export type NodeItemProps<T> = {
-  node: Node<T>;
-  depth: number;
-  selected: boolean;
-};
-
-type Sizes = Record<string, { width: number; height: number }>;
-
-interface InvisibleNodeSizeCalculatorProps<T> {
-  nodes: Node<T>[];
-  node: FC<NodeItemProps<T>>;
-  onSizesChange(sizes: Sizes): void;
-}
-
-const InvisibleNodeSizeCalculator = memo(
-  ({
-    nodes,
-    node: NodeItem,
-    onSizesChange,
-  }: InvisibleNodeSizeCalculatorProps<any>) => {
-    const refs = useRef<Record<string, HTMLDivElement | null>>({});
-
-    const [sizes, setSizes] = useState<Sizes>();
-    useEffect(() => {
-      setSizes(() => {
-        const sizes: Sizes = {};
-        for (const [nodeId, element] of Object.entries(refs.current)) {
-          if (!element) {
-            continue;
-          }
-          const rect = element.getBoundingClientRect();
-          sizes[nodeId] = {
-            width: rect.width,
-            height: rect.height,
-          };
-        }
-        return sizes;
-      });
-    }, [nodes]);
-    useEffect(() => {
-      if (sizes) {
-        onSizesChange(sizes);
-      }
-    }, [sizes, onSizesChange]);
-
-    const renderElkPre = useCallback(
-      (node: ElkNode, depth = 0) => {
-        return (
-          <Fragment key={node.id}>
-            <div className="inline-block">
-              <div
-                className={classNames("h-full relative")}
-                ref={(element) => (refs.current[node.id] = element)}
-              >
-                <NodeItem node={node} depth={depth} selected={false} />
-              </div>
-            </div>
-
-            {node.children?.map((node) => renderElkPre(node, depth + 1))}
-          </Fragment>
-        );
-      },
-      [NodeItem],
-    );
-
-    return (
-      <div className="absolute w-1 h-1 overflow-hidden invisible">
-        {nodes.map((node) => renderElkPre(node))}
-      </div>
-    );
-  },
-);
-
-export interface ElkMapProps<T> {
-  nodes: Node<T>[];
-  edges?: Edge[];
-  node: FC<NodeItemProps<T>>;
-  selectedNodeId?: string;
-  onSelectedNodeIdChange?: (id: string) => void;
-  selectedEdgeId?: string;
-  onSelectedEdgeIdChange?: (id: string) => void;
-}
-
-interface EdgesContainerProps {
-  width: number;
-  height: number;
-  edges: ElkExtendedEdge[];
-  offsets: Map<
-    string,
-    {
-      x: number;
-      y: number;
-    }
-  >;
-  selectedEdgeId?: string;
-  onClick?: (id: string) => void;
-  isHighlighted(nodeId: string): boolean;
-  setHighlighted(nodeId: string | undefined): void;
-  selectedNodeId?: string;
-  highlighted?: string;
-}
-
-const EdgesContainer = memo(
-  ({
-    width,
-    height,
-    edges,
-    offsets,
-    selectedEdgeId,
-    onClick,
-    isHighlighted,
-    setHighlighted,
-    selectedNodeId,
-    highlighted,
-  }: EdgesContainerProps) => {
-    // const higlight = useCallback(() => {
-    //   setHighlighted(edge.sources[0] ?? edge.targets[0]);
-    // });
-    return (
-      <svg
-        className="absolute inset-0 pointer-events-none"
-        width={width}
-        height={height}
-      >
-        <defs>
-          <marker
-            className="stroke-none fill-slate-500 dark:fill-slate-800"
-            markerWidth="6"
-            markerHeight="4"
-            orient="auto"
-            id="arrow-head"
-            refX="4"
-            refY="2"
-          >
-            <path d="M0 0 v4 l5 -2 z" />
-          </marker>
-
-          <marker
-            className="stroke-none fill-sky-500"
-            markerHeight="6"
-            markerWidth="4"
-            orient="auto"
-            id="arrow-head-selected"
-            refX="4"
-            refY="2"
-          >
-            <path d="M0 0 v4 l5 -2 z" />
-          </marker>
-
-          <marker
-            className="stroke-slate-500 dark:stroke-slate-800 fill-slate-500 dark:fill-slate-800"
-            markerHeight="6"
-            markerWidth="6"
-            orient="auto"
-            id="tee"
-            refX="5"
-            refY="3"
-          >
-            <path d="M5 0V6H6V0z" />
-          </marker>
-
-          <marker
-            className="stroke-sky-500 fill-sky-500"
-            markerHeight="6"
-            markerWidth="6"
-            orient="auto"
-            id="tee-selected"
-            refX="5"
-            refY="3"
-          >
-            <path d="M5 0V6H6V0z" />
-          </marker>
-        </defs>
-
-        {edges.map((edge) => {
-          const isNodeHighlighted =
-            isHighlighted(edge.sources[0]!) || isHighlighted(edge.targets[0]!);
-          const isEdgeHighlighted =
-            edge.sources[0] === selectedNodeId ||
-            edge.targets[0] === selectedNodeId;
-          const visible = !highlighted || isNodeHighlighted;
-          const selected = edge.id === selectedEdgeId;
-
-          return (
-            <EdgeItem
-              key={edge.id}
-              edge={edge}
-              offset={offsets.get((edge as any).container)}
-              highlighted={isEdgeHighlighted}
-              selected={selected}
-              fade={!visible}
-              markerStart={
-                isEdgeHighlighted || selected ? "tee-selected" : "tee"
-                // "tee"
-              }
-              markerEnd={
-                isEdgeHighlighted || selected
-                  ? "arrow-head-selected"
-                  : "arrow-head"
-                // "arrow-head"
-              }
-              onMouseEnter={() => {
-                setHighlighted(edge.sources[0] ?? edge.targets[0]);
-              }}
-              onMouseLeave={() => setHighlighted(undefined)}
-              onClick={onClick}
-            />
-          );
-        })}
-      </svg>
-    );
-  },
-);
-
-interface GraphProps {
-  graph: ElkNode;
-  node: FC<NodeItemProps<any>>;
-  nodeList: NodeData[];
-  offsets: Map<string, { x: number; y: number }>;
-  selectedNodeId?: string;
-  onSelectedNodeIdChange?(id: string): void;
-  isHighlighted(nodeId: string): boolean;
-  hasHighlightedEdge(node: NodeData): boolean;
-  setHighlighted(nodeId: string | undefined): void;
-  onSelectedEdgeIdChange?(id: string): void;
-}
-
-const Graph = memo(
-  ({
-    graph,
-    node,
-    nodeList,
-    offsets,
-    selectedNodeId,
-    onSelectedNodeIdChange,
-    isHighlighted,
-    hasHighlightedEdge,
-    setHighlighted,
-    onSelectedEdgeIdChange,
-  }: GraphProps) => {
-    return (
-      <div
-        className={classNames(
-          "relative",
-          "transition-transform",
-          "rounded-lg",
-          nodeList.length > 0 && "bg-white dark:bg-slate-500",
-          durationClass,
-        )}
-        style={{
-          width: graph.width,
-          height: graph.height,
-        }}
-      >
-        <AnimatePresence>
-          <NodesContainer
-            nodeList={nodeList}
-            node={node}
-            selectedNodeId={selectedNodeId}
-            onSelectedNodeIdChange={onSelectedNodeIdChange}
-            isHighlighted={isHighlighted}
-            hasHighlightedEdge={hasHighlightedEdge}
-            setHighlighted={setHighlighted}
-          />
-        </AnimatePresence>
-
-        <AnimatePresence>
-          {offsets && graph.edges && (
-            <EdgesContainer
-              width={graph.width ?? 0}
-              height={graph.height ?? 0}
-              edges={graph.edges}
-              offsets={offsets}
-              selectedNodeId={selectedNodeId}
-              onClick={onSelectedEdgeIdChange}
-              isHighlighted={isHighlighted}
-              setHighlighted={setHighlighted}
-            />
-          )}
-        </AnimatePresence>
-      </div>
-    );
-  },
-);
-
-type NodeData<T = any> = {
-  id: string;
-  width: number;
-  height: number;
-  offset: { x: number; y: number };
-  depth: number;
-  edges: Edge[];
-  data: Node<T>;
-};
-
-interface NodesContainerProps {
-  nodeList: NodeData[];
-  node: FC<NodeItemProps<any>>;
-  selectedNodeId: string | undefined;
-  onSelectedNodeIdChange?(id: string): void;
-  isHighlighted(nodeId: string): boolean;
-  hasHighlightedEdge(node: NodeData): boolean;
-  setHighlighted(nodeId: string | undefined): void;
-}
-
-const NodesContainer = memo(
-  ({
-    nodeList,
-    node: NodeItem,
-    selectedNodeId,
-    onSelectedNodeIdChange,
-    isHighlighted,
-    hasHighlightedEdge,
-    setHighlighted,
-  }: NodesContainerProps) => {
-    return (
-      <>
-        {nodeList.map((node) => (
-          <motion.div
-            key={node.id}
-            className={classNames(
-              "absolute origin-top",
-              "transition-all",
-              durationClass,
-            )}
-            style={{
-              translateX: node.offset.x,
-              translateY: node.offset.y,
-              width: `${node.width}px`,
-              height: `${node.height}px`,
-            }}
-            initial={{
-              opacity: 0,
-            }}
-            animate={{
-              opacity:
-                isHighlighted(node.id) || hasHighlightedEdge(node) ? 1 : 0.35,
-            }}
-            transition={{ ease: "easeOut", duration: 0.15 }}
-            exit={{
-              opacity: 0,
-            }}
-            onClick={() => onSelectedNodeIdChange?.(node.id)}
-            onMouseEnter={() => setHighlighted(node.id)}
-            onMouseLeave={() => setHighlighted(undefined)}
-          >
-            <NodeItem
-              node={node.data}
-              depth={node.depth}
-              selected={node.id === selectedNodeId}
-            />
-          </motion.div>
-        ))}
-      </>
-    );
-  },
-);
-
-export const ElkMap = <T extends unknown = undefined>({
-  nodes,
-  edges,
-  node,
-  selectedNodeId,
-  onSelectedNodeIdChange,
-  selectedEdgeId,
-  onSelectedEdgeIdChange,
-}: ElkMapProps<T>) => {
-  const { nodeRecord } = useNodeStaticData({
-    nodes,
-  });
-
-  const [minimumSizes, setMinimumSizes] = useState<Sizes>();
-
-  const [offsets, setOffsets] =
-    useState<Map<string, { x: number; y: number }>>();
-  const [graph, setGraph] = useState<ElkNode>();
-  useEffect(() => {
-    if (!minimumSizes || Object.keys(minimumSizes).length === 0) return;
-
-    const elk = new ELK();
-    const toElkNode = (node: Node<T>): ElkNode => {
-      const size = minimumSizes?.[node.id];
-      return {
-        id: node.id,
-        width: size?.width,
-        height: size?.height,
-        layoutOptions: {
-          ...layoutOptions,
-          "elk.nodeSize.constraints": "MINIMUM_SIZE",
-          "elk.nodeSize.minimum": `[${size?.width}, ${size?.height}]`,
-        },
-        children: node.children?.map((node) => toElkNode(node)),
-      };
-    };
-
-    let abort = false;
-    void elk
-      .layout({
-        id: "root",
-        layoutOptions: {
-          ...layoutOptions,
-          "elk.padding": "[top=10,left=10,bottom=10,right=10]",
-        },
-        children: nodes.map((node) => toElkNode(node)),
-        edges: edges?.map((edge) => ({
-          id: edge.id,
-          sources: [edge.source],
-          targets: [edge.target],
-        })),
-      })
-      .then((graph) => {
-        if (abort) {
-          return;
-        }
-
-        const offsets = new Map<string, { x: number; y: number }>();
-        const visit = (node: ElkNode, offsetX = 0, offsetY = 0) => {
-          const x = offsetX + (node.x ?? 0);
-          const y = offsetY + (node.y ?? 0);
-          offsets.set(node.id, { x, y });
-          for (const child of node.children ?? []) {
-            visit(child, x, y);
-          }
-        };
-        visit(graph);
-        setOffsets(offsets);
-        setGraph(graph);
-      });
-
-    return () => {
-      abort = true;
-    };
-  }, [nodes, edges, minimumSizes]);
-
-  const [highlighted, setHighlighted] = useState<string>();
-
-  const isHighlighted = useCallback(
-    (nodeId: string) => {
-      if (!highlighted) return true;
-      const highlightedId = `${highlighted}/`;
-      const nodeIdWithSlash = `${nodeId}/`;
-      return (
-        highlightedId.startsWith(nodeIdWithSlash) ||
-        nodeIdWithSlash.startsWith(highlightedId)
-      );
-    },
-    [highlighted],
-  );
-
-  const [nodeList, setNodeList] = useState<NodeData[]>([]);
-  useEffect(() => {
-    setNodeList(() => {
-      if (!graph) {
-        return [];
-      }
-      if (!nodeRecord) {
-        return [];
-      }
-      if (!offsets) {
-        return [];
-      }
-
-      const nodeList: NodeData[] = [];
-      const traverse = (node: ElkNode, depth = 0) => {
-        const offset = offsets?.get(node.id) ?? { x: 0, y: 0 };
-        const data = nodeRecord[node.id];
-        if (data) {
-          nodeList.push({
-            id: node.id,
-            width: node.width ?? 0,
-            height: node.height ?? 0,
-            offset,
-            depth,
-            edges:
-              edges?.filter(
-                (edge) => edge.source === node.id || edge.target === node.id,
-              ) ?? [],
-            data,
-          });
-        }
-        for (const child of node.children ?? []) {
-          traverse(child, depth + 1);
-        }
-      };
-
-      for (const node of graph.children ?? []) {
-        traverse(node);
-      }
-
-      // Remove root node.
-      return nodeList.slice(1);
-    });
-  }, [graph, nodeRecord, offsets, edges, setNodeList]);
-
-  const { zoomToFit } = useZoomPaneContext();
-
-  // Zoom to fit when map changes
-  const previousNodeList = useRef<NodeData[]>();
-  useEffect(() => {
-    // Skip animation if there was no previous node list (eg, first render)
-    const skipAnimation =
-      !previousNodeList.current || previousNodeList.current.length === 0;
-
-    zoomToFit(
-      {
-        x: 0,
-        y: 0,
-        width: graph?.width ?? 0,
-        height: graph?.height ?? 0,
-      },
-      skipAnimation,
-    );
-
-    previousNodeList.current = nodeList;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [graph, nodeList]);
-
-  const hasHighlightedEdge = useCallback(
-    (node: NodeData) => {
-      return node.edges.some(
-        (edge) =>
-          (edge.source === node.id && edge.target === highlighted) ||
-          (edge.source === highlighted && edge.target === node.id),
-      );
-    },
-    [highlighted],
-  );
-
-  const zoomPane = useRef<HTMLDivElement>(null);
-  const rootElement = useRef<HTMLDivElement>(null);
-  useEffect(() => {
-    if (!zoomPane.current || !rootElement.current) {
-      console.error("No zoom pane or root element");
-      return;
-    }
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        for (const entry of entries) {
-          if (!entry.isIntersecting) {
-            zoomToFit();
-            return;
-          }
-        }
-      },
-      {
-        root: zoomPane.current,
-        rootMargin: "-20px",
-      },
-    );
-    observer.observe(rootElement.current);
-    return () => {
-      observer.disconnect();
-    };
-  }, [zoomToFit]);
-
-  return (
-    <>
-      <InvisibleNodeSizeCalculator
-        nodes={nodes}
-        node={node}
-        onSizesChange={setMinimumSizes}
-      />
-
-      <ZoomPane
-        ref={zoomPane}
-        className="w-full h-full bg-white dark:bg-slate-500"
-        data-testid="map-pane"
-      >
-        <div ref={rootElement}>
-          {graph && (
-            <Graph
-              graph={graph}
-              node={node}
-              nodeList={nodeList}
-              offsets={offsets!}
-              selectedNodeId={selectedNodeId}
-              onSelectedNodeIdChange={onSelectedNodeIdChange}
-              onSelectedEdgeIdChange={onSelectedEdgeIdChange}
-              isHighlighted={isHighlighted}
-              hasHighlightedEdge={hasHighlightedEdge}
-              setHighlighted={setHighlighted}
-            />
-          )}
-        </div>
-      </ZoomPane>
-    </>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/ui/explorer.tsx b/apps/wing-console/console/ui/src/ui/explorer.tsx
deleted file mode 100644
index 10ce7cf0c8a..00000000000
--- a/apps/wing-console/console/ui/src/ui/explorer.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import {
-  SquareStackMinusIcon,
-  SquareStackPlusIcon,
-  Toolbar,
-  ToolbarButton,
-  TreeItem,
-  TreeView,
-  useTheme,
-  ResourceIcon,
-  ScrollableArea,
-} from "@wingconsole/design-system";
-import { ExplorerItem } from "@wingconsole/server";
-import classNames from "classnames";
-import { memo, useMemo } from "react";
-
-import { NoResources } from "./no-resources.js";
-import { TreeMenuItem } from "./use-tree-menu-items.js";
-
-const renderTreeItems = (items: TreeMenuItem[]) => {
-  return items.map((item) => {
-    return (
-      <TreeItem
-        key={item.id}
-        itemId={item.id}
-        label={item.label}
-        icon={item.icon}
-      >
-        {item.children &&
-          item.children.length > 0 &&
-          renderTreeItems(item.children)}
-      </TreeItem>
-    );
-  });
-};
-
-const createTreeMenuItemFromExplorerTreeItem = (
-  item: ExplorerItem,
-): TreeMenuItem => {
-  return {
-    id: item.id,
-    label: item.label,
-    icon: item.type ? (
-      <ResourceIcon
-        resourceType={item.type}
-        resourcePath={item.label}
-        className="w-4 h-4"
-        // darkenOnGroupHover
-      />
-    ) : undefined,
-    children: item.childItems?.map((item) =>
-      createTreeMenuItemFromExplorerTreeItem(item),
-    ),
-  };
-};
-
-export interface ExplorerProps {
-  loading?: boolean;
-  items: TreeMenuItem[] | undefined;
-  selectedItemId: string | undefined;
-  expandedItems: string[];
-  "data-testid"?: string;
-  onSelectedItemsChange: (ids: string[]) => void;
-  onExpandedItemsChange: (ids: string[]) => void;
-  onExpandAll(): void;
-  onCollapseAll(): void;
-}
-
-export const Explorer = memo((props: ExplorerProps) => {
-  const {
-    selectedItemId,
-    onSelectedItemsChange,
-    onExpandAll,
-    loading,
-    onCollapseAll,
-    expandedItems,
-    onExpandedItemsChange,
-    items,
-  } = props;
-  const { theme } = useTheme();
-  const selectedItems = useMemo(
-    () => (selectedItemId ? [selectedItemId] : []),
-    [selectedItemId],
-  );
-  return (
-    <div
-      className={classNames("w-full h-full flex flex-col", theme.bg3)}
-      data-testid={props["data-testid"]}
-    >
-      <Toolbar title="Explorer">
-        <ToolbarButton
-          onClick={onExpandAll}
-          title="Expand All"
-          disabled={loading}
-        >
-          <SquareStackPlusIcon className="w-4 h-4 rotate-90" />
-        </ToolbarButton>
-
-        <ToolbarButton
-          onClick={onCollapseAll}
-          title="Collapse All"
-          disabled={loading}
-        >
-          <SquareStackMinusIcon className="w-4 h-4 rotate-90" />
-        </ToolbarButton>
-      </Toolbar>
-
-      <div className="relative grow">
-        <div className="absolute inset-0">
-          <ScrollableArea
-            overflowY
-            className={classNames(
-              "h-full w-full text-sm flex flex-col gap-1",
-              theme.bg3,
-              theme.text2,
-            )}
-          >
-            <div className="flex flex-col">
-              {expandedItems.length === 0 && <NoResources />}
-              <TreeView
-                expandedItems={expandedItems}
-                onExpandedItemsChange={onExpandedItemsChange}
-                selectedItems={selectedItems}
-                onSelectedItemsChange={onSelectedItemsChange}
-              >
-                {items && renderTreeItems(items)}
-              </TreeView>
-            </div>
-          </ScrollableArea>
-        </div>
-      </div>
-    </div>
-  );
-});
diff --git a/apps/wing-console/console/ui/src/ui/map-controls.tsx b/apps/wing-console/console/ui/src/ui/map-controls.tsx
deleted file mode 100644
index 2b909f5325d..00000000000
--- a/apps/wing-console/console/ui/src/ui/map-controls.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import {
-  ArrowsPointingOutIcon,
-  EyeIcon,
-  EyeSlashIcon,
-  MagnifyingGlassMinusIcon,
-  MagnifyingGlassPlusIcon,
-} from "@heroicons/react/24/solid";
-import { Toolbar, ToolbarButton } from "@wingconsole/design-system";
-import { useContext } from "react";
-
-import { TestsContext } from "../tests-context.js";
-
-import { useZoomPaneContext } from "./zoom-pane.js";
-
-export interface MapControlsProps {}
-
-export const MapControls = ({}: MapControlsProps) => {
-  const { zoomIn, zoomOut, zoomToFit } = useZoomPaneContext();
-
-  const { showTests, setShowTests, testsExists } = useContext(TestsContext);
-
-  return (
-    <div className="flex justify-normal items-center">
-      <div className="grow" />
-
-      <div>
-        <Toolbar>
-          <ToolbarButton title="Zoom out" onClick={zoomOut}>
-            <MagnifyingGlassMinusIcon className="w-4 h-4" />
-          </ToolbarButton>
-
-          <ToolbarButton title="Zoom in" onClick={zoomIn}>
-            <MagnifyingGlassPlusIcon className="w-4 h-4" />
-          </ToolbarButton>
-
-          <ToolbarButton title="Zoom to fit" onClick={zoomToFit}>
-            <ArrowsPointingOutIcon className="w-4 h-4" />
-          </ToolbarButton>
-
-          {testsExists && (
-            <div className="ml-2">
-              <ToolbarButton
-                title={showTests ? "Hide tests" : "Show tests"}
-                onClick={() => setShowTests(!showTests)}
-              >
-                <div className="flex items-center gap-1">
-                  {showTests ? (
-                    <EyeSlashIcon className="w-4 h-4" />
-                  ) : (
-                    <EyeIcon className="w-4 h-4" />
-                  )}
-                  <span className="text-xs px-0.5">
-                    {showTests ? "Hide tests" : "Show tests"}
-                  </span>
-                </div>
-              </ToolbarButton>
-            </div>
-          )}
-        </Toolbar>
-      </div>
-    </div>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/ui/resource-metadata.tsx b/apps/wing-console/console/ui/src/ui/resource-metadata.tsx
deleted file mode 100644
index a8c3f6909f1..00000000000
--- a/apps/wing-console/console/ui/src/ui/resource-metadata.tsx
+++ /dev/null
@@ -1,424 +0,0 @@
-import {
-  ArrowLeftOnRectangleIcon,
-  ArrowRightOnRectangleIcon,
-} from "@heroicons/react/20/solid";
-import {
-  ArrowPathRoundedSquareIcon,
-  CubeTransparentIcon,
-  CursorArrowRaysIcon,
-} from "@heroicons/react/24/outline";
-import {
-  useTheme,
-  InspectorSection,
-  Pill,
-  IconComponent,
-  ResourceIcon,
-  getResourceIconComponent,
-  Attribute,
-  ScrollableArea,
-} from "@wingconsole/design-system";
-import classNames from "classnames";
-import { memo, useCallback, useMemo, useState } from "react";
-
-import { QueueMetadataView } from "../features/queue-metadata-view.js";
-import { ResourceInteractionView } from "../features/resource-interaction-view.js";
-
-import { BucketMetadata } from "./bucket-metadata.js";
-import { CounterMetadata } from "./counter-metadata.js";
-import { FunctionMetadata } from "./function-metadata.js";
-import { ScheduleMetadata } from "./schedule-metadata.js";
-
-interface AttributeGroup {
-  groupName: string;
-  actionName?: string;
-  icon?: IconComponent;
-}
-
-interface ConnectionsGroup {
-  groupName: string;
-  type: "inbound" | "outbound";
-  connections: {
-    id: string;
-    path: string;
-    icon: React.ReactNode;
-  }[];
-}
-
-interface Relationship {
-  id: string;
-  path: string;
-  type: string;
-}
-
-export interface MetadataNode {
-  id: string;
-  path: string;
-  type: string;
-  props?:
-    | {
-        [key: string]: any;
-      }
-    | undefined;
-}
-
-export interface MetadataProps {
-  node: MetadataNode;
-  inbound?: Relationship[];
-  outbound?: Relationship[];
-  onConnectionNodeClick?: (path: string) => void;
-}
-
-export const ResourceMetadata = memo(
-  ({ node, inbound, outbound, onConnectionNodeClick }: MetadataProps) => {
-    const { theme } = useTheme();
-    const [openInspectorSections, setOpenInspectorSections] = useState(() => [
-      "interact",
-      "interact-actions",
-    ]);
-    const { resourceGroup, connectionsGroups } = useMemo(() => {
-      const connectionsGroupsArray: ConnectionsGroup[] = [];
-      let resourceGroup: AttributeGroup | undefined;
-      if (node.props) {
-        const icon = getResourceIconComponent(node.type, {
-          resourceId: node.id,
-        });
-        switch (node.type) {
-          case "@winglang/sdk.cloud.Function": {
-            resourceGroup = {
-              groupName: "Function",
-              actionName: "Invoke",
-              icon,
-            };
-            break;
-          }
-          case "@winglang/sdk.cloud.Queue": {
-            resourceGroup = {
-              groupName: "Queue",
-              actionName: "Push Message",
-              icon,
-            };
-
-            break;
-          }
-          case "@winglang/sdk.cloud.Bucket": {
-            resourceGroup = {
-              groupName: "Bucket",
-              actionName: "Files",
-              icon,
-            };
-
-            break;
-          }
-          case "@winglang/sdk.cloud.Counter": {
-            resourceGroup = {
-              groupName: "Counter",
-              icon,
-            };
-
-            break;
-          }
-          case "@winglang/sdk.cloud.Topic": {
-            resourceGroup = {
-              groupName: "Topic",
-              actionName: "Publish Message",
-              icon,
-            };
-
-            break;
-          }
-          case "@winglang/sdk.cloud.Api": {
-            resourceGroup = {
-              groupName: "Api",
-              icon,
-            };
-
-            break;
-          }
-          case "@winglang/sdk.ex.Table": {
-            resourceGroup = {
-              groupName: "Table",
-              icon,
-            };
-
-            break;
-          }
-          case "@winglang/sdk.cloud.Schedule": {
-            resourceGroup = {
-              groupName: "Schedule",
-              icon,
-            };
-
-            break;
-          }
-          case "@winglang/sdk.ex.Redis": {
-            resourceGroup = {
-              groupName: "Redis",
-              icon,
-            };
-
-            break;
-          }
-        }
-      }
-
-      if (inbound && inbound.length > 0) {
-        connectionsGroupsArray.push({
-          groupName: "Inbound",
-          type: "inbound",
-          connections: inbound.map((relationship) => ({
-            id: relationship.id,
-            path: relationship.path,
-            icon: (
-              <ResourceIcon
-                resourceType={relationship.type}
-                resourcePath={relationship.path}
-                className="w-4 h-4"
-              />
-            ),
-          })),
-        });
-      }
-      if (outbound && outbound.length > 0) {
-        connectionsGroupsArray.push({
-          groupName: "Outbound",
-          type: "outbound",
-          connections: outbound.map((relationship) => ({
-            id: relationship.id,
-            path: relationship.path,
-            icon: (
-              <ResourceIcon
-                resourceType={relationship.type}
-                resourcePath={relationship.path}
-                className="w-4 h-4"
-              />
-            ),
-          })),
-        });
-      }
-      return {
-        resourceGroup,
-        connectionsGroups: connectionsGroupsArray,
-      };
-    }, [node, inbound, outbound]);
-
-    const toggleInspectorSection = useCallback((section: string) => {
-      setOpenInspectorSections(([...sections]) => {
-        const index = sections.indexOf(section);
-        if (index === -1) {
-          sections.push(section);
-          return sections;
-        } else {
-          sections.splice(index, 1);
-          return sections;
-        }
-      });
-    }, []);
-
-    return (
-      <ScrollableArea
-        overflowY
-        className={classNames("h-full text-sm", theme.bg3, theme.text1)}
-        dataTestid={`resource-metadata:${node.path}`}
-      >
-        <div className="flex items-center gap-2 px-2 py-2">
-          <div className="flex-shrink-0">
-            <ResourceIcon
-              className="w-6 h-6"
-              resourceType={node.type}
-              resourcePath={node.path}
-            />
-          </div>
-
-          <div className="flex flex-col min-w-0">
-            <div className="text-sm font-medium truncate">{node.id}</div>
-            <div className="flex">
-              <Pill>{node.type}</Pill>
-            </div>
-          </div>
-        </div>
-
-        {node && (
-          <>
-            <InspectorSection
-              text="Node"
-              icon={CubeTransparentIcon}
-              open={openInspectorSections.includes("node")}
-              onClick={() => toggleInspectorSection("node")}
-              headingClassName="pl-2"
-            >
-              <div className={classNames("border-t", theme.border4)}>
-                <div
-                  className={classNames(
-                    "px-2 py-1.5 flex flex-col gap-y-1 gap-x-4",
-                    theme.bg3,
-                    theme.text1,
-                  )}
-                >
-                  <Attribute name="ID" value={node.id} />
-                  <Attribute name="Path" value={node.path} />
-                  <Attribute name="Type" value={node.type} />
-                </div>
-              </div>
-            </InspectorSection>
-
-            {connectionsGroups && connectionsGroups.length > 0 && (
-              <InspectorSection
-                text="Relationships"
-                open={openInspectorSections.includes("relationships")}
-                icon={ArrowPathRoundedSquareIcon}
-                onClick={() => toggleInspectorSection("relationships")}
-                headingClassName="pl-2"
-              >
-                <div className={classNames("border-t", theme.border4)}>
-                  {connectionsGroups.map((connectionGroup) => (
-                    <div key={connectionGroup.groupName}>
-                      <div
-                        className={classNames(
-                          "relative",
-                          theme.bg3,
-                          theme.text1,
-                        )}
-                      >
-                        {connectionGroup.connections.map(
-                          (connection, index) => (
-                            <button
-                              key={`${connection.path}_${index}`}
-                              className={classNames(
-                                theme.bg3,
-                                theme.bg3Hover,
-                                theme.text1,
-                                "w-full flex-shrink-0 max-w-full truncate shadow-sm text-sm pl-4 pr-2 py-1 flex items-center gap-1 min-w-0",
-                              )}
-                              title={connection.path}
-                              onClick={() =>
-                                onConnectionNodeClick?.(connection.path)
-                              }
-                            >
-                              <div
-                                className={classNames(
-                                  "flex-0 flex-shrink-0 flex items-center gap-2 min-w-[100px]",
-                                  theme.text1,
-                                )}
-                              >
-                                <div className="pl-2 flex-0 flex-shrink-0">
-                                  {connectionGroup.type === "inbound" ? (
-                                    <ArrowLeftOnRectangleIcon
-                                      className="w-4 h-4 rotate-180 text-green-500"
-                                      aria-hidden="true"
-                                    />
-                                  ) : (
-                                    <ArrowRightOnRectangleIcon
-                                      className="w-4 h-4 text-red-500"
-                                      aria-hidden="true"
-                                    />
-                                  )}
-                                </div>
-                                <span
-                                  className={classNames(
-                                    "uppercase text-xs",
-                                    theme.text1,
-                                  )}
-                                >
-                                  {connectionGroup.type === "inbound"
-                                    ? "In"
-                                    : "Out"}
-                                </span>
-                              </div>
-
-                              <div className="flex items-center gap-1.5 ml-2 5 min-w-0">
-                                <div className="flex-shrink-0 -ml-1">
-                                  {connection.icon}
-                                </div>
-                                <div className="truncate">{connection.id}</div>
-                              </div>
-                            </button>
-                          ),
-                        )}
-                      </div>
-                    </div>
-                  ))}
-                </div>
-              </InspectorSection>
-            )}
-
-            {(node.type.startsWith("@winglang/sdk.cloud") ||
-              node.type.startsWith("@winglang/sdk.redis") ||
-              node.type.startsWith("@winglang/sdk.ex")) && (
-              <>
-                <InspectorSection
-                  text={resourceGroup?.groupName || "Interact"}
-                  icon={resourceGroup?.icon || CursorArrowRaysIcon}
-                  open={openInspectorSections.includes("interact")}
-                  onClick={() => toggleInspectorSection("interact")}
-                  headingClassName="pl-2"
-                >
-                  <div
-                    className={classNames(
-                      "border-t",
-                      theme.border4,
-                      theme.bg3,
-                      theme.text1,
-                    )}
-                  >
-                    {resourceGroup?.groupName && (
-                      <>
-                        {node.type === "@winglang/sdk.cloud.Function" && (
-                          <FunctionMetadata node={node} />
-                        )}
-                        {node.type === "@winglang/sdk.cloud.Queue" && (
-                          <QueueMetadataView node={node} />
-                        )}
-                        {node.type === "@winglang/sdk.cloud.Bucket" && (
-                          <BucketMetadata node={node} />
-                        )}
-                        {node.type === "@winglang/sdk.cloud.Counter" && (
-                          <CounterMetadata node={node} />
-                        )}
-                        {node.type === "@winglang/sdk.cloud.Schedule" && (
-                          <ScheduleMetadata node={node} />
-                        )}
-                        {resourceGroup?.actionName && (
-                          <InspectorSection
-                            text={resourceGroup.actionName}
-                            open={openInspectorSections.includes(
-                              "interact-actions",
-                            )}
-                            onClick={() =>
-                              toggleInspectorSection("interact-actions")
-                            }
-                            subection
-                            headingClassName="pl-2"
-                          >
-                            <div className="pl-6 pr-2 pb-2 h-full relative">
-                              <ResourceInteractionView
-                                key={node.path}
-                                resourceType={node.type}
-                                resourcePath={node.path}
-                              />
-                            </div>
-                          </InspectorSection>
-                        )}
-                      </>
-                    )}
-                    {(!resourceGroup?.groupName ||
-                      !resourceGroup?.actionName) && (
-                      <div className="pl-6 pr-2 py-1 relative">
-                        <ResourceInteractionView
-                          key={node.path}
-                          resourceType={node.type}
-                          resourcePath={node.path}
-                        />
-                      </div>
-                    )}
-                  </div>
-                </InspectorSection>
-              </>
-            )}
-
-            <div className={classNames(theme.border3, "border-t")}></div>
-          </>
-        )}
-      </ScrollableArea>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/src/ui/use-node-static-data.tsx b/apps/wing-console/console/ui/src/ui/use-node-static-data.tsx
deleted file mode 100644
index 270d94dabb4..00000000000
--- a/apps/wing-console/console/ui/src/ui/use-node-static-data.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useEffect, useState } from "react";
-
-import { Node } from "../shared/Node.js";
-
-export interface NodeStaticDataOptions<T> {
-  /**
-   * The list of nodes.
-   */
-  nodes: Node<T>[];
-}
-
-/**
- * Generate data such as sizes, port positions and more for each node.
- */
-export const useNodeStaticData = <T,>({ nodes }: NodeStaticDataOptions<T>) => {
-  const [nodeRecord, setNodeRecord] = useState<Record<string, Node<T>>>();
-  useEffect(() => {
-    setNodeRecord(() => {
-      const nodeRecord: Record<string, any> = {};
-      const visit = (node: Node<T>) => {
-        nodeRecord[node.id] = node;
-        for (const child of node.children ?? []) {
-          visit(child);
-        }
-      };
-      for (const node of nodes) {
-        visit(node);
-      }
-      return nodeRecord;
-    });
-  }, [nodes]);
-
-  return {
-    nodeRecord,
-  };
-};
diff --git a/apps/wing-console/console/ui/src/ui/use-tree-menu-items.tsx b/apps/wing-console/console/ui/src/ui/use-tree-menu-items.tsx
deleted file mode 100644
index fce53be6618..00000000000
--- a/apps/wing-console/console/ui/src/ui/use-tree-menu-items.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { ReactNode, useCallback, useState } from "react";
-
-export interface TreeMenuItem {
-  id: string;
-  icon?: React.ReactNode;
-  label: string;
-  secondaryLabel?: string | ReactNode | ((item: TreeMenuItem) => ReactNode);
-  children?: TreeMenuItem[];
-}
-
-export function useTreeMenuItems(options?: {
-  treeMenuItems?: TreeMenuItem[];
-  selectedItemIds?: string[];
-  openMenuItemIds?: string[];
-}) {
-  const [items, setItems] = useState(options?.treeMenuItems ?? []);
-
-  const [selectedItems, setSelectedItems] = useState(
-    () => options?.selectedItemIds ?? [],
-  );
-  const [expandedItems, setExpandedItems] = useState(
-    options?.openMenuItemIds ?? [],
-  );
-  const toggle = useCallback((itemId: string) => {
-    setExpandedItems(([...openedMenuItems]) => {
-      const index = openedMenuItems.indexOf(itemId);
-      if (index !== -1) {
-        openedMenuItems.splice(index, 1);
-        return openedMenuItems;
-      }
-
-      openedMenuItems.push(itemId);
-      return openedMenuItems;
-    });
-  }, []);
-
-  const expandAll = useCallback(() => {
-    const itemIds = [];
-    const stack = [...items];
-    while (stack.length > 0) {
-      const item = stack.pop();
-      if (!item) {
-        continue;
-      }
-
-      itemIds.push(item.id);
-
-      if (item.children) {
-        stack.push(...item.children);
-      }
-    }
-
-    setExpandedItems(itemIds);
-  }, [items]);
-
-  const collapseAll = useCallback(() => {
-    setExpandedItems([]);
-  }, []);
-
-  const expand = useCallback((itemId: string) => {
-    setExpandedItems(([...openedMenuItems]) => {
-      const index = openedMenuItems.indexOf(itemId);
-      if (index !== -1) {
-        return openedMenuItems;
-      }
-
-      openedMenuItems.push(itemId);
-      return openedMenuItems;
-    });
-  }, []);
-
-  return {
-    items,
-    setItems,
-    selectedItems,
-    setSelectedItems,
-    expandedItems,
-    setExpandedItems,
-    toggle,
-    expandAll,
-    collapseAll,
-    expand,
-  };
-}
diff --git a/apps/wing-console/console/ui/src/ui/website-interaction.tsx b/apps/wing-console/console/ui/src/ui/website-interaction.tsx
deleted file mode 100644
index 893d37bc0a0..00000000000
--- a/apps/wing-console/console/ui/src/ui/website-interaction.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid";
-import { Attribute, useTheme } from "@wingconsole/design-system";
-import classNames from "classnames";
-
-import { AppMode } from "../AppContext.js";
-
-export interface WebsiteInteractionProps {
-  url: string;
-  appMode: AppMode;
-  onUrlClick: (url: string) => void;
-}
-export const WebsiteInteraction = ({
-  appMode,
-  url,
-  onUrlClick,
-}: WebsiteInteractionProps) => {
-  const { theme } = useTheme();
-  return (
-    <div className="h-full flex-1 flex flex-col text-sm space-y-1">
-      <div className="relative grow flex-row flex items-center">
-        {appMode === "local" && (
-          <>
-            <Attribute
-              name="URL"
-              value={url}
-              noLeftPadding
-              dataTestId="cloud.website:url"
-            />
-            <ArrowTopRightOnSquareIcon
-              className={classNames(
-                theme.text2,
-                "text-sm flex ml-2 h-4 w-4 cursor-pointer",
-              )}
-              onClick={() => onUrlClick(url)}
-              data-testid="cloud.website:open-url"
-            />
-          </>
-        )}
-      </div>
-    </div>
-  );
-};
diff --git a/apps/wing-console/console/ui/src/ui/zoom-pane.stories.tsx b/apps/wing-console/console/ui/src/ui/zoom-pane.stories.tsx
deleted file mode 100644
index 40320f6f346..00000000000
--- a/apps/wing-console/console/ui/src/ui/zoom-pane.stories.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ComponentStory, ComponentMeta } from "@storybook/react";
-
-import { ZoomPane, ZoomPaneProvider } from "./zoom-pane.js";
-
-export default {
-  title: "UI/MapView/ZoomPane",
-  component: ZoomPane,
-  parameters: {
-    docs: {
-      description: {
-        component: "A zoomable pane.",
-      },
-    },
-  },
-} satisfies ComponentMeta<typeof ZoomPane>;
-
-const Template: ComponentStory<typeof ZoomPane> = (props) => (
-  <div className="h-full flex flex-col bg-slate-100">
-    <ZoomPaneProvider>
-      <ZoomPane className="grow">
-        <div className="p-8">
-          <div className="w-32 h-32 bg-blue-500"></div>
-        </div>
-      </ZoomPane>
-    </ZoomPaneProvider>
-  </div>
-);
-
-export const Default = Template.bind({});
-Default.args = {};
diff --git a/apps/wing-console/console/ui/src/ui/zoom-pane.tsx b/apps/wing-console/console/ui/src/ui/zoom-pane.tsx
deleted file mode 100644
index faaf7386489..00000000000
--- a/apps/wing-console/console/ui/src/ui/zoom-pane.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-import classNames from "classnames";
-import * as d3Selection from "d3-selection";
-import * as d3Zoom from "d3-zoom";
-import { forwardRef } from "react";
-import {
-  DetailedHTMLProps,
-  HTMLAttributes,
-  RefObject,
-  useCallback,
-  useRef,
-} from "react";
-import {
-  FunctionComponent,
-  ReactNode,
-  createContext,
-  useState,
-  useContext,
-} from "react";
-
-export type Selection = d3Selection.Selection<
-  HTMLDivElement,
-  unknown,
-  null,
-  undefined
->;
-
-export type ZoomBehavior = d3Zoom.ZoomBehavior<HTMLDivElement, unknown>;
-
-export interface Viewport {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-export interface ZoomPaneContextValue {
-  zoomIn(): void;
-  zoomOut(): void;
-  zoomToFit(viewport?: Viewport, skipAnimation?: boolean): void;
-}
-
-const ZoomPaneContext = createContext<ZoomPaneContextValue>({
-  zoomIn() {},
-  zoomOut() {},
-  zoomToFit() {},
-});
-
-interface ZoomPanePrivateContextValue {
-  zoom: ZoomBehavior;
-  selection: Selection | undefined;
-  select(node: HTMLDivElement): void;
-  targetRef: RefObject<HTMLDivElement>;
-}
-
-const ZoomPanePrivateContext = createContext<
-  ZoomPanePrivateContextValue | undefined
->(undefined);
-
-export interface ZoomPaneProviderProps {
-  children: ReactNode | ((value: ZoomPaneContextValue) => ReactNode);
-}
-
-const selectionTransition = (selection: Selection, duration?: number) => {
-  const newSelection = (selection as any).transition();
-  if (duration) {
-    return newSelection.duration(duration) as Selection;
-  }
-  return newSelection as Selection;
-};
-
-const MIN_ZOOM_LEVEL = 0.5;
-const MAX_ZOOM_LEVEL = 2;
-
-export const ZoomPaneProvider: FunctionComponent<ZoomPaneProviderProps> = (
-  props,
-) => {
-  const targetRef = useRef<HTMLDivElement>(null);
-  const [zoom] = useState(() =>
-    d3Zoom
-      .zoom<HTMLDivElement, unknown>()
-      .scaleExtent([MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL])
-      .clickDistance(30)
-      .on("zoom", (event) => {
-        const { transform } = event;
-        if (targetRef.current) {
-          targetRef.current.style.transform = `translate(${transform.x}px, ${transform.y}px) scale(${transform.k})`;
-        }
-      }),
-  );
-  const [selection, setSelection] = useState<Selection | undefined>();
-  const select = useCallback(
-    (node: HTMLDivElement) => {
-      const selection = d3Selection.select(node);
-      selection.call(zoom);
-      setSelection(selection);
-    },
-    [zoom],
-  );
-
-  const zoomToFit = useCallback(
-    (viewport?: Viewport, skipAnimation?: boolean) => {
-      const node = selection?.node();
-      if (!selection || !node) {
-        return;
-      }
-
-      if (!targetRef.current) {
-        return;
-      }
-
-      viewport ??= {
-        x: 0,
-        y: 0,
-        width: targetRef.current.clientWidth,
-        height: targetRef.current.clientHeight,
-      };
-
-      const width = node.clientWidth;
-      const height = node.clientHeight;
-      const x0 = viewport.x;
-      const y0 = viewport.y;
-      const x1 = x0 + viewport.width;
-      const y1 = y0 + viewport.height;
-
-      const defaultScale = 1.25;
-
-      const scale = Math.min(
-        8,
-        0.9 / Math.max((x1 - x0) / width, (y1 - y0) / height),
-      );
-
-      const newTransform = d3Zoom.zoomIdentity
-        .translate(width / 2, height / 2)
-        .scale(Math.min(defaultScale, scale))
-        .translate(-(x0 + x1) / 2, -(y0 + y1) / 2);
-      if (skipAnimation) {
-        zoom.transform(selection, newTransform);
-      } else {
-        selectionTransition(selection, 500).call(zoom.transform, newTransform);
-      }
-    },
-    [selection, zoom, targetRef],
-  );
-
-  const zoomOut = useCallback(() => {
-    if (!selection) {
-      return;
-    }
-    selectionTransition(selection).call(zoom.scaleBy, 0.9);
-  }, [selection, zoom]);
-
-  const zoomIn = useCallback(() => {
-    if (!selection) {
-      return;
-    }
-    selectionTransition(selection).call(zoom.scaleBy, 1.1);
-  }, [selection, zoom]);
-
-  return (
-    <ZoomPanePrivateContext.Provider
-      value={{ zoom, selection, select, targetRef }}
-    >
-      <ZoomPaneContext.Provider
-        value={{
-          zoomIn,
-          zoomOut,
-          zoomToFit,
-        }}
-      >
-        {typeof props.children === "function" ? (
-          props.children({
-            zoomIn,
-            zoomOut,
-            zoomToFit,
-          })
-        ) : (
-          <>{props.children}</>
-        )}
-      </ZoomPaneContext.Provider>
-    </ZoomPanePrivateContext.Provider>
-  );
-};
-
-export const useZoomPaneContext = () => {
-  return useContext(ZoomPaneContext);
-};
-
-export const ZoomPane = forwardRef<
-  HTMLDivElement,
-  DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>
->((props, _ref) => {
-  const context = useContext(ZoomPanePrivateContext);
-
-  if (!context) {
-    return <>{props.children}</>;
-  }
-
-  const { select, targetRef } = context;
-
-  return (
-    <div ref={_ref} className={classNames(props.className, "overflow-hidden")}>
-      <div
-        ref={select}
-        {...props}
-        className={classNames(props.className, "overflow-hidden")}
-      >
-        <div ref={targetRef} className="inline-block origin-top-left">
-          {props.children}
-        </div>
-      </div>
-    </div>
-  );
-});
diff --git a/apps/wing-console/console/ui/src/shared/use-download-file.ts b/apps/wing-console/console/ui/src/use-download-file.ts
similarity index 100%
rename from apps/wing-console/console/ui/src/shared/use-download-file.ts
rename to apps/wing-console/console/ui/src/use-download-file.ts
diff --git a/apps/wing-console/console/ui/src/shared/use-file-link.tsx b/apps/wing-console/console/ui/src/use-file-link.tsx
similarity index 76%
rename from apps/wing-console/console/ui/src/shared/use-file-link.tsx
rename to apps/wing-console/console/ui/src/use-file-link.tsx
index 79c0111e8e5..9087ca8cd17 100644
--- a/apps/wing-console/console/ui/src/shared/use-file-link.tsx
+++ b/apps/wing-console/console/ui/src/use-file-link.tsx
@@ -1,6 +1,7 @@
-import { PropsWithChildren } from "react";
+import classNames from "classnames";
+import type { PropsWithChildren } from "react";
 
-import { trpc } from "../services/trpc.js";
+import { trpc } from "./trpc.js";
 
 export const createHtmlLink = (
   error: string,
@@ -11,7 +12,7 @@ export const createHtmlLink = (
     .replaceAll("<", "&lt;")
     .replaceAll(">", "&gt;")
     .replaceAll(
-      /\B((?:[a-z]:)?\.{0,2}[/\\]\S+):(\d+):(\d+)/gi,
+      /--&gt;\s*([\w./-]+\.w):(\d+):(\d+)/g,
       (match, path, line, column) => {
         return `<a class="${className}" path="${path}" line="${line}" column="${column}" >${match}</a>`;
       },
@@ -19,12 +20,15 @@ export const createHtmlLink = (
     .replaceAll(/(\r\n|\n|\r)/gm, expanded ? "<br />" : "\n");
 };
 
-export const OpenFileInEditorButton = ({ children }: PropsWithChildren) => {
+export const OpenFileInEditorButton = ({
+  className,
+  children,
+}: PropsWithChildren<{ className?: string }>) => {
   const openFileInEditor = trpc["app.openFileInEditor"].useMutation();
 
   return (
     <button
-      className="appearance-none text-left"
+      className={classNames("appearance-none text-left", className)}
       onClick={(event) => {
         event.preventDefault();
         const target = event.target as HTMLElement;
diff --git a/apps/wing-console/console/ui/src/services/use-open-external.ts b/apps/wing-console/console/ui/src/use-open-external.ts
similarity index 100%
rename from apps/wing-console/console/ui/src/services/use-open-external.ts
rename to apps/wing-console/console/ui/src/use-open-external.ts
diff --git a/apps/wing-console/console/ui/src/shared/use-upload-file.ts b/apps/wing-console/console/ui/src/use-upload-file.ts
similarity index 100%
rename from apps/wing-console/console/ui/src/shared/use-upload-file.ts
rename to apps/wing-console/console/ui/src/use-upload-file.ts
diff --git a/apps/wing-console/console/ui/src/widgets/logs.tsx b/apps/wing-console/console/ui/src/widgets/logs.tsx
deleted file mode 100644
index 22f325a02bb..00000000000
--- a/apps/wing-console/console/ui/src/widgets/logs.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import {
-  ScrollableArea,
-  USE_EXTERNAL_THEME_COLOR,
-  useTheme,
-} from "@wingconsole/design-system";
-import { LogEntry, LogLevel } from "@wingconsole/server";
-import classNames from "classnames";
-import { useState, useRef, useEffect, useCallback, memo } from "react";
-
-import { ConsoleLogsFilters } from "../features/console-logs-filters.js";
-import { ConsoleLogs } from "../features/console-logs.js";
-import { trpc } from "../services/trpc.js";
-
-const DEFAULT_LOG_LEVELS: LogLevel[] = ["info", "warn", "error"];
-
-export interface LogsWidgetProps {
-  loading?: boolean;
-  onResourceClick?: (path: string) => void;
-}
-
-export const LogsWidget = memo(
-  ({ loading, onResourceClick }: LogsWidgetProps) => {
-    const { theme } = useTheme();
-
-    const [selectedLogTypeFilters, setSelectedLogTypeFilters] = useState(
-      () => DEFAULT_LOG_LEVELS,
-    );
-    const [searchText, setSearchText] = useState("");
-
-    const [logsTimeFilter, setLogsTimeFilter] = useState(0);
-
-    const logs = trpc["app.logs"].useQuery(
-      {
-        filters: {
-          level: {
-            verbose: selectedLogTypeFilters.includes("verbose"),
-            info: selectedLogTypeFilters.includes("info"),
-            warn: selectedLogTypeFilters.includes("warn"),
-            error: selectedLogTypeFilters.includes("error"),
-          },
-          text: searchText,
-          timestamp: logsTimeFilter,
-        },
-      },
-      {
-        keepPreviousData: true,
-      },
-    );
-
-    const scrollableRef = useRef<HTMLDivElement>(null);
-    const [scrolledToBottom, setScrolledToBottom] = useState(true);
-    const [initialScroll, setInitialScroll] = useState(true);
-
-    useEffect(() => {
-      const element = scrollableRef.current;
-      if (!element) {
-        return;
-      }
-
-      if (!logs.data) {
-        return;
-      }
-
-      if (initialScroll || scrolledToBottom) {
-        setInitialScroll(false);
-        element.scrollTo({
-          top: element.scrollHeight,
-          behavior: initialScroll ? "instant" : "smooth",
-        });
-      }
-    }, [initialScroll, logs.data, scrolledToBottom]);
-
-    const onLogClick = useCallback(
-      (log: LogEntry) => {
-        const path = log.ctx?.sourcePath;
-        if (path) {
-          onResourceClick?.(path);
-        }
-      },
-      [onResourceClick],
-    );
-
-    const clearLogs = useCallback(() => setLogsTimeFilter(Date.now()), []);
-
-    return (
-      <div className="relative h-full flex flex-col gap-2">
-        <div
-          className={classNames(
-            "absolute h-full w-full bg-white/70 dark:bg-slate-600/70",
-            "transition-all",
-            !loading && "opacity-0 -z-10",
-            theme.text2,
-          )}
-        />
-
-        <ConsoleLogsFilters
-          selectedLogTypeFilters={selectedLogTypeFilters}
-          setSelectedLogTypeFilters={setSelectedLogTypeFilters}
-          clearLogs={clearLogs}
-          isLoading={false} // display logs also while in loading state
-          onSearch={setSearchText}
-        />
-        <div className="relative h-full">
-          <ScrollableArea
-            ref={scrollableRef}
-            overflowY
-            className={classNames(
-              "pb-1.5",
-              theme.bg3,
-              theme.text2,
-              USE_EXTERNAL_THEME_COLOR,
-            )}
-            onScrolledToBottomChange={setScrolledToBottom}
-          >
-            <ConsoleLogs logs={logs.data ?? []} onResourceClick={onLogClick} />
-          </ScrollableArea>
-        </div>
-      </div>
-    );
-  },
-);
diff --git a/apps/wing-console/console/ui/vite.config.ts b/apps/wing-console/console/ui/vite.config.ts
index de3630bea3c..751332ad111 100644
--- a/apps/wing-console/console/ui/vite.config.ts
+++ b/apps/wing-console/console/ui/vite.config.ts
@@ -6,8 +6,4 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
   plugins: [react()],
-  test: {
-    environment: "happy-dom",
-    setupFiles: ["./test/setup.ts"],
-  },
 });
diff --git a/apps/wing-console/packages/use-persistent-state/src/index.tsx b/apps/wing-console/packages/use-persistent-state/src/index.tsx
index f5739e1f625..1994774a795 100644
--- a/apps/wing-console/packages/use-persistent-state/src/index.tsx
+++ b/apps/wing-console/packages/use-persistent-state/src/index.tsx
@@ -1,12 +1,14 @@
-import {
+import type {
   Dispatch,
   PropsWithChildren,
   SetStateAction,
+  MutableRefObject,
+} from "react";
+import {
   createContext,
   useContext,
   useEffect,
   useRef,
-  MutableRefObject,
   useState,
   memo,
 } from "react";
diff --git a/apps/wing-console/tools/eslint-plugin/index.cjs b/apps/wing-console/tools/eslint-plugin/index.cjs
index aa3d5511da8..5ffb5158380 100644
--- a/apps/wing-console/tools/eslint-plugin/index.cjs
+++ b/apps/wing-console/tools/eslint-plugin/index.cjs
@@ -13,7 +13,6 @@ const base = {
     "plugin:unicorn/recommended",
     "plugin:@cloudy-ts/recommended",
   ],
-
   settings: {
     react: {
       version: "detect",
@@ -50,6 +49,7 @@ const base = {
       },
     ],
     "react/display-name": ["off"],
+    "@typescript-eslint/consistent-type-imports": "error",
   },
 };
 
diff --git a/apps/wing/.eslintrc.json b/apps/wing/.eslintrc.json
index a32a468f78c..0b1610933a2 100644
--- a/apps/wing/.eslintrc.json
+++ b/apps/wing/.eslintrc.json
@@ -13,7 +13,7 @@
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module",
-    "project": "./tsconfig.json"
+    "project": "./tsconfig.dev.json"
   },
   "extends": [
     "plugin:import/typescript",
@@ -30,7 +30,7 @@
     "import/resolver": {
       "node": {},
       "typescript": {
-        "project": "./tsconfig.json",
+        "project": "./tsconfig.dev.json",
         "alwaysTryTypes": true
       }
     }
@@ -45,6 +45,7 @@
     "!projenrc/**/*.ts"
   ],
   "rules": {
+    "@typescript-eslint/no-misused-promises": "error",
     "prettier/prettier": [
       "error"
     ],
diff --git a/apps/wing/README.md b/apps/wing/README.md
index 23137c9fce0..2c88e31db6c 100644
--- a/apps/wing/README.md
+++ b/apps/wing/README.md
@@ -4,7 +4,7 @@
   ▪︎
   <a href="https://www.winglang.io/docs/">Getting Started</a>
   ▪︎
-  <a href="http://t.winglang.io/slack">Join Slack</a>
+  <a href="http://t.winglang.io/discord">Join Discord</a>
   ▪︎
   <a href="https://www.winglang.io/docs/category/faq">FAQ</a>
   ▪︎
@@ -32,7 +32,7 @@ We also provide you with a set of tools that let you test your code locally, sig
   <img src="./logo/demo.gif" alt="Wing Demo" height="360px">
 </p>
 
-Wing is built by [Elad Ben-Israel](https://github.com/eladb), the guy behind the [AWS CDK](https://github.com/aws/aws-cdk), the gang at the [Wing Cloud team](https://www.wing.cloud/) and an amazing [community](https://t.winglang.io/slack) of contributors (also known as Wingnuts).
+Wing is built by [Elad Ben-Israel](https://github.com/eladb), the guy behind the [AWS CDK](https://github.com/aws/aws-cdk), the gang at the [Wing Cloud team](https://www.wing.cloud/) and an amazing [community](https://t.winglang.io/discord) of contributors (also known as Wingnuts).
 
 Click [here](https://www.youtube.com/watch?v=5_RhWwgGue0) to watch a short video introduction to the Wing language.
 
@@ -83,8 +83,8 @@ Wing was built from the ground up to make it easy for building applications on a
 It includes an assembly of different features that serve that purpose:
 
 * [Cloud services](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-services) as first-class citizens, with [phase modifiers](https://www.winglang.io/contributing/rfcs/language-spec#13-phase-modifiers) for describing infrastructure and runtime code ([`preflight` and `inflight`](https://www.winglang.io/docs/concepts/inflights)). 
-* [Wing Cloud Library](https://www.winglang.io/docs/category/cloud-library) provides a standard set of resources that lets you write cloud portable code.
-* [Compiler plugins](https://www.winglang.io/docs/tools/compiler-plugins) that keep you in control by allowing you to customize the infrastructure definitions and run policy checks.
+* [Wing Cloud Library](https://www.winglang.io/docs/category/cloud) provides a standard set of resources that lets you write cloud portable code.
+* [Custom platforms](https://www.winglang.io/docs/concepts/platforms) that keep you in control by allowing you to customize the infrastructure definitions and run policy checks.
 * Use any resource in the Terraform ecosystem as first-class citizen in your app.
 * [JavaScript interoperability](https://www.winglang.io/contributing/rfcs/language-spec#5-interoperability).
 * Automatic generation of IAM policies and other cloud mechanics based on source code.
@@ -120,7 +120,7 @@ Here are some questions we're commonly asked that are covered by our [FAQ](https
 
 ## Community 💬
 
-Join our flock in the [Wing Slack](https://t.winglang.io/slack) community.
+Join our flock in the [Wing Discord](https://t.winglang.io/discord) community.
 We're here to help each other, answer questions, and share our cloud adventures.
 Alternatively, post any questions on [GitHub Discussions](https://github.com/winglang/wing/discussions).
 
@@ -145,4 +145,4 @@ Contributions are made under our [contribution license](./CONTRIBUTION_LICENSE.m
 
 Happy coding, and remember: the sky's the limit with Wing (yes, another pun)! 🌤️🚀
 
-[wing slack]: https://t.winglang.io/slack
+[wing discord]: https://t.winglang.io/discord
diff --git a/apps/wing/fixtures/valid1/main.w b/apps/wing/fixtures/invalid6/lib.w
similarity index 100%
rename from apps/wing/fixtures/valid1/main.w
rename to apps/wing/fixtures/invalid6/lib.w
diff --git a/apps/wing/fixtures/invalid6/package.json b/apps/wing/fixtures/invalid6/package.json
new file mode 100644
index 00000000000..8ce3fa12dca
--- /dev/null
+++ b/apps/wing/fixtures/invalid6/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "invalid6",
+  "version": "0.0.0",
+  "description": "description",
+  "author": "author",
+  "license": "MIT",
+  "files": [
+    "**/*.ts"
+  ],
+  "dependencies": {
+    "some-dependency": "^1.0.0"
+  }
+}
diff --git a/apps/wing/fixtures/invalid6/util.ts b/apps/wing/fixtures/invalid6/util.ts
new file mode 100644
index 00000000000..11dd2c2f1d5
--- /dev/null
+++ b/apps/wing/fixtures/invalid6/util.ts
@@ -0,0 +1,3 @@
+export function add(x: number, y: number): number {
+  return x + y;
+}
diff --git a/apps/wing/fixtures/valid1/lib.w b/apps/wing/fixtures/valid1/lib.w
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/apps/wing/fixtures/valid1/package.json b/apps/wing/fixtures/valid1/package.json
index f9ac31ccc0d..f5beb574ad2 100644
--- a/apps/wing/fixtures/valid1/package.json
+++ b/apps/wing/fixtures/valid1/package.json
@@ -6,5 +6,6 @@
   "license": "MIT",
   "files": [
     "**/*.ts"
-  ]
+  ],
+  "dependencies": {}
 }
diff --git a/apps/wing/logo/banner.gif b/apps/wing/logo/banner.gif
new file mode 100644
index 00000000000..8c5f0e8a173
Binary files /dev/null and b/apps/wing/logo/banner.gif differ
diff --git a/apps/wing/package.json b/apps/wing/package.json
index b6014011544..c253d0329a6 100644
--- a/apps/wing/package.json
+++ b/apps/wing/package.json
@@ -5,7 +5,8 @@
   "files": [
     "wingc.wasm",
     "bin/wing",
-    "dist/"
+    "dist/",
+    "project-templates/"
   ],
   "license": "MIT",
   "engines": {
@@ -33,6 +34,7 @@
   "dependencies": {
     "@npmcli/arborist": "^7.2.0",
     "@segment/analytics-node": "^1.1.0",
+    "@supercharge/promise-pool": "^3.2.0",
     "@wingconsole/app": "workspace:^",
     "@wingconsole/server": "workspace:^",
     "@winglang/compiler": "workspace:^",
@@ -45,6 +47,8 @@
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
     "glob": "^10.3.10",
+    "inquirer": "^8",
+    "lodash.once": "^4.1.1",
     "nanoid": "^3.3.6",
     "npm-packlist": "^8.0.0",
     "open": "^8.4.2",
@@ -56,7 +60,9 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.8",
-    "@types/node": "^18.17.13",
+    "@types/inquirer": "^9.0.7",
+    "@types/lodash.once": "^4.1.9",
+    "@types/node": "^20.11.0",
     "@types/node-persist": "^3.1.4",
     "@types/npm-packlist": "^7.0.1",
     "@types/npmcli__arborist": "^5.6.2",
@@ -66,15 +72,14 @@
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
     "bump-pack": "workspace:^",
-    "esbuild": "^0.17.19",
     "eslint": "^8.50.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "typescript": "^4.9.5",
-    "vitest": "^0.30.1"
+    "typescript": "^5.3.3",
+    "vitest": "^1.6.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/apps/wing/project-templates/typescript/empty/main.ts b/apps/wing/project-templates/typescript/empty/main.ts
new file mode 100644
index 00000000000..d049d1e6546
--- /dev/null
+++ b/apps/wing/project-templates/typescript/empty/main.ts
@@ -0,0 +1,19 @@
+import { cloud, inflight, lift, main } from "@wingcloud/framework";
+import assert from "node:assert";
+
+main((root, test) => {
+  const fn = new cloud.Function(
+    root,
+    "Function",
+    inflight(async () => {
+      return "hello, world";
+    })
+  );
+
+  test(
+    "fn returns hello",
+    lift({ fn }).inflight(async ({ fn }) => {
+      assert.equal(await fn.invoke(""), "hello, world");
+    })
+  );
+});
diff --git a/apps/wing/project-templates/typescript/empty/package.json b/apps/wing/project-templates/typescript/empty/package.json
new file mode 100644
index 00000000000..bd4235f9f6f
--- /dev/null
+++ b/apps/wing/project-templates/typescript/empty/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "my-wing-app",
+  "version": "0.0.0",
+  "description": "A description of my Wing application",
+  "author": "Your Name",
+  "license": "MIT",
+  "scripts": {
+    "dev": "wing run main.ts",
+    "compile": "wing compile main.ts",
+    "test": "wing test main.ts"
+  },
+  "dependencies": {
+    "@wingcloud/framework": "^#WING_VERSION#"
+  },
+  "devDependencies": {
+    "@types/node": "^20",
+    "winglang": "^#WING_VERSION#"
+  }
+}
diff --git a/apps/wing/project-templates/typescript/private-api/main.ts b/apps/wing/project-templates/typescript/private-api/main.ts
new file mode 100644
index 00000000000..638464a0c74
--- /dev/null
+++ b/apps/wing/project-templates/typescript/private-api/main.ts
@@ -0,0 +1,87 @@
+import { cloud, lift, main } from "@wingcloud/framework";
+
+/**
+ * The example below is a simple note-taking app.
+ * It uses a cloud.Bucket to store notes and a cloud.Api to expose a RESTful interface.
+ * 
+ * The api has two endpoints:
+ * - GET /note?name=NAME to get a note by name
+ * - PUT /note/:NAME to save a note by name
+ * 
+ * The app also includes two cloud.Functions to consume the api.
+ * - Consumer-PUT reads a string like: `NAME:NOTE` and calls the api to save it.
+ * - Consumer-GET reads a string like: `NAME` and calls the api to get the note.
+ * 
+ * These consumer functions are not required for the app to work, but since our api is private, they are useful for testing.
+ * As an example, if you deploy this app to AWS, you can use the AWS CLI to invoke these functions
+ * by running the following commands, you can test the api:
+ * `aws lambda invoke --cli-binary-format raw-in-base64-out --function-name <function-name> --payload "\"n1:this is my note\"" response.json`
+ * `cat response.json`
+ * 
+ * And retrieve the note:
+ * `aws lambda invoke --cli-binary-format raw-in-base64-out --function-name <function-name> --payload "\"n1\"" response.json`
+ * `cat response.json`
+ * 
+ * If you have not made changes to this template you can find your function names in AWS using the following command:
+ * `aws lambda list-functions --query "Functions[?starts_with(FunctionName, 'Consumer')].FunctionName"`
+ */
+main((root) => {
+  let noteBucket = new cloud.Bucket(root, "Bucket");
+
+  const api = new cloud.Api(root, "Api");
+
+  api.get('/note', lift({ noteBucket }).inflight(async ({ noteBucket }, request) => {
+    let noteName = request.query.name;
+    const note = await noteBucket.get(noteName);
+
+    return {
+      statusCode: 200,
+      body: note
+    }
+  }));
+
+  api.put('/note/:name', lift({ noteBucket }).inflight(async ({ noteBucket }, request) => {
+    let note = request.body;
+    let noteName = request.vars.name;
+
+    if (!note) {
+      return {
+        statusCode: 400,
+        body: "note is required"
+      }
+    }
+
+    await noteBucket.put(noteName, note ?? "");
+
+    return {
+      statusCode: 200,
+      body: `note: "${noteName}" saved!`
+    }
+  }));
+
+
+
+  // Consumer functions (not required for the app to work, but useful for testing)
+  new cloud.Function(root, "Consumer-PUT", lift({ url: api.url }).inflight(async ({ url }, event) => {
+    if (!event) {
+      return "event is required `NAME:NOTE`"
+    }
+    const [name, note] = event!.split(":");
+    const response = await fetch(`${url}/note/${name}`, {
+      method: 'PUT',
+      body: JSON.stringify(note)
+    });
+
+    return await response.text();
+  }))
+
+  new cloud.Function(root, "Consumer-GET", lift({ url: api.url }).inflight(async ({ url }, event) => {
+    if (!event) {
+      return "event is required `NAME`"
+    }
+
+    const response = await fetch(`${url}/note?name=${event}`);
+
+    return await response.text();
+  }));
+});
diff --git a/apps/wing/project-templates/typescript/private-api/package.json b/apps/wing/project-templates/typescript/private-api/package.json
new file mode 100644
index 00000000000..86c4ce0c173
--- /dev/null
+++ b/apps/wing/project-templates/typescript/private-api/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "my-wing-app",
+  "version": "0.0.0",
+  "description": "A description of my Wing application",
+  "author": "Your Name",
+  "license": "MIT",
+  "scripts": {
+    "compile": "wing compile main.ts",
+    "test": "wing test main.ts"
+  },
+  "dependencies": {
+    "@wingcloud/framework": "^#WING_VERSION#"
+  },
+  "devDependencies": {
+    "@types/node": "^20",
+    "winglang": "^#WING_VERSION#"
+  }
+}
diff --git a/apps/wing/project-templates/typescript/private-api/wing.toml b/apps/wing/project-templates/typescript/private-api/wing.toml
new file mode 100644
index 00000000000..f8d4693f8bb
--- /dev/null
+++ b/apps/wing/project-templates/typescript/private-api/wing.toml
@@ -0,0 +1,11 @@
+[ tf-aws ]
+# vpc can be set to "new" or "existing"
+vpc = "new"
+# vpc_lambda will ensure that lambda functions are created within the vpc on the private subnet
+vpc_lambda = true
+# vpc_api_gateway will ensure that the api gateway is created within the vpc on the private subnet
+vpc_api_gateway = true
+# The following parameters will be required if using "existing" vpc
+# vpc_id = "vpc-123xyz"
+# private_subnet_ids = ["subnet-123xyz"]
+# public_subnet_ids = ["subnet-123xyz"]
diff --git a/apps/wing/project-templates/wing/empty/main.w b/apps/wing/project-templates/wing/empty/main.w
new file mode 100644
index 00000000000..63380012bc4
--- /dev/null
+++ b/apps/wing/project-templates/wing/empty/main.w
@@ -0,0 +1,10 @@
+bring cloud;
+bring expect;
+
+let fn = new cloud.Function(inflight () => {
+  return "hello, world";
+});
+
+test "fn returns hello" {
+  expect.equal(fn.invoke(""), "hello, world");
+}
diff --git a/apps/wing/project-templates/wing/empty/package.json b/apps/wing/project-templates/wing/empty/package.json
new file mode 100644
index 00000000000..c1f3649f00b
--- /dev/null
+++ b/apps/wing/project-templates/wing/empty/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "my-wing-app",
+  "version": "0.0.0",
+  "description": "A description of my Wing application",
+  "author": "Your Name",
+  "license": "MIT",
+  "wing": true
+}
diff --git a/apps/wing/project-templates/wing/http-api/main.w b/apps/wing/project-templates/wing/http-api/main.w
new file mode 100644
index 00000000000..063f49dda41
--- /dev/null
+++ b/apps/wing/project-templates/wing/http-api/main.w
@@ -0,0 +1,27 @@
+bring cloud;
+bring http;
+
+let api = new cloud.Api();
+api.post("/greet/:name", inflight (req) => {
+  let name = req.vars.get("name");
+  let var message = "Hello, {name}!";
+  if let _ = req.query.tryGet("all-caps") {
+    message = message.uppercase();
+  }
+  return {
+    status: 200,
+    body: message,
+  };
+});
+
+test "POST /greet/:name" {
+  let res = http.post("{api.url}/greet/world", body: "Hello, world!");
+  assert(res.status == 200);
+  assert(res.body == "Hello, world!");
+}
+
+test "POST /greet/:name?all-caps" {
+  let res = http.post("{api.url}/greet/world?all-caps", body: "Hello, world!");
+  assert(res.status == 200);
+  assert(res.body == "HELLO, WORLD!");
+}
diff --git a/apps/wing/project-templates/wing/http-api/package.json b/apps/wing/project-templates/wing/http-api/package.json
new file mode 100644
index 00000000000..c1f3649f00b
--- /dev/null
+++ b/apps/wing/project-templates/wing/http-api/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "my-wing-app",
+  "version": "0.0.0",
+  "description": "A description of my Wing application",
+  "author": "Your Name",
+  "license": "MIT",
+  "wing": true
+}
diff --git a/apps/wing/project-templates/wing/private-api/main.w b/apps/wing/project-templates/wing/private-api/main.w
new file mode 100644
index 00000000000..e7ce55a43ed
--- /dev/null
+++ b/apps/wing/project-templates/wing/private-api/main.w
@@ -0,0 +1,131 @@
+bring cloud;
+bring http;
+bring util;
+
+/**
+ * The example below is a simple note-taking app.
+ * It uses a cloud.Bucket to store notes and a cloud.Api to expose a RESTful interface.
+ * 
+ * The api has two endpoints:
+ * - GET /note?name=NAME to get a note by name
+ * - PUT /note/:NAME to save a note by name
+ * 
+ * The app also includes two cloud.Functions to consume the api.
+ * - Consumer-PUT reads a string like: `NAME:NOTE` and calls the api to save it.
+ * - Consumer-GET reads a string like: `NAME` and calls the api to get the note.
+ * 
+ * These consumer functions are not required for the app to work, but since our api is private, they are useful for testing.
+ * As an example, if you deploy this app to AWS, you can use the AWS CLI to invoke these functions
+ * by running the following commands, you can test the api:
+ * `aws lambda invoke --cli-binary-format raw-in-base64-out --function-name <function-name> --payload "\"n1:this is my note\"" response.json`
+ * `cat response.json`
+ * 
+ * And retrieve the note:
+ * `aws lambda invoke --cli-binary-format raw-in-base64-out --function-name <function-name> --payload "\"n1\"" response.json`
+ * `cat response.json`
+ *
+ * If you have not made changes to this template you can find your function names in AWS using the following command:
+ * `aws lambda list-functions --query "Functions[?starts_with(FunctionName, 'Consumer')].FunctionName"`
+ */
+ class NoteService {
+  pub api: cloud.Api;
+  notes: cloud.Bucket;
+
+  new() {
+    this.notes = new cloud.Bucket() as "my-notes";
+    this.api = new cloud.Api() as "notes-api";
+
+
+    let notes = this.notes;
+
+    this.api.get("/note", inflight(request) => {
+      let noteName = request.query.get("name");
+      let note = notes.tryGet(noteName);
+
+      if let note = note {
+        return {
+          status: 200,
+          body: "{note}"
+        };
+      } else {
+        return {
+          status: 400,
+          body: "Unable to find note named: {noteName}"
+        };
+      }
+    });
+
+    this.api.post("/note/:name", inflight (request) => {
+      let note = request.body;
+      let noteName = request.vars.get("name");
+
+      if (note == "") {
+        return {
+          status: 400,
+          body: "note is required!"
+        };
+      }
+
+      if let note = note {
+        notes.put(noteName, note);
+        return {
+          status: 200,
+          body: "note: {noteName} saved!"
+        };
+      }
+    });
+
+    this.api.delete("/note/:name", inflight(request) => {
+      let noteName = request.vars.get("name");
+
+      if notes.tryDelete(noteName) {
+        return {
+          status: 200,
+          body: "note: {noteName} was deleted!"
+        };
+      }
+
+      return {
+        status: 404,
+        body: "Unable to find note named: {noteName}"
+      };
+    });
+  }
+}
+
+let noteService = new NoteService();
+
+// Consumer functions (not required for the app to work, but useful for testing)
+if util.env("WING_TARGET") == "tf-aws" {
+  new cloud.Function(inflight (event: str?) => {
+    if let event = event {
+      let parts = event.split(":");
+      let name = parts.at(0);
+      let note = parts.at(1);
+  
+      let response = http.post("{noteService.api.url}/note/{name}", {
+        body: "{note}"
+      });
+      return response.body;
+    }
+  
+    return "event is required `NAME:NOTE`";
+  }) as "Consumer-PUT";
+  
+  new cloud.Function(inflight (event: str?) => {
+    if let event = event {
+      let response = http.delete("{noteService.api.url}/note/{event}");
+      return response.body;
+    }
+  
+    return "event is required `NAME`";
+  }) as "Consumer-DELETE";
+  
+  new cloud.Function(inflight (event: str?) => {
+    if let event = event {
+      return http.get("{noteService.api.url}/note?name={event}").body;
+    }
+  
+    return "event is required `NAME`";
+  }) as "Consumer-GET";
+}
\ No newline at end of file
diff --git a/apps/wing/project-templates/wing/private-api/package.json b/apps/wing/project-templates/wing/private-api/package.json
new file mode 100644
index 00000000000..c1f3649f00b
--- /dev/null
+++ b/apps/wing/project-templates/wing/private-api/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "my-wing-app",
+  "version": "0.0.0",
+  "description": "A description of my Wing application",
+  "author": "Your Name",
+  "license": "MIT",
+  "wing": true
+}
diff --git a/apps/wing/project-templates/wing/private-api/wing.toml b/apps/wing/project-templates/wing/private-api/wing.toml
new file mode 100644
index 00000000000..f8d4693f8bb
--- /dev/null
+++ b/apps/wing/project-templates/wing/private-api/wing.toml
@@ -0,0 +1,11 @@
+[ tf-aws ]
+# vpc can be set to "new" or "existing"
+vpc = "new"
+# vpc_lambda will ensure that lambda functions are created within the vpc on the private subnet
+vpc_lambda = true
+# vpc_api_gateway will ensure that the api gateway is created within the vpc on the private subnet
+vpc_api_gateway = true
+# The following parameters will be required if using "existing" vpc
+# vpc_id = "vpc-123xyz"
+# private_subnet_ids = ["subnet-123xyz"]
+# public_subnet_ids = ["subnet-123xyz"]
diff --git a/apps/wing/project-templates/wing/react-vite/backend/broadcaster.w b/apps/wing/project-templates/wing/react-vite/backend/broadcaster.w
new file mode 100644
index 00000000000..794f1583d7b
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/backend/broadcaster.w
@@ -0,0 +1,37 @@
+bring cloud;
+bring websockets;
+bring ui;
+
+pub class Broadcaster {
+  pub url: str;
+  server: websockets.WebSocket;
+  clients: cloud.Bucket;
+
+  new() {
+    this.server = new websockets.WebSocket(name: "counter_updates") as "counter_updates";
+    this.url = this.server.url;
+    this.clients = new cloud.Bucket();
+    
+    // upon connection, add the client to the list
+    this.server.onConnect(inflight(id: str): void => {
+      this.clients.put(id, "");
+    });
+
+    // upon disconnect, remove the client from the list
+    this.server.onDisconnect(inflight(id: str): void => {
+      this.clients.delete(id);
+    });
+
+    // Custom resource display in Console UI
+    // hide the websockets server and cloud bucket resources from the Console UI
+    nodeof(this.server).hidden = true;
+    nodeof(this.clients).hidden = true;
+  }
+
+  // send a message to all clients
+  pub inflight broadcast(messgae: str) {
+    for id in this.clients.list() {
+      this.server.sendMessage(id, messgae);
+    }
+  }
+}
diff --git a/apps/wing/project-templates/wing/react-vite/backend/main.w b/apps/wing/project-templates/wing/react-vite/backend/main.w
new file mode 100644
index 00000000000..2a86fb86de4
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/backend/main.w
@@ -0,0 +1,47 @@
+bring cloud;
+bring expect;
+bring vite;
+bring http;
+bring "./broadcaster.w" as broadcaster;
+
+// Winglang doesn't have a built-in support for __dirname yet, so we use a workaround to get the current directory.
+// @see tracking issue: https://github.com/winglang/wing/issues/3736
+class Utils {
+  extern "utils.js" pub static __dirname(): str;
+}
+
+let myBroadcaster = new broadcaster.Broadcaster() as "Broadcaster";
+let api = new cloud.Api(cors: true);
+let counter = new cloud.Counter();
+
+let website = new vite.Vite(
+  root: "{Utils.__dirname()}/../frontend",
+  publicEnv: {
+    TITLE: "Wing + Vite + React",
+    API_URL: api.url,
+    WS_URL: myBroadcaster.url
+  }
+) as "Vite Website"; 
+
+api.get("/counter", inflight () => {
+  return {
+    body: "{counter.peek()}"
+  };
+});
+
+api.post("/counter", inflight () => {
+  let prev = counter.inc();
+  myBroadcaster.broadcast("refresh");
+  return {
+    body: "{prev + 1}"
+  };
+});
+
+test "api counter increment and get" {
+  log("counter initial value: {counter.peek()}");
+  assert(counter.peek() == 0);
+  http.post(api.url + "/counter");
+  let res = http.get(api.url + "/counter");
+  log("counter value after increment: {res.body}");
+  assert(res.body == "1");
+}
diff --git a/apps/wing/project-templates/wing/react-vite/backend/package.json b/apps/wing/project-templates/wing/react-vite/backend/package.json
new file mode 100644
index 00000000000..112ab7502b9
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/backend/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "my-wing-app",
+  "version": "0.0.0",
+  "description": "A description of my Wing application",
+  "author": "Your Name",
+  "license": "MIT",
+  "wing": true,
+  "dependencies": {
+    "@winglibs/vite": "^0.2.1"
+  }
+}
diff --git a/apps/wing/project-templates/wing/react-vite/backend/utils.js b/apps/wing/project-templates/wing/react-vite/backend/utils.js
new file mode 100644
index 00000000000..e89ea1e8cd3
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/backend/utils.js
@@ -0,0 +1 @@
+exports.__dirname = () => __dirname;
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/.eslintrc.cjs b/apps/wing/project-templates/wing/react-vite/frontend/.eslintrc.cjs
new file mode 100644
index 00000000000..d6c95379530
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/.eslintrc.cjs
@@ -0,0 +1,18 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+  },
+}
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/.gitignore b/apps/wing/project-templates/wing/react-vite/frontend/.gitignore
new file mode 100644
index 00000000000..a547bf36d8d
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/README.md b/apps/wing/project-templates/wing/react-vite/frontend/README.md
new file mode 100644
index 00000000000..0d6babeddbd
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/README.md
@@ -0,0 +1,30 @@
+# React + TypeScript + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
+
+- Configure the top-level `parserOptions` property like this:
+
+```js
+export default {
+  // other rules...
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    project: ['./tsconfig.json', './tsconfig.node.json'],
+    tsconfigRootDir: __dirname,
+  },
+}
+```
+
+- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
+- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/index.html b/apps/wing/project-templates/wing/react-vite/frontend/index.html
new file mode 100644
index 00000000000..e4b78eae123
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/package.json b/apps/wing/project-templates/wing/react-vite/frontend/package.json
new file mode 100644
index 00000000000..7ee69d28788
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "frontend",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-use-websocket": "^4.7.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.2.56",
+    "@types/react-dom": "^18.2.19",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
+    "@vitejs/plugin-react": "^4.2.1",
+    "eslint": "^8.56.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.5",
+    "typescript": "^5.2.2",
+    "vite": "^5.1.4"
+  }
+}
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/public/vite.svg b/apps/wing/project-templates/wing/react-vite/frontend/public/vite.svg
new file mode 100644
index 00000000000..e7b8dfb1b2a
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/App.css b/apps/wing/project-templates/wing/react-vite/frontend/src/App.css
new file mode 100644
index 00000000000..b9d355df2a5
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/src/App.css
@@ -0,0 +1,42 @@
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+@keyframes logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/App.tsx b/apps/wing/project-templates/wing/react-vite/frontend/src/App.tsx
new file mode 100644
index 00000000000..8d1132d6dcd
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/src/App.tsx
@@ -0,0 +1,59 @@
+import { useState, useEffect } from 'react'
+import reactLogo from './assets/react.svg'
+import viteLogo from '/vite.svg'
+import './App.css'
+import useWebSocket from 'react-use-websocket';
+
+const API_URL = window.wing.env.API_URL;
+const WS_URL = window.wing.env.WS_URL;
+
+function App() {
+  const [count, setCount] = useState("0");
+  const incrementCount = async () => {
+    const response = await fetch(`${API_URL}/counter`, {
+      method: "POST"
+    });
+    setCount(await response.text()); 
+  }
+  const updateCount = async () => {
+    const response = await fetch(`${API_URL}/counter`);
+    setCount(await response.text());
+  }
+
+  useWebSocket(WS_URL, {
+    onMessage: () => {
+      updateCount();
+    }
+  });
+
+  useEffect(() => {
+    updateCount();
+  }, []);
+
+  return (
+    <>
+      <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} className="logo" alt="Vite logo" />
+        </a>
+        <a href="https://react.dev" target="_blank">
+          <img src={reactLogo} className="logo react" alt="React logo"/>
+        </a>
+      </div>
+      <h1>{window.wing.env.TITLE}</h1>
+      <div className="card">
+        <button key={count} onClick={incrementCount}>
+          count is {count}
+        </button>
+        <p>
+          Edit <code>src/App.tsx</code> and save to test HMR
+        </p>
+      </div>
+      <p className="read-the-docs">
+        Click on the Vite and React logos to learn more
+      </p>
+    </>
+  )
+}
+
+export default App;
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/assets/react.svg b/apps/wing/project-templates/wing/react-vite/frontend/src/assets/react.svg
new file mode 100644
index 00000000000..6c87de9bb33
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/src/assets/react.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/index.css b/apps/wing/project-templates/wing/react-vite/frontend/src/index.css
new file mode 100644
index 00000000000..6119ad9a8fa
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/src/index.css
@@ -0,0 +1,68 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/main.tsx b/apps/wing/project-templates/wing/react-vite/frontend/src/main.tsx
new file mode 100644
index 00000000000..3d7150da80e
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/src/main.tsx
@@ -0,0 +1,10 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+import App from './App.tsx'
+import './index.css'
+
+ReactDOM.createRoot(document.getElementById('root')!).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+)
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/src/vite-env.d.ts b/apps/wing/project-templates/wing/react-vite/frontend/src/vite-env.d.ts
new file mode 100644
index 00000000000..11f02fe2a00
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.json b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.json
new file mode 100644
index 00000000000..a7fc6fbf23d
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.node.json b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.node.json
new file mode 100644
index 00000000000..97ede7ee6f2
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/tsconfig.node.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/apps/wing/project-templates/wing/react-vite/frontend/vite.config.ts b/apps/wing/project-templates/wing/react-vite/frontend/vite.config.ts
new file mode 100644
index 00000000000..5a33944a9b4
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/frontend/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+})
diff --git a/apps/wing/project-templates/wing/react-vite/package.json b/apps/wing/project-templates/wing/react-vite/package.json
new file mode 100644
index 00000000000..c3f0f57a50b
--- /dev/null
+++ b/apps/wing/project-templates/wing/react-vite/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "my-app",
+  "version": "0.0.0",
+  "description": "A description of my application",
+  "author": "Your Name",
+  "license": "MIT",
+  "scripts": {
+    "install:backend": "cd backend && npm install",
+    "install:frontend": "cd frontend && npm install",
+    "postinstall": "npm run install:backend && npm run install:frontend"
+  },
+  "dependencies": {
+    "@winglibs/websockets": "^0.3.2"
+  }
+}
diff --git a/apps/wing/project-templates/wing/slack/main.w b/apps/wing/project-templates/wing/slack/main.w
new file mode 100644
index 00000000000..1e7b20825fb
--- /dev/null
+++ b/apps/wing/project-templates/wing/slack/main.w
@@ -0,0 +1,43 @@
+bring cloud;
+bring slack;
+
+/**
+ * In this example, we will create a slack application that gives us updates about
+ * a inbox bucket, sending slack messages when a new file is added. Additionally, the 
+ * app will allow us to mention it with the text "list inbox" to get a list of all the
+ * files in the inbox bucket.
+ */
+ 
+/// Since the slack bot will require a token as a secret please be sure 
+/// to run `wing secrets` before trying this out. For help understanding how to create
+/// a slack bot token see: https://github.com/winglang/winglibs/blob/main/slack/README.md
+let botToken = new cloud.Secret(name: "slack-bot-token");
+let slackBot = new slack.App(token: botToken);
+let inbox = new cloud.Bucket() as "file-process-inbox";
+
+/// When a file is created this event will post an update to slack (be sure to change it to a real slack channel name)
+inbox.onCreate(inflight (key) => {
+  let channel = slackBot.channel("INBOX_PROCESSING_CHANNEL");
+  channel.post("New file: {key} was just uploaded to inbox!");
+});
+
+
+/// When our slack bot is mentioned, this event handler checks for "list inbox" in the 
+/// events text, and then responds with a list of all files in the inbox
+slackBot.onEvent("app_mention", inflight(ctx, event) => {
+  let eventText = event["event"]["text"].asStr();
+  log(eventText);
+  if eventText.contains("list inbox") {
+    let files = inbox.list();
+    let message = new slack.Message();
+    message.addSection({
+      fields: [
+        {
+          type: slack.FieldType.mrkdwn,
+          text: "*Current Inbox:*\n-{files.join("\n-")}"
+        }
+      ]
+    });
+    ctx.channel.postMessage(message);
+  }
+});
\ No newline at end of file
diff --git a/apps/wing/project-templates/wing/slack/package.json b/apps/wing/project-templates/wing/slack/package.json
new file mode 100644
index 00000000000..84f1e1002ae
--- /dev/null
+++ b/apps/wing/project-templates/wing/slack/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "my-slack-app",
+  "version": "0.0.0",
+  "description": "A simple Slack app",
+  "author": "Your Name",
+  "license": "MIT",
+  "dependencies": {
+    "@winglibs/slack": "0.1.1"
+  }
+}
\ No newline at end of file
diff --git a/apps/wing/src/analytics/collectors/cli-collector.ts b/apps/wing/src/analytics/collectors/cli-collector.ts
index c1090252c72..624416d071b 100644
--- a/apps/wing/src/analytics/collectors/cli-collector.ts
+++ b/apps/wing/src/analytics/collectors/cli-collector.ts
@@ -3,12 +3,13 @@ import { determineTargetFromPlatforms } from "@winglang/compiler";
 import { Command } from "commander";
 import { Collector } from "./collector";
 import { PACKAGE_VERSION } from "../../cli";
+import { flattenObject } from "../../util";
 
 export interface CLIData {
   platform: string;
   target: string;
   version: string;
-  options: string;
+  options?: Record<string, string>;
   entrypoint?: string;
   wing_sdk_version?: string;
   wing_console_version?: string;
@@ -28,10 +29,10 @@ export class CLICollector extends Collector {
     return {
       platform: platform.map((p: string) => basename(p)).join(","), // only report the platform name, not the full path
       target: determineTargetFromPlatforms(platform),
-      options: `${JSON.stringify(this.cmd.opts())}`,
       version: PACKAGE_VERSION,
       wing_sdk_version: this.tryGetModuleVersion("@winglang/sdk/package.json"),
       wing_console_version: this.tryGetModuleVersion(`@wingconsole/app/package.json`),
+      ...flattenObject({ options: this.cmd.opts() }),
     };
   }
 
diff --git a/apps/wing/src/analytics/disclaimer.ts b/apps/wing/src/analytics/disclaimer.ts
index aafaf081e05..6f69fc1166a 100644
--- a/apps/wing/src/analytics/disclaimer.ts
+++ b/apps/wing/src/analytics/disclaimer.ts
@@ -13,7 +13,7 @@ chance you'll encounter missing pieces, rough edges, performance issues and even
 god forbid, bugs 🐞.
 
 Please don't hesitate to ping us at ${chalk.blueBright.bold.underline(
-  "https://t.winglang.io/slack"
+  "https://t.winglang.io/discord"
 )} or file an issue at
 ${chalk.blueBright.bold.underline(
   "https://github.com/winglang/wing"
diff --git a/apps/wing/src/analytics/storage.test.ts b/apps/wing/src/analytics/storage.test.ts
index e9dee64e9d0..28a2fc58f0c 100644
--- a/apps/wing/src/analytics/storage.test.ts
+++ b/apps/wing/src/analytics/storage.test.ts
@@ -11,7 +11,7 @@ describe("storage tests", () => {
     properties: {
       cli: {
         platform: ["xbox", "ps5"].join(","),
-        options: '{"-t": "fake-aws"}',
+        options: { "-t": "fake-aws" },
         target: "fake-aws",
         version: "4.2.0",
         wing_console_version: "1.2.3",
@@ -63,7 +63,7 @@ describe("storage tests", () => {
             cli_target: "fake-aws",
             cli_platform: "xbox,ps5",
             cli_version: "4.2.0",
-            cli_options: '{"-t": "fake-aws"}',
+            "cli_options_-t": "fake-aws",
             cli_wing_console_version: "1.2.3",
             cli_wing_sdk_version: "4.5.6",
             os_arch: "x64",
diff --git a/apps/wing/src/cli.ts b/apps/wing/src/cli.ts
index 0a17169a690..8299300d180 100644
--- a/apps/wing/src/cli.ts
+++ b/apps/wing/src/cli.ts
@@ -1,10 +1,10 @@
-import { Command, Option } from "commander";
+import { Argument, Command, Option } from "commander";
 import { satisfies } from "compare-versions";
 
 import { optionallyDisplayDisclaimer } from "./analytics/disclaimer";
 import { exportAnalytics } from "./analytics/export";
-import { loadEnvVariables } from "./env";
-import { currentPackage } from "./util";
+import { SNAPSHOTS_HELP } from "./commands/test/snapshots-help";
+import { currentPackage, projectTemplateNames, DEFAULT_PARALLEL_SIZE } from "./util";
 
 export const PACKAGE_VERSION = currentPackage.version;
 if (PACKAGE_VERSION == "0.0.0" && !process.env.DEBUG) {
@@ -17,24 +17,21 @@ if (!SUPPORTED_NODE_VERSION) {
 }
 
 const DEFAULT_PLATFORM = ["sim"];
-let analyticsExportFile: Promise<string | undefined>;
 
-function runSubCommand(subCommand: string, path: string = subCommand) {
-  loadEnvVariables({
-    mode: subCommand,
-  });
+let analyticsExportFile: Promise<string | undefined> | undefined;
 
+function runSubCommand(subCommand: string, path: string = subCommand) {
   return async (...args: any[]) => {
     try {
       // paths other than the root path aren't working unless specified in the path arg
       const exitCode = await import(`./commands/${path}`).then((m) => m[subCommand](...args));
       if (exitCode === 1) {
         await exportAnalyticsHook();
-        process.exit(1);
+        process.exitCode = 1;
       }
     } catch (err) {
       console.error((err as any)?.message ?? err);
-      process.exit(1);
+      process.exitCode = 1;
     }
   };
 }
@@ -147,6 +144,16 @@ async function main() {
     .argument("[entrypoint]", "program .w entrypoint")
     .option("-p, --port <port>", "specify port")
     .option("--no-open", "Do not open the Wing Console in the browser")
+    .option(
+      "-w, --watch <globs...>",
+      "Watch additional paths for changes. Supports globs and '!' for negations."
+    )
+    .option(
+      "-t, --platform <platform> --platform <platform>",
+      "Target platform provider (builtin: sim)",
+      collectPlatformVariadic,
+      DEFAULT_PLATFORM
+    )
     .hook("preAction", collectAnalyticsHook)
     .action(runSubCommand("run"));
 
@@ -167,12 +174,33 @@ async function main() {
       DEFAULT_PLATFORM
     )
     .option("-r, --rootId <rootId>", "App root id")
+    .option(
+      "-o, --output <output>",
+      'path to the output directory- default is "./target/<entrypoint>.<target>"'
+    )
     .option("-v, --value <value>", "Platform-specific value in the form KEY=VALUE", addValue, [])
-    .option("--values <file>", "Yaml file with Platform-specific values")
+    .option("--values <file>", "File with platform-specific values (TOML|YAML|JSON)")
     .hook("preAction", progressHook)
     .hook("preAction", collectAnalyticsHook)
     .action(runSubCommand("compile"));
 
+  program
+    .command("secrets")
+    .description("Manage secrets")
+    .argument("[entrypoint]", "program .w entrypoint")
+    .option(
+      "-t, --platform <platform> --platform <platform>",
+      "Target platform provider (builtin: sim, tf-aws, tf-azure, tf-gcp, awscdk)",
+      collectPlatformVariadic,
+      DEFAULT_PLATFORM
+    )
+    .option("-v, --value <value>", "Platform-specific value in the form KEY=VALUE", addValue, [])
+    .option("--values <file>", "File with platform-specific values (TOML|YAML|JSON)")
+    .addOption(new Option("--list", "List required application secrets"))
+    .hook("preAction", progressHook)
+    .hook("preAction", collectAnalyticsHook)
+    .action(runSubCommand("secrets"));
+
   program
     .command("test")
     .description(
@@ -185,12 +213,19 @@ async function main() {
       collectPlatformVariadic,
       DEFAULT_PLATFORM
     )
+    .addOption(
+      new Option("-s, --snapshots <mode>", "Capture snapshots of compiler output")
+        .choices(["auto", "never", "update", "deploy", "assert"])
+        .default("auto")
+    )
+    .addHelpText("afterAll", SNAPSHOTS_HELP)
     .option("-r, --rootId <rootId>", "App root id")
     .option(
       "-f, --test-filter <regex>",
       "Run tests that match the provided regex pattern within the selected entrypoint files"
     )
     .option("--no-clean", "Keep build output")
+    .option("--no-stream", "Do not stream logs")
     .option(
       "-o, --output-file <outputFile>",
       "File name to write test results to (file extension is required, supports only .json at the moment)"
@@ -200,6 +235,14 @@ async function main() {
         .preset(3)
         .argParser(parseInt)
     )
+    .addOption(
+      new Option(
+        "-p, --parallel [batch]",
+        `Number of tests to be executed on parallel- if not specified- ${DEFAULT_PARALLEL_SIZE} will run on parallel, 0 to run all at once`
+      )
+        .preset(DEFAULT_PARALLEL_SIZE)
+        .argParser(parseInt)
+    )
     .hook("preAction", progressHook)
     .hook("preAction", collectAnalyticsHook)
     .action(runSubCommand("test", "test/test"));
@@ -211,6 +254,21 @@ async function main() {
     .hook("preAction", collectAnalyticsHook)
     .action(runSubCommand("pack"));
 
+  program
+    .command("new")
+    .description("Create a new Wing project")
+    .addArgument(
+      new Argument("<template>", "Template name").choices(projectTemplateNames()).argOptional()
+    )
+    .addOption(
+      new Option("-l --language [language]", "Language")
+        .choices(["wing", "typescript"])
+        .argParser((value) => value ?? "wing")
+    )
+    .addOption(new Option("--list-templates", "List available templates"))
+    .hook("postAction", collectAnalyticsHook) // to catch the options that are added later
+    .action(runSubCommand("init"));
+
   program
     .command("docs")
     .description("Open the Wing documentation")
@@ -234,5 +292,5 @@ function checkNodeVersion() {
 
 main().catch((err) => {
   console.error(err);
-  process.exit(1);
+  process.exitCode = 1;
 });
diff --git a/apps/wing/src/commands/compile.test.ts b/apps/wing/src/commands/compile.test.ts
index d4d7168a260..5a6c460835b 100644
--- a/apps/wing/src/commands/compile.test.ts
+++ b/apps/wing/src/commands/compile.test.ts
@@ -1,36 +1,46 @@
-import { writeFileSync } from "fs";
 import { readdir, stat, writeFile, mkdtemp } from "fs/promises";
 import { tmpdir } from "os";
 import { join, resolve } from "path";
 import { BuiltinPlatform } from "@winglang/compiler";
 import { describe, test, expect } from "vitest";
 import { compile } from "./compile";
-import { generateTmpDir } from "../util";
 
 const exampleDir = resolve("../../examples/tests/valid");
+const exampleErrorDir = resolve("../../examples/tests/error");
 const exampleSmallDir = resolve("../../examples/tests/valid/subdir2");
 const exampleFilePath = join(exampleDir, "captures.test.w");
 
+function rndTargetDir() {
+  return `./target/wingtest-${Math.random().toString(36).substring(7)}`;
+}
+
 describe(
   "compile command tests",
   () => {
     test("should be able to compile the SDK capture test to sim", async () => {
       const outDir = await compile(exampleFilePath, {
         platform: [BuiltinPlatform.SIM],
-        targetDir: `${await generateTmpDir()}/target`,
+        targetDir: rndTargetDir(),
       });
 
       const stats = await stat(outDir);
       expect(stats.isDirectory()).toBeTruthy();
       const files = (await readdir(outDir)).sort();
       expect(files.length).toBeGreaterThan(0);
-      expect(files).toEqual([".wing", "connections.json", "simulator.json", "tree.json"]);
+      expect(files).toMatchInlineSnapshot(`
+        [
+          ".wing",
+          "connections.json",
+          "simulator.json",
+          "tree.json",
+        ]
+      `);
     });
 
     test("should be able to compile the SDK capture test to tf-aws", async () => {
       const artifactDir = await compile(exampleFilePath, {
         platform: [BuiltinPlatform.TF_AWS],
-        targetDir: `${await generateTmpDir()}/target`,
+        targetDir: rndTargetDir(),
       });
       const expectedFiles = ["main.tf.json", "tree.json", "connections.json"];
 
@@ -44,14 +54,21 @@ describe(
     test("should be able to compile to default target sim", async () => {
       const outDir = await compile(exampleFilePath, {
         platform: [BuiltinPlatform.SIM],
-        targetDir: `${await generateTmpDir()}/target`,
+        targetDir: rndTargetDir(),
       });
 
       const stats = await stat(outDir);
       expect(stats.isDirectory()).toBeTruthy();
       const files = (await readdir(outDir)).sort();
       expect(files.length).toBeGreaterThan(0);
-      expect(files).toEqual([".wing", "connections.json", "simulator.json", "tree.json"]);
+      expect(files).toMatchInlineSnapshot(`
+        [
+          ".wing",
+          "connections.json",
+          "simulator.json",
+          "tree.json",
+        ]
+      `);
     });
 
     test("should be able to compile the only entrypoint file in current directory", async () => {
@@ -60,7 +77,7 @@ describe(
 
       try {
         process.chdir(outDir);
-        writeFileSync("main.w", "bring cloud;");
+        await writeFile("main.w", "bring cloud;");
         await compile();
 
         const stats = await stat(outDir);
@@ -79,10 +96,27 @@ describe(
       ).rejects.toThrowError(/Source file cannot be found/);
     });
 
+    test("should create verbose stacktrace with DEBUG env set", async () => {
+      const exampleErrorFile = join(exampleErrorDir, "bool_from_json.test.w");
+
+      await expect(
+        compile(exampleErrorFile, { platform: [BuiltinPlatform.SIM] })
+      ).rejects.not.toThrowError(/wingsdk/);
+
+      const prevDebug = process.env.DEBUG;
+      process.env.DEBUG = "true";
+
+      await expect(
+        compile(exampleErrorFile, { platform: [BuiltinPlatform.SIM] })
+      ).rejects.toThrowError(/wingsdk/);
+
+      process.env.DEBUG = prevDebug;
+    });
+
     test("should be able to compile a directory", async () => {
       const artifactDir = await compile(exampleSmallDir, {
         platform: [BuiltinPlatform.SIM],
-        targetDir: `${await generateTmpDir()}/target`,
+        targetDir: rndTargetDir(),
       });
 
       const stats = await stat(artifactDir);
@@ -92,7 +126,7 @@ describe(
     test("should be able to compile a directory to tf-aws", async () => {
       const artifactDir = await compile(exampleSmallDir, {
         platform: [BuiltinPlatform.TF_AWS],
-        targetDir: `${await generateTmpDir()}/target`,
+        targetDir: rndTargetDir(),
       });
 
       const stats = await stat(artifactDir);
@@ -109,21 +143,28 @@ describe(
         // because we changed to the example directory, we can just pass the filename
         const outDir = await compile("extern_implementation.test.w", {
           platform: [BuiltinPlatform.SIM],
-          targetDir: `${await generateTmpDir()}/target`,
+          targetDir: rndTargetDir(),
         });
 
         const stats = await stat(outDir);
         expect(stats.isDirectory()).toBeTruthy();
         const files = (await readdir(outDir)).sort();
         expect(files.length).toBeGreaterThan(0);
-        expect(files).toEqual([".wing", "connections.json", "simulator.json", "tree.json"]);
+        expect(files).toMatchInlineSnapshot(`
+          [
+            ".wing",
+            "connections.json",
+            "simulator.json",
+            "tree.json",
+          ]
+        `);
       } finally {
         process.chdir(oldCwd);
       }
     });
 
     test("should not delete files in the output directory if they are not generated by the compiler", async () => {
-      const targetDir = `${await generateTmpDir()}/target`;
+      const targetDir = rndTargetDir();
       const artifactDir = await compile(exampleFilePath, {
         platform: [BuiltinPlatform.TF_AWS],
         targetDir,
diff --git a/apps/wing/src/commands/compile.ts b/apps/wing/src/commands/compile.ts
index 6321346459f..92af631eb24 100644
--- a/apps/wing/src/commands/compile.ts
+++ b/apps/wing/src/commands/compile.ts
@@ -1,5 +1,5 @@
 import { promises as fsPromise } from "fs";
-import { relative, resolve } from "path";
+import { dirname, relative, resolve } from "path";
 
 import * as wingCompiler from "@winglang/compiler";
 import { prettyPrintError } from "@winglang/sdk/lib/util/enhanced-error";
@@ -7,6 +7,7 @@ import chalk from "chalk";
 import { CHARS_ASCII, emitDiagnostic, File, Label } from "codespan-wasm";
 import debug from "debug";
 import { glob } from "glob";
+import { loadEnvVariables } from "../env";
 
 // increase the stack trace limit to 50, useful for debugging Rust panics
 // (not setting the limit too high in case of infinite recursion)
@@ -35,7 +36,7 @@ export interface CompileOptions {
    */
   readonly value?: string;
   /**
-   * Path to the YAML file with specific platform values
+   * Path to the file with specific platform values (TOML|YAML|JSON)
    *
    * example of the file's content:
    * root/Default/Domain:
@@ -48,6 +49,11 @@ export interface CompileOptions {
    * @default "./target"
    */
   readonly targetDir?: string;
+  /**
+   * The overrides the location to save the compilation output
+   * @default "./target/<entrypoint>.<target>"
+   */
+  readonly output?: string;
   /**
    * Whether to run the compiler in `wing test` mode. This may create multiple
    * copies of the application resources in order to run tests in parallel.
@@ -63,10 +69,10 @@ export interface CompileOptions {
  */
 export async function compile(entrypoint?: string, options?: CompileOptions): Promise<string> {
   if (!entrypoint) {
-    const wingFiles = (await glob("{main,*.main}.w")).sort();
+    const wingFiles = (await glob("{main,*.main}.{w,ts}")).sort();
     if (wingFiles.length === 0) {
       throw new Error(
-        "Cannot find entrypoint files (main.w or *.main.w) in the current directory."
+        "Cannot find an entrypoint file (main.w, main.ts, *.main.w, *.main.ts) in the current directory."
       );
     }
     if (wingFiles.length > 1) {
@@ -78,7 +84,7 @@ export async function compile(entrypoint?: string, options?: CompileOptions): Pr
     }
     entrypoint = wingFiles[0];
   }
-
+  loadEnvVariables({ cwd: resolve(dirname(entrypoint)) });
   const coloring = chalk.supportsColor ? chalk.supportsColor.hasBasic : false;
   try {
     return await wingCompiler.compile(entrypoint, {
@@ -103,31 +109,27 @@ export async function compile(entrypoint?: string, options?: CompileOptions): Pr
         if (span?.file_id) {
           // `span` should only be null if source file couldn't be read etc.
           const source = await fsPromise.readFile(span.file_id, "utf8");
-          const start = byteOffsetFromLineAndColumn(source, span.start.line, span.start.col);
-          const end = byteOffsetFromLineAndColumn(source, span.end.line, span.end.col);
+          const start = span.start_offset;
+          const end = span.end_offset;
           const filePath = relative(cwd, span.file_id);
           files.push({ name: filePath, source });
           labels.push({
             fileId: filePath,
             rangeStart: start,
             rangeEnd: end,
-            message,
+            message: "",
             style: "primary",
           });
         }
 
         for (const annotation of annotations) {
+          // file_id might be "" if the span is synthetic (see #2521)
+          if (!annotation.span?.file_id) {
+            continue;
+          }
           const source = await fsPromise.readFile(annotation.span.file_id, "utf8");
-          const start = byteOffsetFromLineAndColumn(
-            source,
-            annotation.span.start.line,
-            annotation.span.start.col
-          );
-          const end = byteOffsetFromLineAndColumn(
-            source,
-            annotation.span.end.line,
-            annotation.span.end.col
-          );
+          const start = annotation.span.start_offset;
+          const end = annotation.span.end_offset;
           const filePath = relative(cwd, annotation.span.file_id);
           files.push({ name: filePath, source });
           labels.push({
@@ -164,7 +166,7 @@ export async function compile(entrypoint?: string, options?: CompileOptions): Pr
       if (process.env.DEBUG) {
         output +=
           "\n--------------------------------- ORIGINAL STACK TRACE ---------------------------------\n" +
-          (error.stack ?? "(no stacktrace available)");
+          (error.causedBy.stack ?? "(no stacktrace available)");
       }
 
       error.causedBy.message = output;
@@ -175,16 +177,3 @@ export async function compile(entrypoint?: string, options?: CompileOptions): Pr
     }
   }
 }
-
-function byteOffsetFromLineAndColumn(source: string, line: number, column: number) {
-  const lines = source.split("\n");
-  let offset = 0;
-  for (let i = 0; i < line; i++) {
-    offset += lines[i].length + 1;
-  }
-
-  // Convert char offset to byte offset
-  const encoder = new TextEncoder();
-  const srouce_bytes = encoder.encode(source.substring(0, offset));
-  return srouce_bytes.length + column;
-}
diff --git a/apps/wing/src/commands/init.test.ts b/apps/wing/src/commands/init.test.ts
new file mode 100644
index 00000000000..9417bca8420
--- /dev/null
+++ b/apps/wing/src/commands/init.test.ts
@@ -0,0 +1,149 @@
+import { readdir, writeFile } from "fs/promises";
+import { join } from "path";
+import inquirer from "inquirer";
+import { describe, expect, test, vitest, beforeEach, afterEach, vi } from "vitest";
+import { test as cliTest } from "./test/test";
+import { init } from "../commands/init";
+import { generateTmpDir, projectTemplateNames } from "../util";
+
+vitest.mock("inquirer");
+
+const templates = projectTemplateNames();
+
+describe.each(templates)("new %s --language=wing", (template) => {
+  let log: any;
+  beforeEach(() => {
+    log = console.log;
+    console.log = vi.fn();
+  });
+
+  afterEach(() => {
+    console.log = log;
+  });
+
+  test(`wing new ${template} && wing test main.w`, async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    await init(template, { language: "wing" });
+
+    await cliTest(["main.w"], {
+      platform: ["sim"],
+      clean: false,
+    });
+  });
+});
+
+describe("new --list-templates", () => {
+  let log: any;
+  beforeEach(() => {
+    log = console.log;
+    console.log = vi.fn();
+  });
+
+  afterEach(() => {
+    console.log = log;
+  });
+
+  test("does not contain duplicate template names", async () => {
+    await init("", { listTemplates: true });
+    expect(console.log).toHaveBeenCalledWith(templates.join("\n"));
+
+    const outputLines = (console.log as any).mock.calls[0][0].split("\n");
+    const outputLinesAsSet = new Set(outputLines);
+
+    expect(outputLines.length).toBeGreaterThan(0);
+    // Check there are no duplicate lines
+    expect(outputLinesAsSet.size).toBe(outputLines.length);
+  });
+});
+
+describe("new empty --language=ts", () => {
+  let log: any;
+  beforeEach(() => {
+    log = console.log;
+    console.log = vi.fn();
+  });
+
+  afterEach(() => {
+    console.log = log;
+  });
+
+  test(`wing new empty --language ts && wing test main.w`, async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    await init("empty", { language: "typescript" });
+
+    await cliTest(["main.ts"], {
+      platform: ["sim"],
+      clean: false,
+    });
+  });
+});
+
+describe("new", () => {
+  let log: any;
+  beforeEach(() => {
+    log = console.log;
+    console.log = vi.fn();
+  });
+
+  afterEach(() => {
+    console.log = log;
+  });
+
+  test("wing new invalid-template", async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    await expect(init("invalid-template")).rejects.toThrow(
+      /Template "invalid-template" is not available/
+    );
+  });
+
+  // test an invalid language
+  test("wing new http-api --language=python", async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    await expect(init("http-api", { language: "python" })).rejects.toThrow(/Unknown language/);
+  });
+
+  // test an unavailable language
+  test("wing new http-api --language=typescript", async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    await expect(init("http-api", { language: "typescript" })).rejects.toThrow(
+      /Template "http-api" is not available in typescript/
+    );
+  });
+
+  test("wing new with conflicting file", async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    // write a conflicting file
+    await writeFile(join(workdir, "main.w"), "hello");
+
+    await expect(init("http-api", { language: "wing" })).rejects.toThrow(
+      /The following files already exist in the current directory and will be overwritten/
+    );
+  });
+
+  test("wing new with interactive prompt", async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    (inquirer.prompt as any) = vitest.fn().mockResolvedValue({
+      template: "http-api",
+      language: "wing",
+    });
+
+    await init(undefined as any);
+
+    const files = await readdir(workdir);
+    expect(files).toEqual(["main.w", "package-lock.json", "package.json"]);
+  });
+});
diff --git a/apps/wing/src/commands/init.ts b/apps/wing/src/commands/init.ts
new file mode 100644
index 00000000000..1d2d212a928
--- /dev/null
+++ b/apps/wing/src/commands/init.ts
@@ -0,0 +1,227 @@
+// This file and the main function are named "init" instead of "new"
+// to avoid a conflict with the "new" keyword in JavaScript
+import { exec } from "child_process";
+import { existsSync, constants } from "fs";
+import { cp, mkdir, readFile, readdir, writeFile } from "fs/promises";
+import { join, relative } from "path";
+import { promisify } from "util";
+import chalk from "chalk";
+import inquirer from "inquirer";
+import { exists } from "./pack";
+import { projectTemplateNames, PROJECT_TEMPLATES_DIR, currentPackage } from "../util";
+
+const execPromise = promisify(exec);
+
+/**
+ * Options for the `new` command.
+ * This is passed from Commander to the `init` function.
+ */
+export interface InitOptions {
+  template?: string;
+  language?: string;
+  readonly listTemplates?: boolean;
+}
+
+/**
+ * Compiles a Wing program. Throws an error if compilation fails.
+ * @param entrypoint The program .w entrypoint.
+ * @param options Compile options.
+ * @returns the output directory
+ */
+export async function init(template: string, options: InitOptions = {}): Promise<void> {
+  const templates = projectTemplateNames();
+  let language = options.language ?? "wing";
+
+  // If --list-templates is specified, list the available templates and exit
+  if (options.listTemplates) {
+    console.log(templates.join("\n"));
+    return;
+  }
+
+  // If no template is specified, let them interactively select one
+  if (!template) {
+    console.log("Usage: wing new <template> [--language <language>]");
+    console.log();
+    try {
+      const responses = await inquirer.prompt([
+        {
+          type: "list",
+          name: "template",
+          message: "Please select a template:",
+          choices: templates,
+        },
+        {
+          type: "list",
+          name: "language",
+          message: "Please select a language:",
+          choices: ["wing", "typescript"],
+        },
+      ]);
+      template = responses.template;
+      language = responses.language;
+      console.log();
+    } catch (err) {
+      if ((err as any).isTtyError) {
+        throw new Error(
+          `Please select from one of the available choices:\n  ${templates.join(
+            "\n  "
+          )}\n\nHave an idea for a new template? Let us know at https://github.com/winglang/wing/issues/!`
+        );
+      }
+    }
+  }
+
+  if (!templates.includes(template)) {
+    throw new Error(
+      `Template "${template}" is not available. Please select from one of the available choices:\n  ${templates.join(
+        "\n  "
+      )}\n\nHave an idea for a new template? Let us know at https://github.com/winglang/wing/issues/!`
+    );
+  }
+
+  // Parse the language selected
+  switch (language) {
+    case "ts":
+    case "typescript":
+      language = "typescript";
+      break;
+    case "wing":
+    case "winglang":
+      language = "wing";
+      break;
+    default:
+      throw new Error(
+        `Unknown language: "${language}". Please select from "wing" or "typescript".`
+      );
+  }
+  // Since this object is used by our analytics collector
+  options.language = language;
+  options.template = template;
+  // Check if the template exists for the selected language
+  const templatePath = join(PROJECT_TEMPLATES_DIR, language, template);
+  const templateExists = await exists(templatePath, constants.R_OK);
+  if (!templateExists) {
+    throw new Error(
+      `Template "${template}" is not available in ${language}. Please let us know you'd like to use this template in ${language} by opening an issue at https://github.com/winglang/wing/issues/!`
+    );
+  }
+
+  // Obtain a list of files in the template, and check they won't overwrite anything
+  const files = await getFiles(templatePath);
+  const existingFiles = await getFiles(process.cwd());
+  const overwrite = existingFiles.filter((file) => files.includes(file));
+  if (overwrite.length > 0) {
+    throw new Error(
+      `The following files already exist in the current directory and will be overwritten:\n  ${overwrite.join(
+        "\n  "
+      )}\n\nPlease move or delete these files and try again.`
+    );
+  }
+
+  // Copy the template
+  await copyFiles(templatePath, process.cwd());
+
+  // Replace wing version
+  const packageJsonPath = join(process.cwd(), "package.json");
+  if (existsSync(packageJsonPath)) {
+    const packageJson = JSON.parse(await readFile(packageJsonPath, "utf8"));
+    const isDevVersion = currentPackage.version.startsWith("0.0.0");
+
+    const depKeys = ["dependencies", "devDependencies", "peerDependencies"];
+    for (const depKey of depKeys) {
+      const depMap = packageJson[depKey] ?? {};
+      for (const [key, val] of Object.entries(depMap)) {
+        if ((val as string).includes("#WING_VERSION#")) {
+          if (isDevVersion) {
+            if (key === "winglang") {
+              depMap[key] = `file:${join(__dirname, "..", "..")}`;
+            } else {
+              depMap[key] = `file:${join(__dirname, "..", "..", "..", "..", "libs", key)}`;
+            }
+          } else {
+            depMap[key] = depMap[key].replace("#WING_VERSION#", currentPackage.version);
+          }
+        }
+      }
+    }
+
+    await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+  }
+
+  // Run npm install
+  console.log("Installing dependencies...");
+  console.log();
+
+  // Check if npm is installed
+  const npmExists = await execPromise("npm --version")
+    .then(() => true)
+    .catch(() => false);
+  if (!npmExists) {
+    console.log(
+      `${chalk.yellow(
+        "warning:"
+      )} npm is not installed. Please install npm and run "npm install" to finish setting up any project dependencies.`
+    );
+  }
+
+  // Install dependencies (in the current directory)
+  try {
+    await execPromise("npm install");
+  } catch (err) {
+    console.log(
+      `${chalk.yellow(
+        "warning:"
+      )} npm install failed. Please let us know there's an issue with this template by opening an issue at at https://github.com/winglang/wing/issues/.`
+    );
+    console.log();
+    console.error((err as any).stderr);
+  }
+
+  console.log(`Created a new ${chalk.cyan(template)} project in the current directory! 🎉`);
+  console.log();
+  console.log("Not sure where to get started? In your Wing application folder, try running:");
+  console.log();
+  console.log("  wing compile - build your project");
+  console.log("  wing it - simulate your app in the Wing Console");
+  console.log("  wing test - run all tests");
+  console.log();
+  console.log("Visit the docs for examples and tutorials: https://winglang.io/docs");
+}
+
+/**
+ * Recursively copies a directory.
+ * @param src The source directory.
+ * @param dest The destination directory.
+ */
+async function copyFiles(src: string, dest: string): Promise<void> {
+  // Create the destination directory if it doesn't exist
+  if (!existsSync(dest)) {
+    await mkdir(dest);
+  }
+
+  // Copy all files
+  const files = await getFiles(src);
+  for (const file of files) {
+    await cp(join(src, file), join(dest, file));
+  }
+}
+
+/**
+ * Recursively gets all files in a directory.
+ * @param dir The directory to search.
+ * @returns a list of files.
+ */
+async function getFiles(dir: string): Promise<string[]> {
+  return getFilesHelper(dir, dir);
+}
+
+async function getFilesHelper(basedir: string, dir: string): Promise<string[]> {
+  const dirents = await readdir(dir, { withFileTypes: true });
+  const files = await Promise.all(
+    dirents.map(async (dirent) => {
+      const res = join(dir, dirent.name);
+      return dirent.isDirectory() ? getFilesHelper(basedir, res) : relative(basedir, res);
+    })
+  );
+  return Array.prototype.concat(...files);
+}
diff --git a/apps/wing/src/commands/lsp.ts b/apps/wing/src/commands/lsp.ts
index 64ef44f37e2..56056a7ace2 100644
--- a/apps/wing/src/commands/lsp.ts
+++ b/apps/wing/src/commands/lsp.ts
@@ -80,20 +80,27 @@ export async function lsp() {
   };
 
   let connection = createConnection(process.stdin, process.stdout);
-  connection.onInitialize((_params: InitializeParams) => {
+  connection.onInitialize((params: InitializeParams) => {
+    // certain IDEs don't internally respect a `parameterHints` option, so we must check it ourselves
+    const signatureHelpProvider =
+      params.initializationOptions?.parameterHints ?? true
+        ? {
+            triggerCharacters: ["(", ",", ")"],
+          }
+        : undefined;
+
     const result: InitializeResult = {
       capabilities: {
         textDocumentSync: TextDocumentSyncKind.Full,
         completionProvider: {
           triggerCharacters: [".", ":"],
         },
-        signatureHelpProvider: {
-          triggerCharacters: ["(", ",", ")"],
-        },
+        signatureHelpProvider,
         codeActionProvider: true,
         hoverProvider: true,
         documentSymbolProvider: true,
         definitionProvider: true,
+        renameProvider: { prepareProvider: true },
       },
     };
     return result;
@@ -130,9 +137,14 @@ export async function lsp() {
     for (const rd of raw_diagnostics) {
       if (rd.span) {
         const diagnosticUri = "file://" + rd.span.file_id;
+        let message = rd.message;
+        if (rd.hints.length > 0) {
+          message += `\n${rd.hints.map((hint) => `hint: ${hint}`).join("\n")}`;
+        }
+
         const diag = Diagnostic.create(
           Range.create(rd.span.start.line, rd.span.start.col, rd.span.end.line, rd.span.end.col),
-          `${rd.message}\n${rd.hints.map((hint) => `hint: ${hint}`).join("\n")}`,
+          message,
           undefined,
           undefined,
           undefined,
@@ -178,14 +190,14 @@ export async function lsp() {
     }
   }
 
-  connection.onDidOpenTextDocument(async (params) => {
+  connection.onDidOpenTextDocument((params) => {
     void handle_event_and_update_diagnostics(
       "wingc_on_did_open_text_document",
       params,
       params.textDocument.uri
     );
   });
-  connection.onDidChangeTextDocument(async (params) => {
+  connection.onDidChangeTextDocument((params) => {
     void handle_event_and_update_diagnostics(
       "wingc_on_did_change_text_document",
       params,
@@ -204,6 +216,12 @@ export async function lsp() {
   connection.onDocumentSymbol(async (params) => {
     return callWing("wingc_on_document_symbol", params);
   });
+  connection.onRenameRequest(async (params) => {
+    return callWing("wingc_on_rename", params);
+  });
+  connection.onPrepareRename(async (params) => {
+    return callWing("wingc_on_prepare_rename", params);
+  });
   connection.onHover(async (params) => {
     return callWing("wingc_on_hover", params);
   });
diff --git a/apps/wing/src/commands/pack.test.ts b/apps/wing/src/commands/pack.test.ts
index 45b176b934a..3bc815e0143 100644
--- a/apps/wing/src/commands/pack.test.ts
+++ b/apps/wing/src/commands/pack.test.ts
@@ -18,7 +18,7 @@ describe("wing pack", () => {
     const projectDir = join(fixturesDir, "invalid1");
     const outdir = await generateTmpDir();
     process.chdir(projectDir);
-    await expect(pack({ outfile: join(outdir, "tarball.tgz") })).rejects.toThrow(
+    await expect(pack({ outFile: join(outdir, "tarball.tgz") })).rejects.toThrow(
       /No package.json found in the current directory./
     );
     await expectNoTarball(outdir);
@@ -29,7 +29,7 @@ describe("wing pack", () => {
     const outdir = await generateTmpDir();
     process.chdir(projectDir);
 
-    await expect(pack({ outfile: join(outdir, "tarball.tgz") })).rejects.toThrow(
+    await expect(pack({ outFile: join(outdir, "tarball.tgz") })).rejects.toThrow(
       /Missing required field "license" in package.json/
     );
     await expectNoTarball(outdir);
@@ -40,7 +40,7 @@ describe("wing pack", () => {
     const outdir = await generateTmpDir();
     process.chdir(projectDir);
 
-    await expect(pack({ outfile: join(outdir, "tarball.tgz") })).rejects.toThrow(/Expected ';'/);
+    await expect(pack({ outFile: join(outdir, "tarball.tgz") })).rejects.toThrow(/Expected ';'/);
     await expectNoTarball(outdir);
   });
 
@@ -65,10 +65,45 @@ describe("wing pack", () => {
     const outdir = await generateTmpDir();
     process.chdir(projectDir);
 
-    await expect(pack({ outfile: join(outdir, "tarball.tgz") })).rejects.toThrow();
+    await expect(pack({ outFile: join(outdir, "tarball.tgz") })).rejects.toThrow();
     await expectNoTarball(outdir);
   });
 
+  it("throws an error if package.json uses dependencies instead of peerDependencies", async () => {
+    // GIVEN
+    const projectDir = join(fixturesDir, "invalid6");
+    const outdir = await generateTmpDir();
+    process.chdir(projectDir);
+
+    // WHEN
+    await expect(pack({ outFile: join(outdir, "tarball.tgz") })).rejects.toThrow(
+      /Cannot create package with "dependencies" in package.json. Use "peerDependencies" instead./
+    );
+
+    // THEN
+    await expectNoTarball(outdir);
+  });
+
+  it("includes empty dependencies in package.json", async () => {
+    // valid1's package.json contains this:
+    // {
+    //   ...
+    //   "dependencies": {}
+    // }
+
+    // GIVEN
+    const projectDir = join(fixturesDir, "valid1");
+    const outdir = await generateTmpDir();
+    process.chdir(projectDir);
+
+    // WHEN
+    await expect(pack({ outFile: join(outdir, "tarball.tgz") })).resolves.not.toThrow();
+
+    // THEN
+    const tarballContents = await extractTarball(join(outdir, "tarball.tgz"), outdir);
+    expect(tarballContents).toBeDefined();
+  });
+
   it("includes extra files specified by package.json", async () => {
     // valid1's package.json contains this:
     // {
@@ -84,7 +119,7 @@ describe("wing pack", () => {
     process.chdir(projectDir);
 
     // WHEN
-    await pack({ outfile: join(outdir, "tarball.tgz") });
+    await pack({ outFile: join(outdir, "tarball.tgz") });
 
     // THEN
     const tarballContents = await extractTarball(join(outdir, "tarball.tgz"), outdir);
@@ -103,7 +138,7 @@ describe("wing pack", () => {
     await fs.mkdir("target");
     await fs.writeFile("target/index.js", "console.log('hello world');");
 
-    await pack({ outfile: join(outdir, "tarball.tgz") });
+    await pack({ outFile: join(outdir, "tarball.tgz") });
     const tarballContents = await extractTarball(join(outdir, "tarball.tgz"), outdir);
     expect(tarballContents["target/index.js"]).toBeUndefined();
   });
@@ -111,12 +146,11 @@ describe("wing pack", () => {
   it("packages a valid Wing project to a default path", async () => {
     // GIVEN
     const outdir = await generateTmpDir();
-    // copy everything to the output directory to sandbox this test
-    await exec(`cp -r ${goodFixtureDir}/* ${outdir}`);
-    process.chdir(outdir);
 
     // WHEN
-    await pack();
+    process.chdir(goodFixtureDir);
+    await pack({ outFile: join(outdir, "tarball.tgz") });
+    process.chdir(outdir);
 
     // THEN
     const files = await fs.readdir(outdir);
@@ -124,7 +158,7 @@ describe("wing pack", () => {
     const tarballPath = files.find((path) => path.endsWith(".tgz"))!;
     const tarballContents = await extractTarball(join(outdir, tarballPath), outdir);
 
-    const expectedFiles = ["index.js", "README.md", "package.json", "store.w"];
+    const expectedFiles = ["README.md", "package.json", "store.w"];
     for (const file of expectedFiles) {
       expect(tarballContents[file]).toBeDefined();
     }
@@ -136,14 +170,52 @@ describe("wing pack", () => {
     expect(pkgJson.wing).toEqual(true);
   });
 
+  it("can consume a Wing project from JS", async () => {
+    // GIVEN
+    const outdir = await generateTmpDir();
+
+    // WHEN
+    process.chdir(goodFixtureDir);
+    await pack({ outFile: join(outdir, "tarball.tgz") });
+    process.chdir(outdir);
+
+    // THEN
+    const files = await fs.readdir(outdir);
+    expect(files.filter((path) => path.endsWith(".tgz")).length).toEqual(1);
+    const tarballPath = files.find((path) => path.endsWith(".tgz"))!;
+    await extractTarball(join(outdir, tarballPath), outdir);
+
+    // symlink node_modules/@winglang/sdk to our version of the sdk so the import works
+    await fs.mkdir(join(outdir, "package", "node_modules", "@winglang"), { recursive: true });
+    await fs.symlink(
+      require.resolve("@winglang/sdk"),
+      join(outdir, "package", "node_modules", "@winglang", "sdk")
+    );
+
+    const packagePath = join(outdir, "package");
+
+    const modPackage = await import(join(packagePath, "package.json"));
+    const mod = await import(join(packagePath, modPackage.main));
+
+    expect(mod).toBeDefined();
+    expect(Object.keys(mod).sort()).toMatchInlineSnapshot(`
+      [
+        "FavoriteNumbers",
+        "Store",
+        "default",
+        "subdir",
+      ]
+    `);
+  });
+
   it("packages a valid Wing project to a user-specified path", async () => {
     // GIVEN
-    const projectDir = goodFixtureDir;
     const outdir = await generateTmpDir();
-    process.chdir(projectDir);
 
     // WHEN
-    await pack({ outfile: join(outdir, "tarball.tgz") });
+    process.chdir(goodFixtureDir);
+    await pack({ outFile: join(outdir, "tarball.tgz") });
+    process.chdir(outdir);
 
     // THEN
     const files = await fs.readdir(outdir);
@@ -151,18 +223,38 @@ describe("wing pack", () => {
     const tarballPath = files.find((path) => path.endsWith(".tgz"))!;
     const tarballContents = await extractTarball(join(outdir, tarballPath), outdir);
 
-    const expectedFiles = [
-      "index.js",
-      "README.md",
-      "LICENSE",
-      "package.json",
-      "store.w",
-      "enums.w",
-      "subdir/util.w",
-      "util.js",
-      // util.ts - TypeScript files are not included by default
-    ];
-    expect(Object.keys(tarballContents).sort()).toEqual(expectedFiles.sort());
+    expect(Object.keys(tarballContents).sort()).toMatchInlineSnapshot(`
+      [
+        "$lib/.wing/inflight.Store-2.cjs",
+        "$lib/.wing/inflight.Store-2.cjs.map",
+        "$lib/.wing/inflight.Util-1.cjs",
+        "$lib/.wing/inflight.Util-1.cjs.map",
+        "$lib/.wing/preflight.cjs",
+        "$lib/.wing/preflight.cjs.map",
+        "$lib/.wing/preflight.d.cts",
+        "$lib/.wing/preflight.enums-1.cjs",
+        "$lib/.wing/preflight.enums-1.cjs.map",
+        "$lib/.wing/preflight.enums-1.d.cts",
+        "$lib/.wing/preflight.store-3.cjs",
+        "$lib/.wing/preflight.store-3.cjs.map",
+        "$lib/.wing/preflight.store-3.d.cts",
+        "$lib/.wing/preflight.subdir-4.cjs",
+        "$lib/.wing/preflight.subdir-4.cjs.map",
+        "$lib/.wing/preflight.subdir-4.d.cts",
+        "$lib/.wing/preflight.util-2.cjs",
+        "$lib/.wing/preflight.util-2.cjs.map",
+        "$lib/.wing/preflight.util-2.d.cts",
+        "LICENSE",
+        "README.md",
+        "enums.w",
+        "package.json",
+        "store.w",
+        "subdir/util.w",
+        "util.extern.d.ts",
+        "util.js",
+        "util.ts",
+      ]
+    `);
 
     const pkgJson = JSON.parse(tarballContents["package.json"]);
     expect(pkgJson.name).toEqual("@winglibs/testfixture");
@@ -170,6 +262,21 @@ describe("wing pack", () => {
     expect(pkgJson.engines.wing).toEqual("*");
     expect(pkgJson.wing).toEqual(true);
   });
+
+  it("creates a tarball with a custom filename when using the out-file option", async () => {
+    // GIVEN
+    const projectDir = goodFixtureDir;
+    const outdir = await generateTmpDir();
+    process.chdir(projectDir);
+    const customFilename = "custom-tarball.tgz";
+
+    // WHEN
+    await pack({ outFile: join(outdir, customFilename) });
+
+    // THEN
+    const files = await fs.readdir(outdir);
+    expect(files.includes(customFilename)).toBe(true);
+  });
 });
 
 /**
diff --git a/apps/wing/src/commands/pack.ts b/apps/wing/src/commands/pack.ts
index 5994edaa1e2..059e00a3543 100644
--- a/apps/wing/src/commands/pack.ts
+++ b/apps/wing/src/commands/pack.ts
@@ -8,18 +8,35 @@ import { BuiltinPlatform } from "@winglang/compiler";
 import packlist from "npm-packlist";
 import * as tar from "tar";
 import { compile } from "./compile";
+import { loadEnvVariables } from "../env";
 
 // TODO: add --dry-run option?
 // TODO: let the user specify library's supported targets in package.json, and compile to each before packaging
 // TODO: print information about the generated library? (e.g. size, dependencies, number of public APIs)
 
-const defaultGlobs = ["**/*.js", "**/*.w", "README*", "LICENSE*", "!/target"];
+const defaultGlobs = [
+  "**/*.js",
+  "**/*.cjs",
+  "**/*.mjs",
+  "**/*.ts",
+  "**/*.cts",
+  "**/*.mts",
+  "**/*.w",
+  "README*",
+  "LICENSE*",
+  "!target",
+  "!**/main.w",
+  "!**/*.main.w",
+  "!**/*.test.w",
+];
+const compilerOutputFolder = "$lib";
+const dotWingDir = ".wing";
 
 export interface PackageOptions {
   /**
    * Output filename.
    */
-  readonly outfile?: string;
+  readonly outFile?: string;
 }
 
 async function containsWingFile(dir: string): Promise<boolean> {
@@ -60,9 +77,10 @@ async function validateWingDir(dir: string) {
 
 export async function pack(options: PackageOptions = {}): Promise<string> {
   const userDir = process.cwd();
-  const outfile = options.outfile ? resolve(options.outfile) : undefined;
+  const outfile = options.outFile ? resolve(options.outFile) : undefined;
   const outdir = outfile ? path.dirname(outfile) : userDir;
 
+  loadEnvVariables({ cwd: userDir });
   // check package.json exists
   const originalPkgJsonPath = path.join(userDir, "package.json");
   if (!(await exists(originalPkgJsonPath))) {
@@ -89,7 +107,9 @@ export async function pack(options: PackageOptions = {}): Promise<string> {
 
     // check that the library compiles to the "sim" target
     console.log('Compiling to the "sim" target...');
-    await compile(workdir, { platform: [BuiltinPlatform.SIM] });
+    const compilerOutputDir = await compile(workdir, {
+      platform: [BuiltinPlatform.SIM],
+    });
 
     const pkgJsonPath = path.join(workdir, "package.json");
     const pkgJson = JSON.parse(await fs.readFile(pkgJsonPath, "utf8"));
@@ -102,28 +122,32 @@ export async function pack(options: PackageOptions = {}): Promise<string> {
       }
     }
 
+    // Check if package.json has non-empty "dependencies"
+    if (pkgJson.dependencies && Object.keys(pkgJson.dependencies).length > 0) {
+      throw new Error(
+        `Cannot create package with "dependencies" in package.json. Use "peerDependencies" instead.`
+      );
+    }
+
+    // move compiler output
+    await fs.rename(compilerOutputDir, path.join(workdir, compilerOutputFolder));
+
     // add default globs to "files" so that Wing files are included in the tarball
-    const pkgJsonFiles = new Set(pkgJson.files ?? []);
-    const expectedGlobs = defaultGlobs;
+    const pkgJsonFiles: Set<string> = new Set(pkgJson.files ?? []);
+
+    const expectedGlobs = [
+      compilerOutputFolder,
+      // exclude the unnecessary .manifest file
+      "!" + path.join(compilerOutputFolder, ".manifest"),
+      ...defaultGlobs,
+    ];
     for (const pat of expectedGlobs) {
       if (!pkgJsonFiles.has(pat)) {
         pkgJsonFiles.add(pat);
       }
     }
     pkgJson.files = [...pkgJsonFiles];
-
-    // check if "main" points to a valid file, and if not, create a dummy file
-    let main = pkgJson.main ?? "index.js";
-    if (!(await exists(main))) {
-      const lines = [];
-      lines.push("// This file was generated by `wing pack`");
-      lines.push(
-        `console.log("${pkgJson.name} is a winglang library and cannot be used from javascript (yet). See winglang.io/docs/libraries")`
-      );
-      lines.push();
-      await fs.writeFile(main, lines.join("\n"));
-    }
-    pkgJson.main = main;
+    pkgJson.main = path.join(compilerOutputFolder, dotWingDir, "preflight.cjs");
 
     // add "winglang" to "keywords"
     const keywords = new Set(pkgJson.keywords ?? []);
@@ -201,19 +225,23 @@ async function withTempDir<T>(work: (workdir: string) => Promise<T>): Promise<T>
     // if you want to debug this you can keep the workdir around
     if (!process.env.WING_PACK_KEEP_WORKDIR) {
       await fs.rm(workdir, { recursive: true });
+    } else {
+      console.debug(`Keeping pack workdir ${workdir}`);
     }
   }
 }
 
 /**
- * Check if a file exists for an specific path
+ * Check if a file exists at a specific path with the given permissions
+ * @param filePath The path to the file
+ * @param permissions The permissions to check for. Defaults to checking for existence, readability, and writability.
  */
-export async function exists(filePath: string): Promise<boolean> {
+export async function exists(
+  filePath: string,
+  permissions: number = constants.R_OK | constants.W_OK // eslint-disable-line no-bitwise
+): Promise<boolean> {
   try {
-    await fs.access(
-      filePath,
-      constants.F_OK | constants.R_OK | constants.W_OK //eslint-disable-line no-bitwise
-    );
+    await fs.access(filePath, permissions);
     return true;
   } catch (er) {
     return false;
diff --git a/apps/wing/src/commands/run.test.ts b/apps/wing/src/commands/run.test.ts
index d137988b441..b1556f48335 100644
--- a/apps/wing/src/commands/run.test.ts
+++ b/apps/wing/src/commands/run.test.ts
@@ -3,17 +3,15 @@ import { mkdtemp } from "fs/promises";
 import { tmpdir } from "os";
 import { join, resolve } from "path";
 import { createConsoleApp } from "@wingconsole/app";
-import open from "open";
 import { vi, test, expect } from "vitest";
 import { run } from "./run";
 
-vi.mock("open");
-
 vi.mock("@wingconsole/app", () => {
   return {
-    createConsoleApp: vi.fn((options?: { requestedPort?: number }) => {
+    createConsoleApp: vi.fn((options?: { requestedPort?: number; platform?: string[] }) => {
       return {
         port: options?.requestedPort ?? 1214,
+        platfrom: options?.platform,
       };
     }),
   };
@@ -33,8 +31,8 @@ test("wing it runs the only entrypoint file named main.w", async () => {
       requestedPort: 3000,
       hostUtils: expect.anything(),
       requireAcceptTerms: expect.anything(),
+      open: true,
     });
-    expect(open).toBeCalledWith("http://localhost:3000/");
   } finally {
     process.chdir(prevdir);
   }
@@ -54,8 +52,8 @@ test("wing it runs the only entrypoint file ending with .main.w", async () => {
       requestedPort: 3000,
       hostUtils: expect.anything(),
       requireAcceptTerms: expect.anything(),
+      open: true,
     });
-    expect(open).toBeCalledWith("http://localhost:3000/");
   } finally {
     process.chdir(prevdir);
   }
@@ -127,8 +125,8 @@ test("wing it with a nested file runs", async () => {
       requestedPort: 3000,
       hostUtils: expect.anything(),
       requireAcceptTerms: expect.anything(),
+      open: true,
     });
-    expect(open).toBeCalledWith("http://localhost:3000/");
   } finally {
     process.chdir(prevdir);
   }
@@ -162,8 +160,8 @@ test("wing it with a custom port runs", async () => {
       requestedPort: 5000,
       hostUtils: expect.anything(),
       requireAcceptTerms: expect.anything(),
+      open: true,
     });
-    expect(open).toBeCalledWith("http://localhost:5000/");
   } finally {
     process.chdir(prevdir);
   }
@@ -184,3 +182,43 @@ test("wing it throws when invalid port number is used", async () => {
     process.chdir(prevdir);
   }
 });
+
+test("wing it throws when invalid platform is used", async () => {
+  const workdir = await mkdtemp(join(tmpdir(), "-wing-it-test"));
+  const prevdir = process.cwd();
+  try {
+    process.chdir(workdir);
+
+    writeFileSync("foo.main.w", "bring cloud;");
+
+    await expect(async () => {
+      await run("foo.main.w", { platform: ["anyPlatform"] });
+    }).rejects.toThrowError(
+      'The first platform in the list must be the sim platform (try "-t sim -t anyPlatform")'
+    );
+  } finally {
+    process.chdir(prevdir);
+  }
+});
+
+test("wing it with a custom platform runs", async () => {
+  const workdir = await mkdtemp(join(tmpdir(), "-wing-it-test"));
+  const prevdir = process.cwd();
+  try {
+    process.chdir(workdir);
+
+    writeFileSync("foo.main.w", "bring cloud;");
+
+    await run("foo.main.w", { platform: ["sim", "anyPlatform"] });
+    expect(createConsoleApp).toBeCalledWith({
+      wingfile: resolve("foo.main.w"),
+      requestedPort: expect.anything(),
+      hostUtils: expect.anything(),
+      platform: ["sim", "anyPlatform"],
+      requireAcceptTerms: expect.anything(),
+      open: true,
+    });
+  } finally {
+    process.chdir(prevdir);
+  }
+});
diff --git a/apps/wing/src/commands/run.ts b/apps/wing/src/commands/run.ts
index 29e5e2170bd..b6a3c0a7d6d 100644
--- a/apps/wing/src/commands/run.ts
+++ b/apps/wing/src/commands/run.ts
@@ -1,10 +1,12 @@
 import { existsSync } from "fs";
-import { resolve } from "path";
+import { dirname, resolve } from "path";
 import { createConsoleApp } from "@wingconsole/app";
+import { BuiltinPlatform } from "@winglang/compiler";
 import { debug } from "debug";
 import { glob } from "glob";
-import open from "open";
+import { loadEnvVariables } from "../env";
 import { parseNumericString } from "../util";
+import { beforeShutdown } from "../util.before-shutdown.js";
 
 /**
  * Options for the `run` command.
@@ -24,6 +26,16 @@ export interface RunOptions {
    * @default true
    */
   readonly open?: boolean;
+  /**
+   * Target platform
+   * @default wingCompiler.BuiltinPlatform.SIM
+   */
+  readonly platform?: string[];
+
+  /**
+   * Additional paths to watch or ignore for changes. Supports globs.
+   */
+  readonly watch?: string[];
 }
 
 /**
@@ -36,7 +48,7 @@ export async function run(entrypoint?: string, options?: RunOptions) {
   const openBrowser = options?.open ?? true;
 
   if (!entrypoint) {
-    const wingFiles = (await glob("{main,*.main}.w")).sort();
+    const wingFiles = (await glob("{main,*.main}.{w,ts}")).sort();
     if (wingFiles.length === 0) {
       throw new Error(
         "Cannot find entrypoint files (main.w or *.main.w) in the current directory."
@@ -56,6 +68,16 @@ export async function run(entrypoint?: string, options?: RunOptions) {
     throw new Error(entrypoint + " doesn't exist");
   }
 
+  loadEnvVariables({ cwd: resolve(dirname(entrypoint)) });
+
+  if (options?.platform && options?.platform[0] !== BuiltinPlatform.SIM) {
+    throw new Error(
+      `The first platform in the list must be the sim platform (try "-t sim -t ${options.platform.join(
+        " -t"
+      )}")`
+    );
+  }
+
   entrypoint = resolve(entrypoint);
   debug("opening the wing console with:" + entrypoint);
 
@@ -64,22 +86,18 @@ export async function run(entrypoint?: string, options?: RunOptions) {
     requestedPort,
     hostUtils: {
       async openExternal(url: string) {
-        await open(url);
+        open(url);
       },
     },
+    platform: options?.platform,
     requireAcceptTerms: !!process.stdin.isTTY,
+    open: openBrowser,
+    watchGlobs: options?.watch,
   });
   const url = `http://localhost:${port}/`;
-  if (openBrowser) {
-    await open(url);
-  }
   console.log(`The Wing Console is running at ${url}`);
 
-  const onExit = async (exitCode: number) => {
-    await close(() => process.exit(exitCode));
-  };
-
-  process.once("exit", async (c) => onExit(c));
-  process.once("SIGTERM", async () => onExit(0));
-  process.once("SIGINT", async () => onExit(0));
+  beforeShutdown(async () => {
+    await close();
+  });
 }
diff --git a/apps/wing/src/commands/secrets.test.ts b/apps/wing/src/commands/secrets.test.ts
new file mode 100644
index 00000000000..b2c12f4af3e
--- /dev/null
+++ b/apps/wing/src/commands/secrets.test.ts
@@ -0,0 +1,61 @@
+import { writeFile } from "fs/promises";
+import { join } from "path";
+import { BuiltinPlatform } from "@winglang/compiler";
+import { describe, expect, test, vitest, beforeEach, afterEach, vi } from "vitest";
+import { secrets } from "../commands/secrets";
+import { generateTmpDir } from "../util";
+
+vitest.mock("inquirer");
+
+describe("secrets", () => {
+  let log: any;
+
+  beforeEach(() => {
+    log = console.log;
+    console.log = vi.fn();
+  });
+
+  afterEach(() => {
+    console.log = log;
+  });
+
+  test("no secrets found", async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    const wingCode = `
+    bring cloud;
+    `;
+
+    await writeFile(join(workdir, "main.w"), wingCode);
+
+    await secrets("main.w", {
+      platform: [BuiltinPlatform.SIM],
+      targetDir: workdir,
+    });
+
+    expect(console.log).toHaveBeenCalledWith("0 secret(s) found\n");
+  });
+
+  test("secrets found", async () => {
+    const workdir = await generateTmpDir();
+    process.chdir(workdir);
+
+    const wingCode = `
+    bring cloud;
+
+    let s1 = new cloud.Secret(name: "my-secret") as "s1";
+    let s2 = new cloud.Secret(name: "other-secret") as "s2";
+    `;
+
+    await writeFile(join(workdir, "main.w"), wingCode);
+
+    await secrets("main.w", {
+      platform: [BuiltinPlatform.SIM],
+      targetDir: workdir,
+      list: true,
+    });
+
+    expect(console.log).toHaveBeenCalledWith("2 secret(s) found\n");
+  });
+});
diff --git a/apps/wing/src/commands/secrets.ts b/apps/wing/src/commands/secrets.ts
new file mode 100644
index 00000000000..b9fae26ddf0
--- /dev/null
+++ b/apps/wing/src/commands/secrets.ts
@@ -0,0 +1,47 @@
+import fs from "fs";
+import path from "path";
+import { PlatformManager, SECRETS_FILE_NAME } from "@winglang/sdk/lib/platform";
+import inquirer from "inquirer";
+import { CompileOptions, compile } from "./compile";
+
+export interface SecretsOptions extends CompileOptions {
+  readonly list?: boolean;
+}
+
+export async function secrets(entrypoint?: string, options?: SecretsOptions): Promise<void> {
+  // Compile the program to generate secrets file
+  const outdir = await compile(entrypoint, options);
+  const secretsFile = path.join(outdir, SECRETS_FILE_NAME);
+
+  let secretNames = fs.existsSync(secretsFile)
+    ? JSON.parse(fs.readFileSync(secretsFile, "utf-8"))
+    : [];
+
+  process.env.WING_SOURCE_DIR = path.resolve(path.dirname(entrypoint ?? "main.w"));
+
+  let secretValues: Record<string, string> = {};
+  console.log(`${secretNames.length} secret(s) found\n`);
+
+  if (options?.list) {
+    console.log("- " + secretNames.join("\n- "));
+    return;
+  }
+
+  if (secretNames.length === 0) {
+    return;
+  }
+
+  for (const secret of secretNames) {
+    const response = await inquirer.prompt([
+      {
+        type: "password",
+        name: "value",
+        message: `Enter the secret value for ${secret}:`,
+      },
+    ]);
+    secretValues[secret] = response.value;
+  }
+
+  const plaformManager = new PlatformManager({ platformPaths: options?.platform });
+  await plaformManager.storeSecrets(secretValues);
+}
diff --git a/apps/wing/src/commands/spinner-stream.ts b/apps/wing/src/commands/spinner-stream.ts
new file mode 100644
index 00000000000..84c20e21868
--- /dev/null
+++ b/apps/wing/src/commands/spinner-stream.ts
@@ -0,0 +1,67 @@
+import { WriteStream } from "tty";
+import ora from "ora";
+
+/**
+ * A stream that can write logs and print a spinner to the terminal without
+ * interfering with each other.
+ */
+export class SpinnerStream {
+  private stream: WriteStream;
+  private spinner: ora.Ora;
+  private buffer: string[] = [];
+  private interval: NodeJS.Timeout | undefined;
+  private isTty: boolean;
+
+  constructor(stream: WriteStream, text: string) {
+    this.stream = stream;
+    this.isTty = stream.isTTY;
+    this.spinner = ora({ stream: this.stream, text, isEnabled: false });
+    if (this.isTty) {
+      this.interval = setInterval(() => {
+        this.updateSpinner();
+      }, 80);
+    }
+  }
+
+  public write(log: string): void {
+    if (this.isTty) {
+      this.buffer.push(log);
+    } else {
+      // If not a TTY, write logs directly to the stream since the spinner
+      // won't be displayed
+      this.stream.write(log);
+    }
+  }
+
+  private updateSpinner(): void {
+    // Clear the spinner
+    this.stream.cursorTo(0);
+    this.stream.clearLine(1);
+
+    // Print any logs
+    for (const log of this.buffer) {
+      this.stream.write(log);
+    }
+    this.buffer = [];
+
+    // Redraw spinner
+    this.spinner.render();
+  }
+
+  public stopSpinner(): void {
+    if (this.isTty) {
+      // Stop looping
+      clearInterval(this.interval);
+
+      // Clear the spinner
+      this.stream.cursorTo(0);
+      this.stream.clearLine(1);
+
+      // Print any remaining logs
+      for (const log of this.buffer) {
+        this.stream.write(log);
+      }
+      this.buffer = [];
+    }
+  }
+}
diff --git a/apps/wing/src/commands/test/__snapshots__/test.test.ts.snap b/apps/wing/src/commands/test/__snapshots__/test.test.ts.snap
index 2fff5cf442e..99106f4b022 100644
--- a/apps/wing/src/commands/test/__snapshots__/test.test.ts.snap
+++ b/apps/wing/src/commands/test/__snapshots__/test.test.ts.snap
@@ -1,19 +1,20 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`printing test reports > resource traces are not shown if debug mode is disabled 1`] = `
+exports[`printing test reports > verbose traces are not shown if debug mode is disabled 1`] = `
 "fail ┌ hello.w » root/env0/test:test
      │ sleeping for 500 ms
-     └ runtime error: Object does not exist (key=file.txt)"
+     │ Subscriber error - returning 1 messages to queue: Missing environment variable: QUEUE_HANDLE_7164aec4
+     └ Error: Object does not exist (key=file.txt)"
 `;
 
-exports[`printing test reports > resource traces are shown if debug mode is enabled 1`] = `
+exports[`printing test reports > verbose traces are shown if debug mode is enabled 1`] = `
 "fail ┌ hello.w » root/env0/test:test
-     │ [trace] Push (message=cool).
+     │ Push (message=cool).
      │ sleeping for 500 ms
-     │ [trace] Sending messages (messages=[\\"cool\\"], subscriber=sim-4).
-     │ [trace] Invoke (payload=\\"{\\\\\\"messages\\\\\\":[\\\\\\"cool\\\\\\"]}\\").
-     │ [trace] Subscriber error - returning 1 messages to queue: Missing environment variable: QUEUE_HANDLE_7164aec4
-     │ [trace] Get (key=file.txt).
-     │ [trace] Invoke (payload=\\"\\").
-     └ runtime error: Object does not exist (key=file.txt)"
+     │ Sending messages (messages=["cool"], subscriber=sim-4).
+     │ Invoke (payload="{\\"messages\\":[\\"cool\\"]}").
+     │ Subscriber error - returning 1 messages to queue: Missing environment variable: QUEUE_HANDLE_7164aec4
+     │ Get (key=file.txt).
+     │ Invoke (payload="").
+     └ Error: Object does not exist (key=file.txt)"
 `;
diff --git a/apps/wing/src/commands/test/fixtures/main.w.tf-aws.snap.md b/apps/wing/src/commands/test/fixtures/main.w.tf-aws.snap.md
new file mode 100644
index 00000000000..2e5ede67ab4
--- /dev/null
+++ b/apps/wing/src/commands/test/fixtures/main.w.tf-aws.snap.md
@@ -0,0 +1,50 @@
+# `main.w.tf-aws.snap.md`
+
+## main.tf.json
+
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+    }
+  },
+  "provider": {
+    "aws": [
+      {
+      }
+    ]
+  },
+  "resource": {
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      }
+    }
+  },
+  "terraform": {
+    "backend": {
+      "local": {
+        "path": "./terraform.tfstate"
+      }
+    },
+    "required_providers": {
+      "aws": {
+        "source": "aws",
+        "version": "5.31.0"
+      }
+    }
+  }
+}
+```
diff --git a/apps/wing/src/commands/test/results.ts b/apps/wing/src/commands/test/results.ts
index e853dc01eef..989c5b094d2 100644
--- a/apps/wing/src/commands/test/results.ts
+++ b/apps/wing/src/commands/test/results.ts
@@ -2,11 +2,10 @@ import { mkdir, writeFile } from "fs/promises";
 import { parse } from "path";
 import { std } from "@winglang/sdk";
 import chalk from "chalk";
+import { SnapshotResult } from "./snapshots";
+import { SingleTestResult } from "./test";
 
-export function printResults(
-  testResults: { testName: string; results: std.TestResult[] }[],
-  duration: number
-) {
+export function printResults(testResults: SingleTestResult[], duration: number) {
   const durationInSeconds = duration / 1000;
   const totalSum = testResults.length;
   const unsupportedFiles = testResults.filter(({ results }) =>
@@ -29,7 +28,6 @@ export function printResults(
     (acc, { results }) => acc + results.filter(({ pass }) => !!pass).length,
     0
   );
-  console.log(" "); // for getting a new line- \n does't seem to work :(
   const areErrors = failing.length + unsupportedFiles.length > 0 && totalSum > 1;
   const showTitle = totalSum > 1;
 
@@ -37,6 +35,7 @@ export function printResults(
 
   if (showTitle) {
     // prints a list of the tests names with an icon
+    res.push("");
     res.push(`Results:`);
     res.push(...passing.map(({ testName }) => `    ${chalk.green("✓")} ${testName}`));
     res.push(...failing.map(({ testName }) => `    ${chalk.red("×")} ${testName}`));
@@ -45,7 +44,7 @@ export function printResults(
 
   if (areErrors) {
     // prints error messages form failed tests
-    res.push(" ");
+    res.push("");
     res.push("Errors:");
     res.push(
       ...[...failing, ...unsupportedFiles].map(({ testName, results }) =>
@@ -62,7 +61,7 @@ export function printResults(
   }
 
   // prints a summary of how many tests passed and failed
-  res.push(" ");
+  res.push("");
   const testCount = [
     failingTestsNumber && chalk.red(` ${failingTestsNumber} failed`),
     passingTestsNumber && chalk.green(` ${passingTestsNumber} passed`),
@@ -84,6 +83,12 @@ export function printResults(
       `(${failingTestsNumber + passingTestsNumber + unsupportedTestsNumber})`
     )}`
   );
+
+  const snapshotSummary = renderSnapshotSummary(testResults);
+
+  // print snapshot summary
+  res.push(`${chalk.dim("Snapshots")} ${snapshotSummary}`);
+
   // prints a summary of how many tests files passed and failed
   res.push(`${chalk.dim("Test Files")}${fileCount} ${chalk.dim(`(${totalSum})`)}`);
 
@@ -94,20 +99,56 @@ export function printResults(
     ).toFixed(2)}s`
   );
 
-  console.log(res.filter((value) => !!value).join("\n"));
+  console.log(res.join("\n"));
 }
 
-interface TestResultsJson {
+export interface TestResultsJson {
   duration: number;
+  platforms: string[];
   results: Record<string, Record<string, std.TestResult>>;
 }
 
+function renderSnapshotSummary(results: SingleTestResult[]) {
+  const stats: { [key: string]: number } = {};
+
+  // count the number of each snapshot result
+  for (const t of results) {
+    stats[t.snapshot] = (stats[t.snapshot] ?? 0) + 1;
+  }
+
+  // color map
+  const snapshotSummaryColors = {
+    [SnapshotResult.NEW]: chalk.yellow,
+    [SnapshotResult.UPDATED]: chalk.yellow,
+    [SnapshotResult.VERIFIED]: chalk.green,
+    [SnapshotResult.SKIPPED]: chalk.dim,
+    [SnapshotResult.MISMATCH]: chalk.red,
+  };
+
+  const snapshotSummary = [];
+  for (const t of [
+    SnapshotResult.MISMATCH,
+    SnapshotResult.VERIFIED,
+    SnapshotResult.NEW,
+    SnapshotResult.UPDATED,
+    SnapshotResult.SKIPPED,
+  ]) {
+    const count = t in stats ? stats[t] : 0;
+    if (count > 0) {
+      snapshotSummary.push(snapshotSummaryColors[t](`${stats[t]} ${t.toLowerCase()}`));
+    }
+  }
+
+  return snapshotSummary.join(chalk.dim(" | "));
+}
+
 export async function writeResultsToFile(
   testResults: { testName: string; results: std.TestResult[] }[],
   duration: number,
-  filePath: string
+  filePath: string,
+  platforms: string[]
 ) {
-  const output: TestResultsJson = { duration, results: {} };
+  const output: TestResultsJson = { duration, platforms, results: {} };
   for (const result of testResults) {
     output.results[result.testName] = result.results.reduce(
       (acc, item) => ({ ...acc, [item.path.replace(/[\w+\/\\.-]+test:/, "")]: item }),
diff --git a/apps/wing/src/commands/test/snapshots-help.ts b/apps/wing/src/commands/test/snapshots-help.ts
new file mode 100644
index 00000000000..18b9bf4c005
--- /dev/null
+++ b/apps/wing/src/commands/test/snapshots-help.ts
@@ -0,0 +1,19 @@
+export const SNAPSHOTS_HELP = `\
+Snapshots (s, --snapshots <mode>):
+  never  \t Snapshot are never captured
+  auto   \t Determines behavior based on the "CI" environment variable: "assert" if CI=1 or "deploy" otherwise
+  deploy \t Execute tests on the target platform and update snapshots if all tests pass
+  assert \t verifies that the snapshot is up-to-date and fails the test is they are not
+  update \t Only update the snapshots without actually executing the tests on the target platform
+
+  When testing against a cloud target (e.g. -t tf-aws), if all tests pass, the compiler output 
+  will be captured under "<entrypoint>.snap.md".
+`;
+
+export const SNAPSHOT_ERROR_PREFIX = "Snapshot mismatch:";
+
+export const SNAPSHOTS_ERROR_HELP = [
+  "Update with '--snapshots=update'",
+  "To disable this behavior run with '--snapshots=never'",
+  "See https://www.winglang.io/docs/tools/cli#cloud-test-snapshots",
+].join("\n");
diff --git a/apps/wing/src/commands/test/snapshots.test.ts b/apps/wing/src/commands/test/snapshots.test.ts
new file mode 100644
index 00000000000..96ff72ccf23
--- /dev/null
+++ b/apps/wing/src/commands/test/snapshots.test.ts
@@ -0,0 +1,219 @@
+import { readFile, readdir, writeFile } from "fs/promises";
+import { dirname, join } from "path";
+import { describe, test, expect, beforeEach, afterEach } from "vitest";
+import { SnapshotMode, captureSnapshot, determineSnapshotMode } from "./snapshots";
+import { generateTmpDir } from "src/util";
+
+const prevCI = process.env.CI;
+
+describe("determineSnapshotMode", () => {
+  beforeEach(() => {
+    delete process.env.CI;
+  });
+
+  afterEach(() => {
+    process.env.CI = prevCI;
+  });
+
+  test("--snapshots=never", () => {
+    expect(
+      determineSnapshotMode("tf-aws", {
+        clean: false,
+        platform: [],
+        snapshots: SnapshotMode.NEVER,
+      })
+    ).toBe(SnapshotMode.NEVER);
+  });
+
+  test("--snapshots=dry", () => {
+    expect(
+      determineSnapshotMode("tf-aws", {
+        clean: false,
+        platform: [],
+        snapshots: SnapshotMode.UPDATE,
+      })
+    ).toBe(SnapshotMode.UPDATE);
+  });
+
+  test("--snapshots=deploy", () => {
+    expect(
+      determineSnapshotMode("tf-aws", {
+        clean: false,
+        platform: [],
+        snapshots: SnapshotMode.DEPLOY,
+      })
+    ).toBe(SnapshotMode.DEPLOY);
+  });
+
+  test("target=sim always disables (even if explicitly set)", () => {
+    expect(
+      determineSnapshotMode("sim", {
+        clean: false,
+        platform: [],
+        snapshots: SnapshotMode.DEPLOY,
+      })
+    ).toBe(SnapshotMode.NEVER);
+
+    expect(
+      determineSnapshotMode("sim", {
+        clean: false,
+        platform: [],
+        snapshots: SnapshotMode.ASSERT,
+      })
+    ).toBe(SnapshotMode.NEVER);
+
+    expect(
+      determineSnapshotMode("sim", {
+        clean: false,
+        platform: [],
+        snapshots: SnapshotMode.UPDATE,
+      })
+    ).toBe(SnapshotMode.NEVER);
+  });
+
+  describe("--snapshots=auto", () => {
+    describe("CI=1", () => {
+      beforeEach(() => {
+        process.env.CI = "1";
+      });
+
+      test("sim => disabled", () => {
+        expect(
+          determineSnapshotMode("sim", {
+            clean: false,
+            platform: [],
+          })
+        ).toBe(SnapshotMode.NEVER);
+      });
+
+      test("non sim => assert", () => {
+        expect(
+          determineSnapshotMode("tf-azure", {
+            clean: false,
+            snapshots: SnapshotMode.AUTO,
+            platform: [],
+          })
+        ).toBe(SnapshotMode.ASSERT);
+      });
+    });
+
+    describe("not in CI", () => {
+      test("sim => disabled", () => {
+        expect(
+          determineSnapshotMode("sim", {
+            clean: false,
+            platform: [],
+          })
+        ).toBe(SnapshotMode.NEVER);
+      });
+      test("non sim => deploy", () => {
+        expect(
+          determineSnapshotMode("tf-azure", {
+            clean: false,
+            platform: [],
+          })
+        ).toBe(SnapshotMode.DEPLOY);
+      });
+    });
+  });
+});
+
+describe("captureSnapshot", async () => {
+  async function makeEntrypoint() {
+    const workdir = await generateTmpDir();
+    const entrypoint = join(workdir, "main.w");
+
+    await writeFile(
+      entrypoint,
+      `
+      bring cloud;
+      let b = new cloud.Bucket();
+
+      test "put" {
+        b.put("key", "value");
+        assert(b.get("key") == "value");
+      }
+    `
+    );
+
+    return entrypoint;
+  }
+
+  const expected = await readFile(join(__dirname, "fixtures", "main.w.tf-aws.snap.md"), "utf-8");
+
+  test("skip if snapshots are disabled", async () => {
+    const entrypoint = await makeEntrypoint();
+    await captureSnapshot(entrypoint, "tf-aws", {
+      clean: false,
+      platform: ["tf-aws"],
+      snapshots: SnapshotMode.NEVER,
+    });
+
+    expect(await readdir(dirname(entrypoint))).toEqual(["main.w"]);
+  });
+
+  test("snapshots are created for UPDATE", async () => {
+    const entrypoint = await makeEntrypoint();
+    await captureSnapshot(entrypoint, "tf-aws", {
+      clean: false,
+      platform: ["tf-aws"],
+      snapshots: SnapshotMode.UPDATE,
+    });
+
+    const snapshot = await readFile(join(dirname(entrypoint), "main.w.tf-aws.snap.md"), "utf-8");
+    expect(snapshot).toStrictEqual(expected);
+  });
+
+  test("snapshots are created for DEPLOY", async () => {
+    const entrypoint = await makeEntrypoint();
+    await captureSnapshot(entrypoint, "tf-aws", {
+      clean: false,
+      platform: ["tf-aws"],
+      snapshots: SnapshotMode.DEPLOY,
+    });
+
+    const snapshot = await readFile(join(dirname(entrypoint), "main.w.tf-aws.snap.md"), "utf-8");
+    expect(snapshot).toStrictEqual(expected);
+  });
+
+  test("ASSERT fails if there is no existing snapshot", async () => {
+    const entrypoint = await makeEntrypoint();
+
+    await expect(
+      captureSnapshot(entrypoint, "tf-aws", {
+        clean: false,
+        platform: ["tf-aws"],
+        snapshots: SnapshotMode.ASSERT,
+      })
+    ).rejects.toThrowError(/Snapshot file does not exist/);
+  });
+
+  test("ASSERT fails if snapshot does not match", async () => {
+    const entrypoint = await makeEntrypoint();
+
+    await writeFile(
+      join(dirname(entrypoint), "main.w.tf-aws.snap.md"),
+      expected.replace(`"force_destroy": false`, `"force_destroy": true`)
+    );
+
+    await expect(
+      captureSnapshot(entrypoint, "tf-aws", {
+        clean: false,
+        platform: ["tf-aws"],
+        snapshots: SnapshotMode.ASSERT,
+      })
+    ).rejects.toThrowError(/\+        "force_destroy": false/);
+  });
+
+  test("ASSERT succeeds if snapshots match", async () => {
+    const entrypoint = await makeEntrypoint();
+
+    await writeFile(join(dirname(entrypoint), "main.w.tf-aws.snap.md"), expected);
+
+    await captureSnapshot(entrypoint, "tf-aws", {
+      clean: false,
+      platform: ["tf-aws"],
+      snapshots: SnapshotMode.ASSERT,
+    });
+  });
+});
diff --git a/apps/wing/src/commands/test/snapshots.ts b/apps/wing/src/commands/test/snapshots.ts
new file mode 100644
index 00000000000..880f35cd2b1
--- /dev/null
+++ b/apps/wing/src/commands/test/snapshots.ts
@@ -0,0 +1,210 @@
+import * as cp from "child_process";
+import * as fs from "fs/promises";
+import { join, extname, basename } from "path";
+import { BuiltinPlatform } from "@winglang/compiler";
+import * as glob from "glob";
+import { SNAPSHOTS_ERROR_HELP, SNAPSHOT_ERROR_PREFIX } from "./snapshots-help";
+import { TestOptions } from "./test";
+import { renderTestName } from "./util";
+import { withSpinner } from "../../util";
+import { compile } from "../compile";
+
+export enum SnapshotMode {
+  /**
+   * Auto-detect. If CI=1, SnapshotMode.ASSERT otherwise SnapshotMode.DEPLOY.
+   */
+  AUTO = "auto",
+
+  /**
+   * Snapshots are disabled.
+   */
+  NEVER = "never",
+
+  /**
+   * Deploy and test in the cloud and update the snapshot only if all tests passed.
+   */
+  DEPLOY = "deploy",
+
+  /**
+   * Update the snapshots without deploying (dry run).
+   */
+  UPDATE = "update",
+
+  /**
+   * Just verify that the snapshots are correct.
+   */
+  ASSERT = "assert",
+}
+
+export function determineSnapshotMode(
+  target: string | undefined,
+  options: TestOptions
+): SnapshotMode {
+  // no snapshots for sim, ever!
+  if (target === BuiltinPlatform.SIM) {
+    return SnapshotMode.NEVER;
+  }
+
+  // if AUTO or unset, determine behavior based on CI flag
+  if (!options.snapshots || options.snapshots === SnapshotMode.AUTO) {
+    // determine behavior based on CI
+    if (process.env.CI) {
+      return SnapshotMode.ASSERT;
+    } else {
+      return SnapshotMode.DEPLOY;
+    }
+  }
+
+  return options.snapshots;
+}
+
+export enum SnapshotResult {
+  SKIPPED = "skipped",
+  NEW = "new",
+  UPDATED = "updated",
+  MISMATCH = "mismatched",
+  VERIFIED = "verified",
+}
+
+export async function captureSnapshot(
+  entrypoint: string,
+  target: string,
+  options: TestOptions
+): Promise<SnapshotResult> {
+  const snapshotMode = determineSnapshotMode(target, options);
+
+  // skip if snapshots are disabled
+  if (snapshotMode === SnapshotMode.NEVER) {
+    return SnapshotResult.SKIPPED;
+  }
+
+  const snapshotFile = `${entrypoint}.${target}.snap.md`;
+  const oldSnapshot = await tryReadFile(snapshotFile);
+
+  return withSpinner(`Snapshot ${renderTestName(snapshotFile)}...`, async () => {
+    // we need to compile again in order for snapshots because we can't afford the snapshot to be
+    // based on a random root id (which is the default for tests)
+    const snapshotDir = await compile(entrypoint, options);
+
+    // take a snapshot of the synthesis output
+    const newSnapshot = await createMarkdownSnapshot(basename(snapshotFile), snapshotDir);
+
+    // if the snapshot is the same, we're done
+    if (oldSnapshot === newSnapshot) {
+      return SnapshotResult.VERIFIED;
+    }
+
+    // snapshot are mismatched, decide if we want to update or assert based on the mode
+    switch (snapshotMode) {
+      case SnapshotMode.DEPLOY:
+      case SnapshotMode.UPDATE:
+        await fs.writeFile(snapshotFile, newSnapshot);
+        return !oldSnapshot ? SnapshotResult.NEW : SnapshotResult.UPDATED;
+
+      case SnapshotMode.ASSERT:
+        if (!oldSnapshot) {
+          throw new Error(
+            [
+              SNAPSHOT_ERROR_PREFIX,
+              `Snapshot file does not exist: ${snapshotFile}`,
+              "",
+              SNAPSHOTS_ERROR_HELP,
+            ].join("\n")
+          );
+        }
+
+        const actualFile = `${snapshotFile}.actual`;
+        await fs.writeFile(actualFile, newSnapshot);
+
+        const diff =
+          tryRenderDiff(snapshotFile, actualFile) ??
+          [` - Expected: ${snapshotFile}`, ` - Actual: ${actualFile}`].join("\n");
+
+        // don't keep the actual file around
+        await fs.rm(actualFile);
+
+        throw new Error([SNAPSHOT_ERROR_PREFIX, "", diff, "", SNAPSHOTS_ERROR_HELP].join("\n"));
+    }
+
+    throw new Error(`Unexpected snapshot mode: ${snapshotMode}`);
+  });
+}
+
+/**
+ * Uses the "diff" command to render a diff between two files. Returns `undefined` if the diff command
+ * is not available or if there was an error.
+ *
+ * @param expectedFile A snapshot file with the expected content
+ * @param actualFile The actual snapshot content
+ * @returns The diff output or `undefined`
+ */
+function tryRenderDiff(expectedFile: string, actualFile: string) {
+  const color = process.env.CI ? "never" : "always";
+  const out = cp.spawnSync("diff", ["-u", expectedFile, actualFile, `--color=${color}`]);
+  if (out.error) {
+    return undefined;
+  }
+
+  return out.stdout?.toString();
+}
+
+async function tryReadFile(file: string): Promise<string | undefined> {
+  try {
+    return await fs.readFile(file, "utf-8");
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Creates a markdown snapshot of the synthesis output.
+ *
+ * @param baseName The base name of the test
+ * @param synthDir The directory containing the synthesis output
+ * @returns The snapshot content in markdown format
+ */
+async function createMarkdownSnapshot(baseName: string, synthDir: string) {
+  const fileMap: Record<string, string> = {};
+  const exclude = ["connections.json", "tree.json", "**/*.zip", "**/*.map"];
+  const include = ["**/*.js", "**/*.json", "**/*.tf", "**/*.ts", "**/*.yaml", "**/*.yml"];
+  for await (const subpath of glob.iterate(include, {
+    cwd: synthDir,
+    nodir: true,
+    dot: false, // don't include the `.wing` directory
+    ignore: exclude,
+  })) {
+    const abspath = join(synthDir, subpath);
+    const fileContents = await fs.readFile(abspath, "utf8");
+
+    // ensure no absolute requires are included in the snapshot
+    if (/require\("(\/|\w:).*\/(.+)"\)/g.test(fileContents)) {
+      throw new Error(`Unable to capture snapshot. Found absolute path in ${abspath}`);
+    }
+
+    fileMap[subpath] = fileContents;
+  }
+
+  return createMarkdown(baseName, fileMap);
+}
+
+function createMarkdown(baseName: string, fileMap: Record<string, string>) {
+  const files = Object.keys(fileMap);
+  files.sort();
+
+  const lines = [];
+
+  lines.push(`# \`${baseName}\``);
+  lines.push("");
+
+  for (const file of files) {
+    const extension = extname(file).replace(".", "");
+    lines.push(`## ${file}`);
+    lines.push("");
+    lines.push("```" + extension);
+    lines.push(fileMap[file]);
+    lines.push("```");
+    lines.push("");
+  }
+
+  return lines.join("\n");
+}
diff --git a/apps/wing/src/commands/test/test.test.ts b/apps/wing/src/commands/test/test.test.ts
index b5b21d9ab4d..d0da0868124 100644
--- a/apps/wing/src/commands/test/test.test.ts
+++ b/apps/wing/src/commands/test/test.test.ts
@@ -3,11 +3,12 @@ import fsPromises from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
 import { BuiltinPlatform } from "@winglang/compiler";
-import { TestResult, TraceType } from "@winglang/sdk/lib/std";
+import { LogLevel, TestResult, TraceType } from "@winglang/sdk/lib/std";
 import chalk from "chalk";
 import { describe, test, expect, beforeEach, afterEach, vi, SpyInstance } from "vitest";
-import { filterTests, pickOneTestPerEnvironment, renderTestReport, test as wingTest } from ".";
+import { filterTests, renderTestReport, collectTestFiles, test as wingTest } from ".";
 import * as resultsFn from "./results";
+import { SnapshotMode } from "./snapshots";
 
 const defaultChalkLevel = chalk.level;
 const cwd = process.cwd();
@@ -22,14 +23,14 @@ describe("printing test reports", () => {
     process.chdir(cwd);
   });
 
-  test("resource traces are not shown if debug mode is disabled", async () => {
+  test("verbose traces are not shown if debug mode is disabled", async () => {
     const testReport = await renderTestReport("hello.w", EXAMPLE_TEST_RESULTS);
 
     expect(testReport).toMatchSnapshot();
     expect(testReport).not.toContain("Push (message=cool)");
   });
 
-  test("resource traces are shown if debug mode is enabled", async () => {
+  test("verbose traces are shown if debug mode is enabled", async () => {
     const oldDebug = process.env.DEBUG;
     process.env.DEBUG = "1";
 
@@ -82,7 +83,11 @@ describe("wing test (custom platform)", () => {
       module.exports = { Platform }`
     );
 
-    await wingTest([], { clean: true, platform: ["./custom-platform.js"] });
+    await wingTest([], {
+      clean: true,
+      platform: ["./custom-platform.js"],
+      snapshots: SnapshotMode.NEVER,
+    });
 
     expect(logSpy).toHaveBeenCalledWith(
       expect.stringMatching(/^pass ─ foo\.test\.tfaws\.\d+ \(no tests\)$/)
@@ -90,51 +95,123 @@ describe("wing test (custom platform)", () => {
   });
 });
 
-describe("wing test (no options)", () => {
-  let logSpy: SpyInstance;
+describe("collectTestFiles", () => {
+  test("default entrypoints", async () => {
+    const outDir = await fsPromises.mkdtemp(join(tmpdir(), "-wing-compile-test"));
 
-  beforeEach(() => {
-    chalk.level = 0;
-    logSpy = vi.spyOn(console, "log");
+    process.chdir(outDir);
+    fs.writeFileSync("foo.test.w", "");
+    fs.writeFileSync("bar.test.w", "");
+    fs.writeFileSync("baz.test.w", "");
+    fs.writeFileSync("main.ts", "");
+
+    const files = await collectTestFiles([]);
+
+    expect(files).toMatchInlineSnapshot(`
+      [
+        "main.ts",
+        "foo.test.w",
+        "baz.test.w",
+        "bar.test.w",
+      ]
+    `);
   });
 
-  afterEach(() => {
-    chalk.level = defaultChalkLevel;
-    process.chdir(cwd);
-    logSpy.mockRestore();
+  test("specific entrypoint", async () => {
+    const outDir = await fsPromises.mkdtemp(join(tmpdir(), "-wing-compile-test"));
+
+    process.chdir(outDir);
+    fs.writeFileSync("foo.test.w", "");
+    fs.writeFileSync("bar.test.w", "");
+    fs.writeFileSync("baz.test.w", "");
+
+    const files = await collectTestFiles(["foo.test.w"]);
+
+    expect(files).toMatchInlineSnapshot(`
+      [
+        "foo.test.w",
+      ]
+    `);
+  });
+
+  test("fuzzy match dir", async () => {
+    const outDir = await fsPromises.mkdtemp(join(tmpdir(), "-wing-compile-test"));
+
+    process.chdir(outDir);
+    fs.mkdirSync("foo");
+    fs.writeFileSync("foo/a.test.w", "");
+    fs.writeFileSync("foo/b.test.w", "");
+    fs.writeFileSync("foo.test.w", "");
+    fs.writeFileSync("baz.test.w", "");
+
+    const files = await collectTestFiles(["foo"]);
+
+    expect(files).toMatchInlineSnapshot(`
+      [
+        "foo.test.w",
+        "foo/b.test.w",
+        "foo/a.test.w",
+      ]
+    `);
+  });
+
+  test("absolute path dedupe", async () => {
+    const outDir = await fsPromises.mkdtemp(join(tmpdir(), "-wing-compile-test"));
+
+    process.chdir(outDir);
+    fs.mkdirSync("foo");
+    fs.writeFileSync("foo/a.test.w", "");
+    fs.writeFileSync("foo/b.test.w", "");
+    fs.writeFileSync("foo.test.w", "");
+    fs.writeFileSync("baz.test.w", "");
+
+    const files = await collectTestFiles(["foo"]);
+
+    expect(files).toMatchInlineSnapshot(`
+    [
+      "foo.test.w",
+      "foo/b.test.w",
+      "foo/a.test.w",
+    ]
+  `);
   });
 
-  test("default entrypoint behaviour", async () => {
+  test("testing file outside current dir", async () => {
     const outDir = await fsPromises.mkdtemp(join(tmpdir(), "-wing-compile-test"));
+    const subDir = join(outDir, "subdir");
 
     process.chdir(outDir);
-    fs.writeFileSync("foo.test.w", "bring cloud;");
-    fs.writeFileSync("bar.test.w", "bring cloud;");
-    fs.writeFileSync("baz.test.w", "bring cloud;");
 
-    await wingTest([], { clean: true, platform: [BuiltinPlatform.SIM] });
+    fs.writeFileSync("foo.test.w", "");
 
-    expect(logSpy).toHaveBeenCalledWith("pass ─ foo.test.wsim (no tests)");
-    expect(logSpy).toHaveBeenCalledWith("pass ─ bar.test.wsim (no tests)");
-    expect(logSpy).toHaveBeenCalledWith("pass ─ baz.test.wsim (no tests)");
+    fs.mkdirSync(subDir);
+
+    process.chdir(subDir);
+
+    fs.writeFileSync("main.w", "");
+
+    const files = await collectTestFiles(["../foo.test.w"]);
+
+    expect(files).toMatchInlineSnapshot(`
+      [
+        "../foo.test.w",
+      ]
+    `);
   });
 });
 
 describe("output-file option", () => {
   let writeResultsSpy: SpyInstance;
-  let writeFileSpy: SpyInstance;
 
   beforeEach(() => {
     chalk.level = 0;
     writeResultsSpy = vi.spyOn(resultsFn, "writeResultsToFile");
-    writeFileSpy = vi.spyOn(fsPromises, "writeFile");
   });
 
   afterEach(() => {
     chalk.level = defaultChalkLevel;
     process.chdir(cwd);
     writeResultsSpy.mockRestore();
-    writeFileSpy.mockRestore();
   });
 
   test("wing test with output file calls writeResultsToFile", async () => {
@@ -158,10 +235,10 @@ describe("output-file option", () => {
     expect(testName).toBe("test.test.w");
     expect(writeResultsSpy.mock.calls[0][2]).toBe(outputFile);
 
-    expect(writeFileSpy).toBeCalledTimes(2);
-    const [filePath, output] = writeFileSpy.mock.calls[1];
-    expect(filePath).toBe("out.json");
-    expect(JSON.parse(output as string)).toMatchObject(OUTPUT_FILE);
+    const outputFileExists = fs.existsSync(outputFile);
+    expect(outputFileExists).toBe(true);
+    const outputContents = fs.readFileSync(outputFile, "utf-8");
+    expect(JSON.parse(outputContents)).toMatchObject(OUTPUT_FILE);
   });
 
   test("wing test without output file calls writeResultsToFile", async () => {
@@ -201,7 +278,7 @@ describe("test-filter option", () => {
   });
 
   test("wing test (no test-filter)", () => {
-    const filteredTests = pickOneTestPerEnvironment(filterTests(EXAMPLE_UNFILTERED_TESTS));
+    const filteredTests = filterTests(EXAMPLE_UNFILTERED_TESTS);
 
     expect(filteredTests.length).toBe(3);
     expect(filteredTests[0]).toBe("root/env0/test:get()");
@@ -210,7 +287,7 @@ describe("test-filter option", () => {
   });
 
   test("wing test --test-filter <regex>", () => {
-    const filteredTests = pickOneTestPerEnvironment(filterTests(EXAMPLE_UNFILTERED_TESTS, "get"));
+    const filteredTests = filterTests(EXAMPLE_UNFILTERED_TESTS, "get");
 
     expect(filteredTests.length).toBe(2);
     expect(filteredTests[0]).toBe("root/env0/test:get()");
@@ -218,7 +295,7 @@ describe("test-filter option", () => {
   });
 });
 
-describe("retry option", () => {
+describe("retry and parallel options", () => {
   let logSpy: SpyInstance;
 
   beforeEach(() => {
@@ -279,7 +356,89 @@ describe("retry option", () => {
     });
 
     const retryLogs = logSpy.mock.calls.filter((args) => args[0].includes("Retrying"));
-    expect(retryLogs.length).toBe(3);
+    expect(retryLogs.length).toBe(2);
+  });
+
+  test("wing test --parallel [batch]", async () => {
+    const outDir = await fsPromises.mkdtemp(join(tmpdir(), "-wing-batch-test"));
+
+    process.chdir(outDir);
+
+    fs.writeFileSync(
+      "t1.test.w",
+      `
+bring util;
+
+test "t1" {
+  util.sleep(1s);
+  log("t1 ends");
+  assert(true);
+}
+  `
+    );
+    fs.writeFileSync(
+      "t2.test.w",
+      `
+bring util;
+
+test "t2" {
+  log("t2 ends");
+  assert(true);
+}
+  `
+    );
+
+    await wingTest(["t1.test.w", "t2.test.w"], {
+      clean: true,
+      platform: [BuiltinPlatform.SIM],
+      parallel: 1,
+    });
+    // we are running the tests one by one so first t1 should log and then t2
+    const t1Ends = logSpy.mock.calls.findIndex((args) => args[0].includes("t1 ends"));
+    const t2Ends = logSpy.mock.calls.findIndex((args) => args[0].includes("t2 ends"));
+
+    expect(t2Ends).toBeGreaterThan(t1Ends);
+  });
+
+  test("wing test --parallel 2", async () => {
+    const outDir = await fsPromises.mkdtemp(join(tmpdir(), "-wing-batch-test"));
+
+    process.chdir(outDir);
+
+    fs.writeFileSync(
+      "t1.test.w",
+      `
+bring util;
+
+test "t1" {
+util.sleep(1s);
+log("t1 ends");
+assert(true);
+}
+  `
+    );
+    fs.writeFileSync(
+      "t2.test.w",
+      `
+bring util;
+
+test "t2" {
+  log("t2 ends");
+  assert(true);
+}
+  `
+    );
+
+    await wingTest(["t1.test.w", "t2.test.w"], {
+      clean: true,
+      platform: [BuiltinPlatform.SIM],
+      parallel: 2,
+    });
+    // we are running the tests in parallel so first t2 should log and then t1
+    const t2Ends = logSpy.mock.calls.findIndex((args) => args[0].includes("t2 ends"));
+    const t1Ends = logSpy.mock.calls.findIndex((args) => args[0].includes("t1 ends"));
+
+    expect(t2Ends).toBeLessThan(t1Ends);
   });
 });
 
@@ -292,6 +451,7 @@ const EXAMPLE_TEST_RESULTS: Array<TestResult> = [
       {
         data: { message: "Push (message=cool).", status: "success" },
         type: TraceType.RESOURCE,
+        level: LogLevel.VERBOSE,
         sourcePath: "root/env0/MyProcessor/cloud.Queue",
         sourceType: "@winglang/sdk.cloud.Queue",
         timestamp: "2023-05-15T16:20:46.886Z",
@@ -299,6 +459,7 @@ const EXAMPLE_TEST_RESULTS: Array<TestResult> = [
       {
         data: { message: "sleeping for 500 ms" },
         type: TraceType.LOG,
+        level: LogLevel.INFO,
         sourcePath: "root/env0/test:test/Handler",
         sourceType: "@winglang/sdk.cloud.Function",
         timestamp: "2023-05-15T16:20:46.887Z",
@@ -306,6 +467,7 @@ const EXAMPLE_TEST_RESULTS: Array<TestResult> = [
       {
         type: TraceType.RESOURCE,
         data: { message: 'Sending messages (messages=["cool"], subscriber=sim-4).' },
+        level: LogLevel.VERBOSE,
         sourcePath: "root/env0/MyProcessor/cloud.Queue",
         sourceType: "@winglang/sdk.cloud.Queue",
         timestamp: "2023-05-15T16:20:46.961Z",
@@ -313,10 +475,9 @@ const EXAMPLE_TEST_RESULTS: Array<TestResult> = [
       {
         data: {
           message: 'Invoke (payload="{\\"messages\\":[\\"cool\\"]}").',
-          status: "failure",
-          error: {},
         },
         type: TraceType.RESOURCE,
+        level: LogLevel.VERBOSE,
         sourcePath: "root/env0/MyProcessor/cloud.Queue-AddConsumer-0088483a",
         sourceType: "@winglang/sdk.cloud.Function",
         timestamp: "2023-05-15T16:20:46.966Z",
@@ -329,18 +490,21 @@ const EXAMPLE_TEST_RESULTS: Array<TestResult> = [
         sourcePath: "root/env0/MyProcessor/cloud.Queue",
         sourceType: "@winglang/sdk.cloud.Queue",
         type: TraceType.RESOURCE,
+        level: LogLevel.ERROR,
         timestamp: "2023-05-15T16:20:46.966Z",
       },
       {
-        data: { message: "Get (key=file.txt).", status: "failure", error: {} },
+        data: { message: "Get (key=file.txt)." },
         type: TraceType.RESOURCE,
-        sourcePath: "root/env0/MyProcessor/cloud.Bucket",
+        level: LogLevel.VERBOSE,
+        sourcePath: "root/env0/MyProcessor/Bucket",
         sourceType: "@winglang/sdk.cloud.Bucket",
         timestamp: "2023-05-15T16:20:47.388Z",
       },
       {
-        data: { message: 'Invoke (payload="").', status: "failure", error: {} },
+        data: { message: 'Invoke (payload="").' },
         type: TraceType.RESOURCE,
+        level: LogLevel.VERBOSE,
         sourcePath: "root/env0/test:test/Handler",
         sourceType: "@winglang/sdk.cloud.Function",
         timestamp: "2023-05-15T16:20:47.388Z",
@@ -367,17 +531,17 @@ const BUCKET_TEST_RESULT = [
       {
         data: { message: "Put (key=test1.txt).", status: "success" },
         type: "resource",
-        sourcePath: "root/env0/cloud.Bucket",
+        sourcePath: "root/env0/Bucket",
         sourceType: "@winglang/sdk.cloud.Bucket",
       },
       {
         data: { message: "Get (key=test1.txt).", status: "success", result: '"Foo"' },
         type: "resource",
-        sourcePath: "root/env0/cloud.Bucket",
+        sourcePath: "root/env0/Bucket",
         sourceType: "@winglang/sdk.cloud.Bucket",
       },
       {
-        data: { message: 'Invoke (payload="").', status: "success" },
+        data: { message: "Invoke (payload=undefined).", status: "success" },
         type: "resource",
         sourcePath: "root/env0/test:put/Handler",
         sourceType: "@winglang/sdk.cloud.Function",
@@ -399,7 +563,7 @@ const OUTPUT_FILE = {
               status: "success",
             },
             type: "resource",
-            sourcePath: "root/env0/cloud.Bucket",
+            sourcePath: "root/env0/Bucket",
             sourceType: "@winglang/sdk.cloud.Bucket",
           },
           {
@@ -409,12 +573,12 @@ const OUTPUT_FILE = {
               result: '"Foo"',
             },
             type: "resource",
-            sourcePath: "root/env0/cloud.Bucket",
+            sourcePath: "root/env0/Bucket",
             sourceType: "@winglang/sdk.cloud.Bucket",
           },
           {
             data: {
-              message: 'Invoke (payload="").',
+              message: "Invoke (payload=undefined).",
               status: "success",
             },
             type: "resource",
@@ -429,12 +593,6 @@ const OUTPUT_FILE = {
 
 const EXAMPLE_UNFILTERED_TESTS: string[] = [
   "root/env0/test:get()",
-  "root/env0/test:get:At()",
-  "root/env0/test:stringify()",
-  "root/env1/test:get()",
   "root/env1/test:get:At()",
-  "root/env1/test:stringify()",
-  "root/env2/test:get()",
-  "root/env2/test:get:At()",
   "root/env2/test:stringify()",
 ];
diff --git a/apps/wing/src/commands/test/test.ts b/apps/wing/src/commands/test/test.ts
index f6247adb5ac..195dbb9eee0 100644
--- a/apps/wing/src/commands/test/test.ts
+++ b/apps/wing/src/commands/test/test.ts
@@ -1,9 +1,11 @@
 import * as cp from "child_process";
-import { readFile, rm, rmSync } from "fs";
-import { basename, resolve, sep } from "path";
+import { existsSync, readFile, readFileSync, realpathSync, rm, rmSync, statSync } from "fs";
+import { basename, join, relative, resolve } from "path";
 import { promisify } from "util";
+import { PromisePool } from "@supercharge/promise-pool";
 import { BuiltinPlatform, determineTargetFromPlatforms } from "@winglang/compiler";
 import { std, simulator } from "@winglang/sdk";
+import { LogLevel } from "@winglang/sdk/lib/std";
 import { Util } from "@winglang/sdk/lib/util";
 import { prettyPrintError } from "@winglang/sdk/lib/util/enhanced-error";
 import chalk from "chalk";
@@ -11,19 +13,20 @@ import debug from "debug";
 import { glob } from "glob";
 import { nanoid } from "nanoid";
 import { printResults, validateOutputFilePath, writeResultsToFile } from "./results";
-import { withSpinner, normalPath } from "../../util";
+import { SnapshotMode, SnapshotResult, captureSnapshot, determineSnapshotMode } from "./snapshots";
+import { SNAPSHOT_ERROR_PREFIX } from "./snapshots-help";
+import { TraceProcessor } from "./trace-processor";
+import { renderTestName } from "./util";
+import { withSpinner } from "../../util";
 import { compile, CompileOptions } from "../compile";
+import { SpinnerStream } from "../spinner-stream";
 
 const log = debug("wing:test");
 
 const ENV_WING_TEST_RUNNER_FUNCTION_IDENTIFIERS = "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS";
 const ENV_WING_TEST_RUNNER_FUNCTION_IDENTIFIERS_AWSCDK = "WingTestRunnerFunctionArns";
 
-/**
- * @param path path to the test/s file
- * @returns the file name and parent dir in the following format: "folder/file.ext"
- */
-const generateTestName = (path: string) => path.split(sep).slice(-2).join("/");
+const PARALLELISM = { [BuiltinPlatform.TF_AZURE]: 5 };
 
 /**
  * Options for the `test` command.
@@ -32,56 +35,117 @@ export interface TestOptions extends CompileOptions {
   /**
    * Whether the output artifacts should be kept or cleaned up after the test run.
    */
-  clean: boolean;
+  readonly clean: boolean;
   /**
    * The name of the output file.
    */
-  outputFile?: string;
+  readonly outputFile?: string;
   /**
    * String representing a regex pattern used to selectively filter which tests to run.
    */
-  testFilter?: string;
+  readonly testFilter?: string;
+  /**
+   * How many times failed tests should be retried. default is one
+   */
+  readonly retry?: number;
+  /**
+   * Whether to stream the logs of the test run.
+   */
+  readonly stream?: boolean;
+
+  /**
+   * Determine snapshot behavior.
+   */
+  readonly snapshots?: SnapshotMode;
+
   /**
-   * How many times failed tests should be retried.
+   * Number of tests to be run in parallel. 0 or undefined will run all at once.
    */
-  retry?: number;
+  readonly parallel?: number;
 }
 
-export async function test(entrypoints: string[], options: TestOptions): Promise<number> {
-  let patterns;
+const TEST_FILE_PATTERNS = ["**/*.test.w", "**/{main,*.main}.{w,ts}"];
+const TEST_FILE_IGNORE = ["**/node_modules/**", "**/target/**"];
 
-  if (options.outputFile) {
-    validateOutputFilePath(options.outputFile);
+/**
+ * Collects all the test files that should be run.
+ * If no entrypoints are specified, all the entrypoint files in the current directory (recursive) are collected.
+ * This excludes node_modules and target directories.
+ *
+ * If entrypoints are specified, only the files that contain the entrypoint string are collected.
+ */
+export async function collectTestFiles(entrypoints: string[] = []): Promise<string[]> {
+  const expandedEntrypoints = await glob(TEST_FILE_PATTERNS, {
+    ignore: TEST_FILE_IGNORE,
+    absolute: false,
+    posix: true,
+  });
+
+  // check if any of the entrypoints are exact files
+  const exactEntrypoints = entrypoints.filter(
+    (e) => statSync(e, { throwIfNoEntry: false })?.isFile() === true
+  );
+  const fuzzyEntrypoints = entrypoints.filter((e) => !exactEntrypoints.includes(e));
+
+  let finalEntrypoints: string[] = exactEntrypoints;
+  if (fuzzyEntrypoints.length > 0) {
+    // if entrypoints are specified, filter the expanded entrypoints to ones that contain them
+    finalEntrypoints = finalEntrypoints.concat(
+      expandedEntrypoints.filter((e) => fuzzyEntrypoints.some((f) => e.includes(f)))
+    );
+  } else if (exactEntrypoints.length === 0) {
+    finalEntrypoints = finalEntrypoints.concat(expandedEntrypoints);
   }
 
-  if (entrypoints.length === 0) {
-    patterns = ["*.test.w"];
-  } else {
-    patterns = entrypoints.map((entrypoint) => normalPath(entrypoint));
+  // dedupe based on real path, then get all paths as relative to cwd
+  const cwd = process.cwd();
+  return [...new Set(finalEntrypoints.map((e) => realpathSync(e)))].map((e) => relative(cwd, e));
+}
+
+export async function test(entrypoints: string[], options: TestOptions): Promise<number> {
+  if (options.outputFile) {
+    validateOutputFilePath(options.outputFile);
   }
 
-  const expandedEntrypoints = await glob(patterns);
-  if (expandedEntrypoints.length === 0) {
-    throw new Error(`No matching files found for patterns: [${patterns.join(", ")}]`);
+  const selectedEntrypoints = await collectTestFiles(entrypoints);
+  if (selectedEntrypoints.length === 0) {
+    throw new Error(`No matching test or entrypoint files found: [${entrypoints.join(", ")}]`);
   }
 
   const startTime = Date.now();
-  const results: { testName: string; results: std.TestResult[] }[] = [];
+  const results: SingleTestResult[] = [];
   process.env.WING_TARGET = determineTargetFromPlatforms(options.platform ?? []);
-  const testFile = async (entrypoint: string) => {
-    const testName = generateTestName(entrypoint);
+  const testFile = async (
+    entrypoint: string,
+    retries: number = options.retry || 1
+  ): Promise<void> => {
+    const testName = renderTestName(entrypoint);
     try {
-      const singleTestResults: std.TestResult[] | void = await testOne(entrypoint, options);
-      results.push({ testName, results: singleTestResults ?? [] });
+      const singleTestResults = await testOne(testName, entrypoint, options);
+      if (singleTestResults.results.some((t) => !t.pass) && retries > 1) {
+        console.log(`Retrying failed tests. ${retries - 1} retries left.`);
+        return await testFile(entrypoint, retries - 1);
+      }
+      results.push(singleTestResults);
     } catch (error: any) {
       console.log(error.message);
+      if (retries > 1) {
+        console.log(`Retrying failed tests. ${retries - 1} retries left.`);
+        return await testFile(entrypoint, retries - 1);
+      }
+      const snapshot = error.message?.startsWith(SNAPSHOT_ERROR_PREFIX)
+        ? SnapshotResult.MISMATCH
+        : SnapshotResult.SKIPPED;
       results.push({
-        testName: generateTestName(entrypoint),
+        testName,
+        snapshot,
         results: [
           {
             pass: false,
             unsupported: error.name === "NotImplementedError",
-            path: "",
+            unsupportedResource: (error as any).resource,
+            unsupportedOperation: (error as any).operation,
+            path: "*",
             error: error.message,
             traces: [],
           },
@@ -89,11 +153,15 @@ export async function test(entrypoints: string[], options: TestOptions): Promise
       });
     }
   };
-  await Promise.all(expandedEntrypoints.map(testFile));
+
+  await PromisePool.withConcurrency(options.parallel || selectedEntrypoints.length)
+    .for(selectedEntrypoints)
+    .process((entrypointFile) => testFile(entrypointFile));
+
   const testDuration = Date.now() - startTime;
   printResults(results, testDuration);
   if (options.outputFile) {
-    await writeResultsToFile(results, testDuration, options.outputFile);
+    await writeResultsToFile(results, testDuration, options.outputFile, options.platform);
   }
 
   // if we have any failures, exit with 1
@@ -108,18 +176,59 @@ export async function test(entrypoints: string[], options: TestOptions): Promise
   return 0;
 }
 
-async function testOne(entrypoint: string, options: TestOptions) {
-  const target = process.env.WING_TARGET; // TODO: try to just call method
-  const synthDir = await withSpinner(
-    `Compiling ${generateTestName(entrypoint)} to ${target}...`,
-    async () =>
-      compile(entrypoint, {
-        ...options,
-        rootId: options.rootId ?? `Test.${nanoid(10)}`,
-        testing: true,
-      })
-  );
+export type SingleTestResult = {
+  readonly testName: string;
+  readonly results: std.TestResult[];
+  readonly snapshot: SnapshotResult;
+};
 
+async function testOne(
+  testName: string,
+  entrypoint: string,
+  options: TestOptions
+): Promise<SingleTestResult> {
+  const target = determineTargetFromPlatforms(options.platform);
+
+  // determine snapshot behavior
+  const snapshotMode = determineSnapshotMode(target, options);
+  const shouldExecute = snapshotMode === SnapshotMode.NEVER || snapshotMode === SnapshotMode.DEPLOY;
+
+  let results: std.TestResult[] = [];
+  if (shouldExecute) {
+    const synthDir = await withSpinner(
+      `Compiling ${renderTestName(entrypoint)} to ${target}...`,
+      async () =>
+        compile(entrypoint, {
+          ...options,
+          rootId: options.rootId ?? `Test.${nanoid(10)}`,
+          testing: true,
+        })
+    );
+
+    results = await executeTest(synthDir, target, options);
+  }
+
+  // if one of the tests failed, return the results without updating any snapshots.
+  const success = !results.some((r) => !r.pass);
+  let snapshot = SnapshotResult.SKIPPED;
+
+  // if all tests pass, capture snapshots
+  if (success) {
+    snapshot = await captureSnapshot(entrypoint, target, options);
+  }
+
+  return {
+    testName,
+    results: results,
+    snapshot,
+  };
+}
+
+async function executeTest(
+  synthDir: string,
+  target: string | undefined,
+  options: TestOptions
+): Promise<std.TestResult[]> {
   switch (target) {
     case BuiltinPlatform.SIM:
       return testSimulator(synthDir, options);
@@ -139,7 +248,8 @@ async function testOne(entrypoint: string, options: TestOptions) {
  */
 export async function renderTestReport(
   entrypoint: string,
-  results: std.TestResult[]
+  results: std.TestResult[],
+  includeLogs: boolean = true
 ): Promise<string> {
   const out = new Array<string>();
 
@@ -164,13 +274,12 @@ export async function renderTestReport(
 
     const details = new Array<string>();
 
-    // add any log messages that were emitted during the test
-    for (const trace of result.traces) {
-      // only show detailed traces if we are in debug mode
-      if (trace.type === "resource" && process.env.DEBUG) {
-        details.push(chalk.gray("[trace] " + trace.data.message));
-      }
-      if (trace.type === "log") {
+    if (includeLogs) {
+      for (const trace of result.traces) {
+        if (shouldSkipTrace(trace)) {
+          continue;
+        }
+
         details.push(chalk.gray(trace.data.message));
       }
     }
@@ -243,69 +352,200 @@ export function filterTests(tests: Array<string>, regexString?: string): Array<s
   }
 }
 
-async function runTestsWithRetry(
+async function runTests(
   testRunner: std.ITestRunnerClient,
-  tests: string[],
-  retries: number
+  tests: string[]
 ): Promise<std.TestResult[]> {
-  let runCount = retries + 1;
-  let remainingTests = tests;
   const results: std.TestResult[] = [];
 
-  while (runCount > 0 && remainingTests.length > 0) {
-    const failedTests: string[] = [];
+  for (const testPath of tests) {
+    const result = await testRunner.runTest(testPath);
+    results.push(result);
+  }
 
-    for (const testPath of remainingTests) {
-      const result = await testRunner.runTest(testPath);
-      results.push(result);
+  return results;
+}
 
-      if (!result.pass) {
-        failedTests.push(testPath);
-      }
-    }
+const SEVERITY_STRING = {
+  [LogLevel.ERROR]: "[ERROR]",
+  [LogLevel.WARNING]: "[WARNING]",
+  [LogLevel.INFO]: "[INFO]",
+  [LogLevel.VERBOSE]: "[VERBOSE]",
+};
 
-    remainingTests = failedTests;
+const LOG_STREAM_COLORS = {
+  [LogLevel.ERROR]: chalk.red,
+  [LogLevel.WARNING]: chalk.yellow,
+  [LogLevel.INFO]: chalk.green,
+  [LogLevel.VERBOSE]: chalk.gray,
+};
 
-    if (remainingTests.length > 0 && runCount > 1) {
-      console.log(`Retrying failed tests. ${runCount - 1} retries left.`);
+async function formatTrace(
+  trace: std.Trace,
+  testName: string,
+  mode: "short" | "full"
+): Promise<string> {
+  const level = trace.level;
+  const date = new Date(trace.timestamp);
+  const hours = date.getHours().toString().padStart(2, "0");
+  const minutes = date.getMinutes().toString().padStart(2, "0");
+  const seconds = date.getSeconds().toString().padStart(2, "0");
+  const milliseconds = date.getMilliseconds().toString().padStart(3, "0");
+  const timestamp = `${hours}:${minutes}:${seconds}.${milliseconds}`;
+
+  let msg = "";
+  if (mode === "full") {
+    msg += chalk.dim(`[${timestamp}]`);
+    msg += LOG_STREAM_COLORS[level](` ${SEVERITY_STRING[level]}`);
+    msg += chalk.dim(` ${testName} » ${trace.sourcePath}`);
+    msg += "\n";
+    if (level === LogLevel.ERROR) {
+      msg += await prettyPrintError(trace.data.error ?? trace.data.message ?? trace.data, {
+        chalk,
+      });
+    } else {
+      msg += trace.data.message;
     }
-
-    runCount--;
+    msg += "\n\n";
+    return msg;
+  } else if (mode === "short") {
+    msg += LOG_STREAM_COLORS[level](`${SEVERITY_STRING[level]}`);
+    msg += chalk.dim(` ${testName} | `);
+    if (level === LogLevel.ERROR) {
+      msg += await prettyPrintError(trace.data.error ?? trace.data.message ?? trace.data, {
+        chalk,
+      });
+    } else {
+      msg += trace.data.message;
+    }
+    msg += "\n";
+    return msg;
+  } else {
+    throw new Error(`Unknown mode: ${mode}`);
   }
+}
 
-  return results;
+function shouldSkipTrace(trace: std.Trace): boolean {
+  switch (trace.level) {
+    // show VERBOSE only in debug mode
+    case LogLevel.VERBOSE:
+      return !process.env.DEBUG;
+
+    // show INFO, WARNING, ERROR in all cases
+    case LogLevel.INFO:
+    case LogLevel.WARNING:
+    case LogLevel.ERROR:
+      return false;
+  }
 }
 
 async function testSimulator(synthDir: string, options: TestOptions) {
   const s = new simulator.Simulator({ simfile: synthDir });
-  const { clean, testFilter, retry } = options;
-  await s.start();
+  const { clean, testFilter } = options;
+
+  let outputStream: SpinnerStream | undefined;
+  let traceProcessor: TraceProcessor | undefined;
+
+  if (options.stream) {
+    // As of this comment, each Wing test is associated with an isolated environment.
+    // (All resources for test #0 are in root/env0/..., etc.)
+    // This means we can use the environment number to map each environment # to a test name,
+    // so when we receive a trace from the simulator, we can infer which test it's associated with.
+    const testMappings = extractTestMappings(s.listResources());
+
+    const printEvent = async (event: std.Trace) => {
+      const env = extractTestEnvFromPath(event.sourcePath);
+
+      let testName = "(no test)";
+      if (env !== undefined) {
+        testName = testMappings[env] ?? testName;
+      }
+
+      if (testFilter && !testName.includes(testFilter) && testName !== "(no test)") {
+        // This test does not match the filter, so skip it.
+        return;
+      }
+
+      if (shouldSkipTrace(event)) {
+        return;
+      }
+
+      const formatStyle = process.env.DEBUG ? "full" : "short";
+      const formatted = await formatTrace(event, testName, formatStyle);
+      outputStream!.write(formatted);
+    };
+
+    // The simulator emits events synchronously, but formatting them needs to
+    // happen asynchronously since e.g. files have to be read to format stack
+    // traces. If we performed this async work inside of the `onTrace` callback,
+    // we might end up with out-of-order traces, or traces getting printed (or
+    // dropped) after the test has finished. TraceProcessor allows events to be
+    // added to a queue and processed serially, and provides a way to safely
+    // "await" the completion of the processing.
+    traceProcessor = new TraceProcessor((event) => printEvent(event));
+
+    // SpinnerStream is responsible for taking in lines of text and streaming
+    // them to a TTY with a spinner, making sure to clear and re-print the
+    // spinner when new lines are added.
+    outputStream = new SpinnerStream(process.stdout, "Running tests...");
+
+    s.onTrace({
+      callback: (event) => {
+        traceProcessor!.addEvent(event);
+      },
+    });
+  }
+
+  try {
+    await s.start();
+  } catch (e) {
+    outputStream?.stopSpinner();
+    throw e;
+  }
 
   const testRunner = s.getResource("root/cloud.TestRunner") as std.ITestRunnerClient;
   const tests = await testRunner.listTests();
-  const filteredTests = pickOneTestPerEnvironment(filterTests(tests, testFilter));
+  const filteredTests = filterTests(tests, testFilter);
 
-  const results = await runTestsWithRetry(testRunner, filteredTests, retry ?? 0);
+  const results = await runTests(testRunner, filteredTests);
 
   await s.stop();
 
-  const testReport = await renderTestReport(synthDir, results);
-  console.log(testReport);
+  if (options.stream) {
+    await traceProcessor!.finish();
+    outputStream!.stopSpinner();
+  }
+
+  const testReport = await renderTestReport(synthDir, results, !options.stream);
+  if (testReport.length > 0) {
+    console.log(testReport);
+  }
+
+  let args: { methods: Record<string, Record<string, string>> };
+  if (existsSync(join(synthDir, "usage_context.json"))) {
+    args = { methods: JSON.parse(readFileSync(join(synthDir, "usage_context.json")).toString()) };
+  }
 
   if (clean) {
-    rmSync(synthDir, { recursive: true, force: true });
+    try {
+      rmSync(synthDir, { recursive: true, force: true });
+    } catch (err) {
+      console.warn(`Warning: unable to clean up test directory: ${err}`);
+    }
   } else {
     noCleanUp(synthDir);
   }
 
-  return results;
+  return results.map((r) => ({ ...r, args }));
 }
 
-async function testTf(synthDir: string, options: TestOptions): Promise<std.TestResult[] | void> {
-  const { clean, testFilter, retry, platform = [BuiltinPlatform.SIM] } = options;
+async function testTf(synthDir: string, options: TestOptions): Promise<std.TestResult[]> {
+  const { clean, testFilter, platform = [BuiltinPlatform.SIM] } = options;
+  let tfParallelism = PARALLELISM[platform[0]];
 
   try {
-    if (!isTerraformInstalled(synthDir)) {
+    const installed = await isTerraformInstalled(synthDir);
+    if (!installed) {
       throw new Error(
         "Terraform is not installed. Please install Terraform to run tests in the cloud."
       );
@@ -313,7 +553,7 @@ async function testTf(synthDir: string, options: TestOptions): Promise<std.TestR
 
     await withSpinner("terraform init", async () => terraformInit(synthDir));
 
-    await withSpinner("terraform apply", () => terraformApply(synthDir));
+    await withSpinner("terraform apply", () => terraformApply(synthDir, tfParallelism));
 
     const [testRunner, tests] = await withSpinner("Setting up test runner...", async () => {
       const target = determineTargetFromPlatforms(platform);
@@ -324,28 +564,35 @@ async function testTf(synthDir: string, options: TestOptions): Promise<std.TestR
       const runner = new TestRunnerClient(testArns);
 
       const allTests = await runner.listTests();
-      const filteredTests = pickOneTestPerEnvironment(filterTests(allTests, testFilter));
+      const filteredTests = filterTests(allTests, testFilter);
       return [runner, filteredTests];
     });
 
     const results = await withSpinner("Running tests...", async () => {
-      return runTestsWithRetry(testRunner, tests, retry ?? 0);
+      return runTests(testRunner, tests);
     });
 
     const testReport = await renderTestReport(synthDir, results);
-    console.log(testReport);
+    if (testReport.length > 0) {
+      console.log(testReport);
+    }
 
     if (testResultsContainsFailure(results)) {
       console.log("One or more tests failed. Cleaning up resources...");
     }
 
-    return results;
+    let args: { methods: Record<string, Record<string, string>> };
+    if (existsSync(join(synthDir, "usage_context.json"))) {
+      args = { methods: JSON.parse(readFileSync(join(synthDir, "usage_context.json")).toString()) };
+    }
+
+    return results.map((r) => ({ ...r, args }));
   } catch (err) {
     console.warn((err as Error).message);
     return [{ pass: false, path: "", error: (err as Error).message, traces: [] }];
   } finally {
     if (clean) {
-      await cleanupTf(synthDir);
+      await cleanupTf(synthDir, tfParallelism);
     } else {
       noCleanUp(synthDir);
     }
@@ -353,7 +600,7 @@ async function testTf(synthDir: string, options: TestOptions): Promise<std.TestR
 }
 
 async function testAwsCdk(synthDir: string, options: TestOptions): Promise<std.TestResult[]> {
-  const { clean, testFilter, retry } = options;
+  const { clean, testFilter } = options;
   try {
     await isAwsCdkInstalled(synthDir);
 
@@ -374,16 +621,18 @@ async function testAwsCdk(synthDir: string, options: TestOptions): Promise<std.T
       const runner = new TestRunnerClient(testArns);
 
       const allTests = await runner.listTests();
-      const filteredTests = pickOneTestPerEnvironment(filterTests(allTests, testFilter));
+      const filteredTests = filterTests(allTests, testFilter);
       return [runner, filteredTests];
     });
 
     const results = await withSpinner("Running tests...", async () => {
-      return runTestsWithRetry(testRunner, tests, retry ?? 0);
+      return runTests(testRunner, tests);
     });
 
     const testReport = await renderTestReport(synthDir, results);
-    console.log(testReport);
+    if (testReport.length > 0) {
+      console.log(testReport);
+    }
 
     if (testResultsContainsFailure(results)) {
       console.log("One or more tests failed. Cleaning up resources...");
@@ -442,9 +691,13 @@ const targetFolder: Record<string, string> = {
   [BuiltinPlatform.TF_GCP]: "shared-gcp",
 };
 
-async function cleanupTf(synthDir: string) {
-  await withSpinner("terraform destroy", () => terraformDestroy(synthDir));
-  rmSync(synthDir, { recursive: true, force: true });
+async function cleanupTf(synthDir: string, parallelism?: number) {
+  try {
+    await withSpinner("terraform destroy", () => terraformDestroy(synthDir, parallelism));
+    rmSync(synthDir, { recursive: true, force: true });
+  } catch (e) {
+    console.error(e);
+  }
 }
 
 async function isTerraformInstalled(synthDir: string) {
@@ -456,12 +709,20 @@ export async function terraformInit(synthDir: string) {
   return execCapture("terraform init", { cwd: synthDir });
 }
 
-async function terraformApply(synthDir: string) {
-  return execCapture("terraform apply -auto-approve", { cwd: synthDir });
+async function terraformApply(synthDir: string, parallelism?: number) {
+  return execCapture(
+    `terraform apply -auto-approve ${parallelism ? `-parallelism=${parallelism}` : ""}`,
+    { cwd: synthDir }
+  );
 }
 
-async function terraformDestroy(synthDir: string) {
-  return execCapture("terraform destroy -auto-approve", { cwd: synthDir });
+async function terraformDestroy(synthDir: string, parallelism?: number) {
+  return execCapture(
+    `terraform destroy -auto-approve ${parallelism ? `-parallelism=${parallelism}` : ""}`,
+    {
+      cwd: synthDir,
+    }
+  );
 }
 
 async function terraformOutput(synthDir: string, name: string) {
@@ -473,50 +734,6 @@ async function terraformOutput(synthDir: string, name: string) {
   return parsed[name].value;
 }
 
-export function pickOneTestPerEnvironment(testPaths: string[]) {
-  // Given a list of test paths like so:
-  //
-  // root/Default/env0/a/b/test:test1
-  // root/Default/env0/d/e/f/test:test2
-  // root/Default/env0/g/test:test3
-  // root/Default/env1/a/b/test:test1
-  // root/Default/env1/d/e/f/test:test2
-  // root/Default/env1/g/test:test3
-  // root/Default/env2/a/b/test:test1
-  // root/Default/env2/d/e/f/test:test2
-  // root/Default/env2/g/test:test3
-  //
-  // This function returns a list of test paths which uses each test name
-  // exactly once and each "env" exactly once. In this case, the result would
-  // be:
-  //
-  // root/Default/env0/a/b/test:test1
-  // root/Default/env1/d/e/f/test:test2
-  // root/Default/env2/g/test:test3
-
-  const tests = new Map<string, string>();
-  const envs = new Set<string>();
-
-  for (const testPath of testPaths) {
-    const testSuffix = testPath.substring(testPath.indexOf("env") + 1); // "<env #>/<path to test>"
-    const env = testSuffix.substring(0, testSuffix.indexOf("/")); // "<env #>"
-    const testName = testSuffix.substring(testSuffix.indexOf("/") + 1); // "<path to test>"
-
-    if (envs.has(env)) {
-      continue;
-    }
-
-    if (tests.has(testName)) {
-      continue;
-    }
-
-    tests.set(testName, testPath);
-    envs.add(env);
-  }
-
-  return Array.from(tests.values());
-}
-
 function sortTests(a: std.TestResult, b: std.TestResult) {
   if (a.pass && !b.pass) {
     return -1;
@@ -527,6 +744,62 @@ function sortTests(a: std.TestResult, b: std.TestResult) {
   return a.path.localeCompare(b.path);
 }
 
+/**
+ * Take a path like "root/env123/foo/bar" and return the environment number (123).
+ */
+function extractTestEnvFromPath(path: string): number | undefined {
+  const parts = path.split("/");
+  const envPart = parts[1] ?? parts[0];
+  if (!envPart.startsWith("env")) {
+    return undefined;
+  }
+  return parseInt(envPart.substring(3));
+}
+
+/*
+ * Take a path like "root/env123/foo/test:first test/bar" and return "first test".
+ */
+function extractTestNameFromPath(path: string): string | undefined {
+  const parts = path.split("/");
+  for (const part of parts) {
+    if (part.startsWith("test:")) {
+      return part.substring(5);
+    }
+  }
+  return undefined;
+}
+
+/*
+ * Take a list of paths like:
+ *
+ * root/env0/foo
+ * root/env0/test:first test        <-- this is a test
+ * root/env1/bar/test:second test   <-- this is a test
+ * root/env1/bar
+ *
+ * and extract the mapping from environment indices to test names:
+ *
+ * { 0: "first test", 1: "second test" }
+ */
+function extractTestMappings(paths: string[]): Record<number, string> {
+  const mappings: Record<number, string> = {};
+  for (const path of paths) {
+    const parts = path.split("/");
+    if (parts.some((p) => p.startsWith("test:"))) {
+      const env = extractTestEnvFromPath(path);
+      if (env === undefined) {
+        continue;
+      }
+      const testName = extractTestNameFromPath(path);
+      if (testName === undefined) {
+        continue;
+      }
+      mappings[env] = testName;
+    }
+  }
+  return mappings;
+}
+
 const MAX_BUFFER = 10 * 1024 * 1024;
 
 /**
diff --git a/apps/wing/src/commands/test/trace-processor.ts b/apps/wing/src/commands/test/trace-processor.ts
new file mode 100644
index 00000000000..a25d092107b
--- /dev/null
+++ b/apps/wing/src/commands/test/trace-processor.ts
@@ -0,0 +1,56 @@
+import { std } from "@winglang/sdk";
+
+export class TraceProcessor {
+  private readonly eventQueue: Array<std.Trace>;
+  private processing: boolean;
+  private simulationComplete: boolean;
+  private printTrace: (event: std.Trace) => Promise<void>;
+  private resolveCompletion: ((value: unknown) => void) | null;
+
+  constructor(printTrace: (event: std.Trace) => Promise<void>) {
+    this.eventQueue = [];
+    this.processing = false;
+    this.simulationComplete = false;
+    this.resolveCompletion = null;
+    this.printTrace = printTrace;
+  }
+
+  // Sync method to add events to the queue
+  public addEvent(event: std.Trace) {
+    this.eventQueue.push(event);
+    void this.processEvents();
+  }
+
+  // Async method to process events
+  public async processEvents() {
+    // Check if already processing to avoid race conditions
+    if (this.processing) return;
+    this.processing = true;
+
+    // Process each event in the queue serially
+    while (this.eventQueue.length > 0) {
+      const event = this.eventQueue.shift();
+      await this.printTrace(event!);
+    }
+
+    this.processing = false;
+
+    // Check if simulation has ended and queue is empty
+    if (this.simulationComplete && this.eventQueue.length === 0) {
+      this.resolveCompletion?.(undefined);
+    }
+  }
+
+  // Method to call once the simulator has ended to wait for all processing to complete
+  public finish() {
+    this.simulationComplete = true;
+    void this.processEvents(); // Trigger processing in case it was idle
+    if (this.eventQueue.length > 0 || this.processing) {
+      return new Promise((resolve) => {
+        this.resolveCompletion = resolve;
+      });
+    } else {
+      return Promise.resolve();
+    }
+  }
+}
diff --git a/apps/wing/src/commands/test/util.ts b/apps/wing/src/commands/test/util.ts
new file mode 100644
index 00000000000..9c838ba2b16
--- /dev/null
+++ b/apps/wing/src/commands/test/util.ts
@@ -0,0 +1,7 @@
+import { sep } from "path";
+
+/**
+ * @param path path to the test/s file
+ * @returns the file name and parent dir in the following format: "folder/file.ext"
+ */
+export const renderTestName = (path: string) => path.split(sep).slice(-2).join("/");
diff --git a/apps/wing/src/env.ts b/apps/wing/src/env.ts
index 250bd5b5259..f3198d10cc7 100644
--- a/apps/wing/src/env.ts
+++ b/apps/wing/src/env.ts
@@ -11,12 +11,6 @@ export interface EnvLoadOptions {
    * @default process.cwd()
    */
   cwd?: string;
-
-  /**
-   * The mode to load additional environment variables from.
-   * e.g. "wing compile" has mode "compile", which will load ".env.compile" and ".env.compile.local".
-   */
-  mode?: string;
 }
 
 /**
@@ -24,9 +18,7 @@ export interface EnvLoadOptions {
  */
 export function loadEnvVariables(options?: EnvLoadOptions): Record<string, string> | undefined {
   const envDir = options?.cwd ?? process.cwd();
-  const envFiles = DEFAULT_ENV_FILES.concat(
-    options?.mode ? [`.env.${options.mode}`, `.env.${options.mode}.local`] : []
-  ).map((file) => join(envDir, file));
+  const envFiles = DEFAULT_ENV_FILES.map((file) => join(envDir, file));
 
   // Parse `envFiles` and combine their variables into a single object
   const parsed = Object.fromEntries(
diff --git a/apps/wing/src/util.before-shutdown.ts b/apps/wing/src/util.before-shutdown.ts
new file mode 100644
index 00000000000..0ada1f8d235
--- /dev/null
+++ b/apps/wing/src/util.before-shutdown.ts
@@ -0,0 +1,93 @@
+import once from "lodash.once";
+
+/**
+ * Based on https://gist.github.com/nfantone/1eaa803772025df69d07f4dbf5df7e58.
+ */
+type BeforeShutdownListener = (codeOrSignal: string | number) => Promise<void> | void;
+
+/**
+ * Time in milliseconds to wait before forcing shutdown.
+ */
+const SHUTDOWN_TIMEOUT = 15_000;
+
+/**
+ * Signals/Events that trigger the shutdown process.
+ */
+const HANDLED_SIGNALS: (NodeJS.Signals | "beforeExit")[] = [
+  "beforeExit",
+  "SIGINT",
+  "SIGTERM",
+  "SIGHUP",
+];
+
+/**
+ * A queue of listener callbacks to execute before shutting
+ * down the process.
+ */
+const shutdownListeners: BeforeShutdownListener[] = [];
+
+/**
+ * Listen for signals and execute given `fn` function once.
+ * @param  fn Function to execute on shutdown.
+ */
+const processOnce = (fn: BeforeShutdownListener) => {
+  const onceFn = once(fn);
+  HANDLED_SIGNALS.forEach((signal) => process.on(signal, (s) => void onceFn(s)));
+};
+
+/**
+ * Sets a forced shutdown mechanism that will exit the process after `timeout` milliseconds.
+ * @param timeout Time to wait before forcing shutdown (milliseconds)
+ */
+const forceExitAfter = (timeout: number) => () => {
+  setTimeout(() => {
+    // Force shutdown after timeout
+    console.warn(`Could not close resources gracefully after ${timeout}ms: forcing shutdown`);
+    return process.exit(1);
+  }, timeout).unref();
+};
+
+/**
+ * Main process shutdown handler. Will invoke every previously registered async shutdown listener
+ * in the queue and exit with a code of `0`. Any `Promise` rejections from any listener will
+ * be logged out as a warning, but won't prevent other callbacks from executing.
+ */
+async function shutdownHandler(codeOrSignal: string | number) {
+  for (const listener of shutdownListeners) {
+    try {
+      await listener(codeOrSignal);
+    } catch (error) {
+      console.warn(
+        `A shutdown handler failed before completing with: ${
+          error instanceof Error ? error.message : error
+        }`
+      );
+    }
+  }
+
+  if (typeof codeOrSignal === "string") {
+    process.exit();
+  } else {
+    process.exit(codeOrSignal);
+  }
+}
+
+/**
+ * Registers a new shutdown listener to be invoked before exiting
+ * the main process. Listener handlers are guaranteed to be called in the order
+ * they were registered.
+ * @param listener The shutdown listener to register.
+ * @returns Echoes back the supplied `listener`.
+ */
+export function beforeShutdown(listener: BeforeShutdownListener) {
+  shutdownListeners.push(listener);
+  return listener;
+}
+
+// Register shutdown callback that kills the process after `SHUTDOWN_TIMEOUT` milliseconds
+// This prevents custom shutdown handlers from hanging the process indefinitely
+processOnce(forceExitAfter(SHUTDOWN_TIMEOUT));
+
+// Register process shutdown callback
+// Will listen to incoming signal events and execute all registered handlers in the stack
+processOnce(shutdownHandler);
diff --git a/apps/wing/src/util.test.ts b/apps/wing/src/util.test.ts
new file mode 100644
index 00000000000..2e3a36b0d1d
--- /dev/null
+++ b/apps/wing/src/util.test.ts
@@ -0,0 +1,44 @@
+import { describe, test, expect } from "vitest";
+import { flattenObject } from "./util";
+
+describe("flattenObject", () => {
+  test("flattening an empty object", () => {
+    expect(flattenObject({})).toEqual({});
+  });
+
+  test("flattening object with two levels of nesting", () => {
+    expect(flattenObject({ a: { a: "b", c: "a" }, n: { a: 1 }, b: "b" })).toEqual({
+      a_a: "b",
+      a_c: "a",
+      b: "b",
+      n_a: 1,
+    });
+  });
+
+  test("flattening object with two levels of nesting", () => {
+    expect(flattenObject({ a: { a: "b", c: "a", d: { e: "f" } }, n: { a: 1 }, b: "b" })).toEqual({
+      a_a: "b",
+      a_c: "a",
+      b: "b",
+      a_d_e: "f",
+      n_a: 1,
+    });
+  });
+
+  test("flattening an empty", () => {
+    expect(flattenObject({ a: [] })).toEqual({});
+  });
+
+  test("flattening array with two levels of nesting", () => {
+    expect(flattenObject({ a: ["a", { b: "c" }] })).toEqual({ a_0: "a", a_1_b: "c" });
+  });
+
+  test("flattening object with three levels of nesting", () => {
+    expect(flattenObject({ a: ["a", { b: "c", d: ["e", { f: "g" }] }] })).toEqual({
+      a_0: "a",
+      a_1_b: "c",
+      a_1_d_0: "e",
+      a_1_d_1_f: "g",
+    });
+  });
+});
diff --git a/apps/wing/src/util.ts b/apps/wing/src/util.ts
index 0633c90a007..d94ac820f9a 100644
--- a/apps/wing/src/util.ts
+++ b/apps/wing/src/util.ts
@@ -1,9 +1,12 @@
 import * as cp from "child_process";
-import { copyFileSync, promises as fsPromise } from "fs";
+import { readdirSync } from "fs";
+import * as fs from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
 import { promisify } from "util";
 
+export const DEFAULT_PARALLEL_SIZE = 10;
+
 /**
  * Normalize windows paths to be posix-like.
  */
@@ -41,18 +44,6 @@ export async function withSpinner<T>(message: string, fn: () => Promise<T>): Pro
   }
 }
 
-export async function copyDir(src: string, dest: string) {
-  await fsPromise.mkdir(dest, { recursive: true });
-  let entries = await fsPromise.readdir(src, { withFileTypes: true });
-
-  for (let entry of entries) {
-    let srcPath = join(src, entry.name);
-    let destPath = join(dest, entry.name);
-
-    entry.isDirectory() ? await copyDir(srcPath, destPath) : copyFileSync(srcPath, destPath);
-  }
-}
-
 /**
  * Execute a command and return its stdout.
  */
@@ -65,7 +56,7 @@ export async function exec(command: string): Promise<string> {
  * Creates a clean environment for each test by copying the example file to a temporary directory.
  */
 export async function generateTmpDir() {
-  return fsPromise.mkdtemp(join(tmpdir(), "-wing-compile-test"));
+  return fs.mkdtemp(join(tmpdir(), "-wing-compile-test"));
 }
 
 /**
@@ -94,3 +85,30 @@ export const currentPackage: {
   engines: { node: string };
   // eslint-disable-next-line @typescript-eslint/no-require-imports
 } = require("../package.json");
+
+export const PROJECT_TEMPLATES_DIR = join(__dirname, "..", "project-templates");
+
+export function projectTemplateNames(): string[] {
+  const templateNames: Set<string> = new Set();
+  readdirSync(join(PROJECT_TEMPLATES_DIR)).forEach((language) => {
+    readdirSync(join(PROJECT_TEMPLATES_DIR, language)).forEach((template) => {
+      templateNames.add(template);
+    });
+  });
+  return [...templateNames];
+}
+
+export function flattenObject(item: any, parentKey: string = "") {
+  let flattened: Record<string, unknown> = {};
+
+  if (typeof item === "object") {
+    for (const key in item) {
+      const propName: string = parentKey ? `${parentKey}_${key}` : key;
+      Object.assign(flattened, flattenObject(item[key] as Record<string, unknown>, propName));
+    }
+  } else {
+    flattened[parentKey] = item;
+  }
+
+  return flattened;
+}
diff --git a/apps/wing/tsconfig.dev.json b/apps/wing/tsconfig.dev.json
new file mode 100644
index 00000000000..afe13061799
--- /dev/null
+++ b/apps/wing/tsconfig.dev.json
@@ -0,0 +1,5 @@
+{
+    "extends": "./tsconfig.json",
+    "include": ["src/**/*.ts"],
+    "exclude": []
+}
diff --git a/apps/wing/tsconfig.json b/apps/wing/tsconfig.json
index 81f89648918..8334009e1e9 100644
--- a/apps/wing/tsconfig.json
+++ b/apps/wing/tsconfig.json
@@ -21,8 +21,8 @@
     "emitDecoratorMetadata": true,
     "declaration": true,
     "baseUrl": ".",
-    "esModuleInterop": true
+    "esModuleInterop": true,
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules"]
+  "exclude": ["src/**/*.test.ts"]
 }
diff --git a/apps/wing/vitest.config.ts b/apps/wing/vitest.config.ts
index a8af8e18b65..e1fac82a884 100644
--- a/apps/wing/vitest.config.ts
+++ b/apps/wing/vitest.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "vitest/config";
 export default defineConfig({
   test: {
     // Some tests use process.chdir which is not supported in vitest's multi-thread mode
-    threads: false,
+    pool: "forks",
     testTimeout: 200_000,
   },
 });
diff --git a/apps/wingcli-v2/Cargo.toml b/apps/wingcli-v2/Cargo.toml
new file mode 100644
index 00000000000..f700753167b
--- /dev/null
+++ b/apps/wingcli-v2/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "wingcli"
+version = "0.74.53"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# Customizing CLI colored output
+anstyle = "1.0.6"
+# Drop in replacement for std::path but with only utf-8
+camino = "1.1.6"
+# Command line argument parsing
+clap = { version = "4.5.1", features = ["derive", "color"] }
+# Home directories
+home = "0.5.9"
+# Lazily evaluated static variables
+lazy_static = "1.4.0"
+# Enum parsing
+strum = { version = "0.26.1", features = ["derive"] }
+# Colors in terminal
+termcolor = "1.4.1"
+# Logging
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
+# Compilation
+wingc = { path = "../../libs/wingc" }
+wingii = { path = "../../libs/wingii" }
diff --git a/apps/wingcli-v2/README.md b/apps/wingcli-v2/README.md
new file mode 100644
index 00000000000..93b6a1243f5
--- /dev/null
+++ b/apps/wingcli-v2/README.md
@@ -0,0 +1,11 @@
+This crate contains an experimental Rust-based implementation of the Wing CLI.
+
+Missing features:
+
+- [ ] wing test
+- [ ] wing platform options
+- [ ] wing lsp
+- [ ] wing pack
+- [ ] wing new
+- [ ] wing run/it
+- [ ] wing pack
diff --git a/apps/wingcli-v2/package.json b/apps/wingcli-v2/package.json
new file mode 100644
index 00000000000..859aa219160
--- /dev/null
+++ b/apps/wingcli-v2/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "wingcli-v2",
+  "scripts": {
+    "compile": "cargo build --release",
+    "test": "cargo test"
+  },
+  "dependencies": {
+    "@winglang/wingii": "workspace:^",
+    "@winglang/wingc": "workspace:^",
+    "@winglang/sdk": "workspace:^"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/apps/wingcli-v2/src/cli.rs b/apps/wingcli-v2/src/cli.rs
new file mode 100644
index 00000000000..900345d6569
--- /dev/null
+++ b/apps/wingcli-v2/src/cli.rs
@@ -0,0 +1,50 @@
+use std::io::Write;
+use std::time::Duration;
+
+use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
+
+pub(crate) fn print_compiling(text: &str) {
+	print_colourful_prefix("Compiling", text)
+}
+
+pub(crate) fn print_installing(text: &str) {
+	print_colourful_prefix("Installing", text)
+}
+
+pub(crate) fn print_compiled(duration: Duration) {
+	print_colourful_prefix("Compiled", &format!("in {}", seconds(duration)))
+}
+
+pub fn seconds(duration: Duration) -> String {
+	format!("{:.2}s", duration.as_millis() as f32 / 1000.)
+}
+
+pub fn print_colourful_prefix(prefix: &str, text: &str) {
+	let buffer_writer = stdout_buffer_writer();
+	let mut buffer = buffer_writer.buffer();
+	buffer
+		.set_color(ColorSpec::new().set_intense(true).set_fg(Some(Color::Cyan)))
+		.expect("print_cyan_prefix");
+	write!(buffer, "{prefix: >11}").expect("print_cyan_prefix");
+	buffer.set_color(&ColorSpec::new()).expect("print_cyan_prefix");
+	writeln!(buffer, " {text}").expect("print_cyan_prefix");
+	buffer_writer.print(&buffer).expect("print_cyan_prefix");
+}
+
+pub fn stderr_buffer_writer() -> BufferWriter {
+	// Don't add color codes to the output if standard error isn't connected to a terminal
+	termcolor::BufferWriter::stderr(color_choice())
+}
+
+pub fn stdout_buffer_writer() -> BufferWriter {
+	// Don't add color codes to the output if standard error isn't connected to a terminal
+	termcolor::BufferWriter::stdout(color_choice())
+}
+
+fn color_choice() -> ColorChoice {
+	if std::io::IsTerminal::is_terminal(&std::io::stderr()) {
+		termcolor::ColorChoice::Auto
+	} else {
+		termcolor::ColorChoice::Never
+	}
+}
diff --git a/apps/wingcli-v2/src/main.rs b/apps/wingcli-v2/src/main.rs
new file mode 100644
index 00000000000..3107bff85c3
--- /dev/null
+++ b/apps/wingcli-v2/src/main.rs
@@ -0,0 +1,239 @@
+mod cli;
+
+use std::{error::Error, io::Write, path::PathBuf, time::Instant};
+
+use camino::{Utf8Path, Utf8PathBuf};
+use clap::Parser;
+use cli::{print_compiled, print_compiling, print_installing};
+use home::home_dir;
+use lazy_static::lazy_static;
+use strum::{Display, EnumString};
+use wingc::compile;
+
+lazy_static! {
+	static ref HOME_PATH: PathBuf = home_dir().expect("Could not find home directory");
+	pub static ref WING_CACHE_DIR: Utf8PathBuf =
+		Utf8PathBuf::from_path_buf(HOME_PATH.join(".wing").join("cache")).expect("invalid utf8");
+}
+
+#[derive(Parser, Debug)]
+#[clap(version, styles=get_styles())]
+enum Command {
+	/// Compile one or more Wing files
+	Compile {
+		/// Source file or directory to compile
+		file: Utf8PathBuf,
+
+		/// The platform to target
+		#[clap(short, long)]
+		target: Option<Target>,
+	},
+}
+
+#[derive(Parser, Debug, EnumString, Display, Clone, Copy)]
+enum Target {
+	/// Local simulator
+	#[strum(serialize = "sim")]
+	Sim,
+	/// AWS with Terraform
+	#[strum(serialize = "tf-aws")]
+	TfAws,
+}
+
+fn as_dir_prefix(target: &Target) -> &'static str {
+	match target {
+		Target::Sim => "sim",
+		Target::TfAws => "tfaws",
+	}
+}
+
+fn main() {
+	initialize_logger();
+	let stderr = cli::stderr_buffer_writer();
+	let result = match Command::parse() {
+		Command::Compile { file, target } => command_build(file, target),
+	};
+
+	match result {
+		Ok(_) => {
+			tracing::info!("Successfully completed");
+		}
+		Err(error) => {
+			tracing::error!(error = ?error, "Failed");
+			let mut buffer = stderr.buffer();
+			writeln!(buffer, "Error: {}", error).expect("Error writing");
+			stderr.print(&buffer).expect("Final result error writing");
+			std::process::exit(1);
+		}
+	}
+}
+
+fn command_build(source_file: Utf8PathBuf, target: Option<Target>) -> Result<(), Box<dyn Error>> {
+	let start = Instant::now();
+	let target = target.unwrap_or(Target::Sim);
+
+	let project_dir = Utf8PathBuf::from_path_buf(std::env::current_dir()?).expect("invalid utf8");
+	let target_dir = project_dir.join("target").join(format!(
+		"{}.{}",
+		source_file.file_stem().unwrap_or("main"),
+		as_dir_prefix(&target),
+	));
+	let work_dir = target_dir.join(".wing");
+
+	// Print that work is being done
+	print_compiling(source_file.as_str());
+
+	let sdk_root = WING_CACHE_DIR.join("node_modules").join("@winglang").join("sdk");
+
+	// Skip installing the SDK here if we're in a unit test since tests may run in parallel
+	// TODO: check if the SDK is up to date
+	if !sdk_root.exists() && !cfg!(test) {
+		install_sdk()?;
+	}
+	tracing::info!("Using SDK at {}", sdk_root);
+
+	// Special pragma used by wingc to find the SDK types
+	if !cfg!(test) {
+		std::env::set_var("WINGSDK_MANIFEST_ROOT", &sdk_root);
+	}
+
+	let result = compile(&project_dir, &source_file, None, &work_dir);
+
+	match result {
+		Ok(_) => {}
+		Err(error) => {
+			tracing::error!(error = ?error, "Failed");
+			return Err("Compiler error".into());
+		}
+	}
+
+	run_javascript_node(&source_file, &target_dir, target)?;
+
+	print_compiled(start.elapsed());
+	Ok(())
+}
+
+fn install_sdk() -> Result<(), Box<dyn Error>> {
+	print_installing("Wing SDK");
+
+	std::fs::create_dir_all(WING_CACHE_DIR.as_str())?;
+	let mut install_command = std::process::Command::new("npm");
+	install_command.arg("install").arg("esbuild"); // TODO: should this not be an optional dependency?
+
+	// No need to install the latest verison of SDK from npm in tests
+	if !cfg!(test) {
+		install_command.arg(format!("@winglang/sdk@{}", env!("CARGO_PKG_VERSION")));
+	}
+	install_command.current_dir(WING_CACHE_DIR.as_str());
+	install_command.stdout(std::process::Stdio::piped());
+	install_command.stderr(std::process::Stdio::piped());
+
+	tracing::info!("Running command: {:?}", install_command);
+
+	let output = install_command.output()?;
+	if !output.status.success() {
+		let stdout = String::from_utf8_lossy(&output.stdout);
+		let stderr = String::from_utf8_lossy(&output.stderr);
+		let error_message = format!("Failed to install SDK. stdout: {}. stderr: {}", stdout, stderr);
+		return Err(error_message.into());
+	}
+
+	Ok(())
+}
+
+fn run_javascript_node(source_file: &Utf8Path, target_dir: &Utf8Path, target: Target) -> Result<(), Box<dyn Error>> {
+	let source_file_canonical = source_file.canonicalize_utf8()?;
+	let source_dir = source_file_canonical.parent().expect("source file has no parent");
+
+	let mut command = std::process::Command::new("node");
+	command.arg(target_dir.join(".wing").join("preflight.cjs"));
+
+	let mut node_path = WING_CACHE_DIR.join("node_modules").to_string();
+
+	// For tests, add the local version of the SDK to the NODE_PATH
+	if cfg!(test) {
+		node_path = format!(
+			"{}:{}",
+			Utf8Path::new(env!("CARGO_MANIFEST_DIR")).join("node_modules"),
+			node_path
+		);
+	}
+
+	command.env("NODE_PATH", node_path);
+	command.env("WING_PLATFORMS", target.to_string());
+	command.env("WING_SOURCE_DIR", source_dir);
+	command.env("WING_SYNTH_DIR", target_dir);
+
+	tracing::info!("Running command: {:?}", command);
+	let status = command.status()?;
+	if !status.success() {
+		return Err("Node.js failed".into());
+	}
+	Ok(())
+}
+
+fn initialize_logger() {
+	let enable_logs = std::env::var("WING_LOG").is_ok_and(|x| !x.is_empty() && x != "off" && x != "0");
+	let enable_colours = std::env::var("WING_LOG_NOCOLOR").is_err();
+	if enable_logs {
+		tracing_subscriber::fmt()
+			.with_writer(std::io::stderr)
+			.with_target(false)
+			.with_ansi(enable_colours)
+			.without_time()
+			.init();
+	}
+}
+
+pub fn get_styles() -> clap::builder::Styles {
+	clap::builder::Styles::styled()
+		.usage(anstyle::Style::new().bold())
+		.header(anstyle::Style::new().bold())
+		.literal(anstyle::Style::new().fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Green))))
+		.invalid(
+			anstyle::Style::new()
+				.bold()
+				.fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Red))),
+		)
+		.error(
+			anstyle::Style::new()
+				.bold()
+				.fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Red))),
+		)
+		.valid(
+			anstyle::Style::new()
+				.bold()
+				.underline()
+				.fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Green))),
+		)
+		.placeholder(anstyle::Style::new().fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::White))))
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use std::sync::Once;
+
+	static INIT: Once = Once::new();
+
+	fn initialize() {
+		INIT.call_once(|| {
+			initialize_logger();
+			install_sdk().expect("Failed to install SDK");
+		});
+	}
+
+	#[test]
+	fn test_compile_sim() {
+		initialize();
+		let res = command_build("../../examples/tests/valid/hello.test.w".into(), Some(Target::Sim));
+		res.expect("Failed to compile to sim");
+	}
+
+	#[test]
+	fn test_compile_tfaws() {
+		initialize();
+		let res = command_build("../../examples/tests/valid/hello.test.w".into(), Some(Target::TfAws));
+		res.expect("Failed to compile to tf-aws");
+	}
+}
diff --git a/apps/wingcli-v2/turbo.json b/apps/wingcli-v2/turbo.json
new file mode 100644
index 00000000000..2fbc4819435
--- /dev/null
+++ b/apps/wingcli-v2/turbo.json
@@ -0,0 +1,11 @@
+{
+    "$schema": "https://turborepo.org/schema.json",
+    "extends": ["//"],
+    "pipeline": {
+      "compile": {},
+      "test": {
+        "dependsOn": ["@winglang/sdk#compile"]
+      }
+    }
+  }
+  
\ No newline at end of file
diff --git a/docs/contributing/01-start-here/01-contributing-to-wing.md b/docs/contributing/01-start-here/01-contributing-to-wing.md
index eef48d5c160..81bdb27375c 100644
--- a/docs/contributing/01-start-here/01-contributing-to-wing.md
+++ b/docs/contributing/01-start-here/01-contributing-to-wing.md
@@ -12,14 +12,14 @@ There are many ways to contribute to Wing:
 
 * Contributing to the [Wing SDK (standard library)](/contributing/start-here/wingsdk)
 * Reporting bugs through a [GitHub issue](https://github.com/winglang/wing/issues)
-* Writing [documentation and guides](https://github.com/winglang/wing/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%93%9A+documentation%22) or adding [examples](/contributing/start-here/docs#%EF%B8%8F-how-do-i-add-an-example)
+* Writing [documentation and guides](https://github.com/winglang/wing/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%93%9A+documentation%22) or adding [examples](https://github.com/winglang/examples)
 * Setting up your [development environment](/contributing/start-here/development) and working on the code
 * Submitting [pull requests](/contributing/start-here/pull_requests) for new features or helping with [reviews](https://github.com/winglang/wing/pulls)
 * Picking up a [good first issue](https://github.com/winglang/wing/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22+no%3Aassignee+sort%3Aupdated-desc+) to work on
 * Reporting and fixing [bugs](/contributing/start-here/bugs)
 * Find solutions to common issues in our [troubleshooting guide](/contributing/start-here/troubleshooting)
 * Commenting on [RFCs](/contributing/category/rfcs) or submitting one for major features
-* Asking and answering questions in the [Wing Slack](https://t.winglang.io/slack)
+* Asking and answering questions in the [Wing Discord](https://t.winglang.io/discord)
 * Posting or answering questions in [Wing Discussions](https://github.com/winglang/wing/discussions)
 
 ![](./giphy.webp)
diff --git a/docs/contributing/01-start-here/02-help.md b/docs/contributing/01-start-here/02-help.md
index dfc2cbe5b7d..f8e8e55cf0b 100644
--- a/docs/contributing/01-start-here/02-help.md
+++ b/docs/contributing/01-start-here/02-help.md
@@ -1,14 +1,14 @@
 ---
 title: Get Help
 id: help
-keywords: [help, slack, community, questions]
+keywords: [help, discord, community, questions]
 ---
 
 ## 🙋 Where can I go to ask questions about Wing?
 
-Come on down and hang out in the [Wing Slack]! We're a friendly bunch and we'd love to help you out.
+Come on down and hang out in the [Wing Discord]! We're a friendly bunch and we'd love to help you out.
 There are no stupid questions, so don't be afraid to ask! Don't forget to introduce yourself in the
-[#intro](https://winglang.slack.com/archives/C048QDSMC7L) channel.
+[#intro](https://t.winglang.io/discord) channel.
 
-[Wing Slack]: https://t.winglang.io/slack
+[Wing Discord]: https://t.winglang.io/discord
 
diff --git a/docs/contributing/01-start-here/03-status.md b/docs/contributing/01-start-here/03-status.md
index 0deedd02f71..0bc633e903b 100644
--- a/docs/contributing/01-start-here/03-status.md
+++ b/docs/contributing/01-start-here/03-status.md
@@ -19,7 +19,7 @@ We are working hard to make this a great tool, but there's still a pretty good
 chance you'll encounter missing pieces, rough edges, performance issues and even,
 god forbid, bugs 🐞. 
 
-Please don't hesitate to ping us on [Slack](https://t.winglang.io/slack) or 
+Please don't hesitate to ping us on [Discord](https://t.winglang.io/discord) or 
 [file an issue](https://github.com/winglang/wing). We promise to do our best to
 respond quickly and help out.
 
diff --git a/docs/contributing/01-start-here/05-development.md b/docs/contributing/01-start-here/05-development.md
index 2c53a944aa9..75659654b29 100644
--- a/docs/contributing/01-start-here/05-development.md
+++ b/docs/contributing/01-start-here/05-development.md
@@ -26,10 +26,10 @@ Some Guides:
 Here is a list of minimal tools you should install to build the Wing repo in your development
 environment:
 
-- [Node.js] v18 and [PNPM] v8
+- [Node.js] v20 and [PNPM] v8
   - We recommend [volta] to manage node tools
 - [Rust]
-  - We recommend using [rustup] to manage your Rust installation
+  - We recommend using [rustup] to manage your Rust installation if Rust is not already installed. Be careful of conflicting Rust installations (homebrew rust and rustup)
 - [AWS CLI]
   - Only needed for integration tests - make sure to do the setup part to create credentials
 - [Terraform CLI]
@@ -280,3 +280,12 @@ Lastly you can show linting errors in your IDE by enabling the following setting
 // in your VS Code settings
 "rust-analyzer.check.command": "clippy",
 ```
+
+## 🏁 How do I add a quickstart template to the `wing` CLI?
+
+Adding a new template is straightforward!
+
+Each template is represented by a folder located at [project-templates](https://github.com/winglang/wing/tree/main/apps/wing/project-templates), containing all of the files that template should be initialized with.
+
+Create a new folder with the template name, and insert any code files that are needed to run it.
+Unit tests ran with `pnpm turbo test` (or in GitHub Actions once you make a pull request) will automatically validate that the template is valid.
diff --git a/docs/contributing/01-start-here/06-pull-requests.md b/docs/contributing/01-start-here/06-pull-requests.md
index 178a2fd022c..a5a518be63b 100644
--- a/docs/contributing/01-start-here/06-pull-requests.md
+++ b/docs/contributing/01-start-here/06-pull-requests.md
@@ -51,9 +51,9 @@ changelog. To that end, pull request titles must follow this convention:
   * `tutorial`
   * `vscode`
   * `plugins`
+  * `platforms`
   * `build` - change related to development environment, build system, build tools, etc.
-  * `repo` - change related to repository behavior (e.g. pull request templates, issue templates,
-    etc).
+  * `repo` - change related to repository behavior (e.g. pull request templates, issue templates, etc).
 * `<subject>`
   * Prefer lowercase (except for proper nouns) and do not include a period (improves aesthetics of changelog).
   * For `fix` changes, subject should describe the problem, not the solution (e.g. `fix(cli): intermediate.js file not found` instead of ~`fix(cli): make sure output directory exists`~).
diff --git a/docs/contributing/01-start-here/07-wingsdk.md b/docs/contributing/01-start-here/07-wingsdk.md
index a1afb902e5b..701b910dbfa 100644
--- a/docs/contributing/01-start-here/07-wingsdk.md
+++ b/docs/contributing/01-start-here/07-wingsdk.md
@@ -54,7 +54,7 @@ Here is an example of adding a package named "fast-json-stringify" pinned to maj
 ## 🧱 How do I add a new Terraform provider for use in the SDK?
 
 The SDK uses [CDK for Terraform] to generate Terraform files.
-This means that you can generate bindings for any Terraform provider and reference in in the SDK using TypeScript.
+This means that you can generate bindings for any Terraform provider and reference it in the SDK using TypeScript.
 
 To add a new provider, go to `libs/wingsdk/.projenrc.ts` and edit the section
 that says "CDKTF_BINDINGS" to add the new provider.
@@ -67,23 +67,23 @@ A resource in the SDK has several parts:
 
 * A set of base APIs that must be implemented by all cloud targets. Typically the resource's preflight APIs correspond to a base class in TypeScript, and the resource's inflight APIs correspond to an interface in TypeScript. These are defined in `src/cloud` or `src/ex`. For example, [`src/cloud/bucket.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/cloud/bucket.ts).
 * An interface representing the inflight API common across all cloud targets. By convention, if the resource is named like `Gizmo`, the inflight interface should be named `IGizmoClient`. This is usually in the same file as the preflight API.
-* A simulator implementation in `src/sim`. This includes:
-  * A schema with information to simulate the resource and display the resource in the Wing console. Currently these are in [`src/sim/schema-resources.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/sim/schema-resources.ts).
-  * A class that implements the polycon API and can produce the resource's simulation schema. For example, [`src/sim/bucket.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/sim/bucket.ts).
-  * An class that implements the inflight API and can simulate the resource. For example, [`src/sim/bucket.sim.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/sim/bucket.sim.ts).
-  * Unit tests for the simulator implementation. For example, [`test/sim/bucket.test.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/test/sim/bucket.test.ts).
+* A simulator implementation in `src/target-sim`. This includes:
+  * A schema with information to simulate the resource and display the resource in the Wing console. Currently these are in [`src/target-sim/schema-resources.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/target-sim/schema-resources.ts).
+  * A class that implements the polycon API and can produce the resource's simulation schema. For example, [`src/target-sim/bucket.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/target-sim/bucket.ts).
+  * An class that implements the inflight API and can simulate the resource. For example, [`src/target-sim/bucket.inflight.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/target-sim/bucket.inflight.ts).
+  * Unit tests for the simulator implementation. For example, [`test/target-sim/bucket.test.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/test/target-sim/bucket.test.ts).
 * An implementation for each target cloud (currently just AWS). This includes:
-  * A class that implements the polycon API and creates all of the required terraform resources. For example, [`src/tf-aws/bucket.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/tf-aws/bucket.ts).
-  * A class that implements the inflight API that interacts with the cloud resource. For example, [`src/tf-aws/bucket.inflight.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/tf-aws/bucket.inflight.ts).
-  * Unit tests for the cloud infrastructure. For example, [`test/tf-aws/bucket.test.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/test/tf-aws/bucket.test.ts).
-  * End-to-end tests. These are added to the "examples" directory at the root of the repository. For example, [`examples/tests/sdk_tests/bucket/bucket_list.w`](https://github.com/winglang/wing/blob/main/examples/tests/sdk_tests/bucket/bucket_list.w).
+  * A class that implements the polycon API and creates all of the required terraform resources. For example, [`src/shared-aws/bucket.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/shared-aws/bucket.ts).
+  * A class that implements the inflight API that interacts with the cloud resource. For example, [`src/shared-aws/bucket.inflight.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/src/shared-aws/bucket.inflight.ts).
+  * Unit tests for the cloud infrastructure. For example, [`test/target-tf-aws/bucket.test.ts`](https://github.com/winglang/wing/tree/main/libs/wingsdk/test/target-tf-aws/bucket.test.ts).
+  * End-to-end tests. These are added to the "examples" directory at the root of the repository. For example, [`examples/tests/sdk_tests/bucket/bucket_list.test.w`](https://github.com/winglang/wing/blob/main/examples/tests/sdk_tests/bucket/bucket_list.test.w).
 
 If you are implementing a new resource, or implementing an existing resource for a new cloud provider, try to take a look at code for existing resources (`Bucket`, `Function`, `Queue`) to see how to structure your code.
 
 Feel free to create an issue if you have questions about how to implement a resource or want to discuss the design of a resource.
-You can also join us on our [Wing Slack] to ask questions (or just say hi)!
+You can also join us on our [Wing Discord] to ask questions (or just say hi)!
 
-[Wing Slack]: https://t.winglang.io/slack
+[Wing Discord]: https://t.winglang.io/discord
 
 ## 🏁 How do I add and run tests to the SDK?
 
diff --git a/docs/contributing/01-start-here/08-docs.md b/docs/contributing/01-start-here/08-docs.md
index 7c9747ec830..3844146250f 100644
--- a/docs/contributing/01-start-here/08-docs.md
+++ b/docs/contributing/01-start-here/08-docs.md
@@ -24,15 +24,3 @@ pnpm docs
 This magical script will clone the [winglang/docsite](https://github.com/winglang/docsite)
 repository into `~/.winglang-docsite`, symlink your local copy into it and start a browser with the
 site.
-
-## 🖼️ How do I add an example?
-
-Adding a code example is a great way to contribute to Wing.  Here's how to do it:
-
-* Fork this repository on GitHub.
-* Create a new branch for your example.
-* Add your Wing code to the `examples` directory.
-  * If your example involves multiple files, create a dedicated directory for it.
-* Add a link to your example to the `examples/README.md` file.
-* Commit your changes and push them to your fork.
-* Open a pull request. A Wing maintainer will review it as soon as possible!
diff --git a/docs/contributing/01-start-here/10-code-of-conduct.md b/docs/contributing/01-start-here/10-code-of-conduct.md
index 659988f0e90..d1e56b24da5 100644
--- a/docs/contributing/01-start-here/10-code-of-conduct.md
+++ b/docs/contributing/01-start-here/10-code-of-conduct.md
@@ -6,8 +6,8 @@ keywords: [coc, code of conduct]
 
 The Wing community follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
 
-Please review it before contributing issues, pull requests, or joining the [Wing Slack].
+Please review it before contributing issues, pull requests, or joining the [Wing Discord].
 
-[Wing Slack]: https://t.winglang.io/slack
+[Wing Discord]: https://t.winglang.io/discord
 
 
diff --git a/docs/contributing/02-maintainers/050-operations.md b/docs/contributing/02-maintainers/050-operations.md
index aa56f3d2a24..9766a195413 100644
--- a/docs/contributing/02-maintainers/050-operations.md
+++ b/docs/contributing/02-maintainers/050-operations.md
@@ -30,7 +30,7 @@ Monitoring may take one of two forms:
 
 - Polling monitors via BetterUptime check the status of GitHub actions and hosted sites to make sure they are currently reporting successfully
   - "GitHub Action" checks includes builds, release, and other scheduled jobs that provide additional health verification
-- Manual reports from users via Slack or Github Issues
+- Manual reports from users via Discord or Github Issues
 
 Manual reports also must be manually escalated to become actual incidents by any available maintainers.
 Ideally manual reports should be minimized, and we should constantly look for ways to automate the detection of issues.
@@ -67,7 +67,7 @@ Whatever action(s) are technically, it is useful for the responder to be over-co
 
 Another good response is to reach out to someone who has more information about the issue.
 This could be the person who wrote the code, or someone who has more context about the system.
-It is important to be respectful of maintainer time especially if they are not on-call or during regular working hours for their timezone (listed in Slack).
+It is important to be respectful of maintainer time especially if they are not on-call or during regular working hours for their timezone (listed in Discord).
 In P0 circumstances where no other mitigation is feasible, it is acceptable to ping/call someone on off-hours for help in resolving the issue.
 
 ### Analysis
@@ -125,7 +125,7 @@ Any maintainer should be empowered to take ownership of an incident if they wish
 - (always, immediately) send a Slack message to #alert
 - (always, immediately) notify the primary responder
 - (if not acknowledged within 10 minutes) notify the secondary responder
-- (if not acknowledged) Repeat everything above except for the slack message up to 6 times.
+- (if not acknowledged) Repeat everything above except for the Slack message up to 6 times.
 
 The notification channel and timing is configured per user. It's recommended to configure it in the following way:
 
diff --git a/docs/contributing/03-stories/story-04.md b/docs/contributing/03-stories/story-04.md
index 668ccceac96..f1f904203f9 100644
--- a/docs/contributing/03-stories/story-04.md
+++ b/docs/contributing/03-stories/story-04.md
@@ -203,7 +203,7 @@ guidelines for contributing to the project.
 
 ## Community
 
-We all hang out at the [Wing Slack](https://t.winglang.io/slack). Come as you are, say hi, ask
+We all hang out at the [Wing Discord](https://t.winglang.io/discord). Come as you are, say hi, ask
 questions, help friends, geek out!
 
 ## License
diff --git a/docs/contributing/03-stories/story-16.md b/docs/contributing/03-stories/story-16.md
new file mode 100644
index 00000000000..a2fc1bf3d4b
--- /dev/null
+++ b/docs/contributing/03-stories/story-16.md
@@ -0,0 +1,113 @@
+# User Story 16 - Wing for TypeScript
+
+> **Status**: Approved
+
+[Anders](https://en.wikipedia.org/wiki/Anders_Hejlsberg) loves TypeScript, but he also loves the amazing experience Wing offers for building cloud applications.
+
+It's Anders' lucky day because Wing Cloud had just announced that very soon TypeScript developers will be able to leverage any Wing library from the comforts of
+their favorite programming language.
+
+Anders just got an invite for a pre-release of Wing for TypeScript (code name "wing4ts"). The invite explains that in this pre-release, there is only support for `cloud.Bucket` and `cloud.Function` from the Wing Cloud Library and for consuming [winglibs](https://github.com/winglang/winglibs).
+
+First, install the Wing CLI:
+
+```sh
+npm i winglang
+```
+
+Now, install the Wing for TypeScript library (temporary name):
+
+```sh
+npm i wing4ts
+```
+
+Now, install some winglibs:
+
+```sh
+$ npm i @winglibs/cloud @winglibs/checks
+```
+
+```ts
+// main.ts
+import { inflight, App } from "wing4ts";
+import * as cloud from "@winglibs/cloud";
+import { Check } from "@winglibs/checks";
+
+// Final App depends on platform used
+const app = new App();
+
+const data = "world";
+const bucket = new cloud.Bucket(app, "Bucket");
+
+const fn = new cloud.Function(app, "Function", inflight({ bucket, data }, async (ctx, event) => {
+  await ctx.bucket.put("hello.txt", ctx.data);
+});
+
+bucket.grantPut(fn);
+
+const check = new Check(app, "Check", inflight({ fn, bucket, data }, async (ctx, event) => {
+  await ctx.fn.invoke();
+  const actual = await ctx.bucket.get("hello.txt");
+
+  console.log(`actual = ${actual}, expected = ${ctx.data}`);
+
+  if (actual !== ctx.data) {
+    throw new Error("check failed");
+  }
+}));
+
+fn.grantInvoke(check);
+bucket.grantGet(check);
+
+app.synth();
+```
+
+Now, you can open the Wing Console:
+
+```sh
+$ wing run main.ts
+```
+
+And compile to AWS:
+
+```sh
+$ wing compile -t tf-aws main.ts
+```
+
+And enjoy life!
+
+## Notes
+
+The `@winglibs/cloud` library is a Wing library that looks like this:
+
+```js
+bring cloud;
+
+pub struct BucketProps {
+  public: bool?;
+}
+
+pub class Bucket {
+  inner: cloud.Bucket;
+
+  new(props: BucketProps?) {
+    this.inner = new cloud.Bucket(props);
+  }
+
+  pub addFile(key: str, path: str, encoding?: str): void { return this.inner.addFile(key, path, encoding); }
+  pub addObject(key: str, body: str): void               { return this.inner.addObject(key, body); }
+
+  pub onCreate(fn: IBucketEventHandler, opts?: BucketOnCreateOptions): void { return this.inner.onCreate(fn, opts); }
+  pub onDelete(fn: IBucketEventHandler, opts?: BucketOnDeleteOptions): void { return this.inner.onDelete(fn, opts); }
+  pub onUpdate(fn: IBucketEventHandler, opts?: BucketOnUpdateOptions): void { return this.inner.onUpdate(fn, opts); }
+  pub onEvent(fn: IBucketEventHandler, opts?: BucketOnEventOptions): void   { return this.inner.onEvent(fn, opts); }
+
+  pub inflight copy(srcKey: str, dstKey: str): void               { return this.inner.copy(srcKey, dstKey); }
+  pub inflight delete(key: str, opts?: BucketDeleteOptions): void { return this.inner.delete(key, opts); }
+
+  // ... you got the point
+
+  pub grantPut(target: std.InflightHost): void { /* ??? */ }
+  // ...
+}
+```
diff --git a/docs/contributing/998-archived/01-compile-targets.md b/docs/contributing/998-archived/01-compile-targets.md
index 6c1da4fbaf5..8bac3608889 100644
--- a/docs/contributing/998-archived/01-compile-targets.md
+++ b/docs/contributing/998-archived/01-compile-targets.md
@@ -33,7 +33,7 @@ These targets contain a combination of provisioning engine and cloud environment
 
 ## Portability
 
-The [Wing Cloud Library](/docs/category/cloud-library) has several classes representing abstracted cloud resources, whose APIs are not specific to a single cloud provider.
+The [Wing Cloud Library](/docs/category/cloud) has several classes representing abstracted cloud resources, whose APIs are not specific to a single cloud provider.
 This allows you to write code that can be deployed to any supported cloud environment or provisioning engine.
 
 Here's an example of a portable code snippet:
@@ -91,7 +91,7 @@ In this example, we want to sleep briefly for the Simulator target and for 30 se
 
 Compiler plugins serve to extend the capabilities of the Wing compiler. They offer customization for the compilation output, such as infrastructure definitions. For instance, a compiler plugin can be employed to enforce a specific tagging convention on all resources within the resulting infrastructure.
 
-Learn more about compiler plugins [here](https://www.winglang.io/docs/tools/compiler-plugins)
+Learn more about compiler plugins [here](https://www.winglang.io/contributing/archived/compiler-plugins)
 
 
 
diff --git a/docs/contributing/999-rfcs/2023-06-12-language-spec.md b/docs/contributing/999-rfcs/2023-06-12-language-spec.md
index b324a31ed17..4e36c5c59e7 100644
--- a/docs/contributing/999-rfcs/2023-06-12-language-spec.md
+++ b/docs/contributing/999-rfcs/2023-06-12-language-spec.md
@@ -121,8 +121,8 @@ Almost all types can be implicitly resolved by the compiler except for "any".
 > `Promise<T>` is only available to JSII imported modules.
 
 > ```TS
-> let z = {1, 2, 3};               // immutable set, Set<Num> is inferred
-> let zm = MutSet<num>{};          // mutable set
+> let z = Set<num>[1, 2, 3];       // immutable set
+> let zm = MutSet<num>[];          // mutable set
 > let y = {"a" => 1, "b" => 2};    // immutable map, Map<num> is inferred
 > let ym = MutMap<num>{};          // mutable map
 > let x = [1, 2, 3];               // immutable array, Array<num> is inferred
@@ -2461,7 +2461,7 @@ If [frozen](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Gl
 
 ### 6.1 Strings
 
-String reference doc is available [here](https://www.winglang.io/docs/standard-library/std/api-reference#string-).
+String reference doc is available [here](https://www.winglang.io/docs/standard-library/std/string).
 Type of string is UTF-16 internally.  
 All string declaration variants are multi-line.  
 
diff --git a/docs/contributing/999-rfcs/2024-01-15-console-sign-in.md b/docs/contributing/999-rfcs/2024-01-15-console-sign-in.md
new file mode 100644
index 00000000000..b48ab4d0b47
--- /dev/null
+++ b/docs/contributing/999-rfcs/2024-01-15-console-sign-in.md
@@ -0,0 +1,98 @@
+---
+title: "Wing Console Sign In"
+description: Requirements for Wing Console Sign In process
+---
+
+# Wing Console Sign In
+
+- **Author(s)**: @ainvoner
+- **Submission Date**: 2024-01-15
+- **Stage**: Proposal
+- **Stage Date**: 2024-01-15
+
+This document describes the Wing Console Sign In process and rationale.
+
+## Background
+
+As we seek to be able to understand how wing is used, it has become increasingly important to establish a more direct and meaningful connection with our users.
+One of the ways to achieve this is by implementing a sign-in flow within the Wing Console application.
+
+## Requirements
+
+New users of Wing Console will be required to sign in with their GitHub account before having access to the Wing Console application.
+
+Another requirement is to have only one user entity in Wing. This means that a user in Wing Console is also a user in Wing Cloud and vice versa.
+
+## User Experience
+
+### New Users
+
+New users that will `wing it` will see a sign in dialog blocking the Wing Console UI. The rationale behind this decision is that we want to show the user a teaser of Wing Console while asking them to sign in.
+
+Once users will be signed in with their GitHub account they will be able to use Wing Console.
+
+### EULA (End User License Agreement) for new users
+
+The license agreement should be added to the bottom of the sign in screen:
+
+"By using the Wing Console you agree to these [terms and conditions](#)"
+
+The current EULA should be updated since we would like to contact our users via email
+### Signed In Users
+
+Signed in users to Wing Console will not need to sign in again. They will be able to use Wing Console as usual.
+
+### Offline
+
+If the user is offline (no internet connection) they will be able to use Wing Console as usual without the need to sign in.
+
+### Support of multiple users on the same machine
+
+There would be no support for multiple users on the same machine.
+
+### Logging out
+
+There is no support for logging out. The user will need to delete the `signedIn` boolean from their machine.
+
+## User identity for Analytics
+
+Events generated by signed in users will include the user's GitHub account email as an integral part of their user identity.
+In contrast, Wing CLI users are initially anonymous, and all analytics events originating from the CLI are sent anonymously with a unique identifier.
+However, when a user signs in to Wing Console, the unique identifier associated with CLI analytics events will be associated with the signed in user's identity, allowing us to link CLI analytics data to specific user accounts.
+
+## Technical details
+
+Since we would like to have a single user entity in Wing, the process of signing in to Wing Console will use the same authentication mechanism as Wing Cloud.
+In fact, the user will actually be signing in to Wing Cloud and be redirected back to Wing Console without noticing.
+
+In order to make sure a signed in user won't need to sign in again, we will save a `signedIn` boolean somewhere in the user's machine. We don't need to store more information than that because the analytics engine will save the user ID and the user's email.
+
+### In depth technical details: sign in flow
+
+Upon opening Wing Console, the user will be redirected to the Wing Cloud sign in page (in OAuth fashion). The redirection URL will include the anonymous analytics ID that is stored in the Wing Console App package.
+
+After signing in to Wing Cloud, the user will be redirected back to the Wing Console. The redirection will not include any information at all, so the user's data will be safe. The Wing Cloud server will link the anonymous analytics ID with the user's ID and email, using the following code snippet:
+
+```js
+import { Analytics } from "@segment/analytics-node";
+analytics.identify({
+  // The Wing Console App anonymous ID.
+  anonymousId: "48d213bb-95c3-4f8d-af97-86b2b404dcfe",
+  // The Wing Cloud user data.
+  userId: "user_123",
+  traits: {
+    github: "johndoe",
+    email: "johndoe@gmail.com",
+  },
+});
+```
+
+## Possible Next Steps
+
+Add value for the user in exchange for signin up. Things which could be considered:
+
+- Deploy to wing.cloud directly from the console. This could upload the working directory to a Bucket from which wing.cloud could deploy. The deployment status and the url would be shown in the local console
+- Offer a solution similar to ngrok, to make the locally running instance available for remote services (e.g. webhooks) or users (e.g. demo purposes)
+- Host the Console in Wing Cloud. While doing so, we could provide the ngrok-like functionality out of the box
+
+Support additional sign in providers (like google, etc.).
diff --git a/docs/contributing/999-rfcs/2024-03-14-explicit-lift-qualification.md b/docs/contributing/999-rfcs/2024-03-14-explicit-lift-qualification.md
new file mode 100644
index 00000000000..8970f1ac4d9
--- /dev/null
+++ b/docs/contributing/999-rfcs/2024-03-14-explicit-lift-qualification.md
@@ -0,0 +1,259 @@
+---
+title: "Explicit lift qualification"
+description: Language spec for specifying explicit lift qualifications
+---
+
+# Explicit lift qualification
+
+- **Author(s)**: @yoav-steinberg
+- **Submission Date**: 2024-03-14
+- **Stage**: Proposal
+- **Stage Date**: 2024-03-14
+
+This document describes the requirements and proposed syntax for explicit lift qualifications.
+
+## Background
+
+### Lifting
+
+A lift in winglang is 2 things: 
+1. A mechanism for capturing a preflight object in inflight code and generating an inflight client for that specific object. 
+   In case of primitives this is mere serialization. In case of preflight classes the client is the object's inflight API.
+2. A mechanism for setting up the host of the inflight closure (the `cloud.Function` for example) so it can safely use the client
+   to access the preflight objet. For example setting up least privilege permissions for the host to access the resource.
+
+This document deals with the 2nd of these two.
+
+### Lift qualification
+
+Lift qualification is the compilation process in which we qualify each lifted object with the operations being performed on it.
+For example the inflight code `bucket.put("key", "value")`, requires the lifted object `bucket` to be qualified with the operation `put` for the given inflight method/closure. 
+By qualifying lifts the compiler creates a map of all the preflight objects and how they are used in a given inflight method/closure.
+This map is then used to configure the host running that inflight code so it can safely access the preflight objects (least privilege permissions).
+
+### Automatic lift qualification
+Lift qualification is currently done automatically by the compiler for all preflight expressions in inflight code. 
+
+### Qualification errors
+
+When the compiler encounters an inflight expression that references a preflight type, then, without static analysis, it cannot qualify the lift because it does not know what preflight objects might be referenced by this inflight expression. The result is a compilation error.
+
+In the future we'd like to employ data flow analysis (probably through [reaching defintions analysis](https://en.wikipedia.org/wiki/Reaching_definition)) resolve these errors.
+
+## Problems with the current solution
+
+We need a mechanism for explicitly qualifying lifted objects. Consider the following cases:
+
+1. When using inflight expressions to reference a preflight object we'd like to disable the compilation error and explicitly qualify the lift.
+```js
+let b1 = new cloud.Bucket() as "b1";
+let b2 = new cloud.Bucket() as "b2";
+inflight () => {
+  let var b = b1;
+  if true {
+    b = b2;
+  }
+  b.put("key", "value"); // Need to explicitly qualify b1 and b2 with "put" since the compiler doesn't figure this out for us.
+}
+```
+
+2. When there's a collection of preflight objects that are being used inflight:
+```js
+for b in buckets {
+  b.put("key", "value"); // We need to qualify all `buckets` with "put"
+}
+```
+3. When our knowledge of the application logic can produce better qualifications:
+```js
+for i in buckets.len {
+  if i % 2 == 0 {
+    buckets.at(i).put("key", "value"); // We only need to qualify the even buckets with "put" and not the odd ones
+  }
+}
+```
+4. Cases where just the method name isn't enough information to create least privilege permissions:
+```js
+for i in 0..5 {
+  bucket.put("k{i}", "value");
+}
+```
+Here we can benefit from an explicit qualification of `bucket` with `"put"` operation and a specific key pattern: `"k*"`. We currently don't
+have a way to disable the automatic qualification and define the narrower qualification.
+
+Note that in all the above exmaples except the last one we currently get a compilation error due to us trying to use a `Bucket.put` operation on an inflight expression.
+
+## Requirements
+
+So the aim of this proposal is to present:
+1. A way to explicitly qualify the preflight objects that are being used by inflight methods/closures.
+2. Disabling compilation errors where the explicit qualification applies.
+3. Disabling automatic qualification where the explicit qualification applies. 
+4. Provide a framework that can be extended to programatically defining and reusing lift qualifications.
+
+## Naming
+
+"qualifiations" is used because it qualifies how the preflight object is being used. 
+Other words that we sometime used in the past and might be clearer are "capabilities" or "operations":
+* "capabilities" makes sense because it describes the capabilities the host needs in order to successfully run the inflight code.
+* "operations" makes sense because it describes the operations being performed on the preflight objects by the inflight code.
+
+In this proposal I'll use "qualifications", but I'd be happy to hear what you think.
+
+## Prior work
+
+### Issue with discussion on the subject: 
+[Mechanism for explicitly qualifying lifting](https://github.com/winglang/wing/issues/76)
+
+### Existing PR
+[feat(compiler): allow explicit lift qualifications of preflight objects](https://github.com/winglang/wing/pull/5935)
+
+Issues with this PR:
+* Confusing sytax that looks like an inflight function call might lead to [misuse](https://github.com/winglang/wing/pull/5935#issuecomment-1995051115).
+* No scoping of where we're disabling compiler errors.
+* Doesn't provide a mechanism to disable auto qualification.
+* No mechanism or clear path to mechanism for programatically defining and reusing lift qualifications.
+
+## Proposal
+
+```js
+let b1 = new cloud.Bucket() as "b1";
+let b2 = new cloud.Bucket() as "b2";
+inflight () => {
+  let var b = b1;
+  if true {
+    b = b2;
+  }
+  // In the following scope we disable qualification compilation errors due to unknown preflight object
+  // and we also disable automatic qualification.
+  // We explicitly qualify b1 and b2 with "put" since the compiler doesn't figure this out for us.
+  lift {b1: ["put"], b2: ["put"]} {
+    b.put("key", "value"); 
+  }
+}
+```
+
+Internally the argument to the `lift` block creates a `std.LiftQualificationsContainer` object which is added to the closures lift qualifications. 
+
+Note that multiple `lift` blocks in the code just create more `std.LiftQualificationsContainer`s for this closure. 
+The actual qualification values (`b1` and `"put"`) are just appended to the closure/method and they don't strictly belong to the block.
+
+What does apply to the block are the disabling of qualification errors within the block, so in our example we can use the inflight expression `b`, and inside the block we also don't automatically add qualifications even if the compiler can technically do this. 
+This behavior ensures that we can create custom qualifications without worrying that the compiler with override this with something more general.
+
+A few points worth highlighting about the design of the block-like syntax:
+
+1. It's granular, meaning it's possible to scope usage to the exact code it's needed for, avoiding [spooky action at a distance](https://en.wikipedia.org/wiki/Action_at_a_distance_(computer_programming)). The syntax opts out of Winglang's automatic permission generation for just the lines of code inside it, which means if you have a function with dozens of lines of code, you don't necessarily have to opt the entire function out of the compiler's automatic qualification system.
+
+2. The syntax makes it clear to people reading the code that something special is happening that can't be achieved in plain runtime / library code. For example it's not a function call, so it doesn't necessarily follow the rules of function calls.
+
+3. It's compositional. When a user refactors their code (for example, to extract a few lines of code into a separate function), they can take a qualification/capabilities block along with it, and it's made easy because the qualifications are located adjacent to the relevant code.
+
+4. Note that nesting `lift` blocks has no special effect. It'll just add the explicit qualifications to the method and disable the compiler's error generation and auto qualification at the top most `lift` block:
+
+```js
+// These two inflight closures are effectively the same:
+let nesting = inflight () => {
+  let b = bucket;
+  let q = queue;
+  lift {bucket: ["get"]} {
+    b.get("key");
+    lift {queue: ["push"]} {
+      q.push("data");
+    }
+  }
+}
+
+let no_nesting = inflight () => {
+  let b = bucket;
+  let q = queue;
+  lift {bucket: ["get"], queue: ["push"]} {
+    b.get("key");
+    q.push("data");
+  }
+}
+```
+
+## Next steps
+
+### SDK API
+The next step will be to provide library APIs for programatically creating and manipulating `std.LiftQualification` objects and their `std.LiftQalificationsContainer` containers and then reusing them. We can also inherit from them and to provide qualification objects that go beyond only the "operation" being performed on the object. Here's an example:
+
+```js
+// stdlib
+class cloud.BucketPutQual extends std.LiftQualification {
+  this.keyPattern: str;
+  
+  new(b: cloud.Bucket) {
+    super(b, ["put"]);
+    this.keyPattern = "*";
+  }
+  
+  setKeyPattern(pattern: str) {
+    this.keyPattern = pattern;
+  }
+}
+
+// Create a qualifications container
+let quals = new std.LiftQualificationsContainer();
+
+let b1 = new cloud.Bucket() as "b1";
+let b2 = new cloud.Bucket() as "b1";
+
+// Define our explicit qualifications, b1 has a special key pattern when putting
+let b1Quals = new cloud.BucketPutCap(b1);
+b1Quals.setKeyPattern("k*");
+// b2 can put any key
+let b2Quals = new std.LiftQualification(b2, ["put"]);
+
+// Add them to our explicit qualifications
+quals.add(b1Quals);
+quals.add(b2Quals);
+
+let arr = [b1,b2];
+
+// Define get access on all buckets
+let getBucketQuals = new std.LiftQualificationsContainer();
+for b in arr {
+  getQuals.add(new std.LiftQualification(b, ["get"]));
+}
+
+class A {
+  inflight foo() {
+    lift quals { // Use the qualification object programatically defined in preflight code
+      for b in arr {
+        b.put("k99", "v"); // This key pattern should work for both buckets
+      }
+      // 
+      b2.put("hello", "world"); // b2 accepts any key pattern
+      b1.put("k100", "v"); // no automatic qualifications happen in this scope, the key pattern qualification on b1 isn't overriden
+    }
+
+    // use getBucketQuals for get access on all buckets in the bucket array
+    lift getBucketQuals {
+      for b in arr {
+        b.get("k");
+      }
+    }
+  }
+
+  inflight bar() {
+    lift quals { // reuse `qual` for another method of `A`
+      let b = arr.at(randome(arr.len));
+      b.put("k0", "bar");
+    }
+  }
+}
+
+```
+
+### Type checking the qualification method names
+Ideally `lift {a: ["put"]}` shouldn't copile if `a` doesn't have an inflight member called `put`.
+We might want to support a syntax like this:
+```
+let a = new A();
+inflight () => {
+  lift {a: [A.put]} // Here we verify that `a` is really of type `A` and that there's an inflight `put` method in `A` instances.
+  {
+
+  }
+};
\ No newline at end of file
diff --git a/docs/contributing/999-rfcs/2024-03-24-snapshot-tests.md b/docs/contributing/999-rfcs/2024-03-24-snapshot-tests.md
new file mode 100644
index 00000000000..13ea703c6b1
--- /dev/null
+++ b/docs/contributing/999-rfcs/2024-03-24-snapshot-tests.md
@@ -0,0 +1,75 @@
+---
+title: "#5958 Cloud Snapshot Tests"
+description: Spec and design for adding cloud snapshots to the Wing test framework
+---
+
+# Cloud Snapshot Tests
+
+- **Author(s)**: @eladb
+- **Submission Date**: 2024-03-24
+- **Stage**: Approved
+- **Stage Date**: 2024-04-03
+
+## Requirements
+
+We would like to be able to capture a snapshot of the synthesized output when compiling to cloud
+targets, and use it to protect against regressions in CI, without having to deploy to the cloud.
+
+For example, let's say I am creating a Wing library with a resource that supports both `sim` and
+`tf-aws`. I am writing a bunch of tests for it. 
+
+I can run these tests in the simulator (`wing test`) and can also run them on AWS through `wing test
+-t tf-aws`.
+
+As my code **or its dependencies** are updated, I'd like to continuously run all these tests to make
+sure my library is not broken. Running the tests against `sim` is easy (I can just run `wing test`
+in my CI build environment), but it's not realistic to run all these tests against the real cloud
+target, given it could take a very long time and could also be very expensive.
+
+In some scenarios (such as the Wing SDK tests), users will prefer to setup a continuous integration
+workflow and run tests in the cloud, but for the most part running all my tests on the cloud for
+every commit is too expensive and requires a complicated setup (i.e. an AWS account), so I'd like to
+use a more lightweight approach...
+
+> NOTE: This is not https://github.com/winglang/wing/issues/1214 (which is about using snapshots for
+> assertions).
+
+## Design
+
+We propose to add a feature to `wing test` which will capture a snapshot of the synthesized output
+of every `.test.w` file and store them in the repository.
+
+> This is a similar approach used successfully and scalably in the AWS CDK. See
+> [docs](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md) for details. The main
+> difference is that `cdk-integ` there was no way to add assertions to tests, so this is so much
+> cooler.
+
+When I run `wing test -t tf-aws foo.test.w` in my dev environment, if the test succeeds (e.g.
+deploys and all test cases pass), the test framework will create `foo.test.w.tfaws.snap` which will
+include a nicely formatted (markdown?) snapshot of all the synthesis output from this test.
+
+> In a future version we can add support for placing all snapshots in an adjacent subdirectory.
+
+Now, when `wing test -t tf-aws foo.test.w` is executed in CI (`CI=1`), by default it won't actually
+go and deploy to the cloud. Instead, it will just synthesize the output and compare it to the
+committed `.snap` file. If the output is not the same, the test will fail with a nice diff
+indicating that there was an unexpected regression.
+
+The `--snapshots` or `-s` switch can be used to control behavior:
+
+ * `--snapshots=auto` - auto-detect based on CI flag (described above)
+ * `--snapshots=never` - disables snapshots altogether
+ * `--snapshots=update` - skips deployment and only update the snapshots.
+ * `--snapshots=deploy` - forces a deployment even if `CI=1`.
+ * `--snapshots=assert` - only asserts that the snapshots have not changed
+
+## Implementation Notes
+
+* We need to decide if we want the inflight JavaScript code to also be included or just trust the
+  fact that if inflight code has changed, it should be reflected somehow in the asset names
+  referenced from the IAC model.
+* Ideally this shouldn't be Terraform-specific. `app.synth()` should return something that can be
+  used to capture the snapshots.
+* The output will need to be sanitized somehow so that it will be deterministic (e.g. paths should
+  not be included).
+
diff --git a/docs/contributing/999-rfcs/2024-03-31-wing-secrets-cli.md b/docs/contributing/999-rfcs/2024-03-31-wing-secrets-cli.md
new file mode 100644
index 00000000000..8f970cc7320
--- /dev/null
+++ b/docs/contributing/999-rfcs/2024-03-31-wing-secrets-cli.md
@@ -0,0 +1,116 @@
+---
+title: "#6105 Wing Secrets CLI"
+description: Creating Wing secrets from the CLI
+---
+
+# Wing Secrets CLI
+- **Author(s)**: @hasanaburayyan
+- **Submission Date**: 2024-03-31
+- **Stage**: Draft
+
+Creating secrets through the Wing CLI.
+
+## Background
+
+Wing applications often require secrets to be retrieved during runtime. These secrets are stored in platform specific secret stores, such as AWS Secrets Manager for `tf-aws` or a local `.env` file for the `sim` platform.
+
+Secrets must be configured before the application is run, and now the Wing CLI along with Wing platforms make it easy to configure secrets.
+
+### Out of Scope
+
+In this RFC a few things are out of scope:
+- Checking if the secrets exist in the platform's secret store when running `wing compile`
+- Reading secret values, for now we will only focus on creating secrets
+
+## Platform Hook
+
+Since secrets creation is platform specific, platforms can now implement a new hook `configureSecrets(secrets: { [key: string]: string }): string` which will be called by the Wing CLI to configure the secrets.
+
+For example the `sim` platform implementation which needs to store secrets in a `.env` file, would look something like this:
+
+```js
+public async configureSecrets(secrets: { [key: string]: string }): Promise<string> {
+  let existingSecretsContent = "";
+  try {
+    existingSecretsContent = fs.readFileSync('./.env', 'utf8');
+  } catch (error) {}
+
+  const existingSecrets = existingSecretsContent.split('\n')
+    .filter(line => line.trim() !== '')
+    .reduce((s, line) => {
+      const [key, value] = line.split('=', 2);
+      s[key] = value;
+      return s;
+    }, {} as { [key: string]: string });
+
+  for (const key in secrets) {
+    existingSecrets[key] = secrets[key];
+  }
+
+  const updatedContent = Object.entries(existingSecrets)
+    .map(([key, value]) => `${key}=${value}`)
+    .join('\n');
+
+  fs.writeFileSync('./.env', updatedContent);
+
+  return "Secrets saved to .env file";
+}
+```
+
+## CLI Command
+
+Introducing a new Wing CLI command `secrets` which will be used for managing secrets in the Wing applications.
+
+Given the following Wing application:
+
+```js
+bring cloud;
+
+let slackSigningSecret = new cloud.Secret(name: "SLACK_SIGNING_SECRET");
+let slackBotToken = new cloud.Secret(name: "SLACK_BOT_TOKEN");
+```
+
+### Creating Secrets
+
+Running `wing secrets main.w` will result in an interactive experience where the user is prompted to enter the values for the secrets:
+
+```bash
+wing secrets main.w
+
+2 secrets found in main.w
+
+Enter the value for SLACK_SIGNING_SECRET: ********
+Enter the value for SLACK_BOT_TOKEN: ********
+
+Secrets saved to .env file
+```
+
+This results in a `.env` file being created with the secrets stored in it.
+
+### specifying the platform
+
+You can specify the platform using the `-t` flag, for example to configure the secrets for the `tf-aws` platform:
+
+```bash
+wing secrets main.w -t tf-aws
+
+2 secrets found in main.w
+
+Enter the value for SLACK_SIGNING_SECRET: ********
+Enter the value for SLACK_BOT_TOKEN: ********
+
+Secrets saved to AWS Secrets Manager
+```
+
+### Listing Secrets
+
+If the user prefers to ignore the interactive experience of creating secrets in favor of creating the secrets themselves, there is an option to list the secrets in the Wing application:
+
+```bash
+wing secrets main.w --list
+
+2 secrets found in main.w
+
+- SLACK_SIGNING_SECRET
+- SLACK_BOT_TOKEN
+```
diff --git a/docs/contributing/999-rfcs/2024-05-07-intrinsics.md b/docs/contributing/999-rfcs/2024-05-07-intrinsics.md
new file mode 100644
index 00000000000..efba24ae616
--- /dev/null
+++ b/docs/contributing/999-rfcs/2024-05-07-intrinsics.md
@@ -0,0 +1,40 @@
+---
+title: "Intrinsic Functions"
+description: Global compiler intrinsics
+---
+
+# Intrinsics
+
+- **Author(s)**: @MarkMcCulloh
+- **Submission Date**: 2024-05-07
+
+### Use Case
+
+In wing there are currently several built-in globals, all of which are injected with their own macro functionalities. These can intentionally have behaviors different from those possible to implement in wing itself. Some are simply macros that emit code, while some interact with the compiler in more novel/deep ways (e.g. `lift`). Even the simple macros have access to information that user-defined code would typically not (types, source position, etc.).
+
+These are incredibly useful, but their behavior is surprising when to the user they appear no different than any other symbol/variable. Additionally they allow you to do things like do variable shadowing and assign them to variables which can actually break their functionality.
+
+### Proposed Solution
+
+Introduce a new syntax to reflect these special behaviors.
+
+I propose `@x` and `@x()` as a "compiler intrinsic", with the following notes:
+- Having an intrinsic called `@x` does not mean that there is a symbol called `x`. Intrinsics are their own separate concept.
+- While the arguments/return types must be representable wing types, the kind of expressions that can be passed as arguments may have certain restrictions. For example, it would be common to only allow non-interpolated string for certain cases to ensure all information is available statically.
+
+- Why `@`?
+  - It's not a valid identifier character, so there is no ambiguity that this is a special thing
+  - A reasonable-looking alternative is x!(...) a la rust. Unfortunately ! is already used as the postfix unwrap. I think having a construct that is `<identifier><!>` mean 2 different things is ambiguous for both users and the compiler.
+  - Having a special character as a prefix is useful for IDE completions because all you have to do is type `@` and you see all the available options.
+  - It looks nice in [zig for builtins](https://ziglang.org/documentation/master/#Builtin-Functions) so there is at least some precedent
+  - `@` is used in js for decorators which has a similar vibe of being special in the eyes of the compiler. It would not be unreasonable to use @ for decorators of some kind in wing as well.
+
+With this, we can convert our existing globals to intrinsics instead and go forward implementing new ones. Some existing issues that I think would benefit:
+- `@file` - https://github.com/winglang/wing/issues/5449
+- `@inflight` - https://github.com/winglang/wing/issues/6045
+
+For certain widely used globals (e.g. `log` and `assert`), we should soft-deprecate the old syntax and only provide a warning when they are used. 
+
+### Other thoughts
+
+I think it would be reasonable to expose the ability to create these in user-space via some sort of compiler API. This would be amazing but the design and implementation that would be a pretty huge task. Even if we did, we could still use the same syntax for invoke them even though we probably shouldn't call them "intrinsic" anymore.
diff --git a/docs/docs/01-start-here/01-getting-started.md b/docs/docs/01-start-here/01-getting-started.md
deleted file mode 100644
index 1f12198a28b..00000000000
--- a/docs/docs/01-start-here/01-getting-started.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-id: getting-started
-title: Getting started
-description: Wing is a cloud-oriented programming language. Most programming languages think about computers as individual machines. In Wing, the cloud is the computer.
-image: https://assets.website-files.com/63720940a94e098b4e2a542b/637e2d5495f59f7654160773_Social%20thumbnail.png
-slug: /
-hide_title: true
----
-
-# Welcome Wingnuts! :wave: 
-
-This handbook is your ultimate guide for learning about the Wing language. It is
-organized like a book, so you can read it by going from top to bottom by
-clicking "Next" at the bottom of each page. Alternatively, you can browse topics
-through the left-hand navigation bar. You know, the regular structure...
-
-You are invited to join the [Wing Community Slack]. We would love to get to know you!
-Come say hi, hang out, geek out, help friends and share your experience ❤️
-
-[Wing Community Slack]: https://t.winglang.io/slack
-
-TL;DR: if you can't be bothered with all the philosophical blabber, feel free to
-jump right in and [install the Wing CLI](./02-installation.md).
-
-## What is a cloud-oriented language?
-
-Wing is what we call a **cloud-oriented programming language**. It allows
-developers to build distributed systems that fully leverage the power of the
-cloud without having to worry about the underlying infrastructure.
-It's best explained through an example:
-
-
-```js
-bring cloud;
-
-let queue = new cloud.Queue(timeout: 2m);
-let bucket = new cloud.Bucket();
-let counter = new cloud.Counter(initial: 100);
-
-queue.setConsumer(inflight (body: str): str => {
-  let next = counter.inc();
-  let key = "myfile-{next}.txt";
-  bucket.put(key, body);
-});
-```
-
-In this simple application, every message that goes into the queue is written to
-a new object inside a cloud bucket. An atomic counter is used to generate an
-incrementing and unique key for each object.
-
-***But don't let the simplicity of this example fool you!***
-
-When compiling this code, the Wing compiler will produce a bundle of artifacts
-that are ready to be deployed to a cloud provider. This bundle includes
-[Terraform] files which define the infrastructure resources required for this
-application and [JavaScript] code to run on cloud compute resources.
-
-When deployed to the cloud, this application can handle an infinite amount of
-traffic, with no need for you to explicitly take care of scaling, load
-balancing, security policies, or any other infrastructure-related concerns. For
-example, when targeting AWS, Wing will use Amazon S3 for the bucket, Amazon SQS
-for the queue, Amazon DynamoDB for the atomic counter, and AWS Lambda for the
-handler. It will also render least privilege IAM security policies, wire up
-environment variables and produce the code bundles needed for this to work on AWS Lambda.
-
-In addition to targeting cloud providers, Wing applications can also be compiled
-to run inside a local **Cloud Simulator**. This means that you can now iterate
-on your code without having to deploy it to the cloud, write **unit tests** that
-cover your complete cloud architecture and **debug** your code in a local
-environment.
-
-Every Wing installation includes access to the Wing Console, a visual application-centric operations and management console that lets you interact with the cloud simulator.
-Through the console you can view logs, inspect resources, and even run unit tests:
-
-![Wing Console screenshot](../06-tools/console-demo-1.png)
-
-This is what we call **cloud-oriented programming**. It's a programming paradigm
-which treats the cloud as a computer, and heavily relies on managed services and
-distributed programming to build and deliver systems that are intrinsically
-scalable, highly-available, and robust.
-
-## Why you should consider Wing?
-
-The cloud has evolved to become a ubiquitous platform for running many types of applications.
-However, the cloud has also introduced a new set of challenges for developers.
-Writing applications often requires understanding low-level details of cloud services, and barriers between the spaces of infrastructure and runtime code make it increasingly difficult to test and debug applications locally.
-
-Wing addresses these challenges through several key pillars:
-
-* **Iteration speed** - Wing applications can run in a local cloud simulator.
-  This allows developers to iterate at a much faster pace, and to see the
-  effects of incremental changes at milliseconds latency.
-  Unit testing in Wing can validate architectures end-to-end without requiring deployments or heavy mocking.
-* **High-level cloud primitives** - The batteries-included Wing Cloud Library allows developers to leverage the power of the cloud
-  to its full extent through a set of rich, high-level and cloud-portable
-  resources. This allows developers to build complete cloud applications without
-  having to be infrastructure experts.
-* **Distributed computing support** - Traditional languages are designed to tell a single machine what to do, but the cloud at its core is a big distributed system.
-  Wing allows cloud applications to be written more naturally through the concepts of [preflight and inflight code](https://www.winglang.io/docs/concepts/inflights), which allow infrastructure and runtime code to be interleaved while
-  giving developers the speed safety they expect from modern tooling.
-* **Infrastructure as policy** - Infrastructure concerns such as deployment,
-  networking, security, and observability can be applied horizontally through
-  policies instead of inside the application code.
-
-## This is a pre-release 🧪
-
-We are working hard to make this a great tool, but there's still a pretty good 
-chance you'll encounter missing pieces, rough edges, performance issues and even,
-god forbid, bugs 🐞. 
-
-Please don't hesitate to ping us on [Slack](https://t.winglang.io/slack) or 
-[file an issue](https://github.com/winglang/wing). We promise to do our best to
-respond quickly and help out.
-
-Our <a href="https://www.winglang.io/contributing/status">Project Status</a> page includes
-more information about stability and roadmap 👷‍♀️ 
-
-[Terraform]: https://www.terraform.io/
-[JavaScript]: https://developer.mozilla.org/en-US/docs/Web/JavaScript
diff --git a/docs/docs/01-start-here/02-getting-started.md b/docs/docs/01-start-here/02-getting-started.md
new file mode 100644
index 00000000000..6cc27a8c46e
--- /dev/null
+++ b/docs/docs/01-start-here/02-getting-started.md
@@ -0,0 +1,133 @@
+---
+id: getting-started
+title: Getting Started
+keywords: [Getting started, Wing installation, installation, Wing toolchain]
+slug: /
+---
+
+## Welcome
+
+Welcome, it's great to see you here!
+
+As you prepare to start taking flight with Wing 😉, there are a few things you need to do to get set up.
+This guide will walk you through the steps to setup Wing on your machine, create your first project, run it in the Wing Simulator and deploy it to AWS.
+
+:::info
+
+Wing is still in active development, and we would love to hear what you think! Please ping us on [Wing Discord](https://t.winglang.io/discord), share what you want to build
+and let us know if you encounter any issues. There's also a cute channel with music recommendations 🎶
+
+:::
+
+> Did you know that you can also take Wing for a spin without installing anything?
+> Check out the [Wing Playground](https://www.winglang.io/play/).
+
+## Prerequisite
+
+* [Node.js](https://nodejs.org/en/) v20 or later
+
+## Install
+
+The Wing CLI is distributed via [npm](https://www.npmjs.com/package/winglang):
+
+```sh
+npm install -g winglang
+```
+
+Verify your installation:
+```
+wing -V
+```
+
+## IDE Extension
+
+Wing has extended support for two IDEs. They provide syntax highlighting, completions, go-to-definition, etc. and embedded Wing Console support:
+
+- [VSCode](https://marketplace.visualstudio.com/items?itemName=Monada.vscode-wing) - Official extension
+- [IntelliJ](https://plugins.jetbrains.com/plugin/22353-wing) - Community extension
+
+To use Wing in other IDEs, there are a few tools available to help:
+
+- Language server - Running `wing lsp` serves the official language server
+- [TextMate grammar](https://github.com/winglang/wing/blob/main/apps/vscode-wing/syntaxes/wing.tmLanguage.json) - For syntax highlighting
+- [tree-sitter grammar and queries](https://github.com/winglang/wing/tree/main/libs/tree-sitter-wing) - For syntax highlighting and more
+- [Syntax Highlighting for GitHub (Chrome extension)](https://chromewebstore.google.com/detail/winglang-syntax-hightligh/gjnleleianfjpmckmmdeahlklhcdlakj) - Adds syntax highlighting to various locations within GitHub
+
+## Create your project
+
+First let's create an empty directory for your project:
+
+```sh
+mkdir hello-wing
+cd hello-wing
+```
+
+You can use the CLI to bootstrap a new project: Use the `new` command and then modify `main.w` to have the following:
+
+```sh
+wing new empty
+```
+
+```js example
+bring cloud;
+
+// define a queue, a bucket and a counter
+let bucket = new cloud.Bucket();
+let counter = new cloud.Counter(initial: 1);
+let queue = new cloud.Queue();
+
+// When a message is received in the queue it should be consumed
+// by the following closure
+queue.setConsumer(inflight (message: str) => {
+  // Increment the distributed counter, the index variable will 
+  // store the value prior to the increment
+  let index = counter.inc();
+  // Once two messages are pushed to the queue, e.g. "Wing" and "Queue".
+  // Two files will be created:
+  // - wing-1.txt with "Hello Wing"
+  // - wing-2.txt with "Hello Queue"
+  bucket.put("wing-{index}.txt", "Hello, {message}");
+  log("file wing-{index}.txt created");
+});
+```
+
+:::info
+
+<details><summary>Experimental TypeScript Support</summary>
+
+If you'd like to use TypeScript instead of winglang, you can add the `--language ts` flag when creating a new project:
+
+```sh
+wing new empty --language ts
+```
+
+Then modify `main.ts` to have the following, equivalent to the above winglang code:
+
+```ts
+import { main, cloud, lift } from "@wingcloud/framework";
+
+main((root) => {
+  const bucket = new cloud.Bucket(root, "Bucket");
+  const counter = new cloud.Counter(root, "Counter");
+  const queue = new cloud.Queue(root, "Queue");
+
+  queue.setConsumer(
+    lift({ bucket, counter }).inflight(async ({ bucket, counter }, message) => {
+      const index = await counter.inc();
+      await bucket.put(`wing-${index}.txt`, `Hello, ${message}`);
+      console.log(`file wing-${index}.txt created`);
+    })
+  );
+});
+```
+
+The rest of the starting guide will be the same!
+See [here](../09-typescript/index.md) for more information on using TypeScript with Wing.
+  
+</details>
+
+:::
+
+Here we defined a queue and a counter. Every time a message is added to the queue, a handler is triggered and creates a file named `wing-{counter-index}.txt` with the content `"Hello, {message}!"`, and the counter is incremented by 1.
+
+Now that we've written this program, let's run and test it using the **Wing Console**.
diff --git a/docs/docs/01-start-here/02-installation.md b/docs/docs/01-start-here/02-installation.md
deleted file mode 100644
index 45093ff34a1..00000000000
--- a/docs/docs/01-start-here/02-installation.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-id: installation
-title: Installation
-keywords: [Wing installation, installation, Wing toolchain]
----
-
-:::info We are out there
-
-New experiences are always better with friends and support, [join](https://t.winglang.io/slack) 
-the **Wing Community Slack** and jump right into the [#getting-started](https://winglang.slack.com/archives/C04BBDQUWQP) 
-channel. Say :wave: and feel free to ask questions, post rants and 
-offer advice to your fellow Wingnuts.
-
-If you run into issues, please submit a [new
-issue](https://github.com/winglang/wing/issues/new/choose) on GitHub and let us
-know as soon as possible.
-
-::: 
-
-In this section you will install Wing on your system. This includes:
-
-1. **Wing Toolchain**: The Wing development toolchain which includes the **Wing CLI**, **Wing Compiler** and the **Wing Console**.
-2. **Wing VSCode Extension**: An extension for developing Wing code in the VSCode IDE.
-
-## Prerequisites
-
-To install Wing, you will need the following setup:
-
-* [Node.js](https://nodejs.org/en/) (>= 18.13.0)
-* [VSCode] (not required, but currently supported with an [extension](#wing-ide-extension))
-
-## Wing Toolchain
-
-The Wing Toolchain is distributed via [npm](https://www.npmjs.com/):
-
-```sh
-npm install -g winglang
-```
-
-Verify your installation:
-
-```sh
-wing --version
-```
-
-## Wing VSCode Extension
-
-The Wing VSCode Extension adds syntax highlighting and other conveniences for the Wing Programming Language in [VSCode].
-
-To install the Wing VSCode extension, [download](https://marketplace.visualstudio.com/items?itemName=Monada.vscode-wing) it from the VSCode Marketplace. It is distributed via the VSCode Marketplace.
-
-[VSCode]: https://code.visualstudio.com/
diff --git a/docs/docs/01-start-here/03-hello.md b/docs/docs/01-start-here/03-hello.md
deleted file mode 100644
index 90735740fb5..00000000000
--- a/docs/docs/01-start-here/03-hello.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-id: hello
-title: Hello, Wing!
-keywords: [Hello World, first Wing program, Wing example]
----
-
-OK, we are ready for our first Wing program!
-
-## Create your project directory
-
-Let's create an empty directory for your project.
-
-```sh
-mkdir hello-wing
-cd hello-wing
-```
-
-## The entrypoint file
-
-Add a new file called `main.w` with the following code. This file is the
-entrypoint of your Wing application.
-
-```js
-bring cloud;
-
-let bucket = new cloud.Bucket();
-let counter = new cloud.Counter(initial: 1);
-let queue = new cloud.Queue();
-
-queue.setConsumer(inflight (message: str) => {
-  let index = counter.inc();
-  bucket.put("wing-{index}.txt", "Hello, {message}");
-  log("file wing-{index}.txt created");
-});
-```
-
-This code should be mostly self explanatory. We define a queue and a counter, and every time a
-message is added to the queue, a handler is triggered and creates a file named `wing-<counter-index>.txt` with `"Hello, {message}!"` content, and the counter is incremented by 1.
-
-Now that we've written this program, let's run and test it using the **Wing Console**.
diff --git a/docs/docs/01-start-here/04-run-locally.md b/docs/docs/01-start-here/04-run-locally.md
index 1339e82af2f..e42cc3d15fd 100644
--- a/docs/docs/01-start-here/04-run-locally.md
+++ b/docs/docs/01-start-here/04-run-locally.md
@@ -4,7 +4,7 @@ id: local
 keywords: [Wing Local, Wing testing, Wing Console installation, Wing Console usage, Wing Console setup]
 ---
 
-The **Wing Console** is a web application that provides an interface that can be used to view, explore, and interact with Wing applications as you develop them on the local machine.
+The **Wing Console** is a local web app to view, explore, and interact with Wing applications as you develop them on the local machine.
 
 ## Starting the Wing Console
 
diff --git a/docs/docs/01-start-here/05-aws.md b/docs/docs/01-start-here/05-aws.md
index 3b2581a913b..e4a7c689091 100644
--- a/docs/docs/01-start-here/05-aws.md
+++ b/docs/docs/01-start-here/05-aws.md
@@ -23,7 +23,7 @@ resources, using Terraform as the provisioning engine.
 
 :::info Under Construction
 
-:construction: We plan to also support [Azure](https://github.com/winglang/wing/issues?q=is:issue+is:open+sort:updated-desc+label:azure) and [Google Cloud](https://github.com/winglang/wing/issues?q=is:issue+is:open+sort:updated-desc+label:gcp) as platforms out of
+:construction: We plan to also support [Azure](https://github.com/winglang/wing/issues?q=is:issue+is:open+sort:updated-desc+label:%22☁️%20azure%22) and [Google Cloud](https://github.com/winglang/wing/issues?q=is:issue+is:open+sort:updated-desc+label:%22☁️%20gcp%22) as platforms out of
 the box. In addition, we are planning support for other provisioning engines
 such as AWS CloudFormation and Kubernetes.
 
diff --git a/docs/docs/01-start-here/06-learn-more.md b/docs/docs/01-start-here/06-learn-more.md
index aa777537789..82ba9fcd5f3 100644
--- a/docs/docs/01-start-here/06-learn-more.md
+++ b/docs/docs/01-start-here/06-learn-more.md
@@ -13,7 +13,7 @@ Learn about Wing's [core concepts](https://www.winglang.io/docs/category/core-co
 
 Or check out the documentation of the varios resources in Wing's [standard library](https://www.winglang.io/docs/category/standard-library) which abstracts the cloud.
 
-You can also check out Wing's [toolchain](https://www.winglang.io/docs/category/tools), including the [compiler plugins](https://www.winglang.io/docs/tools/compiler-plugins) that allow you to go below the abstraction layer and tweak the infrastructure definitions directly.
+You can also check out Wing's [toolchain](https://www.winglang.io/docs/category/tools), including the [platforms](https://www.winglang.io/docs/concepts/platforms) that allow you to go below the abstraction layer and tweak the infrastructure definitions directly.
 
 ### Interactive Tutorials 
 
@@ -42,4 +42,4 @@ Put your skills to the test using the [playground](https://docs.winglang.io/gett
 ### Community
 We also have a [YouTube channel](https://www.youtube.com/@winglangio) where we share clips of demos and guest interviews on our [Twitch show](https://www.twitch.tv/winglangio), and a [blog](https://www.winglang.io/blog).
 
-Finally, we encourage you to join our [Wing Slack](http://t.winglang.io/slack) where we help each other, answer questions, and share our cloud adventures.
\ No newline at end of file
+Finally, we encourage you to join our [Wing Discord](http://t.winglang.io/discord) where we help each other, answer questions, and share our cloud adventures.
\ No newline at end of file
diff --git a/docs/docs/02-concepts/00-cloud-oriented-programming.md b/docs/docs/02-concepts/00-cloud-oriented-programming.md
new file mode 100644
index 00000000000..12ce581b98d
--- /dev/null
+++ b/docs/docs/02-concepts/00-cloud-oriented-programming.md
@@ -0,0 +1,104 @@
+---
+id: why-wing
+title: Why Wing
+description: Wing is a cloud-oriented programming language. Most programming languages think about computers as individual machines. In Wing, the cloud is the computer.
+image: https://assets.website-files.com/63720940a94e098b4e2a542b/637e2d5495f59f7654160773_Social%20thumbnail.png
+
+---
+
+
+## What is a cloud-oriented language?
+
+Wing is what we call a **cloud-oriented programming language**. It allows
+developers to build distributed systems that fully leverage the power of the
+cloud without having to worry about the underlying infrastructure.
+It's best explained through an example:
+
+
+```js example
+bring cloud;
+
+let queue = new cloud.Queue(timeout: 2m);
+let bucket = new cloud.Bucket();
+let counter = new cloud.Counter(initial: 100);
+
+queue.setConsumer(inflight (body: str) => {
+  let next = counter.inc();
+  let key = "myfile-{next}.txt";
+  bucket.put(key, body);
+});
+```
+
+In this simple application, every message that goes into the queue is written to
+a new object inside a cloud bucket. An atomic counter is used to generate an
+incrementing and unique key for each object.
+
+***But don't let the simplicity of this example fool you!***
+
+When compiling this code, the Wing compiler will produce a bundle of artifacts
+that are ready to be deployed to a cloud provider. This bundle includes
+[Terraform] files which define the infrastructure resources required for this
+application and [JavaScript] code to run on cloud compute resources.
+
+When deployed to the cloud, this application can handle an infinite amount of
+traffic, with no need for you to explicitly take care of scaling, load
+balancing, security policies, or any other infrastructure-related concerns. For
+example, when targeting AWS, Wing will use Amazon S3 for the bucket, Amazon SQS
+for the queue, Amazon DynamoDB for the atomic counter, and AWS Lambda for the
+handler. It will also render least privilege IAM security policies, wire up
+environment variables and produce the code bundles needed for this to work on AWS Lambda.
+
+In addition to targeting cloud providers, Wing applications can also be compiled
+to run inside a local **Cloud Simulator**. This means that you can now iterate
+on your code without having to deploy it to the cloud, write **unit tests** that
+cover your complete cloud architecture and **debug** your code in a local
+environment.
+
+Every Wing installation includes access to the Wing Console, a visual application-centric operations and management console that lets you interact with the cloud simulator.
+Through the console you can view logs, inspect resources, and even run unit tests:
+
+![Wing Console screenshot](../06-tools/console-demo-1.png)
+
+This is what we call **cloud-oriented programming**. It's a programming paradigm
+which treats the cloud as a computer, and heavily relies on managed services and
+distributed programming to build and deliver systems that are intrinsically
+scalable, highly-available, and robust.
+
+## Why you should consider Wing?
+
+The cloud has evolved to become a ubiquitous platform for running many types of applications.
+However, the cloud has also introduced a new set of challenges for developers.
+Writing applications often requires understanding low-level details of cloud services, and barriers between the spaces of infrastructure and runtime code make it increasingly difficult to test and debug applications locally.
+
+Wing addresses these challenges through several key pillars:
+
+* **Iteration speed** - Wing applications can run in a local cloud simulator.
+  This allows developers to iterate at a much faster pace, and to see the
+  effects of incremental changes at milliseconds latency.
+  Unit testing in Wing can validate architectures end-to-end without requiring deployments or heavy mocking.
+* **High-level cloud primitives** - The batteries-included Wing Cloud Library allows developers to leverage the power of the cloud
+  to its full extent through a set of rich, high-level and cloud-portable
+  resources. This allows developers to build complete cloud applications without
+  having to be infrastructure experts.
+* **Distributed computing support** - Traditional languages are designed to tell a single machine what to do, but the cloud at its core is a big distributed system.
+  Wing allows cloud applications to be written more naturally through the concepts of [preflight and inflight code](https://www.winglang.io/docs/concepts/inflights), which allow infrastructure and runtime code to be interleaved while
+  giving developers the speed safety they expect from modern tooling.
+* **Infrastructure as policy** - Infrastructure concerns such as deployment,
+  networking, security, and observability can be applied horizontally through
+  policies instead of inside the application code.
+
+## This is a pre-release 🧪
+
+We are working hard to make this a great tool, but there's still a pretty good 
+chance you'll encounter missing pieces, rough edges, performance issues and even,
+god forbid, bugs 🐞. 
+
+Please don't hesitate to ping us on [Discord](https://t.winglang.io/discord) or 
+[file an issue](https://github.com/winglang/wing). We promise to do our best to
+respond quickly and help out.
+
+Our <a href="https://www.winglang.io/contributing/status">Project Status</a> page includes
+more information about stability and roadmap 👷‍♀️ 
+
+[Terraform]: https://www.terraform.io/
+[JavaScript]: https://developer.mozilla.org/en-US/docs/Web/JavaScript
diff --git a/docs/docs/02-concepts/01-preflight-and-inflight.md b/docs/docs/02-concepts/01-preflight-and-inflight.md
index f857da0da82..73f019797ea 100644
--- a/docs/docs/02-concepts/01-preflight-and-inflight.md
+++ b/docs/docs/02-concepts/01-preflight-and-inflight.md
@@ -28,7 +28,7 @@ Your preflight code runs once, at compile time, and defines your application's i
 
 For example, this code snippet defines a storage bucket using a class from the standard library:
 
-```js playground
+```js playground example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -42,7 +42,7 @@ Preflight code can be also used to configure services or set up more complex eve
 
 In this code snippet, we've specified the bucket's contents will be publicly accessible, and it will be pre-populated with a file during the app's deployment (not while the app is running).
 
-```js playground
+```js playground example
 bring cloud;
 
 let bucket = new cloud.Bucket(public: true);
@@ -52,7 +52,7 @@ bucket.addObject("file1.txt", "Hello world!");
 There are a few global functions with specific behaviors in preflight.
 For example, adding a `log()` statement to your preflight code will result in Wing printing a message to the console after compilation.
 
-```js
+```js example
 // hello.w
 log("7 * 6 = {7 * 6}");
 ```
@@ -84,7 +84,7 @@ Let's walk through some examples.
 
 Inflight code is always contained inside a block that starts with the word `inflight`.
 
-```js
+```js example
 let greeting = inflight () => {
   log("Hello from the cloud!");
 };
@@ -93,7 +93,7 @@ let greeting = inflight () => {
 Inflight code can call other inflight functions and methods.
 For example, `cloud.Bucket` has an inflight method named `list()` that can be called inside inflight contexts:
 
-```js playground
+```js playground example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -110,7 +110,7 @@ Even though `bucket` is defined in preflight, it's okay to use its inflight meth
 
 For an inflight function to actually get executed, it must be provided to an API that expects inflight code. For example, we can provide it to a `cloud.Function`:
 
-```js playground
+```js playground example
 bring cloud;
 
 let func = new cloud.Function(inflight () => {
@@ -133,7 +133,7 @@ firstObject(); // error: Cannot call into inflight phase while preflight
 Likewise, inflight code cannot call preflight code, because preflight code has the capability to modify your application's infrastructure configuration, which is disallowed after deployment.
 For example, since `addObject` is a preflight method, it cannot be called in inflight:
 
-```js playground
+```js playground example{valid: false}
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -147,7 +147,7 @@ Instead, to insert an object into the bucket at runtime you would have to use an
 
 Since a class's initializer is just a special kind of preflight function, it also isn't possible to initialize regular classes during preflight:
 
-```js playground
+```js playground example{valid: false}
 bring cloud;
 
 inflight () => {
@@ -163,7 +163,7 @@ A preflight class (the default kind of class) can contain both preflight and inf
 Here's a class that models a queue that can replay its messages.
 A `cloud.Bucket` stores the history of messages, and a `cloud.Counter` helps with sequencing each new message as it's added to the queue.
 
-```js playground
+```js playground example
 bring cloud;
 
 class ReplayableQueue {
@@ -202,7 +202,7 @@ Inflight classes are safe to create in inflight contexts.
 
 For example, this inflight class can be created in an inflight contexts, and its methods can be called in inflight contexts:
 
-```js playground
+```js playground example
 inflight () => {
   class Person {
     name: str;
@@ -213,7 +213,7 @@ inflight () => {
       this.age = age;
     }
 
-    inflight greet() {
+    pub inflight greet() {
       log("Hello, {this.name}!");
     }
   }
@@ -230,7 +230,7 @@ While inflight code can't call preflight code, it's perfectly ok to reference da
 For example, the `cloud.Api` class has a preflight field named `url`.
 Since the URL is a string, it can be directly referenced inflight:
 
-```js
+```js example
 bring cloud;
 bring http;
 
@@ -252,9 +252,9 @@ new cloud.Function(checkEndpoint);
 ```
 
 However, mutation to preflight data is not allowed.
-This mean means that variables from preflight cannot be reassigned to, and mutable collections like `MutArray` and `MutMap` cannot be modified.
+This mean means that variables from preflight cannot be reassigned to, and mutable collections like `MutArray` and `MutMap` cannot be modified (they're turned into their immutable counterparts, `Array` and `Map`, respectively when accessed inflight).
 
-```js playground
+```js playground example{valid: false}
 let var count = 3;
 let names = MutArray<str>["John", "Jane", "Joe"];
 
@@ -263,11 +263,77 @@ names.push("Jack"); // OK
 
 inflight () => {
   count = count + 1; // error: Variable cannot be reassigned from inflight
-  names.push("Jill"); // error: variable "names" cannot be mutated in inflight - error message not 
-                      // implemented yet, see https://github.com/winglang/wing/issues/3069
+  names.push("Jill"); // error: push doesn't exist in Array
+};
+```
+
+### Lift qualification
+
+Preflight objects referenced inflight are called "lifted" objects:
+
+```js playground example
+let preflight_str = "hello from preflight"; 
+inflight () => {
+  log(preflight_str); // `preflight_str` is "lifted" into inflight.
 };
 ```
 
+During the lifting process the compiler tries to figure out in what way the lifted objects are being used. 
+This is how Winglang generats least privilage permissions. Consider the case of lifting a [`cloud.Bucket`](../04-standard-library/cloud/bucket.md) object:
+
+```js playground example
+bring cloud;
+let bucket = new cloud.Bucket();
+new cloud.Function(inflight () => {
+  bucket.put("key", "value"); // `bucket` is lifted and `put` is being used on it
+});
+```
+
+In this example the compiler generates the correct _write_ access permissions for the [`cloud.Function`](../04-standard-library/cloud/function.md) on `bucket` based on the fact we're `put`ing into it. We say `bucket`'s lift is qualified with `put`. 
+
+#### Explicit lift qualification
+In some cases the compiler can't figure out (yet) the lift qualifications, and therefore will report an error:
+
+```js playground example{valid: false}
+bring cloud;
+let main_bucket = new cloud.Bucket() as "main";
+let secondary_bucket = new cloud.Bucket() as "backup";
+let use_main = true;
+new cloud.Function(inflight () => {
+  let var b = main_bucket;
+  if !use_main {
+    b = secondary_bucket;
+  }
+  b.put("key", "value"); // Error: the compiler doesn't know the possible values for `b` and therefore can't qualify the lift.
+});
+```
+
+To explicitly qualify lifts in an inflight closure or inflight method and suppress the above compiler error, create a `lift` block:
+
+```js playground
+bring cloud;
+let main_bucket = new cloud.Bucket() as "main";
+let secondary_bucket = new cloud.Bucket() as "backup";
+let use_main = true;
+new cloud.Function(inflight () => {
+  let var b = main_bucket;
+  if !use_main {
+    b = secondary_bucket;
+  }
+  // Explicitly state that methods named `put` may be used on `main_bucket` and `secondary_bucket`
+  lift {main_bucket: [put], secondary_bucket: [put]} {
+    // Error is supressed in this block and all possible values of `b` are explicitly qualified with `put`
+    b.put("key1", "value"); 
+    b.put("key2", "value");
+  }
+});
+```
+
+Within the first clause of the `lift` block, a list of qualifications on preflight objects can be added.
+
+Statements within a `lift` block are exempt from the compiler's analyzer that tries to determine preflight object usage automatically.
+If an inflight method is directly or indirectly called within a `lift` block without sufficient resource qualifications, it may result in errors at runtime.
+
 ## Phase-independent code
 
 The global functions `log`, `assert`, and `throw` can all be used in both preflight and inflight code.
diff --git a/docs/docs/02-concepts/02-application-tree.md b/docs/docs/02-concepts/02-application-tree.md
index d1536113e34..02318fda115 100644
--- a/docs/docs/02-concepts/02-application-tree.md
+++ b/docs/docs/02-concepts/02-application-tree.md
@@ -3,12 +3,16 @@ id: application-tree
 title: Application tree 
 ---
 
+## Instance names
+
 Instances of preflight classes in Wing are identified by a unique name.
 The name is used to identify the resource in the Wing Console, and is used to determine the logical name assigned to the resource in the infrastructure provisioning engine (such as Terraform or CloudFormation), and the physical name of the resource in the target cloud provider (such as AWS, Azure, or GCP).
 
 The default name of a resource is the name of the class. The name can be overridden using the `as` syntax:
 
-```js
+```js example
+bring cloud;
+
 let bucket1 = new cloud.Bucket(); // default name is "cloud.Bucket"
 let bucket2 = new cloud.Bucket() as "my-bucket";
 ```
@@ -16,7 +20,9 @@ let bucket2 = new cloud.Bucket() as "my-bucket";
 The name of a resource needs to be unique within the scope it is defined.
 New classes introduce new scopes, so the same name can be used for different resources in different classes.
 
-```js
+```js example
+bring cloud;
+
 class Group1 {
   new() {
     new cloud.Bucket() as "Store";
@@ -34,6 +40,126 @@ new Group1();
 new Group2();
 ```
 
+## Instance scope
+
+Instances of preflight classes define the application's construct tree. This way you can think about the generated cloud infrastructure as a logical tree where each node is some logical piece of infrastructure which may contain children nodes which are also part of your application's infrastructure (composition). 
+
+In Wing this tree structure is automatically generated. Any class instantiated at the top level (global scope) is a child of the "root" node of of the tree. 
+Any class instantiated inside another class (in its constructor or one of its other preflight methods) will be placed as a child of that other class.
+
+```js example
+class ThumbnailBucket {
+  //...
+}
+
+class ImageStorage {
+  new() {
+    new ThumbnailBucket(); // This ThumbnailBucket will be a child of a ImageStorage instance in the construct tree
+  }
+}
+
+new ImageStorage(); // This ImageStorage will be a child of the root in the construct tree
+new ThumbnailBucket(); // This Counter will be a child of of the root in the construct tree
+
+// Here's a tree view of the generated infrastructure:
+//
+//              root
+//               /\
+//   ImageStorage  ThumbnailBucket
+//    /
+//  ThumbnailBucket
+```
+
+As mentioned in the [previous section](#instance-names) each instance must have a unique name within its scope. 
+And the name will be automatically generated based on the class name. 
+So the tree shown above also shows the correct names for each infrastructure piece of our application.
+You may query information about the construct tree using the `nodeof(someInstance)` intrinsic function:
+```js example
+bring cloud;
+
+let b = new cloud.Bucket();
+log(nodeof(b).path); // Will log something like "/root/Bucket"
+```
+
+### Controlling instance scope
+
+You may define an explicit scope for an instance instead of using Wing's default of placing it inside the instance where it was created using the `in` keyword:
+
+```js example
+class ThumbnailBucket {
+  //...
+}
+
+class ImageStorage {
+  new() {
+    new ThumbnailBucket(); // This ThumbnailBucket will be a child of a ImageStorage instance in the construct tree
+  }
+}
+
+let imageStorage = new ImageStorage(); // This goes in root
+let defaultThumbnails = new ThumbnailBucket() as "defaultThumbs" in imageStorage; // This is explicitly named "defaultThumbs" and explicitly placed inside imageStorage
+
+// Here's a tree view of the generated infrastructure:
+//
+//                   root
+//                  /
+//            ImageStorage  
+//             /       \
+//  ThumbnailBucket    defaultsThumbs
+```
+
+### Instances created inside static methods
+
+Preflight classes instantiated inside static methods, or instantiated inside constructors before `this` is available will use the
+scope of the caller by default:
+
+```js example
+bring cloud;
+
+class Factory {
+  pub static make() {
+    new cloud.Bucket(); // We're in a static, so we don't know where to place this bucket
+  }
+}
+
+class MyBucket {
+  new() {
+    Factory.make(); // Bucket will be placed inside `this` instance of `MyBucket`
+  }
+}
+new MyBucket();
+
+// tree:
+//          root
+//           /
+//       MyBucket
+//         /
+//      Bucket
+```
+
+Similarly, consider this case where we instantiate a class inside a parameter in a `super()` constructor call before the
+the class is creates and its scope becomes valid:
+
+```js example
+bring cloud;
+
+class Base {
+  new(b: cloud.Bucket) {}
+}
+class Derived extends Base {
+  new() {
+    super(new cloud.Bucket()); // Bucket create before `Derived` so scope defaults to caller
+  }
+}
+new Derived();
+
+// tree:
+//          root
+//           /\
+//     Bucket  Derived
+```
+
+## Interop
 Classes in Wing are an extension of the [Construct Programming Model] and as such any [AWS Constructs] can be natively used in Wing applications.
 
 [Construct Programming Model]: https://docs.aws.amazon.com/cdk/v2/guide/constructs.html
diff --git a/docs/docs/02-concepts/03-platforms.md b/docs/docs/02-concepts/03-platforms.md
index cbdb107c5e8..f916a0dff63 100644
--- a/docs/docs/02-concepts/03-platforms.md
+++ b/docs/docs/02-concepts/03-platforms.md
@@ -7,8 +7,6 @@ keywords: [platforms, targets, target, platform, aws, gcp, azure, sim, terraform
 
 When working with the Wing programming language, an integral part of the compilation process is the use of platform. In essence, platform specify how and where your application is deployed. They determine both the cloud environment and the provisioning engine that the code will be deployed with.
 
-## Platforms
-
 You can view the list of available builtin platform with the `wing compile --help` command. Here is an example of the output:
 
 ```sh
@@ -40,6 +38,29 @@ The order in which platforms are evaluated is important.
 
 The first platform in the list is the primary platform, it is responsible for providing the Wing compiler with the base App that will be used to determine how resources are created, as well it will also lay the ground work for what target the rest of the platforms will need to be compatible with.
 
+#### Implicit Platforms
+
+Additionally, you can use naming conventions to implicitly define platforms that should be used. These platform files can be located in the root of your project or in a library that your project uses. The naming convention is as follows:
+```sh
+wplatform.js
+*.wplatform.js
+```
+
+For example, if you have a file named `custom.wplatform.js` in the root of your project, it will automatically be added to the list of platforms to be used when compiling your application. Its also important to note that implicit platforms are always loaded after the platforms specified in the `--platform` option.
+
+The use of implicit platforms can be beneficial when writing a Wing library that requires a specific platform to be used. For example, if you are writing a library that requires a specific parameter to be passed to the platform, you can use an implicit platform to ensure that the parameter is always provided.
+
+For example, if your library structure looks like this:
+
+```sh
+my-library/
+  lib.w
+  custom.wplatform.js
+```
+
+Then the custom platform can define any required parameters that the library needs to function properly. (see [Defining Custom Platform Parameters](#defining-custom-platform-parameters) for more information on how to define custom platform parameters)
+
+
 ### Provisioning Engines
 
 Provisioning is the process of setting up and creating infrastructure, and the provisioning engine is the driver behind this deployment. Common engines used in the Wing compilation process include Terraform and AWS CDK, with support for more planned ([tracking issue](https://github.com/winglang/wing/issues/2066)).
@@ -54,13 +75,55 @@ It is worth noting that the platform names are not guaranteed to match their tar
 
 Though not currently implemented, the platform target system is designed with extensibility in mind, as it will be used to determine compatibility between different platforms ([tracking issue](https://github.com/winglang/wing/issues/1474))
 
+#### Platform Parameters
+
+Some platform targets may require additional parameters to be provided. These parameters can be used to pass configuration values to the platform. For example, the platform target `tf-aws` has an optional parameter that can be specified to determine if a new VPC 
+should be created or if an existing VPC should be used. In order to provide this parameter, you can use the `--value` option in the cli to specify a key-value pair. For example:
+
+```sh
+wing compile app.main.w --platform tf-aws --value tf-aws/vpc=existing
+```
+
+which will tell the `tf-aws` platform to use an existing VPC. However this will result in an parameter validation error, since when using an existing VPC, you will be required to add additional parameters such as `vpcId` and subnets. As shown in the error below:
+
+```sh
+Error: Parameter validation errors:
+- must have required property 'vpc_id'
+- must have required property 'private_subnet_ids'
+- must have required property 'public_subnet_ids'
+```
+
+it is possible to provide these additional parameters using the `--value` option as well. For example:
+
+```sh
+wing compile app.main.w --platform tf-aws --value tf-aws/vpc=existing --value tf-aws/vpcId=vpc-1234567890 --value tf-aws/privateSubnetId=subnet-1234567890 --value tf-aws/publicSubnetId=subnet-1234567890
+```
+
+Though this may be a bit verbose. As an alternative you can use a values file. Value files are a way to provide multiple config values in a single file. By default the compiler will look for a file named `wing` with any of the following extensions `.json`, `.yaml`, `.yml`, `.toml` Though you can also specify a custom file using the `--values` option.
+
+Here is an example of using a `wing.toml` file to provide the same parameters as above:
+
+```toml
+[ tf-aws ]
+# vpc can be set to "new" or "existing"
+vpc = "new"
+# vpc_lambda will ensure that lambda functions are created within the vpc on the private subnet
+vpc_lambda = true
+# vpc_api_gateway will ensure that the api gateway is created within the vpc on the private subnet
+vpc_api_gateway = true
+# The following parameters will be required if using "existing" vpc
+# vpc_id = "vpc-123xyz"
+# private_subnet_ids = ["subnet-123xyz"]
+# public_subnet_ids = ["subnet-123xyz"]
+```
+
 #### Target-specific code
 
 There might be times when you need to write code that is specific to a particular platform target. For example, you may want to activate a verbose logging service only when testing locally to save on cloud log storage costs.
 
 With the Wing `util` library, you can access environment variables. The `WING_TARGET` environment variable contains the current platform target as it's value, which you can use to conditionally run target-specific code. See the example below:
 
-```js playground
+```js playground example
 bring cloud;
 bring util;
 
@@ -127,7 +190,7 @@ export interface IPlatform {
 
 ### Using a custom platform
 
-When running the `wing compile` command, the `--platform` option is used to specify the platform provider(s) you wish to use. This option is accepts variadic arguments, which means you can specify any number of platforms. 
+When running the `wing compile` command, the `--platform` option is used to specify the platform provider(s) you wish to use. This option accepts variadic arguments, which means you can specify any number of platforms. 
 
 The specified platform can be a built-in platform, or a path to a custom platform. For example, if you have a custom platform named `my-platform`, you can specify it as follows:
 
@@ -235,4 +298,48 @@ exports.Platform = class MyPlatform {
 } 
 ```
 
-<!-- TODO: Create step by step guide for writing custom platforms and publishing them as node modules -->
\ No newline at end of file
+### Defining Custom Platform Parameters
+
+In addition to the hooks mentioned above, you can also define custom parameters for your platform. These parameters can be used to pass
+configuration to your platform and can be optional or required.
+
+Parameters are defined using the `parameters` property of the platform. These parameters are expected to be provided in the form of a 
+(JSON schema)[https://json-schema.org/]. 
+
+The following example shoes how to define three parameters `replicateAllBuckets`, `bucketsToReplicate` and `replicaRegion` for a custom platform.
+Our platform's logic will either replicate all buckets if `replicateAllBuckets` is set to `true` or replicate only the buckets specified in `bucketsToReplicate` to the region specified in `replicaRegion`.
+
+Its important to understand the relationship between these parameters, as in if `replicateAllBuckets` is set to `true` then `bucketsToReplicate` is not required.
+Whereas no matter the value of `replicateAllBuckets`, `replicaRegion` is always required.
+
+Luckily, JSON schema allows us to define these relationships and constraints like so:
+
+```js
+class MyPlatform {
+  parameters = {
+    type: "object",
+    required: ["replicateAllBuckets", "replicaRegion"],
+    properties: {
+      replicateAllBuckets: {
+        type: "boolean",
+      },
+      nameOfBucketsToReplicate: {
+        type: "array",
+        items: {
+          type: "string",
+        },
+      },
+      replicaRegion: {
+        type: "string",
+      },
+    },
+    "$comment": "Here in an allOf we can define multiple conditions that must be met for the schema to be valid",
+    allOf: [
+      {
+        if: { properties: { replicateAllBuckets: { const: false }} },
+        then: { required: ["nameOfBucketsToReplicate"] },
+      }
+    ]
+  }
+}
+```
diff --git a/docs/docs/02-concepts/04-tests.md b/docs/docs/02-concepts/04-tests.md
index 8f82720da56..7fb091a6be0 100644
--- a/docs/docs/02-concepts/04-tests.md
+++ b/docs/docs/02-concepts/04-tests.md
@@ -11,7 +11,7 @@ Winglang incorporates a lightweight testing framework, which is built around the
 
 You can create a test by adding the following code structure to any Winglang file (.w):
 
-```ts wing
+```ts wing example
 test "<test-name>" {
   // test code
 }
@@ -21,7 +21,7 @@ If a test throws an exception (typically using the `assert` function), it's cons
 
 Here's an example:
 
-```ts playground
+```ts playground example
 // example.w
 bring math;
 
@@ -50,7 +50,7 @@ Duration 0m0.54s
 
 Every Winglang test is executed in complete isolation. Take a look at the following code:
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let b = new cloud.Bucket();
@@ -73,7 +73,7 @@ In the first test (`bucket list should include created file`), a file is created
 
 Consider the following example:
 
-```ts playground
+```ts playground example
 bring cloud;
 bring util;
 
@@ -140,7 +140,7 @@ Wing Console provides a straightforward method to run either a single test or al
 
 Consider the following code:
 
-```ts playground
+```ts playground example{valid: false}
 // example.w
 bring cloud;
 
diff --git a/docs/docs/03-language-reference.md b/docs/docs/03-language-reference.md
index a2be58bfb03..26dcf996773 100644
--- a/docs/docs/03-language-reference.md
+++ b/docs/docs/03-language-reference.md
@@ -213,6 +213,13 @@ The `Json` keyword can be omitted from `Json` object literals:
 let jsonObj = { boom: 123, bam: [4, 5, 6] };
 ```
 
+You may use "punning" to define the literals with implicit keys:
+```TS
+let boom = 123;
+let bam = [4,5,6];
+let jsonObj = { boom, bam };
+```
+
 Every value within a `Json` array or object also has a type of `Json`.
 
 ##### 1.1.4.2 JSON objects
@@ -544,18 +551,55 @@ log("Timezone is GMT{d.timezone() / 60}"); // output: Timezone is GMT-2
 log("UTC: {t1.utc.toIso())}");            // output: 2023-02-09T06:21:03.000Z
 ```
 
+####  1.1.7 Indexing
+
+The `obj[index]` syntax can be used to index into arrays and objects. For example:
+
+```TS
+let arr = MutArray<num>[3, 5];
+assert(arr[0] == 3);
+assert(arr[1] == 5);
+assert(arr[-1] == 5);
+assert(arr[-2] == 3);
+
+arr[42]; // throws an index out of bounds error
+
+arr[0] = 42;
+arr[1] += 3.5;
+```
+
+Negative indices are supported and are counted from the end of the array.
+
+The following is a list of supported indexable types:
+
+* `Array` and `MutArray` - accepts a `num` index
+* `Map` and `MutMap` - accepts a `str` index
+* `Json` and `MutJson` - accepts `num` and `str` index values
+* `str` - accepts a `num` index
+
+[`▲ top`][top]
 
-### 1.2 Utility Functions
+### 1.2 Intrinsic Functions
 
-| Name         | Extra information                                     |
-| ------------ | ----------------------------------------------------- |
-| `log`        | logs str                                              |
-| `assert`     | checks a condition and _throws_ if evaluated to false |
-| `unsafeCast` | cast a value into a different type                    |
+Intrinsic functions are a special call-like expressions built into the Wing compiler with
+the following properties (given an example intrinsic `@x`):
+- `x` is not automatically a symbol that can be referenced
+- The arguments/return types must be representable Wing types, but can be more dynamic than user-defined functions
+  - For example, the return type may change between inflight and preflight
+
+| Name            | Extra information                                                                                                         |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------- |
+| `@log()`        | logs str                                                                                                                  |
+| `@assert()`     | checks a condition and _throws_ if evaluated to false                                                                     |
+| `@dirname`      | current source directory                                                                                                  |
+| `@unsafeCast()` | cast a value into a different type                                                                                        |
+| `@nodeof()`     | obtain the [tree node](./02-concepts/02-application-tree.md) of a preflight object                                        |
+| `@lift()`       | explicitly qualify a [lift](./02-concepts/01-preflight-and-inflight.md#explicit-lift-qualification) of a preflight object |
 
 > ```TS
-> log("Hello {name}");
-> assert(x > 0);
+> @log("Hello {name}");
+> @assert(x > 0);
+> @assert(x > 0, "x should be positive");
 > ```
 
 [`▲ top`][top]
@@ -639,7 +683,7 @@ let handler2 = inflight() => {
 Bridge between preflight and inflight is crossed with the help of immutable data
 structures, "structs" (user definable and `Struct`), and the capture mechanism.
 
-Preflight class methods and initializers can receive an inflight function as an argument. This
+Preflight class methods and constructors can receive an inflight function as an argument. This
 enables preflight classes to define code that will be executed on a cloud compute platform such as
 lambda functions, docker, virtual machines etc.
 
@@ -807,11 +851,17 @@ Here's a quick summary of how optionality works in Wing:
   otherwise.
 * `if let y = x { } else { }` is a special control flow statement which binds `y` inside the first
   block only if `x` has a value. Otherwise, the `else` block will be executed.
+* The `x!` notation will return the value in `x` if there is one, otherwise it will throw an error.
 * The `x?.y?.z` notation can be used to access fields only if they have a value. The type of this
   expression is `Z?` (an optional based on the type of the last component).
 * The `x ?? y` notation will return the value in `x` if there is one, `y` otherwise.
 * The keyword `nil` can be used in assignment scenarios to indicate that an optional doesn't have a
   value. It cannot be used to test if an optional has a value or not.
+* A type annotation in Wing can always be enclosed in parentheses: `num` and `(num)` are the same type.
+  This is useful when you want to denote an optional function type. For example `((str):num)?` means
+  an **optional function** receiving a `str` and returning a `num`, while the similarly written 
+  `(str):num?` means a function receiving a `str` and returning an **optional `num`**.
+
 
 #### 1.7.1 Declaration
 
@@ -916,6 +966,20 @@ f(myRequired: "hello");
 f(myOptional: 12, myRequired: "dang");
 ```
 
+A method implementation can omit any number of arguments from the end of an argument list when implementing an interface method. This is useful when you want to implement an interface method but don't need all of its arguments.
+
+```TS
+interface MyInterface {
+  myMethod(a: num, b: str, c: bool): void;
+}
+
+class MyClass impl MyInterface {
+  myMethod(a: num, b: str): void {
+    // This is a valid implementation of MyInterface.myMethod
+  }
+}
+```
+
 ##### 1.7.1.5 Function return types
 
 If a function returns an optional type, use the `return nil;` statement to indicate that the value
@@ -1337,6 +1401,17 @@ Structs can inherit from multiple other structs.
 > };
 > ```
 
+A struct literal initialization may use "punning" syntax to initialize fields using variables of the same names:
+> ```TS
+> struct MyData {
+>   someNum: num;
+>   someStr: str;
+> }
+> let someNum = 1;
+> let someStr = "string cheese";
+> let myData = MyData {someNum, someStr};
+> ```
+
 [`▲ top`][top]
 
 ---
@@ -1358,8 +1433,8 @@ scope in which it is declared. This implies that, if a class is declared at the
 program's entrypoint), it will be a *preflight class*. If a class is declared within an inflight
 scope, it will be implicitly an inflight class.
 
-A method that has the name **init** is considered to be a class
-constructor (or initializer).
+A method that has the name **new** is considered to be a class
+constructor.
 
 ```TS
 inflight class Name extends Base impl IMyInterface1, IMyInterface2 {
@@ -1432,10 +1507,14 @@ class Boo extends Foo {
 ```
 
 Classes can inherit and extend other classes using the `extends` keyword.  
-Classes can implement interfaces iff the interfaces do not contain `inflight`.
+Classes can implement multiple interfaces using the `impl` keyword. 
+Inflight classes may only implement inflight interfaces.
 
 ```TS
-class Foo {
+interface IFoo {
+  method(): void;
+}
+class Foo impl IFoo {
   x: num;
   new() { this.x = 0; }
   pub method() { }
@@ -1568,7 +1647,12 @@ of methods with different phases is not allowed as well.
 
 Interfaces represent a contract that a class must fulfill.
 Interfaces are defined with the `interface` keyword.
-Currently, preflight interfaces are allowed, while inflight interfaces are not supported yet (see https://github.com/winglang/wing/issues/1961).
+Interfaces may be either preflight interfaces or inflight interfaces.
+Preflight interfaces are defined in preflight scope and can contain both preflight and inflight methods.
+Only preflight classes may implement preflight interfaces.
+Inflight interfaces are either defined with the `inflight` modifier in preflight scope or simply defined in inflight scope.
+All methods of inflight interfaces are implicitly inflight (no need to use the `inflight` keyword).
+Since both preflight and inflight classes can have inflight methods defined inside them, they are both capable of implementing inflight interfaces.
 `impl` keyword is used to implement an interface or multiple interfaces that are
 separated with commas.
 
@@ -1585,7 +1669,7 @@ Interface fields are not supported.
 >   inflight method3(): void;
 > }
 >
-> interface IMyInterface2 {
+> inflight interface IMyInterface2 {
 >   method2(): str; 
 > }
 >
@@ -1601,7 +1685,7 @@ Interface fields are not supported.
 >     return "sample: {x}";
 >   }
 >   inflight method3(): void { }
->   method2(): str {
+>   inflight method2(): str {
 >     return this.field2;
 >   }
 > }
@@ -1718,7 +1802,7 @@ Arrays are similar to dynamically sized arrays or vectors in other languages.
 > let arr1 = [1, 2, 3];
 > let arr2 = ["a", "b", "c"];
 > let arr3 = MutArray<str>["a1", "b2", "c3"];
-> let l = arr1.length + arr2.length + arr3.length + arr1.at(0);
+> let l = arr1.length + arr2.length + arr3.length + arr1[0];
 > ```
 
 [`▲ top`][top]
@@ -1854,9 +1938,21 @@ let bucket = new awscdk.aws_s3.Bucket(
 );
 ```
 
+### 5.1.2 Type System
+
+Mapping JSII types to Wing types:
+
+| **JSII Type** |  **Wing Type** |
+|---------------|--------------------|
+| [class](https://aws.github.io/jsii/user-guides/language-support/assembly/#classes) | A [Wing class](#32-classes).<br/> The [phase](#13-phase-modifiers) of the class will be `preflight` if the imported class is a [construct](https://github.com/aws/constructs) (derived from `constructs.Construct`). Otherwise the class will be phase independent.<br/> By convention construct constructors have a `scope` and `id` as their first parameters. These will be used by Wing to define the default scope and id for new instances of this [preflight class](#33-preflight-classes) or explicit scope and id using the `in` and `as` keywords. |
+| [interface](https://aws.github.io/jsii/user-guides/language-support/assembly/#interfaces) | A [Wing interface](#34-interfaces). All imported interfaces are `preflight` interfaces.<br/> JSII library authors may annotate their interface with a docstring tag like `@inflight IMyClient` to indicate a second interface that'll be used to import inflight methods **into** this Wing interface. |
+| [struct (a.k.a. data-type)](https://aws.github.io/jsii/user-guides/language-support/assembly/#structs-aka-data-types) | A [Wing struct](#31-structs). Always phase independent. |
+| [enum](https://aws.github.io/jsii/user-guides/language-support/assembly/#enums) | A [Wing enum](#38-enumeration). |
+
 ## 5.2 JavaScript
 
-The `extern "<commonjs module path>"` modifier can be used on method declarations in classes to indicate that a method is backed by an implementation imported from a JavaScript module. The module must be a relative path and will be loaded via [require()](https://nodejs.org/api/modules.html#requireid).
+The `extern "<javascript module path>"` modifier can be used on method declarations in classes to indicate that a method is backed by an implementation imported from a JavaScript module. The module must be a relative path and will be loaded via [require()](https://nodejs.org/api/modules.html#requireid).
+This module can be either CJS or ESM and may be written in JavaScript or TypeScript.
 
 In the following example, the static inflight method `makeId` is implemented
 in `helper.js`:
@@ -1891,13 +1987,7 @@ matching name (without any case conversion).
 
 Extern methods do not support access to class's members through `this`, so they must be declared `static`.
 
-### 5.2.1 TypeScript
-
-It is possible to use TypeScript to write helpers, but at the moment this is not
-directly supported by Wing. This means that you will need to setup the TypeScript toolchain
-to compile your code to JavaScript and then use `extern` against the JavaScript file.
-
-### 5.2.2 Type model
+### 5.2.1 Type model
 
 The table below shows the mapping between Wing types and JavaScript values, shown with TypeScript types.
 When calling **extern** function, the parameter and return types are **assumed** to be satisfied by the called function.
@@ -2063,8 +2153,6 @@ assert(Json [1, 2, 3] == Json [1, 2, 3]);
 assert(Json { "foo": 1, "bar": 2 } == Json { "foo": 1, "bar": 2 });
 ```
 
-> *Note*: `Json` equality is not fully implemented. See [#2938](https://github.com/winglang/wing/issues/2938), [#2937](https://github.com/winglang/wing/issues/2937).
-
 #### 6.1.7 Structs
 
 Two structs are equal if they have the same type and all of their fields are equal (based on rules of equality of their type).
@@ -2093,7 +2181,7 @@ assert(cat1 != dog); // compile time error (can't compare different types)
 
 ### 6.2 Strings
 
-String reference doc is available [here](https://www.winglang.io/docs/standard-library/std/api-reference#string-).
+String reference doc is available [here](https://www.winglang.io/docs/standard-library/std/string).
 Type of string is UTF-16 internally.  
 All string declaration variants are multi-line.  
 
diff --git a/docs/docs/04-standard-library/01-cloud/api.md b/docs/docs/04-standard-library/01-cloud/api.md
deleted file mode 100644
index cbae43adef1..00000000000
--- a/docs/docs/04-standard-library/01-cloud/api.md
+++ /dev/null
@@ -1,1032 +0,0 @@
----
-title: Api
-id: api
-description: A built-in resource for creating HTTP endpoints in the cloud.
-keywords:
-  [
-    Wing reference,
-    Wing language,
-    language,
-    Wing standard library,
-    Wing programming language,
-    APIs,
-    Endpoints,
-    HTTP endpoint,
-  ]
-sidebar_position: 1
----
-
-The `cloud.Api` resource represents a collection of HTTP endpoints that can be invoked by clients over the internet.
-APIs often serve as the front door for applications to access data, business logic, or functionality from your backend services.
-
-The `Api` resource models an endpoint as a collection of routes, each mapped to an event handler function.
-A route is a combination of a path, like `"/users/:userid"` and a set of HTTP methods, like `GET`, `POST`, or `DELETE`.
-When a client invokes a route, the corresponding event handler function executes.
-
-## Usage
-
-### REST API
-
-The following example shows a complete REST API implementation using `cloud.Api`, `ex.Table` & `cloud.Counter`
-
-```ts playground
-bring cloud;
-bring ex;
-
-let api = new cloud.Api();
-// Used for generating unique id
-let counter = new cloud.Counter();
-// our employee database
-let db = new ex.Table(
-  name: "employees",
-  primaryKey: "id",
-  columns: {
-    "name" => ex.ColumnType.STRING
-  }
-);
-
-api.get("/employees", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
-  let result = MutJson [];
-  let var i = 0;
-  for employee in db.list() {
-    result.setAt(i, employee);
-    i = i + 1;
-  }
-  return cloud.ApiResponse {
-    status: 200,
-    body: Json.stringify(result)
-  };
-});
-
-
-api.get("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
-  let employee = db.get(request.vars.get("id"));
-  return cloud.ApiResponse {
-    status: 200,
-    body: Json.stringify(employee)
-  };
-});
-
-api.post("/employees", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
-   if let body = request.body {
-    let employeeData = Json.parse(body);
-    let id = "{counter.inc()}";
-    db.insert(id, employeeData);
-    return cloud.ApiResponse {
-      status: 201,
-      body: id
-    };
-   }
-});
-
-api.put("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
-  if let body = request.body {
-    let employeeData = Json.parse(body);
-    let id = request.vars.get("id");
-    db.update(id, employeeData);
-    return cloud.ApiResponse {
-      status: 200,
-      body: Json.stringify(employeeData)
-    };
-  }
-});
-
-api.delete("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
-  let id = request.vars.get("id");
-  db.delete(id);
-  return cloud.ApiResponse {
-    status: 204
-  };
-});
-```
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-The sim implementation of `cloud.Api` uses [nodejs express](https://expressjs.com/).
-
-### AWS (`tf-aws` and `awscdk`)
-
-The AWS implementation of `cloud.Api` uses [Amazon API Gateway](https://aws.amazon.com/api-gateway/).
-
-### Azure (`tf-azure`)
-
-🚧 Not supported yet (tracking issue: [#625](https://github.com/winglang/wing/issues/625))
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet (tracking issue: [#624](https://github.com/winglang/wing/issues/624))
-## API Reference <a name="API Reference" id="API Reference"></a>
-
-### Api <a name="Api" id="@winglang/sdk.cloud.Api"></a>
-
-Functionality shared between all `Api` implementations.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Api.Initializer"></a>
-
-```wing
-bring cloud;
-
-new cloud.Api(props?: ApiProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Api.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.ApiProps">ApiProps</a></code> | *No description.* |
-
----
-
-##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiProps">ApiProps</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-##### Preflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Api.connect">connect</a></code> | Add a inflight handler to the api for CONNECT requests on the given path. |
-| <code><a href="#@winglang/sdk.cloud.Api.delete">delete</a></code> | Add a inflight handler to the api for DELETE requests on the given path. |
-| <code><a href="#@winglang/sdk.cloud.Api.get">get</a></code> | Add a inflight handler to the api for GET requests on the given path. |
-| <code><a href="#@winglang/sdk.cloud.Api.head">head</a></code> | Add a inflight handler to the api for HEAD requests on the given path. |
-| <code><a href="#@winglang/sdk.cloud.Api.options">options</a></code> | Add a inflight handler to the api for OPTIONS requests on the given path. |
-| <code><a href="#@winglang/sdk.cloud.Api.patch">patch</a></code> | Add a inflight handler to the api for PATCH requests on the given path. |
-| <code><a href="#@winglang/sdk.cloud.Api.post">post</a></code> | Add a inflight handler to the api for POST requests on the given path. |
-| <code><a href="#@winglang/sdk.cloud.Api.put">put</a></code> | Add a inflight handler to the api for PUT requests on the given path. |
-
----
-
-##### `connect` <a name="connect" id="@winglang/sdk.cloud.Api.connect"></a>
-
-```wing
-connect(path: str, inflight: IApiEndpointHandler, props?: ApiConnectOptions): void
-```
-
-Add a inflight handler to the api for CONNECT requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.connect.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle CONNECT requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.connect.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.connect.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiConnectOptions">ApiConnectOptions</a>
-
-Options for the route.
-
----
-
-##### `delete` <a name="delete" id="@winglang/sdk.cloud.Api.delete"></a>
-
-```wing
-delete(path: str, inflight: IApiEndpointHandler, props?: ApiDeleteOptions): void
-```
-
-Add a inflight handler to the api for DELETE requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.delete.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle DELETE requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.delete.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.delete.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiDeleteOptions">ApiDeleteOptions</a>
-
-Options for the route.
-
----
-
-##### `get` <a name="get" id="@winglang/sdk.cloud.Api.get"></a>
-
-```wing
-get(path: str, inflight: IApiEndpointHandler, props?: ApiGetOptions): void
-```
-
-Add a inflight handler to the api for GET requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.get.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle GET requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.get.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.get.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiGetOptions">ApiGetOptions</a>
-
-Options for the route.
-
----
-
-##### `head` <a name="head" id="@winglang/sdk.cloud.Api.head"></a>
-
-```wing
-head(path: str, inflight: IApiEndpointHandler, props?: ApiHeadOptions): void
-```
-
-Add a inflight handler to the api for HEAD requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.head.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle HEAD requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.head.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.head.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiHeadOptions">ApiHeadOptions</a>
-
-Options for the route.
-
----
-
-##### `options` <a name="options" id="@winglang/sdk.cloud.Api.options"></a>
-
-```wing
-options(path: str, inflight: IApiEndpointHandler, props?: ApiOptionsOptions): void
-```
-
-Add a inflight handler to the api for OPTIONS requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.options.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle OPTIONS requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.options.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.options.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiOptionsOptions">ApiOptionsOptions</a>
-
-Options for the route.
-
----
-
-##### `patch` <a name="patch" id="@winglang/sdk.cloud.Api.patch"></a>
-
-```wing
-patch(path: str, inflight: IApiEndpointHandler, props?: ApiPatchOptions): void
-```
-
-Add a inflight handler to the api for PATCH requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.patch.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle PATCH requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.patch.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.patch.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiPatchOptions">ApiPatchOptions</a>
-
-Options for the route.
-
----
-
-##### `post` <a name="post" id="@winglang/sdk.cloud.Api.post"></a>
-
-```wing
-post(path: str, inflight: IApiEndpointHandler, props?: ApiPostOptions): void
-```
-
-Add a inflight handler to the api for POST requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.post.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle POST requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.post.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.post.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiPostOptions">ApiPostOptions</a>
-
-Options for the route.
-
----
-
-##### `put` <a name="put" id="@winglang/sdk.cloud.Api.put"></a>
-
-```wing
-put(path: str, inflight: IApiEndpointHandler, props?: ApiPutOptions): void
-```
-
-Add a inflight handler to the api for PUT requests on the given path.
-
-###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.put.parameter.path"></a>
-
-- *Type:* str
-
-The path to handle PUT requests for.
-
----
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.put.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-The function to handle the request.
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.put.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiPutOptions">ApiPutOptions</a>
-
-Options for the route.
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Api.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-| <code><a href="#@winglang/sdk.cloud.Api.property.url">url</a></code> | <code>str</code> | The base URL of the API endpoint. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Api.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.cloud.Api.property.url"></a>
-
-```wing
-url: str;
-```
-
-- *Type:* str
-
-The base URL of the API endpoint.
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### ApiConnectOptions <a name="ApiConnectOptions" id="@winglang/sdk.cloud.ApiConnectOptions"></a>
-
-Options for Api patch endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiConnectOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiConnectOptions = cloud.ApiConnectOptions{ ... };
-```
-
-
-### ApiCorsOptions <a name="ApiCorsOptions" id="@winglang/sdk.cloud.ApiCorsOptions"></a>
-
-Cors Options for `Api`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiCorsOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiCorsOptions = cloud.ApiCorsOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowCredentials">allowCredentials</a></code> | <code>bool</code> | Whether to allow credentials. |
-| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowHeaders">allowHeaders</a></code> | <code>MutArray&lt;str&gt;</code> | The list of allowed headers. |
-| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowMethods">allowMethods</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a>&gt;</code> | The list of allowed methods. |
-| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowOrigin">allowOrigin</a></code> | <code>MutArray&lt;str&gt;</code> | The list of allowed allowOrigin. |
-| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.exposeHeaders">exposeHeaders</a></code> | <code>MutArray&lt;str&gt;</code> | The list of exposed headers. |
-| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.maxAge">maxAge</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long the browser should cache preflight request results. |
-
----
-
-##### `allowCredentials`<sup>Optional</sup> <a name="allowCredentials" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowCredentials"></a>
-
-```wing
-allowCredentials: bool;
-```
-
-- *Type:* bool
-- *Default:* false
-
-Whether to allow credentials.
-
----
-
-##### `allowHeaders`<sup>Optional</sup> <a name="allowHeaders" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowHeaders"></a>
-
-```wing
-allowHeaders: MutArray<str>;
-```
-
-- *Type:* MutArray&lt;str&gt;
-- *Default:* ["Content-Type", "Authorization"]
-
-The list of allowed headers.
-
----
-
-*Example*
-
-```wing
-["Content-Type"]
-```
-
-
-##### `allowMethods`<sup>Optional</sup> <a name="allowMethods" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowMethods"></a>
-
-```wing
-allowMethods: MutArray<HttpMethod>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a>&gt;
-- *Default:* [HttpMethod.GET, HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH, HttpMethod.DELETE, HttpMethod.HEAD, HttpMethod.OPTIONS]
-
-The list of allowed methods.
-
----
-
-*Example*
-
-```wing
-[HttpMethod.GET, HttpMethod.POST]
-```
-
-
-##### `allowOrigin`<sup>Optional</sup> <a name="allowOrigin" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowOrigin"></a>
-
-```wing
-allowOrigin: MutArray<str>;
-```
-
-- *Type:* MutArray&lt;str&gt;
-- *Default:* ["*"]
-
-The list of allowed allowOrigin.
-
----
-
-*Example*
-
-```wing
-["https://example.com"]
-```
-
-
-##### `exposeHeaders`<sup>Optional</sup> <a name="exposeHeaders" id="@winglang/sdk.cloud.ApiCorsOptions.property.exposeHeaders"></a>
-
-```wing
-exposeHeaders: MutArray<str>;
-```
-
-- *Type:* MutArray&lt;str&gt;
-- *Default:* []
-
-The list of exposed headers.
-
----
-
-*Example*
-
-```wing
-["Content-Type"]
-```
-
-
-##### `maxAge`<sup>Optional</sup> <a name="maxAge" id="@winglang/sdk.cloud.ApiCorsOptions.property.maxAge"></a>
-
-```wing
-maxAge: duration;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
-- *Default:* 300 seconds
-
-How long the browser should cache preflight request results.
-
----
-
-### ApiDeleteOptions <a name="ApiDeleteOptions" id="@winglang/sdk.cloud.ApiDeleteOptions"></a>
-
-Options for Api put endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiDeleteOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiDeleteOptions = cloud.ApiDeleteOptions{ ... };
-```
-
-
-### ApiGetOptions <a name="ApiGetOptions" id="@winglang/sdk.cloud.ApiGetOptions"></a>
-
-Options for Api get endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiGetOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiGetOptions = cloud.ApiGetOptions{ ... };
-```
-
-
-### ApiHeadOptions <a name="ApiHeadOptions" id="@winglang/sdk.cloud.ApiHeadOptions"></a>
-
-Options for Api patch endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiHeadOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiHeadOptions = cloud.ApiHeadOptions{ ... };
-```
-
-
-### ApiOptionsOptions <a name="ApiOptionsOptions" id="@winglang/sdk.cloud.ApiOptionsOptions"></a>
-
-Options for Api patch endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiOptionsOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiOptionsOptions = cloud.ApiOptionsOptions{ ... };
-```
-
-
-### ApiPatchOptions <a name="ApiPatchOptions" id="@winglang/sdk.cloud.ApiPatchOptions"></a>
-
-Options for Api patch endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiPatchOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiPatchOptions = cloud.ApiPatchOptions{ ... };
-```
-
-
-### ApiPostOptions <a name="ApiPostOptions" id="@winglang/sdk.cloud.ApiPostOptions"></a>
-
-Options for Api post endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiPostOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiPostOptions = cloud.ApiPostOptions{ ... };
-```
-
-
-### ApiProps <a name="ApiProps" id="@winglang/sdk.cloud.ApiProps"></a>
-
-Options for `Api`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiProps.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiProps = cloud.ApiProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.ApiProps.property.cors">cors</a></code> | <code>bool</code> | Options for configuring the API's CORS behavior across all routes. |
-| <code><a href="#@winglang/sdk.cloud.ApiProps.property.corsOptions">corsOptions</a></code> | <code><a href="#@winglang/sdk.cloud.ApiCorsOptions">ApiCorsOptions</a></code> | Options for configuring the API's CORS behavior across all routes. |
-
----
-
-##### `cors`<sup>Optional</sup> <a name="cors" id="@winglang/sdk.cloud.ApiProps.property.cors"></a>
-
-```wing
-cors: bool;
-```
-
-- *Type:* bool
-- *Default:* false, CORS configuration is disabled
-
-Options for configuring the API's CORS behavior across all routes.
-
-Options can also be overridden on a per-route basis. (not yet implemented)
-When enabled this will add CORS headers with default options.
-Can be customized by passing `corsOptions`
-
----
-
-*Example*
-
-```wing
-true
-```
-
-
-##### `corsOptions`<sup>Optional</sup> <a name="corsOptions" id="@winglang/sdk.cloud.ApiProps.property.corsOptions"></a>
-
-```wing
-corsOptions: ApiCorsOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiCorsOptions">ApiCorsOptions</a>
-- *Default:* Default CORS options are applied when `cors` is set to `true` allowOrigin: ["*"], allowMethods: [ HttpMethod.GET, HttpMethod.POST, HttpMethod.PUT, HttpMethod.DELETE, HttpMethod.HEAD, HttpMethod.OPTIONS, ], allowHeaders: ["Content-Type", "Authorization"], exposeHeaders: [], allowCredentials: false,
-
-Options for configuring the API's CORS behavior across all routes.
-
-Options can also be overridden on a per-route basis. (not yet implemented)
-
----
-
-*Example*
-
-```wing
-{ allowOrigin: ["https://example.com"] }
-```
-
-
-### ApiPutOptions <a name="ApiPutOptions" id="@winglang/sdk.cloud.ApiPutOptions"></a>
-
-Options for Api put endpoint.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiPutOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiPutOptions = cloud.ApiPutOptions{ ... };
-```
-
-
-### ApiRequest <a name="ApiRequest" id="@winglang/sdk.cloud.ApiRequest"></a>
-
-Shape of a request to an inflight handler.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiRequest.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiRequest = cloud.ApiRequest{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.method">method</a></code> | <code><a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a></code> | The request's HTTP method. |
-| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.path">path</a></code> | <code>str</code> | The request's path. |
-| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.query">query</a></code> | <code>MutMap&lt;str&gt;</code> | The request's query string values. |
-| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.vars">vars</a></code> | <code>MutMap&lt;str&gt;</code> | The path variables. |
-| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.body">body</a></code> | <code>str</code> | The request's body. |
-| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.headers">headers</a></code> | <code>MutMap&lt;str&gt;</code> | The request's headers. |
-
----
-
-##### `method`<sup>Required</sup> <a name="method" id="@winglang/sdk.cloud.ApiRequest.property.method"></a>
-
-```wing
-method: HttpMethod;
-```
-
-- *Type:* <a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a>
-
-The request's HTTP method.
-
----
-
-##### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.ApiRequest.property.path"></a>
-
-```wing
-path: str;
-```
-
-- *Type:* str
-
-The request's path.
-
----
-
-##### `query`<sup>Required</sup> <a name="query" id="@winglang/sdk.cloud.ApiRequest.property.query"></a>
-
-```wing
-query: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-
-The request's query string values.
-
----
-
-##### `vars`<sup>Required</sup> <a name="vars" id="@winglang/sdk.cloud.ApiRequest.property.vars"></a>
-
-```wing
-vars: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-
-The path variables.
-
----
-
-##### `body`<sup>Optional</sup> <a name="body" id="@winglang/sdk.cloud.ApiRequest.property.body"></a>
-
-```wing
-body: str;
-```
-
-- *Type:* str
-
-The request's body.
-
----
-
-##### `headers`<sup>Optional</sup> <a name="headers" id="@winglang/sdk.cloud.ApiRequest.property.headers"></a>
-
-```wing
-headers: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-
-The request's headers.
-
----
-
-### ApiResponse <a name="ApiResponse" id="@winglang/sdk.cloud.ApiResponse"></a>
-
-Shape of a response from a inflight handler.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiResponse.Initializer"></a>
-
-```wing
-bring cloud;
-
-let ApiResponse = cloud.ApiResponse{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.ApiResponse.property.status">status</a></code> | <code>num</code> | The response's status code. |
-| <code><a href="#@winglang/sdk.cloud.ApiResponse.property.body">body</a></code> | <code>str</code> | The response's body. |
-| <code><a href="#@winglang/sdk.cloud.ApiResponse.property.headers">headers</a></code> | <code>MutMap&lt;str&gt;</code> | The response's headers. |
-
----
-
-##### `status`<sup>Required</sup> <a name="status" id="@winglang/sdk.cloud.ApiResponse.property.status"></a>
-
-```wing
-status: num;
-```
-
-- *Type:* num
-
-The response's status code.
-
----
-
-##### `body`<sup>Optional</sup> <a name="body" id="@winglang/sdk.cloud.ApiResponse.property.body"></a>
-
-```wing
-body: str;
-```
-
-- *Type:* str
-
-The response's body.
-
----
-
-##### `headers`<sup>Optional</sup> <a name="headers" id="@winglang/sdk.cloud.ApiResponse.property.headers"></a>
-
-```wing
-headers: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-
-The response's headers.
-
----
-
-## Protocols <a name="Protocols" id="Protocols"></a>
-
-### IApiEndpointHandler <a name="IApiEndpointHandler" id="@winglang/sdk.cloud.IApiEndpointHandler"></a>
-
-- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
-
-**Inflight client:** [@winglang/sdk.cloud.IApiEndpointHandlerClient](#@winglang/sdk.cloud.IApiEndpointHandlerClient)
-
-A resource with an inflight "handle" method that can be passed to one of the `Api` request preflight methods.
-
-
-
-### IApiEndpointHandlerClient <a name="IApiEndpointHandlerClient" id="@winglang/sdk.cloud.IApiEndpointHandlerClient"></a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.IApiEndpointHandlerClient">IApiEndpointHandlerClient</a>
-
-Inflight client for `IApiEndpointHandler`.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.IApiEndpointHandlerClient.handle">handle</a></code> | Inflight that will be called when a request is made to the endpoint. |
-
----
-
-##### `handle` <a name="handle" id="@winglang/sdk.cloud.IApiEndpointHandlerClient.handle"></a>
-
-```wing
-inflight handle(request: ApiRequest): ApiResponse
-```
-
-Inflight that will be called when a request is made to the endpoint.
-
-###### `request`<sup>Required</sup> <a name="request" id="@winglang/sdk.cloud.IApiEndpointHandlerClient.handle.parameter.request"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ApiRequest">ApiRequest</a>
-
----
-
-
-## Enums <a name="Enums" id="Enums"></a>
-
-### HttpMethod <a name="HttpMethod" id="@winglang/sdk.cloud.HttpMethod"></a>
-
-Allowed HTTP methods for a endpoint.
-
-#### Members <a name="Members" id="Members"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.GET">GET</a></code> | Get. |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.HEAD">HEAD</a></code> | Head. |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.POST">POST</a></code> | Post. |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.PUT">PUT</a></code> | Put. |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.DELETE">DELETE</a></code> | Delete. |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.CONNECT">CONNECT</a></code> | Connect. |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.OPTIONS">OPTIONS</a></code> | Options. |
-| <code><a href="#@winglang/sdk.cloud.HttpMethod.PATCH">PATCH</a></code> | Patch. |
-
----
-
-##### `GET` <a name="GET" id="@winglang/sdk.cloud.HttpMethod.GET"></a>
-
-Get.
-
----
-
-
-##### `HEAD` <a name="HEAD" id="@winglang/sdk.cloud.HttpMethod.HEAD"></a>
-
-Head.
-
----
-
-
-##### `POST` <a name="POST" id="@winglang/sdk.cloud.HttpMethod.POST"></a>
-
-Post.
-
----
-
-
-##### `PUT` <a name="PUT" id="@winglang/sdk.cloud.HttpMethod.PUT"></a>
-
-Put.
-
----
-
-
-##### `DELETE` <a name="DELETE" id="@winglang/sdk.cloud.HttpMethod.DELETE"></a>
-
-Delete.
-
----
-
-
-##### `CONNECT` <a name="CONNECT" id="@winglang/sdk.cloud.HttpMethod.CONNECT"></a>
-
-Connect.
-
----
-
-
-##### `OPTIONS` <a name="OPTIONS" id="@winglang/sdk.cloud.HttpMethod.OPTIONS"></a>
-
-Options.
-
----
-
-
-##### `PATCH` <a name="PATCH" id="@winglang/sdk.cloud.HttpMethod.PATCH"></a>
-
-Patch.
-
----
-
diff --git a/docs/docs/04-standard-library/01-cloud/domain.md b/docs/docs/04-standard-library/01-cloud/domain.md
deleted file mode 100644
index 60afed0ae55..00000000000
--- a/docs/docs/04-standard-library/01-cloud/domain.md
+++ /dev/null
@@ -1,174 +0,0 @@
----
-title: Domain
-id: domain
-description: A built-in resource for representing a domain in the cloud.
-keywords:
-  [
-    Wing reference,
-    Wing language,
-    language,
-    Wing standard library,
-    Wing programming language,
-    Domain,
-  ]
-sidebar_position: 1
----
-
-The `cloud.Domain` resource represents a domain configuration in the cloud.
-
-## Usage
-
-### Defining a domain
-
-```js
-bring cloud;
-
-let domain = new cloud.Domain(
-  domain: "www.example.com",
-);
-
-new cloud.Website(path: "./site", domain: domain);
-```
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-Under the hood, the simulator stores the domain value in memory.
-
-Note that domain data is not persisted between simulator runs.
-
-### AWS (`tf-aws` and `awscdk`)
-
-The AWS implementation of `cloud.Domain` requires certain platform-specific values such as the `hostedZoneId` and either `iamCertificate` or `acmCertificateArn` to be provided.
-
-To provide these values, there are two options. You can either pass the values in the command line or you can provide a YAML file with the configurations.
-
-This YAML file should contain the data as shown in the example below:
-
-```yaml
-root/Default/Default/cloud.Domain:
-  hostedZoneId: Z0XXXXXXXXXXXXXXXXXXF
-  acmCertificateArn: arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee
-```
-
-### Azure (`tf-azure`)
-
-🚧 Not supported yet
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet## API Reference <a name="API Reference" id="API Reference"></a>
-
-### Domain <a name="Domain" id="@winglang/sdk.cloud.Domain"></a>
-
-A cloud Domain.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Domain.Initializer"></a>
-
-```wing
-bring cloud;
-
-new cloud.Domain(props: DomainProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Domain.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a></code> | *No description.* |
-
----
-
-##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.cloud.Domain.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a>
-
----
-
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Domain.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-| <code><a href="#@winglang/sdk.cloud.Domain.property.domainName">domainName</a></code> | <code>str</code> | The domain name. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Domain.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-##### `domainName`<sup>Required</sup> <a name="domainName" id="@winglang/sdk.cloud.Domain.property.domainName"></a>
-
-```wing
-domainName: str;
-```
-
-- *Type:* str
-
-The domain name.
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### DomainProps <a name="DomainProps" id="@winglang/sdk.cloud.DomainProps"></a>
-
-Options for `Domain`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.DomainProps.Initializer"></a>
-
-```wing
-bring cloud;
-
-let DomainProps = cloud.DomainProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.DomainProps.property.domainName">domainName</a></code> | <code>str</code> | The website's custom domain name. |
-
----
-
-##### `domainName`<sup>Required</sup> <a name="domainName" id="@winglang/sdk.cloud.DomainProps.property.domainName"></a>
-
-```wing
-domainName: str;
-```
-
-- *Type:* str
-
-The website's custom domain name.
-
----
-
-*Example*
-
-```wing
-"example.com"
-```
-
-
-## Protocols <a name="Protocols" id="Protocols"></a>
-
-### IDomainClient <a name="IDomainClient" id="@winglang/sdk.cloud.IDomainClient"></a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.IDomainClient">IDomainClient</a>
-
-Inflight interface for `Domain`.
-
-
-
diff --git a/docs/docs/04-standard-library/01-cloud/function.md b/docs/docs/04-standard-library/01-cloud/function.md
deleted file mode 100644
index b9892216936..00000000000
--- a/docs/docs/04-standard-library/01-cloud/function.md
+++ /dev/null
@@ -1,325 +0,0 @@
----
-title: Function
-id: function
-description: A built-in resource for creating serverless functions.
-keywords:
-  [
-    Wing reference,
-    Wing language,
-    language,
-    Wing standard library,
-    Wing programming language,
-    Serverless function,
-  ]
-sidebar_position: 1
----
-
-The `cloud.Function` resource represents a serverless function for performing short, stateless tasks.
-Functions are typically used to run business logic in response to events, such as a file being uploaded to a bucket, a message being pushed to a queue, or a timer expiring.
-
-When a function is invoked on a cloud provider, it is typically executed in a container that is spun up on demand.
-The container is then destroyed after the function finishes executing.
-
-Functions may be invoked more than once, and some cloud providers may automatically retry failed invocations.
-For performance reasons, most cloud providers impose a timeout on functions, after which the function is automatically terminated.
-
-## Usage
-
-```ts playground
-bring cloud;
-
-// defining a cloud.Function resource
-let countWords = new cloud.Function(inflight (s: str): str => {
-  return "${s.split(" ").length}";
-}) as "countWords";
-
-new cloud.Function(inflight () => {
-  let sentence = "I am a sentence with 7 words";
-  // invoking cloud.Function from inflight context
-  let wordsCount = countWords.invoke(sentence);
-  log("'${sentence}' has ${wordsCount} words");
-}) as "Invoke Me";
-```
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-The sim implementation of `cloud.Function` runs the inflight code as a JavaScript function.
-
-### AWS (`tf-aws` and `awscdk`)
-
-The AWS implementation of `cloud.Function` uses [AWS Lambda](https://aws.amazon.com/lambda/).
-
-To add extra IAM permissions to the function, you can use the `aws.Function` class as shown below.
-
-```ts playground
-bring aws;
-bring cloud;
-
-let f = new cloud.Function(inflight () => {
-  log("Hello world!");
-});
-if let lambdaFn = aws.Function.from(f) {
-  lambdaFn.addPolicyStatements(
-    aws.PolicyStatement {
-      actions: ["ses:sendEmail"],
-      effect: aws.Effect.ALLOW,
-      resources: ["*"],
-    },
-  );
-}
-```
-
-### Azure (`tf-azure`)
-
-The Azure implementation of `cloud.Function` uses [Azure Functions](https://azure.microsoft.com/en-us/products/functions).
-
-🚧 `invoke` API is not supported yet (tracking issue: [#1371](https://github.com/winglang/wing/issues/1371))
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet (tracking issue: [#614](https://github.com/winglang/wing/issues/614))
-## API Reference <a name="API Reference" id="API Reference"></a>
-
-### Function <a name="Function" id="@winglang/sdk.cloud.Function"></a>
-
-- *Implements:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
-
-A function.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Function.Initializer"></a>
-
-```wing
-bring cloud;
-
-new cloud.Function(handler: IFunctionHandler, props?: FunctionProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Function.Initializer.parameter.handler">handler</a></code> | <code><a href="#@winglang/sdk.cloud.IFunctionHandler">IFunctionHandler</a></code> | *No description.* |
-| <code><a href="#@winglang/sdk.cloud.Function.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.FunctionProps">FunctionProps</a></code> | *No description.* |
-
----
-
-##### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.cloud.Function.Initializer.parameter.handler"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IFunctionHandler">IFunctionHandler</a>
-
----
-
-##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Function.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.FunctionProps">FunctionProps</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-##### Preflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Function.addEnvironment">addEnvironment</a></code> | Add an environment variable to the function. |
-
-##### Inflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.IFunctionClient.invoke">invoke</a></code> | Invokes the function with a payload and waits for the result. |
-
----
-
-##### `addEnvironment` <a name="addEnvironment" id="@winglang/sdk.cloud.Function.addEnvironment"></a>
-
-```wing
-addEnvironment(name: str, value: str): void
-```
-
-Add an environment variable to the function.
-
-###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.cloud.Function.addEnvironment.parameter.name"></a>
-
-- *Type:* str
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.cloud.Function.addEnvironment.parameter.value"></a>
-
-- *Type:* str
-
----
-
-##### `invoke` <a name="invoke" id="@winglang/sdk.cloud.IFunctionClient.invoke"></a>
-
-```wing
-inflight invoke(payload: str): str
-```
-
-Invokes the function with a payload and waits for the result.
-
-###### `payload`<sup>Required</sup> <a name="payload" id="@winglang/sdk.cloud.IFunctionClient.invoke.parameter.payload"></a>
-
-- *Type:* str
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Function.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-| <code><a href="#@winglang/sdk.cloud.Function.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Returns the set of environment variables for this function. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Function.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-##### `env`<sup>Required</sup> <a name="env" id="@winglang/sdk.cloud.Function.property.env"></a>
-
-```wing
-env: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-
-Returns the set of environment variables for this function.
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### FunctionProps <a name="FunctionProps" id="@winglang/sdk.cloud.FunctionProps"></a>
-
-Options for `Function`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.FunctionProps.Initializer"></a>
-
-```wing
-bring cloud;
-
-let FunctionProps = cloud.FunctionProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
-| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
-| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
-| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
-
----
-
-##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.FunctionProps.property.env"></a>
-
-```wing
-env: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-- *Default:* No environment variables.
-
-Environment variables to pass to the function.
-
----
-
-##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.FunctionProps.property.logRetentionDays"></a>
-
-```wing
-logRetentionDays: num;
-```
-
-- *Type:* num
-- *Default:* 30
-
-Specifies the number of days that function logs will be kept.
-
-Setting negative value means logs will not expire.
-
----
-
-##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.FunctionProps.property.memory"></a>
-
-```wing
-memory: num;
-```
-
-- *Type:* num
-- *Default:* 1024
-
-The amount of memory to allocate to the function, in MB.
-
----
-
-##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.FunctionProps.property.timeout"></a>
-
-```wing
-timeout: duration;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
-- *Default:* 1m
-
-The maximum amount of time the function can run.
-
----
-
-## Protocols <a name="Protocols" id="Protocols"></a>
-
-### IFunctionHandler <a name="IFunctionHandler" id="@winglang/sdk.cloud.IFunctionHandler"></a>
-
-- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.IFunctionHandler">IFunctionHandler</a>
-
-**Inflight client:** [@winglang/sdk.cloud.IFunctionHandlerClient](#@winglang/sdk.cloud.IFunctionHandlerClient)
-
-A resource with an inflight "handle" method that can be used to create a `cloud.Function`.
-
-
-
-### IFunctionHandlerClient <a name="IFunctionHandlerClient" id="@winglang/sdk.cloud.IFunctionHandlerClient"></a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.IFunctionHandlerClient">IFunctionHandlerClient</a>
-
-Inflight client for `IFunctionHandler`.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.IFunctionHandlerClient.handle">handle</a></code> | Entrypoint function that will be called when the cloud function is invoked. |
-
----
-
-##### `handle` <a name="handle" id="@winglang/sdk.cloud.IFunctionHandlerClient.handle"></a>
-
-```wing
-inflight handle(event: str): void
-```
-
-Entrypoint function that will be called when the cloud function is invoked.
-
-###### `event`<sup>Required</sup> <a name="event" id="@winglang/sdk.cloud.IFunctionHandlerClient.handle.parameter.event"></a>
-
-- *Type:* str
-
----
-
-
diff --git a/docs/docs/04-standard-library/01-cloud/queue.md b/docs/docs/04-standard-library/01-cloud/queue.md
deleted file mode 100644
index 0b2f0a434a0..00000000000
--- a/docs/docs/04-standard-library/01-cloud/queue.md
+++ /dev/null
@@ -1,394 +0,0 @@
----
-title: Queue
-id: queue
-description: A built-in resource for creating distributed queues - a data structure for storing messages.
-keywords:
-  [
-    Wing reference,
-    Wing language,
-    language,
-    Wing standard library,
-    Wing programming language,
-    Queue,
-    Distributed queue,
-    Messaging queue,
-    FIFO queue,
-    Channel,
-  ]
-sidebar_position: 1
----
-
-The `cloud.Queue` resource represents a data structure for holding a list of messages.
-Queues are typically used to decouple producers of data and the consumers of said data in distributed systems.
-Queues by default are not FIFO (first in, first out) - so the order of messages is not guaranteed.
-
-## Usage
-
-### Setting a Queue Consumer
-
-```ts playground
-bring cloud;
-
-let q = new cloud.Queue();
-
-q.setConsumer(inflight (m: str) => {
-  log("message ${m} consumed");
-});
-
-new cloud.Function(inflight () => {
-  q.push("message a");
-  q.push("message b");
-});
-```
-
-### Using Queue inflight api
-
-Pusing messages, popping them, and purge
-
-```ts playground
-bring cloud;
-
-let q = new cloud.Queue();
-
-new cloud.Function(inflight () => {
-  q.push("message a");
-  q.push("message b", "message c", "message d");
-  log("approxSize is ${q.approxSize()}");
-  log("popping message ${q.pop()}");
-  log("popping message ${q.pop()}");
-  log("approxSize is ${q.approxSize()}");
-  q.purge();
-  log("approxSize is ${q.approxSize()}");
-});
-```
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-The sim implementation of `cloud.Queue` uses JavaScript's `Array`
-
-### AWS (`tf-aws` and `awscdk`)
-
-The AWS implementation of `cloud.Queue` uses [Amazon Simple Queue Service](https://aws.amazon.com/sqs/).
-
-### Azure (`tf-azure`)
-
-🚧 Not supported yet (tracking issue: [#617](https://github.com/winglang/wing/issues/617))
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet (tracking issue: [#616](https://github.com/winglang/wing/issues/616))
-## API Reference <a name="API Reference" id="API Reference"></a>
-
-### Queue <a name="Queue" id="@winglang/sdk.cloud.Queue"></a>
-
-A queue.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Queue.Initializer"></a>
-
-```wing
-bring cloud;
-
-new cloud.Queue(props?: QueueProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Queue.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.QueueProps">QueueProps</a></code> | *No description.* |
-
----
-
-##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Queue.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.QueueProps">QueueProps</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-##### Preflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Queue.setConsumer">setConsumer</a></code> | Create a function to consume messages from this queue. |
-
-##### Inflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.IQueueClient.approxSize">approxSize</a></code> | Retrieve the approximate number of messages in the queue. |
-| <code><a href="#@winglang/sdk.cloud.IQueueClient.pop">pop</a></code> | Pop a message from the queue. |
-| <code><a href="#@winglang/sdk.cloud.IQueueClient.purge">purge</a></code> | Purge all of the messages in the queue. |
-| <code><a href="#@winglang/sdk.cloud.IQueueClient.push">push</a></code> | Push one or more messages to the queue. |
-
----
-
-##### `setConsumer` <a name="setConsumer" id="@winglang/sdk.cloud.Queue.setConsumer"></a>
-
-```wing
-setConsumer(handler: IQueueSetConsumerHandler, props?: QueueSetConsumerOptions): Function
-```
-
-Create a function to consume messages from this queue.
-
-###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.cloud.Queue.setConsumer.parameter.handler"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.IQueueSetConsumerHandler">IQueueSetConsumerHandler</a>
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Queue.setConsumer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.QueueSetConsumerOptions">QueueSetConsumerOptions</a>
-
----
-
-##### `approxSize` <a name="approxSize" id="@winglang/sdk.cloud.IQueueClient.approxSize"></a>
-
-```wing
-inflight approxSize(): num
-```
-
-Retrieve the approximate number of messages in the queue.
-
-##### `pop` <a name="pop" id="@winglang/sdk.cloud.IQueueClient.pop"></a>
-
-```wing
-inflight pop(): str
-```
-
-Pop a message from the queue.
-
-##### `purge` <a name="purge" id="@winglang/sdk.cloud.IQueueClient.purge"></a>
-
-```wing
-inflight purge(): void
-```
-
-Purge all of the messages in the queue.
-
-##### `push` <a name="push" id="@winglang/sdk.cloud.IQueueClient.push"></a>
-
-```wing
-inflight push(...messages: Array<str>): void
-```
-
-Push one or more messages to the queue.
-
-###### `messages`<sup>Required</sup> <a name="messages" id="@winglang/sdk.cloud.IQueueClient.push.parameter.messages"></a>
-
-- *Type:* str
-
-Payload to send to the queue.
-
-Each message must be non-empty.
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Queue.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Queue.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### QueueProps <a name="QueueProps" id="@winglang/sdk.cloud.QueueProps"></a>
-
-Options for `Queue`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.QueueProps.Initializer"></a>
-
-```wing
-bring cloud;
-
-let QueueProps = cloud.QueueProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.QueueProps.property.retentionPeriod">retentionPeriod</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long a queue retains a message. |
-| <code><a href="#@winglang/sdk.cloud.QueueProps.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long a queue's consumers have to process a message. |
-
----
-
-##### `retentionPeriod`<sup>Optional</sup> <a name="retentionPeriod" id="@winglang/sdk.cloud.QueueProps.property.retentionPeriod"></a>
-
-```wing
-retentionPeriod: duration;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
-- *Default:* 1h
-
-How long a queue retains a message.
-
----
-
-##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.QueueProps.property.timeout"></a>
-
-```wing
-timeout: duration;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
-- *Default:* 30s
-
-How long a queue's consumers have to process a message.
-
----
-
-### QueueSetConsumerOptions <a name="QueueSetConsumerOptions" id="@winglang/sdk.cloud.QueueSetConsumerOptions"></a>
-
-Options for Queue.setConsumer.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.QueueSetConsumerOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let QueueSetConsumerOptions = cloud.QueueSetConsumerOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
-| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
-| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
-| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
-| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.batchSize">batchSize</a></code> | <code>num</code> | The maximum number of messages to send to subscribers at once. |
-
----
-
-##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.env"></a>
-
-```wing
-env: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-- *Default:* No environment variables.
-
-Environment variables to pass to the function.
-
----
-
-##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.logRetentionDays"></a>
-
-```wing
-logRetentionDays: num;
-```
-
-- *Type:* num
-- *Default:* 30
-
-Specifies the number of days that function logs will be kept.
-
-Setting negative value means logs will not expire.
-
----
-
-##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.memory"></a>
-
-```wing
-memory: num;
-```
-
-- *Type:* num
-- *Default:* 1024
-
-The amount of memory to allocate to the function, in MB.
-
----
-
-##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.timeout"></a>
-
-```wing
-timeout: duration;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
-- *Default:* 1m
-
-The maximum amount of time the function can run.
-
----
-
-##### `batchSize`<sup>Optional</sup> <a name="batchSize" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.batchSize"></a>
-
-```wing
-batchSize: num;
-```
-
-- *Type:* num
-- *Default:* 1
-
-The maximum number of messages to send to subscribers at once.
-
----
-
-## Protocols <a name="Protocols" id="Protocols"></a>
-
-### IQueueSetConsumerHandler <a name="IQueueSetConsumerHandler" id="@winglang/sdk.cloud.IQueueSetConsumerHandler"></a>
-
-- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.IQueueSetConsumerHandler">IQueueSetConsumerHandler</a>
-
-**Inflight client:** [@winglang/sdk.cloud.IQueueSetConsumerHandlerClient](#@winglang/sdk.cloud.IQueueSetConsumerHandlerClient)
-
-A resource with an inflight "handle" method that can be passed to `Queue.setConsumer`.
-
-
-
-### IQueueSetConsumerHandlerClient <a name="IQueueSetConsumerHandlerClient" id="@winglang/sdk.cloud.IQueueSetConsumerHandlerClient"></a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.IQueueSetConsumerHandlerClient">IQueueSetConsumerHandlerClient</a>
-
-Inflight client for `IQueueSetConsumerHandler`.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.IQueueSetConsumerHandlerClient.handle">handle</a></code> | Function that will be called when a message is received from the queue. |
-
----
-
-##### `handle` <a name="handle" id="@winglang/sdk.cloud.IQueueSetConsumerHandlerClient.handle"></a>
-
-```wing
-inflight handle(message: str): void
-```
-
-Function that will be called when a message is received from the queue.
-
-###### `message`<sup>Required</sup> <a name="message" id="@winglang/sdk.cloud.IQueueSetConsumerHandlerClient.handle.parameter.message"></a>
-
-- *Type:* str
-
----
-
-
diff --git a/docs/docs/04-standard-library/01-cloud/secret.md b/docs/docs/04-standard-library/01-cloud/secret.md
deleted file mode 100644
index eef5ee1d42e..00000000000
--- a/docs/docs/04-standard-library/01-cloud/secret.md
+++ /dev/null
@@ -1,246 +0,0 @@
----
-title: Secret
-id: secret
-description: A built-in resource for securely storing secrets in the cloud.
-keywords:
-  [
-    Wing reference,
-    Wing language,
-    language,
-    Wing standard library,
-    Wing programming language,
-    secrets,
-  ]
-sidebar_position: 1
----
-
-The `cloud.Secret` class represents a secret value (like an API key, certificate, etc.) that is securely stored in the cloud.
-
-Secrets are encrypted at rest and in transit, and are only decrypted when they are used in a task.
-Storing a secret allows you to use the value in different compute tasks while only having to rotate or revoke it in one place.
-
-## Usage
-
-### Defining a secret
-
-```js
-bring cloud;
-
-let secret = new cloud.Secret(
-  name: "my-secret", // optional, defaults to a generated name
-);
-```
-
-Before deploying your application, you will be expected to store the secret value in a secure place according to the target-specific instructions below.
-
-### Retrieving secret values
-
-```js
-bring cloud;
-
-let secret = new cloud.Secret(
-  name: "my-api-key",
-);
-
-new cloud.Function(inflight () => {
-  let secretValue = secret.value(); // retrieve the secret as a `str` value
-  let secretValueAsJson = secret.valueJson(); // retrieve the secret as a `Json` value
-});
-```
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-When using a secret in Wing's simulator, a secrets file must be added to your home directory at `~/.wing/secrets.json`.
-The simulator will look up secrets in this file by their `name`.
-Secrets should be saved in a JSON format:
-
-```json
-// secrets.json
-{
-  "my-api-key": "1234567890"
-}
-```
-
-### AWS (`tf-aws` and `awscdk`)
-
-AWS implementations of `cloud.Secret` use [AWS Secrets Manager](https://docs.aws.amazon.com/secretsmanager/latest/userguide/intro.html).
-Before deploying your application, you must create a secret in the AWS account with the same `name` as the secret in your Wing application.
-You can do this using the AWS CLI:
-
-```bash
-aws secretsmanager create-secret --name my-api-key --secret-string 1234567890
-```
-
-It's also possible to create a secret using the AWS console.
-See [AWS documentation](https://docs.aws.amazon.com/secretsmanager/latest/userguide/create_secret.html) for more details.
-
-### Azure (`tf-azure`)
-
-🚧 Not supported yet (tracking issue: [#2178](https://github.com/winglang/wing/issues/2178))
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet (tracking issue: [#2179](https://github.com/winglang/wing/issues/2179))
-## API Reference <a name="API Reference" id="API Reference"></a>
-
-### Secret <a name="Secret" id="@winglang/sdk.cloud.Secret"></a>
-
-A cloud secret.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Secret.Initializer"></a>
-
-```wing
-bring cloud;
-
-new cloud.Secret(props?: SecretProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Secret.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.SecretProps">SecretProps</a></code> | *No description.* |
-
----
-
-##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Secret.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.SecretProps">SecretProps</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-##### Inflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.ISecretClient.value">value</a></code> | Retrieve the value of the secret. |
-| <code><a href="#@winglang/sdk.cloud.ISecretClient.valueJson">valueJson</a></code> | Retrieve the Json value of the secret. |
-
----
-
-##### `value` <a name="value" id="@winglang/sdk.cloud.ISecretClient.value"></a>
-
-```wing
-inflight value(options?: GetSecretValueOptions): str
-```
-
-Retrieve the value of the secret.
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.ISecretClient.value.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.GetSecretValueOptions">GetSecretValueOptions</a>
-
----
-
-##### `valueJson` <a name="valueJson" id="@winglang/sdk.cloud.ISecretClient.valueJson"></a>
-
-```wing
-inflight valueJson(options?: GetSecretValueOptions): Json
-```
-
-Retrieve the Json value of the secret.
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.ISecretClient.valueJson.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.GetSecretValueOptions">GetSecretValueOptions</a>
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Secret.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Secret.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### GetSecretValueOptions <a name="GetSecretValueOptions" id="@winglang/sdk.cloud.GetSecretValueOptions"></a>
-
-Options when getting a secret value.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.GetSecretValueOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let GetSecretValueOptions = cloud.GetSecretValueOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.GetSecretValueOptions.property.cache">cache</a></code> | <code>bool</code> | Whether to cache the value. |
-
----
-
-##### `cache`<sup>Optional</sup> <a name="cache" id="@winglang/sdk.cloud.GetSecretValueOptions.property.cache"></a>
-
-```wing
-cache: bool;
-```
-
-- *Type:* bool
-- *Default:* true
-
-Whether to cache the value.
-
----
-
-### SecretProps <a name="SecretProps" id="@winglang/sdk.cloud.SecretProps"></a>
-
-Options for `Secret`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.SecretProps.Initializer"></a>
-
-```wing
-bring cloud;
-
-let SecretProps = cloud.SecretProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.SecretProps.property.name">name</a></code> | <code>str</code> | The secret's name. |
-
----
-
-##### `name`<sup>Optional</sup> <a name="name" id="@winglang/sdk.cloud.SecretProps.property.name"></a>
-
-```wing
-name: str;
-```
-
-- *Type:* str
-- *Default:* a new secret is provisioned with a generated name
-
-The secret's name.
-
-If no name is provided then a new secret is provisioned in the target.
-If a name is provided then the resource will reference an existing
-secret in the target.
-
----
-
-
diff --git a/docs/docs/04-standard-library/01-cloud/topic.md b/docs/docs/04-standard-library/01-cloud/topic.md
deleted file mode 100644
index 0b941b5dcce..00000000000
--- a/docs/docs/04-standard-library/01-cloud/topic.md
+++ /dev/null
@@ -1,340 +0,0 @@
----
-title: Topic
-id: topic
-description: A built-in resource for publishing messages to subscribers.
-keywords:
-  [
-    Wing reference,
-    Wing language,
-    language,
-    Wing standard library,
-    Wing programming language,
-    topics,
-  ]
-sidebar_position: 1
----
-
-The `cloud.Topic` class represents a subject of data that is open for subscription.
-
-Topics are a staple of event-driven architectures, especially those that rely on pub-sub messaging to decouple producers of data and the consumers of said data.
-
-## Usage
-
-### Creating a topic
-
-```js
-bring cloud;
-
-let topic = new cloud.Topic();
-```
-
-### Subscribing to a topic
-
-```js
-bring cloud;
-
-let topic = new cloud.Topic();
-
-topic.onMessage(inflight (message: str) => {
-  log("Topic published message: {message}");
-});
-```
-
-### Publishing to a topic
-
-The inflight method `publish` sends a message to all of the topic's subscribers.
-
-```js
-bring cloud;
-
-let topic = new cloud.Topic();
-
-inflight () => {
-  topic.publish("Hello World!");
-};
-```
-
-### Simple pub-sub example
-
-Here is an example of combining the preflight and inflight apis for a topic and creating an adorable
-simple pub-sub application.
-
-```js
-bring cloud;
-
-// First we create a topic
-let topic = new cloud.Topic();
-
-// Then we define a consumer inflight handler
-let consumerHandler = inflight(message: str) => {
-  log("Doing some work with message: {message}");
-};
-
-// Now we can use a preflight method of topic to register the consumer handler
-// to be invoked when a message is published to the topic.
-topic.onMessage(consumerHandler);
-
-// Then we define the producer inflight handler
-let publisherHandler = inflight () => {
-  // Here we use the inflight api to publish a message to the topic.
-  topic.publish("Here are those launch codes you asked for.");
-};
-
-// Finally we can use multiple resources to invoke our publisher handler
-// for simplicity sake we will just use a function.
-new cloud.Function(publisherHandler);
-```
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-Within the context of the simulator, topics are implemented by keeping an in-memory list of subscribers and publishing messages to them when `publish` is called.
-
-### AWS (`tf-aws` and `awscdk`)
-
-AWS implementations of `cloud.Topic` use [AWS SNS](https://docs.aws.amazon.com/sns/latest/dg/welcome.html).
-
-### Azure (`tf-azure`)
-
-🚧 Not supported yet (tracking issue: [#621](https://github.com/winglang/wing/issues/621))
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet (tracking issue: [#620](https://github.com/winglang/wing/issues/620))
-## API Reference <a name="API Reference" id="API Reference"></a>
-
-### Topic <a name="Topic" id="@winglang/sdk.cloud.Topic"></a>
-
-A topic.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Topic.Initializer"></a>
-
-```wing
-bring cloud;
-
-new cloud.Topic(props?: TopicProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Topic.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.TopicProps">TopicProps</a></code> | *No description.* |
-
----
-
-##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Topic.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.TopicProps">TopicProps</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-##### Preflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Topic.onMessage">onMessage</a></code> | Run an inflight whenever an message is published to the topic. |
-
-##### Inflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.ITopicClient.publish">publish</a></code> | Publish message to topic. |
-
----
-
-##### `onMessage` <a name="onMessage" id="@winglang/sdk.cloud.Topic.onMessage"></a>
-
-```wing
-onMessage(inflight: ITopicOnMessageHandler, props?: TopicOnMessageOptions): Function
-```
-
-Run an inflight whenever an message is published to the topic.
-
-###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Topic.onMessage.parameter.inflight"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.ITopicOnMessageHandler">ITopicOnMessageHandler</a>
-
----
-
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Topic.onMessage.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.cloud.TopicOnMessageOptions">TopicOnMessageOptions</a>
-
----
-
-##### `publish` <a name="publish" id="@winglang/sdk.cloud.ITopicClient.publish"></a>
-
-```wing
-inflight publish(message: str): void
-```
-
-Publish message to topic.
-
-###### `message`<sup>Required</sup> <a name="message" id="@winglang/sdk.cloud.ITopicClient.publish.parameter.message"></a>
-
-- *Type:* str
-
-Payload to publish to Topic.
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.Topic.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Topic.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### TopicOnMessageOptions <a name="TopicOnMessageOptions" id="@winglang/sdk.cloud.TopicOnMessageOptions"></a>
-
-Options for `Topic.onMessage`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.TopicOnMessageOptions.Initializer"></a>
-
-```wing
-bring cloud;
-
-let TopicOnMessageOptions = cloud.TopicOnMessageOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
-| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
-| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
-| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
-
----
-
-##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.env"></a>
-
-```wing
-env: MutMap<str>;
-```
-
-- *Type:* MutMap&lt;str&gt;
-- *Default:* No environment variables.
-
-Environment variables to pass to the function.
-
----
-
-##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.logRetentionDays"></a>
-
-```wing
-logRetentionDays: num;
-```
-
-- *Type:* num
-- *Default:* 30
-
-Specifies the number of days that function logs will be kept.
-
-Setting negative value means logs will not expire.
-
----
-
-##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.memory"></a>
-
-```wing
-memory: num;
-```
-
-- *Type:* num
-- *Default:* 1024
-
-The amount of memory to allocate to the function, in MB.
-
----
-
-##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.timeout"></a>
-
-```wing
-timeout: duration;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
-- *Default:* 1m
-
-The maximum amount of time the function can run.
-
----
-
-### TopicProps <a name="TopicProps" id="@winglang/sdk.cloud.TopicProps"></a>
-
-Options for `Topic`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.TopicProps.Initializer"></a>
-
-```wing
-bring cloud;
-
-let TopicProps = cloud.TopicProps{ ... };
-```
-
-
-## Protocols <a name="Protocols" id="Protocols"></a>
-
-### ITopicOnMessageHandler <a name="ITopicOnMessageHandler" id="@winglang/sdk.cloud.ITopicOnMessageHandler"></a>
-
-- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.ITopicOnMessageHandler">ITopicOnMessageHandler</a>
-
-**Inflight client:** [@winglang/sdk.cloud.ITopicOnMessageHandlerClient](#@winglang/sdk.cloud.ITopicOnMessageHandlerClient)
-
-A resource with an inflight "handle" method that can be passed to `Topic.on_message`.
-
-
-
-### ITopicOnMessageHandlerClient <a name="ITopicOnMessageHandlerClient" id="@winglang/sdk.cloud.ITopicOnMessageHandlerClient"></a>
-
-- *Implemented By:* <a href="#@winglang/sdk.cloud.ITopicOnMessageHandlerClient">ITopicOnMessageHandlerClient</a>
-
-Inflight client for `ITopicOnMessageHandler`.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.cloud.ITopicOnMessageHandlerClient.handle">handle</a></code> | Function that will be called when a message is received from the topic. |
-
----
-
-##### `handle` <a name="handle" id="@winglang/sdk.cloud.ITopicOnMessageHandlerClient.handle"></a>
-
-```wing
-inflight handle(event: str): void
-```
-
-Function that will be called when a message is received from the topic.
-
-###### `event`<sup>Required</sup> <a name="event" id="@winglang/sdk.cloud.ITopicOnMessageHandlerClient.handle.parameter.event"></a>
-
-- *Type:* str
-
----
-
-
diff --git a/docs/docs/04-standard-library/02-ex/_category_.yml b/docs/docs/04-standard-library/02-ex/_category_.yml
deleted file mode 100644
index 78eb0b48066..00000000000
--- a/docs/docs/04-standard-library/02-ex/_category_.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-label: ex
-collapsible: true
-collapsed: true
diff --git a/docs/docs/04-standard-library/02-ex/dynamodb-table.md b/docs/docs/04-standard-library/02-ex/dynamodb-table.md
deleted file mode 100644
index 74453401b22..00000000000
--- a/docs/docs/04-standard-library/02-ex/dynamodb-table.md
+++ /dev/null
@@ -1,2845 +0,0 @@
----
-title: Dynamodb Table
-id: dynamodb-table
-description: A cloud Dynamodb table.
-keywords: [dynamoDB, NoSQL, store, DB, database, cache, table]
-sidebar_position: 1
----
-# API Reference <a name="API Reference" id="api-reference"></a>
-
-## Resources <a name="Resources" id="Resources"></a>
-
-### DynamodbTable <a name="DynamodbTable" id="@winglang/sdk.ex.DynamodbTable"></a>
-
-A cloud Dynamodb table.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.ex.DynamodbTable.Initializer"></a>
-
-```wing
-bring ex;
-
-new ex.DynamodbTable(props: DynamodbTableProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTable.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTableProps">DynamodbTableProps</a></code> | *No description.* |
-
----
-
-##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.ex.DynamodbTable.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableProps">DynamodbTableProps</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-##### Inflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.batchGetItem">batchGetItem</a></code> | Return the attributes of one or more items. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.batchWriteItem">batchWriteItem</a></code> | Put or delete multiple items. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.deleteItem">deleteItem</a></code> | Delete an item from the table. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.getItem">getItem</a></code> | Get an item from the table. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.putItem">putItem</a></code> | Put an item into the table. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.query">query</a></code> | Return all items with a given partition key value. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.scan">scan</a></code> | Return one or more items and item attributes by accessing every item in a table or a secondary index. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.transactGetItems">transactGetItems</a></code> | Perform a synchronous read operation that groups up to 100 item retrievals. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.transactWriteItems">transactWriteItems</a></code> | Perform a synchronous write operation that groups up to 100 action requests. |
-| <code><a href="#@winglang/sdk.ex.IDynamodbTableClient.updateItem">updateItem</a></code> | Edit an existing item's attributes, or add a new item to the table if it does not already exist. |
-
----
-
-##### `batchGetItem` <a name="batchGetItem" id="@winglang/sdk.ex.IDynamodbTableClient.batchGetItem"></a>
-
-```wing
-inflight batchGetItem(options: DynamodbTableBatchGetItemOptions): DynamodbTableBatchGetItemResult
-```
-
-Return the attributes of one or more items.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchGetItem.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchGetItem.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.batchGetItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemOptions">DynamodbTableBatchGetItemOptions</a>
-
-options for the batch get item operation.
-
----
-
-##### `batchWriteItem` <a name="batchWriteItem" id="@winglang/sdk.ex.IDynamodbTableClient.batchWriteItem"></a>
-
-```wing
-inflight batchWriteItem(options: DynamodbTableBatchWriteItemOptions): DynamodbTableBatchWriteItemResult
-```
-
-Put or delete multiple items.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.batchWriteItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions">DynamodbTableBatchWriteItemOptions</a>
-
-options for the batch write item operation.
-
----
-
-##### `deleteItem` <a name="deleteItem" id="@winglang/sdk.ex.IDynamodbTableClient.deleteItem"></a>
-
-```wing
-inflight deleteItem(options: DynamodbTableDeleteItemOptions): DynamodbTableDeleteItemResult
-```
-
-Delete an item from the table.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_DeleteItem.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_DeleteItem.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.deleteItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions">DynamodbTableDeleteItemOptions</a>
-
-dynamodb DeleteItem options.
-
----
-
-##### `getItem` <a name="getItem" id="@winglang/sdk.ex.IDynamodbTableClient.getItem"></a>
-
-```wing
-inflight getItem(options: DynamodbTableGetItemOptions): DynamodbTableGetItemResult
-```
-
-Get an item from the table.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_GetItem.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_GetItem.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.getItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableGetItemOptions">DynamodbTableGetItemOptions</a>
-
-options for the getItem operation.
-
----
-
-##### `putItem` <a name="putItem" id="@winglang/sdk.ex.IDynamodbTableClient.putItem"></a>
-
-```wing
-inflight putItem(options: DynamodbTablePutItemOptions): DynamodbTablePutItemResult
-```
-
-Put an item into the table.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_PutItem.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_PutItem.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.putItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions">DynamodbTablePutItemOptions</a>
-
-dynamodb PutItem options.
-
----
-
-##### `query` <a name="query" id="@winglang/sdk.ex.IDynamodbTableClient.query"></a>
-
-```wing
-inflight query(options: DynamodbTableQueryOptions): DynamodbTableQueryResult
-```
-
-Return all items with a given partition key value.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.query.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableQueryOptions">DynamodbTableQueryOptions</a>
-
-options for the query operation.
-
----
-
-##### `scan` <a name="scan" id="@winglang/sdk.ex.IDynamodbTableClient.scan"></a>
-
-```wing
-inflight scan(options?: DynamodbTableScanOptions): DynamodbTableScanResult
-```
-
-Return one or more items and item attributes by accessing every item in a table or a secondary index.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html)
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.scan.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableScanOptions">DynamodbTableScanOptions</a>
-
-options for the scan operation.
-
----
-
-##### `transactGetItems` <a name="transactGetItems" id="@winglang/sdk.ex.IDynamodbTableClient.transactGetItems"></a>
-
-```wing
-inflight transactGetItems(options: DynamodbTransactGetItemsOptions): DynamodbTableTransactGetItemsResult
-```
-
-Perform a synchronous read operation that groups up to 100 item retrievals.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactGetItems.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactGetItems.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.transactGetItems.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactGetItemsOptions">DynamodbTransactGetItemsOptions</a>
-
-options for the query operation.
-
----
-
-##### `transactWriteItems` <a name="transactWriteItems" id="@winglang/sdk.ex.IDynamodbTableClient.transactWriteItems"></a>
-
-```wing
-inflight transactWriteItems(options: DynamodbTransactWriteItemsOptions): DynamodbTableTransactWriteItemsResult
-```
-
-Perform a synchronous write operation that groups up to 100 action requests.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactWriteItems.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactWriteItems.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.transactWriteItems.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactWriteItemsOptions">DynamodbTransactWriteItemsOptions</a>
-
-options for the transact write items operation.
-
----
-
-##### `updateItem` <a name="updateItem" id="@winglang/sdk.ex.IDynamodbTableClient.updateItem"></a>
-
-```wing
-inflight updateItem(options: DynamodbTableUpdateItemOptions): DynamodbTableUpdateItemResult
-```
-
-Edit an existing item's attributes, or add a new item to the table if it does not already exist.
-
-> [https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_UpdateItem.html](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_UpdateItem.html)
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.IDynamodbTableClient.updateItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions">DynamodbTableUpdateItemOptions</a>
-
-dynamodb UpdateItem options.
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTable.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTable.property.name">name</a></code> | <code>str</code> | Table name. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ex.DynamodbTable.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-##### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.ex.DynamodbTable.property.name"></a>
-
-```wing
-name: str;
-```
-
-- *Type:* str
-
-Table name.
-
----
-
-
-## Classes <a name="Classes" id="Classes"></a>
-
-### DynamodbTableClientBase <a name="DynamodbTableClientBase" id="@winglang/sdk.ex.DynamodbTableClientBase"></a>
-
-- *Implements:* <a href="#@winglang/sdk.ex.IDynamodbTableClient">IDynamodbTableClient</a>
-
-Base class for `DynamodbTable` Client.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.ex.DynamodbTableClientBase.Initializer"></a>
-
-```wing
-bring ex;
-
-new ex.DynamodbTableClientBase(tableName: str);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.Initializer.parameter.tableName">tableName</a></code> | <code>str</code> | the table name. |
-
----
-
-##### `tableName`<sup>Required</sup> <a name="tableName" id="@winglang/sdk.ex.DynamodbTableClientBase.Initializer.parameter.tableName"></a>
-
-- *Type:* str
-
-the table name.
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.batchGetItem">batchGetItem</a></code> | Return the attributes of one or more items. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.batchWriteItem">batchWriteItem</a></code> | Put or delete multiple items. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.deleteItem">deleteItem</a></code> | Delete an item from the table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.getItem">getItem</a></code> | Get an item from the table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.putItem">putItem</a></code> | Put an item into the table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.query">query</a></code> | Return all items with a given partition key value. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.scan">scan</a></code> | Return one or more items and item attributes by accessing every item in a table or a secondary index. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.transactGetItems">transactGetItems</a></code> | Perform a synchronous read operation that groups up to 100 item retrievals. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.transactWriteItems">transactWriteItems</a></code> | Perform a synchronous write operation that groups up to 100 action requests. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableClientBase.updateItem">updateItem</a></code> | Edit an existing item's attributes, or add a new item to the table if it does not already exist. |
-
----
-
-##### `batchGetItem` <a name="batchGetItem" id="@winglang/sdk.ex.DynamodbTableClientBase.batchGetItem"></a>
-
-```wing
-batchGetItem(options: DynamodbTableBatchGetItemOptions): DynamodbTableBatchGetItemResult
-```
-
-Return the attributes of one or more items.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.batchGetItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemOptions">DynamodbTableBatchGetItemOptions</a>
-
----
-
-##### `batchWriteItem` <a name="batchWriteItem" id="@winglang/sdk.ex.DynamodbTableClientBase.batchWriteItem"></a>
-
-```wing
-batchWriteItem(options: DynamodbTableBatchWriteItemOptions): DynamodbTableBatchWriteItemResult
-```
-
-Put or delete multiple items.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.batchWriteItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions">DynamodbTableBatchWriteItemOptions</a>
-
----
-
-##### `deleteItem` <a name="deleteItem" id="@winglang/sdk.ex.DynamodbTableClientBase.deleteItem"></a>
-
-```wing
-deleteItem(options: DynamodbTableDeleteItemOptions): DynamodbTableDeleteItemResult
-```
-
-Delete an item from the table.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.deleteItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions">DynamodbTableDeleteItemOptions</a>
-
----
-
-##### `getItem` <a name="getItem" id="@winglang/sdk.ex.DynamodbTableClientBase.getItem"></a>
-
-```wing
-getItem(options: DynamodbTableGetItemOptions): DynamodbTableGetItemResult
-```
-
-Get an item from the table.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.getItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableGetItemOptions">DynamodbTableGetItemOptions</a>
-
----
-
-##### `putItem` <a name="putItem" id="@winglang/sdk.ex.DynamodbTableClientBase.putItem"></a>
-
-```wing
-putItem(options: DynamodbTablePutItemOptions): DynamodbTablePutItemResult
-```
-
-Put an item into the table.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.putItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions">DynamodbTablePutItemOptions</a>
-
----
-
-##### `query` <a name="query" id="@winglang/sdk.ex.DynamodbTableClientBase.query"></a>
-
-```wing
-query(options: DynamodbTableQueryOptions): DynamodbTableQueryResult
-```
-
-Return all items with a given partition key value.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.query.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableQueryOptions">DynamodbTableQueryOptions</a>
-
----
-
-##### `scan` <a name="scan" id="@winglang/sdk.ex.DynamodbTableClientBase.scan"></a>
-
-```wing
-scan(options?: DynamodbTableScanOptions): DynamodbTableScanResult
-```
-
-Return one or more items and item attributes by accessing every item in a table or a secondary index.
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.scan.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableScanOptions">DynamodbTableScanOptions</a>
-
----
-
-##### `transactGetItems` <a name="transactGetItems" id="@winglang/sdk.ex.DynamodbTableClientBase.transactGetItems"></a>
-
-```wing
-transactGetItems(options: DynamodbTransactGetItemsOptions): DynamodbTableTransactGetItemsResult
-```
-
-Perform a synchronous read operation that groups up to 100 item retrievals.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.transactGetItems.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactGetItemsOptions">DynamodbTransactGetItemsOptions</a>
-
----
-
-##### `transactWriteItems` <a name="transactWriteItems" id="@winglang/sdk.ex.DynamodbTableClientBase.transactWriteItems"></a>
-
-```wing
-transactWriteItems(options: DynamodbTransactWriteItemsOptions): DynamodbTableTransactWriteItemsResult
-```
-
-Perform a synchronous write operation that groups up to 100 action requests.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.transactWriteItems.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactWriteItemsOptions">DynamodbTransactWriteItemsOptions</a>
-
----
-
-##### `updateItem` <a name="updateItem" id="@winglang/sdk.ex.DynamodbTableClientBase.updateItem"></a>
-
-```wing
-updateItem(options: DynamodbTableUpdateItemOptions): DynamodbTableUpdateItemResult
-```
-
-Edit an existing item's attributes, or add a new item to the table if it does not already exist.
-
-###### `options`<sup>Required</sup> <a name="options" id="@winglang/sdk.ex.DynamodbTableClientBase.updateItem.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions">DynamodbTableUpdateItemOptions</a>
-
----
-
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### DynamodbTableBatchGetItemOptions <a name="DynamodbTableBatchGetItemOptions" id="@winglang/sdk.ex.DynamodbTableBatchGetItemOptions"></a>
-
-Options for `DynamodbTable.batchGetItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchGetItemOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchGetItemOptions = ex.DynamodbTableBatchGetItemOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemOptions.property.requestItem">requestItem</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem">DynamodbTableBatchGetItemRequestItem</a></code> | Describes one or more items to retrieve from that table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-
----
-
-##### `requestItem`<sup>Required</sup> <a name="requestItem" id="@winglang/sdk.ex.DynamodbTableBatchGetItemOptions.property.requestItem"></a>
-
-```wing
-requestItem: DynamodbTableBatchGetItemRequestItem;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem">DynamodbTableBatchGetItemRequestItem</a>
-
-Describes one or more items to retrieve from that table.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTableBatchGetItemOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-### DynamodbTableBatchGetItemRequestItem <a name="DynamodbTableBatchGetItemRequestItem" id="@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem"></a>
-
-Options for `DynamodbTable.batchGetItem` request item.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchGetItemRequestItem = ex.DynamodbTableBatchGetItemRequestItem{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.keys">keys</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;</code> | The primary key attribute values that define the items and the attributes associated with the items. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.consistentRead">consistentRead</a></code> | <code>bool</code> | The consistency of a read operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.projectionExpression">projectionExpression</a></code> | <code>str</code> | A string that identifies one or more attributes to retrieve from the table. |
-
----
-
-##### `keys`<sup>Required</sup> <a name="keys" id="@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.keys"></a>
-
-```wing
-keys: MutArray<Json>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;
-
-The primary key attribute values that define the items and the attributes associated with the items.
-
----
-
-##### `consistentRead`<sup>Optional</sup> <a name="consistentRead" id="@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.consistentRead"></a>
-
-```wing
-consistentRead: bool;
-```
-
-- *Type:* bool
-- *Default:* false
-
-The consistency of a read operation.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `projectionExpression`<sup>Optional</sup> <a name="projectionExpression" id="@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem.property.projectionExpression"></a>
-
-```wing
-projectionExpression: str;
-```
-
-- *Type:* str
-
-A string that identifies one or more attributes to retrieve from the table.
-
----
-
-### DynamodbTableBatchGetItemResult <a name="DynamodbTableBatchGetItemResult" id="@winglang/sdk.ex.DynamodbTableBatchGetItemResult"></a>
-
-Result for `DynamodbTable.batchGetItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchGetItemResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchGetItemResult = ex.DynamodbTableBatchGetItemResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemResult.property.responses">responses</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;</code> | The list of items that are returned, with the attributes requested. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemResult.property.unprocessedKeys">unprocessedKeys</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem">DynamodbTableBatchGetItemRequestItem</a></code> | A list of keys that were not processed. |
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableBatchGetItemResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `responses`<sup>Optional</sup> <a name="responses" id="@winglang/sdk.ex.DynamodbTableBatchGetItemResult.property.responses"></a>
-
-```wing
-responses: MutArray<Json>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;
-
-The list of items that are returned, with the attributes requested.
-
----
-
-##### `unprocessedKeys`<sup>Optional</sup> <a name="unprocessedKeys" id="@winglang/sdk.ex.DynamodbTableBatchGetItemResult.property.unprocessedKeys"></a>
-
-```wing
-unprocessedKeys: DynamodbTableBatchGetItemRequestItem;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchGetItemRequestItem">DynamodbTableBatchGetItemRequestItem</a>
-
-A list of keys that were not processed.
-
----
-
-### DynamodbTableBatchWriteItemDeleteRequestOptions <a name="DynamodbTableBatchWriteItemDeleteRequestOptions" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemDeleteRequestOptions"></a>
-
-Options for `DynamodbTable.batchWriteItem`'s delete request.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemDeleteRequestOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchWriteItemDeleteRequestOptions = ex.DynamodbTableBatchWriteItemDeleteRequestOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemDeleteRequestOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be deleted. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemDeleteRequestOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be deleted.
-
----
-
-### DynamodbTableBatchWriteItemOptions <a name="DynamodbTableBatchWriteItemOptions" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions"></a>
-
-Options for `DynamodbTable.batchWriteItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchWriteItemOptions = ex.DynamodbTableBatchWriteItemOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions.property.requestItems">requestItems</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem">DynamodbTableBatchWriteItemRequestItem</a>&gt;</code> | A list of operations to be performed (`DeleteRequest` or `PutRequest`). |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions.property.returnItemCollectionMetrics">returnItemCollectionMetrics</a></code> | <code>str</code> | Determines whether item collection metrics are returned. |
-
----
-
-##### `requestItems`<sup>Required</sup> <a name="requestItems" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions.property.requestItems"></a>
-
-```wing
-requestItems: MutArray<DynamodbTableBatchWriteItemRequestItem>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem">DynamodbTableBatchWriteItemRequestItem</a>&gt;
-
-A list of operations to be performed (`DeleteRequest` or `PutRequest`).
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-##### `returnItemCollectionMetrics`<sup>Optional</sup> <a name="returnItemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemOptions.property.returnItemCollectionMetrics"></a>
-
-```wing
-returnItemCollectionMetrics: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines whether item collection metrics are returned.
-
----
-
-### DynamodbTableBatchWriteItemPutRequestOptions <a name="DynamodbTableBatchWriteItemPutRequestOptions" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemPutRequestOptions"></a>
-
-Options for `DynamodbTable.batchWriteItem`'s put request.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemPutRequestOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchWriteItemPutRequestOptions = ex.DynamodbTableBatchWriteItemPutRequestOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemPutRequestOptions.property.item">item</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The values of the item to be put. |
-
----
-
-##### `item`<sup>Required</sup> <a name="item" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemPutRequestOptions.property.item"></a>
-
-```wing
-item: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The values of the item to be put.
-
----
-
-### DynamodbTableBatchWriteItemRequestItem <a name="DynamodbTableBatchWriteItemRequestItem" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem"></a>
-
-Options for `DynamodbTable.batchWriteItem` request item.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchWriteItemRequestItem = ex.DynamodbTableBatchWriteItemRequestItem{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem.property.deleteRequest">deleteRequest</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemDeleteRequestOptions">DynamodbTableBatchWriteItemDeleteRequestOptions</a></code> | A request to perform a delete operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem.property.putRequest">putRequest</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemPutRequestOptions">DynamodbTableBatchWriteItemPutRequestOptions</a></code> | A request to perform a put operation. |
-
----
-
-##### `deleteRequest`<sup>Optional</sup> <a name="deleteRequest" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem.property.deleteRequest"></a>
-
-```wing
-deleteRequest: DynamodbTableBatchWriteItemDeleteRequestOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemDeleteRequestOptions">DynamodbTableBatchWriteItemDeleteRequestOptions</a>
-
-A request to perform a delete operation.
-
----
-
-##### `putRequest`<sup>Optional</sup> <a name="putRequest" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem.property.putRequest"></a>
-
-```wing
-putRequest: DynamodbTableBatchWriteItemPutRequestOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemPutRequestOptions">DynamodbTableBatchWriteItemPutRequestOptions</a>
-
-A request to perform a put operation.
-
----
-
-### DynamodbTableBatchWriteItemResult <a name="DynamodbTableBatchWriteItemResult" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemResult"></a>
-
-Result for `DynamodbTable.batchWriteItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableBatchWriteItemResult = ex.DynamodbTableBatchWriteItemResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemResult.property.itemCollectionMetrics">itemCollectionMetrics</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | Information about item collections, if any, that were affected by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemResult.property.unprocessedItems">unprocessedItems</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem">DynamodbTableBatchWriteItemRequestItem</a>&gt;</code> | The unprocessed items from the operation. |
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `itemCollectionMetrics`<sup>Optional</sup> <a name="itemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemResult.property.itemCollectionMetrics"></a>
-
-```wing
-itemCollectionMetrics: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-Information about item collections, if any, that were affected by the operation.
-
----
-
-##### `unprocessedItems`<sup>Optional</sup> <a name="unprocessedItems" id="@winglang/sdk.ex.DynamodbTableBatchWriteItemResult.property.unprocessedItems"></a>
-
-```wing
-unprocessedItems: MutArray<DynamodbTableBatchWriteItemRequestItem>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTableBatchWriteItemRequestItem">DynamodbTableBatchWriteItemRequestItem</a>&gt;
-
-The unprocessed items from the operation.
-
----
-
-### DynamodbTableDeleteItemOptions <a name="DynamodbTableDeleteItemOptions" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions"></a>
-
-Options for `DynamodbTable.deleteItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableDeleteItemOptions = ex.DynamodbTableDeleteItemOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be deleted. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.conditionExpression">conditionExpression</a></code> | <code>str</code> | A condition that must be satisfied in order for an operation to succeed. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnItemCollectionMetrics">returnItemCollectionMetrics</a></code> | <code>str</code> | Determines whether item collection metrics are returned. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnValues">returnValues</a></code> | <code>str</code> | Whether to return the item attributes as they appeared before they were deleted. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnValuesOnConditionCheckFailure">returnValuesOnConditionCheckFailure</a></code> | <code>str</code> | Whether to return the item attributes if the condition fails. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be deleted.
-
----
-
-##### `conditionExpression`<sup>Optional</sup> <a name="conditionExpression" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.conditionExpression"></a>
-
-```wing
-conditionExpression: str;
-```
-
-- *Type:* str
-
-A condition that must be satisfied in order for an operation to succeed.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-##### `returnItemCollectionMetrics`<sup>Optional</sup> <a name="returnItemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnItemCollectionMetrics"></a>
-
-```wing
-returnItemCollectionMetrics: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines whether item collection metrics are returned.
-
----
-
-##### `returnValues`<sup>Optional</sup> <a name="returnValues" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnValues"></a>
-
-```wing
-returnValues: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Whether to return the item attributes as they appeared before they were deleted.
-
----
-
-##### `returnValuesOnConditionCheckFailure`<sup>Optional</sup> <a name="returnValuesOnConditionCheckFailure" id="@winglang/sdk.ex.DynamodbTableDeleteItemOptions.property.returnValuesOnConditionCheckFailure"></a>
-
-```wing
-returnValuesOnConditionCheckFailure: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Whether to return the item attributes if the condition fails.
-
----
-
-### DynamodbTableDeleteItemResult <a name="DynamodbTableDeleteItemResult" id="@winglang/sdk.ex.DynamodbTableDeleteItemResult"></a>
-
-Result for `DynamodbTable.deleteItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableDeleteItemResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableDeleteItemResult = ex.DynamodbTableDeleteItemResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemResult.property.attributes">attributes</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableDeleteItemResult.property.itemCollectionMetrics">itemCollectionMetrics</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | Information about item collections, if any, that were affected by the operation. |
-
----
-
-##### `attributes`<sup>Optional</sup> <a name="attributes" id="@winglang/sdk.ex.DynamodbTableDeleteItemResult.property.attributes"></a>
-
-```wing
-attributes: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableDeleteItemResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `itemCollectionMetrics`<sup>Optional</sup> <a name="itemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTableDeleteItemResult.property.itemCollectionMetrics"></a>
-
-```wing
-itemCollectionMetrics: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-Information about item collections, if any, that were affected by the operation.
-
----
-
-### DynamodbTableGetItemOptions <a name="DynamodbTableGetItemOptions" id="@winglang/sdk.ex.DynamodbTableGetItemOptions"></a>
-
-Options for `DynamodbTable.getItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableGetItemOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableGetItemOptions = ex.DynamodbTableGetItemOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableGetItemOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be retrieved. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableGetItemOptions.property.consistentRead">consistentRead</a></code> | <code>bool</code> | Determines the read consistency model: If set to true, then the operation uses strongly consistent reads; |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableGetItemOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableGetItemOptions.property.projectionExpression">projectionExpression</a></code> | <code>str</code> | A string that identifies one or more attributes to retrieve from the table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableGetItemOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTableGetItemOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be retrieved.
-
----
-
-##### `consistentRead`<sup>Optional</sup> <a name="consistentRead" id="@winglang/sdk.ex.DynamodbTableGetItemOptions.property.consistentRead"></a>
-
-```wing
-consistentRead: bool;
-```
-
-- *Type:* bool
-- *Default:* false
-
-Determines the read consistency model: If set to true, then the operation uses strongly consistent reads;
-
-otherwise, the operation uses eventually consistent reads.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTableGetItemOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `projectionExpression`<sup>Optional</sup> <a name="projectionExpression" id="@winglang/sdk.ex.DynamodbTableGetItemOptions.property.projectionExpression"></a>
-
-```wing
-projectionExpression: str;
-```
-
-- *Type:* str
-
-A string that identifies one or more attributes to retrieve from the table.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTableGetItemOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-### DynamodbTableGetItemResult <a name="DynamodbTableGetItemResult" id="@winglang/sdk.ex.DynamodbTableGetItemResult"></a>
-
-Result for `DynamodbTable.getItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableGetItemResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableGetItemResult = ex.DynamodbTableGetItemResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableGetItemResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableGetItemResult.property.item">item</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | A map of attribute names to `AttributeValue` objects, as specified by `ProjectionExpression`. |
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableGetItemResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `item`<sup>Optional</sup> <a name="item" id="@winglang/sdk.ex.DynamodbTableGetItemResult.property.item"></a>
-
-```wing
-item: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-A map of attribute names to `AttributeValue` objects, as specified by `ProjectionExpression`.
-
----
-
-### DynamodbTableProps <a name="DynamodbTableProps" id="@winglang/sdk.ex.DynamodbTableProps"></a>
-
-Properties for `DynamodbTable`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableProps.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableProps = ex.DynamodbTableProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableProps.property.attributeDefinitions">attributeDefinitions</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | Table attribute definitions. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableProps.property.hashKey">hashKey</a></code> | <code>str</code> | Hash key for this table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableProps.property.name">name</a></code> | <code>str</code> | The table's name. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableProps.property.rangeKey">rangeKey</a></code> | <code>str</code> | Range key for this table. |
-
----
-
-##### `attributeDefinitions`<sup>Required</sup> <a name="attributeDefinitions" id="@winglang/sdk.ex.DynamodbTableProps.property.attributeDefinitions"></a>
-
-```wing
-attributeDefinitions: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-Table attribute definitions.
-
-e.g.  { "myKey": "S", "myOtherKey": "S" }.
-
----
-
-##### `hashKey`<sup>Required</sup> <a name="hashKey" id="@winglang/sdk.ex.DynamodbTableProps.property.hashKey"></a>
-
-```wing
-hashKey: str;
-```
-
-- *Type:* str
-
-Hash key for this table.
-
----
-
-##### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.ex.DynamodbTableProps.property.name"></a>
-
-```wing
-name: str;
-```
-
-- *Type:* str
-
-The table's name.
-
----
-
-##### `rangeKey`<sup>Optional</sup> <a name="rangeKey" id="@winglang/sdk.ex.DynamodbTableProps.property.rangeKey"></a>
-
-```wing
-rangeKey: str;
-```
-
-- *Type:* str
-- *Default:* undefined
-
-Range key for this table.
-
----
-
-### DynamodbTablePutItemOptions <a name="DynamodbTablePutItemOptions" id="@winglang/sdk.ex.DynamodbTablePutItemOptions"></a>
-
-Options for `DynamodbTable.putItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTablePutItemOptions = ex.DynamodbTablePutItemOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions.property.item">item</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The values of the item to be put. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions.property.conditionExpression">conditionExpression</a></code> | <code>str</code> | A condition that must be satisfied in order for an operation to succeed. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions.property.returnItemCollectionMetrics">returnItemCollectionMetrics</a></code> | <code>str</code> | Determines whether item collection metrics are returned. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemOptions.property.returnValuesOnConditionCheckFailure">returnValuesOnConditionCheckFailure</a></code> | <code>str</code> | Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Put condition fails. |
-
----
-
-##### `item`<sup>Required</sup> <a name="item" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.property.item"></a>
-
-```wing
-item: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The values of the item to be put.
-
----
-
-##### `conditionExpression`<sup>Optional</sup> <a name="conditionExpression" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.property.conditionExpression"></a>
-
-```wing
-conditionExpression: str;
-```
-
-- *Type:* str
-
-A condition that must be satisfied in order for an operation to succeed.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-##### `returnItemCollectionMetrics`<sup>Optional</sup> <a name="returnItemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.property.returnItemCollectionMetrics"></a>
-
-```wing
-returnItemCollectionMetrics: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines whether item collection metrics are returned.
-
----
-
-##### `returnValuesOnConditionCheckFailure`<sup>Optional</sup> <a name="returnValuesOnConditionCheckFailure" id="@winglang/sdk.ex.DynamodbTablePutItemOptions.property.returnValuesOnConditionCheckFailure"></a>
-
-```wing
-returnValuesOnConditionCheckFailure: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Put condition fails.
-
----
-
-### DynamodbTablePutItemResult <a name="DynamodbTablePutItemResult" id="@winglang/sdk.ex.DynamodbTablePutItemResult"></a>
-
-Result for `DynamodbTable.putItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTablePutItemResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTablePutItemResult = ex.DynamodbTablePutItemResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemResult.property.attributes">attributes</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTablePutItemResult.property.itemCollectionMetrics">itemCollectionMetrics</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | Information about item collections, if any, that were affected by the operation. |
-
----
-
-##### `attributes`<sup>Optional</sup> <a name="attributes" id="@winglang/sdk.ex.DynamodbTablePutItemResult.property.attributes"></a>
-
-```wing
-attributes: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTablePutItemResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `itemCollectionMetrics`<sup>Optional</sup> <a name="itemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTablePutItemResult.property.itemCollectionMetrics"></a>
-
-```wing
-itemCollectionMetrics: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-Information about item collections, if any, that were affected by the operation.
-
----
-
-### DynamodbTableQueryOptions <a name="DynamodbTableQueryOptions" id="@winglang/sdk.ex.DynamodbTableQueryOptions"></a>
-
-Options for `DynamodbTable.query`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableQueryOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableQueryOptions = ex.DynamodbTableQueryOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.keyConditionExpression">keyConditionExpression</a></code> | <code>str</code> | The condition that specifies the key values for items to be retrieved by the Query action. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.consistentRead">consistentRead</a></code> | <code>bool</code> | Determines the read consistency model: If set to true, then the operation uses strongly consistent reads; |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.exclusiveStartKey">exclusiveStartKey</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the first item that this operation will evaluate. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.filterExpression">filterExpression</a></code> | <code>str</code> | A string that contains conditions that DynamoDB applies after the Query operation, but before the data is returned to you. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.indexName">indexName</a></code> | <code>str</code> | The name of an index to query. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.limit">limit</a></code> | <code>num</code> | The maximum number of items to evaluate (not necessarily the number of matching items). |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.projectionExpression">projectionExpression</a></code> | <code>str</code> | A string that identifies one or more attributes to retrieve from the table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.scanIndexForward">scanIndexForward</a></code> | <code>bool</code> | Specifies the order for index traversal. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryOptions.property.select">select</a></code> | <code>str</code> | The attributes to be returned in the result. |
-
----
-
-##### `keyConditionExpression`<sup>Required</sup> <a name="keyConditionExpression" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.keyConditionExpression"></a>
-
-```wing
-keyConditionExpression: str;
-```
-
-- *Type:* str
-
-The condition that specifies the key values for items to be retrieved by the Query action.
-
----
-
-##### `consistentRead`<sup>Optional</sup> <a name="consistentRead" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.consistentRead"></a>
-
-```wing
-consistentRead: bool;
-```
-
-- *Type:* bool
-- *Default:* false
-
-Determines the read consistency model: If set to true, then the operation uses strongly consistent reads;
-
-otherwise, the operation uses eventually consistent reads.
-
----
-
-##### `exclusiveStartKey`<sup>Optional</sup> <a name="exclusiveStartKey" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.exclusiveStartKey"></a>
-
-```wing
-exclusiveStartKey: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the first item that this operation will evaluate.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `filterExpression`<sup>Optional</sup> <a name="filterExpression" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.filterExpression"></a>
-
-```wing
-filterExpression: str;
-```
-
-- *Type:* str
-
-A string that contains conditions that DynamoDB applies after the Query operation, but before the data is returned to you.
-
----
-
-##### `indexName`<sup>Optional</sup> <a name="indexName" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.indexName"></a>
-
-```wing
-indexName: str;
-```
-
-- *Type:* str
-
-The name of an index to query.
-
----
-
-##### `limit`<sup>Optional</sup> <a name="limit" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.limit"></a>
-
-```wing
-limit: num;
-```
-
-- *Type:* num
-
-The maximum number of items to evaluate (not necessarily the number of matching items).
-
----
-
-##### `projectionExpression`<sup>Optional</sup> <a name="projectionExpression" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.projectionExpression"></a>
-
-```wing
-projectionExpression: str;
-```
-
-- *Type:* str
-
-A string that identifies one or more attributes to retrieve from the table.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-##### `scanIndexForward`<sup>Optional</sup> <a name="scanIndexForward" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.scanIndexForward"></a>
-
-```wing
-scanIndexForward: bool;
-```
-
-- *Type:* bool
-- *Default:* true
-
-Specifies the order for index traversal.
-
----
-
-##### `select`<sup>Optional</sup> <a name="select" id="@winglang/sdk.ex.DynamodbTableQueryOptions.property.select"></a>
-
-```wing
-select: str;
-```
-
-- *Type:* str
-
-The attributes to be returned in the result.
-
----
-
-### DynamodbTableQueryResult <a name="DynamodbTableQueryResult" id="@winglang/sdk.ex.DynamodbTableQueryResult"></a>
-
-Result for `DynamodbTable.query`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableQueryResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableQueryResult = ex.DynamodbTableQueryResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryResult.property.count">count</a></code> | <code>num</code> | The number of items in the response. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryResult.property.items">items</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;</code> | An array of item attributes that match the scan criteria. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryResult.property.scannedCount">scannedCount</a></code> | <code>num</code> | The number of items evaluated, before any QueryFilter is applied. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableQueryResult.property.lastEvaluatedKey">lastEvaluatedKey</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item where the operation stopped, inclusive of the previous result set. |
-
----
-
-##### `count`<sup>Required</sup> <a name="count" id="@winglang/sdk.ex.DynamodbTableQueryResult.property.count"></a>
-
-```wing
-count: num;
-```
-
-- *Type:* num
-
-The number of items in the response.
-
----
-
-##### `items`<sup>Required</sup> <a name="items" id="@winglang/sdk.ex.DynamodbTableQueryResult.property.items"></a>
-
-```wing
-items: MutArray<Json>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;
-
-An array of item attributes that match the scan criteria.
-
----
-
-##### `scannedCount`<sup>Required</sup> <a name="scannedCount" id="@winglang/sdk.ex.DynamodbTableQueryResult.property.scannedCount"></a>
-
-```wing
-scannedCount: num;
-```
-
-- *Type:* num
-
-The number of items evaluated, before any QueryFilter is applied.
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableQueryResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `lastEvaluatedKey`<sup>Optional</sup> <a name="lastEvaluatedKey" id="@winglang/sdk.ex.DynamodbTableQueryResult.property.lastEvaluatedKey"></a>
-
-```wing
-lastEvaluatedKey: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item where the operation stopped, inclusive of the previous result set.
-
----
-
-### DynamodbTableScanOptions <a name="DynamodbTableScanOptions" id="@winglang/sdk.ex.DynamodbTableScanOptions"></a>
-
-Options for `DynamodbTable.scan`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableScanOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableScanOptions = ex.DynamodbTableScanOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.consistentRead">consistentRead</a></code> | <code>bool</code> | Determines the read consistency model: If set to true, then the operation uses strongly consistent reads; |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.exclusiveStartKey">exclusiveStartKey</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the first item that this operation will evaluate. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.filterExpression">filterExpression</a></code> | <code>str</code> | A string that contains conditions that DynamoDB applies after the Query operation, but before the data is returned to you. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.indexName">indexName</a></code> | <code>str</code> | The name of an index to query. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.limit">limit</a></code> | <code>num</code> | The maximum number of items to evaluate (not necessarily the number of matching items). |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.projectionExpression">projectionExpression</a></code> | <code>str</code> | A string that identifies one or more attributes to retrieve from the table. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.segment">segment</a></code> | <code>num</code> | For a parallel Scan request, Segment identifies an individual segment to be scanned by an application worker. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.select">select</a></code> | <code>str</code> | The attributes to be returned in the result. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanOptions.property.totalSegments">totalSegments</a></code> | <code>num</code> | For a parallel Scan request, TotalSegments represents the total number of segments into which the Scan operation will be divided. |
-
----
-
-##### `consistentRead`<sup>Optional</sup> <a name="consistentRead" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.consistentRead"></a>
-
-```wing
-consistentRead: bool;
-```
-
-- *Type:* bool
-- *Default:* false
-
-Determines the read consistency model: If set to true, then the operation uses strongly consistent reads;
-
-otherwise, the operation uses eventually consistent reads.
-
----
-
-##### `exclusiveStartKey`<sup>Optional</sup> <a name="exclusiveStartKey" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.exclusiveStartKey"></a>
-
-```wing
-exclusiveStartKey: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the first item that this operation will evaluate.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `filterExpression`<sup>Optional</sup> <a name="filterExpression" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.filterExpression"></a>
-
-```wing
-filterExpression: str;
-```
-
-- *Type:* str
-
-A string that contains conditions that DynamoDB applies after the Query operation, but before the data is returned to you.
-
----
-
-##### `indexName`<sup>Optional</sup> <a name="indexName" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.indexName"></a>
-
-```wing
-indexName: str;
-```
-
-- *Type:* str
-
-The name of an index to query.
-
----
-
-##### `limit`<sup>Optional</sup> <a name="limit" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.limit"></a>
-
-```wing
-limit: num;
-```
-
-- *Type:* num
-
-The maximum number of items to evaluate (not necessarily the number of matching items).
-
----
-
-##### `projectionExpression`<sup>Optional</sup> <a name="projectionExpression" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.projectionExpression"></a>
-
-```wing
-projectionExpression: str;
-```
-
-- *Type:* str
-
-A string that identifies one or more attributes to retrieve from the table.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-##### `segment`<sup>Optional</sup> <a name="segment" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.segment"></a>
-
-```wing
-segment: num;
-```
-
-- *Type:* num
-- *Default:* 0
-
-For a parallel Scan request, Segment identifies an individual segment to be scanned by an application worker.
-
----
-
-##### `select`<sup>Optional</sup> <a name="select" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.select"></a>
-
-```wing
-select: str;
-```
-
-- *Type:* str
-
-The attributes to be returned in the result.
-
----
-
-##### `totalSegments`<sup>Optional</sup> <a name="totalSegments" id="@winglang/sdk.ex.DynamodbTableScanOptions.property.totalSegments"></a>
-
-```wing
-totalSegments: num;
-```
-
-- *Type:* num
-- *Default:* 1
-
-For a parallel Scan request, TotalSegments represents the total number of segments into which the Scan operation will be divided.
-
----
-
-### DynamodbTableScanResult <a name="DynamodbTableScanResult" id="@winglang/sdk.ex.DynamodbTableScanResult"></a>
-
-Result for `DynamodbTable.scan`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableScanResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableScanResult = ex.DynamodbTableScanResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanResult.property.count">count</a></code> | <code>num</code> | The number of items in the response. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanResult.property.items">items</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;</code> | An array of item attributes that match the scan criteria. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanResult.property.scannedCount">scannedCount</a></code> | <code>num</code> | The number of items evaluated, before any ScanFilter is applied. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableScanResult.property.lastEvaluatedKey">lastEvaluatedKey</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item where the operation stopped, inclusive of the previous result set. |
-
----
-
-##### `count`<sup>Required</sup> <a name="count" id="@winglang/sdk.ex.DynamodbTableScanResult.property.count"></a>
-
-```wing
-count: num;
-```
-
-- *Type:* num
-
-The number of items in the response.
-
----
-
-##### `items`<sup>Required</sup> <a name="items" id="@winglang/sdk.ex.DynamodbTableScanResult.property.items"></a>
-
-```wing
-items: MutArray<Json>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;
-
-An array of item attributes that match the scan criteria.
-
----
-
-##### `scannedCount`<sup>Required</sup> <a name="scannedCount" id="@winglang/sdk.ex.DynamodbTableScanResult.property.scannedCount"></a>
-
-```wing
-scannedCount: num;
-```
-
-- *Type:* num
-
-The number of items evaluated, before any ScanFilter is applied.
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableScanResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `lastEvaluatedKey`<sup>Optional</sup> <a name="lastEvaluatedKey" id="@winglang/sdk.ex.DynamodbTableScanResult.property.lastEvaluatedKey"></a>
-
-```wing
-lastEvaluatedKey: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item where the operation stopped, inclusive of the previous result set.
-
----
-
-### DynamodbTableTransactGetItemsResponseItem <a name="DynamodbTableTransactGetItemsResponseItem" id="@winglang/sdk.ex.DynamodbTableTransactGetItemsResponseItem"></a>
-
-Details of the requested item.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableTransactGetItemsResponseItem.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableTransactGetItemsResponseItem = ex.DynamodbTableTransactGetItemsResponseItem{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableTransactGetItemsResponseItem.property.item">item</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The values of the item. |
-
----
-
-##### `item`<sup>Required</sup> <a name="item" id="@winglang/sdk.ex.DynamodbTableTransactGetItemsResponseItem.property.item"></a>
-
-```wing
-item: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The values of the item.
-
----
-
-### DynamodbTableTransactGetItemsResult <a name="DynamodbTableTransactGetItemsResult" id="@winglang/sdk.ex.DynamodbTableTransactGetItemsResult"></a>
-
-Result for `DynamodbTable.transactGetItems`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableTransactGetItemsResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableTransactGetItemsResult = ex.DynamodbTableTransactGetItemsResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableTransactGetItemsResult.property.responses">responses</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTableTransactGetItemsResponseItem">DynamodbTableTransactGetItemsResponseItem</a>&gt;</code> | An ordered array of up to 100 `DynamodbTableTransactGetItemsResponseItem` objects. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableTransactGetItemsResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-
----
-
-##### `responses`<sup>Required</sup> <a name="responses" id="@winglang/sdk.ex.DynamodbTableTransactGetItemsResult.property.responses"></a>
-
-```wing
-responses: MutArray<DynamodbTableTransactGetItemsResponseItem>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTableTransactGetItemsResponseItem">DynamodbTableTransactGetItemsResponseItem</a>&gt;
-
-An ordered array of up to 100 `DynamodbTableTransactGetItemsResponseItem` objects.
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableTransactGetItemsResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-### DynamodbTableTransactWriteItemsResult <a name="DynamodbTableTransactWriteItemsResult" id="@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult"></a>
-
-Result for `DynamodbTable.transactWriteItems`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableTransactWriteItemsResult = ex.DynamodbTableTransactWriteItemsResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult.property.attributes">attributes</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult.property.itemCollectionMetrics">itemCollectionMetrics</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | Information about item collections, if any, that were affected by the operation. |
-
----
-
-##### `attributes`<sup>Optional</sup> <a name="attributes" id="@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult.property.attributes"></a>
-
-```wing
-attributes: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `itemCollectionMetrics`<sup>Optional</sup> <a name="itemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTableTransactWriteItemsResult.property.itemCollectionMetrics"></a>
-
-```wing
-itemCollectionMetrics: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-Information about item collections, if any, that were affected by the operation.
-
----
-
-### DynamodbTableUpdateItemOptions <a name="DynamodbTableUpdateItemOptions" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions"></a>
-
-Options for `DynamodbTable.updateItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableUpdateItemOptions = ex.DynamodbTableUpdateItemOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be updated. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.conditionExpression">conditionExpression</a></code> | <code>str</code> | A condition that must be satisfied in order for a conditional update to succeed. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnItemCollectionMetrics">returnItemCollectionMetrics</a></code> | <code>str</code> | Determines whether item collection metrics are returned. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnValues">returnValues</a></code> | <code>str</code> | Use ReturnValues to get the item attributes if the Update operation succeeds. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnValuesOnConditionCheckFailure">returnValuesOnConditionCheckFailure</a></code> | <code>str</code> | Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Update condition fails. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.updateExpression">updateExpression</a></code> | <code>str</code> | An expression that defines one or more attributes to be updated. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be updated.
-
----
-
-##### `conditionExpression`<sup>Optional</sup> <a name="conditionExpression" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.conditionExpression"></a>
-
-```wing
-conditionExpression: str;
-```
-
-- *Type:* str
-
-A condition that must be satisfied in order for a conditional update to succeed.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-##### `returnItemCollectionMetrics`<sup>Optional</sup> <a name="returnItemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnItemCollectionMetrics"></a>
-
-```wing
-returnItemCollectionMetrics: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines whether item collection metrics are returned.
-
----
-
-##### `returnValues`<sup>Optional</sup> <a name="returnValues" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnValues"></a>
-
-```wing
-returnValues: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Use ReturnValues to get the item attributes if the Update operation succeeds.
-
----
-
-##### `returnValuesOnConditionCheckFailure`<sup>Optional</sup> <a name="returnValuesOnConditionCheckFailure" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.returnValuesOnConditionCheckFailure"></a>
-
-```wing
-returnValuesOnConditionCheckFailure: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Update condition fails.
-
----
-
-##### `updateExpression`<sup>Optional</sup> <a name="updateExpression" id="@winglang/sdk.ex.DynamodbTableUpdateItemOptions.property.updateExpression"></a>
-
-```wing
-updateExpression: str;
-```
-
-- *Type:* str
-
-An expression that defines one or more attributes to be updated.
-
----
-
-### DynamodbTableUpdateItemResult <a name="DynamodbTableUpdateItemResult" id="@winglang/sdk.ex.DynamodbTableUpdateItemResult"></a>
-
-Result for `DynamodbTable.updateItem`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTableUpdateItemResult.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTableUpdateItemResult = ex.DynamodbTableUpdateItemResult{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemResult.property.attributes">attributes</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemResult.property.consumedCapacity">consumedCapacity</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The capacity units consumed by the operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTableUpdateItemResult.property.itemCollectionMetrics">itemCollectionMetrics</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | Information about item collections, if any, that were affected by the operation. |
-
----
-
-##### `attributes`<sup>Optional</sup> <a name="attributes" id="@winglang/sdk.ex.DynamodbTableUpdateItemResult.property.attributes"></a>
-
-```wing
-attributes: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-
----
-
-##### `consumedCapacity`<sup>Optional</sup> <a name="consumedCapacity" id="@winglang/sdk.ex.DynamodbTableUpdateItemResult.property.consumedCapacity"></a>
-
-```wing
-consumedCapacity: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The capacity units consumed by the operation.
-
----
-
-##### `itemCollectionMetrics`<sup>Optional</sup> <a name="itemCollectionMetrics" id="@winglang/sdk.ex.DynamodbTableUpdateItemResult.property.itemCollectionMetrics"></a>
-
-```wing
-itemCollectionMetrics: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-Information about item collections, if any, that were affected by the operation.
-
----
-
-### DynamodbTransactGetItem <a name="DynamodbTransactGetItem" id="@winglang/sdk.ex.DynamodbTransactGetItem"></a>
-
-Dynamodb transact get operation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactGetItem.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactGetItem = ex.DynamodbTransactGetItem{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactGetItem.property.get">get</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTransactGetItemGetOptions">DynamodbTransactGetItemGetOptions</a></code> | A request to perform a get operation. |
-
----
-
-##### `get`<sup>Optional</sup> <a name="get" id="@winglang/sdk.ex.DynamodbTransactGetItem.property.get"></a>
-
-```wing
-get: DynamodbTransactGetItemGetOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactGetItemGetOptions">DynamodbTransactGetItemGetOptions</a>
-
-A request to perform a get operation.
-
----
-
-### DynamodbTransactGetItemGetOptions <a name="DynamodbTransactGetItemGetOptions" id="@winglang/sdk.ex.DynamodbTransactGetItemGetOptions"></a>
-
-Options for `DynamodbTable.transactGetItems`'s get operation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactGetItemGetOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactGetItemGetOptions = ex.DynamodbTransactGetItemGetOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactGetItemGetOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be retrieved. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactGetItemGetOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactGetItemGetOptions.property.projectionExpression">projectionExpression</a></code> | <code>str</code> | A string that identifies one or more attributes to retrieve from the table. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTransactGetItemGetOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be retrieved.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTransactGetItemGetOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-- *Default:* undefined
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `projectionExpression`<sup>Optional</sup> <a name="projectionExpression" id="@winglang/sdk.ex.DynamodbTransactGetItemGetOptions.property.projectionExpression"></a>
-
-```wing
-projectionExpression: str;
-```
-
-- *Type:* str
-- *Default:* undefined
-
-A string that identifies one or more attributes to retrieve from the table.
-
----
-
-### DynamodbTransactGetItemsOptions <a name="DynamodbTransactGetItemsOptions" id="@winglang/sdk.ex.DynamodbTransactGetItemsOptions"></a>
-
-Options for `DynamodbTable.transactGetItems`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactGetItemsOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactGetItemsOptions = ex.DynamodbTransactGetItemsOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactGetItemsOptions.property.transactItems">transactItems</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTransactGetItem">DynamodbTransactGetItem</a>&gt;</code> | An ordered array of up to 100 `DynamodbTransactGetItem` objects, each of which contains a `DynamodbTransactGetItem` structure. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactGetItemsOptions.property.returnConsumedCapacity">returnConsumedCapacity</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-
----
-
-##### `transactItems`<sup>Required</sup> <a name="transactItems" id="@winglang/sdk.ex.DynamodbTransactGetItemsOptions.property.transactItems"></a>
-
-```wing
-transactItems: MutArray<DynamodbTransactGetItem>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTransactGetItem">DynamodbTransactGetItem</a>&gt;
-
-An ordered array of up to 100 `DynamodbTransactGetItem` objects, each of which contains a `DynamodbTransactGetItem` structure.
-
----
-
-##### `returnConsumedCapacity`<sup>Optional</sup> <a name="returnConsumedCapacity" id="@winglang/sdk.ex.DynamodbTransactGetItemsOptions.property.returnConsumedCapacity"></a>
-
-```wing
-returnConsumedCapacity: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-### DynamodbTransactWriteItem <a name="DynamodbTransactWriteItem" id="@winglang/sdk.ex.DynamodbTransactWriteItem"></a>
-
-Dynamodb transact write operation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactWriteItem.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactWriteItem = ex.DynamodbTransactWriteItem{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItem.property.conditionCheck">conditionCheck</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions">DynamodbTransactWriteItemConditionCheckOptions</a></code> | A request to perform a condition check operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItem.property.delete">delete</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions">DynamodbTransactWriteItemDeleteOptions</a></code> | A request to perform a delete operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItem.property.put">put</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions">DynamodbTransactWriteItemPutOptions</a></code> | A request to perform a put operation. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItem.property.update">update</a></code> | <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions">DynamodbTransactWriteItemUpdateOptions</a></code> | A request to perform a update operation. |
-
----
-
-##### `conditionCheck`<sup>Optional</sup> <a name="conditionCheck" id="@winglang/sdk.ex.DynamodbTransactWriteItem.property.conditionCheck"></a>
-
-```wing
-conditionCheck: DynamodbTransactWriteItemConditionCheckOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions">DynamodbTransactWriteItemConditionCheckOptions</a>
-
-A request to perform a condition check operation.
-
----
-
-##### `delete`<sup>Optional</sup> <a name="delete" id="@winglang/sdk.ex.DynamodbTransactWriteItem.property.delete"></a>
-
-```wing
-delete: DynamodbTransactWriteItemDeleteOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions">DynamodbTransactWriteItemDeleteOptions</a>
-
-A request to perform a delete operation.
-
----
-
-##### `put`<sup>Optional</sup> <a name="put" id="@winglang/sdk.ex.DynamodbTransactWriteItem.property.put"></a>
-
-```wing
-put: DynamodbTransactWriteItemPutOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions">DynamodbTransactWriteItemPutOptions</a>
-
-A request to perform a put operation.
-
----
-
-##### `update`<sup>Optional</sup> <a name="update" id="@winglang/sdk.ex.DynamodbTransactWriteItem.property.update"></a>
-
-```wing
-update: DynamodbTransactWriteItemUpdateOptions;
-```
-
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions">DynamodbTransactWriteItemUpdateOptions</a>
-
-A request to perform a update operation.
-
----
-
-### DynamodbTransactWriteItemConditionCheckOptions <a name="DynamodbTransactWriteItemConditionCheckOptions" id="@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions"></a>
-
-Options for transact write item's condition check operation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactWriteItemConditionCheckOptions = ex.DynamodbTransactWriteItemConditionCheckOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be checked. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.conditionExpression">conditionExpression</a></code> | <code>str</code> | A condition that must be satisfied in order for an operation to succeed. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.returnValuesOnConditionCheckFailure">returnValuesOnConditionCheckFailure</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be checked.
-
----
-
-##### `conditionExpression`<sup>Optional</sup> <a name="conditionExpression" id="@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.conditionExpression"></a>
-
-```wing
-conditionExpression: str;
-```
-
-- *Type:* str
-
-A condition that must be satisfied in order for an operation to succeed.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `returnValuesOnConditionCheckFailure`<sup>Optional</sup> <a name="returnValuesOnConditionCheckFailure" id="@winglang/sdk.ex.DynamodbTransactWriteItemConditionCheckOptions.property.returnValuesOnConditionCheckFailure"></a>
-
-```wing
-returnValuesOnConditionCheckFailure: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-### DynamodbTransactWriteItemDeleteOptions <a name="DynamodbTransactWriteItemDeleteOptions" id="@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions"></a>
-
-Options for transact write item's delete operation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactWriteItemDeleteOptions = ex.DynamodbTransactWriteItemDeleteOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be deleted. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.conditionExpression">conditionExpression</a></code> | <code>str</code> | A condition that must be satisfied in order for an operation to succeed. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.returnValuesOnConditionCheckFailure">returnValuesOnConditionCheckFailure</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be deleted.
-
----
-
-##### `conditionExpression`<sup>Optional</sup> <a name="conditionExpression" id="@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.conditionExpression"></a>
-
-```wing
-conditionExpression: str;
-```
-
-- *Type:* str
-
-A condition that must be satisfied in order for an operation to succeed.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `returnValuesOnConditionCheckFailure`<sup>Optional</sup> <a name="returnValuesOnConditionCheckFailure" id="@winglang/sdk.ex.DynamodbTransactWriteItemDeleteOptions.property.returnValuesOnConditionCheckFailure"></a>
-
-```wing
-returnValuesOnConditionCheckFailure: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-### DynamodbTransactWriteItemPutOptions <a name="DynamodbTransactWriteItemPutOptions" id="@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions"></a>
-
-Options for transact write item's update operation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactWriteItemPutOptions = ex.DynamodbTransactWriteItemPutOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions.property.item">item</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The values of the item to be put. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions.property.conditionExpression">conditionExpression</a></code> | <code>str</code> | A condition that must be satisfied in order for the operation to succeed. |
-
----
-
-##### `item`<sup>Required</sup> <a name="item" id="@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions.property.item"></a>
-
-```wing
-item: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The values of the item to be put.
-
----
-
-##### `conditionExpression`<sup>Optional</sup> <a name="conditionExpression" id="@winglang/sdk.ex.DynamodbTransactWriteItemPutOptions.property.conditionExpression"></a>
-
-```wing
-conditionExpression: str;
-```
-
-- *Type:* str
-- *Default:* undefined
-
-A condition that must be satisfied in order for the operation to succeed.
-
----
-
-### DynamodbTransactWriteItemsOptions <a name="DynamodbTransactWriteItemsOptions" id="@winglang/sdk.ex.DynamodbTransactWriteItemsOptions"></a>
-
-Options for `DynamodbTable.transactWriteItems`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactWriteItemsOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactWriteItemsOptions = ex.DynamodbTransactWriteItemsOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemsOptions.property.transactItems">transactItems</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTransactWriteItem">DynamodbTransactWriteItem</a>&gt;</code> | The write transact items. |
-
----
-
-##### `transactItems`<sup>Required</sup> <a name="transactItems" id="@winglang/sdk.ex.DynamodbTransactWriteItemsOptions.property.transactItems"></a>
-
-```wing
-transactItems: MutArray<DynamodbTransactWriteItem>;
-```
-
-- *Type:* MutArray&lt;<a href="#@winglang/sdk.ex.DynamodbTransactWriteItem">DynamodbTransactWriteItem</a>&gt;
-
-The write transact items.
-
----
-
-### DynamodbTransactWriteItemUpdateOptions <a name="DynamodbTransactWriteItemUpdateOptions" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions"></a>
-
-Options for transact write item's update operation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let DynamodbTransactWriteItemUpdateOptions = ex.DynamodbTransactWriteItemUpdateOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.key">key</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The primary key of the item to be updated. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.conditionExpression">conditionExpression</a></code> | <code>str</code> | A condition that must be satisfied in order for an operation to succeed. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.expressionAttributeNames">expressionAttributeNames</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more substitution tokens for attribute names in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.expressionAttributeValues">expressionAttributeValues</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | One or more values that can be substituted in an expression. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.returnValuesOnConditionCheckFailure">returnValuesOnConditionCheckFailure</a></code> | <code>str</code> | Determines the level of detail about either provisioned or on-demand throughput consumption. |
-| <code><a href="#@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.updateExpression">updateExpression</a></code> | <code>str</code> | An expression that defines one or more attributes to be updated. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.key"></a>
-
-```wing
-key: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The primary key of the item to be updated.
-
----
-
-##### `conditionExpression`<sup>Optional</sup> <a name="conditionExpression" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.conditionExpression"></a>
-
-```wing
-conditionExpression: str;
-```
-
-- *Type:* str
-
-A condition that must be satisfied in order for an operation to succeed.
-
----
-
-##### `expressionAttributeNames`<sup>Optional</sup> <a name="expressionAttributeNames" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.expressionAttributeNames"></a>
-
-```wing
-expressionAttributeNames: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more substitution tokens for attribute names in an expression.
-
----
-
-##### `expressionAttributeValues`<sup>Optional</sup> <a name="expressionAttributeValues" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.expressionAttributeValues"></a>
-
-```wing
-expressionAttributeValues: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-One or more values that can be substituted in an expression.
-
----
-
-##### `returnValuesOnConditionCheckFailure`<sup>Optional</sup> <a name="returnValuesOnConditionCheckFailure" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.returnValuesOnConditionCheckFailure"></a>
-
-```wing
-returnValuesOnConditionCheckFailure: str;
-```
-
-- *Type:* str
-- *Default:* "NONE"
-
-Determines the level of detail about either provisioned or on-demand throughput consumption.
-
----
-
-##### `updateExpression`<sup>Optional</sup> <a name="updateExpression" id="@winglang/sdk.ex.DynamodbTransactWriteItemUpdateOptions.property.updateExpression"></a>
-
-```wing
-updateExpression: str;
-```
-
-- *Type:* str
-
-An expression that defines one or more attributes to be updated.
-
----
-
-
diff --git a/docs/docs/04-standard-library/02-ex/react-app.md b/docs/docs/04-standard-library/02-ex/react-app.md
deleted file mode 100644
index b64ccefa804..00000000000
--- a/docs/docs/04-standard-library/02-ex/react-app.md
+++ /dev/null
@@ -1,406 +0,0 @@
----
-title: React App
-id: react-app
-description: A built-in resource for creating deployable websites using the React framework.
-keywords: [Website, React, deployment, build]
-sidebar_position: 1
----
-
-The `ex.ReactApp` resource represents a website, built using React, that can be both hosted in the cloud or to run on a development hot-reload server in the sim target.
-
-## Usage
-
-### Initialization
-
-Using the default arguments:
-
-```ts
-bring ex;
-bring util;
-
-let website = new ex.ReactApp(projectPath: "./client");
-```
-
-or customizing them:
-
-```ts
-bring ex;
-bring util;
-
-let website = new ex.ReactApp(
-  projectPath: "./client",
-  useBuildCommand: true // `false` by default. Will run the build command if true, and the start command if not
-  buildDir: "/dist" // default is "/build"
-  startCommand: "pnpm start" // default is "npm start"
-  buildCommand: "pnpm build" // default is "npm build"
-  localPort: 4000 // default is 3001
- );
-```
-
-When `ReactApp` is compiled to the `sim` target, by default it runs the start command (default: `npm start`) inside `projectPath` to serve your app in development mode on a local port.
-
-If the `useBuildCommand` environment variable is set OR if `ReactApp` is compiled to any other target, it will run the build command (default: `npm build`) inside of the `projectPath` to build the React app for production to `buildDir` and serve the app.
-
-### Using Wing variables within react code
-
-`ex.ReactApp` allows you to pass preflight string values from Wing to the React app using `addEnvironment` method:
-
-```ts
-bring cloud;
-bring util;
-bring ex;
-
-let api = new cloud.Api();
-let website = new ex.ReactApp(projectPath: "./client");
-
-website.addEnvironment("apiUrl", api.url);
-website.addEnvironment("another", "some string variable");
-
-```
-
-Then in the React app use `window.wingEnv`:
-(accessible after adding `<script src="./wing.js"></script>` to the index file)
-
-```ts
-const { apiUrl } = window.wingEnv;
-const users = await fetch(apiUrl + "/users");
-```
-
-Currently, we can only pass preflight string variables to the React app environment.
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-sim implementations of `ex.ReactApp` is using either the [Website resource](../01-cloud/website.md) (when `useBuildCommand` is `true`) or starts React development server when `false`.
-
-### AWS (`tf-aws` and `awscdk`)
-
-AWS implementations of `ex.ReactApp` uses the [Website resource](../01-cloud/website.md).
-
-### Azure (`tf-azure`)
-
-🚧 Not supported yet (tracking issue: [#4220](https://github.com/winglang/wing/issues/4220))
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet (tracking issue: [#4221](https://github.com/winglang/wing/issues/4221))
-# API Reference <a name="API Reference" id="api-reference"></a>
-
-## Resources <a name="Resources" id="Resources"></a>
-
-### ReactApp <a name="ReactApp" id="@winglang/sdk.ex.ReactApp"></a>
-
-A cloud deployable React App.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.ex.ReactApp.Initializer"></a>
-
-```wing
-bring ex;
-
-new ex.ReactApp(props: ReactAppProps);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.ReactApp.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.ex.ReactAppProps">ReactAppProps</a></code> | *No description.* |
-
----
-
-##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.ex.ReactApp.Initializer.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.ex.ReactAppProps">ReactAppProps</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-##### Preflight Methods
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.ex.ReactApp.addEnvironment">addEnvironment</a></code> | Adding a key-value pair that can be accessible later via the `window.wingEnv` object in the react code. |
-
----
-
-##### `addEnvironment` <a name="addEnvironment" id="@winglang/sdk.ex.ReactApp.addEnvironment"></a>
-
-```wing
-addEnvironment(key: str, value: str): void
-```
-
-Adding a key-value pair that can be accessible later via the `window.wingEnv` object in the react code.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.ReactApp.addEnvironment.parameter.key"></a>
-
-- *Type:* str
-
-the key to add.
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.ex.ReactApp.addEnvironment.parameter.value"></a>
-
-- *Type:* str
-
-the value to add.
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.ReactApp.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-| <code><a href="#@winglang/sdk.ex.ReactApp.property.url">url</a></code> | <code>str</code> | Website's url. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ex.ReactApp.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.ex.ReactApp.property.url"></a>
-
-```wing
-url: str;
-```
-
-- *Type:* str
-
-Website's url.
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### ReactAppOptions <a name="ReactAppOptions" id="@winglang/sdk.ex.ReactAppOptions"></a>
-
-Basic options for `ReactApp`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.ReactAppOptions.Initializer"></a>
-
-```wing
-bring ex;
-
-let ReactAppOptions = ex.ReactAppOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.projectPath">projectPath</a></code> | <code>str</code> | The path to the React app root folder- can be absolute or relative to the wing folder. |
-| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.buildCommand">buildCommand</a></code> | <code>str</code> | A command for building the React app. |
-| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.buildDir">buildDir</a></code> | <code>str</code> | The path to the React app build folder- relative to the `projectPath`. |
-| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.localPort">localPort</a></code> | <code>num</code> | A port to start a local build of the React app on. |
-| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.startCommand">startCommand</a></code> | <code>str</code> | A command for starting React app locally. |
-| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.useBuildCommand">useBuildCommand</a></code> | <code>bool</code> | In sim, if `true` - will use the start command, and if `false` - the build command. |
-
----
-
-##### `projectPath`<sup>Required</sup> <a name="projectPath" id="@winglang/sdk.ex.ReactAppOptions.property.projectPath"></a>
-
-```wing
-projectPath: str;
-```
-
-- *Type:* str
-
-The path to the React app root folder- can be absolute or relative to the wing folder.
-
----
-
-##### `buildCommand`<sup>Optional</sup> <a name="buildCommand" id="@winglang/sdk.ex.ReactAppOptions.property.buildCommand"></a>
-
-```wing
-buildCommand: str;
-```
-
-- *Type:* str
-- *Default:* "npm run build"
-
-A command for building the React app.
-
----
-
-##### `buildDir`<sup>Optional</sup> <a name="buildDir" id="@winglang/sdk.ex.ReactAppOptions.property.buildDir"></a>
-
-```wing
-buildDir: str;
-```
-
-- *Type:* str
-- *Default:* "/build"
-
-The path to the React app build folder- relative to the `projectPath`.
-
----
-
-##### `localPort`<sup>Optional</sup> <a name="localPort" id="@winglang/sdk.ex.ReactAppOptions.property.localPort"></a>
-
-```wing
-localPort: num;
-```
-
-- *Type:* num
-- *Default:* 3001
-
-A port to start a local build of the React app on.
-
----
-
-##### `startCommand`<sup>Optional</sup> <a name="startCommand" id="@winglang/sdk.ex.ReactAppOptions.property.startCommand"></a>
-
-```wing
-startCommand: str;
-```
-
-- *Type:* str
-- *Default:* "npm run start"
-
-A command for starting React app locally.
-
----
-
-##### `useBuildCommand`<sup>Optional</sup> <a name="useBuildCommand" id="@winglang/sdk.ex.ReactAppOptions.property.useBuildCommand"></a>
-
-```wing
-useBuildCommand: bool;
-```
-
-- *Type:* bool
-- *Default:* false
-
-In sim, if `true` - will use the start command, and if `false` - the build command.
-
----
-
-### ReactAppProps <a name="ReactAppProps" id="@winglang/sdk.ex.ReactAppProps"></a>
-
-Options for `ReactApp`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ex.ReactAppProps.Initializer"></a>
-
-```wing
-bring ex;
-
-let ReactAppProps = ex.ReactAppProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.domain">domain</a></code> | <code><a href="#@winglang/sdk.cloud.Domain">Domain</a></code> | The website's custom domain object. |
-| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.projectPath">projectPath</a></code> | <code>str</code> | The path to the React app root folder- can be absolute or relative to the wing folder. |
-| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.buildCommand">buildCommand</a></code> | <code>str</code> | A command for building the React app. |
-| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.buildDir">buildDir</a></code> | <code>str</code> | The path to the React app build folder- relative to the `projectPath`. |
-| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.localPort">localPort</a></code> | <code>num</code> | A port to start a local build of the React app on. |
-| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.startCommand">startCommand</a></code> | <code>str</code> | A command for starting React app locally. |
-| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.useBuildCommand">useBuildCommand</a></code> | <code>bool</code> | In sim, if `true` - will use the start command, and if `false` - the build command. |
-
----
-
-##### `domain`<sup>Optional</sup> <a name="domain" id="@winglang/sdk.ex.ReactAppProps.property.domain"></a>
-
-```wing
-domain: Domain;
-```
-
-- *Type:* <a href="#@winglang/sdk.cloud.Domain">Domain</a>
-- *Default:* undefined
-
-The website's custom domain object.
-
----
-
-##### `projectPath`<sup>Required</sup> <a name="projectPath" id="@winglang/sdk.ex.ReactAppProps.property.projectPath"></a>
-
-```wing
-projectPath: str;
-```
-
-- *Type:* str
-
-The path to the React app root folder- can be absolute or relative to the wing folder.
-
----
-
-##### `buildCommand`<sup>Optional</sup> <a name="buildCommand" id="@winglang/sdk.ex.ReactAppProps.property.buildCommand"></a>
-
-```wing
-buildCommand: str;
-```
-
-- *Type:* str
-- *Default:* "npm run build"
-
-A command for building the React app.
-
----
-
-##### `buildDir`<sup>Optional</sup> <a name="buildDir" id="@winglang/sdk.ex.ReactAppProps.property.buildDir"></a>
-
-```wing
-buildDir: str;
-```
-
-- *Type:* str
-- *Default:* "/build"
-
-The path to the React app build folder- relative to the `projectPath`.
-
----
-
-##### `localPort`<sup>Optional</sup> <a name="localPort" id="@winglang/sdk.ex.ReactAppProps.property.localPort"></a>
-
-```wing
-localPort: num;
-```
-
-- *Type:* num
-- *Default:* 3001
-
-A port to start a local build of the React app on.
-
----
-
-##### `startCommand`<sup>Optional</sup> <a name="startCommand" id="@winglang/sdk.ex.ReactAppProps.property.startCommand"></a>
-
-```wing
-startCommand: str;
-```
-
-- *Type:* str
-- *Default:* "npm run start"
-
-A command for starting React app locally.
-
----
-
-##### `useBuildCommand`<sup>Optional</sup> <a name="useBuildCommand" id="@winglang/sdk.ex.ReactAppProps.property.useBuildCommand"></a>
-
-```wing
-useBuildCommand: bool;
-```
-
-- *Type:* bool
-- *Default:* false
-
-In sim, if `true` - will use the start command, and if `false` - the build command.
-
----
-
-
diff --git a/docs/docs/04-standard-library/03-std/_category_.yml b/docs/docs/04-standard-library/03-std/_category_.yml
deleted file mode 100644
index 0c4cc39d71a..00000000000
--- a/docs/docs/04-standard-library/03-std/_category_.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-label: std
-collapsible: true
-collapsed: true
diff --git a/docs/docs/04-standard-library/_category_.yml b/docs/docs/04-standard-library/_category_.yml
new file mode 100644
index 00000000000..287ede0010e
--- /dev/null
+++ b/docs/docs/04-standard-library/_category_.yml
@@ -0,0 +1,6 @@
+label: Standard Library
+collapsible: true
+collapsed: true
+link:
+  type: generated-index
+  title: Wing Standard Library
diff --git a/docs/docs/04-standard-library/aws/_category_.yml b/docs/docs/04-standard-library/aws/_category_.yml
index 5a97a8112f5..73bf0800cf8 100644
--- a/docs/docs/04-standard-library/aws/_category_.yml
+++ b/docs/docs/04-standard-library/aws/_category_.yml
@@ -1,3 +1,5 @@
 label: aws
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/aws/api-reference.md b/docs/docs/04-standard-library/aws/api-reference.md
index 1706d41bff8..a8a4c731b1d 100644
--- a/docs/docs/04-standard-library/aws/api-reference.md
+++ b/docs/docs/04-standard-library/aws/api-reference.md
@@ -8,106 +8,746 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
+# API Reference <a name="API Reference" id="api-reference"></a>
+
+## Resources <a name="Resources" id="Resources"></a>
+
+### BucketRef <a name="BucketRef" id="@winglang/sdk.aws.BucketRef"></a>
+
+A reference to an external S3 bucket.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.BucketRef.Initializer"></a>
+
+```wing
+bring aws;
+
+new aws.BucketRef(bucketName: str);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.BucketRef.Initializer.parameter.bucketName">bucketName</a></code> | <code>str</code> | *No description.* |
+
+---
+
+##### `bucketName`<sup>Required</sup> <a name="bucketName" id="@winglang/sdk.aws.BucketRef.Initializer.parameter.bucketName"></a>
+
+- *Type:* str
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.IAwsBucketClient.bucketRegion">bucketRegion</a></code> | Get the region of the bucket. |
+
+---
+
+##### `bucketRegion` <a name="bucketRegion" id="@winglang/sdk.aws.IAwsBucketClient.bucketRegion"></a>
+
+```wing
+inflight bucketRegion(): str
+```
+
+Get the region of the bucket.
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.BucketRef.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.aws.BucketRef.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.aws.BucketRef.onLiftType"></a>
+
+```wing
+bring aws;
+
+aws.BucketRef.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.aws.BucketRef.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.aws.BucketRef.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.aws.BucketRef.toInflight"></a>
+
+```wing
+bring aws;
+
+aws.BucketRef.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.aws.BucketRef.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.BucketRef.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.aws.BucketRef.property.bucketArn">bucketArn</a></code> | <code>str</code> | The ARN of this bucket. |
+| <code><a href="#@winglang/sdk.aws.BucketRef.property.bucketName">bucketName</a></code> | <code>str</code> | The Name of this bucket. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.BucketRef.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `bucketArn`<sup>Required</sup> <a name="bucketArn" id="@winglang/sdk.aws.BucketRef.property.bucketArn"></a>
+
+```wing
+bucketArn: str;
+```
+
+- *Type:* str
+
+The ARN of this bucket.
+
+---
+
+##### `bucketName`<sup>Required</sup> <a name="bucketName" id="@winglang/sdk.aws.BucketRef.property.bucketName"></a>
+
+```wing
+bucketName: str;
+```
+
+- *Type:* str
+
+The Name of this bucket.
+
+---
+
+
+### Domain <a name="Domain" id="@winglang/sdk.aws.Domain"></a>
+
+AWS implementation of `cloud.Domain`.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.Domain.Initializer"></a>
+
+```wing
+bring aws;
+
+new aws.Domain(props: DomainProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.Domain.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.aws.Domain.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a>
+
+---
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.Domain.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.aws.Domain.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.aws.Domain.onLiftType"></a>
+
+```wing
+bring aws;
+
+aws.Domain.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.aws.Domain.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.aws.Domain.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.aws.Domain.toInflight"></a>
+
+```wing
+bring aws;
+
+aws.Domain.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.aws.Domain.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.Domain.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.aws.Domain.property.domainName">domainName</a></code> | <code>str</code> | The domain name. |
+| <code><a href="#@winglang/sdk.aws.Domain.property.acmCertificateArn">acmCertificateArn</a></code> | <code>str</code> | The AWS Certificate Manager (ACM) certificate arn value. |
+| <code><a href="#@winglang/sdk.aws.Domain.property.hostedZoneId">hostedZoneId</a></code> | <code>str</code> | The hosted zone id value. |
+| <code><a href="#@winglang/sdk.aws.Domain.property.iamCertificate">iamCertificate</a></code> | <code>str</code> | The IAM certificate identifier value. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.Domain.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `domainName`<sup>Required</sup> <a name="domainName" id="@winglang/sdk.aws.Domain.property.domainName"></a>
+
+```wing
+domainName: str;
+```
+
+- *Type:* str
+
+The domain name.
+
+---
+
+##### `acmCertificateArn`<sup>Optional</sup> <a name="acmCertificateArn" id="@winglang/sdk.aws.Domain.property.acmCertificateArn"></a>
+
+```wing
+acmCertificateArn: str;
+```
+
+- *Type:* str
+
+The AWS Certificate Manager (ACM) certificate arn value.
+
+---
+
+##### `hostedZoneId`<sup>Optional</sup> <a name="hostedZoneId" id="@winglang/sdk.aws.Domain.property.hostedZoneId"></a>
+
+```wing
+hostedZoneId: str;
+```
+
+- *Type:* str
+
+The hosted zone id value.
+
+---
+
+##### `iamCertificate`<sup>Optional</sup> <a name="iamCertificate" id="@winglang/sdk.aws.Domain.property.iamCertificate"></a>
+
+```wing
+iamCertificate: str;
+```
+
+- *Type:* str
+
+The IAM certificate identifier value.
+
+---
+
+
+### FunctionRef <a name="FunctionRef" id="@winglang/sdk.aws.FunctionRef"></a>
+
+A reference to an external Lambda function.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.FunctionRef.Initializer"></a>
+
+```wing
+bring aws;
+
+new aws.FunctionRef(functionArn: str);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.FunctionRef.Initializer.parameter.functionArn">functionArn</a></code> | <code>str</code> | *No description.* |
+
+---
+
+##### `functionArn`<sup>Required</sup> <a name="functionArn" id="@winglang/sdk.aws.FunctionRef.Initializer.parameter.functionArn"></a>
+
+- *Type:* str
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.IFunctionClient.invoke">invoke</a></code> | Invokes the function with a payload and waits for the result. |
+| <code><a href="#@winglang/sdk.cloud.IFunctionClient.invokeAsync">invokeAsync</a></code> | Kicks off the execution of the function with a payload and returns immediately while the function is running. |
+
+---
+
+##### `invoke` <a name="invoke" id="@winglang/sdk.cloud.IFunctionClient.invoke"></a>
+
+```wing
+inflight invoke(payload?: str): str?
+```
+
+Invokes the function with a payload and waits for the result.
+
+###### `payload`<sup>Optional</sup> <a name="payload" id="@winglang/sdk.cloud.IFunctionClient.invoke.parameter.payload"></a>
+
+- *Type:* str
+
+payload to pass to the function.
+
+If not defined, an empty string will be passed.
+
+---
+
+##### `invokeAsync` <a name="invokeAsync" id="@winglang/sdk.cloud.IFunctionClient.invokeAsync"></a>
+
+```wing
+inflight invokeAsync(payload?: str): void
+```
+
+Kicks off the execution of the function with a payload and returns immediately while the function is running.
+
+###### `payload`<sup>Optional</sup> <a name="payload" id="@winglang/sdk.cloud.IFunctionClient.invokeAsync.parameter.payload"></a>
+
+- *Type:* str
+
+payload to pass to the function.
+
+If not defined, an empty string will be passed.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.FunctionRef.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.aws.FunctionRef.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.aws.FunctionRef.onLiftType"></a>
+
+```wing
+bring aws;
+
+aws.FunctionRef.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.aws.FunctionRef.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.aws.FunctionRef.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.aws.FunctionRef.toInflight"></a>
+
+```wing
+bring aws;
+
+aws.FunctionRef.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.aws.FunctionRef.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.FunctionRef.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.aws.FunctionRef.property.functionArn">functionArn</a></code> | <code>str</code> | The ARN of this function. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.FunctionRef.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `functionArn`<sup>Required</sup> <a name="functionArn" id="@winglang/sdk.aws.FunctionRef.property.functionArn"></a>
+
+```wing
+functionArn: str;
+```
+
+- *Type:* str
+
+The ARN of this function.
+
+---
+
+
+### QueueRef <a name="QueueRef" id="@winglang/sdk.aws.QueueRef"></a>
+
+A reference to an external SQS queue.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.QueueRef.Initializer"></a>
+
+```wing
+bring aws;
+
+new aws.QueueRef(queueArn: str);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.QueueRef.Initializer.parameter.queueArn">queueArn</a></code> | <code>str</code> | *No description.* |
+
+---
+
+##### `queueArn`<sup>Required</sup> <a name="queueArn" id="@winglang/sdk.aws.QueueRef.Initializer.parameter.queueArn"></a>
+
+- *Type:* str
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.IAwsQueueClient.queueUrl">queueUrl</a></code> | Get the queue URL. |
+
+---
+
+##### `queueUrl` <a name="queueUrl" id="@winglang/sdk.aws.IAwsQueueClient.queueUrl"></a>
+
+```wing
+inflight queueUrl(): str
+```
+
+Get the queue URL.
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.QueueRef.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.aws.QueueRef.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.aws.QueueRef.onLiftType"></a>
+
+```wing
+bring aws;
+
+aws.QueueRef.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.aws.QueueRef.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.aws.QueueRef.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.aws.QueueRef.toInflight"></a>
+
+```wing
+bring aws;
+
+aws.QueueRef.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.aws.QueueRef.toInflight.parameter.obj"></a>
 
-# API Reference <a name="API Reference" id="api-reference"></a>
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
 
-## Resources <a name="Resources" id="Resources"></a>
+---
 
-### Domain <a name="Domain" id="@winglang/sdk.aws.Domain"></a>
+#### Properties <a name="Properties" id="Properties"></a>
 
-AWS implementation of `cloud.Domain`.
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.QueueRef.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.aws.QueueRef.property.queueArn">queueArn</a></code> | <code>str</code> | The ARN of this queue. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.QueueRef.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `queueArn`<sup>Required</sup> <a name="queueArn" id="@winglang/sdk.aws.QueueRef.property.queueArn"></a>
+
+```wing
+queueArn: str;
+```
+
+- *Type:* str
+
+The ARN of this queue.
+
+---
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.aws.Domain.Initializer"></a>
+
+### SecretRef <a name="SecretRef" id="@winglang/sdk.aws.SecretRef"></a>
+
+A reference to an existing secret.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.SecretRef.Initializer"></a>
 
 ```wing
 bring aws;
 
-new aws.Domain(props: DomainProps);
+new aws.SecretRef(secretArn: str);
 ```
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.aws.Domain.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a></code> | *No description.* |
+| <code><a href="#@winglang/sdk.aws.SecretRef.Initializer.parameter.secretArn">secretArn</a></code> | <code>str</code> | *No description.* |
 
 ---
 
-##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.aws.Domain.Initializer.parameter.props"></a>
+##### `secretArn`<sup>Required</sup> <a name="secretArn" id="@winglang/sdk.aws.SecretRef.Initializer.parameter.secretArn"></a>
 
-- *Type:* <a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a>
+- *Type:* str
 
 ---
 
+#### Methods <a name="Methods" id="Methods"></a>
 
+##### Inflight Methods
 
-#### Properties <a name="Properties" id="Properties"></a>
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ISecretClient.value">value</a></code> | Retrieve the value of the secret. |
+| <code><a href="#@winglang/sdk.cloud.ISecretClient.valueJson">valueJson</a></code> | Retrieve the Json value of the secret. |
 
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.aws.Domain.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-| <code><a href="#@winglang/sdk.aws.Domain.property.domainName">domainName</a></code> | <code>str</code> | The domain name. |
-| <code><a href="#@winglang/sdk.aws.Domain.property.acmCertificateArn">acmCertificateArn</a></code> | <code>str</code> | The AWS Certificate Manager (ACM) certificate arn value. |
-| <code><a href="#@winglang/sdk.aws.Domain.property.hostedZoneId">hostedZoneId</a></code> | <code>str</code> | The hosted zone id value. |
-| <code><a href="#@winglang/sdk.aws.Domain.property.iamCertificate">iamCertificate</a></code> | <code>str</code> | The IAM certificate identifier value. |
+---
+
+##### `value` <a name="value" id="@winglang/sdk.cloud.ISecretClient.value"></a>
+
+```wing
+inflight value(options?: GetSecretValueOptions): str
+```
+
+Retrieve the value of the secret.
+
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.ISecretClient.value.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.GetSecretValueOptions">GetSecretValueOptions</a>
 
 ---
 
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.Domain.property.node"></a>
+##### `valueJson` <a name="valueJson" id="@winglang/sdk.cloud.ISecretClient.valueJson"></a>
 
 ```wing
-node: Node;
+inflight valueJson(options?: GetSecretValueOptions): Json
 ```
 
-- *Type:* constructs.Node
+Retrieve the Json value of the secret.
 
-The tree node.
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.ISecretClient.valueJson.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.GetSecretValueOptions">GetSecretValueOptions</a>
 
 ---
 
-##### `domainName`<sup>Required</sup> <a name="domainName" id="@winglang/sdk.aws.Domain.property.domainName"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.SecretRef.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.aws.SecretRef.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.aws.SecretRef.onLiftType"></a>
 
 ```wing
-domainName: str;
+bring aws;
+
+aws.SecretRef.onLiftType(host: IInflightHost, ops: MutArray<str>);
 ```
 
-- *Type:* str
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
 
-The domain name.
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.aws.SecretRef.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
 
 ---
 
-##### `acmCertificateArn`<sup>Optional</sup> <a name="acmCertificateArn" id="@winglang/sdk.aws.Domain.property.acmCertificateArn"></a>
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.aws.SecretRef.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.aws.SecretRef.toInflight"></a>
 
 ```wing
-acmCertificateArn: str;
+bring aws;
+
+aws.SecretRef.toInflight(obj: IResource);
 ```
 
-- *Type:* str
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
 
-The AWS Certificate Manager (ACM) certificate arn value.
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.aws.SecretRef.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
 
 ---
 
-##### `hostedZoneId`<sup>Optional</sup> <a name="hostedZoneId" id="@winglang/sdk.aws.Domain.property.hostedZoneId"></a>
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.SecretRef.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.aws.SecretRef.property.secretArn">secretArn</a></code> | <code>str</code> | The ARN of the secret. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.SecretRef.property.node"></a>
 
 ```wing
-hostedZoneId: str;
+node: Node;
 ```
 
-- *Type:* str
+- *Type:* constructs.Node
 
-The hosted zone id value.
+The tree node.
 
 ---
 
-##### `iamCertificate`<sup>Optional</sup> <a name="iamCertificate" id="@winglang/sdk.aws.Domain.property.iamCertificate"></a>
+##### `secretArn`<sup>Required</sup> <a name="secretArn" id="@winglang/sdk.aws.SecretRef.property.secretArn"></a>
 
 ```wing
-iamCertificate: str;
+secretArn: str;
 ```
 
 - *Type:* str
 
-The IAM certificate identifier value.
+The ARN of the secret.
 
 ---
 
@@ -160,6 +800,91 @@ The cloud.Api.
 
 
 
+### ApiEndpointHandler <a name="ApiEndpointHandler" id="@winglang/sdk.aws.ApiEndpointHandler"></a>
+
+A helper class for working with AWS api endpoint handlers.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.ApiEndpointHandler.Initializer"></a>
+
+```wing
+bring aws;
+
+new aws.ApiEndpointHandler();
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+
+---
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.ApiEndpointHandler.toFunctionHandler">toFunctionHandler</a></code> | Returns a `cloud.Function` handler for handling requests from a `cloud.Api`. |
+
+---
+
+##### `toFunctionHandler` <a name="toFunctionHandler" id="@winglang/sdk.aws.ApiEndpointHandler.toFunctionHandler"></a>
+
+```wing
+bring aws;
+
+aws.ApiEndpointHandler.toFunctionHandler(handler: IApiEndpointHandler, headers?: MutMap<str>);
+```
+
+Returns a `cloud.Function` handler for handling requests from a `cloud.Api`.
+
+###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.aws.ApiEndpointHandler.toFunctionHandler.parameter.handler"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The `onRequest` handler.
+
+---
+
+###### `headers`<sup>Optional</sup> <a name="headers" id="@winglang/sdk.aws.ApiEndpointHandler.toFunctionHandler.parameter.headers"></a>
+
+- *Type:* MutMap&lt;str&gt;
+
+HTTP response headers to add to all responses (used by CORS).
+
+---
+
+
+
+### AwsInflightHost <a name="AwsInflightHost" id="@winglang/sdk.aws.AwsInflightHost"></a>
+
+Represents an inflight host on AWS.
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.AwsInflightHost.isAwsInflightHost">isAwsInflightHost</a></code> | Returns `true` if `obj` implements `IAwsInflightHost`. |
+
+---
+
+##### `isAwsInflightHost` <a name="isAwsInflightHost" id="@winglang/sdk.aws.AwsInflightHost.isAwsInflightHost"></a>
+
+```wing
+bring aws;
+
+aws.AwsInflightHost.isAwsInflightHost(obj: any);
+```
+
+Returns `true` if `obj` implements `IAwsInflightHost`.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.aws.AwsInflightHost.isAwsInflightHost.parameter.obj"></a>
+
+- *Type:* any
+
+---
+
+
+
 ### Bucket <a name="Bucket" id="@winglang/sdk.aws.Bucket"></a>
 
 A helper class for working with AWS buckets.
@@ -206,16 +931,16 @@ The cloud.Bucket.
 
 
 
-### Counter <a name="Counter" id="@winglang/sdk.aws.Counter"></a>
+### BucketEventHandler <a name="BucketEventHandler" id="@winglang/sdk.aws.BucketEventHandler"></a>
 
-A helper class for working with AWS Counters.
+Utility class to work with bucket event handlers.
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.aws.Counter.Initializer"></a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.BucketEventHandler.Initializer"></a>
 
 ```wing
 bring aws;
 
-new aws.Counter();
+new aws.BucketEventHandler();
 ```
 
 | **Name** | **Type** | **Description** |
@@ -228,40 +953,48 @@ new aws.Counter();
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.aws.Counter.from">from</a></code> | If the table is an AWS Counter, return a helper interface for working with it. |
+| <code><a href="#@winglang/sdk.aws.BucketEventHandler.toTopicOnMessageHandler">toTopicOnMessageHandler</a></code> | Converts a `cloud.IBucketEventHandler` to a `cloud.ITopicOnMessageHandler`. |
 
 ---
 
-##### `from` <a name="from" id="@winglang/sdk.aws.Counter.from"></a>
+##### `toTopicOnMessageHandler` <a name="toTopicOnMessageHandler" id="@winglang/sdk.aws.BucketEventHandler.toTopicOnMessageHandler"></a>
 
 ```wing
 bring aws;
 
-aws.Counter.from(counter: Counter);
+aws.BucketEventHandler.toTopicOnMessageHandler(handler: IBucketEventHandler, eventType: BucketEventType);
 ```
 
-If the table is an AWS Counter, return a helper interface for working with it.
+Converts a `cloud.IBucketEventHandler` to a `cloud.ITopicOnMessageHandler`.
 
-###### `counter`<sup>Required</sup> <a name="counter" id="@winglang/sdk.aws.Counter.from.parameter.counter"></a>
+###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.aws.BucketEventHandler.toTopicOnMessageHandler.parameter.handler"></a>
 
-- *Type:* <a href="#@winglang/sdk.cloud.Counter">Counter</a>
+- *Type:* <a href="#@winglang/sdk.cloud.IBucketEventHandler">IBucketEventHandler</a>
 
-The cloud.Counter.
+the handler to convert.
+
+---
+
+###### `eventType`<sup>Required</sup> <a name="eventType" id="@winglang/sdk.aws.BucketEventHandler.toTopicOnMessageHandler.parameter.eventType"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.BucketEventType">BucketEventType</a>
+
+the event type.
 
 ---
 
 
 
-### DynamodbTable <a name="DynamodbTable" id="@winglang/sdk.aws.DynamodbTable"></a>
+### Counter <a name="Counter" id="@winglang/sdk.aws.Counter"></a>
 
-A helper class for working with AWS DynamodbTables.
+A helper class for working with AWS Counters.
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.aws.DynamodbTable.Initializer"></a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.Counter.Initializer"></a>
 
 ```wing
 bring aws;
 
-new aws.DynamodbTable();
+new aws.Counter();
 ```
 
 | **Name** | **Type** | **Description** |
@@ -274,25 +1007,25 @@ new aws.DynamodbTable();
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.aws.DynamodbTable.from">from</a></code> | If the table is an AWS Dynamodb, return a helper interface for working with it. |
+| <code><a href="#@winglang/sdk.aws.Counter.from">from</a></code> | If the table is an AWS Counter, return a helper interface for working with it. |
 
 ---
 
-##### `from` <a name="from" id="@winglang/sdk.aws.DynamodbTable.from"></a>
+##### `from` <a name="from" id="@winglang/sdk.aws.Counter.from"></a>
 
 ```wing
 bring aws;
 
-aws.DynamodbTable.from(dynamodb: DynamodbTable);
+aws.Counter.from(counter: Counter);
 ```
 
-If the table is an AWS Dynamodb, return a helper interface for working with it.
+If the table is an AWS Counter, return a helper interface for working with it.
 
-###### `dynamodb`<sup>Required</sup> <a name="dynamodb" id="@winglang/sdk.aws.DynamodbTable.from.parameter.dynamodb"></a>
+###### `counter`<sup>Required</sup> <a name="counter" id="@winglang/sdk.aws.Counter.from.parameter.counter"></a>
 
-- *Type:* <a href="#@winglang/sdk.ex.DynamodbTable">DynamodbTable</a>
+- *Type:* <a href="#@winglang/sdk.cloud.Counter">Counter</a>
 
-The ex.DynamodbTable.
+The cloud.Counter.
 
 ---
 
@@ -320,10 +1053,23 @@ new aws.Function();
 
 | **Name** | **Description** |
 | --- | --- |
+| <code><a href="#@winglang/sdk.aws.Function.context">context</a></code> | Returns the current Lambda invocation context, if the host is an AWS Lambda. |
 | <code><a href="#@winglang/sdk.aws.Function.from">from</a></code> | If the inflight host is an AWS Lambda, return a helper interface for working with it. |
 
 ---
 
+##### `context` <a name="context" id="@winglang/sdk.aws.Function.context"></a>
+
+```wing
+bring aws;
+
+aws.Function.context();
+```
+
+Returns the current Lambda invocation context, if the host is an AWS Lambda.
+
+> [https://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html](https://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html)
+
 ##### `from` <a name="from" id="@winglang/sdk.aws.Function.from"></a>
 
 ```wing
@@ -390,16 +1136,16 @@ The cloud.Queue.
 
 
 
-### ReactApp <a name="ReactApp" id="@winglang/sdk.aws.ReactApp"></a>
+### QueueSetConsumerHandler <a name="QueueSetConsumerHandler" id="@winglang/sdk.aws.QueueSetConsumerHandler"></a>
 
-A helper class for working with AWS react apps.
+Utility class for working with the queue consumer handler.
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.aws.ReactApp.Initializer"></a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.QueueSetConsumerHandler.Initializer"></a>
 
 ```wing
 bring aws;
 
-new aws.ReactApp();
+new aws.QueueSetConsumerHandler();
 ```
 
 | **Name** | **Type** | **Description** |
@@ -412,25 +1158,25 @@ new aws.ReactApp();
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.aws.ReactApp.from">from</a></code> | If the bucket is an AWS Bucket, return a helper interface for working with it. |
+| <code><a href="#@winglang/sdk.aws.QueueSetConsumerHandler.toFunctionHandler">toFunctionHandler</a></code> | Converts a queue consumer handler to a function handler. |
 
 ---
 
-##### `from` <a name="from" id="@winglang/sdk.aws.ReactApp.from"></a>
+##### `toFunctionHandler` <a name="toFunctionHandler" id="@winglang/sdk.aws.QueueSetConsumerHandler.toFunctionHandler"></a>
 
 ```wing
 bring aws;
 
-aws.ReactApp.from(react: ReactApp);
+aws.QueueSetConsumerHandler.toFunctionHandler(handler: IQueueSetConsumerHandler);
 ```
 
-If the bucket is an AWS Bucket, return a helper interface for working with it.
+Converts a queue consumer handler to a function handler.
 
-###### `react`<sup>Required</sup> <a name="react" id="@winglang/sdk.aws.ReactApp.from.parameter.react"></a>
+###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.aws.QueueSetConsumerHandler.toFunctionHandler.parameter.handler"></a>
 
-- *Type:* <a href="#@winglang/sdk.ex.ReactApp">ReactApp</a>
+- *Type:* <a href="#@winglang/sdk.cloud.IQueueSetConsumerHandler">IQueueSetConsumerHandler</a>
 
-The ex.ReactApp.
+The queue consumer handler.
 
 ---
 
@@ -472,26 +1218,72 @@ aws.Table.from(table: Table);
 
 If the table is an AWS DynamoDB, return a helper interface for working with it.
 
-###### `table`<sup>Required</sup> <a name="table" id="@winglang/sdk.aws.Table.from.parameter.table"></a>
+###### `table`<sup>Required</sup> <a name="table" id="@winglang/sdk.aws.Table.from.parameter.table"></a>
+
+- *Type:* <a href="#@winglang/sdk.ex.Table">Table</a>
+
+The ex.Table.
+
+---
+
+
+
+### Topic <a name="Topic" id="@winglang/sdk.aws.Topic"></a>
+
+A helper class for working with AWS topics.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.Topic.Initializer"></a>
+
+```wing
+bring aws;
+
+new aws.Topic();
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+
+---
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.Topic.from">from</a></code> | If the topic is an AWS SNS, return a helper interface for working with it. |
+
+---
+
+##### `from` <a name="from" id="@winglang/sdk.aws.Topic.from"></a>
+
+```wing
+bring aws;
+
+aws.Topic.from(topic: Topic);
+```
+
+If the topic is an AWS SNS, return a helper interface for working with it.
+
+###### `topic`<sup>Required</sup> <a name="topic" id="@winglang/sdk.aws.Topic.from.parameter.topic"></a>
 
-- *Type:* <a href="#@winglang/sdk.ex.Table">Table</a>
+- *Type:* <a href="#@winglang/sdk.cloud.Topic">Topic</a>
 
-The ex.Table.
+The cloud.Topic.
 
 ---
 
 
 
-### Topic <a name="Topic" id="@winglang/sdk.aws.Topic"></a>
+### TopicOnMessageHandler <a name="TopicOnMessageHandler" id="@winglang/sdk.aws.TopicOnMessageHandler"></a>
 
-A helper class for working with AWS topics.
+A helper class for working with AWS topic on message handlers.
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.aws.Topic.Initializer"></a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.aws.TopicOnMessageHandler.Initializer"></a>
 
 ```wing
 bring aws;
 
-new aws.Topic();
+new aws.TopicOnMessageHandler();
 ```
 
 | **Name** | **Type** | **Description** |
@@ -504,25 +1296,25 @@ new aws.Topic();
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.aws.Topic.from">from</a></code> | If the topic is an AWS SNS, return a helper interface for working with it. |
+| <code><a href="#@winglang/sdk.aws.TopicOnMessageHandler.toFunctionHandler">toFunctionHandler</a></code> | Returns a `cloud.Function` handler for handling messages from a `cloud.Topic`. |
 
 ---
 
-##### `from` <a name="from" id="@winglang/sdk.aws.Topic.from"></a>
+##### `toFunctionHandler` <a name="toFunctionHandler" id="@winglang/sdk.aws.TopicOnMessageHandler.toFunctionHandler"></a>
 
 ```wing
 bring aws;
 
-aws.Topic.from(topic: Topic);
+aws.TopicOnMessageHandler.toFunctionHandler(handler: ITopicOnMessageHandler);
 ```
 
-If the topic is an AWS SNS, return a helper interface for working with it.
+Returns a `cloud.Function` handler for handling messages from a `cloud.Topic`.
 
-###### `topic`<sup>Required</sup> <a name="topic" id="@winglang/sdk.aws.Topic.from.parameter.topic"></a>
+###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.aws.TopicOnMessageHandler.toFunctionHandler.parameter.handler"></a>
 
-- *Type:* <a href="#@winglang/sdk.cloud.Topic">Topic</a>
+- *Type:* <a href="#@winglang/sdk.cloud.ITopicOnMessageHandler">ITopicOnMessageHandler</a>
 
-The cloud.Topic.
+The `onMessage` handler.
 
 ---
 
@@ -576,110 +1368,68 @@ The cloud.Bucket.
 
 ## Structs <a name="Structs" id="Structs"></a>
 
-### AwsReactAppProps <a name="AwsReactAppProps" id="@winglang/sdk.aws.AwsReactAppProps"></a>
+### AwsWebsiteProps <a name="AwsWebsiteProps" id="@winglang/sdk.aws.AwsWebsiteProps"></a>
 
-Options for AWS `ReactApp`.
+Options for AWS `Website`.
 
-#### Initializer <a name="Initializer" id="@winglang/sdk.aws.AwsReactAppProps.Initializer"></a>
+#### Initializer <a name="Initializer" id="@winglang/sdk.aws.AwsWebsiteProps.Initializer"></a>
 
 ```wing
 bring aws;
 
-let AwsReactAppProps = aws.AwsReactAppProps{ ... };
+let AwsWebsiteProps = aws.AwsWebsiteProps{ ... };
 ```
 
 #### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.aws.AwsReactAppProps.property.projectPath">projectPath</a></code> | <code>str</code> | The path to the React app root folder- can be absolute or relative to the wing folder. |
-| <code><a href="#@winglang/sdk.aws.AwsReactAppProps.property.buildCommand">buildCommand</a></code> | <code>str</code> | A command for building the React app. |
-| <code><a href="#@winglang/sdk.aws.AwsReactAppProps.property.buildDir">buildDir</a></code> | <code>str</code> | The path to the React app build folder- relative to the `projectPath`. |
-| <code><a href="#@winglang/sdk.aws.AwsReactAppProps.property.localPort">localPort</a></code> | <code>num</code> | A port to start a local build of the React app on. |
-| <code><a href="#@winglang/sdk.aws.AwsReactAppProps.property.startCommand">startCommand</a></code> | <code>str</code> | A command for starting React app locally. |
-| <code><a href="#@winglang/sdk.aws.AwsReactAppProps.property.useBuildCommand">useBuildCommand</a></code> | <code>bool</code> | In sim, if `true` - will use the start command, and if `false` - the build command. |
-| <code><a href="#@winglang/sdk.aws.AwsReactAppProps.property.domain">domain</a></code> | <code><a href="#@winglang/sdk.aws.Domain">Domain</a></code> | The website's custom domain object. |
-
----
-
-##### `projectPath`<sup>Required</sup> <a name="projectPath" id="@winglang/sdk.aws.AwsReactAppProps.property.projectPath"></a>
-
-```wing
-projectPath: str;
-```
-
-- *Type:* str
-
-The path to the React app root folder- can be absolute or relative to the wing folder.
-
----
-
-##### `buildCommand`<sup>Optional</sup> <a name="buildCommand" id="@winglang/sdk.aws.AwsReactAppProps.property.buildCommand"></a>
-
-```wing
-buildCommand: str;
-```
-
-- *Type:* str
-- *Default:* "npm run build"
-
-A command for building the React app.
+| <code><a href="#@winglang/sdk.aws.AwsWebsiteProps.property.path">path</a></code> | <code>str</code> | Local path to the website's static files, relative to the Wing source file or absolute. |
+| <code><a href="#@winglang/sdk.aws.AwsWebsiteProps.property.errorDocument">errorDocument</a></code> | <code>str</code> | Name of the error document for the website. |
+| <code><a href="#@winglang/sdk.aws.AwsWebsiteProps.property.domain">domain</a></code> | <code><a href="#@winglang/sdk.aws.Domain">Domain</a></code> | The website's custom domain object. |
 
 ---
 
-##### `buildDir`<sup>Optional</sup> <a name="buildDir" id="@winglang/sdk.aws.AwsReactAppProps.property.buildDir"></a>
+##### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.aws.AwsWebsiteProps.property.path"></a>
 
 ```wing
-buildDir: str;
+path: str;
 ```
 
 - *Type:* str
-- *Default:* "/build"
 
-The path to the React app build folder- relative to the `projectPath`.
+Local path to the website's static files, relative to the Wing source file or absolute.
 
 ---
 
-##### `localPort`<sup>Optional</sup> <a name="localPort" id="@winglang/sdk.aws.AwsReactAppProps.property.localPort"></a>
+*Example*
 
 ```wing
-localPort: num;
+"./dist"
 ```
 
-- *Type:* num
-- *Default:* 3001
-
-A port to start a local build of the React app on.
-
----
 
-##### `startCommand`<sup>Optional</sup> <a name="startCommand" id="@winglang/sdk.aws.AwsReactAppProps.property.startCommand"></a>
+##### `errorDocument`<sup>Optional</sup> <a name="errorDocument" id="@winglang/sdk.aws.AwsWebsiteProps.property.errorDocument"></a>
 
 ```wing
-startCommand: str;
+errorDocument: str;
 ```
 
 - *Type:* str
-- *Default:* "npm run start"
+- *Default:* undefined
 
-A command for starting React app locally.
+Name of the error document for the website.
 
 ---
 
-##### `useBuildCommand`<sup>Optional</sup> <a name="useBuildCommand" id="@winglang/sdk.aws.AwsReactAppProps.property.useBuildCommand"></a>
+*Example*
 
 ```wing
-useBuildCommand: bool;
+"404.html"
 ```
 
-- *Type:* bool
-- *Default:* false
-
-In sim, if `true` - will use the start command, and if `false` - the build command.
 
----
-
-##### `domain`<sup>Optional</sup> <a name="domain" id="@winglang/sdk.aws.AwsReactAppProps.property.domain"></a>
+##### `domain`<sup>Optional</sup> <a name="domain" id="@winglang/sdk.aws.AwsWebsiteProps.property.domain"></a>
 
 ```wing
 domain: Domain;
@@ -692,56 +1442,48 @@ The website's custom domain object.
 
 ---
 
-### AwsWebsiteProps <a name="AwsWebsiteProps" id="@winglang/sdk.aws.AwsWebsiteProps"></a>
+### NetworkConfig <a name="NetworkConfig" id="@winglang/sdk.aws.NetworkConfig"></a>
 
-Options for AWS `Website`.
+Function network configuration used to hold data on subnets and security groups that should be used when a function is deployed within a VPC.
 
-#### Initializer <a name="Initializer" id="@winglang/sdk.aws.AwsWebsiteProps.Initializer"></a>
+#### Initializer <a name="Initializer" id="@winglang/sdk.aws.NetworkConfig.Initializer"></a>
 
 ```wing
 bring aws;
 
-let AwsWebsiteProps = aws.AwsWebsiteProps{ ... };
+let NetworkConfig = aws.NetworkConfig{ ... };
 ```
 
 #### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.aws.AwsWebsiteProps.property.path">path</a></code> | <code>str</code> | Local path to the website's static files, relative to the Wing source file or absolute. |
-| <code><a href="#@winglang/sdk.aws.AwsWebsiteProps.property.domain">domain</a></code> | <code><a href="#@winglang/sdk.aws.Domain">Domain</a></code> | The website's custom domain object. |
+| <code><a href="#@winglang/sdk.aws.NetworkConfig.property.securityGroupIds">securityGroupIds</a></code> | <code>MutArray&lt;str&gt;</code> | List of security groups to place function in. |
+| <code><a href="#@winglang/sdk.aws.NetworkConfig.property.subnetIds">subnetIds</a></code> | <code>MutArray&lt;str&gt;</code> | List of subnets to attach on function. |
 
 ---
 
-##### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.aws.AwsWebsiteProps.property.path"></a>
+##### `securityGroupIds`<sup>Required</sup> <a name="securityGroupIds" id="@winglang/sdk.aws.NetworkConfig.property.securityGroupIds"></a>
 
 ```wing
-path: str;
+securityGroupIds: MutArray<str>;
 ```
 
-- *Type:* str
+- *Type:* MutArray&lt;str&gt;
 
-Local path to the website's static files, relative to the Wing source file or absolute.
+List of security groups to place function in.
 
 ---
 
-*Example*
-
-```wing
-"./dist"
-```
-
-
-##### `domain`<sup>Optional</sup> <a name="domain" id="@winglang/sdk.aws.AwsWebsiteProps.property.domain"></a>
+##### `subnetIds`<sup>Required</sup> <a name="subnetIds" id="@winglang/sdk.aws.NetworkConfig.property.subnetIds"></a>
 
 ```wing
-domain: Domain;
+subnetIds: MutArray<str>;
 ```
 
-- *Type:* <a href="#@winglang/sdk.aws.Domain">Domain</a>
-- *Default:* undefined
+- *Type:* MutArray&lt;str&gt;
 
-The website's custom domain object.
+List of subnets to attach on function.
 
 ---
 
@@ -977,82 +1719,95 @@ AWS Dynamodb name.
 
 ---
 
-### IAwsDynamodbTable <a name="IAwsDynamodbTable" id="@winglang/sdk.aws.IAwsDynamodbTable"></a>
+### IAwsFunction <a name="IAwsFunction" id="@winglang/sdk.aws.IAwsFunction"></a>
+
+- *Extends:* <a href="#@winglang/sdk.aws.IAwsInflightHost">IAwsInflightHost</a>
 
-- *Implemented By:* <a href="#@winglang/sdk.aws.IAwsDynamodbTable">IAwsDynamodbTable</a>
+- *Implemented By:* <a href="#@winglang/sdk.aws.IAwsFunction">IAwsFunction</a>
 
-A shared interface for AWS Dynamodb.
+A shared interface for AWS functions.
 
 
 #### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.aws.IAwsDynamodbTable.property.dynamoTableArn">dynamoTableArn</a></code> | <code>str</code> | AWS Dynamodb arn. |
-| <code><a href="#@winglang/sdk.aws.IAwsDynamodbTable.property.dynamoTableName">dynamoTableName</a></code> | <code>str</code> | AWS Dynamodb name. |
+| <code><a href="#@winglang/sdk.aws.IAwsFunction.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.aws.IAwsFunction.property.functionArn">functionArn</a></code> | <code>str</code> | AWS Function arn. |
+| <code><a href="#@winglang/sdk.aws.IAwsFunction.property.functionName">functionName</a></code> | <code>str</code> | AWS Function name. |
 
 ---
 
-##### `dynamoTableArn`<sup>Required</sup> <a name="dynamoTableArn" id="@winglang/sdk.aws.IAwsDynamodbTable.property.dynamoTableArn"></a>
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.IAwsFunction.property.node"></a>
 
 ```wing
-dynamoTableArn: str;
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `functionArn`<sup>Required</sup> <a name="functionArn" id="@winglang/sdk.aws.IAwsFunction.property.functionArn"></a>
+
+```wing
+functionArn: str;
 ```
 
 - *Type:* str
 
-AWS Dynamodb arn.
+AWS Function arn.
 
 ---
 
-##### `dynamoTableName`<sup>Required</sup> <a name="dynamoTableName" id="@winglang/sdk.aws.IAwsDynamodbTable.property.dynamoTableName"></a>
+##### `functionName`<sup>Required</sup> <a name="functionName" id="@winglang/sdk.aws.IAwsFunction.property.functionName"></a>
 
 ```wing
-dynamoTableName: str;
+functionName: str;
 ```
 
 - *Type:* str
 
-AWS Dynamodb name.
+AWS Function name.
 
 ---
 
-### IAwsFunction <a name="IAwsFunction" id="@winglang/sdk.aws.IAwsFunction"></a>
+### IAwsInflightHost <a name="IAwsInflightHost" id="@winglang/sdk.aws.IAwsInflightHost"></a>
 
-- *Implemented By:* <a href="#@winglang/sdk.aws.IAwsFunction">IAwsFunction</a>
+- *Extends:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
 
-A shared interface for AWS functions.
+- *Implemented By:* <a href="#@winglang/sdk.aws.IAwsFunction">IAwsFunction</a>, <a href="#@winglang/sdk.aws.IAwsInflightHost">IAwsInflightHost</a>
+
+Represents an `IInflightHost` on AWS.
 
 #### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.aws.IAwsFunction.addEnvironment">addEnvironment</a></code> | Add an environment variable to the function. |
-| <code><a href="#@winglang/sdk.aws.IAwsFunction.addPolicyStatements">addPolicyStatements</a></code> | Add policy statements to the function's IAM role. |
+| <code><a href="#@winglang/sdk.aws.IAwsInflightHost.addNetwork">addNetwork</a></code> | Adds the host to the specified network. |
+| <code><a href="#@winglang/sdk.aws.IAwsInflightHost.addPolicyStatements">addPolicyStatements</a></code> | Add policy statements to the function's IAM role. |
 
 ---
 
-##### `addEnvironment` <a name="addEnvironment" id="@winglang/sdk.aws.IAwsFunction.addEnvironment"></a>
+##### `addNetwork` <a name="addNetwork" id="@winglang/sdk.aws.IAwsInflightHost.addNetwork"></a>
 
 ```wing
-addEnvironment(key: str, value: str): void
+addNetwork(config: NetworkConfig): void
 ```
 
-Add an environment variable to the function.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.aws.IAwsFunction.addEnvironment.parameter.key"></a>
-
-- *Type:* str
+Adds the host to the specified network.
 
----
+###### `config`<sup>Required</sup> <a name="config" id="@winglang/sdk.aws.IAwsInflightHost.addNetwork.parameter.config"></a>
 
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.aws.IAwsFunction.addEnvironment.parameter.value"></a>
+- *Type:* <a href="#@winglang/sdk.aws.NetworkConfig">NetworkConfig</a>
 
-- *Type:* str
+The network configuration.
 
 ---
 
-##### `addPolicyStatements` <a name="addPolicyStatements" id="@winglang/sdk.aws.IAwsFunction.addPolicyStatements"></a>
+##### `addPolicyStatements` <a name="addPolicyStatements" id="@winglang/sdk.aws.IAwsInflightHost.addPolicyStatements"></a>
 
 ```wing
 addPolicyStatements(...policies: Array<PolicyStatement>): void
@@ -1060,7 +1815,7 @@ addPolicyStatements(...policies: Array<PolicyStatement>): void
 
 Add policy statements to the function's IAM role.
 
-###### `policies`<sup>Required</sup> <a name="policies" id="@winglang/sdk.aws.IAwsFunction.addPolicyStatements.parameter.policies"></a>
+###### `policies`<sup>Required</sup> <a name="policies" id="@winglang/sdk.aws.IAwsInflightHost.addPolicyStatements.parameter.policies"></a>
 
 - *Type:* <a href="#@winglang/sdk.aws.PolicyStatement">PolicyStatement</a>
 
@@ -1070,32 +1825,19 @@ Add policy statements to the function's IAM role.
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.aws.IAwsFunction.property.functionArn">functionArn</a></code> | <code>str</code> | AWS Function arn. |
-| <code><a href="#@winglang/sdk.aws.IAwsFunction.property.functionName">functionName</a></code> | <code>str</code> | AWS Function name. |
-
----
-
-##### `functionArn`<sup>Required</sup> <a name="functionArn" id="@winglang/sdk.aws.IAwsFunction.property.functionArn"></a>
-
-```wing
-functionArn: str;
-```
-
-- *Type:* str
-
-AWS Function arn.
+| <code><a href="#@winglang/sdk.aws.IAwsInflightHost.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
 
 ---
 
-##### `functionName`<sup>Required</sup> <a name="functionName" id="@winglang/sdk.aws.IAwsFunction.property.functionName"></a>
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.aws.IAwsInflightHost.property.node"></a>
 
 ```wing
-functionName: str;
+node: Node;
 ```
 
-- *Type:* str
+- *Type:* constructs.Node
 
-AWS Function name.
+The tree node.
 
 ---
 
@@ -1152,46 +1894,6 @@ AWS Queue url.
 
 ---
 
-### IAwsReactApp <a name="IAwsReactApp" id="@winglang/sdk.aws.IAwsReactApp"></a>
-
-- *Implemented By:* <a href="#@winglang/sdk.aws.IAwsReactApp">IAwsReactApp</a>
-
-A shared interface for AWS react app.
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.aws.IAwsReactApp.property.bucketArn">bucketArn</a></code> | <code>str</code> | AWS Bucket arn. |
-| <code><a href="#@winglang/sdk.aws.IAwsReactApp.property.bucketName">bucketName</a></code> | <code>str</code> | AWS Bucket name. |
-
----
-
-##### `bucketArn`<sup>Required</sup> <a name="bucketArn" id="@winglang/sdk.aws.IAwsReactApp.property.bucketArn"></a>
-
-```wing
-bucketArn: str;
-```
-
-- *Type:* str
-
-AWS Bucket arn.
-
----
-
-##### `bucketName`<sup>Required</sup> <a name="bucketName" id="@winglang/sdk.aws.IAwsReactApp.property.bucketName"></a>
-
-```wing
-bucketName: str;
-```
-
-- *Type:* str
-
-AWS Bucket name.
-
----
-
 ### IAwsTable <a name="IAwsTable" id="@winglang/sdk.aws.IAwsTable"></a>
 
 - *Implemented By:* <a href="#@winglang/sdk.aws.IAwsTable">IAwsTable</a>
@@ -1312,6 +2014,128 @@ AWS Bucket name.
 
 ---
 
+### ILambdaContext <a name="ILambdaContext" id="@winglang/sdk.aws.ILambdaContext"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.aws.ILambdaContext">ILambdaContext</a>
+
+The AWS Lambda context object.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.remainingTimeInMillis">remainingTimeInMillis</a></code> | Returns the number of milliseconds left before the execution times out. |
+
+---
+
+##### `remainingTimeInMillis` <a name="remainingTimeInMillis" id="@winglang/sdk.aws.ILambdaContext.remainingTimeInMillis"></a>
+
+```wing
+remainingTimeInMillis(): num
+```
+
+Returns the number of milliseconds left before the execution times out.
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.property.awsRequestId">awsRequestId</a></code> | <code>str</code> | The identifier of the invocation request. |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.property.functionName">functionName</a></code> | <code>str</code> | The name of the Lambda function. |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.property.functionVersion">functionVersion</a></code> | <code>str</code> | The version of the function. |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.property.invokedFunctionArn">invokedFunctionArn</a></code> | <code>str</code> | The Amazon Resource Name (ARN) that's used to invoke the function. |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.property.logGroupName">logGroupName</a></code> | <code>str</code> | The log group for the function. |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.property.logStreamName">logStreamName</a></code> | <code>str</code> | The log stream for the function instance. |
+| <code><a href="#@winglang/sdk.aws.ILambdaContext.property.memoryLimitInMB">memoryLimitInMB</a></code> | <code>str</code> | The amount of memory that's allocated for the function. |
+
+---
+
+##### `awsRequestId`<sup>Required</sup> <a name="awsRequestId" id="@winglang/sdk.aws.ILambdaContext.property.awsRequestId"></a>
+
+```wing
+awsRequestId: str;
+```
+
+- *Type:* str
+
+The identifier of the invocation request.
+
+---
+
+##### `functionName`<sup>Required</sup> <a name="functionName" id="@winglang/sdk.aws.ILambdaContext.property.functionName"></a>
+
+```wing
+functionName: str;
+```
+
+- *Type:* str
+
+The name of the Lambda function.
+
+---
+
+##### `functionVersion`<sup>Required</sup> <a name="functionVersion" id="@winglang/sdk.aws.ILambdaContext.property.functionVersion"></a>
+
+```wing
+functionVersion: str;
+```
+
+- *Type:* str
+
+The version of the function.
+
+---
+
+##### `invokedFunctionArn`<sup>Required</sup> <a name="invokedFunctionArn" id="@winglang/sdk.aws.ILambdaContext.property.invokedFunctionArn"></a>
+
+```wing
+invokedFunctionArn: str;
+```
+
+- *Type:* str
+
+The Amazon Resource Name (ARN) that's used to invoke the function.
+
+Indicates if the invoker specified a version number or alias.
+
+---
+
+##### `logGroupName`<sup>Required</sup> <a name="logGroupName" id="@winglang/sdk.aws.ILambdaContext.property.logGroupName"></a>
+
+```wing
+logGroupName: str;
+```
+
+- *Type:* str
+
+The log group for the function.
+
+---
+
+##### `logStreamName`<sup>Required</sup> <a name="logStreamName" id="@winglang/sdk.aws.ILambdaContext.property.logStreamName"></a>
+
+```wing
+logStreamName: str;
+```
+
+- *Type:* str
+
+The log stream for the function instance.
+
+---
+
+##### `memoryLimitInMB`<sup>Required</sup> <a name="memoryLimitInMB" id="@winglang/sdk.aws.ILambdaContext.property.memoryLimitInMB"></a>
+
+```wing
+memoryLimitInMB: str;
+```
+
+- *Type:* str
+
+The amount of memory that's allocated for the function.
+
+---
+
 ## Enums <a name="Enums" id="Enums"></a>
 
 ### Effect <a name="Effect" id="@winglang/sdk.aws.Effect"></a>
diff --git a/docs/docs/04-standard-library/01-cloud/_category_.yml b/docs/docs/04-standard-library/cloud/_category_.yml
similarity index 100%
rename from docs/docs/04-standard-library/01-cloud/_category_.yml
rename to docs/docs/04-standard-library/cloud/_category_.yml
diff --git a/docs/docs/04-standard-library/cloud/api.md b/docs/docs/04-standard-library/cloud/api.md
new file mode 100644
index 00000000000..5127273d45e
--- /dev/null
+++ b/docs/docs/04-standard-library/cloud/api.md
@@ -0,0 +1,1887 @@
+---
+title: Api
+id: api
+description: A built-in resource for creating HTTP endpoints in the cloud.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    APIs,
+    Endpoints,
+    HTTP endpoint,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Api` resource represents a collection of HTTP endpoints that can be invoked by clients over the internet.
+APIs often serve as the front door for applications to access data, business logic, or functionality from your backend services.
+
+The `Api` resource models an endpoint as a collection of routes, each mapped to an event handler function.
+A route is a combination of a path, like `"/users/:userid"` and a set of HTTP methods, like `GET`, `POST`, or `DELETE`.
+When a client invokes a route, the corresponding event handler function executes.
+
+## Usage
+
+### REST API
+
+The following example shows a complete REST API implementation using `cloud.Api`, `ex.Table` & `cloud.Counter`
+
+```ts playground example
+bring cloud;
+bring ex;
+
+let api = new cloud.Api();
+// Used for generating unique id
+let counter = new cloud.Counter();
+// our employee database
+let db = new ex.Table(
+  name: "employees",
+  primaryKey: "id",
+  columns: {
+    "name" => ex.ColumnType.STRING
+  }
+);
+
+api.get("/employees", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  let result = MutJson [];
+  let var i = 0;
+  for employee in db.list() {
+    result.setAt(i, employee);
+    i = i + 1;
+  }
+  return cloud.ApiResponse {
+    status: 200,
+    body: Json.stringify(result)
+  };
+});
+
+
+api.get("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  let employee = db.get(request.vars.get("id"));
+  return cloud.ApiResponse {
+    status: 200,
+    body: Json.stringify(employee)
+  };
+});
+
+api.post("/employees", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+   if let body = request.body {
+    let employeeData = Json.parse(body);
+    let id = "{counter.inc()}";
+    db.insert(id, employeeData);
+    return cloud.ApiResponse {
+      status: 201,
+      body: id
+    };
+   }
+});
+
+api.put("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  if let body = request.body {
+    let employeeData = Json.parse(body);
+    let id = request.vars.get("id");
+    db.update(id, employeeData);
+    return cloud.ApiResponse {
+      status: 200,
+      body: Json.stringify(employeeData)
+    };
+  }
+});
+
+api.delete("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  let id = request.vars.get("id");
+  db.delete(id);
+  return cloud.ApiResponse {
+    status: 204
+  };
+});
+```
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+The sim implementation of `cloud.Api` uses [nodejs express](https://expressjs.com/).
+
+### AWS (`tf-aws` and `awscdk`)
+
+The AWS implementation of `cloud.Api` uses [Amazon API Gateway](https://aws.amazon.com/api-gateway/).
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet (tracking issue: [#625](https://github.com/winglang/wing/issues/625))
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet (tracking issue: [#624](https://github.com/winglang/wing/issues/624))
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Api <a name="Api" id="@winglang/sdk.cloud.Api"></a>
+
+Functionality shared between all `Api` implementations.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Api.Initializer"></a>
+
+```wing
+bring cloud;
+
+new cloud.Api(props?: ApiProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Api.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.ApiProps">ApiProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiProps">ApiProps</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Api.connect">connect</a></code> | Add a inflight handler to the api for CONNECT requests on the given path. |
+| <code><a href="#@winglang/sdk.cloud.Api.delete">delete</a></code> | Add a inflight handler to the api for DELETE requests on the given path. |
+| <code><a href="#@winglang/sdk.cloud.Api.get">get</a></code> | Add a inflight handler to the api for GET requests on the given path. |
+| <code><a href="#@winglang/sdk.cloud.Api.head">head</a></code> | Add a inflight handler to the api for HEAD requests on the given path. |
+| <code><a href="#@winglang/sdk.cloud.Api.options">options</a></code> | Add a inflight handler to the api for OPTIONS requests on the given path. |
+| <code><a href="#@winglang/sdk.cloud.Api.patch">patch</a></code> | Add a inflight handler to the api for PATCH requests on the given path. |
+| <code><a href="#@winglang/sdk.cloud.Api.post">post</a></code> | Add a inflight handler to the api for POST requests on the given path. |
+| <code><a href="#@winglang/sdk.cloud.Api.put">put</a></code> | Add a inflight handler to the api for PUT requests on the given path. |
+
+---
+
+##### `connect` <a name="connect" id="@winglang/sdk.cloud.Api.connect"></a>
+
+```wing
+connect(path: str, inflight: IApiEndpointHandler, props?: ApiConnectOptions): void
+```
+
+Add a inflight handler to the api for CONNECT requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.connect.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle CONNECT requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.connect.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.connect.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiConnectOptions">ApiConnectOptions</a>
+
+Options for the route.
+
+---
+
+##### `delete` <a name="delete" id="@winglang/sdk.cloud.Api.delete"></a>
+
+```wing
+delete(path: str, inflight: IApiEndpointHandler, props?: ApiDeleteOptions): void
+```
+
+Add a inflight handler to the api for DELETE requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.delete.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle DELETE requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.delete.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.delete.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiDeleteOptions">ApiDeleteOptions</a>
+
+Options for the route.
+
+---
+
+##### `get` <a name="get" id="@winglang/sdk.cloud.Api.get"></a>
+
+```wing
+get(path: str, inflight: IApiEndpointHandler, props?: ApiGetOptions): void
+```
+
+Add a inflight handler to the api for GET requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.get.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle GET requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.get.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.get.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiGetOptions">ApiGetOptions</a>
+
+Options for the route.
+
+---
+
+##### `head` <a name="head" id="@winglang/sdk.cloud.Api.head"></a>
+
+```wing
+head(path: str, inflight: IApiEndpointHandler, props?: ApiHeadOptions): void
+```
+
+Add a inflight handler to the api for HEAD requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.head.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle HEAD requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.head.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.head.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiHeadOptions">ApiHeadOptions</a>
+
+Options for the route.
+
+---
+
+##### `options` <a name="options" id="@winglang/sdk.cloud.Api.options"></a>
+
+```wing
+options(path: str, inflight: IApiEndpointHandler, props?: ApiOptionsOptions): void
+```
+
+Add a inflight handler to the api for OPTIONS requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.options.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle OPTIONS requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.options.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.options.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiOptionsOptions">ApiOptionsOptions</a>
+
+Options for the route.
+
+---
+
+##### `patch` <a name="patch" id="@winglang/sdk.cloud.Api.patch"></a>
+
+```wing
+patch(path: str, inflight: IApiEndpointHandler, props?: ApiPatchOptions): void
+```
+
+Add a inflight handler to the api for PATCH requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.patch.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle PATCH requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.patch.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.patch.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiPatchOptions">ApiPatchOptions</a>
+
+Options for the route.
+
+---
+
+##### `post` <a name="post" id="@winglang/sdk.cloud.Api.post"></a>
+
+```wing
+post(path: str, inflight: IApiEndpointHandler, props?: ApiPostOptions): void
+```
+
+Add a inflight handler to the api for POST requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.post.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle POST requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.post.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.post.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiPostOptions">ApiPostOptions</a>
+
+Options for the route.
+
+---
+
+##### `put` <a name="put" id="@winglang/sdk.cloud.Api.put"></a>
+
+```wing
+put(path: str, inflight: IApiEndpointHandler, props?: ApiPutOptions): void
+```
+
+Add a inflight handler to the api for PUT requests on the given path.
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.put.parameter.path"></a>
+
+- *Type:* str
+
+The path to handle PUT requests for.
+
+---
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Api.put.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+The function to handle the request.
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Api.put.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiPutOptions">ApiPutOptions</a>
+
+Options for the route.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Api.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Api.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+| <code><a href="#@winglang/sdk.cloud.Api.renderCorsHeaders">renderCorsHeaders</a></code> | Generates an object containing default CORS response headers and OPTIONS response headers. |
+| <code><a href="#@winglang/sdk.cloud.Api.renderOpenApiPath">renderOpenApiPath</a></code> | Converts input path to a valid OpenAPI path (replaces `:` based path params with `{}`). |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Api.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Api.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Api.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Api.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Api.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Api.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Api.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+##### `renderCorsHeaders` <a name="renderCorsHeaders" id="@winglang/sdk.cloud.Api.renderCorsHeaders"></a>
+
+```wing
+bring cloud;
+
+cloud.Api.renderCorsHeaders(corsOptions?: ApiCorsOptions);
+```
+
+Generates an object containing default CORS response headers and OPTIONS response headers.
+
+###### `corsOptions`<sup>Optional</sup> <a name="corsOptions" id="@winglang/sdk.cloud.Api.renderCorsHeaders.parameter.corsOptions"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiCorsOptions">ApiCorsOptions</a>
+
+The CORS options to generate the headers from.
+
+---
+
+##### `renderOpenApiPath` <a name="renderOpenApiPath" id="@winglang/sdk.cloud.Api.renderOpenApiPath"></a>
+
+```wing
+bring cloud;
+
+cloud.Api.renderOpenApiPath(path: str);
+```
+
+Converts input path to a valid OpenAPI path (replaces `:` based path params with `{}`).
+
+###### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.Api.renderOpenApiPath.parameter.path"></a>
+
+- *Type:* str
+
+The path to convert (assumes path is valid).
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Api.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.cloud.Api.property.url">url</a></code> | <code>str</code> | The base URL of the API endpoint. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Api.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.cloud.Api.property.url"></a>
+
+```wing
+url: str;
+```
+
+- *Type:* str
+
+The base URL of the API endpoint.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### ApiConnectOptions <a name="ApiConnectOptions" id="@winglang/sdk.cloud.ApiConnectOptions"></a>
+
+Options for Api patch endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiConnectOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiConnectOptions = cloud.ApiConnectOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiConnectOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiConnectOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiConnectOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiConnectOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiConnectOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiConnectOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiConnectOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiConnectOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiConnectOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiConnectOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiCorsOptions <a name="ApiCorsOptions" id="@winglang/sdk.cloud.ApiCorsOptions"></a>
+
+Cors Options for `Api`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiCorsOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiCorsOptions = cloud.ApiCorsOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowCredentials">allowCredentials</a></code> | <code>bool</code> | Whether to allow credentials. |
+| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowHeaders">allowHeaders</a></code> | <code>MutArray&lt;str&gt;</code> | The list of allowed headers. |
+| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowMethods">allowMethods</a></code> | <code>MutArray&lt;<a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a>&gt;</code> | The list of allowed methods. |
+| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.allowOrigin">allowOrigin</a></code> | <code>str</code> | The allowed origin. |
+| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.exposeHeaders">exposeHeaders</a></code> | <code>MutArray&lt;str&gt;</code> | The list of exposed headers. |
+| <code><a href="#@winglang/sdk.cloud.ApiCorsOptions.property.maxAge">maxAge</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long the browser should cache preflight request results. |
+
+---
+
+##### `allowCredentials`<sup>Optional</sup> <a name="allowCredentials" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowCredentials"></a>
+
+```wing
+allowCredentials: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Whether to allow credentials.
+
+---
+
+##### `allowHeaders`<sup>Optional</sup> <a name="allowHeaders" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowHeaders"></a>
+
+```wing
+allowHeaders: MutArray<str>;
+```
+
+- *Type:* MutArray&lt;str&gt;
+- *Default:* ["Content-Type", "Authorization"]
+
+The list of allowed headers.
+
+---
+
+*Example*
+
+```wing
+["Content-Type"]
+```
+
+
+##### `allowMethods`<sup>Optional</sup> <a name="allowMethods" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowMethods"></a>
+
+```wing
+allowMethods: MutArray<HttpMethod>;
+```
+
+- *Type:* MutArray&lt;<a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a>&gt;
+- *Default:* [HttpMethod.GET, HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH, HttpMethod.DELETE, HttpMethod.HEAD, HttpMethod.OPTIONS]
+
+The list of allowed methods.
+
+---
+
+*Example*
+
+```wing
+[HttpMethod.GET, HttpMethod.POST]
+```
+
+
+##### `allowOrigin`<sup>Optional</sup> <a name="allowOrigin" id="@winglang/sdk.cloud.ApiCorsOptions.property.allowOrigin"></a>
+
+```wing
+allowOrigin: str;
+```
+
+- *Type:* str
+- *Default:* "*"
+
+The allowed origin.
+
+---
+
+*Example*
+
+```wing
+"https://example.com"
+```
+
+
+##### `exposeHeaders`<sup>Optional</sup> <a name="exposeHeaders" id="@winglang/sdk.cloud.ApiCorsOptions.property.exposeHeaders"></a>
+
+```wing
+exposeHeaders: MutArray<str>;
+```
+
+- *Type:* MutArray&lt;str&gt;
+- *Default:* []
+
+The list of exposed headers.
+
+---
+
+*Example*
+
+```wing
+["Content-Type"]
+```
+
+
+##### `maxAge`<sup>Optional</sup> <a name="maxAge" id="@winglang/sdk.cloud.ApiCorsOptions.property.maxAge"></a>
+
+```wing
+maxAge: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 300 seconds
+
+How long the browser should cache preflight request results.
+
+---
+
+### ApiDeleteOptions <a name="ApiDeleteOptions" id="@winglang/sdk.cloud.ApiDeleteOptions"></a>
+
+Options for Api put endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiDeleteOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiDeleteOptions = cloud.ApiDeleteOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiDeleteOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiDeleteOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiDeleteOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiDeleteOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiDeleteOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiDeleteOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiDeleteOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiDeleteOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiDeleteOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiDeleteOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiEndpointOptions <a name="ApiEndpointOptions" id="@winglang/sdk.cloud.ApiEndpointOptions"></a>
+
+Base options for Api endpoints.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiEndpointOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiEndpointOptions = cloud.ApiEndpointOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiEndpointOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiEndpointOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiEndpointOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiEndpointOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiEndpointOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiEndpointOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiEndpointOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiEndpointOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiEndpointOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiEndpointOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiGetOptions <a name="ApiGetOptions" id="@winglang/sdk.cloud.ApiGetOptions"></a>
+
+Options for Api get endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiGetOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiGetOptions = cloud.ApiGetOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiGetOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiGetOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiGetOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiGetOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiGetOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiGetOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiGetOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiGetOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiGetOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiGetOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiHeadOptions <a name="ApiHeadOptions" id="@winglang/sdk.cloud.ApiHeadOptions"></a>
+
+Options for Api patch endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiHeadOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiHeadOptions = cloud.ApiHeadOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiHeadOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiHeadOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiHeadOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiHeadOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiHeadOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiHeadOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiHeadOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiHeadOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiHeadOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiHeadOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiOptionsOptions <a name="ApiOptionsOptions" id="@winglang/sdk.cloud.ApiOptionsOptions"></a>
+
+Options for Api patch endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiOptionsOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiOptionsOptions = cloud.ApiOptionsOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiOptionsOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiOptionsOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiOptionsOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiOptionsOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiOptionsOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiOptionsOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiOptionsOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiOptionsOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiOptionsOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiOptionsOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiPatchOptions <a name="ApiPatchOptions" id="@winglang/sdk.cloud.ApiPatchOptions"></a>
+
+Options for Api patch endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiPatchOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiPatchOptions = cloud.ApiPatchOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiPatchOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiPatchOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiPatchOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiPatchOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiPatchOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiPatchOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiPatchOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiPatchOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiPatchOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiPatchOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiPostOptions <a name="ApiPostOptions" id="@winglang/sdk.cloud.ApiPostOptions"></a>
+
+Options for Api post endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiPostOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiPostOptions = cloud.ApiPostOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiPostOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiPostOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiPostOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiPostOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiPostOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiPostOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiPostOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiPostOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiPostOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiPostOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiProps <a name="ApiProps" id="@winglang/sdk.cloud.ApiProps"></a>
+
+Options for `Api`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiProps = cloud.ApiProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiProps.property.cors">cors</a></code> | <code>bool</code> | Options for configuring the API's CORS behavior across all routes. |
+| <code><a href="#@winglang/sdk.cloud.ApiProps.property.corsOptions">corsOptions</a></code> | <code><a href="#@winglang/sdk.cloud.ApiCorsOptions">ApiCorsOptions</a></code> | Options for configuring the API's CORS behavior across all routes. |
+
+---
+
+##### `cors`<sup>Optional</sup> <a name="cors" id="@winglang/sdk.cloud.ApiProps.property.cors"></a>
+
+```wing
+cors: bool;
+```
+
+- *Type:* bool
+- *Default:* false, CORS configuration is disabled
+
+Options for configuring the API's CORS behavior across all routes.
+
+Options can also be overridden on a per-route basis. (not yet implemented)
+When enabled this will add CORS headers with default options.
+Can be customized by passing `corsOptions`
+
+---
+
+*Example*
+
+```wing
+true
+```
+
+
+##### `corsOptions`<sup>Optional</sup> <a name="corsOptions" id="@winglang/sdk.cloud.ApiProps.property.corsOptions"></a>
+
+```wing
+corsOptions: ApiCorsOptions;
+```
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiCorsOptions">ApiCorsOptions</a>
+- *Default:* Default CORS options are applied when `cors` is set to `true` allowOrigin: "*", allowMethods: [ HttpMethod.GET, HttpMethod.POST, HttpMethod.PUT, HttpMethod.DELETE, HttpMethod.HEAD, HttpMethod.OPTIONS, ], allowHeaders: ["Content-Type", "Authorization"], exposeHeaders: [], allowCredentials: false,
+
+Options for configuring the API's CORS behavior across all routes.
+
+Options can also be overridden on a per-route basis. (not yet implemented)
+
+---
+
+*Example*
+
+```wing
+{ allowOrigin: "https://example.com" }
+```
+
+
+### ApiPutOptions <a name="ApiPutOptions" id="@winglang/sdk.cloud.ApiPutOptions"></a>
+
+Options for Api put endpoint.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiPutOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiPutOptions = cloud.ApiPutOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiPutOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.ApiPutOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.ApiPutOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.ApiPutOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.ApiPutOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ApiPutOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ApiPutOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.ApiPutOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.ApiPutOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.ApiPutOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### ApiRequest <a name="ApiRequest" id="@winglang/sdk.cloud.ApiRequest"></a>
+
+Shape of a request to an inflight handler.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiRequest.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiRequest = cloud.ApiRequest{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.method">method</a></code> | <code><a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a></code> | The request's HTTP method. |
+| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.path">path</a></code> | <code>str</code> | The request's path. |
+| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.query">query</a></code> | <code>MutMap&lt;str&gt;</code> | The request's query string values. |
+| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.vars">vars</a></code> | <code>MutMap&lt;str&gt;</code> | The path variables. |
+| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.body">body</a></code> | <code>str</code> | The request's body. |
+| <code><a href="#@winglang/sdk.cloud.ApiRequest.property.headers">headers</a></code> | <code>MutMap&lt;str&gt;</code> | The request's headers. |
+
+---
+
+##### `method`<sup>Required</sup> <a name="method" id="@winglang/sdk.cloud.ApiRequest.property.method"></a>
+
+```wing
+method: HttpMethod;
+```
+
+- *Type:* <a href="#@winglang/sdk.cloud.HttpMethod">HttpMethod</a>
+
+The request's HTTP method.
+
+---
+
+##### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.cloud.ApiRequest.property.path"></a>
+
+```wing
+path: str;
+```
+
+- *Type:* str
+
+The request's path.
+
+---
+
+##### `query`<sup>Required</sup> <a name="query" id="@winglang/sdk.cloud.ApiRequest.property.query"></a>
+
+```wing
+query: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+
+The request's query string values.
+
+---
+
+##### `vars`<sup>Required</sup> <a name="vars" id="@winglang/sdk.cloud.ApiRequest.property.vars"></a>
+
+```wing
+vars: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+
+The path variables.
+
+---
+
+##### `body`<sup>Optional</sup> <a name="body" id="@winglang/sdk.cloud.ApiRequest.property.body"></a>
+
+```wing
+body: str;
+```
+
+- *Type:* str
+
+The request's body.
+
+---
+
+##### `headers`<sup>Optional</sup> <a name="headers" id="@winglang/sdk.cloud.ApiRequest.property.headers"></a>
+
+```wing
+headers: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+
+The request's headers.
+
+---
+
+### ApiResponse <a name="ApiResponse" id="@winglang/sdk.cloud.ApiResponse"></a>
+
+Shape of a response from a inflight handler.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.ApiResponse.Initializer"></a>
+
+```wing
+bring cloud;
+
+let ApiResponse = cloud.ApiResponse{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ApiResponse.property.body">body</a></code> | <code>str</code> | The response's body. |
+| <code><a href="#@winglang/sdk.cloud.ApiResponse.property.headers">headers</a></code> | <code>MutMap&lt;str&gt;</code> | The response's headers. |
+| <code><a href="#@winglang/sdk.cloud.ApiResponse.property.status">status</a></code> | <code>num</code> | The response's status code. |
+
+---
+
+##### `body`<sup>Optional</sup> <a name="body" id="@winglang/sdk.cloud.ApiResponse.property.body"></a>
+
+```wing
+body: str;
+```
+
+- *Type:* str
+- *Default:* no body
+
+The response's body.
+
+---
+
+##### `headers`<sup>Optional</sup> <a name="headers" id="@winglang/sdk.cloud.ApiResponse.property.headers"></a>
+
+```wing
+headers: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* {}
+
+The response's headers.
+
+---
+
+##### `status`<sup>Optional</sup> <a name="status" id="@winglang/sdk.cloud.ApiResponse.property.status"></a>
+
+```wing
+status: num;
+```
+
+- *Type:* num
+- *Default:* 200
+
+The response's status code.
+
+---
+
+### CorsHeaders <a name="CorsHeaders" id="@winglang/sdk.cloud.CorsHeaders"></a>
+
+Type definition for CORS headers which includes default and options headers.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.CorsHeaders.Initializer"></a>
+
+```wing
+bring cloud;
+
+let CorsHeaders = cloud.CorsHeaders{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.CorsHeaders.property.defaultResponse">defaultResponse</a></code> | <code>MutMap&lt;str&gt;</code> | Default CORS response headers. |
+| <code><a href="#@winglang/sdk.cloud.CorsHeaders.property.optionsResponse">optionsResponse</a></code> | <code>MutMap&lt;str&gt;</code> | CORS options response headers. |
+
+---
+
+##### `defaultResponse`<sup>Required</sup> <a name="defaultResponse" id="@winglang/sdk.cloud.CorsHeaders.property.defaultResponse"></a>
+
+```wing
+defaultResponse: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+
+Default CORS response headers.
+
+---
+
+##### `optionsResponse`<sup>Required</sup> <a name="optionsResponse" id="@winglang/sdk.cloud.CorsHeaders.property.optionsResponse"></a>
+
+```wing
+optionsResponse: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+
+CORS options response headers.
+
+---
+
+## Protocols <a name="Protocols" id="Protocols"></a>
+
+### IApiEndpointHandler <a name="IApiEndpointHandler" id="@winglang/sdk.cloud.IApiEndpointHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.IApiEndpointHandler">IApiEndpointHandler</a>
+
+**Inflight client:** [@winglang/sdk.cloud.IApiEndpointHandlerClient](#@winglang/sdk.cloud.IApiEndpointHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to one of the `Api` request preflight methods.
+
+
+
+### IApiEndpointHandlerClient <a name="IApiEndpointHandlerClient" id="@winglang/sdk.cloud.IApiEndpointHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.IApiEndpointHandlerClient">IApiEndpointHandlerClient</a>
+
+Inflight client for `IApiEndpointHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.IApiEndpointHandlerClient.handle">handle</a></code> | Inflight that will be called when a request is made to the endpoint. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.cloud.IApiEndpointHandlerClient.handle"></a>
+
+```wing
+inflight handle(request: ApiRequest): ApiResponse?
+```
+
+Inflight that will be called when a request is made to the endpoint.
+
+###### `request`<sup>Required</sup> <a name="request" id="@winglang/sdk.cloud.IApiEndpointHandlerClient.handle.parameter.request"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ApiRequest">ApiRequest</a>
+
+---
+
+
+## Enums <a name="Enums" id="Enums"></a>
+
+### HttpMethod <a name="HttpMethod" id="@winglang/sdk.cloud.HttpMethod"></a>
+
+Allowed HTTP methods for a endpoint.
+
+#### Members <a name="Members" id="Members"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.GET">GET</a></code> | Get. |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.HEAD">HEAD</a></code> | Head. |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.POST">POST</a></code> | Post. |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.PUT">PUT</a></code> | Put. |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.DELETE">DELETE</a></code> | Delete. |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.CONNECT">CONNECT</a></code> | Connect. |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.OPTIONS">OPTIONS</a></code> | Options. |
+| <code><a href="#@winglang/sdk.cloud.HttpMethod.PATCH">PATCH</a></code> | Patch. |
+
+---
+
+##### `GET` <a name="GET" id="@winglang/sdk.cloud.HttpMethod.GET"></a>
+
+Get.
+
+---
+
+
+##### `HEAD` <a name="HEAD" id="@winglang/sdk.cloud.HttpMethod.HEAD"></a>
+
+Head.
+
+---
+
+
+##### `POST` <a name="POST" id="@winglang/sdk.cloud.HttpMethod.POST"></a>
+
+Post.
+
+---
+
+
+##### `PUT` <a name="PUT" id="@winglang/sdk.cloud.HttpMethod.PUT"></a>
+
+Put.
+
+---
+
+
+##### `DELETE` <a name="DELETE" id="@winglang/sdk.cloud.HttpMethod.DELETE"></a>
+
+Delete.
+
+---
+
+
+##### `CONNECT` <a name="CONNECT" id="@winglang/sdk.cloud.HttpMethod.CONNECT"></a>
+
+Connect.
+
+---
+
+
+##### `OPTIONS` <a name="OPTIONS" id="@winglang/sdk.cloud.HttpMethod.OPTIONS"></a>
+
+Options.
+
+---
+
+
+##### `PATCH` <a name="PATCH" id="@winglang/sdk.cloud.HttpMethod.PATCH"></a>
+
+Patch.
+
+---
+
diff --git a/docs/docs/04-standard-library/01-cloud/bucket.md b/docs/docs/04-standard-library/cloud/bucket.md
similarity index 77%
rename from docs/docs/04-standard-library/01-cloud/bucket.md
rename to docs/docs/04-standard-library/cloud/bucket.md
index ec0a1fa8449..8844346e31e 100644
--- a/docs/docs/04-standard-library/01-cloud/bucket.md
+++ b/docs/docs/04-standard-library/cloud/bucket.md
@@ -26,7 +26,7 @@ Unlike other kinds of storage like file storage, data is not stored in a hierarc
 
 ### Defining a bucket
 
-```js
+```js example
 bring cloud;
 
 let bucket = new cloud.Bucket(
@@ -38,7 +38,7 @@ let bucket = new cloud.Bucket(
 
 If you have static data that you want to upload to the bucket each time your app is deployed, you can call the preflight method `addObject`:
 
-```js
+```js example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -48,7 +48,7 @@ bucket.addObject("my-file.txt", "Hello, world!");
 
 ### Using a bucket inflight
 
-```js playground
+```js playground example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -80,7 +80,7 @@ Use the `onEvent` method for responding to any event.
 
 Each method creates a new `cloud.Function` resource which will be triggered by the given event type.
 
-```js playground
+```js playground example
 bring cloud;
 
 let store = new cloud.Bucket();
@@ -171,9 +171,10 @@ new cloud.Bucket(props?: BucketProps);
 | <code><a href="#@winglang/sdk.cloud.IBucketClient.publicUrl">publicUrl</a></code> | Returns a url to the given file. |
 | <code><a href="#@winglang/sdk.cloud.IBucketClient.put">put</a></code> | Put an object in the bucket. |
 | <code><a href="#@winglang/sdk.cloud.IBucketClient.putJson">putJson</a></code> | Put a Json object in the bucket. |
+| <code><a href="#@winglang/sdk.cloud.IBucketClient.rename">rename</a></code> | Move an object to a new location in the bucket. |
 | <code><a href="#@winglang/sdk.cloud.IBucketClient.signedUrl">signedUrl</a></code> | Returns a signed url to the given file. |
 | <code><a href="#@winglang/sdk.cloud.IBucketClient.tryDelete">tryDelete</a></code> | Delete an object from the bucket if it exists. |
-| <code><a href="#@winglang/sdk.cloud.IBucketClient.tryGet">tryGet</a></code> | Get an object from the bucket if it exists. |
+| <code><a href="#@winglang/sdk.cloud.IBucketClient.tryGet">tryGet</a></code> | Get an object from the bucket if it exists If the bytes returned are not a valid UTF-8 string, an error is thrown. |
 | <code><a href="#@winglang/sdk.cloud.IBucketClient.tryGetJson">tryGetJson</a></code> | Gets an object from the bucket if it exists, parsing it as Json. |
 
 ---
@@ -324,7 +325,7 @@ inflight copy(srcKey: str, dstKey: str): void
 Copy an object to a new location in the bucket.
 
 If the destination object
-already exists, it will be overwritten. Returns once the copying is finished.
+already exists, it will be overwritten.
 
 ###### `srcKey`<sup>Required</sup> <a name="srcKey" id="@winglang/sdk.cloud.IBucketClient.copy.parameter.srcKey"></a>
 
@@ -385,11 +386,13 @@ Key of the object.
 ##### `get` <a name="get" id="@winglang/sdk.cloud.IBucketClient.get"></a>
 
 ```wing
-inflight get(key: str): str
+inflight get(key: str, options?: BucketGetOptions): str
 ```
 
 Retrieve an object from the bucket.
 
+If the bytes returned are not a valid UTF-8 string, an error is thrown.
+
 ###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.cloud.IBucketClient.get.parameter.key"></a>
 
 - *Type:* str
@@ -398,6 +401,14 @@ Key of the object.
 
 ---
 
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.IBucketClient.get.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.BucketGetOptions">BucketGetOptions</a>
+
+Additional get options.
+
+---
+
 ##### `getJson` <a name="getJson" id="@winglang/sdk.cloud.IBucketClient.getJson"></a>
 
 ```wing
@@ -516,6 +527,33 @@ Json object that we want to store into the bucket.
 
 ---
 
+##### `rename` <a name="rename" id="@winglang/sdk.cloud.IBucketClient.rename"></a>
+
+```wing
+inflight rename(srcKey: str, dstKey: str): void
+```
+
+Move an object to a new location in the bucket.
+
+If the destination object
+already exists, it will be overwritten. Returns once the renaming is finished.
+
+###### `srcKey`<sup>Required</sup> <a name="srcKey" id="@winglang/sdk.cloud.IBucketClient.rename.parameter.srcKey"></a>
+
+- *Type:* str
+
+The key of the source object you wish to rename.
+
+---
+
+###### `dstKey`<sup>Required</sup> <a name="dstKey" id="@winglang/sdk.cloud.IBucketClient.rename.parameter.dstKey"></a>
+
+- *Type:* str
+
+The key of the destination object after renaming.
+
+---
+
 ##### `signedUrl` <a name="signedUrl" id="@winglang/sdk.cloud.IBucketClient.signedUrl"></a>
 
 ```wing
@@ -559,10 +597,10 @@ Key of the object.
 ##### `tryGet` <a name="tryGet" id="@winglang/sdk.cloud.IBucketClient.tryGet"></a>
 
 ```wing
-inflight tryGet(key: str): str
+inflight tryGet(key: str, options?: BucketTryGetOptions): str?
 ```
 
-Get an object from the bucket if it exists.
+Get an object from the bucket if it exists If the bytes returned are not a valid UTF-8 string, an error is thrown.
 
 ###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.cloud.IBucketClient.tryGet.parameter.key"></a>
 
@@ -572,10 +610,18 @@ Key of the object.
 
 ---
 
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.IBucketClient.tryGet.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.BucketTryGetOptions">BucketTryGetOptions</a>
+
+Additional get options.
+
+---
+
 ##### `tryGetJson` <a name="tryGetJson" id="@winglang/sdk.cloud.IBucketClient.tryGetJson"></a>
 
 ```wing
-inflight tryGetJson(key: str): Json
+inflight tryGetJson(key: str): Json?
 ```
 
 Gets an object from the bucket if it exists, parsing it as Json.
@@ -588,6 +634,60 @@ Key of the object.
 
 ---
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Bucket.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Bucket.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Bucket.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Bucket.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Bucket.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Bucket.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Bucket.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Bucket.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Bucket.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
@@ -691,6 +791,53 @@ Type of event.
 
 ---
 
+### BucketGetOptions <a name="BucketGetOptions" id="@winglang/sdk.cloud.BucketGetOptions"></a>
+
+Options for `Bucket.get()`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.BucketGetOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let BucketGetOptions = cloud.BucketGetOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.BucketGetOptions.property.endByte">endByte</a></code> | <code>num</code> | The ending byte to read up to (including). |
+| <code><a href="#@winglang/sdk.cloud.BucketGetOptions.property.startByte">startByte</a></code> | <code>num</code> | The starting byte to read from. |
+
+---
+
+##### `endByte`<sup>Optional</sup> <a name="endByte" id="@winglang/sdk.cloud.BucketGetOptions.property.endByte"></a>
+
+```wing
+endByte: num;
+```
+
+- *Type:* num
+- *Default:* undefined
+
+The ending byte to read up to (including).
+
+---
+
+##### `startByte`<sup>Optional</sup> <a name="startByte" id="@winglang/sdk.cloud.BucketGetOptions.property.startByte"></a>
+
+```wing
+startByte: num;
+```
+
+- *Type:* num
+- *Default:* undefined
+
+The starting byte to read from.
+
+---
+
 ### BucketOnCreateOptions <a name="BucketOnCreateOptions" id="@winglang/sdk.cloud.BucketOnCreateOptions"></a>
 
 `onCreate` event options.
@@ -827,7 +974,21 @@ let BucketSignedUrlOptions = cloud.BucketSignedUrlOptions{ ... };
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.cloud.BucketSignedUrlOptions.property.duration">duration</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The duration for the signed url to expire. |
+| <code><a href="#@winglang/sdk.cloud.BucketSignedUrlOptions.property.action">action</a></code> | <code><a href="#@winglang/sdk.cloud.BucketSignedUrlAction">BucketSignedUrlAction</a></code> | The action allowed by the signed URL. |
+| <code><a href="#@winglang/sdk.cloud.BucketSignedUrlOptions.property.duration">duration</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The duration for the signed URL to expire. |
+
+---
+
+##### `action`<sup>Optional</sup> <a name="action" id="@winglang/sdk.cloud.BucketSignedUrlOptions.property.action"></a>
+
+```wing
+action: BucketSignedUrlAction;
+```
+
+- *Type:* <a href="#@winglang/sdk.cloud.BucketSignedUrlAction">BucketSignedUrlAction</a>
+- *Default:* BucketSignedUrlAction.DOWNLOAD
+
+The action allowed by the signed URL.
 
 ---
 
@@ -838,8 +999,56 @@ duration: duration;
 ```
 
 - *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 15m
+
+The duration for the signed URL to expire.
+
+---
+
+### BucketTryGetOptions <a name="BucketTryGetOptions" id="@winglang/sdk.cloud.BucketTryGetOptions"></a>
+
+Options for `Bucket.tryGet()`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.BucketTryGetOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let BucketTryGetOptions = cloud.BucketTryGetOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
 
-The duration for the signed url to expire.
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.BucketTryGetOptions.property.endByte">endByte</a></code> | <code>num</code> | The ending byte to read up to (including). |
+| <code><a href="#@winglang/sdk.cloud.BucketTryGetOptions.property.startByte">startByte</a></code> | <code>num</code> | The starting byte to read from. |
+
+---
+
+##### `endByte`<sup>Optional</sup> <a name="endByte" id="@winglang/sdk.cloud.BucketTryGetOptions.property.endByte"></a>
+
+```wing
+endByte: num;
+```
+
+- *Type:* num
+- *Default:* undefined
+
+The ending byte to read up to (including).
+
+---
+
+##### `startByte`<sup>Optional</sup> <a name="startByte" id="@winglang/sdk.cloud.BucketTryGetOptions.property.startByte"></a>
+
+```wing
+startByte: num;
+```
+
+- *Type:* num
+- *Default:* undefined
+
+The starting byte to read from.
 
 ---
 
@@ -986,3 +1195,30 @@ Update.
 
 ---
 
+
+### BucketSignedUrlAction <a name="BucketSignedUrlAction" id="@winglang/sdk.cloud.BucketSignedUrlAction"></a>
+
+Specifies the action permitted by a presigned URL for a bucket.
+
+#### Members <a name="Members" id="Members"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.BucketSignedUrlAction.DOWNLOAD">DOWNLOAD</a></code> | Represents a HTTP GET request for a presigned URL, allowing read access for an object in the bucket. |
+| <code><a href="#@winglang/sdk.cloud.BucketSignedUrlAction.UPLOAD">UPLOAD</a></code> | Represents a HTTP PUT request for a presigned URL, allowing write access for an object in the bucket. |
+
+---
+
+##### `DOWNLOAD` <a name="DOWNLOAD" id="@winglang/sdk.cloud.BucketSignedUrlAction.DOWNLOAD"></a>
+
+Represents a HTTP GET request for a presigned URL, allowing read access for an object in the bucket.
+
+---
+
+
+##### `UPLOAD` <a name="UPLOAD" id="@winglang/sdk.cloud.BucketSignedUrlAction.UPLOAD"></a>
+
+Represents a HTTP PUT request for a presigned URL, allowing write access for an object in the bucket.
+
+---
+
diff --git a/docs/docs/04-standard-library/01-cloud/counter.md b/docs/docs/04-standard-library/cloud/counter.md
similarity index 78%
rename from docs/docs/04-standard-library/01-cloud/counter.md
rename to docs/docs/04-standard-library/cloud/counter.md
index 353e9447119..2d5aecf564f 100644
--- a/docs/docs/04-standard-library/01-cloud/counter.md
+++ b/docs/docs/04-standard-library/cloud/counter.md
@@ -20,7 +20,7 @@ The `cloud.Counter` resource represents a stateful container for one or more num
 
 ### Defining a counter
 
-```js
+```js example
 bring cloud;
 
 let counter = new cloud.Counter(
@@ -30,7 +30,7 @@ let counter = new cloud.Counter(
 
 ### Using a counter inflight
 
-```js playground
+```js playground example
 bring cloud;
 
 let counter = new cloud.Counter();
@@ -51,7 +51,7 @@ new cloud.Function(counterFunc);
 
 ### Using keys to manage multiple counter values
 
-```js playground
+```js playground example
 bring cloud;
 
 let counter = new cloud.Counter(initial: 100);
@@ -219,6 +219,60 @@ specify the key to be set.
 
 ---
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Counter.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Counter.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Counter.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Counter.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Counter.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Counter.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Counter.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Counter.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Counter.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
diff --git a/docs/docs/04-standard-library/cloud/domain.md b/docs/docs/04-standard-library/cloud/domain.md
new file mode 100644
index 00000000000..251073f5230
--- /dev/null
+++ b/docs/docs/04-standard-library/cloud/domain.md
@@ -0,0 +1,223 @@
+---
+title: Domain
+id: domain
+description: A built-in resource for representing a domain in the cloud.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    Domain,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Domain` resource represents a domain configuration in the cloud.
+
+## Usage
+
+### Defining a domain
+
+```js
+bring cloud;
+
+let domain = new cloud.Domain(
+  domainName: "www.example.com",
+);
+
+new cloud.Website(path: "./site", domain: domain);
+```
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+Under the hood, the simulator stores the domain value in memory.
+
+Note that domain data is not persisted between simulator runs.
+
+### AWS (`tf-aws` and `awscdk`)
+
+The AWS implementation of `cloud.Domain` requires certain platform-specific values such as the `hostedZoneId` and either `iamCertificate` or `acmCertificateArn` to be provided.
+
+To provide these values, there are two options. You can either pass the values in the command line or you can provide a TOML file with the configurations:
+
+```
+wing compile -t tf-aws main.w --value root/Default/Default/Domain/acmCertificateArn=arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee --value root/Default/Default/Domain/hostedZoneId=Z0111111111111111111F
+```
+
+Alternatively, create a `wing.toml` file in your project directory:
+
+```toml
+[root.Default.Default.Domain]
+hostedZoneId = "Z0XXXXXXXXXXXXXXXXXXF"
+acmCertificateArn = "arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
+```
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Domain <a name="Domain" id="@winglang/sdk.cloud.Domain"></a>
+
+A cloud Domain.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Domain.Initializer"></a>
+
+```wing
+bring cloud;
+
+new cloud.Domain(props: DomainProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Domain.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.cloud.Domain.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.DomainProps">DomainProps</a>
+
+---
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Domain.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Domain.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Domain.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Domain.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Domain.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Domain.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Domain.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Domain.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Domain.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Domain.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.cloud.Domain.property.domainName">domainName</a></code> | <code>str</code> | The domain name. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Domain.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `domainName`<sup>Required</sup> <a name="domainName" id="@winglang/sdk.cloud.Domain.property.domainName"></a>
+
+```wing
+domainName: str;
+```
+
+- *Type:* str
+
+The domain name.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### DomainProps <a name="DomainProps" id="@winglang/sdk.cloud.DomainProps"></a>
+
+Options for `Domain`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.DomainProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let DomainProps = cloud.DomainProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.DomainProps.property.domainName">domainName</a></code> | <code>str</code> | The website's custom domain name. |
+
+---
+
+##### `domainName`<sup>Required</sup> <a name="domainName" id="@winglang/sdk.cloud.DomainProps.property.domainName"></a>
+
+```wing
+domainName: str;
+```
+
+- *Type:* str
+
+The website's custom domain name.
+
+---
+
+*Example*
+
+```wing
+"example.com"
+```
+
+
+
diff --git a/docs/docs/04-standard-library/cloud/endpoint.md b/docs/docs/04-standard-library/cloud/endpoint.md
new file mode 100644
index 00000000000..c9a3abcc1fb
--- /dev/null
+++ b/docs/docs/04-standard-library/cloud/endpoint.md
@@ -0,0 +1,321 @@
+---
+title: Endpoint
+id: endpoint
+description: A resource that represents an endpoint.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    Endpoint,
+    URL,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Endpoint` represents a publicly accessible endpoint and outputs it as part of the compilation target.
+
+## Usage
+
+```ts playground example
+bring cloud;
+
+let endpoint = new cloud.Endpoint("https://example.com");
+```
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+The sim implementation of `cloud.Endpoint` outputs the endpoint URL.
+
+### AWS (`tf-aws`)
+
+The TF AWS implementation of `cloud.Endpoint` uses a [Terraform Output](https://developer.hashicorp.com/terraform/language/values/outputs).
+
+### AWS (`awscdk`)
+
+The AWS CDK implementation of `cloud.Endpoint` uses a [Cloudformation Output](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html).
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Endpoint <a name="Endpoint" id="@winglang/sdk.cloud.Endpoint"></a>
+
+represents a publicly accessible endpoint and outputs it as part of the compilation target.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Endpoint.Initializer"></a>
+
+```wing example
+bring cloud;
+
+new cloud.Endpoint("https://example.com");
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.property.url">url</a></code> | <code>str</code> | *The endpoint URL* |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.property.props">props</a></code> | <code>winglang/sdk.cloud.EndpointProps</code> | *The endpoint Props* |
+|
+
+---
+
+##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.cloud.Endpoint.property.url"></a>
+
+- *Type:* str
+
+---
+
+##### `props` <a name="props" id="@winglang/sdk.cloud.Endpoint.property.props"></a>
+
+- *Type:* winglang/sdk.cloud.EndpointProps
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### EndpointProps <a name="EndpointProps" id="@winglang/sdk.cloud.EndpointProps"></a>
+
+Options for `Endpoint`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.EndpointProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let EndpointProps = cloud.EndpointProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.EndpointProps.property.label">label</a></code> | <code>str</code> | The endpoint's label. For UI purposes. |
+| <code><a href="#@winglang/sdk.cloud.EndpointProps.property.browserSupport">browserSupport</a></code> | <code>bool</code> | Whether the endpoint is supported through browsers. For UI purposes. |
+
+---
+
+##### `label` <a name="label" id="@winglang/sdk.cloud.EndpointProps.property.label"></a>
+
+```wing
+label: str;
+```
+
+- *Type:* str
+
+The endpoint's label. For UI purposes.
+
+---
+
+*Example*
+
+```wing
+"My Dashboard"
+```
+
+---
+
+##### `browserSupport` <a name="browserSupport" id="@winglang/sdk.cloud.EndpointProps.property.browserSupport"></a>
+
+```wing
+browserSupport: bool;
+```
+
+- *Type:* bool
+
+Whether the endpoint is supported through browsers. For UI purposes.
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Endpoint <a name="Endpoint" id="@winglang/sdk.cloud.Endpoint"></a>
+
+A cloud Endpoint.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Endpoint.Initializer"></a>
+
+```wing
+bring cloud;
+
+new cloud.Endpoint(url: str, props?: EndpointProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.Initializer.parameter.url">url</a></code> | <code>str</code> | *No description.* |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.EndpointProps">EndpointProps</a></code> | *No description.* |
+
+---
+
+##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.cloud.Endpoint.Initializer.parameter.url"></a>
+
+- *Type:* str
+
+---
+
+##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Endpoint.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.EndpointProps">EndpointProps</a>
+
+---
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Endpoint.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Endpoint.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Endpoint.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Endpoint.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Endpoint.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Endpoint.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Endpoint.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.property.url">url</a></code> | <code>str</code> | The endpoint url. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Endpoint.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.cloud.Endpoint.property.url"></a>
+
+```wing
+url: str;
+```
+
+- *Type:* str
+
+The endpoint url.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### EndpointProps <a name="EndpointProps" id="@winglang/sdk.cloud.EndpointProps"></a>
+
+Options for `Endpoint`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.EndpointProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let EndpointProps = cloud.EndpointProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.EndpointProps.property.browserSupport">browserSupport</a></code> | <code>bool</code> | Whether the endpoint is supported through browsers. |
+| <code><a href="#@winglang/sdk.cloud.EndpointProps.property.label">label</a></code> | <code>str</code> | The endpoint's label. |
+
+---
+
+##### `browserSupport`<sup>Optional</sup> <a name="browserSupport" id="@winglang/sdk.cloud.EndpointProps.property.browserSupport"></a>
+
+```wing
+browserSupport: bool;
+```
+
+- *Type:* bool
+- *Default:* undefined
+
+Whether the endpoint is supported through browsers.
+
+For UI purposes.
+
+---
+
+##### `label`<sup>Optional</sup> <a name="label" id="@winglang/sdk.cloud.EndpointProps.property.label"></a>
+
+```wing
+label: str;
+```
+
+- *Type:* str
+- *Default:* undefined
+
+The endpoint's label.
+
+For UI purposes.
+
+---
+
+*Example*
+
+```wing
+"My Dashboard"
+```
+
+
+
diff --git a/docs/docs/04-standard-library/cloud/function.md b/docs/docs/04-standard-library/cloud/function.md
new file mode 100644
index 00000000000..16af5f6bd26
--- /dev/null
+++ b/docs/docs/04-standard-library/cloud/function.md
@@ -0,0 +1,493 @@
+---
+title: Function
+id: function
+description: A built-in resource for creating serverless functions.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    Serverless function,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Function` resource represents a serverless function for performing short, stateless tasks.
+Functions are typically used to run business logic in response to events, such as a file being uploaded to a bucket, a message being pushed to a queue, or a timer expiring.
+
+When a function is invoked on a cloud provider, it is typically executed in a container/host which is provisioned on demand.
+
+Functions may be invoked more than once, and some cloud providers may automatically retry failed invocations.
+For performance reasons, most cloud providers impose a timeout on functions, after which the function is automatically terminated.
+
+## Usage
+
+A function can be invoked in two ways:
+
+* **invoke()** - Executes the function with a payload and waits for the result.
+* **invokeAsync()** - Kicks off the execution of the function with a payload and returns immediately while the function is running.
+
+```ts playground example
+bring cloud;
+bring util;
+
+// defining a cloud.Function resource
+let countWords = new cloud.Function(inflight (s: str?): str => {
+  return "{s?.split(" ")?.length ?? 0}";
+}) as "countWords";
+
+let longTask = new cloud.Function(inflight () => {
+  util.sleep(30s);
+  log("done!");
+});
+
+new cloud.Function(inflight () => {
+  let sentence = "I am a sentence with 7 words";
+  // invoking cloud.Function from inflight context
+  let wordsCount = countWords.invoke(sentence);
+  log("'{sentence}' has {wordsCount ?? "0"} words");
+
+  longTask.invokeAsync("");
+  log("task started");
+}) as "Invoke Me";
+```
+
+## Function container reuse
+
+Most cloud providers will opportunistically reuse the function's container in additional invocations.
+It is possible to leverage this behavior to cache objects across function executions using `inflight new` and inflight fields.
+
+The following example reads the `bigdata.json` file once and reuses it every time `query()` is called.
+
+```ts playground example
+bring cloud;
+
+let big = new cloud.Bucket();
+
+big.addObject("bigdata.json", Json.stringify({
+  "my-key": "my-value"
+}));
+
+class MyDatabase {
+  inflight bigdata: Json;
+  inflight new() {
+    // download big data once
+    this.bigdata = big.getJson("bigdata.json");
+  }
+
+  pub inflight query(key: str): Json {
+    return this.bigdata.get(key);
+  }
+}
+
+let db = new MyDatabase();
+
+new cloud.Function(inflight () => {
+  log(Json.stringify(db.query("my-key")));
+});
+```
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+The sim implementation of `cloud.Function` runs the inflight code as a JavaScript function.
+
+By default, a maximum of 10 workers can be processing requests sent to a `cloud.Function` concurrently, but this number can be adjusted with the `concurrency` property:
+
+```ts playground
+bring cloud;
+
+new cloud.Function(inflight () => {
+  // ... code that shouldn't run concurrently ...
+}, concurrency: 1);
+```
+
+### AWS (`tf-aws` and `awscdk`)
+
+The AWS implementation of `cloud.Function` uses [AWS Lambda](https://aws.amazon.com/lambda/).
+
+To add extra IAM permissions to the function, you can use the `aws.Function` class as shown below.
+
+```ts playground example
+bring aws;
+bring cloud;
+
+let f = new cloud.Function(inflight () => {
+  log("Hello world!");
+});
+if let lambdaFn = aws.Function.from(f) {
+  lambdaFn.addPolicyStatements(
+    aws.PolicyStatement {
+      actions: ["ses:sendEmail"],
+      effect: aws.Effect.ALLOW,
+      resources: ["*"],
+    },
+  );
+}
+```
+
+To access the AWS Lambda context object, you can use the `aws.Function` class as shown below.
+
+```ts playground example
+bring aws;
+bring cloud;
+
+let f = new cloud.Function(inflight () => {
+  if let ctx = aws.Function.context() {
+    log(ctx.logGroupName); // prints the log group name
+    log(ctx.logStreamName); // prints the log stream name
+
+    let remainingTime = ctx.remainingTimeInMillis();
+    assert(remainingTime > 0);
+  }
+});
+```
+
+The `context()` method returns `nil` when ran on non-AWS targets.
+
+### Azure (`tf-azure`)
+
+The Azure implementation of `cloud.Function` uses [Azure Functions](https://azure.microsoft.com/en-us/products/functions).
+
+🚧 `invoke` API is not supported yet (tracking issue: [#1371](https://github.com/winglang/wing/issues/1371))
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet (tracking issue: [#614](https://github.com/winglang/wing/issues/614))
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Function <a name="Function" id="@winglang/sdk.cloud.Function"></a>
+
+- *Implements:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+A function.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Function.Initializer"></a>
+
+```wing
+bring cloud;
+
+new cloud.Function(handler: IFunctionHandler, props?: FunctionProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Function.Initializer.parameter.handler">handler</a></code> | <code><a href="#@winglang/sdk.cloud.IFunctionHandler">IFunctionHandler</a></code> | *No description.* |
+| <code><a href="#@winglang/sdk.cloud.Function.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.FunctionProps">FunctionProps</a></code> | *No description.* |
+
+---
+
+##### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.cloud.Function.Initializer.parameter.handler"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IFunctionHandler">IFunctionHandler</a>
+
+---
+
+##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Function.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.FunctionProps">FunctionProps</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Function.addEnvironment">addEnvironment</a></code> | Add an environment variable to the function. |
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.IFunctionClient.invoke">invoke</a></code> | Invokes the function with a payload and waits for the result. |
+| <code><a href="#@winglang/sdk.cloud.IFunctionClient.invokeAsync">invokeAsync</a></code> | Kicks off the execution of the function with a payload and returns immediately while the function is running. |
+
+---
+
+##### `addEnvironment` <a name="addEnvironment" id="@winglang/sdk.cloud.Function.addEnvironment"></a>
+
+```wing
+addEnvironment(name: str, value: str): void
+```
+
+Add an environment variable to the function.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.cloud.Function.addEnvironment.parameter.name"></a>
+
+- *Type:* str
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.cloud.Function.addEnvironment.parameter.value"></a>
+
+- *Type:* str
+
+---
+
+##### `invoke` <a name="invoke" id="@winglang/sdk.cloud.IFunctionClient.invoke"></a>
+
+```wing
+inflight invoke(payload?: str): str?
+```
+
+Invokes the function with a payload and waits for the result.
+
+###### `payload`<sup>Optional</sup> <a name="payload" id="@winglang/sdk.cloud.IFunctionClient.invoke.parameter.payload"></a>
+
+- *Type:* str
+
+payload to pass to the function.
+
+If not defined, an empty string will be passed.
+
+---
+
+##### `invokeAsync` <a name="invokeAsync" id="@winglang/sdk.cloud.IFunctionClient.invokeAsync"></a>
+
+```wing
+inflight invokeAsync(payload?: str): void
+```
+
+Kicks off the execution of the function with a payload and returns immediately while the function is running.
+
+###### `payload`<sup>Optional</sup> <a name="payload" id="@winglang/sdk.cloud.IFunctionClient.invokeAsync.parameter.payload"></a>
+
+- *Type:* str
+
+payload to pass to the function.
+
+If not defined, an empty string will be passed.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Function.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Function.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Function.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Function.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Function.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Function.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Function.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Function.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Function.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Function.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.cloud.Function.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Returns the set of environment variables for this function. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Function.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `env`<sup>Required</sup> <a name="env" id="@winglang/sdk.cloud.Function.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+
+Returns the set of environment variables for this function.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### FunctionProps <a name="FunctionProps" id="@winglang/sdk.cloud.FunctionProps"></a>
+
+Options for `Function`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.FunctionProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let FunctionProps = cloud.FunctionProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.FunctionProps.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.FunctionProps.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.FunctionProps.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.FunctionProps.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.FunctionProps.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.FunctionProps.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+## Protocols <a name="Protocols" id="Protocols"></a>
+
+### IFunctionHandler <a name="IFunctionHandler" id="@winglang/sdk.cloud.IFunctionHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.IFunctionHandler">IFunctionHandler</a>
+
+**Inflight client:** [@winglang/sdk.cloud.IFunctionHandlerClient](#@winglang/sdk.cloud.IFunctionHandlerClient)
+
+A resource with an inflight "handle" method that can be used to create a `cloud.Function`.
+
+
+
+### IFunctionHandlerClient <a name="IFunctionHandlerClient" id="@winglang/sdk.cloud.IFunctionHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.IFunctionHandlerClient">IFunctionHandlerClient</a>
+
+Inflight client for `IFunctionHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.IFunctionHandlerClient.handle">handle</a></code> | Entrypoint function that will be called when the cloud function is invoked. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.cloud.IFunctionHandlerClient.handle"></a>
+
+```wing
+inflight handle(event?: str): str?
+```
+
+Entrypoint function that will be called when the cloud function is invoked.
+
+###### `event`<sup>Optional</sup> <a name="event" id="@winglang/sdk.cloud.IFunctionHandlerClient.handle.parameter.event"></a>
+
+- *Type:* str
+
+---
+
+
diff --git a/docs/docs/04-standard-library/01-cloud/on-deploy.md b/docs/docs/04-standard-library/cloud/on-deploy.md
similarity index 76%
rename from docs/docs/04-standard-library/01-cloud/on-deploy.md
rename to docs/docs/04-standard-library/cloud/on-deploy.md
index 3cc162c233b..5d41d3694bf 100644
--- a/docs/docs/04-standard-library/01-cloud/on-deploy.md
+++ b/docs/docs/04-standard-library/cloud/on-deploy.md
@@ -20,7 +20,7 @@ The `cloud.OnDeploy` resource runs a block of inflight code each time the applic
 
 ## Usage
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -35,7 +35,7 @@ let setup = new cloud.OnDeploy(inflight () => {
 
 To specify that the `cloud.OnDeploy` resource should be run before or after another resource is created or updated, use the `executeBefore` or `executeAfter` properties:
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let counter = new cloud.Counter();
@@ -99,6 +99,60 @@ new cloud.OnDeploy(handler: IOnDeployHandler, props?: OnDeployProps);
 ---
 
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.OnDeploy.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.OnDeploy.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.OnDeploy.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.OnDeploy.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.OnDeploy.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.OnDeploy.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.OnDeploy.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.OnDeploy.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.OnDeploy.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
@@ -140,6 +194,7 @@ let OnDeployProps = cloud.OnDeployProps{ ... };
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.OnDeployProps.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
 | <code><a href="#@winglang/sdk.cloud.OnDeployProps.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
 | <code><a href="#@winglang/sdk.cloud.OnDeployProps.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
 | <code><a href="#@winglang/sdk.cloud.OnDeployProps.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
@@ -149,6 +204,19 @@ let OnDeployProps = cloud.OnDeployProps{ ... };
 
 ---
 
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.OnDeployProps.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
 ##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.OnDeployProps.property.env"></a>
 
 ```wing
diff --git a/docs/docs/04-standard-library/cloud/queue.md b/docs/docs/04-standard-library/cloud/queue.md
new file mode 100644
index 00000000000..1b5bcbc21b7
--- /dev/null
+++ b/docs/docs/04-standard-library/cloud/queue.md
@@ -0,0 +1,563 @@
+---
+title: Queue
+id: queue
+description: A built-in resource for creating distributed queues - a data structure for storing messages.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    Queue,
+    Distributed queue,
+    Messaging queue,
+    FIFO queue,
+    Channel,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Queue` resource represents a data structure for holding a list of messages.
+Queues are typically used to decouple producers of data and the consumers of said data in distributed systems.
+Queues by default are not FIFO (first in, first out) - so the order of messages is not guaranteed.
+
+## Usage
+
+### Setting a Queue Consumer
+
+```ts playground example
+bring cloud;
+
+let q = new cloud.Queue();
+
+q.setConsumer(inflight (m: str) => {
+  log("message ${m} consumed");
+});
+
+new cloud.Function(inflight () => {
+  q.push("message a");
+  q.push("message b");
+});
+```
+
+### Using Queue inflight api
+
+Pushing messages, popping them, and purging.
+
+```ts playground example
+bring cloud;
+
+let q = new cloud.Queue();
+
+new cloud.Function(inflight () => {
+  q.push("message a");
+  q.push("message b", "message c", "message d");
+  log("approxSize is ${q.approxSize()}");
+  log("popping message ${q.pop()!}");
+  log("popping message ${q.pop()!}");
+  log("approxSize is ${q.approxSize()}");
+  q.purge();
+  log("approxSize is ${q.approxSize()}");
+});
+```
+
+### Adding a dead-letter queue
+
+Creating a queue and adding a dead-letter queue with the maximum number of attempts configured
+
+```ts playground example
+bring cloud;
+
+let dlq = new cloud.Queue() as "dead-letter queue";
+let q = new cloud.Queue(
+  dlq: { 
+    queue: dlq,
+    maxDeliveryAttempts: 2
+  }
+);
+```
+
+### Referencing an external queue
+
+If you would like to reference an existing queue from within your application you can use the
+`QueueRef` classes in the target-specific namespaces.
+
+> This is currently only supported for `aws`.
+
+The following example defines a reference to an Amazon SQS queue with a specific ARN and sends a
+message to the queue from the function:
+
+```js example
+bring cloud;
+bring aws;
+
+let outbox = new aws.QueueRef("arn:aws:sqs:us-east-1:111111111111:Outbox");
+
+new cloud.Function(inflight () => {
+  outbox.push("send an email");
+});
+```
+
+This works both when running in the simulator (requires AWS credentials on the developer's machine)
+and when deployed to AWS. When this is deployed to AWS, the AWS Lambda IAM policy will include the
+needed permissions.
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+The sim implementation of `cloud.Queue` uses JavaScript's `Array`
+
+### AWS (`tf-aws` and `awscdk`)
+
+The AWS implementation of `cloud.Queue` uses [Amazon Simple Queue Service](https://aws.amazon.com/sqs/).
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet (tracking issue: [#617](https://github.com/winglang/wing/issues/617))
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet (tracking issue: [#616](https://github.com/winglang/wing/issues/616))
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Queue <a name="Queue" id="@winglang/sdk.cloud.Queue"></a>
+
+A queue.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Queue.Initializer"></a>
+
+```wing
+bring cloud;
+
+new cloud.Queue(props?: QueueProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Queue.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.QueueProps">QueueProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Queue.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.QueueProps">QueueProps</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Queue.setConsumer">setConsumer</a></code> | Create a function to consume messages from this queue. |
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.IQueueClient.approxSize">approxSize</a></code> | Retrieve the approximate number of messages in the queue. |
+| <code><a href="#@winglang/sdk.cloud.IQueueClient.pop">pop</a></code> | Pop a message from the queue. |
+| <code><a href="#@winglang/sdk.cloud.IQueueClient.purge">purge</a></code> | Purge all of the messages in the queue. |
+| <code><a href="#@winglang/sdk.cloud.IQueueClient.push">push</a></code> | Push one or more messages to the queue. |
+
+---
+
+##### `setConsumer` <a name="setConsumer" id="@winglang/sdk.cloud.Queue.setConsumer"></a>
+
+```wing
+setConsumer(handler: IQueueSetConsumerHandler, props?: QueueSetConsumerOptions): Function
+```
+
+Create a function to consume messages from this queue.
+
+###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.cloud.Queue.setConsumer.parameter.handler"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.IQueueSetConsumerHandler">IQueueSetConsumerHandler</a>
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Queue.setConsumer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.QueueSetConsumerOptions">QueueSetConsumerOptions</a>
+
+---
+
+##### `approxSize` <a name="approxSize" id="@winglang/sdk.cloud.IQueueClient.approxSize"></a>
+
+```wing
+inflight approxSize(): num
+```
+
+Retrieve the approximate number of messages in the queue.
+
+##### `pop` <a name="pop" id="@winglang/sdk.cloud.IQueueClient.pop"></a>
+
+```wing
+inflight pop(): str?
+```
+
+Pop a message from the queue.
+
+##### `purge` <a name="purge" id="@winglang/sdk.cloud.IQueueClient.purge"></a>
+
+```wing
+inflight purge(): void
+```
+
+Purge all of the messages in the queue.
+
+##### `push` <a name="push" id="@winglang/sdk.cloud.IQueueClient.push"></a>
+
+```wing
+inflight push(...messages: Array<str>): void
+```
+
+Push one or more messages to the queue.
+
+###### `messages`<sup>Required</sup> <a name="messages" id="@winglang/sdk.cloud.IQueueClient.push.parameter.messages"></a>
+
+- *Type:* str
+
+Payload to send to the queue.
+
+Each message must be non-empty.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Queue.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Queue.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Queue.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Queue.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Queue.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Queue.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Queue.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Queue.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Queue.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Queue.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Queue.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### DeadLetterQueueProps <a name="DeadLetterQueueProps" id="@winglang/sdk.cloud.DeadLetterQueueProps"></a>
+
+Dead letter queue options.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.DeadLetterQueueProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let DeadLetterQueueProps = cloud.DeadLetterQueueProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.DeadLetterQueueProps.property.queue">queue</a></code> | <code><a href="#@winglang/sdk.cloud.Queue">Queue</a></code> | Queue to receive messages that failed processing. |
+| <code><a href="#@winglang/sdk.cloud.DeadLetterQueueProps.property.maxDeliveryAttempts">maxDeliveryAttempts</a></code> | <code>num</code> | Number of times a message will be processed before being sent to the dead-letter queue. |
+
+---
+
+##### `queue`<sup>Required</sup> <a name="queue" id="@winglang/sdk.cloud.DeadLetterQueueProps.property.queue"></a>
+
+```wing
+queue: Queue;
+```
+
+- *Type:* <a href="#@winglang/sdk.cloud.Queue">Queue</a>
+
+Queue to receive messages that failed processing.
+
+---
+
+##### `maxDeliveryAttempts`<sup>Optional</sup> <a name="maxDeliveryAttempts" id="@winglang/sdk.cloud.DeadLetterQueueProps.property.maxDeliveryAttempts"></a>
+
+```wing
+maxDeliveryAttempts: num;
+```
+
+- *Type:* num
+- *Default:* 1
+
+Number of times a message will be processed before being sent to the dead-letter queue.
+
+---
+
+### QueueProps <a name="QueueProps" id="@winglang/sdk.cloud.QueueProps"></a>
+
+Options for `Queue`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.QueueProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let QueueProps = cloud.QueueProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.QueueProps.property.dlq">dlq</a></code> | <code><a href="#@winglang/sdk.cloud.DeadLetterQueueProps">DeadLetterQueueProps</a></code> | A dead-letter queue. |
+| <code><a href="#@winglang/sdk.cloud.QueueProps.property.retentionPeriod">retentionPeriod</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long a queue retains a message. |
+| <code><a href="#@winglang/sdk.cloud.QueueProps.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long a queue's consumers have to process a message. |
+
+---
+
+##### `dlq`<sup>Optional</sup> <a name="dlq" id="@winglang/sdk.cloud.QueueProps.property.dlq"></a>
+
+```wing
+dlq: DeadLetterQueueProps;
+```
+
+- *Type:* <a href="#@winglang/sdk.cloud.DeadLetterQueueProps">DeadLetterQueueProps</a>
+- *Default:* no dead letter queue
+
+A dead-letter queue.
+
+---
+
+##### `retentionPeriod`<sup>Optional</sup> <a name="retentionPeriod" id="@winglang/sdk.cloud.QueueProps.property.retentionPeriod"></a>
+
+```wing
+retentionPeriod: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1h
+
+How long a queue retains a message.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.QueueProps.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 30s
+
+How long a queue's consumers have to process a message.
+
+---
+
+### QueueSetConsumerOptions <a name="QueueSetConsumerOptions" id="@winglang/sdk.cloud.QueueSetConsumerOptions"></a>
+
+Options for Queue.setConsumer.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.QueueSetConsumerOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let QueueSetConsumerOptions = cloud.QueueSetConsumerOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+| <code><a href="#@winglang/sdk.cloud.QueueSetConsumerOptions.property.batchSize">batchSize</a></code> | <code>num</code> | The maximum number of messages to send to subscribers at once. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+##### `batchSize`<sup>Optional</sup> <a name="batchSize" id="@winglang/sdk.cloud.QueueSetConsumerOptions.property.batchSize"></a>
+
+```wing
+batchSize: num;
+```
+
+- *Type:* num
+- *Default:* 1
+
+The maximum number of messages to send to subscribers at once.
+
+---
+
+## Protocols <a name="Protocols" id="Protocols"></a>
+
+### IQueueSetConsumerHandler <a name="IQueueSetConsumerHandler" id="@winglang/sdk.cloud.IQueueSetConsumerHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.IQueueSetConsumerHandler">IQueueSetConsumerHandler</a>
+
+**Inflight client:** [@winglang/sdk.cloud.IQueueSetConsumerHandlerClient](#@winglang/sdk.cloud.IQueueSetConsumerHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `Queue.setConsumer`.
+
+
+
+### IQueueSetConsumerHandlerClient <a name="IQueueSetConsumerHandlerClient" id="@winglang/sdk.cloud.IQueueSetConsumerHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.IQueueSetConsumerHandlerClient">IQueueSetConsumerHandlerClient</a>
+
+Inflight client for `IQueueSetConsumerHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.IQueueSetConsumerHandlerClient.handle">handle</a></code> | Function that will be called when a message is received from the queue. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.cloud.IQueueSetConsumerHandlerClient.handle"></a>
+
+```wing
+inflight handle(message: str): void
+```
+
+Function that will be called when a message is received from the queue.
+
+###### `message`<sup>Required</sup> <a name="message" id="@winglang/sdk.cloud.IQueueSetConsumerHandlerClient.handle.parameter.message"></a>
+
+- *Type:* str
+
+---
+
+
diff --git a/docs/docs/04-standard-library/01-cloud/schedule.md b/docs/docs/04-standard-library/cloud/schedule.md
similarity index 75%
rename from docs/docs/04-standard-library/01-cloud/schedule.md
rename to docs/docs/04-standard-library/cloud/schedule.md
index 3242c450b51..7da90e055c4 100644
--- a/docs/docs/04-standard-library/01-cloud/schedule.md
+++ b/docs/docs/04-standard-library/cloud/schedule.md
@@ -23,10 +23,10 @@ The timezone used in cron expressions is always UTC.
 
 ### From cron
 
-```ts playground
+```ts playground example
 bring cloud;
 
-let schedule = new cloud.Schedule(cron: "* * * * ?");
+let schedule = new cloud.Schedule(cron: "* * * * *");
 
 schedule.onTick(inflight () => {
   log("schedule: triggered");
@@ -35,7 +35,7 @@ schedule.onTick(inflight () => {
 
 ### From rate
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let schedule = new cloud.Schedule(rate: 1m);
@@ -116,6 +116,60 @@ Create a function that runs when receiving the scheduled event.
 
 ---
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Schedule.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Schedule.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Schedule.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Schedule.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Schedule.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Schedule.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Schedule.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Schedule.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Schedule.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
@@ -157,6 +211,7 @@ let ScheduleOnTickOptions = cloud.ScheduleOnTickOptions{ ... };
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ScheduleOnTickOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
 | <code><a href="#@winglang/sdk.cloud.ScheduleOnTickOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
 | <code><a href="#@winglang/sdk.cloud.ScheduleOnTickOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
 | <code><a href="#@winglang/sdk.cloud.ScheduleOnTickOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
@@ -164,6 +219,19 @@ let ScheduleOnTickOptions = cloud.ScheduleOnTickOptions{ ... };
 
 ---
 
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ScheduleOnTickOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
 ##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ScheduleOnTickOptions.property.env"></a>
 
 ```wing
@@ -252,13 +320,21 @@ Trigger events according to a cron schedule using the UNIX cron format.
 
 Timezone is UTC.
 [minute] [hour] [day of month] [month] [day of week]
+'*' means all possible values.
+'-' means a range of values.
+',' means a list of values.
+[minute] allows 0-59.
+[hour] allows 0-23.
+[day of month] allows 1-31.
+[month] allows 1-12 or JAN-DEC.
+[day of week] allows 0-6 or SUN-SAT.
 
 ---
 
 *Example*
 
 ```wing
-"0/1 * ? * *"
+"* * * * *"
 ```
 
 
diff --git a/docs/docs/04-standard-library/cloud/secret.md b/docs/docs/04-standard-library/cloud/secret.md
new file mode 100644
index 00000000000..73dafd421eb
--- /dev/null
+++ b/docs/docs/04-standard-library/cloud/secret.md
@@ -0,0 +1,314 @@
+---
+title: Secret
+id: secret
+description: A built-in resource for securely storing secrets in the cloud.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    secrets,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Secret` class represents a secret value (like an API key, certificate, etc.) that is securely stored in the cloud.
+
+Secrets are encrypted at rest and in transit, and are only decrypted when they are used in a task.
+Storing a secret allows you to use the value in different compute tasks while only having to rotate or revoke it in one place.
+
+You can use the [`wing secrets`](https://www.winglang.io/docs/tools/cli#store-secrets-wing-secrets) command to store secrets in the target platform.
+
+## Usage
+
+### Defining a secret
+
+```js example
+bring cloud;
+
+let secret = new cloud.Secret(
+  name: "my-secret", // optional, defaults to a generated name
+);
+```
+
+Before deploying your application, you will be expected to store the secret value in a secure place according to the target-specific instructions below.
+
+### Retrieving secret values
+
+```js example
+bring cloud;
+
+let secret = new cloud.Secret(
+  name: "my-api-key",
+);
+
+new cloud.Function(inflight () => {
+  let secretValue = secret.value(); // retrieve the secret as a `str` value
+  let secretValueAsJson = secret.valueJson(); // retrieve the secret as a `Json` value
+});
+```
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+When using a secret in Wing's simulator, a secrets file must be added to your project in a file called: `.env`.
+The simulator will look up secrets in this file by their `name`.
+Secrets should be saved in a key=value format:
+
+```json
+// .env
+my-api-key=1234567890
+secret-key=secret-value
+```
+
+### AWS (`tf-aws` and `awscdk`)
+
+AWS implementations of `cloud.Secret` use [AWS Secrets Manager](https://docs.aws.amazon.com/secretsmanager/latest/userguide/intro.html).
+Before deploying your application, you must create a secret in the AWS account with the same `name` as the secret in your Wing application.
+You can do this using the AWS CLI:
+
+```bash
+aws secretsmanager create-secret --name my-api-key --secret-string 1234567890
+```
+
+It's also possible to create a secret using the AWS console.
+See [AWS documentation](https://docs.aws.amazon.com/secretsmanager/latest/userguide/create_secret.html) for more details.
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet (tracking issue: [#2178](https://github.com/winglang/wing/issues/2178))
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet (tracking issue: [#2179](https://github.com/winglang/wing/issues/2179))
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Secret <a name="Secret" id="@winglang/sdk.cloud.Secret"></a>
+
+A cloud secret.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Secret.Initializer"></a>
+
+```wing
+bring cloud;
+
+new cloud.Secret(props?: SecretProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Secret.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.SecretProps">SecretProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Secret.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.SecretProps">SecretProps</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ISecretClient.value">value</a></code> | Retrieve the value of the secret. |
+| <code><a href="#@winglang/sdk.cloud.ISecretClient.valueJson">valueJson</a></code> | Retrieve the Json value of the secret. |
+
+---
+
+##### `value` <a name="value" id="@winglang/sdk.cloud.ISecretClient.value"></a>
+
+```wing
+inflight value(options?: GetSecretValueOptions): str
+```
+
+Retrieve the value of the secret.
+
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.ISecretClient.value.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.GetSecretValueOptions">GetSecretValueOptions</a>
+
+---
+
+##### `valueJson` <a name="valueJson" id="@winglang/sdk.cloud.ISecretClient.valueJson"></a>
+
+```wing
+inflight valueJson(options?: GetSecretValueOptions): Json
+```
+
+Retrieve the Json value of the secret.
+
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.cloud.ISecretClient.valueJson.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.GetSecretValueOptions">GetSecretValueOptions</a>
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Secret.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Secret.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Secret.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Secret.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Secret.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Secret.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Secret.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Secret.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Secret.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Secret.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.cloud.Secret.property.name">name</a></code> | <code>str</code> | Get secret name. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Secret.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `name`<sup>Optional</sup> <a name="name" id="@winglang/sdk.cloud.Secret.property.name"></a>
+
+```wing
+name: str;
+```
+
+- *Type:* str
+
+Get secret name.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### GetSecretValueOptions <a name="GetSecretValueOptions" id="@winglang/sdk.cloud.GetSecretValueOptions"></a>
+
+Options when getting a secret value.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.GetSecretValueOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let GetSecretValueOptions = cloud.GetSecretValueOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.GetSecretValueOptions.property.cache">cache</a></code> | <code>bool</code> | Whether to cache the value. |
+
+---
+
+##### `cache`<sup>Optional</sup> <a name="cache" id="@winglang/sdk.cloud.GetSecretValueOptions.property.cache"></a>
+
+```wing
+cache: bool;
+```
+
+- *Type:* bool
+- *Default:* true
+
+Whether to cache the value.
+
+---
+
+### SecretProps <a name="SecretProps" id="@winglang/sdk.cloud.SecretProps"></a>
+
+Options for `Secret`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.SecretProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let SecretProps = cloud.SecretProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.SecretProps.property.name">name</a></code> | <code>str</code> | The secret's name. |
+
+---
+
+##### `name`<sup>Optional</sup> <a name="name" id="@winglang/sdk.cloud.SecretProps.property.name"></a>
+
+```wing
+name: str;
+```
+
+- *Type:* str
+- *Default:* a new secret is provisioned with a generated name
+
+The secret's name.
+
+If no name is provided then a new secret is provisioned in the target.
+If a name is provided then the resource will reference an existing
+secret in the target.
+
+---
+
+
diff --git a/docs/docs/04-standard-library/01-cloud/service.md b/docs/docs/04-standard-library/cloud/service.md
similarity index 84%
rename from docs/docs/04-standard-library/01-cloud/service.md
rename to docs/docs/04-standard-library/cloud/service.md
index 6a48ce20aba..72fd7427fb3 100644
--- a/docs/docs/04-standard-library/01-cloud/service.md
+++ b/docs/docs/04-standard-library/cloud/service.md
@@ -225,6 +225,60 @@ inflight stop(): void
 
 Stop the service.
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Service.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Service.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Service.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Service.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Service.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Service.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Service.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Service.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Service.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
@@ -279,6 +333,7 @@ let ServiceOnStartOptions = cloud.ServiceOnStartOptions{ ... };
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ServiceOnStartOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
 | <code><a href="#@winglang/sdk.cloud.ServiceOnStartOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
 | <code><a href="#@winglang/sdk.cloud.ServiceOnStartOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
 | <code><a href="#@winglang/sdk.cloud.ServiceOnStartOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
@@ -286,6 +341,19 @@ let ServiceOnStartOptions = cloud.ServiceOnStartOptions{ ... };
 
 ---
 
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.ServiceOnStartOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
 ##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.ServiceOnStartOptions.property.env"></a>
 
 ```wing
@@ -421,7 +489,7 @@ Inflight client for `IServiceHandler`.
 ##### `handle` <a name="handle" id="@winglang/sdk.cloud.IServiceHandlerClient.handle"></a>
 
 ```wing
-handle(): IServiceStopHandler
+inflight handle(): IServiceStopHandler?
 ```
 
 Handler to run when the service starts.
diff --git a/docs/docs/04-standard-library/cloud/topic.md b/docs/docs/04-standard-library/cloud/topic.md
new file mode 100644
index 00000000000..11253eba690
--- /dev/null
+++ b/docs/docs/04-standard-library/cloud/topic.md
@@ -0,0 +1,507 @@
+---
+title: Topic
+id: topic
+description: A built-in resource for publishing messages to subscribers.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    topics,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Topic` class represents a subject of data that is open for subscription.
+
+Topics are a staple of event-driven architectures, especially those that rely on pub-sub messaging to decouple producers of data and the consumers of said data.
+
+## Usage
+
+### Creating a topic
+
+```js example
+bring cloud;
+
+let topic = new cloud.Topic();
+```
+
+### Subscribing to a topic
+
+```js example
+bring cloud;
+
+let topic = new cloud.Topic();
+
+topic.onMessage(inflight (message: str) => {
+  log("Topic published message: {message}");
+});
+```
+
+### Subscribing a Queue to a Topic
+
+```js example
+bring cloud;
+
+let queue = new cloud.Queue();
+queue.setConsumer(inflight (message: str) => {
+  log("Topic published message: {message}");
+});
+
+let topic = new cloud.Topic();
+topic.subscribeQueue(queue);
+```
+
+### Publishing to a topic
+
+The inflight method `publish` sends messages to all of the topic's subscribers.
+
+```js example
+bring cloud;
+
+let topic = new cloud.Topic();
+
+inflight () => {
+  topic.publish(
+    "Topics can now publish",
+    "multiple messages at once"
+  );
+};
+```
+
+### Simple pub-sub example
+
+Here is an example of combining the preflight and inflight apis for a topic and creating an adorable
+simple pub-sub application.
+
+```js example
+bring cloud;
+
+// First we create a topic
+let topic = new cloud.Topic();
+
+// Then we define a consumer inflight handler
+let consumerHandler = inflight(message: str) => {
+  log("Doing some work with message: {message}");
+};
+
+// Now we can use a preflight method of topic to register the consumer handler
+// to be invoked when a message is published to the topic.
+topic.onMessage(consumerHandler);
+
+// Then we define the producer inflight handler
+let publisherHandler = inflight () => {
+  // Here we use the inflight api to publish a message to the topic.
+  topic.publish("Here are those launch codes you asked for.");
+};
+
+// Finally we can use multiple resources to invoke our publisher handler
+// for simplicity sake we will just use a function.
+new cloud.Function(publisherHandler);
+```
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+Within the context of the simulator, topics are implemented by keeping an in-memory list of subscribers and publishing messages to them when `publish` is called.
+
+### AWS (`tf-aws` and `awscdk`)
+
+AWS implementations of `cloud.Topic` use [AWS SNS](https://docs.aws.amazon.com/sns/latest/dg/welcome.html).
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet (tracking issue: [#621](https://github.com/winglang/wing/issues/621))
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet (tracking issue: [#620](https://github.com/winglang/wing/issues/620))
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Topic <a name="Topic" id="@winglang/sdk.cloud.Topic"></a>
+
+A topic.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Topic.Initializer"></a>
+
+```wing
+bring cloud;
+
+new cloud.Topic(props?: TopicProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Topic.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.cloud.TopicProps">TopicProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Topic.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.TopicProps">TopicProps</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Topic.onMessage">onMessage</a></code> | Run an inflight whenever an message is published to the topic. |
+| <code><a href="#@winglang/sdk.cloud.Topic.subscribeQueue">subscribeQueue</a></code> | Subscribing queue to the topic. |
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ITopicClient.publish">publish</a></code> | Publish messages to topic, if multiple messages are passed then they will be published as a batch if supported by the target platform. |
+
+---
+
+##### `onMessage` <a name="onMessage" id="@winglang/sdk.cloud.Topic.onMessage"></a>
+
+```wing
+onMessage(inflight: ITopicOnMessageHandler, props?: TopicOnMessageOptions): Function
+```
+
+Run an inflight whenever an message is published to the topic.
+
+###### `inflight`<sup>Required</sup> <a name="inflight" id="@winglang/sdk.cloud.Topic.onMessage.parameter.inflight"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.ITopicOnMessageHandler">ITopicOnMessageHandler</a>
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Topic.onMessage.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.TopicOnMessageOptions">TopicOnMessageOptions</a>
+
+---
+
+##### `subscribeQueue` <a name="subscribeQueue" id="@winglang/sdk.cloud.Topic.subscribeQueue"></a>
+
+```wing
+subscribeQueue(queue: Queue, props?: TopicSubscribeQueueOptions): void
+```
+
+Subscribing queue to the topic.
+
+###### `queue`<sup>Required</sup> <a name="queue" id="@winglang/sdk.cloud.Topic.subscribeQueue.parameter.queue"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.Queue">Queue</a>
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.cloud.Topic.subscribeQueue.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.cloud.TopicSubscribeQueueOptions">TopicSubscribeQueueOptions</a>
+
+---
+
+##### `publish` <a name="publish" id="@winglang/sdk.cloud.ITopicClient.publish"></a>
+
+```wing
+inflight publish(...messages: Array<str>): void
+```
+
+Publish messages to topic, if multiple messages are passed then they will be published as a batch if supported by the target platform.
+
+###### `messages`<sup>Required</sup> <a name="messages" id="@winglang/sdk.cloud.ITopicClient.publish.parameter.messages"></a>
+
+- *Type:* str
+
+Payload to publish to Topic.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Topic.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Topic.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Topic.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Topic.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Topic.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Topic.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Topic.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Topic.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Topic.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Topic.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.cloud.Topic.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### TopicOnMessageOptions <a name="TopicOnMessageOptions" id="@winglang/sdk.cloud.TopicOnMessageOptions"></a>
+
+Options for `Topic.onMessage`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.TopicOnMessageOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let TopicOnMessageOptions = cloud.TopicOnMessageOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.concurrency">concurrency</a></code> | <code>num</code> | The maximum concurrent invocations that can run at one time. |
+| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to pass to the function. |
+| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.logRetentionDays">logRetentionDays</a></code> | <code>num</code> | Specifies the number of days that function logs will be kept. |
+| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.memory">memory</a></code> | <code>num</code> | The amount of memory to allocate to the function, in MB. |
+| <code><a href="#@winglang/sdk.cloud.TopicOnMessageOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The maximum amount of time the function can run. |
+
+---
+
+##### `concurrency`<sup>Optional</sup> <a name="concurrency" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.concurrency"></a>
+
+```wing
+concurrency: num;
+```
+
+- *Type:* num
+- *Default:* platform specific limits (100 on the simulator)
+
+The maximum concurrent invocations that can run at one time.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* No environment variables.
+
+Environment variables to pass to the function.
+
+---
+
+##### `logRetentionDays`<sup>Optional</sup> <a name="logRetentionDays" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.logRetentionDays"></a>
+
+```wing
+logRetentionDays: num;
+```
+
+- *Type:* num
+- *Default:* 30
+
+Specifies the number of days that function logs will be kept.
+
+Setting negative value means logs will not expire.
+
+---
+
+##### `memory`<sup>Optional</sup> <a name="memory" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.memory"></a>
+
+```wing
+memory: num;
+```
+
+- *Type:* num
+- *Default:* 1024
+
+The amount of memory to allocate to the function, in MB.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.TopicOnMessageOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1m
+
+The maximum amount of time the function can run.
+
+---
+
+### TopicProps <a name="TopicProps" id="@winglang/sdk.cloud.TopicProps"></a>
+
+Options for `Topic`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.TopicProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let TopicProps = cloud.TopicProps{ ... };
+```
+
+
+### TopicSubscribeQueueOptions <a name="TopicSubscribeQueueOptions" id="@winglang/sdk.cloud.TopicSubscribeQueueOptions"></a>
+
+Options for `Topic.subscribeQueue`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.TopicSubscribeQueueOptions.Initializer"></a>
+
+```wing
+bring cloud;
+
+let TopicSubscribeQueueOptions = cloud.TopicSubscribeQueueOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.TopicSubscribeQueueOptions.property.dlq">dlq</a></code> | <code><a href="#@winglang/sdk.cloud.DeadLetterQueueProps">DeadLetterQueueProps</a></code> | A dead-letter queue. |
+| <code><a href="#@winglang/sdk.cloud.TopicSubscribeQueueOptions.property.retentionPeriod">retentionPeriod</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long a queue retains a message. |
+| <code><a href="#@winglang/sdk.cloud.TopicSubscribeQueueOptions.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How long a queue's consumers have to process a message. |
+
+---
+
+##### `dlq`<sup>Optional</sup> <a name="dlq" id="@winglang/sdk.cloud.TopicSubscribeQueueOptions.property.dlq"></a>
+
+```wing
+dlq: DeadLetterQueueProps;
+```
+
+- *Type:* <a href="#@winglang/sdk.cloud.DeadLetterQueueProps">DeadLetterQueueProps</a>
+- *Default:* no dead letter queue
+
+A dead-letter queue.
+
+---
+
+##### `retentionPeriod`<sup>Optional</sup> <a name="retentionPeriod" id="@winglang/sdk.cloud.TopicSubscribeQueueOptions.property.retentionPeriod"></a>
+
+```wing
+retentionPeriod: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 1h
+
+How long a queue retains a message.
+
+---
+
+##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.cloud.TopicSubscribeQueueOptions.property.timeout"></a>
+
+```wing
+timeout: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* 30s
+
+How long a queue's consumers have to process a message.
+
+---
+
+## Protocols <a name="Protocols" id="Protocols"></a>
+
+### ITopicOnMessageHandler <a name="ITopicOnMessageHandler" id="@winglang/sdk.cloud.ITopicOnMessageHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.ITopicOnMessageHandler">ITopicOnMessageHandler</a>
+
+**Inflight client:** [@winglang/sdk.cloud.ITopicOnMessageHandlerClient](#@winglang/sdk.cloud.ITopicOnMessageHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `Topic.on_message`.
+
+
+
+### ITopicOnMessageHandlerClient <a name="ITopicOnMessageHandlerClient" id="@winglang/sdk.cloud.ITopicOnMessageHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.cloud.ITopicOnMessageHandlerClient">ITopicOnMessageHandlerClient</a>
+
+Inflight client for `ITopicOnMessageHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.ITopicOnMessageHandlerClient.handle">handle</a></code> | Function that will be called when a message is received from the topic. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.cloud.ITopicOnMessageHandlerClient.handle"></a>
+
+```wing
+inflight handle(event: str): void
+```
+
+Function that will be called when a message is received from the topic.
+
+###### `event`<sup>Required</sup> <a name="event" id="@winglang/sdk.cloud.ITopicOnMessageHandlerClient.handle.parameter.event"></a>
+
+- *Type:* str
+
+---
+
+
diff --git a/docs/docs/04-standard-library/01-cloud/website.md b/docs/docs/04-standard-library/cloud/website.md
similarity index 78%
rename from docs/docs/04-standard-library/01-cloud/website.md
rename to docs/docs/04-standard-library/cloud/website.md
index 9c96a25dbae..90c8050ec09 100644
--- a/docs/docs/04-standard-library/01-cloud/website.md
+++ b/docs/docs/04-standard-library/cloud/website.md
@@ -159,6 +159,60 @@ the data to write to the file.
 
 ---
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Website.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.cloud.Website.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.cloud.Website.onLiftType"></a>
+
+```wing
+bring cloud;
+
+cloud.Website.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.cloud.Website.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.cloud.Website.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.cloud.Website.toInflight"></a>
+
+```wing
+bring cloud;
+
+cloud.Website.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.cloud.Website.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
@@ -244,7 +298,7 @@ File's content type.
 
 ### WebsiteDomainOptions <a name="WebsiteDomainOptions" id="@winglang/sdk.cloud.WebsiteDomainOptions"></a>
 
-Options for `Website`, and `ReactApp`.
+Options for `Website`.
 
 #### Initializer <a name="Initializer" id="@winglang/sdk.cloud.WebsiteDomainOptions.Initializer"></a>
 
@@ -292,6 +346,7 @@ let WebsiteOptions = cloud.WebsiteOptions{ ... };
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
 | <code><a href="#@winglang/sdk.cloud.WebsiteOptions.property.path">path</a></code> | <code>str</code> | Local path to the website's static files, relative to the Wing source file or absolute. |
+| <code><a href="#@winglang/sdk.cloud.WebsiteOptions.property.errorDocument">errorDocument</a></code> | <code>str</code> | Name of the error document for the website. |
 
 ---
 
@@ -314,6 +369,26 @@ Local path to the website's static files, relative to the Wing source file or ab
 ```
 
 
+##### `errorDocument`<sup>Optional</sup> <a name="errorDocument" id="@winglang/sdk.cloud.WebsiteOptions.property.errorDocument"></a>
+
+```wing
+errorDocument: str;
+```
+
+- *Type:* str
+- *Default:* undefined
+
+Name of the error document for the website.
+
+---
+
+*Example*
+
+```wing
+"404.html"
+```
+
+
 ### WebsiteProps <a name="WebsiteProps" id="@winglang/sdk.cloud.WebsiteProps"></a>
 
 Options for `Website`.
@@ -331,6 +406,7 @@ let WebsiteProps = cloud.WebsiteProps{ ... };
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
 | <code><a href="#@winglang/sdk.cloud.WebsiteProps.property.path">path</a></code> | <code>str</code> | Local path to the website's static files, relative to the Wing source file or absolute. |
+| <code><a href="#@winglang/sdk.cloud.WebsiteProps.property.errorDocument">errorDocument</a></code> | <code>str</code> | Name of the error document for the website. |
 | <code><a href="#@winglang/sdk.cloud.WebsiteProps.property.domain">domain</a></code> | <code><a href="#@winglang/sdk.cloud.Domain">Domain</a></code> | The website's custom domain object. |
 
 ---
@@ -354,6 +430,26 @@ Local path to the website's static files, relative to the Wing source file or ab
 ```
 
 
+##### `errorDocument`<sup>Optional</sup> <a name="errorDocument" id="@winglang/sdk.cloud.WebsiteProps.property.errorDocument"></a>
+
+```wing
+errorDocument: str;
+```
+
+- *Type:* str
+- *Default:* undefined
+
+Name of the error document for the website.
+
+---
+
+*Example*
+
+```wing
+"404.html"
+```
+
+
 ##### `domain`<sup>Optional</sup> <a name="domain" id="@winglang/sdk.cloud.WebsiteProps.property.domain"></a>
 
 ```wing
diff --git a/docs/docs/04-standard-library/01-cloud/workload.md b/docs/docs/04-standard-library/cloud/workload.md
similarity index 99%
rename from docs/docs/04-standard-library/01-cloud/workload.md
rename to docs/docs/04-standard-library/cloud/workload.md
index 24a23ea4c63..2ebf9cc6981 100644
--- a/docs/docs/04-standard-library/01-cloud/workload.md
+++ b/docs/docs/04-standard-library/cloud/workload.md
@@ -36,7 +36,7 @@ orchestration system such as [Amazon ECS](https://aws.amazon.com/ecs/), [fly.io]
 [ControlPlane](https://controlplane.com/).
 
 > :warning: This resource is still experimental. Please ping the team on [Wing
-> Slack](https://t.winglang.io/slack) if you encounter any issues or have any questions and let us
+> Discord](https://t.winglang.io/discord) if you encounter any issues or have any questions and let us
 > know what you think. See [roadmap](#roadmap) below for more details about our plans.
 
 ## Installation
diff --git a/docs/docs/04-standard-library/compatibility/compatibility-table.jsx b/docs/docs/04-standard-library/compatibility/compatibility-table.jsx
index 199aa897c97..42cce0346a3 100644
--- a/docs/docs/04-standard-library/compatibility/compatibility-table.jsx
+++ b/docs/docs/04-standard-library/compatibility/compatibility-table.jsx
@@ -18,7 +18,7 @@ const Cell = ({item: {implemented, issue} = {}}) => (
   <td>
     <div className="cell">
       {implemented ? <CheckMark fill={"var(--ifm-color-success-lightest)"} /> : <XMark fill={"var(--ifm-color-danger-light)"} />}
-      {issue ? (
+      {!implemented && issue ? (
         <a target="_blank" href={`https://github.com/winglang/wing/issues/${issue}`}>
           #{issue}
         </a>
diff --git a/docs/docs/04-standard-library/compatibility/compatibility.json b/docs/docs/04-standard-library/compatibility/compatibility.json
index 8d541222ba8..9448fa1d23e 100644
--- a/docs/docs/04-standard-library/compatibility/compatibility.json
+++ b/docs/docs/04-standard-library/compatibility/compatibility.json
@@ -1,690 +1,1928 @@
 {
   "Bucket": {
     "BucketProps.public": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "public": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "onCreate": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": false, "issue": 2724 },
-      "tf-azure": { "implemented": false, "issue": 1954 },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true,
+        "issue": 2724
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1954
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "onDelete": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1954 },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1954
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "onUpdate": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": false, "issue": 2724 },
-      "tf-azure": { "implemented": false, "issue": 1954 },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true,
+        "issue": 2724
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1954
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "onEvent": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": false, "issue": 2724 },
-      "tf-azure": { "implemented": false, "issue": 1954 },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true,
+        "issue": 2724
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1954
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "addObject": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "put": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "putJson": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "get": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "tryGet": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "getJson": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "tryGetJson": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "delete": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "tryDelete": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "exists": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "metadata": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": false, "issue": 4332 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "rename": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": false },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "copy": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": false, "issue": 4398 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "list": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "publicUrl": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1805 },
-      "tf-gcp": { "implemented": true },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "signedUrl": {
-      "sim": { "implemented": false, "issue": 1383 },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 4635 },
-      "tf-gcp": { "implemented": false, "issue": 4599 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": false,
+        "issue": 1383
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 4635
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
+    },
+    "addFile": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
     }
   },
   "Queue": {
     "QueueProps.duration": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": false },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": false
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "QueueProps.retentionPeriod": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": false },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": false
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "QueueProps.initialMessages": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "timeout": {
-      "sim": { "implemented": false, "issue": 1980 },
-      "tf-aws": { "implemented": false, "issue": 3354 },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": false,
+        "issue": 1980
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 3354
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "setConsumer": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "approxSize": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "push": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "pop": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "purge": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     }
   },
   "Function": {
     "FunctionProps.timeout": {
-      "sim": { "implemented": false, "issue": 1980 },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": true },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": false,
+        "issue": 1980
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "FunctionProps.memory": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": false
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "FunctionProps.concurrency": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": false },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false
+      },
+      "tf-aws": {
+        "implemented": false
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "FunctionProps.env": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": false
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "timeout": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "memory": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "concurrency": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": false },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false
+      },
+      "tf-aws": {
+        "implemented": false
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "addEnvironment": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "invoke": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false, "issue": 614 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 614
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "invokeAsync": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": false },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": true
+      }
+    },
+    "env": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
     }
   },
   "Counter": {
     "CounterProps.initial": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 629 },
-      "tf-gcp": { "implemented": false, "issue": 628 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "inc": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 629 },
-      "tf-gcp": { "implemented": false, "issue": 628 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "dec": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 629 },
-      "tf-gcp": { "implemented": false, "issue": 628 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "peek": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 629 },
-      "tf-gcp": { "implemented": false, "issue": 628 },
-      "awscdk": { "implemented": true }
-    },
-    "reset": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 629 },
-      "tf-gcp": { "implemented": false, "issue": 628 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
+    },
+    "set": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      },
+      "tf-gcp": {
+        "implemented": true
+      },
+      "awscdk": {
+        "implemented": true
+      }
+    },
+    "initial": {
+      "tf-aws": {
+        "implemented": true
+      },
+      "sim": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": true
+      }
     }
   },
   "Topic": {
     "publish": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 621 },
-      "tf-gcp": { "implemented": false, "issue": 620 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 621
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 620
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "onMessage": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 621 },
-      "tf-gcp": { "implemented": false, "issue": 620 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 621
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 620
+      },
+      "awscdk": {
+        "implemented": true
+      }
+    },
+    "permissions": {
+      "tf-aws": {
+        "implemented": true
+      }
+    },
+    "subscribeQueue": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
     }
   },
   "Schedule": {
     "ScheduleProps.cron": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1291 },
-      "tf-gcp": { "implemented": false, "issue": 1292 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1291
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1292
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "ScheduleProps.rate": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1291 },
-      "tf-gcp": { "implemented": false, "issue": 1292 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1291
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1292
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "onTick": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1291 },
-      "tf-gcp": { "implemented": false, "issue": 1292 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1291
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1292
+      },
+      "awscdk": {
+        "implemented": false
+      }
     }
   },
   "Website": {
     "WebsiteProps.path": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1295 },
-      "tf-gcp": { "implemented": false, "issue": 1296 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1295
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1296
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "WebsiteProps.domain": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": false, "issue": 2440 },
-      "tf-azure": { "implemented": false, "issue": 1295 },
-      "tf-gcp": { "implemented": false, "issue": 1296 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 2440
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1295
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1296
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "path": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1295 },
-      "tf-gcp": { "implemented": false, "issue": 1296 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1295
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1296
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "url": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1295 },
-      "tf-gcp": { "implemented": false, "issue": 1296 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1295
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1296
+      },
+      "awscdk": {
+        "implemented": false
+      }
+    },
+    "addJson": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
+    },
+    "addFile": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
     }
   },
   "Api": {
     "ApiProps.ApiCorsProps": {
-      "sim": { "implemented": false },
-      "tf-aws": { "implemented": false },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false
+      },
+      "tf-aws": {
+        "implemented": false
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "url": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": false, "issue": 3342 },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true,
+        "issue": 3342
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "cors": {
-      "sim": { "implemented": false, "issue": 2289 },
-      "tf-aws": { "implemented": false, "issue": 2289 },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false, "issue": 2289 }
+      "sim": {
+        "implemented": false,
+        "issue": 2289
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 2289
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": false,
+        "issue": 2289
+      }
     },
     "get": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "post": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "put": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "delete": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "patch": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "any": {
-      "sim": { "implemented": false, "issue": 1848 },
-      "tf-aws": { "implemented": false, "issue": 1848 },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false, "issue": 1848 }
+      "sim": {
+        "implemented": false,
+        "issue": 1848
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1848
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": false,
+        "issue": 1848
+      }
     },
     "request": {
-      "sim": { "implemented": false, "issue": 1850 },
-      "tf-aws": { "implemented": false, "issue": 1850 },
-      "tf-azure": { "implemented": false, "issue": 625 },
-      "tf-gcp": { "implemented": false, "issue": 624 },
-      "awscdk": { "implemented": false, "issue": 1850 }
+      "sim": {
+        "implemented": false,
+        "issue": 1850
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1850
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 625
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 624
+      },
+      "awscdk": {
+        "implemented": false,
+        "issue": 1850
+      }
+    },
+    "options": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
+    },
+    "head": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
+    },
+    "connect": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
     }
   },
-
   "Secret": {
     "SecretProps.name": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 2178 },
-      "tf-gcp": { "implemented": false, "issue": 2179 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 2178
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 2179
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "SecretProps.value": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 2178 },
-      "tf-gcp": { "implemented": false, "issue": 2179 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 2178
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 2179
+      },
+      "awscdk": {
+        "implemented": true
+      }
     },
     "SecretProps.valueJson": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 2178 },
-      "tf-gcp": { "implemented": false, "issue": 2179 },
-      "awscdk": { "implemented": true }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 2178
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 2179
+      },
+      "awscdk": {
+        "implemented": true
+      }
     }
   },
   "Service": {
     "ServiceProps.buildpackPath": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "ServiceProps.env": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "ServiceProps.command": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "ServiceProps.port": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "ServiceProps.memory": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "ServiceProps.cpu": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "url": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "buildpackPath": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "command": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "port": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "memory": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "cpu": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "replicas": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "addEnv": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "request": {
-      "sim": { "implemented": false, "issue": 1305 },
-      "tf-aws": { "implemented": false, "issue": 1306 },
-      "tf-azure": { "implemented": false, "issue": 1307 },
-      "tf-gcp": { "implemented": false, "issue": 1308 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": false,
+        "issue": 1305
+      },
+      "tf-aws": {
+        "implemented": false,
+        "issue": 1306
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1307
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1308
+      },
+      "awscdk": {
+        "implemented": false
+      }
+    },
+    "started": {
+      "sim": {
+        "implemented": true
+      }
+    },
+    "stop": {
+      "sim": {
+        "implemented": true
+      }
+    },
+    "start": {
+      "sim": {
+        "implemented": true
+      }
     }
   },
   "Table": {
     "TableProps.name": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "TableProps.columns": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "TableProps.primaryKey": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "name": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "columns": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "primaryKey": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "addRow": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false },
-      "tf-gcp": { "implemented": false },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false
+      },
+      "tf-gcp": {
+        "implemented": false
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "insert": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "update": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "delete": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "get": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
     },
     "list": {
-      "sim": { "implemented": true },
-      "tf-aws": { "implemented": true },
-      "tf-azure": { "implemented": false, "issue": 1315 },
-      "tf-gcp": { "implemented": false, "issue": 1316 },
-      "awscdk": { "implemented": false }
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      },
+      "tf-azure": {
+        "implemented": false,
+        "issue": 1315
+      },
+      "tf-gcp": {
+        "implemented": false,
+        "issue": 1316
+      },
+      "awscdk": {
+        "implemented": false
+      }
+    },
+    "tryGet": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
+    },
+    "upsert": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
+    }
+  },
+  "Endpoint": {
+    "url": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
+    }
+  },
+  "ReactApp": {
+    "addEnvironment": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
+    },
+    "url": {
+      "sim": {
+        "implemented": true
+      },
+      "tf-aws": {
+        "implemented": true
+      }
     }
   }
 }
diff --git a/docs/docs/04-standard-library/ex/_category_.yml b/docs/docs/04-standard-library/ex/_category_.yml
new file mode 100644
index 00000000000..3a23b22d46d
--- /dev/null
+++ b/docs/docs/04-standard-library/ex/_category_.yml
@@ -0,0 +1,5 @@
+label: ex
+collapsible: true
+collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/ex/react-app.md b/docs/docs/04-standard-library/ex/react-app.md
new file mode 100644
index 00000000000..954a38305e0
--- /dev/null
+++ b/docs/docs/04-standard-library/ex/react-app.md
@@ -0,0 +1,441 @@
+---
+title: React App
+id: react-app
+description: A built-in resource for creating deployable websites using the React framework.
+keywords: [Website, React, deployment, build]
+sidebar_position: 1
+---
+
+The `ex.ReactApp` resource represents a website, built using React, that can be both hosted in the cloud or to run on a development hot-reload server in the sim target.
+
+## Usage
+
+### Initialization
+
+Using the default arguments:
+
+```ts
+bring ex;
+bring util;
+
+let website = new ex.ReactApp(projectPath: "./client");
+```
+
+or customizing them:
+
+```ts
+bring ex;
+bring util;
+
+let website = new ex.ReactApp(
+  projectPath: "./client",
+  useBuildCommand: true // `false` by default. Will run the build command if true, and the start command if not
+  buildDir: "/dist" // default is "/build"
+  startCommand: "pnpm start" // default is "npm start"
+  buildCommand: "pnpm build" // default is "npm build"
+  localPort: 4000 // default is 3001
+ );
+```
+
+When `ReactApp` is compiled to the `sim` target, by default it runs the start command (default: `npm start`) inside `projectPath` to serve your app in development mode on a local port.
+
+If the `useBuildCommand` environment variable is set OR if `ReactApp` is compiled to any other target, it will run the build command (default: `npm build`) inside of the `projectPath` to build the React app for production to `buildDir` and serve the app.
+
+### Using Wing variables within react code
+
+`ex.ReactApp` allows you to pass preflight string values from Wing to the React app using `addEnvironment` method:
+
+```ts
+bring cloud;
+bring util;
+bring ex;
+
+let api = new cloud.Api();
+let website = new ex.ReactApp(projectPath: "./client");
+
+website.addEnvironment("apiUrl", api.url);
+website.addEnvironment("another", "some string variable");
+
+```
+
+Then in the React app use `window.wingEnv`:
+(accessible after adding `<script src="./wing.js"></script>` to the index file)
+
+```ts
+const { apiUrl } = window.wingEnv;
+const users = await fetch(apiUrl + "/users");
+```
+
+Currently, we can only pass preflight string variables to the React app environment.
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+sim implementations of `ex.ReactApp` is using either the [Website resource](../cloud/website) (when `useBuildCommand` is `true`) or starts React development server when `false`.
+
+### AWS (`tf-aws` and `awscdk`)
+
+AWS implementations of `ex.ReactApp` uses the [Website resource](../cloud/website).
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet (tracking issue: [#4220](https://github.com/winglang/wing/issues/4220))
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet (tracking issue: [#4221](https://github.com/winglang/wing/issues/4221))
+# API Reference <a name="API Reference" id="api-reference"></a>
+
+## Resources <a name="Resources" id="Resources"></a>
+
+### ReactApp <a name="ReactApp" id="@winglang/sdk.ex.ReactApp"></a>
+
+A cloud deployable React App.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.ex.ReactApp.Initializer"></a>
+
+```wing
+bring ex;
+
+new ex.ReactApp(props: ReactAppProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ex.ReactApp.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.ex.ReactAppProps">ReactAppProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.ex.ReactApp.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.ex.ReactAppProps">ReactAppProps</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ex.ReactApp.addEnvironment">addEnvironment</a></code> | Adding a key-value pair that can be accessible later via the `window.wingEnv` object in the react code. |
+
+---
+
+##### `addEnvironment` <a name="addEnvironment" id="@winglang/sdk.ex.ReactApp.addEnvironment"></a>
+
+```wing
+addEnvironment(key: str, value: str): void
+```
+
+Adding a key-value pair that can be accessible later via the `window.wingEnv` object in the react code.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.ex.ReactApp.addEnvironment.parameter.key"></a>
+
+- *Type:* str
+
+the key to add.
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.ex.ReactApp.addEnvironment.parameter.value"></a>
+
+- *Type:* str
+
+the value to add.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ex.ReactApp.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ex.ReactApp.onLiftType"></a>
+
+```wing
+bring ex;
+
+ex.ReactApp.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ex.ReactApp.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ex.ReactApp.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ex.ReactApp.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.ex.ReactApp.property.url">url</a></code> | <code>str</code> | Website's url. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ex.ReactApp.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.ex.ReactApp.property.url"></a>
+
+```wing
+url: str;
+```
+
+- *Type:* str
+
+Website's url.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### ReactAppOptions <a name="ReactAppOptions" id="@winglang/sdk.ex.ReactAppOptions"></a>
+
+Basic options for `ReactApp`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.ex.ReactAppOptions.Initializer"></a>
+
+```wing
+bring ex;
+
+let ReactAppOptions = ex.ReactAppOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.projectPath">projectPath</a></code> | <code>str</code> | The path to the React app root folder- can be absolute or relative to the wing folder. |
+| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.buildCommand">buildCommand</a></code> | <code>str</code> | A command for building the React app. |
+| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.buildDir">buildDir</a></code> | <code>str</code> | The path to the React app build folder- relative to the `projectPath`. |
+| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.localPort">localPort</a></code> | <code>num</code> | A port to start a local build of the React app on. |
+| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.startCommand">startCommand</a></code> | <code>str</code> | A command for starting React app locally. |
+| <code><a href="#@winglang/sdk.ex.ReactAppOptions.property.useBuildCommand">useBuildCommand</a></code> | <code>bool</code> | In sim, if `true` - will use the start command, and if `false` - the build command. |
+
+---
+
+##### `projectPath`<sup>Required</sup> <a name="projectPath" id="@winglang/sdk.ex.ReactAppOptions.property.projectPath"></a>
+
+```wing
+projectPath: str;
+```
+
+- *Type:* str
+
+The path to the React app root folder- can be absolute or relative to the wing folder.
+
+---
+
+##### `buildCommand`<sup>Optional</sup> <a name="buildCommand" id="@winglang/sdk.ex.ReactAppOptions.property.buildCommand"></a>
+
+```wing
+buildCommand: str;
+```
+
+- *Type:* str
+- *Default:* "npm run build"
+
+A command for building the React app.
+
+---
+
+##### `buildDir`<sup>Optional</sup> <a name="buildDir" id="@winglang/sdk.ex.ReactAppOptions.property.buildDir"></a>
+
+```wing
+buildDir: str;
+```
+
+- *Type:* str
+- *Default:* "/build"
+
+The path to the React app build folder- relative to the `projectPath`.
+
+---
+
+##### `localPort`<sup>Optional</sup> <a name="localPort" id="@winglang/sdk.ex.ReactAppOptions.property.localPort"></a>
+
+```wing
+localPort: num;
+```
+
+- *Type:* num
+- *Default:* 3001
+
+A port to start a local build of the React app on.
+
+---
+
+##### `startCommand`<sup>Optional</sup> <a name="startCommand" id="@winglang/sdk.ex.ReactAppOptions.property.startCommand"></a>
+
+```wing
+startCommand: str;
+```
+
+- *Type:* str
+- *Default:* "npm run start"
+
+A command for starting React app locally.
+
+---
+
+##### `useBuildCommand`<sup>Optional</sup> <a name="useBuildCommand" id="@winglang/sdk.ex.ReactAppOptions.property.useBuildCommand"></a>
+
+```wing
+useBuildCommand: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+In sim, if `true` - will use the start command, and if `false` - the build command.
+
+---
+
+### ReactAppProps <a name="ReactAppProps" id="@winglang/sdk.ex.ReactAppProps"></a>
+
+Options for `ReactApp`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.ex.ReactAppProps.Initializer"></a>
+
+```wing
+bring ex;
+
+let ReactAppProps = ex.ReactAppProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.domain">domain</a></code> | <code><a href="#@winglang/sdk.cloud.Domain">Domain</a></code> | The website's custom domain object. |
+| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.projectPath">projectPath</a></code> | <code>str</code> | The path to the React app root folder- can be absolute or relative to the wing folder. |
+| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.buildCommand">buildCommand</a></code> | <code>str</code> | A command for building the React app. |
+| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.buildDir">buildDir</a></code> | <code>str</code> | The path to the React app build folder- relative to the `projectPath`. |
+| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.localPort">localPort</a></code> | <code>num</code> | A port to start a local build of the React app on. |
+| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.startCommand">startCommand</a></code> | <code>str</code> | A command for starting React app locally. |
+| <code><a href="#@winglang/sdk.ex.ReactAppProps.property.useBuildCommand">useBuildCommand</a></code> | <code>bool</code> | In sim, if `true` - will use the start command, and if `false` - the build command. |
+
+---
+
+##### `domain`<sup>Optional</sup> <a name="domain" id="@winglang/sdk.ex.ReactAppProps.property.domain"></a>
+
+```wing
+domain: Domain;
+```
+
+- *Type:* <a href="#@winglang/sdk.cloud.Domain">Domain</a>
+- *Default:* undefined
+
+The website's custom domain object.
+
+---
+
+##### `projectPath`<sup>Required</sup> <a name="projectPath" id="@winglang/sdk.ex.ReactAppProps.property.projectPath"></a>
+
+```wing
+projectPath: str;
+```
+
+- *Type:* str
+
+The path to the React app root folder- can be absolute or relative to the wing folder.
+
+---
+
+##### `buildCommand`<sup>Optional</sup> <a name="buildCommand" id="@winglang/sdk.ex.ReactAppProps.property.buildCommand"></a>
+
+```wing
+buildCommand: str;
+```
+
+- *Type:* str
+- *Default:* "npm run build"
+
+A command for building the React app.
+
+---
+
+##### `buildDir`<sup>Optional</sup> <a name="buildDir" id="@winglang/sdk.ex.ReactAppProps.property.buildDir"></a>
+
+```wing
+buildDir: str;
+```
+
+- *Type:* str
+- *Default:* "/build"
+
+The path to the React app build folder- relative to the `projectPath`.
+
+---
+
+##### `localPort`<sup>Optional</sup> <a name="localPort" id="@winglang/sdk.ex.ReactAppProps.property.localPort"></a>
+
+```wing
+localPort: num;
+```
+
+- *Type:* num
+- *Default:* 3001
+
+A port to start a local build of the React app on.
+
+---
+
+##### `startCommand`<sup>Optional</sup> <a name="startCommand" id="@winglang/sdk.ex.ReactAppProps.property.startCommand"></a>
+
+```wing
+startCommand: str;
+```
+
+- *Type:* str
+- *Default:* "npm run start"
+
+A command for starting React app locally.
+
+---
+
+##### `useBuildCommand`<sup>Optional</sup> <a name="useBuildCommand" id="@winglang/sdk.ex.ReactAppProps.property.useBuildCommand"></a>
+
+```wing
+useBuildCommand: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+In sim, if `true` - will use the start command, and if `false` - the build command.
+
+---
+
+
diff --git a/docs/docs/04-standard-library/02-ex/redis.md b/docs/docs/04-standard-library/ex/redis.md
similarity index 83%
rename from docs/docs/04-standard-library/02-ex/redis.md
rename to docs/docs/04-standard-library/ex/redis.md
index ed06856a79e..6c69132ab9c 100644
--- a/docs/docs/04-standard-library/02-ex/redis.md
+++ b/docs/docs/04-standard-library/ex/redis.md
@@ -62,7 +62,7 @@ the key.
 ##### `get` <a name="get" id="@winglang/sdk.ex.IRedisClient.get"></a>
 
 ```wing
-inflight get(key: str): str
+inflight get(key: str): str?
 ```
 
 Get value at given key.
@@ -78,7 +78,7 @@ the key to get.
 ##### `hget` <a name="hget" id="@winglang/sdk.ex.IRedisClient.hget"></a>
 
 ```wing
-inflight hget(key: str, field: str): str
+inflight hget(key: str, field: str): str?
 ```
 
 Returns the value associated with field in the hash stored at key.
@@ -203,6 +203,60 @@ inflight url(): str
 
 Get url of redis server.
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ex.Redis.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ex.Redis.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ex.Redis.onLiftType"></a>
+
+```wing
+bring ex;
+
+ex.Redis.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ex.Redis.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ex.Redis.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ex.Redis.toInflight"></a>
+
+```wing
+bring ex;
+
+ex.Redis.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ex.Redis.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
@@ -278,7 +332,7 @@ Removes the specified key.
 ##### `get` <a name="get" id="@winglang/sdk.ex.RedisClientBase.get"></a>
 
 ```wing
-get(key: str): str
+get(key: str): str?
 ```
 
 Get value at given key.
@@ -292,7 +346,7 @@ Get value at given key.
 ##### `hget` <a name="hget" id="@winglang/sdk.ex.RedisClientBase.hget"></a>
 
 ```wing
-hget(key: str, field: str): str
+hget(key: str, field: str): str?
 ```
 
 Returns the value associated with field in the hash stored at key.
diff --git a/docs/docs/04-standard-library/02-ex/table.md b/docs/docs/04-standard-library/ex/table.md
similarity index 84%
rename from docs/docs/04-standard-library/02-ex/table.md
rename to docs/docs/04-standard-library/ex/table.md
index a0c11c2ba3f..2b93ebe153d 100644
--- a/docs/docs/04-standard-library/02-ex/table.md
+++ b/docs/docs/04-standard-library/ex/table.md
@@ -142,7 +142,7 @@ List all rows in the table.
 ##### `tryGet` <a name="tryGet" id="@winglang/sdk.ex.ITableClient.tryGet"></a>
 
 ```wing
-inflight tryGet(key: str): Json
+inflight tryGet(key: str): Json?
 ```
 
 Get a row from the table if exists, by primary key.
@@ -203,6 +203,60 @@ data to be upserted.
 
 ---
 
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ex.Table.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ex.Table.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ex.Table.onLiftType"></a>
+
+```wing
+bring ex;
+
+ex.Table.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ex.Table.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ex.Table.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ex.Table.toInflight"></a>
+
+```wing
+bring ex;
+
+ex.Table.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ex.Table.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
diff --git a/docs/docs/04-standard-library/expect/_category_.yml b/docs/docs/04-standard-library/expect/_category_.yml
index 42ed33b8cf0..c0e49351f2e 100644
--- a/docs/docs/04-standard-library/expect/_category_.yml
+++ b/docs/docs/04-standard-library/expect/_category_.yml
@@ -1,3 +1,6 @@
 label: expect
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
+  title: expect
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/expect/api-reference.md b/docs/docs/04-standard-library/expect/api-reference.md
index e23c3efc204..2dc3972033f 100644
--- a/docs/docs/04-standard-library/expect/api-reference.md
+++ b/docs/docs/04-standard-library/expect/api-reference.md
@@ -8,7 +8,6 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -23,10 +22,40 @@ The Util class provides methods for making assertions in tests, such as comparin
 
 | **Name** | **Description** |
 | --- | --- |
+| <code><a href="#@winglang/sdk.expect.Util.doesNotMatch">doesNotMatch</a></code> | Checks if a string does not match a regular expression pattern. |
 | <code><a href="#@winglang/sdk.expect.Util.equal">equal</a></code> | Compares two values for equality. |
+| <code><a href="#@winglang/sdk.expect.Util.fail">fail</a></code> | Marks a test as failed. |
+| <code><a href="#@winglang/sdk.expect.Util.match">match</a></code> | Checks if a string matches a regular expression pattern. |
 | <code><a href="#@winglang/sdk.expect.Util.nil">nil</a></code> | Checks if a value is nil. |
 | <code><a href="#@winglang/sdk.expect.Util.notEqual">notEqual</a></code> | Compares two values for inequality. |
 | <code><a href="#@winglang/sdk.expect.Util.notNil">notNil</a></code> | Checks if a value is not nil. |
+| <code><a href="#@winglang/sdk.expect.Util.ok">ok</a></code> | Asserts that a condition is truthy. |
+
+---
+
+##### `doesNotMatch` <a name="doesNotMatch" id="@winglang/sdk.expect.Util.doesNotMatch"></a>
+
+```wing
+bring expect;
+
+inflight expect.doesNotMatch(actual: str, expected: str);
+```
+
+Checks if a string does not match a regular expression pattern.
+
+###### `actual`<sup>Required</sup> <a name="actual" id="@winglang/sdk.expect.Util.doesNotMatch.parameter.actual"></a>
+
+- *Type:* str
+
+The string to test.
+
+---
+
+###### `expected`<sup>Required</sup> <a name="expected" id="@winglang/sdk.expect.Util.doesNotMatch.parameter.expected"></a>
+
+- *Type:* str
+
+The regular expression pattern to check against.
 
 ---
 
@@ -56,6 +85,50 @@ The expected value.
 
 ---
 
+##### `fail` <a name="fail" id="@winglang/sdk.expect.Util.fail"></a>
+
+```wing
+bring expect;
+
+inflight expect.fail(message?: str);
+```
+
+Marks a test as failed.
+
+###### `message`<sup>Optional</sup> <a name="message" id="@winglang/sdk.expect.Util.fail.parameter.message"></a>
+
+- *Type:* str
+
+An optional message to include with the failure.
+
+---
+
+##### `match` <a name="match" id="@winglang/sdk.expect.Util.match"></a>
+
+```wing
+bring expect;
+
+inflight expect.match(actual: str, expected: str);
+```
+
+Checks if a string matches a regular expression pattern.
+
+###### `actual`<sup>Required</sup> <a name="actual" id="@winglang/sdk.expect.Util.match.parameter.actual"></a>
+
+- *Type:* str
+
+The string to test.
+
+---
+
+###### `expected`<sup>Required</sup> <a name="expected" id="@winglang/sdk.expect.Util.match.parameter.expected"></a>
+
+- *Type:* str
+
+The regular expression pattern to match against.
+
+---
+
 ##### `nil` <a name="nil" id="@winglang/sdk.expect.Util.nil"></a>
 
 ```wing
@@ -118,6 +191,32 @@ The value to test.
 
 ---
 
+##### `ok` <a name="ok" id="@winglang/sdk.expect.Util.ok"></a>
+
+```wing
+bring expect;
+
+inflight expect.ok(condition: bool, message?: str);
+```
+
+Asserts that a condition is truthy.
+
+###### `condition`<sup>Required</sup> <a name="condition" id="@winglang/sdk.expect.Util.ok.parameter.condition"></a>
+
+- *Type:* bool
+
+The condition to test.
+
+---
+
+###### `message`<sup>Optional</sup> <a name="message" id="@winglang/sdk.expect.Util.ok.parameter.message"></a>
+
+- *Type:* str
+
+An optional message to include if the condition is falsy.
+
+---
+
 
 
 
diff --git a/docs/docs/04-standard-library/fs/_category_.yml b/docs/docs/04-standard-library/fs/_category_.yml
index 803c4b4a12a..1fbfaab843b 100644
--- a/docs/docs/04-standard-library/fs/_category_.yml
+++ b/docs/docs/04-standard-library/fs/_category_.yml
@@ -1,3 +1,5 @@
 label: fs
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/fs/api-reference.md b/docs/docs/04-standard-library/fs/api-reference.md
index 3dee6af3bd8..d1f9e903155 100644
--- a/docs/docs/04-standard-library/fs/api-reference.md
+++ b/docs/docs/04-standard-library/fs/api-reference.md
@@ -8,7 +8,6 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -40,12 +39,15 @@ new fs.Util();
 | **Name** | **Description** |
 | --- | --- |
 | <code><a href="#@winglang/sdk.fs.Util.absolute">absolute</a></code> | The right-most parameter is considered {to}. Other parameters are considered an array of {from}. |
+| <code><a href="#@winglang/sdk.fs.Util.appendFile">appendFile</a></code> | Appends new data to the end of an existing file. |
 | <code><a href="#@winglang/sdk.fs.Util.basename">basename</a></code> | Retrieve the final segment of a given file path. |
 | <code><a href="#@winglang/sdk.fs.Util.dirname">dirname</a></code> | Retrieve the name of the directory from a given file path. |
 | <code><a href="#@winglang/sdk.fs.Util.exists">exists</a></code> | Check if the path exists. |
 | <code><a href="#@winglang/sdk.fs.Util.extension">extension</a></code> | Extracts the extension (without the leading dot) from the path, if possible. |
+| <code><a href="#@winglang/sdk.fs.Util.glob">glob</a></code> | Match files using the patterns the shell uses. |
 | <code><a href="#@winglang/sdk.fs.Util.isDir">isDir</a></code> | Checks if the given path is a directory and exists. |
 | <code><a href="#@winglang/sdk.fs.Util.join">join</a></code> | Join all arguments together and normalize the resulting path. |
+| <code><a href="#@winglang/sdk.fs.Util.md5">md5</a></code> | Calculate an MD5 content hash of all the files that match a glob pattern. |
 | <code><a href="#@winglang/sdk.fs.Util.metadata">metadata</a></code> | Gets the stats of the given path. |
 | <code><a href="#@winglang/sdk.fs.Util.mkdir">mkdir</a></code> | Create a directory. |
 | <code><a href="#@winglang/sdk.fs.Util.mkdtemp">mkdtemp</a></code> | Create a temporary directory. |
@@ -93,6 +95,43 @@ A sequence of paths or path segments.
 
 ---
 
+##### `appendFile` <a name="appendFile" id="@winglang/sdk.fs.Util.appendFile"></a>
+
+```wing
+bring fs;
+
+fs.appendFile(filepath: str, data: str, options?: WriteFileOptions);
+```
+
+Appends new data to the end of an existing file.
+
+###### `filepath`<sup>Required</sup> <a name="filepath" id="@winglang/sdk.fs.Util.appendFile.parameter.filepath"></a>
+
+- *Type:* str
+
+The file path that needs to be appended.
+
+---
+
+###### `data`<sup>Required</sup> <a name="data" id="@winglang/sdk.fs.Util.appendFile.parameter.data"></a>
+
+- *Type:* str
+
+The text to be appended to the file.
+
+---
+
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.fs.Util.appendFile.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.fs.WriteFileOptions">WriteFileOptions</a>
+
+The `encoding` can be set to specify the character encoding.
+
+And the `flag` can be set to specify the attributes.
+If a flag is not provided, it defaults to `"w"`.
+
+---
+
 ##### `basename` <a name="basename" id="@winglang/sdk.fs.Util.basename"></a>
 
 ```wing
@@ -165,6 +204,34 @@ The path to get extension for.
 
 ---
 
+##### `glob` <a name="glob" id="@winglang/sdk.fs.Util.glob"></a>
+
+```wing
+bring fs;
+
+fs.glob(pattern: str, options?: GlobOptions);
+```
+
+Match files using the patterns the shell uses.
+
+Built with the great `glob` package, based on https://www.npmjs.com/package/glob
+
+###### `pattern`<sup>Required</sup> <a name="pattern" id="@winglang/sdk.fs.Util.glob.parameter.pattern"></a>
+
+- *Type:* str
+
+The pattern to match.
+
+---
+
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.fs.Util.glob.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.fs.GlobOptions">GlobOptions</a>
+
+Glob options.
+
+---
+
 ##### `isDir` <a name="isDir" id="@winglang/sdk.fs.Util.isDir"></a>
 
 ```wing
@@ -201,6 +268,32 @@ The array of path need to join.
 
 ---
 
+##### `md5` <a name="md5" id="@winglang/sdk.fs.Util.md5"></a>
+
+```wing
+bring fs;
+
+fs.md5(dir: str, globPattern?: str);
+```
+
+Calculate an MD5 content hash of all the files that match a glob pattern.
+
+###### `dir`<sup>Required</sup> <a name="dir" id="@winglang/sdk.fs.Util.md5.parameter.dir"></a>
+
+- *Type:* str
+
+The root directory.
+
+---
+
+###### `globPattern`<sup>Optional</sup> <a name="globPattern" id="@winglang/sdk.fs.Util.md5.parameter.globPattern"></a>
+
+- *Type:* str
+
+The glob pattern to match (defaults to all files and subdirectories).
+
+---
+
 ##### `metadata` <a name="metadata" id="@winglang/sdk.fs.Util.metadata"></a>
 
 ```wing
@@ -656,6 +749,135 @@ The YANL objects to be dumped.
 
 ## Structs <a name="Structs" id="Structs"></a>
 
+### GlobOptions <a name="GlobOptions" id="@winglang/sdk.fs.GlobOptions"></a>
+
+Options for `glob`, based on https://www.npmjs.com/package/glob.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.fs.GlobOptions.Initializer"></a>
+
+```wing
+bring fs;
+
+let GlobOptions = fs.GlobOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.fs.GlobOptions.property.absolute">absolute</a></code> | <code>bool</code> | Set to `true` to always receive absolute paths for matched files. |
+| <code><a href="#@winglang/sdk.fs.GlobOptions.property.cwd">cwd</a></code> | <code>str</code> | The current working directory in which to search. |
+| <code><a href="#@winglang/sdk.fs.GlobOptions.property.dot">dot</a></code> | <code>bool</code> | Include `.dot` files in normal matches and globstar matches. Note that an explicit dot in a portion of the pattern will always match dot files. |
+| <code><a href="#@winglang/sdk.fs.GlobOptions.property.follow">follow</a></code> | <code>bool</code> | Follow symlinked directories when expanding `**` patterns. |
+| <code><a href="#@winglang/sdk.fs.GlobOptions.property.ignore">ignore</a></code> | <code>MutArray&lt;str&gt;</code> | An array of glob patterns to exclude from matches. |
+| <code><a href="#@winglang/sdk.fs.GlobOptions.property.maxDepth">maxDepth</a></code> | <code>num</code> | Specify a number to limit the depth of the directory traversal to this many levels below the cwd. |
+| <code><a href="#@winglang/sdk.fs.GlobOptions.property.nodir">nodir</a></code> | <code>bool</code> | Do not match directories, only files. |
+
+---
+
+##### `absolute`<sup>Optional</sup> <a name="absolute" id="@winglang/sdk.fs.GlobOptions.property.absolute"></a>
+
+```wing
+absolute: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Set to `true` to always receive absolute paths for matched files.
+
+Set to `false` to always
+receive relative paths for matched files.
+
+---
+
+##### `cwd`<sup>Optional</sup> <a name="cwd" id="@winglang/sdk.fs.GlobOptions.property.cwd"></a>
+
+```wing
+cwd: str;
+```
+
+- *Type:* str
+- *Default:* process.cwd()
+
+The current working directory in which to search.
+
+---
+
+##### `dot`<sup>Optional</sup> <a name="dot" id="@winglang/sdk.fs.GlobOptions.property.dot"></a>
+
+```wing
+dot: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Include `.dot` files in normal matches and globstar matches. Note that an explicit dot in a portion of the pattern will always match dot files.
+
+---
+
+##### `follow`<sup>Optional</sup> <a name="follow" id="@winglang/sdk.fs.GlobOptions.property.follow"></a>
+
+```wing
+follow: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Follow symlinked directories when expanding `**` patterns.
+
+This can result in a lot of
+duplicate references in the presence of cyclic links, and make performance quite bad.
+
+---
+
+##### `ignore`<sup>Optional</sup> <a name="ignore" id="@winglang/sdk.fs.GlobOptions.property.ignore"></a>
+
+```wing
+ignore: MutArray<str>;
+```
+
+- *Type:* MutArray&lt;str&gt;
+- *Default:* []
+
+An array of glob patterns to exclude from matches.
+
+To ignore all children within a directory,
+as well as the entry itself, append '/**' to the ignore pattern.
+
+---
+
+##### `maxDepth`<sup>Optional</sup> <a name="maxDepth" id="@winglang/sdk.fs.GlobOptions.property.maxDepth"></a>
+
+```wing
+maxDepth: num;
+```
+
+- *Type:* num
+- *Default:* no limit
+
+Specify a number to limit the depth of the directory traversal to this many levels below the cwd.
+
+---
+
+##### `nodir`<sup>Optional</sup> <a name="nodir" id="@winglang/sdk.fs.GlobOptions.property.nodir"></a>
+
+```wing
+nodir: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Do not match directories, only files.
+
+(Note: to match only directories, put a `/` at the end of
+the pattern.)
+
+---
+
 ### Metadata <a name="Metadata" id="@winglang/sdk.fs.Metadata"></a>
 
 Metadata of a file system object.
diff --git a/docs/docs/04-standard-library/http/_category_.yml b/docs/docs/04-standard-library/http/_category_.yml
index 430675137f2..6cdcea5209b 100644
--- a/docs/docs/04-standard-library/http/_category_.yml
+++ b/docs/docs/04-standard-library/http/_category_.yml
@@ -1,3 +1,5 @@
 label: http
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/http/api-reference.md b/docs/docs/04-standard-library/http/api-reference.md
index 6de547347e1..a5b931eeeb5 100644
--- a/docs/docs/04-standard-library/http/api-reference.md
+++ b/docs/docs/04-standard-library/http/api-reference.md
@@ -8,7 +8,6 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -329,7 +328,7 @@ let RequestOptions = http.RequestOptions{ ... };
 | <code><a href="#@winglang/sdk.http.RequestOptions.property.cache">cache</a></code> | <code><a href="#@winglang/sdk.http.RequestCache">RequestCache</a></code> | The cache mode you want to use for the request. |
 | <code><a href="#@winglang/sdk.http.RequestOptions.property.headers">headers</a></code> | <code>MutMap&lt;str&gt;</code> | Any headers you want to add to your request. |
 | <code><a href="#@winglang/sdk.http.RequestOptions.property.method">method</a></code> | <code><a href="#@winglang/sdk.http.HttpMethod">HttpMethod</a></code> | The request method, e.g., GET, POST. The default is GET. |
-| <code><a href="#@winglang/sdk.http.RequestOptions.property.redirect">redirect</a></code> | <code><a href="#@winglang/sdk.http.RequestRedirect">RequestRedirect</a></code> | The redirect mode to use: follow, error. |
+| <code><a href="#@winglang/sdk.http.RequestOptions.property.redirect">redirect</a></code> | <code><a href="#@winglang/sdk.http.RequestRedirect">RequestRedirect</a></code> | An enum specifying the redirect mode to use: follow, error or manual. |
 | <code><a href="#@winglang/sdk.http.RequestOptions.property.referrer">referrer</a></code> | <code>str</code> | A string specifying "no-referrer", client, or a URL. |
 
 ---
@@ -355,6 +354,7 @@ cache: RequestCache;
 ```
 
 - *Type:* <a href="#@winglang/sdk.http.RequestCache">RequestCache</a>
+- *Default:* RequestCache.DEFAULT
 
 The cache mode you want to use for the request.
 
@@ -392,9 +392,9 @@ redirect: RequestRedirect;
 ```
 
 - *Type:* <a href="#@winglang/sdk.http.RequestRedirect">RequestRedirect</a>
-- *Default:* follow
+- *Default:* RequestRedirect.FOLLOW
 
-The redirect mode to use: follow, error.
+An enum specifying the redirect mode to use: follow, error or manual.
 
 The default is follow.
 
@@ -807,11 +807,22 @@ The redirect read-only property that contains the mode for how redirects are han
 
 | **Name** | **Description** |
 | --- | --- |
+| <code><a href="#@winglang/sdk.http.RequestRedirect.MANUAL">MANUAL</a></code> | Do not follow redirects automatically. |
 | <code><a href="#@winglang/sdk.http.RequestRedirect.FOLLOW">FOLLOW</a></code> | Follow all redirects incurred when fetching a resource. |
 | <code><a href="#@winglang/sdk.http.RequestRedirect.ERROR">ERROR</a></code> | Return a network error when a request is met with a redirect. |
 
 ---
 
+##### `MANUAL` <a name="MANUAL" id="@winglang/sdk.http.RequestRedirect.MANUAL"></a>
+
+Do not follow redirects automatically.
+
+The `Location` response header includes the redirect
+target.
+
+---
+
+
 ##### `FOLLOW` <a name="FOLLOW" id="@winglang/sdk.http.RequestRedirect.FOLLOW"></a>
 
 Follow all redirects incurred when fetching a resource.
diff --git a/docs/docs/04-standard-library/math/_category_.yml b/docs/docs/04-standard-library/math/_category_.yml
index 40cf5134897..782fee83615 100644
--- a/docs/docs/04-standard-library/math/_category_.yml
+++ b/docs/docs/04-standard-library/math/_category_.yml
@@ -1,3 +1,5 @@
 label: math
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/math/api-reference.md b/docs/docs/04-standard-library/math/api-reference.md
index 57be91c9734..d0bbd66381b 100644
--- a/docs/docs/04-standard-library/math/api-reference.md
+++ b/docs/docs/04-standard-library/math/api-reference.md
@@ -8,7 +8,6 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -45,6 +44,9 @@ Utility class for mathematical operations.
 | <code><a href="#@winglang/sdk.math.Util.harmonicMean">harmonicMean</a></code> | Calculates the harmonic mean of an array of numbers. |
 | <code><a href="#@winglang/sdk.math.Util.hypot">hypot</a></code> | Calculate the length of the vector from the origin to the point given by the coordinates. |
 | <code><a href="#@winglang/sdk.math.Util.isPrime">isPrime</a></code> | Checks if a number is prime. |
+| <code><a href="#@winglang/sdk.math.Util.log">log</a></code> | Returns the natural logarithm (base e) of a number. |
+| <code><a href="#@winglang/sdk.math.Util.log10">log10</a></code> | Returns the base-10 logarithm of a number. |
+| <code><a href="#@winglang/sdk.math.Util.log2">log2</a></code> | Returns the base-2 logarithm of a number. |
 | <code><a href="#@winglang/sdk.math.Util.max">max</a></code> | Returns the maximum value from an array of numbers. |
 | <code><a href="#@winglang/sdk.math.Util.median">median</a></code> | Calculates the median value of an array of numbers. |
 | <code><a href="#@winglang/sdk.math.Util.min">min</a></code> | Returns the minimum value from an array of numbers. |
@@ -53,9 +55,11 @@ Utility class for mathematical operations.
 | <code><a href="#@winglang/sdk.math.Util.random">random</a></code> | Generates a pseudo-random number between 0 and max (default of 1). |
 | <code><a href="#@winglang/sdk.math.Util.round">round</a></code> | Rounds the given number to the nearest integer. |
 | <code><a href="#@winglang/sdk.math.Util.sec">sec</a></code> | Calculates the secant of an angle (in radians). |
+| <code><a href="#@winglang/sdk.math.Util.sign">sign</a></code> | Returns 1 or -1, indicating the sign of the number passed as an argument, 0 for 0. |
 | <code><a href="#@winglang/sdk.math.Util.sin">sin</a></code> | Returns the sine of a number in radians. |
 | <code><a href="#@winglang/sdk.math.Util.sqrt">sqrt</a></code> | Returns the square root of a number. |
 | <code><a href="#@winglang/sdk.math.Util.tan">tan</a></code> | Returns the tangent of a number in radians. |
+| <code><a href="#@winglang/sdk.math.Util.toRadix">toRadix</a></code> | Convert a value to a new number base. |
 
 ---
 
@@ -471,6 +475,60 @@ The number to check for primality.
 
 ---
 
+##### `log` <a name="log" id="@winglang/sdk.math.Util.log"></a>
+
+```wing
+bring math;
+
+math.log(value: num);
+```
+
+Returns the natural logarithm (base e) of a number.
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.math.Util.log.parameter.value"></a>
+
+- *Type:* num
+
+The input number.
+
+---
+
+##### `log10` <a name="log10" id="@winglang/sdk.math.Util.log10"></a>
+
+```wing
+bring math;
+
+math.log10(value: num);
+```
+
+Returns the base-10 logarithm of a number.
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.math.Util.log10.parameter.value"></a>
+
+- *Type:* num
+
+The input number.
+
+---
+
+##### `log2` <a name="log2" id="@winglang/sdk.math.Util.log2"></a>
+
+```wing
+bring math;
+
+math.log2(value: num);
+```
+
+Returns the base-2 logarithm of a number.
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.math.Util.log2.parameter.value"></a>
+
+- *Type:* num
+
+The input number.
+
+---
+
 ##### `max` <a name="max" id="@winglang/sdk.math.Util.max"></a>
 
 ```wing
@@ -621,6 +679,24 @@ The angle in radians.
 
 ---
 
+##### `sign` <a name="sign" id="@winglang/sdk.math.Util.sign"></a>
+
+```wing
+bring math;
+
+math.sign(value: num);
+```
+
+Returns 1 or -1, indicating the sign of the number passed as an argument, 0 for 0.
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.math.Util.sign.parameter.value"></a>
+
+- *Type:* num
+
+The input number.
+
+---
+
 ##### `sin` <a name="sin" id="@winglang/sdk.math.Util.sin"></a>
 
 ```wing
@@ -675,6 +751,32 @@ A number representing an angle in radians.
 
 ---
 
+##### `toRadix` <a name="toRadix" id="@winglang/sdk.math.Util.toRadix"></a>
+
+```wing
+bring math;
+
+math.toRadix(value: num, base: num);
+```
+
+Convert a value to a new number base.
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.math.Util.toRadix.parameter.value"></a>
+
+- *Type:* num
+
+The number to be converted.
+
+---
+
+###### `base`<sup>Required</sup> <a name="base" id="@winglang/sdk.math.Util.toRadix.parameter.base"></a>
+
+- *Type:* num
+
+The base of the new value.
+
+---
+
 
 #### Constants <a name="Constants" id="Constants"></a>
 
diff --git a/docs/docs/04-standard-library/regex/_category_.yml b/docs/docs/04-standard-library/regex/_category_.yml
deleted file mode 100644
index 844a888a98d..00000000000
--- a/docs/docs/04-standard-library/regex/_category_.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-label: regex
-collapsible: true
-collapsed: true
diff --git a/docs/docs/04-standard-library/regex/api-reference.md b/docs/docs/04-standard-library/regex/api-reference.md
deleted file mode 100644
index 98ef5aee74c..00000000000
--- a/docs/docs/04-standard-library/regex/api-reference.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: API reference
-id: api-reference
-description: Wing standard library API reference for the regex module
-keywords: [Wing sdk, sdk, Wing API Reference]
-hide_title: true
-sidebar_position: 100
----
-
-<!-- This file is automatically generated. Do not edit manually. -->
-
-# API Reference <a name="API Reference" id="api-reference"></a>
-
-
-## Classes <a name="Classes" id="Classes"></a>
-
-### Regex <a name="Regex" id="@winglang/sdk.regex.Util"></a>
-
-Regex utilities and functions.
-
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.regex.Util.match">match</a></code> | Check if a regex pattern is matched by a given string. |
-
----
-
-##### `match` <a name="match" id="@winglang/sdk.regex.Util.match"></a>
-
-```wing
-bring regex;
-
-regex.match(pattern: str, text: str);
-```
-
-Check if a regex pattern is matched by a given string.
-
-###### `pattern`<sup>Required</sup> <a name="pattern" id="@winglang/sdk.regex.Util.match.parameter.pattern"></a>
-
-- *Type:* str
-
-regex pattern.
-
----
-
-###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.regex.Util.match.parameter.text"></a>
-
-- *Type:* str
-
-given input string.
-
----
-
-
-
-
-
diff --git a/docs/docs/04-standard-library/sim/_category_.yml b/docs/docs/04-standard-library/sim/_category_.yml
index be5b96dd52a..8cab680f364 100644
--- a/docs/docs/04-standard-library/sim/_category_.yml
+++ b/docs/docs/04-standard-library/sim/_category_.yml
@@ -1,3 +1,5 @@
 label: sim
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
diff --git a/docs/docs/04-standard-library/sim/api-reference.md b/docs/docs/04-standard-library/sim/api-reference.md
index e7ee2bed490..058af73e049 100644
--- a/docs/docs/04-standard-library/sim/api-reference.md
+++ b/docs/docs/04-standard-library/sim/api-reference.md
@@ -8,36 +8,33 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 ## Resources <a name="Resources" id="Resources"></a>
 
-### State <a name="State" id="@winglang/sdk.sim.State"></a>
+### Container <a name="Container" id="@winglang/sdk.sim.Container"></a>
 
 - *Implements:* <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
 
-Key/value in-memory state for the simulator.
-
-Use the preflight method `token(key)` to obtain a token that can be used to reference the value
-of the state at runtime.
-
-During deployment (i.e. `cloud.OnDeploy` or `cloud.Service` startup), you must call the inflight
-method `set(key, value)` to set the runtime value. The value will be available at runtime through
-the inflight method `get(key)` (or resolved as a token).
-
-See tests for examples.
+Represents a container running in the Wing Simulator.
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.sim.State.Initializer"></a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.sim.Container.Initializer"></a>
 
 ```wing
 bring sim;
 
-new sim.State();
+new sim.Container(props: ContainerProps);
 ```
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Container.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.sim.ContainerProps">ContainerProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.sim.Container.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.sim.ContainerProps">ContainerProps</a>
 
 ---
 
@@ -47,114 +44,236 @@ new sim.State();
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.sim.State.token">token</a></code> | Returns a token that can be used to retrieve the value of the state after the simulation has run. |
-| <code><a href="#@winglang/sdk.sim.State.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
+| <code><a href="#@winglang/sdk.sim.Container.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
 
-##### Inflight Methods
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.Container.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.sim.IStateClient.get">get</a></code> | Gets the runtime state of this object. |
-| <code><a href="#@winglang/sdk.sim.IStateClient.set">set</a></code> | Sets the state of runtime a runtime object. |
-| <code><a href="#@winglang/sdk.sim.IStateClient.tryGet">tryGet</a></code> | Checks if runtime state exists for this object and returns it's value. |
+| <code><a href="#@winglang/sdk.sim.Container.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.sim.Container.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
 
 ---
 
-##### `token` <a name="token" id="@winglang/sdk.sim.State.token"></a>
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.sim.Container.onLiftType"></a>
 
 ```wing
-token(key: str): str
+bring sim;
+
+sim.Container.onLiftType(host: IInflightHost, ops: MutArray<str>);
 ```
 
-Returns a token that can be used to retrieve the value of the state after the simulation has run.
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
 
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.State.token.parameter.key"></a>
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
 
-- *Type:* str
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
 
-The object key retrieved through the inflight `state.get()`.
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.sim.Container.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
 
 ---
 
-##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.State.toSimulator"></a>
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.sim.Container.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.sim.Container.toInflight"></a>
 
 ```wing
-toSimulator(): BaseResourceSchema
+bring sim;
+
+sim.Container.toInflight(obj: IResource);
 ```
 
-Convert this resource to a resource schema for the simulator.
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
 
-##### `get` <a name="get" id="@winglang/sdk.sim.IStateClient.get"></a>
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.sim.Container.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Container.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.sim.Container.property.hostPort">hostPort</a></code> | <code>str</code> | A token that resolves to the host port of this container. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.Container.property.node"></a>
 
 ```wing
-get(key: str): Json
+node: Node;
 ```
 
-Gets the runtime state of this object.
+- *Type:* constructs.Node
 
-Throws if there is no value for the given key.
+The tree node.
 
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.get.parameter.key"></a>
+---
+
+##### `hostPort`<sup>Optional</sup> <a name="hostPort" id="@winglang/sdk.sim.Container.property.hostPort"></a>
+
+```wing
+hostPort: str;
+```
 
 - *Type:* str
 
-The object's key.
+A token that resolves to the host port of this container.
 
 ---
 
-##### `set` <a name="set" id="@winglang/sdk.sim.IStateClient.set"></a>
+
+### Policy <a name="Policy" id="@winglang/sdk.sim.Policy"></a>
+
+- *Implements:* <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
+
+Implementation of `sim.Policy`.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.sim.Policy.Initializer"></a>
 
 ```wing
-set(key: str, value: Json): void
+bring sim;
+
+new sim.Policy(props: PolicyProps);
 ```
 
-Sets the state of runtime a runtime object.
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Policy.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.sim.PolicyProps">PolicyProps</a></code> | *No description.* |
 
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.set.parameter.key"></a>
+---
 
-- *Type:* str
+##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.sim.Policy.Initializer.parameter.props"></a>
 
-The object's key.
+- *Type:* <a href="#@winglang/sdk.sim.PolicyProps">PolicyProps</a>
 
 ---
 
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.sim.IStateClient.set.parameter.value"></a>
+#### Methods <a name="Methods" id="Methods"></a>
 
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
+##### Preflight Methods
 
-The object's value.
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Policy.addStatement">addStatement</a></code> | Adds a statement to the policy. |
+| <code><a href="#@winglang/sdk.sim.Policy.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
 
 ---
 
-##### `tryGet` <a name="tryGet" id="@winglang/sdk.sim.IStateClient.tryGet"></a>
+##### `addStatement` <a name="addStatement" id="@winglang/sdk.sim.Policy.addStatement"></a>
 
 ```wing
-tryGet(key: str): Json
+addStatement(resource: IResource, op: str): void
 ```
 
-Checks if runtime state exists for this object and returns it's value.
+Adds a statement to the policy.
 
-If no value exists,
-returns `nil`.
+###### `resource`<sup>Required</sup> <a name="resource" id="@winglang/sdk.sim.Policy.addStatement.parameter.resource"></a>
 
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.tryGet.parameter.key"></a>
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+###### `op`<sup>Required</sup> <a name="op" id="@winglang/sdk.sim.Policy.addStatement.parameter.op"></a>
 
 - *Type:* str
 
-The object's key.
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.Policy.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Policy.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.sim.Policy.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.sim.Policy.onLiftType"></a>
+
+```wing
+bring sim;
+
+sim.Policy.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.sim.Policy.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.sim.Policy.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
 
 ---
 
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.sim.Policy.toInflight"></a>
+
+```wing
+bring sim;
+
+sim.Policy.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.sim.Policy.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
 
 #### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.sim.State.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.sim.Policy.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
 
 ---
 
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.State.property.node"></a>
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.Policy.property.node"></a>
 
 ```wing
 node: Node;
@@ -167,17 +286,847 @@ The tree node.
 ---
 
 
+### Resource <a name="Resource" id="@winglang/sdk.sim.Resource"></a>
 
+- *Implements:* <a href="#@winglang/sdk.std.IResource">IResource</a>, <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>, <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>, <a href="#@winglang/sdk.sim.ISimulatorInflightHost">ISimulatorInflightHost</a>
 
-## Protocols <a name="Protocols" id="Protocols"></a>
+A backend for a simulated resource.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.sim.Resource.Initializer"></a>
+
+```wing
+bring sim;
+
+new sim.Resource(factory: IResourceFactory);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.Initializer.parameter.factory">factory</a></code> | <code><a href="#@winglang/sdk.sim.IResourceFactory">IResourceFactory</a></code> | *No description.* |
+
+---
+
+##### `factory`<sup>Required</sup> <a name="factory" id="@winglang/sdk.sim.Resource.Initializer.parameter.factory"></a>
+
+- *Type:* <a href="#@winglang/sdk.sim.IResourceFactory">IResourceFactory</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.addEnvironment">addEnvironment</a></code> | Add an environment variable to make available to the inflight code. |
+| <code><a href="#@winglang/sdk.sim.Resource.addPermission">addPermission</a></code> | Add a simulated permission to this inflight host. |
+| <code><a href="#@winglang/sdk.sim.Resource.createToken">createToken</a></code> | Obtain a token that can be used to reference an attribute of this resource that is only resolved once the resource is started in the simulator. |
+| <code><a href="#@winglang/sdk.sim.Resource.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResourceClient.call">call</a></code> | Call a method on the resource. |
+
+---
+
+##### `addEnvironment` <a name="addEnvironment" id="@winglang/sdk.sim.Resource.addEnvironment"></a>
+
+```wing
+addEnvironment(name: str, value: str): void
+```
+
+Add an environment variable to make available to the inflight code.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.Resource.addEnvironment.parameter.name"></a>
+
+- *Type:* str
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.sim.Resource.addEnvironment.parameter.value"></a>
+
+- *Type:* str
+
+---
+
+##### `addPermission` <a name="addPermission" id="@winglang/sdk.sim.Resource.addPermission"></a>
+
+```wing
+addPermission(resource: IResource, op: str): void
+```
+
+Add a simulated permission to this inflight host.
+
+###### `resource`<sup>Required</sup> <a name="resource" id="@winglang/sdk.sim.Resource.addPermission.parameter.resource"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+###### `op`<sup>Required</sup> <a name="op" id="@winglang/sdk.sim.Resource.addPermission.parameter.op"></a>
+
+- *Type:* str
+
+---
+
+##### `createToken` <a name="createToken" id="@winglang/sdk.sim.Resource.createToken"></a>
+
+```wing
+createToken(name: str): str
+```
+
+Obtain a token that can be used to reference an attribute of this resource that is only resolved once the resource is started in the simulator.
+
+If the token is used in inflight code or in the configuration of a simulated
+resource (e.g. as an environment variable), the relevant resource will
+automatically take a dependency on the resource the token belongs to.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.Resource.createToken.parameter.name"></a>
+
+- *Type:* str
+
+The name of the token.
+
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.Resource.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+##### `call` <a name="call" id="@winglang/sdk.sim.IResourceClient.call"></a>
+
+```wing
+inflight call(method: str, args?: MutArray<Json>): Json
+```
+
+Call a method on the resource.
+
+###### `method`<sup>Required</sup> <a name="method" id="@winglang/sdk.sim.IResourceClient.call.parameter.method"></a>
+
+- *Type:* str
+
+---
+
+###### `args`<sup>Optional</sup> <a name="args" id="@winglang/sdk.sim.IResourceClient.call.parameter.args"></a>
+
+- *Type:* MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.sim.Resource.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.sim.Resource.onLiftType"></a>
+
+```wing
+bring sim;
+
+sim.Resource.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.sim.Resource.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.sim.Resource.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.sim.Resource.toInflight"></a>
+
+```wing
+bring sim;
+
+sim.Resource.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.sim.Resource.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.Resource.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+### State <a name="State" id="@winglang/sdk.sim.State"></a>
+
+- *Implements:* <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
+
+Key/value in-memory state for the simulator.
+
+Use the preflight method `token(key)` to obtain a token that can be used to reference the value
+of the state at runtime.
+
+During deployment (i.e. `cloud.OnDeploy` or `cloud.Service` startup), you must call the inflight
+method `set(key, value)` to set the runtime value. The value will be available at runtime through
+the inflight method `get(key)` (or resolved as a token).
+
+See tests for examples.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.sim.State.Initializer"></a>
+
+```wing
+bring sim;
+
+new sim.State();
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.State.token">token</a></code> | Returns a token that can be used to retrieve the value of the state after the simulation has run. |
+| <code><a href="#@winglang/sdk.sim.State.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IStateClient.get">get</a></code> | Gets the runtime state of this object. |
+| <code><a href="#@winglang/sdk.sim.IStateClient.set">set</a></code> | Sets the state of runtime a runtime object. |
+| <code><a href="#@winglang/sdk.sim.IStateClient.tryGet">tryGet</a></code> | Checks if runtime state exists for this object and returns it's value. |
+
+---
+
+##### `token` <a name="token" id="@winglang/sdk.sim.State.token"></a>
+
+```wing
+token(key: str): str
+```
+
+Returns a token that can be used to retrieve the value of the state after the simulation has run.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.State.token.parameter.key"></a>
+
+- *Type:* str
+
+The object key retrieved through the inflight `state.get()`.
+
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.State.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+##### `get` <a name="get" id="@winglang/sdk.sim.IStateClient.get"></a>
+
+```wing
+inflight get(key: str): Json
+```
+
+Gets the runtime state of this object.
+
+Throws if there is no value for the given key.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.get.parameter.key"></a>
+
+- *Type:* str
+
+The object's key.
+
+---
+
+##### `set` <a name="set" id="@winglang/sdk.sim.IStateClient.set"></a>
+
+```wing
+inflight set(key: str, value: Json): void
+```
+
+Sets the state of runtime a runtime object.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.set.parameter.key"></a>
+
+- *Type:* str
+
+The object's key.
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.sim.IStateClient.set.parameter.value"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
+
+The object's value.
+
+---
+
+##### `tryGet` <a name="tryGet" id="@winglang/sdk.sim.IStateClient.tryGet"></a>
+
+```wing
+inflight tryGet(key: str): Json?
+```
+
+Checks if runtime state exists for this object and returns it's value.
+
+If no value exists,
+returns `nil`.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.tryGet.parameter.key"></a>
+
+- *Type:* str
+
+The object's key.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.State.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.sim.State.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.sim.State.onLiftType"></a>
+
+```wing
+bring sim;
+
+sim.State.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.sim.State.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.sim.State.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.sim.State.toInflight"></a>
+
+```wing
+bring sim;
+
+sim.State.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.sim.State.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.State.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.State.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### ContainerProps <a name="ContainerProps" id="@winglang/sdk.sim.ContainerProps"></a>
+
+Initialization properties for `sim.Container`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.sim.ContainerProps.Initializer"></a>
+
+```wing
+bring sim;
+
+let ContainerProps = sim.ContainerProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.image">image</a></code> | <code>str</code> | A name of a public Docker image to pull and run or a path to a local directory with a `Dockerfile`. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.name">name</a></code> | <code>str</code> | A name for the container. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.args">args</a></code> | <code>MutArray&lt;str&gt;</code> | Container arguments. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.containerPort">containerPort</a></code> | <code>num</code> | Internal container port to expose. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.entrypoint">entrypoint</a></code> | <code>str</code> | Container entrypoint. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to set in the container. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.network">network</a></code> | <code>str</code> | Docker network to use for the container - such as 'host', 'bridge', etc. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.sourceHash">sourceHash</a></code> | <code>str</code> | An explicit source hash that represents the container source. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.sourcePattern">sourcePattern</a></code> | <code>str</code> | A glob of local files to consider as input sources for the container, relative to the build context directory. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.volumes">volumes</a></code> | <code>MutArray&lt;str&gt;</code> | Volume mount points. |
+
+---
+
+##### `image`<sup>Required</sup> <a name="image" id="@winglang/sdk.sim.ContainerProps.property.image"></a>
+
+```wing
+image: str;
+```
+
+- *Type:* str
+
+A name of a public Docker image to pull and run or a path to a local directory with a `Dockerfile`.
+
+---
+
+##### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.ContainerProps.property.name"></a>
+
+```wing
+name: str;
+```
+
+- *Type:* str
+
+A name for the container.
+
+---
+
+##### `args`<sup>Optional</sup> <a name="args" id="@winglang/sdk.sim.ContainerProps.property.args"></a>
+
+```wing
+args: MutArray<str>;
+```
+
+- *Type:* MutArray&lt;str&gt;
+- *Default:* []
+
+Container arguments.
+
+---
+
+##### `containerPort`<sup>Optional</sup> <a name="containerPort" id="@winglang/sdk.sim.ContainerProps.property.containerPort"></a>
+
+```wing
+containerPort: num;
+```
+
+- *Type:* num
+- *Default:* no port exposed
+
+Internal container port to expose.
+
+---
+
+##### `entrypoint`<sup>Optional</sup> <a name="entrypoint" id="@winglang/sdk.sim.ContainerProps.property.entrypoint"></a>
+
+```wing
+entrypoint: str;
+```
+
+- *Type:* str
+- *Default:* default image entrypoint
+
+Container entrypoint.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.sim.ContainerProps.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* {}
+
+Environment variables to set in the container.
+
+---
+
+##### `network`<sup>Optional</sup> <a name="network" id="@winglang/sdk.sim.ContainerProps.property.network"></a>
+
+```wing
+network: str;
+```
+
+- *Type:* str
+- *Default:* default docker network
+
+Docker network to use for the container - such as 'host', 'bridge', etc.
+
+> [https://docs.docker.com/network.](https://docs.docker.com/network.)
+
+---
+
+*Example*
+
+```wing
+'host'
+```
+
+
+##### `sourceHash`<sup>Optional</sup> <a name="sourceHash" id="@winglang/sdk.sim.ContainerProps.property.sourceHash"></a>
+
+```wing
+sourceHash: str;
+```
+
+- *Type:* str
+- *Default:* calculated based on the source files
+
+An explicit source hash that represents the container source.
+
+if not set, and `sourcePattern`
+is set, the hash will be calculated based on the content of the source files.
+
+---
+
+##### `sourcePattern`<sup>Optional</sup> <a name="sourcePattern" id="@winglang/sdk.sim.ContainerProps.property.sourcePattern"></a>
+
+```wing
+sourcePattern: str;
+```
+
+- *Type:* str
+- *Default:* all files
+
+A glob of local files to consider as input sources for the container, relative to the build context directory.
+
+---
+
+##### `volumes`<sup>Optional</sup> <a name="volumes" id="@winglang/sdk.sim.ContainerProps.property.volumes"></a>
+
+```wing
+volumes: MutArray<str>;
+```
+
+- *Type:* MutArray&lt;str&gt;
+- *Default:* []
+
+Volume mount points.
+
+---
+
+*Example*
+
+```wing
+['/host:/container']
+```
+
+
+### PolicyProps <a name="PolicyProps" id="@winglang/sdk.sim.PolicyProps"></a>
+
+Options for `sim.Policy`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.sim.PolicyProps.Initializer"></a>
+
+```wing
+bring sim;
+
+let PolicyProps = sim.PolicyProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.PolicyProps.property.principal">principal</a></code> | <code><a href="#@winglang/sdk.std.IResource">IResource</a></code> | The resource to which the policy is attached. |
+
+---
+
+##### `principal`<sup>Required</sup> <a name="principal" id="@winglang/sdk.sim.PolicyProps.property.principal"></a>
+
+```wing
+principal: IResource;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+The resource to which the policy is attached.
+
+---
+
+## Protocols <a name="Protocols" id="Protocols"></a>
+
+### IResource <a name="IResource" id="@winglang/sdk.sim.IResource"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResource">IResource</a>
+
+Contract that a resource backend must implement.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResource.onStop">onStop</a></code> | Runs when the resource is stopped. |
+
+---
+
+##### `onStop` <a name="onStop" id="@winglang/sdk.sim.IResource.onStop"></a>
+
+```wing
+onStop(): void
+```
+
+Runs when the resource is stopped.
+
+
+### IResourceContext <a name="IResourceContext" id="@winglang/sdk.sim.IResourceContext"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResourceContext">IResourceContext</a>
+
+Context for implementing a simulator resource.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResourceContext.log">log</a></code> | Log a message at the current point in time. |
+| <code><a href="#@winglang/sdk.sim.IResourceContext.resolveToken">resolveToken</a></code> | Resolves a token value. |
+| <code><a href="#@winglang/sdk.sim.IResourceContext.statedir">statedir</a></code> | The directory for the resource's state. |
+
+---
+
+##### `log` <a name="log" id="@winglang/sdk.sim.IResourceContext.log"></a>
+
+```wing
+inflight log(message: str, level?: LogLevel): void
+```
+
+Log a message at the current point in time.
+
+Defaults to `info` level.
+
+###### `message`<sup>Required</sup> <a name="message" id="@winglang/sdk.sim.IResourceContext.log.parameter.message"></a>
+
+- *Type:* str
+
+The message to log.
+
+---
+
+###### `level`<sup>Optional</sup> <a name="level" id="@winglang/sdk.sim.IResourceContext.log.parameter.level"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.LogLevel">LogLevel</a>
+
+The severity of the message.
+
+---
+
+##### `resolveToken` <a name="resolveToken" id="@winglang/sdk.sim.IResourceContext.resolveToken"></a>
+
+```wing
+inflight resolveToken(name: str, value: str): void
+```
+
+Resolves a token value.
+
+All tokens must be resolved during the
+constructor of the resource.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.IResourceContext.resolveToken.parameter.name"></a>
+
+- *Type:* str
+
+The name of the token.
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.sim.IResourceContext.resolveToken.parameter.value"></a>
+
+- *Type:* str
+
+The value of the token.
+
+---
+
+##### `statedir` <a name="statedir" id="@winglang/sdk.sim.IResourceContext.statedir"></a>
+
+```wing
+statedir(): str
+```
+
+The directory for the resource's state.
+
+
+### IResourceFactory <a name="IResourceFactory" id="@winglang/sdk.sim.IResourceFactory"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResourceFactory">IResourceFactory</a>
+
+**Inflight client:** [@winglang/sdk.sim.IResourceFactoryClient](#@winglang/sdk.sim.IResourceFactoryClient)
+
+A resource with an inflight "handle" method that can be passed to the `sim.Resource` constructor.
+
+
+
+### IResourceFactoryClient <a name="IResourceFactoryClient" id="@winglang/sdk.sim.IResourceFactoryClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResourceFactoryClient">IResourceFactoryClient</a>
+
+A resource with an inflight "handle" method that can be passed to the `sim.Resource` constructor.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResourceFactoryClient.handle">handle</a></code> | Function that will be called to initialize the simulator resource. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.sim.IResourceFactoryClient.handle"></a>
+
+```wing
+inflight handle(context: IResourceContext): IResource?
+```
+
+Function that will be called to initialize the simulator resource.
+
+To implement a shutdown sequence, return an object that implements the `IResource` inflight interface with an `onStop()` method.
+
+###### `context`<sup>Required</sup> <a name="context" id="@winglang/sdk.sim.IResourceFactoryClient.handle.parameter.context"></a>
+
+- *Type:* <a href="#@winglang/sdk.sim.IResourceContext">IResourceContext</a>
+
+---
+
+
+### ISimulatorInflightHost <a name="ISimulatorInflightHost" id="@winglang/sdk.sim.ISimulatorInflightHost"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.Resource">Resource</a>, <a href="#@winglang/sdk.sim.ISimulatorInflightHost">ISimulatorInflightHost</a>
+
+Interfaces shared by all preflight classes that host inflight code.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.ISimulatorInflightHost.addPermission">addPermission</a></code> | Add a simulated permission to this inflight host. |
+
+---
+
+##### `addPermission` <a name="addPermission" id="@winglang/sdk.sim.ISimulatorInflightHost.addPermission"></a>
+
+```wing
+addPermission(resource: IResource, op: str): void
+```
+
+Add a simulated permission to this inflight host.
+
+###### `resource`<sup>Required</sup> <a name="resource" id="@winglang/sdk.sim.ISimulatorInflightHost.addPermission.parameter.resource"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+The resource to add.
+
+---
+
+###### `op`<sup>Required</sup> <a name="op" id="@winglang/sdk.sim.ISimulatorInflightHost.addPermission.parameter.op"></a>
+
+- *Type:* str
+
+The action to add.
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.ISimulatorInflightHost.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.ISimulatorInflightHost.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
 
 ### ISimulatorResource <a name="ISimulatorResource" id="@winglang/sdk.sim.ISimulatorResource"></a>
 
 - *Extends:* <a href="#@winglang/sdk.std.IResource">IResource</a>
 
-- *Implemented By:* <a href="#@winglang/sdk.sim.State">State</a>, <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
+- *Implemented By:* <a href="#@winglang/sdk.sim.Container">Container</a>, <a href="#@winglang/sdk.sim.Policy">Policy</a>, <a href="#@winglang/sdk.sim.Resource">Resource</a>, <a href="#@winglang/sdk.sim.State">State</a>, <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
 
-Interfaces shared by all polycon implementations (preflight classes) targeting the simulator.
+Interfaces shared by all preflight classes targeting the simulator.
 
 #### Methods <a name="Methods" id="Methods"></a>
 
@@ -190,7 +1139,7 @@ Interfaces shared by all polycon implementations (preflight classes) targeting t
 ##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.ISimulatorResource.toSimulator"></a>
 
 ```wing
-toSimulator(): BaseResourceSchema
+toSimulator(): ToSimulatorOutput
 ```
 
 Convert this resource to a resource schema for the simulator.
diff --git a/docs/docs/04-standard-library/sim/container.md b/docs/docs/04-standard-library/sim/container.md
new file mode 100644
index 00000000000..086e22c58ab
--- /dev/null
+++ b/docs/docs/04-standard-library/sim/container.md
@@ -0,0 +1,394 @@
+---
+title: Container
+id: container
+description: Runs a container in the Wing Simulator
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    docker,
+    container,
+    docker compose,
+    simulator
+  ]
+---
+
+The `sim.Container` resource allows running containers in the Wing Simulator:
+
+```js
+bring sim;
+bring http;
+
+let c = new sim.Container(
+  name: "http-echo",
+  image: "hashicorp/http-echo",
+  containerPort: 5678,
+  args: ["-text=bang"],
+);
+
+test "send request" {
+  http.get("http://localhost:{c.hostPort}");
+}
+```
+
+There is also support for building containers from a local directory with a `Dockerfile`:
+
+```js
+new sim.Container(
+  name: "my-service",
+  image: "./my-service",
+  containerPort: 8080,
+);
+```
+
+### Retaining state
+
+When the Wing Console is closed, all containers are stopped and removed.
+To retain the state of a container across console restarts, you can mount an anonymous volume:
+
+```js
+new sim.Container(
+  name: "my-service",
+  image: "./my-service",
+  containerPort: 8080,
+  volumes: ["/var/data"],
+);
+```
+
+Wing will automatically name each unnamed volume in `volumes`, and reuse the named
+volumes across console restarts.
+
+## API
+
+* `name` - a name for the container.
+* `image` - a name of a public Docker image to pull and run or a path to a local directory with a
+  `Dockerfile`.
+* `containerPort` - a TCP port to expose from the container (optional).
+* `env` - environment variables to set in the container.
+* `args` - container entrypoint arguments
+* `sourcePattern` - a glob pattern to use to match the files for calculating the source hash when
+  determining if a rebuild is needed. By default this is all the files in the docker build context
+  directory (and below).
+* `sourceHash` - An explicit source hash that represents the container source. if not set, and
+  `sourcePattern` is set, the hash will be calculated based on the content of the source files.
+
+# API Reference <a name="API Reference" id="api-reference"></a>
+
+## Resources <a name="Resources" id="Resources"></a>
+
+### Container <a name="Container" id="@winglang/sdk.sim.Container"></a>
+
+- *Implements:* <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
+
+Represents a container running in the Wing Simulator.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.sim.Container.Initializer"></a>
+
+```wing
+bring sim;
+
+new sim.Container(props: ContainerProps);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Container.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.sim.ContainerProps">ContainerProps</a></code> | *No description.* |
+
+---
+
+##### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.sim.Container.Initializer.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.sim.ContainerProps">ContainerProps</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Container.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
+
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.Container.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Container.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.sim.Container.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.sim.Container.onLiftType"></a>
+
+```wing
+bring sim;
+
+sim.Container.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.sim.Container.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.sim.Container.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.sim.Container.toInflight"></a>
+
+```wing
+bring sim;
+
+sim.Container.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.sim.Container.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Container.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.sim.Container.property.hostPort">hostPort</a></code> | <code>str</code> | A token that resolves to the host port of this container. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.Container.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+##### `hostPort`<sup>Optional</sup> <a name="hostPort" id="@winglang/sdk.sim.Container.property.hostPort"></a>
+
+```wing
+hostPort: str;
+```
+
+- *Type:* str
+
+A token that resolves to the host port of this container.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### ContainerProps <a name="ContainerProps" id="@winglang/sdk.sim.ContainerProps"></a>
+
+Initialization properties for `sim.Container`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.sim.ContainerProps.Initializer"></a>
+
+```wing
+bring sim;
+
+let ContainerProps = sim.ContainerProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.image">image</a></code> | <code>str</code> | A name of a public Docker image to pull and run or a path to a local directory with a `Dockerfile`. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.name">name</a></code> | <code>str</code> | A name for the container. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.args">args</a></code> | <code>MutArray&lt;str&gt;</code> | Container arguments. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.containerPort">containerPort</a></code> | <code>num</code> | Internal container port to expose. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.entrypoint">entrypoint</a></code> | <code>str</code> | Container entrypoint. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables to set in the container. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.network">network</a></code> | <code>str</code> | Docker network to use for the container - such as 'host', 'bridge', etc. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.sourceHash">sourceHash</a></code> | <code>str</code> | An explicit source hash that represents the container source. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.sourcePattern">sourcePattern</a></code> | <code>str</code> | A glob of local files to consider as input sources for the container, relative to the build context directory. |
+| <code><a href="#@winglang/sdk.sim.ContainerProps.property.volumes">volumes</a></code> | <code>MutArray&lt;str&gt;</code> | Volume mount points. |
+
+---
+
+##### `image`<sup>Required</sup> <a name="image" id="@winglang/sdk.sim.ContainerProps.property.image"></a>
+
+```wing
+image: str;
+```
+
+- *Type:* str
+
+A name of a public Docker image to pull and run or a path to a local directory with a `Dockerfile`.
+
+---
+
+##### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.ContainerProps.property.name"></a>
+
+```wing
+name: str;
+```
+
+- *Type:* str
+
+A name for the container.
+
+---
+
+##### `args`<sup>Optional</sup> <a name="args" id="@winglang/sdk.sim.ContainerProps.property.args"></a>
+
+```wing
+args: MutArray<str>;
+```
+
+- *Type:* MutArray&lt;str&gt;
+- *Default:* []
+
+Container arguments.
+
+---
+
+##### `containerPort`<sup>Optional</sup> <a name="containerPort" id="@winglang/sdk.sim.ContainerProps.property.containerPort"></a>
+
+```wing
+containerPort: num;
+```
+
+- *Type:* num
+- *Default:* no port exposed
+
+Internal container port to expose.
+
+---
+
+##### `entrypoint`<sup>Optional</sup> <a name="entrypoint" id="@winglang/sdk.sim.ContainerProps.property.entrypoint"></a>
+
+```wing
+entrypoint: str;
+```
+
+- *Type:* str
+- *Default:* default image entrypoint
+
+Container entrypoint.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.sim.ContainerProps.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* {}
+
+Environment variables to set in the container.
+
+---
+
+##### `network`<sup>Optional</sup> <a name="network" id="@winglang/sdk.sim.ContainerProps.property.network"></a>
+
+```wing
+network: str;
+```
+
+- *Type:* str
+- *Default:* default docker network
+
+Docker network to use for the container - such as 'host', 'bridge', etc.
+
+> [https://docs.docker.com/network.](https://docs.docker.com/network.)
+
+---
+
+*Example*
+
+```wing
+'host'
+```
+
+
+##### `sourceHash`<sup>Optional</sup> <a name="sourceHash" id="@winglang/sdk.sim.ContainerProps.property.sourceHash"></a>
+
+```wing
+sourceHash: str;
+```
+
+- *Type:* str
+- *Default:* calculated based on the source files
+
+An explicit source hash that represents the container source.
+
+if not set, and `sourcePattern`
+is set, the hash will be calculated based on the content of the source files.
+
+---
+
+##### `sourcePattern`<sup>Optional</sup> <a name="sourcePattern" id="@winglang/sdk.sim.ContainerProps.property.sourcePattern"></a>
+
+```wing
+sourcePattern: str;
+```
+
+- *Type:* str
+- *Default:* all files
+
+A glob of local files to consider as input sources for the container, relative to the build context directory.
+
+---
+
+##### `volumes`<sup>Optional</sup> <a name="volumes" id="@winglang/sdk.sim.ContainerProps.property.volumes"></a>
+
+```wing
+volumes: MutArray<str>;
+```
+
+- *Type:* MutArray&lt;str&gt;
+- *Default:* []
+
+Volume mount points.
+
+---
+
+*Example*
+
+```wing
+['/host:/container']
+```
+
+
+
diff --git a/docs/docs/04-standard-library/sim/resource.md b/docs/docs/04-standard-library/sim/resource.md
new file mode 100644
index 00000000000..b891461b412
--- /dev/null
+++ b/docs/docs/04-standard-library/sim/resource.md
@@ -0,0 +1,657 @@
+---
+title: Resource
+id: resource
+description: Model a simulated resource with a lifecycle.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    Resource,
+    Simulator
+  ]
+---
+
+The `sim.Resource` class models a simulated resource with a lifecycle.
+It's can be used to represent any cloud service where API calls are made over HTTP
+to interact with the service at runtime.
+
+## Usage
+
+As an example, suppose we want to simulate a service that stores a number, like the one in `cloud.Counter`, which has two methods: `inc` and `peek`.
+
+First, we'll define an inflight class that represents the service's backend:
+
+```js
+bring sim;
+
+// a resource backend must implement IResource
+inflight class CounterBackend impl sim.IResource {
+  var counter: num;
+
+  new(ctx: sim.IResourceContext) {
+    // startup code
+    this.counter = 0;
+  }
+
+  pub onStop() {
+    // shutdown code
+  }
+
+  pub inc(n: num?): num {
+    let p = this.counter;
+    this.counter += (n ?? 1);
+    return p;
+  }
+
+  pub peek(): num {
+    return this.counter;
+  }
+}
+```
+
+Each `CounterBackend` object that's created will have its own state.
+It will be initialized by the simulator with its constructor (the `new()` method), and shut down using its `onStop` method.
+
+From the perspective of `CounterBackend`, its `inc` and `peek` methods are always called serially, even if requests are made concurrently from other resources.
+
+Next, we have to define a preflight class which represents the service's frontend:
+
+```js
+class Counter {
+  backend: sim.Resource;
+
+  new() {
+    // this is a "backend factory". it returns an inflight class that implements the
+    // resource.
+    let factory = inflight (ctx): sim.IResource => {
+      return new CounterBackend(ctx);
+    };
+
+    this.backend = new sim.Resource(factory);
+  }
+
+  pub inflight inc(n: num?): num {
+    let response = this.backend.call("inc", [Json (n ?? 1)]);
+    return num.fromJson(response);
+  }
+
+  pub inflight peek(): num {
+    let response = this.backend.call("peek");
+    return num.fromJson(response);
+  }
+}
+```
+
+The `Counter` class is a simple wrapper around the `CounterBackend` class. It provides a way to interact with the resource using the `inc` and `peek` methods.
+
+`sim.Resource` has an inflight method named `call` that takes the name of a method to call and an array of arguments, and returns the serialized response from the resource.
+The arguments are serialized and sent to the resource over HTTP, which will process the request and returns a serialized response.
+
+> Note: Since the `call` method makes networked requests, it's important that the resource implementation provided by the inflight class responds in a timely manner.
+> If the resource takes over 30 seconds to respond, `call` will throw an error, and the simulator will terminate the resource.
+
+The `Counter` class can be used like this:
+
+```js
+let c = new Counter();
+
+new cloud.Function(inflight () => {
+  log("counter is {c.peek()}");
+  c.inc();
+  log("counter is now {c.peek()}");
+});
+```
+
+### Serializability
+
+Methods that are called on a `sim.Resource` instance must be serializable, meaning
+all of their arguments and return values must be serializable.
+
+The following types are serializable:
+
+- `num`
+- `str`
+- `bool`
+- `Json`
+- `Array`
+- `Map`
+- `T?` where `T` is a serializable type
+- enums
+- structs that contain only serializable types
+
+The `call` function on `sim.Resource` only supports arguments that are valid `Json` values.
+To convert a value to `Json`, use the `Json` constructor:
+
+```js
+let x: num = 5;
+let y: str = "a";
+this.backend.call("myMethod", Json [x, y]);
+```
+
+Return values can be converted back from `Json` using an appropriate `fromJson` method.
+
+```js
+let response = this.backend.call("myMethod");
+let result: num = num.fromJson(response);
+```
+
+> Note: some types are missing `fromJson` methods. To work around this, you may use `unsafeCast()` to cast the value into the desired type.
+>
+> ```js
+> let response = this.backend.call("myOtherMethod");
+> let result: MyEnum = unsafeCast(response);
+> ```
+
+### Late-bound Tokens
+
+Consider a use case where there is an attribute of a simulated service that only gets resolved during initialization (e.g. the exposed port of a container).
+In order to create such resources, we need a way to obtain a lazy token that gets resolved during simulator initialization.
+
+Use the preflight method `resource.createToken(key)` to obtain a token that can be used to reference the value of the attribute at runtime.
+
+During resource simulation, you must call `ctx.resolveToken(key, value)` during a resource's constructor method to set the runtime value.
+
+```js playground
+inflight class MyResourceBackend impl sim.IResource {
+  new(ctx: sim.IResourceContext) {
+    ctx.resolveToken("startTime", "2023-10-16T20:47:39.511Z");
+  }
+
+  pub onStop() {}
+}
+
+class MyResource {
+  backend: sim.Resource;
+  pub startTime: str;
+
+  new() {
+    this.backend = new sim.Resource(inflight () => {
+      return new MyResourceBackend();
+    });
+    this.startTime = this.backend.createToken("startTime");
+  }
+}
+
+let r = new MyResource();
+
+new cloud.Function(inflight () => {
+  let time = util.env("START_TIME");
+  log("start time is {time}");
+}, env: {
+  START_TIME: r.startTime, // lazy token can be used in preflight configuration
+});
+
+// ...or you can use it directly inflight, where the value is automatically resolved
+
+new cloud.Function(inflight () => {
+  log("start time is {r.startTime}");
+});
+```
+# API Reference <a name="API Reference" id="api-reference"></a>
+
+## Resources <a name="Resources" id="Resources"></a>
+
+### Resource <a name="Resource" id="@winglang/sdk.sim.Resource"></a>
+
+- *Implements:* <a href="#@winglang/sdk.std.IResource">IResource</a>, <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>, <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>, <a href="#@winglang/sdk.sim.ISimulatorInflightHost">ISimulatorInflightHost</a>
+
+A backend for a simulated resource.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.sim.Resource.Initializer"></a>
+
+```wing
+bring sim;
+
+new sim.Resource(factory: IResourceFactory);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.Initializer.parameter.factory">factory</a></code> | <code><a href="#@winglang/sdk.sim.IResourceFactory">IResourceFactory</a></code> | *No description.* |
+
+---
+
+##### `factory`<sup>Required</sup> <a name="factory" id="@winglang/sdk.sim.Resource.Initializer.parameter.factory"></a>
+
+- *Type:* <a href="#@winglang/sdk.sim.IResourceFactory">IResourceFactory</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.addEnvironment">addEnvironment</a></code> | Add an environment variable to make available to the inflight code. |
+| <code><a href="#@winglang/sdk.sim.Resource.addPermission">addPermission</a></code> | Add a simulated permission to this inflight host. |
+| <code><a href="#@winglang/sdk.sim.Resource.createToken">createToken</a></code> | Obtain a token that can be used to reference an attribute of this resource that is only resolved once the resource is started in the simulator. |
+| <code><a href="#@winglang/sdk.sim.Resource.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResourceClient.call">call</a></code> | Call a method on the resource. |
+
+---
+
+##### `addEnvironment` <a name="addEnvironment" id="@winglang/sdk.sim.Resource.addEnvironment"></a>
+
+```wing
+addEnvironment(name: str, value: str): void
+```
+
+Add an environment variable to make available to the inflight code.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.Resource.addEnvironment.parameter.name"></a>
+
+- *Type:* str
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.sim.Resource.addEnvironment.parameter.value"></a>
+
+- *Type:* str
+
+---
+
+##### `addPermission` <a name="addPermission" id="@winglang/sdk.sim.Resource.addPermission"></a>
+
+```wing
+addPermission(resource: IResource, op: str): void
+```
+
+Add a simulated permission to this inflight host.
+
+###### `resource`<sup>Required</sup> <a name="resource" id="@winglang/sdk.sim.Resource.addPermission.parameter.resource"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+###### `op`<sup>Required</sup> <a name="op" id="@winglang/sdk.sim.Resource.addPermission.parameter.op"></a>
+
+- *Type:* str
+
+---
+
+##### `createToken` <a name="createToken" id="@winglang/sdk.sim.Resource.createToken"></a>
+
+```wing
+createToken(name: str): str
+```
+
+Obtain a token that can be used to reference an attribute of this resource that is only resolved once the resource is started in the simulator.
+
+If the token is used in inflight code or in the configuration of a simulated
+resource (e.g. as an environment variable), the relevant resource will
+automatically take a dependency on the resource the token belongs to.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.Resource.createToken.parameter.name"></a>
+
+- *Type:* str
+
+The name of the token.
+
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.Resource.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+##### `call` <a name="call" id="@winglang/sdk.sim.IResourceClient.call"></a>
+
+```wing
+inflight call(method: str, args?: MutArray<Json>): Json
+```
+
+Call a method on the resource.
+
+###### `method`<sup>Required</sup> <a name="method" id="@winglang/sdk.sim.IResourceClient.call.parameter.method"></a>
+
+- *Type:* str
+
+---
+
+###### `args`<sup>Optional</sup> <a name="args" id="@winglang/sdk.sim.IResourceClient.call.parameter.args"></a>
+
+- *Type:* MutArray&lt;<a href="#@winglang/sdk.std.Json">Json</a>&gt;
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.sim.Resource.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.sim.Resource.onLiftType"></a>
+
+```wing
+bring sim;
+
+sim.Resource.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.sim.Resource.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.sim.Resource.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.sim.Resource.toInflight"></a>
+
+```wing
+bring sim;
+
+sim.Resource.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.sim.Resource.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.Resource.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.Resource.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+
+
+## Protocols <a name="Protocols" id="Protocols"></a>
+
+### IResource <a name="IResource" id="@winglang/sdk.sim.IResource"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResource">IResource</a>
+
+Contract that a resource backend must implement.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResource.onStop">onStop</a></code> | Runs when the resource is stopped. |
+
+---
+
+##### `onStop` <a name="onStop" id="@winglang/sdk.sim.IResource.onStop"></a>
+
+```wing
+onStop(): void
+```
+
+Runs when the resource is stopped.
+
+
+### IResourceContext <a name="IResourceContext" id="@winglang/sdk.sim.IResourceContext"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResourceContext">IResourceContext</a>
+
+Context for implementing a simulator resource.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResourceContext.log">log</a></code> | Log a message at the current point in time. |
+| <code><a href="#@winglang/sdk.sim.IResourceContext.resolveToken">resolveToken</a></code> | Resolves a token value. |
+| <code><a href="#@winglang/sdk.sim.IResourceContext.statedir">statedir</a></code> | The directory for the resource's state. |
+
+---
+
+##### `log` <a name="log" id="@winglang/sdk.sim.IResourceContext.log"></a>
+
+```wing
+inflight log(message: str, level?: LogLevel): void
+```
+
+Log a message at the current point in time.
+
+Defaults to `info` level.
+
+###### `message`<sup>Required</sup> <a name="message" id="@winglang/sdk.sim.IResourceContext.log.parameter.message"></a>
+
+- *Type:* str
+
+The message to log.
+
+---
+
+###### `level`<sup>Optional</sup> <a name="level" id="@winglang/sdk.sim.IResourceContext.log.parameter.level"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.LogLevel">LogLevel</a>
+
+The severity of the message.
+
+---
+
+##### `resolveToken` <a name="resolveToken" id="@winglang/sdk.sim.IResourceContext.resolveToken"></a>
+
+```wing
+inflight resolveToken(name: str, value: str): void
+```
+
+Resolves a token value.
+
+All tokens must be resolved during the
+constructor of the resource.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.sim.IResourceContext.resolveToken.parameter.name"></a>
+
+- *Type:* str
+
+The name of the token.
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.sim.IResourceContext.resolveToken.parameter.value"></a>
+
+- *Type:* str
+
+The value of the token.
+
+---
+
+##### `statedir` <a name="statedir" id="@winglang/sdk.sim.IResourceContext.statedir"></a>
+
+```wing
+statedir(): str
+```
+
+The directory for the resource's state.
+
+
+### IResourceFactory <a name="IResourceFactory" id="@winglang/sdk.sim.IResourceFactory"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResourceFactory">IResourceFactory</a>
+
+**Inflight client:** [@winglang/sdk.sim.IResourceFactoryClient](#@winglang/sdk.sim.IResourceFactoryClient)
+
+A resource with an inflight "handle" method that can be passed to the `sim.Resource` constructor.
+
+
+
+### IResourceFactoryClient <a name="IResourceFactoryClient" id="@winglang/sdk.sim.IResourceFactoryClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.IResourceFactoryClient">IResourceFactoryClient</a>
+
+A resource with an inflight "handle" method that can be passed to the `sim.Resource` constructor.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IResourceFactoryClient.handle">handle</a></code> | Function that will be called to initialize the simulator resource. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.sim.IResourceFactoryClient.handle"></a>
+
+```wing
+inflight handle(context: IResourceContext): IResource?
+```
+
+Function that will be called to initialize the simulator resource.
+
+To implement a shutdown sequence, return an object that implements the `IResource` inflight interface with an `onStop()` method.
+
+###### `context`<sup>Required</sup> <a name="context" id="@winglang/sdk.sim.IResourceFactoryClient.handle.parameter.context"></a>
+
+- *Type:* <a href="#@winglang/sdk.sim.IResourceContext">IResourceContext</a>
+
+---
+
+
+### ISimulatorInflightHost <a name="ISimulatorInflightHost" id="@winglang/sdk.sim.ISimulatorInflightHost"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.Resource">Resource</a>, <a href="#@winglang/sdk.sim.ISimulatorInflightHost">ISimulatorInflightHost</a>
+
+Interfaces shared by all preflight classes that host inflight code.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.ISimulatorInflightHost.addPermission">addPermission</a></code> | Add a simulated permission to this inflight host. |
+
+---
+
+##### `addPermission` <a name="addPermission" id="@winglang/sdk.sim.ISimulatorInflightHost.addPermission"></a>
+
+```wing
+addPermission(resource: IResource, op: str): void
+```
+
+Add a simulated permission to this inflight host.
+
+###### `resource`<sup>Required</sup> <a name="resource" id="@winglang/sdk.sim.ISimulatorInflightHost.addPermission.parameter.resource"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+The resource to add.
+
+---
+
+###### `op`<sup>Required</sup> <a name="op" id="@winglang/sdk.sim.ISimulatorInflightHost.addPermission.parameter.op"></a>
+
+- *Type:* str
+
+The action to add.
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.ISimulatorInflightHost.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.ISimulatorInflightHost.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+### ISimulatorResource <a name="ISimulatorResource" id="@winglang/sdk.sim.ISimulatorResource"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.sim.Container">Container</a>, <a href="#@winglang/sdk.sim.Policy">Policy</a>, <a href="#@winglang/sdk.sim.Resource">Resource</a>, <a href="#@winglang/sdk.sim.State">State</a>, <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
+
+Interfaces shared by all preflight classes targeting the simulator.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.ISimulatorResource.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
+
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.ISimulatorResource.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.ISimulatorResource.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.ISimulatorResource.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
diff --git a/docs/docs/04-standard-library/sim/state.md b/docs/docs/04-standard-library/sim/state.md
new file mode 100644
index 00000000000..9d21fdd00e8
--- /dev/null
+++ b/docs/docs/04-standard-library/sim/state.md
@@ -0,0 +1,283 @@
+---
+title: State
+id: state
+description: Key/value in-memory state for the simulator.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    In-memory state,
+    State,
+    Simulator
+  ]
+---
+
+The `sim.State` is a simple key/value in-memory store for the simulator with support for lazy
+tokens.
+
+Consider a use case where there is an attribute of a simulated service that only gets resolved during initialization (e.g. the exposed port of a container). In order to create such resources, we need a way to obtain a lazy token that gets resolved during simulator initialization. It just so happens that we already have a mechanism like this, but it was not exposed as a public API.
+
+Use the preflight method `state.token(key)` to obtain a token that can be used to reference the
+value of the state at runtime.
+
+During simulator app initialization (i.e. `cloud.OnDeploy` or `cloud.Service` startup), you must
+call the inflight method `state.set(key, value)` to set the runtime value. The value will be
+available at runtime through the inflight method `state.get(key)`, or via a resolved token.
+
+## Usage
+
+Let's say I want to create a simulated service that has property called `startTime` which returns
+the time the service was started. This information is also known when the service is actually
+initialized.
+
+```js
+bring cloud;
+bring sim;
+
+class MyService {
+  startTime: str;
+
+  new() {
+    let state = new sim.State();
+
+    new cloud.Service(inflight () => {
+      state.set("start", std.Datetime.utcNow().toIso());
+    });
+
+    this.startTime = state.token("start");
+  }
+}
+```
+
+In this example, the `startTime` property will resolve to a *simulator token* (something like
+`${root/MyService/State#attrs.start)}`) which can be referenced ("lifted") into inflight context
+naturally:
+
+```js
+let s = new MyService();
+
+new cloud.Function(inflight () => {
+  log("service start time is {s}");
+});
+```
+
+This creates an implicit dependency between the `cloud.Function` and `MyService` such that only when
+the state `start` is set, the `cloud.Function` will be initialized with the actual value.
+# API Reference <a name="API Reference" id="api-reference"></a>
+
+## Resources <a name="Resources" id="Resources"></a>
+
+### State <a name="State" id="@winglang/sdk.sim.State"></a>
+
+- *Implements:* <a href="#@winglang/sdk.sim.ISimulatorResource">ISimulatorResource</a>
+
+Key/value in-memory state for the simulator.
+
+Use the preflight method `token(key)` to obtain a token that can be used to reference the value
+of the state at runtime.
+
+During deployment (i.e. `cloud.OnDeploy` or `cloud.Service` startup), you must call the inflight
+method `set(key, value)` to set the runtime value. The value will be available at runtime through
+the inflight method `get(key)` (or resolved as a token).
+
+See tests for examples.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.sim.State.Initializer"></a>
+
+```wing
+bring sim;
+
+new sim.State();
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+##### Preflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.State.token">token</a></code> | Returns a token that can be used to retrieve the value of the state after the simulation has run. |
+| <code><a href="#@winglang/sdk.sim.State.toSimulator">toSimulator</a></code> | Convert this resource to a resource schema for the simulator. |
+
+##### Inflight Methods
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.IStateClient.get">get</a></code> | Gets the runtime state of this object. |
+| <code><a href="#@winglang/sdk.sim.IStateClient.set">set</a></code> | Sets the state of runtime a runtime object. |
+| <code><a href="#@winglang/sdk.sim.IStateClient.tryGet">tryGet</a></code> | Checks if runtime state exists for this object and returns it's value. |
+
+---
+
+##### `token` <a name="token" id="@winglang/sdk.sim.State.token"></a>
+
+```wing
+token(key: str): str
+```
+
+Returns a token that can be used to retrieve the value of the state after the simulation has run.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.State.token.parameter.key"></a>
+
+- *Type:* str
+
+The object key retrieved through the inflight `state.get()`.
+
+---
+
+##### `toSimulator` <a name="toSimulator" id="@winglang/sdk.sim.State.toSimulator"></a>
+
+```wing
+toSimulator(): ToSimulatorOutput
+```
+
+Convert this resource to a resource schema for the simulator.
+
+##### `get` <a name="get" id="@winglang/sdk.sim.IStateClient.get"></a>
+
+```wing
+inflight get(key: str): Json
+```
+
+Gets the runtime state of this object.
+
+Throws if there is no value for the given key.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.get.parameter.key"></a>
+
+- *Type:* str
+
+The object's key.
+
+---
+
+##### `set` <a name="set" id="@winglang/sdk.sim.IStateClient.set"></a>
+
+```wing
+inflight set(key: str, value: Json): void
+```
+
+Sets the state of runtime a runtime object.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.set.parameter.key"></a>
+
+- *Type:* str
+
+The object's key.
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.sim.IStateClient.set.parameter.value"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
+
+The object's value.
+
+---
+
+##### `tryGet` <a name="tryGet" id="@winglang/sdk.sim.IStateClient.tryGet"></a>
+
+```wing
+inflight tryGet(key: str): Json?
+```
+
+Checks if runtime state exists for this object and returns it's value.
+
+If no value exists,
+returns `nil`.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.sim.IStateClient.tryGet.parameter.key"></a>
+
+- *Type:* str
+
+The object's key.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.sim.State.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.sim.State.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.sim.State.onLiftType"></a>
+
+```wing
+bring sim;
+
+sim.State.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.sim.State.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.sim.State.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.sim.State.toInflight"></a>
+
+```wing
+bring sim;
+
+sim.State.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.sim.State.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.sim.State.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.sim.State.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+
+
+
diff --git a/docs/docs/04-standard-library/std/README.md b/docs/docs/04-standard-library/std/README.md
new file mode 100644
index 00000000000..da8b4831e25
--- /dev/null
+++ b/docs/docs/04-standard-library/std/README.md
@@ -0,0 +1,3 @@
+# Wing Globals
+
+This directory contains types available in the global scope of Wing.
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/std/_category_.yml b/docs/docs/04-standard-library/std/_category_.yml
new file mode 100644
index 00000000000..7e25e71eb2f
--- /dev/null
+++ b/docs/docs/04-standard-library/std/_category_.yml
@@ -0,0 +1,5 @@
+label: std
+collapsible: true
+collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/std/api-reference.md b/docs/docs/04-standard-library/std/api-reference.md
deleted file mode 100644
index 8ea6da4a707..00000000000
--- a/docs/docs/04-standard-library/std/api-reference.md
+++ /dev/null
@@ -1,3298 +0,0 @@
----
-title: API reference
-id: api-reference
-description: Wing standard library API reference for the std module
-keywords: [Wing sdk, sdk, Wing API Reference]
-hide_title: true
-sidebar_position: 100
----
-
-<!-- This file is automatically generated. Do not edit manually. -->
-
-# API Reference <a name="API Reference" id="api-reference"></a>
-
-
-## Classes <a name="Classes" id="Classes"></a>
-
-### Array <a name="Array" id="@winglang/sdk.std.Array"></a>
-
-Immutable Array.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Array.at">at</a></code> | Get the value at the given index. |
-| <code><a href="#@winglang/sdk.std.Array.concat">concat</a></code> | Merge arr to the end of this array. |
-| <code><a href="#@winglang/sdk.std.Array.contains">contains</a></code> | Checks if this array includes searchElement. |
-| <code><a href="#@winglang/sdk.std.Array.copyMut">copyMut</a></code> | Create a mutable shallow copy of this array. |
-| <code><a href="#@winglang/sdk.std.Array.indexOf">indexOf</a></code> | Returns the index of the first occurrence of searchElement found. |
-| <code><a href="#@winglang/sdk.std.Array.join">join</a></code> | Returns a new string containing the concatenated values in this array, separated by commas or a specified separator string. |
-| <code><a href="#@winglang/sdk.std.Array.lastIndexOf">lastIndexOf</a></code> | Returns the index of the last occurrence of searchElement found. |
-| <code><a href="#@winglang/sdk.std.Array.tryAt">tryAt</a></code> | Get the value at the given index, returning nil if the index is out of bounds. |
-
----
-
-##### `at` <a name="at" id="@winglang/sdk.std.Array.at"></a>
-
-```wing
-at(index: num): <T>
-```
-
-Get the value at the given index.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.Array.at.parameter.index"></a>
-
-- *Type:* num
-
-index of the value to get.
-
----
-
-##### `concat` <a name="concat" id="@winglang/sdk.std.Array.concat"></a>
-
-```wing
-concat(arr: Array): Array
-```
-
-Merge arr to the end of this array.
-
-###### `arr`<sup>Required</sup> <a name="arr" id="@winglang/sdk.std.Array.concat.parameter.arr"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Array">Array</a>
-
-array to merge.
-
----
-
-##### `contains` <a name="contains" id="@winglang/sdk.std.Array.contains"></a>
-
-```wing
-contains(searchElement: <T>): bool
-```
-
-Checks if this array includes searchElement.
-
-###### `searchElement`<sup>Required</sup> <a name="searchElement" id="@winglang/sdk.std.Array.contains.parameter.searchElement"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-to search for.
-
----
-
-##### `copyMut` <a name="copyMut" id="@winglang/sdk.std.Array.copyMut"></a>
-
-```wing
-copyMut(): MutArray
-```
-
-Create a mutable shallow copy of this array.
-
-##### `indexOf` <a name="indexOf" id="@winglang/sdk.std.Array.indexOf"></a>
-
-```wing
-indexOf(searchElement: <T>): num
-```
-
-Returns the index of the first occurrence of searchElement found.
-
-###### `searchElement`<sup>Required</sup> <a name="searchElement" id="@winglang/sdk.std.Array.indexOf.parameter.searchElement"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-to search for.
-
----
-
-##### `join` <a name="join" id="@winglang/sdk.std.Array.join"></a>
-
-```wing
-join(separator?: str): str
-```
-
-Returns a new string containing the concatenated values in this array, separated by commas or a specified separator string.
-
-If the array has only
-one item, then that item will be returned without using the separator.
-
-###### `separator`<sup>Optional</sup> <a name="separator" id="@winglang/sdk.std.Array.join.parameter.separator"></a>
-
-- *Type:* str
-
----
-
-##### `lastIndexOf` <a name="lastIndexOf" id="@winglang/sdk.std.Array.lastIndexOf"></a>
-
-```wing
-lastIndexOf(searchElement: <T>): num
-```
-
-Returns the index of the last occurrence of searchElement found.
-
-###### `searchElement`<sup>Required</sup> <a name="searchElement" id="@winglang/sdk.std.Array.lastIndexOf.parameter.searchElement"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-to search for.
-
----
-
-##### `tryAt` <a name="tryAt" id="@winglang/sdk.std.Array.tryAt"></a>
-
-```wing
-tryAt(index: num): <T>
-```
-
-Get the value at the given index, returning nil if the index is out of bounds.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.Array.tryAt.parameter.index"></a>
-
-- *Type:* num
-
-index of the value to get.
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.Array.property.length">length</a></code> | <code>num</code> | The length of the array. |
-
----
-
-##### `length`<sup>Required</sup> <a name="length" id="@winglang/sdk.std.Array.property.length"></a>
-
-```wing
-length: num;
-```
-
-- *Type:* num
-
-The length of the array.
-
----
-
-
-### Boolean <a name="Boolean" id="@winglang/sdk.std.Boolean"></a>
-
-Boolean.
-
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Boolean.fromJson">fromJson</a></code> | Parse a boolean from Json. |
-
----
-
-##### `fromJson` <a name="fromJson" id="@winglang/sdk.std.Boolean.fromJson"></a>
-
-```wing
-bool.fromJson(json: Json, options?: JsonValidationOptions);
-```
-
-Parse a boolean from Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Boolean.fromJson.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-to parse boolean from.
-
----
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.std.Boolean.fromJson.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.JsonValidationOptions">JsonValidationOptions</a>
-
----
-
-
-
-### Datetime <a name="Datetime" id="@winglang/sdk.std.Datetime"></a>
-
-Represents a local or UTC date object.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Datetime.toIso">toIso</a></code> | Returns ISO-8601 string. |
-| <code><a href="#@winglang/sdk.std.Datetime.toUtc">toUtc</a></code> | Returns a Datetime represents the same date in utc. |
-
----
-
-##### `toIso` <a name="toIso" id="@winglang/sdk.std.Datetime.toIso"></a>
-
-```wing
-toIso(): str
-```
-
-Returns ISO-8601 string.
-
-##### `toUtc` <a name="toUtc" id="@winglang/sdk.std.Datetime.toUtc"></a>
-
-```wing
-toUtc(): datetime
-```
-
-Returns a Datetime represents the same date in utc.
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Datetime.fromComponents">fromComponents</a></code> | Create a Datetime from Datetime components. |
-| <code><a href="#@winglang/sdk.std.Datetime.fromDate">fromDate</a></code> | Create a Datetime from a JavaScript Date object. |
-| <code><a href="#@winglang/sdk.std.Datetime.fromIso">fromIso</a></code> | Create a Datetime from an ISO-8601 string. |
-| <code><a href="#@winglang/sdk.std.Datetime.systemNow">systemNow</a></code> | Create a Datetime from local system timezone. |
-| <code><a href="#@winglang/sdk.std.Datetime.utcNow">utcNow</a></code> | Create a Datetime from UTC timezone. |
-
----
-
-##### `fromComponents` <a name="fromComponents" id="@winglang/sdk.std.Datetime.fromComponents"></a>
-
-```wing
-datetime.fromComponents(c: DatetimeComponents);
-```
-
-Create a Datetime from Datetime components.
-
-###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.std.Datetime.fromComponents.parameter.c"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.DatetimeComponents">DatetimeComponents</a>
-
-DatetimeComponents.
-
----
-
-##### `fromDate` <a name="fromDate" id="@winglang/sdk.std.Datetime.fromDate"></a>
-
-```wing
-datetime.fromDate(date: datetime);
-```
-
-Create a Datetime from a JavaScript Date object.
-
-###### `date`<sup>Required</sup> <a name="date" id="@winglang/sdk.std.Datetime.fromDate.parameter.date"></a>
-
-- *Type:* datetime
-
-The JavaScript Date object.
-
----
-
-##### `fromIso` <a name="fromIso" id="@winglang/sdk.std.Datetime.fromIso"></a>
-
-```wing
-datetime.fromIso(iso: str);
-```
-
-Create a Datetime from an ISO-8601 string.
-
-###### `iso`<sup>Required</sup> <a name="iso" id="@winglang/sdk.std.Datetime.fromIso.parameter.iso"></a>
-
-- *Type:* str
-
-ISO-8601 string.
-
----
-
-##### `systemNow` <a name="systemNow" id="@winglang/sdk.std.Datetime.systemNow"></a>
-
-```wing
-datetime.systemNow();
-```
-
-Create a Datetime from local system timezone.
-
-##### `utcNow` <a name="utcNow" id="@winglang/sdk.std.Datetime.utcNow"></a>
-
-```wing
-datetime.utcNow();
-```
-
-Create a Datetime from UTC timezone.
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.Datetime.property.dayOfMonth">dayOfMonth</a></code> | <code>num</code> | Returns the day of month in the local machine time or in utc (1 - 31). |
-| <code><a href="#@winglang/sdk.std.Datetime.property.dayOfWeek">dayOfWeek</a></code> | <code>num</code> | Returns the day in month of the local machine time or in utc (0 - 6). |
-| <code><a href="#@winglang/sdk.std.Datetime.property.hours">hours</a></code> | <code>num</code> | Returns the hour of the local machine time or in utc. |
-| <code><a href="#@winglang/sdk.std.Datetime.property.min">min</a></code> | <code>num</code> | Returns the minute of the local machine time or in utc. |
-| <code><a href="#@winglang/sdk.std.Datetime.property.month">month</a></code> | <code>num</code> | Returns the month of the local machine time or in utc (0 - 11). |
-| <code><a href="#@winglang/sdk.std.Datetime.property.ms">ms</a></code> | <code>num</code> | Returns the milliseconds of the local machine time or in utc  *. |
-| <code><a href="#@winglang/sdk.std.Datetime.property.sec">sec</a></code> | <code>num</code> | Returns the seconds of the local machine time or in utc. |
-| <code><a href="#@winglang/sdk.std.Datetime.property.timestamp">timestamp</a></code> | <code>num</code> | Return a timestamp of non-leap year seconds since epoch. |
-| <code><a href="#@winglang/sdk.std.Datetime.property.timestampMs">timestampMs</a></code> | <code>num</code> | Return a timestamp of non-leap year milliseconds since epoch. |
-| <code><a href="#@winglang/sdk.std.Datetime.property.timezone">timezone</a></code> | <code>num</code> | Returns the offset in minutes from UTC. |
-| <code><a href="#@winglang/sdk.std.Datetime.property.year">year</a></code> | <code>num</code> | Returns the year of the local machine time or in utc. |
-
----
-
-##### `dayOfMonth`<sup>Required</sup> <a name="dayOfMonth" id="@winglang/sdk.std.Datetime.property.dayOfMonth"></a>
-
-```wing
-dayOfMonth: num;
-```
-
-- *Type:* num
-
-Returns the day of month in the local machine time or in utc (1 - 31).
-
----
-
-##### `dayOfWeek`<sup>Required</sup> <a name="dayOfWeek" id="@winglang/sdk.std.Datetime.property.dayOfWeek"></a>
-
-```wing
-dayOfWeek: num;
-```
-
-- *Type:* num
-
-Returns the day in month of the local machine time or in utc (0 - 6).
-
----
-
-##### `hours`<sup>Required</sup> <a name="hours" id="@winglang/sdk.std.Datetime.property.hours"></a>
-
-```wing
-hours: num;
-```
-
-- *Type:* num
-
-Returns the hour of the local machine time or in utc.
-
----
-
-##### `min`<sup>Required</sup> <a name="min" id="@winglang/sdk.std.Datetime.property.min"></a>
-
-```wing
-min: num;
-```
-
-- *Type:* num
-
-Returns the minute of the local machine time or in utc.
-
----
-
-##### `month`<sup>Required</sup> <a name="month" id="@winglang/sdk.std.Datetime.property.month"></a>
-
-```wing
-month: num;
-```
-
-- *Type:* num
-
-Returns the month of the local machine time or in utc (0 - 11).
-
----
-
-##### `ms`<sup>Required</sup> <a name="ms" id="@winglang/sdk.std.Datetime.property.ms"></a>
-
-```wing
-ms: num;
-```
-
-- *Type:* num
-
-Returns the milliseconds of the local machine time or in utc  *.
-
----
-
-##### `sec`<sup>Required</sup> <a name="sec" id="@winglang/sdk.std.Datetime.property.sec"></a>
-
-```wing
-sec: num;
-```
-
-- *Type:* num
-
-Returns the seconds of the local machine time or in utc.
-
----
-
-##### `timestamp`<sup>Required</sup> <a name="timestamp" id="@winglang/sdk.std.Datetime.property.timestamp"></a>
-
-```wing
-timestamp: num;
-```
-
-- *Type:* num
-
-Return a timestamp of non-leap year seconds since epoch.
-
----
-
-##### `timestampMs`<sup>Required</sup> <a name="timestampMs" id="@winglang/sdk.std.Datetime.property.timestampMs"></a>
-
-```wing
-timestampMs: num;
-```
-
-- *Type:* num
-
-Return a timestamp of non-leap year milliseconds since epoch.
-
----
-
-##### `timezone`<sup>Required</sup> <a name="timezone" id="@winglang/sdk.std.Datetime.property.timezone"></a>
-
-```wing
-timezone: num;
-```
-
-- *Type:* num
-
-Returns the offset in minutes from UTC.
-
----
-
-##### `year`<sup>Required</sup> <a name="year" id="@winglang/sdk.std.Datetime.property.year"></a>
-
-```wing
-year: num;
-```
-
-- *Type:* num
-
-Returns the year of the local machine time or in utc.
-
----
-
-
-### Duration <a name="Duration" id="@winglang/sdk.std.Duration"></a>
-
-Represents a length of time.
-
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Duration.fromDays">fromDays</a></code> | Create a Duration representing an amount of days. |
-| <code><a href="#@winglang/sdk.std.Duration.fromHours">fromHours</a></code> | Create a Duration representing an amount of hours. |
-| <code><a href="#@winglang/sdk.std.Duration.fromMilliseconds">fromMilliseconds</a></code> | Create a Duration representing an amount of milliseconds. |
-| <code><a href="#@winglang/sdk.std.Duration.fromMinutes">fromMinutes</a></code> | Create a Duration representing an amount of minutes. |
-| <code><a href="#@winglang/sdk.std.Duration.fromMonths">fromMonths</a></code> | Create a Duration representing an amount of months. |
-| <code><a href="#@winglang/sdk.std.Duration.fromSeconds">fromSeconds</a></code> | Create a Duration representing an amount of seconds. |
-| <code><a href="#@winglang/sdk.std.Duration.fromYears">fromYears</a></code> | Create a Duration representing an amount of years. |
-
----
-
-##### `fromDays` <a name="fromDays" id="@winglang/sdk.std.Duration.fromDays"></a>
-
-```wing
-duration.fromDays(amount: num);
-```
-
-Create a Duration representing an amount of days.
-
-###### `amount`<sup>Required</sup> <a name="amount" id="@winglang/sdk.std.Duration.fromDays.parameter.amount"></a>
-
-- *Type:* num
-
-the amount of Days the `Duration` will represent.
-
----
-
-##### `fromHours` <a name="fromHours" id="@winglang/sdk.std.Duration.fromHours"></a>
-
-```wing
-duration.fromHours(amount: num);
-```
-
-Create a Duration representing an amount of hours.
-
-###### `amount`<sup>Required</sup> <a name="amount" id="@winglang/sdk.std.Duration.fromHours.parameter.amount"></a>
-
-- *Type:* num
-
-the amount of Hours the `Duration` will represent.
-
----
-
-##### `fromMilliseconds` <a name="fromMilliseconds" id="@winglang/sdk.std.Duration.fromMilliseconds"></a>
-
-```wing
-duration.fromMilliseconds(amount: num);
-```
-
-Create a Duration representing an amount of milliseconds.
-
-###### `amount`<sup>Required</sup> <a name="amount" id="@winglang/sdk.std.Duration.fromMilliseconds.parameter.amount"></a>
-
-- *Type:* num
-
-the amount of Milliseconds the `Duration` will represent.
-
----
-
-##### `fromMinutes` <a name="fromMinutes" id="@winglang/sdk.std.Duration.fromMinutes"></a>
-
-```wing
-duration.fromMinutes(amount: num);
-```
-
-Create a Duration representing an amount of minutes.
-
-###### `amount`<sup>Required</sup> <a name="amount" id="@winglang/sdk.std.Duration.fromMinutes.parameter.amount"></a>
-
-- *Type:* num
-
-the amount of Minutes the `Duration` will represent.
-
----
-
-##### `fromMonths` <a name="fromMonths" id="@winglang/sdk.std.Duration.fromMonths"></a>
-
-```wing
-duration.fromMonths(amount: num);
-```
-
-Create a Duration representing an amount of months.
-
-###### `amount`<sup>Required</sup> <a name="amount" id="@winglang/sdk.std.Duration.fromMonths.parameter.amount"></a>
-
-- *Type:* num
-
-the amount of Months the `Duration` will represent.
-
----
-
-##### `fromSeconds` <a name="fromSeconds" id="@winglang/sdk.std.Duration.fromSeconds"></a>
-
-```wing
-duration.fromSeconds(amount: num);
-```
-
-Create a Duration representing an amount of seconds.
-
-###### `amount`<sup>Required</sup> <a name="amount" id="@winglang/sdk.std.Duration.fromSeconds.parameter.amount"></a>
-
-- *Type:* num
-
-the amount of Seconds the `Duration` will represent.
-
----
-
-##### `fromYears` <a name="fromYears" id="@winglang/sdk.std.Duration.fromYears"></a>
-
-```wing
-duration.fromYears(amount: num);
-```
-
-Create a Duration representing an amount of years.
-
-###### `amount`<sup>Required</sup> <a name="amount" id="@winglang/sdk.std.Duration.fromYears.parameter.amount"></a>
-
-- *Type:* num
-
-the amount of Years the `Duration` will represent.
-
----
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.Duration.property.days">days</a></code> | <code>num</code> | Return the total number of days in this Duration. |
-| <code><a href="#@winglang/sdk.std.Duration.property.hours">hours</a></code> | <code>num</code> | Return the total number of hours in this Duration. |
-| <code><a href="#@winglang/sdk.std.Duration.property.milliseconds">milliseconds</a></code> | <code>num</code> | Return the total number of milliseconds in this Duration. |
-| <code><a href="#@winglang/sdk.std.Duration.property.minutes">minutes</a></code> | <code>num</code> | Return the total number of minutes in this Duration. |
-| <code><a href="#@winglang/sdk.std.Duration.property.months">months</a></code> | <code>num</code> | Return the total number of months in this Duration. |
-| <code><a href="#@winglang/sdk.std.Duration.property.seconds">seconds</a></code> | <code>num</code> | Return the total number of seconds in this Duration. |
-| <code><a href="#@winglang/sdk.std.Duration.property.years">years</a></code> | <code>num</code> | Return the total number of years in this Duration. |
-
----
-
-##### `days`<sup>Required</sup> <a name="days" id="@winglang/sdk.std.Duration.property.days"></a>
-
-```wing
-days: num;
-```
-
-- *Type:* num
-
-Return the total number of days in this Duration.
-
----
-
-##### `hours`<sup>Required</sup> <a name="hours" id="@winglang/sdk.std.Duration.property.hours"></a>
-
-```wing
-hours: num;
-```
-
-- *Type:* num
-
-Return the total number of hours in this Duration.
-
----
-
-##### `milliseconds`<sup>Required</sup> <a name="milliseconds" id="@winglang/sdk.std.Duration.property.milliseconds"></a>
-
-```wing
-milliseconds: num;
-```
-
-- *Type:* num
-
-Return the total number of milliseconds in this Duration.
-
----
-
-##### `minutes`<sup>Required</sup> <a name="minutes" id="@winglang/sdk.std.Duration.property.minutes"></a>
-
-```wing
-minutes: num;
-```
-
-- *Type:* num
-
-Return the total number of minutes in this Duration.
-
----
-
-##### `months`<sup>Required</sup> <a name="months" id="@winglang/sdk.std.Duration.property.months"></a>
-
-```wing
-months: num;
-```
-
-- *Type:* num
-
-Return the total number of months in this Duration.
-
----
-
-##### `seconds`<sup>Required</sup> <a name="seconds" id="@winglang/sdk.std.Duration.property.seconds"></a>
-
-```wing
-seconds: num;
-```
-
-- *Type:* num
-
-Return the total number of seconds in this Duration.
-
----
-
-##### `years`<sup>Required</sup> <a name="years" id="@winglang/sdk.std.Duration.property.years"></a>
-
-```wing
-years: num;
-```
-
-- *Type:* num
-
-Return the total number of years in this Duration.
-
----
-
-
-### Json <a name="Json" id="@winglang/sdk.std.Json"></a>
-
-Immutable Json.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Json.asBool">asBool</a></code> | Convert Json element to boolean if possible. |
-| <code><a href="#@winglang/sdk.std.Json.asNum">asNum</a></code> | Convert Json element to number if possible. |
-| <code><a href="#@winglang/sdk.std.Json.asStr">asStr</a></code> | Convert Json element to string if possible. |
-| <code><a href="#@winglang/sdk.std.Json.get">get</a></code> | Returns the value associated with the specified Json key. |
-| <code><a href="#@winglang/sdk.std.Json.getAt">getAt</a></code> | Returns a specified element at a given index from Json Array. |
-| <code><a href="#@winglang/sdk.std.Json.tryAsBool">tryAsBool</a></code> | Convert Json element to boolean if possible. |
-| <code><a href="#@winglang/sdk.std.Json.tryAsNum">tryAsNum</a></code> | Convert Json element to number if possible. |
-| <code><a href="#@winglang/sdk.std.Json.tryAsStr">tryAsStr</a></code> | Convert Json element to string if possible. |
-| <code><a href="#@winglang/sdk.std.Json.tryGet">tryGet</a></code> | Optionally returns an specified element from the Json. |
-| <code><a href="#@winglang/sdk.std.Json.tryGetAt">tryGetAt</a></code> | Optionally returns a specified element at a given index from Json Array. |
-
----
-
-##### `asBool` <a name="asBool" id="@winglang/sdk.std.Json.asBool"></a>
-
-```wing
-asBool(): bool
-```
-
-Convert Json element to boolean if possible.
-
-##### `asNum` <a name="asNum" id="@winglang/sdk.std.Json.asNum"></a>
-
-```wing
-asNum(): num
-```
-
-Convert Json element to number if possible.
-
-##### `asStr` <a name="asStr" id="@winglang/sdk.std.Json.asStr"></a>
-
-```wing
-asStr(): str
-```
-
-Convert Json element to string if possible.
-
-##### `get` <a name="get" id="@winglang/sdk.std.Json.get"></a>
-
-```wing
-get(key: str): Json
-```
-
-Returns the value associated with the specified Json key.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Json.get.parameter.key"></a>
-
-- *Type:* str
-
-The key of the Json property.
-
----
-
-##### `getAt` <a name="getAt" id="@winglang/sdk.std.Json.getAt"></a>
-
-```wing
-getAt(index: num): Json
-```
-
-Returns a specified element at a given index from Json Array.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.Json.getAt.parameter.index"></a>
-
-- *Type:* num
-
-The index of the element in the Json Array to return.
-
----
-
-##### `tryAsBool` <a name="tryAsBool" id="@winglang/sdk.std.Json.tryAsBool"></a>
-
-```wing
-tryAsBool(): bool
-```
-
-Convert Json element to boolean if possible.
-
-##### `tryAsNum` <a name="tryAsNum" id="@winglang/sdk.std.Json.tryAsNum"></a>
-
-```wing
-tryAsNum(): num
-```
-
-Convert Json element to number if possible.
-
-##### `tryAsStr` <a name="tryAsStr" id="@winglang/sdk.std.Json.tryAsStr"></a>
-
-```wing
-tryAsStr(): str
-```
-
-Convert Json element to string if possible.
-
-##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.Json.tryGet"></a>
-
-```wing
-tryGet(key: str): Json
-```
-
-Optionally returns an specified element from the Json.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Json.tryGet.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to return.
-
----
-
-##### `tryGetAt` <a name="tryGetAt" id="@winglang/sdk.std.Json.tryGetAt"></a>
-
-```wing
-tryGetAt(index: num): Json
-```
-
-Optionally returns a specified element at a given index from Json Array.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.Json.tryGetAt.parameter.index"></a>
-
-- *Type:* num
-
-The index of the element in the Json Array to return.
-
----
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Json.deepCopy">deepCopy</a></code> | Creates an immutable deep copy of the Json. |
-| <code><a href="#@winglang/sdk.std.Json.deepCopyMut">deepCopyMut</a></code> | Creates a mutable deep copy of the Json. |
-| <code><a href="#@winglang/sdk.std.Json.delete">delete</a></code> | Deletes a key in a given Json. |
-| <code><a href="#@winglang/sdk.std.Json.entries">entries</a></code> | Returns the entries from the Json. |
-| <code><a href="#@winglang/sdk.std.Json.has">has</a></code> | Checks if a Json object has a given key. |
-| <code><a href="#@winglang/sdk.std.Json.keys">keys</a></code> | Returns the keys from the Json. |
-| <code><a href="#@winglang/sdk.std.Json.parse">parse</a></code> | Parse a string into a Json. |
-| <code><a href="#@winglang/sdk.std.Json.stringify">stringify</a></code> | Formats Json as string. |
-| <code><a href="#@winglang/sdk.std.Json.tryParse">tryParse</a></code> | Try to parse a string into a Json. |
-| <code><a href="#@winglang/sdk.std.Json.values">values</a></code> | Returns the values from the Json. |
-
----
-
-##### `deepCopy` <a name="deepCopy" id="@winglang/sdk.std.Json.deepCopy"></a>
-
-```wing
-Json.deepCopy(json: MutJson);
-```
-
-Creates an immutable deep copy of the Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.deepCopy.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.MutJson">MutJson</a>
-
-to copy.
-
----
-
-##### `deepCopyMut` <a name="deepCopyMut" id="@winglang/sdk.std.Json.deepCopyMut"></a>
-
-```wing
-Json.deepCopyMut(json: Json);
-```
-
-Creates a mutable deep copy of the Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.deepCopyMut.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-to copy.
-
----
-
-##### `delete` <a name="delete" id="@winglang/sdk.std.Json.delete"></a>
-
-```wing
-Json.delete(json: MutJson, key: str);
-```
-
-Deletes a key in a given Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.delete.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.MutJson">MutJson</a>
-
-to delete key from.
-
----
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Json.delete.parameter.key"></a>
-
-- *Type:* str
-
-the key to delete.
-
----
-
-##### `entries` <a name="entries" id="@winglang/sdk.std.Json.entries"></a>
-
-```wing
-Json.entries(json: Json);
-```
-
-Returns the entries from the Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.entries.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-map to get the entries from.
-
----
-
-##### `has` <a name="has" id="@winglang/sdk.std.Json.has"></a>
-
-```wing
-Json.has(json: Json, key: str);
-```
-
-Checks if a Json object has a given key.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.has.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The json object to inspect.
-
----
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Json.has.parameter.key"></a>
-
-- *Type:* str
-
-The key to check.
-
----
-
-##### `keys` <a name="keys" id="@winglang/sdk.std.Json.keys"></a>
-
-```wing
-Json.keys(json: any);
-```
-
-Returns the keys from the Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.keys.parameter.json"></a>
-
-- *Type:* any
-
-map to get the keys from.
-
----
-
-##### `parse` <a name="parse" id="@winglang/sdk.std.Json.parse"></a>
-
-```wing
-Json.parse(str: str);
-```
-
-Parse a string into a Json.
-
-###### `str`<sup>Required</sup> <a name="str" id="@winglang/sdk.std.Json.parse.parameter.str"></a>
-
-- *Type:* str
-
-to parse as Json.
-
----
-
-##### `stringify` <a name="stringify" id="@winglang/sdk.std.Json.stringify"></a>
-
-```wing
-Json.stringify(json: any, options?: JsonStringifyOptions);
-```
-
-Formats Json as string.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.stringify.parameter.json"></a>
-
-- *Type:* any
-
-to format as string.
-
----
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.std.Json.stringify.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.JsonStringifyOptions">JsonStringifyOptions</a>
-
----
-
-##### `tryParse` <a name="tryParse" id="@winglang/sdk.std.Json.tryParse"></a>
-
-```wing
-Json.tryParse(str?: str);
-```
-
-Try to parse a string into a Json.
-
-###### `str`<sup>Optional</sup> <a name="str" id="@winglang/sdk.std.Json.tryParse.parameter.str"></a>
-
-- *Type:* str
-
-to parse as Json.
-
----
-
-##### `values` <a name="values" id="@winglang/sdk.std.Json.values"></a>
-
-```wing
-Json.values(json: Json);
-```
-
-Returns the values from the Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.values.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-map to get the values from.
-
----
-
-
-
-### JsonSchema <a name="JsonSchema" id="@winglang/sdk.std.JsonSchema"></a>
-
-Struct Schema.
-
-#### Initializers <a name="Initializers" id="@winglang/sdk.std.JsonSchema.Initializer"></a>
-
-```wing
-new JsonSchema(schema: Json);
-```
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.JsonSchema.Initializer.parameter.schema">schema</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | *No description.* |
-
----
-
-##### `schema`<sup>Required</sup> <a name="schema" id="@winglang/sdk.std.JsonSchema.Initializer.parameter.schema"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
----
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.JsonSchema.asStr">asStr</a></code> | Retrieve the json schema as a string. |
-| <code><a href="#@winglang/sdk.std.JsonSchema.validate">validate</a></code> | Attempt to validate a json object against the schema. |
-
----
-
-##### `asStr` <a name="asStr" id="@winglang/sdk.std.JsonSchema.asStr"></a>
-
-```wing
-asStr(): str
-```
-
-Retrieve the json schema as a string.
-
-##### `validate` <a name="validate" id="@winglang/sdk.std.JsonSchema.validate"></a>
-
-```wing
-validate(obj: Json, options?: JsonValidationOptions): void
-```
-
-Attempt to validate a json object against the schema.
-
-###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.std.JsonSchema.validate.parameter.obj"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-the Json object to validate.
-
----
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.std.JsonSchema.validate.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.JsonValidationOptions">JsonValidationOptions</a>
-
----
-
-
-
-
-### Map <a name="Map" id="@winglang/sdk.std.Map"></a>
-
-Immutable Map.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Map.copyMut">copyMut</a></code> | Create a mutable shallow copy of this map. |
-| <code><a href="#@winglang/sdk.std.Map.get">get</a></code> | Returns a specified element from the map. |
-| <code><a href="#@winglang/sdk.std.Map.has">has</a></code> | Returns a boolean indicating whether an element with the specified key exists or not. |
-| <code><a href="#@winglang/sdk.std.Map.keys">keys</a></code> | Returns the keys of this map. |
-| <code><a href="#@winglang/sdk.std.Map.size">size</a></code> | Returns the number of elements in the map. |
-| <code><a href="#@winglang/sdk.std.Map.tryGet">tryGet</a></code> | Optionally returns a specified element from the map. |
-| <code><a href="#@winglang/sdk.std.Map.values">values</a></code> | Returns the values of this map. |
-
----
-
-##### `copyMut` <a name="copyMut" id="@winglang/sdk.std.Map.copyMut"></a>
-
-```wing
-copyMut(): MutMap
-```
-
-Create a mutable shallow copy of this map.
-
-##### `get` <a name="get" id="@winglang/sdk.std.Map.get"></a>
-
-```wing
-get(key: str): <T>
-```
-
-Returns a specified element from the map.
-
-If the value that is associated to the provided key is an object, then you will get a reference
-to that object and any change made to that object will effectively modify it inside the map.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Map.get.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to return.
-
----
-
-##### `has` <a name="has" id="@winglang/sdk.std.Map.has"></a>
-
-```wing
-has(key: str): bool
-```
-
-Returns a boolean indicating whether an element with the specified key exists or not.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Map.has.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to test for presence.
-
----
-
-##### `keys` <a name="keys" id="@winglang/sdk.std.Map.keys"></a>
-
-```wing
-keys(): MutArray<str>
-```
-
-Returns the keys of this map.
-
-##### `size` <a name="size" id="@winglang/sdk.std.Map.size"></a>
-
-```wing
-size(): num
-```
-
-Returns the number of elements in the map.
-
-TODO: For now this has to be a method rather than a getter as macros only work on methods https://github.com/winglang/wing/issues/1658
-
-##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.Map.tryGet"></a>
-
-```wing
-tryGet(key: str): <T>
-```
-
-Optionally returns a specified element from the map.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Map.tryGet.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to return.
-
----
-
-##### `values` <a name="values" id="@winglang/sdk.std.Map.values"></a>
-
-```wing
-values(): Array
-```
-
-Returns the values of this map.
-
-
-
-
-### MutArray <a name="MutArray" id="@winglang/sdk.std.MutArray"></a>
-
-Mutable Array.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.MutArray.at">at</a></code> | Get the value at the given index. |
-| <code><a href="#@winglang/sdk.std.MutArray.concat">concat</a></code> | Merge arr to the end of this array. |
-| <code><a href="#@winglang/sdk.std.MutArray.contains">contains</a></code> | Checks if this array includes searchElement. |
-| <code><a href="#@winglang/sdk.std.MutArray.copy">copy</a></code> | Create an immutable shallow copy of this array. |
-| <code><a href="#@winglang/sdk.std.MutArray.indexOf">indexOf</a></code> | Returns the index of the first occurrence of searchElement found. |
-| <code><a href="#@winglang/sdk.std.MutArray.insert">insert</a></code> | Inserts a new value at the given index of an array. |
-| <code><a href="#@winglang/sdk.std.MutArray.join">join</a></code> | Returns a new string containing the concatenated values in this array, separated by commas or a specified separator string. |
-| <code><a href="#@winglang/sdk.std.MutArray.lastIndexOf">lastIndexOf</a></code> | Returns the index of the last occurrence of searchElement found. |
-| <code><a href="#@winglang/sdk.std.MutArray.pop">pop</a></code> | Remove value from end of array. |
-| <code><a href="#@winglang/sdk.std.MutArray.popAt">popAt</a></code> | Removes value from the given index of an array. |
-| <code><a href="#@winglang/sdk.std.MutArray.push">push</a></code> | Add value to end of array. |
-| <code><a href="#@winglang/sdk.std.MutArray.removeFirst">removeFirst</a></code> | Removes first occurrence of a given value in an array. |
-| <code><a href="#@winglang/sdk.std.MutArray.set">set</a></code> | Sets a new value at the given index of an array. |
-
----
-
-##### `at` <a name="at" id="@winglang/sdk.std.MutArray.at"></a>
-
-```wing
-at(index: num): <T>
-```
-
-Get the value at the given index.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.MutArray.at.parameter.index"></a>
-
-- *Type:* num
-
-index of the value to get.
-
----
-
-##### `concat` <a name="concat" id="@winglang/sdk.std.MutArray.concat"></a>
-
-```wing
-concat(arr: MutArray): MutArray
-```
-
-Merge arr to the end of this array.
-
-###### `arr`<sup>Required</sup> <a name="arr" id="@winglang/sdk.std.MutArray.concat.parameter.arr"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.MutArray">MutArray</a>
-
-array to merge.
-
----
-
-##### `contains` <a name="contains" id="@winglang/sdk.std.MutArray.contains"></a>
-
-```wing
-contains(searchElement: <T>): bool
-```
-
-Checks if this array includes searchElement.
-
-###### `searchElement`<sup>Required</sup> <a name="searchElement" id="@winglang/sdk.std.MutArray.contains.parameter.searchElement"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-to search for.
-
----
-
-##### `copy` <a name="copy" id="@winglang/sdk.std.MutArray.copy"></a>
-
-```wing
-copy(): Array
-```
-
-Create an immutable shallow copy of this array.
-
-##### `indexOf` <a name="indexOf" id="@winglang/sdk.std.MutArray.indexOf"></a>
-
-```wing
-indexOf(searchElement: <T>): num
-```
-
-Returns the index of the first occurrence of searchElement found.
-
-###### `searchElement`<sup>Required</sup> <a name="searchElement" id="@winglang/sdk.std.MutArray.indexOf.parameter.searchElement"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-to search for.
-
----
-
-##### `insert` <a name="insert" id="@winglang/sdk.std.MutArray.insert"></a>
-
-```wing
-insert(index: num, value: <T>): void
-```
-
-Inserts a new value at the given index of an array.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.MutArray.insert.parameter.index"></a>
-
-- *Type:* num
-
-the index to insert the value at.
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutArray.insert.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-the value to insert at the given index.
-
----
-
-##### `join` <a name="join" id="@winglang/sdk.std.MutArray.join"></a>
-
-```wing
-join(separator?: str): str
-```
-
-Returns a new string containing the concatenated values in this array, separated by commas or a specified separator string.
-
-If the array has only
-one item, then that item will be returned without using the separator.
-
-###### `separator`<sup>Optional</sup> <a name="separator" id="@winglang/sdk.std.MutArray.join.parameter.separator"></a>
-
-- *Type:* str
-
----
-
-##### `lastIndexOf` <a name="lastIndexOf" id="@winglang/sdk.std.MutArray.lastIndexOf"></a>
-
-```wing
-lastIndexOf(searchElement: <T>): num
-```
-
-Returns the index of the last occurrence of searchElement found.
-
-###### `searchElement`<sup>Required</sup> <a name="searchElement" id="@winglang/sdk.std.MutArray.lastIndexOf.parameter.searchElement"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-to search for.
-
----
-
-##### `pop` <a name="pop" id="@winglang/sdk.std.MutArray.pop"></a>
-
-```wing
-pop(): <T>
-```
-
-Remove value from end of array.
-
-##### `popAt` <a name="popAt" id="@winglang/sdk.std.MutArray.popAt"></a>
-
-```wing
-popAt(index: num): <T>
-```
-
-Removes value from the given index of an array.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.MutArray.popAt.parameter.index"></a>
-
-- *Type:* num
-
-the index to remove the value at.
-
----
-
-##### `push` <a name="push" id="@winglang/sdk.std.MutArray.push"></a>
-
-```wing
-push(value: <T>): void
-```
-
-Add value to end of array.
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutArray.push.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-value to add.
-
----
-
-##### `removeFirst` <a name="removeFirst" id="@winglang/sdk.std.MutArray.removeFirst"></a>
-
-```wing
-removeFirst(value: <T>): bool
-```
-
-Removes first occurrence of a given value in an array.
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutArray.removeFirst.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-the value to remove.
-
----
-
-##### `set` <a name="set" id="@winglang/sdk.std.MutArray.set"></a>
-
-```wing
-set(index: num, value: <T>): void
-```
-
-Sets a new value at the given index of an array.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.MutArray.set.parameter.index"></a>
-
-- *Type:* num
-
-the index to set the value at.
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutArray.set.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-the value to set at the given index.
-
----
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.MutArray.property.length">length</a></code> | <code>num</code> | The length of the array. |
-
----
-
-##### `length`<sup>Required</sup> <a name="length" id="@winglang/sdk.std.MutArray.property.length"></a>
-
-```wing
-length: num;
-```
-
-- *Type:* num
-
-The length of the array.
-
----
-
-
-### MutJson <a name="MutJson" id="@winglang/sdk.std.MutJson"></a>
-
-Mutable Json.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.MutJson.asBool">asBool</a></code> | Convert Json element to boolean if possible. |
-| <code><a href="#@winglang/sdk.std.MutJson.asNum">asNum</a></code> | Convert Json element to number if possible. |
-| <code><a href="#@winglang/sdk.std.MutJson.asStr">asStr</a></code> | Convert Json element to string if possible. |
-| <code><a href="#@winglang/sdk.std.MutJson.get">get</a></code> | Returns the value associated with the specified Json key. |
-| <code><a href="#@winglang/sdk.std.MutJson.getAt">getAt</a></code> | Returns a specified element at a given index from MutJson Array. |
-| <code><a href="#@winglang/sdk.std.MutJson.set">set</a></code> | Adds or updates an element in MutJson with a specific key and value. |
-| <code><a href="#@winglang/sdk.std.MutJson.setAt">setAt</a></code> | Set element in MutJson Array with a specific key and value. |
-| <code><a href="#@winglang/sdk.std.MutJson.tryAsBool">tryAsBool</a></code> | Convert Json element to boolean if possible. |
-| <code><a href="#@winglang/sdk.std.MutJson.tryAsNum">tryAsNum</a></code> | Convert Json element to number if possible. |
-| <code><a href="#@winglang/sdk.std.MutJson.tryAsStr">tryAsStr</a></code> | Convert Json element to string if possible. |
-| <code><a href="#@winglang/sdk.std.MutJson.tryGet">tryGet</a></code> | Optionally returns an specified element from the Json. |
-| <code><a href="#@winglang/sdk.std.MutJson.tryGetAt">tryGetAt</a></code> | Optionally returns a specified element at a given index from Json Array. |
-
----
-
-##### `asBool` <a name="asBool" id="@winglang/sdk.std.MutJson.asBool"></a>
-
-```wing
-asBool(): bool
-```
-
-Convert Json element to boolean if possible.
-
-##### `asNum` <a name="asNum" id="@winglang/sdk.std.MutJson.asNum"></a>
-
-```wing
-asNum(): num
-```
-
-Convert Json element to number if possible.
-
-##### `asStr` <a name="asStr" id="@winglang/sdk.std.MutJson.asStr"></a>
-
-```wing
-asStr(): str
-```
-
-Convert Json element to string if possible.
-
-##### `get` <a name="get" id="@winglang/sdk.std.MutJson.get"></a>
-
-```wing
-get(key: str): MutJson
-```
-
-Returns the value associated with the specified Json key.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutJson.get.parameter.key"></a>
-
-- *Type:* str
-
-The key of the Json property.
-
----
-
-##### `getAt` <a name="getAt" id="@winglang/sdk.std.MutJson.getAt"></a>
-
-```wing
-getAt(index: num): MutJson
-```
-
-Returns a specified element at a given index from MutJson Array.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.MutJson.getAt.parameter.index"></a>
-
-- *Type:* num
-
-The index of the element in the MutJson Array to return.
-
----
-
-##### `set` <a name="set" id="@winglang/sdk.std.MutJson.set"></a>
-
-```wing
-set(key: str, value: MutJson): void
-```
-
-Adds or updates an element in MutJson with a specific key and value.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutJson.set.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to add.
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutJson.set.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.MutJson">MutJson</a>
-
-The value of the element to add.
-
----
-
-##### `setAt` <a name="setAt" id="@winglang/sdk.std.MutJson.setAt"></a>
-
-```wing
-setAt(index: num, value: MutJson): void
-```
-
-Set element in MutJson Array with a specific key and value.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.MutJson.setAt.parameter.index"></a>
-
-- *Type:* num
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutJson.setAt.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.MutJson">MutJson</a>
-
-The value of the element to set.
-
----
-
-##### `tryAsBool` <a name="tryAsBool" id="@winglang/sdk.std.MutJson.tryAsBool"></a>
-
-```wing
-tryAsBool(): bool
-```
-
-Convert Json element to boolean if possible.
-
-##### `tryAsNum` <a name="tryAsNum" id="@winglang/sdk.std.MutJson.tryAsNum"></a>
-
-```wing
-tryAsNum(): num
-```
-
-Convert Json element to number if possible.
-
-##### `tryAsStr` <a name="tryAsStr" id="@winglang/sdk.std.MutJson.tryAsStr"></a>
-
-```wing
-tryAsStr(): str
-```
-
-Convert Json element to string if possible.
-
-##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.MutJson.tryGet"></a>
-
-```wing
-tryGet(key: str): MutJson
-```
-
-Optionally returns an specified element from the Json.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutJson.tryGet.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to return.
-
----
-
-##### `tryGetAt` <a name="tryGetAt" id="@winglang/sdk.std.MutJson.tryGetAt"></a>
-
-```wing
-tryGetAt(index: num): MutJson
-```
-
-Optionally returns a specified element at a given index from Json Array.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.MutJson.tryGetAt.parameter.index"></a>
-
-- *Type:* num
-
-The index of the element in the Json Array to return.
-
----
-
-
-
-
-### MutMap <a name="MutMap" id="@winglang/sdk.std.MutMap"></a>
-
-Mutable Map.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.MutMap.clear">clear</a></code> | Removes all elements. |
-| <code><a href="#@winglang/sdk.std.MutMap.copy">copy</a></code> | Create an immutable shallow copy of this map. |
-| <code><a href="#@winglang/sdk.std.MutMap.delete">delete</a></code> | Removes the specified element from a map. |
-| <code><a href="#@winglang/sdk.std.MutMap.get">get</a></code> | Returns a specified element from the map. |
-| <code><a href="#@winglang/sdk.std.MutMap.has">has</a></code> | Returns a boolean indicating whether an element with the specified key exists or not. |
-| <code><a href="#@winglang/sdk.std.MutMap.keys">keys</a></code> | Returns the keys of this map. |
-| <code><a href="#@winglang/sdk.std.MutMap.set">set</a></code> | Adds or updates an entry in a Map object with a specified key and a value. |
-| <code><a href="#@winglang/sdk.std.MutMap.size">size</a></code> | Returns the number of elements in the map. |
-| <code><a href="#@winglang/sdk.std.MutMap.tryGet">tryGet</a></code> | Optionally returns a specified element from the map. |
-| <code><a href="#@winglang/sdk.std.MutMap.values">values</a></code> | Returns the values of this map. |
-
----
-
-##### `clear` <a name="clear" id="@winglang/sdk.std.MutMap.clear"></a>
-
-```wing
-clear(): void
-```
-
-Removes all elements.
-
-##### `copy` <a name="copy" id="@winglang/sdk.std.MutMap.copy"></a>
-
-```wing
-copy(): Map
-```
-
-Create an immutable shallow copy of this map.
-
-##### `delete` <a name="delete" id="@winglang/sdk.std.MutMap.delete"></a>
-
-```wing
-delete(key: str): bool
-```
-
-Removes the specified element from a map.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutMap.delete.parameter.key"></a>
-
-- *Type:* str
-
-The key.
-
----
-
-##### `get` <a name="get" id="@winglang/sdk.std.MutMap.get"></a>
-
-```wing
-get(key: str): <T>
-```
-
-Returns a specified element from the map.
-
-If the value that is associated to the provided key is an object, then you will get a reference
-to that object and any change made to that object will effectively modify it inside the map.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutMap.get.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to return.
-
----
-
-##### `has` <a name="has" id="@winglang/sdk.std.MutMap.has"></a>
-
-```wing
-has(key: str): bool
-```
-
-Returns a boolean indicating whether an element with the specified key exists or not.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutMap.has.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to test for presence.
-
----
-
-##### `keys` <a name="keys" id="@winglang/sdk.std.MutMap.keys"></a>
-
-```wing
-keys(): MutArray<str>
-```
-
-Returns the keys of this map.
-
-##### `set` <a name="set" id="@winglang/sdk.std.MutMap.set"></a>
-
-```wing
-set(key: str, value: <T>): void
-```
-
-Adds or updates an entry in a Map object with a specified key and a value.
-
-TODO: revisit this macro after we support indexed args https://github.com/winglang/wing/issues/1659
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutMap.set.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to add.
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutMap.set.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-The value of the element to add.
-
----
-
-##### `size` <a name="size" id="@winglang/sdk.std.MutMap.size"></a>
-
-```wing
-size(): num
-```
-
-Returns the number of elements in the map.
-
-TODO: For now this has to be a method rather than a getter as macros only work on methods https://github.com/winglang/wing/issues/1658
-
-##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.MutMap.tryGet"></a>
-
-```wing
-tryGet(key: str): <T>
-```
-
-Optionally returns a specified element from the map.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutMap.tryGet.parameter.key"></a>
-
-- *Type:* str
-
-The key of the element to return.
-
----
-
-##### `values` <a name="values" id="@winglang/sdk.std.MutMap.values"></a>
-
-```wing
-values(): Array
-```
-
-Returns the values of this map.
-
-
-
-
-### MutSet <a name="MutSet" id="@winglang/sdk.std.MutSet"></a>
-
-Mutable Set.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.MutSet.add">add</a></code> | Add value to set. |
-| <code><a href="#@winglang/sdk.std.MutSet.clear">clear</a></code> | The clear() method removes all elements from a set. |
-| <code><a href="#@winglang/sdk.std.MutSet.copy">copy</a></code> | Create an immutable shallow copy of this set. |
-| <code><a href="#@winglang/sdk.std.MutSet.delete">delete</a></code> | Removes a specified value from a set, if it is in the set. |
-| <code><a href="#@winglang/sdk.std.MutSet.has">has</a></code> | Returns a boolean indicating whether an element with the specified value exists in the set. |
-| <code><a href="#@winglang/sdk.std.MutSet.toArray">toArray</a></code> | Create an immutable array shallow copy of this set. |
-
----
-
-##### `add` <a name="add" id="@winglang/sdk.std.MutSet.add"></a>
-
-```wing
-add(value: <T>): MutSet
-```
-
-Add value to set.
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutSet.add.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-value to add.
-
----
-
-##### `clear` <a name="clear" id="@winglang/sdk.std.MutSet.clear"></a>
-
-```wing
-clear(): void
-```
-
-The clear() method removes all elements from a set.
-
-##### `copy` <a name="copy" id="@winglang/sdk.std.MutSet.copy"></a>
-
-```wing
-copy(): Set
-```
-
-Create an immutable shallow copy of this set.
-
-##### `delete` <a name="delete" id="@winglang/sdk.std.MutSet.delete"></a>
-
-```wing
-delete(value: <T>): bool
-```
-
-Removes a specified value from a set, if it is in the set.
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutSet.delete.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-The value to remove from the set.
-
----
-
-##### `has` <a name="has" id="@winglang/sdk.std.MutSet.has"></a>
-
-```wing
-has(value: <T>): bool
-```
-
-Returns a boolean indicating whether an element with the specified value exists in the set.
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutSet.has.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-The value to test for presence in the Set object.
-
----
-
-##### `toArray` <a name="toArray" id="@winglang/sdk.std.MutSet.toArray"></a>
-
-```wing
-toArray(): Array
-```
-
-Create an immutable array shallow copy of this set.
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.MutSet.property.size">size</a></code> | <code>num</code> | The length of the set. |
-
----
-
-##### `size`<sup>Required</sup> <a name="size" id="@winglang/sdk.std.MutSet.property.size"></a>
-
-```wing
-size: num;
-```
-
-- *Type:* num
-
-The length of the set.
-
----
-
-
-### Node <a name="Node" id="@winglang/sdk.std.Node"></a>
-
-The internal node of a construct.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Node.addConnection">addConnection</a></code> | Adds a connection between two constructs. |
-| <code><a href="#@winglang/sdk.std.Node.addDependency">addDependency</a></code> | Add an ordering dependency on another construct. |
-| <code><a href="#@winglang/sdk.std.Node.addMetadata">addMetadata</a></code> | Adds a metadata entry to this construct. |
-| <code><a href="#@winglang/sdk.std.Node.addValidation">addValidation</a></code> | Adds a validation to this construct. |
-| <code><a href="#@winglang/sdk.std.Node.findAll">findAll</a></code> | Return this construct and all of its children in the given order. |
-| <code><a href="#@winglang/sdk.std.Node.findChild">findChild</a></code> | Return a direct child by id. |
-| <code><a href="#@winglang/sdk.std.Node.getContext">getContext</a></code> | Retrieves a value from tree context if present. Otherwise, would throw an error. |
-| <code><a href="#@winglang/sdk.std.Node.lock">lock</a></code> | Locks this construct from allowing more children to be added. |
-| <code><a href="#@winglang/sdk.std.Node.setContext">setContext</a></code> | This can be used to set contextual values. |
-| <code><a href="#@winglang/sdk.std.Node.tryFindChild">tryFindChild</a></code> | Return a direct child by id, or undefined. |
-| <code><a href="#@winglang/sdk.std.Node.tryGetContext">tryGetContext</a></code> | Retrieves a value from tree context. |
-| <code><a href="#@winglang/sdk.std.Node.tryRemoveChild">tryRemoveChild</a></code> | Remove the child with the given name, if present. |
-| <code><a href="#@winglang/sdk.std.Node.validate">validate</a></code> | Validates this construct. |
-
----
-
-##### `addConnection` <a name="addConnection" id="@winglang/sdk.std.Node.addConnection"></a>
-
-```wing
-addConnection(props: AddConnectionProps): void
-```
-
-Adds a connection between two constructs.
-
-A connection is a piece of
-metadata describing how one construct is related to another construct.
-
-###### `props`<sup>Required</sup> <a name="props" id="@winglang/sdk.std.Node.addConnection.parameter.props"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.AddConnectionProps">AddConnectionProps</a>
-
----
-
-##### `addDependency` <a name="addDependency" id="@winglang/sdk.std.Node.addDependency"></a>
-
-```wing
-addDependency(...deps: Array<IDependable>): void
-```
-
-Add an ordering dependency on another construct.
-
-An `IDependable`
-
-###### `deps`<sup>Required</sup> <a name="deps" id="@winglang/sdk.std.Node.addDependency.parameter.deps"></a>
-
-- *Type:* constructs.IDependable
-
----
-
-##### `addMetadata` <a name="addMetadata" id="@winglang/sdk.std.Node.addMetadata"></a>
-
-```wing
-addMetadata(type: str, data: any, options?: MetadataOptions): void
-```
-
-Adds a metadata entry to this construct.
-
-Entries are arbitrary values and will also include a stack trace to allow tracing back to
-the code location for when the entry was added. It can be used, for example, to include source
-mapping in CloudFormation templates to improve diagnostics.
-
-###### `type`<sup>Required</sup> <a name="type" id="@winglang/sdk.std.Node.addMetadata.parameter.type"></a>
-
-- *Type:* str
-
-a string denoting the type of metadata.
-
----
-
-###### `data`<sup>Required</sup> <a name="data" id="@winglang/sdk.std.Node.addMetadata.parameter.data"></a>
-
-- *Type:* any
-
-the value of the metadata (can be a Token).
-
-If null/undefined, metadata will not be added.
-
----
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.std.Node.addMetadata.parameter.options"></a>
-
-- *Type:* constructs.MetadataOptions
-
-options.
-
----
-
-##### `addValidation` <a name="addValidation" id="@winglang/sdk.std.Node.addValidation"></a>
-
-```wing
-addValidation(validation: IValidation): void
-```
-
-Adds a validation to this construct.
-
-When `node.validate()` is called, the `validate()` method will be called on
-all validations and all errors will be returned.
-
-###### `validation`<sup>Required</sup> <a name="validation" id="@winglang/sdk.std.Node.addValidation.parameter.validation"></a>
-
-- *Type:* constructs.IValidation
-
-The validation object.
-
----
-
-##### `findAll` <a name="findAll" id="@winglang/sdk.std.Node.findAll"></a>
-
-```wing
-findAll(order?: ConstructOrder): MutArray<IConstruct>
-```
-
-Return this construct and all of its children in the given order.
-
-###### `order`<sup>Optional</sup> <a name="order" id="@winglang/sdk.std.Node.findAll.parameter.order"></a>
-
-- *Type:* constructs.ConstructOrder
-
----
-
-##### `findChild` <a name="findChild" id="@winglang/sdk.std.Node.findChild"></a>
-
-```wing
-findChild(): IConstruct
-```
-
-Return a direct child by id.
-
-Throws an error if the child is not found.
-
-##### `getContext` <a name="getContext" id="@winglang/sdk.std.Node.getContext"></a>
-
-```wing
-getContext(key: str): any
-```
-
-Retrieves a value from tree context if present. Otherwise, would throw an error.
-
-Context is usually initialized at the root, but can be overridden at any point in the tree.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Node.getContext.parameter.key"></a>
-
-- *Type:* str
-
-The context key.
-
----
-
-##### `lock` <a name="lock" id="@winglang/sdk.std.Node.lock"></a>
-
-```wing
-lock(): void
-```
-
-Locks this construct from allowing more children to be added.
-
-After this
-call, no more children can be added to this construct or to any children.
-
-##### `setContext` <a name="setContext" id="@winglang/sdk.std.Node.setContext"></a>
-
-```wing
-setContext(key: str, value: any): void
-```
-
-This can be used to set contextual values.
-
-Context must be set before any children are added, since children may consult context info during construction.
-If the key already exists, it will be overridden.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Node.setContext.parameter.key"></a>
-
-- *Type:* str
-
-The context key.
-
----
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.Node.setContext.parameter.value"></a>
-
-- *Type:* any
-
-The context value.
-
----
-
-##### `tryFindChild` <a name="tryFindChild" id="@winglang/sdk.std.Node.tryFindChild"></a>
-
-```wing
-tryFindChild(): IConstruct
-```
-
-Return a direct child by id, or undefined.
-
-##### `tryGetContext` <a name="tryGetContext" id="@winglang/sdk.std.Node.tryGetContext"></a>
-
-```wing
-tryGetContext(key: str): any
-```
-
-Retrieves a value from tree context.
-
-Context is usually initialized at the root, but can be overridden at any point in the tree.
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Node.tryGetContext.parameter.key"></a>
-
-- *Type:* str
-
-The context key.
-
----
-
-##### `tryRemoveChild` <a name="tryRemoveChild" id="@winglang/sdk.std.Node.tryRemoveChild"></a>
-
-```wing
-tryRemoveChild(childName: str): bool
-```
-
-Remove the child with the given name, if present.
-
-###### `childName`<sup>Required</sup> <a name="childName" id="@winglang/sdk.std.Node.tryRemoveChild.parameter.childName"></a>
-
-- *Type:* str
-
----
-
-##### `validate` <a name="validate" id="@winglang/sdk.std.Node.validate"></a>
-
-```wing
-validate(): MutArray<str>
-```
-
-Validates this construct.
-
-Invokes the `validate()` method on all validations added through
-`addValidation()`.
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.Node.property.addr">addr</a></code> | <code>str</code> | Returns an opaque tree-unique address for this construct. |
-| <code><a href="#@winglang/sdk.std.Node.property.app">app</a></code> | <code><a href="#@winglang/sdk.std.IApp">IApp</a></code> | Returns the root of the construct tree (the `cloud.App` object). |
-| <code><a href="#@winglang/sdk.std.Node.property.children">children</a></code> | <code>MutArray&lt;constructs.IConstruct&gt;</code> | All direct children of this construct. |
-| <code><a href="#@winglang/sdk.std.Node.property.dependencies">dependencies</a></code> | <code>MutArray&lt;constructs.IConstruct&gt;</code> | Return all dependencies registered on this node (non-recursive). |
-| <code><a href="#@winglang/sdk.std.Node.property.id">id</a></code> | <code>str</code> | The id of this construct within the current scope. |
-| <code><a href="#@winglang/sdk.std.Node.property.locked">locked</a></code> | <code>bool</code> | Returns true if this construct or the scopes in which it is defined are locked. |
-| <code><a href="#@winglang/sdk.std.Node.property.metadata">metadata</a></code> | <code>MutArray&lt;constructs.MetadataEntry&gt;</code> | An immutable array of metadata objects associated with this construct. |
-| <code><a href="#@winglang/sdk.std.Node.property.path">path</a></code> | <code>str</code> | The full, absolute path of this construct in the tree. |
-| <code><a href="#@winglang/sdk.std.Node.property.root">root</a></code> | <code>constructs.IConstruct</code> | Returns the root of the construct tree (the `cloud.App` object). |
-| <code><a href="#@winglang/sdk.std.Node.property.scopes">scopes</a></code> | <code>MutArray&lt;constructs.IConstruct&gt;</code> | All parent scopes of this construct. |
-| <code><a href="#@winglang/sdk.std.Node.property.scope">scope</a></code> | <code>constructs.IConstruct</code> | Returns the scope in which this construct is defined. |
-| <code><a href="#@winglang/sdk.std.Node.property.defaultChild">defaultChild</a></code> | <code>constructs.IConstruct</code> | Returns the child construct that has the id `Default` or `Resource"`. |
-| <code><a href="#@winglang/sdk.std.Node.property.description">description</a></code> | <code>str</code> | Description of the construct for display purposes. |
-| <code><a href="#@winglang/sdk.std.Node.property.hidden">hidden</a></code> | <code>bool</code> | Whether the construct should be hidden by default in tree visualizations. |
-| <code><a href="#@winglang/sdk.std.Node.property.sourceModule">sourceModule</a></code> | <code>str</code> | The source file or library where the construct was defined. |
-| <code><a href="#@winglang/sdk.std.Node.property.title">title</a></code> | <code>str</code> | Title of the construct for display purposes. |
-
----
-
-##### `addr`<sup>Required</sup> <a name="addr" id="@winglang/sdk.std.Node.property.addr"></a>
-
-```wing
-addr: str;
-```
-
-- *Type:* str
-
-Returns an opaque tree-unique address for this construct.
-
-Addresses are 42 characters hexadecimal strings. They begin with "c8"
-followed by 40 lowercase hexadecimal characters (0-9a-f).
-
-Addresses are calculated using a SHA-1 of the components of the construct
-path.
-
-To enable refactorings of construct trees, constructs with the ID `Default`
-will be excluded from the calculation. In those cases constructs in the
-same tree may have the same addreess.
-
----
-
-*Example*
-
-```wing
-c83a2846e506bcc5f10682b564084bca2d275709ee
-```
-
-
-##### `app`<sup>Required</sup> <a name="app" id="@winglang/sdk.std.Node.property.app"></a>
-
-```wing
-app: IApp;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.IApp">IApp</a>
-
-Returns the root of the construct tree (the `cloud.App` object).
-
-Similar to `root`.
-
----
-
-##### `children`<sup>Required</sup> <a name="children" id="@winglang/sdk.std.Node.property.children"></a>
-
-```wing
-children: MutArray<IConstruct>;
-```
-
-- *Type:* MutArray&lt;constructs.IConstruct&gt;
-
-All direct children of this construct.
-
----
-
-##### `dependencies`<sup>Required</sup> <a name="dependencies" id="@winglang/sdk.std.Node.property.dependencies"></a>
-
-```wing
-dependencies: MutArray<IConstruct>;
-```
-
-- *Type:* MutArray&lt;constructs.IConstruct&gt;
-
-Return all dependencies registered on this node (non-recursive).
-
----
-
-##### `id`<sup>Required</sup> <a name="id" id="@winglang/sdk.std.Node.property.id"></a>
-
-```wing
-id: str;
-```
-
-- *Type:* str
-
-The id of this construct within the current scope.
-
-This is a a scope-unique id. To obtain an app-unique id for this construct, use `addr`.
-
----
-
-##### `locked`<sup>Required</sup> <a name="locked" id="@winglang/sdk.std.Node.property.locked"></a>
-
-```wing
-locked: bool;
-```
-
-- *Type:* bool
-
-Returns true if this construct or the scopes in which it is defined are locked.
-
----
-
-##### `metadata`<sup>Required</sup> <a name="metadata" id="@winglang/sdk.std.Node.property.metadata"></a>
-
-```wing
-metadata: MutArray<MetadataEntry>;
-```
-
-- *Type:* MutArray&lt;constructs.MetadataEntry&gt;
-
-An immutable array of metadata objects associated with this construct.
-
-This can be used, for example, to implement support for deprecation notices, source mapping, etc.
-
----
-
-##### `path`<sup>Required</sup> <a name="path" id="@winglang/sdk.std.Node.property.path"></a>
-
-```wing
-path: str;
-```
-
-- *Type:* str
-
-The full, absolute path of this construct in the tree.
-
-Components are separated by '/'.
-
----
-
-##### `root`<sup>Required</sup> <a name="root" id="@winglang/sdk.std.Node.property.root"></a>
-
-```wing
-root: IConstruct;
-```
-
-- *Type:* constructs.IConstruct
-
-Returns the root of the construct tree (the `cloud.App` object).
-
-Similar to `app`.
-
----
-
-##### `scopes`<sup>Required</sup> <a name="scopes" id="@winglang/sdk.std.Node.property.scopes"></a>
-
-```wing
-scopes: MutArray<IConstruct>;
-```
-
-- *Type:* MutArray&lt;constructs.IConstruct&gt;
-
-All parent scopes of this construct.
-
----
-
-##### `scope`<sup>Optional</sup> <a name="scope" id="@winglang/sdk.std.Node.property.scope"></a>
-
-```wing
-scope: IConstruct;
-```
-
-- *Type:* constructs.IConstruct
-
-Returns the scope in which this construct is defined.
-
-The value is `undefined` at the root of the construct scope tree.
-
----
-
-##### `defaultChild`<sup>Optional</sup> <a name="defaultChild" id="@winglang/sdk.std.Node.property.defaultChild"></a>
-
-```wing
-defaultChild: IConstruct;
-```
-
-- *Type:* constructs.IConstruct
-
-Returns the child construct that has the id `Default` or `Resource"`.
-
-This is usually the construct that provides the bulk of the underlying functionality.
-Useful for modifications of the underlying construct that are not available at the higher levels.
-Override the defaultChild property.
-
-This should only be used in the cases where the correct
-default child is not named 'Resource' or 'Default' as it
-should be.
-
-If you set this to undefined, the default behavior of finding
-the child named 'Resource' or 'Default' will be used.
-
----
-
-##### `description`<sup>Optional</sup> <a name="description" id="@winglang/sdk.std.Node.property.description"></a>
-
-```wing
-description: str;
-```
-
-- *Type:* str
-
-Description of the construct for display purposes.
-
----
-
-##### `hidden`<sup>Optional</sup> <a name="hidden" id="@winglang/sdk.std.Node.property.hidden"></a>
-
-```wing
-hidden: bool;
-```
-
-- *Type:* bool
-
-Whether the construct should be hidden by default in tree visualizations.
-
----
-
-##### `sourceModule`<sup>Optional</sup> <a name="sourceModule" id="@winglang/sdk.std.Node.property.sourceModule"></a>
-
-```wing
-sourceModule: str;
-```
-
-- *Type:* str
-
-The source file or library where the construct was defined.
-
----
-
-##### `title`<sup>Optional</sup> <a name="title" id="@winglang/sdk.std.Node.property.title"></a>
-
-```wing
-title: str;
-```
-
-- *Type:* str
-
-Title of the construct for display purposes.
-
----
-
-
-### Number <a name="Number" id="@winglang/sdk.std.Number"></a>
-
-Number.
-
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Number.fromJson">fromJson</a></code> | Parse a number from Json. |
-| <code><a href="#@winglang/sdk.std.Number.fromStr">fromStr</a></code> | Parse a number from string. |
-
----
-
-##### `fromJson` <a name="fromJson" id="@winglang/sdk.std.Number.fromJson"></a>
-
-```wing
-num.fromJson(json: Json, options?: JsonValidationOptions);
-```
-
-Parse a number from Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Number.fromJson.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-to parse number from.
-
----
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.std.Number.fromJson.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.JsonValidationOptions">JsonValidationOptions</a>
-
----
-
-##### `fromStr` <a name="fromStr" id="@winglang/sdk.std.Number.fromStr"></a>
-
-```wing
-num.fromStr(str: str);
-```
-
-Parse a number from string.
-
-###### `str`<sup>Required</sup> <a name="str" id="@winglang/sdk.std.Number.fromStr.parameter.str"></a>
-
-- *Type:* str
-
-to parse number from.
-
----
-
-
-
-### Range <a name="Range" id="@winglang/sdk.std.Range"></a>
-
-Range.
-
-
-
-
-
-### Set <a name="Set" id="@winglang/sdk.std.Set"></a>
-
-Immutable Set.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Set.copyMut">copyMut</a></code> | Create a mutable shallow copy of this set. |
-| <code><a href="#@winglang/sdk.std.Set.has">has</a></code> | Returns a boolean indicating whether an element with the specified value exists in the set. |
-| <code><a href="#@winglang/sdk.std.Set.toArray">toArray</a></code> | Create an immutable array shallow copy of this set. |
-
----
-
-##### `copyMut` <a name="copyMut" id="@winglang/sdk.std.Set.copyMut"></a>
-
-```wing
-copyMut(): MutSet
-```
-
-Create a mutable shallow copy of this set.
-
-##### `has` <a name="has" id="@winglang/sdk.std.Set.has"></a>
-
-```wing
-has(value: <T>): bool
-```
-
-Returns a boolean indicating whether an element with the specified value exists in the set.
-
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.Set.has.parameter.value"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
-
-The value to test for presence in the Set object.
-
----
-
-##### `toArray` <a name="toArray" id="@winglang/sdk.std.Set.toArray"></a>
-
-```wing
-toArray(): Array
-```
-
-Create an immutable array shallow copy of this set.
-
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.Set.property.size">size</a></code> | <code>num</code> | The length of the set. |
-
----
-
-##### `size`<sup>Required</sup> <a name="size" id="@winglang/sdk.std.Set.property.size"></a>
-
-```wing
-size: num;
-```
-
-- *Type:* num
-
-The length of the set.
-
----
-
-
-### String <a name="String" id="@winglang/sdk.std.String"></a>
-
-String.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.String.at">at</a></code> | Returns the character at the specified index. |
-| <code><a href="#@winglang/sdk.std.String.concat">concat</a></code> | Combines the text of two (or more) strings and returns a new string. |
-| <code><a href="#@winglang/sdk.std.String.contains">contains</a></code> | Checks if string includes substring. |
-| <code><a href="#@winglang/sdk.std.String.endsWith">endsWith</a></code> | Does this string end with the given searchString? |
-| <code><a href="#@winglang/sdk.std.String.indexOf">indexOf</a></code> | Returns the index of the first occurrence of searchString found. |
-| <code><a href="#@winglang/sdk.std.String.lowercase">lowercase</a></code> | Returns this string in lower case. |
-| <code><a href="#@winglang/sdk.std.String.replace">replace</a></code> | Replaces the first occurence of a substring within a string. |
-| <code><a href="#@winglang/sdk.std.String.replaceAll">replaceAll</a></code> | Replaces all occurrences of a substring within a string. |
-| <code><a href="#@winglang/sdk.std.String.split">split</a></code> | Splits string by separator. |
-| <code><a href="#@winglang/sdk.std.String.startsWith">startsWith</a></code> | Does this string start with the given searchString? |
-| <code><a href="#@winglang/sdk.std.String.substring">substring</a></code> | Returns a string between indexStart, indexEnd. |
-| <code><a href="#@winglang/sdk.std.String.trim">trim</a></code> | Removes white spaces from start and end of this string. |
-| <code><a href="#@winglang/sdk.std.String.uppercase">uppercase</a></code> | Returns this string in upper case. |
-
----
-
-##### `at` <a name="at" id="@winglang/sdk.std.String.at"></a>
-
-```wing
-at(index: num): str
-```
-
-Returns the character at the specified index.
-
-###### `index`<sup>Required</sup> <a name="index" id="@winglang/sdk.std.String.at.parameter.index"></a>
-
-- *Type:* num
-
-position of the character.
-
----
-
-##### `concat` <a name="concat" id="@winglang/sdk.std.String.concat"></a>
-
-```wing
-concat(strN: str): str
-```
-
-Combines the text of two (or more) strings and returns a new string.
-
-###### `strN`<sup>Required</sup> <a name="strN" id="@winglang/sdk.std.String.concat.parameter.strN"></a>
-
-- *Type:* str
-
-one or more strings to concatenate to this string.
-
----
-
-##### `contains` <a name="contains" id="@winglang/sdk.std.String.contains"></a>
-
-```wing
-contains(searchString: str): bool
-```
-
-Checks if string includes substring.
-
-###### `searchString`<sup>Required</sup> <a name="searchString" id="@winglang/sdk.std.String.contains.parameter.searchString"></a>
-
-- *Type:* str
-
-substring to search for.
-
----
-
-##### `endsWith` <a name="endsWith" id="@winglang/sdk.std.String.endsWith"></a>
-
-```wing
-endsWith(searchString: str): bool
-```
-
-Does this string end with the given searchString?
-
-###### `searchString`<sup>Required</sup> <a name="searchString" id="@winglang/sdk.std.String.endsWith.parameter.searchString"></a>
-
-- *Type:* str
-
-substring to search for.
-
----
-
-##### `indexOf` <a name="indexOf" id="@winglang/sdk.std.String.indexOf"></a>
-
-```wing
-indexOf(searchString: str): num
-```
-
-Returns the index of the first occurrence of searchString found.
-
-###### `searchString`<sup>Required</sup> <a name="searchString" id="@winglang/sdk.std.String.indexOf.parameter.searchString"></a>
-
-- *Type:* str
-
-substring to search for.
-
----
-
-##### `lowercase` <a name="lowercase" id="@winglang/sdk.std.String.lowercase"></a>
-
-```wing
-lowercase(): str
-```
-
-Returns this string in lower case.
-
-##### `replace` <a name="replace" id="@winglang/sdk.std.String.replace"></a>
-
-```wing
-replace(searchString: str, replaceString: str): str
-```
-
-Replaces the first occurence of a substring within a string.
-
-###### `searchString`<sup>Required</sup> <a name="searchString" id="@winglang/sdk.std.String.replace.parameter.searchString"></a>
-
-- *Type:* str
-
-The substring to search for.
-
----
-
-###### `replaceString`<sup>Required</sup> <a name="replaceString" id="@winglang/sdk.std.String.replace.parameter.replaceString"></a>
-
-- *Type:* str
-
-The replacement substring.
-
----
-
-##### `replaceAll` <a name="replaceAll" id="@winglang/sdk.std.String.replaceAll"></a>
-
-```wing
-replaceAll(searchString: str, replaceString: str): str
-```
-
-Replaces all occurrences of a substring within a string.
-
-###### `searchString`<sup>Required</sup> <a name="searchString" id="@winglang/sdk.std.String.replaceAll.parameter.searchString"></a>
-
-- *Type:* str
-
-The substring to search for.
-
----
-
-###### `replaceString`<sup>Required</sup> <a name="replaceString" id="@winglang/sdk.std.String.replaceAll.parameter.replaceString"></a>
-
-- *Type:* str
-
-The replacement substring.
-
----
-
-##### `split` <a name="split" id="@winglang/sdk.std.String.split"></a>
-
-```wing
-split(separator: str): MutArray<str>
-```
-
-Splits string by separator.
-
-###### `separator`<sup>Required</sup> <a name="separator" id="@winglang/sdk.std.String.split.parameter.separator"></a>
-
-- *Type:* str
-
-separator to split by.
-
----
-
-##### `startsWith` <a name="startsWith" id="@winglang/sdk.std.String.startsWith"></a>
-
-```wing
-startsWith(searchString: str): bool
-```
-
-Does this string start with the given searchString?
-
-###### `searchString`<sup>Required</sup> <a name="searchString" id="@winglang/sdk.std.String.startsWith.parameter.searchString"></a>
-
-- *Type:* str
-
-substring to search for.
-
----
-
-##### `substring` <a name="substring" id="@winglang/sdk.std.String.substring"></a>
-
-```wing
-substring(indexStart: num, indexEnd?: num): str
-```
-
-Returns a string between indexStart, indexEnd.
-
-###### `indexStart`<sup>Required</sup> <a name="indexStart" id="@winglang/sdk.std.String.substring.parameter.indexStart"></a>
-
-- *Type:* num
-
-index of the character we slice at.
-
----
-
-###### `indexEnd`<sup>Optional</sup> <a name="indexEnd" id="@winglang/sdk.std.String.substring.parameter.indexEnd"></a>
-
-- *Type:* num
-
-optional - index of the character we end slicing at.
-
----
-
-##### `trim` <a name="trim" id="@winglang/sdk.std.String.trim"></a>
-
-```wing
-trim(): str
-```
-
-Removes white spaces from start and end of this string.
-
-##### `uppercase` <a name="uppercase" id="@winglang/sdk.std.String.uppercase"></a>
-
-```wing
-uppercase(): str
-```
-
-Returns this string in upper case.
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.String.fromJson">fromJson</a></code> | Parse string from Json. |
-
----
-
-##### `fromJson` <a name="fromJson" id="@winglang/sdk.std.String.fromJson"></a>
-
-```wing
-str.fromJson(json: Json, options?: JsonValidationOptions);
-```
-
-Parse string from Json.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.String.fromJson.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-to create string from.
-
----
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.std.String.fromJson.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.JsonValidationOptions">JsonValidationOptions</a>
-
----
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.String.property.length">length</a></code> | <code>num</code> | The length of the string. |
-
----
-
-##### `length`<sup>Required</sup> <a name="length" id="@winglang/sdk.std.String.property.length"></a>
-
-```wing
-length: num;
-```
-
-- *Type:* num
-
-The length of the string.
-
----
-
-
-### Struct <a name="Struct" id="@winglang/sdk.std.Struct"></a>
-
-Shared behavior for all structs.
-
-
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.Struct.fromJson">fromJson</a></code> | Converts a Json to a Struct. |
-| <code><a href="#@winglang/sdk.std.Struct.parseJson">parseJson</a></code> | Parse a Json string into a Struct. |
-| <code><a href="#@winglang/sdk.std.Struct.schema">schema</a></code> | Retrieve the schema for this struct. |
-| <code><a href="#@winglang/sdk.std.Struct.tryFromJson">tryFromJson</a></code> | Converts a Json to a Struct, returning nil if the Json is not valid. |
-| <code><a href="#@winglang/sdk.std.Struct.tryParseJson">tryParseJson</a></code> | Parse a Json string into a Struct, returning nil if the Json is not valid. |
-
----
-
-##### `fromJson` <a name="fromJson" id="@winglang/sdk.std.Struct.fromJson"></a>
-
-```wing
-Struct.fromJson(json: Json, options?: JsonValidationOptions);
-```
-
-Converts a Json to a Struct.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Struct.fromJson.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
----
-
-###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.std.Struct.fromJson.parameter.options"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.JsonValidationOptions">JsonValidationOptions</a>
-
----
-
-##### `parseJson` <a name="parseJson" id="@winglang/sdk.std.Struct.parseJson"></a>
-
-```wing
-Struct.parseJson(json: str);
-```
-
-Parse a Json string into a Struct.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Struct.parseJson.parameter.json"></a>
-
-- *Type:* str
-
----
-
-##### `schema` <a name="schema" id="@winglang/sdk.std.Struct.schema"></a>
-
-```wing
-Struct.schema();
-```
-
-Retrieve the schema for this struct.
-
-##### `tryFromJson` <a name="tryFromJson" id="@winglang/sdk.std.Struct.tryFromJson"></a>
-
-```wing
-Struct.tryFromJson(json: Json);
-```
-
-Converts a Json to a Struct, returning nil if the Json is not valid.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Struct.tryFromJson.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
----
-
-##### `tryParseJson` <a name="tryParseJson" id="@winglang/sdk.std.Struct.tryParseJson"></a>
-
-```wing
-Struct.tryParseJson(json?: str);
-```
-
-Parse a Json string into a Struct, returning nil if the Json is not valid.
-
-###### `json`<sup>Optional</sup> <a name="json" id="@winglang/sdk.std.Struct.tryParseJson.parameter.json"></a>
-
-- *Type:* str
-
----
-
-
-
-## Structs <a name="Structs" id="Structs"></a>
-
-### AddConnectionProps <a name="AddConnectionProps" id="@winglang/sdk.std.AddConnectionProps"></a>
-
-Props for `Node.addConnection`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.std.AddConnectionProps.Initializer"></a>
-
-```wing
-let AddConnectionProps = AddConnectionProps{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.AddConnectionProps.property.name">name</a></code> | <code>str</code> | A name for the connection. |
-| <code><a href="#@winglang/sdk.std.AddConnectionProps.property.source">source</a></code> | <code>constructs.IConstruct</code> | The source of the connection. |
-| <code><a href="#@winglang/sdk.std.AddConnectionProps.property.target">target</a></code> | <code>constructs.IConstruct</code> | The target of the connection. |
-
----
-
-##### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.std.AddConnectionProps.property.name"></a>
-
-```wing
-name: str;
-```
-
-- *Type:* str
-
-A name for the connection.
-
----
-
-##### `source`<sup>Required</sup> <a name="source" id="@winglang/sdk.std.AddConnectionProps.property.source"></a>
-
-```wing
-source: IConstruct;
-```
-
-- *Type:* constructs.IConstruct
-
-The source of the connection.
-
----
-
-##### `target`<sup>Required</sup> <a name="target" id="@winglang/sdk.std.AddConnectionProps.property.target"></a>
-
-```wing
-target: IConstruct;
-```
-
-- *Type:* constructs.IConstruct
-
-The target of the connection.
-
----
-
-### DatetimeComponents <a name="DatetimeComponents" id="@winglang/sdk.std.DatetimeComponents"></a>
-
-Interface that is used for setting Datetime date.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.std.DatetimeComponents.Initializer"></a>
-
-```wing
-let DatetimeComponents = DatetimeComponents{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.day">day</a></code> | <code>num</code> | Day. |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.hour">hour</a></code> | <code>num</code> | Hours. |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.min">min</a></code> | <code>num</code> | Minutes. |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.month">month</a></code> | <code>num</code> | Month. |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.ms">ms</a></code> | <code>num</code> | Milliseconds. |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.sec">sec</a></code> | <code>num</code> | Seconds. |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.tz">tz</a></code> | <code>num</code> | Timezone offset in minutes from UTC. |
-| <code><a href="#@winglang/sdk.std.DatetimeComponents.property.year">year</a></code> | <code>num</code> | Year. |
-
----
-
-##### `day`<sup>Required</sup> <a name="day" id="@winglang/sdk.std.DatetimeComponents.property.day"></a>
-
-```wing
-day: num;
-```
-
-- *Type:* num
-
-Day.
-
----
-
-##### `hour`<sup>Required</sup> <a name="hour" id="@winglang/sdk.std.DatetimeComponents.property.hour"></a>
-
-```wing
-hour: num;
-```
-
-- *Type:* num
-
-Hours.
-
----
-
-##### `min`<sup>Required</sup> <a name="min" id="@winglang/sdk.std.DatetimeComponents.property.min"></a>
-
-```wing
-min: num;
-```
-
-- *Type:* num
-
-Minutes.
-
----
-
-##### `month`<sup>Required</sup> <a name="month" id="@winglang/sdk.std.DatetimeComponents.property.month"></a>
-
-```wing
-month: num;
-```
-
-- *Type:* num
-
-Month.
-
----
-
-##### `ms`<sup>Required</sup> <a name="ms" id="@winglang/sdk.std.DatetimeComponents.property.ms"></a>
-
-```wing
-ms: num;
-```
-
-- *Type:* num
-
-Milliseconds.
-
----
-
-##### `sec`<sup>Required</sup> <a name="sec" id="@winglang/sdk.std.DatetimeComponents.property.sec"></a>
-
-```wing
-sec: num;
-```
-
-- *Type:* num
-
-Seconds.
-
----
-
-##### `tz`<sup>Required</sup> <a name="tz" id="@winglang/sdk.std.DatetimeComponents.property.tz"></a>
-
-```wing
-tz: num;
-```
-
-- *Type:* num
-
-Timezone offset in minutes from UTC.
-
----
-
-##### `year`<sup>Required</sup> <a name="year" id="@winglang/sdk.std.DatetimeComponents.property.year"></a>
-
-```wing
-year: num;
-```
-
-- *Type:* num
-
-Year.
-
----
-
-### JsonEntry <a name="JsonEntry" id="@winglang/sdk.std.JsonEntry"></a>
-
-Json entry representation.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.std.JsonEntry.Initializer"></a>
-
-```wing
-let JsonEntry = JsonEntry{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.JsonEntry.property.key">key</a></code> | <code>str</code> | The entry key. |
-| <code><a href="#@winglang/sdk.std.JsonEntry.property.value">value</a></code> | <code><a href="#@winglang/sdk.std.Json">Json</a></code> | The entry value. |
-
----
-
-##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.JsonEntry.property.key"></a>
-
-```wing
-key: str;
-```
-
-- *Type:* str
-
-The entry key.
-
----
-
-##### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.JsonEntry.property.value"></a>
-
-```wing
-value: Json;
-```
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The entry value.
-
----
-
-### JsonStringifyOptions <a name="JsonStringifyOptions" id="@winglang/sdk.std.JsonStringifyOptions"></a>
-
-Options for stringify() method.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.std.JsonStringifyOptions.Initializer"></a>
-
-```wing
-let JsonStringifyOptions = JsonStringifyOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.JsonStringifyOptions.property.indent">indent</a></code> | <code>num</code> | Indentation spaces number. |
-
----
-
-##### `indent`<sup>Required</sup> <a name="indent" id="@winglang/sdk.std.JsonStringifyOptions.property.indent"></a>
-
-```wing
-indent: num;
-```
-
-- *Type:* num
-
-Indentation spaces number.
-
----
-
-### JsonValidationOptions <a name="JsonValidationOptions" id="@winglang/sdk.std.JsonValidationOptions"></a>
-
-Options for validating Json.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.std.JsonValidationOptions.Initializer"></a>
-
-```wing
-let JsonValidationOptions = JsonValidationOptions{ ... };
-```
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.JsonValidationOptions.property.unsafe">unsafe</a></code> | <code>bool</code> | Unsafe mode to skip validation (may lead to runtime errors). |
-
----
-
-##### `unsafe`<sup>Optional</sup> <a name="unsafe" id="@winglang/sdk.std.JsonValidationOptions.property.unsafe"></a>
-
-```wing
-unsafe: bool;
-```
-
-- *Type:* bool
-
-Unsafe mode to skip validation (may lead to runtime errors).
-
----
-
-## Protocols <a name="Protocols" id="Protocols"></a>
-
-### IApp <a name="IApp" id="@winglang/sdk.std.IApp"></a>
-
-- *Extends:* constructs.IConstruct
-
-- *Implemented By:* <a href="#@winglang/sdk.core.App">App</a>, <a href="#@winglang/sdk.std.IApp">IApp</a>
-
-Represents a Wing application.
-
-#### Methods <a name="Methods" id="Methods"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.std.IApp.makeId">makeId</a></code> | Generate a unique ID for the given scope and prefix. |
-
----
-
-##### `makeId` <a name="makeId" id="@winglang/sdk.std.IApp.makeId"></a>
-
-```wing
-makeId(prefix?: str): str
-```
-
-Generate a unique ID for the given scope and prefix.
-
-The newly generated ID is
-guaranteed to be unique within the given scope.
-It will have the form '{prefix}{n}', where '{prefix}' is the given prefix and '{n}' is an
-ascending sequence of integers starting from '0'.
-
-###### `prefix`<sup>Optional</sup> <a name="prefix" id="@winglang/sdk.std.IApp.makeId.parameter.prefix"></a>
-
-- *Type:* str
-
-prepended to the unique identifier.
-
----
-
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.std.IApp.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
-| <code><a href="#@winglang/sdk.std.IApp.property.entrypointDir">entrypointDir</a></code> | <code>str</code> | The directory of the entrypoint of the current program. |
-| <code><a href="#@winglang/sdk.std.IApp.property.isTestEnvironment">isTestEnvironment</a></code> | <code>bool</code> | `true` if this is a testing environment. |
-| <code><a href="#@winglang/sdk.std.IApp.property.workdir">workdir</a></code> | <code>str</code> | The `.wing` directory into which you can emit artifacts during preflight. |
-
----
-
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.std.IApp.property.node"></a>
-
-```wing
-node: Node;
-```
-
-- *Type:* constructs.Node
-
-The tree node.
-
----
-
-##### `entrypointDir`<sup>Required</sup> <a name="entrypointDir" id="@winglang/sdk.std.IApp.property.entrypointDir"></a>
-
-```wing
-entrypointDir: str;
-```
-
-- *Type:* str
-
-The directory of the entrypoint of the current program.
-
----
-
-##### `isTestEnvironment`<sup>Required</sup> <a name="isTestEnvironment" id="@winglang/sdk.std.IApp.property.isTestEnvironment"></a>
-
-```wing
-isTestEnvironment: bool;
-```
-
-- *Type:* bool
-
-`true` if this is a testing environment.
-
----
-
-##### `workdir`<sup>Required</sup> <a name="workdir" id="@winglang/sdk.std.IApp.property.workdir"></a>
-
-```wing
-workdir: str;
-```
-
-- *Type:* str
-
-The `.wing` directory into which you can emit artifacts during preflight.
-
----
-
diff --git a/docs/docs/04-standard-library/03-std/array.md b/docs/docs/04-standard-library/std/array.md
similarity index 88%
rename from docs/docs/04-standard-library/03-std/array.md
rename to docs/docs/04-standard-library/std/array.md
index 7ac25b43292..bfb6a1a2375 100644
--- a/docs/docs/04-standard-library/03-std/array.md
+++ b/docs/docs/04-standard-library/std/array.md
@@ -3,7 +3,6 @@ title: array
 id: array
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -24,6 +23,7 @@ Immutable Array.
 | <code><a href="#@winglang/sdk.std.Array.indexOf">indexOf</a></code> | Returns the index of the first occurrence of searchElement found. |
 | <code><a href="#@winglang/sdk.std.Array.join">join</a></code> | Returns a new string containing the concatenated values in this array, separated by commas or a specified separator string. |
 | <code><a href="#@winglang/sdk.std.Array.lastIndexOf">lastIndexOf</a></code> | Returns the index of the last occurrence of searchElement found. |
+| <code><a href="#@winglang/sdk.std.Array.slice">slice</a></code> | Returns a shallow copy of a portion of the array. |
 | <code><a href="#@winglang/sdk.std.Array.tryAt">tryAt</a></code> | Get the value at the given index, returning nil if the index is out of bounds. |
 
 ---
@@ -133,10 +133,34 @@ to search for.
 
 ---
 
+##### `slice` <a name="slice" id="@winglang/sdk.std.Array.slice"></a>
+
+```wing
+slice(start?: num, end?: num): Array
+```
+
+Returns a shallow copy of a portion of the array.
+
+###### `start`<sup>Optional</sup> <a name="start" id="@winglang/sdk.std.Array.slice.parameter.start"></a>
+
+- *Type:* num
+
+the beginning index of the slice, inclusive.
+
+---
+
+###### `end`<sup>Optional</sup> <a name="end" id="@winglang/sdk.std.Array.slice.parameter.end"></a>
+
+- *Type:* num
+
+the ending index of the slice, exclusive.
+
+---
+
 ##### `tryAt` <a name="tryAt" id="@winglang/sdk.std.Array.tryAt"></a>
 
 ```wing
-tryAt(index: num): <T>
+tryAt(index: num): <T>?
 ```
 
 Get the value at the given index, returning nil if the index is out of bounds.
@@ -189,9 +213,10 @@ Mutable Array.
 | <code><a href="#@winglang/sdk.std.MutArray.lastIndexOf">lastIndexOf</a></code> | Returns the index of the last occurrence of searchElement found. |
 | <code><a href="#@winglang/sdk.std.MutArray.pop">pop</a></code> | Remove value from end of array. |
 | <code><a href="#@winglang/sdk.std.MutArray.popAt">popAt</a></code> | Removes value from the given index of an array. |
-| <code><a href="#@winglang/sdk.std.MutArray.push">push</a></code> | Add value to end of array. |
+| <code><a href="#@winglang/sdk.std.MutArray.push">push</a></code> | Add values to end of array. |
 | <code><a href="#@winglang/sdk.std.MutArray.removeFirst">removeFirst</a></code> | Removes first occurrence of a given value in an array. |
 | <code><a href="#@winglang/sdk.std.MutArray.set">set</a></code> | Sets a new value at the given index of an array. |
+| <code><a href="#@winglang/sdk.std.MutArray.slice">slice</a></code> | Returns a shallow copy of a portion of the array. |
 
 ---
 
@@ -351,16 +376,16 @@ the index to remove the value at.
 ##### `push` <a name="push" id="@winglang/sdk.std.MutArray.push"></a>
 
 ```wing
-push(value: <T>): void
+push(...values: Array<<T>>): void
 ```
 
-Add value to end of array.
+Add values to end of array.
 
-###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.MutArray.push.parameter.value"></a>
+###### `values`<sup>Required</sup> <a name="values" id="@winglang/sdk.std.MutArray.push.parameter.values"></a>
 
 - *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
 
-value to add.
+values to add.
 
 ---
 
@@ -404,6 +429,30 @@ the value to set at the given index.
 
 ---
 
+##### `slice` <a name="slice" id="@winglang/sdk.std.MutArray.slice"></a>
+
+```wing
+slice(start?: num, end?: num): MutArray
+```
+
+Returns a shallow copy of a portion of the array.
+
+###### `start`<sup>Optional</sup> <a name="start" id="@winglang/sdk.std.MutArray.slice.parameter.start"></a>
+
+- *Type:* num
+
+the beginning index of the slice, inclusive.
+
+---
+
+###### `end`<sup>Optional</sup> <a name="end" id="@winglang/sdk.std.MutArray.slice.parameter.end"></a>
+
+- *Type:* num
+
+the ending index of the slice, exclusive.
+
+---
+
 
 #### Properties <a name="Properties" id="Properties"></a>
 
diff --git a/docs/docs/04-standard-library/03-std/bool.md b/docs/docs/04-standard-library/std/bool.md
similarity index 99%
rename from docs/docs/04-standard-library/03-std/bool.md
rename to docs/docs/04-standard-library/std/bool.md
index 55d9a113686..4f1639ce733 100644
--- a/docs/docs/04-standard-library/03-std/bool.md
+++ b/docs/docs/04-standard-library/std/bool.md
@@ -3,7 +3,6 @@ title: bool
 id: bool
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
diff --git a/docs/docs/04-standard-library/03-std/datetime.md b/docs/docs/04-standard-library/std/datetime.md
similarity index 99%
rename from docs/docs/04-standard-library/03-std/datetime.md
rename to docs/docs/04-standard-library/std/datetime.md
index 0765ee58bca..56c353326e7 100644
--- a/docs/docs/04-standard-library/03-std/datetime.md
+++ b/docs/docs/04-standard-library/std/datetime.md
@@ -3,7 +3,6 @@ title: datetime
 id: datetime
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -11,6 +10,8 @@ id: datetime
 
 ### Datetime <a name="Datetime" id="@winglang/sdk.std.Datetime"></a>
 
+- *Implements:* <a href="#@winglang/sdk.std.ILiftable">ILiftable</a>
+
 Represents a local or UTC date object.
 
 #### Methods <a name="Methods" id="Methods"></a>
diff --git a/docs/docs/04-standard-library/03-std/duration.md b/docs/docs/04-standard-library/std/duration.md
similarity index 98%
rename from docs/docs/04-standard-library/03-std/duration.md
rename to docs/docs/04-standard-library/std/duration.md
index 3934743ba51..0c2807e5cfc 100644
--- a/docs/docs/04-standard-library/03-std/duration.md
+++ b/docs/docs/04-standard-library/std/duration.md
@@ -3,7 +3,6 @@ title: duration
 id: duration
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -11,6 +10,8 @@ id: duration
 
 ### Duration <a name="Duration" id="@winglang/sdk.std.Duration"></a>
 
+- *Implements:* <a href="#@winglang/sdk.std.ILiftable">ILiftable</a>
+
 Represents a length of time.
 
 
diff --git a/docs/docs/04-standard-library/03-std/json.md b/docs/docs/04-standard-library/std/json.md
similarity index 94%
rename from docs/docs/04-standard-library/03-std/json.md
rename to docs/docs/04-standard-library/std/json.md
index a5d43d3f547..72436d5dc3f 100644
--- a/docs/docs/04-standard-library/03-std/json.md
+++ b/docs/docs/04-standard-library/std/json.md
@@ -3,7 +3,6 @@ title: json
 id: json
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -22,6 +21,7 @@ Immutable Json.
 | <code><a href="#@winglang/sdk.std.Json.asStr">asStr</a></code> | Convert Json element to string if possible. |
 | <code><a href="#@winglang/sdk.std.Json.get">get</a></code> | Returns the value associated with the specified Json key. |
 | <code><a href="#@winglang/sdk.std.Json.getAt">getAt</a></code> | Returns a specified element at a given index from Json Array. |
+| <code><a href="#@winglang/sdk.std.Json.has">has</a></code> | Checks if a Json object has a given key. |
 | <code><a href="#@winglang/sdk.std.Json.tryAsBool">tryAsBool</a></code> | Convert Json element to boolean if possible. |
 | <code><a href="#@winglang/sdk.std.Json.tryAsNum">tryAsNum</a></code> | Convert Json element to number if possible. |
 | <code><a href="#@winglang/sdk.std.Json.tryAsStr">tryAsStr</a></code> | Convert Json element to string if possible. |
@@ -86,10 +86,26 @@ The index of the element in the Json Array to return.
 
 ---
 
+##### `has` <a name="has" id="@winglang/sdk.std.Json.has"></a>
+
+```wing
+has(key: str): bool
+```
+
+Checks if a Json object has a given key.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Json.has.parameter.key"></a>
+
+- *Type:* str
+
+The key to check.
+
+---
+
 ##### `tryAsBool` <a name="tryAsBool" id="@winglang/sdk.std.Json.tryAsBool"></a>
 
 ```wing
-tryAsBool(): bool
+tryAsBool(): bool?
 ```
 
 Convert Json element to boolean if possible.
@@ -97,7 +113,7 @@ Convert Json element to boolean if possible.
 ##### `tryAsNum` <a name="tryAsNum" id="@winglang/sdk.std.Json.tryAsNum"></a>
 
 ```wing
-tryAsNum(): num
+tryAsNum(): num?
 ```
 
 Convert Json element to number if possible.
@@ -105,7 +121,7 @@ Convert Json element to number if possible.
 ##### `tryAsStr` <a name="tryAsStr" id="@winglang/sdk.std.Json.tryAsStr"></a>
 
 ```wing
-tryAsStr(): str
+tryAsStr(): str?
 ```
 
 Convert Json element to string if possible.
@@ -113,7 +129,7 @@ Convert Json element to string if possible.
 ##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.Json.tryGet"></a>
 
 ```wing
-tryGet(key: str): Json
+tryGet(key: str): Json?
 ```
 
 Optionally returns an specified element from the Json.
@@ -129,7 +145,7 @@ The key of the element to return.
 ##### `tryGetAt` <a name="tryGetAt" id="@winglang/sdk.std.Json.tryGetAt"></a>
 
 ```wing
-tryGetAt(index: num): Json
+tryGetAt(index: num): Json?
 ```
 
 Optionally returns a specified element at a given index from Json Array.
@@ -150,7 +166,6 @@ The index of the element in the Json Array to return.
 | <code><a href="#@winglang/sdk.std.Json.deepCopyMut">deepCopyMut</a></code> | Creates a mutable deep copy of the Json. |
 | <code><a href="#@winglang/sdk.std.Json.delete">delete</a></code> | Deletes a key in a given Json. |
 | <code><a href="#@winglang/sdk.std.Json.entries">entries</a></code> | Returns the entries from the Json. |
-| <code><a href="#@winglang/sdk.std.Json.has">has</a></code> | Checks if a Json object has a given key. |
 | <code><a href="#@winglang/sdk.std.Json.keys">keys</a></code> | Returns the keys from the Json. |
 | <code><a href="#@winglang/sdk.std.Json.parse">parse</a></code> | Parse a string into a Json. |
 | <code><a href="#@winglang/sdk.std.Json.stringify">stringify</a></code> | Formats Json as string. |
@@ -231,30 +246,6 @@ map to get the entries from.
 
 ---
 
-##### `has` <a name="has" id="@winglang/sdk.std.Json.has"></a>
-
-```wing
-Json.has(json: Json, key: str);
-```
-
-Checks if a Json object has a given key.
-
-###### `json`<sup>Required</sup> <a name="json" id="@winglang/sdk.std.Json.has.parameter.json"></a>
-
-- *Type:* <a href="#@winglang/sdk.std.Json">Json</a>
-
-The json object to inspect.
-
----
-
-###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.Json.has.parameter.key"></a>
-
-- *Type:* str
-
-The key to check.
-
----
-
 ##### `keys` <a name="keys" id="@winglang/sdk.std.Json.keys"></a>
 
 ```wing
@@ -418,8 +409,10 @@ Mutable Json.
 | <code><a href="#@winglang/sdk.std.MutJson.asBool">asBool</a></code> | Convert Json element to boolean if possible. |
 | <code><a href="#@winglang/sdk.std.MutJson.asNum">asNum</a></code> | Convert Json element to number if possible. |
 | <code><a href="#@winglang/sdk.std.MutJson.asStr">asStr</a></code> | Convert Json element to string if possible. |
+| <code><a href="#@winglang/sdk.std.MutJson.delete">delete</a></code> | Removes the specified element from a map. |
 | <code><a href="#@winglang/sdk.std.MutJson.get">get</a></code> | Returns the value associated with the specified Json key. |
 | <code><a href="#@winglang/sdk.std.MutJson.getAt">getAt</a></code> | Returns a specified element at a given index from MutJson Array. |
+| <code><a href="#@winglang/sdk.std.MutJson.has">has</a></code> | Checks if a Json object has a given key. |
 | <code><a href="#@winglang/sdk.std.MutJson.set">set</a></code> | Adds or updates an element in MutJson with a specific key and value. |
 | <code><a href="#@winglang/sdk.std.MutJson.setAt">setAt</a></code> | Set element in MutJson Array with a specific key and value. |
 | <code><a href="#@winglang/sdk.std.MutJson.tryAsBool">tryAsBool</a></code> | Convert Json element to boolean if possible. |
@@ -454,6 +447,22 @@ asStr(): str
 
 Convert Json element to string if possible.
 
+##### `delete` <a name="delete" id="@winglang/sdk.std.MutJson.delete"></a>
+
+```wing
+delete(key: str): bool
+```
+
+Removes the specified element from a map.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutJson.delete.parameter.key"></a>
+
+- *Type:* str
+
+The key.
+
+---
+
 ##### `get` <a name="get" id="@winglang/sdk.std.MutJson.get"></a>
 
 ```wing
@@ -486,6 +495,22 @@ The index of the element in the MutJson Array to return.
 
 ---
 
+##### `has` <a name="has" id="@winglang/sdk.std.MutJson.has"></a>
+
+```wing
+has(key: str): bool
+```
+
+Checks if a Json object has a given key.
+
+###### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.MutJson.has.parameter.key"></a>
+
+- *Type:* str
+
+The key to check.
+
+---
+
 ##### `set` <a name="set" id="@winglang/sdk.std.MutJson.set"></a>
 
 ```wing
@@ -535,7 +560,7 @@ The value of the element to set.
 ##### `tryAsBool` <a name="tryAsBool" id="@winglang/sdk.std.MutJson.tryAsBool"></a>
 
 ```wing
-tryAsBool(): bool
+tryAsBool(): bool?
 ```
 
 Convert Json element to boolean if possible.
@@ -543,7 +568,7 @@ Convert Json element to boolean if possible.
 ##### `tryAsNum` <a name="tryAsNum" id="@winglang/sdk.std.MutJson.tryAsNum"></a>
 
 ```wing
-tryAsNum(): num
+tryAsNum(): num?
 ```
 
 Convert Json element to number if possible.
@@ -551,7 +576,7 @@ Convert Json element to number if possible.
 ##### `tryAsStr` <a name="tryAsStr" id="@winglang/sdk.std.MutJson.tryAsStr"></a>
 
 ```wing
-tryAsStr(): str
+tryAsStr(): str?
 ```
 
 Convert Json element to string if possible.
@@ -559,7 +584,7 @@ Convert Json element to string if possible.
 ##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.MutJson.tryGet"></a>
 
 ```wing
-tryGet(key: str): MutJson
+tryGet(key: str): MutJson?
 ```
 
 Optionally returns an specified element from the Json.
@@ -575,7 +600,7 @@ The key of the element to return.
 ##### `tryGetAt` <a name="tryGetAt" id="@winglang/sdk.std.MutJson.tryGetAt"></a>
 
 ```wing
-tryGetAt(index: num): MutJson
+tryGetAt(index: num): MutJson?
 ```
 
 Optionally returns a specified element at a given index from Json Array.
diff --git a/docs/docs/04-standard-library/03-std/json_schema.md b/docs/docs/04-standard-library/std/json_schema.md
similarity index 99%
rename from docs/docs/04-standard-library/03-std/json_schema.md
rename to docs/docs/04-standard-library/std/json_schema.md
index 75af34b6b4f..87d228043ea 100644
--- a/docs/docs/04-standard-library/03-std/json_schema.md
+++ b/docs/docs/04-standard-library/std/json_schema.md
@@ -3,7 +3,6 @@ title: jsonSchema
 id: jsonSchema
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
diff --git a/docs/docs/04-standard-library/03-std/map.md b/docs/docs/04-standard-library/std/map.md
similarity index 81%
rename from docs/docs/04-standard-library/03-std/map.md
rename to docs/docs/04-standard-library/std/map.md
index 19c622451b5..e23e3d49c23 100644
--- a/docs/docs/04-standard-library/03-std/map.md
+++ b/docs/docs/04-standard-library/std/map.md
@@ -3,7 +3,6 @@ title: map
 id: map
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -18,6 +17,7 @@ Immutable Map.
 | **Name** | **Description** |
 | --- | --- |
 | <code><a href="#@winglang/sdk.std.Map.copyMut">copyMut</a></code> | Create a mutable shallow copy of this map. |
+| <code><a href="#@winglang/sdk.std.Map.entries">entries</a></code> | Returns the entries from the map. |
 | <code><a href="#@winglang/sdk.std.Map.get">get</a></code> | Returns a specified element from the map. |
 | <code><a href="#@winglang/sdk.std.Map.has">has</a></code> | Returns a boolean indicating whether an element with the specified key exists or not. |
 | <code><a href="#@winglang/sdk.std.Map.keys">keys</a></code> | Returns the keys of this map. |
@@ -35,6 +35,14 @@ copyMut(): MutMap
 
 Create a mutable shallow copy of this map.
 
+##### `entries` <a name="entries" id="@winglang/sdk.std.Map.entries"></a>
+
+```wing
+entries(): MutArray<ArrayEntry>
+```
+
+Returns the entries from the map.
+
 ##### `get` <a name="get" id="@winglang/sdk.std.Map.get"></a>
 
 ```wing
@@ -91,7 +99,7 @@ TODO: For now this has to be a method rather than a getter as macros only work o
 ##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.Map.tryGet"></a>
 
 ```wing
-tryGet(key: str): <T>
+tryGet(key: str): <T>?
 ```
 
 Optionally returns a specified element from the map.
@@ -126,6 +134,7 @@ Mutable Map.
 | <code><a href="#@winglang/sdk.std.MutMap.clear">clear</a></code> | Removes all elements. |
 | <code><a href="#@winglang/sdk.std.MutMap.copy">copy</a></code> | Create an immutable shallow copy of this map. |
 | <code><a href="#@winglang/sdk.std.MutMap.delete">delete</a></code> | Removes the specified element from a map. |
+| <code><a href="#@winglang/sdk.std.MutMap.entries">entries</a></code> | Returns the entries from the map. |
 | <code><a href="#@winglang/sdk.std.MutMap.get">get</a></code> | Returns a specified element from the map. |
 | <code><a href="#@winglang/sdk.std.MutMap.has">has</a></code> | Returns a boolean indicating whether an element with the specified key exists or not. |
 | <code><a href="#@winglang/sdk.std.MutMap.keys">keys</a></code> | Returns the keys of this map. |
@@ -168,6 +177,14 @@ The key.
 
 ---
 
+##### `entries` <a name="entries" id="@winglang/sdk.std.MutMap.entries"></a>
+
+```wing
+entries(): MutArray<ArrayEntry>
+```
+
+Returns the entries from the map.
+
 ##### `get` <a name="get" id="@winglang/sdk.std.MutMap.get"></a>
 
 ```wing
@@ -250,7 +267,7 @@ TODO: For now this has to be a method rather than a getter as macros only work o
 ##### `tryGet` <a name="tryGet" id="@winglang/sdk.std.MutMap.tryGet"></a>
 
 ```wing
-tryGet(key: str): <T>
+tryGet(key: str): <T>?
 ```
 
 Optionally returns a specified element from the map.
@@ -274,5 +291,49 @@ Returns the values of this map.
 
 
 
+## Structs <a name="Structs" id="Structs"></a>
+
+### ArrayEntry <a name="ArrayEntry" id="@winglang/sdk.std.ArrayEntry"></a>
+
+Array entry representation.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.std.ArrayEntry.Initializer"></a>
+
+```wing
+let ArrayEntry = ArrayEntry{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.std.ArrayEntry.property.key">key</a></code> | <code>str</code> | The entry key. |
+| <code><a href="#@winglang/sdk.std.ArrayEntry.property.value">value</a></code> | <code><a href="#@winglang/sdk.std.T1">&lt;T&gt;</a></code> | The entry value. |
+
+---
+
+##### `key`<sup>Required</sup> <a name="key" id="@winglang/sdk.std.ArrayEntry.property.key"></a>
+
+```wing
+key: str;
+```
+
+- *Type:* str
+
+The entry key.
+
+---
+
+##### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.std.ArrayEntry.property.value"></a>
+
+```wing
+value: <T>;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.T1">&lt;T&gt;</a>
+
+The entry value.
+
+---
 
 
diff --git a/docs/docs/04-standard-library/03-std/node.md b/docs/docs/04-standard-library/std/node.md
similarity index 87%
rename from docs/docs/04-standard-library/03-std/node.md
rename to docs/docs/04-standard-library/std/node.md
index a2818d481a3..f6c4f60df8a 100644
--- a/docs/docs/04-standard-library/03-std/node.md
+++ b/docs/docs/04-standard-library/std/node.md
@@ -3,7 +3,6 @@ title: node
 id: node
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
@@ -206,7 +205,7 @@ The context value.
 ##### `tryFindChild` <a name="tryFindChild" id="@winglang/sdk.std.Node.tryFindChild"></a>
 
 ```wing
-tryFindChild(): IConstruct
+tryFindChild(): IConstruct?
 ```
 
 Return a direct child by id, or undefined.
@@ -270,9 +269,12 @@ Invokes the `validate()` method on all validations added through
 | <code><a href="#@winglang/sdk.std.Node.property.root">root</a></code> | <code>constructs.IConstruct</code> | Returns the root of the construct tree (the `cloud.App` object). |
 | <code><a href="#@winglang/sdk.std.Node.property.scopes">scopes</a></code> | <code>MutArray&lt;constructs.IConstruct&gt;</code> | All parent scopes of this construct. |
 | <code><a href="#@winglang/sdk.std.Node.property.scope">scope</a></code> | <code>constructs.IConstruct</code> | Returns the scope in which this construct is defined. |
+| <code><a href="#@winglang/sdk.std.Node.property.color">color</a></code> | <code>str</code> | The color of the construct for display purposes. |
 | <code><a href="#@winglang/sdk.std.Node.property.defaultChild">defaultChild</a></code> | <code>constructs.IConstruct</code> | Returns the child construct that has the id `Default` or `Resource"`. |
 | <code><a href="#@winglang/sdk.std.Node.property.description">description</a></code> | <code>str</code> | Description of the construct for display purposes. |
+| <code><a href="#@winglang/sdk.std.Node.property.expanded">expanded</a></code> | <code>bool</code> | Whether the node is expanded or collapsed by default in the UI. |
 | <code><a href="#@winglang/sdk.std.Node.property.hidden">hidden</a></code> | <code>bool</code> | Whether the construct should be hidden by default in tree visualizations. |
+| <code><a href="#@winglang/sdk.std.Node.property.icon">icon</a></code> | <code>str</code> | The icon of the construct for display purposes. |
 | <code><a href="#@winglang/sdk.std.Node.property.sourceModule">sourceModule</a></code> | <code>str</code> | The source file or library where the construct was defined. |
 | <code><a href="#@winglang/sdk.std.Node.property.title">title</a></code> | <code>str</code> | Title of the construct for display purposes. |
 
@@ -439,6 +441,31 @@ The value is `undefined` at the root of the construct scope tree.
 
 ---
 
+##### `color`<sup>Optional</sup> <a name="color" id="@winglang/sdk.std.Node.property.color"></a>
+
+```wing
+color: str;
+```
+
+- *Type:* str
+
+The color of the construct for display purposes.
+
+Supported colors are:
+- orange
+- sky
+- emerald
+- lime
+- pink
+- amber
+- cyan
+- purple
+- red
+- violet
+- slate
+
+---
+
 ##### `defaultChild`<sup>Optional</sup> <a name="defaultChild" id="@winglang/sdk.std.Node.property.defaultChild"></a>
 
 ```wing
@@ -474,6 +501,21 @@ Description of the construct for display purposes.
 
 ---
 
+##### `expanded`<sup>Optional</sup> <a name="expanded" id="@winglang/sdk.std.Node.property.expanded"></a>
+
+```wing
+expanded: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Whether the node is expanded or collapsed by default in the UI.
+
+By default, nodes are collapsed. Set this to `true` if you want the node to be expanded by default.
+
+---
+
 ##### `hidden`<sup>Optional</sup> <a name="hidden" id="@winglang/sdk.std.Node.property.hidden"></a>
 
 ```wing
@@ -486,6 +528,23 @@ Whether the construct should be hidden by default in tree visualizations.
 
 ---
 
+##### `icon`<sup>Optional</sup> <a name="icon" id="@winglang/sdk.std.Node.property.icon"></a>
+
+```wing
+icon: str;
+```
+
+- *Type:* str
+
+The icon of the construct for display purposes.
+
+Supported icons are from Heroicons:
+- https://heroicons.com/
+e.g.
+- "academic-cap"
+
+---
+
 ##### `sourceModule`<sup>Optional</sup> <a name="sourceModule" id="@winglang/sdk.std.Node.property.sourceModule"></a>
 
 ```wing
@@ -528,8 +587,10 @@ let AddConnectionProps = AddConnectionProps{ ... };
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
 | <code><a href="#@winglang/sdk.std.AddConnectionProps.property.name">name</a></code> | <code>str</code> | A name for the connection. |
-| <code><a href="#@winglang/sdk.std.AddConnectionProps.property.source">source</a></code> | <code>constructs.IConstruct</code> | The source of the connection. |
 | <code><a href="#@winglang/sdk.std.AddConnectionProps.property.target">target</a></code> | <code>constructs.IConstruct</code> | The target of the connection. |
+| <code><a href="#@winglang/sdk.std.AddConnectionProps.property.source">source</a></code> | <code>constructs.IConstruct</code> | The source of the connection. |
+| <code><a href="#@winglang/sdk.std.AddConnectionProps.property.sourceOp">sourceOp</a></code> | <code>str</code> | An operation that the source construct supports. |
+| <code><a href="#@winglang/sdk.std.AddConnectionProps.property.targetOp">targetOp</a></code> | <code>str</code> | An operation that the target construct supports. |
 
 ---
 
@@ -545,27 +606,54 @@ A name for the connection.
 
 ---
 
-##### `source`<sup>Required</sup> <a name="source" id="@winglang/sdk.std.AddConnectionProps.property.source"></a>
+##### `target`<sup>Required</sup> <a name="target" id="@winglang/sdk.std.AddConnectionProps.property.target"></a>
+
+```wing
+target: IConstruct;
+```
+
+- *Type:* constructs.IConstruct
+
+The target of the connection.
+
+---
+
+##### `source`<sup>Optional</sup> <a name="source" id="@winglang/sdk.std.AddConnectionProps.property.source"></a>
 
 ```wing
 source: IConstruct;
 ```
 
 - *Type:* constructs.IConstruct
+- *Default:* this
 
 The source of the connection.
 
 ---
 
-##### `target`<sup>Required</sup> <a name="target" id="@winglang/sdk.std.AddConnectionProps.property.target"></a>
+##### `sourceOp`<sup>Optional</sup> <a name="sourceOp" id="@winglang/sdk.std.AddConnectionProps.property.sourceOp"></a>
 
 ```wing
-target: IConstruct;
+sourceOp: str;
 ```
 
-- *Type:* constructs.IConstruct
+- *Type:* str
+- *Default:* no operation
 
-The target of the connection.
+An operation that the source construct supports.
+
+---
+
+##### `targetOp`<sup>Optional</sup> <a name="targetOp" id="@winglang/sdk.std.AddConnectionProps.property.targetOp"></a>
+
+```wing
+targetOp: str;
+```
+
+- *Type:* str
+- *Default:* no operation
+
+An operation that the target construct supports.
 
 ---
 
@@ -615,6 +703,7 @@ prepended to the unique identifier.
 | <code><a href="#@winglang/sdk.std.IApp.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
 | <code><a href="#@winglang/sdk.std.IApp.property.entrypointDir">entrypointDir</a></code> | <code>str</code> | The directory of the entrypoint of the current program. |
 | <code><a href="#@winglang/sdk.std.IApp.property.isTestEnvironment">isTestEnvironment</a></code> | <code>bool</code> | `true` if this is a testing environment. |
+| <code><a href="#@winglang/sdk.std.IApp.property.parameters">parameters</a></code> | <code><a href="#@winglang/sdk.platform.ParameterRegistrar">ParameterRegistrar</a></code> | The application's parameter registrar. |
 | <code><a href="#@winglang/sdk.std.IApp.property.workdir">workdir</a></code> | <code>str</code> | The `.wing` directory into which you can emit artifacts during preflight. |
 
 ---
@@ -655,6 +744,18 @@ isTestEnvironment: bool;
 
 ---
 
+##### `parameters`<sup>Required</sup> <a name="parameters" id="@winglang/sdk.std.IApp.property.parameters"></a>
+
+```wing
+parameters: ParameterRegistrar;
+```
+
+- *Type:* <a href="#@winglang/sdk.platform.ParameterRegistrar">ParameterRegistrar</a>
+
+The application's parameter registrar.
+
+---
+
 ##### `workdir`<sup>Required</sup> <a name="workdir" id="@winglang/sdk.std.IApp.property.workdir"></a>
 
 ```wing
diff --git a/docs/docs/04-standard-library/03-std/number.md b/docs/docs/04-standard-library/std/number.md
similarity index 99%
rename from docs/docs/04-standard-library/03-std/number.md
rename to docs/docs/04-standard-library/std/number.md
index fc21ef04a2d..4d9ea120fb8 100644
--- a/docs/docs/04-standard-library/03-std/number.md
+++ b/docs/docs/04-standard-library/std/number.md
@@ -3,7 +3,6 @@ title: number
 id: number
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
diff --git a/docs/docs/04-standard-library/std/regex.md b/docs/docs/04-standard-library/std/regex.md
new file mode 100644
index 00000000000..48584bbb245
--- /dev/null
+++ b/docs/docs/04-standard-library/std/regex.md
@@ -0,0 +1,199 @@
+---
+title: regex
+id: regex
+---
+
+# API Reference <a name="API Reference" id="api-reference"></a>
+
+
+## Classes <a name="Classes" id="Classes"></a>
+
+### Regex <a name="Regex" id="@winglang/sdk.std.Regex"></a>
+
+- *Implements:* <a href="#@winglang/sdk.std.ILiftable">ILiftable</a>
+
+Represents a compiled regular expression pattern.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.std.Regex.find">find</a></code> | Finds the first occurrence of the pattern within the text. |
+| <code><a href="#@winglang/sdk.std.Regex.findAll">findAll</a></code> | Finds all non-overlapping occurrences of the pattern within the text. |
+| <code><a href="#@winglang/sdk.std.Regex.findAllIndex">findAllIndex</a></code> | Finds the start and end index of all matches within the text. |
+| <code><a href="#@winglang/sdk.std.Regex.findIndex">findIndex</a></code> | Finds the start and end index of the first match within the text. |
+| <code><a href="#@winglang/sdk.std.Regex.findSubmatch">findSubmatch</a></code> | Finds the first match and its submatches. |
+| <code><a href="#@winglang/sdk.std.Regex.findSubmatchIndex">findSubmatchIndex</a></code> | Finds the start and end index of the match and all submatches. |
+| <code><a href="#@winglang/sdk.std.Regex.replaceAll">replaceAll</a></code> | Replaces all occurrences of the match with a replacement string. |
+| <code><a href="#@winglang/sdk.std.Regex.test">test</a></code> | Checks if the regular expression matches the provided text. |
+
+---
+
+##### `find` <a name="find" id="@winglang/sdk.std.Regex.find"></a>
+
+```wing
+find(text: str): str?
+```
+
+Finds the first occurrence of the pattern within the text.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.find.parameter.text"></a>
+
+- *Type:* str
+
+The text to search within.
+
+---
+
+##### `findAll` <a name="findAll" id="@winglang/sdk.std.Regex.findAll"></a>
+
+```wing
+findAll(text: str): MutArray<str>
+```
+
+Finds all non-overlapping occurrences of the pattern within the text.
+
+Returns an empty array if no matches are found.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.findAll.parameter.text"></a>
+
+- *Type:* str
+
+The text to search within.
+
+---
+
+##### `findAllIndex` <a name="findAllIndex" id="@winglang/sdk.std.Regex.findAllIndex"></a>
+
+```wing
+findAllIndex(text: str): MutArray<MutArray<num>>
+```
+
+Finds the start and end index of all matches within the text.
+
+Indices are zero-based.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.findAllIndex.parameter.text"></a>
+
+- *Type:* str
+
+The text to search within.
+
+---
+
+##### `findIndex` <a name="findIndex" id="@winglang/sdk.std.Regex.findIndex"></a>
+
+```wing
+findIndex(text: str): MutArray<num>?
+```
+
+Finds the start and end index of the first match within the text.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.findIndex.parameter.text"></a>
+
+- *Type:* str
+
+The text to search within.
+
+---
+
+##### `findSubmatch` <a name="findSubmatch" id="@winglang/sdk.std.Regex.findSubmatch"></a>
+
+```wing
+findSubmatch(text: str): MutArray<str>?
+```
+
+Finds the first match and its submatches.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.findSubmatch.parameter.text"></a>
+
+- *Type:* str
+
+The text to search within.
+
+---
+
+##### `findSubmatchIndex` <a name="findSubmatchIndex" id="@winglang/sdk.std.Regex.findSubmatchIndex"></a>
+
+```wing
+findSubmatchIndex(text: str): MutArray<MutArray<num>>?
+```
+
+Finds the start and end index of the match and all submatches.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.findSubmatchIndex.parameter.text"></a>
+
+- *Type:* str
+
+The text to search within.
+
+---
+
+##### `replaceAll` <a name="replaceAll" id="@winglang/sdk.std.Regex.replaceAll"></a>
+
+```wing
+replaceAll(text: str, replacement: str): str
+```
+
+Replaces all occurrences of the match with a replacement string.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.replaceAll.parameter.text"></a>
+
+- *Type:* str
+
+The text to search and replace within.
+
+---
+
+###### `replacement`<sup>Required</sup> <a name="replacement" id="@winglang/sdk.std.Regex.replaceAll.parameter.replacement"></a>
+
+- *Type:* str
+
+The replacement string.
+
+---
+
+##### `test` <a name="test" id="@winglang/sdk.std.Regex.test"></a>
+
+```wing
+test(text: str): bool
+```
+
+Checks if the regular expression matches the provided text.
+
+###### `text`<sup>Required</sup> <a name="text" id="@winglang/sdk.std.Regex.test.parameter.text"></a>
+
+- *Type:* str
+
+The text to check against.
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.std.Regex.compile">compile</a></code> | Compiles the provided regex pattern into a `Regex` object. |
+
+---
+
+##### `compile` <a name="compile" id="@winglang/sdk.std.Regex.compile"></a>
+
+```wing
+regex.compile(pattern: str);
+```
+
+Compiles the provided regex pattern into a `Regex` object.
+
+###### `pattern`<sup>Required</sup> <a name="pattern" id="@winglang/sdk.std.Regex.compile.parameter.pattern"></a>
+
+- *Type:* str
+
+The regex pattern to compile.
+
+---
+
+
+
+
+
diff --git a/docs/docs/04-standard-library/03-std/set.md b/docs/docs/04-standard-library/std/set.md
similarity index 99%
rename from docs/docs/04-standard-library/03-std/set.md
rename to docs/docs/04-standard-library/std/set.md
index 5a47d21f586..540128db000 100644
--- a/docs/docs/04-standard-library/03-std/set.md
+++ b/docs/docs/04-standard-library/std/set.md
@@ -3,7 +3,6 @@ title: set
 id: set
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
diff --git a/docs/docs/04-standard-library/03-std/string.md b/docs/docs/04-standard-library/std/string.md
similarity index 99%
rename from docs/docs/04-standard-library/03-std/string.md
rename to docs/docs/04-standard-library/std/string.md
index 4d82dd6e519..63d7c79498e 100644
--- a/docs/docs/04-standard-library/03-std/string.md
+++ b/docs/docs/04-standard-library/std/string.md
@@ -3,7 +3,6 @@ title: string
 id: string
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
diff --git a/docs/docs/04-standard-library/03-std/struct.md b/docs/docs/04-standard-library/std/struct.md
similarity index 99%
rename from docs/docs/04-standard-library/03-std/struct.md
rename to docs/docs/04-standard-library/std/struct.md
index e1c68cf5597..af463247e27 100644
--- a/docs/docs/04-standard-library/03-std/struct.md
+++ b/docs/docs/04-standard-library/std/struct.md
@@ -3,7 +3,6 @@ title: struct
 id: struct
 ---
 
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
diff --git a/docs/docs/04-standard-library/ui/_category_.yml b/docs/docs/04-standard-library/ui/_category_.yml
index 026c3df3109..d7b43b21f9c 100644
--- a/docs/docs/04-standard-library/ui/_category_.yml
+++ b/docs/docs/04-standard-library/ui/_category_.yml
@@ -1,3 +1,5 @@
 label: ui
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/ui/api-reference.md b/docs/docs/04-standard-library/ui/api-reference.md
index 89492b059eb..ff880ac2107 100644
--- a/docs/docs/04-standard-library/ui/api-reference.md
+++ b/docs/docs/04-standard-library/ui/api-reference.md
@@ -8,7 +8,6 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 ## Resources <a name="Resources" id="Resources"></a>
@@ -49,10 +48,58 @@ new ui.Button(label: str, handler: IButtonHandler);
 
 | **Name** | **Description** |
 | --- | --- |
+| <code><a href="#@winglang/sdk.ui.Button.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ui.Button.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
 | <code><a href="#@winglang/sdk.ui.Button.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
 
 ---
 
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ui.Button.onLiftType"></a>
+
+```wing
+bring ui;
+
+ui.Button.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ui.Button.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ui.Button.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ui.Button.toInflight"></a>
+
+```wing
+bring ui;
+
+ui.Button.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ui.Button.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
 ##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.Button.isVisualComponent"></a>
 
 ```wing
@@ -133,10 +180,58 @@ new ui.Field(label: str, handler: IFieldHandler, props?: FieldProps);
 
 | **Name** | **Description** |
 | --- | --- |
+| <code><a href="#@winglang/sdk.ui.Field.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ui.Field.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
 | <code><a href="#@winglang/sdk.ui.Field.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
 
 ---
 
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ui.Field.onLiftType"></a>
+
+```wing
+bring ui;
+
+ui.Field.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ui.Field.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ui.Field.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ui.Field.toInflight"></a>
+
+```wing
+bring ui;
+
+ui.Field.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ui.Field.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
 ##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.Field.isVisualComponent"></a>
 
 ```wing
@@ -174,126 +269,105 @@ The tree node.
 ---
 
 
-### Section <a name="Section" id="@winglang/sdk.ui.Section"></a>
+### FileBrowser <a name="FileBrowser" id="@winglang/sdk.ui.FileBrowser"></a>
 
-A section can be used to group other visual components.
+A file browser can be used to browse files.
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.ui.Section.Initializer"></a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.ui.FileBrowser.Initializer"></a>
 
 ```wing
 bring ui;
 
-new ui.Section(props?: SectionProps);
+new ui.FileBrowser(label: str, handlers: FileBrowserHandlers);
 ```
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.ui.Section.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.ui.SectionProps">SectionProps</a></code> | *No description.* |
+| <code><a href="#@winglang/sdk.ui.FileBrowser.Initializer.parameter.label">label</a></code> | <code>str</code> | *No description.* |
+| <code><a href="#@winglang/sdk.ui.FileBrowser.Initializer.parameter.handlers">handlers</a></code> | <code><a href="#@winglang/sdk.ui.FileBrowserHandlers">FileBrowserHandlers</a></code> | *No description.* |
 
 ---
 
-##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.ui.Section.Initializer.parameter.props"></a>
+##### `label`<sup>Required</sup> <a name="label" id="@winglang/sdk.ui.FileBrowser.Initializer.parameter.label"></a>
 
-- *Type:* <a href="#@winglang/sdk.ui.SectionProps">SectionProps</a>
+- *Type:* str
 
 ---
 
-#### Methods <a name="Methods" id="Methods"></a>
+##### `handlers`<sup>Required</sup> <a name="handlers" id="@winglang/sdk.ui.FileBrowser.Initializer.parameter.handlers"></a>
 
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.ui.Section.add">add</a></code> | Adds a visual component to the section. |
-| <code><a href="#@winglang/sdk.ui.Section.addButton">addButton</a></code> | Adds a button to the section. |
-| <code><a href="#@winglang/sdk.ui.Section.addField">addField</a></code> | Adds a field to the section. |
+- *Type:* <a href="#@winglang/sdk.ui.FileBrowserHandlers">FileBrowserHandlers</a>
 
 ---
 
-##### `add` <a name="add" id="@winglang/sdk.ui.Section.add"></a>
-
-```wing
-add(...components: Array<VisualComponent>): void
-```
-
-Adds a visual component to the section.
-
-The components
-will be rendered in the order they were added.
 
-###### `components`<sup>Required</sup> <a name="components" id="@winglang/sdk.ui.Section.add.parameter.components"></a>
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
 
-- *Type:* <a href="#@winglang/sdk.ui.VisualComponent">VisualComponent</a>
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.FileBrowser.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ui.FileBrowser.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+| <code><a href="#@winglang/sdk.ui.FileBrowser.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
 
 ---
 
-##### `addButton` <a name="addButton" id="@winglang/sdk.ui.Section.addButton"></a>
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ui.FileBrowser.onLiftType"></a>
 
 ```wing
-addButton(label: str, handler: IButtonHandler): void
-```
-
-Adds a button to the section.
+bring ui;
 
-Shorthand for `add(new ui.Button(...))`.
+ui.FileBrowser.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
 
-###### `label`<sup>Required</sup> <a name="label" id="@winglang/sdk.ui.Section.addButton.parameter.label"></a>
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
 
-- *Type:* str
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
 
----
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
 
-###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.ui.Section.addButton.parameter.handler"></a>
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ui.FileBrowser.onLiftType.parameter.host"></a>
 
-- *Type:* <a href="#@winglang/sdk.ui.IButtonHandler">IButtonHandler</a>
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
 
 ---
 
-##### `addField` <a name="addField" id="@winglang/sdk.ui.Section.addField"></a>
-
-```wing
-addField(label: str, handler: IFieldHandler, props?: FieldProps): void
-```
-
-Adds a field to the section.
-
-Shorthand for `add(new ui.Field(...))`.
-
-###### `label`<sup>Required</sup> <a name="label" id="@winglang/sdk.ui.Section.addField.parameter.label"></a>
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ui.FileBrowser.onLiftType.parameter.ops"></a>
 
-- *Type:* str
+- *Type:* MutArray&lt;str&gt;
 
 ---
 
-###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.ui.Section.addField.parameter.handler"></a>
-
-- *Type:* <a href="#@winglang/sdk.ui.IFieldHandler">IFieldHandler</a>
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ui.FileBrowser.toInflight"></a>
 
----
+```wing
+bring ui;
 
-###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.ui.Section.addField.parameter.props"></a>
+ui.FileBrowser.toInflight(obj: IResource);
+```
 
-- *Type:* <a href="#@winglang/sdk.ui.FieldProps">FieldProps</a>
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
 
----
+NOTE: This statement must be executed within an async context.
 
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ui.FileBrowser.toInflight.parameter.obj"></a>
 
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.ui.Section.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
 
 ---
 
-##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.Section.isVisualComponent"></a>
+##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.FileBrowser.isVisualComponent"></a>
 
 ```wing
 bring ui;
 
-ui.Section.isVisualComponent(c: IConstruct);
+ui.FileBrowser.isVisualComponent(c: IConstruct);
 ```
 
 Returns whether the given construct is a visual component.
 
-###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.ui.Section.isVisualComponent.parameter.c"></a>
+###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.ui.FileBrowser.isVisualComponent.parameter.c"></a>
 
 - *Type:* constructs.IConstruct
 
@@ -303,11 +377,11 @@ Returns whether the given construct is a visual component.
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.ui.Section.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+| <code><a href="#@winglang/sdk.ui.FileBrowser.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
 
 ---
 
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ui.Section.property.node"></a>
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ui.FileBrowser.property.node"></a>
 
 ```wing
 node: Node;
@@ -320,184 +394,768 @@ The tree node.
 ---
 
 
-### VisualComponent <a name="VisualComponent" id="@winglang/sdk.ui.VisualComponent"></a>
-
-A visual component is used to customize the view of other classes in the Wing Console.
+### HttpClient <a name="HttpClient" id="@winglang/sdk.ui.HttpClient"></a>
 
-This is a base class for all other visual components.
+An HttpClient can be used to make HTTP requests.
 
-#### Initializers <a name="Initializers" id="@winglang/sdk.ui.VisualComponent.Initializer"></a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.ui.HttpClient.Initializer"></a>
 
 ```wing
 bring ui;
 
-new ui.VisualComponent();
+new ui.HttpClient(label: str, getUrlHandler: IHttpClientGetUrlHandler, getApiSpecHandler: IHttpClientGetApiSpecHandler);
 ```
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.HttpClient.Initializer.parameter.label">label</a></code> | <code>str</code> | *No description.* |
+| <code><a href="#@winglang/sdk.ui.HttpClient.Initializer.parameter.getUrlHandler">getUrlHandler</a></code> | <code><a href="#@winglang/sdk.ui.IHttpClientGetUrlHandler">IHttpClientGetUrlHandler</a></code> | *No description.* |
+| <code><a href="#@winglang/sdk.ui.HttpClient.Initializer.parameter.getApiSpecHandler">getApiSpecHandler</a></code> | <code><a href="#@winglang/sdk.ui.IHttpClientGetApiSpecHandler">IHttpClientGetApiSpecHandler</a></code> | *No description.* |
 
 ---
 
+##### `label`<sup>Required</sup> <a name="label" id="@winglang/sdk.ui.HttpClient.Initializer.parameter.label"></a>
 
-#### Static Functions <a name="Static Functions" id="Static Functions"></a>
-
-| **Name** | **Description** |
-| --- | --- |
-| <code><a href="#@winglang/sdk.ui.VisualComponent.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
+- *Type:* str
 
 ---
 
-##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.VisualComponent.isVisualComponent"></a>
-
-```wing
-bring ui;
+##### `getUrlHandler`<sup>Required</sup> <a name="getUrlHandler" id="@winglang/sdk.ui.HttpClient.Initializer.parameter.getUrlHandler"></a>
 
-ui.VisualComponent.isVisualComponent(c: IConstruct);
-```
+- *Type:* <a href="#@winglang/sdk.ui.IHttpClientGetUrlHandler">IHttpClientGetUrlHandler</a>
 
-Returns whether the given construct is a visual component.
+---
 
-###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.ui.VisualComponent.isVisualComponent.parameter.c"></a>
+##### `getApiSpecHandler`<sup>Required</sup> <a name="getApiSpecHandler" id="@winglang/sdk.ui.HttpClient.Initializer.parameter.getApiSpecHandler"></a>
 
-- *Type:* constructs.IConstruct
+- *Type:* <a href="#@winglang/sdk.ui.IHttpClientGetApiSpecHandler">IHttpClientGetApiSpecHandler</a>
 
 ---
 
-#### Properties <a name="Properties" id="Properties"></a>
 
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ui.VisualComponent.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.HttpClient.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ui.HttpClient.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+| <code><a href="#@winglang/sdk.ui.HttpClient.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
 
 ---
 
-##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ui.VisualComponent.property.node"></a>
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ui.HttpClient.onLiftType"></a>
 
 ```wing
-node: Node;
+bring ui;
+
+ui.HttpClient.onLiftType(host: IInflightHost, ops: MutArray<str>);
 ```
 
-- *Type:* constructs.Node
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
 
-The tree node.
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
 
----
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
 
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ui.HttpClient.onLiftType.parameter.host"></a>
 
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
 
-## Structs <a name="Structs" id="Structs"></a>
+---
 
-### FieldProps <a name="FieldProps" id="@winglang/sdk.ui.FieldProps"></a>
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ui.HttpClient.onLiftType.parameter.ops"></a>
 
-Props for `Field`.
+- *Type:* MutArray&lt;str&gt;
 
-#### Initializer <a name="Initializer" id="@winglang/sdk.ui.FieldProps.Initializer"></a>
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ui.HttpClient.toInflight"></a>
 
 ```wing
 bring ui;
 
-let FieldProps = ui.FieldProps{ ... };
+ui.HttpClient.toInflight(obj: IResource);
 ```
 
-#### Properties <a name="Properties" id="Properties"></a>
-
-| **Name** | **Type** | **Description** |
-| --- | --- | --- |
-| <code><a href="#@winglang/sdk.ui.FieldProps.property.refreshRate">refreshRate</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How often the field should be refreshed. |
-
----
-
-##### `refreshRate`<sup>Optional</sup> <a name="refreshRate" id="@winglang/sdk.ui.FieldProps.property.refreshRate"></a>
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
 
-```wing
-refreshRate: duration;
-```
+NOTE: This statement must be executed within an async context.
 
-- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
-- *Default:* no automatic refresh
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ui.HttpClient.toInflight.parameter.obj"></a>
 
-How often the field should be refreshed.
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
 
 ---
 
-### SectionProps <a name="SectionProps" id="@winglang/sdk.ui.SectionProps"></a>
-
-Props for `Section`.
-
-#### Initializer <a name="Initializer" id="@winglang/sdk.ui.SectionProps.Initializer"></a>
+##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.HttpClient.isVisualComponent"></a>
 
 ```wing
 bring ui;
 
-let SectionProps = ui.SectionProps{ ... };
+ui.HttpClient.isVisualComponent(c: IConstruct);
 ```
 
+Returns whether the given construct is a visual component.
+
+###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.ui.HttpClient.isVisualComponent.parameter.c"></a>
+
+- *Type:* constructs.IConstruct
+
+---
+
 #### Properties <a name="Properties" id="Properties"></a>
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@winglang/sdk.ui.SectionProps.property.label">label</a></code> | <code>str</code> | The label of the section. |
+| <code><a href="#@winglang/sdk.ui.HttpClient.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
 
 ---
 
-##### `label`<sup>Optional</sup> <a name="label" id="@winglang/sdk.ui.SectionProps.property.label"></a>
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ui.HttpClient.property.node"></a>
 
 ```wing
-label: str;
+node: Node;
 ```
 
-- *Type:* str
-- *Default:* no label
+- *Type:* constructs.Node
 
-The label of the section.
+The tree node.
 
 ---
 
-## Protocols <a name="Protocols" id="Protocols"></a>
 
-### IButtonHandler <a name="IButtonHandler" id="@winglang/sdk.ui.IButtonHandler"></a>
+### Section <a name="Section" id="@winglang/sdk.ui.Section"></a>
 
-- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+A section can be used to group other visual components.
 
-- *Implemented By:* <a href="#@winglang/sdk.ui.IButtonHandler">IButtonHandler</a>
+#### Initializers <a name="Initializers" id="@winglang/sdk.ui.Section.Initializer"></a>
 
-**Inflight client:** [@winglang/sdk.ui.IButtonHandlerClient](#@winglang/sdk.ui.IButtonHandlerClient)
+```wing
+bring ui;
 
-A resource with an inflight "handle" method that can be passed to `Button`.
+new ui.Section(props?: SectionProps);
+```
 
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.Section.Initializer.parameter.props">props</a></code> | <code><a href="#@winglang/sdk.ui.SectionProps">SectionProps</a></code> | *No description.* |
 
+---
 
-### IButtonHandlerClient <a name="IButtonHandlerClient" id="@winglang/sdk.ui.IButtonHandlerClient"></a>
+##### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.ui.Section.Initializer.parameter.props"></a>
 
-- *Implemented By:* <a href="#@winglang/sdk.ui.IButtonHandlerClient">IButtonHandlerClient</a>
+- *Type:* <a href="#@winglang/sdk.ui.SectionProps">SectionProps</a>
 
-Inflight client for `IButtonHandler`.
+---
 
 #### Methods <a name="Methods" id="Methods"></a>
 
 | **Name** | **Description** |
 | --- | --- |
-| <code><a href="#@winglang/sdk.ui.IButtonHandlerClient.handle">handle</a></code> | Function that peforms an action. |
+| <code><a href="#@winglang/sdk.ui.Section.add">add</a></code> | Adds a visual component to the section. |
+| <code><a href="#@winglang/sdk.ui.Section.addButton">addButton</a></code> | Adds a button to the section. |
+| <code><a href="#@winglang/sdk.ui.Section.addField">addField</a></code> | Adds a field to the section. |
 
 ---
 
-##### `handle` <a name="handle" id="@winglang/sdk.ui.IButtonHandlerClient.handle"></a>
+##### `add` <a name="add" id="@winglang/sdk.ui.Section.add"></a>
 
 ```wing
-inflight handle(): void
+add(...components: Array<VisualComponent>): void
 ```
 
-Function that peforms an action.
+Adds a visual component to the section.
 
+The components
+will be rendered in the order they were added.
 
-### IFieldHandler <a name="IFieldHandler" id="@winglang/sdk.ui.IFieldHandler"></a>
+###### `components`<sup>Required</sup> <a name="components" id="@winglang/sdk.ui.Section.add.parameter.components"></a>
 
-- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+- *Type:* <a href="#@winglang/sdk.ui.VisualComponent">VisualComponent</a>
 
-- *Implemented By:* <a href="#@winglang/sdk.ui.IFieldHandler">IFieldHandler</a>
+---
 
-**Inflight client:** [@winglang/sdk.ui.IFieldHandlerClient](#@winglang/sdk.ui.IFieldHandlerClient)
+##### `addButton` <a name="addButton" id="@winglang/sdk.ui.Section.addButton"></a>
+
+```wing
+addButton(label: str, handler: IButtonHandler): void
+```
+
+Adds a button to the section.
+
+Shorthand for `add(new ui.Button(...))`.
+
+###### `label`<sup>Required</sup> <a name="label" id="@winglang/sdk.ui.Section.addButton.parameter.label"></a>
+
+- *Type:* str
+
+---
+
+###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.ui.Section.addButton.parameter.handler"></a>
+
+- *Type:* <a href="#@winglang/sdk.ui.IButtonHandler">IButtonHandler</a>
+
+---
+
+##### `addField` <a name="addField" id="@winglang/sdk.ui.Section.addField"></a>
+
+```wing
+addField(label: str, handler: IFieldHandler, props?: FieldProps): void
+```
+
+Adds a field to the section.
+
+Shorthand for `add(new ui.Field(...))`.
+
+###### `label`<sup>Required</sup> <a name="label" id="@winglang/sdk.ui.Section.addField.parameter.label"></a>
+
+- *Type:* str
+
+---
+
+###### `handler`<sup>Required</sup> <a name="handler" id="@winglang/sdk.ui.Section.addField.parameter.handler"></a>
+
+- *Type:* <a href="#@winglang/sdk.ui.IFieldHandler">IFieldHandler</a>
+
+---
+
+###### `props`<sup>Optional</sup> <a name="props" id="@winglang/sdk.ui.Section.addField.parameter.props"></a>
+
+- *Type:* <a href="#@winglang/sdk.ui.FieldProps">FieldProps</a>
+
+---
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.Section.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ui.Section.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+| <code><a href="#@winglang/sdk.ui.Section.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ui.Section.onLiftType"></a>
+
+```wing
+bring ui;
+
+ui.Section.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ui.Section.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ui.Section.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ui.Section.toInflight"></a>
+
+```wing
+bring ui;
+
+ui.Section.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ui.Section.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.Section.isVisualComponent"></a>
+
+```wing
+bring ui;
+
+ui.Section.isVisualComponent(c: IConstruct);
+```
+
+Returns whether the given construct is a visual component.
+
+###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.ui.Section.isVisualComponent.parameter.c"></a>
+
+- *Type:* constructs.IConstruct
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.Section.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ui.Section.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+### ValueField <a name="ValueField" id="@winglang/sdk.ui.ValueField"></a>
+
+A value field can be used to display a string value.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.ui.ValueField.Initializer"></a>
+
+```wing
+bring ui;
+
+new ui.ValueField(label: str, value: str);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.ValueField.Initializer.parameter.label">label</a></code> | <code>str</code> | *No description.* |
+| <code><a href="#@winglang/sdk.ui.ValueField.Initializer.parameter.value">value</a></code> | <code>str</code> | *No description.* |
+
+---
+
+##### `label`<sup>Required</sup> <a name="label" id="@winglang/sdk.ui.ValueField.Initializer.parameter.label"></a>
+
+- *Type:* str
+
+---
+
+##### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.ui.ValueField.Initializer.parameter.value"></a>
+
+- *Type:* str
+
+---
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.ValueField.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ui.ValueField.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+| <code><a href="#@winglang/sdk.ui.ValueField.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ui.ValueField.onLiftType"></a>
+
+```wing
+bring ui;
+
+ui.ValueField.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ui.ValueField.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ui.ValueField.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ui.ValueField.toInflight"></a>
+
+```wing
+bring ui;
+
+ui.ValueField.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ui.ValueField.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.ValueField.isVisualComponent"></a>
+
+```wing
+bring ui;
+
+ui.ValueField.isVisualComponent(c: IConstruct);
+```
+
+Returns whether the given construct is a visual component.
+
+###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.ui.ValueField.isVisualComponent.parameter.c"></a>
+
+- *Type:* constructs.IConstruct
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.ValueField.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ui.ValueField.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+### VisualComponent <a name="VisualComponent" id="@winglang/sdk.ui.VisualComponent"></a>
+
+A visual component is used to customize the view of other classes in the Wing Console.
+
+This is a base class for all other visual components.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.ui.VisualComponent.Initializer"></a>
+
+```wing
+bring ui;
+
+new ui.VisualComponent();
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+
+---
+
+
+#### Static Functions <a name="Static Functions" id="Static Functions"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.VisualComponent.onLiftType">onLiftType</a></code> | A hook called by the Wing compiler once for each inflight host that needs to use this type inflight. |
+| <code><a href="#@winglang/sdk.ui.VisualComponent.toInflight">toInflight</a></code> | Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource. |
+| <code><a href="#@winglang/sdk.ui.VisualComponent.isVisualComponent">isVisualComponent</a></code> | Returns whether the given construct is a visual component. |
+
+---
+
+##### `onLiftType` <a name="onLiftType" id="@winglang/sdk.ui.VisualComponent.onLiftType"></a>
+
+```wing
+bring ui;
+
+ui.VisualComponent.onLiftType(host: IInflightHost, ops: MutArray<str>);
+```
+
+A hook called by the Wing compiler once for each inflight host that needs to use this type inflight.
+
+The list of requested inflight methods
+needed by the inflight host are given by `ops`.
+
+This method is commonly used for adding permissions, environment variables, or
+other capabilities to the inflight host.
+
+###### `host`<sup>Required</sup> <a name="host" id="@winglang/sdk.ui.VisualComponent.onLiftType.parameter.host"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IInflightHost">IInflightHost</a>
+
+---
+
+###### `ops`<sup>Required</sup> <a name="ops" id="@winglang/sdk.ui.VisualComponent.onLiftType.parameter.ops"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `toInflight` <a name="toInflight" id="@winglang/sdk.ui.VisualComponent.toInflight"></a>
+
+```wing
+bring ui;
+
+ui.VisualComponent.toInflight(obj: IResource);
+```
+
+Generates an asynchronous JavaScript statement which can be used to create an inflight client for a resource.
+
+NOTE: This statement must be executed within an async context.
+
+###### `obj`<sup>Required</sup> <a name="obj" id="@winglang/sdk.ui.VisualComponent.toInflight.parameter.obj"></a>
+
+- *Type:* <a href="#@winglang/sdk.std.IResource">IResource</a>
+
+---
+
+##### `isVisualComponent` <a name="isVisualComponent" id="@winglang/sdk.ui.VisualComponent.isVisualComponent"></a>
+
+```wing
+bring ui;
+
+ui.VisualComponent.isVisualComponent(c: IConstruct);
+```
+
+Returns whether the given construct is a visual component.
+
+###### `c`<sup>Required</sup> <a name="c" id="@winglang/sdk.ui.VisualComponent.isVisualComponent.parameter.c"></a>
+
+- *Type:* constructs.IConstruct
+
+---
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.VisualComponent.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
+
+---
+
+##### `node`<sup>Required</sup> <a name="node" id="@winglang/sdk.ui.VisualComponent.property.node"></a>
+
+```wing
+node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### FieldProps <a name="FieldProps" id="@winglang/sdk.ui.FieldProps"></a>
+
+Props for `Field`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.ui.FieldProps.Initializer"></a>
+
+```wing
+bring ui;
+
+let FieldProps = ui.FieldProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.FieldProps.property.link">link</a></code> | <code>bool</code> | Indicates that this field is a link. |
+| <code><a href="#@winglang/sdk.ui.FieldProps.property.refreshRate">refreshRate</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | How often the field should be refreshed. |
+
+---
+
+##### `link`<sup>Optional</sup> <a name="link" id="@winglang/sdk.ui.FieldProps.property.link"></a>
+
+```wing
+link: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Indicates that this field is a link.
+
+---
+
+##### `refreshRate`<sup>Optional</sup> <a name="refreshRate" id="@winglang/sdk.ui.FieldProps.property.refreshRate"></a>
+
+```wing
+refreshRate: duration;
+```
+
+- *Type:* <a href="#@winglang/sdk.std.Duration">duration</a>
+- *Default:* no automatic refresh
+
+How often the field should be refreshed.
+
+---
+
+### FileBrowserHandlers <a name="FileBrowserHandlers" id="@winglang/sdk.ui.FileBrowserHandlers"></a>
+
+File browser handlers.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.ui.FileBrowserHandlers.Initializer"></a>
+
+```wing
+bring ui;
+
+let FileBrowserHandlers = ui.FileBrowserHandlers{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.FileBrowserHandlers.property.delete">delete</a></code> | <code><a href="#@winglang/sdk.ui.IFileBrowserDeleteHandler">IFileBrowserDeleteHandler</a></code> | Handler for deleting a file. |
+| <code><a href="#@winglang/sdk.ui.FileBrowserHandlers.property.get">get</a></code> | <code><a href="#@winglang/sdk.ui.IFileBrowserGetHandler">IFileBrowserGetHandler</a></code> | Handler for getting a file. |
+| <code><a href="#@winglang/sdk.ui.FileBrowserHandlers.property.list">list</a></code> | <code><a href="#@winglang/sdk.ui.IFileBrowserListHandler">IFileBrowserListHandler</a></code> | Handler for listing files. |
+| <code><a href="#@winglang/sdk.ui.FileBrowserHandlers.property.put">put</a></code> | <code><a href="#@winglang/sdk.ui.IFileBrowserPutHandler">IFileBrowserPutHandler</a></code> | Handler for putting a file. |
+
+---
+
+##### `delete`<sup>Required</sup> <a name="delete" id="@winglang/sdk.ui.FileBrowserHandlers.property.delete"></a>
+
+```wing
+delete: IFileBrowserDeleteHandler;
+```
+
+- *Type:* <a href="#@winglang/sdk.ui.IFileBrowserDeleteHandler">IFileBrowserDeleteHandler</a>
+
+Handler for deleting a file.
+
+---
+
+##### `get`<sup>Required</sup> <a name="get" id="@winglang/sdk.ui.FileBrowserHandlers.property.get"></a>
+
+```wing
+get: IFileBrowserGetHandler;
+```
+
+- *Type:* <a href="#@winglang/sdk.ui.IFileBrowserGetHandler">IFileBrowserGetHandler</a>
+
+Handler for getting a file.
+
+---
+
+##### `list`<sup>Required</sup> <a name="list" id="@winglang/sdk.ui.FileBrowserHandlers.property.list"></a>
+
+```wing
+list: IFileBrowserListHandler;
+```
+
+- *Type:* <a href="#@winglang/sdk.ui.IFileBrowserListHandler">IFileBrowserListHandler</a>
+
+Handler for listing files.
+
+---
+
+##### `put`<sup>Required</sup> <a name="put" id="@winglang/sdk.ui.FileBrowserHandlers.property.put"></a>
+
+```wing
+put: IFileBrowserPutHandler;
+```
+
+- *Type:* <a href="#@winglang/sdk.ui.IFileBrowserPutHandler">IFileBrowserPutHandler</a>
+
+Handler for putting a file.
+
+---
+
+### SectionProps <a name="SectionProps" id="@winglang/sdk.ui.SectionProps"></a>
+
+Props for `Section`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.ui.SectionProps.Initializer"></a>
+
+```wing
+bring ui;
+
+let SectionProps = ui.SectionProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.ui.SectionProps.property.label">label</a></code> | <code>str</code> | The label of the section. |
+
+---
+
+##### `label`<sup>Optional</sup> <a name="label" id="@winglang/sdk.ui.SectionProps.property.label"></a>
+
+```wing
+label: str;
+```
+
+- *Type:* str
+- *Default:* no label
+
+The label of the section.
+
+---
+
+## Protocols <a name="Protocols" id="Protocols"></a>
+
+### IButtonHandler <a name="IButtonHandler" id="@winglang/sdk.ui.IButtonHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IButtonHandler">IButtonHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IButtonHandlerClient](#@winglang/sdk.ui.IButtonHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `Button`.
+
+
+
+### IButtonHandlerClient <a name="IButtonHandlerClient" id="@winglang/sdk.ui.IButtonHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IButtonHandlerClient">IButtonHandlerClient</a>
+
+Inflight client for `IButtonHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.IButtonHandlerClient.handle">handle</a></code> | Function that peforms an action. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.ui.IButtonHandlerClient.handle"></a>
+
+```wing
+inflight handle(): void
+```
+
+Function that peforms an action.
+
+
+### IFieldHandler <a name="IFieldHandler" id="@winglang/sdk.ui.IFieldHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFieldHandler">IFieldHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IFieldHandlerClient](#@winglang/sdk.ui.IFieldHandlerClient)
 
 A resource with an inflight "handle" method that can be passed to `addField`.
 
@@ -526,3 +1184,237 @@ inflight handle(): str
 Function that returns a string to display.
 
 
+### IFileBrowserDeleteHandler <a name="IFileBrowserDeleteHandler" id="@winglang/sdk.ui.IFileBrowserDeleteHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserDeleteHandler">IFileBrowserDeleteHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IFileBrowserDeleteHandlerClient](#@winglang/sdk.ui.IFileBrowserDeleteHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `IFileBrowser`.
+
+
+
+### IFileBrowserDeleteHandlerClient <a name="IFileBrowserDeleteHandlerClient" id="@winglang/sdk.ui.IFileBrowserDeleteHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserDeleteHandlerClient">IFileBrowserDeleteHandlerClient</a>
+
+Inflight client for `IFileBrowserDeleteHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.IFileBrowserDeleteHandlerClient.handle">handle</a></code> | Function that performs an action. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.ui.IFileBrowserDeleteHandlerClient.handle"></a>
+
+```wing
+inflight handle(fileName: str): void
+```
+
+Function that performs an action.
+
+###### `fileName`<sup>Required</sup> <a name="fileName" id="@winglang/sdk.ui.IFileBrowserDeleteHandlerClient.handle.parameter.fileName"></a>
+
+- *Type:* str
+
+---
+
+
+### IFileBrowserGetHandler <a name="IFileBrowserGetHandler" id="@winglang/sdk.ui.IFileBrowserGetHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserGetHandler">IFileBrowserGetHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IFileBrowserGetHandlerClient](#@winglang/sdk.ui.IFileBrowserGetHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `IFileBrowser`.
+
+
+
+### IFileBrowserGetHandlerClient <a name="IFileBrowserGetHandlerClient" id="@winglang/sdk.ui.IFileBrowserGetHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserGetHandlerClient">IFileBrowserGetHandlerClient</a>
+
+Inflight client for `IFileBrowserGetHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.IFileBrowserGetHandlerClient.handle">handle</a></code> | Function that performs an action. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.ui.IFileBrowserGetHandlerClient.handle"></a>
+
+```wing
+inflight handle(fileName: str): str
+```
+
+Function that performs an action.
+
+###### `fileName`<sup>Required</sup> <a name="fileName" id="@winglang/sdk.ui.IFileBrowserGetHandlerClient.handle.parameter.fileName"></a>
+
+- *Type:* str
+
+---
+
+
+### IFileBrowserListHandler <a name="IFileBrowserListHandler" id="@winglang/sdk.ui.IFileBrowserListHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserListHandler">IFileBrowserListHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IFileBrowserListHandlerClient](#@winglang/sdk.ui.IFileBrowserListHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `IFileBrowser`.
+
+
+
+### IFileBrowserListHandlerClient <a name="IFileBrowserListHandlerClient" id="@winglang/sdk.ui.IFileBrowserListHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserListHandlerClient">IFileBrowserListHandlerClient</a>
+
+Inflight client for `IFileBrowserListHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.IFileBrowserListHandlerClient.handle">handle</a></code> | Function that performs an action. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.ui.IFileBrowserListHandlerClient.handle"></a>
+
+```wing
+inflight handle(): MutArray<str>
+```
+
+Function that performs an action.
+
+
+### IFileBrowserPutHandler <a name="IFileBrowserPutHandler" id="@winglang/sdk.ui.IFileBrowserPutHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserPutHandler">IFileBrowserPutHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IFileBrowserPutHandlerClient](#@winglang/sdk.ui.IFileBrowserPutHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `IFileBrowser`.
+
+
+
+### IFileBrowserPutHandlerClient <a name="IFileBrowserPutHandlerClient" id="@winglang/sdk.ui.IFileBrowserPutHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IFileBrowserPutHandlerClient">IFileBrowserPutHandlerClient</a>
+
+Inflight client for `IFileBrowserVoidHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.IFileBrowserPutHandlerClient.handle">handle</a></code> | Function that performs an action. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.ui.IFileBrowserPutHandlerClient.handle"></a>
+
+```wing
+inflight handle(fileName: str, fileContent: str): void
+```
+
+Function that performs an action.
+
+###### `fileName`<sup>Required</sup> <a name="fileName" id="@winglang/sdk.ui.IFileBrowserPutHandlerClient.handle.parameter.fileName"></a>
+
+- *Type:* str
+
+---
+
+###### `fileContent`<sup>Required</sup> <a name="fileContent" id="@winglang/sdk.ui.IFileBrowserPutHandlerClient.handle.parameter.fileContent"></a>
+
+- *Type:* str
+
+---
+
+
+### IHttpClientGetApiSpecHandler <a name="IHttpClientGetApiSpecHandler" id="@winglang/sdk.ui.IHttpClientGetApiSpecHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IHttpClientGetApiSpecHandler">IHttpClientGetApiSpecHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IHttpClientGetApiSpecHandlerClient](#@winglang/sdk.ui.IHttpClientGetApiSpecHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `IHttpClient`.
+
+
+
+### IHttpClientGetApiSpecHandlerClient <a name="IHttpClientGetApiSpecHandlerClient" id="@winglang/sdk.ui.IHttpClientGetApiSpecHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IHttpClientGetApiSpecHandlerClient">IHttpClientGetApiSpecHandlerClient</a>
+
+Inflight client for `IHttpClientGetApiSpecHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.IHttpClientGetApiSpecHandlerClient.handle">handle</a></code> | Function that returns the OpenAPI spec. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.ui.IHttpClientGetApiSpecHandlerClient.handle"></a>
+
+```wing
+inflight handle(): str
+```
+
+Function that returns the OpenAPI spec.
+
+
+### IHttpClientGetUrlHandler <a name="IHttpClientGetUrlHandler" id="@winglang/sdk.ui.IHttpClientGetUrlHandler"></a>
+
+- *Extends:* <a href="#@winglang/sdk.std.IInflight">IInflight</a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IHttpClientGetUrlHandler">IHttpClientGetUrlHandler</a>
+
+**Inflight client:** [@winglang/sdk.ui.IHttpClientGetUrlHandlerClient](#@winglang/sdk.ui.IHttpClientGetUrlHandlerClient)
+
+A resource with an inflight "handle" method that can be passed to `IHttpClient`.
+
+
+
+### IHttpClientGetUrlHandlerClient <a name="IHttpClientGetUrlHandlerClient" id="@winglang/sdk.ui.IHttpClientGetUrlHandlerClient"></a>
+
+- *Implemented By:* <a href="#@winglang/sdk.ui.IHttpClientGetUrlHandlerClient">IHttpClientGetUrlHandlerClient</a>
+
+Inflight client for `IHttpClientGetUrlHandler`.
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.ui.IHttpClientGetUrlHandlerClient.handle">handle</a></code> | Function that returns the URL to make a request to. |
+
+---
+
+##### `handle` <a name="handle" id="@winglang/sdk.ui.IHttpClientGetUrlHandlerClient.handle"></a>
+
+```wing
+inflight handle(): str
+```
+
+Function that returns the URL to make a request to.
+
+
diff --git a/docs/docs/04-standard-library/util/_category_.yml b/docs/docs/04-standard-library/util/_category_.yml
index 33e95e2cc95..109b472a9b0 100644
--- a/docs/docs/04-standard-library/util/_category_.yml
+++ b/docs/docs/04-standard-library/util/_category_.yml
@@ -1,3 +1,5 @@
 label: util
 collapsible: true
 collapsed: true
+link:
+  type: generated-index
\ No newline at end of file
diff --git a/docs/docs/04-standard-library/util/api-reference.md b/docs/docs/04-standard-library/util/api-reference.md
index f9c34dc2a4a..ee63f0ad45b 100644
--- a/docs/docs/04-standard-library/util/api-reference.md
+++ b/docs/docs/04-standard-library/util/api-reference.md
@@ -8,12 +8,106 @@ sidebar_position: 100
 ---
 
 <!-- This file is automatically generated. Do not edit manually. -->
-
 # API Reference <a name="API Reference" id="api-reference"></a>
 
 
 ## Classes <a name="Classes" id="Classes"></a>
 
+### ChildProcess <a name="ChildProcess" id="@winglang/sdk.util.ChildProcess"></a>
+
+Handle to a running child process.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.util.ChildProcess.Initializer"></a>
+
+```wing
+bring util;
+
+new util.ChildProcess(program: str, args: MutArray<str>, opts?: SpawnOptions);
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.ChildProcess.Initializer.parameter.program">program</a></code> | <code>str</code> | *No description.* |
+| <code><a href="#@winglang/sdk.util.ChildProcess.Initializer.parameter.args">args</a></code> | <code>MutArray&lt;str&gt;</code> | *No description.* |
+| <code><a href="#@winglang/sdk.util.ChildProcess.Initializer.parameter.opts">opts</a></code> | <code><a href="#@winglang/sdk.util.SpawnOptions">SpawnOptions</a></code> | *No description.* |
+
+---
+
+##### `program`<sup>Required</sup> <a name="program" id="@winglang/sdk.util.ChildProcess.Initializer.parameter.program"></a>
+
+- *Type:* str
+
+---
+
+##### `args`<sup>Required</sup> <a name="args" id="@winglang/sdk.util.ChildProcess.Initializer.parameter.args"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+---
+
+##### `opts`<sup>Optional</sup> <a name="opts" id="@winglang/sdk.util.ChildProcess.Initializer.parameter.opts"></a>
+
+- *Type:* <a href="#@winglang/sdk.util.SpawnOptions">SpawnOptions</a>
+
+---
+
+#### Methods <a name="Methods" id="Methods"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.util.ChildProcess.kill">kill</a></code> | Kill the process. |
+| <code><a href="#@winglang/sdk.util.ChildProcess.wait">wait</a></code> | Wait for the process to finish and return its output. |
+
+---
+
+##### `kill` <a name="kill" id="@winglang/sdk.util.ChildProcess.kill"></a>
+
+```wing
+kill(signal?: num): void
+```
+
+Kill the process.
+
+###### `signal`<sup>Optional</sup> <a name="signal" id="@winglang/sdk.util.ChildProcess.kill.parameter.signal"></a>
+
+- *Type:* num
+
+the signal to send to the process (defaults to SIGTERM).
+
+---
+
+##### `wait` <a name="wait" id="@winglang/sdk.util.ChildProcess.wait"></a>
+
+```wing
+wait(): Output
+```
+
+Wait for the process to finish and return its output.
+
+Calling this method multiple times will return the same output.
+
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.ChildProcess.property.pid">pid</a></code> | <code>num</code> | The child's OS-assigned process ID. |
+
+---
+
+##### `pid`<sup>Optional</sup> <a name="pid" id="@winglang/sdk.util.ChildProcess.property.pid"></a>
+
+```wing
+pid: num;
+```
+
+- *Type:* num
+
+The child's OS-assigned process ID.
+
+---
+
+
 ### Util <a name="Util" id="@winglang/sdk.util.Util"></a>
 
 Utility functions.
@@ -26,10 +120,16 @@ Utility functions.
 | <code><a href="#@winglang/sdk.util.Util.base64Decode">base64Decode</a></code> | Converts a string from base64 to UTF-8. |
 | <code><a href="#@winglang/sdk.util.Util.base64Encode">base64Encode</a></code> | Converts a string from UTF-8 to base64. |
 | <code><a href="#@winglang/sdk.util.Util.env">env</a></code> | Returns the value of an environment variable. |
+| <code><a href="#@winglang/sdk.util.Util.exec">exec</a></code> | Execute a program with the given arguments, wait for it to finish, and return its outputs. |
 | <code><a href="#@winglang/sdk.util.Util.nanoid">nanoid</a></code> | Generates a unique ID using the nanoid library. |
+| <code><a href="#@winglang/sdk.util.Util.os">os</a></code> | Returns a string identifying the operating system platform. |
+| <code><a href="#@winglang/sdk.util.Util.setEnv">setEnv</a></code> | Sets the given name and value as an environment variable. |
 | <code><a href="#@winglang/sdk.util.Util.sha256">sha256</a></code> | Computes the SHA256 hash of the given data. |
+| <code><a href="#@winglang/sdk.util.Util.shell">shell</a></code> | Executes a command in the shell and returns its standard output. |
 | <code><a href="#@winglang/sdk.util.Util.sleep">sleep</a></code> | Suspends execution for a given duration. |
+| <code><a href="#@winglang/sdk.util.Util.spawn">spawn</a></code> | Execute a program with the given arguments, and return a `ChildProcess` object that can be used to interact with the process while it is running. |
 | <code><a href="#@winglang/sdk.util.Util.tryEnv">tryEnv</a></code> | Returns the value of an environment variable. |
+| <code><a href="#@winglang/sdk.util.Util.ulid">ulid</a></code> | Generates universally unique lexicographically sortable identifier. |
 | <code><a href="#@winglang/sdk.util.Util.uuidv4">uuidv4</a></code> | Generates a version 4 UUID. |
 | <code><a href="#@winglang/sdk.util.Util.waitUntil">waitUntil</a></code> | Run a predicate repeatedly, waiting until it returns true or until the timeout elapses. |
 
@@ -107,6 +207,40 @@ The name of the environment variable.
 
 ---
 
+##### `exec` <a name="exec" id="@winglang/sdk.util.Util.exec"></a>
+
+```wing
+bring util;
+
+util.exec(program: str, args: MutArray<str>, opts?: ExecOptions);
+```
+
+Execute a program with the given arguments, wait for it to finish, and return its outputs.
+
+###### `program`<sup>Required</sup> <a name="program" id="@winglang/sdk.util.Util.exec.parameter.program"></a>
+
+- *Type:* str
+
+The program to execute.
+
+---
+
+###### `args`<sup>Required</sup> <a name="args" id="@winglang/sdk.util.Util.exec.parameter.args"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+An array of arguments to pass to the program.
+
+---
+
+###### `opts`<sup>Optional</sup> <a name="opts" id="@winglang/sdk.util.Util.exec.parameter.opts"></a>
+
+- *Type:* <a href="#@winglang/sdk.util.ExecOptions">ExecOptions</a>
+
+`ExecOptions`, such as the working directory and environment variables.
+
+---
+
 ##### `nanoid` <a name="nanoid" id="@winglang/sdk.util.Util.nanoid"></a>
 
 ```wing
@@ -117,7 +251,9 @@ util.nanoid(options?: NanoidOptions);
 
 Generates a unique ID using the nanoid library.
 
-# @link https://github.com/ai/nanoid
+#
+
+> [https://github.com/ai/nanoid](https://github.com/ai/nanoid)
 
 ###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.util.Util.nanoid.parameter.options"></a>
 
@@ -127,6 +263,49 @@ Optional options object for generating the ID.
 
 ---
 
+##### `os` <a name="os" id="@winglang/sdk.util.Util.os"></a>
+
+```wing
+bring util;
+
+util.os();
+```
+
+Returns a string identifying the operating system platform.
+
+*Example*
+
+```wing
+"linux", "darwin", "win32"
+```
+
+
+##### `setEnv` <a name="setEnv" id="@winglang/sdk.util.Util.setEnv"></a>
+
+```wing
+bring util;
+
+util.setEnv(name: str, value: str);
+```
+
+Sets the given name and value as an environment variable.
+
+###### `name`<sup>Required</sup> <a name="name" id="@winglang/sdk.util.Util.setEnv.parameter.name"></a>
+
+- *Type:* str
+
+The name of the environment variable.
+
+---
+
+###### `value`<sup>Required</sup> <a name="value" id="@winglang/sdk.util.Util.setEnv.parameter.value"></a>
+
+- *Type:* str
+
+The value of the environment variable.
+
+---
+
 ##### `sha256` <a name="sha256" id="@winglang/sdk.util.Util.sha256"></a>
 
 ```wing
@@ -145,6 +324,32 @@ The string to be hashed.
 
 ---
 
+##### `shell` <a name="shell" id="@winglang/sdk.util.Util.shell"></a>
+
+```wing
+bring util;
+
+util.shell(command: str, opts?: ShellOptions);
+```
+
+Executes a command in the shell and returns its standard output.
+
+###### `command`<sup>Required</sup> <a name="command" id="@winglang/sdk.util.Util.shell.parameter.command"></a>
+
+- *Type:* str
+
+The command string to execute in the shell.
+
+---
+
+###### `opts`<sup>Optional</sup> <a name="opts" id="@winglang/sdk.util.Util.shell.parameter.opts"></a>
+
+- *Type:* <a href="#@winglang/sdk.util.ShellOptions">ShellOptions</a>
+
+`ShellOptions`, such as the working directory and environment variables.
+
+---
+
 ##### `sleep` <a name="sleep" id="@winglang/sdk.util.Util.sleep"></a>
 
 ```wing
@@ -163,6 +368,40 @@ The time to suspend execution.
 
 ---
 
+##### `spawn` <a name="spawn" id="@winglang/sdk.util.Util.spawn"></a>
+
+```wing
+bring util;
+
+util.spawn(program: str, args: MutArray<str>, opts?: SpawnOptions);
+```
+
+Execute a program with the given arguments, and return a `ChildProcess` object that can be used to interact with the process while it is running.
+
+###### `program`<sup>Required</sup> <a name="program" id="@winglang/sdk.util.Util.spawn.parameter.program"></a>
+
+- *Type:* str
+
+The program to execute.
+
+---
+
+###### `args`<sup>Required</sup> <a name="args" id="@winglang/sdk.util.Util.spawn.parameter.args"></a>
+
+- *Type:* MutArray&lt;str&gt;
+
+An array of arguments to pass to the program.
+
+---
+
+###### `opts`<sup>Optional</sup> <a name="opts" id="@winglang/sdk.util.Util.spawn.parameter.opts"></a>
+
+- *Type:* <a href="#@winglang/sdk.util.SpawnOptions">SpawnOptions</a>
+
+Spawn options including working directory, environment variables, and stdio configurations.
+
+---
+
 ##### `tryEnv` <a name="tryEnv" id="@winglang/sdk.util.Util.tryEnv"></a>
 
 ```wing
@@ -183,6 +422,28 @@ The name of the environment variable.
 
 ---
 
+##### `ulid` <a name="ulid" id="@winglang/sdk.util.Util.ulid"></a>
+
+```wing
+bring util;
+
+util.ulid(options?: UlidOptions);
+```
+
+Generates universally unique lexicographically sortable identifier.
+
+#
+
+> [https://github.com/ulid/javascript](https://github.com/ulid/javascript)
+
+###### `options`<sup>Optional</sup> <a name="options" id="@winglang/sdk.util.Util.ulid.parameter.options"></a>
+
+- *Type:* <a href="#@winglang/sdk.util.UlidOptions">UlidOptions</a>
+
+Optional options object for generating the ID.
+
+---
+
 ##### `uuidv4` <a name="uuidv4" id="@winglang/sdk.util.Util.uuidv4"></a>
 
 ```wing
@@ -203,6 +464,11 @@ util.waitUntil(predicate: IPredicateHandler, props?: WaitUntilProps);
 
 Run a predicate repeatedly, waiting until it returns true or until the timeout elapses.
 
+If the timeout elapses, the function throws an error.
+
+Alternatively, you can pass `throws: false` to suppress the error, and instead return a boolean
+indicating whether the predicate returned true within the timeout.
+
 ###### `predicate`<sup>Required</sup> <a name="predicate" id="@winglang/sdk.util.Util.waitUntil.parameter.predicate"></a>
 
 - *Type:* <a href="#@winglang/sdk.util.IPredicateHandler">IPredicateHandler</a>
@@ -223,6 +489,128 @@ Timeout and interval values, default to one 1m timeout and 0.1sec interval.
 
 ## Structs <a name="Structs" id="Structs"></a>
 
+### CommandOptions <a name="CommandOptions" id="@winglang/sdk.util.CommandOptions"></a>
+
+Base command options.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.util.CommandOptions.Initializer"></a>
+
+```wing
+bring util;
+
+let CommandOptions = util.CommandOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.CommandOptions.property.cwd">cwd</a></code> | <code>str</code> | Path to a directory to run the command in. |
+| <code><a href="#@winglang/sdk.util.CommandOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables. |
+| <code><a href="#@winglang/sdk.util.CommandOptions.property.inheritEnv">inheritEnv</a></code> | <code>bool</code> | Whether to inherit environment variables from the host's environment. |
+
+---
+
+##### `cwd`<sup>Optional</sup> <a name="cwd" id="@winglang/sdk.util.CommandOptions.property.cwd"></a>
+
+```wing
+cwd: str;
+```
+
+- *Type:* str
+- *Default:* the default working directory of the host
+
+Path to a directory to run the command in.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.util.CommandOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* no environment variables
+
+Environment variables.
+
+---
+
+##### `inheritEnv`<sup>Optional</sup> <a name="inheritEnv" id="@winglang/sdk.util.CommandOptions.property.inheritEnv"></a>
+
+```wing
+inheritEnv: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Whether to inherit environment variables from the host's environment.
+
+---
+
+### ExecOptions <a name="ExecOptions" id="@winglang/sdk.util.ExecOptions"></a>
+
+Additional options for `util.exec()`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.util.ExecOptions.Initializer"></a>
+
+```wing
+bring util;
+
+let ExecOptions = util.ExecOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.ExecOptions.property.cwd">cwd</a></code> | <code>str</code> | Path to a directory to run the command in. |
+| <code><a href="#@winglang/sdk.util.ExecOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables. |
+| <code><a href="#@winglang/sdk.util.ExecOptions.property.inheritEnv">inheritEnv</a></code> | <code>bool</code> | Whether to inherit environment variables from the host's environment. |
+
+---
+
+##### `cwd`<sup>Optional</sup> <a name="cwd" id="@winglang/sdk.util.ExecOptions.property.cwd"></a>
+
+```wing
+cwd: str;
+```
+
+- *Type:* str
+- *Default:* the default working directory of the host
+
+Path to a directory to run the command in.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.util.ExecOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* no environment variables
+
+Environment variables.
+
+---
+
+##### `inheritEnv`<sup>Optional</sup> <a name="inheritEnv" id="@winglang/sdk.util.ExecOptions.property.inheritEnv"></a>
+
+```wing
+inheritEnv: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Whether to inherit environment variables from the host's environment.
+
+---
+
 ### NanoidOptions <a name="NanoidOptions" id="@winglang/sdk.util.NanoidOptions"></a>
 
 Options to generating a unique ID.
@@ -269,6 +657,277 @@ Size of ID.
 
 ---
 
+### Output <a name="Output" id="@winglang/sdk.util.Output"></a>
+
+Output of a finished process.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.util.Output.Initializer"></a>
+
+```wing
+bring util;
+
+let Output = util.Output{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.Output.property.status">status</a></code> | <code>num</code> | A process's exit status. |
+| <code><a href="#@winglang/sdk.util.Output.property.stderr">stderr</a></code> | <code>str</code> | The standard error of a finished process. |
+| <code><a href="#@winglang/sdk.util.Output.property.stdout">stdout</a></code> | <code>str</code> | The standard output of a finished process. |
+
+---
+
+##### `status`<sup>Required</sup> <a name="status" id="@winglang/sdk.util.Output.property.status"></a>
+
+```wing
+status: num;
+```
+
+- *Type:* num
+
+A process's exit status.
+
+---
+
+##### `stderr`<sup>Required</sup> <a name="stderr" id="@winglang/sdk.util.Output.property.stderr"></a>
+
+```wing
+stderr: str;
+```
+
+- *Type:* str
+
+The standard error of a finished process.
+
+---
+
+##### `stdout`<sup>Required</sup> <a name="stdout" id="@winglang/sdk.util.Output.property.stdout"></a>
+
+```wing
+stdout: str;
+```
+
+- *Type:* str
+
+The standard output of a finished process.
+
+---
+
+### ShellOptions <a name="ShellOptions" id="@winglang/sdk.util.ShellOptions"></a>
+
+Additional options for `util.shell()`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.util.ShellOptions.Initializer"></a>
+
+```wing
+bring util;
+
+let ShellOptions = util.ShellOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.ShellOptions.property.cwd">cwd</a></code> | <code>str</code> | Path to a directory to run the command in. |
+| <code><a href="#@winglang/sdk.util.ShellOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables. |
+| <code><a href="#@winglang/sdk.util.ShellOptions.property.inheritEnv">inheritEnv</a></code> | <code>bool</code> | Whether to inherit environment variables from the host's environment. |
+| <code><a href="#@winglang/sdk.util.ShellOptions.property.throw">throw</a></code> | <code>bool</code> | Whether to throw an error on command execution failure. |
+
+---
+
+##### `cwd`<sup>Optional</sup> <a name="cwd" id="@winglang/sdk.util.ShellOptions.property.cwd"></a>
+
+```wing
+cwd: str;
+```
+
+- *Type:* str
+- *Default:* the default working directory of the host
+
+Path to a directory to run the command in.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.util.ShellOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* no environment variables
+
+Environment variables.
+
+---
+
+##### `inheritEnv`<sup>Optional</sup> <a name="inheritEnv" id="@winglang/sdk.util.ShellOptions.property.inheritEnv"></a>
+
+```wing
+inheritEnv: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Whether to inherit environment variables from the host's environment.
+
+---
+
+##### `throw`<sup>Optional</sup> <a name="throw" id="@winglang/sdk.util.ShellOptions.property.throw"></a>
+
+```wing
+throw: bool;
+```
+
+- *Type:* bool
+- *Default:* true
+
+Whether to throw an error on command execution failure.
+
+---
+
+### SpawnOptions <a name="SpawnOptions" id="@winglang/sdk.util.SpawnOptions"></a>
+
+Additional options for `util.spawn()`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.util.SpawnOptions.Initializer"></a>
+
+```wing
+bring util;
+
+let SpawnOptions = util.SpawnOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.SpawnOptions.property.cwd">cwd</a></code> | <code>str</code> | Path to a directory to run the command in. |
+| <code><a href="#@winglang/sdk.util.SpawnOptions.property.env">env</a></code> | <code>MutMap&lt;str&gt;</code> | Environment variables. |
+| <code><a href="#@winglang/sdk.util.SpawnOptions.property.inheritEnv">inheritEnv</a></code> | <code>bool</code> | Whether to inherit environment variables from the host's environment. |
+| <code><a href="#@winglang/sdk.util.SpawnOptions.property.stderr">stderr</a></code> | <code><a href="#@winglang/sdk.util.Stdio">Stdio</a></code> | Configuration for the process's standard error stream. |
+| <code><a href="#@winglang/sdk.util.SpawnOptions.property.stdin">stdin</a></code> | <code><a href="#@winglang/sdk.util.Stdio">Stdio</a></code> | Configuration for the process's standard input stream. |
+| <code><a href="#@winglang/sdk.util.SpawnOptions.property.stdout">stdout</a></code> | <code><a href="#@winglang/sdk.util.Stdio">Stdio</a></code> | Configuration for the process's standard output stream. |
+
+---
+
+##### `cwd`<sup>Optional</sup> <a name="cwd" id="@winglang/sdk.util.SpawnOptions.property.cwd"></a>
+
+```wing
+cwd: str;
+```
+
+- *Type:* str
+- *Default:* the default working directory of the host
+
+Path to a directory to run the command in.
+
+---
+
+##### `env`<sup>Optional</sup> <a name="env" id="@winglang/sdk.util.SpawnOptions.property.env"></a>
+
+```wing
+env: MutMap<str>;
+```
+
+- *Type:* MutMap&lt;str&gt;
+- *Default:* no environment variables
+
+Environment variables.
+
+---
+
+##### `inheritEnv`<sup>Optional</sup> <a name="inheritEnv" id="@winglang/sdk.util.SpawnOptions.property.inheritEnv"></a>
+
+```wing
+inheritEnv: bool;
+```
+
+- *Type:* bool
+- *Default:* false
+
+Whether to inherit environment variables from the host's environment.
+
+---
+
+##### `stderr`<sup>Optional</sup> <a name="stderr" id="@winglang/sdk.util.SpawnOptions.property.stderr"></a>
+
+```wing
+stderr: Stdio;
+```
+
+- *Type:* <a href="#@winglang/sdk.util.Stdio">Stdio</a>
+- *Default:* Stdio.INHERIT
+
+Configuration for the process's standard error stream.
+
+---
+
+##### `stdin`<sup>Optional</sup> <a name="stdin" id="@winglang/sdk.util.SpawnOptions.property.stdin"></a>
+
+```wing
+stdin: Stdio;
+```
+
+- *Type:* <a href="#@winglang/sdk.util.Stdio">Stdio</a>
+- *Default:* Stdio.INHERIT
+
+Configuration for the process's standard input stream.
+
+---
+
+##### `stdout`<sup>Optional</sup> <a name="stdout" id="@winglang/sdk.util.SpawnOptions.property.stdout"></a>
+
+```wing
+stdout: Stdio;
+```
+
+- *Type:* <a href="#@winglang/sdk.util.Stdio">Stdio</a>
+- *Default:* Stdio.INHERIT
+
+Configuration for the process's standard output stream.
+
+---
+
+### UlidOptions <a name="UlidOptions" id="@winglang/sdk.util.UlidOptions"></a>
+
+Options to generate universally unique lexicographically sortable identifiers.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.util.UlidOptions.Initializer"></a>
+
+```wing
+bring util;
+
+let UlidOptions = util.UlidOptions{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.util.UlidOptions.property.seed">seed</a></code> | <code>num</code> | You can also input a seed time which will consistently give you the same string for the time component. |
+
+---
+
+##### `seed`<sup>Optional</sup> <a name="seed" id="@winglang/sdk.util.UlidOptions.property.seed"></a>
+
+```wing
+seed: num;
+```
+
+- *Type:* num
+- *Default:* Date.now()
+
+You can also input a seed time which will consistently give you the same string for the time component.
+
+This is useful for migrating to ulid.
+
+---
+
 ### WaitUntilProps <a name="WaitUntilProps" id="@winglang/sdk.util.WaitUntilProps"></a>
 
 Properties for `util.waitUntil`.
@@ -286,6 +945,7 @@ let WaitUntilProps = util.WaitUntilProps{ ... };
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
 | <code><a href="#@winglang/sdk.util.WaitUntilProps.property.interval">interval</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | Interval between predicate retries. |
+| <code><a href="#@winglang/sdk.util.WaitUntilProps.property.throws">throws</a></code> | <code>bool</code> | Whether to throw an error if the timeout elapses. |
 | <code><a href="#@winglang/sdk.util.WaitUntilProps.property.timeout">timeout</a></code> | <code><a href="#@winglang/sdk.std.Duration">duration</a></code> | The timeout for keep trying predicate. |
 
 ---
@@ -303,6 +963,19 @@ Interval between predicate retries.
 
 ---
 
+##### `throws`<sup>Optional</sup> <a name="throws" id="@winglang/sdk.util.WaitUntilProps.property.throws"></a>
+
+```wing
+throws: bool;
+```
+
+- *Type:* bool
+- *Default:* true
+
+Whether to throw an error if the timeout elapses.
+
+---
+
 ##### `timeout`<sup>Optional</sup> <a name="timeout" id="@winglang/sdk.util.WaitUntilProps.property.timeout"></a>
 
 ```wing
@@ -353,3 +1026,41 @@ inflight handle(): bool
 The Predicate function that is called.
 
 
+## Enums <a name="Enums" id="Enums"></a>
+
+### Stdio <a name="Stdio" id="@winglang/sdk.util.Stdio"></a>
+
+Describes what to do with a standard I/O stream for a child process.
+
+#### Members <a name="Members" id="Members"></a>
+
+| **Name** | **Description** |
+| --- | --- |
+| <code><a href="#@winglang/sdk.util.Stdio.INHERIT">INHERIT</a></code> | The child inherits from the corresponding parent descriptor. |
+| <code><a href="#@winglang/sdk.util.Stdio.PIPED">PIPED</a></code> | A new pipe should be arranged to connect the parent and child processes. |
+| <code><a href="#@winglang/sdk.util.Stdio.NULL">NULL</a></code> | This stream will be ignored. |
+
+---
+
+##### `INHERIT` <a name="INHERIT" id="@winglang/sdk.util.Stdio.INHERIT"></a>
+
+The child inherits from the corresponding parent descriptor.
+
+---
+
+
+##### `PIPED` <a name="PIPED" id="@winglang/sdk.util.Stdio.PIPED"></a>
+
+A new pipe should be arranged to connect the parent and child processes.
+
+---
+
+
+##### `NULL` <a name="NULL" id="@winglang/sdk.util.Stdio.NULL"></a>
+
+This stream will be ignored.
+
+This is the equivalent of attaching the stream to /dev/null.
+
+---
+
diff --git "a/docs/docs/04-standard-library/\302\265-winglang_support_metrix.mdx" "b/docs/docs/04-standard-library/\302\265-winglang_support_metrix.mdx"
index 39ff2abb1fa..ec02d0d650b 100644
--- "a/docs/docs/04-standard-library/\302\265-winglang_support_metrix.mdx"
+++ "b/docs/docs/04-standard-library/\302\265-winglang_support_metrix.mdx"
@@ -1,14 +1,10 @@
 ---
-title: compatibility matrix
+title: Compatibility Matrix
 id: compatibility-matrix
-description: Wing Compatibility Matrix
+description: Wing Cloud Library Compatibility Matrix
 keywords: [support matrix, compatibility, versions, resources, standard library]
 ---
 
 import {Table} from "./compatibility/compatibility-table";
 
-> **Status**: Draft
-
-**Next Step**: Make sure all check marked api are tested see [#2114](https://github.com/winglang/wing/issues/2114)
-
 <Table />
diff --git a/docs/docs/055-platforms/_category_.yml b/docs/docs/055-platforms/_category_.yml
new file mode 100644
index 00000000000..3e7b49bbf48
--- /dev/null
+++ b/docs/docs/055-platforms/_category_.yml
@@ -0,0 +1,6 @@
+label: Platforms
+collapsible: true
+collapsed: true
+link:
+  type: generated-index
+  title: Platforms
diff --git a/docs/docs/055-platforms/awscdk.md b/docs/docs/055-platforms/awscdk.md
new file mode 100644
index 00000000000..8806e31fd4f
--- /dev/null
+++ b/docs/docs/055-platforms/awscdk.md
@@ -0,0 +1,191 @@
+---
+title: AWS CDK
+id: awscdk
+sidebar_label: awscdk
+description: AWS CDK platform
+keywords: [Wing reference, Wing language, language, Wing language spec, Wing programming language, aws, awscdk, amazon web services, cloudformation]
+---
+
+The `@winglang/platform-awscdk` [platform](../02-concepts/03-platforms.md) compiles your program for
+the AWS CDK and deployed through the CDK CLI (and AWS CloudFormation).
+
+## Prerequisites
+
+* Install the AWS CDK (or use via `npx cdk`):
+  ```sh
+  npm i aws-cdk
+  ```
+
+* Install the Wing `awscdk` platform:
+  ```sh
+  npm i @winglang/platform-awscdk
+  ```
+
+## Usage
+
+Let's create `main.w` with our Wing program:
+
+```js
+bring cloud;
+
+new cloud.Bucket();
+```
+
+> At this point, you can just run `wing it` (or `wing run`) to open the Wing Simulator.
+
+To use Wing with the AWS CDK, we will need to tell the CDK CLI to run `wing compile` as the CDK app
+and that the synthesis output is in the Wing's target directory.
+
+This can be done by creating a `cdk.json` file manually or through `cdk init` and editing the `app`
+and the `output` fields:
+
+```json
+{
+  "app": "wing compile --output cdk.out --platform @winglang/platform-awscdk main.w",
+  // ... rest of cdk.json
+}
+```
+
+You will also need to set the following environment variables. You can define them in your shell or in a `.env` file:
+
+```dotenv
+# (required) sets the CloudFormation stack name to use.
+CDK_STACK_NAME=MyStack
+# AWS account to deploy to (required if you are using context lookups, optional otherwise)        
+CDK_AWS_ACCOUNT=111111555555
+# AWS region to deploy to (required if you are using context lookups, optional otherwise)
+CDK_AWS_REGION=us-east-1
+```
+
+Now, the AWS CDK CLI will work as normal:
+
+* `npx cdk bootstrap` bootstrap your AWS account for AWS CDK use (once per account/region).
+* `npx cdk deploy` deploy the Wing app to your default AWS account/region.
+* `npx cdk synth` synthesize output to `cdk.out`.
+* `npx cdk diff` show a diff between your code and the deployed version
+
+## Deployment
+
+Before you can first deploy an AWS CDK app to your account, you'll need to bootstrap the account/region:
+
+```sh
+npx cdk bootstrap
+```
+
+Now, you can use `cdk deploy` to deploy the latest version:
+
+```sh
+npx cdk deploy
+```
+
+Let's make a change to your app:
+
+```js
+bring cloud;
+
+let b = new cloud.Bucket();
+
+new cloud.Function(inflight () => {
+  b.put("hello.txt", "world");
+});
+```
+
+If we run `cdk diff` we should see the new resources that are about to be created:
+
+```sh
+$ npx cdk diff
+IAM Statement Changes
+┌───┬──────────────────────────────────┬────────┬──────────────────────────────────┬──────────────────────────────────┬───────────┐
+│   │ Resource                         │ Effect │ Action                           │ Principal                        │ Condition │
+├───┼──────────────────────────────────┼────────┼──────────────────────────────────┼──────────────────────────────────┼───────────┤
+│ + │ ${Default/Default/Bucket/Default │ Allow  │ s3:Abort*                        │ AWS:${Default/Default/Function/D │           │
+│   │ .Arn}                            │        │ s3:PutObject*                    │ efault/ServiceRole}              │           │
+│   │ ${Default/Default/Bucket/Default │        │                                  │                                  │           │
+│   │ .Arn}/*                          │        │                                  │                                  │           │
+├───┼──────────────────────────────────┼────────┼──────────────────────────────────┼──────────────────────────────────┼───────────┤
+│ + │ ${Default/Default/Function/Defau │ Allow  │ sts:AssumeRole                   │ Service:lambda.amazonaws.com     │           │
+│   │ lt/ServiceRole.Arn}              │        │                                  │                                  │           │
+└───┴──────────────────────────────────┴────────┴──────────────────────────────────┴──────────────────────────────────┴───────────┘
+IAM Policy Changes
+┌───┬──────────────────────────────────────────────────────────────┬──────────────────────────────────────────────────────────────┐
+│   │ Resource                                                     │ Managed Policy ARN                                           │
+├───┼──────────────────────────────────────────────────────────────┼──────────────────────────────────────────────────────────────┤
+│ + │ ${Default/Default/Function/Default/ServiceRole}              │ arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambda │
+│   │                                                              │ BasicExecutionRole                                           │
+└───┴──────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
+(NOTE: There may be security-related changes not in this list. See https://github.com/aws/aws-cdk/issues/1299)
+
+Resources
+[+] AWS::Logs::LogGroup Default/Default/Function/LogGroup FunctionLogGroup55B80E27 
+[+] AWS::IAM::Role Default/Default/Function/Default/ServiceRole FunctionServiceRole675BB04A 
+[+] AWS::IAM::Policy Default/Default/Function/Default/ServiceRole/DefaultPolicy FunctionServiceRoleDefaultPolicy2F49994A 
+[+] AWS::Lambda::Function Default/Default/Function/Default Function76856677 
+
+
+✨  Number of stacks with differences: 1
+```
+
+Sweet!, now deploy again:
+
+```sh
+npx cdk deploy
+```
+
+To destroy your stack, you can use:
+
+```sh
+npx cdk destroy
+```
+
+## Bringing AWS CDK constructs to your Wing code
+
+You can bring any AWS CDK library and use constructs in your Wing programs.
+
+> Using AWS CDK constructs directly in your Wing application will only have an effect when compiling
+> and deploying AWS CDK applications and not when running in the Wing Simulator.
+
+The following example shows how to define an EC2 instance inside a VPC (from a lookup):
+
+```js
+bring "aws-cdk-lib" as cdk;
+
+let myVpc = cdk.aws_ec2.Vpc.fromLookup(this, "MyVpc", vpcId: "vpc-111111111222ddddd");
+
+let type = cdk.aws_ec2.InstanceType.of(cdk.aws_ec2.InstanceClass.T2, cdk.aws_ec2.InstanceSize.MICRO);
+
+new cdk.aws_ec2.Instance(
+  instanceType: type,
+  machineImage: cdk.aws_ec2.MachineImage.latestAmazonLinux2(),
+  vpc: myVpc,
+);
+```
+
+Note that in order for the VPC lookup to work, you will need to make sure `CDK_AWS_ACCOUNT` and
+`CDK_AWS_REGION` are configured properly in your `cdk.json` `app` configuration.
+
+## Customizations
+
+### Custom CDK Stack
+
+The `App` class has a `stackFactory` property that can be used to customize how the root CDK stack
+is created.
+
+To use this, create a custom platform like this:
+
+```js
+import { App } from "@winglang/platform-awscdk";
+import { platform } from "@winglang/sdk";
+
+export class Platform implements platform.IPlatform {
+  public readonly target = "awscdk";
+  public newApp?(appProps: any): any {
+    return new App({
+      ...appProps,
+      stackFactory: (app: cdk.App, stackName: string) => {
+        // customize here!
+        return new cdk.Stack(app, stackName);
+      }
+    });
+  }
+}
+```
diff --git a/docs/docs/055-platforms/sim.md b/docs/docs/055-platforms/sim.md
new file mode 100644
index 00000000000..8131ab66e4e
--- /dev/null
+++ b/docs/docs/055-platforms/sim.md
@@ -0,0 +1,35 @@
+---
+title: Wing Cloud Simulator
+id: sim
+sidebar_label: sim
+description: Simulator Platform
+keywords: [Wing reference, Wing language, language, Wing language spec, Wing programming language, simulator, sim, wing simulator]
+---
+
+The Wing Cloud Simulator is a tool for running Wing applications on a single host. It offers a
+simple localhost implementation of all the resources of the Wing Cloud Library to allow developers
+to develop and functionally test cloud applications without having to deploy to the cloud.
+
+The `sim` [platform](../02-concepts/03-platforms.md) compiles your program so it can run in the
+Wing Cloud Simulator.
+
+## Usage
+
+```sh
+$ wing compile [entrypoint] --platform sim
+```
+
+## Parameters
+
+No parameters.
+
+## Output
+
+The output will be found under `target/<entrypoint>.wsim`.
+
+## Deployment
+
+The Wing Simulator can be used in one of these methods:
+
+* Interactively through the [Wing Console](/docs/start-here/local)
+* Using the `wing run|it target/<entrypoint>.wsim` command through the Wing CLI.
diff --git a/docs/docs/055-platforms/tf-aws.md b/docs/docs/055-platforms/tf-aws.md
new file mode 100644
index 00000000000..db38ee5ab6a
--- /dev/null
+++ b/docs/docs/055-platforms/tf-aws.md
@@ -0,0 +1,56 @@
+---
+title: Terraform/AWS
+id: tf-aws
+sidebar_label: tf-aws
+description: Terraform/AWS platform
+keywords: [Wing reference, Wing language, language, Wing language spec, Wing programming language, cli, terraform, aws, tf-aws, tfaws, amazon web services, platform]
+---
+
+The `tf-aws` [platform](../02-concepts/03-platforms.md) compiles your program for Terraform and run on AWS.
+
+## Usage
+
+```sh
+$ wing compile --platform tf-aws [entrypoint]
+```
+
+## Parameters
+
+The `tf-aws` platform supports the following parameters (in `wing.toml`):
+
+* `vpc` - Determine whether to create a new VPC or use an existing one. Allowed values: `"new"` or `"existing"`.
+* `private_subnet_ids` (array of strings) - If using an existing VPC, provide the private subnet IDs.
+* `public_subnet_ids` (array of strings) - If using an existing VPC, provide the public subnet IDs.
+* `vpc_api_gateway` (boolean) - Whether Api gateways should be deployed in a VPC.
+* `vpc_lambda` (boolean) - Whether Lambda functions should be deployed in a VPC.
+
+Example `wing.toml`:
+
+```toml
+[ tf-aws ]
+vpc = "new"
+vpc_lambda = true
+vpc_api_gateway = true
+vpc_id = "vpc-123xyz"
+private_subnet_ids = ["subnet-123xyz"]
+public_subnet_ids = ["subnet-123xyz"]
+```
+
+### Implicit VPC
+
+The `tf-aws` platform can create a new VPC for you if needed. The VPC is pretty standard and includes:
+
+- A VPC with CIDR block `10.0.0.0/16`
+- An Internet Gateway
+- A NAT Gateway
+- A single public subnet with CIDR block `10.0.0.0/24`
+- Two private subnets with CIDR blocks `10.0.4.0/22` and `10.0.8.0/22` (both have Egress via NAT Gateway)
+
+## Output
+
+The output includes both a Terraform configuration file (under `target/cdktf.out/stacks/root`) and
+JavaScript bundles that include inflight code that executes on compute platform such as AWS Lambda.
+
+## Deployment
+
+You can deploy your stack to AWS using Terraform ([instructions](/docs/start-here/aws)).
diff --git a/docs/docs/055-platforms/tf-azure.md b/docs/docs/055-platforms/tf-azure.md
new file mode 100644
index 00000000000..c9ed4a6f11d
--- /dev/null
+++ b/docs/docs/055-platforms/tf-azure.md
@@ -0,0 +1,28 @@
+---
+title: Terraform/Azure
+id: tf-azure
+sidebar_label: tf-azure
+description: Terraform/Azure platform
+keywords: [Wing reference, Wing language, language, Wing language spec, Wing programming language, cli, terraform, tf-azure, azure, microsoft azure, platform]
+---
+
+The `tf-azure` [platform](../02-concepts/03-platforms.md) compiles your program for Terraform and run on Azure.
+
+## Usage
+
+```sh
+$ export AZURE_LOCATION="East US"
+$ wing compile [entrypoint] --platform tf-azure
+```
+
+## Parameters
+
+The environment variable `AZURE_LOCATION` is required and indicates the [deployment
+location](https://github.com/claranet/terraform-azurerm-regions/blob/master/REGIONS.md) of your
+stack.
+
+## Output
+
+The output includes both a Terraform configuration file (under `target/cdktf.out/stacks/root`) and
+JavaScript bundles that include inflight code that executes on compute platform such as Azure
+Functions.
diff --git a/docs/docs/055-platforms/tf-gcp.md b/docs/docs/055-platforms/tf-gcp.md
new file mode 100644
index 00000000000..4c11fc555ab
--- /dev/null
+++ b/docs/docs/055-platforms/tf-gcp.md
@@ -0,0 +1,29 @@
+---
+title: Terraform/GCP
+id: tf-gcp
+sidebar_label: tf-gcp
+description: Terraform/GCP platform
+keywords: [Wing reference, Wing language, language, Wing language spec, Wing programming language, cli, terraform, tf-gcp, gcp, google cloud platform, platform]
+---
+
+The `tf-gcp` [platform](../02-concepts/03-platforms.md) compiles your program for Terraform and run on Google Cloud Platform.
+
+## Usage
+
+```sh
+$ export GOOGLE_PROJECT_ID="my-project"
+$ export GOOGLE_STORAGE_LOCATION="US"
+$ wing compile [entrypoint] --platform tf-gcp
+```
+
+## Parameters 
+
+The environment variable `GOOGLE_STORAGE_LOCATION` is required and indicates the [deployment
+location](https://cloud.google.com/storage/docs/locations) of all storage
+resources (such as buckets and queues). 
+
+The environment variable `GOOGLE_PROJECT_ID` is required and indicates
+the project ID of your stack.
+
+The output includes both a Terraform configuration file (under `target/cdktf.out/stacks/root`) and
+JavaScript bundles that include inflight code that executes on compute platform such as Google Cloud Functions.
diff --git a/docs/docs/06-tools/01-cli.md b/docs/docs/06-tools/01-cli.md
index 13fc437a75f..c7ff114d0e9 100644
--- a/docs/docs/06-tools/01-cli.md
+++ b/docs/docs/06-tools/01-cli.md
@@ -23,6 +23,18 @@ Usage:
 $ wing [command] [options]
 ```
 
+## New project: `wing new`
+
+The `wing new` command can be used to create a new Wing project from a template in your current directory.
+
+Usage:
+
+```sh
+$ wing new <template>
+```
+
+Run `wing new` without any arguments to view the available templates or you can [view the templates on GitHub](https://github.com/winglang/wing/tree/main/apps/wing/project-templates/wing).
+
 ## Run: `wing run|it`
 
 You can use the `run` command (or `it`) when you want to interact with your Wing program in the
@@ -58,170 +70,199 @@ By default, `wing compile` will look for exactly one file named `main.w` or endi
 
 :::
 
-The --platform option specifies the target platform to compile for. The default platform is `sim`.
-The following platforms are built-in:
+The --platform option (or `-t`) specifies the target platform to compile for. The default platform
+is `sim`.
 
-* `sim` - [Wing Simulator](#sim-target)
-* `tf-aws` - Terraform/AWS
-* `tf-azure` - Terraform/Azure
-* `tf-gcp` - Terraform/Google Cloud Platform
+You can use one of the built-in platform providers:
 
-### `sim` Platform
+* [Wing Cloud Simulator](../055-platforms/sim.md) - `sim`
+* [Terraform/AWS](../055-platforms/tf-aws.md) - `tf-aws`
+* [Terraform/Azure](../055-platforms/tf-azure.md) - `tf-azure`
+* [Terraform/GCP](../055-platforms/tf-gcp.md) - `tf-gcp`
+* [AWS CDK](../055-platforms/awscdk.md) - `@winglang/platform-awscdk`
 
-The Wing program is going to be compiled for the Wing simulator (`.wsim`).
+## Test: `wing test`
+
+The `wing test` command can be used to compile and execute tests in Wing applications.
 
 Usage:
 
 ```sh
-$ wing compile [entrypoint] --platform sim
+$ wing test [entrypoint...] [--test-filter <regex>] [--retry [retries]] [-t TARGET]
 ```
 
-The output will be found under `target/<entrypoint>.wsim` and can be opened in two ways:
+Tests are written in `test` blocks that contain *inflight code*. In Wing, each test is executed
+against a separate copy of the application being tested.
 
-* Interactively through the [Wing Console](/docs/start-here/local)
-* Using the `wing run|it target/<entrypoint>.wsim` command through the Wing CLI.
+In the following example
+([test_bucket.test.w](https://github.com/winglang/wing/tree/main/examples/tests/valid/test_bucket.test.w)),
+the application consists of a single `cloud.Bucket` and two tests `"put"` and `"get"`.
 
+```js example
+bring cloud;
 
-### `tf-aws` Platform
+let b = new cloud.Bucket();
 
-Compiles your program for Terraform and run on AWS.
+test "put" {
+  assert(b.list().length == 0);
+  b.put("hello.txt", "world");
+  assert(b.list().length == 1);
+}
 
-Usage:
+test "get" {
+  b.put("hello.txt", "world");
+  assert(b.get("hello.txt") == "world");
+}
+```
+
+Now, if we run the following command, the framework will run each one of these tests against a
+different bucket. This is how the `"put"` test can safely assume that `b.list()` initially returns
+an empty array.
 
 ```sh
-$ wing compile [entrypoint] --platform tf-aws
+$ wing test test_bucket.test.w
+pass | test_bucket.test.w | root/test:get
+pass | test_bucket.test.w | root/test:put
 ```
 
-The output includes both a Terraform configuration file (under `target/cdktf.out/stacks/root`) and
-JavaScript bundles that include inflight code that executes on compute platform such as AWS Lambda.
-
-You can deploy your stack to AWS using Terraform ([instructions](/docs/start-here/aws)).
+### Choosing which tests to run
 
+The `wing test` command accepts an optional list of test entrypoint files:
 
+```sh
+wing test [entrypoint...]
+```
 
-### `tf-azure` Platform
+A file is considered an entrypoint if its name is `main` or ends with `.main` or `.test` and the
+extension is `.w` or `.ts`. 
 
-Compiles your program for Terraform and run on Azure.
+By default, all entrypoints in the current directory will be used.
 
-Usage:
+Exact paths or partial text can be used. If partial, all entrypoints in the current directory that
+contain the partial path will be used. For example `wing test bucket` will test `bucket.test.w` and
+`bucket/get.test.w`.
 
-```sh
-$ export AZURE_LOCATION="East US"
-$ wing compile [entrypoint] --platform tf-azure
-```
+The `--test-filter <regex>` option can be used to run only specific tests within the entrypoints
+based on a provided regular expression.
 
-The variable `AZURE_LOCATION` is required and indicates the [deployment
-location](https://github.com/claranet/terraform-azurerm-regions/blob/master/REGIONS.md) of your
-stack.
+### Cloud tests
 
-The output includes both a Terraform configuration file (under `target/cdktf.out/stacks/root`) and
-JavaScript bundles that include inflight code that executes on compute platform such as Azure
-Functions.
+The `-t TARGET` option can be used to run tests on supported cloud platforms.
 
-### `tf-gcp` Platform
+> Currently, cloud tests are supported for Terraform (`tf-*`) and AWS CDK (`awscdk`).
 
-Compiles your program for Terraform and run on Google Cloud Platform.
+For example, `wing test -t tf-aws` will deploy to AWS using Terraform and execute tests. For this to
+work, you will need AWS credentials in your environment.
 
-Usage:
+Since each Wing test expects to run against its own isolated environment, the test framework will
+deploy a separate copy of your application for each test, execute the test and collect the results.
 
-```sh
-$ export GOOGLE_PROJECT_ID="my-project"
-$ export GOOGLE_STORAGE_LOCATION="US"
-$ wing compile [entrypoint] --platform tf-gcp
-```
+Sometimes, when running tests on the cloud there could be intermittent issues such as connectivity
+or capacity issues. The `--retry <retries>` switch controls how many times to retry a failed test.
+By default it will retry 3 times.
 
-The variable `GOOGLE_STORAGE_LOCATION` is required and indicates the [deployment
-location](https://cloud.google.com/storage/docs/locations) of all storage
-resources (such as buckets and queues). The variable `GOOGLE_PROJECT_ID` is required and indicates
-the project ID of your stack.
+### Cloud test snapshots
 
-The output includes both a Terraform configuration file (under `target/cdktf.out/stacks/root`) and
-JavaScript bundles that include inflight code that executes on compute platform such as Google Cloud Functions.
+Sometimes it is not practical to execute all tests on the cloud in every commit. This could be
+because it can take a long time to run all these tests or because the cloud resources required are
+expensive.
 
+The Wing test framework has a built-in mechanism to mitigate these constraints called *cloud test
+snapshots*.
 
-### `awscdk` Platform
+This mechanism is only activated when running tests on the cloud (e.g. `-t TARGET` where `TARGET` is
+not `sim`).
 
-Compiles your program for AWS CDK with CloudFormation to run on AWS.
+If all the tests pass, the framework will automatically capture a snapshot of the compiler output
+and store it next to the test file (under a `.snap.md` file with the same name as the test
+entrypoint).
 
-Usage:
+In the following example, we run `test_bucket.test.w` against the `tf-aws` target. After the tests passed, a snapshot is captured
+and stored under `test_bucket.test.w.tf-aws.snap.md`.
 
 ```sh
-$ export CDK_STACK_NAME="my-project"
-$ wing compile [entrypoint] --platform awscdk
+$ wing test -t tf-aws test_bucket.test.w
+✔ Compiling test_bucket.test.w to tf-aws...
+✔ terraform init
+✔ terraform apply
+...
+✔ Snapshot test_bucket.test.w.tf-aws.snap.md...
 ```
 
-The output includes both a AWS-CDK configuration file (under `target/<entrypoint>.awscdk`) and
-JavaScript bundles that include inflight code that executes on compute platforms such as AWS Lambda.
+The snapshot file will include a snapshot of the `main.tf.json` file which includes the Terraform
+output of the compiler.
+
+Then, when running the same command within a CI system (which is detected by the `CI` environment
+variable), the framework will *not* attempt to deploy to the cloud, but instead will only assert
+that the output hasn't changed.
 
-You can deploy your stack to AWS by installing the [AWS CDK Toolkit](https://docs.aws.amazon.com/cdk/v2/guide/cli.html) and running:
 ```sh
-$ cdk deploy --app target/app.awscdk
+$ CI=1 wing test -t tf-aws test_bucket.test.w
+✔ Snapshot test_bucket.test.w.tf-aws.snap.md...
 ```
 
-## Test: `wing test`
-
-The `wing test` command can be used to compile and execute tests in Wing applications.
-
-Usage:
+If the output has changed, the test will fail:
 
 ```sh
-$ wing test [entrypoint...] [--test-filter <regex>] [--retry [retries]]
+$ CI=1 wing test -t tf-aws test_bucket.test.w
+✖ Snapshot test_bucket.test.w.tf-aws.snap.md...
+Snapshot mismatch:
+ - Expected: test_bucket.test.w.tf-aws.snap.md
+ - Actual: test_bucket.test.w.tf-aws.snap.md.actual
 ```
 
-`[entrypoint...]` specifies the entrypoint list of files that will be compiled and tested. A file is considered a valid entrypoint if its name ends with `.w`.
+The `--snapshots <mode>` or `-s <mode>` switch can be used to determine the behavior of the
+snapshots mechanism:
 
-`[--test-filter <regex>]` option to run only specific tests within the entrypoints based on a provided regex.
+* `never` - Disables the snapshots mechanism altogether. Should be used, for example, if you wish to
+  run cloud tests from within a CI system.
+* `deploy` - Deploys and captures the snapshot if test passed. This is the default behavior when
+  running cloud tests and `CI` is not set.
+* `assert` - Only verifies that the snapshots haven't changed. This is the default behavior when
+  running cloud tests and `CI` is set.
+* `update` - Only updates the snapshots without deploying. Use this with caution as this can
+  potentially result in a regressed behavior.
+* `auto` - Auto-detect `wet` or `assert` based on the `CI` environment variable (the behavior
+  described above).
 
-`[--retry [retries]]` option specifies the number of retries for failed tests. If no number is specified, the default number of retries is `3`.
-
-For example ([test_bucket.test.w](https://github.com/winglang/wing/tree/main/examples/tests/valid/test_bucket.test.w)):
-
-:::note Default Entrypoint(s)
+## Package: `wing pack`
 
-It's possible to execute `wing test` without specifying any entrypoint, in which case the CLI looks for all files ending with `.test.w` in the current directory. If no files are found, the CLI throws an error.
+The `wing pack` command can be used to package your project as a Wing library.
 
-:::
+Usage:
 
-```js
-bring cloud;
+```sh
+$ wing pack
+```
 
-let b = new cloud.Bucket();
+This will compile your current Wing directory, and bundle it as a tarball that can be published to [GitHub packages](https://github.com/features/packages) or [npm](https://www.npmjs.com/).
 
-test "put" {
-  assert(b.list().length == 0);
-  b.put("hello.txt", "world");
-  assert(b.list().length == 1);
-}
+See [Libraries](../05-libraries.md) for more details on packaging and consuming Wing libraries.
 
-test "get" {
-  b.put("hello.txt", "world");
-  assert(b.get("hello.txt") == "world");
-}
-```
+:::
 
-Now, if we run the following command:
+## Store Secrets: `wing secrets`
 
-```sh
-$ wing test test_bucket.test.w
-pass | test_bucket.test.w | root/test:get
-pass | test_bucket.test.w | root/test:put
-```
+The `wing secrets` command can be used to store secrets needed by your application. The method of storing secrets depends on the target platform.
 
-We will see that both functions were invoked and that the tests passed.
+Take the following Wing application:
 
-## Package: `wing pack`
+```js example
+// main.w
+bring cloud;
 
-The `wing pack` command can be used to package your project as a Wing library.
+let secret = new cloud.Secret(name: "slack-token");
+```
 
 Usage:
 
 ```sh
-$ wing pack
-```
+$ wing secrets main.w
 
-This will compile your current Wing directory, and bundle it as a tarball that can be published to [GitHub packages](https://github.com/features/packages) or [npm](https://www.npmjs.com/).
+1 secret(s) found
 
-See [Libraries](../05-libraries.md) for more details on packaging and consuming Wing libraries.
+? Enter the secret value for slack-token: [hidden]
+```
 
 ## Environment Variables
 
@@ -242,4 +283,4 @@ Here's the list of supported `.env` files:
 
 - **Loading from multiple files**: Wing can load environment variables from multiple `.env` files. If variables overlap, the last loaded file will overwrite previously set values. This allows for a layered setup where base configuration can be in `.env` and environment-specific overrides can be in `.env.[mode]` or `.env.[mode].local`.
 
-By leveraging these advanced features, you can create a more flexible and dynamic environment configuration for your Wing applications.
\ No newline at end of file
+By leveraging these advanced features, you can create a more flexible and dynamic environment configuration for your Wing applications.
diff --git a/docs/docs/06-tools/02-wing-console.md b/docs/docs/06-tools/02-wing-console.md
index 19fc3b81f32..0c2e200acb6 100644
--- a/docs/docs/06-tools/02-wing-console.md
+++ b/docs/docs/06-tools/02-wing-console.md
@@ -17,7 +17,7 @@ Unlike traditional cloud development iterations that involve time-consuming depl
 
 ## Installation
 
-The Wing Console is installed as part of the [Wing CLI installation](../01-start-here/02-installation.md#wing-console).
+The Wing Console is installed as part of the [Wing CLI installation](../01-start-here/02-installation.md).
 
 ## View And Explore your Wing application 
 The Console offers two primary views to provide a comprehensive understanding of your Wing application: the Explorer view and the Map view.
diff --git a/docs/docs/06-tools/03-debugging.md b/docs/docs/06-tools/03-debugging.md
new file mode 100644
index 00000000000..5e7d9714601
--- /dev/null
+++ b/docs/docs/06-tools/03-debugging.md
@@ -0,0 +1,26 @@
+---
+title: Debugging
+id: Debugging
+description: Learn how to debug your Wing application
+keywords: [debugging, debug, test, vscode]
+---
+
+## Overview
+
+Internally Wing uses JavaScript to execute preflight and inflight code, so standard JavaScript debugging tools can be used to debug your Wing application. The best-supported debugger is the built-in VS Code one so this guide will focus on that. 
+
+### Local/Simulator Debugging
+
+To start, open your .w file in VS Code and set breakpoints by clicking in the gutter to the left of the line number. Breakpoints can also be set in extern files.
+Once set, press F5 or use the "Run and Debug" button in the sidebar to start the debugger. This will use the current file if it's an entrypoint or it will prompt you to select one. Different CLI arguments can be provided as well.
+By default, `wing test` will be run with an attached debugger.
+
+#### Non-VSCode Support
+
+The Wing CLI itself is a Node.js application, so you can use the `--inspect` flag to debug it and expose a debug server.
+
+```bash
+node --inspect $(which wing)
+```
+
+Note that inflight code will be executed among multiple child processes, so it's recommended to use a debugger that supports automatically attaching to child processes.
diff --git a/docs/docs/07-examples/01-variable-declaration.md b/docs/docs/07-examples/01-variable-declaration.md
index d18b709d6d4..3a8cfd48233 100644
--- a/docs/docs/07-examples/01-variable-declaration.md
+++ b/docs/docs/07-examples/01-variable-declaration.md
@@ -6,22 +6,24 @@ keywords: [Wing example]
 
 ### Assignment
 
-```ts 
+```ts example{valid: false}
 let x = 12;
 x = 77; // error: Variable is not reassignable
+```
 
+```ts example
 let var y = "hello";
 y = "world"; // OK (y is reassignable)
 ```
 
 ### Inferred typing
-```ts playground
+```ts playground example
 let x1 = 12; 
 let x2: num = 12; // equivalent 
 ```
 
 ### Optionals
-```ts playground
+```ts playground example{valid: false}
 let var x1 = "Hello"; // type str, value "Hello"
 let var x2: str = "Hello"; // same as above 
 let var x3: str? = "Hello"; // type str? (optional), value "Hello"
@@ -31,7 +33,7 @@ x1 = nil; // ERROR: Expected type to be "str", but got "nil" instead
 x3 = nil; // OK (x3 is optional)
 ```
 ### Scopes
-```ts
+```ts example
 let s = "parent";
 log(s); // prints parent
 if true {
diff --git a/docs/docs/07-examples/02-primitives.md b/docs/docs/07-examples/02-primitives.md
index 65c19798f27..b6208d69c91 100644
--- a/docs/docs/07-examples/02-primitives.md
+++ b/docs/docs/07-examples/02-primitives.md
@@ -7,7 +7,7 @@ keywords: [Wing example]
 
 ## Str
 ### Concat and Interpolate 
-```ts 
+```ts  example
 let s1 = "Hello Wing String";
 log(s1); // prints Hello Wing String
 let s2 = "Interpolate: {s1}"; // string interpolation
@@ -17,7 +17,7 @@ log(s3); // prints Concat: Hello Wing String
 ```
 
 ### Str methods
-```ts 
+```ts example
 let s = "Hello to a new Wing world";
 
 // lets start with split
@@ -45,7 +45,7 @@ for w in s.split(" ") {
 
 ## Num
 
-```ts 
+```ts example
 let n1 = 10;
 log("{n1}"); // 10
 
@@ -68,7 +68,7 @@ log("{n6}"); // The meaning of the universe
 
 ## Bool
 
-```ts 
+```ts example
 let b1 = true;
 let b2 = false;
 
diff --git a/docs/docs/07-examples/03-functions.md b/docs/docs/07-examples/03-functions.md
index 554763dacba..77830f153df 100644
--- a/docs/docs/07-examples/03-functions.md
+++ b/docs/docs/07-examples/03-functions.md
@@ -7,9 +7,9 @@ keywords: [Wing example]
 
 ### Preflight function
 
-```ts playground
+```ts playground example
 // preflight function - when declared in preflight context
-let dup = (s: str, count: num): str => {
+let dup = (s: str, count: num) => {
   // code
 };
 ```
@@ -18,21 +18,21 @@ let dup = (s: str, count: num): str => {
 
 Inflight functions are Wing's distributed computing primitive. They are isolated code blocks which can be packaged and executed on compute platforms in the cloud (such as containers, Lambda/Cloud Function, etc..).
 
-```ts playground
+```ts playground example
 
 let handler = inflight (message: str): void => {
   // using the inflight modifier 
-  let dup = inflight (s: str, count: num): str => {
+  let dup = inflight (s: str, count: num) => {
     // code
   };
   // inflight modifier is not required when function is declared in inflight context
-  let sup = (s: str, count: num): str => {
+  let sup = (s: str, count: num) => {
     // code
   };
 };
 ```
 ### Struct Expansion
-```ts playground
+```ts playground example
 struct Options {
   prefix: str?;
   delim: str;
diff --git a/docs/docs/07-examples/04-flow-controls.md b/docs/docs/07-examples/04-flow-controls.md
index 7b405974964..0149726bbcb 100644
--- a/docs/docs/07-examples/04-flow-controls.md
+++ b/docs/docs/07-examples/04-flow-controls.md
@@ -6,7 +6,7 @@ keywords: [Wing example]
 
 ### For in
 
-```ts playground
+```ts playground example
 let iterable = ["a", "b", "c", "d", "e", "f", "g", "h"];
 for value in iterable {
   if value == "g" {
@@ -31,16 +31,26 @@ for value in iterable {
 
 ### For through a range
 
-```ts playground
+```ts playground example
 // print numbers from 0 to 9
 for value in 0..10 {
   log("{value}");
 }
+
+// prints numbers in reverse order from 10 to 0
+for value in 10..-1 {
+    log("{value}");
+}
+
+// include end
+for value in 1..=5 {
+    log("{value}");
+}
 ```
 
 ### If elif else
 
-```ts playground
+```ts playground example
 let grade = (score: num): str => {
     // Parentheses are optional in conditions.
     // However, curly braces are required in `if/else` statements.
@@ -66,7 +76,7 @@ log("101 is {grade(101)}"); // 101 is Invalid grade
 
 ### While 
 
-```ts playground
+```ts playground example
 let var i = 0;
 while i < 100 {
   i = i + 1;
diff --git a/docs/docs/07-examples/05-optionality.md b/docs/docs/07-examples/05-optionality.md
index e0cb665dfe1..3901a4564c2 100644
--- a/docs/docs/07-examples/05-optionality.md
+++ b/docs/docs/07-examples/05-optionality.md
@@ -6,13 +6,13 @@ keywords: [Wing example]
 
 ## Definition 
 
-```ts playground
+```ts playground example
 let s1: str? = "Hello"; // type str? (optional), value "Hello"
 let s2: str? = nil; // type str? (optional), value nil
 ```
 
 ## Testing existence  
-```ts playground
+```ts playground example
 let s1: str? = "Hello"; // type str? (optional), value "Hello"
 let s2: str? = nil; // type str? (optional), value nil
 
@@ -25,7 +25,7 @@ if !s2? {
 ```
 
 ## Using if let
-```ts playground
+```ts playground example
 let s1: str? = "Hello"; // type str? (optional), value "Hello"
 
 // unwrap optional s1 and create s from type str
@@ -46,7 +46,7 @@ log("s1 type is optional str");
 
 ## Using ?? 
 
-```ts playground
+```ts playground example
 let s1: str? = nil; // type str? (optional), value nil
 let s2 = s1 ?? "default value";  // s2 is of type str
 log(s2); // prints default value
@@ -54,7 +54,7 @@ log(s2); // prints default value
 
 ## Optional Chaining 
 
-```ts playground
+```ts playground example
 let j  = Json {
   working: {
     a: {
@@ -77,7 +77,7 @@ if let value = j.tryGet("broken")?.tryGet("a")?.tryGet("b")?.tryAsStr() {
 
 ## Optional bool
 
-```ts playground
+```ts playground example
 let b3: bool? = false; 
 
 if b3? {
diff --git a/docs/docs/07-examples/06-json.md b/docs/docs/07-examples/06-json.md
index a4051227c47..6a591d97913 100644
--- a/docs/docs/07-examples/06-json.md
+++ b/docs/docs/07-examples/06-json.md
@@ -6,7 +6,7 @@ keywords: [Wing example]
 ## Create Json values
 
 ### Using Json literal
-```js playground
+```js playground example
 let j = Json {
   k1: 1,
   k2: "hello",
@@ -32,7 +32,7 @@ log("{jsonHomogeneousArrayValue}");
 
 ### From existing variables
 
-```js playground
+```js playground example
 let x: num = 42;
 let jsonNum = Json x;
 log("{jsonNum}"); // 42
@@ -59,7 +59,7 @@ if let jsonFromTryParse = Json.tryParse("{\"k1\":\"v\"}") {
 
 ## Enumerating 
 ### Over keys
-```js playground
+```js playground example
 let j = Json {
     k1: "v1",
     k2: "v2"
@@ -70,7 +70,7 @@ for k in Json.keys(j) {
 }
 ```
 ### Over values
-```js playground
+```js playground example
 let j = Json {
     k1: "v1",
     k2: "v2"
@@ -81,7 +81,7 @@ for value in Json.values(j) {
 ```
 
 ### Over a json array
-```js playground
+```js playground example
 let arrayValue = Json ["a", "b", "c"];
 for v in Json.values(arrayValue) {
   log(str.fromJson(v));
@@ -90,7 +90,7 @@ for v in Json.values(arrayValue) {
 
 ## Safely convert to primitives
 ### To `str`
-```js playground
+```js playground example
 let j = Json {
     k: "hello"
 };
@@ -99,24 +99,24 @@ log(j.get("k").asStr());
 ```
 
 ### To `num`
-```js playground
+```js playground example
 let j = Json {
-    k: 12
+  k: 12
 };
-log(j.get("k").asNum());
+log("{j.get("k").asNum()}");
 ```
 
 ### To `bool`
 
-```js playground
+```js playground example
 let j = Json {
-    k:true
+  k:true
 };
-log(j.get("k").asBool());
+log("{j.get("k").asBool()}");
 ```
 
 ## Safely convert to structs
-```js playground
+```js playground example
 struct Foo {
   val1: str;
   val2: num;
diff --git a/docs/docs/07-examples/07-structs.md b/docs/docs/07-examples/07-structs.md
index 74d2578b068..73083048521 100644
--- a/docs/docs/07-examples/07-structs.md
+++ b/docs/docs/07-examples/07-structs.md
@@ -7,7 +7,7 @@ keywords: [Wing example]
 ## Deceleration and Initialization
 
 ### Required fields
-```ts playground
+```ts playground example
 struct Example {
   a: str;
   b: num;
@@ -19,7 +19,7 @@ log(example.a); // prints "a"
 ```
 
 ### Optional fields
-```ts playground
+```ts playground example
 struct Example {
   a: str?;
   b: num?;
@@ -33,7 +33,7 @@ if ! example.a? {
 ```
 
 ### Composition
-```ts playground
+```ts playground example
 struct Another {
   hello: str;
 }
@@ -57,7 +57,7 @@ log(data.c.hello); // prints two
 
 
 ## Struct expansion in function calls
-```ts playground
+```ts playground example
 struct Options {
   prefix: str?;
   delim: str;
diff --git a/docs/docs/07-examples/08-classes.md b/docs/docs/07-examples/08-classes.md
index 2f9715fa603..96155a2e10a 100644
--- a/docs/docs/07-examples/08-classes.md
+++ b/docs/docs/07-examples/08-classes.md
@@ -5,13 +5,13 @@ keywords: [Wing example]
 ---
 
 ### Preflight class
-```ts playground
+```ts playground example
 bring cloud;
 bring util;
 
 class Foo  {
-  field1: str;     // <-- readonly
-  var field2: num; // <-- reassignable
+  pub field1: str;     // <-- readonly
+  pub var field2: num; // <-- reassignable
   inflight field3: Array<str>;
 
   new() {
@@ -47,10 +47,10 @@ new cloud.Function(inflight () => {
 ```
 
 ### Inflight interface
-```js playground
+```js playground example
 bring cloud;
 
-interface IProfile {
+inflight interface IProfile {
   inflight name(): str;
 }
 
@@ -70,7 +70,8 @@ new cloud.Function(inflight () => {
 ```
 
 ### Preflight interface
-```ts playground
+```ts playground example
+bring cloud;
 /**
  * Preflight Interface
  **/ 
@@ -95,8 +96,9 @@ class BucketBasedKeyValueStore impl IKVStore {
 ```
 
 ### Complete IKVStore 
-```js playground
+```js playground example
 bring cloud;
+bring ex;
 
 interface IKVStore extends std.IResource { 
   inflight get(key: str): Json;
@@ -117,9 +119,9 @@ class BucketBasedKeyValueStore impl IKVStore {
 }
 
 class TableBasedKeyValueStore impl IKVStore {
-  table: cloud.Table;
+  table: ex.Table;
   new() {
-    this.table = new cloud.Table(
+    this.table = new ex.Table(
       name: "table",
       primaryKey: "key",
       columns: {
@@ -130,7 +132,7 @@ class TableBasedKeyValueStore impl IKVStore {
   pub inflight get(key: str): Json {
     return this.table.get(key);
   }
-  pub inflight set(key: str, value: Json): str {
+  pub inflight set(key: str, value: Json) {
     this.table.insert(key, value);
   }
 }
@@ -138,19 +140,21 @@ class TableBasedKeyValueStore impl IKVStore {
 let bucketBased: IKVStore = new BucketBasedKeyValueStore();
 let tableBased: IKVStore = new TableBasedKeyValueStore();
 
-let testKv = inflight (kv: IKVStore):void => {
-  kv.set("k", Json { 
-    value: "v" 
+test "bucketBased KVStore" {
+  bucketBased.set("k", Json {
+    value: "v"
   });
-  let result = kv.get("k");
+  let result = bucketBased.get("k");
   log("{result.get("value")}");
   assert("v" == str.fromJson(result.get("value")));
-};
+}
 
-new cloud.Function(inflight () => {
-  log("testing bucketBased KVStore");
-  testKv(bucketBased);
-  log("testing tableBased KVStore");
-  testKv(tableBased);
-});
+test "tableBased KVStore" {
+  tableBased.set("k", Json {
+    value: "v"
+  });
+  let result = tableBased.get("k");
+  log("{result.get("value")}");
+  assert("v" == str.fromJson(result.get("value")));
+}
 ```
\ No newline at end of file
diff --git a/docs/docs/07-examples/10-using-javascript.md b/docs/docs/07-examples/10-using-javascript.md
index 5410a9f9082..b8e9022c1fa 100644
--- a/docs/docs/07-examples/10-using-javascript.md
+++ b/docs/docs/07-examples/10-using-javascript.md
@@ -1,56 +1,129 @@
 ---
-title: Using JavaScript
+title: Using JavaScript/TypeScript
 id: using-javascript
-keywords: [Wing example]
+keywords: [example, javascript, extern, typescript, js, ts]
 ---
 
-Calling a Javascript function from Wing requires two steps. 
+## Creating inflight function from JavaScript/TypeScript file
 
-First, export the function from Javascript.
+Inflight closures are an extremely important Wing functionality. Consider the following simple wing program:
 
-This examples exports `isValidUrl` from a file named`url_utils.js`:
+```wing example
+// main.w
+bring cloud;
+let bucket = new cloud.Bucket();
 
-```js
-exports.isValidUrl = function(url) {
-  try {
-    new URL(url);
-    return true;
-  } catch {
-    return false;
-  }
-};
+bucket.onCreate(inflight (file) => {
+  log(file);
+});
+```
+
+Being able to write inflight wing alongside the preflight code is beautiful, but you may want to write the inflight function in a separate file and *language*. The `@inflight` intrinsic function can be used to create an inflight closure from a JavaScript/TypeScript:
+
+```wing
+// main.w
+bring cloud;
+let bucket = new cloud.Bucket();
+
+bucket.onCreate(@inflight("./bucket_create.ts"));
+//              ^ onCreate expects an `inflight (str): void` function, so the file must export a function with a typescript signature that matches
+//                        ^ Relative (to current file) path to javascript or typescript file
+//                          Note: This must be a static string
+```
+
+`wing compile` will generate `.bucket_create.inflight.ts` which will contain all of the information needed for TypeScript type checking and IDE support.
+With that, you can create the `bucket_create.ts` file:
+
+```ts
+// bucket_create.ts
+import inflight from "./.bucket_create.inflight";
+
+export default inflight(async ({}, file) => {
+//                                 ^ This is known to be a string, the first positional argument needed for `onCreate`
+  console.log(file);
+});
+```
+
+Something missing here is the ability to reference preflight resources inside an inflight function.
+Let's create a Queue and pass it to the inflight function while exploring other options:
+
+```wing
+// main.w
+bring cloud;
+let bucket = new cloud.Bucket();
+let queue = new cloud.Queue();
+
+bucket.onCreate(@inflight("./bucket_create.ts",
+  export: "default",
+//        ^ Optional named export from the file, "default" is the default export
+  lifts:[{ obj: queue, alias: "myQueue", ops: ["push"] }],
+//       ^ object to lift, can be any preflight expression
+//                     ^ Optional alias, by default, this will be the variable name passed to obj
+//                                     ^ methods to lift, if not provided then all methods will be granted
+));
+``` 
+
+```ts
+// bucket_create.ts
+import inflight from "./bucket_create.inflight";
+
+export default inflight(async ({ myQueue }, file) => {
+//                               ^ inflight interface to your preflight queue
+  await myQueue.push(file);
+});
 ```
 
-### Preflight function
+## Using `extern` to expose JavaScript/TypeScript functions in preflight and inflight
+
+When you want to use a JavaScript/TypeScript file anywhere in Wing, you can use the `extern` keyword to expose functions from that file.
 
-To call this in preflight code, define the function as an `extern` in a class.
+1. Create a .js/.ts file that exports some functions
 
-**Note:** Extern functions must be `static.` 
+```js
+// util.js
 
-If you want to use the function outside of the calss, be sure to decalre it as `pub`.
+exports.isValidUrl = function (url) {
+  return URL.canParse(url);
+};
+```
 
-```ts 
-class JsExample {  
-  // preflight static 
-  pub extern "./url_utils.js" static isValidUrl(url: str): bool;
+It may be CJS/ESM written in either JavaScript or TypeScript.
+
+2. Use the `extern` keyword in a class to expose the function to Wing. Note that this must be `static`. It may also be `inflight`
+
+```ts
+class JsExample {
+  pub extern "./util.js" static isValidUrl(url: str): bool;
 }
 
 assert(JsExample.isValidUrl("http://www.google.com"));
 assert(!JsExample.isValidUrl("X?Y"));
 ```
 
-### Inflight
+### Type-safe `extern`
 
-To call the function inflight, add the `inflight` modifier. 
+Running `wing compile` will generate a corresponding `.d.ts` file for each `extern`. This file can be imported into the extern file itself to ensure the extern is type-safe. Either your IDE or a separate usage of the TypeScript compiler can provide type-checking.
 
 ```ts
-class JsExample {  
-  // inflight static method
-  extern "./url_utils.js" static inflight  isValidUrl(url: str): bool;
-}
+// util.ts
+import type extern from "./util.extern";
 
-test "main" {
-  assert(JsExample.isValidUrl("http://www.google.com"));
-  assert(!JsExample.isValidUrl("X?Y"));
-}
+export const isValidUrl: extern["isValidUrl"] = (url) => {
+  // url is known to be a string and that we must return a boolean
+  return URL.canParse(url);
+};
+```
+
+The .d.ts file can also be used in JavaScript via JSDoc comments and can even be applied at a module export level.
+
+```js
+// util.js
+/** @type {import("./util.extern").default} */
+module.exports = {
+  isValidUrl: (url) => {
+    return URL.canParse(url);
+  },
+};
 ```
+
+Coming Soon: The ability to use resources inside an `inflight extern`. See [this issue](https://github.com/winglang/wing/issues/76) for more information.
diff --git a/docs/docs/07-examples/13-api-gateway.md b/docs/docs/07-examples/13-api-gateway.md
index 69ee83de873..f1083192e2a 100644
--- a/docs/docs/07-examples/13-api-gateway.md
+++ b/docs/docs/07-examples/13-api-gateway.md
@@ -5,7 +5,7 @@ keywords: [Wing example]
 ---
 
 ### Creating routes
-```js playground
+```js playground example
 bring cloud;
 
 let api = new cloud.Api();
@@ -37,12 +37,12 @@ api.delete("/", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
 ```
 
 ### Path parameters 
-```js playground
+```js playground example
 bring cloud;
 
 let api = new cloud.Api();
 
-api.get("/items/{id}/{value}", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+api.get("/items/:id/:value", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
   let itemId = req.vars.get("id");
   let itemValue = req.vars.get("value");
   log("Received itemId:{itemId}, itemValue:{itemValue}");
@@ -55,12 +55,12 @@ api.get("/items/{id}/{value}", inflight (req: cloud.ApiRequest): cloud.ApiRespon
 ```
 
 ### Json body
-```js playground
+```js playground example
 bring cloud;
 
 let api = new cloud.Api();
 
-api.put("/items/{id}", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+api.put("/items/:id", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
   let itemId = req.vars.get("id");
   if let itemBody = Json.tryParse(req.body ?? "") {    
     return cloud.ApiResponse {
diff --git a/docs/docs/07-examples/80-singletons.md b/docs/docs/07-examples/80-singletons.md
index e64938d4716..b4f5f8a6317 100644
--- a/docs/docs/07-examples/80-singletons.md
+++ b/docs/docs/07-examples/80-singletons.md
@@ -10,14 +10,14 @@ a pattern for how to implement singletons in Wing.
 As an example, say we want to maintain a central bucket that can be accessed from any part of the
 application:
 
-```js playground
+```js playground example
 bring cloud;
 
 class SingletonBucket {
   pub static of(scope: std.IResource): cloud.Bucket {
     let uid = "SingletonBucket";
-    let root = std.Node.of(scope).root;
-    let rootNode = std.Node.of(root);
+    let root = nodeof(scope).root;
+    let rootNode = nodeof(root);
     return unsafeCast(rootNode.tryFindChild(uid)) ?? new cloud.Bucket() as uid in root;
   }
 }
@@ -32,7 +32,18 @@ it or otherwise it creates a new bucket with this id (`as uid`) under the root n
 Now, in order to access our bucket from anywhere within the app, I can just use:
 
 ```js
-let bucket = SingletonBucket.of(this);
+class MyFoo {
+  new() {
+    let bucket = SingletonBucket.of(this);
+  }
+}
 ```
 
-And we will always get the same bucket.
\ No newline at end of file
+And we will always get the same bucket.
+
+> NOTE: if you use `this` in an entrypoint (outside of a class declaration), its type is going to be `Construct`
+> (known issue: [#6049](https://github.com/winglang/wing/issues/6049)), so you can use `unsafeCast` as a workaround:
+
+```js
+let bucket = SingletonBucket.of(unsafeCast(this));
+```
diff --git a/docs/docs/08-guides/01-terraform-backend.md b/docs/docs/08-guides/01-terraform-backend.md
index 05d081443be..b1e182f4e4f 100644
--- a/docs/docs/08-guides/01-terraform-backend.md
+++ b/docs/docs/08-guides/01-terraform-backend.md
@@ -70,25 +70,27 @@ aws dynamodb create-table --table-name <table-name> --attribute-definitions Attr
 
 This revised command creates a DynamoDB table with the On-Demand capacity mode, eliminating the need for capacity planning and managing throughput.
 
-## Step 4: Configure Terraform Backend with a Wing Plugin
+## Step 4: Configure Terraform Backend with a Wing Platform
 
-Winglang provides the functionality of a `postSynth` plugin which can be leveraged to modify the Terraform configuration during the compilation phase. In our scenario, we will utilize this feature to configure the S3 backend for Terraform. This facilitates the separation of concerns by allowing us to develop the Wing application independently from its deployment logistics.
+Winglang provides the functionality of a `postSynth` platform extension which can be leveraged to modify the Terraform configuration during the compilation phase. In our scenario, we will utilize this feature to configure the S3 backend for Terraform. This facilitates the separation of concerns by allowing us to develop the Wing application independently from its deployment logistics.
 
-Now, utilize the Winglang static plugin for injecting the S3 backend configuration during the compilation phase:
+Now, utilize the Winglang static platform for injecting the S3 backend configuration during the compilation phase:
 
 ```javascript
-// plugin.static-backend.js
-
-exports.postSynth = function(config) {
-  config.terraform.backend = {
-    s3: {
-      bucket: "<bucket-name>",
-      region: "<region>",
-      key: "path/to/my/key/terraform.tfstate",
-      dynamodb_table: "<table-name>"
+// platform.static-backend.js
+
+exports.Platform = class TFBackend {
+  postSynth(config) {
+    config.terraform.backend = {
+      s3: {
+        bucket: "<bucket-name>",
+        region: "<region>",
+        key: "path/to/my/key/terraform.tfstate",
+        dynamodb_table: "<table-name>"
+      }
     }
+    return config;
   }
-  return config;
 }
 ```
 
@@ -96,14 +98,14 @@ Replace `<bucket-name>`, `<region>`, `path/to/my/key/terraform.tfstate` and `<ta
 
 
 ```bash
-wing compile -t tf-aws --plugins=plugin.static-backend.js main.w
+wing compile -t tf-aws -t platform.static-backend.js main.w
 ```
 
 You can find a more detailed example [here](https://github.com/winglang/examples/tree/main/examples/s3-backend).
 
 ## Step 5: Initialize Backend
 
-After configuring the backend with the Wing plugin, the final step is to initialize it. When using the static plugin, we can change the directory to the synthesized application, e.g. `cd target/main.tfaws` and run
+After configuring the backend with the Wing platform, the final step is to initialize it. When using the static platform, we can change the directory to the synthesized application, e.g. `cd target/main.tfaws` and run
 
 :::info
 
@@ -115,7 +117,7 @@ This command will require valid AWS credentials with the correct [permissions](h
 terraform init
 ```
 
-This command initializes your Terraform workspace by installing the necessary Terraform provider and plugins. During this process, it will also set up the S3 backend with the parameters provided by the Wing plugin and output a confirmation that the backend was successfully initialized.
+This command initializes your Terraform workspace by installing the necessary Terraform provider and plugins. During this process, it will also set up the S3 backend with the parameters provided by the Wing platform and output a confirmation that the backend was successfully initialized.
 
 ## Summary
 
diff --git a/docs/docs/08-guides/02-ci-cd.md b/docs/docs/08-guides/02-ci-cd.md
index 6bd7a29e6ac..b2d7b02ff3d 100644
--- a/docs/docs/08-guides/02-ci-cd.md
+++ b/docs/docs/08-guides/02-ci-cd.md
@@ -65,9 +65,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
           role-session-name: gh-actions-winglang # makes it easy to identify, e.g. in AWS Cloudtrail
@@ -101,9 +101,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
           role-session-name: gh-actions-winglang
@@ -149,7 +149,7 @@ exports.postSynth = function(config) {
 This workflow:
 
 - Checks out the code.
-- Installs Node.js v18.
+- Installs Node.js v20.
 - Installs the winglang CLI with the latest version.
 - Installs npm dependencies (this step can be skipped if not necessary).
 - Retrieves short-lived credentials for AWS via OIDC.
@@ -192,7 +192,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js v18
         uses: actions/setup-node@v3
         with:
@@ -204,7 +204,7 @@ jobs:
       - name: Compile
         run: wing compile -t tf-aws --plugins=plugin.s3-backend.js main.w
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
           role-session-name: gh-actions-winglang-website-proxy
diff --git a/docs/docs/08-guides/03-react-vite-websockets.md b/docs/docs/08-guides/03-react-vite-websockets.md
new file mode 100644
index 00000000000..c467f063841
--- /dev/null
+++ b/docs/docs/08-guides/03-react-vite-websockets.md
@@ -0,0 +1,718 @@
+---
+title: React, Vite & Websockets 
+id: react-vite-websockets
+keywords: [Websockets, React, Vite, Local, Wing]
+---
+
+# React, Vite & WebSockets 
+
+In this guide, we will build a simple web application with React for our frontend and Wing for our backend.
+We will develop and test our application using the Wing Simulator and deploy it to AWS using [Terraform](https://www.terraform.io/).
+
+Our application will have a counter that can be incremented by clicking on it. This counter will be
+synchronized in real-time across all users via a distributed cloud counter and WebSockets.
+
+> 🚧 Wing is still under active development, so don't be (too) surprised if you run into issues or bugs
+> along the way. You are invited to [join the Wing Discord](https://t.winglang.io/discord) to say hi, ask questions
+> and help your fellow Wingnuts.
+
+## How to use this guide?
+
+This guide is written as a tutorial and intended to be followed step-by-step. At the end of each step, you should be able to find the 
+full source code in a collapsable section.
+
+To expedite the project creation process, consider leveraging the react-vite quickstart template. This quickstart option automates the generation of all the files demonstrated in this tutorial, providing a fast way to set up your project environment:
+
+```bash
+$ mkdir my-react-vite
+$ cd my-react-vite
+$ wing new react-vite
+```
+
+Let's check out what we now have in our project directory:
+
+```bash
+my-react-vite/
+├── backend
+├── frontned
+├── package-lock.json
+├── package.json
+```
+
+During this tutorial, we'll be focusing on editing the following files:
+
+```bash
+backend/
+├── main.w
+├── broadcaster.w
+```
+
+```bash
+frontend/
+├── src/App.tsx
+```
+
+You can also find the entire project in [GitHub](https://github.com/winglang/guide-react-vite-websockets).
+
+## Prerequisites
+
+- [Node.js](https://nodejs.org/en) v20 or later.
+- IDE support (syntax highlighting, code completions and more):
+  - [VSCode](https://marketplace.visualstudio.com/items?itemName=Monada.vscode-wing) - Official extension
+  - [IntelliJ](https://plugins.jetbrains.com/plugin/22353-wing) - Community-supported
+
+## Step 1 - Installation & Scaffolding
+
+In this step, we will create our project.
+
+### Creating a React App with Vite
+
+1. Create our project folder:
+
+    ```sh
+    mkdir ~/shared-counter
+    cd ~/shared-counter
+    ```
+
+2. Create a new React app using Vite under the `frontend` directory:
+ 
+    ```sh
+    npm create -y vite frontend -- --template react-ts
+    ```
+
+3. Let's ensure your new frontend works:
+
+    ```sh
+    cd frontend
+    npm install
+    npm run dev
+    ```
+
+    > The result should be a very simple webpage that runs locally and works without a backend. If you
+    > open multiple browser tabs you'll see that the counter is not synchronized.
+
+4. Press Ctrl-C to return to the CLI prompt.
+
+### Creating a Wing backend
+
+Now, we will create our backend for our app:
+
+1. Install Wing:
+
+    ```sh
+    npm install -g winglang
+    wing -V # should be >= 0.60.1
+    ```
+
+2. Create a `backend` directory under the project root:
+
+    ```sh
+    mkdir ~/shared-counter/backend
+    cd ~/shared-counter/backend
+    ```
+
+3. Generate a new empty Wing project:
+
+    ```sh
+    wing new empty
+    ```
+
+    > This will generate three files: `package.json`, `package-lock.json` and `main.w` file with a
+    > simple "hello world" program
+
+4. Let's run our new application in the Wing Simulator:
+
+    ```sh
+    wing it
+    ```
+
+    > The Wing Simulator will be opened in your browser and will show a map of your app with a single
+    > function.
+    >
+    > ![image](https://github.com/winglang/wing/assets/598796/1ba40358-e833-4583-9c14-2efd160ffdc6)
+
+5. Now, let's invoke our function from the interaction panel and check out the result.
+
+    > ![image](https://github.com/winglang/wing/assets/598796/42c7820f-09ec-4fa2-abc6-18a717d60ab9)
+
+6. Ctrl-C to go back to CLI prompt.
+
+## Step 2 - Hello `@winglibs/vite` 
+
+In the previous step, we used `npm run dev` to start the local web server.
+In this step, we will install the `@winglibs/vite` package responsible for starting the dev server. 
+We will also learn how to send static data from your backend to your frontend application.
+
+### Install and use `@winglibs/vite`
+
+1. Install `@winglibs/vite`:
+
+    ```sh
+    cd ~/shared-counter/backend
+    npm i @winglibs/vite
+    ```
+
+2. Open up your IDE within the project root:
+
+    ```sh
+    cd ~/shared-counter
+    code .
+    ```
+
+3. Clear `backend/main.w` from existing code, and add the following code to bring and instantiate
+   Vite in `backend/main.w`:
+
+    ```ts
+    bring vite;
+  
+    new vite.Vite(
+      root: "../frontend"
+    );
+    ```
+
+3. Open the Wing Simulator again:
+
+    ```sh
+    cd ~/shared-counter/backend
+    wing it
+    ```
+
+    > You'll notice you both the Wing Simulator and your Vite application opened.
+    >
+    > ![image](https://github.com/winglang/wing/assets/598796/6c9961bc-ac13-4ea2-a3f4-fc1e2a6543e4)
+    >
+    > You'll also notice that your Wing application has a Vite resource:
+    >
+    > ![image](https://github.com/winglang/wing/assets/598796/cbab9eab-2b9d-4523-b39d-e1fade8571c3)
+`
+### Sending data to your Vite app using `publicEnv`
+
+Now that our backend has a Vite resource, let's explore how to send static data from the backend to
+the frontend.
+
+1. Edit your `backend/main.w` and add the `TITLE` environment variable to `publicEnv`:
+
+    ```ts
+    bring vite;
+  
+    new vite.Vite(
+      root: "../frontend",
+      publicEnv: {
+        TITLE: "Wing + Vite + React"
+      }
+    );
+    ```
+
+2. Your web app can now access this environment variable through `window.wing.env`. You can verify
+   this by opening the JavaScript console under Developer Tools and running
+   `console.log(window.wing.env);`
+
+    > ![image](https://github.com/winglang/wing/assets/598796/cda270e1-5b7b-402f-b533-68be131b5075)
+
+3. Add this line at the top of `frontend/src/App.tsx`:
+
+    ```ts
+    import "../.winglibs/wing-env.d.ts"
+    ```
+
+4. Edit `frontend/src/App.tsx` and use replace:
+
+    ```tsx
+    <h1>Vite + React</h1>
+    ```
+
+    with:
+
+    ```ts
+    <h1>{window.wing.env.TITLE}</h1>
+    ```
+
+5. Upon saving both `main.w` and `App.tsx`, you should see the new title pop up!
+
+    > ![image](https://github.com/winglang/wing/assets/598796/e6e5e8d9-52fc-4fdf-a600-ba00271b6ef6)
+
+## Step 3 - Adding a counter
+
+Now that we understand how to send static information from the backend to the frontend, we will create a backend API endpoint and provide the frontend code with its URL.
+On the frontend, we will switch from using a local counter to a backend-based counter.
+
+### Creating a counter and read/update API routes
+
+1. Instantiate a `cloud.Api` in `backend/main.w` by adding the following code:
+
+    ```ts
+    bring vite;
+    bring cloud;
+
+    let api = new cloud.Api(cors: true);
+
+    new vite.Vite(
+      root: "../frontend",
+      publicEnv: {
+        TITLE: "Wing + Vite + React",
+        API_URL: api.url
+      }
+    );
+    ```
+
+    > Notice that we added a new environment variable called `API_URL` to our frontend application
+    > which points to the URL of our API endpoint.
+
+2. Now, let's create a `cloud.Counter`:
+ 
+    ```ts
+    let counter = new cloud.Counter();
+    ```
+
+3. Add the following routes:
+
+    - `GET /counter` will retrieve the counter value using `counter.peek()`:
+
+    ```ts
+    api.get("/counter", inflight () => {
+      return {
+        body: "{counter.peek()}"
+      };
+    });
+    ```
+    
+    - `POST /counter` will increment the counter using `counter.inc()`:
+
+    ```ts
+    api.post("/counter", inflight () => {
+      let prev = counter.inc();
+      return {
+        body: "{prev + 1}"
+      };
+    });
+    ```
+
+4. Jump over to the Wing Simulator to see that these routes work as expected.
+
+    > You can click on the API and use the interaction panel to test your endpoints, you can also
+    > examine the counter value and even modify it.
+    >
+    > ![image](https://github.com/winglang/wing/assets/598796/90fc5b61-610c-460d-8da1-4a4d23525f2a)
+
+---
+
+<details>
+<summary>main.w</summary>
+
+```js
+bring vite;
+bring cloud;
+
+let api = new cloud.Api(cors: true);
+let counter = new cloud.Counter();
+
+api.get("/counter", inflight () => {
+  return {
+    body: "{counter.peek()}"
+  };
+});
+
+api.post("/counter", inflight () => {
+  let prev = counter.inc();
+  return {
+    body: "{prev + 1}"
+  };
+});
+
+new vite.Vite(
+  root: "../frontend",
+  publicEnv: {
+    TITLE: "Wing + Vite + React",
+    API_URL: api.url
+  }
+);  
+```
+
+</details>
+
+
+### Edit `App.tsx` to call our backend
+
+Let's modify our frontend code to fetch and update the counter value using the routes defined above.
+
+1. First, store the `API_URL` in a const at the top of `frontend/src/App.tsx`:
+
+    ```ts
+    const API_URL = window.wing.env.API_URL;
+    ```
+
+2. Then, let's use React hooks to update the counter data:
+
+    - Import `useEffect`:
+
+    ```ts
+    import { useState, useEffect } from 'react';
+    ```
+
+    - Add the code inside the `App` function:
+
+    ```ts
+    function App() {
+      const [count, setCount] = useState("NA")
+
+      const incrementCount = async () => {
+        const response = await fetch(`${API_URL}/counter`, {
+          method: "POST"
+        });
+        setCount(await response.text()); 
+      }
+
+      const updateCount = async () => {
+        const response = await fetch(`${API_URL}/counter`);
+        setCount(await response.text()); 
+      }
+      
+      useEffect(() => {
+        updateCount();
+      }, []);
+
+      // ...
+    ```
+
+3. Let's trigger the `incrementCount()` function when the user clicks the button:
+
+    ```ts
+      <button key={count} onClick={incrementCount}>
+    ```
+
+4. Once you save the code, you can examine both the webpage and the Simulator to see how the counter
+   gets incremented.
+
+---
+
+<details>
+<summary>App.tsx</summary>
+
+```ts
+import { useState, useEffect } from 'react'
+import reactLogo from './assets/react.svg'
+import viteLogo from '/vite.svg'
+import './App.css'
+
+function App() {
+  const API_URL = window.wing.env.API_URL;
+  const [count, setCount] = useState("NA")
+
+  const incrementCount = async () => {
+    const response = await fetch(`${API_URL}/counter`, {
+      method: "POST"
+    });
+    setCount(await response.text()); 
+  };
+
+  const updateCount = async () => {
+    const response = await fetch(`${API_URL}/counter`);
+    setCount(await response.text()); 
+  };
+
+  useEffect(() => {
+    updateCount();
+  }, []);
+
+  return (
+    <>
+      <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} className="logo" alt="Vite logo" />
+        </a>
+        <a href="https://react.dev" target="_blank">
+          <img src={reactLogo} className="logo react" alt="React logo" />
+        </a>
+      </div>
+      <h1>{window.wing.env.TITLE}</h1>
+      <div className="card">
+        <button key={count} onClick={incrementCount}>
+          count is {count}
+        </button>
+        <p>
+          Edit <code>src/App.tsx</code> and save to test HMR
+        </p>
+      </div>
+      <p className="read-the-docs">
+        Click on the Vite and React logos to learn more
+      </p>
+    </>
+  );
+}
+
+export default App;
+```
+
+</details>
+
+## Step 4 - Synchronize browsers using `@winglibs/websockets` 
+
+In the current implementation, if we open two browser side-by-side, we only see the counter latest
+value upon refresh.
+
+In this step we will create a broadcasting service which deploys a WebSocket server on the backend.
+Clients then connect to this WebSocket to receive real-time notifications when the counter is
+updated.
+
+When the counter is incremented, the broadcaster service will notify all clients that they need to
+fetch a new value from our API.
+
+### Create a Broadcaster class
+
+The `Broadcaster` class contains two public API endpoints:
+
+- a static public WebSocket URL that will be sent to clients through `publicEnv`.
+- an `inflight` broadcast message, that sends a message to all connected clients
+
+1. First, let's install the `@winglibs/websockets` library:
+
+    ```sh
+    cd ~/shared-counter/backend
+    npm i @winglibs/websockets
+    ```
+
+2. Create a new file `backend/broadcaster.w`, with the following implementation:
+
+    ```ts
+    bring cloud;
+    bring websockets;
+
+    pub class Broadcaster {
+      pub url: str;
+      server: websockets.WebSocket;
+      clients: cloud.Bucket;
+
+      new() {
+        this.server = new websockets.WebSocket(name: "counter_updates");
+        this.url = this.server.url;
+        this.clients = new cloud.Bucket();
+      
+        // upon connection, add the client to the list
+        this.server.onConnect(inflight(id: str): void => {
+          this.clients.put(id, "");
+        });
+
+        // upon disconnect, remove the client from the list
+        this.server.onDisconnect(inflight(id: str): void => {
+          this.clients.delete(id);
+        });
+      }
+
+      // send a message to all clients
+      pub inflight broadcast(message: str) {
+        for id in this.clients.list() {
+          this.server.sendMessage(id, message);
+        }
+      }
+    }
+    ```
+
+3. In `backend/main.w`, lets bring and instantiate our broadcaster service:
+
+    ```ts
+    bring "./broadcaster.w" as b;
+
+    let broadcaster = new b.Broadcaster();
+    ```
+
+4. Send the WebSocket URL to the client:
+
+    ```ts
+    new vite.Vite(
+      root: "../frontend",
+      publicEnv: {
+        TITLE: "Wing + Vite + React",
+        WS_URL: broadcaster.url, // <-- add this
+        API_URL: api.url,
+      }
+    );
+    ```
+
+5. Now, every time the counter is increment, let's send a broadcast `"refresh"` message to all our clients. Add this to the `POST /counter` handler:
+
+    ```ts
+    api.post("/counter", inflight () => {
+      let oldValue = counter.inc();
+      broadcaster.broadcast("refresh");
+
+      return {
+        body: "{oldValue + 1}"
+      };
+    });
+    ```
+
+---
+
+<details>
+<summary>main.w</summary>
+
+```ts
+bring vite;
+bring cloud;
+bring "./broadcaster.w" as b;
+
+let broadcaster = new b.Broadcaster();
+
+let api = new cloud.Api(cors: true);
+let counter = new cloud.Counter();
+
+api.get("/counter", inflight () => {
+  return {
+    body: "{counter.peek()}"
+  };
+});
+
+api.post("/counter", inflight () => {
+  let prev = counter.inc();
+  broadcaster.broadcast("refresh");
+  return {
+    body: "{prev + 1}"
+  };
+});
+
+new vite.Vite(
+  root: "../frontend",
+  publicEnv: {
+    TITLE: "Wing + Vite + React",
+    WS_URL: broadcaster.url,
+    API_URL: api.url,
+  }
+);
+```
+
+</details>
+
+### Listen to ws message and trigger data refresh
+
+Let's move to the client.
+
+On the client side we are going to use `react-use-websocket` and listen to any event from the
+broadcaster, once an event is received we will read the counter value from the API. 
+
+1. Start by installing `react-use-websocket` on the `frontend/`:
+    ```sh
+    cd ~/shared-counter/frontend
+    npm i react-use-websocket
+    ```
+
+2. Lets import and use it inside `frontend/App.tsx`:
+
+  ```ts
+  import useWebSocket from 'react-use-websocket';
+  ```
+
+3. And use it inside the `App()` function body (after the definition of `updateCount()`):
+
+    ```ts
+    useWebSocket(window.wing.env.WS_URL, {
+      onMessage: () => {
+        updateCount();
+      }
+    });
+    ```
+
+5. Play around by opening multiple tabs of the website; they should automatically update when the
+   counter increments.
+
+---
+
+<details>
+<summary>App.tsx</summary>
+
+```ts
+import { useState, useEffect } from 'react'
+import reactLogo from './assets/react.svg'
+import viteLogo from '/vite.svg'
+import './App.css'
+import useWebSocket from 'react-use-websocket';
+
+
+function App() {
+  const API_URL = window.wing.env.API_URL;
+  const [count, setCount] = useState("NA")
+  
+  const incrementCount = async () => {
+    const response = await fetch(`${API_URL}/counter`, {
+      method: "POST"
+    });
+    setCount(await response.text()); 
+  };
+  
+  const updateCount = async () => {
+    const response = await fetch(`${API_URL}/counter`);
+    setCount(await response.text()); 
+  };
+  
+  useWebSocket(window.wing.env.WS_URL, {
+    onMessage: () => {
+      updateCount();
+    }
+  });
+  
+  useEffect(() => {
+    updateCount();
+  }, []);
+  
+  return (
+    <>
+      <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} className="logo" alt="Vite logo" />
+        </a>
+        <a href="https://react.dev" target="_blank">
+          <img src={reactLogo} className="logo react" alt="React logo" />
+        </a>
+      </div>
+      <h1>{window.wing.env.TITLE}</h1>
+      <div className="card">
+        <button key={count} onClick={incrementCount}>
+          count is {count}
+        </button>
+        <p>
+          Edit <code>src/App.tsx</code> and save to test HMR
+        </p>
+      </div>
+      <p className="read-the-docs">
+        Click on the Vite and React logos to learn more
+      </p>
+    </>
+  );
+}
+
+export default App;
+```
+
+</details>
+
+## Step 5 - Deploy on AWS
+
+Once deployed, the above code translates into the following (simplified) AWS architecture.
+
+![AWS Architecture](./vite-react-websockets-AWS-diagram.png 'AWS Architecture')
+
+###  Prerequisites
+
+In order to deploy to AWS, you will need:
+
+* [Terraform](https://terraform.io/downloads)
+* [AWS CLI](https://docs.aws.amazon.com/cli) with configured credentials. See
+  [here](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html) for more
+  information.
+
+1. Compile to Terraform/AWS
+
+    We will use the `tf-aws` platform to tell the compiler to bind all of our resources
+    to the default set of AWS resources and use Terraform as the provisioning engine.
+
+    ```sh
+    cd ~/shared-counter/backend
+    wing compile --platform tf-aws main.w
+    ```
+
+2. Run Terraform Init and Apply 
+
+    ```sh
+    cd ./target/main.tfaws
+    terraform init
+    terraform apply # this takes some time
+    ```
diff --git a/docs/docs/08-guides/04-private-api-gateway-aws.md b/docs/docs/08-guides/04-private-api-gateway-aws.md
new file mode 100644
index 00000000000..7dca7c44f3b
--- /dev/null
+++ b/docs/docs/08-guides/04-private-api-gateway-aws.md
@@ -0,0 +1,267 @@
+---
+title: Building a Private API Gateway in AWS with Winglang
+description: A step by step guid to build a private API Gateway in an AWS VPC with Winglang
+authors:
+  - skorfmann
+  - hasanaburayyan
+tags: [aws, api-gateway, vpc]
+image: https://www.winglang.io/assets/images/private-api-gateway-a08f1e4cf02c6d3a98ce7e813fd5685c.jpg
+hide_table_of_contents: false
+---
+
+![gateway](private-api-gateway.jpg)
+
+This tutorial is a guide for creating a [secure](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-private-apis.html) [API Gateway](https://aws.amazon.com/api-gateway/) inside an AWS Virtual Private Cloud (VPC) using Winglang. A private API Gateway in AWS is used when you need to expose APIs that are only accessible within your Virtual Private Cloud (VPC) or through specific endpoints that you define. This setup is essential for internal or private applications where security and controlled access are crucial.
+
+Wing currently supports two programming languages: TypeScript and [Winglang](https://winglang.io). For the purposes of this tutorial, we'll use Winglang.
+
+> Its recommended to use VSCode to follow along with this tutorial, as it has a Winglang extension that provides syntax highlighting and code completion. You can install the Winglang extension from the [VSCode Marketplace](https://marketplace.visualstudio.com/items?itemName=Monada.vscode-wing).
+
+
+Let's start by installing the Wing CLI (you'll need Node.js >= 20.x installed):
+
+```bash
+npm i -g winglang
+```
+
+You can check the CLI version like this (the minimum version required by this tutorial is 0.58.10):
+
+```bash
+wing --version
+0.58.10
+```
+
+> Before we get going it would be great if you joined the awesome people hanging out on the [Wing Discord](https://t.winglang.io/discord).
+
+
+Ok, now that we have the Wing CLI installed, let's create a new project using the `private-api` quickstart:
+
+```bash
+$ mkdir my-api
+$ cd my-api
+$ wing new private-api
+```
+
+Let's check out what we now have in our project directory:
+
+```bash
+my-api/
+├── main.w
+├── wing.toml
+├── package-lock.json
+└── package.json
+```
+
+If we look at the `main.w` file, we'll see a code template for a simple note-taking app:
+
+```jsx
+bring cloud;
+bring http;
+
+/**
+ * The example below is a simple note-taking app.
+ * It uses a cloud.Bucket to store notes and a cloud.Api to expose a RESTful interface.
+ * 
+ * The api has two endpoints:
+ * - GET /note?name=NAME to get a note by name
+ * - PUT /note/:NAME to save a note by name
+ * 
+ * The app also includes two cloud.Functions to consume the api.
+ * - Consumer-PUT reads a string like: `NAME:NOTE` and calls the api to save it.
+ * - Consumer-GET reads a string like: `NAME` and calls the api to get the note.
+ * 
+ * These consumer functions are not required for the app to work, but since our api is private, they are useful for testing.
+ * As an example, if you deploy this app to AWS, you can use the AWS CLI to invoke these functions
+ * by running the following commands, you can test the api:
+ * `aws lambda invoke --cli-binary-format raw-in-base64-out --function-name <function-name> --payload "\"n1:this is my note\"" response.json`
+ * `cat response.json`
+ * 
+ * And retrieve the note:
+ * `aws lambda invoke --cli-binary-format raw-in-base64-out --function-name <function-name> --payload "\"n1\"" response.json`
+ * `cat response.json`
+ *
+ * If you have not made changes to this template you can find your function names in AWS using the following command:
+ * `aws lambda list-functions --query "Functions[?starts_with(FunctionName, 'Consumer')].FunctionName"`
+ */
+let noteBucket = new cloud.Bucket();
+
+let api = new cloud.Api();
+
+api.get("/note", inflight (request) => {
+  let noteName = request.query.get("name"); 
+  let note = noteBucket.get(noteName);
+
+  return {
+    status: 200,
+    body: note
+  };
+});
+
+api.put("/note/:name", inflight (request) => {
+  let note = request.body;
+  let noteName = request.vars.get("name");
+
+  if (note == "") {
+    return {
+      status: 400,
+      body: "note is required"
+    };
+  }
+
+  noteBucket.put(noteName, note ?? "");
+
+  return {
+    status: 200,
+    body: "note: {noteName} saved!"
+  };
+});
+
+// Consumer functions (not required for the app to work, but useful for testing)
+new cloud.Function(inflight (event: str?) => {
+  if let event = event {
+    let parts = event.split(":");
+    let name = parts.at(0);
+    let note = parts.at(1);
+
+    let response = http.put("{api.url}/note/{name}", {
+      body: "{note}"
+    });
+    return response.body;
+  }
+
+  return "event is required `NAME:NOTE`";
+}) as "Consumer-PUT";
+
+new cloud.Function(inflight (event: str?) => {
+  if let event = event {
+    return http.get("{api.url}/note?name={event}").body;
+  }
+
+  return "event is required `NAME`";
+}) as "Consumer-GET";
+```
+
+You'll notice, there's nothing in this Wing code that implies that the API needs to be inside the VPC. This is because in Wing, this type of configuration happens at that *platform level* and not at the *application level*.
+
+Your platform configuration happens inside `wing.toml`:
+
+```toml
+[ tf-aws ]
+# vpc can be set to "new" or "existing"
+vpc = "new"
+# vpc_lambda will ensure that lambda functions are created within the vpc on the private subnet
+vpc_lambda = true
+# vpc_api_gateway will ensure that the api gateway is created within the vpc on the private subnet
+vpc_api_gateway = true
+# The following parameters will be required if using "existing" vpc
+# vpc_id = "vpc-123xyz"
+# private_subnet_id = "subnet-123xyz"
+# public_subnet_id = "subnet-123xyz"
+```
+
+This `wing.toml` file sets configuration options for the `tf-aws` platform. The quickstart configures the platform to create a new VPC for this app and put Amazon API Gateways and AWS Lambda functions inside that VPC.
+
+> Built-in Wing platforms such as tf-aws support certain common configuration options (such as private APIs). If you need additional customization, you can always create your own custom platforms and have complete control over how your app is deployed to the cloud. To read more about creating your own custom platform checkout our [custom platforms documentation](https://www.winglang.io/docs/concepts/platforms#custom-platforms).
+
+Before we deploy our app to AWS, let's first check it out in the Wing Console:
+
+```bash
+wing it
+```
+
+> If this is the first time you are running the Wing Console on your machine, you'll need to sign up with your GitHub credentials.
+
+Once the Wing Console is running, you'll be able to see your API endpoint, invoke it and see the response. Note that the consumer functions are not required for the app to work, and really are not useful in the simulator,
+their usefulness is shown when the app is deployed to AWS. For now we will ignore them.
+
+![app-in-sim](private-api-app-sim.png)
+
+You can go ahead and test the functionality of the api by selecting `cloud.Api` resources and interacting with it using the tool panel on the right. A first fun interaction might be just saving a note using the `PUT /note/:name` endpoint:
+
+![save-note](private-api-save-note.png)
+
+Once the note is saved we can take a look into the bucket resource and see that the note is there:
+
+![read-note](private-api-read-note.png)
+
+Lastly, lets see about using the API to read back the note's contents, just as we used the simulator to interact with the API and save the note, we can read it back using the `GET /note?name=NAME` endpoint:
+
+![retrieve-note](private-api-retrieve-note.png)
+
+Wonderful! Our API is working as expected in the simulator. Next, let's deploy this to the cloud!
+
+> Make sure to have [Terraform](https://developer.hashicorp.com/terraform/install) installed. The `terraform init` step is only required for the initial deployment.
+> Also ensure you have your own AWS credentials set up in your environment.
+
+In order to compile our code for deployment to AWS we will use the `tf-aws` platform with the `wing compile` command. This will generate the necessary Terraform files for deploying our app to AWS. 
+
+The following commands will compile the code and deploy it to AWS:
+
+```bash
+wing compile -t tf-aws
+terraform -chdir=./target/main.tfaws init
+terraform -chdir=./target/main.tfaws apply -auto-approve
+```
+
+The terraform apply will take a few minutes to complete, as its configuring the API Gateway to be private and only accessible from within the VPC. As well as configuring our Lambda consumer functions to be in the same VPC (this is where the consumer functions come in handy finally).
+
+Once the deployment is complete, you should see something like this:
+```bash
+Apply complete! Resources: 31 added, 0 changed, 0 destroyed.
+
+Outputs:
+
+cloudApi_Endpoint_Url_CD8AC9A6 = "https://ac3f2dvk1h.execute-api.us-east-1.amazonaws.com/prod"
+```
+
+Your Endpoint URL will be different, but now since you have it, try running this `curl` command to get a note back. You should see a response like this:
+
+```bash
+curl "https://ac3f2dvk1h.execute-api.us-east-1.amazonaws.com/prod/note?name=n1"
+curl: (6) Could not resolve host: ac3f2dvk1h.execute-api.us-east-1.amazonaws.com
+```
+
+This is because the API Gateway is now private and only accessible from within the VPC. Before we test the API using the consumer functions, lets take a peek at the AWS console to see the API Gateway settings.
+
+Below we can see that the newly created API Gateway is now private and configured to be accessible withing a VPC Endpoint:
+
+![private-api-gateway](private-api-settings.png)
+
+Lastly lets test that the API is working as expected by using the consumer functions. In order to do so we can use the AWS CLI, but we will need the names of the consumer functions, which can be found running the commands given in the comments of the `main.w` file. 
+
+```bash
+aws lambda list-functions --query "Functions[?starts_with(FunctionName, 'Consumer')].FunctionName"
+[
+  "Consumer-PUT-c8756be1",
+  "Consumer-GET-c8d6f858"
+]
+```
+First we will use the `Consumer-PUT` function to save a note:
+
+> Be sure to replace the function name with your own.
+
+```bash
+aws lambda invoke --cli-binary-format raw-in-base64-out --function-name Consumer-PUT-c8756be1 --payload "\"n1:this is my note\"" response.json
+cat response.json
+
+"note: n1 saved!"
+```
+
+And then we can use the `Consumer-GET` function to read the note back:
+
+```bash
+aws lambda invoke --cli-binary-format raw-in-base64-out --function-name Consumer-GET-c8d6f858 --payload "\"n1\"" response.json
+cat response.json
+
+"this is my note"
+```
+
+And there you have it! You have successfully deployed a private API Gateway in AWS using Winglang. You can be confident that your API is secure and only accessible from within your VPC.
+
+Once you are ready to cleanup the resources out of your account you can just run the following command:
+
+> You will need to empty the s3 bucket used for storing notes before you can delete it.
+
+```bash
+terraform -chdir=./target/main.tfaws destroy -auto-approve
+```
diff --git a/docs/docs/08-guides/private-api-app-sim.png b/docs/docs/08-guides/private-api-app-sim.png
new file mode 100644
index 00000000000..2a71ae06d35
Binary files /dev/null and b/docs/docs/08-guides/private-api-app-sim.png differ
diff --git a/docs/docs/08-guides/private-api-gateway.jpg b/docs/docs/08-guides/private-api-gateway.jpg
new file mode 100644
index 00000000000..701904b110b
Binary files /dev/null and b/docs/docs/08-guides/private-api-gateway.jpg differ
diff --git a/docs/docs/08-guides/private-api-read-note.png b/docs/docs/08-guides/private-api-read-note.png
new file mode 100644
index 00000000000..a7bdc57af2a
Binary files /dev/null and b/docs/docs/08-guides/private-api-read-note.png differ
diff --git a/docs/docs/08-guides/private-api-retrieve-note.png b/docs/docs/08-guides/private-api-retrieve-note.png
new file mode 100644
index 00000000000..598b180dc44
Binary files /dev/null and b/docs/docs/08-guides/private-api-retrieve-note.png differ
diff --git a/docs/docs/08-guides/private-api-save-note.png b/docs/docs/08-guides/private-api-save-note.png
new file mode 100644
index 00000000000..66625bc69e5
Binary files /dev/null and b/docs/docs/08-guides/private-api-save-note.png differ
diff --git a/docs/docs/08-guides/private-api-settings.png b/docs/docs/08-guides/private-api-settings.png
new file mode 100644
index 00000000000..84320f871c7
Binary files /dev/null and b/docs/docs/08-guides/private-api-settings.png differ
diff --git a/docs/docs/08-guides/vite-react-websockets-AWS-diagram.png b/docs/docs/08-guides/vite-react-websockets-AWS-diagram.png
new file mode 100644
index 00000000000..5f74ab23e2b
Binary files /dev/null and b/docs/docs/08-guides/vite-react-websockets-AWS-diagram.png differ
diff --git a/docs/docs/09-typescript/01-resources.md b/docs/docs/09-typescript/01-resources.md
new file mode 100644
index 00000000000..b1ba01d9eec
--- /dev/null
+++ b/docs/docs/09-typescript/01-resources.md
@@ -0,0 +1,63 @@
+---
+title: Resources
+id: resources
+---
+
+Resources are created similar to other CDKs (awscdk, cdktf, cdk8s, etc.). They make up the tree that represents your infrastructure.
+Resources are classes typically constructed with at least two arguments: The scope (parent) resource and an id.
+
+Creating these resources starts with `main()` from `@wingcloud/framework`:
+
+```ts
+import { main } from "@wingcloud/framework";
+
+main(() => {
+  // your app goes here
+});
+```
+
+The callback passed to `main()` is the entry point for your application. The first argument provided is the root of this tree of resources and can be used to construct your first resource:
+
+```ts
+import { main, cloud } from "@wingcloud/framework";
+
+main((root) => {
+  new cloud.Bucket(root, "Bucket");
+});
+```
+
+API documentation for the `cloud` namespace is available [here](../04-standard-library/cloud).
+Note that those docs are meant for The TypeScript API is similar, with two primary differences:
+
+- Resources always have 2 arguments first: the `scope` resource to contain the new one and an `id` for it
+- Some types are different, a table can be found in the [winglang reference](../03-language-reference.md#522-type-model)
+
+### Creating new resources
+
+Resources can be grouped together by using [constructs](https://github.com/aws/constructs).
+
+```ts
+// my-construct.ts
+import { cloud, Construct } from "@wingcloud/framework";
+
+export class MyConstruct extends Construct {
+  public bucket: cloud.Bucket;
+  constructor(scope: Construct, id: string) {
+    super(scope, id);
+
+    this.bucket = new cloud.Bucket(this, "MyBucket");
+  }
+}
+```
+
+```ts
+// main.ts
+import { main } from "@wingcloud/framework";
+import { MyConstruct } from "./my-construct";
+
+main((root) => {
+  new MyConstruct(root, "MyConstruct");
+});
+```
+
+> The creation of [`lift`able classes like winglang](../07-examples/08-classes.md) is not currently supported in TypeScript.
diff --git a/docs/docs/09-typescript/02-inflights.md b/docs/docs/09-typescript/02-inflights.md
new file mode 100644
index 00000000000..380ef48fbdc
--- /dev/null
+++ b/docs/docs/09-typescript/02-inflights.md
@@ -0,0 +1,136 @@
+---
+title: Inflight Functions
+id: inflights
+---
+
+The concepts of `preflight` and `inflight` in winglang are described [here](../02-concepts/01-preflight-and-inflight.md).
+In TypeScript, this is analogous to the difference between the `main` function (preflight) and the `inflight` function.
+
+### Functions and `inflight`
+
+Some resources, like `cloud.Function`, run code in the cloud. This code is called an *inflight closure*.
+
+To create an inflight closure in TypeScript, you can use the `inflight()` function and pass it an async closure:
+
+```ts
+import { main, cloud, inflight } from "@wingcloud/framework";
+
+main((root) => {
+  new cloud.Function(
+    root,
+    "MyFn",
+    inflight(async () => {
+      // This code runs in the deployed cloud function
+      return "Wing!";
+    })
+  );
+});
+```
+
+### Lifting objects into inflight closures
+
+Inflight closures do not run in the same environment as the rest of the code, so you can't just reference variables from the outside.
+The `lift()` function ensures you have an interface with the data you need. This includes the inflight APIs for the lifted resources:
+
+```ts
+import { main, cloud, lift } from "@wingcloud/framework";
+
+main((root) => {
+  const bucket = new cloud.Bucket(root, "MyBucket");
+  const plainData = "Wing!";
+
+  new cloud.Function(
+    root,
+    "MyFn",
+    lift({ bucket, plainData }).inflight(async ({ bucket, plainData }) => {
+      // note that inflight methods are always asynchronous
+      await bucket.put("hello.txt", plainData);
+      return plainData;
+    })
+  );
+});
+```
+
+Inflight closures themselves can also be lifted. Once lifted, they can be called like normal closure:
+
+```ts
+import { main, lift, inflight } from "@wingcloud/framework";
+
+main((root) => {
+  const myInflight = inflight(async () => {
+    return "Wing!";
+  });
+
+  lift({ myInflight }).inflight(async ({ myInflight }) => {
+    return myInflight();
+  });
+});
+```
+
+Normal functions and classes cannot be lifted.
+Unlike other variables, imports can be referenced as-is from within inflight closures. The imports will be bundled into the inflight's environment.
+
+```ts
+import { main, inflight } from "@wingcloud/framework";
+import assert from "node:assert";
+
+main((root) => {
+  inflight(async () => {
+    assert.equal(1, 1);
+  });
+});
+```
+
+### Permissions
+
+When `lift()` is used with resources, permissions are granted automatically to access them in the cloud.
+By default, these permissions are permissive and allow all actions on the resource.
+To restrict the permissions, chain `grant()` calls to your `lift()`:
+
+```ts
+import { main, cloud, lift } from "@wingcloud/framework";
+
+main((root) => {
+  const bucket = new cloud.Bucket(root, "MyBucket");
+
+  new cloud.Function(
+    root,
+    "MyFn",
+    lift({ bucket })
+      .grant({ bucket: ["get"] })
+      .inflight(async ({ bucket }) => {
+        await bucket.put("hello.txt", "Wing!");
+        //           ^^^ Type error, no `put` permissions!
+        return "Wing!";
+      })
+  );
+});
+```
+
+### Testing
+
+`wing test` runs all tests within your `main`. To define a test, use the `test()` function provided as the second argument to `main`:
+
+```ts
+import { main, cloud, inflight, lift } from "@wingcloud/framework";
+import assert from "node:assert";
+
+main((root, test) => {
+  const fn = new cloud.Function(
+    root,
+    "MyFn",
+    inflight(async () => {
+      return "Wing!";
+    })
+  );
+
+  test(
+    // name of the test
+    "MyFn returns 'Wing!'",
+    // inflight function to run as the test
+    lift({ fn }).inflight(async ({ fn }) => {
+      assert.equal(await fn.invoke(), "Wing!");
+    })
+  );
+});
+```
diff --git a/docs/docs/09-typescript/03-ecosystem.md b/docs/docs/09-typescript/03-ecosystem.md
new file mode 100644
index 00000000000..f1b46a887b1
--- /dev/null
+++ b/docs/docs/09-typescript/03-ecosystem.md
@@ -0,0 +1,56 @@
+---
+title: Ecosystem
+id: ecosystem
+---
+
+### Trusted libraries
+
+Dependencies can be installed like any other npm package and used in your project.
+There is an ecosystem of trusted libraries written in winglang called [winglibs](https://github.com/winglang/winglibs)
+
+```shell
+npm install @winglibs/checks
+```
+
+```ts
+import { main, inflight } from "@wingcloud/framework";
+import checks from "@winglibs/checks";
+
+main((root) => {
+  new checks.Check(
+    root,
+    "MyCheck",
+    inflight(async () => {
+      console.log("Looks good to me!");
+    })
+  );
+});
+```
+
+Other libraries can be used as well, including any CDKs:
+
+```ts
+import { main, inflight } from "@wingcloud/framework";
+import { s3Bucket } from "@cdktf/provider-aws";
+
+main((root) => {
+  new s3Bucket.S3Bucket(root, "B1");
+});
+```
+
+### Platform-specific code
+
+Some resources are only available on certain platforms (clouds and provisioning systems). For example, if you import `@cdktf/provider-aws` and use `s3Bucket.S3Bucket`, you can only use it with the `tf-aws` target. To have platform-specific code, you can use the `WING_TARGET` environment variable to conditionally execute certain code:
+
+```ts
+import { main } from "@wingcloud/framework";
+import { s3Bucket } from "@cdktf/provider-aws";
+
+main((root) => {
+  if (process.env.WING_TARGET === "tf-aws") {
+    new s3Bucket.S3Bucket(root, "B1");
+  }
+});
+```
+
+More details about targets can be found [here](../02-concepts/03-platforms.md).
diff --git a/docs/docs/09-typescript/_category_.yml b/docs/docs/09-typescript/_category_.yml
new file mode 100644
index 00000000000..7e0b183fbba
--- /dev/null
+++ b/docs/docs/09-typescript/_category_.yml
@@ -0,0 +1,3 @@
+label: TypeScript
+collapsible: true
+collapsed: true
diff --git a/docs/docs/09-typescript/index.md b/docs/docs/09-typescript/index.md
new file mode 100644
index 00000000000..028a23b1a76
--- /dev/null
+++ b/docs/docs/09-typescript/index.md
@@ -0,0 +1,29 @@
+---
+title: TypeScript For Wing
+id: typescript
+---
+
+Wing's CLI has experimental support for TypeScript.
+
+We see Winglang as the ideal language to create Wing apps, but using TypeScript allows you to use many powerful features of Wing without fully diving into a new language.
+
+## Getting Started
+
+Follow the [installation guide](../01-start-here/02-installation.md) to install Wing and get started with a new project. Make sure to create a new project with the `--language ts` flag in that guide.
+
+```sh
+wing new empty --language ts
+```
+
+## Exploring the entry point
+
+Wing apps start with an entry point file, commonly named `main.ts`. This file can be anywhere, the important part is that it calls `main` from `@wingcloud/framework`:
+
+```ts
+import { main, cloud } from "@wingcloud/framework";
+
+main((root) => {
+  // your app goes here!
+  new cloud.Bucket(root, "Bucket");
+});
+```
diff --git a/docs/docs/999-faq/010-good-fit.md b/docs/docs/999-faq/010-good-fit.md
index e520f30e406..ea0c233380c 100644
--- a/docs/docs/999-faq/010-good-fit.md
+++ b/docs/docs/999-faq/010-good-fit.md
@@ -10,7 +10,7 @@ It includes an assembly of different features that serve that purpose:
 
 * [Cloud services](https://www.winglang.io/docs/faq/supported-clouds-services-and-engines/supported-services) as first-class citizens, with [phase modifiers](https://www.winglang.io/contributing/rfcs/language-spec#13-phase-modifiers) for config or runtime ([`preflight` and `inflight`](https://www.winglang.io/contributing/rfcs/2023-01-20-wingsdk-spec)).
 * Higher level of cloud abstraction with a [cloud library](https://www.winglang.io/contributing/rfcs/2023-01-20-wingsdk-spec) containing APIs that lets you write cloud portable code.
-* [Compiler plugins](https://www.winglang.io/docs/tools/compiler-plugins) that keep you in control by allowing you to customize the compilation output, such as infrastructure definitions.
+* [Custom platforms](https://www.winglang.io/docs/concepts/platforms) that keep you in control by allowing you to customize the infrastructure definitions and run policy checks.
 * Use any resource in the Terraform ecosystem as first-class citizen in your app.
 * [JavaScript interoperability](https://www.winglang.io/contributing/rfcs/language-spec#5-interoperability).
 * [Distributed computing primitives](https://www.winglang.io/docs/concepts/inflights).
diff --git a/docs/docs/999-faq/020-supported-clouds-services-and-engines/021-supported-clouds.md b/docs/docs/999-faq/020-supported-clouds-services-and-engines/021-supported-clouds.md
index 6a864af9e04..a2bbbee7a42 100644
--- a/docs/docs/999-faq/020-supported-clouds-services-and-engines/021-supported-clouds.md
+++ b/docs/docs/999-faq/020-supported-clouds-services-and-engines/021-supported-clouds.md
@@ -13,7 +13,7 @@ Since Wing is in early stages of development, the Wing SDK supports each cloud w
 * GCP - Partial support. Not all Wing code that compiles for the simulator will compile for GCP. 
 * Azure - Partial support. Not all Wing code that compiles for the simulator will compile for Azure. 
 
-We are working hard on filling the support gap between the different clouds -- check out our [roadmap](https://www.winglang.io/contributing/status) for more details. If there are other clouds you would like supported, please let us know through our GitHub or Slack!
+We are working hard on filling the support gap between the different clouds -- check out our [roadmap](https://www.winglang.io/contributing/status) for more details. If there are other clouds you would like supported, please let us know through our GitHub or Discord!
 
 Beyond the common set of cloud resources in the SDK, you can create resources for any other possible cloud by importing a [CDKTF](https://github.com/hashicorp/terraform-cdk) library corresponding to any given Terraform provider.
 
diff --git a/docs/docs/999-faq/020-supported-clouds-services-and-engines/022-supported-services.md b/docs/docs/999-faq/020-supported-clouds-services-and-engines/022-supported-services.md
index 4a9aeb1d728..caca028bcac 100644
--- a/docs/docs/999-faq/020-supported-clouds-services-and-engines/022-supported-services.md
+++ b/docs/docs/999-faq/020-supported-clouds-services-and-engines/022-supported-services.md
@@ -16,8 +16,8 @@ We are working hard on filling the support gap between the different services --
 ## Future plans
 You can also check out our [roadmap](https://www.winglang.io/contributing/status) for future plans.
 
-If there are other services you would like to see supported, please let us know through our GitHub or Slack!
+If there are other services you would like to see supported, please let us know through our GitHub or Discord!
 
 ## You can use any Terraform resource
-Beyond the built-in set of resources in the [Wing Cloud Library](../../category/cloud-library), you can use any Terraform resource by importing a [CDKTF](https://github.com/hashicorp/terraform-cdk) library corresponding to any given Terraform provider.
+Beyond the built-in set of resources in the [Wing Cloud Library](../../category/cloud), you can use any Terraform resource by importing a [CDKTF](https://github.com/hashicorp/terraform-cdk) library corresponding to any given Terraform provider.
 
diff --git a/docs/docs/banner.png b/docs/docs/banner.png
deleted file mode 100644
index 50098392530..00000000000
Binary files a/docs/docs/banner.png and /dev/null differ
diff --git a/docs/package-lock.json b/docs/package-lock.json
new file mode 100644
index 00000000000..2c53c36929a
--- /dev/null
+++ b/docs/package-lock.json
@@ -0,0 +1,113 @@
+{
+  "name": "@winglang/docs",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@winglang/docs",
+      "version": "0.0.0",
+      "devDependencies": {
+        "@types/node": "^20.14.0",
+        "tsx": "^4.11.2",
+        "typescript": "^5.4.5"
+      }
+    },
+    "../node_modules/.pnpm/tsx@4.11.2/node_modules/tsx": {
+      "version": "4.11.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.20.2",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "../node_modules/.pnpm/typescript@5.4.5/node_modules/typescript": {
+      "version": "5.4.5",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "devDependencies": {
+        "@esfx/canceltoken": "^1.0.0",
+        "@octokit/rest": "^20.0.2",
+        "@types/chai": "^4.3.11",
+        "@types/glob": "^8.1.0",
+        "@types/microsoft__typescript-etw": "^0.1.3",
+        "@types/minimist": "^1.2.5",
+        "@types/mocha": "^10.0.6",
+        "@types/ms": "^0.7.34",
+        "@types/node": "latest",
+        "@types/source-map-support": "^0.5.10",
+        "@types/which": "^3.0.3",
+        "@typescript-eslint/eslint-plugin": "^6.19.0",
+        "@typescript-eslint/parser": "^6.19.0",
+        "@typescript-eslint/utils": "^6.19.0",
+        "azure-devops-node-api": "^12.3.0",
+        "c8": "^9.1.0",
+        "chai": "^4.4.1",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "diff": "^5.1.0",
+        "dprint": "^0.45.0",
+        "esbuild": "^0.20.0",
+        "eslint": "^8.56.0",
+        "eslint-formatter-autolinkable-stylish": "^1.3.0",
+        "eslint-plugin-local": "^3.1.0",
+        "eslint-plugin-no-null": "^1.0.2",
+        "eslint-plugin-simple-import-sort": "^10.0.0",
+        "fast-xml-parser": "^4.3.3",
+        "glob": "^10.3.10",
+        "hereby": "^1.8.9",
+        "jsonc-parser": "^3.2.0",
+        "minimist": "^1.2.8",
+        "mocha": "^10.2.0",
+        "mocha-fivemat-progress-reporter": "^0.1.0",
+        "ms": "^2.1.3",
+        "node-fetch": "^3.3.2",
+        "playwright": "^1.41.0",
+        "source-map-support": "^0.5.21",
+        "tslib": "^2.6.2",
+        "typescript": "5.4.0-dev.20240119",
+        "which": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.14.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz",
+      "integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/tsx": {
+      "resolved": "../node_modules/.pnpm/tsx@4.11.2/node_modules/tsx",
+      "link": true
+    },
+    "node_modules/typescript": {
+      "resolved": "../node_modules/.pnpm/typescript@5.4.5/node_modules/typescript",
+      "link": true
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}
diff --git a/docs/package.json b/docs/package.json
new file mode 100644
index 00000000000..6a0f5406386
--- /dev/null
+++ b/docs/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@winglang/docs",
+  "version": "0.0.0",
+  "author": {
+    "name": "Wing Cloud",
+    "email": "ping@wing.cloud",
+    "organization": true
+  },
+  "scripts": {
+    "compile": "tsx src/generate_examples_files.ts"
+  },
+  "devDependencies": {
+    "@types/node": "^20.14.0",
+    "tsx": "^4.11.2",
+    "typescript": "^5.4.5"
+  }
+}
diff --git a/docs/src/generate_examples_files.ts b/docs/src/generate_examples_files.ts
new file mode 100644
index 00000000000..d1af13890e7
--- /dev/null
+++ b/docs/src/generate_examples_files.ts
@@ -0,0 +1,93 @@
+import * as fs from 'fs';
+import { join } from 'path';
+import { docsRoot, testDir } from "../../tools/hangar/src/paths";
+
+/**
+ * TODO: Support the following types of examples:
+ *  - Examples that require importing other examples
+ *  - Examples that require `wing.toml`
+ *  - TypeScript examples
+ *  - Website examples (need to generate some dummy static site config)
+ *  - Examples that should only be tested on specific target platforms
+ */
+export interface ExampleMetadata {
+  /** @default true */
+  valid: boolean;
+  name?: string; // We might be able to use this for matching dependant examples on each other
+}
+
+export interface Example {
+  code: string;
+  filePath: string;
+  exampleNumber: number;
+  metadata: ExampleMetadata;
+}
+
+const docExamplesDir = join(testDir, 'doc_examples');
+
+export function findExamples(directory: string): Example[] {
+  const items = fs.readdirSync(directory, { withFileTypes: true });
+  let examples: Example[] = [];
+  for (const item of items) {
+    const fullPath = join(directory, item.name);
+    if (item.isDirectory()) {
+      examples.push(...findExamples(fullPath)); // Recurse into subdirectories
+    } else if (item.isFile() && fullPath.endsWith('.md')) {
+      examples.push(...extractExamples(fullPath));
+    }
+  }
+  return examples;
+}
+
+export function extractExamples(filePath: string): Example[] {
+  const content = fs.readFileSync(filePath, 'utf8');
+  const exampleCodeBlocks = content.match(/```.*? example.*?\n([\s\S]*?)```/g);
+  let examples: Example[] = [];
+  if (exampleCodeBlocks) {
+    exampleCodeBlocks.forEach((block, index) => {
+      const metaDataMatch = block.match(/```.*? example(\{[^}]+\})/);
+      let metadata: ExampleMetadata | undefined = undefined;
+      try {
+        if (metaDataMatch) {
+          const metaDataString = metaDataMatch[1]
+            .replace(/([a-zA-Z0-9_]+)\s*:/g, '"$1":') // Enclose property names in double quotes
+            .replace(/'/g, '"'); // Replace single quotes with double quotes if any
+          metadata = JSON.parse(metaDataString);
+        }
+      } catch (e) {
+        console.error(`Unable to parse metadata for example #${index + 1} in ${filePath}`, e);
+      }
+      const code = block.match(/```.*?\n([\s\S]*?)```/)![1];
+      examples.push({
+        code,
+        filePath,
+        exampleNumber: index + 1,
+        metadata: {
+          valid: true,
+          ...metadata
+        }
+      });
+    });
+  }
+  return examples;
+}
+
+function generateTestsFromDocExamples(): void {
+
+  const examples = findExamples(docsRoot);
+  examples.forEach((example) => {
+    const testName = `${example.filePath.split('/').pop()}_example_${example.exampleNumber}`;
+
+    // For debug sake we add metadata as a comment to the code
+    example.code = `// Example metadata: ${JSON.stringify(example.metadata)}\n${example.code}`;
+
+    example.code = `// This file was auto generated from an example found in: ${testName}\n${example.code}`
+    const outDir = join(docExamplesDir, example.metadata?.valid ? 'valid' : 'invalid', testName);
+    fs.mkdirSync(outDir, { recursive: true });
+    fs.writeFileSync(join(outDir, 'main.w'), example.code);
+  });
+}
+
+fs.rmSync(join(docExamplesDir, "invalid"), { recursive: true, force: true });
+fs.rmSync(join(docExamplesDir, "valid"), { recursive: true, force: true });
+generateTestsFromDocExamples();
\ No newline at end of file
diff --git a/docs/turbo.json b/docs/turbo.json
new file mode 100644
index 00000000000..37f8ad2ee68
--- /dev/null
+++ b/docs/turbo.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "compile": {
+      "inputs": [
+        "./docs/**/*.md"
+      ],
+      "outputs": [
+        "../examples/tests/doc_examples/**/*.w"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/README.md b/examples/README.md
index dc843d66106..ba855a7333b 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,53 +1,5 @@
 # Wing Examples
 
-This directory contains a collection of Wing examples of the kinds of apps you can build in Wing! Check out the [Wing Contributor's Handbook](https://www.winglang.io/contributing/start-here/docs#%EF%B8%8F-how-do-i-add-an-example) for a guide on on how to add your own example.
+This directory contains Wing examples used for testing the Wing compiler and standard library.
 
-The examples in the `tests` directory are examples specifically used for testing the compiler. `tests/valid` are examples that should compile successfully, and `tests/invalid` are examples that should fail.
-
-The examples in `proposed` are examples that may not yet work in the current version of Wing, but we want to make them work in the future!
-
-## Examples
-
-_Add yours here!_
-
-### Cacheable function
-
-* **Source code:** [./proposed/cacheable-function.w](./proposed/cacheable-function.w)
-* **Description:** A Wing resource where a FaaS is augmented to cache input/output pairs using a object storage bucket.
-* **Author:** [@Chriscbr](https://github.com/Chriscbr)
-
-### In-memory search engine
-
-* **Source code:** [./proposed/in-memory-search.w](./proposed/in-memory-search.w)
-* **Description:** This is a concept for a Wing app where cloud functions are used to create a search engine where the entire search index exists in-memory, spread across many lambda functions.
-* **Author:** [@Chriscbr](https://github.com/Chriscbr)
-
-### Lock
-
-* **Source code:** [./proposed/lock.w](./proposed/lock.w)
-* **Description:** A naive distributed lock implementation. This lock uses the atomicity of `Counter` internally to guarantee that it can only be acquired by a single inflight function at a time, even if they are on different machines.
-* **Author:** [@Chriscbr](https://github.com/Chriscbr)
-
-### Counting semaphore
-
-* **Source code:** [./proposed/counting-semaphore.w](./proposed/counting-semaphore.w)
-* **Description:** A Wing resource that helps access control for a common resource in a cloud environment.
-* **Author:** [@flyingImer](https://github.com/flyingImer)
-
-### Replayable Queue
-
-* **Source code:** [./proposed/replayable-queue.w](./proposed/replayable-queue.w)
-* **Description:** A Wing Queue that saves all the messages sent to it on a bucket and allow you to replay all messages
-* **Author:** [@ekeren](https://github.com/ekeren)
-
-### Task Manager
-
-* **Source code:** [./proposed/task-manager.w](./proposed/task-manager.w)
-* **Description:** A task manager that lets you create background tasks asynchronously, and check their status at any point in time.
-* **Author:** [@Chriscbr](https://github.com/Chriscbr)
-
-### URL Shortener
-
-* **Source code:** [./proposed/url-shortener.w](./proposed/url-shortener.w)
-* **Description:** A URL shortener consisting of two API endpoints, `/create` and `/u/:id`. IDs are managed using buckets, but could be swapped with a table or other stateful storage mechanism. Requires installing `node-fetch@2` from npm.
-* **Author:** [@Chriscbr](https://github.com/Chriscbr)
+`tests/valid` has examples that should compile successfully, and `tests/invalid` has examples that should fail.
diff --git a/examples/jsii-fixture/package.json b/examples/jsii-fixture/package.json
index c21ce9657d0..82258a88cec 100644
--- a/examples/jsii-fixture/package.json
+++ b/examples/jsii-fixture/package.json
@@ -6,9 +6,7 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "compile": "jsii -vvv",
-    "build:watch": "jsii -w",
-    "package": "jsii-pacmak -vvv",
-    "test": "echo 'No tests here...'"
+    "build:watch": "jsii -w"
   },
   "jsii": {
     "outdir": "dist",
@@ -32,9 +30,7 @@
   "private": true,
   "homepage": "https://github.com/winglang/wing",
   "devDependencies": {
-    "jsii": "^1.70.0",
-    "jsii-pacmak": "^1.70.0",
-    "jsii-release": "^0.2.519"
+    "jsii": "~5.3.11"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/examples/jsii-fixture/src/index.ts b/examples/jsii-fixture/src/index.ts
index e48df4c6e32..c93df7d15f8 100644
--- a/examples/jsii-fixture/src/index.ts
+++ b/examples/jsii-fixture/src/index.ts
@@ -1,3 +1,12 @@
+export class ClassWithInnerType {}
+
+export namespace ClassWithInnerType {
+  /** This type cannot be referenced in wing (yet) */
+  export interface InnerStruct {
+    readonly field: string;
+  }
+}
+
 export class JsiiClass {
   /** @internal */
   _field: number;
@@ -14,7 +23,45 @@ export class JsiiClass {
     return `Got ${arg}`;
   }
 
+  public applyClosure(num: number, closure: IFakeClosure): number {
+    return closure(num);
+  }
+
   protected protectedMethod(arg: string) {
     return `Got ${arg}`;
   }
+
+  public static staticMethod(arg: string) {
+    return `Got ${arg}`;
+  }
+
+  public methodWithStructParam(s: ClassWithInnerType.InnerStruct): string {
+    return s.field;
+  }
+}
+
+export class JsiiClassWithPrivateConstructor {
+  private constructor() {}
+
+  public static makeInstance(): JsiiClassWithPrivateConstructor {
+    return new JsiiClassWithPrivateConstructor();
+  }
+}
+
+/**
+ * @callable
+ */
+export interface IFakeClosure {
+  /** @internal */
+  (x: number): number;
+
+  fn(x: number): number;
+}
+
+export interface SomeStruct {
+  readonly field: string;
+}
+
+export interface ISomeInterface {
+  method(): void;
 }
diff --git a/examples/proposed/cacheable-function.w b/examples/proposed/cacheable-function.w
deleted file mode 100644
index 144b97b860c..00000000000
--- a/examples/proposed/cacheable-function.w
+++ /dev/null
@@ -1,29 +0,0 @@
-bring cloud;
-
-class CachableFunction extends cloud.Function {
-    _func: cloud.Function;
-    _cache: cloud.Bucket;
-
-    new(inflight: inflight (event: any) => any, props: cloud.FunctionProps) {
-        super(inflight, props);
-        this._cache = new cloud.Bucket();
-    }
-
-    pub inflight invoke(event: any): any {
-        let key = hashof(event);
-        let cached = this._cache.try_get(key);
-        if cached {
-            return cached;
-        }
-        let result = super.invoke(event);
-        this._cache.set(key, result);
-        return result;
-    }
-}
-
-let handler = inflight (arg1: num): num => {
-    // do expensive computations
-    return arg1 * 2;
-};
-
-let cachedHandler = new CachableFunction(handler);
diff --git a/examples/proposed/counting-semaphore.w b/examples/proposed/counting-semaphore.w
deleted file mode 100644
index d88068f288c..00000000000
--- a/examples/proposed/counting-semaphore.w
+++ /dev/null
@@ -1,76 +0,0 @@
-bring cloud;
-
-struct CountingSemaphoreProps {
-  availableResources: num;
-}
-
-class CountingSemaphore {
-  pub limit: num;
-  _counter: cloud.Counter;
-
-  // need some ttl solution here,
-  // probably in-house once replaced with a key-value store
-  new(props: CountingSemaphoreProps) {
-    // pseudocode: input validation
-    this.limit = props.availableResources;
-    this._counter = new cloud.Counter();
-  }
-
-  // some stable unique instance id is wanted in the inflight context
-  // so that a resource instance can be properly claimed and later released
-  // when used in conjunction with a key-value store
-  pub inflight try_acquire(): bool {
-    if this.is_at_capacity() {
-      return false;
-    }
-
-    let post_acquired_capacity = this._counter.inc();
-    if post_acquired_capacity <= this.limit {
-      return true;
-    }
-    this.release();
-    return false;
-  }
-
-  // probably key-value store is wanted,
-  // so that a specific resource instance can be released
-  // rather than naively releasing a count
-  pub inflight release() {
-    if this._counter.peek() <= 0 {
-      return;
-    }
-
-    this._counter.dec();
-  }
-
-  pub inflight is_at_capacity(): bool {
-    return this._counter.peek() >= this.limit;
-  }
-}
-
-let resource_1 = new CountingSemaphore({ availableResources: 2 });
-let resource_2 = new CountingSemaphore({ availableResources: 3 });
-
-let queue = new cloud.Queue();
-/**
- * An example handler to work with two shared resources.
- */
-queue.add_consumer(inflight (message: str) => {
-  let is_resource_1_acquired = resource_1.try_acquire();
-  if !is_resource_1_acquired {
-    // brutally error out to re-enqueue
-    throw "Failed to acquire resource 1";
-  }
-  let is_resource_2_acquired = resource_2.try_acquire();
-  if !is_resource_2_acquired {
-    resource_1.release();
-    // brutally error out to re-enqueue
-    throw "Failed to acquire resource 2";
-  }
-
-  // real work
-  log("all resources are acquired, processing message: {message}");
-
-  resource_1.release();
-  resource_2.release();
-});
diff --git a/examples/proposed/in-memory-search.w b/examples/proposed/in-memory-search.w
deleted file mode 100644
index 92020c6ead3..00000000000
--- a/examples/proposed/in-memory-search.w
+++ /dev/null
@@ -1,81 +0,0 @@
-bring cloud;
-
-// high level concept:
-// generate a large search index at compile time, and spread the search index
-// data (and the work of processing through it) across N cloud functions.
-// when a request to the search engine is made, all N cloud functions are
-// called, and their results are joined.
-//
-// inspiration: https://boyter.org/posts/abusing-aws-to-make-a-search-engine/
-
-let search_index_1: Map<Array<str>> = {
-  "apple": ["fruits.com"],
-  "banana": ["fruits.com", "dole.com"],
-};
-let search_index_2: Map<Array<str>> = {
-  "cherry": ["fruits.com"],
-  "donut": ["krispykreme.com", "bakery.com"],
-};
-let search_index_3: Map<Array<str>> = {
-  "eclair": ["bakery.com"],
-  "fruit": ["fruits.com"],
-};
-
-let search_index_chunks = [
-  search_index_1,
-  search_index_2,
-  search_index_3,
-  // ...
-];
-
-struct WebsiteSummary {
-  url: str;
-  title: str;
-  description: str;
-}
-
-let lookup_website = inflight (url: str): WebsiteSummary => {
-  // pseudocode:
-  // - fetch url
-  // - extract title from <title> tag
-  // - extract description from <meta name="description"> tag
-};
-
-let make_worker = (chunk: Map<Array<str>>): cloud.Function => {
-  return new cloud.Function(inflight (terms: Array<str>): Array<str> => {
-    let website_urls = new MutSet<str>();
-    for term in terms {
-      if chunk.has(term) {
-        for url in chunk[term] {
-          website_urls.add(url);
-        }
-      }
-    }
-    return website_urls.to_arr(); // converts MutSet<str> to Array<str>
-  });
-};
-
-let workers = search_index_chunks.map(search_index_chunks); // inferred: Array<cloud.Function>
-
-let api = new cloud.Api();
-api.on_post("/search", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
-  let terms_str = request.query_params.get("terms"); // "cherry,donut"
-  let terms = terms_str.split(",");
-  let worker_calls = new MutArray<Promise<Array<str>>>();
-  for worker in workers {
-    worker_calls.append(defer worker.invoke(terms));
-  }
-
-  // wait for all promises in the array to resolve
-  // `worker_results` is inferred as Array<Array<str>>
-  let worker_results = Promise.all(worker_calls);
-  let website_urls = new Set<str>(worker_results.flatten());
-  let summaries = new MutArray<WebsiteSummary>();
-  for url in website_urls {
-    summaries.append(lookup_website(url));
-  }
-  return {
-    status_code: 200,
-    payload: summaries.to_json(),
-  };
-});
diff --git a/examples/proposed/lock.w b/examples/proposed/lock.w
deleted file mode 100644
index c74ceb29a6c..00000000000
--- a/examples/proposed/lock.w
+++ /dev/null
@@ -1,83 +0,0 @@
-bring cloud;
-
-/**
- * A lock that can only be acquired by one inflight at a time.
- *
- * Internally, this uses a cloud.Counter to keep track of a number.
- * If the number is 0, the lock is free. If the number is 1, the lock
- * is acquired.
- *
- * This is a very simple lock, and it has a number of limitations:
-  * - It is not reentrant. If a single inflight tries to acquire the lock
-  *   twice, it may block forever.
-  * - It is not fair. If multiple inflights are waiting to acquire the lock,
-  *   there is no guarantee that they will acquire the lock in the order
-  *   that they requested it.
-  * - It is not stable. If an inflight crashes while holding the lock, the
-  *   lock will be permanently stuck in the acquired state.
- */
-resource Lock {
-  counter: cloud.Counter;
-  new() {
-    this.counter = new cloud.Counter();
-  }
-
-  pub inflight var is_locked: bool;
-
-  inflight new() {
-    this.is_locked = false;
-  }
-
-  /**
-   * Try to acquire the lock. If the lock is already acquired, return false.
-   * Otherwise, return true.
-   */
-  inflight try_lock(): bool {
-    // If the lock is already acquired by the current inflight, throw an error.
-    if this.is_locked {
-      throw "Lock is already acquired by this inflight";
-    }
-
-    // The lock is already acquired by another inflight - too bad. :(
-    if this.counter.peek() > 0 {
-      return false;
-    }
-
-    let value = this.counter.inc();
-    if value == 1 {
-      // We successfully acquired the lock.
-      this.is_locked = true;
-      return true;
-    } else {
-      // Someone else acquired the lock between the time we checked and
-      // the time we tried to acquire it. Undo our increment.
-      this.counter.dec();
-      return false;
-    }
-  }
-
-  /**
-   * Acquire the lock. If the lock is already acquired by another inflight,
-   * block until it is released.
-   */
-  inflight lock() {
-    // If the lock is already acquired by the current inflight, throw an error.
-    if this.is_locked {
-      throw "Lock is already acquired by this inflight";
-    }
-
-    while !this.try_lock() {
-      cloud.sleep(1);
-    }
-  }
-
-  /**
-   * Release the lock. If the lock is not held by this inflight, this is a no-op.
-   */
-  inflight unlock() {
-    if !this.is_locked {
-      return;
-    }
-    this.counter.dec();
-  }
-}
diff --git a/examples/proposed/replayable-queue.w b/examples/proposed/replayable-queue.w
deleted file mode 100644
index 06affb6f723..00000000000
--- a/examples/proposed/replayable-queue.w
+++ /dev/null
@@ -1,59 +0,0 @@
-bring cloud;
-
-/** 
- * A queue that can replay all messages 
- */
-class ReplayableQueue {
-  queue: cloud.Queue;
-  bucket: cloud.Bucket; 
-  counter: cloud.Counter;
-  
-  new() {
-    this.queue = new cloud.Queue();
-    this.bucket = new cloud.Bucket();
-    this.counter = new cloud.Counter();
-  }
-
-  setConsumer(fn: inflight (str): str){
-    this.queue.setConsumer(fn);
-  }
-  
-  inflight push(m: str) {
-    this.queue.push(m);
-    this.bucket.put("messages/{this.counter.inc()}", m);
-  }
-  
-  inflight replay(){
-    for i in this.bucket.list() {
-      this.queue.push(this.bucket.get(i));
-    }
-  }
-}
-
-
-// how to use the queue
-class RemoteControl { 
-  new(q: ReplayableQueue){
-    let f = inflight (m: str): str => {
-      log("setConsumer got triggered with {m}");
-    };
-      
-    q.setConsumer(f);
-    
-    new cloud.Function(inflight (m: str) => {
-      q.push(m);
-    }) as "push";
-        
-    new cloud.Function(inflight () => {
-      q.replay();
-    }) as "replay";
-  }
-}
-
-let q = new ReplayableQueue();
-new RemoteControl(q);
-
-// Exercises for the curious reader:
-// - Add some time retention for keeping messages
-// - Add some max messages to keep property
-// - Make sure that messages are replayed in order (currenlty it relies on the bucket.list() order) 
diff --git a/examples/proposed/task-manager.w b/examples/proposed/task-manager.w
deleted file mode 100644
index f5a37846d66..00000000000
--- a/examples/proposed/task-manager.w
+++ /dev/null
@@ -1,108 +0,0 @@
-bring cloud;
-
-resource Utils {
-  extern "./helpers.js" static inflight uuid(): str;
-  extern "./helpers.js" static inflight sleep(ms: num): void;
-}
-
-/**
- * A resource that allows you to run background tasks asynchronously,
- * and check their status at any point in time.
- *
- * The function of the background task must be passed to the
- * constructor so that its code and permissions can be deployed to
- * the cloud when the TaskManager is created.
- */
-resource TaskManager {
-  fn: cloud.Function;
-  state: cloud.Bucket;
-
-  new(handler: inflight (str): void) {
-    this.bucket = new cloud.Bucket();
-
-    let wrapper = inflight (id: str, input: str) => {
-      try {
-        let result = handler.invoke(input);
-        this.bucket.put("{id}/status", "done");
-        this.bucket.put("{id}/result", result);
-      } catch e {
-        this.bucket.put("{id}/status", "failed");
-        this.bucket.put("{id}/result", e);
-      }
-    };
-
-    this.fn = new cloud.Function(wrapper);
-  }
-
-  /**
-   * Starts a background task with the given input, and returns an id
-   * that can be used to check the status of the task.
-   */
-  inflight start(input: str) {
-    let id = Utils.uuid();
-    this.fn.invoke_async(id, input);
-    this.bucket.put("{id}/status", "pending");
-  }
-
-  /**
-   * Returns the status of the background task with the given id.
-   * If the task is still running, this will return "pending".
-   * If the task has completed, this will return "done".
-   * If the task has failed, this will return "failed".
-   */
-  inflight check(id: str): str {
-    try {
-      return this.bucket.get("{id}/status");
-    } catch e {
-      throw "no such key: {id}";
-    }
-  }
-
-  /**
-   * Returns the result of the background task with the given id.
-   */
-  inflight get_result(id: str): str {
-    try {
-      return this.bucket.get("{id}/result");
-    } catch e {
-      throw "no such id: {id}";
-    }
-  }
-
-  /**
-   * Returns a list of all running tasks.
-   */
-  inflight list_running_tasks(): Array<str> {
-    let keys = this.bucket.list();
-    let running = MutArray<str>[];
-    for key in keys {
-      if key.ends_with("/status") && this.bucket.get(key) == "pending" {
-        running.push(id.split("/")[0]);
-      }
-    }
-    return running.copy();
-  }
-}
-
-let import_contacts = new TaskManager(inflight (input: str) => {
-  // pretend to do some work
-  Utils.sleep(5s);
-  log(input);
-});
-
-// Tests
-
-test "import_contacts_work" {
-  let key = import_contacts.start("hello");
-  Utils.sleep(1s);
-  assert(import_contacts.check(key) == "pending");
-  Utils.sleep(5s);
-  assert(import_contacts.check(key) == "done");
-  assert(import_contacts.get_result(key) == "hello");
-}
-
-// Exercises for the curious reader:
-// - Add a timeout to the background task.
-// - Add a way to cancel a background task.
-// - Add a way to configure the number of retries.
-// - Return a Task object from start() that can be used to check the status of the task.
diff --git a/examples/proposed/url-shortener.main.w b/examples/proposed/url-shortener.main.w
deleted file mode 100644
index 0ce3ccfb22e..00000000000
--- a/examples/proposed/url-shortener.main.w
+++ /dev/null
@@ -1,127 +0,0 @@
-bring cloud;
-bring math;
-bring http;
-
-class UrlShortener {
-  lookup: cloud.Bucket;
-
-  new() {
-    // map from ids to urls
-    this.lookup = new cloud.Bucket() as "IdLookup";
-  }
-
-  // Generates a short id for the given url.
-  pub inflight getId(url: str): str {
-    let id = this._makeId();
-    this.lookup.put(id, url);
-    return id;
-  }
-
-  // Get the url for the given id. Returns nil if the id is invalid.
-  pub inflight getUrl(id: str): str? {
-    return this.lookup.tryGet(id);
-  }
-
-  inflight _makeId(): str {
-    let ALPHANUMERIC_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    let var id = "";
-    for i in 0..5 {
-      let randomIndex = math.floor(math.random() * ALPHANUMERIC_CHARS.length);
-      id = id + ALPHANUMERIC_CHARS.at(randomIndex);
-    }
-    return id;
-  }
-}
-
-class UrlShortenerApi {
-  pub api: cloud.Api;
-  shortener: UrlShortener;
-
-  new(shortener: UrlShortener) {
-    this.shortener = shortener;
-    this.api = new cloud.Api();
-
-    this.api.post("/create", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
-      let var requestUrl = "";
-      try {
-        requestUrl = str.fromJson(Json.parse(req.body).get("url"));
-      } catch e {
-        log(e);
-        return cloud.ApiResponse {
-          status: 400,
-          body: Json.stringify(Json {
-            "error": "missing url field",
-          }),
-        };
-      }
-      log("Generating shortened URL for {requestUrl}");
-
-      let id = this.shortener.getId(requestUrl);
-
-      // return the shortened url
-      let shortenedUrl = "{this.api.url}/u/\{id}";
-      log("Shortened URL: {shortenedUrl}");
-      return cloud.ApiResponse {
-        status: 200,
-        body: Json.stringify(Json {
-          "shortenedUrl": shortenedUrl,
-        }),
-      };
-    });
-
-    this.api.get("/u/\{id}", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
-      let id = req.vars.get("id");
-      let fullUrl = this.shortener.getUrl(id);
-
-      if let fullUrl = fullUrl {
-        return cloud.ApiResponse {
-          status: 302,
-          headers: Map<str>{
-            "Content-Type" => "text/xml",
-            "Location" => fullUrl
-          }
-        };
-      } else {
-        return cloud.ApiResponse {
-          status: 404,
-          body: Json.stringify(Json {
-            "error": "url not found",
-          }),
-        };
-      }
-    });
-  }
-}
-
-let urlShortener = new UrlShortener();
-let urlShortenerApi = new UrlShortenerApi(urlShortener);
-
-// --- tests ---
-
-let TEST_URL = "https://news.ycombinator.com/";
-
-test "shorten url" {
-  let response = http.post("{urlShortenerApi.api.url}/create", body: Json.stringify({ url: TEST_URL }));
-  let newUrl = str.fromJson(Json.parse(response.body).get("shortenedUrl"));
-  assert(newUrl.startsWith(urlShortenerApi.api.url));
-}
-
-test "shorten same url twice" {
-  let response1 = http.post("{urlShortenerApi.api.url}/create", body: Json.stringify({ url: TEST_URL }));
-  let newUrl1 = Json.parse(response1.body).get("shortenedUrl").asStr();
-  let response2 = http.post("{urlShortenerApi.api.url}/create", body: Json.stringify({ url: TEST_URL }));
-  let newUrl2 = Json.parse(response2.body).get("shortenedUrl").asStr();
-  assert(newUrl1 != newUrl2);
-}
-
-test "redirect sends to correct page" {
-  let createResponse = http.post("{urlShortenerApi.api.url}/create", body: Json.stringify({ url: TEST_URL }));
-  let newUrl = Json.parse(createResponse.body).get("shortenedUrl").asStr();
-  let redirectedResponse = http.get(newUrl);
-  assert(redirectedResponse.body.contains("<title>Hacker News</title>"));
-}
-
-test "invalid short url" {
-  let response = http.get("{urlShortenerApi.api.url}/u/invalid");
-  assert(response.body.contains("url not found"));
-}
diff --git a/examples/tests/doc_examples/.gitattributes b/examples/tests/doc_examples/.gitattributes
new file mode 100644
index 00000000000..47a8c155a40
--- /dev/null
+++ b/examples/tests/doc_examples/.gitattributes
@@ -0,0 +1 @@
+*.w linguist-generated
\ No newline at end of file
diff --git a/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_12/main.w b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_12/main.w
new file mode 100644
index 00000000000..a97d34980bd
--- /dev/null
+++ b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_12/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_12
+// Example metadata: {"valid":false}
+let var count = 3;
+let names = MutArray<str>["John", "Jane", "Joe"];
+
+count = count + 1; // OK
+names.push("Jack"); // OK
+
+inflight () => {
+  count = count + 1; // error: Variable cannot be reassigned from inflight
+  names.push("Jill"); // error: push doesn't exist in Array
+};
diff --git a/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_15/main.w b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_15/main.w
new file mode 100644
index 00000000000..7a555bd62fd
--- /dev/null
+++ b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_15/main.w
@@ -0,0 +1,13 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_15
+// Example metadata: {"valid":false}
+bring cloud;
+let main_bucket = new cloud.Bucket() as "main";
+let secondary_bucket = new cloud.Bucket() as "backup";
+let use_main = true;
+new cloud.Function(inflight () => {
+  let var b = main_bucket;
+  if !use_main {
+    b = secondary_bucket;
+  }
+  b.put("key", "value"); // Error: the compiler doesn't know the possible values for `b` and therefore can't qualify the lift.
+});
diff --git a/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_7/main.w b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_7/main.w
new file mode 100644
index 00000000000..2ba226aaf82
--- /dev/null
+++ b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_7/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_7
+// Example metadata: {"valid":false}
+bring cloud;
+
+let bucket = new cloud.Bucket();
+
+let saveCalculation = inflight () => {
+  bucket.addObject("file1", "{2 ** 10}"); // error: Cannot call into preflight phase while inflight
+};
diff --git a/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_8/main.w b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_8/main.w
new file mode 100644
index 00000000000..7bf74636ade
--- /dev/null
+++ b/examples/tests/doc_examples/invalid/01-preflight-and-inflight.md_example_8/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_8
+// Example metadata: {"valid":false}
+bring cloud;
+
+inflight () => {
+  new cloud.Bucket(); // error: Cannot create preflight class "Bucket" in inflight phase
+};
diff --git a/examples/tests/doc_examples/invalid/01-variable-declaration.md_example_1/main.w b/examples/tests/doc_examples/invalid/01-variable-declaration.md_example_1/main.w
new file mode 100644
index 00000000000..fe1bf28f255
--- /dev/null
+++ b/examples/tests/doc_examples/invalid/01-variable-declaration.md_example_1/main.w
@@ -0,0 +1,4 @@
+// This file was auto generated from an example found in: 01-variable-declaration.md_example_1
+// Example metadata: {"valid":false}
+let x = 12;
+x = 77; // error: Variable is not reassignable
diff --git a/examples/tests/doc_examples/invalid/01-variable-declaration.md_example_4/main.w b/examples/tests/doc_examples/invalid/01-variable-declaration.md_example_4/main.w
new file mode 100644
index 00000000000..1894434fd78
--- /dev/null
+++ b/examples/tests/doc_examples/invalid/01-variable-declaration.md_example_4/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: 01-variable-declaration.md_example_4
+// Example metadata: {"valid":false}
+let var x1 = "Hello"; // type str, value "Hello"
+let var x2: str = "Hello"; // same as above 
+let var x3: str? = "Hello"; // type str? (optional), value "Hello"
+let var x4: str? = nil; // type str? (optional), value nil
+
+x1 = nil; // ERROR: Expected type to be "str", but got "nil" instead
+x3 = nil; // OK (x3 is optional)
diff --git a/examples/tests/doc_examples/invalid/04-tests.md_example_5/main.w b/examples/tests/doc_examples/invalid/04-tests.md_example_5/main.w
new file mode 100644
index 00000000000..b0da4713678
--- /dev/null
+++ b/examples/tests/doc_examples/invalid/04-tests.md_example_5/main.w
@@ -0,0 +1,21 @@
+// This file was auto generated from an example found in: 04-tests.md_example_5
+// Example metadata: {"valid":false}
+// example.w
+bring cloud;
+
+let b = new cloud.Bucket();
+
+test "bucket list should include created file" {
+  b.put("file", "lorem ipsum");
+  let listOfFile = b.list();
+  assert(listOfFile.length == 1);
+}
+
+test "bucket starts empty" {
+  let listOfFile = b.list();
+  assert(listOfFile.length == 0);
+}
+
+test "this test should fail" {
+  throw("test throws an exception fails");
+}
diff --git a/examples/tests/doc_examples/package.json b/examples/tests/doc_examples/package.json
new file mode 100644
index 00000000000..de3b80ab5fd
--- /dev/null
+++ b/examples/tests/doc_examples/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "examples-docs",
+  "volta": {
+    "extends": "../../../package.json"
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/doc_examples/turbo.json b/examples/tests/doc_examples/turbo.json
new file mode 100644
index 00000000000..af4cba7052e
--- /dev/null
+++ b/examples/tests/doc_examples/turbo.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "topo": {}
+  }
+}
diff --git a/examples/tests/doc_examples/valid/00-cloud-oriented-programming.md_example_1/main.w b/examples/tests/doc_examples/valid/00-cloud-oriented-programming.md_example_1/main.w
new file mode 100644
index 00000000000..85addff0931
--- /dev/null
+++ b/examples/tests/doc_examples/valid/00-cloud-oriented-programming.md_example_1/main.w
@@ -0,0 +1,13 @@
+// This file was auto generated from an example found in: 00-cloud-oriented-programming.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let queue = new cloud.Queue(timeout: 2m);
+let bucket = new cloud.Bucket();
+let counter = new cloud.Counter(initial: 100);
+
+queue.setConsumer(inflight (body: str) => {
+  let next = counter.inc();
+  let key = "myfile-{next}.txt";
+  bucket.put(key, body);
+});
diff --git a/examples/tests/doc_examples/valid/01-cli.md_example_1/main.w b/examples/tests/doc_examples/valid/01-cli.md_example_1/main.w
new file mode 100644
index 00000000000..73653995db7
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-cli.md_example_1/main.w
@@ -0,0 +1,16 @@
+// This file was auto generated from an example found in: 01-cli.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let b = new cloud.Bucket();
+
+test "put" {
+  assert(b.list().length == 0);
+  b.put("hello.txt", "world");
+  assert(b.list().length == 1);
+}
+
+test "get" {
+  b.put("hello.txt", "world");
+  assert(b.get("hello.txt") == "world");
+}
diff --git a/examples/tests/doc_examples/valid/01-cli.md_example_2/main.w b/examples/tests/doc_examples/valid/01-cli.md_example_2/main.w
new file mode 100644
index 00000000000..fe6d5da8e1a
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-cli.md_example_2/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 01-cli.md_example_2
+// Example metadata: {"valid":true}
+// main.w
+bring cloud;
+
+let secret = new cloud.Secret(name: "slack-token");
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_1/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_1/main.w
new file mode 100644
index 00000000000..ada40bf07a0
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_1/main.w
@@ -0,0 +1,5 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket = new cloud.Bucket();
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_10/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_10/main.w
new file mode 100644
index 00000000000..f6748316a40
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_10/main.w
@@ -0,0 +1,20 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_10
+// Example metadata: {"valid":true}
+inflight () => {
+  class Person {
+    name: str;
+    age: num;
+
+    new(name: str, age: num) {
+      this.name = name;
+      this.age = age;
+    }
+
+    pub inflight greet() {
+      log("Hello, {this.name}!");
+    }
+  }
+
+  let p = new Person("John", 30);
+  p.greet();
+};
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_11/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_11/main.w
new file mode 100644
index 00000000000..c8b4f4a6231
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_11/main.w
@@ -0,0 +1,20 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_11
+// Example metadata: {"valid":true}
+bring cloud;
+bring http;
+
+let api = new cloud.Api();
+api.get("/test", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  return cloud.ApiResponse {
+    status: 200,
+    body: "success!"
+  };
+});
+
+let checkEndpoint = inflight () => {
+  let url = api.url; // this is OK
+  let path = "{url}/test";
+  let response = http.get(path);
+  assert(response.status == 200);
+};
+new cloud.Function(checkEndpoint);
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_13/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_13/main.w
new file mode 100644
index 00000000000..c54983d5f1c
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_13/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_13
+// Example metadata: {"valid":true}
+let preflight_str = "hello from preflight"; 
+inflight () => {
+  log(preflight_str); // `preflight_str` is "lifted" into inflight.
+};
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_14/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_14/main.w
new file mode 100644
index 00000000000..6472626c36a
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_14/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_14
+// Example metadata: {"valid":true}
+bring cloud;
+let bucket = new cloud.Bucket();
+new cloud.Function(inflight () => {
+  bucket.put("key", "value"); // `bucket` is lifted and `put` is being used on it
+});
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_2/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_2/main.w
new file mode 100644
index 00000000000..410ff2fe396
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_2/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket = new cloud.Bucket(public: true);
+bucket.addObject("file1.txt", "Hello world!");
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_3/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_3/main.w
new file mode 100644
index 00000000000..22689d607f8
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_3/main.w
@@ -0,0 +1,4 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_3
+// Example metadata: {"valid":true}
+// hello.w
+log("7 * 6 = {7 * 6}");
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_4/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_4/main.w
new file mode 100644
index 00000000000..b3179c0324e
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_4/main.w
@@ -0,0 +1,5 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_4
+// Example metadata: {"valid":true}
+let greeting = inflight () => {
+  log("Hello from the cloud!");
+};
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_5/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_5/main.w
new file mode 100644
index 00000000000..671ae114db2
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_5/main.w
@@ -0,0 +1,10 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_5
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket = new cloud.Bucket();
+
+let firstObject = inflight (): str => {
+  let items = bucket.list();
+  return items.at(0);
+};
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_6/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_6/main.w
new file mode 100644
index 00000000000..e9805dd41d2
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_6/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_6
+// Example metadata: {"valid":true}
+bring cloud;
+
+let func = new cloud.Function(inflight () => {
+  log("Hello from the cloud!");
+});
diff --git a/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_9/main.w b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_9/main.w
new file mode 100644
index 00000000000..e175ec58fae
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-preflight-and-inflight.md_example_9/main.w
@@ -0,0 +1,32 @@
+// This file was auto generated from an example found in: 01-preflight-and-inflight.md_example_9
+// Example metadata: {"valid":true}
+bring cloud;
+
+class ReplayableQueue {
+  queue: cloud.Queue;
+  bucket: cloud.Bucket; 
+  counter: cloud.Counter;
+  
+  new() {
+    this.queue = new cloud.Queue();
+    this.bucket = new cloud.Bucket();
+    this.counter = new cloud.Counter();
+  }
+
+  setConsumer(fn: inflight (str): str){
+    this.queue.setConsumer(fn);
+  }
+  
+  inflight push(m: str) {
+    this.queue.push(m);
+    this.bucket.put("messages/{this.counter.inc()}", m);
+  }
+  
+  inflight replay(){
+    for i in this.bucket.list() {
+      this.queue.push(this.bucket.get(i));
+    }
+  }
+}
+
+let rq = new ReplayableQueue();
diff --git a/examples/tests/doc_examples/valid/01-variable-declaration.md_example_2/main.w b/examples/tests/doc_examples/valid/01-variable-declaration.md_example_2/main.w
new file mode 100644
index 00000000000..3ea48d09629
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-variable-declaration.md_example_2/main.w
@@ -0,0 +1,4 @@
+// This file was auto generated from an example found in: 01-variable-declaration.md_example_2
+// Example metadata: {"valid":true}
+let var y = "hello";
+y = "world"; // OK (y is reassignable)
diff --git a/examples/tests/doc_examples/valid/01-variable-declaration.md_example_3/main.w b/examples/tests/doc_examples/valid/01-variable-declaration.md_example_3/main.w
new file mode 100644
index 00000000000..d9ef2be947c
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-variable-declaration.md_example_3/main.w
@@ -0,0 +1,4 @@
+// This file was auto generated from an example found in: 01-variable-declaration.md_example_3
+// Example metadata: {"valid":true}
+let x1 = 12; 
+let x2: num = 12; // equivalent 
diff --git a/examples/tests/doc_examples/valid/01-variable-declaration.md_example_5/main.w b/examples/tests/doc_examples/valid/01-variable-declaration.md_example_5/main.w
new file mode 100644
index 00000000000..7b3968d7f14
--- /dev/null
+++ b/examples/tests/doc_examples/valid/01-variable-declaration.md_example_5/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: 01-variable-declaration.md_example_5
+// Example metadata: {"valid":true}
+let s = "parent";
+log(s); // prints parent
+if true {
+  let s = "inner";
+  log(s); // prints inner
+}
+log(s); // prints parent
diff --git a/examples/tests/doc_examples/valid/02-application-tree.md_example_1/main.w b/examples/tests/doc_examples/valid/02-application-tree.md_example_1/main.w
new file mode 100644
index 00000000000..49e0dcd93c0
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-application-tree.md_example_1/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 02-application-tree.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket1 = new cloud.Bucket(); // default name is "cloud.Bucket"
+let bucket2 = new cloud.Bucket() as "my-bucket";
diff --git a/examples/tests/doc_examples/valid/02-application-tree.md_example_2/main.w b/examples/tests/doc_examples/valid/02-application-tree.md_example_2/main.w
new file mode 100644
index 00000000000..8b263f3c448
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-application-tree.md_example_2/main.w
@@ -0,0 +1,19 @@
+// This file was auto generated from an example found in: 02-application-tree.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+class Group1 {
+  new() {
+    new cloud.Bucket() as "Store";
+  }
+}
+
+class Group2 {
+  new() {
+    new cloud.Bucket() as "Store";
+  }
+}
+
+// The following is valid
+new Group1();
+new Group2();
diff --git a/examples/tests/doc_examples/valid/02-application-tree.md_example_3/main.w b/examples/tests/doc_examples/valid/02-application-tree.md_example_3/main.w
new file mode 100644
index 00000000000..717c1b89ae6
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-application-tree.md_example_3/main.w
@@ -0,0 +1,22 @@
+// This file was auto generated from an example found in: 02-application-tree.md_example_3
+// Example metadata: {"valid":true}
+class ThumbnailBucket {
+  //...
+}
+
+class ImageStorage {
+  new() {
+    new ThumbnailBucket(); // This ThumbnailBucket will be a child of a ImageStorage instance in the construct tree
+  }
+}
+
+new ImageStorage(); // This ImageStorage will be a child of the root in the construct tree
+new ThumbnailBucket(); // This Counter will be a child of of the root in the construct tree
+
+// Here's a tree view of the generated infrastructure:
+//
+//              root
+//               /\
+//   ImageStorage  ThumbnailBucket
+//    /
+//  ThumbnailBucket
diff --git a/examples/tests/doc_examples/valid/02-application-tree.md_example_4/main.w b/examples/tests/doc_examples/valid/02-application-tree.md_example_4/main.w
new file mode 100644
index 00000000000..9be060e9cc3
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-application-tree.md_example_4/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 02-application-tree.md_example_4
+// Example metadata: {"valid":true}
+bring cloud;
+
+let b = new cloud.Bucket();
+log(nodeof(b).path); // Will log something like "/root/Bucket"
diff --git a/examples/tests/doc_examples/valid/02-application-tree.md_example_5/main.w b/examples/tests/doc_examples/valid/02-application-tree.md_example_5/main.w
new file mode 100644
index 00000000000..6b98f40a0cf
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-application-tree.md_example_5/main.w
@@ -0,0 +1,22 @@
+// This file was auto generated from an example found in: 02-application-tree.md_example_5
+// Example metadata: {"valid":true}
+class ThumbnailBucket {
+  //...
+}
+
+class ImageStorage {
+  new() {
+    new ThumbnailBucket(); // This ThumbnailBucket will be a child of a ImageStorage instance in the construct tree
+  }
+}
+
+let imageStorage = new ImageStorage(); // This goes in root
+let defaultThumbnails = new ThumbnailBucket() as "defaultThumbs" in imageStorage; // This is explicitly named "defaultThumbs" and explicitly placed inside imageStorage
+
+// Here's a tree view of the generated infrastructure:
+//
+//                   root
+//                  /
+//            ImageStorage  
+//             /       \
+//  ThumbnailBucket    defaultsThumbs
diff --git a/examples/tests/doc_examples/valid/02-application-tree.md_example_6/main.w b/examples/tests/doc_examples/valid/02-application-tree.md_example_6/main.w
new file mode 100644
index 00000000000..56895e2c3ee
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-application-tree.md_example_6/main.w
@@ -0,0 +1,23 @@
+// This file was auto generated from an example found in: 02-application-tree.md_example_6
+// Example metadata: {"valid":true}
+bring cloud;
+
+class Factory {
+  pub static make() {
+    new cloud.Bucket(); // We're in a static, so we don't know where to place this bucket
+  }
+}
+
+class MyBucket {
+  new() {
+    Factory.make(); // Bucket will be placed inside `this` instance of `MyBucket`
+  }
+}
+new MyBucket();
+
+// tree:
+//          root
+//           /
+//       MyBucket
+//         /
+//      Bucket
diff --git a/examples/tests/doc_examples/valid/02-application-tree.md_example_7/main.w b/examples/tests/doc_examples/valid/02-application-tree.md_example_7/main.w
new file mode 100644
index 00000000000..c7e0b6047e7
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-application-tree.md_example_7/main.w
@@ -0,0 +1,18 @@
+// This file was auto generated from an example found in: 02-application-tree.md_example_7
+// Example metadata: {"valid":true}
+bring cloud;
+
+class Base {
+  new(b: cloud.Bucket) {}
+}
+class Derived extends Base {
+  new() {
+    super(new cloud.Bucket()); // Bucket create before `Derived` so scope defaults to caller
+  }
+}
+new Derived();
+
+// tree:
+//          root
+//           /\
+//     Bucket  Derived
diff --git a/examples/tests/doc_examples/valid/02-getting-started.md_example_1/main.w b/examples/tests/doc_examples/valid/02-getting-started.md_example_1/main.w
new file mode 100644
index 00000000000..091d8d21fc8
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-getting-started.md_example_1/main.w
@@ -0,0 +1,22 @@
+// This file was auto generated from an example found in: 02-getting-started.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+// define a queue, a bucket and a counter
+let bucket = new cloud.Bucket();
+let counter = new cloud.Counter(initial: 1);
+let queue = new cloud.Queue();
+
+// When a message is received in the queue it should be consumed
+// by the following closure
+queue.setConsumer(inflight (message: str) => {
+  // Increment the distributed counter, the index variable will 
+  // store the value prior to the increment
+  let index = counter.inc();
+  // Once two messages are pushed to the queue, e.g. "Wing" and "Queue".
+  // Two files will be created:
+  // - wing-1.txt with "Hello Wing"
+  // - wing-2.txt with "Hello Queue"
+  bucket.put("wing-{index}.txt", "Hello, {message}");
+  log("file wing-{index}.txt created");
+});
diff --git a/examples/tests/doc_examples/valid/02-primitives.md_example_1/main.w b/examples/tests/doc_examples/valid/02-primitives.md_example_1/main.w
new file mode 100644
index 00000000000..0cdb9a21d0a
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-primitives.md_example_1/main.w
@@ -0,0 +1,8 @@
+// This file was auto generated from an example found in: 02-primitives.md_example_1
+// Example metadata: {"valid":true}
+let s1 = "Hello Wing String";
+log(s1); // prints Hello Wing String
+let s2 = "Interpolate: {s1}"; // string interpolation
+log(s2); // prints Interpolate Hello Wing String
+let s3 = "Concat: " + s1; // string concatenation 
+log(s3); // prints Concat: Hello Wing String
diff --git a/examples/tests/doc_examples/valid/02-primitives.md_example_2/main.w b/examples/tests/doc_examples/valid/02-primitives.md_example_2/main.w
new file mode 100644
index 00000000000..5535f0a4670
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-primitives.md_example_2/main.w
@@ -0,0 +1,25 @@
+// This file was auto generated from an example found in: 02-primitives.md_example_2
+// Example metadata: {"valid":true}
+let s = "Hello to a new Wing world";
+
+// lets start with split
+for w in s.split(" ") {
+  if w.startsWith("H") {
+    log(w); // 'Hello' starts with H
+  } 
+  if w.length > 3 && w.lowercase() == w {
+    log(w); // 'world' is lowercased with more then 3 chars
+  }
+  if w.contains("in") && w.endsWith("g") {
+    log(w); // 'Wing' has in and end with g
+  }
+  if s.indexOf(w) == 6  {
+    log(w); // 'to' position is 6
+  }
+  if s.at(9) == w {
+    log(w); // 'a' is a single char
+  }
+  if s.substring(11,14) == w {
+    log(w); // 'new' position is 11-14
+  }
+}
diff --git a/examples/tests/doc_examples/valid/02-primitives.md_example_3/main.w b/examples/tests/doc_examples/valid/02-primitives.md_example_3/main.w
new file mode 100644
index 00000000000..b8d9fe60c56
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-primitives.md_example_3/main.w
@@ -0,0 +1,19 @@
+// This file was auto generated from an example found in: 02-primitives.md_example_3
+// Example metadata: {"valid":true}
+let n1 = 10;
+log("{n1}"); // 10
+
+let n2 = n1 - 10 / 10 + 1 * 10 ; // arithmetic
+log("{n2}"); // 1
+
+let n3 = 10 % 7; // modulo 
+log("{n3}"); // 3
+
+let n4 = 10 \ 7; // FloorDiv
+log("{n4}"); // 1
+
+let n5 = 2 ** 10; // power of 
+log("{n5}"); // 1024
+
+let n6 = (10 + 1) / (12 - 1) + (20 / 2) * 2 + 10 * 2**10 / 512 + 1; 
+log("{n6}"); // The meaning of the universe
diff --git a/examples/tests/doc_examples/valid/02-primitives.md_example_4/main.w b/examples/tests/doc_examples/valid/02-primitives.md_example_4/main.w
new file mode 100644
index 00000000000..c9dbf43d252
--- /dev/null
+++ b/examples/tests/doc_examples/valid/02-primitives.md_example_4/main.w
@@ -0,0 +1,8 @@
+// This file was auto generated from an example found in: 02-primitives.md_example_4
+// Example metadata: {"valid":true}
+let b1 = true;
+let b2 = false;
+
+if b1 && !b2 { 
+  log("b1:{b1},b2:{b2}"); // prints b1:true, b2:false
+}
diff --git a/examples/tests/doc_examples/valid/03-functions.md_example_1/main.w b/examples/tests/doc_examples/valid/03-functions.md_example_1/main.w
new file mode 100644
index 00000000000..57ccb08f10b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/03-functions.md_example_1/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 03-functions.md_example_1
+// Example metadata: {"valid":true}
+// preflight function - when declared in preflight context
+let dup = (s: str, count: num) => {
+  // code
+};
diff --git a/examples/tests/doc_examples/valid/03-functions.md_example_2/main.w b/examples/tests/doc_examples/valid/03-functions.md_example_2/main.w
new file mode 100644
index 00000000000..a7ca33ea8a9
--- /dev/null
+++ b/examples/tests/doc_examples/valid/03-functions.md_example_2/main.w
@@ -0,0 +1,13 @@
+// This file was auto generated from an example found in: 03-functions.md_example_2
+// Example metadata: {"valid":true}
+
+let handler = inflight (message: str): void => {
+  // using the inflight modifier 
+  let dup = inflight (s: str, count: num) => {
+    // code
+  };
+  // inflight modifier is not required when function is declared in inflight context
+  let sup = (s: str, count: num) => {
+    // code
+  };
+};
diff --git a/examples/tests/doc_examples/valid/03-functions.md_example_3/main.w b/examples/tests/doc_examples/valid/03-functions.md_example_3/main.w
new file mode 100644
index 00000000000..4b7db9fa5c9
--- /dev/null
+++ b/examples/tests/doc_examples/valid/03-functions.md_example_3/main.w
@@ -0,0 +1,17 @@
+// This file was auto generated from an example found in: 03-functions.md_example_3
+// Example metadata: {"valid":true}
+struct Options {
+  prefix: str?;
+  delim: str;
+}
+
+let join_str = (a: Array<str>, opts: Options):str => {
+  let prefix = opts.prefix ?? "";
+  return prefix + a.join(opts.delim);
+};
+
+log(join_str(["hello", "world"], delim: ", ")); //  "!hello.world"
+
+// also OK to pass an object
+let opts = Options { delim: "/" , prefix: "!!" };
+log(join_str(["hello", "world"], opts)); // "!!hello/world");
diff --git a/examples/tests/doc_examples/valid/03-platforms.md_example_1/main.w b/examples/tests/doc_examples/valid/03-platforms.md_example_1/main.w
new file mode 100644
index 00000000000..3cfeab86f0b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/03-platforms.md_example_1/main.w
@@ -0,0 +1,26 @@
+// This file was auto generated from an example found in: 03-platforms.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+bring util;
+
+let invocationCounter = new cloud.Counter();
+let queue = new cloud.Queue();
+
+queue.setConsumer(inflight (msg: str) => {
+  invocationCounter.inc();
+});
+
+new cloud.Function(inflight ()=> { 
+  // push a message to queue
+  queue.push("m");
+  // sleep according to target 
+  if util.env("WING_TARGET") == "sim" {
+    log("Running on Simulator, sleeping for 1s");
+    util.sleep(1s);
+  } else {
+    log("Running on the cloud, sleeping for 30s");
+    util.sleep(30s);
+  }
+  log("Function invoked {invocationCounter.peek()} times");
+});
+
diff --git a/examples/tests/doc_examples/valid/04-flow-controls.md_example_1/main.w b/examples/tests/doc_examples/valid/04-flow-controls.md_example_1/main.w
new file mode 100644
index 00000000000..94383efc82b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-flow-controls.md_example_1/main.w
@@ -0,0 +1,22 @@
+// This file was auto generated from an example found in: 04-flow-controls.md_example_1
+// Example metadata: {"valid":true}
+let iterable = ["a", "b", "c", "d", "e", "f", "g", "h"];
+for value in iterable {
+  if value == "g" {
+    // stopping at g
+    break;
+  }
+  if value == "b" {
+    // skipping b
+    continue;
+  }
+  log(value);
+}
+/** 
+ * prints
+ a
+ c
+ d
+ e
+ f
+**/
diff --git a/examples/tests/doc_examples/valid/04-flow-controls.md_example_2/main.w b/examples/tests/doc_examples/valid/04-flow-controls.md_example_2/main.w
new file mode 100644
index 00000000000..9b83cbcd9bc
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-flow-controls.md_example_2/main.w
@@ -0,0 +1,16 @@
+// This file was auto generated from an example found in: 04-flow-controls.md_example_2
+// Example metadata: {"valid":true}
+// print numbers from 0 to 9
+for value in 0..10 {
+  log("{value}");
+}
+
+// prints numbers in reverse order from 10 to 0
+for value in 10..-1 {
+    log("{value}");
+}
+
+// include end
+for value in 1..=5 {
+    log("{value}");
+}
diff --git a/examples/tests/doc_examples/valid/04-flow-controls.md_example_3/main.w b/examples/tests/doc_examples/valid/04-flow-controls.md_example_3/main.w
new file mode 100644
index 00000000000..c7281a6d58f
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-flow-controls.md_example_3/main.w
@@ -0,0 +1,23 @@
+// This file was auto generated from an example found in: 04-flow-controls.md_example_3
+// Example metadata: {"valid":true}
+let grade = (score: num): str => {
+    // Parentheses are optional in conditions.
+    // However, curly braces are required in `if/else` statements.
+    if 0 < score && score < 55 {
+        return "F";
+    } elif 55 <= score && score < 65 {
+        return "C";
+    } elif 65 <= score && score < 75  {
+        return "B";
+    } elif 75 <= score && score <= 100 {
+        return "A";
+    } else {
+        return "Invalid grade";
+    }
+};
+
+log("54 is {grade(54)}"); // 54 is F
+log("62 is {grade(62)}"); // 62 is C
+log("68 is {grade(68)}"); // 68 is B
+log("99 is {grade(99)}"); // 99 is A
+log("101 is {grade(101)}"); // 101 is Invalid grade
diff --git a/examples/tests/doc_examples/valid/04-flow-controls.md_example_4/main.w b/examples/tests/doc_examples/valid/04-flow-controls.md_example_4/main.w
new file mode 100644
index 00000000000..b6e84150263
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-flow-controls.md_example_4/main.w
@@ -0,0 +1,28 @@
+// This file was auto generated from an example found in: 04-flow-controls.md_example_4
+// Example metadata: {"valid":true}
+let var i = 0;
+while i < 100 {
+  i = i + 1;
+  if i == 20 {
+    // although the while loop goes to 100, we break it at 20
+    break;
+  }
+  if i % 2 == 0 {
+    // continue for even numbers
+    continue;
+  }
+  log("{i}");
+}
+/** 
+ * prints
+  1
+  3
+  5
+  7
+  9
+  11
+  13
+  15
+  17
+  19
+**/
diff --git a/examples/tests/doc_examples/valid/04-tests.md_example_1/main.w b/examples/tests/doc_examples/valid/04-tests.md_example_1/main.w
new file mode 100644
index 00000000000..0d07ac070af
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-tests.md_example_1/main.w
@@ -0,0 +1,5 @@
+// This file was auto generated from an example found in: 04-tests.md_example_1
+// Example metadata: {"valid":true}
+test "<test-name>" {
+  // test code
+}
diff --git a/examples/tests/doc_examples/valid/04-tests.md_example_2/main.w b/examples/tests/doc_examples/valid/04-tests.md_example_2/main.w
new file mode 100644
index 00000000000..86cc8f4fae6
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-tests.md_example_2/main.w
@@ -0,0 +1,8 @@
+// This file was auto generated from an example found in: 04-tests.md_example_2
+// Example metadata: {"valid":true}
+// example.w
+bring math;
+
+test "abs" {
+  assert(1 == math.abs(-1));
+}
diff --git a/examples/tests/doc_examples/valid/04-tests.md_example_3/main.w b/examples/tests/doc_examples/valid/04-tests.md_example_3/main.w
new file mode 100644
index 00000000000..139027f66f3
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-tests.md_example_3/main.w
@@ -0,0 +1,16 @@
+// This file was auto generated from an example found in: 04-tests.md_example_3
+// Example metadata: {"valid":true}
+bring cloud;
+
+let b = new cloud.Bucket();
+
+test "bucket list should include created file" {
+  b.put("file", "lorem ipsum");
+  let listOfFile = b.list();
+  assert(listOfFile.length == 1);
+}
+
+test "bucket starts empty" {
+  let listOfFile = b.list();
+  assert(listOfFile.length == 0);
+}
diff --git a/examples/tests/doc_examples/valid/04-tests.md_example_4/main.w b/examples/tests/doc_examples/valid/04-tests.md_example_4/main.w
new file mode 100644
index 00000000000..1bb41c2b12b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/04-tests.md_example_4/main.w
@@ -0,0 +1,23 @@
+// This file was auto generated from an example found in: 04-tests.md_example_4
+// Example metadata: {"valid":true}
+bring cloud;
+bring util;
+
+let b = new cloud.Bucket();
+b.onCreate(inflight (key: str) => {
+  if !key.startsWith("/dest") {
+    let content = b.get(key);
+    b.put("/dest/" + key, content.uppercase());
+  }
+});
+
+test "bucket onCreate" {
+  b.put("file", "lorem ipsum");
+  // Using waitUntil for waiting until the async event system of onCreate
+  // finished generating a the dest/file
+  let foundUppercaseFile = util.waitUntil((): bool => {
+      return b.exists("/dest/file");
+  });
+  assert(foundUppercaseFile && b.get("/dest/file") == "LOREM IPSUM");
+}
+
diff --git a/examples/tests/doc_examples/valid/05-optionality.md_example_1/main.w b/examples/tests/doc_examples/valid/05-optionality.md_example_1/main.w
new file mode 100644
index 00000000000..99c37bc9059
--- /dev/null
+++ b/examples/tests/doc_examples/valid/05-optionality.md_example_1/main.w
@@ -0,0 +1,4 @@
+// This file was auto generated from an example found in: 05-optionality.md_example_1
+// Example metadata: {"valid":true}
+let s1: str? = "Hello"; // type str? (optional), value "Hello"
+let s2: str? = nil; // type str? (optional), value nil
diff --git a/examples/tests/doc_examples/valid/05-optionality.md_example_2/main.w b/examples/tests/doc_examples/valid/05-optionality.md_example_2/main.w
new file mode 100644
index 00000000000..8ecc04906d5
--- /dev/null
+++ b/examples/tests/doc_examples/valid/05-optionality.md_example_2/main.w
@@ -0,0 +1,11 @@
+// This file was auto generated from an example found in: 05-optionality.md_example_2
+// Example metadata: {"valid":true}
+let s1: str? = "Hello"; // type str? (optional), value "Hello"
+let s2: str? = nil; // type str? (optional), value nil
+
+if s1? {
+  log("x1 is not nil");
+}
+if !s2? {
+  log("x2 is nil");
+}
diff --git a/examples/tests/doc_examples/valid/05-optionality.md_example_3/main.w b/examples/tests/doc_examples/valid/05-optionality.md_example_3/main.w
new file mode 100644
index 00000000000..e4355080865
--- /dev/null
+++ b/examples/tests/doc_examples/valid/05-optionality.md_example_3/main.w
@@ -0,0 +1,18 @@
+// This file was auto generated from an example found in: 05-optionality.md_example_3
+// Example metadata: {"valid":true}
+let s1: str? = "Hello"; // type str? (optional), value "Hello"
+
+// unwrap optional s1 and create s from type str
+if let s = s1 {
+  log("s is not optional, value {s}");
+} else {
+  log("s1 was nil, s doesn't exists in this scope");
+}
+
+// same as above but shadowing s1 variable
+if let s1 = s1 {
+  log("s1 type is str, value {s1}");
+} else {
+  log("s1 was nil");
+}
+log("s1 type is optional str");
diff --git a/examples/tests/doc_examples/valid/05-optionality.md_example_4/main.w b/examples/tests/doc_examples/valid/05-optionality.md_example_4/main.w
new file mode 100644
index 00000000000..f9589cfb47b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/05-optionality.md_example_4/main.w
@@ -0,0 +1,5 @@
+// This file was auto generated from an example found in: 05-optionality.md_example_4
+// Example metadata: {"valid":true}
+let s1: str? = nil; // type str? (optional), value nil
+let s2 = s1 ?? "default value";  // s2 is of type str
+log(s2); // prints default value
diff --git a/examples/tests/doc_examples/valid/05-optionality.md_example_5/main.w b/examples/tests/doc_examples/valid/05-optionality.md_example_5/main.w
new file mode 100644
index 00000000000..1f906eb049c
--- /dev/null
+++ b/examples/tests/doc_examples/valid/05-optionality.md_example_5/main.w
@@ -0,0 +1,20 @@
+// This file was auto generated from an example found in: 05-optionality.md_example_5
+// Example metadata: {"valid":true}
+let j  = Json {
+  working: {
+    a: {
+      b: "value"
+    }
+  },
+  broken: {}
+};
+
+if let value = j.tryGet("working")?.tryGet("a")?.tryGet("b")?.tryAsStr() {
+  log("value is {value}");
+} 
+
+if let value = j.tryGet("broken")?.tryGet("a")?.tryGet("b")?.tryAsStr() {
+  // not reachable 
+} else {
+  log("value was not found");
+}
diff --git a/examples/tests/doc_examples/valid/05-optionality.md_example_6/main.w b/examples/tests/doc_examples/valid/05-optionality.md_example_6/main.w
new file mode 100644
index 00000000000..0c6a751a5f1
--- /dev/null
+++ b/examples/tests/doc_examples/valid/05-optionality.md_example_6/main.w
@@ -0,0 +1,23 @@
+// This file was auto generated from an example found in: 05-optionality.md_example_6
+// Example metadata: {"valid":true}
+let b3: bool? = false; 
+
+if b3? {
+  log("although b3 is false, the if statement here checks for existence of value");
+}
+
+if let b3 = b3  { // unboxing b3 and shadowing original b3 
+  if b3 {
+    log("b3 is true");
+  } else {
+    log("b3 is false");
+  }
+} else {
+  log("b3 is nil");
+}
+
+/**
+ * prints:
+  although b3 is false, the if statement here checks for existence of value
+  b3 is false
+**/
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_1/main.w b/examples/tests/doc_examples/valid/06-json.md_example_1/main.w
new file mode 100644
index 00000000000..033b7e26cd3
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_1/main.w
@@ -0,0 +1,23 @@
+// This file was auto generated from an example found in: 06-json.md_example_1
+// Example metadata: {"valid":true}
+let j = Json {
+  k1: 1,
+  k2: "hello",
+  k3: true,
+  k4: {
+    k1: [1, "a", true, {} ]
+  }
+};
+log("{j}");
+
+let jsonStrValue = Json "Hello";
+log("{jsonStrValue}");
+
+let jsonNumValue = Json 42;
+log("{jsonNumValue}");
+
+let jsonBoolValue = Json true;
+log("{jsonBoolValue}");
+
+let jsonHomogeneousArrayValue = Json ["a", "b"];
+log("{jsonHomogeneousArrayValue}");
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_2/main.w b/examples/tests/doc_examples/valid/06-json.md_example_2/main.w
new file mode 100644
index 00000000000..82418742392
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_2/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: 06-json.md_example_2
+// Example metadata: {"valid":true}
+let x: num = 42;
+let jsonNum = Json x;
+log("{jsonNum}"); // 42
+
+let chars = Array<str>["a", "b"];
+let jsonChars = Json chars;
+log("{jsonChars}"); // ["a","b"]
+
+let jsonComplex = Json { "first": x, "second": chars };
+log("{jsonComplex}"); // {"first": 42, "second": ["a","b"]}
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_3/main.w b/examples/tests/doc_examples/valid/06-json.md_example_3/main.w
new file mode 100644
index 00000000000..04a1ca743aa
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_3/main.w
@@ -0,0 +1,10 @@
+// This file was auto generated from an example found in: 06-json.md_example_3
+// Example metadata: {"valid":true}
+let j = Json {
+    k1: "v1",
+    k2: "v2"
+};
+for k in Json.keys(j) {
+  let value = j.get(k);
+  log("found key {k} with value {value}");
+}
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_4/main.w b/examples/tests/doc_examples/valid/06-json.md_example_4/main.w
new file mode 100644
index 00000000000..9d51fe48328
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_4/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: 06-json.md_example_4
+// Example metadata: {"valid":true}
+let j = Json {
+    k1: "v1",
+    k2: "v2"
+};
+for value in Json.values(j) {
+  log("found value {value}");
+}
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_5/main.w b/examples/tests/doc_examples/valid/06-json.md_example_5/main.w
new file mode 100644
index 00000000000..f677769b9fa
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_5/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 06-json.md_example_5
+// Example metadata: {"valid":true}
+let arrayValue = Json ["a", "b", "c"];
+for v in Json.values(arrayValue) {
+  log(str.fromJson(v));
+}
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_6/main.w b/examples/tests/doc_examples/valid/06-json.md_example_6/main.w
new file mode 100644
index 00000000000..b83d75c0243
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_6/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: 06-json.md_example_6
+// Example metadata: {"valid":true}
+let j = Json {
+    k: "hello"
+};
+
+log(j.get("k").asStr());
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_7/main.w b/examples/tests/doc_examples/valid/06-json.md_example_7/main.w
new file mode 100644
index 00000000000..20547f84dbc
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_7/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 06-json.md_example_7
+// Example metadata: {"valid":true}
+let j = Json {
+  k: 12
+};
+log("{j.get("k").asNum()}");
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_8/main.w b/examples/tests/doc_examples/valid/06-json.md_example_8/main.w
new file mode 100644
index 00000000000..c1fe2966aef
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_8/main.w
@@ -0,0 +1,6 @@
+// This file was auto generated from an example found in: 06-json.md_example_8
+// Example metadata: {"valid":true}
+let j = Json {
+  k:true
+};
+log("{j.get("k").asBool()}");
diff --git a/examples/tests/doc_examples/valid/06-json.md_example_9/main.w b/examples/tests/doc_examples/valid/06-json.md_example_9/main.w
new file mode 100644
index 00000000000..1e35a7912f0
--- /dev/null
+++ b/examples/tests/doc_examples/valid/06-json.md_example_9/main.w
@@ -0,0 +1,13 @@
+// This file was auto generated from an example found in: 06-json.md_example_9
+// Example metadata: {"valid":true}
+struct Foo {
+  val1: str;
+  val2: num;
+}
+
+let jFoo = {
+  val1: "cool",
+  val2: 21
+};
+
+let foo = Foo.fromJson(jFoo);
diff --git a/examples/tests/doc_examples/valid/07-structs.md_example_1/main.w b/examples/tests/doc_examples/valid/07-structs.md_example_1/main.w
new file mode 100644
index 00000000000..ac77a1892a0
--- /dev/null
+++ b/examples/tests/doc_examples/valid/07-structs.md_example_1/main.w
@@ -0,0 +1,10 @@
+// This file was auto generated from an example found in: 07-structs.md_example_1
+// Example metadata: {"valid":true}
+struct Example {
+  a: str;
+  b: num;
+  c: bool;
+}
+
+let example = Example { a: "a", b: 0, c: false };
+log(example.a); // prints "a"
diff --git a/examples/tests/doc_examples/valid/07-structs.md_example_2/main.w b/examples/tests/doc_examples/valid/07-structs.md_example_2/main.w
new file mode 100644
index 00000000000..7ad7553d1c7
--- /dev/null
+++ b/examples/tests/doc_examples/valid/07-structs.md_example_2/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: 07-structs.md_example_2
+// Example metadata: {"valid":true}
+struct Example {
+  a: str?;
+  b: num?;
+  c: bool?;
+}
+
+let example = Example { };
+if ! example.a? {
+  log("a is nil"); 
+}
diff --git a/examples/tests/doc_examples/valid/07-structs.md_example_3/main.w b/examples/tests/doc_examples/valid/07-structs.md_example_3/main.w
new file mode 100644
index 00000000000..97b1088b98b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/07-structs.md_example_3/main.w
@@ -0,0 +1,21 @@
+// This file was auto generated from an example found in: 07-structs.md_example_3
+// Example metadata: {"valid":true}
+struct Another {
+  hello: str;
+}
+
+struct MyData {
+  a: str;
+  b: num?;
+  c: Another;
+}
+
+let data = MyData {
+  a: "hello",
+  c: Another {
+    hello: "two"
+  }
+};
+
+log(data.a); // prints hello  
+log(data.c.hello); // prints two
diff --git a/examples/tests/doc_examples/valid/07-structs.md_example_4/main.w b/examples/tests/doc_examples/valid/07-structs.md_example_4/main.w
new file mode 100644
index 00000000000..54867719c4c
--- /dev/null
+++ b/examples/tests/doc_examples/valid/07-structs.md_example_4/main.w
@@ -0,0 +1,17 @@
+// This file was auto generated from an example found in: 07-structs.md_example_4
+// Example metadata: {"valid":true}
+struct Options {
+  prefix: str?;
+  delim: str;
+}
+
+let join_str = (a: Array<str>, opts: Options):str => {
+  let prefix = opts.prefix ?? "";
+  return prefix + a.join(opts.delim);
+};
+
+log(join_str(["hello", "world"], delim: ", ")); //  "!hello.world"
+
+// also OK to pass an object
+let opts = Options { delim: "," };
+log(join_str(["hello", "world"], opts)); // "!!hello/world");
diff --git a/examples/tests/doc_examples/valid/08-classes.md_example_1/main.w b/examples/tests/doc_examples/valid/08-classes.md_example_1/main.w
new file mode 100644
index 00000000000..4dcab81f940
--- /dev/null
+++ b/examples/tests/doc_examples/valid/08-classes.md_example_1/main.w
@@ -0,0 +1,40 @@
+// This file was auto generated from an example found in: 08-classes.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+bring util;
+
+class Foo  {
+  pub field1: str;     // <-- readonly
+  pub var field2: num; // <-- reassignable
+  inflight field3: Array<str>;
+
+  new() {
+    this.field1 = "hello";
+    this.field2 = 123;
+  }
+
+  setField2(value: num): void {
+    this.field2 = value;
+  }
+
+  inflight new() {
+    this.field3 = ["value created on inflight init"];
+    log("at inflight init");
+  }
+
+  pub inflight doStuff() {
+    // all code is async and runs on the cloud
+    log("field3[0]='{this.field3.at(0)}'");
+    util.sleep(1s);
+    log("done");
+  }
+}
+
+let f = new Foo();
+log("field1={f.field1}");
+log("field2={f.field2}");
+
+new cloud.Function(inflight () => {
+  f.doStuff();
+});
+
diff --git a/examples/tests/doc_examples/valid/08-classes.md_example_2/main.w b/examples/tests/doc_examples/valid/08-classes.md_example_2/main.w
new file mode 100644
index 00000000000..2d3401ba798
--- /dev/null
+++ b/examples/tests/doc_examples/valid/08-classes.md_example_2/main.w
@@ -0,0 +1,21 @@
+// This file was auto generated from an example found in: 08-classes.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+inflight interface IProfile {
+  inflight name(): str;
+}
+
+inflight class WingPerson impl IProfile {
+  pub inflight name(): str {
+    return "Fairy Wing";
+  }
+}
+
+let logName = inflight(profile: IProfile): void => {
+  log(profile.name());
+};
+
+new cloud.Function(inflight () => {
+  logName(new WingPerson());
+});
diff --git a/examples/tests/doc_examples/valid/08-classes.md_example_3/main.w b/examples/tests/doc_examples/valid/08-classes.md_example_3/main.w
new file mode 100644
index 00000000000..f84b999927f
--- /dev/null
+++ b/examples/tests/doc_examples/valid/08-classes.md_example_3/main.w
@@ -0,0 +1,24 @@
+// This file was auto generated from an example found in: 08-classes.md_example_3
+// Example metadata: {"valid":true}
+bring cloud;
+/**
+ * Preflight Interface
+ **/ 
+interface IKVStore extends std.IResource { // https://github.com/winglang/wing/issues/1961
+  inflight get(key: str): Json;
+  inflight set(key: str, value: Json): void;
+}
+
+class BucketBasedKeyValueStore impl IKVStore {
+  bucket: cloud.Bucket;
+  new() {
+    this.bucket = new cloud.Bucket();
+  }
+  pub inflight get(key: str): Json {
+    return this.bucket.getJson(key);
+  }
+  pub inflight set(key: str, value: Json): void {
+    this.bucket.putJson(key, value);
+  }
+}
+
diff --git a/examples/tests/doc_examples/valid/08-classes.md_example_4/main.w b/examples/tests/doc_examples/valid/08-classes.md_example_4/main.w
new file mode 100644
index 00000000000..248a3276315
--- /dev/null
+++ b/examples/tests/doc_examples/valid/08-classes.md_example_4/main.w
@@ -0,0 +1,62 @@
+// This file was auto generated from an example found in: 08-classes.md_example_4
+// Example metadata: {"valid":true}
+bring cloud;
+bring ex;
+
+interface IKVStore extends std.IResource { 
+  inflight get(key: str): Json;
+  inflight set(key: str, value: Json): void;
+}
+
+class BucketBasedKeyValueStore impl IKVStore {
+  bucket: cloud.Bucket;
+  new() {
+    this.bucket = new cloud.Bucket();
+  }
+  pub inflight get(key: str): Json {
+    return this.bucket.getJson(key);
+  }
+  pub inflight set(key: str, value: Json): void {
+    this.bucket.putJson(key, value);
+  }
+}
+
+class TableBasedKeyValueStore impl IKVStore {
+  table: ex.Table;
+  new() {
+    this.table = new ex.Table(
+      name: "table",
+      primaryKey: "key",
+      columns: {
+        value: ex.ColumnType.STRING
+      }
+    );
+  }
+  pub inflight get(key: str): Json {
+    return this.table.get(key);
+  }
+  pub inflight set(key: str, value: Json) {
+    this.table.insert(key, value);
+  }
+}
+
+let bucketBased: IKVStore = new BucketBasedKeyValueStore();
+let tableBased: IKVStore = new TableBasedKeyValueStore();
+
+test "bucketBased KVStore" {
+  bucketBased.set("k", Json {
+    value: "v"
+  });
+  let result = bucketBased.get("k");
+  log("{result.get("value")}");
+  assert("v" == str.fromJson(result.get("value")));
+}
+
+test "tableBased KVStore" {
+  tableBased.set("k", Json {
+    value: "v"
+  });
+  let result = tableBased.get("k");
+  log("{result.get("value")}");
+  assert("v" == str.fromJson(result.get("value")));
+}
diff --git a/examples/tests/doc_examples/valid/10-using-javascript.md_example_1/main.w b/examples/tests/doc_examples/valid/10-using-javascript.md_example_1/main.w
new file mode 100644
index 00000000000..900539f6a08
--- /dev/null
+++ b/examples/tests/doc_examples/valid/10-using-javascript.md_example_1/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: 10-using-javascript.md_example_1
+// Example metadata: {"valid":true}
+// main.w
+bring cloud;
+let bucket = new cloud.Bucket();
+
+bucket.onCreate(inflight (file) => {
+  log(file);
+});
diff --git a/examples/tests/doc_examples/valid/13-api-gateway.md_example_1/main.w b/examples/tests/doc_examples/valid/13-api-gateway.md_example_1/main.w
new file mode 100644
index 00000000000..7fb3c783d3a
--- /dev/null
+++ b/examples/tests/doc_examples/valid/13-api-gateway.md_example_1/main.w
@@ -0,0 +1,30 @@
+// This file was auto generated from an example found in: 13-api-gateway.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let api = new cloud.Api();
+
+api.get("/", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+    return cloud.ApiResponse {
+      status: 200,
+      body: "Hello GET"
+    };
+});
+api.post("/", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+    return cloud.ApiResponse {
+      status: 200,
+      body: "Hello POST"
+    };
+});
+api.put("/", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+    return cloud.ApiResponse {
+      status: 200, body:
+      "Hello PUT"
+    };
+});
+api.delete("/", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+    return cloud.ApiResponse {
+      status: 200,
+      body: "Hello DELETE"
+    };
+});
diff --git a/examples/tests/doc_examples/valid/13-api-gateway.md_example_2/main.w b/examples/tests/doc_examples/valid/13-api-gateway.md_example_2/main.w
new file mode 100644
index 00000000000..c4fbe45e598
--- /dev/null
+++ b/examples/tests/doc_examples/valid/13-api-gateway.md_example_2/main.w
@@ -0,0 +1,16 @@
+// This file was auto generated from an example found in: 13-api-gateway.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let api = new cloud.Api();
+
+api.get("/items/:id/:value", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  let itemId = req.vars.get("id");
+  let itemValue = req.vars.get("value");
+  log("Received itemId:{itemId}, itemValue:{itemValue}");
+  return cloud.ApiResponse {
+    status: 200,
+    body: "Received itemId:{itemId}, itemValue:{itemValue}"
+  };
+});
+
diff --git a/examples/tests/doc_examples/valid/13-api-gateway.md_example_3/main.w b/examples/tests/doc_examples/valid/13-api-gateway.md_example_3/main.w
new file mode 100644
index 00000000000..1615f1620e9
--- /dev/null
+++ b/examples/tests/doc_examples/valid/13-api-gateway.md_example_3/main.w
@@ -0,0 +1,19 @@
+// This file was auto generated from an example found in: 13-api-gateway.md_example_3
+// Example metadata: {"valid":true}
+bring cloud;
+
+let api = new cloud.Api();
+
+api.put("/items/:id", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  let itemId = req.vars.get("id");
+  if let itemBody = Json.tryParse(req.body ?? "") {    
+    return cloud.ApiResponse {
+        status: 200,
+        body: "Received id {itemId} with body {itemBody}"
+    };
+  }
+  return cloud.ApiResponse {
+      status: 400,
+      body: "Missing body"
+  };
+});
diff --git a/examples/tests/doc_examples/valid/80-singletons.md_example_1/main.w b/examples/tests/doc_examples/valid/80-singletons.md_example_1/main.w
new file mode 100644
index 00000000000..6a5433f182b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/80-singletons.md_example_1/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: 80-singletons.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+class SingletonBucket {
+  pub static of(scope: std.IResource): cloud.Bucket {
+    let uid = "SingletonBucket";
+    let root = nodeof(scope).root;
+    let rootNode = nodeof(root);
+    return unsafeCast(rootNode.tryFindChild(uid)) ?? new cloud.Bucket() as uid in root;
+  }
+}
diff --git a/examples/tests/doc_examples/valid/api.md_example_1/main.w b/examples/tests/doc_examples/valid/api.md_example_1/main.w
new file mode 100644
index 00000000000..eb37179001b
--- /dev/null
+++ b/examples/tests/doc_examples/valid/api.md_example_1/main.w
@@ -0,0 +1,70 @@
+// This file was auto generated from an example found in: api.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+bring ex;
+
+let api = new cloud.Api();
+// Used for generating unique id
+let counter = new cloud.Counter();
+// our employee database
+let db = new ex.Table(
+  name: "employees",
+  primaryKey: "id",
+  columns: {
+    "name" => ex.ColumnType.STRING
+  }
+);
+
+api.get("/employees", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  let result = MutJson [];
+  let var i = 0;
+  for employee in db.list() {
+    result.setAt(i, employee);
+    i = i + 1;
+  }
+  return cloud.ApiResponse {
+    status: 200,
+    body: Json.stringify(result)
+  };
+});
+
+
+api.get("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  let employee = db.get(request.vars.get("id"));
+  return cloud.ApiResponse {
+    status: 200,
+    body: Json.stringify(employee)
+  };
+});
+
+api.post("/employees", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+   if let body = request.body {
+    let employeeData = Json.parse(body);
+    let id = "{counter.inc()}";
+    db.insert(id, employeeData);
+    return cloud.ApiResponse {
+      status: 201,
+      body: id
+    };
+   }
+});
+
+api.put("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  if let body = request.body {
+    let employeeData = Json.parse(body);
+    let id = request.vars.get("id");
+    db.update(id, employeeData);
+    return cloud.ApiResponse {
+      status: 200,
+      body: Json.stringify(employeeData)
+    };
+  }
+});
+
+api.delete("/employees/:id", inflight (request: cloud.ApiRequest): cloud.ApiResponse => {
+  let id = request.vars.get("id");
+  db.delete(id);
+  return cloud.ApiResponse {
+    status: 204
+  };
+});
diff --git a/examples/tests/doc_examples/valid/bucket.md_example_1/main.w b/examples/tests/doc_examples/valid/bucket.md_example_1/main.w
new file mode 100644
index 00000000000..6fa931672a8
--- /dev/null
+++ b/examples/tests/doc_examples/valid/bucket.md_example_1/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: bucket.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket = new cloud.Bucket(
+  public: true, // optional, defaults to `false`
+);
diff --git a/examples/tests/doc_examples/valid/bucket.md_example_2/main.w b/examples/tests/doc_examples/valid/bucket.md_example_2/main.w
new file mode 100644
index 00000000000..6294a794b4f
--- /dev/null
+++ b/examples/tests/doc_examples/valid/bucket.md_example_2/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: bucket.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket = new cloud.Bucket();
+
+bucket.addObject("my-file.txt", "Hello, world!");
diff --git a/examples/tests/doc_examples/valid/bucket.md_example_3/main.w b/examples/tests/doc_examples/valid/bucket.md_example_3/main.w
new file mode 100644
index 00000000000..1b11216fd0d
--- /dev/null
+++ b/examples/tests/doc_examples/valid/bucket.md_example_3/main.w
@@ -0,0 +1,24 @@
+// This file was auto generated from an example found in: bucket.md_example_3
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket = new cloud.Bucket();
+
+let bucketFunc = inflight () => {
+  bucket.put("file.txt", "Hello, world!");
+  bucket.putJson("person.json", Json { name: "Alice" });
+
+  let fileData = bucket.get("file.txt");
+  assert(fileData == "Hello, world!");
+
+  let jsonData = bucket.getJson("person.json");
+  assert(jsonData.get("name") == "Alice");
+
+  let keys = bucket.list();
+  assert(keys.at(0) == "file.txt");
+  assert(keys.at(1) == "person.json");
+
+  bucket.delete("file.txt");
+};
+
+new cloud.Function(bucketFunc);
diff --git a/examples/tests/doc_examples/valid/bucket.md_example_4/main.w b/examples/tests/doc_examples/valid/bucket.md_example_4/main.w
new file mode 100644
index 00000000000..c9dd7159da9
--- /dev/null
+++ b/examples/tests/doc_examples/valid/bucket.md_example_4/main.w
@@ -0,0 +1,18 @@
+// This file was auto generated from an example found in: bucket.md_example_4
+// Example metadata: {"valid":true}
+bring cloud;
+
+let store = new cloud.Bucket();
+let copies = new cloud.Bucket() as "Backup";
+
+store.onCreate(inflight (key: str) => {
+  let data = store.get(key);
+  if !key.endsWith(".log") {
+    copies.put(key, data);
+  }
+});
+
+store.onDelete(inflight (key: str) => {
+  copies.delete(key);
+  log("Deleted {key}");
+});
diff --git a/examples/tests/doc_examples/valid/counter.md_example_1/main.w b/examples/tests/doc_examples/valid/counter.md_example_1/main.w
new file mode 100644
index 00000000000..ff57bdc2f65
--- /dev/null
+++ b/examples/tests/doc_examples/valid/counter.md_example_1/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: counter.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let counter = new cloud.Counter(
+  initial: 123, // optional, defaults to 0
+);
diff --git a/examples/tests/doc_examples/valid/counter.md_example_2/main.w b/examples/tests/doc_examples/valid/counter.md_example_2/main.w
new file mode 100644
index 00000000000..158fbef4981
--- /dev/null
+++ b/examples/tests/doc_examples/valid/counter.md_example_2/main.w
@@ -0,0 +1,18 @@
+// This file was auto generated from an example found in: counter.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let counter = new cloud.Counter();
+
+let counterFunc = inflight () => {
+  let prev = counter.inc(); // increment by 1 and return previous value
+  counter.inc(5); // increment by 5
+  counter.dec(); // decrement by 1
+  counter.dec(2); // decrement by 2
+
+  assert(counter.peek() == 3); // check the current value
+
+  counter.set(100); // set to a specific value
+};
+
+new cloud.Function(counterFunc);
diff --git a/examples/tests/doc_examples/valid/counter.md_example_3/main.w b/examples/tests/doc_examples/valid/counter.md_example_3/main.w
new file mode 100644
index 00000000000..20ab812f1ee
--- /dev/null
+++ b/examples/tests/doc_examples/valid/counter.md_example_3/main.w
@@ -0,0 +1,18 @@
+// This file was auto generated from an example found in: counter.md_example_3
+// Example metadata: {"valid":true}
+bring cloud;
+
+let counter = new cloud.Counter(initial: 100);
+
+let counterFunc = inflight () => {
+  let k1 = "key-1";
+  let k2 = "key-2";
+
+  counter.dec(1, k1); // decrement k1 by 1
+  counter.inc(11, k2); // increment k2 by 11
+
+  assert(counter.peek(k1) == 99); // check the current value of k1
+  assert(counter.peek(k2) == 111); // check the current value of k2
+};
+
+new cloud.Function(counterFunc);
diff --git a/examples/tests/doc_examples/valid/endpoint.md_example_1/main.w b/examples/tests/doc_examples/valid/endpoint.md_example_1/main.w
new file mode 100644
index 00000000000..93a0403459a
--- /dev/null
+++ b/examples/tests/doc_examples/valid/endpoint.md_example_1/main.w
@@ -0,0 +1,5 @@
+// This file was auto generated from an example found in: endpoint.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let endpoint = new cloud.Endpoint("https://example.com");
diff --git a/examples/tests/doc_examples/valid/endpoint.md_example_2/main.w b/examples/tests/doc_examples/valid/endpoint.md_example_2/main.w
new file mode 100644
index 00000000000..9d7cb97a719
--- /dev/null
+++ b/examples/tests/doc_examples/valid/endpoint.md_example_2/main.w
@@ -0,0 +1,5 @@
+// This file was auto generated from an example found in: endpoint.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+new cloud.Endpoint("https://example.com");
diff --git a/examples/tests/doc_examples/valid/function.md_example_1/main.w b/examples/tests/doc_examples/valid/function.md_example_1/main.w
new file mode 100644
index 00000000000..b727f4e0b03
--- /dev/null
+++ b/examples/tests/doc_examples/valid/function.md_example_1/main.w
@@ -0,0 +1,24 @@
+// This file was auto generated from an example found in: function.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+bring util;
+
+// defining a cloud.Function resource
+let countWords = new cloud.Function(inflight (s: str?): str => {
+  return "{s?.split(" ")?.length ?? 0}";
+}) as "countWords";
+
+let longTask = new cloud.Function(inflight () => {
+  util.sleep(30s);
+  log("done!");
+});
+
+new cloud.Function(inflight () => {
+  let sentence = "I am a sentence with 7 words";
+  // invoking cloud.Function from inflight context
+  let wordsCount = countWords.invoke(sentence);
+  log("'{sentence}' has {wordsCount ?? "0"} words");
+
+  longTask.invokeAsync("");
+  log("task started");
+}) as "Invoke Me";
diff --git a/examples/tests/doc_examples/valid/function.md_example_2/main.w b/examples/tests/doc_examples/valid/function.md_example_2/main.w
new file mode 100644
index 00000000000..745b9c2ef4d
--- /dev/null
+++ b/examples/tests/doc_examples/valid/function.md_example_2/main.w
@@ -0,0 +1,27 @@
+// This file was auto generated from an example found in: function.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let big = new cloud.Bucket();
+
+big.addObject("bigdata.json", Json.stringify({
+  "my-key": "my-value"
+}));
+
+class MyDatabase {
+  inflight bigdata: Json;
+  inflight new() {
+    // download big data once
+    this.bigdata = big.getJson("bigdata.json");
+  }
+
+  pub inflight query(key: str): Json {
+    return this.bigdata.get(key);
+  }
+}
+
+let db = new MyDatabase();
+
+new cloud.Function(inflight () => {
+  log(Json.stringify(db.query("my-key")));
+});
diff --git a/examples/tests/doc_examples/valid/function.md_example_3/main.w b/examples/tests/doc_examples/valid/function.md_example_3/main.w
new file mode 100644
index 00000000000..b74b18d78ce
--- /dev/null
+++ b/examples/tests/doc_examples/valid/function.md_example_3/main.w
@@ -0,0 +1,17 @@
+// This file was auto generated from an example found in: function.md_example_3
+// Example metadata: {"valid":true}
+bring aws;
+bring cloud;
+
+let f = new cloud.Function(inflight () => {
+  log("Hello world!");
+});
+if let lambdaFn = aws.Function.from(f) {
+  lambdaFn.addPolicyStatements(
+    aws.PolicyStatement {
+      actions: ["ses:sendEmail"],
+      effect: aws.Effect.ALLOW,
+      resources: ["*"],
+    },
+  );
+}
diff --git a/examples/tests/doc_examples/valid/function.md_example_4/main.w b/examples/tests/doc_examples/valid/function.md_example_4/main.w
new file mode 100644
index 00000000000..29b791e5c37
--- /dev/null
+++ b/examples/tests/doc_examples/valid/function.md_example_4/main.w
@@ -0,0 +1,14 @@
+// This file was auto generated from an example found in: function.md_example_4
+// Example metadata: {"valid":true}
+bring aws;
+bring cloud;
+
+let f = new cloud.Function(inflight () => {
+  if let ctx = aws.Function.context() {
+    log(ctx.logGroupName); // prints the log group name
+    log(ctx.logStreamName); // prints the log stream name
+
+    let remainingTime = ctx.remainingTimeInMillis();
+    assert(remainingTime > 0);
+  }
+});
diff --git a/examples/tests/doc_examples/valid/on-deploy.md_example_1/main.w b/examples/tests/doc_examples/valid/on-deploy.md_example_1/main.w
new file mode 100644
index 00000000000..63ccbe1cc73
--- /dev/null
+++ b/examples/tests/doc_examples/valid/on-deploy.md_example_1/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: on-deploy.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let bucket = new cloud.Bucket();
+
+// each time the application is deployed, all objects in the bucket are deleted
+let setup = new cloud.OnDeploy(inflight () => {
+  for key in bucket.list() {
+    bucket.delete(key);
+  }
+});
diff --git a/examples/tests/doc_examples/valid/on-deploy.md_example_2/main.w b/examples/tests/doc_examples/valid/on-deploy.md_example_2/main.w
new file mode 100644
index 00000000000..9d72bf0e725
--- /dev/null
+++ b/examples/tests/doc_examples/valid/on-deploy.md_example_2/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: on-deploy.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let counter = new cloud.Counter();
+
+let setup2 = new cloud.OnDeploy(inflight () => {
+  counter.inc();
+}) as "setup2";
+let setup1 = new cloud.OnDeploy(inflight () => {
+  counter.set(10);
+}, executeBefore: [setup2]) as "setup1";
diff --git a/examples/tests/doc_examples/valid/queue.md_example_1/main.w b/examples/tests/doc_examples/valid/queue.md_example_1/main.w
new file mode 100644
index 00000000000..37a56c81144
--- /dev/null
+++ b/examples/tests/doc_examples/valid/queue.md_example_1/main.w
@@ -0,0 +1,14 @@
+// This file was auto generated from an example found in: queue.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let q = new cloud.Queue();
+
+q.setConsumer(inflight (m: str) => {
+  log("message ${m} consumed");
+});
+
+new cloud.Function(inflight () => {
+  q.push("message a");
+  q.push("message b");
+});
diff --git a/examples/tests/doc_examples/valid/queue.md_example_2/main.w b/examples/tests/doc_examples/valid/queue.md_example_2/main.w
new file mode 100644
index 00000000000..817135ec890
--- /dev/null
+++ b/examples/tests/doc_examples/valid/queue.md_example_2/main.w
@@ -0,0 +1,16 @@
+// This file was auto generated from an example found in: queue.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let q = new cloud.Queue();
+
+new cloud.Function(inflight () => {
+  q.push("message a");
+  q.push("message b", "message c", "message d");
+  log("approxSize is ${q.approxSize()}");
+  log("popping message ${q.pop()!}");
+  log("popping message ${q.pop()!}");
+  log("approxSize is ${q.approxSize()}");
+  q.purge();
+  log("approxSize is ${q.approxSize()}");
+});
diff --git a/examples/tests/doc_examples/valid/queue.md_example_3/main.w b/examples/tests/doc_examples/valid/queue.md_example_3/main.w
new file mode 100644
index 00000000000..006252a9782
--- /dev/null
+++ b/examples/tests/doc_examples/valid/queue.md_example_3/main.w
@@ -0,0 +1,11 @@
+// This file was auto generated from an example found in: queue.md_example_3
+// Example metadata: {"valid":true}
+bring cloud;
+
+let dlq = new cloud.Queue() as "dead-letter queue";
+let q = new cloud.Queue(
+  dlq: { 
+    queue: dlq,
+    maxDeliveryAttempts: 2
+  }
+);
diff --git a/examples/tests/doc_examples/valid/queue.md_example_4/main.w b/examples/tests/doc_examples/valid/queue.md_example_4/main.w
new file mode 100644
index 00000000000..fb2d7cb32a6
--- /dev/null
+++ b/examples/tests/doc_examples/valid/queue.md_example_4/main.w
@@ -0,0 +1,10 @@
+// This file was auto generated from an example found in: queue.md_example_4
+// Example metadata: {"valid":true}
+bring cloud;
+bring aws;
+
+let outbox = new aws.QueueRef("arn:aws:sqs:us-east-1:111111111111:Outbox");
+
+new cloud.Function(inflight () => {
+  outbox.push("send an email");
+});
diff --git a/examples/tests/doc_examples/valid/schedule.md_example_1/main.w b/examples/tests/doc_examples/valid/schedule.md_example_1/main.w
new file mode 100644
index 00000000000..68808a3ae87
--- /dev/null
+++ b/examples/tests/doc_examples/valid/schedule.md_example_1/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: schedule.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let schedule = new cloud.Schedule(cron: "* * * * *");
+
+schedule.onTick(inflight () => {
+  log("schedule: triggered");
+});
diff --git a/examples/tests/doc_examples/valid/schedule.md_example_2/main.w b/examples/tests/doc_examples/valid/schedule.md_example_2/main.w
new file mode 100644
index 00000000000..409cbd0be76
--- /dev/null
+++ b/examples/tests/doc_examples/valid/schedule.md_example_2/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: schedule.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let schedule = new cloud.Schedule(rate: 1m);
+
+schedule.onTick(inflight () => {
+  log("schedule: triggered");
+});
diff --git a/examples/tests/doc_examples/valid/secret.md_example_1/main.w b/examples/tests/doc_examples/valid/secret.md_example_1/main.w
new file mode 100644
index 00000000000..09598b0638f
--- /dev/null
+++ b/examples/tests/doc_examples/valid/secret.md_example_1/main.w
@@ -0,0 +1,7 @@
+// This file was auto generated from an example found in: secret.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let secret = new cloud.Secret(
+  name: "my-secret", // optional, defaults to a generated name
+);
diff --git a/examples/tests/doc_examples/valid/secret.md_example_2/main.w b/examples/tests/doc_examples/valid/secret.md_example_2/main.w
new file mode 100644
index 00000000000..b4a310d0b84
--- /dev/null
+++ b/examples/tests/doc_examples/valid/secret.md_example_2/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: secret.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let secret = new cloud.Secret(
+  name: "my-api-key",
+);
+
+new cloud.Function(inflight () => {
+  let secretValue = secret.value(); // retrieve the secret as a `str` value
+  let secretValueAsJson = secret.valueJson(); // retrieve the secret as a `Json` value
+});
diff --git a/examples/tests/doc_examples/valid/topic.md_example_1/main.w b/examples/tests/doc_examples/valid/topic.md_example_1/main.w
new file mode 100644
index 00000000000..749c67e6b4d
--- /dev/null
+++ b/examples/tests/doc_examples/valid/topic.md_example_1/main.w
@@ -0,0 +1,5 @@
+// This file was auto generated from an example found in: topic.md_example_1
+// Example metadata: {"valid":true}
+bring cloud;
+
+let topic = new cloud.Topic();
diff --git a/examples/tests/doc_examples/valid/topic.md_example_2/main.w b/examples/tests/doc_examples/valid/topic.md_example_2/main.w
new file mode 100644
index 00000000000..d09ea4f2ced
--- /dev/null
+++ b/examples/tests/doc_examples/valid/topic.md_example_2/main.w
@@ -0,0 +1,9 @@
+// This file was auto generated from an example found in: topic.md_example_2
+// Example metadata: {"valid":true}
+bring cloud;
+
+let topic = new cloud.Topic();
+
+topic.onMessage(inflight (message: str) => {
+  log("Topic published message: {message}");
+});
diff --git a/examples/tests/doc_examples/valid/topic.md_example_3/main.w b/examples/tests/doc_examples/valid/topic.md_example_3/main.w
new file mode 100644
index 00000000000..169262a6f29
--- /dev/null
+++ b/examples/tests/doc_examples/valid/topic.md_example_3/main.w
@@ -0,0 +1,11 @@
+// This file was auto generated from an example found in: topic.md_example_3
+// Example metadata: {"valid":true}
+bring cloud;
+
+let queue = new cloud.Queue();
+queue.setConsumer(inflight (message: str) => {
+  log("Topic published message: {message}");
+});
+
+let topic = new cloud.Topic();
+topic.subscribeQueue(queue);
diff --git a/examples/tests/doc_examples/valid/topic.md_example_4/main.w b/examples/tests/doc_examples/valid/topic.md_example_4/main.w
new file mode 100644
index 00000000000..1180617f329
--- /dev/null
+++ b/examples/tests/doc_examples/valid/topic.md_example_4/main.w
@@ -0,0 +1,12 @@
+// This file was auto generated from an example found in: topic.md_example_4
+// Example metadata: {"valid":true}
+bring cloud;
+
+let topic = new cloud.Topic();
+
+inflight () => {
+  topic.publish(
+    "Topics can now publish",
+    "multiple messages at once"
+  );
+};
diff --git a/examples/tests/doc_examples/valid/topic.md_example_5/main.w b/examples/tests/doc_examples/valid/topic.md_example_5/main.w
new file mode 100644
index 00000000000..28f99045003
--- /dev/null
+++ b/examples/tests/doc_examples/valid/topic.md_example_5/main.w
@@ -0,0 +1,25 @@
+// This file was auto generated from an example found in: topic.md_example_5
+// Example metadata: {"valid":true}
+bring cloud;
+
+// First we create a topic
+let topic = new cloud.Topic();
+
+// Then we define a consumer inflight handler
+let consumerHandler = inflight(message: str) => {
+  log("Doing some work with message: {message}");
+};
+
+// Now we can use a preflight method of topic to register the consumer handler
+// to be invoked when a message is published to the topic.
+topic.onMessage(consumerHandler);
+
+// Then we define the producer inflight handler
+let publisherHandler = inflight () => {
+  // Here we use the inflight api to publish a message to the topic.
+  topic.publish("Here are those launch codes you asked for.");
+};
+
+// Finally we can use multiple resources to invoke our publisher handler
+// for simplicity sake we will just use a function.
+new cloud.Function(publisherHandler);
diff --git a/examples/tests/error/fail_to_start_simulator.test.w b/examples/tests/error/fail_to_start_simulator.test.w
new file mode 100644
index 00000000000..170d0a1521d
--- /dev/null
+++ b/examples/tests/error/fail_to_start_simulator.test.w
@@ -0,0 +1,18 @@
+/*\
+skipPlatforms:
+  - win32
+  - darwin
+\*/
+
+bring sim;
+bring cloud;
+
+let x = new sim.Container(
+  name: "pull-failure",
+  image: "foo://do-not-pull-me",
+  containerPort: 1234,
+);
+
+test "dep_on_failing_resource" {
+   log(x.hostPort!);
+}
diff --git a/examples/tests/error/inflight_stacktraces.test.w b/examples/tests/error/inflight_stacktraces.test.w
new file mode 100644
index 00000000000..3a676411ee9
--- /dev/null
+++ b/examples/tests/error/inflight_stacktraces.test.w
@@ -0,0 +1,28 @@
+bring cloud;
+bring expect;
+
+let bucket = new cloud.Bucket();
+
+test "assert" {
+  assert(false);
+}
+
+test "expect.equal" {
+  expect.equal(1,2 );
+}
+
+test "bucket failed delete" {
+  bucket.delete("doesn't exist", mustExist: true);
+}
+
+test "throw from closure" {
+  let closure = inflight () => {
+    throw "ouch";
+  };
+  closure();
+}
+
+test "assert with message" {
+  let x = false;
+  assert(x, "x is false");
+}
diff --git a/examples/tests/error/invalid-token.test.w b/examples/tests/error/invalid-token.test.w
new file mode 100644
index 00000000000..37dcb73a218
--- /dev/null
+++ b/examples/tests/error/invalid-token.test.w
@@ -0,0 +1,32 @@
+bring sim;
+bring util;
+
+inflight class MyResourceBackend impl sim.IResource {
+  ctx: sim.IResourceContext;
+  new(ctx: sim.IResourceContext) { this.ctx = ctx; }
+  pub onStop() {}
+}
+
+class MyResource {
+  backend: sim.Resource;
+
+  new() {
+    this.backend = new sim.Resource(inflight (ctx) => {
+      return new MyResourceBackend(ctx);
+    });
+  }
+
+  pub fakeAttr(): str {
+    return this.backend.createToken("fake-attr");
+  }
+}
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  let r = new MyResource();
+  let fakeAttr = r.fakeAttr();
+
+  test "test cannot access unresolved token" {
+    log(fakeAttr);
+  }
+}
diff --git a/examples/tests/error/turbo.json b/examples/tests/error/turbo.json
index 69065399ba4..af4cba7052e 100644
--- a/examples/tests/error/turbo.json
+++ b/examples/tests/error/turbo.json
@@ -2,8 +2,6 @@
   "$schema": "https://turborepo.org/schema.json",
   "extends": ["//"],
   "pipeline": {
-    "topo": {
-      "inputs": ["**", "!node_modules/**", "!**/target/**"]
-    }
+    "topo": {}
   }
 }
diff --git a/examples/tests/invalid/bypass_return.test.w b/examples/tests/invalid/bypass_return.test.w
new file mode 100644
index 00000000000..2733a99bb2e
--- /dev/null
+++ b/examples/tests/invalid/bypass_return.test.w
@@ -0,0 +1,25 @@
+let y: (): num = () => {
+    return "a";
+//         ^^^ Expected type to be "num", but got "str" instead
+};
+
+let wrongReturnInScope = (): num => {
+  if false {
+    return "a";
+         //^^^ Expected type to be "num", but got "str" instead
+  }
+
+  throw "error";
+};
+
+let emptyBody = (): num => {};
+//^ A function whose return type is "num" must return a value
+
+let dfaSatisfied: (): num = () => {
+  if true {
+    return "a";
+  }
+
+  throw "not implemented";
+};
+//^ Expected type to be "num", but got "str" instead
diff --git a/examples/tests/invalid/class.test.w b/examples/tests/invalid/class.test.w
index 6b69e1663a9..4f641a81d35 100644
--- a/examples/tests/invalid/class.test.w
+++ b/examples/tests/invalid/class.test.w
@@ -5,6 +5,17 @@ class C1 {
 // ^ Preflight field "x" is not initialized
 }
 
+class C1_1 {
+  x:num;
+  new() {
+    () => {
+      // This doesn't count as an initialization because it's in a closure that might not be called
+      // and should produce an error.
+      this.x = 1;
+    };
+  }
+}
+
 class C2 {}
 new C2(1);
 //^^^^^^^ Expected 0 argument(s) but got 1
@@ -158,9 +169,60 @@ inflight class Jet extends Plane{
 //  ^^^^^^^^ Expected 1 positional argument(s) but got 0
   }
   constructor() {
-//^^^^^^^^^^^ To declare a initializer, use "init"
+//^^^^^^^^^^^ To declare a constructor, use "new"
   }
 }
 
 new std.Resource();
-//^^^^^^^^^^^^^^^^ Cannot instantiate abstract class "Resource"
\ No newline at end of file
+//^^^^^^^^^^^^^^^^ Cannot instantiate abstract class "Resource"
+
+// Class with field and method of the same name (field comes first)
+class C12 {
+  z: num;
+  z(): num {
+  //^ Symbol "z" is already defined
+    // The method body should still be type checked
+    2 + "2";
+    //^ Expected type to be "num", but got "str" instead
+    this.z == 5; // OK
+    return "hello";
+    //^ Expected type to be "num", but got "str" instead
+  }
+  new() {
+    this.z = 5;
+  }
+  z: str;
+  //^ Symbol "z" is already defined
+  z(): str {
+  //^ Symbol "z" is already defined
+    2 + "2";
+    //^ Expected type to be "num", but got "str" instead
+    return 5;
+    //^ Expected type to be "str", but got "num" instead
+  }
+}
+
+// Class with method and field of the same name (method comes first)
+class C13 {
+  z(): num {
+  //^ Symbol "z" is already defined
+    // The method body should still be type checked
+    2 + "2";
+    //^ Expected type to be "num", but got "str" instead
+    return "hello";
+    //^ Expected type to be "num", but got "str" instead
+  }
+  z: num;
+  new() {
+    this.z = 5;
+  }
+  z(): str {
+  //^ Symbol "z" is already defined
+    2 + "2";
+    //^ Expected type to be "num", but got "str" instead
+    return 5;
+    //^ Expected type to be "str", but got "num" instead
+  }
+  z: str;
+  //^ Symbol "z" is already defined
+}
diff --git a/examples/tests/invalid/constructs.test.w b/examples/tests/invalid/constructs.test.w
new file mode 100644
index 00000000000..eb9e0d63ae3
--- /dev/null
+++ b/examples/tests/invalid/constructs.test.w
@@ -0,0 +1,13 @@
+bring expect;
+
+class A {
+  new() {
+    this.node.hidden;
+    // ^ Error: member "node" does not exist in A
+
+    nodeof(this).hidden; // OK
+
+    nodeof(this).root.node;
+    // ^ Error: member "node" does not exist in IConstruct
+  }
+}
diff --git a/examples/tests/invalid/container_types.test.w b/examples/tests/invalid/container_types.test.w
index 536f10e479f..a877ac061bd 100644
--- a/examples/tests/invalid/container_types.test.w
+++ b/examples/tests/invalid/container_types.test.w
@@ -1,6 +1,6 @@
 //Array tests
 let arr1: Array<num> = [1, "2", 3];
-let arr2 = Array<num> {1, 2, 3};
+let arr2 = Array<num> [1, 2, 3];
 let arr3 = Array<str>["hello"];
 let arr4: Array<num> = arr3;
 arr1.someRandomMethod();
@@ -21,10 +21,10 @@ let m5 = {"a" => 1, "{1+1}" => 2, 1+1 => 3};
 //                               ^^^ Expected type to be "str", but got "num" instead
 
 //Set tests
-let s1: Set<num> = {1, "2", 3};
+let s1: Set<num> = [1, "2", 3];
 let s2 = Set<num> [1, "2", 3];
 let s3: Set<num> = [1, "2", 3];
-let s4 = Set<num>{1,2};
+let s4 = Set<num>[1,2];
 let s5: Set<str> = s4;
 s1.someRandomMethod();
 
@@ -38,10 +38,10 @@ let mm3 = mm2.copyMut();
 //            ^^^^^^^ Unknown symbol "copyMut"
 
 
-let ss1: MutSet<str> = Set{"c"};
+let ss1: MutSet<str> = Set["c"];
 //                        ^^^^^ Expected type to be "MutSet<str>", but got "Set<str>" instead
-let ss2: MutSet<num> = MutSet<num> {true};
+let ss2: MutSet<num> = MutSet<num>[true];
 //                                  ^^^^ Expected type to be "num", but got "bool" instead
-let ss3 = MutSet<bool> {false, true};
+let ss3 = MutSet<bool> [false, true];
 let ss4 = ss3.copyMut();
-//            ^^^^^^^ Unknown symbol "copyMut"
\ No newline at end of file
+//            ^^^^^^^ Unknown symbol "copyMut"
diff --git a/examples/tests/invalid/ctor_super.test.w b/examples/tests/invalid/ctor_super.test.w
new file mode 100644
index 00000000000..d29d3c662c7
--- /dev/null
+++ b/examples/tests/invalid/ctor_super.test.w
@@ -0,0 +1,73 @@
+bring "jsii-fixture" as jf;
+
+/// === Preflight tests ===
+class PreflightBaseWithCtorParam {
+  new(a: num) {}
+}
+
+// Missing ctor so no call to super error
+class PreflighChild1 extends PreflightBaseWithCtorParam {}
+
+// Missing call to super in ctor
+class PreflighChild2 extends PreflightBaseWithCtorParam {
+  new(a: num) {}
+}
+
+// Missing args in call to super in ctor
+class PreflighChild3 extends PreflightBaseWithCtorParam {
+  new() {
+    super();
+  }
+}
+
+/// === Inflight tests ===
+inflight class InflightBaseWithCtorParam {
+  new(a: num) {}
+}
+
+// Missing ctor so no call to super error
+inflight class InflightChild1 extends InflightBaseWithCtorParam {}
+
+// Missing call to super in ctor
+inflight class InflightChild2 extends InflightBaseWithCtorParam {
+  new(a: num) {}
+}
+
+// Missing args in call to super in ctor
+inflight class InflightChild3 extends InflightBaseWithCtorParam {
+  new() {
+    super();
+  }
+}
+
+// Missing super call when inflight inherits phase independent class (jsii)
+inflight class InflightChild4 extends jf.JsiiClass {
+  new() {}
+}
+
+// === Inflight classes defined inflight ===
+inflight () => {
+  class InflightBaseWithCtorParam {
+    new(a: num) {}
+  }
+  
+  // Missing ctor so no call to super error
+  class InflightChild1 extends InflightBaseWithCtorParam {}
+  
+  // Missing call to super in ctor
+  class InflightChild2 extends InflightBaseWithCtorParam {
+    new(a: num) {}
+  }
+  
+  // Missing args in call to super in ctor
+  class InflightChild3 extends InflightBaseWithCtorParam {
+    new() {
+      super();
+    }
+  }
+  
+  // Missing super call when inflight inherits phase independent class (jsii)
+  class InflightChild4 extends jf.JsiiClass {
+    new() {}
+  }
+};
\ No newline at end of file
diff --git a/examples/tests/invalid/equality.test.w b/examples/tests/invalid/equality.test.w
new file mode 100644
index 00000000000..97b04961144
--- /dev/null
+++ b/examples/tests/invalid/equality.test.w
@@ -0,0 +1,79 @@
+// arrays
+
+assert([{a: 1}] == [{a: 1}]);
+
+assert(MutArray<Json>[{a: 1}] == Array<Json>[MutJson{a: 1}]);
+// this is fine- we ignore mutable
+
+assert([1,2] == ["a", "b"]);
+//     ^^^^^^^^^^^^^^^^^^^ Expected type to be "Array<num>", but got "Array<str>" instead
+
+assert(["a", "b"] == [1,2]);
+//     ^^^^^^^^^^^^^^^^^^^ Expected type to be "Array<str>", but got "Array<num>" instead
+
+assert([{a: 1}] == ["1", "2"]);
+//this doesn't throw an error since string is a subtype of json
+
+
+assert(["1", "2"] == [{a: 1}]);
+//     ^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "Array<str>", but got "Array<Json>" instead
+
+assert([["1", "2"]] == [[{a: 1}]]);
+//     ^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "Array<Array<str>>", but got "Array<Array<Json>>" instead
+
+assert({"a" => ["a"]} == {"a" => [1]});
+//     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "Map<Array<str>>", but got "Map<Array<num>>" instead
+
+assert([{"a" => [1]}] == [{"a" => ["a"]}]);
+//     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "Array<Map<Array<num>>>", but got "Array<Map<Array<str>>>" instead
+
+let a1: Array<bool>? = nil;
+let a2: Array<str>? = nil;
+
+assert(a1 == a2);
+//     ^^^^^^^^ Expected type to be "Array<bool>?", but got "Array<str>?" instead
+
+let b1: Array<str> = [];
+let b2: Array<str>? = [];
+
+assert(b1 == b2);
+//     ^^^^^^^^ Expected type to be "Array<str>", but got "Array<str>?" instead
+
+assert([nil] == ["a"]);
+//     ^^^^^^^^^^^^^^ Expected type to be "Array<nil>", but got "Array<str>" instead
+
+assert(Array<Json>[nil] == ["a"]);
+//                 ^^^ Expected type to be "Json", but got "nil" instead. hint: to allow "nil" assignment use optional type: "Json?"
+
+assert(Array<Json?>[nil] == ["a"]);
+// this is ok
+
+
+let c1: num? = nil;
+let c2: str? = nil;
+assert([c1] == [c2]);
+//     ^^^^^^^^^^^^ Expected type to be "Array<num?>", but got "Array<str?>" instead
+
+
+assert([[1]] == [["1"]]);
+//     ^^^^^^^^^^^^^^^^ Expected type to be "Array<Array<num>>", but got "Array<Array<str>>" instead
+
+assert([["1"]] == [[1]]);
+//     ^^^^^^^^^^^^^^^^ Expected type to be "Array<Array<str>>", but got "Array<Array<num>>" instead
+
+let d1 = {"a" => 1};
+let d2 = {"b" => "b"};
+assert(d1 == d2);
+//     ^^^^^^^^ Expected type to be "Map<num>", but got "Map<str>" instead
+
+let e1 = MutSet<bool>[true, true, true];
+let e2 = Set<num>[1,2,3,3,3,2];
+
+assert(e1 == e2);
+//     ^^^^^^^^ Expected type to be "MutSet<bool>", but got "Set<num>" instead
+
+let f1 = Set<num>[1,2,3,3,3,2];
+let f2 = MutSet<num>[1,2,3,3,3,2];
+
+assert(f1 == f2);
+// this is ok
\ No newline at end of file
diff --git a/examples/tests/invalid/explicit_lift_qualification.test.w b/examples/tests/invalid/explicit_lift_qualification.test.w
new file mode 100644
index 00000000000..2931e18795a
--- /dev/null
+++ b/examples/tests/invalid/explicit_lift_qualification.test.w
@@ -0,0 +1,46 @@
+bring cloud;
+
+interface IPreflightInterface {
+  inflight method(): void;
+}
+class PreflightClass impl IPreflightInterface {
+  pub inflight method(): void {}
+  pub static inflight static_method() {}
+
+  preflight_method() {
+    lift {bucket: [put]}{} // Lift statment in preflight method
+  }
+}
+
+let bucket = new cloud.Bucket();
+
+let prelight_string = "hi";
+let preflight_class = new PreflightClass();
+
+// Lift statement in preflight global scope
+lift {bucket: [put]}{}
+
+class Foo {
+  pub inflight mehtod1() {
+    let b = bucket;
+    lift {b: [put]}{} // Explicit qualification with inflight object
+    lift {prelight_string: contains}{} // Explicit qualification on preflight non-class
+    lift {bucket: [shoot]}{} // Explicit qualification with unknown member
+    lift {bucket: shoot}{} // Explicit qualification with unknown, single method format
+    lift {not_bucket: put, not_bucket_again: get}{} // Explicit qualification with unknown objects
+    lift {bucket: addObject}{} // Explicit qualification with preflight method op
+    lift {preflight_class: static_method}{} // Explicit qualification with static method
+  }
+
+  pub inflight method2() {
+    let b = bucket;
+    b.put("k", "v"); // With no explicit qualification this should be an error
+
+    let b2 = bucket;
+    lift {bucket: put}{}
+    b2.put("k", "v"); // With explicit qualification, but outside of lift block, this should be an error
+
+    let i: IPreflightInterface = preflight_class;
+    i.method(); // With no explicit qualification this should be an error
+  }
+}
diff --git a/examples/tests/invalid/extern_static.test.w b/examples/tests/invalid/extern_static.test.w
index 8efcc58d8b2..6d055e48d46 100644
--- a/examples/tests/invalid/extern_static.test.w
+++ b/examples/tests/invalid/extern_static.test.w
@@ -1,4 +1,4 @@
 class Foo {
-  extern "../valid/external_js.js" inflight getGreeting(name: str): str;
+  extern "../valid/external_ts.ts" inflight getGreeting(name: str): str;
                                     //^ Error: extern methods must be declared "static"
 }
diff --git a/examples/tests/invalid/function_type.test.w b/examples/tests/invalid/function_type.test.w
index 9f3acb21e02..4ecadded32b 100644
--- a/examples/tests/invalid/function_type.test.w
+++ b/examples/tests/invalid/function_type.test.w
@@ -1,10 +1,3 @@
-// function type with no return type
-let my_func = (callback: (num)) => {  };
-//                       ^^^^^ Expected function return type
-let my_func2 = (callback: ((num)): (str)) => {  };
-//                                 ^^^^^ Expected function return type
-//                         ^^^^^ Expected function return type
-
 // interface methods with no return type
 interface IFace {
   my_method(x: num);
diff --git a/examples/tests/invalid/global_symbols.test.w b/examples/tests/invalid/global_symbols.test.w
new file mode 100644
index 00000000000..877b6b545c0
--- /dev/null
+++ b/examples/tests/invalid/global_symbols.test.w
@@ -0,0 +1,17 @@
+let log = "hi";
+// ^Error: Symbol "log" already defined in this scope
+let assert = "there";
+// ^Error: Symbol "assert" already defined in this scope
+let unsafeCast = "wingnuts";
+// ^Error: Symbol "unsafeCast" already defined in this scope
+let nodeof = "!";
+// ^Error: Symbol "nodeof" already defined in this scope
+
+log = "hi";
+// ^Error: Variable is not reassignable
+assert = "there";
+// ^Error: Variable is not reassignable
+unsafeCast = "wingnuts";
+// ^Error: Variable is not reassignable
+nodeof = "!";
+// ^Error: Variable is not reassignable
diff --git a/examples/tests/invalid/immutable_container_types.test.w b/examples/tests/invalid/immutable_container_types.test.w
index c97c93ec9dd..ef683e1b688 100644
--- a/examples/tests/invalid/immutable_container_types.test.w
+++ b/examples/tests/invalid/immutable_container_types.test.w
@@ -1,7 +1,7 @@
 let m1 = Map<str>{"a" => "hi"};
 
 m1.set("a", "bye");
-// ^^^ Unknown symbol "set" (TODO: better error message https://github.com/winglang/wing/issues/1660)
+// ^^^ Member "set" doesn't exist in "Map" (TODO: better error message https://github.com/winglang/wing/issues/1660)
 
 let m2: Map<str> = MutMap<str> {};
 //                 ^^^^^^^^^^^^^^ Expected type to be "Map<str>", but got "MutMap<str>" instead
@@ -9,25 +9,25 @@ let m3 = Map<bool> { "a" => "A" };
 //                          ^^^ Expected type to be "bool", but got "str" instead
 let m4 = {"1" => 1, "2" => 2 };
 m4.set("2", 3);
-// ^^^ Unknown symbol "set"
+// ^^^ Member "set" doesn't exist in "Map"
 let m5 = m4.copy();
-//          ^^^^ Unknown symbol "copy"
+//          ^^^^ Member "copy" doesn't exist in "Map"
 m4.delete("1");
-// ^^^^^^ Unknown symbol "delete"
+// ^^^^^^ Member "delete" doesn't exist in "Map"
 m4.clear();
-// ^^^^^ Unknown symbol "clear"
+// ^^^^^ Member "clear" doesn't exist in "Map"
 
 
-let s1: Set<Array<num>> = MutSet<Array<num>> {[1]};
+let s1: Set<Array<num>> = MutSet<Array<num>>[[1]];
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "Set<Array<num>>", but got "MutSet<Array<num>>" instead
-let s2 = Set<str> {"a", "b", "c"};
+let s2 = Set<str> ["a", "b", "c"];
 s2.delete("a");
-// ^^^^^^ Unknown symbol "delete"
+// ^^^^^^ Member "delete" doesn't exist in "Set"
 s2.add("d");
-// ^^^ Unknown symbol "add"
+// ^^^ Member "add" doesn't exist in "Set"
 let s3 = s2.copy();
-//          ^^^^ Unknown symbol "copy"
+//          ^^^^ Member "copy" doesn't exist in "Set"
 s2.clear();
-// ^^^^^ Unknown symbol "clear"
-let s4: Set<bool> = {[3]};
-//                  ^^^^^ Expected type to be "Set<bool>", but got "Set<Array<num>>" instead
\ No newline at end of file
+// ^^^^^ Member "clear" doesn't exist in "Set"
+let s4: Set<bool> = Set<bool>[[3]];
+//                  ^^^^^ Expected type to be "Set<bool>", but got "Set<Array<num>>" instead
diff --git a/examples/tests/invalid/indexing.test.w b/examples/tests/invalid/indexing.test.w
new file mode 100644
index 00000000000..57284381c60
--- /dev/null
+++ b/examples/tests/invalid/indexing.test.w
@@ -0,0 +1,44 @@
+bring cloud;
+bring expect;
+
+let arr = Array<num>[1, 2, 3];
+
+arr[0] = 5;
+// ^ error: Cannot update elements of an immutable array
+
+arr["key"];
+// ^ error: Expected type to be "num", but got "str" instead
+
+let b = new cloud.Bucket();
+b[0] = 5;
+// ^ error: Type "Bucket" is not indexable
+
+let optarr: Array<num>? = [1, 2, 3];
+optarr[0] = 5;
+// ^ error: Type "Array<num>?" is not indexable
+
+let map = Map<num>{"us-east-1" => 5, "us-west-2" => 8};
+map[0];
+// ^ error: Expected type to be "str", but got "num" instead
+
+let mutmap = Map<bool>{ "a" => true, "b" => false };
+mutmap["a"] = false;
+// ^ error: Cannot update elements of an immutable map
+
+let json = Json.parse("\{\"a\": 5}");
+json[0] = 5;
+// ^ error: Cannot update elements of an immutable Json
+
+let s = "hello";
+s[0] = "H";
+// ^ error: Strings are immutable
+
+let var x = 3 + "hello";
+x["hi"] = 4;
+// ^ error: Unsupported reassignment of element of type unresolved
+
+let f = (x): Array<str> => {
+  log(x[0]);
+  // ^ error: Indexing into an inferred type is not supported
+  return x;
+};
diff --git a/examples/tests/invalid/inference.test.w b/examples/tests/invalid/inference.test.w
index 1c0cb17bda1..60b9b684072 100644
--- a/examples/tests/invalid/inference.test.w
+++ b/examples/tests/invalid/inference.test.w
@@ -84,11 +84,11 @@ class NeedAnnotations {
 let badFunc: inflight (str): void = inflight (arg1: num) => {};
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "inflight (str): void", but got "inflight (arg1: num): unknown" instead
 
+struct SS {
+  a: Array<num>;
+  b: Array<str>;
+}
 (a) => {
-  struct SS {
-    a: Array<num>;
-    b: Array<str>;
-  }
   let jsonDoubleInference: SS = {
     a: a,
     b: a,
@@ -112,3 +112,12 @@ let unknownArg = (arg) => {
 if true {
   unknownArg({ a: true });
 }
+
+let takesOptionalClosure = (fn: ((num): num)?) => {};
+takesOptionalClosure((a) => {
+  let s: str = a;
+  //           ^ Expected type to be "str", but got "num" instead
+  return "";
+  //     ^^ Expected type to be "str", but got "num" instead
+});
+
diff --git a/examples/tests/invalid/inflight_class_dup_init.test.w b/examples/tests/invalid/inflight_class_dup_init.test.w
index 841581c449a..5fcab9a299b 100644
--- a/examples/tests/invalid/inflight_class_dup_init.test.w
+++ b/examples/tests/invalid/inflight_class_dup_init.test.w
@@ -6,5 +6,5 @@ inflight class Foo {
   inflight new() {
 
   }
-//^ Multiple inflight initializers defined in class Foo
+//^ Multiple inflight constructors defined in class Foo
 }
diff --git a/examples/tests/invalid/inflight_class_interface_structural_typing.test.w b/examples/tests/invalid/inflight_class_interface_structural_typing.test.w
index d5c3d5dba9d..b5247675078 100644
--- a/examples/tests/invalid/inflight_class_interface_structural_typing.test.w
+++ b/examples/tests/invalid/inflight_class_interface_structural_typing.test.w
@@ -1,7 +1,7 @@
 bring cloud;
 
-interface IGoo {
-  inflight notHandle(): void;
+inflight interface IGoo {
+  notHandle(): void;
 }
 
 inflight class NotGoo {
diff --git a/examples/tests/invalid/inflight_intrinsic.test.w b/examples/tests/invalid/inflight_intrinsic.test.w
new file mode 100644
index 00000000000..1d33c6465af
--- /dev/null
+++ b/examples/tests/invalid/inflight_intrinsic.test.w
@@ -0,0 +1,6 @@
+let funkPath = "./path.ts";
+let func: inflight (): str = @inflight(funkPath, lifts: [
+//                   ^^^^^^^^ Must be a string literal
+  { obj: [1, 2, 3] }
+//^^^^^^^^^^^^^^^^^^ alias is required because object is not an identifier
+]);
diff --git a/examples/tests/invalid/interface.test.w b/examples/tests/invalid/interface.test.w
index 3c6a6851d00..611f5172955 100644
--- a/examples/tests/invalid/interface.test.w
+++ b/examples/tests/invalid/interface.test.w
@@ -1,3 +1,5 @@
+bring "jsii-fixture" as jsii_fixture;
+
 // interface extend loop
 interface IA extends IB {
                   // ^^ Unknown symbol "IB"
@@ -29,4 +31,39 @@ interface IWithSameName {
 interface INoProps {
   bar: str;
 //^^^^^^^^ interfaces can't have properties 
+}
+
+// interfaces can't have access modifiers in their method signatures
+interface IPointy {
+  pub method2(): str;  
+//^^^ Access modifiers are not allowed in interfaces
+}
+
+// interface parameters must have types
+interface IMissingParamTypes {
+  method1(a, b): void;
+  //^ Expected type annotation
+}
+
+// Can't implement preflight interface on inflight class
+interface IPreflight {
+  method1(): void;
+}
+inflight class CImplPreflightIface impl IPreflight {
+  pub method1(): void {}
+}
+
+// Can't extend preflight interface on inflight interface
+inflight interface IInflightExtendsPreflight extends IPreflight {
+  method2(): void;
+}
+
+// Inflight interfaces can't extend JSII interfaces
+inflight interface IInflightExtendsJsii extends jsii_fixture.ISomeInterface {
+  method(): void;
+}
+
+// Inflight classes can't implement JSII interfaces
+inflight class CInflightImplJsii impl jsii_fixture.ISomeInterface {
+  pub method(): void {}
 }
\ No newline at end of file
diff --git a/examples/tests/invalid/intrinsics.test.w b/examples/tests/invalid/intrinsics.test.w
new file mode 100644
index 00000000000..458ab47823a
--- /dev/null
+++ b/examples/tests/invalid/intrinsics.test.w
@@ -0,0 +1,7 @@
+inflight () => {
+  let x = @dirname;
+//        ^^^^^^^^ @dirname cannot be used inflight
+};
+
+let path = @dirname();
+//                 ^^ Unexpected arguments
diff --git a/examples/tests/invalid/json.test.w b/examples/tests/invalid/json.test.w
index 5550be661f7..f3d610fcb69 100644
--- a/examples/tests/invalid/json.test.w
+++ b/examples/tests/invalid/json.test.w
@@ -17,7 +17,7 @@ let a: Array<str> = j;
 // Immutable Json
 let foreverJson = Json {a: "hello"};
 foreverJson.set("a", "world!");
-//          ^^^ Unknown symbol "set" (TODO: better error message https://github.com/winglang/wing/issues/1660) 
+//          ^^^ Member "set" doesn't exist in "Json" (TODO: better error message https://github.com/winglang/wing/issues/1660)
 
 let bkt = new cloud.Bucket();
 let jArr = Json [bkt];
@@ -58,16 +58,17 @@ let notJsonMissingField: StructyJson = {
 };
 //^ Missing required field "maybe" from "StructyJson"
 
-let notJsonMissingFieldArray: Map<Set<Array<StructyJson>>> = {
-  "1" => {[ 
+let notJsonMissingFieldArray = {
+  "1" => Set<Array<StructyJson>> [[
     {
       foo: "bar",
       stuff: [],
     }
   //^ Missing required field "maybe" from "StructyJson"
-  ]}
+  ]]
 };
 
+
 let notJsonBadNesting: StructyJson = {
   foo: "bar",
   stuff: [1, 2, 3],
@@ -113,3 +114,24 @@ let notAStruct = {
 
 let isBucket = Json new cloud.Bucket();
 //                  ^^^^^^^^^^^^^^^^^^ "Bucket" is not a legal JSON value
+
+let objInsteadOfArray: StructyJson = {
+  stuff: {a: 1}, // Error: expeced an array but got a JSON object
+  foo: "bar",
+  maybe: {
+    good: true,
+  }
+};
+
+// Unkonwn variable in json object punning
+{"x":1, y: 2, unknownVar};
+// Unknown variable in explicitly typed json object punning
+Json {"x":1, y: 2, unknownVar};
+// Duplicate field in punned json
+let numField = 1;
+{numField, numField};
+{numField: 5, numField};
+
+// Wrong type when using punning
+let bucket = new cloud.Bucket();
+Json { bucket };
diff --git a/examples/tests/invalid/json_static.test.w b/examples/tests/invalid/json_static.test.w
index 3dd4fe1ccab..bf1efd4d03b 100644
--- a/examples/tests/invalid/json_static.test.w
+++ b/examples/tests/invalid/json_static.test.w
@@ -2,4 +2,4 @@ let immutObj = Json {a: 123, b: "hello", c: [1, 2, 3]};
 let mutObj = Json.deepCopyMut(immutObj);
 
 immutObj.set("a", "foo");
-//       ^^^ Unknown symbol "set" (TODO: better error message https://github.com/winglang/wing/issues/1660) 
+//       ^^^ Member "set" doesn't exist in "Json" (TODO: better error message https://github.com/winglang/wing/issues/1660) 
diff --git a/examples/tests/invalid/lib/extern_above.w b/examples/tests/invalid/lib/extern_above.w
new file mode 100644
index 00000000000..12cfea9af23
--- /dev/null
+++ b/examples/tests/invalid/lib/extern_above.w
@@ -0,0 +1,4 @@
+class Foo1 {
+  extern "../../valid/external_ts.ts" static getGreeting(name: str): str;
+       //^ must be a sub directory of the entrypoint
+}
diff --git a/examples/tests/invalid/map_entries.test.w b/examples/tests/invalid/map_entries.test.w
new file mode 100644
index 00000000000..6e3dce24386
--- /dev/null
+++ b/examples/tests/invalid/map_entries.test.w
@@ -0,0 +1,3 @@
+let mapToNumber = { "foo" => 1, "bar" => 2 };
+let someStr: str = mapToNumber.entries().at(0).value;
+//                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "str", but got "num" instead
diff --git a/examples/tests/invalid/missing_return.test.w b/examples/tests/invalid/missing_return.test.w
new file mode 100644
index 00000000000..b9a07216e79
--- /dev/null
+++ b/examples/tests/invalid/missing_return.test.w
@@ -0,0 +1,43 @@
+let returnString = inflight (): str => {
+  log("i am not going to return anything!");
+};
+//^ A function whose return type is "str" must return a value.
+
+let returnStringInferred = inflight () => {
+  return "i am a returned value!";
+};
+
+let callInflight = inflight () => {
+  let name: str = returnStringInferred();
+};
+
+let returnOption = inflight (): str? => {
+  log("i am not going to return anything!");
+};
+// no error - there is implicit "return nil" at the end of the function
+
+// TODO: analyzing all control flow paths - this should be an error
+// https://github.com/winglang/wing/issues/457
+let returnString2 = inflight (): str => {
+  if false {
+    return "hi";
+  }
+};
+
+// Ignore return statements in inner closures when searching for return statements
+let returnString3 = (): str => {
+  let x = (): str => {
+    return "what?"; // This should be ignored and we should produce a missing return error
+  };
+};
+//^ A function whose return type is "str" must return a value.
+
+// Ignore return statements in inner methods when searching for return statements
+let returnString4 = (): str => {
+  class Foo {
+    pub static blah(): num {
+      return 5;
+    }
+  }
+};
+//^ A function whose return type is "str" must return a value.
diff --git a/examples/tests/invalid/missing_semicolon.test.w b/examples/tests/invalid/missing_semicolon.test.w
index 5897e4048d9..0b24a725b00 100644
--- a/examples/tests/invalid/missing_semicolon.test.w
+++ b/examples/tests/invalid/missing_semicolon.test.w
@@ -4,12 +4,12 @@ let b = new cloud.Bucket() as "Eyal Keren";
 let q1 = new cloud.Queue() as "q1";
 let q2 = new cloud.Queue() as "q2";
 
-q1.setConsumer(inflight (m:str): str => {
+q1.setConsumer(inflight (m:str) => {
   b.put("1.txt", "Hello, {m}"); 
 })
 //^ Expected ';'
 
-q2.setConsumer(inflight (m:str): str => {
+q2.setConsumer(inflight (m:str) => {
   b.put("2.txt", "Hello, {m}"); 
 });
 
@@ -17,4 +17,4 @@ let x = 5 //
       //^ ';' expected
 
 if (x > 10) {
-           //^ '}' expected
\ No newline at end of file
+           //^ '}' expected
diff --git a/examples/tests/invalid/mut_container_types.test.w b/examples/tests/invalid/mut_container_types.test.w
index 8dcbad97d69..d179b111b8b 100644
--- a/examples/tests/invalid/mut_container_types.test.w
+++ b/examples/tests/invalid/mut_container_types.test.w
@@ -1,16 +1,15 @@
 //Array tests
 let arr1 = MutArray<num>[1, "2", 3];
-let arr2 = MutArray<num>{1, 2, 3};
 let arr3: MutArray<num> = [1, 2, 3]; // https://github.com/winglang/wing/issues/1117
 let arr4 = MutArray<str>["a","b"];
 let arr5: MutArray<num> = arr4;
 arr1.someMethod();
 
 //Set tests
-let s1 = MutSet<num>{1, "2", 3};
+let s1 = MutSet<num>[1, "2", 3];
 let s2 = MutSet<num>[1, "2", 3];
-let s3: MutSet<num> = {1, 1, 3}; // https://github.com/winglang/wing/issues/1117
-let s4 = MutSet<str>{"hi"};
+let s3 = MutSet<num> [1, 1, 3];
+let s4 = MutSet<str>["hi"];
 let s5: MutSet<num> = s4;
 s3.someMethod();
 
diff --git a/examples/tests/invalid/new_in_static_without_scope.test.w b/examples/tests/invalid/new_in_static_without_scope.test.w
deleted file mode 100644
index 0410d0e610b..00000000000
--- a/examples/tests/invalid/new_in_static_without_scope.test.w
+++ /dev/null
@@ -1,15 +0,0 @@
-// since MyClass is a preflight class, it can only be created in from a static context with an
-// explicit `scope`.
-bring cloud;
-
-class MyClass {
-  pub static createBucket(): cloud.Bucket {
-    return new cloud.Bucket();
-  }
-  pub static createMyClass(): MyClass {
-    return new MyClass();
-  }
-}
-
-MyClass.createMyClass();
-MyClass.createBucket();
\ No newline at end of file
diff --git a/examples/tests/invalid/optionals.test.w b/examples/tests/invalid/optionals.test.w
index 844aaeba0f9..56bc1c3c521 100644
--- a/examples/tests/invalid/optionals.test.w
+++ b/examples/tests/invalid/optionals.test.w
@@ -93,4 +93,26 @@ let val: str = baz?.bar?.foo?.val;
 
 let optionalFunction = Json.tryParse("")?.asStr;
 optionalFunction();
-//^ Cannot call optional function (unless it's part of a reference)
\ No newline at end of file
+//^ Cannot call optional function (unless it's part of a reference)
+
+let optionalFunctionWithNoRetType: ()? = () => {};
+//                                 ^^ Unexpected syntax
+
+// Pass incorrect optional function type to a function
+let functionWithOptionalFuncParam1: ((num):void)? = (x: str):void => {};
+//                                                  ^^^^^^^^^^^^^^^^^^^ Expected type to be "(preflight (num): void)?", but got "preflight (x: str): void" instead
+let functionWithOptionalFuncParam2: (():num)? = ():str => { return "s"; };
+//                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be "(preflight (): num)?", but got "preflight (): str" instead
+
+// Unwrap non-optional type
+
+let nonOptional: num = 10;
+let unwrapValue = nonOptional!;
+//                ^^^^^^^^^^^ '!' expects an optional type, found "num"
+
+let nonOptionalFn = (): num => {
+  return 10;
+};
+let unwrapValueFn = nonOptionalFn()!;
+//                  ^^^^^^^^^^^^^^^ '!' expects an optional type, found "num"
+
diff --git a/examples/tests/invalid/package.json b/examples/tests/invalid/package.json
index 0cac08025cd..b5877f9cfc8 100644
--- a/examples/tests/invalid/package.json
+++ b/examples/tests/invalid/package.json
@@ -1,9 +1,10 @@
 {
   "name": "examples-invalid",
   "dependencies": {
-    "cdktf": "0.17.0",
-    "constructs": "^10.2.70",
-    "jsii-code-samples": "1.7.0"
+    "cdktf": "0.20.3",
+    "constructs": "^10.3",
+    "jsii-code-samples": "1.7.0",
+    "jsii-fixture": "workspace:^"
   },
   "volta": {
     "extends": "../../../package.json"
diff --git a/examples/tests/invalid/parameters.test.w b/examples/tests/invalid/parameters.test.w
new file mode 100644
index 00000000000..71b00933910
--- /dev/null
+++ b/examples/tests/invalid/parameters.test.w
@@ -0,0 +1,12 @@
+let app = nodeof(this).app;
+
+struct MyParams {
+  foo: str;
+}
+
+app.parameters.addSchema(MyParams.schema());
+
+// Error: Parameter validation errors:
+// - must have required property 'foo'
+
+// (hint: make sure to use --values to provide the required parameters file)
diff --git a/examples/tests/invalid/primitives.test.w b/examples/tests/invalid/primitives.test.w
index cd91f9ed207..01771f7c4b4 100644
--- a/examples/tests/invalid/primitives.test.w
+++ b/examples/tests/invalid/primitives.test.w
@@ -2,13 +2,10 @@ let x = "1,2,3";
 let y = x.split(",");
       //^ x is not a class
 
-log(y[0]);
-     //^ no array indexing
-
 let arr = [1, 2, 3];
 let join = arr.blabla(",");
-             //^ blabla is not a valid method
+             //^ Property "blabla" doesn't not exist in "Array"
 arr.push(4);
-  //^ push is not a valid method (array is immutable)
+  //^ Property "push" doesn't not exist in "Array"
 let n: str = arr.at(0);
            //^ expected str, got num
diff --git a/examples/tests/invalid/private_constructor.test.w b/examples/tests/invalid/private_constructor.test.w
new file mode 100644
index 00000000000..51cf7bc07b6
--- /dev/null
+++ b/examples/tests/invalid/private_constructor.test.w
@@ -0,0 +1,6 @@
+bring "jsii-fixture" as jsii_fixture;
+
+new jsii_fixture.JsiiClassWithPrivateConstructor();
+// error: constructor is private and only accessible within class "JsiiClassWithPrivateConstructor"
+
+jsii_fixture.JsiiClassWithPrivateConstructor.makeInstance(); // OK
diff --git a/examples/tests/invalid/resource_captures.test.w b/examples/tests/invalid/resource_captures.test.w
index 84c0a41c66a..bf9dec893f0 100644
--- a/examples/tests/invalid/resource_captures.test.w
+++ b/examples/tests/invalid/resource_captures.test.w
@@ -11,8 +11,8 @@ class Foo {
 
   inflight test() {
     let b = this.bucket;
-//          ^^^^^^^^^^^ Unable to qualify which operations are performed on 'this.bucket' of type 'Bucket'. This is not supported yet.
     b.put("hello", "world");
+//  ^ Expression of type "Bucket" references an unknown preflight object
 
     this.collectionOfResources.at(0).put("hello", "world");
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Capturing collection of resources is not supported yet (type is 'Array<Bucket>')
diff --git a/examples/tests/invalid/sim_resource.test.w b/examples/tests/invalid/sim_resource.test.w
new file mode 100644
index 00000000000..6ae45344814
--- /dev/null
+++ b/examples/tests/invalid/sim_resource.test.w
@@ -0,0 +1,54 @@
+bring cloud;
+bring sim;
+
+interface IPreflightInterface {}
+
+inflight interface IInflightInterface {}
+
+struct MyStructWithNonSerializableTypes {
+  a: duration;
+  b: Set<num>;
+}
+
+inflight class ResourceBackend impl sim.IResource {
+  pub onStop() {}
+
+  pub methodWithMutJsons(a: MutJson): MutJson { return {}; }
+  // ^ error: Parameter "a" cannot have mutable type "MutJson" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+  pub methodWithMuArrays(a: MutArray<str>, b: MutArray<num>): MutArray<bool> {
+    // ^ error: Parameter "a" cannot have mutable type "MutArray<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return MutArray<bool>[];
+  }
+  pub methodWithSets(a: Set<str>, b: Set<num>): Set<bool> {
+    // ^ error: Parameter "a" cannot have non-serializable type "Set<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return Set<bool>[];
+  }
+  pub methodWithMutSets(a: MutSet<str>, b: MutSet<num>): MutSet<bool> {
+    // ^ error: Parameter "a" cannot have mutable type "MutSet<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return MutSet<bool>[];
+  }
+  pub methodWithMutMaps(a: MutMap<num>, b: MutMap<str>): MutMap<bool> {
+    // ^ error: Parameter "a" cannot have mutable type "MutMap<num>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return MutMap<bool>{};
+  }
+  pub methodWithDurations(a: duration): duration {
+    // ^ error: Parameter "a" cannot have non-serializable type "duration" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return 0s;
+  }
+  pub methodWithClasses(a: cloud.Bucket): cloud.Queue? {
+    // ^ error: Parameter "a" cannot have non-serializable type "cloud.Bucket" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return nil;
+  }
+  pub methodWithInterfaces(a: IPreflightInterface, b: IInflightInterface): IPreflightInterface {
+    // ^ error: Parameter "a" cannot have non-serializable type "IPreflightInterface" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return a;
+  }
+  pub methodWithFunctions(a: (str): str, b: inflight (num): bool): (inflight (): bool)? {
+    // ^ error: Parameter "a" cannot have non-serializable type "(str): str" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return nil;
+  }
+  pub methodWithBadStructs(a: MyStructWithNonSerializableTypes): MyStructWithNonSerializableTypes {
+    // ^ error: Parameter "a" cannot have non-serializable type "MyStructWithNonSerializableTypes" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+    return a;
+  }
+}
diff --git a/examples/tests/invalid/simulator_permissions.test.w b/examples/tests/invalid/simulator_permissions.test.w
new file mode 100644
index 00000000000..81f3ab9f033
--- /dev/null
+++ b/examples/tests/invalid/simulator_permissions.test.w
@@ -0,0 +1,26 @@
+bring cloud;
+
+let buckets = [
+  new cloud.Bucket() as "b1",
+  new cloud.Bucket() as "b2"
+];
+
+test "incorrect resource permission" {
+  // This test fails because permission is granted to b2, not b1
+  lift(buckets.at(1), ["put"]);
+  let var i = 10;
+  while i > 0 {
+    i -= 1;
+  }
+  buckets.at(i).put("key", "value");
+}
+
+test "incorrect permission operation" {
+  // This test fails because permission is granted for "list", not "put"
+  lift(buckets.at(0), ["list"]);
+  let var i = 10;
+  while i > 0 {
+    i -= 1;
+  }
+  buckets.at(i).put("key", "value");
+}
diff --git a/examples/tests/invalid/stringify.test.w b/examples/tests/invalid/stringify.test.w
new file mode 100644
index 00000000000..fc7ff61dd3d
--- /dev/null
+++ b/examples/tests/invalid/stringify.test.w
@@ -0,0 +1,11 @@
+class B {}
+let b = new B();
+log("hello {b}");
+// ^ Error: expected type to be stringable 
+
+let x: str? = nil;
+log("{x}");
+// ^ Error: expected type to be stringable
+
+log(b);
+// ^ Error: expected type to be stringable
diff --git a/examples/tests/invalid/struct_expansion.test.w b/examples/tests/invalid/struct_expansion.test.w
index a10e20185dc..9a25b743794 100644
--- a/examples/tests/invalid/struct_expansion.test.w
+++ b/examples/tests/invalid/struct_expansion.test.w
@@ -7,7 +7,7 @@ let bucket1 = new cloud.Bucket(bublic: false, public: true);
 let bucket2 = new cloud.Bucket(2, public: true);
                              //^^^^^^^^^^^^^^^ Expected between 0 and 1 arguments but got 2 when instantiating "Bucket"
 
-let handler = inflight (event: str): str => {
+let handler = inflight (event: str) => {
   bucket1.put(file: "file.txt", "data");
             //^^^^^^^^^^^^^^^^ Named arguments must be after positional arguments
 };
diff --git a/examples/tests/invalid/struct_from_parameter.test.w b/examples/tests/invalid/struct_from_parameter.test.w
new file mode 100644
index 00000000000..908b478fcf4
--- /dev/null
+++ b/examples/tests/invalid/struct_from_parameter.test.w
@@ -0,0 +1,18 @@
+struct MyParams {
+  foo: str;
+  bar: bool;
+  baz: num;
+}
+
+
+let app = nodeof(this).app;
+
+// Never added the schema to the parameters, so
+// technically we never enforced the parameters must have been
+// provided
+
+MyParams.fromJson(app.parameters.read());
+//Error: unable to parse MyParams:
+// - instance requires property "bar"
+// - instance requires property "baz"
+// - instance requires property "foo"
\ No newline at end of file
diff --git a/examples/tests/invalid/structs.test.w b/examples/tests/invalid/structs.test.w
index a95f1d495ba..38282c99300 100644
--- a/examples/tests/invalid/structs.test.w
+++ b/examples/tests/invalid/structs.test.w
@@ -30,7 +30,7 @@ let a = A {
   x: "Sup"
 };
 log(a.badField);
-//    ^^^^^^^^ Unknown symbol "badField"
+//    ^^^^^^^^ Property "badField" doesn't exist on "A"
 
 // two inherits with same field name but different type
 struct Razzle {
@@ -45,4 +45,27 @@ struct Showtime extends Razzle, Dazzle {}
 //     ^^^^^^^^ struct "Showtime" extends "Dazzle" which introduces a conflicting member "a"
 
 let x = new cloud.BucketProps(1);
-          //^ Cannot instantiate type "BucketProps" because it is not a class
\ No newline at end of file
+          //^ Cannot instantiate type "BucketProps" because it is not a class
+
+let inlinePreflightStruct = () => {
+  struct PreflightStruct {
+      // ^ Structs must be declared at the top-level of a program: Struct PreflightStruct is not defined at the top-level
+    name: str;
+  }
+};
+          
+let inlineInflightStruct = inflight () => {
+  struct InflightStruct {
+      // ^ Structs must be declared at the top-level of a program: Struct InflightStruct is not defined at the top-level
+    name: str;
+  }
+};
+
+
+struct SomeStruct1 {
+  numField: num;
+}
+let numField = "hello";
+let noSuchField = 1;
+SomeStruct1 { numField }; // Wrong type when using punning
+SomeStruct1 { noSuchField }; // Wrong field when using punning
diff --git a/examples/tests/invalid/this.w b/examples/tests/invalid/this.w
new file mode 100644
index 00000000000..ad1f21f60b8
--- /dev/null
+++ b/examples/tests/invalid/this.w
@@ -0,0 +1,6 @@
+class A {
+  static logThisId() {
+    log(this.node.id);
+      //^^^^ Unkown symbol "this" 
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/invalid/try_catch_parenthesis.test.w b/examples/tests/invalid/try_catch_parenthesis.test.w
new file mode 100644
index 00000000000..bc2065d0cd4
--- /dev/null
+++ b/examples/tests/invalid/try_catch_parenthesis.test.w
@@ -0,0 +1,22 @@
+try {
+  log("Hello World");
+} catch (e) {
+//      ^^^ Unexpected parentheses in catch block. Use 'catch e' instead of 'catch (e)'.
+  log("error");
+}
+
+try {
+  log("Hello World");
+} catch (longError) {
+//      ^^^^^^^^^^^ Unexpected parentheses in catch block. Use 'catch longError' instead of 'catch (longError)'.
+  log("error");
+}
+
+
+try {
+  log("Hello World");
+} catch e {
+  log("error");
+}
+// this is ok^
+
diff --git a/examples/tests/invalid/turbo.json b/examples/tests/invalid/turbo.json
index 69065399ba4..af4cba7052e 100644
--- a/examples/tests/invalid/turbo.json
+++ b/examples/tests/invalid/turbo.json
@@ -2,8 +2,6 @@
   "$schema": "https://turborepo.org/schema.json",
   "extends": ["//"],
   "pipeline": {
-    "topo": {
-      "inputs": ["**", "!node_modules/**", "!**/target/**"]
-    }
+    "topo": {}
   }
 }
diff --git a/examples/tests/invalid/types_strings_arithmetic.test.w b/examples/tests/invalid/types_strings_arithmetic.test.w
index b3ae2a61a15..1c4f9f381ab 100644
--- a/examples/tests/invalid/types_strings_arithmetic.test.w
+++ b/examples/tests/invalid/types_strings_arithmetic.test.w
@@ -8,4 +8,9 @@ let strExample = "Hello World";
 let numExample = 2;
 
 let e3 = "{strExample}!" * numExample;
-// ERR   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Cannot multiply a string with a number
\ No newline at end of file
+// ERR   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Cannot multiply a string with a number
+
+let var a = 2;
+let b = "2";
+a += b;
+// ERR   ^^^^^ Cannot add a number to a string
diff --git a/examples/tests/invalid/un_mut_lifted_objects.test.w b/examples/tests/invalid/un_mut_lifted_objects.test.w
new file mode 100644
index 00000000000..cf42bafa1c0
--- /dev/null
+++ b/examples/tests/invalid/un_mut_lifted_objects.test.w
@@ -0,0 +1,30 @@
+let ar = MutArray<num>[];
+ar.push(1);
+
+let j = MutJson {a: 1};
+j.set("a", 2);
+
+let st = MutSet<num>[1,2];
+st.add(3);
+
+let mp = MutMap<num>{"a" => 1};
+mp.set("a", 2);
+
+let opt_ar: MutArray<num>? = MutArray<num>[];
+opt_ar?.push(1);
+
+let recursive_ar = MutArray<MutArray<num>>[];
+recursive_ar.push(MutArray<num>[1]);
+recursive_ar.at(0).push(2);
+
+inflight() => {
+  // Same code as above should be an error in inflight
+  ar.push(2); // Error: push doesn't exist in Array
+  ar[0] = 1; // Error: Cannot update elements of an immutable Array
+  j.set("a", 3); // Error: set doesn't exist in Json
+  st.add(4); // Error: add doesn't exist in Set
+  mp.set("a", 3); // Error: set doesn't exist in Map
+  opt_ar?.push(2); // Error: push doesn't exist in Array
+  recursive_ar.push(MutArray<num>[2]); // Error: push doesn't exist in Array
+  recursive_ar.at(0).push(3); // Error: push doesn't exist in Array
+};
diff --git a/examples/tests/invalid/unknown_symbol.test.w b/examples/tests/invalid/unknown_symbol.test.w
index c04caba442c..278e6260cd6 100644
--- a/examples/tests/invalid/unknown_symbol.test.w
+++ b/examples/tests/invalid/unknown_symbol.test.w
@@ -18,10 +18,10 @@ class SomeResource {
 
   inflight getTask(id: str): str {
     this.bucket.assert(2 + "2");
-               //^ Unknown symbol
+               //^ Member "assert" doesn't exist in "Bucket"
                           //^ Expected type to be "num", but got "str" instead
     return this.bucket.methodWhichIsNotPartOfBucketApi(id);
-                      //^ Unknown symbol
+                      //^ Member "methodWhichIsNotPartOfBucketApi" doesn't exist in "Bucket"
   }
 }
 
@@ -29,6 +29,14 @@ class A extends B {
               //^ Unknown symbol
 }
 
+class SomeResourceChild extends SomeResource {
+}
+
+let src = new SomeResourceChild();
+// Make sure the error states the class and not its parent
+src.dodo();
+   //^ Member "dodo" doesn't exist in "SomeResourceChild"
+
 unknown = 1;
 //^ Unknown symbol
 
diff --git a/examples/tests/invalid/void_in_expression_position.test.w b/examples/tests/invalid/void_in_expression_position.test.w
index 9787912ab0f..7cf3e6a12f0 100644
--- a/examples/tests/invalid/void_in_expression_position.test.w
+++ b/examples/tests/invalid/void_in_expression_position.test.w
@@ -2,11 +2,15 @@ log("hey").get("x");
 // ^^^^^^^^^ Expression must be a class to access property "get", instead found type "void"
 
 let x = "my name is {log("mister cloud")}";
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be one of "str,num", but got "void" instead
+//                   ^^^^^^^^^^^^^^^^^^^ Expected type to be stringable, but got "void" instead
 
 let y = 5 + log("hello");
 //          ^^^^^^^^^^^^^^ Expected type to be "num", but got "void" instead
 
-let returnsNothing = () => {};
+let returnsNothing = (): void => {};
 let z = returnsNothing();
-//      ^^^^^^^^^^^^^^^^^ Cannot assign expression of type "void" to a variable
\ No newline at end of file
+//      ^^^^^^^^^^^^^^^^^ Cannot assign expression of type "void" to a variable
+
+let returnsNothing2 = (): void => {};
+let w: str? = returnsNothing2();
+//            ^^^^^^^^^^^^^^^^^ Cannot assign expression of type "void" to a variable
diff --git a/examples/tests/sdk_tests/.gitignore b/examples/tests/sdk_tests/.gitignore
new file mode 100644
index 00000000000..24178925e2d
--- /dev/null
+++ b/examples/tests/sdk_tests/.gitignore
@@ -0,0 +1 @@
+**.snap.md
diff --git a/examples/tests/sdk_tests/api/cycle.test.w b/examples/tests/sdk_tests/api/cycle.test.w
new file mode 100644
index 00000000000..8e87d265631
--- /dev/null
+++ b/examples/tests/sdk_tests/api/cycle.test.w
@@ -0,0 +1,22 @@
+bring cloud;
+bring http;
+bring util;
+
+// This test checks that an API can have a route whose handler
+// references the API's URL.
+
+if ["sim", "tf-aws", "awscdk"].contains(util.env("WING_TARGET")) {
+  let api = new cloud.Api();
+
+  api.get("/my_url", inflight () => {
+    return {
+      status: 200,
+      body: api.url
+    };
+  });
+
+  test "GET /my_url" {
+    let resp = http.get("{api.url}/my_url");
+    assert(resp.status == 200);
+  }
+}
diff --git a/examples/tests/sdk_tests/api/env.test.w b/examples/tests/sdk_tests/api/env.test.w
new file mode 100644
index 00000000000..59187d3ca49
--- /dev/null
+++ b/examples/tests/sdk_tests/api/env.test.w
@@ -0,0 +1,21 @@
+bring cloud;
+bring expect;
+bring http;
+bring util;
+
+let api = new cloud.Api();
+
+api.get("/path", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  let foo = util.env("FOO");
+
+  return cloud.ApiResponse {
+    status: 200,
+    body: foo
+  };
+}, env: { FOO: "bar" });
+
+test "can access env vars in handler" {
+    let url = api.url + "/path";
+    let res = http.get(url);
+    expect.equal(res.body, "bar");
+}
diff --git a/examples/tests/sdk_tests/api/get.test.w b/examples/tests/sdk_tests/api/get.test.w
index 56a311cfb2a..7a0abf883a0 100644
--- a/examples/tests/sdk_tests/api/get.test.w
+++ b/examples/tests/sdk_tests/api/get.test.w
@@ -1,4 +1,5 @@
 bring cloud;
+bring expect;
 bring http;
 bring util;
 
@@ -18,6 +19,18 @@ api.get("/path", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
   };
 });
 
+// default status is 200
+
+api.get("/default-response", inflight () => {
+  log("200 ok");
+});
+
+api.get("/default-status", inflight () => {
+  return {
+    body: "ok"
+  };
+});
+
 
 test "http.get and http.fetch can preform a call to an api" {
     let url = api.url + "/path";
@@ -37,4 +50,21 @@ test "http.get and http.fetch can preform a call to an api" {
     assert(fetchResponseNoMethod.body == body);
     assert(fetchResponseNoMethod.status == 200);
     assert(fetchResponseNoMethod.url == url);
+
+  // "default response is 200 with no body"
+  let r1 = http.get("{api.url}/default-response");
+  log(r1.body);
+  expect.equal(200, r1.status);
+  expect.equal("", r1.body);
+
+
+//  "default status is 200" 
+  let r2 = http.get("{api.url}/default-status");
+  log(r2.body);
+  expect.equal(200, r2.status);
+  expect.equal("ok", r2.body);
+
 }
+
+
+
diff --git a/examples/tests/sdk_tests/api/path_vars.test.w b/examples/tests/sdk_tests/api/path_vars.test.w
index 449235db1c5..af637cc4b54 100644
--- a/examples/tests/sdk_tests/api/path_vars.test.w
+++ b/examples/tests/sdk_tests/api/path_vars.test.w
@@ -25,40 +25,24 @@ api.get("/path/:name", handler);
 api.get("/users/permission/:name", handler);
 api.get("/path/:name/:age", handler_two);
 
-test "test" {
-  let username = "tsuf";
-  let res: http.Response = http.get("{api.url}/users/{username}");
-
-
-  assert(res.status == 200);
-  assert(Json.parse(res.body).get("user") == username);
-}
-
-test "test2" {
-  let username = "akhil";
-  let res: http.Response = http.get("{api.url}/path/{username}");
-
-
-  assert(res.status == 200);
-  assert(Json.parse(res.body).get("user") == username);
-}
-
-test "test3" {
+test "path vars are valid" {
   let username = "akhil";
-  let res: http.Response = http.get("{api.url}/users/permission/{username}");
+  let age = "23";
 
+  let res1: http.Response = http.get("{api.url}/users/{username}");
+  assert(res1.status == 200);
+  assert(Json.parse(res1.body).get("user") == username);
 
-  assert(res.status == 200);
-  assert(Json.parse(res.body).get("user") == username);
-}
-
-test "test4" {
-  let username = "akhil";
-  let age = "23";
-  let res: http.Response = http.get("{api.url}/path/{username}/{age}");
+  let res2: http.Response = http.get("{api.url}/path/{username}");
+  assert(res2.status == 200);
+  assert(Json.parse(res2.body).get("user") == username);
 
+  let res3: http.Response = http.get("{api.url}/users/permission/{username}");
+  assert(res3.status == 200);
+  assert(Json.parse(res3.body).get("user") == username);
 
-  assert(res.status == 200);
-  assert(Json.parse(res.body).get("user") == username);
-  assert(Json.parse(res.body).get("age") == age);
+  let res4: http.Response = http.get("{api.url}/path/{username}/{age}");
+  assert(res4.status == 200);
+  assert(Json.parse(res4.body).get("user") == username);
+  assert(Json.parse(res4.body).get("age") == age);
 }
diff --git a/examples/tests/sdk_tests/api/post.test.w b/examples/tests/sdk_tests/api/post.test.w
index ab2d6c6ca7c..65a8016bed9 100644
--- a/examples/tests/sdk_tests/api/post.test.w
+++ b/examples/tests/sdk_tests/api/post.test.w
@@ -1,15 +1,16 @@
 bring cloud;
 bring http;
 bring util;
+bring expect;
 
 let api = new cloud.Api();
 let body = Json {"cat": "Tion"};
 
-api.post("/path", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
-  assert(req.method == cloud.HttpMethod.POST);
-  assert(req.path == "/path");
-  assert(req.body == Json.stringify(body));
-  assert(req.headers?.get("content-type") == "application/json");
+api.post("/", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  expect.equal(req.method, cloud.HttpMethod.POST);
+  expect.equal(req.path, "/");
+  expect.equal(req.body, Json.stringify(body));
+  expect.equal(req.headers?.get("content-type"), "application/json");
 
   return cloud.ApiResponse {
     status: 200,
@@ -19,15 +20,14 @@ api.post("/path", inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
 
 
 test "http.post and http.fetch can preform a call to an api" {
-    let url = api.url + "/path";
-    let response: http.Response = http.post(url, headers: { "content-type" => "application/json" }, body: Json.stringify(body));
-    let fetchResponse: http.Response = http.post(url, method: http.HttpMethod.POST, headers: { "content-type" => "application/json" }, body: Json.stringify(body));
+  let response: http.Response = http.post(api.url, headers: { "content-type" => "application/json" }, body: Json.stringify(body));
+  let fetchResponse: http.Response = http.post(api.url, method: http.HttpMethod.POST, headers: { "content-type" => "application/json" }, body: Json.stringify(body));
 
-    assert(response.body == Json.stringify(body));
-    assert(response.status == 200);
-    assert(response.url == url);
+  expect.equal(response.body , Json.stringify(body));
+  expect.equal(response.status , 200);
+  expect.match(response.url , api.url);
 
-    assert(fetchResponse.body == Json.stringify(body));
-    assert(fetchResponse.status == 200);
-    assert(fetchResponse.url == url);
-}
\ No newline at end of file
+  expect.equal(fetchResponse.body , Json.stringify(body));
+  expect.equal(fetchResponse.status , 200);
+  expect.match(fetchResponse.url , api.url);
+}
diff --git a/examples/tests/sdk_tests/api/root_path_vars.test.w b/examples/tests/sdk_tests/api/root_path_vars.test.w
new file mode 100644
index 00000000000..c769d94d1fa
--- /dev/null
+++ b/examples/tests/sdk_tests/api/root_path_vars.test.w
@@ -0,0 +1,51 @@
+bring cloud;
+bring http;
+bring expect;
+
+let api = new cloud.Api();
+
+let handler = inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  return {
+    body: "id is {req.vars.tryGet("id") ?? "unknown"}",
+  };
+};
+
+api.get("/:id", handler);
+api.get("/:id/comments", handler);
+
+
+try {
+  // sibling path same method
+  api.get("/:username/something", handler);
+  expect.equal(false);
+} catch e  {
+  expect.equal(e, "Endpoint for path '/:username/something' and method 'GET' conflicts with existing sibling endpoint for path '/:id'- try to match the parameter names to avoid this error.");
+}
+
+try {
+  // sibling path different method
+  api.post("/:username", handler);
+  expect.equal(false);
+} catch e  {
+  expect.equal(e, "Endpoint for path '/:username' and method 'POST' conflicts with existing sibling endpoint for path '/:id'- try to match the parameter names to avoid this error.");
+}
+
+
+
+test "path vars at endpoint root are working as expected" {
+  let resWithId = http.get("{api.url}/123");
+  expect.ok(resWithId.ok);
+  expect.equal(resWithId.body, "id is 123");
+
+  let resWithComments = http.get("{api.url}/123/comments");
+  expect.ok(resWithComments.ok);
+  expect.equal(resWithComments.body, "id is 123");
+
+  let unknownRes = http.get("{api.url}/123/comments/unknown-path");
+  expect.equal(unknownRes.status, 404);
+  expect.match(unknownRes.body, "Error");
+  
+  let unknownRes2 = http.get("{api.url}/123/unknown-path");
+  expect.equal(unknownRes2.status, 404);
+  expect.match(unknownRes2.body, "Error");
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/bucket/bucket-ref.test.w b/examples/tests/sdk_tests/bucket/bucket-ref.test.w
new file mode 100644
index 00000000000..7a4537a0c83
--- /dev/null
+++ b/examples/tests/sdk_tests/bucket/bucket-ref.test.w
@@ -0,0 +1,37 @@
+bring cloud;
+bring aws;
+bring util;
+bring expect;
+let b = new cloud.Bucket();
+
+// this will only work if we are testing on tf-aws
+if let name = aws.Bucket.from(b)?.bucketName {
+  let bref = new aws.BucketRef(name);
+
+  test "can store and get objects (BucketRef)" {
+    bref.put("key1", "value1");
+    expect.equal(bref.get("key1"), "value1");
+  }
+}
+
+if util.env("WING_TARGET") == "sim" {
+  let dummyName = "wing-dummy-bucket";
+  let dummyArn = "arn:aws:s3:::{dummyName}";
+  let br = new aws.BucketRef(dummyName);
+
+  test "bucketArn returns the arn" {
+    expect.equal(dummyArn, br.bucketArn);
+    expect.equal(dummyName, br.bucketName);
+  }
+
+  test "get() sends a request to aws, fails because we are using a dummy bucket" {
+    let var err = false;
+    try {
+      br.get("key1");
+    } catch e {
+      err = true;
+    }
+
+    assert(err);
+  }
+}
diff --git a/examples/tests/sdk_tests/bucket/copy.test.w b/examples/tests/sdk_tests/bucket/copy.test.w
index 10d87b78a3b..1a61979c762 100644
--- a/examples/tests/sdk_tests/bucket/copy.test.w
+++ b/examples/tests/sdk_tests/bucket/copy.test.w
@@ -1,5 +1,6 @@
 bring cloud;
 bring util;
+bring expect;
 
 let b = new cloud.Bucket();
 
@@ -9,10 +10,10 @@ test "copy()" {
     try {
       block();
     } catch actual {
-      assert(actual.contains(expected));
+      expect.equal(actual, expected);
       error = true;
     }
-    assert(error);
+    expect.equal(error, true);
   };
   let UNEXISTING_KEY = "no-such-file.txt";
   let OBJECT_DOES_NOT_EXIST_ERROR = "Source object does not exist (srcKey={UNEXISTING_KEY}).";
diff --git a/examples/tests/sdk_tests/bucket/events.test.w b/examples/tests/sdk_tests/bucket/events.test.w
index 56ebcca61d4..df4a1e82d02 100644
--- a/examples/tests/sdk_tests/bucket/events.test.w
+++ b/examples/tests/sdk_tests/bucket/events.test.w
@@ -29,37 +29,21 @@ let logHistory = inflight (key: str, operation: str, source: Source) => {
 
 
 b.onDelete(inflight (key: str) => {
-  logHistory(key, "onDelete()", Source.anyEvent);
+  logHistory(key, "OnDelete()", Source.anyEvent);
 });
 
 b.onUpdate(inflight (key: str) => {
-  logHistory(key, "onUpdate()", Source.anyEvent);
+  logHistory(key, "OnUpdate()", Source.anyEvent);
 });
 
 b.onCreate(inflight (key: str) => {
-  logHistory(key, "onCreate()", Source.anyEvent);
+  logHistory(key, "OnCreate()", Source.anyEvent);
 });
 
 b.onEvent(inflight (key: str, event: cloud.BucketEventType) => { 
   logHistory(key, "{event}()", Source.onEvent);
 });
 
-let wait = inflight (pred: inflight (): bool): bool => {
-  let var i = 0;
-    // waiting for up to 2 minutess, checking every 10 seconds
-  while i < 12 { 
-    if pred() {
-      return true;
-    } 
-  
-    util.sleep(10s);
-
-    i = i + 1;
-  }
-
-  return false;
-};
-  
 struct CheckHitCountOptions {
   key: str;
   type: str;
@@ -67,18 +51,17 @@ struct CheckHitCountOptions {
   count: num;
 }
 
-
-let checkHitCount = inflight (opts: CheckHitCountOptions): inflight (): bool => {
-  return inflight (): bool => {
+let checkHitCount = inflight (opts: CheckHitCountOptions): void => {
+  util.waitUntil(inflight () => {
     let var count = 0;
+
     for u in table.list() {
-      
       if (u.get("key") == opts.key && u.get("operation") == opts.type && u.get("source") == "{opts.source}") {
         count = count + 1;
       }
     }
     return count == opts.count;  
-  };
+  }, timeout: 2m, interval: 10s);
 };
 
 
@@ -92,19 +75,19 @@ new std.Test(inflight () => {
 // https://github.com/winglang/wing/issues/2724
   if (util.env("WING_TARGET") != "tf-aws") {
     // assert that onCreate events about the "a", "b", and "c" objects were each produced exactly 1 time
-    assert(wait(checkHitCount(key: "a", type: "onCreate()", source: Source.anyEvent, count: 1)));
-    assert(wait(checkHitCount(key: "b", type: "onCreate()", source: Source.anyEvent, count: 1)));
-    assert(wait(checkHitCount(key: "c", type: "onCreate()", source: Source.anyEvent, count: 1)));
+    checkHitCount(key: "a", type: "OnCreate()", source: Source.anyEvent, count: 1);
+    checkHitCount(key: "b", type: "OnCreate()", source: Source.anyEvent, count: 1);
+    checkHitCount(key: "c", type: "OnCreate()", source: Source.anyEvent, count: 1);
 
-    assert(wait(checkHitCount(key: "a", type: "onCreate()", source: Source.onEvent, count: 1)));
-    assert(wait(checkHitCount(key: "b", type: "onCreate()", source:  Source.onEvent, count: 1)));
-    assert(wait(checkHitCount(key: "c", type: "onCreate()", source:  Source.onEvent, count: 1)));
+    checkHitCount(key: "a", type: "OnCreate()", source: Source.onEvent, count: 1);
+    checkHitCount(key: "b", type: "OnCreate()", source:  Source.onEvent, count: 1);
+    checkHitCount(key: "c", type: "OnCreate()", source:  Source.onEvent, count: 1);
 
-    assert(wait(checkHitCount(key: "b", type: "onUpdate()", source: Source.anyEvent, count: 1)));
-    assert(wait(checkHitCount(key: "c", type: "onDelete()", source: Source.anyEvent, count: 1)));
+    checkHitCount(key: "b", type: "OnUpdate()", source: Source.anyEvent, count: 1);
+    checkHitCount(key: "c", type: "OnDelete()", source: Source.anyEvent, count: 1);
 
-    assert(wait(checkHitCount(key: "b", type: "onUpdate()", source: Source.onEvent, count: 1)));
-    assert(wait(checkHitCount(key: "c", type: "onDelete()", source: Source.onEvent, count: 1)));
+    checkHitCount(key: "b", type: "OnUpdate()", source: Source.onEvent, count: 1);
+    checkHitCount(key: "c", type: "OnDelete()", source: Source.onEvent, count: 1);
   }
 
 }, timeout: 8m) as "hitCount is incremented according to the bucket event";
diff --git a/examples/tests/sdk_tests/bucket/get.test.w b/examples/tests/sdk_tests/bucket/get.test.w
new file mode 100644
index 00000000000..d1ea48cc0a9
--- /dev/null
+++ b/examples/tests/sdk_tests/bucket/get.test.w
@@ -0,0 +1,38 @@
+bring cloud;
+bring expect;
+
+let b = new cloud.Bucket();
+
+test "get range of an object" {
+  let assertThrows = (expected: str, block: (): void) => {
+    let var error = false;
+    try {
+      block();
+    } catch actual {
+      assert(actual.contains(expected), "Expected error to contain: \"{expected}\" but got: \"{actual}");
+      error = true;
+    }
+    assert(error);
+  };
+
+  b.put("test1.txt", "12345");
+
+  expect.equal(b.get("test1.txt"), "12345");
+
+  expect.equal(b.get("test1.txt", startByte: 1, endByte: 3), "234");
+  expect.equal(b.get("test1.txt", startByte: 1), "2345");
+  expect.equal(b.get("test1.txt", endByte: 3), "1234");
+
+  b.put("test2.txt", "𠮷");
+
+  expect.equal(b.get("test2.txt", startByte: 0, endByte: 3), "𠮷");
+
+  assertThrows("The encoded data was not valid for encoding utf-8", () => {
+    b.get("test2.txt", startByte: 0, endByte: 2);
+  });
+
+// "get empty object" 
+  b.put("empty.txt", "");
+
+  expect.equal(b.get("empty.txt"), "");
+}
diff --git a/examples/tests/sdk_tests/bucket/metadata.test.w b/examples/tests/sdk_tests/bucket/metadata.test.w
index 1c6a31e6406..7ef92fb036a 100644
--- a/examples/tests/sdk_tests/bucket/metadata.test.w
+++ b/examples/tests/sdk_tests/bucket/metadata.test.w
@@ -1,36 +1,57 @@
 bring cloud;
+bring expect;
 
 let b = new cloud.Bucket();
 
 test "metadata()" {
-  b.put("file1.main.w", "Foo");
-  b.put("file2.txt", "Bar");
-  b.put("file3.txt", "Baz", { contentType: "application/json" });
-  b.putJson("file4.txt", "Qux");
-
-  let file1Metadata = b.metadata("file1.main.w");
-  assert(file1Metadata.size == 3);
-  assert(file1Metadata.contentType == "application/octet-stream");
+  let assertThrows = (expected: str, block: (): void) => {
+    let var error = false;
+    try {
+      block();
+    } catch actual {
+      assert(actual.contains(expected));
+      error = true;
+    }
+    assert(error);
+  };
+  let UNEXISTING_KEY = "no-such-file.txt";
+  let OBJECT_DOES_NOT_EXIST_ERROR = "Object does not exist (key={UNEXISTING_KEY}).";
+
+  let KEY1 = "file1.main.w";
+  let VALUE1 = "Foo";
+  let KEY2 = "file2.txt";
+  let VALUE2 = "Bar";
+  let KEY3 = "file3.txt";
+  let VALUE3 = "Baz";
+  let KEY4 = "file4.txt";
+  let VALUE4 = "Quz";
+
+  b.put(KEY1, VALUE1);
+  b.put(KEY2, VALUE2);
+  b.put(KEY3, VALUE3, { contentType: "application/json" });
+  b.putJson(KEY4, VALUE4);
+
+  let file1Metadata = b.metadata(KEY1);
+  expect.equal(file1Metadata.size, 3);
+  expect.equal(file1Metadata.contentType, "application/octet-stream");
   assert(file1Metadata.lastModified.year >= 2023);
 
-  let file2Metadata = b.metadata("file2.txt");
-  assert(file2Metadata.size == 3);
-  assert(file2Metadata.contentType == "text/plain");
+  let file2Metadata = b.metadata(KEY2);
+  expect.equal(file2Metadata.size, 3);
+  expect.equal(file2Metadata.contentType, "text/plain");
   assert(file2Metadata.lastModified.year >= 2023);
 
-  let file3Metadata = b.metadata("file3.txt");
-  assert(file3Metadata.size == 3);
-  assert(file3Metadata.contentType == "application/json");
+  let file3Metadata = b.metadata(KEY3);
+  expect.equal(file3Metadata.size, 3);
+  expect.equal(file3Metadata.contentType, "application/json");
   assert(file3Metadata.lastModified.year >= 2023);
 
-  let file4Metadata = b.metadata("file4.txt");
-  assert(file4Metadata.size == 5);
-  assert(file4Metadata.contentType == "application/json");
+  let file4Metadata = b.metadata(KEY4);
+  expect.equal(file4Metadata.size, 5);
+  expect.equal(file4Metadata.contentType,"application/json");
   assert(file4Metadata.lastModified.year >= 2023);
 
-  try {
-    b.metadata("no-such-file.txt");
-  } catch e {
-    assert(e.contains("Object does not exist (key=no-such-file.txt)."));
-  }
+  assertThrows(OBJECT_DOES_NOT_EXIST_ERROR, () => {
+    b.metadata(UNEXISTING_KEY);
+  });
 }
diff --git a/examples/tests/sdk_tests/bucket/public_url.test.w b/examples/tests/sdk_tests/bucket/public_url.test.w
index 3d151dbe528..e5ecb634b99 100644
--- a/examples/tests/sdk_tests/bucket/public_url.test.w
+++ b/examples/tests/sdk_tests/bucket/public_url.test.w
@@ -1,6 +1,7 @@
 bring cloud;
 bring http;
 bring util;
+bring expect;
 
 let publicBucket = new cloud.Bucket(public: true) as "publicBucket";
 let privateBucket = new cloud.Bucket() as "privateBucket";
@@ -11,7 +12,7 @@ test "publicUrl" {
     try {
       block();
     } catch actual {
-      assert(actual.contains(expected));
+      expect.equal(actual, expected);
       error = true;
     }
     assert(error);
diff --git a/examples/tests/sdk_tests/bucket/rename.test.w b/examples/tests/sdk_tests/bucket/rename.test.w
new file mode 100644
index 00000000000..85ee3612dba
--- /dev/null
+++ b/examples/tests/sdk_tests/bucket/rename.test.w
@@ -0,0 +1,67 @@
+bring cloud;
+bring util;
+bring expect;
+
+let b = new cloud.Bucket();
+
+test "rename()" {
+  let assertThrows = (expected: str, block: (): void) => {
+    let var error = false;
+    try {
+      block();
+    } catch actual {
+      expect.equal(actual, expected);
+      error = true;
+    }
+    assert(error);
+  };
+
+  let KEY1 = "original.txt";
+  let VALUE1 = "Hello, Wing!";
+  let KEY2 = "renamed.txt";
+  let KEY3 = "to-overwrite.txt";
+  let VALUE3 = "Hello, World!";
+  let UNEXISTING_KEY = "no-such-obj.txt";
+  let SAME_KEY_ERROR = "Renaming an object to its current name is not a valid operation (srcKey={KEY3}, dstKey={KEY3}).";
+  let OBJECT_DOES_NOT_EXIST_ERROR = "Source object does not exist (srcKey={UNEXISTING_KEY}).";
+
+  b.put(KEY1, VALUE1);
+  b.put(KEY3, VALUE3);
+  let obj1Metadata = b.metadata(KEY1);
+
+  // VALID RENAME
+  b.rename(KEY1, KEY2);
+  let obj2Metadata = b.metadata(KEY2);
+  // Check object got moved
+  assert(b.exists(KEY2));
+  assert(!b.exists(KEY1));
+  // Check object has same content
+  expect.equal(b.get(KEY2), VALUE1);
+  // Check object has same metadata
+  expect.equal(obj1Metadata.size, obj2Metadata.size);
+  expect.equal(obj1Metadata.contentType, obj2Metadata.contentType);
+  expect.equal(obj1Metadata.lastModified.year, obj2Metadata.lastModified.year);
+
+  // VALID RENAME WITH OVERWRITE
+  b.rename(KEY2, KEY3);
+  let obj3Metadata = b.metadata(KEY3);
+  // Check object got moved
+  assert(b.exists(KEY3));
+  assert(!b.exists(KEY2));
+  // Check object has same content
+  expect.equal(b.get(KEY3), VALUE1);
+  // Check object has same metadata
+  expect.equal(obj2Metadata.size, obj3Metadata.size);
+  expect.equal(obj2Metadata.contentType, obj3Metadata.contentType);
+  expect.equal(obj2Metadata.lastModified.year, obj3Metadata.lastModified.year);
+
+  // INVALID RENAME
+  assertThrows(SAME_KEY_ERROR, () => {
+    b.rename(KEY3, KEY3);
+  });
+
+  // RENAMING NON-EXISTENT OBJECT
+  assertThrows(OBJECT_DOES_NOT_EXIST_ERROR, () => {
+    b.rename(UNEXISTING_KEY, "new-name.txt");
+  });
+}
diff --git a/examples/tests/sdk_tests/bucket/signed_url.test.w b/examples/tests/sdk_tests/bucket/signed_url.test.w
index bdadac532a9..02123a408cb 100644
--- a/examples/tests/sdk_tests/bucket/signed_url.test.w
+++ b/examples/tests/sdk_tests/bucket/signed_url.test.w
@@ -1,29 +1,98 @@
 bring cloud;
-bring http;
+bring fs;
 bring util;
+bring expect;
 
-let testBucket = new cloud.Bucket(public: true) as "testBucket";
+let bucket = new cloud.Bucket();
 
-test "signedUrl" {
-  let var error = "";
-  testBucket.put("file1.txt", "Foo");
-  
-  if (util.env("WING_TARGET") != "sim") { 
-    let signedUrl = testBucket.signedUrl("file1.txt");
-    assert(http.get(signedUrl).body ==  "Foo"); 
-  } 
+test "signedUrl GET (implicit)" {
+  let KEY = "tempfile.txt";
+  let VALUE = "Hello, Wing!";
+
+  bucket.put(KEY, VALUE);
+
+  let getSignedUrl = bucket.signedUrl(KEY);
+
+  // Download file from private bucket using GET presigned URL
+  let output = util.shell("curl \"{getSignedUrl}\"");
+
+  expect.equal(output, VALUE);
 }
 
-test "signedUrl for non existent key" {
-  let var error = "";
-  
-  if (util.env("WING_TARGET") != "sim") { 
-    try{
-      let signedUrl = testBucket.signedUrl("file.txt");
-    } catch e {
-      error = e;
+test "signedUrl GET (explicit)" {
+  let KEY = "tempfile.txt";
+  let VALUE = "Hello, Wing!";
+
+  bucket.put(KEY, VALUE);
+
+  let getSignedUrl = bucket.signedUrl(KEY, { action: cloud.BucketSignedUrlAction.DOWNLOAD });
+
+  // Download file from private bucket using GET presigned URL
+  let output = util.shell("curl \"{getSignedUrl}\"");
+
+  expect.equal(output, VALUE);
+}
+
+test "signedUrl GET with non-existent key" {
+  let assertThrows = (expected: str, block: (): void) => {
+    let var error = false;
+    try {
+      block();
+    } catch actual {
+      expect.equal(actual, expected);
+      error = true;
     }
+      expect.equal(error, true);
+  };
+  let UNEXISTING_KEY = "no-such-file.txt";
+  let OBJECT_DOES_NOT_EXIST_ERROR = "Cannot provide signed url for a non-existent key (key={UNEXISTING_KEY})";
 
-    assert(error == "Cannot provide signed url for a non-existent key (key=file.txt)");
-  }
+  assertThrows(OBJECT_DOES_NOT_EXIST_ERROR, () => {
+    bucket.signedUrl(UNEXISTING_KEY);
+  });
 }
+
+test "signedUrl PUT" {
+  let KEY = "tempfile.txt";
+  let VALUE = "Hello, Wing!";
+
+  let tempDir = fs.mkdtemp();
+  let tempFile = fs.join(tempDir, KEY);
+  fs.writeFile(tempFile, VALUE);
+
+  let putSignedUrl = bucket.signedUrl(KEY, { action: cloud.BucketSignedUrlAction.UPLOAD });
+
+  // Upload file to private bucket using PUT presigned URL
+  util.shell("curl -X PUT -T \"{tempFile}\" \"{putSignedUrl}\"");
+
+  expect.equal(bucket.get(KEY), VALUE);
+}
+
+test "signedUrl duration option is respected" {
+  let isExpiredTokenError = (output: str) => {
+    let target = util.env("WING_TARGET");
+    let var result = false;
+
+    if target == "tf-aws" {
+      result = output.contains("<Code>AccessDenied</Code><Message>Request has expired</Message>");
+    } elif target == "tf-gcp" {
+      result = output.contains("<Code>ExpiredToken</Code><Message>Invalid argument.</Message>");
+    }
+    
+    return result;
+  };
+
+  let KEY = "tempfile.txt";
+  let VALUE = "Hello, Wing!";
+
+  bucket.put(KEY, VALUE);
+
+  let getSignedUrl = bucket.signedUrl(KEY, { duration: 1s });
+
+  util.sleep(2s);
+
+  // Download file from private bucket using expired GET presigned URL
+  let output = util.shell("curl \"{getSignedUrl}\"");
+
+  expect.equal(isExpiredTokenError(output), true);
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/container/build-failure.test.w b/examples/tests/sdk_tests/container/build-failure.test.w
new file mode 100644
index 00000000000..be26176b40d
--- /dev/null
+++ b/examples/tests/sdk_tests/container/build-failure.test.w
@@ -0,0 +1,12 @@
+/*\
+skipPlatforms:
+  - win32
+  - darwin
+\*/
+
+bring sim;
+
+new sim.Container(
+  name: "build-failure",
+  image: "./build-failure",
+);
diff --git a/examples/tests/sdk_tests/container/build-failure/Dockerfile b/examples/tests/sdk_tests/container/build-failure/Dockerfile
new file mode 100644
index 00000000000..eaa36a3e12c
--- /dev/null
+++ b/examples/tests/sdk_tests/container/build-failure/Dockerfile
@@ -0,0 +1,2 @@
+FROM node:20.8.0-alpine
+RUN exit 1
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/container/container.test.w b/examples/tests/sdk_tests/container/container.test.w
new file mode 100644
index 00000000000..c21f2562537
--- /dev/null
+++ b/examples/tests/sdk_tests/container/container.test.w
@@ -0,0 +1,40 @@
+/*\
+skipPlatforms:
+  - win32
+  - darwin
+\*/
+
+bring sim;
+bring http;
+bring util;
+bring expect;
+
+// only relevant in simulator
+if util.env("WING_TARGET") == "sim" {
+
+  let echo = new sim.Container(
+    name: "http-echo",
+    image: "hashicorp/http-echo",
+    containerPort: 5678,
+    args: ["-text=bang"],
+  ) as "http-echo";
+  
+  let app = new sim.Container(
+    name: "my-app",
+    image: "./my-docker-image",
+    containerPort: 3000,
+  ) as "my-app";
+  
+  test "get echo" {
+    let response = http.get("http://localhost:{echo.hostPort!}");
+    log(response.body);
+    expect.equal("bang\n", response.body);
+  }
+  
+  test "get app" {
+    let response = http.get("http://localhost:{app.hostPort!}");
+    log(response.body);
+    expect.equal("Hello, Wingnuts!", response.body);
+  }
+
+}
diff --git a/examples/tests/sdk_tests/container/entrypoint.test.w b/examples/tests/sdk_tests/container/entrypoint.test.w
new file mode 100644
index 00000000000..c2799745c82
--- /dev/null
+++ b/examples/tests/sdk_tests/container/entrypoint.test.w
@@ -0,0 +1,27 @@
+/*\
+skipPlatforms:
+  - win32
+  - darwin
+\*/
+
+bring sim;
+bring http;
+bring util;
+bring expect;
+
+// only relevant in simulator
+if util.env("WING_TARGET") == "sim" {
+  let entrypoint = new sim.Container(
+    name: "my-entrypoint-app",
+    image: "./my-docker-image",
+    containerPort: 3000,
+    args: ["-c", "RESPONSE=hello /usr/local/bin/node /app/index.js"],
+    entrypoint: "/bin/sh",
+  ) as "with-entrypoint";
+
+  test "container with entrypoint" {
+    let response = http.get("http://localhost:{entrypoint.hostPort!}");
+    log(response.body);
+    expect.equal("hello", response.body);
+  }
+}
diff --git a/examples/tests/sdk_tests/container/mount.test.w b/examples/tests/sdk_tests/container/mount.test.w
new file mode 100644
index 00000000000..ab2588ff53e
--- /dev/null
+++ b/examples/tests/sdk_tests/container/mount.test.w
@@ -0,0 +1,24 @@
+/*\
+skipPlatforms:
+  - win32
+  - darwin
+\*/
+bring sim;
+bring util;
+
+// only relevant in simulator
+if util.env("WING_TARGET") == "sim" {
+  let container = new sim.Container(
+    name: "postgres",
+    image: "postgres:15",
+    env: {
+      POSTGRES_PASSWORD: "password"
+    },
+    containerPort: 5432,
+    volumes: ["/var/lib/postgresql/data"],
+  );
+
+  test "my test" {
+    log("dummy test");
+  }
+}
diff --git a/examples/tests/sdk_tests/container/my-docker-image/Dockerfile b/examples/tests/sdk_tests/container/my-docker-image/Dockerfile
new file mode 100644
index 00000000000..686c128323e
--- /dev/null
+++ b/examples/tests/sdk_tests/container/my-docker-image/Dockerfile
@@ -0,0 +1,4 @@
+FROM node:20.8.0-alpine
+EXPOSE 3000
+ADD index.js /app/index.js
+ENTRYPOINT [ "/app/index.js" ]
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/container/my-docker-image/index.js b/examples/tests/sdk_tests/container/my-docker-image/index.js
new file mode 100755
index 00000000000..7155ee18602
--- /dev/null
+++ b/examples/tests/sdk_tests/container/my-docker-image/index.js
@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+const http = require('http');
+
+process.on('SIGINT', () => {
+  console.info("Interrupted")
+  process.exit(0)
+});
+
+const response = process.env.RESPONSE;
+
+const server = http.createServer((req, res) => {
+  console.log(`request received: ${req.method} ${req.url}`);
+  res.end(response ?? 'Hello, Wingnuts!');
+});
+
+console.log('listening on port 3000');
+server.listen(3000);
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/container/network.test.w b/examples/tests/sdk_tests/container/network.test.w
new file mode 100644
index 00000000000..41c43afd399
--- /dev/null
+++ b/examples/tests/sdk_tests/container/network.test.w
@@ -0,0 +1,28 @@
+/*\
+skipPlatforms:
+  - win32
+  - darwin
+\*/
+
+bring sim;
+bring http;
+bring util;
+bring expect;
+
+// only relevant in simulator
+if util.env("WING_TARGET") == "sim" {
+  let networkHost = new sim.Container(
+    name: "http-echo",
+    image: "hashicorp/http-echo",
+    containerPort: 5678,
+    args: ["-text=bang"],
+    network: "host",
+  ) as "network-host";
+
+  let localUrl = "http://localhost:{networkHost.hostPort!}";
+  
+  test "container with host network" {
+    expect.equal(networkHost.hostPort, "5678");
+    expect.equal(localUrl, "http://localhost:5678");
+  }
+}
diff --git a/examples/tests/sdk_tests/container/pull-failure.test.w b/examples/tests/sdk_tests/container/pull-failure.test.w
new file mode 100644
index 00000000000..b94f5629ad4
--- /dev/null
+++ b/examples/tests/sdk_tests/container/pull-failure.test.w
@@ -0,0 +1,14 @@
+/*\
+skipPlatforms:
+  - win32
+  - darwin
+\*/
+
+bring sim;
+bring cloud;
+
+let x = new sim.Container(
+  name: "pull-failure",
+  image: "foo://do-not-pull-me",
+  containerPort: 1234,
+);
diff --git a/examples/tests/sdk_tests/counter/dec.test.w b/examples/tests/sdk_tests/counter/dec.test.w
index 23adf176eff..025963d4cb3 100644
--- a/examples/tests/sdk_tests/counter/dec.test.w
+++ b/examples/tests/sdk_tests/counter/dec.test.w
@@ -1,24 +1,47 @@
 bring cloud;
+bring expect;
 
-let counter = new cloud.Counter(initial: 1);
+// implicit initial (0)
+let counter1 = new cloud.Counter() as "counter1";
+// explicit initial
+let counter2 = new cloud.Counter(initial: -1) as "counter2";
 
-test "dec" {
-  assert(counter.peek() == 1);
-  let dec1 = counter.dec();
-  assert(counter.peek() == 0);
-  assert(dec1 == 1);
-  let dec2 = counter.dec(2);
-  assert(counter.peek() == -2);
-  assert(dec2 == 0);
-}
+test "dec()" {
+  // implicit decrement (-1)
+  let r0 = counter1.dec();
+  expect.equal(r0, 0);
+  expect.equal(counter1.peek(), -1);
+
+  // explicit decrement (positive int)
+  let r1 = counter1.dec(5);
+  expect.equal(r1, -1);
+  expect.equal(counter1.peek(), -6);
+
+  // explicit decrement (negative int)
+  let r2 = counter1.dec(-4);
+  expect.equal(r2, -6);
+  expect.equal(counter1.peek(), -2);
+
+  // explicit decrement (-0)
+  let r3 = counter1.dec(0);
+  expect.equal(r3, -2);
+  expect.equal(counter1.peek(), -2);
+
+// "dec() with custom key" 
+  let key = "custom-key";
+
+  // explicit decrement (positive int)
+  let r4 = counter2.dec(5, key);
+  expect.equal(r4, -1);
+  expect.equal(counter2.peek(key), -6);
+
+  // explicit decrement (negative int)
+  let r5 = counter2.dec(-4, key);
+  expect.equal(r5, -6);
+  expect.equal(counter2.peek(key), -2);
 
-test "key dec" {
-  let key = "my-key";
-  assert(counter.peek(key) == 1);
-  let dec1 = counter.dec(nil, key);
-  assert(counter.peek(key) == 0);
-  assert(dec1 == 1);
-  let dec2 = counter.dec(2, key);
-  assert(counter.peek(key) == -2);
-  assert(dec2 == 0);
+  // explicit decrement (-0)
+  let r6 = counter2.dec(0, key);
+  expect.equal(r6, -2);
+  expect.equal(counter2.peek(key), -2);
 }
diff --git a/examples/tests/sdk_tests/counter/inc.test.w b/examples/tests/sdk_tests/counter/inc.test.w
index 6c2165be39e..13752722f52 100644
--- a/examples/tests/sdk_tests/counter/inc.test.w
+++ b/examples/tests/sdk_tests/counter/inc.test.w
@@ -1,34 +1,47 @@
 bring cloud;
+bring expect;
 
-let counter = new cloud.Counter(initial: 0);
-
-test "inc" {
-  assert(counter.peek() == 0);
-  let r0 = counter.inc();
-  assert(r0 == 0);
-  assert(counter.peek() == 1);
-  let r1 = counter.inc();
-  assert(r1 == 1);
-  assert(counter.peek() == 2);
-  let r2 = counter.inc(10);
-  assert(r2 == 2);
-  assert(counter.peek() == 12);
-  let r3 = counter.inc();
-  assert(r3 == 12);
-}
+// implicit initial (0)
+let counter1 = new cloud.Counter() as "counter1";
+// explicit initial
+let counter2 = new cloud.Counter(initial: -1) as "counter2";
+
+test "inc()" {
+  // implicit increment (+1)
+  let r0 = counter1.inc();
+  expect.equal(r0, 0);
+  expect.equal(counter1.peek(), 1);
+
+  // explicit increment (positive int)
+  let r1 = counter1.inc(5);
+  expect.equal(r1, 1);
+  expect.equal(counter1.peek(), 6);
+
+  // explicit increment (negative int)
+  let r2 = counter1.inc(-4);
+  expect.equal(r2, 6);
+  expect.equal(counter1.peek(), 2);
+
+  // explicit increment (+0)
+  let r3 = counter1.inc(0);
+  expect.equal(r3, 2);
+  expect.equal(counter1.peek(), 2);
+
+// "inc() with custom key" 
+  let key = "custom-key";
+
+  // explicit increment (positive int)
+  let r4 = counter2.inc(5, key);
+  expect.equal(r4, -1);
+  expect.equal(counter2.peek(key), 4);
+
+  // explicit increment (negative int)
+  let r5 = counter2.inc(-4, key);
+  expect.equal(r5, 4);
+  expect.equal(counter2.peek(key), 0);
 
-test "key inc" {
-  let key = "my-key";
-  assert(counter.peek(key) == 0);
-  let r0 = counter.inc(nil, key);
-  assert(r0 == 0);
-  assert(counter.peek(key) == 1);
-  let r1 = counter.inc(nil, key);
-  assert(r1 == 1);
-  assert(counter.peek(key) == 2);
-  let r2 = counter.inc(10, key);
-  assert(r2 == 2);
-  assert(counter.peek(key) == 12);
-  let r3 = counter.inc(nil, key);
-  assert(r3 == 12);
+  // explicit increment (+0)
+  let r6 = counter2.inc(0, key);
+  expect.equal(r6, 0);
+  expect.equal(counter2.peek(key), 0);
 }
diff --git a/examples/tests/sdk_tests/counter/initial.test.w b/examples/tests/sdk_tests/counter/initial.test.w
index 8f7bd0d0e35..3b869b5931b 100644
--- a/examples/tests/sdk_tests/counter/initial.test.w
+++ b/examples/tests/sdk_tests/counter/initial.test.w
@@ -1,17 +1,21 @@
 bring cloud;
+bring expect;
 
 let counterA = new cloud.Counter() as "counterA";
 let counterB = new cloud.Counter(initial: 500) as "counterB";
 let counterC = new cloud.Counter(initial: -198) as "counterC";
 
-test "initial:default" {
-  assert(counterA.peek() == 0);
-}
+expect.equal(counterA.initial, 0);
+expect.equal(counterB.initial, 500);
+expect.equal(counterC.initial, -198);
 
-test "initial:positive-value" {
-  assert(counterB.peek() == 500);
-}
+test "initial" {
+// "initial:default"
+  expect.equal(counterA.peek(), 0);
+
+// "initial:positive-value" 
+  expect.equal(counterB.peek(), 500);
 
-test "initial:negative-value" {
-  assert(counterC.peek() == -198);
+// "initial:negative-value" 
+  expect.equal(counterC.peek(), -198);
 }
diff --git a/examples/tests/sdk_tests/counter/peek.test.w b/examples/tests/sdk_tests/counter/peek.test.w
index f6a97356ff0..f9ab3c198ad 100644
--- a/examples/tests/sdk_tests/counter/peek.test.w
+++ b/examples/tests/sdk_tests/counter/peek.test.w
@@ -1,18 +1,18 @@
 bring cloud;
+bring expect;
 
 let c = new cloud.Counter();
 
 test "peek" {
-  assert(c.peek() == 0);
-  assert(c.peek() == 0);
+  expect.equal(c.peek(), 0);
+  expect.equal(c.peek(), 0);
   c.inc();
-  assert(c.peek() == 1);
-}
+  expect.equal(c.peek(), 1);
 
-test "key peek" {
+// "key peek" 
   let key = "my-key";
-  assert(c.peek(key) == 0);
-  assert(c.peek(key) == 0);
+  expect.equal(c.peek(key), 0);
+  expect.equal(c.peek(key), 0);
   c.inc(nil, key);
-  assert(c.peek(key) == 1);
+  expect.equal(c.peek(key), 1);
 }
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/counter/set.test.w b/examples/tests/sdk_tests/counter/set.test.w
index 851d34b079a..9dce4204b4a 100644
--- a/examples/tests/sdk_tests/counter/set.test.w
+++ b/examples/tests/sdk_tests/counter/set.test.w
@@ -1,28 +1,36 @@
 bring cloud;
+bring expect;
 
-let counter = new cloud.Counter(initial: 0);
-
-test "set" {
-  assert(counter.peek() == 0);
-  counter.inc();
-  assert(counter.peek() == 1);
-  counter.inc();
-  assert(counter.peek() == 2);
-  counter.inc(10);
-  assert(counter.peek() == 12);
-  counter.set(88);
-  assert(counter.peek() == 88);
-}
+// implicit initial (0)
+let counter1 = new cloud.Counter() as "counter1";
+// explicit initial
+let counter2 = new cloud.Counter(initial: -1) as "counter2";
+
+test "set()" {
+  // set (positive int)
+  counter1.set(42);
+  expect.equal(counter1.peek(), 42);
+
+  // set (negative int)
+  counter1.set(-100);
+  expect.equal(counter1.peek(), -100);
+
+  // set (0)
+  counter1.set(0);
+  expect.equal(counter1.peek(), 0);
 
-test "key set" {
-  let key = "my-key";
-  assert(counter.peek(key) == 0);
-  counter.inc(nil, key);
-  assert(counter.peek(key) == 1);
-  counter.inc(nil, key);
-  assert(counter.peek(key) == 2);
-  counter.inc(10, key);
-  assert(counter.peek(key) == 12);
-  counter.set(88, key);
-  assert(counter.peek(key) == 88);
-}
\ No newline at end of file
+// "set() with custom key" 
+  let key = "custom-key";
+
+  // set (positive int)
+  counter2.set(42, key);
+  expect.equal(counter2.peek(key), 42);
+
+  // set (negative int)
+  counter2.set(-100, key);
+  expect.equal(counter2.peek(key), -100);
+
+  // set (0)
+  counter2.set(0, key);
+  expect.equal(counter2.peek(key), 0);
+}
diff --git a/examples/tests/sdk_tests/dynamodb-table/aws-dynamodb.test.w b/examples/tests/sdk_tests/dynamodb-table/aws-dynamodb.test.w
deleted file mode 100644
index 34510fd26d3..00000000000
--- a/examples/tests/sdk_tests/dynamodb-table/aws-dynamodb.test.w
+++ /dev/null
@@ -1,40 +0,0 @@
-/*\
-skipPlatforms:
-  - win32
-  - darwin
-\*/
-
-bring ex;
-bring aws;
-bring util;
-
-let target = util.env("WING_TARGET");
-
-let table = new ex.DynamodbTable(
-  name: "test1",
-  attributeDefinitions: { "k1": "S", "k2": "S" },
-  hashKey: "k1",
-  rangeKey: "k2"
-) as "aws-wing-dynamodb";
-
-let getTableInfo = (t: ex.DynamodbTable): Map<str>? => {
-  if let table = aws.DynamodbTable.from(t) {
-    return {
-      dynamoTableName: table.dynamoTableName,
-      dynamoTableArn: table.dynamoTableArn,
-    };
-  }
-  return nil;
-};
-
-let tableInfo = getTableInfo(table);
-
-test "validates the AWS DynamodbTable" {
-  if let table = tableInfo {
-    assert(table.get("dynamoTableArn").contains("arn:aws:dynamodb:"));
-    assert(table.get("dynamoTableArn").contains("aws-wing-dynamodb"));
-    assert(table.get("dynamoTableName").contains("aws-wing-dynamodb"));
-  }
-  // If the test is not on AWS, it should not fail, so I am returning true.
-  assert(true);
-}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/dynamodb-table/query.test.w b/examples/tests/sdk_tests/dynamodb-table/query.test.w
deleted file mode 100644
index da19b5df3b2..00000000000
--- a/examples/tests/sdk_tests/dynamodb-table/query.test.w
+++ /dev/null
@@ -1,41 +0,0 @@
-/*\
-skipPlatforms:
-  - win32
-  - darwin
-\*/
-
-bring ex;
-
-let t1 = new ex.DynamodbTable(name: "test1", attributeDefinitions: { "k1": "S", "k2": "S" }, hashKey: "k1", rangeKey: "k2");
-
-test "query" {
-  t1.putItem({
-    item: {
-      "k1": "key1",
-      "k2": "value1",
-      "k3": "other-value1"
-    }
-  });
-  t1.putItem({
-    item: {
-      "k1": "key1",
-      "k2": "value2",
-      "k3": "other-value2"
-    }
-  });
-
-  let result = t1.query(
-    keyConditionExpression: "k1 = :k1",
-    expressionAttributeValues: {
-      ":k1": "key1",
-    },
-  );
-
-  assert(result.count == 2);
-  assert(result.items.at(0).get("k1") == "key1");
-  assert(result.items.at(0).get("k2") == "value1");
-  assert(result.items.at(0).get("k3") == "other-value1");
-  assert(result.items.at(1).get("k1") == "key1");
-  assert(result.items.at(1).get("k2") == "value2");
-  assert(result.items.at(1).get("k3") == "other-value2");
-}
diff --git a/examples/tests/sdk_tests/dynamodb-table/transaction.test.w b/examples/tests/sdk_tests/dynamodb-table/transaction.test.w
deleted file mode 100644
index ade55adab82..00000000000
--- a/examples/tests/sdk_tests/dynamodb-table/transaction.test.w
+++ /dev/null
@@ -1,63 +0,0 @@
-/*\
-skipPlatforms:
-  - win32
-  - darwin
-\*/
-
-bring ex;
-
-let t1 = new ex.DynamodbTable(name: "test1", attributeDefinitions: { "k1": "S", "k2": "S" }, hashKey: "k1", rangeKey: "k2");
-
-test "transactWriteItems" {
-  t1.putItem({
-    item: {
-      "k1": "key1",
-      "k2": "value1",
-      "k3": "other-value1"
-    }
-  });
-  t1.putItem({
-    item: {
-      "k1": "key2",
-      "k2": "value2",
-      "k3": "other-value2"
-    }
-  });
-
-  t1.transactWriteItems(transactItems: [
-    ex.DynamodbTransactWriteItem{
-      put: {
-        item: {
-          "k1": "key3",
-          "k2": "value3",
-          "k3": "other-value3"
-        }
-      },
-    },
-    ex.DynamodbTransactWriteItem{
-      delete: {
-        key: { "k1": "key2", "k2": "value2" }
-      },
-    },
-    ex.DynamodbTransactWriteItem{
-      update: {
-        key: { "k1": "key1", "k2": "value1" },
-        updateExpression: "set k3 = :k3",
-        expressionAttributeValues: { ":k3": "not-other-value1" }
-      },
-    }
-  ]);
-
-  let var r = t1.getItem({ key: { "k1": "key1", "k2": "value1" } });
-  assert(r.item?.get("k1")?.asStr() == "key1");
-  assert(r.item?.get("k2")?.asStr() == "value1");
-  assert(r.item?.get("k3")?.asStr() == "not-other-value1");
-
-  r = t1.getItem({ key: { "k1": "key2", "k2": "value2" } });
-  assert(r.item?.tryGet("k1") == nil);
-
-  r = t1.getItem({ key: { "k1": "key3", "k2": "value3" } });
-  assert(r.item?.get("k1")?.asStr() == "key3");
-  assert(r.item?.get("k2")?.asStr() == "value3");
-  assert(r.item?.get("k3")?.asStr() == "other-value3");
-}
diff --git a/examples/tests/sdk_tests/endpoint/url.test.w b/examples/tests/sdk_tests/endpoint/url.test.w
new file mode 100644
index 00000000000..4618d7537e2
--- /dev/null
+++ b/examples/tests/sdk_tests/endpoint/url.test.w
@@ -0,0 +1,17 @@
+bring cloud;
+bring http;
+
+let api = new cloud.Api();
+api.get("/", inflight () => {
+  return {
+    status: 200,
+    body: "OK"
+  };
+});
+
+let endpoint = new cloud.Endpoint(api.url);
+assert(endpoint.url == api.url);
+
+test "access endpoint url" {
+  assert(http.get(endpoint.url).body == "OK");
+}
diff --git a/examples/tests/sdk_tests/expect/assert.test.w b/examples/tests/sdk_tests/expect/assert.test.w
index 3eadccbf3e6..1de58aeb3d3 100644
--- a/examples/tests/sdk_tests/expect/assert.test.w
+++ b/examples/tests/sdk_tests/expect/assert.test.w
@@ -16,16 +16,6 @@ expect.notEqual(b, 2);
 expect.notEqual(b, "hello");
 expect.notEqual(b, true);
 
-test "equal num" {
-    expect.equal(1, 1);
-    expect.equal(b, 1);
-    expect.nil(a);
-    expect.notNil(b);
-    expect.notEqual(b, 2);
-    expect.notEqual(b, "hello");
-    expect.notEqual(b, true);
-}
-
 // String tests
 
 let c: str? = nil;
@@ -38,16 +28,8 @@ expect.notNil(d);
 expect.notEqual(d, "world");
 expect.notEqual(d, 1);
 expect.notEqual(d, true);
-
-test "equal str" {
-    expect.equal("hello", "hello");
-    expect.equal(d, "hello");
-    expect.nil(c);
-    expect.notNil(d);
-    expect.notEqual(d, "world");
-    expect.notEqual(d, 1);
-    expect.notEqual(d, true);
-}
+expect.match("this contains hello world string", "hello");
+expect.doesNotMatch("this contains some random string", "world");
 
 // Bool tests
 
@@ -60,76 +42,43 @@ expect.nil(e);
 expect.notNil(f);
 expect.notEqual(f, false);
 
-test "equal bool" {
-    expect.equal(true, true);
-    expect.equal(f, true);
-    expect.nil(e);
-    expect.notNil(f);
-    expect.notEqual(f, false);
-}
-
 // List of str tests
 let g = ["hello"];
 
 expect.equal(g, ["hello"]);
 expect.notEqual(g, ["world"]);
 
-test "equal array of strings" {
-    expect.equal(g, ["hello"]);
-    expect.notEqual(g, ["world"]);
-}
-
 // List of numbers tests
 let h = [1];
 
 expect.equal(h, [1]);
 expect.notEqual(h, ["world"]);
 
-test "equal array of numbers" {
-    expect.equal(h, [1]);
-    expect.notEqual(h, ["world"]);
-}
-
 // Json object tests
 let obj = Json { key1: 1, key2: 2};
 
 expect.equal(obj, Json { key1: 1, key2: 2});
 expect.notEqual(obj, Json { key1: 1, key3: 3});
 
-test "equal objects" {
-    expect.equal(obj, Json { key1: 1, key2: 2});
-    expect.notEqual(obj, Json { key1: 1, key3: 3});
-}
-
 // Map tests
 
 let maps = { "hello" => 123, "world" => 99 };
 expect.equal(maps, { "hello" => 123, "world" => 99 });
 expect.notEqual(maps, { "hello" => 123, "world" => 100 });
 
-test "equal maps" {
-    expect.equal(maps, { "hello" => 123, "world" => 99 });
-    expect.notEqual(maps, { "hello" => 123, "world" => 100 });
-}
-
-
 // Set tests
 
-let mySet = Set<num> {1, 2, 3};
+let mySet = Set<num>[1, 2, 3];
 
-expect.equal(mySet, Set<num> {1, 2, 3});
-expect.notEqual(mySet, Set<num> {1, 2, 3, 4});
+expect.equal(mySet, Set<num>[1, 2, 3]);
+expect.notEqual(mySet, Set<num>[1, 2, 3, 4]);
 
-test "equal sets" {
-    expect.equal(mySet, Set<num> {1, 2, 3});
-    expect.notEqual(mySet, Set<num> {1, 2, 3, 4});
-}
 
 // DateTime tests
 // FIXME: Doesn't work
 // ERROR: unable to serialize immutable data object of type Datetime
 
-// examples/tests/sdk_tests/expect/target/test/assert.main.wsim.256800.tmp/.wing/preflight.js:319
+// examples/tests/sdk_tests/expect/target/test/assert.main.wsim.256800.tmp/.wing/preflight.cjs:319
 
 // let dt = datetime.fromIso("2023-07-18T20:18:25.177+03:00");
 
@@ -141,38 +90,11 @@ test "equal sets" {
 //     expect.notEqual(dt, datetime.fromIso("2024-07-18T20:18:25.177+03:00"));
 // }
 
-// Range tests
-// Doesn't work, while expect.equal([1,2,3,4], [1,2,3,4]); works and the JS equivalent works too
-// 
-//ERROR: Values have same structure but are not reference-equal:
-
-// [
-//     1,
-//     2,
-//     3,
-//     4
-//   ]
-// let myRange = std.Range.of(1,5);
-
-// expect.equal(myRange, [1,2,3,4]);
-// expect.notEqual(myRange, std.Range.of(1,6));
-
-// test "equal ranges" {
-//     expect.equal(myRange, std.Range.of(1,5));
-//     expect.notEqual(myRange, std.Range.of(1,6));
-// }
-
 // Duration tests
 
 expect.equal(60s, 1m);
 expect.notEqual(61s, 1m);
 
-test "equal durations" {
-    expect.equal(60s, 1m);
-    expect.notEqual(61s, 1m);
-}
-
-
 // custom preflight Class test
 class MyClass {
     a: num;
@@ -190,6 +112,93 @@ let myClass = new MyClass(1, "hello");
 expect.equal(myClass, myClass);
 expect.notEqual(myClass, new MyClass(1, "hello world") as "yet another my class");
 
+test "expect" {
+  // "equal num"
+    expect.equal(1, 1);
+    expect.equal(b, 1);
+    expect.nil(a);
+    expect.notNil(b);
+    expect.notEqual(b, 2);
+    expect.notEqual(b, "hello");
+    expect.notEqual(b, true);
+
+// "equal str" 
+    expect.equal("hello", "hello");
+    expect.equal(d, "hello");
+    expect.nil(c);
+    expect.notNil(d);
+    expect.notEqual(d, "world");
+    expect.notEqual(d, 1);
+    expect.notEqual(d, true);
+    expect.match("this contains hello world string", "hello");
+    expect.doesNotMatch("this contains some random string", "world");
+
+// "equal bool" 
+    expect.equal(true, true);
+    expect.equal(f, true);
+    expect.nil(e);
+    expect.notNil(f);
+    expect.notEqual(f, false);
+    expect.ok(true,"succeeds");
+    expect.ok(2<3);
+
+// "equal array of strings" 
+    expect.equal(g, ["hello"]);
+    expect.notEqual(g, ["world"]);
+
+// "equal array of numbers" {
+    expect.equal(h, [1]);
+    expect.notEqual(h, ["world"]);
+
+
+// "equal objects" {
+    expect.equal(obj, Json { key1: 1, key2: 2});
+    expect.notEqual(obj, Json { key1: 1, key3: 3});
+
+// "equal maps" {
+    expect.equal(maps, { "hello" => 123, "world" => 99 });
+    expect.notEqual(maps, { "hello" => 123, "world" => 100 });
+
+
+// "equal sets" 
+    expect.equal(mySet, Set<num>[1, 2, 3]);
+    expect.notEqual(mySet, Set<num>[1, 2, 3, 4]);
+
+// "equal durations" 
+    expect.equal(60s, 1m);
+    expect.notEqual(61s, 1m);
+
+
+// "positive fail test" 
+   try {
+    expect.fail("This is a failure");
+   }catch err{
+    expect.equal(err, "This is a failure");
+   }
+
+ // "negative ok test"
+    try {
+        expect.ok(false,"This Fails with this message");
+       }catch err{
+        expect.equal(err, "This Fails with this message");
+       }
+
+// "negative match test"
+    try{
+        expect.match("this contains hello world string", "new string");
+    }catch err{
+        expect.equal(err, "The input did not match the regular expression new string");
+    }
+
+// "negative doesNotMatch test"
+    try{
+        expect.doesNotMatch("this contains some random string", "random");
+    }catch err{
+        expect.equal(err, "The input should not match the regular expression random");
+    }
+}
+
+
 // custom inflight Class test
 // ERROR: Values have same structure but are not reference-equal:
 
@@ -207,4 +216,4 @@ expect.notEqual(myClass, new MyClass(1, "hello world") as "yet another my class"
 //     let myInflightClass = new MyInflightClass(1, "hello");
 //     expect.equal(myInflightClass, new MyInflightClass(1, "hello"));
 //     expect.notEqual(myInflightClass, new MyInflightClass(1, "hello world"));
-// }
\ No newline at end of file
+// }
diff --git a/examples/tests/sdk_tests/fs/basic.test.w b/examples/tests/sdk_tests/fs/basic.test.w
index 89985729c87..002d581b805 100644
--- a/examples/tests/sdk_tests/fs/basic.test.w
+++ b/examples/tests/sdk_tests/fs/basic.test.w
@@ -3,6 +3,7 @@ bring fs;
 let tmpdir = fs.mkdtemp();
 let filepath = "{tmpdir}/hello-preflight.txt";
 let data = "Hello, Wing!";
+let appendData = " Time to take flight!";
 
 fs.writeFile(filepath, data);
 assert(fs.exists(filepath) == true);
@@ -10,6 +11,12 @@ assert(fs.exists(filepath) == true);
 let content = fs.readFile(filepath);
 assert(content == data);
 
+fs.appendFile(filepath, appendData);
+assert(fs.exists(filepath) == true);
+
+let newContent = fs.readFile(filepath);
+assert(newContent == data + appendData);
+
 fs.remove(filepath);
 assert(fs.exists(filepath) == false);
 
@@ -29,6 +36,12 @@ test "inflight file basic operations" {
     let content = fs.readFile(filepath);
     assert(content == data);
 
+    fs.appendFile(filepath, appendData);
+    assert(fs.exists(filepath) == true);
+
+    let newContent = fs.readFile(filepath);
+    assert(newContent == data + appendData);
+
     fs.remove(filepath);
     assert(fs.exists(filepath) == false);
 
diff --git a/examples/tests/sdk_tests/fs/directory.test.w b/examples/tests/sdk_tests/fs/directory.test.w
index 47090916d9a..dc00b36d201 100644
--- a/examples/tests/sdk_tests/fs/directory.test.w
+++ b/examples/tests/sdk_tests/fs/directory.test.w
@@ -1,5 +1,4 @@
 bring fs;
-bring regex;
 bring expect;
 
 let tmpdir = fs.mkdtemp();
@@ -12,41 +11,43 @@ assert(fs.exists(dirpath) == true);
 try {
     fs.mkdir(dirpath);
 } catch e {
-    assert(regex.match("^EEXIST: file already exists", e) == true);
+    let re = regex.compile("^EEXIST: file already exists");
+    expect.equal(re.test(e), true);
 }
 
 fs.writeFile(fs.join(dirpath, filename), "");
 let files = fs.readdir(dirpath);
-assert(files.length == 1);
+expect.equal(files.length, 1);
 
 fs.remove(dirpath);
-assert(fs.exists(dirpath) == false);
+expect.equal(fs.exists(dirpath), false);
 
 let nilFiles = fs.tryReaddir(dirpath);
-assert(nilFiles == nil);
+expect.equal(nilFiles, nil);
 
 test "inflight create normal directory" {
     let tmpdir = fs.mkdtemp();
     let dirpath = "{tmpdir}/wingdir-inflight";
 
     fs.mkdir(dirpath);
-    assert(fs.exists(dirpath) == true);
+    expect.equal(fs.exists(dirpath), true);
 
     try {
         fs.mkdir(dirpath);
     } catch e {
-        assert(regex.match("^EEXIST: file already exists", e) == true);
+        let re = regex.compile("^EEXIST: file already exists");
+        expect.equal(re.test(e), true);
     }
     
     fs.writeFile(fs.join(dirpath, filename), "");
     let files = fs.readdir(dirpath);
-    assert(files.length == 1);
+    expect.equal(files.length, 1);
 
     fs.remove(dirpath);
-    assert(fs.exists(dirpath) == false);
+    expect.equal(fs.exists(dirpath), false);
 
     let nilFiles = fs.tryReaddir(dirpath);
-    assert(nilFiles == nil);
+    expect.equal(nilFiles, nil);
 }
 
 test "cannot overwrite directory with a file" {
@@ -55,18 +56,19 @@ test "cannot overwrite directory with a file" {
     let var errorCaught = false;
 
     fs.mkdir(dirpath);
-    assert(fs.exists(dirpath) == true);
+    expect.equal(fs.exists(dirpath), true);
 
     try {
         fs.writeFile(dirpath, "This should fail.");
     } catch e {
-        errorCaught = regex.match("^EISDIR: illegal operation on a directory", e);
+        let re = regex.compile("^EISDIR: illegal operation on a directory");
+        errorCaught = re.test(e);
     }
-    assert(errorCaught == true);
+    expect.equal(errorCaught, true);
 
     // Cleanup
     fs.remove(dirpath);
-    assert(fs.exists(dirpath) == false);
+    expect.equal(fs.exists(dirpath), false);
 }
 
 test "isDir()" {
diff --git a/examples/tests/sdk_tests/fs/json.test.w b/examples/tests/sdk_tests/fs/json.test.w
index b450444baa7..48cd7a0fa2f 100644
--- a/examples/tests/sdk_tests/fs/json.test.w
+++ b/examples/tests/sdk_tests/fs/json.test.w
@@ -1,5 +1,5 @@
 bring fs;
-bring regex;
+bring expect;
 
 let tmpdir = fs.mkdtemp();
 let filepath = "{tmpdir}/test-preflight.json";
@@ -12,22 +12,23 @@ try {
     fs.writeFile(filepath, "invalid content");
     fs.readJson(filepath);
 } catch e {
-    assert(regex.match("^Unexpected token", e) == true);
+    let re = regex.compile("^Unexpected token");
+    expect.equal(re.test(e), true);
 }
 
 fs.writeJson(filepath, data);
-assert(fs.exists(filepath) == true);
+expect.equal(fs.exists(filepath), true);
 
 let obj = fs.readJson(filepath);
-assert(Json.stringify(obj) == Json.stringify(data));
+expect.equal(Json.stringify(obj), Json.stringify(data));
 
 fs.remove(filepath);
-assert(fs.exists(filepath) == false);
+expect.equal(fs.exists(filepath), false);
 
-assert(fs.tryReadJson(filepath) == nil);
+expect.equal(fs.tryReadJson(filepath), nil);
 
 fs.remove(tmpdir, { recursive: true });
-assert(fs.exists(tmpdir) == false);
+expect.equal(fs.exists(tmpdir), false);
 
 test "inflight json operations" {
     let tmpdir = fs.mkdtemp();
@@ -37,20 +38,21 @@ test "inflight json operations" {
         fs.writeFile(filepath, "invalid content");
         fs.readJson(filepath);
     } catch e {
-        assert(regex.match("^Unexpected token", e) == true);
+        let re = regex.compile("^Unexpected token");
+        expect.equal(re.test(e), true);
     }
 
     fs.writeJson(filepath, data);
-    assert(fs.exists(filepath) == true);
+    expect.equal(fs.exists(filepath), true);
 
     let obj = fs.readJson(filepath);
-    assert(Json.stringify(obj) == Json.stringify(data));
+    expect.equal(Json.stringify(obj), Json.stringify(data));
 
     fs.remove(filepath);
-    assert(fs.exists(filepath) == false);
+    expect.equal(fs.exists(filepath), false);
 
-    assert(fs.tryReadJson(filepath) == nil);
+    expect.equal(fs.tryReadJson(filepath), nil);
 
     fs.remove(tmpdir, { recursive: true });
-    assert(fs.exists(tmpdir) == false);
+    expect.equal(fs.exists(tmpdir), false);
 }
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/fs/options.test.w b/examples/tests/sdk_tests/fs/options.test.w
index bc2ad8f650f..1ccb028ab14 100644
--- a/examples/tests/sdk_tests/fs/options.test.w
+++ b/examples/tests/sdk_tests/fs/options.test.w
@@ -1,5 +1,4 @@
 bring fs;
-bring regex;
 bring expect;
 
 test "write and read file with `encoding` option" {
@@ -16,7 +15,7 @@ test "write and read file with `encoding` option" {
     expect.notEqual(contentAscii, data);
 
     fs.remove(tmpdir, { recursive: true });
-    assert(fs.exists(tmpdir) == false);
+    expect.equal(fs.exists(tmpdir), false);
 }
 
 test "write file with `flag` option" {
@@ -33,7 +32,7 @@ test "write file with `flag` option" {
     expect.equal(content, "{data}{appendData}");
 
     fs.remove(tmpdir, { recursive: true });
-    assert(fs.exists(tmpdir) == false);
+    expect.equal(fs.exists(tmpdir), false);
 }
 
 test "removing non-existent file with `force: false` raises error" {
@@ -44,13 +43,14 @@ test "removing non-existent file with `force: false` raises error" {
     try {
         fs.remove(nonExistentFilePath, { force: false });
     } catch e {
-        errorCaught = regex.match("^ENOENT: no such file or directory", e);
+        let re = regex.compile("^ENOENT: no such file or directory");
+        errorCaught = re.test(e);
     }
 
     expect.equal(errorCaught, true);
 
     fs.remove(tmpdir);
-    assert(fs.exists(tmpdir) == false);
+    expect.equal(fs.exists(tmpdir), false);
 }
 
 test "removing directory with `recursive: false` raises error" {
@@ -65,13 +65,14 @@ test "removing directory with `recursive: false` raises error" {
     try {
         fs.remove(dirpath, { recursive: false });
     } catch e {
-        errorCaught = regex.match("^Path is a directory: rm returned EISDIR", e);
+        let re = regex.compile("^Path is a directory: rm returned EISDIR");
+        errorCaught = re.test(e);
     }
 
     expect.equal(errorCaught, true);
 
     fs.remove(dirpath);
     fs.remove(tmpdir);
-    assert(fs.exists(dirpath) == false);
-    assert(fs.exists(tmpdir) == false);
+    expect.equal(fs.exists(dirpath), false);
+    expect.equal(fs.exists(tmpdir), false);
 }
diff --git a/examples/tests/sdk_tests/fs/path.test.w b/examples/tests/sdk_tests/fs/path.test.w
index ae2fa820122..69ff8fd5646 100644
--- a/examples/tests/sdk_tests/fs/path.test.w
+++ b/examples/tests/sdk_tests/fs/path.test.w
@@ -1,40 +1,40 @@
 bring fs;
-bring regex;
 bring expect;
 
 let from = "/a/b/c/d";
 let to = "/a/b/e/f";
+let r = regex.compile("/a/b/e/f");
 
 let var result = fs.join(from, to);
-assert(result == "/a/b/c/d/a/b/e/f");
+expect.equal(result, "/a/b/c/d/a/b/e/f");
 
 result = fs.relative(from ,to);
-assert(result == "../../e/f");
+expect.equal(result, "../../e/f");
 
 result = fs.absolute(from, to);
-assert(regex.match("/a/b/e/f", result));
+expect.equal(r.test(result), true);
 
 result = fs.dirname(from);
-assert(result == "/a/b/c");
+expect.equal(result, "/a/b/c");
 
 result = fs.basename(from);
-assert(result == "d");
+expect.equal(result, "d");
 
 test "inflight path conversion" {
     let var result = fs.join(from, to);
-    assert(result == "/a/b/c/d/a/b/e/f");
+    expect.equal(result, "/a/b/c/d/a/b/e/f");
     
     result = fs.relative(from ,to);
-    assert(result == "../../e/f");
+    expect.equal(result, "../../e/f");
 
     result = fs.absolute(from, to);
-    assert(regex.match("/a/b/e/f", result));
+    expect.equal(r.test(result), true);
 
     result = fs.dirname(from);
-    assert(result == "/a/b/c");
+    expect.equal(result, "/a/b/c");
 
     result = fs.basename(from);
-    assert(result == "d");
+    expect.equal(result, "d");
 }
 
 test "extension()" {
diff --git a/examples/tests/sdk_tests/fs/stat.test.w b/examples/tests/sdk_tests/fs/stat.test.w
index d1a567e92a0..32fba19d602 100644
--- a/examples/tests/sdk_tests/fs/stat.test.w
+++ b/examples/tests/sdk_tests/fs/stat.test.w
@@ -1,11 +1,11 @@
 bring fs;
-bring regex;
 bring expect;
 
 test "metadata()" {
     let tempDir = fs.mkdtemp();
     let tempFile = fs.join(tempDir, "tempfile.txt");
     let tempSymlink = fs.join(tempDir, "symlink");
+    let unixMode = regex.compile("[0-7]\{3\}");
 
     fs.writeFile(tempFile, "Hello, Wing!");
     fs.symlink(tempFile, tempSymlink);
@@ -14,7 +14,7 @@ test "metadata()" {
     let fileStats = fs.metadata(tempFile);
     expect.equal(fileStats.size, 12);
     expect.equal(fileStats.fileType, fs.FileType.FILE);
-    assert(regex.match("[0-7]\{3\}", fileStats.permissions));
+    expect.equal(unixMode.test(fileStats.permissions), true);
     assert(fileStats.accessed.year >= 2023);
     assert(fileStats.modified.year >= 2023);
     assert(fileStats.created.year >= 2023);
@@ -23,7 +23,7 @@ test "metadata()" {
     let symlinkStats = fs.metadata(tempSymlink);
     expect.equal(symlinkStats.size, 12);
     expect.equal(symlinkStats.fileType, fs.FileType.FILE);
-    assert(regex.match("[0-7]\{3\}", symlinkStats.permissions));
+    expect.equal(unixMode.test(symlinkStats.permissions), true);
     assert(symlinkStats.accessed.year >= 2023);
     assert(symlinkStats.modified.year >= 2023);
     assert(symlinkStats.created.year >= 2023);
@@ -31,7 +31,7 @@ test "metadata()" {
     // Test a Directory
     let dirStats = fs.metadata(tempDir);
     expect.equal(dirStats.fileType, fs.FileType.DIRECTORY);
-    assert(regex.match("[0-7]\{3\}", dirStats.permissions));
+    expect.equal(unixMode.test(dirStats.permissions), true);
     assert(fileStats.accessed.year >= 2023);
     assert(fileStats.modified.year >= 2023);
     assert(fileStats.created.year >= 2023);
@@ -45,6 +45,7 @@ test "symlinkMetadata()" {
     let tempDir = fs.mkdtemp();
     let tempFile = fs.join(tempDir, "tempfile.txt");
     let tempSymlink = fs.join(tempDir, "symlink");
+    let unixMode = regex.compile("[0-7]\{3\}");
 
     fs.writeFile(tempFile, "Hello, Wing!");
     fs.symlink(tempFile, tempSymlink);
@@ -53,7 +54,7 @@ test "symlinkMetadata()" {
     let fileStats = fs.symlinkMetadata(tempFile);
     expect.equal(fileStats.size, 12);
     expect.equal(fileStats.fileType, fs.FileType.FILE);
-    assert(regex.match("[0-7]\{3\}", fileStats.permissions));
+    expect.equal(unixMode.test(fileStats.permissions), true);
     assert(fileStats.accessed.year >= 2023);
     assert(fileStats.modified.year >= 2023);
     assert(fileStats.created.year >= 2023);
@@ -62,7 +63,7 @@ test "symlinkMetadata()" {
     let symlinkStats = fs.symlinkMetadata(tempSymlink);
     expect.notEqual(symlinkStats.size, 12);
     expect.equal(symlinkStats.fileType, fs.FileType.SYMLINK);
-    assert(regex.match("[0-7]\{3\}", symlinkStats.permissions));
+    expect.equal(unixMode.test(symlinkStats.permissions), true);
     assert(symlinkStats.accessed.year >= 2023);
     assert(symlinkStats.modified.year >= 2023);
     assert(symlinkStats.created.year >= 2023);
@@ -70,7 +71,7 @@ test "symlinkMetadata()" {
     // Test a Directory
     let dirStats = fs.symlinkMetadata(tempDir);
     expect.equal(dirStats.fileType, fs.FileType.DIRECTORY);
-    assert(regex.match("[0-7]\{3\}", dirStats.permissions));
+    expect.equal(unixMode.test(dirStats.permissions), true);
     assert(fileStats.accessed.year >= 2023);
     assert(fileStats.modified.year >= 2023);
     assert(fileStats.created.year >= 2023);
diff --git a/examples/tests/sdk_tests/fs/yaml.test.w b/examples/tests/sdk_tests/fs/yaml.test.w
index 07fbd0c53b2..def8a183487 100644
--- a/examples/tests/sdk_tests/fs/yaml.test.w
+++ b/examples/tests/sdk_tests/fs/yaml.test.w
@@ -1,5 +1,5 @@
 bring fs;
-bring regex;
+bring expect;
 
 let tmpdir = fs.mkdtemp();
 let filepath = "{tmpdir}/test-preflight.yaml";
@@ -12,38 +12,39 @@ fs.writeFile(filepath, "invalid: \{\{ content }}, invalid");
 try {
     fs.readYaml(filepath);
 } catch e {
-    assert(regex.match("^bad indentation", e));
+    let re = regex.compile("^bad indentation");
+    expect.equal(re.test(e));
 }
 
 fs.writeYaml(filepath, data, data);
-assert(fs.exists(filepath) == true);
+expect.equal(fs.exists(filepath), true);
 
 let objs = fs.readYaml(filepath);
-assert(objs.length == 2);
-assert(Json.stringify(objs.at(0)) == Json.stringify(data));
-assert(Json.stringify(objs.at(1)) == Json.stringify(data));
+expect.equal(objs.length, 2);
+expect.equal(Json.stringify(objs.at(0)), Json.stringify(data));
+expect.equal(Json.stringify(objs.at(1)), Json.stringify(data));
 
 fs.remove(filepath);
-assert(fs.exists(filepath) == false);
+expect.equal(fs.exists(filepath), false);
 
 fs.remove(tmpdir, { recursive: true });
-assert(fs.exists(tmpdir) == false);
+expect.equal(fs.exists(tmpdir), false);
 
 test "inflight yaml operations" {
     let tmpdir = fs.mkdtemp();
     let filepath = "{tmpdir}/test-inflight.yaml";
 
     fs.writeYaml(filepath, data, data);
-    assert(fs.exists(filepath) == true);
+    expect.equal(fs.exists(filepath), true);
 
     let objs = fs.readYaml(filepath);
-    assert(objs.length == 2);
-    assert(Json.stringify(objs.at(0)) == Json.stringify(data));
-    assert(Json.stringify(objs.at(1)) == Json.stringify(data));
+    expect.equal(objs.length, 2);
+    expect.equal(Json.stringify(objs.at(0)), Json.stringify(data));
+    expect.equal(Json.stringify(objs.at(1)), Json.stringify(data));
 
     fs.remove(filepath);
-    assert(fs.exists(filepath) == false);
+    expect.equal(fs.exists(filepath), false);
 
     fs.remove(tmpdir, { recursive: true });
-    assert(fs.exists(tmpdir) == false);
+    expect.equal(fs.exists(tmpdir), false);
 }
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/function/aws-function.test.w b/examples/tests/sdk_tests/function/aws-function.test.w
index 7bcd7a7e0fe..68170702641 100644
--- a/examples/tests/sdk_tests/function/aws-function.test.w
+++ b/examples/tests/sdk_tests/function/aws-function.test.w
@@ -1,5 +1,6 @@
-bring cloud;
 bring aws;
+bring cloud;
+bring expect;
 bring util;
 
 let target = util.env("WING_TARGET");
@@ -18,7 +19,31 @@ let getFunctionInfo = (f: cloud.Function): Map<str>? => {
 
 let functionInfo = getFunctionInfo(lambda);
 
-test "validates the AWS Function" {
+
+
+let fn = new cloud.Function(inflight (msg: str?) => {
+  if msg == "error" {
+    throw "fake error";
+  }
+
+  if let ctx = aws.Function.context() {
+    log(Json.stringify(ctx));
+    expect.equal(ctx.functionVersion, "$LATEST");
+
+    let remainingTime = ctx.remainingTimeInMillis();
+    assert(remainingTime > 0);
+  } else {
+    if target == "tf-aws" || target == "awscdk" {
+      expect.fail("Expected to have a context object");
+    }
+  }
+
+  return msg;
+}) as "FunctionAccessingContext";
+
+
+test "AWS Function" {
+  //  "validates the AWS Function"
   if let lambda = functionInfo {
     if target == "tf-aws" {      
       assert(lambda.get("functionArn").contains("arn:aws:lambda:"));
@@ -35,4 +60,20 @@ test "validates the AWS Function" {
     // If the test is not on AWS, it should not fail, so I am returning true.
     assert(true);
   }
-}
\ No newline at end of file
+
+
+// "can access lambda context" 
+  let result = fn.invoke("hello");
+  expect.equal(result, "hello");
+
+  let result2 = fn.invoke("hello2");
+  expect.equal(result2, "hello2");
+
+  let var msg = "";
+  try {
+    fn.invoke("error");
+  } catch err {
+    msg = err;
+  }
+  expect.ok(msg.contains("fake error"), "Expected fake error message");
+}
diff --git a/examples/tests/sdk_tests/function/concurrency.test.w b/examples/tests/sdk_tests/function/concurrency.test.w
new file mode 100644
index 00000000000..699c22e028c
--- /dev/null
+++ b/examples/tests/sdk_tests/function/concurrency.test.w
@@ -0,0 +1,44 @@
+bring cloud;
+bring util;
+
+// TODO: support concurrency on AWS
+
+if util.env("WING_TARGET") == "sim" {
+  let c = new cloud.Counter();
+  
+  let f1 = new cloud.Function(inflight () => {
+    c.inc();
+    util.sleep(5s);
+  }, concurrency: 1) as "concurrency fn";
+  
+  test "f1 concurrency limit reached" {
+    f1.invokeAsync();
+    try {
+      f1.invoke();
+    } catch e {
+      assert(e.contains("Too many requests, the function has reached its concurrency limit"));
+      return;
+    }
+  
+    log("No error thrown");
+    assert(false);
+  }
+
+  let q = new cloud.Queue();
+
+  q.setConsumer(inflight (message: str) => {
+    util.sleep(1s);
+    c.inc();
+  }, concurrency: 1, batchSize: 1);
+
+  test "queue applies backpressure to functions with limited concurrency" {
+    q.push("m1");
+    q.push("m2");
+    q.push("m3");
+
+    util.sleep(5s);
+
+    log("c: {c.peek()}");
+    assert(c.peek() == 3);
+  }
+}
diff --git a/examples/tests/sdk_tests/function/function-ref.test.w b/examples/tests/sdk_tests/function/function-ref.test.w
new file mode 100644
index 00000000000..0c2c29a0b7b
--- /dev/null
+++ b/examples/tests/sdk_tests/function/function-ref.test.w
@@ -0,0 +1,45 @@
+bring cloud;
+bring aws;
+bring util;
+
+// a really cool way to test a "ref" resource: basically, we define a cloud.Function
+// and then we define a `FunctionRef` that references it's ARN. nice, ha?
+
+let c = new cloud.Counter();
+let f = new cloud.Function(inflight () => {
+  c.inc();
+});
+
+// this will only work if we are testing on tf-aws
+if let arn = aws.Function.from(f)?.functionArn {
+  let fref = new aws.FunctionRef(arn);
+
+  test "can invoke a function (FunctionRef)" {
+    fref.invoke("");
+    util.waitUntil(() => {
+      return c.peek() == 1;
+    });
+  }
+}
+
+if util.env("WING_TARGET") == "sim" {
+  bring expect;
+
+  let dummyArn = "arn:aws:lambda:us-east-1:111111111111:function:Function-11111111";
+  let fr = new aws.FunctionRef(dummyArn);
+
+  test "functionArn returns the arn" {
+    expect.equal(dummyArn, fr.functionArn);
+  }
+
+  test "invoke() sends a request to aws, fails because we are using a dummy function" {
+    let var err = false;
+    try {
+      fr.invoke("");
+    } catch e {
+      err = true;
+    }
+
+    assert(err);
+  }
+}
diff --git a/examples/tests/sdk_tests/function/invoke.test.w b/examples/tests/sdk_tests/function/invoke.test.w
index c182b268c03..716e9126935 100644
--- a/examples/tests/sdk_tests/function/invoke.test.w
+++ b/examples/tests/sdk_tests/function/invoke.test.w
@@ -1,19 +1,38 @@
 bring cloud;
 bring util;
+bring expect;
 
 let payload = "hello";
 log("log preflight");
 
-let f = new cloud.Function(inflight (input: str): str => {
+let f = new cloud.Function(inflight (input): str => {
   log("log inside function\ncontains 2 lines");
   let target = util.tryEnv("WING_TARGET");
   assert(target?); // make sure WING_TARGET is defined in all environments
 
-  return "{input}-response";
+  return "{input ?? "nil"}-response";
 });
 
+
+
+let f2 = new cloud.Function(inflight (e) => {
+  expect.equal(e, nil);
+  log("no event, no return!");
+}) as "f2";
+
+let f3 = new cloud.Function(inflight () => {
+  log("bang!");
+}) as "f3";
+
 test "invoke" {
   log("log inside test");
-  let x = f.invoke("hello");
-  assert(x == "hello-response");
+  let res = f.invoke("hello");
+  expect.equal(res, "hello-response");
+
+// "invoke without inputs and outputs" 
+  let res2 = f2.invoke();
+  expect.equal(res2, nil);
+
+  let response = f3.invoke();
+  expect.equal(response, nil);
 }
diff --git a/examples/tests/sdk_tests/function/invoke_async.test.w b/examples/tests/sdk_tests/function/invoke_async.test.w
new file mode 100644
index 00000000000..43c819d66c4
--- /dev/null
+++ b/examples/tests/sdk_tests/function/invoke_async.test.w
@@ -0,0 +1,25 @@
+bring cloud;
+bring util;
+
+let counter = new cloud.Counter();
+
+let fn = new cloud.Function(inflight () => {
+  log("log inside fn");
+  util.sleep(3s);
+  counter.inc();
+});
+
+test "invoke() waits for function to finish" {
+  assert(counter.peek() == 0);
+  fn.invoke("");
+  assert(counter.peek() == 1);
+}
+
+test "invokeAsync() returns without waiting for the function finishes" {
+  assert(counter.peek() == 0);
+  fn.invokeAsync("");
+  assert(counter.peek() == 0);
+  util.waitUntil(() => {
+    return counter.peek() == 1;
+  }, timeout: 15s);
+}
diff --git a/examples/tests/sdk_tests/function/logging.extern.d.ts b/examples/tests/sdk_tests/function/logging.extern.d.ts
new file mode 100644
index 00000000000..5bff5738bf1
--- /dev/null
+++ b/examples/tests/sdk_tests/function/logging.extern.d.ts
@@ -0,0 +1,3 @@
+export default interface extern {
+  logging: () => Promise<void>,
+}
diff --git a/examples/tests/sdk_tests/function/logging.test.w b/examples/tests/sdk_tests/function/logging.test.w
index b33d0190cdf..694f40d11cb 100644
--- a/examples/tests/sdk_tests/function/logging.test.w
+++ b/examples/tests/sdk_tests/function/logging.test.w
@@ -4,11 +4,11 @@ class Util {
   extern "./logging.js" pub static inflight logging(): void;
 }
 
-let f1 = new cloud.Function(inflight (input: str): void => {
+let f1 = new cloud.Function(inflight () => {
   log("log inside f1");
 }) as "f1";
 
-let f2 = new cloud.Function(inflight (input: str): void => {
+let f2 = new cloud.Function(inflight () => {
   f1.invoke("");
   log("log inside f2");
   f1.invoke("");
@@ -32,4 +32,4 @@ test "logging" {
   f2.invoke("");
   Util.logging();
   f2.invoke("");
-}
\ No newline at end of file
+}
diff --git a/examples/tests/sdk_tests/function/timeout.test.w b/examples/tests/sdk_tests/function/timeout.test.w
index 7f4eb9c1c9d..cb4f14ffa90 100644
--- a/examples/tests/sdk_tests/function/timeout.test.w
+++ b/examples/tests/sdk_tests/function/timeout.test.w
@@ -1,28 +1,21 @@
-
-/*\
-skip: true
-\*/
 bring cloud;
 bring util;
 
 let c = new cloud.Counter();
 
 let f1 = new cloud.Function(inflight () => {
-  // call sleep
   util.sleep(1.5s);
   c.inc();
-}, cloud.FunctionProps {timeout: 1s}) as "function with 1s timeout";
+}, timeout: 1s) as "function with 1s timeout";
 
 // testing the default timeout - should be 1 minute
 let f2 = new cloud.Function(inflight () => {
-  // call sleep
   util.sleep(30s);
   c.inc();
   util.sleep(31s);
   c.inc();
 }) as "function with default timeout";
 
-// doesn't work on sim yet- see issue: https://github.com/winglang/wing/issues/1980
 new std.Test(inflight () => {
   let var e = "";
   try {
@@ -31,26 +24,16 @@ new std.Test(inflight () => {
     e = error;
   }
 
-  if (["tf-aws", "awscdk"].contains(util.env("WING_TARGET"))) {
-    assert(e.contains("Task timed out after"));
-  }
-
-  if (util.env("WING_TARGET") != "sim") {
-    assert(c.peek() == 0);
-  }
+  assert(e.contains("Function timed out"));
+  assert(c.peek() == 0);
 
+  e = "";
   try {
     f2.invoke("");
   } catch error {
     e = error;
   }
 
-  if (["tf-aws", "awscdk"].contains(util.env("WING_TARGET"))) {
-    assert(e.contains("Task timed out after"));
-  }
-
-  if (util.env("WING_TARGET") != "sim") {
-    assert(c.peek() == 1);
-  }
- 
-}, std.TestProps {timeout: 2m}) as "timeout";
+  assert(e.contains("Function timed out"));
+  assert(c.peek() == 1);
+}, timeout: 2m) as "function invoke throws on timeout";
diff --git a/examples/tests/sdk_tests/http/fetch.test.w b/examples/tests/sdk_tests/http/fetch.test.w
new file mode 100644
index 00000000000..89b31cb8ab1
--- /dev/null
+++ b/examples/tests/sdk_tests/http/fetch.test.w
@@ -0,0 +1,38 @@
+bring http;
+bring expect;
+bring cloud;
+
+let api = new cloud.Api();
+let bucket = new cloud.Bucket();
+
+bucket.addObject("url.txt", api.url);
+
+api.get("/redirect", inflight () => {
+  let url = bucket.get("url.txt");
+  return {
+    status: 301,
+    headers: {
+      Location: "{url}/target"
+    }
+  };
+});
+
+api.get("/target", inflight () => {
+  return {
+    status: 200,
+    body: "I am the target"
+  };
+});
+
+test "redirect is 'follow' by default" {
+  let res = http.get("{api.url}/redirect");
+  log(res.body);
+  expect.equal(res.status, 200);
+  expect.equal(res.body, "I am the target");
+}
+
+test "redirect 'manual'" {
+  let res = http.get("{api.url}/redirect", redirect: http.RequestRedirect.MANUAL);
+  expect.equal(res.headers.get("location"), "{api.url}/target");
+  expect.equal(res.status, 301);
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/math/log.test.w b/examples/tests/sdk_tests/math/log.test.w
new file mode 100644
index 00000000000..049ae486ee3
--- /dev/null
+++ b/examples/tests/sdk_tests/math/log.test.w
@@ -0,0 +1,17 @@
+bring math;
+
+// 2 x 2 x 2 = 8
+assert((math.log(8) / math.log(2)) == 3);
+// 5 x 5 x 5 x 5 = 625
+assert((math.log(625) / math.log(5)) == 4);
+
+test "inflight absolute" {
+  let getBaseLog = (var x: num, var y: num): num => {
+    return math.log(y) / math.log(x);
+  };
+
+  // 2 x 2 x 2 = 8
+  assert(getBaseLog(2, 8) == 3);
+  // 5 x 5 x 5 x 5 = 625
+  assert(getBaseLog(5, 625) == 4);
+}
diff --git a/examples/tests/sdk_tests/math/log10.test.w b/examples/tests/sdk_tests/math/log10.test.w
new file mode 100644
index 00000000000..1114e5c90f5
--- /dev/null
+++ b/examples/tests/sdk_tests/math/log10.test.w
@@ -0,0 +1,13 @@
+bring math;
+
+assert(math.log10(100000) == 5);
+assert(math.log10(2) == 0.3010299956639812);
+assert(math.log10(1) == 0);
+assert(math.log10(0) == -math.INF);
+
+test "inflight absolute" {
+  assert(math.log10(100000) == 5);
+  assert(math.log10(2) == 0.3010299956639812);
+  assert(math.log10(1) == 0);
+  assert(math.log10(0) == -math.INF);
+}
diff --git a/examples/tests/sdk_tests/math/log2.test.w b/examples/tests/sdk_tests/math/log2.test.w
new file mode 100644
index 00000000000..8cfdf1f4fa0
--- /dev/null
+++ b/examples/tests/sdk_tests/math/log2.test.w
@@ -0,0 +1,13 @@
+bring math;
+
+assert(math.log2(3) == 1.584962500721156);
+assert(math.log2(2) == 1);
+assert(math.log2(1) == 0);
+assert(math.log2(0) == -math.INF);
+
+test "inflight absolute" {
+  assert(math.log2(3) == 1.584962500721156);
+  assert(math.log2(2) == 1);
+  assert(math.log2(1) == 0);
+  assert(math.log2(0) == -math.INF);
+}
diff --git a/examples/tests/sdk_tests/math/sign.test.w b/examples/tests/sdk_tests/math/sign.test.w
new file mode 100644
index 00000000000..5ffc95aaf8b
--- /dev/null
+++ b/examples/tests/sdk_tests/math/sign.test.w
@@ -0,0 +1,27 @@
+bring math;
+
+let negative = -11;
+let zero = 0;
+let positive = 18;
+
+let negative_num = -4.11;
+let zero_num = 0.0;
+let positive_num = 8.18;
+
+assert(math.sign(negative) == -1);
+assert(math.sign(zero) == 0);
+assert(math.sign(positive) == 1);
+
+assert(math.sign(negative_num) == -1);
+assert(math.sign(zero_num) == 0);
+assert(math.sign(positive_num) == 1);
+
+test "inflight absolute" {
+  assert(math.sign(negative) == -1);
+  assert(math.sign(zero) == 0);
+  assert(math.sign(positive) == 1);
+
+  assert(math.sign(negative_num) == -1);
+  assert(math.sign(zero_num) == 0);
+  assert(math.sign(positive_num) == 1);
+}
diff --git a/examples/tests/sdk_tests/math/toradix.test.w b/examples/tests/sdk_tests/math/toradix.test.w
new file mode 100644
index 00000000000..2354328baa9
--- /dev/null
+++ b/examples/tests/sdk_tests/math/toradix.test.w
@@ -0,0 +1,24 @@
+bring math;
+
+let oneVal = 1;
+let twoVal = 2;
+let threeVal = 3;
+
+assert(math.toRadix(oneVal, 2) == "1");
+assert(math.toRadix(twoVal, 2) == "10");
+assert(math.toRadix(threeVal, 2) == "11");
+
+let fifteenVal = 15;
+let sixteenVal = 16;
+
+assert(math.toRadix(fifteenVal, 16) == "f");
+assert(math.toRadix(sixteenVal, 16) == "10");
+
+test "inflight base" {
+  assert(math.toRadix(oneVal, 2) == "1");
+  assert(math.toRadix(twoVal, 2) == "10");
+  assert(math.toRadix(threeVal, 2) == "11");
+  
+  assert(math.toRadix(fifteenVal, 16) == "f");
+  assert(math.toRadix(sixteenVal, 16) == "10");
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/queue/dead-letter-queue.test.w b/examples/tests/sdk_tests/queue/dead-letter-queue.test.w
new file mode 100644
index 00000000000..a75c0587426
--- /dev/null
+++ b/examples/tests/sdk_tests/queue/dead-letter-queue.test.w
@@ -0,0 +1,63 @@
+bring cloud;
+bring util;
+
+let counter_received_messages = new cloud.Counter();
+
+let dlq_without_retries = new cloud.Queue() as "dlq without retries";
+let queue_without_retries = new cloud.Queue(
+  dlq: { queue: dlq_without_retries }
+) as "queue without retries";
+queue_without_retries.setConsumer(inflight (msg: str) => {
+  counter_received_messages.inc(1, msg);
+  if msg == "fail" {
+    throw "error";
+  }
+});
+
+
+new std.Test(
+  inflight () => {
+    queue_without_retries.push("Hello");
+    queue_without_retries.push("fail");
+    queue_without_retries.push("World!");
+
+    // wait until it executes once.
+    assert(util.waitUntil(inflight () => { return counter_received_messages.peek("Hello") == 1; }));
+    assert(util.waitUntil(inflight () => { return counter_received_messages.peek("World!") == 1; }));
+    assert(util.waitUntil(inflight () => { return counter_received_messages.peek("fail") == 1; }));
+
+    // check if the "fail" message has arrived at the dead-letter queue
+    assert(util.waitUntil(inflight () => { return dlq_without_retries.pop() == "fail"; }));
+  }, 
+  // To make this test work on AWS, it's necessary to set a high timeout 
+  // because if the message fails, we have to wait for the visibility timeout 
+  // to expire in order to retrieve the same message from the queue again.
+  timeout: 5m) as "one execution and send fail message to dead-letter queue";
+
+let dlq_with_retries = new cloud.Queue() as "dlq with retries";
+let queue_with_retries = new cloud.Queue(
+  dlq: {
+    queue: dlq_with_retries,
+    maxDeliveryAttempts: 2
+  }
+) as "queue with retries";
+queue_with_retries.setConsumer(inflight (msg: str) => {
+  counter_received_messages.inc(1, msg);
+  if msg == "fail" {
+    throw "error";
+  }
+});
+
+new std.Test(inflight () => {
+  queue_with_retries.push("Hello");
+  queue_with_retries.push("fail");
+  queue_with_retries.push("World!");
+
+  // wait until it executes once and retry one more times.
+  assert(util.waitUntil(inflight () => { return counter_received_messages.peek("Hello") == 1; }));
+  assert(util.waitUntil(inflight () => { return counter_received_messages.peek("World!") == 1; }));
+  assert(util.waitUntil(inflight () => { return counter_received_messages.peek("fail") == 2; }));
+
+  // check if the "fail" message has arrived at the dead-letter queue
+  assert(util.waitUntil(inflight () => { return dlq_with_retries.pop() == "fail"; }));
+}, timeout: 5m) as "one execution, two retries and send the fail message to dead-letter queue";
diff --git a/examples/tests/sdk_tests/queue/purge.test.w b/examples/tests/sdk_tests/queue/purge.test.w
index d6ace9a604a..4ca61b653e9 100644
--- a/examples/tests/sdk_tests/queue/purge.test.w
+++ b/examples/tests/sdk_tests/queue/purge.test.w
@@ -3,33 +3,18 @@ bring util;
 
 let q = new cloud.Queue();
 
-
 test "purge" {
   q.push("foo");
   q.push("bar");
   q.push("baz");
 
-  let wait = inflight (pred: inflight (): bool): bool => {
-    let var i = 0;
-    while i < 60 {
-      if pred() {
-        return true;
-      } 
-  
-      util.sleep(1s);
-      i = i + 1;
-    }
-  
-    return false;
-  };
-  
-  assert(wait(inflight (): bool => { 
+  util.waitUntil(inflight () => {
     return q.approxSize() == 3;
-  }));
+  }, timeout: 1m, interval: 1s);
 
   q.purge();
 
-  assert(wait(inflight (): bool => {
+  util.waitUntil(inflight () => {
     return q.approxSize() == 0;
-  }));
+  }, timeout: 1m, interval: 1s);
 }
diff --git a/examples/tests/sdk_tests/queue/push.test.w b/examples/tests/sdk_tests/queue/push.test.w
index ff2b51580f7..817a7fd99dd 100644
--- a/examples/tests/sdk_tests/queue/push.test.w
+++ b/examples/tests/sdk_tests/queue/push.test.w
@@ -4,7 +4,7 @@ bring util;
 let q = new cloud.Queue();
 
 new std.Test(inflight () => {
-  let obj = Json {
+  let obj = {
     k1: 1,
     k2: "hello",
     k3: true,
@@ -29,22 +29,31 @@ new std.Test(inflight () => {
 
   q.push("Foo");
   
-  assert(util.waitUntil((): bool => {
+  util.waitUntil((): bool => {
     return q.approxSize() == 1;
-  }));
+  });
 
   q.pop();
   q.push("Bar", "Baz");
 
-  assert(util.waitUntil((): bool => {
+  util.waitUntil(() => {
     return q.approxSize() == 2;
-  }));
+  });
+
+  q.purge(); 
+  if util.env("WING_TARGET") != "sim" {
+    // In a real cloud, purging is expensive so we should wait a minute regardless of .approxSize()
+    // e.g. See AWS docs for queue purging (https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-sqs/classes/purgequeuecommand.html)
+    util.sleep(1m);
+  }
+
+  util.waitUntil(() => {
+    return q.approxSize() == 0;
+  });
 
-  q.purge(); // the message deletion process takes up to 60 seconds. (https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-sqs/classes/purgequeuecommand.html)
-  util.sleep(1m);
   q.push("123", "\r", "{obj}");
 
-  assert(util.waitUntil((): bool => {
+  util.waitUntil(() => {
     return q.approxSize() == 3;
-  }));
+  });
 }, timeout: 3m) as "push";
diff --git a/examples/tests/sdk_tests/queue/queue-ref.test.w b/examples/tests/sdk_tests/queue/queue-ref.test.w
new file mode 100644
index 00000000000..fff25baefa4
--- /dev/null
+++ b/examples/tests/sdk_tests/queue/queue-ref.test.w
@@ -0,0 +1,54 @@
+bring cloud;
+bring aws;
+bring util;
+
+// a really cool way to test a "ref" resource: basically, we define a cloud.Queue
+// and then we define a `QueueRef` that references it's ARN. nice, ha?
+
+let c = new cloud.Counter();
+let q = new cloud.Queue();
+
+q.setConsumer(inflight () => {
+  c.inc();
+});
+
+// this will only work if we are testing on tf-aws
+if let arn = aws.Queue.from(q)?.queueArn {
+  let qref = new aws.QueueRef(arn);
+
+  new cloud.Function(inflight () => {
+    qref.push("hello");
+    qref.pop();
+  });
+
+  test "can push to an external queue (QueueRef)" {
+    qref.push("m1");
+    qref.push("m2");
+    qref.push("m3");
+    util.waitUntil(() => {
+      return c.peek() == 3;
+    });
+  }
+}
+
+if util.env("WING_TARGET") == "sim" {
+  bring expect;
+
+  let dummyArn = "arn:aws:sqs:us-east-1:111111111111:Queue-11111111";
+  let qr = new aws.QueueRef(dummyArn);
+
+  test "queueArn returns the arn" {
+    expect.equal(dummyArn, qr.queueArn);
+  }
+
+  test "push() sends a request to aws, fails because we are using a dummy queue" {
+    let var err = false;
+    try {
+      qr.push("foo");
+    } catch e {
+      err = true;
+    }
+
+    assert(err);
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/queue/retention_period.main.w b/examples/tests/sdk_tests/queue/retention_period.main.w
index 0c1c2dd798a..9f664f2c9e9 100644
--- a/examples/tests/sdk_tests/queue/retention_period.main.w
+++ b/examples/tests/sdk_tests/queue/retention_period.main.w
@@ -1,17 +1,20 @@
 bring cloud;
 bring util;
 
-let var timeout = 30s;
-let var retentionPeriod = 60s;
+// TODO: timeout is not supported in sim - https://github.com/winglang/wing/issues/2401
+if util.env("WING_TARGET") != "sim" {
+  let var timeout = 30s;
+  let var retentionPeriod = 60s;
 
-let q = new cloud.Queue(timeout: timeout, retentionPeriod: retentionPeriod);
+  let q = new cloud.Queue(timeout: timeout, retentionPeriod: retentionPeriod);
 
-new std.Test(inflight () => {
-  q.push("hello", "world");
+  new std.Test(inflight () => {
+    q.push("hello", "world");
 
-  util.sleep(retentionPeriod);
+    util.sleep(retentionPeriod);
 
-  assert(util.waitUntil(() => {
-    return q.approxSize() == 0;
-  }));
-}, timeout: 2m) as "retentionPeriod";
+    util.waitUntil(() => {
+      return q.approxSize() == 0;
+    });
+  }, timeout: 2m) as "retentionPeriod";
+}
diff --git a/examples/tests/sdk_tests/queue/set_consumer.test.w b/examples/tests/sdk_tests/queue/set_consumer.test.w
index dfd1f67f976..437cd9599cc 100644
--- a/examples/tests/sdk_tests/queue/set_consumer.test.w
+++ b/examples/tests/sdk_tests/queue/set_consumer.test.w
@@ -4,39 +4,54 @@ bring util;
 let q = new cloud.Queue();
 let c = new cloud.Counter();
 
-// workaround for $stdlib is not defined compiler error
-// had to wrap the inflight ():bool => { c.peek == 2 } inflight method with a the Predicate resource
-class Predicate {
-  c: cloud.Counter;
-  new(c: cloud.Counter){
-    this.c = c;
-  }
+q.setConsumer(inflight (msg: str) => {
+  c.inc();
+});
 
-  pub inflight test(): bool{
-    return this.c.peek() == 2;
-  }
+test "setConsumer" {
+  q.push("hello", "world");
+
+  util.waitUntil(
+    inflight () => { return c.peek() == 2; }, timeout: 10m, interval: 1s
+  );
 }
 
 
+let q2 = new cloud.Queue() as "q2";
+let c2 = new cloud.Counter() as "c2";
 
-q.setConsumer(inflight (msg: str): str => {
-  c.inc();
+q2.setConsumer(inflight (message) => {
+  if message == "hello" {
+    q2.push("world");
+  }
+  c2.inc();
 });
 
+test "function can push back to the queue" {
+  q2.push("hello");
+  util.waitUntil(inflight () => { return c2.peek() >= 2; });
+}
 
-let predicate = new Predicate(c);
-test "setConsumer" {
-  q.push("hello");
-  q.push("world");
-
-  let var i = 0;
-  while i < 600 {
-    i = i + 1;
-    if predicate.test() {
-      assert(predicate.test());
-      return;
-    } 
-    util.sleep(1s);
-  }
-  assert(predicate.test());
+let q3 = new cloud.Queue() as "q3";
+let c3 = new cloud.Counter() as "c3";
+
+q3.setConsumer(inflight (message) => {
+  util.sleep(10s);
+  c3.inc();
+});
+
+test "messages pushed to queue can be processed concurrently" {
+  let t1 = datetime.utcNow();
+  q3.push("message1");
+  q3.push("message2");
+  q3.push("message3");
+
+  util.waitUntil(inflight () => { return c3.peek() == 3; });
+
+  let t2 = datetime.utcNow();
+  let elapsed = duration.fromMilliseconds(t2.timestampMs - t1.timestampMs);
+
+  // If the messages were processed concurrently, the elapsed time should be less than 20s.
+  // Note: even though there is only one consumer, the consumer's default concurrency is more than 1.
+  assert(elapsed.seconds < 20, "Messages were likely not processed concurrently");
 }
diff --git a/examples/tests/sdk_tests/regex/match.test.w b/examples/tests/sdk_tests/regex/match.test.w
deleted file mode 100644
index 9b508b1aa19..00000000000
--- a/examples/tests/sdk_tests/regex/match.test.w
+++ /dev/null
@@ -1,62 +0,0 @@
-bring regex;
-
-let matches1 = regex.match("p[a-z]+ch" , "peach");
-let matches2 = regex.match("[0-9]+" , "0923");
-let matches3 = regex.match("[0-9]+" , "0a923");
-let matches4 = regex.match("^([a-zA-Z0-9_.-]+)@[a-z]+.[a-z]+\$" , "james_bond007@wing.com");
-
-let matches5 = regex.match("p([a-z]+)ch" , "leach");
-let matches6 = regex.match("^([a-zA-Z0-9_.-]+)@[a-z]+.[a-z]+" , "@james_bond007@gmail.com");
-
-let matches7 = regex.match("^Mary" , "Mary had a little lamb");
-let matches8 = regex.match("lamb\$" , "Mary had a little lamb");
-
-let matches9 = regex.match("lamb\$" , "Mary had a little hamb");
-let matches10 = regex.match("^([a-zA-Z0-9_.-]+)@[a-z]+.[a-z]+\$" , "james_bond007@gmail.com123");
-
-assert(matches1 == true );
-assert(matches2 == true );
-assert(matches3 == true );
-assert(matches4 == true );
-
-assert(matches5 == false);
-assert(matches6 == false);
-
-assert(matches7 == true );
-assert(matches8 == true );
-
-assert(matches9 == false);
-assert(matches10 == false);
-
-test "inflight match" {
-        
-  let matches1 = regex.match("p[a-z]+ch" , "peach");
-  let matches2 = regex.match("[0-9]+" , "0923");
-  let matches3 = regex.match("[0-9]+" , "0a923");
-  let matches4 = regex.match("^([a-zA-Z0-9_.-]+)@[a-z]+.[a-z]+\$" , "james_bond007@wing.com");
-
-  let matches5 = regex.match("p([a-z]+)ch" , "leach");
-  let matches6 = regex.match("^([a-zA-Z0-9_.-]+)@[a-z]+.[a-z]+" , "@james_bond007@gmail.com");
-
-  let matches7 = regex.match("^Mary" , "Mary had a little lamb");
-  let matches8 = regex.match("lamb\$" , "Mary had a little lamb");
-
-  let matches9 = regex.match("lamb\$" , "Mary had a little hamb");
-  let matches10 = regex.match("^([a-zA-Z0-9_.-]+)@[a-z]+.[a-z]+\$" , "james_bond007@gmail.com123");
-
-
-  assert(matches1 == true );
-  assert(matches2 == true );
-  assert(matches3 == true );
-  assert(matches4 == true );
-
-  assert(matches5 == false);
-  assert(matches6 == false);
-
-  assert(matches7 == true );
-  assert(matches8 == true );
-
-  assert(matches9 == false);
-  assert(matches10 == false);
-    
-}
diff --git a/examples/tests/sdk_tests/resource/call.test.w b/examples/tests/sdk_tests/resource/call.test.w
new file mode 100644
index 00000000000..a2586392cf1
--- /dev/null
+++ b/examples/tests/sdk_tests/resource/call.test.w
@@ -0,0 +1,233 @@
+bring expect;
+bring util;
+bring sim;
+
+enum MyEnum {
+  A,
+  B,
+  C
+}
+
+struct MyStruct {
+  field1: str;
+  field2: num;
+}
+
+inflight class MyResourceBackend impl sim.IResource {
+  ctx: sim.IResourceContext;
+  var field1: str;
+  var field2: (str): str;
+
+  new(ctx: sim.IResourceContext) {
+    this.ctx = ctx;
+    this.field1 = "hello";
+    this.field2 = (name: str) => { return "Hello, " + name; };
+  }
+
+  pub onStop() {}
+
+  pub throwsError() {
+    throw "Look ma, an error!";
+  }
+
+  pub printLogs() {
+    log("a regular (info) log");
+    this.ctx.log("an info log");
+    this.ctx.log("another info log", std.LogLevel.INFO);
+    this.ctx.log("a verbose log", std.LogLevel.VERBOSE);
+    this.ctx.log("a warn log", std.LogLevel.WARNING);
+    this.ctx.log("an error log", std.LogLevel.ERROR);
+  }
+
+  pub methodTakesLongTime() {
+    util.sleep(40s);
+  }
+
+  pub methodNum(arg: num): num { return arg * 2; }
+  pub methodStr(arg: str): str { return arg + arg; }
+  pub methodBool(arg: bool): bool { return !arg; }
+  pub methodOptNum1(arg: num?): num? { return arg; }
+  pub methodOptNum2(arg: num?): num? { return nil; }
+  pub methodJson(arg: Json): Json { return { value: arg }; }
+  pub methodEnum(arg: MyEnum): MyEnum { assert(arg == MyEnum.A); return MyEnum.B; }
+  pub methodArray(arg: Array<num>): Array<num> { return arg.slice(1, arg.length - 1); }
+  pub methodMap(arg: Map<num>): Map<num> {
+    let var res = MutMap<num>{};
+    for key in arg.keys() {
+      res[key] = arg[key] * 2;
+    }
+    return res.copy();
+  }
+  pub methodStruct(arg: MyStruct): MyStruct {
+    return MyStruct{ field1: arg.field1 + arg.field1, field2: arg.field2 * 2 };
+  }
+  pub methodWithVariadics(arg1: str, ...arg2: Array<num>): num {
+    let var res = num.fromStr(arg1);
+    for arg in arg2 {
+      res += arg;
+    }
+    return res;
+  }
+  pub methodWithComplexTypes1(arg1: Array<MyStruct>): Map<num> {
+    return { "field1Length": arg1[0].field1.length };
+  }
+}
+
+class MyResource {
+  backend: sim.Resource;
+  new() {
+    this.backend = new sim.Resource(inflight (ctx) => {
+      return new MyResourceBackend(ctx);
+    });
+  }
+  pub inflight field1(): str {
+    return str.fromJson(this.backend.call("field1"));
+  }
+  pub inflight field2(name: str): str {
+    // calling a function-typed property works as expected
+    return str.fromJson(this.backend.call("field2", Json [name]));
+  }
+  pub inflight field1WithArgs(): str {
+    // if you are passing arguments to call(), we assume you're trying to call a function.
+    // since field1 is a property, this will throw an error
+    return str.fromJson(this.backend.call("field1", Json ["arg1", "arg2"]));
+  }
+  pub inflight invalidField(): str {
+    return str.fromJson(this.backend.call("invalidField"));
+  }
+  pub inflight onStop() {
+    this.backend.call("onStop");
+  }
+  pub inflight throwsError() {
+    this.backend.call("throwsError");
+  }
+  pub inflight printLogs() {
+    this.backend.call("printLogs");
+  }
+  pub inflight methodTakesLongTime() {
+    this.backend.call("methodTakesLongTime");
+  }
+
+  pub inflight methodNum(arg: num): num {
+    return num.fromJson(this.backend.call("methodNum", Json [arg]));
+  }
+  pub inflight methodStr(arg: str): str {
+    return str.fromJson(this.backend.call("methodStr", Json [arg]));
+  }
+  pub inflight methodBool(arg: bool): bool {
+    return bool.fromJson(this.backend.call("methodBool", Json [arg]));
+  }
+  pub inflight methodOptNum1(arg: num?): num? {
+    // TODO: need a way to convert from Json to num?
+    return unsafeCast(this.backend.call("methodOptNum1", Json [arg]));
+  }
+  pub inflight methodOptNum2(arg: num?): num? {
+    // TODO: need a way to convert from Json to num?
+    return unsafeCast(this.backend.call("methodOptNum2", Json [arg]));
+  }
+  pub inflight methodJson(arg: Json): Json {
+    return this.backend.call("methodJson", [arg]);
+  }
+  pub inflight methodEnum(arg: MyEnum): MyEnum {
+    // TODO: safer way to convert to and from enums
+    return unsafeCast(this.backend.call("methodEnum", Json ["{arg}"]));
+  }
+  pub inflight methodArray(arg: Array<num>): Array<num> {
+    // TODO: Array.fromJson - https://github.com/winglang/wing/issues/1796
+    return unsafeCast(this.backend.call("methodArray", Json [arg]));
+  }
+  pub inflight methodMap(arg: Map<num>): Map<num> {
+    // TODO: Map.fromJson - https://github.com/winglang/wing/issues/1796
+    return unsafeCast(this.backend.call("methodMap", Json [arg]));
+  }
+  pub inflight methodStruct(arg: MyStruct): MyStruct {
+    return MyStruct.fromJson(this.backend.call("methodStruct", Json [arg]));
+  }
+  pub inflight methodWithVariadics(arg1: str, arg2: num, arg3: num): num {
+    // TODO: spreading variadic arguments?
+    return num.fromJson(this.backend.call("methodWithVariadics", Json [arg1, arg2, arg3]));
+  }
+  pub inflight methodWithComplexTypes1(arg1: Array<MyStruct>): Map<num> {
+    // TODO: Map.fromJson - https://github.com/winglang/wing/issues/1796
+    return unsafeCast(this.backend.call("methodWithComplexTypes1", Json [arg1]));
+  }
+}
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  let r1 = new MyResource();
+
+  test "resource.call with a field name returns the field value" {
+    expect.equal(r1.field1(), "hello");
+    expect.equal(r1.field2("world"), "Hello, world");
+
+    let var msg = "";
+    try {
+      r1.field1WithArgs();
+    } catch err {
+      msg = err;
+    }
+    assert(msg.contains("Property \"field1\" is not a function"));
+
+    try {
+      r1.invalidField();
+    } catch err {
+      msg = err;
+    }
+    assert(msg.contains("Method or property \"invalidField\" not found"));
+  }
+
+  test "resource.call cannot be used to call onStop" {
+    // These are reserved methods that are called by the simulator for
+    // managing the resource's lifecycle.
+    let var msg = "";
+    try {
+      r1.onStop();
+    } catch err {
+      msg = err;
+    }
+    assert(msg.contains("Cannot call \"onStop\""));
+  }
+
+  test "exceptions thrown by the resource are caught and rethrown by the caller" {
+    let var msg = "";
+    try {
+      r1.throwsError();
+    } catch err {
+      msg = err;
+    }
+    assert(msg.contains("Look ma, an error!"));
+  }
+
+  test "resource.call can accept and return various kinds of values" {
+    expect.equal(r1.methodNum(42), 84);
+    expect.equal(r1.methodStr("hello"), "hellohello");
+    expect.equal(r1.methodBool(true), false);
+    expect.equal(r1.methodOptNum1(42), 42);
+    expect.equal(r1.methodOptNum2(42), nil);
+    expect.equal(r1.methodJson({ value: 42 }), { value: { value: 42 } });
+    expect.equal(r1.methodEnum(MyEnum.A), MyEnum.B);
+    expect.equal(r1.methodArray([1, 2, 3]), [2]);
+    expect.equal(r1.methodMap({ a: 1, b: 2 }), { a: 2, b: 4 });
+    expect.equal(r1.methodStruct({ field1: "hello", field2: 42 }), { field1: "hellohello", field2: 84 });
+    expect.equal(r1.methodWithVariadics("1", 2, 3), 6);
+    expect.equal(r1.methodWithComplexTypes1([{ field1: "hello", field2: 42 }]), { field1Length: 5 });
+  }
+
+  test "resource can log messages at different levels" {
+    r1.printLogs();
+  }
+
+  // TODO: this test is skipped because it's flakey on Windows
+  // https://github.com/winglang/wing/issues/6756
+  //
+  // test "resource.call times out if the method takes too long" {
+  //   let var msg = "";
+  //   try {
+  //     r1.methodTakesLongTime();
+  //   } catch err {
+  //     msg = err;
+  //   }
+  //   assert(msg.contains("timed out"));
+  // }
+}
diff --git a/examples/tests/sdk_tests/resource/no-stop.test.w b/examples/tests/sdk_tests/resource/no-stop.test.w
new file mode 100644
index 00000000000..cbd1d4b985d
--- /dev/null
+++ b/examples/tests/sdk_tests/resource/no-stop.test.w
@@ -0,0 +1,23 @@
+bring sim;
+bring expect;
+bring util;
+
+class Simple {
+  pub foo: str;
+  new() {
+    let r = new sim.Resource(inflight (ctx) => {
+      ctx.resolveToken("foo", "bar");
+    });
+
+    this.foo = r.createToken("foo");
+  }
+}
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  let s = new Simple();
+
+  test "token is resolved" {
+    expect.equal(s.foo, "bar");
+  }
+}
diff --git a/examples/tests/sdk_tests/resource/on-start.test.w b/examples/tests/sdk_tests/resource/on-start.test.w
new file mode 100644
index 00000000000..a1426e06092
--- /dev/null
+++ b/examples/tests/sdk_tests/resource/on-start.test.w
@@ -0,0 +1,39 @@
+bring sim;
+bring util;
+
+inflight class OnStartThrowerBackend impl sim.IResource {
+  new() {
+    throw "unexpected error!";
+  }
+  pub onStop() {}
+  pub noop() {}
+}
+
+class OnStartThrower {
+  backend: sim.Resource;
+
+  new() {
+    this.backend = new sim.Resource(inflight () => {
+      return new OnStartThrowerBackend();
+    });
+  }
+
+  pub inflight noop() {
+    this.backend.call("noop");
+  }
+}
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  let r = new OnStartThrower();
+
+  test "method calls fail if the resource fails to start" {
+    let var msg = "";
+    try {
+      r.noop();
+    } catch err {
+      msg = err;
+    }
+    assert(msg.contains("Resource is not running"));
+  }
+}
diff --git a/examples/tests/sdk_tests/resource/on-stop.test.w b/examples/tests/sdk_tests/resource/on-stop.test.w
new file mode 100644
index 00000000000..ac4739d32f8
--- /dev/null
+++ b/examples/tests/sdk_tests/resource/on-stop.test.w
@@ -0,0 +1,32 @@
+bring sim;
+bring util;
+
+inflight class OnStopThrowerBackend impl sim.IResource {
+  pub onStop() {
+    throw "unexpected error!";
+  }
+  pub noop() {}
+}
+
+class OnStopThrower {
+  backend: sim.Resource;
+
+  new() {
+    this.backend = new sim.Resource(inflight () => {
+      return new OnStopThrowerBackend();
+    });
+  }
+
+  pub inflight noop() {
+    this.backend.call("noop");
+  }
+}
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  let r = new OnStopThrower();
+
+  test "if a resource throws an error on stopping, it doesn't crash the simulation" {
+    r.noop();
+  }
+}
diff --git a/examples/tests/sdk_tests/resource/resource.test.w b/examples/tests/sdk_tests/resource/resource.test.w
new file mode 100644
index 00000000000..f3e7d320073
--- /dev/null
+++ b/examples/tests/sdk_tests/resource/resource.test.w
@@ -0,0 +1,90 @@
+bring cloud;
+bring sim;
+bring util;
+
+inflight class CounterBackend impl sim.IResource {
+  var counter: num;
+
+  new(ctx: sim.IResourceContext) {
+    // startup code
+    this.counter = 0;
+    ctx.resolveToken("startTime", "2023-10-16T20:47:39.511Z");
+  }
+
+  pub onStop() {
+    // shutdown code
+  }
+
+  pub inc(n: num?): num {
+    let p = this.counter;
+    this.counter += (n ?? 1);
+    return p;
+  }
+
+  pub peek(): num {
+    return this.counter;
+  }
+}
+
+class Counter {
+  backend: sim.Resource;
+  pub startTime: str;
+
+  new() {
+    // this is a "backend factory". it returns an inflight class that implements the
+    // resource.
+    let factory = inflight (ctx: sim.IResourceContext): sim.IResource => {
+      return new CounterBackend(ctx);
+    };
+
+    this.backend = new sim.Resource(factory);
+    this.startTime = this.backend.createToken("startTime");
+  }
+
+  pub inflight inc(n: num?): num {
+    let response = this.backend.call("inc", [Json (n ?? 1)]);
+    return num.fromJson(response);
+  }
+
+  pub inflight peek(): num {
+    let response = this.backend.call("peek");
+    return num.fromJson(response);
+  }
+
+  pub inflight getStartTime(): str {
+    return this.startTime;
+  }
+}
+
+let c = new Counter();
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  test "Counter" {
+    assert(c.inc() == 0);
+    assert(c.inc() == 1);
+    assert(c.inc(5) == 2);
+    assert(c.peek() == 7);
+    assert(c.getStartTime() == "2023-10-16T20:47:39.511Z");
+    assert(c.startTime == "2023-10-16T20:47:39.511Z");
+  }
+}
+
+// check that resources can be extended
+
+class DoubleCounter extends Counter {
+  pub inflight inc(n: num?): num {
+    return super.inc((n ?? 1) * 2);
+  }
+}
+
+let dc = new DoubleCounter();
+
+if util.env("WING_TARGET") == "sim" {
+  test "DoubleCounter" {
+    assert(dc.inc() == 0);
+    assert(dc.inc() == 2);
+    assert(dc.inc(5) == 4);
+    assert(dc.peek() == 14);
+  }
+}
diff --git a/examples/tests/sdk_tests/resource/state.test.w b/examples/tests/sdk_tests/resource/state.test.w
new file mode 100644
index 00000000000..a04ba5fac61
--- /dev/null
+++ b/examples/tests/sdk_tests/resource/state.test.w
@@ -0,0 +1,47 @@
+bring fs;
+bring sim;
+bring util;
+
+inflight class ResourceWithStateBackend impl sim.IResource {
+  ctx: sim.IResourceContext;
+  new(ctx: sim.IResourceContext) { this.ctx = ctx; }
+  pub onStop() {}
+
+  pub writeState() {
+    let file = fs.join(this.ctx.statedir(), "state.txt");
+    fs.writeFile(file, "my state");
+  }
+
+  pub readState(): str {
+    let file = fs.join(this.ctx.statedir(), "state.txt");
+    return fs.readFile(file);
+  }
+}
+
+class ResourceWithState {
+  backend: sim.Resource;
+
+  new() {
+    this.backend = new sim.Resource(inflight (ctx) => {
+      return new ResourceWithStateBackend(ctx);
+    });
+  }
+
+  pub inflight writeState() {
+    this.backend.call("writeState");
+  }
+
+  pub inflight readState(): str {
+    return str.fromJson(this.backend.call("readState"));
+  }
+}
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  let r = new ResourceWithState();
+
+  test "sim.Resource can read and write state" {
+    r.writeState();
+    assert(r.readState() == "my state");
+  }
+}
diff --git a/examples/tests/sdk_tests/resource/tokens.test.w b/examples/tests/sdk_tests/resource/tokens.test.w
new file mode 100644
index 00000000000..1d80c62dbe2
--- /dev/null
+++ b/examples/tests/sdk_tests/resource/tokens.test.w
@@ -0,0 +1,41 @@
+bring sim;
+bring util;
+
+inflight class BadTokenResolverBackend impl sim.IResource {
+  ctx: sim.IResourceContext;
+  new(ctx: sim.IResourceContext) { this.ctx = ctx; }
+  pub onStop() {}
+
+  pub foo() {
+    this.ctx.resolveToken("my-attr", "value");
+  }
+}
+
+class BadTokenResolver {
+  backend: sim.Resource;
+
+  new() {
+    this.backend = new sim.Resource(inflight (ctx) => {
+      return new BadTokenResolverBackend(ctx);
+    });
+  }
+
+  pub inflight foo() {
+    this.backend.call("foo");
+  }
+}
+
+// Only run these tests in the simulator
+if util.env("WING_TARGET") == "sim" {
+  let r = new BadTokenResolver();
+
+  test "calling resolveToken during a method call emits an error" {
+    let var msg = "";
+    try {
+      r.foo();
+    } catch err {
+      msg = err;
+    }
+    assert(msg.contains("cannot resolve attributes outside of onStop method"));
+  }
+}
diff --git a/examples/tests/sdk_tests/schedule/init.test.w b/examples/tests/sdk_tests/schedule/init.test.w
index 06b34dabe27..ee6cdcbda87 100644
--- a/examples/tests/sdk_tests/schedule/init.test.w
+++ b/examples/tests/sdk_tests/schedule/init.test.w
@@ -1,48 +1,50 @@
 /*\
 skip: true
 \*/
-// doesn't work on sim: #2732
 
 bring cloud;
+bring util;
+bring expect;
 
 new cloud.Schedule( rate: 5m ) as "s0";
 
-// Those are testing the many errors in intalization of a cloud.Schedule
-let var error = "";
-try {
-    new cloud.Schedule( rate: nil, cron: nil ) as "s1";
-} catch e {
-    error = e;
-}
-assert(error == "rate or cron need to be filled.");
-
-try {
-    new cloud.Schedule( rate: 2m, cron: "* * * * *" ) as "s2";
-} catch e {
-    error = e;
-}
-assert(error == "rate and cron cannot be configured simultaneously.");
-
-
-try {
-    new cloud.Schedule( rate: 1s ) as "s3";
-} catch e {
-    error = e;
-}
-assert(error == "rate can not be set to less than 1 minute.");
-
-try {
-    new cloud.Schedule( cron: "* * * * * *" ) as "s4";
-} catch e {
-    error = e;
-}
-assert(error ==  "cron string must be UNIX cron format [minute] [hour] [day of month] [month] [day of week]");
-
-
-try {
-    new cloud.Schedule( cron: "* * * * *" ) as "s5";
-} catch e {
-    error = e;
-}
-assert(error == "cannot use * in both the Day-of-month and Day-of-week fields. If you use it in one, you must use ? in the other");
-
+// doesn't work on sim: https://github.com/winglang/wing/issues/2732
+if (util.env("WING_TARGET") != "sim") {
+  // Those are testing the many errors in initialization of a cloud.Schedule
+  let var error = "";
+  try {
+      new cloud.Schedule( rate: nil, cron: nil ) as "s1";
+  } catch e {
+      error = e;
+  }
+  expect.equal(error, "rate or cron need to be filled.");
+
+  try {
+      new cloud.Schedule( rate: 2m, cron: "* * * * *" ) as "s2";
+  } catch e {
+      error = e;
+  }
+  expect.equal(error, "rate and cron cannot be configured simultaneously.");
+
+
+  try {
+      new cloud.Schedule( rate: 1s ) as "s3";
+  } catch e {
+      error = e;
+  }
+  expect.equal(error, "rate can not be set to less than 1 minute.");
+
+  try {
+      new cloud.Schedule( cron: "* * * * * *" ) as "s4";
+  } catch e {
+      error = e;
+  }
+  expect.equal(error, "cron string must be in UNIX cron format");
+
+  try {
+      new cloud.Schedule( cron: "* * * * ?" ) as "s5";
+  } catch e {
+      error = e;
+  }
+  expect.equal(error, "cron string must be in UNIX cron format");
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/schedule/init.test.w.tf-aws.snap.md b/examples/tests/sdk_tests/schedule/init.test.w.tf-aws.snap.md
new file mode 100644
index 00000000000..f9e9a7f6fb4
--- /dev/null
+++ b/examples/tests/sdk_tests/schedule/init.test.w.tf-aws.snap.md
@@ -0,0 +1,49 @@
+# `init.test.w.tf-aws.snap.md`
+
+## main.tf.json
+
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+    }
+  },
+  "provider": {
+    "aws": [
+      {
+      }
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_event_rule": {
+      "s0_Schedule_7FE1E150": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/s0/Schedule",
+            "uniqueId": "s0_Schedule_7FE1E150"
+          }
+        },
+        "schedule_expression": "rate(5 minutes)"
+      }
+    }
+  },
+  "terraform": {
+    "backend": {
+      "local": {
+        "path": "./terraform.tfstate"
+      }
+    },
+    "required_providers": {
+      "aws": {
+        "source": "aws",
+        "version": "5.31.0"
+      }
+    }
+  }
+}
+```
diff --git a/examples/tests/sdk_tests/schedule/init.test.w.tf-gcp.snap.md b/examples/tests/sdk_tests/schedule/init.test.w.tf-gcp.snap.md
new file mode 100644
index 00000000000..3af1b279878
--- /dev/null
+++ b/examples/tests/sdk_tests/schedule/init.test.w.tf-gcp.snap.md
@@ -0,0 +1,46 @@
+# `init.test.w.tf-gcp.snap.md`
+
+## main.tf.json
+
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+    }
+  },
+  "provider": {
+    "google": [
+      {
+        "project": "sdk-spec-tests",
+        "region": "us-east1"
+      }
+    ],
+    "random": [
+      {
+      }
+    ]
+  },
+  "terraform": {
+    "backend": {
+      "local": {
+        "path": "./terraform.tfstate"
+      }
+    },
+    "required_providers": {
+      "google": {
+        "source": "google",
+        "version": "5.10.0"
+      },
+      "random": {
+        "source": "random",
+        "version": "3.5.1"
+      }
+    }
+  }
+}
+```
diff --git a/examples/tests/sdk_tests/schedule/on_tick.test.w b/examples/tests/sdk_tests/schedule/on_tick.test.w
index 4b19dcc9916..4d9239d49ad 100644
--- a/examples/tests/sdk_tests/schedule/on_tick.test.w
+++ b/examples/tests/sdk_tests/schedule/on_tick.test.w
@@ -1,8 +1,9 @@
 bring cloud;
 bring util;
+bring expect;
 
-// every minute
-let from_cron = new cloud.Schedule( cron: "* * * * ?" ) as "from_cron";
+// Trigger schedule every minute
+let from_cron = new cloud.Schedule( cron: "* * * * *" ) as "from_cron";
 let from_rate = new cloud.Schedule( rate: 1m ) as "from_rate";
 let c1 = new cloud.Counter() as "c1";
 let c2 = new cloud.Counter() as "c2";
@@ -15,15 +16,17 @@ from_rate.onTick(inflight () => {
   c2.inc();
 });
 
-// std.Test is used setting the timeout property
+// std.Test is used for setting the timeout property
 new std.Test(inflight () => {
   let c1Value = c1.peek();
   let c2Value = c2.peek();
 
-  // wait at least one minute
-  util.sleep(1.1m);
+  // wait at least two minutes
+  util.sleep(2.1m);
 
-  // check that both counters have been incremented
+  // Check that both counters have been incremented
+  expect.equal(c1Value, 0);
   assert(c1.peek() >= c1Value + 1);
+  expect.equal(c2Value, 0);
   assert(c2.peek() >= c2Value + 1);
-}, timeout: 2m) as "on tick is called both for rate and cron schedules";
+}, timeout: 3m) as "onTick()";
diff --git a/examples/tests/sdk_tests/schedule/on_tick.test.w.tf-aws.snap.md b/examples/tests/sdk_tests/schedule/on_tick.test.w.tf-aws.snap.md
new file mode 100644
index 00000000000..b5d241965e8
--- /dev/null
+++ b/examples/tests/sdk_tests/schedule/on_tick.test.w.tf-aws.snap.md
@@ -0,0 +1,335 @@
+# `on_tick.test.w.tf-aws.snap.md`
+
+## main.tf.json
+
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+    }
+  },
+  "provider": {
+    "aws": [
+      {
+      }
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_event_rule": {
+      "from_cron_Schedule_6C1613E8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/Schedule",
+            "uniqueId": "from_cron_Schedule_6C1613E8"
+          }
+        },
+        "schedule_expression": "cron(* * * * ? *)"
+      },
+      "from_rate_Schedule_5B82E706": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/Schedule",
+            "uniqueId": "from_rate_Schedule_5B82E706"
+          }
+        },
+        "schedule_expression": "rate(1 minute)"
+      }
+    },
+    "aws_cloudwatch_event_target": {
+      "from_cron_ScheduleTarget0_7A4E7226": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/ScheduleTarget0",
+            "uniqueId": "from_cron_ScheduleTarget0_7A4E7226"
+          }
+        },
+        "arn": "${aws_lambda_function.from_cron_OnTick0_6029AF44.qualified_arn}",
+        "rule": "${aws_cloudwatch_event_rule.from_cron_Schedule_6C1613E8.name}"
+      },
+      "from_rate_ScheduleTarget0_35951CD0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/ScheduleTarget0",
+            "uniqueId": "from_rate_ScheduleTarget0_35951CD0"
+          }
+        },
+        "arn": "${aws_lambda_function.from_rate_OnTick0_1B33F073.qualified_arn}",
+        "rule": "${aws_cloudwatch_event_rule.from_rate_Schedule_5B82E706.name}"
+      }
+    },
+    "aws_cloudwatch_log_group": {
+      "from_cron_OnTick0_CloudwatchLogGroup_2763AA6C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/CloudwatchLogGroup",
+            "uniqueId": "from_cron_OnTick0_CloudwatchLogGroup_2763AA6C"
+          }
+        },
+        "name": "/aws/lambda/OnTick0-c82d2f1d",
+        "retention_in_days": 30
+      },
+      "from_rate_OnTick0_CloudwatchLogGroup_051D0516": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/CloudwatchLogGroup",
+            "uniqueId": "from_rate_OnTick0_CloudwatchLogGroup_051D0516"
+          }
+        },
+        "name": "/aws/lambda/OnTick0-c82ff92a",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "c1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c1/Default",
+            "uniqueId": "c1"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-c1-c8b6c50f"
+      },
+      "c2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c2/Default",
+            "uniqueId": "c2"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-c2-c81701d2"
+      }
+    },
+    "aws_iam_role": {
+      "from_cron_OnTick0_IamRole_70AA37F2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/IamRole",
+            "uniqueId": "from_cron_OnTick0_IamRole_70AA37F2"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "from_rate_OnTick0_IamRole_A7066F91": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/IamRole",
+            "uniqueId": "from_rate_OnTick0_IamRole_A7066F91"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "from_cron_OnTick0_IamRolePolicy_6E9071E3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/IamRolePolicy",
+            "uniqueId": "from_cron_OnTick0_IamRolePolicy_6E9071E3"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.c1.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.from_cron_OnTick0_IamRole_70AA37F2.name}"
+      },
+      "from_rate_OnTick0_IamRolePolicy_5036BC29": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/IamRolePolicy",
+            "uniqueId": "from_rate_OnTick0_IamRolePolicy_5036BC29"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.c2.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.from_rate_OnTick0_IamRole_A7066F91.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "from_cron_OnTick0_IamRolePolicyAttachment_9E04D949": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/IamRolePolicyAttachment",
+            "uniqueId": "from_cron_OnTick0_IamRolePolicyAttachment_9E04D949"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.from_cron_OnTick0_IamRole_70AA37F2.name}"
+      },
+      "from_rate_OnTick0_IamRolePolicyAttachment_548892FB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/IamRolePolicyAttachment",
+            "uniqueId": "from_rate_OnTick0_IamRolePolicyAttachment_548892FB"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.from_rate_OnTick0_IamRole_A7066F91.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "from_cron_OnTick0_6029AF44": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/Default",
+            "uniqueId": "from_cron_OnTick0_6029AF44"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_bca69a1d": "${aws_dynamodb_table.c1.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "OnTick0-c82d2f1d",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "OnTick0-c82d2f1d",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.from_cron_OnTick0_IamRole_70AA37F2.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.from_cron_OnTick0_S3Object_0A802C5C.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [
+          ],
+          "subnet_ids": [
+          ]
+        }
+      },
+      "from_rate_OnTick0_1B33F073": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/Default",
+            "uniqueId": "from_rate_OnTick0_1B33F073"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_7ba9f967": "${aws_dynamodb_table.c2.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "OnTick0-c82ff92a",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "OnTick0-c82ff92a",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.from_rate_OnTick0_IamRole_A7066F91.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.from_rate_OnTick0_S3Object_C6F96441.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [
+          ],
+          "subnet_ids": [
+          ]
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "from_cron_OnTick0_InvokePermission-c87c172627b55591ac07edabd9e505482b7ee436d9_77879B23": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/InvokePermission-c87c172627b55591ac07edabd9e505482b7ee436d9",
+            "uniqueId": "from_cron_OnTick0_InvokePermission-c87c172627b55591ac07edabd9e505482b7ee436d9_77879B23"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.from_cron_OnTick0_6029AF44.function_name}",
+        "principal": "events.amazonaws.com",
+        "qualifier": "${aws_lambda_function.from_cron_OnTick0_6029AF44.version}",
+        "source_arn": "${aws_cloudwatch_event_rule.from_cron_Schedule_6C1613E8.arn}"
+      },
+      "from_rate_OnTick0_InvokePermission-c83fb79a39ace0a06023877b9ffa8744f9f18c55e4_FED6D620": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/InvokePermission-c83fb79a39ace0a06023877b9ffa8744f9f18c55e4",
+            "uniqueId": "from_rate_OnTick0_InvokePermission-c83fb79a39ace0a06023877b9ffa8744f9f18c55e4_FED6D620"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.from_rate_OnTick0_1B33F073.function_name}",
+        "principal": "events.amazonaws.com",
+        "qualifier": "${aws_lambda_function.from_rate_OnTick0_1B33F073.version}",
+        "source_arn": "${aws_cloudwatch_event_rule.from_rate_Schedule_5B82E706.arn}"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "from_cron_OnTick0_S3Object_0A802C5C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/S3Object",
+            "uniqueId": "from_cron_OnTick0_S3Object_0A802C5C"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "asset.c82d2f1d8fec3e13d91c6485d180aae181b7120c58.35e5836755a004830aff46870edb4fb4.zip",
+        "source": "assets/from_cron_OnTick0_Asset_74EEBD07/247A2C226B535B1090C838C78C5E7AD9/archive.zip"
+      },
+      "from_rate_OnTick0_S3Object_C6F96441": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/S3Object",
+            "uniqueId": "from_rate_OnTick0_S3Object_C6F96441"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "asset.c82ff92ac8509ee3ca0a2da5631717182783eabb3a.3ea399fa179ec27cefb9c05e7b36544f.zip",
+        "source": "assets/from_rate_OnTick0_Asset_94CD035E/4ABA56796F68C860323C93AD1EE9101C/archive.zip"
+      }
+    }
+  },
+  "terraform": {
+    "backend": {
+      "local": {
+        "path": "./terraform.tfstate"
+      }
+    },
+    "required_providers": {
+      "aws": {
+        "source": "aws",
+        "version": "5.31.0"
+      }
+    }
+  }
+}
+```
diff --git a/examples/tests/sdk_tests/schedule/on_tick.test.w.tf-gcp.snap.md b/examples/tests/sdk_tests/schedule/on_tick.test.w.tf-gcp.snap.md
new file mode 100644
index 00000000000..a35e8888e25
--- /dev/null
+++ b/examples/tests/sdk_tests/schedule/on_tick.test.w.tf-gcp.snap.md
@@ -0,0 +1,432 @@
+# `on_tick.test.w.tf-gcp.snap.md`
+
+## main.tf.json
+
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+    }
+  },
+  "provider": {
+    "google": [
+      {
+        "project": "sdk-spec-tests",
+        "region": "us-east1"
+      }
+    ],
+    "random": [
+      {
+      }
+    ]
+  },
+  "resource": {
+    "google_cloud_scheduler_job": {
+      "from_cron_Scheduler_2F03B2E5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/Scheduler",
+            "uniqueId": "from_cron_Scheduler_2F03B2E5"
+          }
+        },
+        "attempt_deadline": "300s",
+        "description": "Trigger ${google_cloudfunctions_function.from_cron_OnTick0_DefaultFunction_F4D413FD.name}",
+        "http_target": {
+          "http_method": "GET",
+          "oidc_token": {
+            "service_account_email": "${google_service_account.from_cron_SchedulerServiceAccount_BF7611D4.email}"
+          },
+          "uri": "${google_cloudfunctions_function.from_cron_OnTick0_DefaultFunction_F4D413FD.https_trigger_url}"
+        },
+        "name": "scheduler-c87c1726",
+        "schedule": "* * * * *",
+        "time_zone": "Etc/UTC"
+      },
+      "from_rate_Scheduler_AB1E4702": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/Scheduler",
+            "uniqueId": "from_rate_Scheduler_AB1E4702"
+          }
+        },
+        "attempt_deadline": "300s",
+        "description": "Trigger ${google_cloudfunctions_function.from_rate_OnTick0_DefaultFunction_E06C4134.name}",
+        "http_target": {
+          "http_method": "GET",
+          "oidc_token": {
+            "service_account_email": "${google_service_account.from_rate_SchedulerServiceAccount_DF19EF8F.email}"
+          },
+          "uri": "${google_cloudfunctions_function.from_rate_OnTick0_DefaultFunction_E06C4134.https_trigger_url}"
+        },
+        "name": "scheduler-c83fb79a",
+        "schedule": "*/1 * * * *",
+        "time_zone": "Etc/UTC"
+      }
+    },
+    "google_cloudfunctions_function": {
+      "from_cron_OnTick0_DefaultFunction_F4D413FD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/DefaultFunction",
+            "uniqueId": "from_cron_OnTick0_DefaultFunction_F4D413FD"
+          }
+        },
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {
+          "FIRESTORE_DATABASE_NAME_bca69a1d": "${google_firestore_database.c1.name}",
+          "WING_TARGET": "tf-gcp"
+        },
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "ontick0-c82d2f1d",
+        "project": "sdk-spec-tests",
+        "region": "us-east1",
+        "runtime": "nodejs20",
+        "service_account_email": "${google_service_account.from_cron_OnTick0_ServiceAccountc82d2f1d8fec3e13d91c6485d180aae181b7120c58_93C05499.email}",
+        "source_archive_bucket": "${google_storage_bucket.from_cron_OnTick0_FunctionBucket_EEF9EDC7.name}",
+        "source_archive_object": "${google_storage_bucket_object.from_cron_OnTick0_FunctionObjectBucket_27411FAD.name}",
+        "timeout": 120,
+        "trigger_http": true
+      },
+      "from_rate_OnTick0_DefaultFunction_E06C4134": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/DefaultFunction",
+            "uniqueId": "from_rate_OnTick0_DefaultFunction_E06C4134"
+          }
+        },
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {
+          "FIRESTORE_DATABASE_NAME_7ba9f967": "${google_firestore_database.c2.name}",
+          "WING_TARGET": "tf-gcp"
+        },
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "ontick0-c82ff92a",
+        "project": "sdk-spec-tests",
+        "region": "us-east1",
+        "runtime": "nodejs20",
+        "service_account_email": "${google_service_account.from_rate_OnTick0_ServiceAccountc82ff92ac8509ee3ca0a2da5631717182783eabb3a_2CEA3C34.email}",
+        "source_archive_bucket": "${google_storage_bucket.from_rate_OnTick0_FunctionBucket_7752D553.name}",
+        "source_archive_object": "${google_storage_bucket_object.from_rate_OnTick0_FunctionObjectBucket_F8336CE2.name}",
+        "timeout": 120,
+        "trigger_http": true
+      }
+    },
+    "google_cloudfunctions_function_iam_member": {
+      "from_cron_OnTick0_invoker-permission-KEN13_A669F87A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/invoker-permission-KEN.13]}",
+            "uniqueId": "from_cron_OnTick0_invoker-permission-KEN13_A669F87A"
+          }
+        },
+        "cloud_function": "${google_cloudfunctions_function.from_cron_OnTick0_DefaultFunction_F4D413FD.name}",
+        "member": "serviceAccount:${google_service_account.from_cron_SchedulerServiceAccount_BF7611D4.email}",
+        "project": "${google_cloudfunctions_function.from_cron_OnTick0_DefaultFunction_F4D413FD.project}",
+        "region": "${google_cloudfunctions_function.from_cron_OnTick0_DefaultFunction_F4D413FD.region}",
+        "role": "roles/cloudfunctions.invoker"
+      },
+      "from_rate_OnTick0_invoker-permission-KEN32_D7833EB6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/invoker-permission-KEN.32]}",
+            "uniqueId": "from_rate_OnTick0_invoker-permission-KEN32_D7833EB6"
+          }
+        },
+        "cloud_function": "${google_cloudfunctions_function.from_rate_OnTick0_DefaultFunction_E06C4134.name}",
+        "member": "serviceAccount:${google_service_account.from_rate_SchedulerServiceAccount_DF19EF8F.email}",
+        "project": "${google_cloudfunctions_function.from_rate_OnTick0_DefaultFunction_E06C4134.project}",
+        "region": "${google_cloudfunctions_function.from_rate_OnTick0_DefaultFunction_E06C4134.region}",
+        "role": "roles/cloudfunctions.invoker"
+      }
+    },
+    "google_firestore_database": {
+      "c1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c1/Default",
+            "uniqueId": "c1"
+          }
+        },
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.c1_CloudFirestoreAPI_886AC909"
+        ],
+        "location_id": "us-east1",
+        "name": "wing-counter-c1-c8b6c50f",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE"
+      },
+      "c2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c2/Default",
+            "uniqueId": "c2"
+          }
+        },
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.c2_CloudFirestoreAPI_C80229BA"
+        ],
+        "location_id": "us-east1",
+        "name": "wing-counter-c2-c81701d2",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE"
+      }
+    },
+    "google_project_iam_custom_role": {
+      "from_cron_OnTick0_CustomRolec82d2f1d8fec3e13d91c6485d180aae181b7120c58_61D80EEB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/CustomRolec82d2f1d8fec3e13d91c6485d180aae181b7120c58",
+            "uniqueId": "from_cron_OnTick0_CustomRolec82d2f1d8fec3e13d91c6485d180aae181b7120c58_61D80EEB"
+          }
+        },
+        "permissions": [
+          "cloudfunctions.functions.get",
+          "datastore.entities.get",
+          "datastore.entities.create",
+          "datastore.entities.update"
+        ],
+        "role_id": "cloudfunctions.customc82d2f1d8fec3e13d91c6485d180aae181b7120c58",
+        "title": "Custom Role for Cloud Function c82d2f1d8fec3e13d91c6485d180aae181b7120c58"
+      },
+      "from_rate_OnTick0_CustomRolec82ff92ac8509ee3ca0a2da5631717182783eabb3a_CF202318": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/CustomRolec82ff92ac8509ee3ca0a2da5631717182783eabb3a",
+            "uniqueId": "from_rate_OnTick0_CustomRolec82ff92ac8509ee3ca0a2da5631717182783eabb3a_CF202318"
+          }
+        },
+        "permissions": [
+          "cloudfunctions.functions.get",
+          "datastore.entities.get",
+          "datastore.entities.create",
+          "datastore.entities.update"
+        ],
+        "role_id": "cloudfunctions.customc82ff92ac8509ee3ca0a2da5631717182783eabb3a",
+        "title": "Custom Role for Cloud Function c82ff92ac8509ee3ca0a2da5631717182783eabb3a"
+      }
+    },
+    "google_project_iam_member": {
+      "from_cron_OnTick0_ProjectIamMember_F932FAC2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/ProjectIamMember",
+            "uniqueId": "from_cron_OnTick0_ProjectIamMember_F932FAC2"
+          }
+        },
+        "member": "serviceAccount:${google_service_account.from_cron_OnTick0_ServiceAccountc82d2f1d8fec3e13d91c6485d180aae181b7120c58_93C05499.email}",
+        "project": "sdk-spec-tests",
+        "role": "projects/sdk-spec-tests/roles/${google_project_iam_custom_role.from_cron_OnTick0_CustomRolec82d2f1d8fec3e13d91c6485d180aae181b7120c58_61D80EEB.role_id}"
+      },
+      "from_rate_OnTick0_ProjectIamMember_AC7C530B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/ProjectIamMember",
+            "uniqueId": "from_rate_OnTick0_ProjectIamMember_AC7C530B"
+          }
+        },
+        "member": "serviceAccount:${google_service_account.from_rate_OnTick0_ServiceAccountc82ff92ac8509ee3ca0a2da5631717182783eabb3a_2CEA3C34.email}",
+        "project": "sdk-spec-tests",
+        "role": "projects/sdk-spec-tests/roles/${google_project_iam_custom_role.from_rate_OnTick0_CustomRolec82ff92ac8509ee3ca0a2da5631717182783eabb3a_CF202318.role_id}"
+      }
+    },
+    "google_project_service": {
+      "c1_CloudFirestoreAPI_886AC909": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c1/CloudFirestoreAPI",
+            "uniqueId": "c1_CloudFirestoreAPI_886AC909"
+          }
+        },
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com"
+      },
+      "c2_CloudFirestoreAPI_C80229BA": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c2/CloudFirestoreAPI",
+            "uniqueId": "c2_CloudFirestoreAPI_C80229BA"
+          }
+        },
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com"
+      },
+      "from_cron_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_4C3315B8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/FunctionBucket/IamServiceAccountCredentialsApi",
+            "uniqueId": "from_cron_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_4C3315B8"
+          }
+        },
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com"
+      },
+      "from_rate_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_B9283082": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/FunctionBucket/IamServiceAccountCredentialsApi",
+            "uniqueId": "from_rate_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_B9283082"
+          }
+        },
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com"
+      }
+    },
+    "google_service_account": {
+      "from_cron_OnTick0_ServiceAccountc82d2f1d8fec3e13d91c6485d180aae181b7120c58_93C05499": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/ServiceAccountc82d2f1d8fec3e13d91c6485d180aae181b7120c58",
+            "uniqueId": "from_cron_OnTick0_ServiceAccountc82d2f1d8fec3e13d91c6485d180aae181b7120c58_93C05499"
+          }
+        },
+        "account_id": "ontick0-c82d2f1d",
+        "display_name": "Custom Service Account for Cloud Function c82d2f1d8fec3e13d91c6485d180aae181b7120c58"
+      },
+      "from_cron_SchedulerServiceAccount_BF7611D4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/SchedulerServiceAccount",
+            "uniqueId": "from_cron_SchedulerServiceAccount_BF7611D4"
+          }
+        },
+        "account_id": "scheduler-c87c1726-sa",
+        "display_name": "Service Account for scheduler-c87c1726"
+      },
+      "from_rate_OnTick0_ServiceAccountc82ff92ac8509ee3ca0a2da5631717182783eabb3a_2CEA3C34": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/ServiceAccountc82ff92ac8509ee3ca0a2da5631717182783eabb3a",
+            "uniqueId": "from_rate_OnTick0_ServiceAccountc82ff92ac8509ee3ca0a2da5631717182783eabb3a_2CEA3C34"
+          }
+        },
+        "account_id": "ontick0-c82ff92a",
+        "display_name": "Custom Service Account for Cloud Function c82ff92ac8509ee3ca0a2da5631717182783eabb3a"
+      },
+      "from_rate_SchedulerServiceAccount_DF19EF8F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/SchedulerServiceAccount",
+            "uniqueId": "from_rate_SchedulerServiceAccount_DF19EF8F"
+          }
+        },
+        "account_id": "scheduler-c83fb79a-sa",
+        "display_name": "Service Account for scheduler-c83fb79a"
+      }
+    },
+    "google_storage_bucket": {
+      "from_cron_OnTick0_FunctionBucket_EEF9EDC7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/FunctionBucket/Default",
+            "uniqueId": "from_cron_OnTick0_FunctionBucket_EEF9EDC7"
+          }
+        },
+        "depends_on": [
+          "google_project_service.from_cron_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_4C3315B8"
+        ],
+        "force_destroy": false,
+        "location": "us-east1",
+        "name": "functionbucket-${random_id.from_cron_OnTick0_FunctionBucket_Id_3324D148.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true
+      },
+      "from_rate_OnTick0_FunctionBucket_7752D553": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/FunctionBucket/Default",
+            "uniqueId": "from_rate_OnTick0_FunctionBucket_7752D553"
+          }
+        },
+        "depends_on": [
+          "google_project_service.from_rate_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_B9283082"
+        ],
+        "force_destroy": false,
+        "location": "us-east1",
+        "name": "functionbucket-${random_id.from_rate_OnTick0_FunctionBucket_Id_79DF80D2.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true
+      }
+    },
+    "google_storage_bucket_object": {
+      "from_cron_OnTick0_FunctionObjectBucket_27411FAD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/FunctionObjectBucket",
+            "uniqueId": "from_cron_OnTick0_FunctionObjectBucket_27411FAD"
+          }
+        },
+        "bucket": "${google_storage_bucket.from_cron_OnTick0_FunctionBucket_EEF9EDC7.name}",
+        "name": "objects",
+        "source": "assets/from_cron_OnTick0_Asset_74EEBD07/1475918152EEA8CC1F1497A753366550/archive.zip"
+      },
+      "from_rate_OnTick0_FunctionObjectBucket_F8336CE2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/FunctionObjectBucket",
+            "uniqueId": "from_rate_OnTick0_FunctionObjectBucket_F8336CE2"
+          }
+        },
+        "bucket": "${google_storage_bucket.from_rate_OnTick0_FunctionBucket_7752D553.name}",
+        "name": "objects",
+        "source": "assets/from_rate_OnTick0_Asset_94CD035E/1487EB653C82BC034E750583C10FEB68/archive.zip"
+      }
+    },
+    "random_id": {
+      "from_cron_OnTick0_FunctionBucket_Id_3324D148": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_cron/OnTick0/FunctionBucket/Id",
+            "uniqueId": "from_cron_OnTick0_FunctionBucket_Id_3324D148"
+          }
+        },
+        "byte_length": 4
+      },
+      "from_rate_OnTick0_FunctionBucket_Id_79DF80D2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/from_rate/OnTick0/FunctionBucket/Id",
+            "uniqueId": "from_rate_OnTick0_FunctionBucket_Id_79DF80D2"
+          }
+        },
+        "byte_length": 4
+      }
+    }
+  },
+  "terraform": {
+    "backend": {
+      "local": {
+        "path": "./terraform.tfstate"
+      }
+    },
+    "required_providers": {
+      "google": {
+        "source": "google",
+        "version": "5.10.0"
+      },
+      "random": {
+        "source": "random",
+        "version": "3.5.1"
+      }
+    }
+  }
+}
+```
diff --git a/examples/tests/sdk_tests/secret/secret-ref.test.w b/examples/tests/sdk_tests/secret/secret-ref.test.w
new file mode 100644
index 00000000000..e6adbc23720
--- /dev/null
+++ b/examples/tests/sdk_tests/secret/secret-ref.test.w
@@ -0,0 +1,12 @@
+bring util;
+bring aws;
+bring expect;
+
+if util.env("WING_TARGET") == "tf-aws" {
+  let someExistingSecretArn = "arn:aws:secretsmanager:::secret:mysecret";
+  let secret = new aws.SecretRef(someExistingSecretArn);
+
+  test "secretArn" {
+    expect.equal(someExistingSecretArn, secret.secretArn);
+  }
+} 
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/service/callbacks.test.w b/examples/tests/sdk_tests/service/callbacks.test.w
index 3ed3b962a62..1f35b77da80 100644
--- a/examples/tests/sdk_tests/service/callbacks.test.w
+++ b/examples/tests/sdk_tests/service/callbacks.test.w
@@ -50,4 +50,4 @@ if util.env("WING_TARGET") == "sim" {
     assert(startCounter.peek() == 0);
     assert(b.get(status) == stopped);
   }
-}
\ No newline at end of file
+}
diff --git a/examples/tests/sdk_tests/service/http-server.extern.d.ts b/examples/tests/sdk_tests/service/http-server.extern.d.ts
new file mode 100644
index 00000000000..0c67ddf5937
--- /dev/null
+++ b/examples/tests/sdk_tests/service/http-server.extern.d.ts
@@ -0,0 +1,10 @@
+export default interface extern {
+  createServer: (body: string) => Promise<IHttpServer$Inflight>,
+}
+export interface Address {
+  readonly port: number;
+}
+export interface IHttpServer$Inflight {
+  readonly address: () => Promise<Address>;
+  readonly close: () => Promise<void>;
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/service/http-server.test.w b/examples/tests/sdk_tests/service/http-server.test.w
index 9e2153be8a3..52486f3ae8b 100644
--- a/examples/tests/sdk_tests/service/http-server.test.w
+++ b/examples/tests/sdk_tests/service/http-server.test.w
@@ -6,9 +6,9 @@ struct Address {
   port: num;
 }
 
-interface IHttpServer {
-  inflight address(): Address;
-  inflight close(): void;
+inflight interface IHttpServer {
+  address(): Address;
+  close(): void;
 }
 
 
diff --git a/examples/tests/sdk_tests/std/array.test.w b/examples/tests/sdk_tests/std/array.test.w
index b2e1be3ae17..abaef168609 100644
--- a/examples/tests/sdk_tests/std/array.test.w
+++ b/examples/tests/sdk_tests/std/array.test.w
@@ -25,7 +25,7 @@ test "length" {
 assert(["hello"].at(0) == "hello");
 assert(MutArray<str>["hello", "world"].at(1) == "world");
 
-assert(buckets.at(0).node.id == "myBucket");
+assert(nodeof(buckets.at(0)).id == "myBucket");
 
 test "at()" {
   assert(["hello"].at(0) == "hello");
@@ -73,6 +73,12 @@ let item = a.pop();
 assert(item == "world");
 assert(a.length == 1);
 assert(a.at(0) == "hello");
+let pushMultipleItems: MutArray<str> = MutArray<str> ["element1"];
+pushMultipleItems.push("element2", "element3");
+assert(pushMultipleItems.length == 3);
+assert(pushMultipleItems.at(0) == "element1");
+assert(pushMultipleItems.at(1) == "element2");
+assert(pushMultipleItems.at(2) == "element3");
 
 test "pushAndPop()" {
   let a = MutArray<str>["hello"];
@@ -85,6 +91,12 @@ test "pushAndPop()" {
   assert(item == "world");
   assert(a.length == 1);
   assert(a.at(0) == "hello");
+  let pushMultipleItems: MutArray<str> = MutArray<str> ["element1"];
+  pushMultipleItems.push("element2", "element3");
+  assert(pushMultipleItems.length == 3);
+  assert(pushMultipleItems.at(0) == "element1");
+  assert(pushMultipleItems.at(1) == "element2");
+  assert(pushMultipleItems.at(2) == "element3");
 }
 
 //-----------------------------------------------------------------------------
@@ -138,8 +150,8 @@ assert(d.at(1) == "wing");
 
 let mergedBuckets = buckets.concat(anotherBuckets);
 assert(mergedBuckets.length == 2);
-assert(mergedBuckets.at(0).node.id == "myBucket");
-assert(mergedBuckets.at(1).node.id == "mySecondBucket");
+assert(nodeof(mergedBuckets.at(0)).id == "myBucket");
+assert(nodeof(mergedBuckets.at(1)).id == "mySecondBucket");
 
 test "concatMutArray()" {
   let b = MutArray<str>["hello"];
@@ -253,7 +265,7 @@ assert(o.at(0) == p.at(0));
 
 let copiedBuckets = buckets.copyMut();
 assert(copiedBuckets.length == 1);
-assert(copiedBuckets.at(0).node.id == "myBucket");
+assert(nodeof(copiedBuckets.at(0)).id == "myBucket");
 
 test "copy()" {
   let o = MutArray<str>["hello", "wing"];
@@ -387,3 +399,40 @@ test "removeFirst()" {
   assert(r2 == false);
   assert(mutArr.length == 3);
 }
+
+//-----------------------------------------------------------------------------
+// slice()
+
+test "slice()" {
+  let arr = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+  let slice1 = arr.slice(2, 5);
+  assert(slice1 == [3, 4, 5]);
+
+  let slice2 = arr.slice(5);
+  assert(slice2 == [6, 7, 8, 9, 10]);
+
+  let slice3 = arr.slice(0, 3);
+  assert(slice3 == [1, 2, 3]);
+
+  let slice4 = arr.slice(0);
+  assert(slice4 == arr);
+
+  let slice5 = arr.slice(0, 0);
+  assert(slice5 == []);
+
+  let mutarr = MutArray<num>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+  let mutSlice1 = mutarr.slice(2, 5);
+  assert(mutSlice1 == MutArray<num>[3, 4, 5]);
+
+  let mutSlice2 = mutarr.slice(5);
+  assert(mutSlice2 == MutArray<num>[6, 7, 8, 9, 10]);
+
+  let mutSlice3 = mutarr.slice(0, 3);
+  assert(mutSlice3 == MutArray<num>[1, 2, 3]);
+
+  let mutSlice4 = mutarr.slice(0);
+  assert(mutSlice4 == mutarr);
+
+  let mutSlice5 = mutarr.slice(0, 0);
+  assert(mutSlice5 == MutArray<num>[]);
+}
diff --git a/examples/tests/sdk_tests/std/json.test.w b/examples/tests/sdk_tests/std/json.test.w
index d8f3b72d474..7339077e79e 100644
--- a/examples/tests/sdk_tests/std/json.test.w
+++ b/examples/tests/sdk_tests/std/json.test.w
@@ -6,8 +6,8 @@ bring cloud;
 test "has()" {
   let obj = Json { key1: 1, key2: 2};
 
-  assert(Json.has(obj, "key1") == true);
-  assert(Json.has(obj, "key3") == false);
+  assert(obj.has("key1") == true);
+  assert(obj.has("key3") == false);
 }
 
 test "get()" {
@@ -178,4 +178,12 @@ test "deepCopy(), deepCopyMut()" {
   assert(copy != copyMut);
 
   assert(copyMut.get("object") == mutation);
+}
+
+test "delete() for MutJson" {
+  let mutObj = MutJson { x: 1, y: 2 };
+  mutObj.delete("x");
+  assert(mutObj.has("x") == false);
+  assert(mutObj.has("y")==true);
+  assert(mutObj.delete("random key that doesn't exist") == true);
 }
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/std/map.test.w b/examples/tests/sdk_tests/std/map.test.w
index 7a86fd69e9c..e9e58da8b73 100644
--- a/examples/tests/sdk_tests/std/map.test.w
+++ b/examples/tests/sdk_tests/std/map.test.w
@@ -20,7 +20,7 @@ assert(mvalues.at(1) == 99);
 assert(Map<str>{} == MutMap<str>{});
 
 test "equality"{
-    assert(Map<str>{} == MutMap<str>{});
+  assert(Map<str>{} == MutMap<str>{});
 }
 
 
@@ -36,16 +36,16 @@ apprentices.clear();
 assert(apprentices == MutMap<str>{});
 
 test "mutability" {
-    let apprentices = MutMap<str> { "plagueis" => "sidious", "dooku" => "ventress" };
-    apprentices.delete("plagueis");
-    assert(apprentices.size() == 1);
-    assert(apprentices.copy() == Map<str> {"dooku" => "ventress"});
-    apprentices.set("sidious", "dooku");
-    assert(apprentices.get("sidious")  == "dooku");
-    apprentices.set("sidious", "maul");
-    assert(apprentices.get("sidious") == "maul");
-    apprentices.clear();
-    assert(apprentices == MutMap<str>{});
+  let apprentices = MutMap<str> { "plagueis" => "sidious", "dooku" => "ventress" };
+  apprentices.delete("plagueis");
+  assert(apprentices.size() == 1);
+  assert(apprentices.copy() == Map<str> {"dooku" => "ventress"});
+  apprentices.set("sidious", "dooku");
+  assert(apprentices.get("sidious")  == "dooku");
+  apprentices.set("sidious", "maul");
+  assert(apprentices.get("sidious") == "maul");
+  apprentices.clear();
+  assert(apprentices == MutMap<str>{});
 }
 
 
@@ -58,13 +58,13 @@ mutTrilogies.delete("ST"); // One could argue that it's better if this does not
 assert(mutTrilogies.size() == 2);
 
 test "size()" {
-    let trilogies = { "PT" => 2, "OT" => 1, "ST" => 3 };
-    assert(trilogies.size() == 3);
+  let trilogies = { "PT" => 2, "OT" => 1, "ST" => 3 };
+  assert(trilogies.size() == 3);
 
-    let mutTrilogies = MutMap<num> { "PT" => 2, "OT" => 1, "ST" => 3 };
-    assert(mutTrilogies.size() == 3);
-    mutTrilogies.delete("ST");
-    assert(mutTrilogies.size() == 2);
+  let mutTrilogies = MutMap<num> { "PT" => 2, "OT" => 1, "ST" => 3 };
+  assert(mutTrilogies.size() == 3);
+  mutTrilogies.delete("ST");
+  assert(mutTrilogies.size() == 2);
 }
 
 
@@ -87,22 +87,22 @@ let Viceroy: str? = mutGreeting.tryGet("gunray");
 assert(Viceroy == nil);
 
 test "get()" {
-    let greeting = { "hello" => "there!" };
-    assert(greeting.get("hello") == "there!");
-    try {
-      greeting.get("bye");
-    } catch err {
-      assert(err.contains("does not contain key: \"bye\""));
-    }
-
-    let general: str? = greeting.tryGet("grievous");
-    assert(general == nil);
-
-    let mutGreeting = MutMap<str>{ "general" => "kenobi" };
-    assert(mutGreeting.get("general") == "kenobi");
-
-    let Viceroy: str? = mutGreeting.tryGet("gunray");
-    assert(Viceroy == nil);
+  let greeting = { "hello" => "there!" };
+  assert(greeting.get("hello") == "there!");
+  try {
+    greeting.get("bye");
+  } catch err {
+    assert(err.contains("does not contain key: \"bye\""));
+  }
+
+  let general: str? = greeting.tryGet("grievous");
+  assert(general == nil);
+
+  let mutGreeting = MutMap<str>{ "general" => "kenobi" };
+  assert(mutGreeting.get("general") == "kenobi");
+
+  let Viceroy: str? = mutGreeting.tryGet("gunray");
+  assert(Viceroy == nil);
 }
 
 
@@ -118,16 +118,16 @@ assert(padawans.has("windu") == padawans.has("sifo dyas"));
 assert(padawans.has("revan") == false);
 
 test "has()" {
-    let legion501 = { "fives" => "CT-5555", "rex" => "CT-7567" , "appo" => "CC-1119", "jesse" => "CT-5597" };
-    assert(legion501.has("fives") == true);
-    assert(legion501.has("rex") == legion501.has("jesse"));
-    assert(legion501.has("cody") == false);
-
-    let padawans = MutMap<str> { "ahsoka" => "anakin", "anakin" => "kenobi", "kenobi" => "qui gon", "qui gon" => "dooku", "dooku" => "yoda" };
-    assert(padawans.has("anakin") == true);
-    assert(padawans.has("qui gon") == padawans.has("dooku") == padawans.has("anakin"));
-    assert(padawans.has("windu") == padawans.has("sifo dyas"));
-    assert(padawans.has("revan") == false);
+  let legion501 = { "fives" => "CT-5555", "rex" => "CT-7567" , "appo" => "CC-1119", "jesse" => "CT-5597" };
+  assert(legion501.has("fives") == true);
+  assert(legion501.has("rex") == legion501.has("jesse"));
+  assert(legion501.has("cody") == false);
+
+  let padawans = MutMap<str> { "ahsoka" => "anakin", "anakin" => "kenobi", "kenobi" => "qui gon", "qui gon" => "dooku", "dooku" => "yoda" };
+  assert(padawans.has("anakin") == true);
+  assert(padawans.has("qui gon") == padawans.has("dooku") == padawans.has("anakin"));
+  assert(padawans.has("windu") == padawans.has("sifo dyas"));
+  assert(padawans.has("revan") == false);
 }
 
 
@@ -136,7 +136,7 @@ let userKeys = forceUsers.values();
 let valArr = [["malak", "vader", "bane"], ["sunrider", "bastila", "bindo"]];
 assert(userKeys.length == valArr.length);
 for i in 0..userKeys.length {
-    assert(userKeys.at(i) == valArr.at(i));
+  assert(userKeys.at(i) == valArr.at(i));
 }
 
 let saberforms = MutMap<str> { "1st" => "shii-cho", "2nd" => "makashi", "3rd" => "soresu", "4th" => "ataru", "5th" => "shien", "6th" => "niman", "7th" => "juyo"};
@@ -144,25 +144,25 @@ let saberformNames = saberforms.values();
 let nameArr = ["shii-cho", "makashi", "soresu", "ataru", "shien", "niman", "juyo"];
 assert(saberformNames.length == nameArr.length);
 for i in 0..saberformNames.length {
-    assert(saberformNames.at(i) == nameArr.at(i));
+  assert(saberformNames.at(i) == nameArr.at(i));
 }
 
 test "values()" {
-    let forceUsers = { "sith" => ["malak", "vader", "bane"], "jedi" => ["sunrider", "bastila", "bindo"]};
-    let userKeys = forceUsers.values();
-    let valArr = [["malak", "vader", "bane"], ["sunrider", "bastila", "bindo"]];
-    assert(userKeys.length == valArr.length);
-    for i in 0..userKeys.length {
-        assert(userKeys.at(i) == valArr.at(i));
-    }
-
-    let saberforms = MutMap<str> { "1st" => "shii-cho", "2nd" => "makashi", "3rd" => "soresu", "4th" => "ataru", "5th" => "shien", "6th" => "niman", "7th" => "juyo"};
-    let saberformNames = saberforms.values();
-    let nameArr = ["shii-cho", "makashi", "soresu", "ataru", "shien", "niman", "juyo"];
-    assert(saberformNames.length == nameArr.length);
-    for i in 0..saberformNames.length {
-        assert(saberformNames.at(i) == nameArr.at(i));
-    }
+  let forceUsers = { "sith" => ["malak", "vader", "bane"], "jedi" => ["sunrider", "bastila", "bindo"]};
+  let userKeys = forceUsers.values();
+  let valArr = [["malak", "vader", "bane"], ["sunrider", "bastila", "bindo"]];
+  assert(userKeys.length == valArr.length);
+  for i in 0..userKeys.length {
+    assert(userKeys.at(i) == valArr.at(i));
+  }
+
+  let saberforms = MutMap<str> { "1st" => "shii-cho", "2nd" => "makashi", "3rd" => "soresu", "4th" => "ataru", "5th" => "shien", "6th" => "niman", "7th" => "juyo"};
+  let saberformNames = saberforms.values();
+  let nameArr = ["shii-cho", "makashi", "soresu", "ataru", "shien", "niman", "juyo"];
+  assert(saberformNames.length == nameArr.length);
+  for i in 0..saberformNames.length {
+    assert(saberformNames.at(i) == nameArr.at(i));
+  }
 }
 
 
@@ -171,7 +171,7 @@ let lightsaberColors = lightsaberColorMap.keys();
 let colorArr = ["red", "blue"];
 assert(lightsaberColors.length == colorArr.length);
 for i in 0..lightsaberColors.length {
-    assert(lightsaberColors.at(i) == colorArr.at(i));
+  assert(lightsaberColors.at(i) == colorArr.at(i));
 }
 
 let isMandalorianWarrior = MutMap<bool> { "bo katan" => true, "jango" => true, "satine" => false, "boba" => true};
@@ -179,26 +179,26 @@ let mandalorianKeys = isMandalorianWarrior.keys();
 let keysArr = ["bo katan", "jango", "satine", "boba"];
 assert(mandalorianKeys.length == keysArr.length);
 for i in 0..mandalorianKeys.length {
-    assert(mandalorianKeys.at(i) == keysArr.at(i));
+  assert(mandalorianKeys.at(i) == keysArr.at(i));
 }
 
 test "keys()" {
-    let lightsaberColorMap = { "red" => "sith", "blue" => "jedi" };
-    let lightsaberColors = lightsaberColorMap.keys();
-    let colorArr = ["red", "blue"];
-    assert(lightsaberColors.length == colorArr.length);
-    for i in 0..lightsaberColors.length {
-        assert(lightsaberColors.at(i) == colorArr.at(i));
-    }
-
-    let isMandalorianWarrior = MutMap<bool> { "bo katan" => true, "jango" => true, "satine" => false, "boba" => true};
-    let mandalorianKeys = isMandalorianWarrior.keys();
-    let keysArr = ["bo katan", "jango", "satine", "boba"];
-    assert(mandalorianKeys.length == keysArr.length);
-    for i in 0..mandalorianKeys.length {
-        assert(mandalorianKeys.at(i) == keysArr.at(i));
-    }
-    
+  let lightsaberColorMap = { "red" => "sith", "blue" => "jedi" };
+  let lightsaberColors = lightsaberColorMap.keys();
+  let colorArr = ["red", "blue"];
+  assert(lightsaberColors.length == colorArr.length);
+  for i in 0..lightsaberColors.length {
+    assert(lightsaberColors.at(i) == colorArr.at(i));
+  }
+
+  let isMandalorianWarrior = MutMap<bool> { "bo katan" => true, "jango" => true, "satine" => false, "boba" => true};
+  let mandalorianKeys = isMandalorianWarrior.keys();
+  let keysArr = ["bo katan", "jango", "satine", "boba"];
+  assert(mandalorianKeys.length == keysArr.length);
+  for i in 0..mandalorianKeys.length {
+    assert(mandalorianKeys.at(i) == keysArr.at(i));
+  }
+
 }
 
 
@@ -209,11 +209,11 @@ assert(mutRuleOfTwo.delete("master") == true);
 assert(mutRuleOfTwo.size() == 0);
 
 test "copyMut()" {
-    let ruleOfTwo = { "master" => "apprentice" };
-    let mutRuleOfTwo: MutMap<str> = ruleOfTwo.copyMut();
-    assert(mutRuleOfTwo.copy() == ruleOfTwo);
-    assert(mutRuleOfTwo.delete("master") == true);
-    assert(mutRuleOfTwo.size() == 0);
+  let ruleOfTwo = { "master" => "apprentice" };
+  let mutRuleOfTwo: MutMap<str> = ruleOfTwo.copyMut();
+  assert(mutRuleOfTwo.copy() == ruleOfTwo);
+  assert(mutRuleOfTwo.delete("master") == true);
+  assert(mutRuleOfTwo.size() == 0);
 }
 
 
@@ -222,9 +222,9 @@ let immutAuthority: Map<str> = authority.copy();
 assert(immutAuthority.copyMut() == authority);
 
 test "copy()" {
-    let authority = MutMap<str> {"republic" => "senate", "empire" => "emperor"};
-    let immutAuthority: Map<str> = authority.copy();
-    assert(immutAuthority.copyMut() == authority);
+  let authority = MutMap<str> {"republic" => "senate", "empire" => "emperor"};
+  let immutAuthority: Map<str> = authority.copy();
+  assert(immutAuthority.copyMut() == authority);
 }
 
 
@@ -234,10 +234,10 @@ assert(senate.get("senator") == "organa");
 assert(senate.size() == 2);
 
 test "set()" {
-    let senate = MutMap<str> {"chancellor" => "palpatine"};
-    senate.set("senator", "organa");
-    assert(senate.get("senator") == "organa");
-    assert(senate.size() == 2);
+  let senate = MutMap<str> {"chancellor" => "palpatine"};
+  senate.set("senator", "organa");
+  assert(senate.get("senator") == "organa");
+  assert(senate.size() == 2);
 }
 
 
@@ -246,9 +246,9 @@ position.clear();
 assert(position.size() == 0);
 
 test "clear()" {
-    let position = MutMap<str> {"librarian" => "jocasta"};
-    position.clear();
-    assert(position.size() == 0);
+  let position = MutMap<str> {"librarian" => "jocasta"};
+  position.clear();
+  assert(position.size() == 0);
 }
 
 
@@ -259,11 +259,11 @@ sithTriumvirate.delete("sion");
 assert(sithTriumvirate == MutMap<str> { "traya" => "lord of betrayal" });
 
 test "delete()" {
-    let sithTriumvirate = MutMap<str> { "traya" => "lord of betrayal", "nihilus" => "lord of hunger", "sion" => "lord of pain" };
-    sithTriumvirate.delete("nihilus");
-    assert(sithTriumvirate.size() == 2);
-    sithTriumvirate.delete("sion");
-    assert(sithTriumvirate == MutMap<str> { "traya" => "lord of betrayal" });
+  let sithTriumvirate = MutMap<str> { "traya" => "lord of betrayal", "nihilus" => "lord of hunger", "sion" => "lord of pain" };
+  sithTriumvirate.delete("nihilus");
+  assert(sithTriumvirate.size() == 2);
+  sithTriumvirate.delete("sion");
+  assert(sithTriumvirate == MutMap<str> { "traya" => "lord of betrayal" });
 }
 
 
@@ -271,4 +271,18 @@ test "delete()" {
 let mapOfOptionalString = MutMap<str?>{ };
 mapOfOptionalString.set("a", nil);
 let b = mapOfOptionalString.get("a");
-assert(b == nil);
\ No newline at end of file
+assert(b == nil);
+
+// testing entries() method with multiple items
+let map = { "foo" => "hello", "bar" => "world" };
+
+test "entries()" {
+  // iterate over map entries
+  let entries = map.entries();
+
+  assert(entries.length == 2);
+  assert(entries.at(0).key == "foo");
+  assert(entries.at(0).value == "hello");
+  assert(entries.at(1).key == "bar");
+  assert(entries.at(1).value == "world");
+}
diff --git a/examples/tests/sdk_tests/std/node.test.w b/examples/tests/sdk_tests/std/node.test.w
index b56ce2930c2..913f6ffb936 100644
--- a/examples/tests/sdk_tests/std/node.test.w
+++ b/examples/tests/sdk_tests/std/node.test.w
@@ -2,7 +2,7 @@ bring cloud;
 bring expect;
 
 let bucket = new cloud.Bucket();
-let app = std.Node.of(bucket).app;
+let app = nodeof(bucket).app;
 assert(app.workdir.endsWith(".wing"));
 assert(app.entrypointDir.endsWith("/sdk_tests/std") || app.entrypointDir.endsWith("\\sdk_tests\\std"));
 app.isTestEnvironment; // don't care if it's true or false, just that it compiles
@@ -10,8 +10,8 @@ app.isTestEnvironment; // don't care if it's true or false, just that it compile
 class SingletonBucket {
   pub static of(scope: std.IResource): cloud.Bucket {
     let uid = "SingletonBucket";
-    let root = std.Node.of(scope).root;
-    let root_node = std.Node.of(root);
+    let root = nodeof(scope).root;
+    let root_node = nodeof(root);
     return unsafeCast(root_node.tryFindChild(uid)) ?? new cloud.Bucket() as uid in root;
   }
 }
diff --git a/examples/tests/sdk_tests/std/range.test.w b/examples/tests/sdk_tests/std/range.test.w
index 206c7021e70..6324f9a2572 100644
--- a/examples/tests/sdk_tests/std/range.test.w
+++ b/examples/tests/sdk_tests/std/range.test.w
@@ -1,70 +1,54 @@
 //-----------------------------------------------------------------------------
 // rangeOf
 
-assert(std.Range.of(1,5,true).join() == "1,2,3,4,5");
-
-test "rangeOf" {
-   assert(std.Range.of(1,5,true).join() == "1,2,3,4,5");
-}
-
-assert(std.Range.of(1, 5).join() == std.Range.of(1, 5, false).join());
-
-test "defaultRange" {
-   assert(std.Range.of(1, 5).join() == std.Range.of(1, 5, false).join());
-}
-
-assert(std.Range.of(1,5,false).join() == "1,2,3,4");
-
-test "rangeOfWithoutLastNumber" {
-   assert(std.Range.of(1,5,false).join() == "1,2,3,4");
-}
-
-assert(std.Range.of(1,5).join() == "1,2,3,4");
-
-test "rangeOfWithoutLastNumberDefault" {
-   assert(std.Range.of(1,5).join() == "1,2,3,4");
-}
-
-assert(std.Range.of(-3,3,true).join() == "-3,-2,-1,0,1,2,3");
-
-test "rangeOfWithNegativeRange" {
-   assert(std.Range.of(-3,3,true).join() == "-3,-2,-1,0,1,2,3");
-}
-
-assert(std.Range.of(-3,3,false).join() == "-3,-2,-1,0,1,2");
-
-test "rangeOfWithNegativeRangeDefault" {
-   assert(std.Range.of(-3,3,false).join() == "-3,-2,-1,0,1,2");
-}
-
-assert(std.Range.of(5,0,true).join() == "5,4,3,2,1,0");
-
-test "rangeOfDecreasingNumbers" {
-   assert(std.Range.of(5,0,true).join() == "5,4,3,2,1,0");
-}
-
-assert(std.Range.of(5,0,false).join() == "5,4,3,2,1");
-
-test "rangeOfDecreasingNumbersWithDefault" {
-   assert(std.Range.of(5,0,false).join() == "5,4,3,2,1");
-}
-
-let var i = 0;
-for x in 0..5 { i+=1; }
-assert(i==5);
-
-test "forWithRange" { 
-   let var i = 0;
-   for x in 0..5 { i+=1; }
-   assert(i==5);
-}
-
-let var n = 0;
-for x in 0..=5 { n+=1; }
-assert(n==6);
-
-test "forWithRangeIncludeLastNumber" { 
-   let var n = 0;
-   for x in 0..=5 { n+=1; }
-   assert(n==6);
+let testRange = (from: num, to: num, inclusive: bool, expected: Array<num>) => {
+  let var i = 0;
+  if inclusive {
+    for x in from..=to {
+      assert(x == expected.at(i));
+      i += 1;
+    }
+  } else {
+    for x in from..to {
+      assert(x == expected.at(i));
+      i += 1;
+    }
+  }
+  assert(i == expected.length);
+};
+
+let testRangeInflight = inflight (from: num, to: num, inclusive: bool, expected: Array<num>) => {
+  let var i = 0;
+  if inclusive {
+    for x in from..=to {
+      assert(x == expected.at(i));
+      i += 1;
+    }
+  } else {
+    for x in from..to {
+      assert(x == expected.at(i));
+      i += 1;
+    }
+  }
+  assert(i == expected.length);
+};
+
+testRange(1, 5, true, [1, 2, 3, 4, 5]);
+testRange(1, 5, false, [1, 2, 3, 4]);
+testRange(1, 1, true, [1]);
+testRange(1, 1, false, []);
+testRange(-3, 3, true, [-3, -2, -1, 0, 1, 2, 3]);
+testRange(-3, 3, false, [-3, -2, -1, 0, 1, 2]);
+testRange(5, 0, true, [5, 4, 3, 2, 1, 0]);
+testRange(5, 0, false, [5, 4, 3, 2, 1]);
+
+test "ranges work" {
+  testRangeInflight(1, 5, true, [1, 2, 3, 4, 5]);
+  testRangeInflight(1, 5, false, [1, 2, 3, 4]);
+  testRangeInflight(1, 1, true, [1]);
+  testRangeInflight(1, 1, false, []);
+  testRangeInflight(-3, 3, true, [-3, -2, -1, 0, 1, 2, 3]);
+  testRangeInflight(-3, 3, false, [-3, -2, -1, 0, 1, 2]);
+  testRangeInflight(5, 0, true, [5, 4, 3, 2, 1, 0]);
+  testRangeInflight(5, 0, false, [5, 4, 3, 2, 1]);
 }
diff --git a/examples/tests/sdk_tests/std/regex.test.w b/examples/tests/sdk_tests/std/regex.test.w
new file mode 100644
index 00000000000..dde7e42fb24
--- /dev/null
+++ b/examples/tests/sdk_tests/std/regex.test.w
@@ -0,0 +1,40 @@
+bring expect;
+
+let r = regex.compile("p([a-z]+)ch");
+
+// check if there are any matches
+expect.equal(r.test("peach"), true);
+
+// returns the first match, if there is one
+expect.equal(r.find("peach peach"), "peach");
+
+// returns all of the non-overlapping matches
+expect.equal(r.findAll("peach punch pinch"), ["peach", "punch", "pinch"]);
+
+// returns the start and end index of the first match, if there is one
+expect.equal(r.findIndex("peach punch"), [0, 5]);
+
+// returns the start and end index of all matches
+expect.equal(r.findAllIndex("peach punch pinch"), [[0, 5], [6, 11], [12, 17]]);
+
+// returns the match and all submatches from groups like ([a-z]+)
+expect.equal(r.findSubmatch("peach punch"), ["peach", "ea"]);
+
+// returns the start and end index of the match and all submatches
+expect.equal(r.findSubmatchIndex("peach punch"), [[0, 5], [1, 3]]);
+
+// replace all occurrences of a match with a string
+expect.equal(r.replaceAll("a peach", "<fruit>"), "a <fruit>");
+
+test "regex" {
+  let r = regex.compile("p([a-z]+)ch");
+
+  expect.equal(r.test("peach"), true);
+  expect.equal(r.find("peach peach"), "peach");
+  expect.equal(r.findAll("peach punch pinch"), ["peach", "punch", "pinch"]);
+  expect.equal(r.findIndex("peach punch"), [0, 5]);
+  expect.equal(r.findAllIndex("peach punch pinch"), [[0, 5], [6, 11], [12, 17]]);
+  expect.equal(r.findSubmatch("peach punch"), ["peach", "ea"]);
+  expect.equal(r.findSubmatchIndex("peach punch"), [[0, 5], [1, 3]]);
+  expect.equal(r.replaceAll("a peach", "<fruit>"), "a <fruit>");
+}
diff --git a/examples/tests/sdk_tests/std/set.test.w b/examples/tests/sdk_tests/std/set.test.w
index 3aab4f11f9e..44e26092cf3 100644
--- a/examples/tests/sdk_tests/std/set.test.w
+++ b/examples/tests/sdk_tests/std/set.test.w
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 // toArray()
-let mySet = Set<num> {1, 2, 3};
+let mySet = Set<num> [1, 2, 3];
 let myArrayFromSet = mySet.toArray();
 assert(myArrayFromSet.at(0) == 1);
 assert(myArrayFromSet.at(1) == 2);
@@ -8,7 +8,7 @@ assert(myArrayFromSet.at(2) == 3);
 assert(myArrayFromSet.length == mySet.size);
 assert(myArrayFromSet.length == 3);
 
-let myMutSet = MutSet<str> {"a", "b", "c"};
+let myMutSet = MutSet<str> ["a", "b", "c"];
 let myArrayFromMutSet = myMutSet.toArray();
 assert(myArrayFromMutSet.at(0) == "a");
 assert(myArrayFromMutSet.at(1) == "b");
@@ -21,16 +21,16 @@ assert(myArrayFromMutSet.length == 3);
 // container types are equal regardless of the mutability if they have the same
 // content but in all scenraios the type is specified for better readability
 
-assert(Set<num>{1, 2} == MutSet<num>{1, 2});
-assert(Set<bool>{true, false} == MutSet<bool>{false, true});
+assert(Set<num>[1, 2] == MutSet<num>[1, 2]);
+assert(Set<bool>[true, false] == MutSet<bool>[false, true]);
 
 test "equality"{
-    assert(Set<num>{1, 2} == MutSet<num>{1, 2});
-    assert(Set<bool>{true, false} == MutSet<bool>{false, true});
+    assert(Set<num>[1, 2] == MutSet<num>[1, 2]);
+    assert(Set<bool>[true, false] == MutSet<bool>[false, true]);
 }
 
 
-let openings = MutSet<str> {"A Cruel Angel's Thesis", "Lilium", "Unravel", "TOP"};
+let openings = MutSet<str> ["A Cruel Angel's Thesis", "Lilium", "Unravel", "TOP"];
 let immutOpenings: Set<str> = openings.copy();
 assert(immutOpenings.copyMut() == openings);
 openings.add("Abnormalize");
@@ -41,7 +41,7 @@ openings.clear();
 assert(openings.size == 0);
 
 test "mutability" {
-    let openings = MutSet<str> {"A Cruel Angel's Thesis", "Lilium", "Unravel", "TOP"};
+    let openings = MutSet<str> ["A Cruel Angel's Thesis", "Lilium", "Unravel", "TOP"];
     let immutOpenings: Set<str> = openings.copy();
     assert(immutOpenings.copyMut() == openings);
     openings.add("Abnormalize");
@@ -53,10 +53,10 @@ test "mutability" {
 }
 
 
-let maleVA = {"Kenjiro Tsuda", "Akira Ishida", "Yoshitsugu Matsuoka"};
+let maleVA = Set<str> ["Kenjiro Tsuda", "Akira Ishida", "Yoshitsugu Matsuoka"];
 assert(maleVA.size == 3);
 
-let femaleVA = MutSet<str>{"Saori Hayami", "Miyuki Sawashiro"};
+let femaleVA = MutSet<str>["Saori Hayami", "Miyuki Sawashiro"];
 assert(femaleVA.size == 2);
 femaleVA.add("Maaya Sakamoto");
 assert(femaleVA.size == 3);
@@ -64,10 +64,10 @@ femaleVA.clear();
 assert(femaleVA.size == 0);
 
 test "size()" {
-    let maleVA = {"Kenjiro Tsuda", "Akira Ishida", "Yoshitsugu Matsuoka"};
+    let maleVA = Set<str> ["Kenjiro Tsuda", "Akira Ishida", "Yoshitsugu Matsuoka"];
     assert(maleVA.size == 3);
 
-    let femaleVA = MutSet<str>{"Saori Hayami", "Miyuki Sawashiro"};
+    let femaleVA = MutSet<str>["Saori Hayami", "Miyuki Sawashiro"];
     assert(femaleVA.size == 2);
     femaleVA.add("Maaya Sakamoto");
     assert(femaleVA.size == 3);
@@ -76,11 +76,11 @@ test "size()" {
 }
 
 
-let genre = {"isekai", "mecha", "cyberpunk"};
+let genre = Set<str> ["isekai", "mecha", "cyberpunk"];
 assert(genre.has("drama") == false);
 assert(genre.has("mecha"));
 
-let mutGenre = MutSet<str> {"rom-com", "sports", "sci-fi"};
+let mutGenre = MutSet<str> ["rom-com", "sports", "sci-fi"];
 assert(mutGenre.has("psychological") == false);
 assert(mutGenre.has("rom-com"));
 mutGenre.delete("rom-com");
@@ -89,11 +89,11 @@ assert(mutGenre.has("psychological"));
 assert(mutGenre.has("rom-com") == false);
 
 test "has()" {
-    let genre = {"isekai", "mecha", "cyberpunk"};
+    let genre = Set<str> ["isekai", "mecha", "cyberpunk"];
     assert(genre.has("drama") == false);
     assert(genre.has("mecha"));
 
-    let mutGenre = MutSet<str> {"rom-com", "sports", "sci-fi"};
+    let mutGenre = MutSet<str> ["rom-com", "sports", "sci-fi"];
     assert(mutGenre.has("psychological") == false);
     assert(mutGenre.has("rom-com"));
     mutGenre.delete("rom-com");
@@ -103,14 +103,14 @@ test "has()" {
 }
 
 
-let endings = Set<bool>{};
+let endings = Set<bool>[];
 assert(endings.toArray() == Array<bool>[]);
-let strEndings = {"Somewhere, Faraway, Everyone is Listening to a Ballad"};
+let strEndings = Set<str> ["Somewhere, Faraway, Everyone is Listening to a Ballad"];
 assert(strEndings.toArray() == ["Somewhere, Faraway, Everyone is Listening to a Ballad"]);
 let copyEndings = endings.copyMut();
 assert(copyEndings.toArray() == endings.toArray());
 
-let mutEndings = MutSet<Array<str>> {["Fly Me To The Moon", "Slump"], ["Heikousen"]};
+let mutEndings = MutSet<Array<str>> [["Fly Me To The Moon", "Slump"], ["Heikousen"]];
 assert(mutEndings.toArray() == [["Fly Me To The Moon", "Slump"], ["Heikousen"]]);
 mutEndings.add(["Wagamama"]);
 assert(mutEndings.toArray() == [["Fly Me To The Moon", "Slump"], ["Heikousen"], ["Wagamama"]]);
@@ -118,14 +118,14 @@ let immutEndings = mutEndings.copy();
 assert(immutEndings.toArray() == mutEndings.toArray());
 
 test "toArray()" {
-    let endings = Set<bool>{};
+    let endings = Set<bool>[];
     assert(endings.toArray() == Array<bool>[]);
-    let strEndings = {"Somewhere, Faraway, Everyone is Listening to a Ballad"};
+    let strEndings = Set<str> ["Somewhere, Faraway, Everyone is Listening to a Ballad"];
     assert(strEndings.toArray() == ["Somewhere, Faraway, Everyone is Listening to a Ballad"]);
     let copyEndings = endings.copyMut();
     assert(copyEndings.toArray() == endings.toArray());
 
-    let mutEndings = MutSet<Array<str>> {["Fly Me To The Moon", "Slump"], ["Heikousen"]};
+    let mutEndings = MutSet<Array<str>> [["Fly Me To The Moon", "Slump"], ["Heikousen"]];
     assert(mutEndings.toArray() == [["Fly Me To The Moon", "Slump"], ["Heikousen"]]);
     mutEndings.add(["Wagamama"]);
     assert(mutEndings.toArray() == [["Fly Me To The Moon", "Slump"], ["Heikousen"], ["Wagamama"]]);
@@ -134,36 +134,36 @@ test "toArray()" {
 }
 
 
-let talkingQuirks = {"dattebane", "battebayo", "dattebasa"};
-assert(talkingQuirks.copyMut() == MutSet<str> {"dattebane", "battebayo", "dattebasa"});
+let talkingQuirks = Set<str> ["dattebane", "battebayo", "dattebasa"];
+assert(talkingQuirks.copyMut() == MutSet<str> ["dattebane", "battebayo", "dattebasa"]);
 
 test "copyMut()" {
-    let talkingQuirks = {"dattebane", "battebayo", "dattebasa"};
-assert(talkingQuirks.copyMut() == MutSet<str> {"dattebane", "battebayo", "dattebasa"});
+    let talkingQuirks = Set<str> ["dattebane", "battebayo", "dattebasa"];
+    assert(talkingQuirks.copyMut() == MutSet<str> ["dattebane", "battebayo", "dattebasa"]);
 }
 
 
-let evaRebuild = MutSet<num> {1.11, 2.22, 3.33};
+let evaRebuild = MutSet<num> [1.11, 2.22, 3.33];
 evaRebuild.add(3.0+1.0);
 assert(evaRebuild.has(3.0+1.0));
-assert(evaRebuild == MutSet<num>{1.11, 2.22, 3.33, 3.0+1.0});
+assert(evaRebuild == MutSet<num>[1.11, 2.22, 3.33, 3.0+1.0]);
 
 test "add()" {
-    let evaRebuild = MutSet<num> {1.11, 2.22, 3.33};
+    let evaRebuild = MutSet<num> [1.11, 2.22, 3.33];
     evaRebuild.add(3.0+1.0);
     assert(evaRebuild.has(3.0+1.0));
-    assert(evaRebuild == MutSet<num>{1.11, 2.22, 3.33, 3.0+1.0});
+    assert(evaRebuild == MutSet<num>[1.11, 2.22, 3.33, 3.0+1.0]);
 }
 
 
-let studios = MutSet<str> {"Gainax", "Ghibli", "Production I.G.", "Shaft"};
+let studios = MutSet<str> ["Gainax", "Ghibli", "Production I.G.", "Shaft"];
 assert(studios.delete("Gainax"));
 assert(studios.has("Gainax") == false);
 assert(studios.delete("Sunrise") == false);
 assert(studios.size == 3);
 
 test "delete()" {
-    let studios = MutSet<str> {"Gainax", "Ghibli", "Production I.G.", "Shaft"};
+    let studios = MutSet<str> ["Gainax", "Ghibli", "Production I.G.", "Shaft"];
     assert(studios.delete("Gainax"));
     assert(studios.has("Gainax") == false);
     assert(studios.delete("Sunrise") == false);
@@ -171,7 +171,7 @@ test "delete()" {
 }
 
 
-let demographics = MutSet<str> {"shounen", "shoujo", "josei", "seinen"};
+let demographics = MutSet<str> ["shounen", "shoujo", "josei", "seinen"];
 demographics.clear();
 assert(demographics.size == 0);
 demographics.add("kodomo");
@@ -179,7 +179,7 @@ demographics.clear();
 assert(demographics.has("kodomo") == false);
 
 test "clear()" {
-    let demographics = MutSet<str> {"shounen", "shoujo", "josei", "seinen"};
+    let demographics = MutSet<str> ["shounen", "shoujo", "josei", "seinen"];
     demographics.clear();
     assert(demographics.size == 0);
     demographics.add("kodomo");
@@ -188,18 +188,30 @@ test "clear()" {
 }
 
 
-let acronyms = MutSet<Map<str>> {{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}};
+let acronyms = MutSet<Map<str>> [{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}];
 let copyAcronyms = acronyms.copy();
-assert(copyAcronyms == {{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}});
+assert(copyAcronyms == Set<Map<str>>[{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}]);
 acronyms.add({"DomeKano" => "Domestic na Kanojo"});
 let copyAcronymsNew = acronyms.copy().copyMut();
 assert(copyAcronymsNew == acronyms);
 
+let a = MutSet<Map<str>> [{"a" => "b", "c" => "d"}];
+let b = a.copy();
+assert(a == b);
+
+let c = b.copyMut();
+assert(a == c);
+a.add({"e" => "f"});
+c.add({"e" => "f"});
+assert(a == MutSet<Map<str>>[{"a" => "b", "c" => "d"}, {"e" => "f"}]);
+assert(c == MutSet<Map<str>>[{"a" => "b", "c" => "d"}, {"e" => "f"}]);
+assert(a == c); 
+
 test "copy()" {
-    let acronyms = MutSet<Map<str>> {{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}};
+    let acronyms = MutSet<Map<str>> [{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}];
     let copyAcronyms = acronyms.copy();
-    assert(copyAcronyms == {{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}});
+    assert(copyAcronyms == Set<Map<str>>[{"SEL" => "Serial Experiments Lain", "NGE" => "Neon Genesis Evangelion"}]);
     acronyms.add({"DomeKano" => "Domestic na Kanojo"});
     let copyAcronymsNew = acronyms.copy().copyMut();
     assert(copyAcronymsNew == acronyms);
-}
\ No newline at end of file
+}
diff --git a/examples/tests/sdk_tests/std/struct.test.w b/examples/tests/sdk_tests/std/struct.test.w
index 50dc2499275..3dc08e7a66f 100644
--- a/examples/tests/sdk_tests/std/struct.test.w
+++ b/examples/tests/sdk_tests/std/struct.test.w
@@ -10,7 +10,7 @@ let assertThrows = inflight (expected: str, block: (): void) => {
   try {
     block();
   } catch actual {
-    assert(actual == expected);
+    expect.equal(actual, expected);
     error = true;
   }
   assert(error);
@@ -48,7 +48,7 @@ test "tryParseJson()" {
 test "invalid parseJson()" {
   let jsonString = "\{\"name\": \"Billy\", \"age\": false}";
   
-  assertThrows("unable to parse Person:\n- instance.age is not of a type(s) number", () => {
+  assertThrows("unable to parse Person:\n- Person/age must be number", () => {
     Person.parseJson(jsonString);
   });
 }
@@ -59,4 +59,30 @@ test "invalid tryParseJson()" {
   if let person = Person.tryParseJson(jsonString) {
     assert(false); // should not happen
   }
-}
\ No newline at end of file
+}
+
+struct Foo {
+  someJson: Json;
+}
+
+test "valid Json types" {
+  let s = Foo.fromJson({someJson: "wow"});
+  let b = Foo.fromJson({someJson: true});
+  let n = Foo.fromJson({someJson: 123});
+  let arr = Foo.fromJson({someJson: [1, 2, 3]});
+  let j = Foo.fromJson({someJson: {even: "more json!"}});
+
+  expect.equal(s.someJson, "wow");
+  expect.equal(b.someJson, true);
+  expect.equal(n.someJson, 123);
+  expect.equal(arr.someJson, [1, 2, 3]);
+  expect.equal(j.someJson, {even: "more json!"});
+}
+
+// These two files define a struct with the same name and different fields
+// We validate the compiler doesn't mix them up when generating their JSON schema
+bring "./struct_a.w" as struct_a;
+bring "./struct_b.w" as struct_b;
+
+assert({a: 1} == struct_a.FooA.fromJson(#"{\"a\": 1}"));
+assert({b: 2} == struct_b.FooB.fromJson(#"{\"b\": 2}"));
diff --git a/examples/tests/sdk_tests/std/struct_a.w b/examples/tests/sdk_tests/std/struct_a.w
new file mode 100644
index 00000000000..e1c9ac1d0ed
--- /dev/null
+++ b/examples/tests/sdk_tests/std/struct_a.w
@@ -0,0 +1,9 @@
+struct SomeStruct {
+  a: num;
+}
+
+pub class FooA {
+  pub static fromJson(jsonStr: str): SomeStruct {
+    return SomeStruct.parseJson(jsonStr);
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/std/struct_b.w b/examples/tests/sdk_tests/std/struct_b.w
new file mode 100644
index 00000000000..18a624b922d
--- /dev/null
+++ b/examples/tests/sdk_tests/std/struct_b.w
@@ -0,0 +1,9 @@
+struct SomeStruct {
+  b: num;
+}
+
+pub class FooB {
+  pub static fromJson(jsonStr: str): SomeStruct {
+    return SomeStruct.parseJson(jsonStr);
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/topic/no_blocking.test.w b/examples/tests/sdk_tests/topic/no_blocking.test.w
index 271b09f5024..b0825fbaea3 100644
--- a/examples/tests/sdk_tests/topic/no_blocking.test.w
+++ b/examples/tests/sdk_tests/topic/no_blocking.test.w
@@ -20,6 +20,4 @@ test "topic subscribers are invoked without blocking" {
 
   // after a while, the counter should be 1
   util.waitUntil(inflight () => { return counter.peek() == 1; }, interval: 1s, timeout: 30s);
-
-  assert(counter.peek() == 1);
 }
diff --git a/examples/tests/sdk_tests/topic/on_message.test.w b/examples/tests/sdk_tests/topic/on_message.test.w
index 0b3cce4a854..05b12017a4e 100644
--- a/examples/tests/sdk_tests/topic/on_message.test.w
+++ b/examples/tests/sdk_tests/topic/on_message.test.w
@@ -20,6 +20,4 @@ test "onMessage" {
   util.waitUntil(inflight () => {
     return c.peek() == 10;
   }, timeout: 10s);
-
-  assert(c.peek() == 10);
 }
diff --git a/examples/tests/sdk_tests/topic/subscribe-queue.test.w b/examples/tests/sdk_tests/topic/subscribe-queue.test.w
new file mode 100644
index 00000000000..554d7034c52
--- /dev/null
+++ b/examples/tests/sdk_tests/topic/subscribe-queue.test.w
@@ -0,0 +1,36 @@
+bring cloud;
+bring util;
+
+let msg_test = "Hello World!!1";
+
+let c = new cloud.Counter();
+
+let t = new cloud.Topic();
+t.onMessage(inflight (msg: str) => {
+  if msg == msg_test {
+    c.inc(1, "t");
+  }
+});
+
+let q1 = new cloud.Queue() as "q1";
+q1.setConsumer(inflight (msg: str) => {
+  if msg == msg_test {
+    c.inc(1, "q1");
+  }
+});
+t.subscribeQueue(q1);
+
+let q2 = new cloud.Queue() as "q2";
+q2.setConsumer(inflight (msg: str) => {
+  if msg == msg_test {
+    c.inc(1, "q2");
+  }
+});
+t.subscribeQueue(q2);
+
+test "functions and queues receiving messages from the topic" {
+  t.publish(msg_test);
+  assert(util.waitUntil(inflight () => { return c.peek("q1") == 1; }));
+  assert(util.waitUntil(inflight () => { return c.peek("q2") == 1; }));
+  assert(util.waitUntil(inflight () => { return c.peek("t") == 1; }));
+}
diff --git a/examples/tests/sdk_tests/topic/variadic-parameter.test.w b/examples/tests/sdk_tests/topic/variadic-parameter.test.w
new file mode 100644
index 00000000000..479c0552f94
--- /dev/null
+++ b/examples/tests/sdk_tests/topic/variadic-parameter.test.w
@@ -0,0 +1,17 @@
+bring cloud;
+bring util;
+
+let c = new cloud.Counter();
+let t = new cloud.Topic();
+t.onMessage(inflight (msg: str) => {
+  c.inc();
+});
+
+test "publish message array to topic" {
+  t.publish("msg1", "msg2", "msg3", 
+    "msg4", "msg5", "msg6", "msg7", 
+    "msg8", "msg9", "msg10", "msg11", 
+    "msg12", "msg13", "msg14", "msg15");
+
+  assert(util.waitUntil(inflight () => { return c.peek() == 15; }));
+}
diff --git a/examples/tests/sdk_tests/turbo.json b/examples/tests/sdk_tests/turbo.json
index 69065399ba4..af4cba7052e 100644
--- a/examples/tests/sdk_tests/turbo.json
+++ b/examples/tests/sdk_tests/turbo.json
@@ -2,8 +2,6 @@
   "$schema": "https://turborepo.org/schema.json",
   "extends": ["//"],
   "pipeline": {
-    "topo": {
-      "inputs": ["**", "!node_modules/**", "!**/target/**"]
-    }
+    "topo": {}
   }
 }
diff --git a/examples/tests/sdk_tests/util/env.test.w b/examples/tests/sdk_tests/util/env.test.w
index 5b631554c68..9fd0866c460 100644
--- a/examples/tests/sdk_tests/util/env.test.w
+++ b/examples/tests/sdk_tests/util/env.test.w
@@ -28,4 +28,15 @@ test "use util from inflight" {
   // --inflight tryEnv--
   let noValue = util.Util.tryEnv(NOT_ACTUAL_ENV);
   assert(noValue == nil);
-}
\ No newline at end of file
+}
+
+/**
+ * setEnv()
+ */
+util.setEnv("FOO", "bar");
+assert(util.env("FOO") == "bar");
+ 
+test "set env from inflight" {
+  util.setEnv("FOO", "baz");
+  assert(util.env("FOO") == "baz");
+}
diff --git a/examples/tests/sdk_tests/util/exec.test.w b/examples/tests/sdk_tests/util/exec.test.w
new file mode 100644
index 00000000000..83615488410
--- /dev/null
+++ b/examples/tests/sdk_tests/util/exec.test.w
@@ -0,0 +1,88 @@
+bring util;
+bring expect;
+bring fs;
+
+let assertThrows = inflight (expected: str, block: (): void) => {
+  let var error = false;
+  try {
+    block();
+  } catch actual {
+    assert(actual.contains(expected));
+    error = true;
+  }
+  assert(error);
+};
+
+
+test "exec()" {
+  // "exec() with valid program"
+  let output1 = util.exec("echo", ["-n", "Hello, Wing!"]);
+  
+  expect.equal(output1.stdout, "Hello, Wing!");
+  expect.equal(output1.stderr, "");
+  expect.equal(output1.status, 0);
+
+
+// "exec() with invalid program" 
+  let NOT_FOUND_ERROR = "Program not found:";
+
+  assertThrows(NOT_FOUND_ERROR, () => {
+    util.exec("no-such-program",  [""]);
+  });
+
+// "exec() with explicit non-zero exit status" 
+  let output2 = util.exec("bash", ["--norc", "--noprofile", "-c", "exit 1"]);
+
+  expect.equal(output2.stdout, "");
+  expect.equal(output2.stderr, "");
+  expect.equal(output2.status, 1);
+
+//  "exec() with env option" 
+  let program3 = "bash";
+  let args3 = ["--norc", "--noprofile", "-c", "echo $WING_TARGET $ENV_VAR"];
+  let opts3 = {
+    env: { ENV_VAR: "Wing" },
+  };
+
+  let output3 = util.exec(program3, args3, opts3);
+
+  expect.equal(output3.stdout, "Wing\n");
+  expect.equal(output3.stderr, "");
+  expect.equal(output3.status, 0);
+
+
+//  "exec() with inheritEnv option" 
+  let program4 = "bash";
+  let args4 = ["--norc", "--noprofile", "-c", "echo $WING_TARGET"];
+  let opts4 = {
+    inheritEnv: true,
+  };
+
+  let output4 = util.exec(program4, args4);
+  let output5 = util.exec(program4, args4, opts4);
+
+  // LF (\n)
+  expect.equal(output4.stdout.length, 1);
+  expect.equal(output4.stderr, "");
+  expect.equal(output4.status, 0);
+
+  assert(output5.stdout.length > 1);
+  expect.equal(output5.stderr, "");
+  expect.equal(output5.status, 0);
+
+
+// "exec() with cwd option" 
+  let tempDir = fs.mkdtemp();
+  let tempFile = fs.join(tempDir, "tempfile.txt");
+  fs.writeFile(tempFile, "Hello, Wing!");
+
+  let program6 = "ls";
+  let args6 = ["-1"];
+  let opts6 = {cwd: tempDir};
+
+  let output6 = util.exec(program6, args6, opts6);
+
+  expect.equal(output6.stdout, "tempfile.txt\n");
+  expect.equal(output6.stderr, "");
+  expect.equal(output6.status, 0);
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/util/os.test.w b/examples/tests/sdk_tests/util/os.test.w
new file mode 100644
index 00000000000..8fe278e04fd
--- /dev/null
+++ b/examples/tests/sdk_tests/util/os.test.w
@@ -0,0 +1,11 @@
+bring util;
+
+// This is not a comprehensive list, just a few examples
+// that our CI system supports.
+let osList = ["darwin", "linux", "win32"];
+
+assert(osList.contains(util.os()));
+
+test "util.os() inflight" {
+  assert(osList.contains(util.os()));
+}
diff --git a/examples/tests/sdk_tests/util/shell.test.w b/examples/tests/sdk_tests/util/shell.test.w
new file mode 100644
index 00000000000..5939d02b2e9
--- /dev/null
+++ b/examples/tests/sdk_tests/util/shell.test.w
@@ -0,0 +1,118 @@
+bring util;
+bring expect;
+bring fs;
+
+class Util {
+  extern "./util.js" pub static inflight platform(): str;
+}
+
+let assertThrows = inflight (expected: str, block: (): void) => {
+  let var error = false;
+  try {
+    block();
+  } catch actual {
+    assert(actual.contains(expected));
+    error = true;
+  }
+  assert(error);
+};
+
+test "shell() with valid command" {
+  let command = "echo Hello, Wing!";
+
+  let output = util.shell(command);
+  
+  if Util.platform() != "win32" {
+    expect.equal(output, "Hello, Wing!\n");
+  } else {
+    expect.equal(output, "Hello, Wing!\r\n");
+  }
+}
+
+test "shell() with invalid command" {
+  let NOT_FOUND_ERROR = "Error executing command \"no-such-command\". Exited with error:";
+
+  let command = "no-such-command";
+
+  assertThrows(NOT_FOUND_ERROR, () => {
+    util.shell(command);
+  });
+}
+
+test "shell() with explicit non-zero exit status" {
+  let ERROR = "Error executing command \"exit 1\". Exited with error code: 1";
+
+  let command = "exit 1";
+
+  assertThrows(ERROR, () => {
+    util.shell(command);
+  });
+}
+
+test "shell() with env option" {
+  let var command = "";
+  if Util.platform() != "win32" {
+    command = "echo $WING_TARGET $ENV_VAR";
+  } else {
+    command = "echo %WING_TARGET% %ENV_VAR%";
+  }
+  let opts = {
+    env: { ENV_VAR: "Wing" },
+  };
+
+  let output = util.shell(command, opts);
+
+  if Util.platform() != "win32" {
+    expect.equal(output, "Wing\n");
+  } else {
+    expect.equal(output, "%WING_TARGET% Wing\r\n");
+  }
+}
+
+test "shell() with inheritEnv option" {
+  let target = util.env("WING_TARGET");
+
+  let var command = "";
+  if Util.platform() != "win32" {
+    command = "echo $WING_TARGET";
+  } else {
+    command = "echo %WING_TARGET%";
+  }
+  let opts = {
+    inheritEnv: true,
+  };
+
+  let output1 = util.shell(command);
+  let output2 = util.shell(command, opts);
+
+  if Util.platform() != "win32" {
+    // \n
+    expect.equal(output1.length, 1);
+  } else {
+    // %WING_TARGET%\r\n
+    expect.equal(output1.length, 15);
+  }
+  assert(output1.contains(target) == false);
+  assert(output2.contains(target) == true);
+}
+
+test "shell() with cwd option" {
+  let tempDir = fs.mkdtemp();
+  let tempFile = fs.join(tempDir, "tempfile.txt");
+  fs.writeFile(tempFile, "Hello, Wing!");
+
+  let command1 = "ls -1";
+  let opts1 = {cwd: tempDir};
+
+  let output1 = util.shell(command1, opts1);
+
+  expect.equal(output1, "tempfile.txt\n");
+
+// "shell() with throw option" 
+  let command2 = "exit 1";
+  let opts2 = {throw: false};
+
+  let output2 = util.shell(command2, opts2);
+
+  expect.equal(output2, "Error executing command \"exit 1\". Exited with error code: 1");
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/util/sleep-helper.js b/examples/tests/sdk_tests/util/sleep-helper.js
deleted file mode 100644
index 198d456fed3..00000000000
--- a/examples/tests/sdk_tests/util/sleep-helper.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.getTime = function(){
-  return (new Date()).getTime();
-};
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/util/sleep.test.w b/examples/tests/sdk_tests/util/sleep.test.w
index 23df0aac142..be68062b73d 100644
--- a/examples/tests/sdk_tests/util/sleep.test.w
+++ b/examples/tests/sdk_tests/util/sleep.test.w
@@ -1,14 +1,10 @@
 bring util;
 
-class JSHelper { 
-  extern "./sleep-helper.js" pub static inflight getTime(): num;
-}
-
 let oneHundredMiliseconds = 0.1s;
 test "sleep 100 mili seconds" {
-  let start = JSHelper.getTime();
+  let start = datetime.systemNow().timestampMs;
   util.sleep(oneHundredMiliseconds);
-  let end = JSHelper.getTime();
+  let end = datetime.systemNow().timestampMs;
   let delta = end - start;
   // Node.js setTimeout isn't precise, so the actual time slept could be less
   assert(delta >= 90);
diff --git a/examples/tests/sdk_tests/util/spawn.test.w b/examples/tests/sdk_tests/util/spawn.test.w
new file mode 100644
index 00000000000..d755ed39601
--- /dev/null
+++ b/examples/tests/sdk_tests/util/spawn.test.w
@@ -0,0 +1,67 @@
+bring util;
+bring expect;
+
+let assertThrows = inflight (expected: str, block: (): void) => {
+  let var error = false;
+  try {
+    block();
+    } catch actual {
+      expect.equal(actual, expected);
+      error = true;
+    }
+    expect.equal(error, true);
+};
+
+test "spawn()" {
+// "spawn() with successful execution"
+  let program1 = "echo";
+  let args1 = ["Hello, Wing!"];
+  
+  let child1 = util.spawn(program1, args1);
+  let output1 = child1.wait();
+
+  expect.equal(output1.stdout, "Hello, Wing!\n");
+  expect.equal(output1.status, 0);
+
+// "spawn() with empty args" 
+  let program2 = "echo";
+  let args2 = [""];
+  
+  let child2 = util.spawn(program2, args2);
+  let output2 = child2.wait();
+
+  expect.equal(["", "\n"].contains(output2.stdout), true);
+  expect.equal(output2.status, 0);
+
+// "spawn() with non-existent program" 
+  let program3 = "no-such-program";
+  let args3 = ["--help" ];
+
+  let child3 = util.spawn(program3, args3);
+
+  assertThrows("spawn no-such-program ENOENT", () => {
+    child3.wait();
+  });
+
+//  "spawn() and wait for terminated program" 
+  let program4 = "sleep";
+  let args4 = ["0.1"];
+
+  let child4 = util.spawn(program4, args4);
+  util.sleep(1s);
+  let output4 = child4.wait();
+
+  expect.equal(output4.stdout, "");
+  expect.equal(output4.status, 0);
+
+// "spawn() and kill process" 
+  let program5 = "sleep";
+  let args5 = ["1"];
+
+  let child5 = util.spawn(program5, args5);
+  child5.kill();
+
+  assertThrows("Process terminated by signal SIGTERM", () => {
+    child5.wait();
+  });
+}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/util/util.extern.d.ts b/examples/tests/sdk_tests/util/util.extern.d.ts
new file mode 100644
index 00000000000..06d5b1d6059
--- /dev/null
+++ b/examples/tests/sdk_tests/util/util.extern.d.ts
@@ -0,0 +1,3 @@
+export default interface extern {
+  platform: () => Promise<string>,
+}
diff --git a/examples/tests/sdk_tests/util/util.js b/examples/tests/sdk_tests/util/util.js
new file mode 100644
index 00000000000..52c30974b28
--- /dev/null
+++ b/examples/tests/sdk_tests/util/util.js
@@ -0,0 +1,5 @@
+const os = require("os");
+
+exports.platform = function () {
+  return os.platform();
+};
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/util/uuidv4-helper.extern.d.ts b/examples/tests/sdk_tests/util/uuidv4-helper.extern.d.ts
new file mode 100644
index 00000000000..c92962f9d24
--- /dev/null
+++ b/examples/tests/sdk_tests/util/uuidv4-helper.extern.d.ts
@@ -0,0 +1,3 @@
+export default interface extern {
+  validateUUIDv4: (uuidv4: string) => Promise<boolean>,
+}
diff --git a/examples/tests/sdk_tests/util/uuidv4.test.w b/examples/tests/sdk_tests/util/uuidv4.test.w
index da958280ad6..9a4f3898dc1 100644
--- a/examples/tests/sdk_tests/util/uuidv4.test.w
+++ b/examples/tests/sdk_tests/util/uuidv4.test.w
@@ -1,11 +1,6 @@
 bring util;
 
-class JSHelper { 
-  extern "./uuidv4-helper.js" pub static validateUUIDv4(uuidv4: str): bool;
-}
-
-let data = util.uuidv4();
-assert(JSHelper.validateUUIDv4(data) == true);
+let preflightData = util.uuidv4();
 
 class JSHelperInflight {
   extern "./uuidv4-helper.js" pub static inflight validateUUIDv4(uuidv4: str): bool;
@@ -14,4 +9,5 @@ class JSHelperInflight {
 test "inflight uuidv4" {
   let data = util.uuidv4();
   assert(JSHelperInflight.validateUUIDv4(data) == true);
+  assert(JSHelperInflight.validateUUIDv4(preflightData) == true);
 }
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/util/wait-until.test.w b/examples/tests/sdk_tests/util/wait-until.test.w
index 44e454d451c..a37994f1ff4 100644
--- a/examples/tests/sdk_tests/util/wait-until.test.w
+++ b/examples/tests/sdk_tests/util/wait-until.test.w
@@ -1,72 +1,70 @@
 bring cloud;
 bring util;
 
-class JSHelper { 
-  extern "./sleep-helper.js" pub static inflight getTime(): num;
-}
+let invokeCounter1 = new cloud.Counter() as "invoke-counter1";
+let invokeCounter2 = new cloud.Counter() as "invoke-counter2";
+let invokeCounter3 = new cloud.Counter() as "invoke-counter3";
 
-let invokeCounter = new cloud.Counter();
-let oneHundredMiliseconds = 0.1s;
-let oneSecond = 1s;
-let fiveSeconds = 5s;
 
-test "returns true immediately" {
-  let start = JSHelper.getTime();
-  if util.waitUntil((): bool => { return true; }) {
-    assert(JSHelper.getTime() - start < 1000);
-  } else {
-    assert(false);
-  }
-}
+test "waitUntil" {
+  // "waitUntil returns true if the predicate is met immediately"
+  let start1 = datetime.systemNow().timestampMs;
+  let result1 = util.waitUntil((): bool => { return true; });
+  assert(result1 == true);
+  assert(datetime.systemNow().timestampMs - start1 < 1000);
 
-test "returns false goes to timeout" {
-  let start = JSHelper.getTime();
-  if util.waitUntil(inflight (): bool => { return false; }, timeout: oneSecond) {
-      assert(false);
-    } else {
-      assert(JSHelper.getTime() - start > 1 * 1000);
+// "waitUntil throws if the predicate is never met" 
+  let start2 = datetime.systemNow().timestampMs;
+  let var threwErr2 = false;
+  try {
+    util.waitUntil((): bool => { return false; }, timeout: 1s);
+  } catch {
+    threwErr2 = true;
   }
-}
+  assert(threwErr2 == true);
+  assert(datetime.systemNow().timestampMs - start2 > 1000);
 
-test "returns after some time waiting" {
-  let start = JSHelper.getTime();
+// "waitUntil returns false if the predicate is never met and 'throws: false' is set" 
+  let start3 = datetime.systemNow().timestampMs;
+  let result3 = util.waitUntil(inflight (): bool => { return false; }, timeout: 1s, throws: false);
+  assert(result3 == false);
+  assert(datetime.systemNow().timestampMs - start3 > 1 * 1000);
+
+// "waitUntil returns true if the predicate is met after some time waiting" 
+  let start4 = datetime.systemNow().timestampMs;
   let returnTrueAfter3Seconds = (): bool => { 
-    invokeCounter.inc();
-    return JSHelper.getTime() - start > 3 * 1000; 
+    invokeCounter1.inc();
+    return datetime.systemNow().timestampMs - start4 > 3 * 1000; 
   };
-  if util.waitUntil(returnTrueAfter3Seconds, interval: oneSecond) {
-    let invocations = invokeCounter.peek();
-    assert( invocations > 1 && invocations < 10 );
-  } else {
-    assert(false);
-  }
-}
+  util.waitUntil(returnTrueAfter3Seconds, interval: 1s, timeout: 10s);
+  let invocations = invokeCounter1.peek();
+  // Check that the condition was evaluated several times
+  assert( invocations > 1 && invocations < 10 );
+
 
-test "setting props" {
-  let start = JSHelper.getTime();
+// "waitUntil with custom props" 
+  let start5 = datetime.systemNow().timestampMs;
   let returnFalse = (): bool => { 
-    invokeCounter.inc();
+    invokeCounter2.inc();
     return false;
   };
 
-  if util.waitUntil(returnFalse, interval: oneSecond, timeout: fiveSeconds) {
+  if util.waitUntil(returnFalse, interval: 1s, timeout: 5s, throws: false) {
     assert(false);
   } else {
     // making sure that the predicate was invoked almost 5 times
-    let invokeCount = invokeCounter.peek();
+    let invokeCount = invokeCounter2.peek();
     assert(invokeCount > 3 && invokeCount < 7);
   }
-}
-
 
-test "throwing exception from predicate should throw immediately" {
+//  "throwing exception from predicate should throw immediately" 
   try {
     util.waitUntil((): bool => { 
-      invokeCounter.inc();
+      invokeCounter3.inc();
       throw "ERROR";
     });
     assert(false);
   } catch {
-    assert(invokeCounter.peek() == 1);
+    assert(invokeCounter3.peek() == 1);
   }
 }
diff --git a/examples/tests/sdk_tests/website/aws-react-app.test.w b/examples/tests/sdk_tests/website/aws-react-app.test.w
deleted file mode 100644
index 4c4966f2fd2..00000000000
--- a/examples/tests/sdk_tests/website/aws-react-app.test.w
+++ /dev/null
@@ -1,40 +0,0 @@
-bring ex;
-bring aws;
-bring util;
-
-let target = util.env("WING_TARGET");
-
-
-let reactApp = new ex.ReactApp(
-  projectPath: "./react-website",
-  buildDir: "/build/public",
-  useBuildCommand: true // builds the website
-) as "aws-wing-react-app";
-
-let getReactAppInfo = (b: ex.ReactApp): Map<str>? => {
-  if let website = aws.ReactApp.from(b) {
-    return {
-      bucketName: website.bucketName,
-      bucketArn: website.bucketArn,
-    };
-  }
-  return nil;
-};
-
-let reactAppName = getReactAppInfo(reactApp);
-
-test "validates the AWS bucket name" {
-  if let website = reactAppName {
-    if target == "tf-aws" {
-      assert(website.get("bucketArn").contains("arn:aws:s3:::"));
-      assert(website.get("bucketArn").contains("aws-wing-react-app"));
-      assert(website.get("bucketName").contains("aws-wing-react-app"));
-    } else { // If it's not a 'tf-aws' target, it's an 'awscdk'
-      assert(website.get("bucketArn").contains("arn:aws:s3:::"));
-      assert(website.get("bucketArn").contains("awswingreactapp"));
-      assert(website.get("bucketName").contains("awswingreactapp"));
-    }
-  }
-  // If the test is not on AWS, it should not fail, so I am returning true.
-  assert(true);
-}
\ No newline at end of file
diff --git a/examples/tests/sdk_tests/website/react-app.test.w b/examples/tests/sdk_tests/website/react-app.test.w
deleted file mode 100644
index c0d7e2a749d..00000000000
--- a/examples/tests/sdk_tests/website/react-app.test.w
+++ /dev/null
@@ -1,30 +0,0 @@
-bring util;
-bring ex;
-bring cloud;
-bring http;
-
-let api = new cloud.Api();
-
-api.get("/", inflight () => {
-  return {body: "hi!", status: 200};
-});
-
-// the project isn't actually react (since it can make wing's size much larger) 
-// but a mock with start and build commands
-let website = new ex.ReactApp(
-  projectPath: "./react-website", 
-  buildDir: "/build/public",
-  useBuildCommand: true // builds the website
-);
-
-let preflightVariable = "preflight variable";
-website.addEnvironment("apiUrl", api.url);
-website.addEnvironment("anotherEnvVar", preflightVariable);
-
-test "website is working" {
-  assert(http.get(website.url).ok);
-  let wingEnv = http.get(website.url + "/wing.js").body;
-  let expected = "// This file is generated by wing\nwindow.wingEnv = \{\n  \"apiUrl\": \"{api.url}\",\n  \"anotherEnvVar\": \"{preflightVariable}\"\n};";
-  assert(wingEnv == expected);
-}
-
diff --git a/examples/tests/sdk_tests/website/react-website/.gitignore b/examples/tests/sdk_tests/website/react-website/.gitignore
deleted file mode 100644
index bc6d8495db0..00000000000
--- a/examples/tests/sdk_tests/website/react-website/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules/
-
-/build
-
-**/wing.js
diff --git a/examples/tests/sdk_tests/website/react-website/build.js b/examples/tests/sdk_tests/website/react-website/build.js
deleted file mode 100644
index f0a04bd5c91..00000000000
--- a/examples/tests/sdk_tests/website/react-website/build.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-const publicDir = path.join(__dirname, "public");
-const buildDir = path.join(__dirname, "build");
-const buildPublicDir =path.join(buildDir, "public");
-
-fs.rmSync(buildDir, { recursive: true, force: true });
-fs.mkdirSync(buildDir, { recursive: true });
-fs.cpSync(publicDir, buildPublicDir, { recursive: true });
diff --git a/examples/tests/sdk_tests/website/react-website/index.js b/examples/tests/sdk_tests/website/react-website/index.js
deleted file mode 100644
index 8f1c993eb7e..00000000000
--- a/examples/tests/sdk_tests/website/react-website/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const express = require("express");
-const {join} = require("path");
-
-const app = express();
-
-app.use("/", express.static(join(__dirname, "/public")));
-
-app.listen(process.env.PORT ?? 3000, () => console.log("app is running!"));
diff --git a/examples/tests/sdk_tests/website/react-website/package-lock.json b/examples/tests/sdk_tests/website/react-website/package-lock.json
deleted file mode 100644
index 19356dcf3ee..00000000000
--- a/examples/tests/sdk_tests/website/react-website/package-lock.json
+++ /dev/null
@@ -1,604 +0,0 @@
-{
-  "name": "react-website",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "react-website",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "express": "^4.18.2"
-      }
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    }
-  }
-}
diff --git a/examples/tests/sdk_tests/website/react-website/package.json b/examples/tests/sdk_tests/website/react-website/package.json
deleted file mode 100644
index b188514bd1c..00000000000
--- a/examples/tests/sdk_tests/website/react-website/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "react-website",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node index.js",
-    "build": "node build.js"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "express": "^4.18.2"
-  }
-}
diff --git a/examples/tests/sdk_tests/website/react-website/public/index.html b/examples/tests/sdk_tests/website/react-website/public/index.html
deleted file mode 100644
index fd19a87f0bc..00000000000
--- a/examples/tests/sdk_tests/website/react-website/public/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-  <head>
-    <script src="./wing.js"></script>
-    <title>Demo website</title>
-  </head>
-  <body>
-    <h1>Hello Wing!</h1>
-    <p id="par1"></p>
-    <p id="par2"></p>
-    <script src="./index.js"></script>
-  </body>
-</html>
diff --git a/examples/tests/sdk_tests/website/react-website/public/index.js b/examples/tests/sdk_tests/website/react-website/public/index.js
deleted file mode 100644
index 6447c845ca7..00000000000
--- a/examples/tests/sdk_tests/website/react-website/public/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-document.getElementById("par1").innerText = `apiUrl is: ${window.wingEnv?.apiUrl}`;
-document.getElementById("par2").innerText = `anotherEnvVar is: ${window.wingEnv?.anotherEnvVar}`;
diff --git a/examples/tests/sdk_tests/website/website.test.w b/examples/tests/sdk_tests/website/website.test.w
index bd94bb27f33..74c3debfbe8 100644
--- a/examples/tests/sdk_tests/website/website.test.w
+++ b/examples/tests/sdk_tests/website/website.test.w
@@ -2,7 +2,7 @@ bring cloud;
 bring http;
 bring fs;
 
-let w = new cloud.Website(path: "./website");
+let w = new cloud.Website(path: "./website", errorDocument: "error.html");
 let config = Json { json: 1 };
 let htmlContent = "<html>Hello World!</html>";
  
@@ -24,3 +24,7 @@ test "access files on the website" {
     assert(http.get(w.url + "/another-file.html").body == htmlContent);
 
 }  
+
+test "page not found" {
+  assert(http.get(w.url + "/page123").body.contains("Not found"));
+}
diff --git a/examples/tests/sdk_tests/website/website/error.html b/examples/tests/sdk_tests/website/website/error.html
new file mode 100644
index 00000000000..01e418534d4
--- /dev/null
+++ b/examples/tests/sdk_tests/website/website/error.html
@@ -0,0 +1,6 @@
+<html>
+  <head>Not found</head>
+  <body>
+    <p>go to <a href="./index.html">Index</a></p>
+  </body>
+</html>
diff --git a/examples/tests/valid/anon_function.test.w b/examples/tests/valid/anon_function.test.w
index dc53a090d88..d59f4a3c994 100644
--- a/examples/tests/valid/anon_function.test.w
+++ b/examples/tests/valid/anon_function.test.w
@@ -15,4 +15,18 @@ myfunc(1);
 // Immediately invoked function expression
 ((var x: num) => {
   assert(x == 1);
-})(1);
\ No newline at end of file
+})(1);
+
+// Immediately invoked function expression in inflight
+struct S {
+  a: str;
+}
+
+test "" {
+  let x: S = S {
+    a: () => {
+      return "b";
+    }()
+  };
+  assert(x.a == "b");
+}
diff --git a/examples/tests/valid/api_cors_custom.test.w b/examples/tests/valid/api_cors_custom.test.w
index 6abf47e2b11..20b71b971e5 100644
--- a/examples/tests/valid/api_cors_custom.test.w
+++ b/examples/tests/valid/api_cors_custom.test.w
@@ -6,7 +6,7 @@ bring expect;
 let api = new cloud.Api(
   cors: true,
   corsOptions: {
-    allowOrigin: ["winglang.io"],
+    allowOrigin: "winglang.io",
     allowMethods: [cloud.HttpMethod.GET, cloud.HttpMethod.POST, cloud.HttpMethod.OPTIONS],
     allowHeaders: ["Content-Type", "Authorization", "X-Custom-Header"],
     allowCredentials: true,
@@ -70,4 +70,4 @@ test "OPTIONS /users responds with proper headers for requested" {
   expect.equal(headers.tryGet("access-control-allow-methods"), "GET,POST,OPTIONS");
   expect.equal(headers.tryGet("access-control-allow-headers"), "Content-Type,Authorization,X-Custom-Header");
   expect.equal(headers.tryGet("access-control-allow-origin"), "winglang.io");
-}
\ No newline at end of file
+}
diff --git a/examples/tests/valid/api_valid_path.test.w b/examples/tests/valid/api_valid_path.test.w
index 46057ad4379..127fdf9c006 100644
--- a/examples/tests/valid/api_valid_path.test.w
+++ b/examples/tests/valid/api_valid_path.test.w
@@ -1,7 +1,7 @@
 bring cloud;
+bring expect;
 
-let api = new cloud.Api();
-
+let api = new cloud.Api() as "default api";
 
 let handler = inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
   return cloud.ApiResponse {
@@ -10,25 +10,26 @@ let handler = inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
   };
 };
 
-let testInvalidPath = (path:str) => {
+let testInvalidPath = (path:str, apiInstance: cloud.Api?) => {
   let var error = "";
   let expected = "Invalid path {path}. Url parts can only contain alpha-numeric chars, \"-\", \"_\" and \".\". Params can only contain alpha-numeric chars and \"_\".";
   try {
-    api.get(path, handler);
+    (apiInstance ?? api).get(path, handler);
   } catch e {
     error = e;
   }
-  assert(error == expected);
+  expect.equal(error, expected);
 };
 
-let testValidPath = (path:str) => {
+
+let testValidPath = (path:str, apiInstance: cloud.Api?) => {
   let var error = "";
   try {
-    api.get(path, handler);
+    (apiInstance ?? api).get(path, handler);
   } catch e {
     error = e;
   }
-  assert(error == "");
+  expect.equal(error, "");
 };
 
 //invalid paths
@@ -65,3 +66,4 @@ testValidPath("/test/segment1/:param1/segment2?query1=value1?query2=value2");
 testValidPath("/test/segment1/segment2?query=value1&query2=value2");
 testValidPath("/test/path.withDots");
 testValidPath("/test/path/.withDots/:param/:param-dash/x");
+testValidPath("/", new cloud.Api() as "api for root path");
diff --git a/examples/tests/valid/asynchronous_model_implicit_await_in_functions.test.w b/examples/tests/valid/asynchronous_model_implicit_await_in_functions.test.w
index 524e032213e..f229fedd51d 100644
--- a/examples/tests/valid/asynchronous_model_implicit_await_in_functions.test.w
+++ b/examples/tests/valid/asynchronous_model_implicit_await_in_functions.test.w
@@ -1,10 +1,11 @@
 bring cloud;
 
 let q = new cloud.Queue();
-let strToStr = new cloud.Function(inflight (s: str): str => {
+let strToStr = new cloud.Function(inflight () => {
 
 }) as "strToStr";
-let func = new cloud.Function(inflight (s: str): str => {
+
+let func = new cloud.Function(inflight () => {
   strToStr.invoke("one");
-  log(strToStr.invoke("two"));
-}) as "func";
\ No newline at end of file
+  log(strToStr.invoke("two") ?? "no response");
+}) as "func";
diff --git a/examples/tests/valid/bring_awscdk.test.w b/examples/tests/valid/bring_awscdk.test.w
index f161e079eda..7e7757c89c3 100644
--- a/examples/tests/valid/bring_awscdk.test.w
+++ b/examples/tests/valid/bring_awscdk.test.w
@@ -1,14 +1,28 @@
-bring "aws-cdk-lib" as awscdk;
+bring "aws-cdk-lib" as cdk;
 
 class CdkDockerImageFunction {
-    function:  awscdk.aws_lambda.DockerImageFunction;
+    function:  cdk.aws_lambda.DockerImageFunction;
 
     new() {
-        this.function = new awscdk.aws_lambda.DockerImageFunction({
-            code: awscdk.aws_lambda.DockerImageCode.fromImageAsset("./test.ts"),
-        }) as "DockerImageFunction";
+      let eventBridge = new cdk.aws_events.EventBus(eventBusName: "test") as "EventBridge";
+      let rule = new cdk.aws_events.CfnRule(
+        name: "test",
+        eventBusName: eventBridge.eventBusName,
+        eventPattern: {},
+        targets: [{
+          arn: "",
+          id: "",
+        }],
+      );
+      new cdk.aws_events.Rule(eventPattern: {
+        detailType: [""],
+      });
+
+      this.function = new cdk.aws_lambda.DockerImageFunction({
+        code: cdk.aws_lambda.DockerImageCode.fromImageAsset("./test.ts"),
+      }) as "DockerImageFunction";
     }
 }
 
 // Test creating an `App` construct
-new awscdk.App();
+new cdk.App();
diff --git a/examples/tests/valid/bring_cdktf.test.w b/examples/tests/valid/bring_cdktf.test.w
index a897a1271a4..e162f403bbb 100644
--- a/examples/tests/valid/bring_cdktf.test.w
+++ b/examples/tests/valid/bring_cdktf.test.w
@@ -1,13 +1,14 @@
 bring "@cdktf/provider-aws" as aws;
 bring "cdktf" as cdktf;
 
-new aws.s3Bucket.S3Bucket(
+let bucket = new aws.s3Bucket.S3Bucket(
   bucketPrefix: "hello",
   versioning: {
     enabled: true,
     mfaDelete: true,
   },
 ) as "Bucket";
+nodeof(bucket).color = "pink";
 
 class Foo {
   new() {
diff --git a/examples/tests/valid/bring_extend_non_entry.test.w b/examples/tests/valid/bring_extend_non_entry.test.w
new file mode 100644
index 00000000000..6e534dcf144
--- /dev/null
+++ b/examples/tests/valid/bring_extend_non_entry.test.w
@@ -0,0 +1,3 @@
+bring "./extend_non_entrypoint.w" as lib;
+
+let f = new lib.Foo();
\ No newline at end of file
diff --git a/examples/tests/valid/bring_jsii.test.w b/examples/tests/valid/bring_jsii.test.w
index 0cbbf656731..6f53411131d 100644
--- a/examples/tests/valid/bring_jsii.test.w
+++ b/examples/tests/valid/bring_jsii.test.w
@@ -1,5 +1,6 @@
 bring cloud;
 bring "jsii-code-samples" as stuff;
+bring "jsii-fixture" as jsii_fixture;
 
 let hello = new stuff.HelloWorld();
 let greeting = hello.sayHello("wingnuts");
@@ -9,3 +10,13 @@ test "sayHello" {
   let helloInflight = new stuff.HelloWorld();
   assert(helloInflight.sayHello("wingnuts") == greeting);
 }
+
+let jsiiClass = new jsii_fixture.JsiiClass(10);
+assert(jsiiClass.applyClosure(5, (x) => { return x * 2; }) == 10);
+
+assert(jsiiClass.methodWithStructParam({ field: "struct field" }) == "struct field");
+
+// Use a JSII interface
+class X impl jsii_fixture.ISomeInterface {
+  pub method() {}
+}
diff --git a/examples/tests/valid/bring_local.test.w b/examples/tests/valid/bring_local.test.w
index 1e6a6bb7443..6dd61c46cdd 100644
--- a/examples/tests/valid/bring_local.test.w
+++ b/examples/tests/valid/bring_local.test.w
@@ -5,15 +5,21 @@ bring "./store.w" as file1;
 bring "./subdir/subfile.w" as file2;
 bring "./subdir/empty.w" as file3;
 bring math;
+bring expect;
 
 // classes from other files can be used
 let store = new file1.Store();
 let q = new file2.Q();
+expect.equal(file2.Q.preflightGreet("foo"), "Hello foo");
 
 test "add data to store" {
   store.store("foo");
 }
 
+test "greet" {
+  expect.equal(file2.Q.greet("bar"), "Hello bar");
+}
+
 // structs from other files can be used
 let s = file1.Point {
   x: 1,
diff --git a/examples/tests/valid/bring_local_dir.test.w b/examples/tests/valid/bring_local_dir.test.w
index a4819cbadcb..8d53a31371e 100644
--- a/examples/tests/valid/bring_local_dir.test.w
+++ b/examples/tests/valid/bring_local_dir.test.w
@@ -1,7 +1,7 @@
 bring "./subdir2/inner/widget.w" as w;
 bring "./subdir2" as subdir;
 
-let widget1 = new w.Widget();
+let widget1 = new w.Widget() as "widget1";
 assert(widget1.compute() == 42);
 
 // from subdir/file1.w
@@ -13,7 +13,7 @@ let bar = new subdir.Bar();
 assert(bar.bar() == "bar");
 
 // from subdir/inner/widget.w
-let widget2 = new subdir.inner.Widget();
+let widget2 = new subdir.inner.Widget() as "widget2";
 assert(widget2.compute() == 42);
 
 assert(foo.checkWidget(widget2) == 1379);
diff --git a/examples/tests/valid/bypass_return.test.w b/examples/tests/valid/bypass_return.test.w
new file mode 100644
index 00000000000..7faab91475c
--- /dev/null
+++ b/examples/tests/valid/bypass_return.test.w
@@ -0,0 +1,12 @@
+let simpleThrow: (): num = () => {
+  throw "not implemented";
+};
+
+let throwWithConditional: (): num = () => {
+  // this should not be executed
+  if false {
+    return 1;
+  }
+
+  throw "not implemented";
+};
diff --git a/examples/tests/valid/capture_containers.test.w b/examples/tests/valid/capture_containers.test.w
index 85320dfdb1b..3edb62af058 100644
--- a/examples/tests/valid/capture_containers.test.w
+++ b/examples/tests/valid/capture_containers.test.w
@@ -1,7 +1,7 @@
 bring cloud;
 
 let arr = ["hello", "world"];
-let mySet = {"my", "my", "set"};
+let mySet = Set<str>["my", "my", "set"];
 let myMap = {"hello" => 123, "world" => 999};
 let arrOfMap = [{"bang" => 123}];
 let j = Json {a: "hello", b: "world"};
diff --git a/examples/tests/valid/capture_mutables.test.w b/examples/tests/valid/capture_mutables.test.w
index 285a2cf04d2..fa319e78391 100644
--- a/examples/tests/valid/capture_mutables.test.w
+++ b/examples/tests/valid/capture_mutables.test.w
@@ -1,5 +1,5 @@
 let a = MutArray<str>["hello"];
-let s = MutSet<num>{12};
+let s = MutSet<num>[12];
 let m = MutMap<bool>{"hello" => true};
 
 let aCloned = (Array<str>["hello"]).copyMut();
@@ -13,4 +13,4 @@ let handler = inflight () => {
 
 test "main" {
   handler();
-}
\ No newline at end of file
+}
diff --git a/examples/tests/valid/capture_primitives.test.w b/examples/tests/valid/capture_primitives.test.w
index c140cfd2825..d00c37fb8b1 100644
--- a/examples/tests/valid/capture_primitives.test.w
+++ b/examples/tests/valid/capture_primitives.test.w
@@ -6,7 +6,7 @@ let myBool = true;
 let mySecondBool = false;
 let myDur = 10m;
 
-let handler = inflight (s: str): str => {
+let handler = inflight () => {
   log(myStr);
 
   let n = myNum;
diff --git a/examples/tests/valid/capture_reassigable_class_field.test.w b/examples/tests/valid/capture_reassigable_class_field.test.w
index 4d5d6df3297..496a37c570a 100644
--- a/examples/tests/valid/capture_reassigable_class_field.test.w
+++ b/examples/tests/valid/capture_reassigable_class_field.test.w
@@ -39,11 +39,11 @@ test "main" {
   kv.get("k");
   kv.get("k2");
 
-  assert(util.waitUntil((): bool => {
+  util.waitUntil((): bool => {
     return counter.peek("k") == 2;
-  }));
+  });
 
-  assert(util.waitUntil((): bool => {
+  util.waitUntil((): bool => {
     return counter.peek("k2") == 1;
-  }));
+  });
 }
diff --git a/examples/tests/valid/capture_resource_and_data.test.w b/examples/tests/valid/capture_resource_and_data.test.w
index 670ef12194a..ade85403edf 100644
--- a/examples/tests/valid/capture_resource_and_data.test.w
+++ b/examples/tests/valid/capture_resource_and_data.test.w
@@ -1,6 +1,6 @@
 bring cloud;
 
-let data = {1,2,3};
+let data = Set<num>[1,2,3];
 let res = new cloud.Bucket();
 let queue = new cloud.Queue();
 
diff --git a/examples/tests/valid/capture_tokens.test.w b/examples/tests/valid/capture_tokens.test.w
index 5212f6e66d6..a0ec28807a8 100644
--- a/examples/tests/valid/capture_tokens.test.w
+++ b/examples/tests/valid/capture_tokens.test.w
@@ -4,7 +4,7 @@ class MyResource {
   api: cloud.Api;
   url: str;
 
-  extern "./url_utils.js" pub static inflight isValidUrl(url: str): bool;
+  extern "./url_utils.ts" pub static inflight isValidUrl(url: str): bool;
 
   new() {
     this.api = new cloud.Api();
diff --git a/examples/tests/valid/captures.test.w b/examples/tests/valid/captures.test.w
index 6425d2be1d9..b4a69e31ce0 100644
--- a/examples/tests/valid/captures.test.w
+++ b/examples/tests/valid/captures.test.w
@@ -7,7 +7,7 @@ let bucket2 = new cloud.Bucket(cloud.BucketProps {
 let bucket3 = new cloud.Bucket(public: false) as "PrivateBucket";
 let queue = new cloud.Queue();
 
-let handler = inflight (event: str): str => {
+let handler = inflight () => {
   bucket1.put("file.txt", "data");
   bucket2.get("file.txt");
   bucket2.get("file2.txt");
@@ -26,7 +26,7 @@ let handler = inflight (event: str): str => {
   }
 };
 
-queue.setConsumer(handler, batchSize: 5);
+queue.setConsumer(inflight () => { handler(); }, batchSize: 5);
 
 new cloud.Function(
   handler, 
@@ -52,4 +52,4 @@ api.get("/hello", inflight (req) => {
     headers: headers,
     body: "Hello, world!"
   };
-});
\ No newline at end of file
+});
diff --git a/examples/tests/valid/casting.test.w b/examples/tests/valid/casting.test.w
index 97602868438..e4ecffbbd1e 100644
--- a/examples/tests/valid/casting.test.w
+++ b/examples/tests/valid/casting.test.w
@@ -5,8 +5,8 @@ bring "@cdktf/provider-aws" as aws;
 let b = new cloud.Bucket();
 
 if util.env("WING_TARGET") == "tf-aws" {
-  let s3Bucket: aws.s3Bucket.S3Bucket = unsafeCast(b.node.findChild("Default"));
+  let s3Bucket: aws.s3Bucket.S3Bucket = unsafeCast(nodeof(b).findChild("Default"));
   
   s3Bucket.addOverride("bucket_prefix", "my-prefix-");
-  log(s3Bucket.node.path);
+  log(nodeof(s3Bucket).path);
 }
diff --git a/examples/tests/valid/class.test.w b/examples/tests/valid/class.test.w
index 379750971b4..159c4d873a6 100644
--- a/examples/tests/valid/class.test.w
+++ b/examples/tests/valid/class.test.w
@@ -1,10 +1,21 @@
 bring cloud;
 
-// class without init
+// class without new
 class C1 {}
 new C1();
 
-// class with init and no arguments
+// extend class without new
+class C1Ext1 extends C1 {}
+class C1Ext2 extends C1Ext1 {
+  new() {
+    super(); // Can call super
+  }
+}
+class C1Ext3 extends C1Ext2 {
+  new() {} // No need to call super
+}
+
+// class with new and no arguments
 class C2 {
   pub x: num;
   new() {
@@ -14,6 +25,67 @@ class C2 {
 let c2 = new C2();
 assert(c2.x == 1);
 
+// extend class with new and no args
+class C2Ext1 extends C2 {} // Implicit call to super
+let c2Ext1 = new C2Ext1();
+assert(c2Ext1.x == 1);
+class C2Ext2 extends C2 {
+  new() {} // Implicit call to super
+}
+let c2Ext2 = new C2Ext2();
+assert(c2Ext2.x == 1);
+class C2Ext3 extends C2 {
+  new() {
+    super(); // Explicit call to super
+  }
+}
+let c2Ext3 = new C2Ext3();
+assert(c2Ext3.x == 1);
+
+test "inflight classes with no ctor or ctor args" {
+  // class without new
+  class C1 {}
+  new C1();
+
+  // extend class without new
+  class C1Ext1 extends C1 {}
+  class C1Ext2 extends C1Ext1 {
+    new() {
+      super(); // Can call super
+    }
+  }
+  class C1Ext3 extends C1Ext2 {
+    new() {} // No need to call super
+  }
+
+  // class with new and no arguments
+  class C2 {
+    pub x: num;
+    new() {
+      this.x = 1;
+    }
+  }
+  let c2 = new C2();
+  assert(c2.x == 1);
+
+  // extend class with new and no args
+  class C2Ext1 extends C2 {} // Implicit call to super
+  let c2Ext1 = new C2Ext1();
+  assert(c2Ext1.x == 1);
+  class C2Ext2 extends C2 {
+    new() {} // Implicit call to super
+  }
+  let c2Ext2 = new C2Ext2();
+  assert(c2Ext2.x == 1);
+  class C2Ext3 extends C2 {
+    new() {
+      super(); // Explicit call to super
+    }
+  }
+  let c2Ext3 = new C2Ext3();
+  assert(c2Ext3.x == 1);
+}
+
 // class with init and arguments
 class C3 {
   pub x: num;
@@ -140,4 +212,19 @@ new Baz();
 class Boom {
   new() { }
 }
-class Bam extends Boom {}
\ No newline at end of file
+class Bam extends Boom {}
+
+// A documented class (should be parssed without errors)
+/// Class documentation
+/// blah blah blah
+class DocClass {
+  /// Method documentation
+  /// blah blah blah
+  docMethod() {}
+  /// Field documentation
+  /// blah blah blah
+  docField: num;
+  /// Ctor documentation
+  /// blah blah blah
+  new() { this.docField = 0; }
+}
\ No newline at end of file
diff --git a/examples/tests/valid/construct-base.test.w b/examples/tests/valid/construct-base.test.w
index 10faa1e1620..83cf912f036 100644
--- a/examples/tests/valid/construct-base.test.w
+++ b/examples/tests/valid/construct-base.test.w
@@ -1,20 +1,19 @@
 bring cloud;
-// bring cloud;
 bring "constructs" as cx;
 bring "@cdktf/provider-aws" as aws;
 
 class WingResource {
   new() {
-    log("my id is {this.node.id}");
+    log("my id is {nodeof(this).id}");
   }
 }
 
 let getPath = (c: cx.Construct): str => {
-  return c.node.path;
+  return nodeof(c).path;
 };
 
 let getDisplayName = (r: std.Resource): str? => {
-  return std.Node.of(r).title;
+  return nodeof(r).title;
 };
 
 let q = new aws.sqsQueue.SqsQueue();
@@ -27,5 +26,4 @@ log("path of wing resource: {getPath(wr)}");
 let title = getDisplayName(wr) ?? "no display name";
 log("display name of wing resource: {title}");
 
-//TODO: Expected type to be "IConstruct", but got "WingResource" instead
-// log(cx.Node.of(wr).path);
+log(cx.Node.of(wr).path);
diff --git a/examples/tests/valid/container_types.test.w b/examples/tests/valid/container_types.test.w
index a761e18d577..8bdf08908c2 100644
--- a/examples/tests/valid/container_types.test.w
+++ b/examples/tests/valid/container_types.test.w
@@ -120,9 +120,9 @@ try {
 let num9 = 9;
 let m10 = {
   // Just a string
-  "a" => 1, 
+  "a" => 1,
   // Same string again (should overwrite)
-  "a" => 2, 
+  "a" => 2,
   // Interpolation
   "{num9+1}" => 9,
   // Same interpolation again (should overwrite)
@@ -136,22 +136,22 @@ assert(m10.get("10") == 10);
 assert(m10.get("99") == 99);
 
 //Set tests
-let emptySet = Set<num>{};
+let emptySet = Set<num>[];
 assert(emptySet.size == 0);
-let emptySet2 = MutSet<num>{};
+let emptySet2 = MutSet<num>[];
 assert(emptySet2.size == 0);
-let s2: Set<num> = {1, 2, 3};
+let s2: Set<num> = Set<num>[1, 2, 3];
 assert(s2.size == 3);
 assert(s2.has(1));
-let s3 = Set<num> {1, 2, 3};
+let s3 = Set<num>[1, 2, 3];
 assert(s3.size == 3);
 assert(s3.has(1));
-let s4: Set<num> = Set<num> {1, 2, 3};
+let s4: Set<num> = Set<num>[1, 2, 3];
 assert(s4.size == 3);
 assert(s4.has(1));
-let s6: Set<cloud.Bucket> = {bucket1, bucket2, bucket3};
+let s6: Set<cloud.Bucket> = Set<cloud.Bucket>[bucket1, bucket2, bucket3];
 assert(s6.size == 3);
 assert(s6.has(bucket2));
 let s7: Set<num> = s2;
 assert(s7.size == 3);
-assert(s7.has(1));
\ No newline at end of file
+assert(s7.has(1));
diff --git a/examples/tests/valid/custom_obj_id.test.w b/examples/tests/valid/custom_obj_id.test.w
index 0e54afe2229..49eeaf1d6e6 100644
--- a/examples/tests/valid/custom_obj_id.test.w
+++ b/examples/tests/valid/custom_obj_id.test.w
@@ -3,5 +3,5 @@ class Foo { }
 let foo1 = new Foo();
 let bar2 = new Foo() as "bar2";
 
-assert(foo1.node.id == "Foo");
-assert(bar2.node.id == "bar2");
+assert(nodeof(foo1).id == "Foo");
+assert(nodeof(bar2).id == "bar2");
diff --git a/examples/tests/valid/deep_equality.test.w b/examples/tests/valid/deep_equality.test.w
index 36ad386055a..172a2f6562d 100644
--- a/examples/tests/valid/deep_equality.test.w
+++ b/examples/tests/valid/deep_equality.test.w
@@ -39,12 +39,17 @@ test "Json with different values" {
   assert(!(jsonA != jsonB));
 }
 
+test "Json.values equality" {
+  let j = Json { hello: 123, world: [1, 2, 3] };
+  assert(Json.values(j) == [Json 123, Json [1, 2, 3]]);
+}
+
 //-----------------------------------------------------------------------------
 // Set
 //-----------------------------------------------------------------------------
-let setA = { 1,2,3 };
-let setB = MutSet<num>{ 1,2,3 };
-let setC = { 4,5,6 };
+let setA = Set<num>[ 1,2,3 ];
+let setB = MutSet<num>[ 1,2,3 ];
+let setC = Set<num>[ 4,5,6 ];
 
 test "Set types with the same value" {
   assert(setA == setA);
diff --git a/examples/tests/valid/doubler.test.w b/examples/tests/valid/doubler.test.w
index 9a9416da8d3..04f12c1d9d0 100644
--- a/examples/tests/valid/doubler.test.w
+++ b/examples/tests/valid/doubler.test.w
@@ -8,13 +8,14 @@ class Doubler {
     this.func = func;
   }
   inflight invoke(message: str): str {
-    this.func.handle(message);
-    this.func.handle(message);
+    let res1 = this.func.handle(message) ?? "";
+    let res2 = this.func.handle(res1) ?? "";
+    return res2;
   }
 }
 
-let fn = new Doubler(inflight (m: str): str => {
-  return "Hello {m}!";
+let fn = new Doubler(inflight (m: str?): str => {
+  return "Hello {m ?? "nil"}!";
 });
 
 // ----------
@@ -24,8 +25,8 @@ let fn = new Doubler(inflight (m: str): str => {
 class Doubler2 {
   // TODO: make into a static method - see https://github.com/winglang/wing/issues/2583
   pub makeFunc(handler: inflight (num): num): cloud.Function {
-    return new cloud.Function(inflight (x: str): str => {
-      let xStr = num.fromStr(x);
+    return new cloud.Function(inflight (x: str?): str => {
+      let xStr = num.fromStr(x ?? "NaN");
       let y = handler(xStr);
       let z = handler(y);
       return Json.stringify(Json z);
diff --git a/examples/tests/valid/dynamo.extern.d.ts b/examples/tests/valid/dynamo.extern.d.ts
new file mode 100644
index 00000000000..e0fda52f3c7
--- /dev/null
+++ b/examples/tests/valid/dynamo.extern.d.ts
@@ -0,0 +1,4 @@
+export default interface extern {
+  _getItem: (tableName: string, key: Readonly<any>) => Promise<Readonly<any>>,
+  _putItem: (tableName: string, item: Readonly<any>) => Promise<void>,
+}
diff --git a/examples/tests/valid/dynamo.js b/examples/tests/valid/dynamo.js
deleted file mode 100644
index 04c09c8c2c1..00000000000
--- a/examples/tests/valid/dynamo.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const { DynamoDBClient, PutItemCommand, GetItemCommand } = require("@aws-sdk/client-dynamodb");
-
-const client = new DynamoDBClient({});
-
-export async function _putItem(tableName, item) {
-  const command = new PutItemCommand({
-    TableName: tableName,
-    Item: item,
-  });
-
-  const response = await client.send(command);
-  console.log(response);
-  return;
-}
-
-export async function _getItem(tableName, key) {
-  const command = new GetItemCommand({
-    TableName: tableName,
-    Key: key
-  });
-
-  const response = await client.send(command);
-  console.log(response);
-  return response;
-}
\ No newline at end of file
diff --git a/examples/tests/valid/dynamo.test.w b/examples/tests/valid/dynamo.test.w
index c95d3276f75..c16b4ec0fd7 100644
--- a/examples/tests/valid/dynamo.test.w
+++ b/examples/tests/valid/dynamo.test.w
@@ -29,7 +29,7 @@ class DynamoTable {
     }
 
     this.table = new tfaws.dynamodbTable.DynamodbTable(
-      name: this.node.addr,
+      name: nodeof(this).addr,
       billingMode: "PAY_PER_REQUEST",
       hashKey: "Flavor",
       attribute: [
@@ -54,7 +54,8 @@ class DynamoTable {
     }
   }
 
-  extern "./dynamo.js" static inflight _putItem(tableName: str, item: Json): void;
+  extern "./dynamo.ts" static inflight _getItem(tableName: str, key: Json): Json;
+  extern "./dynamo.ts" static inflight _putItem(tableName: str, item: Json): void;
 
   pub inflight putItem(item: Map<Attribute>) {
     let json = this._itemToJson(item);
diff --git a/examples/tests/valid/dynamo.ts b/examples/tests/valid/dynamo.ts
new file mode 100644
index 00000000000..9517414f156
--- /dev/null
+++ b/examples/tests/valid/dynamo.ts
@@ -0,0 +1,30 @@
+import type extern from "./dynamo.extern";
+import {
+  DynamoDBClient,
+  PutItemCommand,
+  GetItemCommand,
+} from "@aws-sdk/client-dynamodb";
+
+const client = new DynamoDBClient({});
+
+export const _putItem: extern["_putItem"] = async (tableName, item) => {
+  const command = new PutItemCommand({
+    TableName: tableName,
+    Item: item,
+  });
+
+  const response = await client.send(command);
+  console.log(response);
+  return;
+};
+
+export const _getItem: extern["_getItem"] = async (tableName, key) => {
+  const command = new GetItemCommand({
+    TableName: tableName,
+    Key: key,
+  });
+
+  const response = await client.send(command);
+  console.log(response);
+  return response;
+};
diff --git a/examples/tests/valid/dynamo_awscdk.test.w b/examples/tests/valid/dynamo_awscdk.test.w
index 3e916121efc..a06492abc14 100644
--- a/examples/tests/valid/dynamo_awscdk.test.w
+++ b/examples/tests/valid/dynamo_awscdk.test.w
@@ -29,7 +29,7 @@ class DynamoTable {
     }
 
     this.table = new awscdk.aws_dynamodb.Table(
-      tableName: this.node.addr,
+      tableName: nodeof(this).addr,
       billingMode: awscdk.aws_dynamodb.BillingMode.PAY_PER_REQUEST,
       removalPolicy: awscdk.RemovalPolicy.DESTROY,
       partitionKey: awscdk.aws_dynamodb.Attribute {
@@ -60,13 +60,13 @@ class DynamoTable {
     }
   }
 
-  extern "./dynamo.js" static inflight _putItem(tableName: str, item: Json): void;
+  extern "./dynamo.ts" static inflight _putItem(tableName: str, item: Json): void;
   pub inflight putItem(item: Map<Attribute>) {
     let json = this._itemToJson(item);
     DynamoTable._putItem(this.tableName, json);
   }
 
-  extern "./dynamo.js" static inflight _getItem(tableName: str, key: Json): Json;
+  extern "./dynamo.ts" static inflight _getItem(tableName: str, key: Json): Json;
   pub inflight getItem(key: Map<Attribute>): Json {
     let json = this._itemToJson(key);
     return DynamoTable._getItem(this.tableName, json);
diff --git a/examples/tests/valid/enums.test.w b/examples/tests/valid/enums.test.w
index 0dd9f064b6f..0cf201e3898 100644
--- a/examples/tests/valid/enums.test.w
+++ b/examples/tests/valid/enums.test.w
@@ -1,3 +1,14 @@
+// enums can be referenced by other types before they are defined
+struct A {
+  e: SomeEnum;
+}
+
+// type annotations can reference enums before they are defined
+let opt: SomeEnum? = nil;
+
+// values can reference enums before they are defined
+let three = SomeEnum.THREE;
+
 enum SomeEnum {
     ONE, TWO, THREE
 }
@@ -8,4 +19,24 @@ let two: SomeEnum = SomeEnum.TWO; // Try with explicit type annotation
 test "inflight" {
   assert(one == SomeEnum.ONE);
   assert(two == SomeEnum.TWO);
-}
\ No newline at end of file
+}
+
+// values stringify into their own names
+assert("{SomeEnum.ONE}" == "ONE");
+assert("{SomeEnum.TWO}" == "TWO");
+assert("{SomeEnum.THREE}" == "THREE");
+
+test "toStr inflight" {
+  assert("{SomeEnum.ONE}" == "ONE");
+  assert("{SomeEnum.TWO}" == "TWO");
+  assert("{SomeEnum.THREE}" == "THREE");
+}
+
+// A documented enum (should be parssed without errors)
+/// Enum documentation
+/// blah blah blah
+enum DocumentedEnum {
+    /// Variant documentation
+    /// blah blah blah
+    VARIANT
+}
diff --git a/examples/tests/valid/esm/esm_extern.extern.d.ts b/examples/tests/valid/esm/esm_extern.extern.d.ts
new file mode 100644
index 00000000000..667f15c03fa
--- /dev/null
+++ b/examples/tests/valid/esm/esm_extern.extern.d.ts
@@ -0,0 +1,3 @@
+export default interface extern {
+  exampleInflight: () => Promise<void>,
+}
diff --git a/examples/tests/valid/esm/esm_extern.js b/examples/tests/valid/esm/esm_extern.js
new file mode 100644
index 00000000000..41bed90fc4c
--- /dev/null
+++ b/examples/tests/valid/esm/esm_extern.js
@@ -0,0 +1 @@
+export const exampleInflight = async () => {};
diff --git a/examples/tests/valid/esm/module_type.test.w b/examples/tests/valid/esm/module_type.test.w
new file mode 100644
index 00000000000..b60476b0362
--- /dev/null
+++ b/examples/tests/valid/esm/module_type.test.w
@@ -0,0 +1,10 @@
+bring cloud;
+
+class Extern {
+  extern "./esm_extern.js"
+  pub static inflight exampleInflight();
+}
+
+test "run extern" {
+  Extern.exampleInflight();
+}
\ No newline at end of file
diff --git a/examples/tests/valid/esm/package.json b/examples/tests/valid/esm/package.json
new file mode 100644
index 00000000000..6b099c745db
--- /dev/null
+++ b/examples/tests/valid/esm/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "examples-valid-esm",
+  "type": "module",
+  "volta": {
+    "extends": "../../../package.json"
+  }
+}
diff --git a/examples/tests/valid/explicit_lift_qualification.test.w b/examples/tests/valid/explicit_lift_qualification.test.w
new file mode 100644
index 00000000000..2fe4a0a94b4
--- /dev/null
+++ b/examples/tests/valid/explicit_lift_qualification.test.w
@@ -0,0 +1,84 @@
+bring cloud;
+
+let bucket1 = new cloud.Bucket() as "b1";
+bucket1.addObject("k", "value");
+let bucket2 = new cloud.Bucket() as "b2";
+let bucket3 = new cloud.Bucket() as "b3";
+let maybe_bucket: cloud.Bucket? = nil;
+
+class Foo {
+  pub inflight mehtod() {
+    // Qualify `bucket` with `delete`, `put` and `list` (multiple methods)
+    // Qualify another preflight object (bucket2) with `put` (test multile qualifications in single statement)
+    lift { bucket1: [delete, put, list], bucket2: [put] } { 
+      let b1 = bucket1; // Assign `bucket` to an inflight variable
+      
+      // `put` should work on `b1` since we explicitly qualified `bucket1` with `put`
+      // no error generated here because of use of `lift` in this method
+      b1.put("k2", "value2"); 
+
+      // validate `put` worked and that we can also `list`
+      assert(b1.list() == ["k", "k2"]);
+
+      // Validate `delete` works
+      b1.delete("k2");
+
+      // Try the other object
+      let b2 = bucket2;
+      b2.put("k2", "value2");
+
+      // Nest another `lift` block, this time with the single method format (no square brackets)
+      let b3 = bucket3;
+      lift { bucket3: put } {
+        b3.put("k3", "value3");
+      }
+      // use expression (unwrap or) to specify the object to lift
+      lift { maybe_bucket ?? bucket3: [list] } {
+        b3.list();
+      }
+    }
+
+    assert(bucket1.tryGet("k2") == nil);
+    assert(bucket2.get("k2") == "value2");
+    assert(bucket3.get("k3") == "value3");
+  }
+}
+
+let foo = new Foo();
+
+test "explicit method lift qualification" {
+  foo.mehtod();
+}
+
+// Similar to the above test, but using a closure
+let inflight_closure = inflight () => {
+  let b = bucket1;
+  lift {bucket1: [put]} {
+    b.put("k3", "value3"); // Use inflight expression to access explicitly qualified `bucket`
+  }
+  assert(bucket1.get("k3") == "value3");
+};
+
+test "explicit closure lift qualification" {
+  inflight_closure();
+}
+
+// Explicit qualification of preflight interface type
+interface PreflightInterface {
+  inflight method(): str;
+}
+
+class PreflightClass impl PreflightInterface {
+  pub inflight method(): str {
+    return "ahoy there";
+  }
+}
+
+let bar = new PreflightClass();
+
+test "explicit interface lift qualification" {
+  let x: PreflightInterface = bar;
+  lift {bar: [method]} {
+    assert(x.method() == "ahoy there");
+  }
+}
diff --git a/examples/tests/valid/expressions_string_interpolation.test.w b/examples/tests/valid/expressions_string_interpolation.test.w
index 26ce94ec191..9cd3141781f 100644
--- a/examples/tests/valid/expressions_string_interpolation.test.w
+++ b/examples/tests/valid/expressions_string_interpolation.test.w
@@ -1,3 +1,5 @@
+bring expect;
+
 let regularString = "str\n\"";
 let emptyString = "";
 let number = 1;
@@ -8,7 +10,48 @@ let reallyCoolString = "{number}{emptyString}\n{coolString}\n\{empty_string}{"st
 let beginingWithCoolStrings = "{regularString} {number} <- cool";
 let endingWithCoolStrings = "cool -> {regularString} {number}";
 
-assert("{1+1}" == "2");
-assert("\{1+1}" == "\{1+1}");
-assert("\{1+1}" != "2");
-assert("\{1+1}" != "\{2}");
\ No newline at end of file
+let nonInterpolated = #"a non { { {interpolated } } } strin{ g }";
+
+let nonInterpolatedJson = {a: nonInterpolated, b: #"this {one} too"};
+
+expect.equal("{1+1}", "2");
+expect.equal("\{1+1}", "\{1+1}");
+expect.notEqual("\{1+1}", "2");
+expect.notEqual("\{1+1}", "\{2}");
+log("\{1+1\} {number}");
+log(nonInterpolated);
+log("this is '{nonInterpolated}'");
+expect.equal(#"{number}", "\{number\}");
+expect.equal(#"{1 + 1}", "\{1 + 1\}");
+expect.equal(#"", "");
+expect.equal(#"{}", "\{\}");
+expect.equal("a\nb\nc", #"a\nb\nc" );
+expect.equal(#"\{\}".length, 2);
+expect.equal(#"{}".length, 2);
+expect.equal(#"\\{".length, 2);
+expect.equal(#"a\nb\nc".length, 5);
+expect.equal("{number} \{number}", "1 \{number}");
+
+// multiline
+let ml1 = "this
+is
+multiline";
+
+let ml2 = #"this
+is
+multiline";
+
+let ml3 = "this\n\is\n\multiline";
+
+expect.equal(ml1,ml2);
+expect.equal(ml2,ml3);
+
+test "str interpolation with lifted expr" {
+    let i = 1336;
+    let s = "leet: {i+number}";
+    expect.equal(s, "leet: 1337");
+    expect.equal(#"leet: {i+number}", "leet: \{i+number\}");
+    expect.equal(#"", "");
+    expect.equal(#"{}".length, 2);
+
+}
\ No newline at end of file
diff --git a/examples/tests/valid/extend_non_entrypoint.w b/examples/tests/valid/extend_non_entrypoint.w
new file mode 100644
index 00000000000..703cfc31697
--- /dev/null
+++ b/examples/tests/valid/extend_non_entrypoint.w
@@ -0,0 +1,5 @@
+bring "cdk8s" as cdk8s;
+
+pub class Foo extends cdk8s.Chart {
+
+}
\ No newline at end of file
diff --git a/examples/tests/valid/extern_implementation.test.w b/examples/tests/valid/extern_implementation.test.w
index 24143e3f6b7..75c23452fe6 100644
--- a/examples/tests/valid/extern_implementation.test.w
+++ b/examples/tests/valid/extern_implementation.test.w
@@ -1,11 +1,12 @@
 bring cloud;
 
 class Foo {
-  extern "./external_js.js" pub static getGreeting(name: str): str;
-  extern "./external_js.js" static inflight regexInflight(pattern: str, text: str): bool;
-  extern "./external_js.js" static inflight getUuid(): str;
-  extern "./external_js.js" static inflight getData(): str;
-  extern "./external_js.js" pub static inflight print(msg: str);
+  extern "./external_ts.ts" pub static getGreeting(name: str): str;
+  extern "./external_ts.ts" static inflight regexInflight(pattern: str, text: str): bool;
+  extern "./external_ts.ts" static inflight getUuid(): str;
+  extern "./external_ts.ts" static inflight getData(): str;
+  extern "./external_ts.ts" pub static inflight print(msg: str): void;
+  extern "./external_ts.ts" pub static preflightBucket(bucket: cloud.Bucket, id: str): void;
 
   pub inflight call() {
     assert(Foo.regexInflight("[a-z]+-\\d+", "abc-123"));
@@ -20,8 +21,15 @@ assert(Foo.getGreeting("Wingding") == "Hello, Wingding!");
 
 let f = new Foo();
 
-test "call" {
+let bucket = new cloud.Bucket() as "my-bucket";
+Foo.preflightBucket(bucket, "my-bucket");
+
+let func = new cloud.Function(inflight () => {
   f.call();
+});
+
+test "call" {
+  func.invoke();
 }
 
 test "console" {
diff --git a/examples/tests/valid/external_js.js b/examples/tests/valid/external_js.js
deleted file mode 100644
index dbfdd7651f8..00000000000
--- a/examples/tests/valid/external_js.js
+++ /dev/null
@@ -1,21 +0,0 @@
-exports.getGreeting = function(name) {
-  return `Hello, ${name}!`;
-};
-
-exports.regexInflight = async function(pattern, text) {
-  const regex = new RegExp(pattern);
-  return regex.test(text);
-};
-
-exports.getUuid = async function() {
-  let uuid = require("uuid");
-  return uuid.v4();
-};
-
-exports.getData = async function() {
-  return require("./exported_data.js");
-};
-
-exports.print = function(msg) {
-  console.log(`printing ${msg}`);
-};
diff --git a/examples/tests/valid/external_ts.extern.d.ts b/examples/tests/valid/external_ts.extern.d.ts
new file mode 100644
index 00000000000..4b69d3861f3
--- /dev/null
+++ b/examples/tests/valid/external_ts.extern.d.ts
@@ -0,0 +1,259 @@
+export default interface extern {
+  getData: () => Promise<string>,
+  getGreeting: (name: string) => string,
+  getUuid: () => Promise<string>,
+  preflightBucket: (bucket: Bucket, id: string) => void,
+  print: (msg: string) => Promise<void>,
+  regexInflight: (pattern: string, text: string) => Promise<boolean>,
+}
+/** Trait marker for classes that can be depended upon.
+The presence of this interface indicates that an object has
+an `IDependable` implementation.
+
+This interface can be used to take an (ordering) dependency on a set of
+constructs. An ordering dependency implies that the resources represented by
+those constructs are deployed before the resources depending ON them are
+deployed. */
+export interface IDependable {
+}
+/** Represents a construct. */
+export interface IConstruct extends IDependable {
+}
+/** Represents the building block of the construct graph.
+All constructs besides the root construct must be created within the scope of
+another construct. */
+export class Construct implements IConstruct {
+  /** Returns a string representation of this construct. */
+  readonly toString: () => string;
+}
+/** Data that can be lifted into inflight. */
+export interface ILiftable {
+}
+/** A resource that can run inflight code. */
+export interface IInflightHost extends IResource {
+  /** Adds an environment variable to the host. */
+  readonly addEnvironment: (name: string, value: string) => void;
+}
+/** A liftable object that needs to be registered on the host as part of the lifting process.
+This is generally used so the host can set up permissions
+to access the lifted object inflight. */
+export interface IHostedLiftable extends ILiftable {
+  /** A hook called by the Wing compiler once for each inflight host that needs to use this object inflight.
+  The list of requested inflight methods
+  needed by the inflight host are given by `ops`.
+  
+  This method is commonly used for adding permissions, environment variables, or
+  other capabilities to the inflight host. */
+  readonly onLift: (host: IInflightHost, ops: (readonly (string)[])) => void;
+}
+/** Options for `construct.addMetadata()`. */
+export interface MetadataOptions {
+  /** Include stack trace with metadata entry. */
+  readonly stackTrace?: (boolean) | undefined;
+  /** A JavaScript function to begin tracing from.
+  This option is ignored unless `stackTrace` is `true`. */
+  readonly traceFromFunction?: (any) | undefined;
+}
+/** Implement this interface in order for the construct to be able to validate itself. */
+export interface IValidation {
+  /** Validate the current construct.
+  This method can be implemented by derived constructs in order to perform
+  validation logic. It is called on all constructs before synthesis.
+  @returns An array of validation error messages, or an empty array if there the construct is valid. */
+  readonly validate: () => (readonly (string)[]);
+}
+/** In what order to return constructs. */
+export enum ConstructOrder {
+  PREORDER = 0,
+  POSTORDER = 1,
+}
+/** An entry in the construct metadata table. */
+export interface MetadataEntry {
+  /** The data. */
+  readonly data?: any;
+  /** Stack trace at the point of adding the metadata.
+  Only available if `addMetadata()` is called with `stackTrace: true`. */
+  readonly trace?: ((readonly (string)[])) | undefined;
+  /** The metadata entry type. */
+  readonly type: string;
+}
+/** Represents the construct node in the scope tree. */
+export class Node {
+  /** Add an ordering dependency on another construct.
+  An `IDependable` */
+  readonly addDependency: (deps: (readonly (IDependable)[])) => void;
+  /** Adds a metadata entry to this construct.
+  Entries are arbitrary values and will also include a stack trace to allow tracing back to
+  the code location for when the entry was added. It can be used, for example, to include source
+  mapping in CloudFormation templates to improve diagnostics. */
+  readonly addMetadata: (type: string, data?: any, options?: (MetadataOptions) | undefined) => void;
+  /** Adds a validation to this construct.
+  When `node.validate()` is called, the `validate()` method will be called on
+  all validations and all errors will be returned. */
+  readonly addValidation: (validation: IValidation) => void;
+  /** Returns an opaque tree-unique address for this construct.
+  Addresses are 42 characters hexadecimal strings. They begin with "c8"
+  followed by 40 lowercase hexadecimal characters (0-9a-f).
+  
+  Addresses are calculated using a SHA-1 of the components of the construct
+  path.
+  
+  To enable refactorings of construct trees, constructs with the ID `Default`
+  will be excluded from the calculation. In those cases constructs in the
+  same tree may have the same addreess.
+  c83a2846e506bcc5f10682b564084bca2d275709ee */
+  readonly addr: string;
+  /** All direct children of this construct. */
+  readonly children: (readonly (IConstruct)[]);
+  /** Returns the child construct that has the id `Default` or `Resource"`.
+  This is usually the construct that provides the bulk of the underlying functionality.
+  Useful for modifications of the underlying construct that are not available at the higher levels.
+  Override the defaultChild property.
+  
+  This should only be used in the cases where the correct
+  default child is not named 'Resource' or 'Default' as it
+  should be.
+  
+  If you set this to undefined, the default behavior of finding
+  the child named 'Resource' or 'Default' will be used.
+  @returns a construct or undefined if there is no default child */
+  defaultChild?: (IConstruct) | undefined;
+  /** Return all dependencies registered on this node (non-recursive). */
+  readonly dependencies: (readonly (IConstruct)[]);
+  /** Return this construct and all of its children in the given order. */
+  readonly findAll: (order?: (ConstructOrder) | undefined) => (readonly (IConstruct)[]);
+  /** Return a direct child by id.
+  Throws an error if the child is not found.
+  @returns Child with the given id. */
+  readonly findChild: (id: string) => IConstruct;
+  /** Retrieves the all context of a node from tree context.
+  Context is usually initialized at the root, but can be overridden at any point in the tree.
+  @returns The context object or an empty object if there is discovered context */
+  readonly getAllContext: (defaults?: (Readonly<any>) | undefined) => any;
+  /** Retrieves a value from tree context if present. Otherwise, would throw an error.
+  Context is usually initialized at the root, but can be overridden at any point in the tree.
+  @returns The context value or throws error if there is no context value for this key */
+  readonly getContext: (key: string) => any;
+  /** The id of this construct within the current scope.
+  This is a scope-unique id. To obtain an app-unique id for this construct, use `addr`. */
+  readonly id: string;
+  /** Locks this construct from allowing more children to be added.
+  After this
+  call, no more children can be added to this construct or to any children. */
+  readonly lock: () => void;
+  /** Returns true if this construct or the scopes in which it is defined are locked. */
+  readonly locked: boolean;
+  /** An immutable array of metadata objects associated with this construct.
+  This can be used, for example, to implement support for deprecation notices, source mapping, etc. */
+  readonly metadata: (readonly (MetadataEntry)[]);
+  /** The full, absolute path of this construct in the tree.
+  Components are separated by '/'. */
+  readonly path: string;
+  /** Returns the root of the construct tree.
+  @returns The root of the construct tree. */
+  readonly root: IConstruct;
+  /** Returns the scope in which this construct is defined.
+  The value is `undefined` at the root of the construct scope tree. */
+  readonly scope?: (IConstruct) | undefined;
+  /** All parent scopes of this construct.
+  @returns a list of parent scopes. The last element in the list will always
+  be the current construct and the first element will be the root of the
+  tree. */
+  readonly scopes: (readonly (IConstruct)[]);
+  /** This can be used to set contextual values.
+  Context must be set before any children are added, since children may consult context info during construction.
+  If the key already exists, it will be overridden. */
+  readonly setContext: (key: string, value?: any) => void;
+  /** Return a direct child by id, or undefined.
+  @returns the child if found, or undefined */
+  readonly tryFindChild: (id: string) => IConstruct | void;
+  /** Retrieves a value from tree context.
+  Context is usually initialized at the root, but can be overridden at any point in the tree.
+  @returns The context value or `undefined` if there is no context value for this key. */
+  readonly tryGetContext: (key: string) => any;
+  /** Remove the child with the given name, if present.
+  @returns Whether a child with the given name was deleted. */
+  readonly tryRemoveChild: (childName: string) => boolean;
+  /** Validates this construct.
+  Invokes the `validate()` method on all validations added through
+  `addValidation()`.
+  @returns an array of validation error messages associated with this
+  construct. */
+  readonly validate: () => (readonly (string)[]);
+}
+/** Abstract interface for `Resource`. */
+export interface IResource extends IConstruct, IHostedLiftable {
+  /** The tree node. */
+  readonly node: Node;
+  /** A hook called by the Wing compiler once for each inflight host that needs to use this object inflight.
+  The list of requested inflight methods
+  needed by the inflight host are given by `ops`.
+  
+  This method is commonly used for adding permissions, environment variables, or
+  other capabilities to the inflight host. */
+  readonly onLift: (host: IInflightHost, ops: (readonly (string)[])) => void;
+}
+/** Shared behavior between all Wing SDK resources. */
+export class Resource extends Construct implements IResource {
+  /** A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.
+  You can override this method to perform additional logic like granting
+  IAM permissions to the host based on what methods are being called. But
+  you must call `super.bind(host, ops)` to ensure that the resource is
+  actually bound. */
+  readonly onLift: (host: IInflightHost, ops: (readonly (string)[])) => void;
+}
+/** Code that runs at runtime and implements your application's behavior.
+For example, handling API requests, processing queue messages, etc.
+Inflight code can be executed on various compute platforms in the cloud,
+such as function services (such as AWS Lambda or Azure Functions),
+containers (such as ECS or Kubernetes), VMs or even physical servers.
+
+This data represents the code together with the bindings to preflight data required to run. */
+export interface IInflight extends IHostedLiftable {
+  /** A hook called by the Wing compiler once for each inflight host that needs to use this object inflight.
+  The list of requested inflight methods
+  needed by the inflight host are given by `ops`.
+  
+  This method is commonly used for adding permissions, environment variables, or
+  other capabilities to the inflight host. */
+  readonly onLift: (host: IInflightHost, ops: (readonly (string)[])) => void;
+}
+/** A resource with an inflight "handle" method that can be passed to the bucket events. */
+export interface IBucketEventHandler extends IInflight {
+  /** A hook called by the Wing compiler once for each inflight host that needs to use this object inflight.
+  The list of requested inflight methods
+  needed by the inflight host are given by `ops`.
+  
+  This method is commonly used for adding permissions, environment variables, or
+  other capabilities to the inflight host. */
+  readonly onLift: (host: IInflightHost, ops: (readonly (string)[])) => void;
+}
+/** `onCreate` event options. */
+export interface BucketOnCreateOptions {
+}
+/** `onDelete` event options. */
+export interface BucketOnDeleteOptions {
+}
+/** `onEvent` options. */
+export interface BucketOnEventOptions {
+}
+/** `onUpdate` event options. */
+export interface BucketOnUpdateOptions {
+}
+/** A cloud object store. */
+export class Bucket extends Resource {
+  /** Add a file to the bucket from system folder. */
+  readonly addFile: (key: string, path: string, encoding?: (string) | undefined) => void;
+  /** Add a file to the bucket that is uploaded when the app is deployed.
+  TODO: In the future this will support uploading any `Blob` type or
+  referencing a file from the local filesystem. */
+  readonly addObject: (key: string, body: string) => void;
+  /** Run an inflight whenever a file is uploaded to the bucket. */
+  readonly onCreate: (fn: IBucketEventHandler, opts?: (BucketOnCreateOptions) | undefined) => void;
+  /** Run an inflight whenever a file is deleted from the bucket. */
+  readonly onDelete: (fn: IBucketEventHandler, opts?: (BucketOnDeleteOptions) | undefined) => void;
+  /** Run an inflight whenever a file is uploaded, modified, or deleted from the bucket. */
+  readonly onEvent: (fn: IBucketEventHandler, opts?: (BucketOnEventOptions) | undefined) => void;
+  /** Run an inflight whenever a file is updated in the bucket. */
+  readonly onUpdate: (fn: IBucketEventHandler, opts?: (BucketOnUpdateOptions) | undefined) => void;
+}
\ No newline at end of file
diff --git a/examples/tests/valid/external_ts.ts b/examples/tests/valid/external_ts.ts
new file mode 100644
index 00000000000..6c0189d6a22
--- /dev/null
+++ b/examples/tests/valid/external_ts.ts
@@ -0,0 +1,31 @@
+import assert from "assert";
+import extern from "./external_ts.extern";
+
+export const getGreeting: extern["getGreeting"] = function (name) {
+  return `Hello, ${name}!`;
+};
+
+export const regexInflight: extern["regexInflight"] = async function (
+  pattern,
+  text
+) {
+  const regex = new RegExp(pattern);
+  return regex.test(text);
+};
+
+export const getUuid: extern["getUuid"] = async function () {
+  let uuid = require("uuid");
+  return uuid.v4();
+};
+
+export const getData: extern["getData"] = async function () {
+  return require("./exported_data.js");
+};
+
+export const print: extern["print"] = async function (msg) {
+  console.log(`printing ${msg}`);
+};
+
+export const preflightBucket: extern["preflightBucket"] = (bucket, id) => {
+  assert.strictEqual(bucket.node.id, id);
+};
diff --git a/examples/tests/valid/file_counter.test.w b/examples/tests/valid/file_counter.test.w
index e2a4ea6eda4..3a85d22e99e 100644
--- a/examples/tests/valid/file_counter.test.w
+++ b/examples/tests/valid/file_counter.test.w
@@ -2,9 +2,9 @@ bring cloud;
 
 let bucket = new cloud.Bucket();
 let counter = new cloud.Counter(initial: 100);
-let queue = new cloud.Queue(timeout: 10s);
+let queue = new cloud.Queue();
 
-let handler = inflight (body: str /* string arg */): str => {
+let handler = inflight (body: str) => {
   let next = counter.inc();
   let key = "myfile-{"hi"}.txt";
   bucket.put(key, body);
diff --git a/examples/tests/valid/for_loop.test.w b/examples/tests/valid/for_loop.test.w
index ca5c36124d7..c4af89b2d69 100644
--- a/examples/tests/valid/for_loop.test.w
+++ b/examples/tests/valid/for_loop.test.w
@@ -1,5 +1,5 @@
 let words = ["wing", "lang", "dang"];
-let uniqueNumbers = { 1, 2, 3 };
+let uniqueNumbers = Set<num>[ 1, 2, 3 ];
 
 for word in words {
   for number in uniqueNumbers {
@@ -159,7 +159,7 @@ for x in (z*2)..0 {
 
 
 bring cloud;
-new cloud.Function(inflight(event:str): str => {
+new cloud.Function(inflight () => {
   for x in 0..10 {
     assert(x <= 0);
     assert(x > 10);
diff --git a/examples/tests/valid/function_optional_arguments.test.w b/examples/tests/valid/function_optional_arguments.test.w
new file mode 100644
index 00000000000..f13e6c9c3af
--- /dev/null
+++ b/examples/tests/valid/function_optional_arguments.test.w
@@ -0,0 +1,88 @@
+// Test non optional named args
+struct Options {
+  opt1: str;
+  opt2: num;
+}
+
+let fn1 = (opts: Options): str => {
+  return "{opts.opt1} {opts.opt2}";
+};
+
+// Pass as struct
+assert(fn1({opt1: "hey", opt2: 1}) == "hey 1");
+// Pass as named args
+assert(fn1(opt1: "hey", opt2: 1) == "hey 1");
+
+// Test optional named args
+let fn2 = (opts: Options?): str => {
+  if let opts = opts {
+    return "{opts.opt1} {opts.opt2}";
+  } else {
+    return "none";
+  }
+};
+
+// Pass as struct
+assert(fn2({opt1: "hey", opt2: 1}) == "hey 1");
+// Pass as named args
+assert(fn2(opt1: "hey", opt2: 1) == "hey 1");
+// Use default
+assert(fn2() == "none");
+
+// Test implicitly optional named args
+// Since all fields are optional the arg is optional
+
+struct ImplitictlyOptionalOptions {
+  opt1: str?;
+  opt2: num?;
+}
+
+let fn3 = (opts: ImplitictlyOptionalOptions): str => {
+  return "{opts.opt1 ?? "none"} {opts.opt2 ?? 0}";
+};
+
+// Pass as struct
+assert(fn3({opt1: "hey", opt2: 1}) == "hey 1");
+// Pass as named args
+assert(fn3(opt1: "hey", opt2: 1) == "hey 1");
+// Pass some named args
+assert(fn3(opt1: "hey") == "hey 0");
+// Use empty struct
+assert(fn3({}) == "none 0");
+// Use default
+assert(fn3() == "none 0");
+
+// Test optional implicitly optional named args
+let fn4 = (opts: ImplitictlyOptionalOptions?): str => {
+  if let opts = opts {
+    return "{opts.opt1 ?? "none"} {opts.opt2 ?? 0}";
+  } else {
+    return "none";
+  }
+};
+
+// Pass as struct
+assert(fn4({opt1: "hey", opt2: 1}) == "hey 1");
+// Pass as named args
+assert(fn4(opt1: "hey", opt2: 1) == "hey 1");
+// Pass some named args
+assert(fn4(opt1: "hey") == "hey 0");
+// Use empty struct
+assert(fn4({}) == "none 0");
+// Use default
+assert(fn4() == "none");
+
+// Test implicitly optional named args used within methods
+class Foo {
+  pub static staticMethod(opts: ImplitictlyOptionalOptions): str {
+    return "{opts.opt1 ?? "none"} {opts.opt2 ?? 0}";
+  }
+
+  pub method(opts: ImplitictlyOptionalOptions): str {
+    return "{opts.opt1 ?? "none"} {opts.opt2 ?? 0}";
+  }
+}
+
+let foo = new Foo();
+assert(foo.method() == "none 0");
+assert(Foo.staticMethod() == "none 0");
\ No newline at end of file
diff --git a/examples/tests/valid/function_variadic_arguments.test.w b/examples/tests/valid/function_variadic_arguments.test.w
index 5ba66c96a52..1a1d7d71a48 100644
--- a/examples/tests/valid/function_variadic_arguments.test.w
+++ b/examples/tests/valid/function_variadic_arguments.test.w
@@ -4,7 +4,7 @@ let bucket2 = new cloud.Bucket() as "bucket2";
 let bucket3 = new cloud.Bucket() as "bucket3";
 
 // can use variadic methods from the jsii world
-bucket3.node.addDependency(bucket1, bucket2);
+nodeof(bucket3).addDependency(bucket1, bucket2);
 
 let funcBucket = (...buckets: Array<cloud.Bucket>) => {
   assert(buckets.length == 2);
@@ -56,6 +56,7 @@ class A {
 
 class B extends A {
   new(msg: str) {
+    super(msg);
     this.message = msg;
   }
 }
diff --git a/examples/tests/valid/impl_interface.test.w b/examples/tests/valid/impl_interface.test.w
index ee3cea41854..30273d119a4 100644
--- a/examples/tests/valid/impl_interface.test.w
+++ b/examples/tests/valid/impl_interface.test.w
@@ -1,4 +1,5 @@
 bring cloud;
+bring "jsii-fixture" as jsii_fixture;
 
 class A impl cloud.IQueueSetConsumerHandler {
   pub inflight handle(msg: str) {
@@ -67,3 +68,74 @@ class Terrier extends Dog {
 }
 
 let w: IAnimal = new Terrier();
+
+// interface inheriting the phase from the function it's inside
+// does it make sense to support this?
+let f = inflight () => {
+  interface IDog {
+    bark(): void;
+  } // All methods should be implicitly inflight
+  class MyDog impl IDog {
+    pub bark(): void {
+      log("woof");
+    }
+  } // Because MyIf can only be used inflight
+  let dog = new MyDog();
+  dog.bark();
+};
+
+// Extend a JSII interface in a preflight interface
+interface ExtendJsiiIface extends jsii_fixture.ISomeInterface {
+  inflight inflight_method(): void;
+}
+
+class ImplementJsiiIface impl ExtendJsiiIface {
+  pub method() {
+    return;
+  }
+  pub inflight inflight_method() {
+    return;
+  }
+}
+
+// Implement an inflight interface in a preflight class
+inflight interface IInflight {
+  inflight_method(): void;
+}
+class ImplementInflightIfaceInPreflightClass impl IInflight {
+  pub inflight inflight_method() {
+    return;
+  }
+}
+
+// Extend inflight interface in an inflight interface defined inflight
+inflight () => {
+  interface InflightIfaceDefinedInflight extends IInflight {}
+};
+
+// Extend inflight interface in an inflight interface defined preflight
+interface InflightIfaceDefinedPreflight extends IInflight {}
+
+// Implement an inflight interface in an inflight class
+inflight class ImplInflightIfaceInInflightClass impl IInflight {
+  pub inflight_method() {
+    return;
+  }
+}
+
+// Implement an inflight interface in a preflight class
+class ImplInflightIfaceInPreflightClass impl IInflight {
+  pub inflight inflight_method() {
+    return;
+  }
+}
+
+// Implement preflight interface in an preflight class
+interface IPreflight {
+  method(): void;
+}
+class ImplPreflightIfaceInPreflightClass impl IPreflight {
+  pub method() {
+    return;
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/valid/indexing.test.w b/examples/tests/valid/indexing.test.w
new file mode 100644
index 00000000000..7a34d28ee77
--- /dev/null
+++ b/examples/tests/valid/indexing.test.w
@@ -0,0 +1,77 @@
+bring cloud;
+bring expect;
+
+let arr = Array<num>[1, 2, 3];
+
+assert(arr[0] == 1);
+assert(arr[2 - 5] == 1);
+assert(arr[0] != arr[1]);
+
+
+try {
+  arr[-5];
+} catch e {
+  assert(e == "Index -5 out of bounds for array of length 3");
+}
+
+try {
+  arr[5];
+} catch e {
+  assert(e == "Index 5 out of bounds for array of length 3");
+}
+
+let map = Map<num>{"us-east-1" => 5, "us-west-2" => 8};
+expect.equal(map["us-east-1"], 5);
+
+try {
+  map["us-west-1"];
+} catch e {
+  assert(e == "Key \"us-west-1\" not found");
+}
+
+let obj = Json { a: "string", b: [4, 5, 6] };
+expect.equal(obj["a"], "string");
+expect.equal(obj["b"][0], 4);
+
+try {
+  obj["c"];
+} catch e {
+  assert(e == "Key \"c\" not found");
+}
+
+let mutjson = MutJson { a: "string", b: [4, 5, 6] };
+mutjson["a"] = true;
+expect.equal(mutjson["a"], MutJson true);
+mutjson["c"] = 10;
+
+try {
+  mutjson["b"][4];
+} catch e {
+  assert(e == "Index 4 out of bounds for array of length 3");
+}
+
+let mutarr = MutArray<num>[1, 2, 3];
+mutarr[-3] = 5;
+mutarr[10 - 8] = 10;
+expect.equal(mutarr, [5, 2, 10]);
+
+let s = "hello world";
+expect.equal(s[4], "o");
+
+class A {
+  pub var value: num;
+  new() {
+    this.value = 5;
+  }
+}
+
+let a = new A();
+let mutarr2 = MutArray<A>[a];
+mutarr2[0].value = 10;
+expect.equal(a.value, 10);
+
+let nested = MutArray<MutArray<num>>[MutArray<num>[1, 2], MutArray<num>[3, 4]];
+assert(nested[0][0] == 1);
+assert(nested[-1][-1] == 4);
+nested[0][0] = 5;
+assert(nested[0][0] == 5);
diff --git a/examples/tests/valid/inference.test.w b/examples/tests/valid/inference.test.w
index ea6b2a20bf2..94e7cbb250e 100644
--- a/examples/tests/valid/inference.test.w
+++ b/examples/tests/valid/inference.test.w
@@ -19,7 +19,7 @@ clonedArray2.push(2);
 clonedArray2.push(clonedArray2.at(0) + clonedArray2.at(1));
 assert(clonedArray2.at(2) == 3);
 
-let emptySet = {clonedArray2.at(2)};
+let emptySet = Set<num>[clonedArray2.at(2)];
 let clonedSet = emptySet.copyMut();
 clonedSet.add(4);
 
@@ -49,3 +49,8 @@ let closureWithUnwrapping = (optionalString) => {
     log(justString);
   }
 };
+
+let takesOptionalClosure = (fn: ((num): str)?) => {};
+takesOptionalClosure((a) => {
+  return "";
+});
diff --git a/examples/tests/valid/inflight_class_inside_inflight_closure.test.w b/examples/tests/valid/inflight_class_inside_inflight_closure.test.w
index ccf79cd444c..7945e00f020 100644
--- a/examples/tests/valid/inflight_class_inside_inflight_closure.test.w
+++ b/examples/tests/valid/inflight_class_inside_inflight_closure.test.w
@@ -6,7 +6,7 @@ class PreflightClass {
     this.b = new cloud.Bucket();
   }
   pub preflight_method(): cloud.Function {
-    let inflight_closure = inflight (payload: str) => {
+    let inflight_closure = inflight () => {
       this.b.put("k","v");  // Here `this` is the parent class instance
       inflight class InflightClass {
         field: str;
diff --git a/examples/tests/valid/inflight_class_structural_interace_handler.test.w b/examples/tests/valid/inflight_class_structural_interace_handler.test.w
index e32ea32e6d6..dcc52cedc17 100644
--- a/examples/tests/valid/inflight_class_structural_interace_handler.test.w
+++ b/examples/tests/valid/inflight_class_structural_interace_handler.test.w
@@ -1,6 +1,6 @@
 bring cloud;
 
-interface IGoo {
+inflight interface IGoo {
   inflight handle(): num;
 }
 
diff --git a/examples/tests/valid/inflight_closure_as_super_param.test.w b/examples/tests/valid/inflight_closure_as_super_param.test.w
new file mode 100644
index 00000000000..8cf60c60a19
--- /dev/null
+++ b/examples/tests/valid/inflight_closure_as_super_param.test.w
@@ -0,0 +1,35 @@
+class Foo {}
+
+class Base {
+  pub h: inflight (): str;
+  pub f_base: Foo;
+  new(handler: inflight (): str, f: Foo) { 
+    this.h = handler;
+    this.f_base = f;
+  }
+}
+
+class Derived extends Base {
+  pub f: Foo;
+  new() {
+    super(inflight (): str => { 
+      return "boom!";
+    }, new Foo() as "in_root");
+    this.f = new Foo() as "in_derived";
+  }
+}
+
+let c = new Derived() as "derived";
+// Make sure that instances created in a ctor are scoped to the instance they were created in
+// This is related to this test because the transformed inflight closure is also an instance 
+// created in a ctor, but it's special cased to to be scoped in the class because `this` isn't
+// available during the closures instantiation.
+assert(nodeof(c.f).path.endsWith("derived/in_derived"));
+// Make sure the instance created in the super call is scoped to the parent (root)
+assert(!nodeof(c.f_base).path.endsWith("derived/in_root"));
+let appPath = nodeof(this).path;
+assert(nodeof(c.f_base).path == "{appPath}/in_root");
+
+test "boom!" {
+  assert(c.h() == "boom!");
+}
\ No newline at end of file
diff --git a/examples/tests/valid/inflight_closure_autoid.test.w b/examples/tests/valid/inflight_closure_autoid.test.w
new file mode 100644
index 00000000000..cabdad7b0b1
--- /dev/null
+++ b/examples/tests/valid/inflight_closure_autoid.test.w
@@ -0,0 +1,12 @@
+let var inflights = MutArray<inflight ():num>[];
+for i in 0..5 {
+  inflights.push(inflight ():num => {
+    return i;
+  });
+}
+
+test "inflight closure auto id" {
+  for i in 0..5 {
+    assert(inflights.at(i)() == i);
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/valid/inflight_handler_singleton.test.w b/examples/tests/valid/inflight_handler_singleton.test.w
new file mode 100644
index 00000000000..c4cf053c5d8
--- /dev/null
+++ b/examples/tests/valid/inflight_handler_singleton.test.w
@@ -0,0 +1,64 @@
+bring cloud;
+bring expect;
+bring util;
+
+class Foo {
+  inflight var n: num;
+  inflight new() {
+    this.n = 99;
+  }
+
+  pub inflight inc(): num {
+    this.n += 1;
+    return this.n;
+  }
+
+  pub inflight get(): num {
+    return this.n;
+  }
+}
+
+let foo = new Foo();
+
+let fn = new cloud.Function(inflight () => {
+  let n = foo.inc();
+  return "{n}";
+});
+
+let fn2 = new cloud.Function(inflight () => {
+  let n = foo.inc();
+  return "{n}-fn2";
+}) as "fn2";
+
+let sim = util.env("WING_TARGET") == "sim";
+
+test "single instance of Foo" {
+  let x = fn.invoke("");
+  let y = fn.invoke("");
+  let z = fn2.invoke("");
+
+  expect.equal(x, "100");
+
+  // the simulator intentionally reuses the sandbox across invocations
+  // but we can't trust that this will always happen on the cloud
+  if sim {
+    expect.equal(y, "101");
+    log("client has been reused");
+  }
+
+  expect.equal(z, "100-fn2"); // fn2 should have a separate instance
+}
+
+// a function that takes at least three seconds to run
+let fn3 = new cloud.Function(inflight () => {
+  let n = foo.inc();
+  util.sleep(3s);
+  assert(n == foo.get());
+}) as "fn3";
+
+test "Foo state is not shared between function invocations" {
+  // start two invocations of fn, staggering them by 1 second
+  fn3.invokeAsync("");
+  util.sleep(1s);
+  fn3.invoke("");
+}
diff --git a/examples/tests/valid/inflight_ts/.example1.inflight.ts b/examples/tests/valid/inflight_ts/.example1.inflight.ts
new file mode 100644
index 00000000000..e1875e29cb9
--- /dev/null
+++ b/examples/tests/valid/inflight_ts/.example1.inflight.ts
@@ -0,0 +1,8 @@
+/// This file is generated by Wing.
+export interface Lifts {
+};
+type HandlerFunction<T> = T extends { handle: (...args: any[]) => any } ? T['handle'] : T;
+type ExpectedFunction = HandlerFunction<(arg0: string) => Promise<string>>;
+export type Handler = ((ctx: Lifts, ...args: Parameters<ExpectedFunction>) => ReturnType<ExpectedFunction>) & {};
+export function inflight(handler: Handler): Handler { return handler; }
+export default inflight;
diff --git a/examples/tests/valid/inflight_ts/.example2.inflight.ts b/examples/tests/valid/inflight_ts/.example2.inflight.ts
new file mode 100644
index 00000000000..8787cea3e6b
--- /dev/null
+++ b/examples/tests/valid/inflight_ts/.example2.inflight.ts
@@ -0,0 +1,63 @@
+/// This file is generated by Wing.
+export interface Lifts {
+  example: Example$Inflight
+  exampleCopy: Pick<Example$Inflight, "getMessage">
+  numbers: (readonly (number | number | number)[])
+};
+type HandlerFunction<T> = T extends { handle: (...args: any[]) => any } ? T['handle'] : T;
+type ExpectedFunction = HandlerFunction<IFunctionHandler$Inflight>;
+/** Entrypoint function that will be called when the cloud function is invoked. */
+export type Handler = ((ctx: Lifts, ...args: Parameters<ExpectedFunction>) => ReturnType<ExpectedFunction>) & {};
+export function inflight(handler: Handler): Handler { return handler; }
+export default inflight;
+/** Trait marker for classes that can be depended upon.
+The presence of this interface indicates that an object has
+an `IDependable` implementation.
+
+This interface can be used to take an (ordering) dependency on a set of
+constructs. An ordering dependency implies that the resources represented by
+those constructs are deployed before the resources depending ON them are
+deployed. */
+export interface IDependable$Inflight {
+}
+/** Represents a construct. */
+export interface IConstruct$Inflight extends IDependable$Inflight {
+}
+/** Represents the building block of the construct graph.
+All constructs besides the root construct must be created within the scope of
+another construct. */
+export class Construct$Inflight implements IConstruct$Inflight {
+}
+/** Data that can be lifted into inflight. */
+export interface ILiftable$Inflight {
+}
+/** A liftable object that needs to be registered on the host as part of the lifting process.
+This is generally used so the host can set up permissions
+to access the lifted object inflight. */
+export interface IHostedLiftable$Inflight extends ILiftable$Inflight {
+}
+/** Abstract interface for `Resource`. */
+export interface IResource$Inflight extends IConstruct$Inflight, IHostedLiftable$Inflight {
+}
+/** Shared behavior between all Wing SDK resources. */
+export class Resource$Inflight extends Construct$Inflight implements IResource$Inflight {
+}
+export class Example$Inflight extends Resource$Inflight {
+  readonly $inflight_init: () => Promise<Example$Inflight>;
+  readonly done: () => Promise<void>;
+  readonly getMessage: () => Promise<string>;
+}
+/** Code that runs at runtime and implements your application's behavior.
+For example, handling API requests, processing queue messages, etc.
+Inflight code can be executed on various compute platforms in the cloud,
+such as function services (such as AWS Lambda or Azure Functions),
+containers (such as ECS or Kubernetes), VMs or even physical servers.
+
+This data represents the code together with the bindings to preflight data required to run. */
+export interface IInflight$Inflight extends IHostedLiftable$Inflight {
+}
+/** A resource with an inflight "handle" method that can be used to create a `cloud.Function`. */
+export interface IFunctionHandler$Inflight extends IInflight$Inflight {
+  /** Entrypoint function that will be called when the cloud function is invoked. */
+  readonly handle: (event?: (string) | undefined) => Promise<string | void>;
+}
\ No newline at end of file
diff --git a/examples/tests/valid/inflight_ts/example1.ts b/examples/tests/valid/inflight_ts/example1.ts
new file mode 100644
index 00000000000..358d875e720
--- /dev/null
+++ b/examples/tests/valid/inflight_ts/example1.ts
@@ -0,0 +1,5 @@
+import inflight from "./.example1.inflight";
+
+export default inflight(async ({}, arg) => {
+  return arg;
+})
\ No newline at end of file
diff --git a/examples/tests/valid/inflight_ts/example2.ts b/examples/tests/valid/inflight_ts/example2.ts
new file mode 100644
index 00000000000..4d9b557c380
--- /dev/null
+++ b/examples/tests/valid/inflight_ts/example2.ts
@@ -0,0 +1,11 @@
+import inflight from "./.example2.inflight";
+
+export const main = inflight(async ({ example, numbers }, message) => {
+  const exampleMessage = await example.getMessage();
+  console.log(`"${message}" should be "${exampleMessage}"`);
+  console.log(numbers);
+  if (message !== exampleMessage) {
+    throw new Error("Message is not the same");
+  }
+  await example.done();
+});
diff --git a/examples/tests/valid/inflights_calling_inflights.test.w b/examples/tests/valid/inflights_calling_inflights.test.w
index 0e16ea2b309..fb279ce4d6e 100644
--- a/examples/tests/valid/inflights_calling_inflights.test.w
+++ b/examples/tests/valid/inflights_calling_inflights.test.w
@@ -2,12 +2,14 @@ bring cloud;
 
 let globalBucket = new cloud.Bucket();
 
-let storeInBucket = inflight (event: str, file: str): str => {
+let storeInBucket = inflight (event: str, file: str) => {
   globalBucket.put(file, event);
 };
 
-let handler1 = inflight (event: str): str => {
-  storeInBucket(event, "file1");
+let handler1 = inflight (event: str?) => {
+  if let event = event {
+    storeInBucket(event, "file1");
+  }
 };
 
 let func1 = new cloud.Function(handler1) as "func1";
diff --git a/examples/tests/valid/interface.test.w b/examples/tests/valid/interface.test.w
index 17eb540428e..2046cc5f3cb 100644
--- a/examples/tests/valid/interface.test.w
+++ b/examples/tests/valid/interface.test.w
@@ -1,3 +1,11 @@
+struct A {
+  // other types can reference interfaces before they are defined
+  field0: IShape;
+}
+
+// type annotations can reference interfaces before they are defined
+let a: IShape? = nil;
+
 interface IShape {
     // method with a return type
     method1(): str;
@@ -14,3 +22,31 @@ interface IPointy {
 interface ISquare extends IShape, IPointy {
     
 }
+
+class C {}
+
+// interfaces can reference classes
+interface IClass {
+    method1(): C;
+    // method2(): D; // TODO: not supported yet - classes are not hoisted
+}
+
+class D {}
+
+// mutually referential interfaces
+interface IThing1 {
+  m2(): IThing2?;
+}
+
+interface IThing2 {
+  m1(): IThing1?;
+}
+
+// A documented interface (should be parsed without errors)
+/// Interface documentation
+/// blah blah blah
+interface IDocumentedInterface {
+    /// Method documentation
+    /// blah blah blah
+    method1(): void;
+}
diff --git a/examples/tests/valid/intrinsics.test.w b/examples/tests/valid/intrinsics.test.w
new file mode 100644
index 00000000000..6cc12cfd2f6
--- /dev/null
+++ b/examples/tests/valid/intrinsics.test.w
@@ -0,0 +1,50 @@
+bring fs;
+bring expect;
+bring cloud;
+bring util;
+bring "./subdir/bar.w" as bar;
+
+// @dirname
+
+let path = "SHOULD_IGNORE";
+let filename = "intrinsics.test.w";
+
+let currentFile = fs.join(@dirname, filename);
+expect.equal(filename, fs.basename(currentFile));
+expect.equal(@dirname, fs.dirname(currentFile));
+expect.equal(bar.Bar.getSubdir(), fs.join(@dirname, "subdir"));
+
+// @inflight
+
+let counter = new cloud.Counter();
+pub class Example {
+  pub inflight getMessage(): str {
+    return "message";
+  }
+  pub inflight done() {
+    counter.inc();
+  }
+}
+
+let echo: inflight (str): str = @inflight("./inflight_ts/example1.ts");
+
+let example = new Example();
+let funcFunction = @inflight("./inflight_ts/example2.ts",
+  export: "main",
+  lifts: [
+    { obj: example },
+    { obj: example, alias: "exampleCopy", ops: ["getMessage"]},
+    { obj: [1, 2, 3], alias: "numbers" },
+  ]
+);
+let func = new cloud.Function(funcFunction);
+
+
+test "invoke default function" {
+  assert(echo("message") == "message");
+}
+
+test "invoke inflight function" {
+  funcFunction("message");
+  func.invoke("message");
+}
diff --git a/examples/tests/valid/json.test.w b/examples/tests/valid/json.test.w
index 943f2644e6d..4b5681c2fbe 100644
--- a/examples/tests/valid/json.test.w
+++ b/examples/tests/valid/json.test.w
@@ -162,7 +162,7 @@ if let val = jsonElements.tryGet("strings")?.tryGet("single")?.asStr() {
 }
 
 if let vals = jsonElements.tryGet("strings")?.tryGet("array") {
-  // Try getting an index 
+  // Try getting an index
   if let hello = vals.tryGetAt(0) {
     assert(hello == "Hello");
   } else {
@@ -206,7 +206,7 @@ assert(notSpecified.get("foo") == "bar");
 
 // Check that empty {} is a Json
 let empty = {};
-assert(Json.has(empty, "something") == false);
+assert(empty.has("something") == false);
 
 struct Base {
   base: str;
@@ -225,18 +225,25 @@ struct StructyJson {
   foo: str;
   stuff: Array<num>;
   maybe: InnerStructyJson?;
+  buckets: Array<cloud.Bucket>?;
 }
 
 let arrayStruct: Array<StructyJson> = [ { foo: "", stuff: [] } ];
-let setStruct: Set<StructyJson> = { { foo: "", stuff: [] } };
+let setStruct: Set<StructyJson> = Set<StructyJson>[ { foo: "", stuff: [] } ];
 let mapStruct: Map<StructyJson> = { "1" => ({ foo: "", stuff: [] }) };
-let deepCollectionStruct: Map<Array<Set<StructyJson>>> = { "1" => [ { { foo: "", stuff: [] } } ] };
+let deepCollectionStruct: Map<Array<Set<StructyJson>>> = { "1" => [ Set<StructyJson>[ { foo: "", stuff: [] } ] ] };
 
 let notJsonMissingField: StructyJson = {
   foo: "bar",
   stuff: [],
 };
 
+let notJsonWithInnerArray: StructyJson = {
+  foo: "bar",
+  stuff: [],
+  buckets: [new cloud.Bucket() as "B1InList"]
+};
+
 let notJson: StructyJson = {
   foo: "bar",
   stuff: [1, 2, 3],
@@ -266,4 +273,21 @@ let hasBucket: HasInnerBucket = {
   a: {
     a: new cloud.Bucket()
   }
-};
\ No newline at end of file
+};
+
+let numVar = 1;
+let strVar = "s";
+let punnedJson1 = {numVar, strVar};
+assert(punnedJson1["numVar"] == 1);
+assert(punnedJson1["strVar"] == "s");
+let punnedMutJson1 = MutJson {numVar};
+punnedMutJson1.set("numVar", punnedMutJson1["numVar"].asNum() + 1);
+assert(punnedMutJson1["numVar"] == 2);
+
+struct StructToPun {
+  numVar: num;
+  strVar: str;
+}
+let structToPunFromJson: StructToPun = Json {numVar, strVar};
+assert(structToPunFromJson.numVar == 1);
+assert(structToPunFromJson.strVar == "s");
\ No newline at end of file
diff --git a/examples/tests/valid/json_bucket.test.w b/examples/tests/valid/json_bucket.test.w
index 3d85b010e5b..879fe070efa 100644
--- a/examples/tests/valid/json_bucket.test.w
+++ b/examples/tests/valid/json_bucket.test.w
@@ -17,7 +17,7 @@ let j = Json {
 };
 
 
-let getJson = new cloud.Function(inflight(msg: str): str => {
+let getJson = new cloud.Function(inflight () => {
   let x = b.getJson(fileName);
   assert(x.get("persons").getAt(0).get("fears").getAt(1) == "failure");
 });
diff --git a/examples/tests/valid/json_static.test.w b/examples/tests/valid/json_static.test.w
index 812a9351d31..360baee950e 100644
--- a/examples/tests/valid/json_static.test.w
+++ b/examples/tests/valid/json_static.test.w
@@ -58,6 +58,6 @@ test "Access Json static inflight" {
 // Check whether some key exists in a json
 test "has key or not" {
   let hasCheck = Json {a: "hello", b: "wing"};
-  assert(Json.has(hasCheck, "a") == true);
-  assert(Json.has(hasCheck, "c") == false);
+  assert(hasCheck.has("a") == true);
+  assert(hasCheck.has("c") == false);
 }
\ No newline at end of file
diff --git a/examples/tests/valid/lift_inflight_closure_collection.test.w b/examples/tests/valid/lift_inflight_closure_collection.test.w
new file mode 100644
index 00000000000..da46d0c0fc1
--- /dev/null
+++ b/examples/tests/valid/lift_inflight_closure_collection.test.w
@@ -0,0 +1,66 @@
+// Inflight closures need to be qualified with `handle` to correct set up their permissions
+// Make sure this happens when they are used in collections too.
+
+bring cloud;
+
+let b1 = new cloud.Bucket() as "b1";
+b1.addObject("k", "v1");
+let b2 = new cloud.Bucket() as "b2";
+b2.addObject("k", "v2");
+
+let c1 = inflight () => {
+  assert(b1.get("k") == "v1");
+};
+
+let c2 = inflight () => {
+  assert(b2.get("k") == "v2");
+};
+
+
+let ar = Array<inflight ():void>[c1, c2];
+// Define an explicit cloud.Function that'll be used in the test. This is so
+// when generating terraform snapshots we'll see the correct permissions.
+// Writing the test directly in the `test` statement will skip them when
+// generating the tf-aws snapshots.
+let f1 = new cloud.Function(inflight () => {
+  for c in ar {
+    c();
+  }
+}) as "f1";
+test "lift closure array" {
+  f1.invoke();
+}
+
+let map = Map<inflight ():void>{ "k1" => c1, "k2" => c2 };
+let f2 = new cloud.Function(inflight () => {
+  for c in map.values() {
+    c();
+  }
+}) as "f2";
+test "lift closure map" {
+  f2.invoke();
+}
+
+let set = Set<inflight ():void>[c1, c2];
+let f3 = new cloud.Function(inflight () => {
+  for c in set {
+    c();
+  }
+}) as "f3";
+test "lift closure set" {
+  f3.invoke();
+}
+
+let complex = [{"k1" => Set<inflight ():void>[c1, c2]}];
+let f4 = new cloud.Function(inflight () => {
+  // Use inflight variables to access the complex collection
+  // to make sure we don't lift the closure, but the entire collection
+  let i = 0;
+  let k = "k1";
+  for c in complex.at(i).get(k) {
+    c();
+  }
+}) as "f4";
+test "lift closure in complex collection" {
+  f4.invoke();
+}
diff --git a/examples/tests/valid/lift_inflight_closure_returning_object_issue6501.test.w b/examples/tests/valid/lift_inflight_closure_returning_object_issue6501.test.w
new file mode 100644
index 00000000000..8fb3728f4ad
--- /dev/null
+++ b/examples/tests/valid/lift_inflight_closure_returning_object_issue6501.test.w
@@ -0,0 +1,33 @@
+// Some inflight object with a method
+inflight class Foo {
+  pub do():num {
+    return 1337;
+  }
+}
+
+let foo = inflight (): Foo => {
+  // Return an object with a method
+  return new Foo();
+};
+
+test "test qualify closure returning an inflight object" {
+  // Call the inflight handler and then call a method on the result in a single satatement.
+  // Here we expect the `handle` method to qualify `foo`'s lift and no other qualfications.
+  assert(foo().do() == 1337);
+}
+
+bring cloud;
+
+let b = new cloud.Bucket();
+let bar = inflight (): cloud.Bucket => {
+  return b;
+};
+
+test "test qualify closure returning a preflight object" {
+  lift {b: put} {
+    // Call the inflight handler and then call a method on the result in a single satatement.
+    // Here we expect the `handle` method to qualify `bar`'s lift and no other qualfications.
+    bar().put("a", "value");
+  }
+  assert(b.get("a") == "value");
+}
diff --git a/examples/tests/valid/lift_parent_fields.test.w b/examples/tests/valid/lift_parent_fields.test.w
new file mode 100644
index 00000000000..d0c19938f2b
--- /dev/null
+++ b/examples/tests/valid/lift_parent_fields.test.w
@@ -0,0 +1,49 @@
+class A {
+  pub a: str;
+
+  new() {
+    this.a = "a";
+  }
+
+  pub inflight do(): str {
+    return this.a;
+  }
+}
+
+class B extends A {
+  pub b: str;
+
+  new() {
+    super();
+    this.b = "b";
+  }
+
+  pub inflight do(): str {
+    return "{this.b} {super.do()}";
+  }
+}
+
+class C extends B {
+  pub c: str;
+
+  new() {
+    super();
+    this.c = "c";
+  }
+
+  inflight dummy() {
+    // Directly access the field of the parent class, this means it's lifted both for 
+    // initializing the parent class and for direct access here. This verifies we don't
+    // lift twice and cause a name conflict.
+    log("{this.b}");
+  }
+
+  pub inflight do(): str {
+    return "{this.c} {super.do()}";
+  }
+}
+
+let c = new C();
+test "test" {
+  assert(c.do() == "c b a");
+}
\ No newline at end of file
diff --git a/examples/tests/valid/lift_shared_resource.test.w b/examples/tests/valid/lift_shared_resource.test.w
new file mode 100644
index 00000000000..4b8286e0cfe
--- /dev/null
+++ b/examples/tests/valid/lift_shared_resource.test.w
@@ -0,0 +1,33 @@
+bring cloud;
+bring http;
+
+let bucket = new cloud.Bucket();
+
+pub class MyBucket {
+  bucket: cloud.Bucket;
+
+  new(bucket: cloud.Bucket) {
+    this.bucket = bucket;
+  }
+
+  pub inflight list() {
+    this.bucket.list();
+  }
+}
+
+let b1 = new MyBucket(bucket) as "b1";
+let b2 = new MyBucket(bucket) as "b2";
+
+let api = new cloud.Api();
+api.get("/", inflight () => {
+  b1.list();
+  b2.list();
+  return {
+    status: 200
+  };
+});
+
+test "call endpoint" {
+  let res = http.get(api.url);
+  assert(res.status == 200);
+}
diff --git a/examples/tests/valid/lift_this.test.w b/examples/tests/valid/lift_this.test.w
index 1c213ebd1f4..60c9284d661 100644
--- a/examples/tests/valid/lift_this.test.w
+++ b/examples/tests/valid/lift_this.test.w
@@ -1,3 +1,5 @@
+bring util;
+
 class Foo {
   inflight x: num;
   inflight new() {
@@ -9,10 +11,19 @@ class Foo {
   pub inflight foo(): num { 
     return this.bar() / 2;
   }
+  pub onLift(host: std.IInflightHost, ops: Array<str>) {
+    if ops.contains("bar") {
+      host.addEnvironment("BAR", "123");
+    }
+  }
 }
 
 let f = new Foo();
 
 test "test" {
   assert(f.foo() == 21);
+
+  // Check that calling foo() results in permissions for bar()
+  // BAR should be set since we called bar()
+  assert(util.env("BAR") == "123");
 }
diff --git a/examples/tests/valid/lift_weird_order.test.w b/examples/tests/valid/lift_weird_order.test.w
new file mode 100644
index 00000000000..0428264c1c8
--- /dev/null
+++ b/examples/tests/valid/lift_weird_order.test.w
@@ -0,0 +1,21 @@
+class B {
+  pub inflight do() {}
+}
+
+class C {
+  b: B;
+  new(b: B) {
+    this.b = b;
+  }
+  pub inflight do() {
+    this.b.do();
+  }
+}
+
+let b = new B();
+let c = new C(b);
+
+test "something" {
+  b.do();
+  c.do();
+}
diff --git a/examples/tests/valid/lift_with_phase_ind.test.w b/examples/tests/valid/lift_with_phase_ind.test.w
new file mode 100644
index 00000000000..ae1910577ee
--- /dev/null
+++ b/examples/tests/valid/lift_with_phase_ind.test.w
@@ -0,0 +1,20 @@
+bring math;
+
+let ar = [1,2,3];
+
+test "Use phase independent methods on lifted object" {
+  // Phase independent method with no inflight args is lifted
+  assert(ar.at(0) == 1);
+  let i = math.floor(math.random() * ar.length);
+  // Phase independent method with inflight args is executed inflight
+  let var x = ar.at(i);
+  assert(x >= 1 && x <= 3);
+  // Complex expression with inflight inner expression is evaluated inflight
+  x = ar.at(1 - 1 + i);
+  assert(x >= 1 && x <= 3);
+
+  // Get mutable copy of lifted array
+  // Make sure the `copyMut` method is called inflight and not lifted and turned into an immutable array
+  let mut_ar = ar.copyMut();
+  mut_ar.push(4);
+}
diff --git a/examples/tests/valid/map_entries.test.w b/examples/tests/valid/map_entries.test.w
new file mode 100644
index 00000000000..e047c8f0da1
--- /dev/null
+++ b/examples/tests/valid/map_entries.test.w
@@ -0,0 +1,28 @@
+let map = { "foo" => "hello" };
+
+test "check if map has entries" {
+  assert(map.size() == 1);
+  assert(map.has("foo"));
+  assert(!map.has("bar"));
+}
+
+test "get value from map" {
+  assert(map.get("foo") == "hello");
+}
+
+test "iterate map using entries() method" {
+  // iterate over map entries
+  let entries = map.entries();
+
+  for x in map.entries() {
+    assert(x.key == "foo");
+    assert(x.value == "hello");
+  }
+}
+
+test "check entries() when map has multiple entries" {
+  let map = { "foo" => "hello", "bar" => "world" };
+
+  // check array length
+  assert(map.entries().length == 2);
+}
diff --git a/examples/tests/valid/mut_container_types.test.w b/examples/tests/valid/mut_container_types.test.w
index e141c4e71dd..fe09889fff3 100644
--- a/examples/tests/valid/mut_container_types.test.w
+++ b/examples/tests/valid/mut_container_types.test.w
@@ -17,9 +17,9 @@ assert(arr1.length == 4);
 assert(arr4.at(0) == "a");
 
 //Set tests
-let s1 = MutSet<num>{1, 2, 3, 3};
-let s2: MutSet<str> = MutSet<str>{"hello", "world", "hello"};
-let s3 = MutSet<cloud.Bucket>{bucket1, bucket2, bucket2};
+let s1 = MutSet<num>[1, 2, 3, 3];
+let s2: MutSet<str> = MutSet<str>["hello", "world", "hello"];
+let s3 = MutSet<cloud.Bucket>[bucket1, bucket2, bucket2];
 s1.add(5);
 s2.add("bye");
 s3.add(bucket3);
@@ -48,4 +48,3 @@ m2.clear();
 assert(m2.size() == 0);
 assert(m1.get("hello") == "goodbye");
 assert(m6.get("a").get("foo") == "bar");
-
diff --git a/examples/tests/valid/mutation_after_class_init.test.w b/examples/tests/valid/mutation_after_class_init.test.w
new file mode 100644
index 00000000000..72d03ac0774
--- /dev/null
+++ b/examples/tests/valid/mutation_after_class_init.test.w
@@ -0,0 +1,39 @@
+bring cloud;
+bring util;
+
+class Queue {
+  data: cloud.Bucket;
+  var consumer: inflight (str): void;
+  new() {
+    this.data = new cloud.Bucket();
+    this.consumer = inflight () => {
+      log("dummy code");
+    };
+    this.data.onCreate(inflight (key: str) => {
+      this.consumer(key);
+    });
+  }
+
+  pub setConsumer(fn: inflight (str): void) {
+    this.consumer = fn;
+  }
+
+  pub inflight push(m: str) {
+    this.data.put(m, "empty");
+  }
+}
+
+let q = new Queue();
+let c = new cloud.Counter();
+q.setConsumer(inflight (m: str) => {
+  log("received {m}");
+  c.inc();
+});
+
+test "hi" {
+  q.push("message1");
+  util.waitUntil(inflight () => {
+    return c.peek() > 0;
+  });
+}
+
diff --git a/examples/tests/valid/new_in_static.test.w b/examples/tests/valid/new_in_static.test.w
index b2ac6cccc98..2095e296a54 100644
--- a/examples/tests/valid/new_in_static.test.w
+++ b/examples/tests/valid/new_in_static.test.w
@@ -1,5 +1,7 @@
 bring cloud;
 bring "constructs" as c;
+bring "jsii-fixture" as jsii_fixture;
+bring "./new_in_static_lib.w" as new_in_static_lib;
 
 class MyClass {
   pub static createBucket(scope: c.IConstruct): cloud.Bucket {
@@ -11,6 +13,25 @@ class MyClass {
     // wing class
     return new MyClass() in scope;
   }
+
+  pub static createMyClassWithImplicitScope(id: str): MyClass {
+    return new MyClass() as "implicit-scope-myclass-{id}";
+  }
+
+  pub static createBucketWithImplicitScope(): cloud.Bucket {
+    return new cloud.Bucket() as "implicit-scope-bucket";
+  }
+
+  pub instanceMethod() {
+    // Implicit scope should be the instance's
+    let my = MyClass.createMyClassWithImplicitScope("from-instance-method");
+    let bucket = MyClass.createBucketWithImplicitScope();
+  }
+
+  pub static staticMehtodThatCallsAnotherStaticMethod(): MyClass {
+    return MyClass.createMyClassWithImplicitScope("from-outer-static-method");
+  }
+
 }
 
 // these should work
@@ -27,7 +48,41 @@ let scope = new c.Construct();
 let bucket = MyClass.createBucket(scope);
 let bucket2 = createBucket();
 let my = MyClass.createMyClass(scope);
+let my2 = MyClass.createMyClassWithImplicitScope("from-root");
+let bucket3 = MyClass.createBucketWithImplicitScope();
+let my3 = MyClass.staticMehtodThatCallsAnotherStaticMethod();
+
+// Call instance that instantiates stuff using static methods (should use the instance's scope)
+my.instanceMethod();
 
-test "play with bucket" {
+// Test calling a static JSII method (no implicit scope should be passed)
+assert(jsii_fixture.JsiiClass.staticMethod("foo") == "Got foo");
+
+test "play with buckets" {
   assert(bucket.list().length == 0);
-}
\ No newline at end of file
+  assert(bucket3.list().length == 0);
+}
+
+// Call static method from a class's ctor
+class FooParent {
+  field: MyClass?;
+  new(myclass: MyClass?) {
+    this.field = myclass;
+  }
+}
+class Foo extends FooParent {
+  new() {
+    super(
+      // TODO: unsupported yet, see https://github.com/winglang/wing/issues/6016
+      // MyClass.createMyClassWithImplicitScope("from-ctor-before-super")
+      nil
+    );
+    MyClass.createMyClassWithImplicitScope("from-ctor");
+  }
+}
+let f = new Foo();
+
+// Create a preflight class from a static method defined in a lib
+// see: https://github.com/winglang/wing/issues/6188
+let lib_f = new_in_static_lib.LibClass.createFoo("lib-foo");
+
diff --git a/examples/tests/valid/new_in_static_lib.w b/examples/tests/valid/new_in_static_lib.w
new file mode 100644
index 00000000000..35c3cab08d9
--- /dev/null
+++ b/examples/tests/valid/new_in_static_lib.w
@@ -0,0 +1,7 @@
+pub class Foo {}
+
+pub class LibClass {
+  pub static createFoo(id: str): Foo {
+    return new Foo() as id;
+  }
+}
\ No newline at end of file
diff --git a/examples/tests/valid/on_lift.test.w b/examples/tests/valid/on_lift.test.w
new file mode 100644
index 00000000000..d883af4e5c8
--- /dev/null
+++ b/examples/tests/valid/on_lift.test.w
@@ -0,0 +1,32 @@
+bring util;
+
+class Foo {
+  pub inflight m1() {
+    log("I'm expecting ABC to be set");
+    assert(util.env("ABC") == "123");
+  }
+
+  pub static inflight m2() {
+    log("I'm expecting XYZ to be set");
+    assert(util.env("XYZ") == "789");
+  }
+
+  pub onLift(host: std.IInflightHost, ops: Array<str>) {
+    if ops.contains("m1") {
+      host.addEnvironment("ABC", "123");
+    }
+  }
+
+  pub static onLiftType(host: std.IInflightHost, ops: Array<str>) {
+    if ops.contains("m2") {
+      host.addEnvironment("XYZ", "789");
+    }
+  }
+}
+
+let foo = new Foo();
+
+test "onLift and onLiftType allow capabilities to be granted to inflight hosts" {
+  foo.m1();
+  Foo.m2();
+}
diff --git a/examples/tests/valid/optionals.test.w b/examples/tests/valid/optionals.test.w
index 544b4255212..1c7772a72cb 100644
--- a/examples/tests/valid/optionals.test.w
+++ b/examples/tests/valid/optionals.test.w
@@ -16,13 +16,14 @@ class Super {
 class Sub extends Super {
   new() { this.name = "Sub"; }
 }
-class Sub1 extends Super {
-  new() { this.name = "Sub"; }
+class SubSub extends Sub {
+  new() { this.name = "SubSub"; }
 }
 
 let optionalSup: Super? = new Super();
 let s = optionalSup ?? new Sub();
 assert(s.name == "Super");
+let s2 = optionalSup ?? optionalSup ?? new SubSub();
 
 struct Name {
   first: str;
@@ -204,3 +205,57 @@ if let s1 = str1 {
 } elif let s2 = str2 {
   assert(true);
 }
+
+// Optional function return type
+let var fn: (): ((): num)? = () => { return () => { return 1337; }; };
+if let f = fn() {
+  assert(f() == 1337);
+} else {
+  assert(false);
+}
+fn = () => { return nil; };
+if let f = fn() {
+  assert(false);
+} else {
+  assert(true);
+}
+
+let maybeVar: num? = 123;
+assert(maybeVar! == 123);
+
+let maybeVarNull: str? = nil;
+try {
+  let err = maybeVarNull!;
+  assert(false);
+} catch e {
+  assert(e == "Unexpected nil");
+}
+
+let maybeFn = (b: bool): Array<str>? => {
+  if b {
+    return ["hi"];
+  }
+};
+try {
+  maybeFn(false)!;
+  assert(false);
+} catch e {
+  assert(e == "Unexpected nil");
+}
+assert(maybeFn(true)! == ["hi"]);
+
+let maybeVarBool: bool? = true;
+assert(!maybeVarBool! == false);
+
+struct Person {
+  name: str;
+  age: num;
+}
+let person = Person.tryParseJson(Json.stringify({"name": "john", "age": 30}))!;
+assert(person.name == "john" && person.age == 30);
+
+let maybeX: num? = 0;
+assert(maybeX! == 0);
+
+let maybeY: str? = "";
+assert(maybeY! == "");
diff --git a/examples/tests/valid/package.json b/examples/tests/valid/package.json
index 947c7777ec5..6ca50358cba 100644
--- a/examples/tests/valid/package.json
+++ b/examples/tests/valid/package.json
@@ -1,16 +1,16 @@
 {
   "name": "examples-valid",
   "dependencies": {
-    "@aws-cdk/asset-awscli-v1": "^2.2.200",
+    "@aws-cdk/asset-awscli-v1": "^2.2.202",
     "@aws-cdk/asset-kubectl-v20": "^2.1.2",
     "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1",
-    "@aws-sdk/client-dynamodb": "^3.405.0",
-    "@cdktf/provider-aws": "^15.0.0",
-    "aws-cdk-lib": "^2.94.0",
-    "cdk8s": "^2.64.2",
-    "cdk8s-plus-27": "^2.7.1",
-    "cdktf": "0.17.0",
-    "constructs": "^10.2.70",
+    "@aws-sdk/client-dynamodb": "^3.503.1",
+    "@cdktf/provider-aws": "^19",
+    "aws-cdk-lib": "^2.124.0",
+    "cdk8s": "^2.68.43",
+    "cdk8s-plus-27": "^2.7.81",
+    "cdktf": "0.20.3",
+    "constructs": "^10.3",
     "jsii-code-samples": "1.7.0",
     "projen": "^0.71.163",
     "uuid": "^9.0.0",
diff --git a/examples/tests/valid/parameters/nested/parameters.test.w b/examples/tests/valid/parameters/nested/parameters.test.w
new file mode 100644
index 00000000000..618b89979fc
--- /dev/null
+++ b/examples/tests/valid/parameters/nested/parameters.test.w
@@ -0,0 +1,21 @@
+struct Person {
+  name: str;
+  age: num;
+}
+
+struct House {
+  address: str;
+  residents: Array<Person>;
+}
+
+struct MyParams {
+  houses: Array<House>;
+}
+
+let app = nodeof(this).app;
+
+let myParams = MyParams.fromJson(app.parameters.read(schema: MyParams.schema()));
+
+assert(myParams.houses.length == 2);
+assert(myParams.houses.at(0).address == "123 Main St");
+assert(myParams.houses.at(0).residents.length == 2);
\ No newline at end of file
diff --git a/examples/tests/valid/parameters/nested/wing.toml b/examples/tests/valid/parameters/nested/wing.toml
new file mode 100644
index 00000000000..155886a5249
--- /dev/null
+++ b/examples/tests/valid/parameters/nested/wing.toml
@@ -0,0 +1,13 @@
+[[houses]]
+address = "123 Main St"
+residents = [
+  {name = "John Doe", age = 30},
+  {name = "Jane Doe", age = 24}
+]
+
+[[houses]]
+address = "456 Elm St"
+residents = [
+  {name = "Tom Smith", age = 45},
+  {name = "Sue Smith", age = 40}
+]
\ No newline at end of file
diff --git a/examples/tests/valid/parameters/simple/parameters.test.w b/examples/tests/valid/parameters/simple/parameters.test.w
new file mode 100644
index 00000000000..740e1b2ecea
--- /dev/null
+++ b/examples/tests/valid/parameters/simple/parameters.test.w
@@ -0,0 +1,18 @@
+let app = nodeof(this).app;
+
+struct MyParams {
+  foo: str?;
+  meaningOfLife: num;
+}
+
+let myParams = MyParams.fromJson(app.parameters.read(schema: MyParams.schema()));
+
+if let foo = myParams.foo {
+  assert(false); // shouldnt happen
+} else {
+  assert(true);
+}
+
+let meaningOfLife = myParams.meaningOfLife;
+
+assert(meaningOfLife == 42);
\ No newline at end of file
diff --git a/examples/tests/valid/parameters/simple/wing.toml b/examples/tests/valid/parameters/simple/wing.toml
new file mode 100644
index 00000000000..54e0f73088f
--- /dev/null
+++ b/examples/tests/valid/parameters/simple/wing.toml
@@ -0,0 +1 @@
+meaningOfLife = 42
\ No newline at end of file
diff --git a/examples/tests/valid/phase_independent_method_on_string.test.w b/examples/tests/valid/phase_independent_method_on_string.test.w
new file mode 100644
index 00000000000..3c0edf20407
--- /dev/null
+++ b/examples/tests/valid/phase_independent_method_on_string.test.w
@@ -0,0 +1,22 @@
+bring cloud;
+bring expect;
+
+let api = new cloud.Api();
+let urlRegex = regex.compile("https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]\{1,256\}\\.[a-zA-Z0-9()]\{1,6\}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)");
+
+// Verify the url is not a valid url (because it's a token)
+expect.equal(urlRegex.test(api.url), false);
+
+let tokenLength = api.url.length;
+
+
+test "phase independent method on string evaluated inflight" {
+  // Make sure api.url isn't a token but evaled inflight
+  expect.equal(urlRegex.test(api.url), true);
+  
+  // Call a method on the url (should be called inflight)
+  expect.equal(api.url.startsWith("http"), true);
+
+  // Call the length property (should be called inflight) and make sure it's different than the preflight length
+  expect.notEqual(api.url.length, tokenLength);
+}
\ No newline at end of file
diff --git a/examples/tests/valid/redis.test.w b/examples/tests/valid/redis.test.w
index 27defe8c8e4..617bc9a1325 100644
--- a/examples/tests/valid/redis.test.w
+++ b/examples/tests/valid/redis.test.w
@@ -30,5 +30,5 @@ test "testing Redis" {
     return r.get("hello") != nil;
   });
 
-  assert("world!" == "{r.get("hello")}");
+  assert("world!" == "{r.get("hello") ?? "nil"}");
 }
diff --git a/examples/tests/valid/resource.test.w b/examples/tests/valid/resource.test.w
index f72314d27a2..3751b1f50aa 100644
--- a/examples/tests/valid/resource.test.w
+++ b/examples/tests/valid/resource.test.w
@@ -1,4 +1,5 @@
 bring cloud;
+bring util;
 
 // User defined resource
 class Foo {
@@ -139,8 +140,12 @@ let bigOlPublisher = new BigPublisher();
 
 test "dependency cycles" {
   bigOlPublisher.publish("foo");
-  let count = bigOlPublisher.getObjectCount();
-  // assert(count == 2); // TODO: This fails due to issue: https://github.com/winglang/wing/issues/2082
+
+  util.waitUntil(inflight () => {
+    let count = bigOlPublisher.getObjectCount();
+    return count == 2;
+  });
+  assert(bigOlPublisher.getObjectCount() == 2);
 }
 
 // Scope and ID tests
@@ -153,18 +158,18 @@ class ScopeAndIdTestClass {
   new() {
     // Create a Dummy in my scope
     let d1 = new Dummy();
-    assert(d1.node.path.endsWith("/ScopeAndIdTestClass/Dummy"));
+    assert(nodeof(d1).path.endsWith("/ScopeAndIdTestClass/Dummy"));
     // Create a Dummy in someone else's scope
     let d2 = new Dummy() in d1;
-    assert(d2.node.path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy"));
+    assert(nodeof(d2).path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy"));
     // Create a Dummy in someone else's scope (reference)
     let d3 = new Dummy() in Dummy.getInstance(d2);
-    assert(d3.node.path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy/StaticDummy/Dummy"));
+    assert(nodeof(d3).path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy/StaticDummy/Dummy"));
     // Generate multiple Dummys with different id's
     for i in 0..3 {
       let x = new Dummy() as "tc{i}";
       let expected_path = "/ScopeAndIdTestClass/tc{i}";
-      assert(x.node.path.endsWith(expected_path));
+      assert(nodeof(x).path.endsWith(expected_path));
     }
   }
 }
diff --git a/examples/tests/valid/resource_as_inflight_literal.test.w b/examples/tests/valid/resource_as_inflight_literal.test.w
index 6c422e17b2e..1581e540416 100644
--- a/examples/tests/valid/resource_as_inflight_literal.test.w
+++ b/examples/tests/valid/resource_as_inflight_literal.test.w
@@ -1,7 +1,7 @@
 bring cloud;
 
 class Foo impl cloud.IFunctionHandler {
-  pub inflight handle(message: str): str {
+  pub inflight handle(): str {
     return "hello world!";
   }
 }
diff --git a/examples/tests/valid/resource_captures.test.w b/examples/tests/valid/resource_captures.test.w
index a2aa0ee686d..edb4fe45010 100644
--- a/examples/tests/valid/resource_captures.test.w
+++ b/examples/tests/valid/resource_captures.test.w
@@ -58,7 +58,7 @@ class MyResource {
       "k1" => 11,
       "k2" => 22
     };
-    this.setOfStr = {"s1", "s2", "s1"};
+    this.setOfStr = Set<str>["s1", "s2", "s1"];
 
     this.another = new Another();
     this.myQueue = new cloud.Queue();
diff --git a/examples/tests/valid/resource_captures_globals.test.w b/examples/tests/valid/resource_captures_globals.test.w
index 6f157f5cbef..765903ac005 100644
--- a/examples/tests/valid/resource_captures_globals.test.w
+++ b/examples/tests/valid/resource_captures_globals.test.w
@@ -1,4 +1,5 @@
 bring cloud;
+bring util;
 
 let globalBucket = new cloud.Bucket();
 let globalCounter = new cloud.Counter();
@@ -7,7 +8,7 @@ let globalBool = true;
 let globalNum = 42;
 let globalArrayOfStr = ["hello", "world"];
 let globalMapOfNum = Map<num>{ "a" => -5, "b" => 2 };
-let globalSetOfStr = Set<str>{ "a", "b" };
+let globalSetOfStr = Set<str>[ "a", "b" ];
 
 class First {
   pub myResource: cloud.Bucket;
@@ -72,7 +73,9 @@ class MyResource {
     globalAnother.first.myResource.put("key", "value");
     assert(globalAnother.myMethod() > 0);
     assert(Another.myStaticMethod() > 0);
-    //assert(this.localCounter.peek() > 0); // TODO: this fails, why?
+    util.waitUntil(inflight () => {
+      return this.localCounter.peek() > 0;
+    });
   }
 }
 
@@ -86,4 +89,4 @@ test "access cloud resource through static methods only" {
   // Call a static method which access a (global) cloud resource
   // the capturing should work through the Type binding mechanism
   assert(Another.myStaticMethod() == 0);
-}
\ No newline at end of file
+}
diff --git a/examples/tests/valid/sim_resource.test.w b/examples/tests/valid/sim_resource.test.w
new file mode 100644
index 00000000000..af3d03634cf
--- /dev/null
+++ b/examples/tests/valid/sim_resource.test.w
@@ -0,0 +1,29 @@
+bring sim;
+
+enum MyEnum {
+  A,
+  B,
+  C
+}
+
+struct MyStruct {
+  a: num;
+  b: str;
+}
+
+inflight class ResourceBackend impl sim.IResource {
+  pub onStop() {}
+
+  pub emptyMethod() {}
+  pub methodWithNums(a: num, b: num): num { return 0; }
+  pub methodWithStrs(a: str, b: str): str { return ""; }
+  pub methodWithBools(a: bool, b: bool): bool { return false;}
+  pub methodWithOptionals(a: num?, b: str?): bool? {}
+  pub methodWithJsons(a: Json, b: Json): Json { return {}; }
+  pub methodWithEnums(a: MyEnum, b: MyEnum): MyEnum { return MyEnum.A; }
+  pub methodWithArrays(a: Array<str>, b: Array<num>): Array<bool> { return []; }
+  pub methodWithMaps(a: Map<num>, b: Map<str>): Map<bool> { return {}; }
+  pub methodWithStructs(a: MyStruct, b: MyStruct): MyStruct { return MyStruct{a: 0, b: ""}; }
+  pub methodWithVariadics(a: str, ...b: Array<num>) {}
+  pub methodWithComplexTypes(a: Array<Map<str?>>): Map<Array<Json>> { return {}; }
+}
diff --git a/examples/tests/valid/statements_if.test.w b/examples/tests/valid/statements_if.test.w
index f3179d4d078..d3567df9274 100644
--- a/examples/tests/valid/statements_if.test.w
+++ b/examples/tests/valid/statements_if.test.w
@@ -38,3 +38,35 @@ test "test" {
     }
   }
 }
+
+if true {
+  let a: str? = nil;
+  let b: str? = "b";
+  let c: str? = "c";
+  if let d = a {
+    assert(false);
+  } elif b? {
+    assert(true);
+  } elif let e = c {
+    assert(false);
+  } else {
+    assert(false);
+  }
+}
+
+if true {
+  let a: str? = nil;
+  let b: str? = nil;
+  let c: str? = "c";
+  if let d = a {
+    assert(false);
+  } elif let e = c {
+    assert(true);
+  } elif b? {
+    assert(false);
+  } else {
+    assert(false);
+  }
+}
+
+
diff --git a/examples/tests/valid/std_containers.test.w b/examples/tests/valid/std_containers.test.w
index 3cb1190b880..b6a6f1ae3d2 100644
--- a/examples/tests/valid/std_containers.test.w
+++ b/examples/tests/valid/std_containers.test.w
@@ -23,7 +23,7 @@ let mergedMutArray = mutArray.concat(mutArray2);
 assert(mergedMutArray.length == 7);
 assert(mergedMutArray.at(5) == "that");
 
-let sSet = {"one", "two"};
+let sSet = Set<str>["one", "two"];
 let mutSet = sSet.copyMut();
 mutSet.add("three");
 let immutSet = mutSet.copy();
@@ -55,10 +55,10 @@ let heterogeneousDoubleArray = Array<Array<Animal>>[
   Array<Animal>[new Cat() as "C3", new Dog() as "D2"],
   [new Animal() as "A1"],
 ];
-let heterogeneousSet = Set<Animal>{
+let heterogeneousSet = Set<Animal>[
   new Cat() as "C4",
   new Dog() as "D3",
-};
+];
 let heterogeneousMap = Map<Animal>{
   "cat" => new Cat() as "C5",
   "dog" => new Dog() as "D4",
diff --git a/examples/tests/valid/std_string.test.w b/examples/tests/valid/std_string.test.w
index 2365782540e..704fa4bbc4c 100644
--- a/examples/tests/valid/std_string.test.w
+++ b/examples/tests/valid/std_string.test.w
@@ -18,6 +18,10 @@ assert("hello" + " world" == "hello world");
 assert(
 "hello {"funky"}
  world" == "hello funky\n world");
+
+let var initial = "hey, ";
+initial += "you";
+assert(initial == "hey, you");
   
 // For debugging the test
 test "string" {
@@ -25,3 +29,8 @@ test "string" {
   log(s1.split(" ").at(1));
   log(s1.concat(s2));
 }
+
+let s3 = "hello
+world";
+let s4 = "hello\nworld";
+assert(s3 == s4);
diff --git a/examples/tests/valid/stringify.test.w b/examples/tests/valid/stringify.test.w
new file mode 100644
index 00000000000..5cfc5a75401
--- /dev/null
+++ b/examples/tests/valid/stringify.test.w
@@ -0,0 +1,8 @@
+enum MyEnum { A, B, C }
+
+// If a value's type is stringable, it can be passed directly to the "log" function
+log("my string");
+log(42);
+log(true);
+log(Json { "cool": "beans" });
+log(MyEnum.A);
diff --git a/examples/tests/valid/struct_from_json.test.w b/examples/tests/valid/struct_from_json.test.w
index cd878088614..0bc62575891 100644
--- a/examples/tests/valid/struct_from_json.test.w
+++ b/examples/tests/valid/struct_from_json.test.w
@@ -282,7 +282,7 @@ assert(myStruct.m2.val == "10");
 let schema = MyStruct.schema();
 schema.validate(jMyStruct); // Should not throw exception
 
-let expectedSchema = {"id":"/MyStruct","type":"object","properties":{"m1":{"type":"object","properties":{"val":{"type":"number"}},"required":["val"]},"m2":{"type":"object","properties":{"val":{"type":"string"}},"required":["val"]}},"required":["m1","m2"]};
+let expectedSchema = {"$id":"/MyStruct","type":"object","properties":{"m1":{"type":"object","properties":{"val":{"type":"number"}},"required":["val"]},"m2":{"type":"object","properties":{"val":{"type":"string"}},"required":["val"]}},"required":["m1","m2"]};
 
 assert(schema.asStr() == Json.stringify(expectedSchema));
 
diff --git a/examples/tests/valid/structs.test.w b/examples/tests/valid/structs.test.w
index c7da198c7ad..21e2fcff04b 100644
--- a/examples/tests/valid/structs.test.w
+++ b/examples/tests/valid/structs.test.w
@@ -1,3 +1,13 @@
+bring expect; 
+
+interface IFoo {
+  // other types can reference structs before they are defined
+  field0(): A;
+}
+
+// type annotations can reference structs before they are defined
+let a: A? = nil;
+
 struct A {
   field0: str;
 }
@@ -70,4 +80,60 @@ test "struct definitions are phase independant" {
   };
 
   assert(s2.a == "foo");
-}
\ No newline at end of file
+}
+
+// mutually referential structs
+struct M1 {
+  m2: M2?;
+}
+
+struct M2 {
+  m1: M1?;
+}
+
+// Self referential struct
+struct Node {
+	val: str;
+	next: Node?;
+}
+
+let aNode = Node {val: "someval"};
+let bNode = Node {val: "otherval", next: aNode};
+
+expect.equal(Json.stringify(bNode), "\{\"val\":\"otherval\",\"next\":\{\"val\":\"someval\"\}\}");
+
+// A documented struct (should be parsed without errors)
+/// Struct documentation
+/// blah blah blah
+struct DocumentedStruct {
+    /// Field documentation
+    /// blah blah blah
+    field: str;
+}
+
+struct SomeStruct1 {
+  numField: num;
+}
+struct SomeStruct2 {
+  structField: SomeStruct1;
+  strField: str;
+}
+struct SomeStruct3 extends SomeStruct2 {
+  boolField: bool;
+  otherField: str;
+}
+let numField = 1337;
+let strField = "leet";
+let boolField = true;
+let structField = SomeStruct1 { numField };
+// Struct literal initialization with punning
+let someStruct3 = SomeStruct3 { 
+  boolField, 
+  strField, 
+  otherField: "good",
+  structField 
+};
+assert(someStruct3.boolField == true);
+assert(someStruct3.strField == "leet");
+assert(someStruct3.structField.numField == 1337);
+assert(someStruct3.otherField == "good");
\ No newline at end of file
diff --git a/examples/tests/valid/subdir/bar.w b/examples/tests/valid/subdir/bar.w
index 6a8d9239c9a..d71c7640c46 100644
--- a/examples/tests/valid/subdir/bar.w
+++ b/examples/tests/valid/subdir/bar.w
@@ -4,4 +4,7 @@ pub class Bar {
   pub static bar(): str {
     return "bar";
   }
+  pub static getSubdir(): str {
+    return @dirname;
+  }
 }
diff --git a/examples/tests/valid/subdir/subfile.w b/examples/tests/valid/subdir/subfile.w
index 7858188260d..7c6556ebd2e 100644
--- a/examples/tests/valid/subdir/subfile.w
+++ b/examples/tests/valid/subdir/subfile.w
@@ -1,5 +1,6 @@
 bring math;
 
 pub class Q {
-  extern "./util.js" static inflight greet(name: str): str;
+  pub extern "./util.ts" static inflight greet(name: str): str;
+  pub extern "./util.ts" static preflightGreet(name: str): str;
 }
diff --git a/examples/tests/valid/subdir/util.extern.d.ts b/examples/tests/valid/subdir/util.extern.d.ts
new file mode 100644
index 00000000000..2f2cb7cf7c1
--- /dev/null
+++ b/examples/tests/valid/subdir/util.extern.d.ts
@@ -0,0 +1,4 @@
+export default interface extern {
+  greet: (name: string) => Promise<string>,
+  preflightGreet: (name: string) => string,
+}
diff --git a/examples/tests/valid/subdir/util.js b/examples/tests/valid/subdir/util.js
deleted file mode 100644
index 9613a35374a..00000000000
--- a/examples/tests/valid/subdir/util.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.greet = function(name) {
-    return 'Hello ' + name;
-}
diff --git a/examples/tests/valid/subdir/util.ts b/examples/tests/valid/subdir/util.ts
new file mode 100644
index 00000000000..325859f7d58
--- /dev/null
+++ b/examples/tests/valid/subdir/util.ts
@@ -0,0 +1,9 @@
+import type extern from "./util.extern";
+
+export const greet: extern["greet"] = async (name) => {
+  return "Hello " + name;
+}
+
+export const preflightGreet: extern["preflightGreet"] = (name) => {
+  return "Hello " + name;
+} 
diff --git a/examples/tests/valid/this.test.w b/examples/tests/valid/this.test.w
new file mode 100644
index 00000000000..db4f14b5c34
--- /dev/null
+++ b/examples/tests/valid/this.test.w
@@ -0,0 +1,12 @@
+bring expect;
+
+// Play around with "this"
+
+let path = nodeof(this).path;
+
+for c in nodeof(this).children {
+  log(nodeof(c).path);
+}
+
+expect.notNil(nodeof(this));
+expect.equal(nodeof(this).path.split("/").at(0), "root");
diff --git a/examples/tests/valid/to_inflight.test.w b/examples/tests/valid/to_inflight.test.w
new file mode 100644
index 00000000000..445f1445cc6
--- /dev/null
+++ b/examples/tests/valid/to_inflight.test.w
@@ -0,0 +1,11 @@
+bring cloud;
+
+let b = new cloud.Bucket();
+
+let x = inflight () => {
+  b.list();
+};
+
+let js = std.Resource.toInflight(x);
+
+assert(js.contains("client"));
\ No newline at end of file
diff --git a/examples/tests/valid/turbo.json b/examples/tests/valid/turbo.json
index abf7e795ed5..687eb4e60b5 100644
--- a/examples/tests/valid/turbo.json
+++ b/examples/tests/valid/turbo.json
@@ -1,19 +1,9 @@
 {
   "$schema": "https://turborepo.org/schema.json",
-  "extends": [
-    "//"
-  ],
+  "extends": ["//"],
   "pipeline": {
     "topo": {
-      "inputs": [
-        "**",
-        "!node_modules/**",
-        "!**/target/**"
-      ],
-      "dependsOn": [
-        "^compile",
-        "^topo"
-      ]
+      "dependsOn": ["^topo", "jsii-fixture#compile"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/examples/tests/valid/unused_lift.test.w b/examples/tests/valid/unused_lift.test.w
new file mode 100644
index 00000000000..485db72adb2
--- /dev/null
+++ b/examples/tests/valid/unused_lift.test.w
@@ -0,0 +1,31 @@
+bring cloud;
+
+let b = new cloud.Bucket();
+
+class Foo {
+  inflight access_b() {
+    b.list();
+  }
+
+  pub inflight m() {}
+}
+
+let f = new Foo();
+
+test "Use class but not method that access lifted object" {
+  f.m();
+}
+
+class Bar {
+  static inflight access_b() {
+    b.list();
+  }
+
+  pub inflight m() {}
+}
+
+let bar = new Bar();
+
+test "Use class but not static method that access lifted object" {
+  bar.m();
+}
\ No newline at end of file
diff --git a/examples/tests/valid/url_utils.extern.d.ts b/examples/tests/valid/url_utils.extern.d.ts
new file mode 100644
index 00000000000..d44c96f5206
--- /dev/null
+++ b/examples/tests/valid/url_utils.extern.d.ts
@@ -0,0 +1,3 @@
+export default interface extern {
+  isValidUrl: (url: string) => Promise<boolean>,
+}
diff --git a/examples/tests/valid/url_utils.js b/examples/tests/valid/url_utils.js
deleted file mode 100644
index 77bc7a93eef..00000000000
--- a/examples/tests/valid/url_utils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-exports.isValidUrl = function(url) {
-  try {
-    new URL(url);
-    return true;
-  } catch {
-    return false;
-  }
-};
\ No newline at end of file
diff --git a/examples/tests/valid/url_utils.ts b/examples/tests/valid/url_utils.ts
new file mode 100644
index 00000000000..5354d5835aa
--- /dev/null
+++ b/examples/tests/valid/url_utils.ts
@@ -0,0 +1,5 @@
+import type extern from "./url_utils.extern";
+
+export const isValidUrl: extern["isValidUrl"] = async (url) => {
+  return URL.canParse(url);
+}
\ No newline at end of file
diff --git a/examples/tests/valid/website_with_api.test.w b/examples/tests/valid/website_with_api.test.w
index 4f2223b3363..5590e5bd30e 100644
--- a/examples/tests/valid/website_with_api.test.w
+++ b/examples/tests/valid/website_with_api.test.w
@@ -7,7 +7,7 @@ bring expect;
 let api = new cloud.Api(
   cors: true,
   corsOptions: cloud.ApiCorsOptions {
-    allowOrigin: ["*"],
+    allowOrigin: "*",
     allowMethods: [cloud.HttpMethod.GET, cloud.HttpMethod.POST, cloud.HttpMethod.OPTIONS],
     allowHeaders: ["Content-Type"],
     allowCredentials: false,
diff --git a/examples/tests/valid/while_loop_await.test.w b/examples/tests/valid/while_loop_await.test.w
index f7e032126cf..4ba2bc9a549 100644
--- a/examples/tests/valid/while_loop_await.test.w
+++ b/examples/tests/valid/while_loop_await.test.w
@@ -2,7 +2,7 @@ bring cloud;
 
 let queue = new cloud.Queue();
 
-let handler = inflight (body: str): str => {
+let handler = inflight (body: str): void => {
     let i = 0;
     let iterator = inflight (j: num): num => {
         return j+1;
diff --git a/examples/ts-fixture/README.md b/examples/ts-fixture/README.md
new file mode 100644
index 00000000000..2fc1e28b29f
--- /dev/null
+++ b/examples/ts-fixture/README.md
@@ -0,0 +1 @@
+# TypeScript Wing Project
\ No newline at end of file
diff --git a/examples/ts-fixture/package.json b/examples/ts-fixture/package.json
new file mode 100644
index 00000000000..6eb487d9095
--- /dev/null
+++ b/examples/ts-fixture/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "ts-fixture",
+  "version": "0.0.0",
+  "scripts": {
+    "compile": "wing compile ./src/main.ts",
+    "test": "wing test ./src/main.ts"
+  },
+  "dependencies": {
+    "@wingcloud/framework": "workspace:^",
+    "@winglibs/testfixture": "workspace:^"
+  },
+  "devDependencies": {
+    "@types/node": "^20",
+    "winglang": "workspace:^"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/examples/ts-fixture/src/main.ts b/examples/ts-fixture/src/main.ts
new file mode 100644
index 00000000000..ac90159957e
--- /dev/null
+++ b/examples/ts-fixture/src/main.ts
@@ -0,0 +1,49 @@
+import { inflight, lift, main, cloud } from "@wingcloud/framework";
+import * as winglib from "@winglibs/testfixture";
+import * as assert from "node:assert";
+import { deepStrictEqual } from "node:assert";
+import { addOne } from "./other";
+
+main((app, test) => {
+  const bucket = new cloud.Bucket(app, "B1");
+  const f = new cloud.Function(
+    app,
+    "F1",
+    lift({ bucket })
+      .grant({ bucket: ["put"] })
+      .inflight(async ({ bucket }) => {
+        assert.strictEqual("", "");
+        await bucket.put("hi", "stuff");
+        console.log("hi from function");
+        return "hi";
+      })
+  );
+
+  const store = new winglib.Store(app, "Store");
+
+  let inf = inflight<() => Promise<void>>(async ({}) => {
+    console.log("hi from loose inflight");
+  });
+
+  store.onSet(
+    inflight(async ({}, message) => {
+      console.log(`Set("${message}")`);
+    })
+  );
+
+  test(
+    "test",
+    lift({ store, inf, f })
+      .grant({ store: ["set"] })
+      .inflight(async ({ store, inf, f }) => {
+        deepStrictEqual(1, 1);
+        assert.deepStrictEqual(1, 1);
+        assert.deepStrictEqual(addOne(1), 2);
+
+        console.log("hi from test");
+        await inf();
+        await f.invoke("me");
+        await store.set("wing");
+      })
+  );
+});
diff --git a/examples/ts-fixture/src/other.ts b/examples/ts-fixture/src/other.ts
new file mode 100644
index 00000000000..f20e5ae85e7
--- /dev/null
+++ b/examples/ts-fixture/src/other.ts
@@ -0,0 +1,3 @@
+export function addOne(x: number) {
+  return x + 1;
+}
\ No newline at end of file
diff --git a/examples/ts-fixture/turbo.json b/examples/ts-fixture/turbo.json
new file mode 100644
index 00000000000..09431dae786
--- /dev/null
+++ b/examples/ts-fixture/turbo.json
@@ -0,0 +1,10 @@
+{
+    "$schema": "https://turborepo.org/schema.json",
+    "extends": ["//"],
+    "pipeline": {
+      "compile": {
+        "outputs": ["src/target/**"]
+      },
+      "test": {}
+    }
+  }
diff --git a/examples/wing-fixture/index.js b/examples/wing-fixture/index.js
deleted file mode 100644
index ff7bd09c0cf..00000000000
--- a/examples/wing-fixture/index.js
+++ /dev/null
@@ -1 +0,0 @@
-// placeholder
diff --git a/examples/wing-fixture/package.json b/examples/wing-fixture/package.json
index 814e0341ad3..858042dd742 100644
--- a/examples/wing-fixture/package.json
+++ b/examples/wing-fixture/package.json
@@ -8,15 +8,23 @@
     "url": "https://wing.cloud",
     "organization": true
   },
+  "scripts": {
+    "compile": "wing compile .",
+    "test": "wing test"
+  },
   "license": "MIT",
   "engines": {
-    "node": ">=v18.0.0"
+    "node": ">=v20.0.0"
   },
-  "main": "index.js",
+  "main": "target/wing-fixture.wsim/.wing/preflight.cjs",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/winglang/wing.git"
   },
+  "devDependencies": {
+    "winglang": "workspace:^",
+    "@winglang/sdk": "workspace:^"
+  },
   "private": true,
   "wing": true,
   "volta": {
diff --git a/examples/wing-fixture/store.test.w b/examples/wing-fixture/store.test.w
new file mode 100644
index 00000000000..aaac977506e
--- /dev/null
+++ b/examples/wing-fixture/store.test.w
@@ -0,0 +1,11 @@
+bring "./store.w" as store;
+
+let s = new store.Store();
+
+s.onSet(inflight (message) => {
+  assert(message == "hi");
+});
+
+test "onSet" {
+  s.set("hi");
+}
\ No newline at end of file
diff --git a/examples/wing-fixture/store.w b/examples/wing-fixture/store.w
index e7120492477..5ad06aeb964 100644
--- a/examples/wing-fixture/store.w
+++ b/examples/wing-fixture/store.w
@@ -1,16 +1,30 @@
 bring cloud;
 bring "./subdir/util.w" as myutil;
 
+pub struct StoreOptions {
+  name: str?;
+}
+
 pub class Store {
+  handlers: MutArray<inflight (str): void>;
   data: cloud.Bucket;
-  new() {
+
+  new(options: StoreOptions?) {
     this.data = new cloud.Bucket();
+    this.handlers = MutArray<inflight (str): void> [];
   }
 
   extern "./util.js" pub static makeKey(name: str): str;
   extern "./util.js" pub static inflight makeKeyInflight(name: str): str;
 
-  inflight set(message: str) {
+  pub inflight set(message: str) {
     this.data.put("data.txt", myutil.double(message));
+    for handler in this.handlers {
+      handler(message);
+    }
+  }
+
+  pub onSet(handler: inflight (str): void) {
+    this.handlers.push(handler);
   }
 }
diff --git a/examples/wing-fixture/subdir/util.w b/examples/wing-fixture/subdir/util.w
index 0b8f3a2768b..2051bffab74 100644
--- a/examples/wing-fixture/subdir/util.w
+++ b/examples/wing-fixture/subdir/util.w
@@ -1,4 +1,6 @@
 pub class Util {
+  extern "../util.js" pub static inflight makeKeyInflight(name: str): str;
+
   pub static inflight double(msg: str): str {
     return "{msg}{msg}";
   }
diff --git a/examples/wing-fixture/turbo.json b/examples/wing-fixture/turbo.json
index 25c2b7f7dca..c2dcd75a401 100644
--- a/examples/wing-fixture/turbo.json
+++ b/examples/wing-fixture/turbo.json
@@ -1,5 +1,12 @@
 {
     "$schema": "https://turborepo.org/schema.json",
     "extends": ["//"],
-    "pipeline": {}
+    "pipeline": {
+      "compile": {
+        "dependsOn": ["^compile"],
+        "inputs": ["**/*.w", "**/*.js", "**/*.ts"],
+        "outputs": ["target/wing-fixture.wsim/**"]
+      },
+      "topo": {}
+    }
   }
diff --git a/examples/wing-fixture/util.extern.d.ts b/examples/wing-fixture/util.extern.d.ts
new file mode 100644
index 00000000000..1ff1975996d
--- /dev/null
+++ b/examples/wing-fixture/util.extern.d.ts
@@ -0,0 +1,4 @@
+export default interface extern {
+  makeKey: (name: string) => string,
+  makeKeyInflight: (name: string) => Promise<string>,
+}
diff --git a/libs/@wingcloud/framework/.gitignore b/libs/@wingcloud/framework/.gitignore
new file mode 100644
index 00000000000..77738287f0e
--- /dev/null
+++ b/libs/@wingcloud/framework/.gitignore
@@ -0,0 +1 @@
+dist/
\ No newline at end of file
diff --git a/libs/@wingcloud/framework/README.md b/libs/@wingcloud/framework/README.md
new file mode 100644
index 00000000000..cb59672708d
--- /dev/null
+++ b/libs/@wingcloud/framework/README.md
@@ -0,0 +1,16 @@
+# @wingcloud/framework - Experimental TypeScript experience for Wing
+
+```ts
+// main.ts
+import { main, cloud } from "@wingcloud/framework";
+
+main((app) => {
+  new cloud.Bucket(app, "Bucket");
+})
+```
+
+```shell
+wing compile main.ts
+wing compile -t tf-aws main.ts
+wing test main.ts
+```
\ No newline at end of file
diff --git a/libs/@wingcloud/framework/package.json b/libs/@wingcloud/framework/package.json
new file mode 100644
index 00000000000..ebebb45033d
--- /dev/null
+++ b/libs/@wingcloud/framework/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "@wingcloud/framework",
+  "version": "0.0.0",
+  "author": {
+    "name": "Wing Cloud",
+    "email": "ping@wing.cloud",
+    "organization": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/winglang/wing.git",
+    "directory": "libs/@wingcloud/framework"
+  },
+  "description": "Experimental TypeScript experience for Wing",
+  "main": "dist/index.js",
+  "license": "MIT",
+  "scripts": {
+    "compile": "tsup",
+    "test": "vitest run --update",
+    "package": "bump-pack -b"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org",
+    "tag": "latest"
+  },
+  "peerDependencies": {
+    "@winglang/sdk": "*",
+    "typescript": "^5.3.3"
+  },
+  "devDependencies": {
+    "@types/node": "^20.11.0",
+    "@winglang/sdk": "workspace:^",
+    "bump-pack": "workspace:^",
+    "tsup": "^8.0.2",
+    "vitest": "^1.6.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "volta": {
+    "extends": "../../../package.json"
+  }
+}
diff --git a/libs/@wingcloud/framework/src/index.ts b/libs/@wingcloud/framework/src/index.ts
new file mode 100644
index 00000000000..0d8f4a90991
--- /dev/null
+++ b/libs/@wingcloud/framework/src/index.ts
@@ -0,0 +1,10 @@
+// re-exporting useful types from the sdk
+export { cloud, ex } from "@winglang/sdk";
+export { Construct } from "@winglang/sdk/lib/core/types";
+
+// typescript workflow primitives
+export { inflight, lift } from "@winglang/sdk/lib/core";
+export { main } from "./main";
+
+// used internally by wing compiler
+export * as internal from "./internal";
diff --git a/libs/@wingcloud/framework/src/internal.ts b/libs/@wingcloud/framework/src/internal.ts
new file mode 100644
index 00000000000..fe7bef861c2
--- /dev/null
+++ b/libs/@wingcloud/framework/src/internal.ts
@@ -0,0 +1,121 @@
+import { dirname, join } from "path";
+import type ts from "typescript";
+
+export interface CompileOptions {
+  workDir: string;
+  entrypoint: string;
+}
+
+export async function compile(options: CompileOptions) {
+  const entrypointDir = dirname(options.entrypoint);
+  const ts = (await import("typescript")).default;
+  const outDir = join(options.workDir, "ts");
+  const wingsdkDir = dirname(require.resolve("@winglang/sdk"));
+
+  const tsconfigPath = ts.findConfigFile(entrypointDir, ts.sys.fileExists);
+  const mandatoryCompilerOptions: ts.CompilerOptions = {
+    // Managed options
+    target: ts.ScriptTarget.ES2022,
+    module: ts.ModuleKind.CommonJS,
+    moduleResolution: ts.ModuleResolutionKind.Node10,
+    paths: {
+      "@winglang/sdk": [wingsdkDir],
+      "@winglang/sdk/*": [wingsdkDir + "/*"],
+    },
+    outDir,
+    listEmittedFiles: true,
+    noEmitOnError: true,
+  };
+
+  const defaultCompilerOptions: ts.CompilerOptions = {
+    sourceMap: true,
+    declaration: false,
+    skipLibCheck: true,
+    isolatedModules: true,
+    esModuleInterop: true,
+  };
+
+  let compilerOptions: ts.CompilerOptions = defaultCompilerOptions;
+
+  if (tsconfigPath) {
+    const { config, error } = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+    if (error) {
+      throw new Error(
+        `Failed to read tsconfig at ${tsconfigPath}: ${error.messageText}`
+      );
+    }
+
+    const { options, errors } = ts.parseJsonConfigFileContent(
+      config,
+      ts.sys,
+      dirname(tsconfigPath),
+      compilerOptions
+    );
+    compilerOptions = options;
+
+    if (errors.length > 0) {
+      throw new Error(
+        `Failed to parse tsconfig at ${tsconfigPath}: ${errors
+          .map((e) => e.messageText)
+          .join("\n")}`
+      );
+    }
+
+    let attemptedOverride = false;
+    for (const managedOption of Object.keys(mandatoryCompilerOptions)) {
+      if (config?.compilerOptions?.[managedOption] !== undefined) {
+        console.warn(
+          `'${managedOption}' is managed by wing and will be ignored from ${tsconfigPath}`
+        );
+        attemptedOverride = true;
+        delete options[managedOption];
+      }
+    }
+
+    if (attemptedOverride) {
+      console.warn(`tsconfig options used:`);
+      console.warn(compilerOptions);
+    }
+  }
+
+  Object.assign(compilerOptions, mandatoryCompilerOptions);
+
+  const program = ts.createProgram([options.entrypoint], compilerOptions);
+
+  const { InflightTransformer } = await import("./transformer");
+  const transformer = new InflightTransformer(program);
+
+  const emitResult = program.emit(undefined, undefined, undefined, undefined, {
+    before: [(sourceFile) => transformer.transform(sourceFile)],
+  });
+
+  const allDiagnostics = emitResult.diagnostics.concat(transformer.extraErrors);
+
+  if (
+    emitResult.emitSkipped ||
+    allDiagnostics.filter((d) => d.category === ts.DiagnosticCategory.Error)
+      .length > 0
+  ) {
+    const fullError = ts.formatDiagnosticsWithColorAndContext(allDiagnostics, {
+      getCanonicalFileName: (f) => f,
+      getCurrentDirectory: () => process.cwd(),
+      getNewLine: () => "\n",
+    });
+
+    throw new Error(`TS compilation failed:\n${fullError}`);
+  }
+
+  // get the last .js file emitted, this should be the entrypoint
+  const emittedFiles = emitResult.emittedFiles?.filter((f) =>
+    f.endsWith(".js")
+  );
+  const emittedFile = emittedFiles?.[emittedFiles.length - 1];
+
+  if (!emittedFile) {
+    throw new Error(
+      `TS compilation failed: Could not find emitted file in ${outDir}`
+    );
+  }
+
+  return emittedFile;
+}
diff --git a/libs/@wingcloud/framework/src/main.ts b/libs/@wingcloud/framework/src/main.ts
new file mode 100644
index 00000000000..39cadaf1eed
--- /dev/null
+++ b/libs/@wingcloud/framework/src/main.ts
@@ -0,0 +1,102 @@
+import { platform, std } from "@winglang/sdk";
+import type { Construct } from "@winglang/sdk/lib/core/types";
+
+/**
+ * Properties for a Wing app.
+ */
+export interface AppProps {
+  /**
+   * The name and id of the app.
+   * @default "main"
+   */
+  name?: string;
+}
+
+/**
+ * Create a Wing app.
+ *
+ * ```ts
+ * import { main, cloud } from "@wingcloud/framework";
+ *
+ * main((root) => {
+ *   new cloud.Bucket(root, "Bucket");
+ * });
+ * ```
+ *
+ * Tests can be added using the second argument:
+ *
+ * ```ts
+ * import { main, cloud } from "@wingcloud/framework";
+ *
+ * main((root, test) => {
+ *   new cloud.Bucket(root, "Bucket");
+ *
+ *   test("bucket holds stuff", async () => {
+ *     lift({ bucket }).inflight(async ({ bucket }) => {
+ *       await bucket.put("key", "value");
+ *     });
+ *   });
+ *
+ * });
+ * ```
+ *
+ * @param fn Define your application using the provided root construct.
+ *           Note that this function may be called multiple times when used with `wing test`.
+ */
+export function main(
+  fn: (
+    root: Construct,
+    test: (
+      name: string,
+      handler: std.ITestHandler,
+      props?: std.TestProps
+    ) => void
+  ) => void,
+  props: AppProps = {}
+) {
+  // check if we have everything we need
+  const requiredEnvVars = [
+    "WING_PLATFORMS",
+    "WING_SYNTH_DIR",
+    "WING_SOURCE_DIR",
+    "WING_IS_TEST",
+  ];
+  for (const envVar of requiredEnvVars) {
+    if (process.env[envVar] === undefined) {
+      throw new Error(`\
+Missing environment variable: ${envVar}
+This is a Wing app and must be run through the Wing CLI (npm install -f winglang).`);
+    }
+  }
+
+  class $Root extends std.Resource {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      fn(this, (name, handler, props) => {
+        new std.Test(this, name, handler, props);
+      });
+    }
+  }
+
+  const platformPaths = ((s) => (!s ? [] : s.split(";")))(
+    process.env.WING_PLATFORMS
+  );
+  const outdir = process.env.WING_SYNTH_DIR;
+  const name = props.name ?? "main";
+  const rootConstruct = $Root;
+  const isTestEnvironment = process.env.WING_IS_TEST === "true";
+  const entrypointDir = process.env.WING_SOURCE_DIR!;
+  const rootId = process.env.WING_ROOT_ID;
+
+  const $PlatformManager = new platform.PlatformManager({ platformPaths });
+  const app = $PlatformManager.createApp({
+    outdir,
+    name,
+    rootConstruct,
+    isTestEnvironment,
+    entrypointDir,
+    rootId,
+  });
+
+  app.synth();
+}
diff --git a/libs/@wingcloud/framework/src/transformer.ts b/libs/@wingcloud/framework/src/transformer.ts
new file mode 100644
index 00000000000..4b50353a70b
--- /dev/null
+++ b/libs/@wingcloud/framework/src/transformer.ts
@@ -0,0 +1,132 @@
+import { dirname, join } from "path";
+import ts from "typescript";
+
+/**
+ * This transformer finds all usages of `inflight` and does the following with the functions passed to it:
+ * 1. Replaces references to top-level imports with inline `require` calls
+ * 2. Throws an error if a reference to a non-import variable declared in an outer scope is used
+ */
+export class InflightTransformer {
+  private program: ts.Program;
+  public readonly extraErrors: ts.Diagnostic[] = [];
+
+  constructor(program: ts.Program) {
+    this.program = program;
+  }
+
+  public transform(context: ts.TransformationContext) {
+    const typeChecker = this.program.getTypeChecker();
+
+    function isInBlock(node: ts.Node, block: ts.Block) {
+      while (node) {
+        if (node === block) {
+          return true;
+        }
+        node = node.parent;
+      }
+      return false;
+    }
+
+    /**
+     * Checks if the given node is a reference to special `inflight` symbol
+     * This will be any symbol that has a jsdoc tag `@wing inflight`
+     */
+    function isInflightSymbol(node: ts.Node) {
+      let sym = typeChecker.getTypeAtLocation(node).symbol;
+      const docs = sym.getJsDocTags(typeChecker);
+      const wingDoc = docs?.find((doc) => doc.name === "wing");
+      return wingDoc?.text?.[0]?.text === "inflight";
+    }
+
+    return (sourceFile: ts.SourceFile) => {
+      let inflightClosureScope: ts.ConciseBody | undefined;
+
+      /**
+       * Converts `import a from "module"` to `require("module")`
+       */
+      function requireFromClause(importClause: ts.ImportClause) {
+        let moduleSpecifier = importClause.parent.moduleSpecifier;
+        if (ts.isStringLiteral(moduleSpecifier)) {
+          const text = moduleSpecifier.text;
+          if (text.startsWith(".")) {
+            const resolved = join(
+              dirname(sourceFile.fileName),
+              text
+            ).replaceAll("\\", "/");
+            moduleSpecifier = context.factory.createStringLiteral(resolved);
+          }
+        }
+
+        return context.factory.createCallExpression(
+          context.factory.createIdentifier("require"),
+          undefined,
+          [moduleSpecifier]
+        );
+      }
+
+      /**
+       * Converts `import { a } from "module"` to `require("module").a`
+       */
+      function requireImportSpec(importSpec: ts.ImportSpecifier) {
+        const importName = importSpec.propertyName || importSpec.name;
+        return context.factory.createPropertyAccessExpression(
+          requireFromClause(importSpec.parent.parent),
+          importName
+        );
+      }
+
+      const visitor = (node: ts.Node): ts.Node => {
+        // check if the call is to the special inflight function
+        if (
+          (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) &&
+          ts.isCallExpression(node.parent) &&
+          isInflightSymbol(node.parent.expression)
+        ) {
+          // we are in a node that looks like this;
+          // inflight(async () => {})
+          // let's get to the scope of the inner ArrowFunction
+          inflightClosureScope = node.body;
+          const result = ts.visitEachChild(node, visitor, context);
+          inflightClosureScope = undefined;
+          return result;
+        }
+
+        const result = ts.visitEachChild(node, visitor, context);
+
+        if (inflightClosureScope && ts.isIdentifier(node)) {
+          const sym = typeChecker.getSymbolAtLocation(node);
+          if (!sym) return result;
+
+          // if this symbol was declared from an import statement, we need to recreate that inline
+          const mostRecentDecl = sym.declarations?.at(0);
+          if (mostRecentDecl?.getSourceFile() === sourceFile) {
+            if (ts.isImportClause(mostRecentDecl)) {
+              return requireFromClause(mostRecentDecl);
+            } else if (ts.isImportSpecifier(mostRecentDecl)) {
+              return requireImportSpec(mostRecentDecl);
+            } else if (ts.isNamespaceImport(mostRecentDecl)) {
+              return requireFromClause(mostRecentDecl.parent);
+            } else if (ts.isVariableDeclaration(mostRecentDecl)) {
+              if (
+                !isInBlock(mostRecentDecl, inflightClosureScope as ts.Block)
+              ) {
+                this.extraErrors.push({
+                  messageText: `Unable to access "${sym.escapedName}" in inflight closure. Use 'lift( { ${sym.escapedName} } )' before 'inflight' and reference through ctx.`,
+                  code: 0,
+                  category: ts.DiagnosticCategory.Error,
+                  file: sourceFile,
+                  start: node.getStart(),
+                  length: node.getEnd() - node.getStart(),
+                });
+              }
+            }
+          }
+        }
+
+        return result;
+      };
+
+      return ts.visitNode(sourceFile, visitor) as ts.SourceFile;
+    };
+  }
+}
diff --git a/libs/@wingcloud/framework/test/__snapshots__/internal.test.ts.snap b/libs/@wingcloud/framework/test/__snapshots__/internal.test.ts.snap
new file mode 100644
index 00000000000..92709b27aba
--- /dev/null
+++ b/libs/@wingcloud/framework/test/__snapshots__/internal.test.ts.snap
@@ -0,0 +1,19 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`compile > fail > tsconfig_respected.ts 1`] = `
+Error: TS compilation failed:
+test/fixtures/fail/tsconfig_respected.ts:5:9 - error TS6133: 'x' is declared but its value is never read.
+
+5     let x = 2;
+          ~
+
+`;
+
+exports[`compile > fail > unlifted_reference.ts 1`] = `
+Error: TS compilation failed:
+test/fixtures/fail/unlifted_reference.ts:7:17 - error TS0: Unable to access "x" in inflight closure. Use 'lift( { x } )' before 'inflight' and reference through ctx.
+
+7     console.log(x);
+                  ~
+
+`;
diff --git a/libs/@wingcloud/framework/test/fixtures/fail/tsconfig.json b/libs/@wingcloud/framework/test/fixtures/fail/tsconfig.json
new file mode 100644
index 00000000000..94c7e9bad95
--- /dev/null
+++ b/libs/@wingcloud/framework/test/fixtures/fail/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "noUnusedLocals": true,
+  }
+}
\ No newline at end of file
diff --git a/libs/@wingcloud/framework/test/fixtures/fail/tsconfig_respected.ts b/libs/@wingcloud/framework/test/fixtures/fail/tsconfig_respected.ts
new file mode 100644
index 00000000000..a517ddb9ee4
--- /dev/null
+++ b/libs/@wingcloud/framework/test/fixtures/fail/tsconfig_respected.ts
@@ -0,0 +1,8 @@
+import { main, inflight } from "../../../src";
+
+main((root) => {
+  inflight(async () => {
+    let x = 2;
+    //  ^ This is unused, which the local tsconfig fails on
+  });
+});
diff --git a/libs/@wingcloud/framework/test/fixtures/fail/unlifted_reference.ts b/libs/@wingcloud/framework/test/fixtures/fail/unlifted_reference.ts
new file mode 100644
index 00000000000..f8e35b268f1
--- /dev/null
+++ b/libs/@wingcloud/framework/test/fixtures/fail/unlifted_reference.ts
@@ -0,0 +1,9 @@
+import { main, inflight } from "../../../src";
+
+main((root) => {
+  let x = 2;
+
+  inflight(async () => {
+    console.log(x);
+  });
+});
diff --git a/libs/@wingcloud/framework/test/fixtures/pass/autolift_import.ts b/libs/@wingcloud/framework/test/fixtures/pass/autolift_import.ts
new file mode 100644
index 00000000000..5b7047dda6c
--- /dev/null
+++ b/libs/@wingcloud/framework/test/fixtures/pass/autolift_import.ts
@@ -0,0 +1,8 @@
+import { main, inflight } from "../../../src";
+import { equal } from "node:assert";
+
+main((root) => {
+  inflight(async () => {
+    equal(1, 1);
+  });
+});
diff --git a/libs/@wingcloud/framework/test/fixtures/pass/basic_inflight.ts b/libs/@wingcloud/framework/test/fixtures/pass/basic_inflight.ts
new file mode 100644
index 00000000000..13bae42da59
--- /dev/null
+++ b/libs/@wingcloud/framework/test/fixtures/pass/basic_inflight.ts
@@ -0,0 +1,7 @@
+import { main, inflight } from "../../../src";
+
+main((root) => {
+  inflight(async () => {
+    console.log("Hello, world!");
+  });
+});
diff --git a/libs/@wingcloud/framework/test/fixtures/pass/lift_inflight.ts b/libs/@wingcloud/framework/test/fixtures/pass/lift_inflight.ts
new file mode 100644
index 00000000000..8956a63bc93
--- /dev/null
+++ b/libs/@wingcloud/framework/test/fixtures/pass/lift_inflight.ts
@@ -0,0 +1,8 @@
+import { main, cloud, lift } from "../../../src";
+
+main((root) => {
+  let b = new cloud.Bucket(root, "Bucket");
+  lift({ b }).inflight(async ({ b }) => {
+    await b.put("key", "value");
+  });
+});
diff --git a/libs/@wingcloud/framework/test/fixtures/pass/tsconfig.json b/libs/@wingcloud/framework/test/fixtures/pass/tsconfig.json
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/libs/@wingcloud/framework/test/fixtures/pass/tsconfig.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/@wingcloud/framework/test/inflight.test.ts b/libs/@wingcloud/framework/test/inflight.test.ts
new file mode 100644
index 00000000000..8b3cf89b59e
--- /dev/null
+++ b/libs/@wingcloud/framework/test/inflight.test.ts
@@ -0,0 +1,47 @@
+import { std } from "@winglang/sdk";
+import { test, expect, expectTypeOf, vi } from "vitest";
+import { lift } from "../src";
+import { INFLIGHT_SYMBOL } from "@winglang/sdk/lib/core/types";
+
+interface FakeBucketClient {
+  field: string;
+  hi(): Promise<void>;
+}
+class FakeBucket implements std.ILiftable {
+  _toInflight(): string {
+    return "{ field: 'hi', hi: () => Promise.resolve()}";
+  }
+  [INFLIGHT_SYMBOL]?: FakeBucketClient;
+}
+
+test("can lift bucket", async () => {
+  const bucket = new FakeBucket();
+  const inflightSpy = vi.spyOn(bucket, "_toInflight");
+
+  let x = lift({ bucket }).inflight(async ({ bucket }) => {
+    expectTypeOf(bucket.hi).toEqualTypeOf<() => Promise<void>>();
+    expectTypeOf(bucket.field).toEqualTypeOf<string>();
+    expectTypeOf(bucket).toEqualTypeOf<FakeBucketClient>();
+  });
+
+  x._toInflight();
+
+  expect(inflightSpy).toHaveBeenCalled();
+});
+
+test("can lift bucket with grant", async () => {
+  const bucket = new FakeBucket();
+  const inflightSpy = vi.spyOn(bucket, "_toInflight");
+
+  let x = lift({ bucket })
+    .grant({ bucket: [] })
+    .inflight(async ({ bucket }) => {
+      expectTypeOf(bucket).not.toEqualTypeOf<FakeBucketClient>();
+      expectTypeOf(bucket.field).toEqualTypeOf<string>();
+      expectTypeOf(bucket).not.toHaveProperty("hi");
+    });
+
+  x._toInflight();
+
+  expect(inflightSpy).toHaveBeenCalled();
+});
diff --git a/libs/@wingcloud/framework/test/internal.test.ts b/libs/@wingcloud/framework/test/internal.test.ts
new file mode 100644
index 00000000000..ab2199ab34b
--- /dev/null
+++ b/libs/@wingcloud/framework/test/internal.test.ts
@@ -0,0 +1,51 @@
+import { join } from "node:path";
+import { compile } from "../src/internal";
+import { test, describe, expect } from "vitest";
+import { readdirSync } from "node:fs";
+import { mkdtemp } from "node:fs/promises";
+import { tmpdir } from "node:os";
+
+const fixturesDir = join(__dirname, "fixtures");
+
+// add custom serializer to remove ansi sequences from error messages
+expect.addSnapshotSerializer({
+  test: (val) => val instanceof Error,
+  serialize: (val) => val.toString().replace(/\u001b\[.*?m/g, ""),
+});
+
+// The fixtures directory contains a pass and fail directory.
+describe("compile", async () => {
+  for (const dir of ["pass", "fail"]) {
+    const statusDir = join(fixturesDir, dir);
+    const shouldFail = dir === "fail";
+
+    describe(dir, async () => {
+      for (const file of readdirSync(statusDir).filter((f) =>
+        f.endsWith(".ts")
+      )) {
+        test(
+          file,
+          {
+            // The typescript compiler is quite slow, especially in CI
+            // See https://github.com/winglang/wing/issues/5676
+            timeout: 60000,
+          },
+          async () => {
+            const tmpDir = await mkdtemp(join(tmpdir(), `wingts.${file}`));
+            const filePath = join(statusDir, file);
+            let compilePromise = compile({
+              entrypoint: filePath,
+              workDir: tmpDir,
+            });
+
+            if (shouldFail) {
+              await expect(compilePromise).rejects.toThrowErrorMatchingSnapshot();
+            } else {
+              await compilePromise;
+            }
+          }
+        );
+      }
+    });
+  }
+});
diff --git a/libs/@wingcloud/framework/tsconfig.json b/libs/@wingcloud/framework/tsconfig.json
new file mode 100644
index 00000000000..2e33663639f
--- /dev/null
+++ b/libs/@wingcloud/framework/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    "alwaysStrict": true,
+    "target": "ES2022",
+    "module": "CommonJS",
+    "moduleResolution": "Node",
+    "esModuleInterop": true,
+    "isolatedModules": true,
+  }
+}
\ No newline at end of file
diff --git a/libs/@wingcloud/framework/tsup.config.ts b/libs/@wingcloud/framework/tsup.config.ts
new file mode 100644
index 00000000000..5f674b34fd3
--- /dev/null
+++ b/libs/@wingcloud/framework/tsup.config.ts
@@ -0,0 +1,12 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  format: "cjs",
+  target: "es2022",
+  dts: true,
+  clean: true,
+  sourcemap: true,
+  bundle: true,
+  skipNodeModulesBundle: true,
+});
diff --git a/libs/@wingcloud/framework/turbo.json b/libs/@wingcloud/framework/turbo.json
new file mode 100644
index 00000000000..08c2dc6ec49
--- /dev/null
+++ b/libs/@wingcloud/framework/turbo.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "extends": [
+    "//"
+  ],
+  "pipeline": {
+    "compile": {
+      "outputs": [
+        "dist/**"
+      ]
+    },
+    "test": {},
+    "package": {
+      "outputs": ["../../../dist/wingcloud-framework-*.tgz"]
+    }
+  }
+}
\ No newline at end of file
diff --git a/libs/awscdk/.prettierrc.json b/libs/awscdk/.prettierrc.json
new file mode 100644
index 00000000000..84c85a38828
--- /dev/null
+++ b/libs/awscdk/.prettierrc.json
@@ -0,0 +1,3 @@
+{
+  "overrides": []
+}
diff --git a/libs/awscdk/package.json b/libs/awscdk/package.json
index 3742c88b137..82d50aafdb4 100644
--- a/libs/awscdk/package.json
+++ b/libs/awscdk/package.json
@@ -20,19 +20,20 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "aws-cdk-lib": "^2.64.0",
-    "constructs": "~10.2.69",
+    "aws-cdk-lib": "^2.124.0",
+    "constructs": "^10.3",
     "safe-stable-stringify": "^2.4.3",
     "@winglang/sdk": "workspace:^"
   },
   "devDependencies": {
     "bump-pack": "workspace:^",
-    "typescript": "^4.9.5",
-    "tsup": "^6.7.0",
-    "vitest": "^0.32.4"
+    "typescript": "^5.3.3",
+    "tsup": "^8.0.2",
+    "vitest": "^1.6.0"
   },
   "scripts": {
     "compile": "tsc",
+    "watch": "tsc --watch",
     "package": "bump-pack -b",
     "test": "vitest run --passWithNoTests --update"
   },
@@ -42,4 +43,4 @@
   "volta": {
     "extends": "../../package.json"
   }
-}
\ No newline at end of file
+}
diff --git a/libs/awscdk/src/api.inflight.ts b/libs/awscdk/src/api.inflight.ts
new file mode 100644
index 00000000000..92239e4ce36
--- /dev/null
+++ b/libs/awscdk/src/api.inflight.ts
@@ -0,0 +1 @@
+export { ApiClient } from "@winglang/sdk/lib/shared-aws/api.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/api.ts b/libs/awscdk/src/api.ts
new file mode 100644
index 00000000000..2672668d115
--- /dev/null
+++ b/libs/awscdk/src/api.ts
@@ -0,0 +1,391 @@
+import { createHash } from "crypto";
+import { Lazy } from "aws-cdk-lib";
+import {
+  ApiDefinition,
+  Deployment,
+  SpecRestApi,
+  Stage,
+} from "aws-cdk-lib/aws-apigateway";
+import { CfnPermission } from "aws-cdk-lib/aws-lambda";
+import { Construct } from "constructs";
+import { App } from "./app";
+import { cloud, core, std } from "@winglang/sdk";
+import {
+  ApiEndpointHandler,
+  IAwsApi,
+  STAGE_NAME,
+} from "@winglang/sdk/lib/shared-aws/api";
+import { createApiDefaultResponse } from "@winglang/sdk/lib/shared-aws/api.default";
+import { isAwsCdkFunction } from "./function";
+
+/**
+ * AWS Implementation of `cloud.Api`.
+ */
+export class Api extends cloud.Api implements IAwsApi {
+  private readonly api: WingRestApi;
+  private readonly handlers: Record<string, cloud.Function> = {};
+  private readonly endpoint: cloud.Endpoint;
+
+  constructor(scope: Construct, id: string, props: cloud.ApiProps = {}) {
+    super(scope, id, props);
+    this.api = new WingRestApi(this, "api", {
+      getApiSpec: this._getOpenApiSpec.bind(this),
+      cors: this.corsOptions,
+    });
+    this.endpoint = new cloud.Endpoint(this, "Endpoint", this.api.url, {
+      label: `Endpoint for Api ${this.node.path}`,
+    });
+  }
+
+  protected get _endpoint(): cloud.Endpoint {
+    return this.endpoint;
+  }
+
+  /**
+   * Build the http requests
+   *
+   * @param method htttp method
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  private httpRequests(
+    method: string,
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiEndpointOptions,
+  ): void {
+    const lowerMethod = method.toLowerCase();
+    const upperMethod = method.toUpperCase();
+
+    this._validatePath(path);
+
+    const fn = this.addHandler(inflight, method, path, props);
+    const apiSpecEndpoint = this.api.addEndpoint(path, upperMethod, fn);
+    this._addToSpec(path, upperMethod, apiSpecEndpoint, this.corsOptions);
+
+    std.Node.of(this).addConnection({
+      source: this,
+      target: fn,
+      name: `${lowerMethod}()`,
+    });
+  }
+
+  /**
+   * Add a inflight to handle GET requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public get(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiGetOptions
+  ): void {
+    this.httpRequests("GET", path, inflight, props);
+  }
+  /**
+   * Add a inflight to handle POST requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public post(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiPostOptions
+  ): void {
+    this.httpRequests("POST", path, inflight, props);
+  }
+  /**
+   * Add a inflight to handle PUT requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public put(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiPutOptions
+  ): void {
+    this.httpRequests("PUT", path, inflight, props);
+  }
+  /**
+   * Add a inflight to handle DELETE requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public delete(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiDeleteOptions
+  ): void {
+    this.httpRequests("DELETE", path, inflight, props);
+  }
+  /**
+   * Add a inflight to handle PATCH requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public patch(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiPatchOptions
+  ): void {
+    this.httpRequests("PATCH", path, inflight, props);
+  }
+  /**
+   * Add a inflight to handle OPTIONS requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public options(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiOptionsOptions
+  ): void {
+    this.httpRequests("OPTIONS", path, inflight, props);
+  }
+  /**
+   * Add a inflight to handle HEAD requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public head(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiHeadOptions
+  ): void {
+    this.httpRequests("HEAD", path, inflight, props);
+  }
+  /**
+   * Add a inflight to handle CONNECT requests to a path.
+   * @param path path to add
+   * @param inflight Inflight to handle request
+   * @param props Additional props
+   */
+  public connect(
+    path: string,
+    inflight: cloud.IApiEndpointHandler,
+    props?: cloud.ApiConnectOptions
+  ): void {
+    this.httpRequests("CONNECT", path, inflight, props);
+  }
+
+  /**
+   * Add a inflight handler to the stack
+   * @param inflight Inflight to add to the API
+   * @param props Endpoint props
+   * @returns AWS Lambda Function
+   */
+  private addHandler(
+    inflight: cloud.IApiEndpointHandler,
+    method: string,
+    path: string,
+    props?: cloud.ApiEndpointOptions,
+  ): cloud.Function {
+    return this.addInflightHandler(inflight, method, path, props);
+  }
+
+  /**
+   * Add an inflight handler to the stack
+   * Ensures that we don't create duplicate inflight handlers.
+   * @param inflight Inflight to add to the API
+   * @returns Inflight handler as a AWS Lambda Function
+   */
+  private addInflightHandler(
+    inflight: cloud.IApiEndpointHandler,
+    method: string,
+    path: string,
+    props?: cloud.ApiEndpointOptions,
+  ): cloud.Function {
+    let handler = this.handlers[inflight._id];
+    if (!handler) {
+      const newInflight = ApiEndpointHandler.toFunctionHandler(
+        inflight,
+        Api.renderCorsHeaders(this.corsOptions)?.defaultResponse
+      );
+      const prefix = `${method.toLowerCase()}${path.replace(/\//g, "_")}_}`;
+      handler = new cloud.Function(
+        this,
+        App.of(this).makeId(this, prefix),
+        newInflight,
+        props,
+      );
+      this.handlers[inflight._id] = handler;
+    }
+
+    return handler;
+  }
+
+  /** @internal */
+  public onLift(host: std.IInflightHost, ops: string[]): void {
+    host.addEnvironment(this.urlEnvName(), this.url);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return core.InflightClient.for(__dirname, __filename, "ApiClient", [
+      `process.env["${this.urlEnvName()}"]`,
+    ]);
+  }
+
+  private urlEnvName(): string {
+    return `API_${this.node.addr.slice(-8)}`;
+  }
+
+  public get restApiArn(): string {
+    return this.api.api.arnForExecuteApi();
+  }
+
+  public get restApiId(): string {
+    return this.api.api.restApiId;
+  }
+
+  public get restApiName(): string {
+    return this.api.api.restApiName;
+  }
+
+  public get stageName(): string {
+    return this.api.stage.stageName;
+  }
+
+  public get invokeUrl(): string {
+    return this.api.stage.urlForPath();
+  }
+
+  public get deploymentId(): string {
+    return this.api.deployment.deploymentId;
+  }
+}
+
+/**
+ * Encapsulates the API Gateway REST API as a abstraction for aws-cdk.
+ */
+class WingRestApi extends Construct {
+  public readonly api: SpecRestApi;
+  public readonly deployment: Deployment;
+  public readonly stage: Stage;
+  private readonly region: string;
+
+  constructor(
+    scope: Construct,
+    id: string,
+    props: {
+      getApiSpec: () => cloud.OpenApiSpec;
+      cors?: cloud.ApiCorsOptions;
+    }
+  ) {
+    super(scope, id);
+    this.region = (App.of(this) as App).region;
+
+    this.api = new SpecRestApi(this, `${id}`, {
+      apiDefinition: ApiDefinition.fromInline(
+        Lazy.any({
+          produce: () => {
+            const injectGreedy404Handler = (openApiSpec: cloud.OpenApiSpec) => {
+              const defaultResponse = createApiDefaultResponse(
+                Object.keys(openApiSpec.paths),
+                props.cors
+              );
+
+              openApiSpec.paths = {
+                ...openApiSpec.paths,
+                ...defaultResponse,
+              };
+              return openApiSpec;
+            };
+            return injectGreedy404Handler(props.getApiSpec());
+          },
+        })
+      ),
+      deploy: false,
+    });
+
+    this.deployment = new Deployment(this, "deployment", {
+      api: this.api,
+      retainDeployments: true,
+    });
+
+    this.stage = new Stage(this, "stage", {
+      deployment: this.deployment,
+      stageName: STAGE_NAME,
+    });
+  }
+
+  public get url(): string {
+    return this.stage.urlForPath();
+  }
+
+  /**
+   * Add an endpoint to the API
+   * @param path Path of the endpoint
+   * @param method Method of the endpoint
+   * @param handler Lambda function to handle the endpoint
+   * @returns OpenApi spec extension for the endpoint
+   */
+  public addEndpoint(path: string, method: string, handler: cloud.Function) {
+    const endpointExtension = this.createApiSpecExtension(handler);
+    this.addHandlerPermissions(path, method, handler);
+    return endpointExtension;
+  }
+
+  /**
+   * Creates a OpenApi extension object for the endpoint and handler
+   * @param handler Lambda function to handle the endpoint
+   * @returns OpenApi extension object for the endpoint and handler
+   */
+  private createApiSpecExtension(handler: cloud.Function) {
+    if (!isAwsCdkFunction(handler)) {
+      throw new Error("Expected 'handler' to implement IAwsCdkFunction");
+    }
+
+    const extension = {
+      "x-amazon-apigateway-integration": {
+        uri: `arn:aws:apigateway:${this.region}:lambda:path/2015-03-31/functions/${handler.awscdkFunction.functionArn}/invocations`,
+        type: "aws_proxy",
+        httpMethod: "POST",
+        responses: {
+          default: {
+            statusCode: "200",
+          },
+        },
+        passthroughBehavior: "when_no_match",
+        contentHandling: "CONVERT_TO_TEXT",
+      },
+    };
+
+    return extension;
+  }
+
+  /**
+   * Add permissions to the handler to allow it to be called by the API
+   * @param path Path of the endpoint
+   * @param method Method of the endpoint
+   * @param handler Lambda function to handle the endpoint
+   */
+  private addHandlerPermissions = (
+    path: string,
+    method: string,
+    handler: cloud.Function
+  ) => {
+    if (!isAwsCdkFunction(handler)) {
+      throw new Error("Expected 'handler' to implement IAwsCdkFunction");
+    }
+
+    const pathHash = createHash("sha1").update(path).digest("hex").slice(-8);
+    const permissionId = `${method}-${pathHash}`;
+
+    new CfnPermission(this, `permission-${permissionId}`, {
+      action: "lambda:InvokeFunction",
+      functionName: handler.awscdkFunction.functionName,
+      principal: "apigateway.amazonaws.com",
+      sourceArn: this.api.arnForExecuteApi(method, Api.renderOpenApiPath(path)),
+    });
+  };
+}
diff --git a/libs/awscdk/src/app.ts b/libs/awscdk/src/app.ts
index c7364221535..1d36def2b38 100644
--- a/libs/awscdk/src/app.ts
+++ b/libs/awscdk/src/app.ts
@@ -4,9 +4,10 @@ import * as cdk from "aws-cdk-lib";
 import { Template } from "aws-cdk-lib/assertions";
 import { Construct } from "constructs";
 import stringify from "safe-stable-stringify";
+import { Api } from "./api";
 import { Bucket } from "./bucket";
 import { Counter } from "./counter";
-import { DynamodbTable } from "./dynamodb-table";
+import { Endpoint } from "./endpoint";
 import { Function } from "./function";
 import { OnDeploy } from "./on-deploy";
 import { Queue } from "./queue";
@@ -19,8 +20,10 @@ import { Website } from "./website";
 import { cloud } from "@winglang/sdk";
 
 const {
+  API_FQN,
   BUCKET_FQN,
   COUNTER_FQN,
+  ENDPOINT_FQN,
   FUNCTION_FQN,
   ON_DEPLOY_FQN,
   QUEUE_FQN,
@@ -30,7 +33,7 @@ const {
   WEBSITE_FQN,
 } = cloud;
 
-import { core, std, ex } from "@winglang/sdk";
+import { core, std } from "@winglang/sdk";
 import { Util } from "@winglang/sdk/lib/util";
 import { registerTokenResolver } from "@winglang/sdk/lib/core/tokens";
 
@@ -40,9 +43,18 @@ import { registerTokenResolver } from "@winglang/sdk/lib/core/tokens";
 export interface CdkAppProps extends core.AppProps {
   /**
    * CDK Stack Name
-   * @default - undefined
+   *
+   * @default - read from the CDK_STACK_NAME environment variable
    */
   readonly stackName?: string;
+
+  /**
+   * A hook for customizating the way the root CDK stack is created. You can override this if you wish to use a custom stack
+   * instead of the default `cdk.Stack`.
+   *
+   * @default - creates a standard `cdk.Stack`
+   */
+  readonly stackFactory?: (app: cdk.App, stackName: string, props?: cdk.StackProps) => cdk.Stack;
 }
 
 /**
@@ -54,19 +66,19 @@ export class App extends core.App {
 
   public readonly _target = "awscdk";
 
+  private awsAccount?: string;
+  private awsRegion?: string;
+
   private readonly cdkApp: cdk.App;
   private readonly cdkStack: cdk.Stack;
 
   private synthed: boolean;
   private synthedOutput: string | undefined;
-  private synthHooks?: core.SynthHooks;
-
-  /**
-   * The test runner for this app.
-   */
-  protected readonly testRunner: TestRunner;
 
   constructor(props: CdkAppProps) {
+    const account = process.env.CDK_AWS_ACCOUNT ?? process.env.CDK_DEFAULT_ACCOUNT;
+    const region = process.env.CDK_AWS_REGION ?? process.env.CDK_DEFAULT_REGION;
+
     let stackName = props.stackName ?? process.env.CDK_STACK_NAME;
     if (stackName === undefined) {
       throw new Error(
@@ -84,10 +96,16 @@ export class App extends core.App {
     mkdirSync(cdkOutdir, { recursive: true });
 
     const cdkApp = new cdk.App({ outdir: cdkOutdir });
-    const cdkStack = new cdk.Stack(cdkApp, stackName);
 
-    super(cdkStack, props.rootId ?? "Default", props);
+    const createStack =
+      props.stackFactory ?? ((app, stackName, props) => new cdk.Stack(app, stackName, props));
+
+    const cdkStack = createStack(cdkApp, stackName, {
+      env: { account, region }
+    });
 
+    super(cdkStack, props.rootId ?? "Default", props);
+    
     // HACK: monkey patch the `new` method on the cdk app (which is the root of the tree) so that
     // we can intercept the creation of resources and replace them with our own.
     (cdkApp as any).new = (
@@ -105,17 +123,14 @@ export class App extends core.App {
       ...args: any[]
     ) => this.newAbstract(fqn, scope, id, ...args);
 
-    this.synthHooks = props.synthHooks;
-
     this.outdir = outdir;
     this.cdkApp = cdkApp;
     this.cdkStack = cdkStack;
     this.synthed = false;
     this.isTestEnvironment = props.isTestEnvironment ?? false;
     registerTokenResolver(new CdkTokens());
-    this.testRunner = new TestRunner(this, "cloud.TestRunner");
 
-    this.synthRoots(props, this.testRunner);
+    TestRunner._createTree(this, props.rootConstruct);
   }
 
   /**
@@ -132,8 +147,8 @@ export class App extends core.App {
     // call preSynthesize() on every construct in the tree
     core.preSynthesizeAllConstructs(this);
 
-    if (this.synthHooks?.preSynthesize) {
-      this.synthHooks.preSynthesize.forEach((hook) => hook(this));
+    if (this._synthHooks?.preSynthesize) {
+      this._synthHooks.preSynthesize.forEach((hook) => hook(this));
     }
 
     // synthesize cdk.Stack files in `outdir/cdk.out`
@@ -154,6 +169,9 @@ export class App extends core.App {
 
   protected typeForFqn(fqn: string): any {
     switch (fqn) {
+      case API_FQN:
+        return Api;
+
       case FUNCTION_FQN:
         return Function;
 
@@ -184,9 +202,29 @@ export class App extends core.App {
       case WEBSITE_FQN:
         return Website;
 
-      case ex.DYNAMODB_TABLE_FQN:
-        return DynamodbTable;
+      case ENDPOINT_FQN:
+        return Endpoint;
     }
     return undefined;
   }
+
+  /**
+   * The AWS account ID of the App
+   */
+  public get accountId(): string {
+    if (!this.awsAccount) {
+      this.awsAccount = this.cdkStack.account;
+    }
+    return this.awsAccount;
+  }
+
+  /**
+   * The AWS region of the App
+   */
+  public get region(): string {
+    if (!this.awsRegion) {
+      this.awsRegion = this.cdkStack.region;
+    }
+    return this.awsRegion;
+  }
 }
diff --git a/libs/awscdk/src/bucket.onevent.inflight.ts b/libs/awscdk/src/bucket.onevent.inflight.ts
deleted file mode 100644
index 5a649f18eff..00000000000
--- a/libs/awscdk/src/bucket.onevent.inflight.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { cloud } from "@winglang/sdk";
-
-export class BucketEventHandlerClient implements cloud.IBucketEventHandlerClient {
-  private readonly handler: cloud.IFunctionHandlerClient;
-  constructor({ handler }: { handler: cloud.IFunctionHandlerClient }) {
-    this.handler = handler;
-  }
-  public async handle(event: any) {
-    try {
-      return await this.handler.handle(event.Records[0].s3.object.key);
-    } catch (error) {
-      //TODO: change to some sort of warning- console.warn doesn't seems to work
-      console.log("Error parsing the notification event message: ", error);
-      console.log("Event: ", event);
-    }
-  }
-}
diff --git a/libs/awscdk/src/bucket.ts b/libs/awscdk/src/bucket.ts
index 597b5238ad0..7e73db6db25 100644
--- a/libs/awscdk/src/bucket.ts
+++ b/libs/awscdk/src/bucket.ts
@@ -1,4 +1,3 @@
-import { join } from "path";
 import { RemovalPolicy } from "aws-cdk-lib";
 import {
   BlockPublicAccess,
@@ -10,11 +9,15 @@ import { BucketDeployment, Source } from "aws-cdk-lib/aws-s3-deployment";
 import { LambdaDestination } from "aws-cdk-lib/aws-s3-notifications";
 import { Construct } from "constructs";
 import { App } from "./app";
-import { Function } from "./function";
 import { cloud, core, std } from "@winglang/sdk";
-import { convertBetweenHandlers } from "@winglang/sdk/lib/shared/convert";
 import { calculateBucketPermissions } from "@winglang/sdk/lib/shared-aws/permissions";
 import { IAwsBucket } from "@winglang/sdk/lib/shared-aws/bucket";
+import {
+  IAwsCdkFunction,
+  addPolicyStatements,
+  isAwsCdkFunction,
+} from "./function";
+import { LiftMap, lift } from "@winglang/sdk/lib/core";
 
 const EVENTS = {
   [cloud.BucketEventType.DELETE]: EventType.OBJECT_REMOVED,
@@ -51,61 +54,65 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
     }
   }
 
-  protected eventHandlerLocation(): string {
-    return join(__dirname, "bucket.onevent.inflight.js");
-  }
-
   private onEventFunction(
-    event: string,
+    event: cloud.BucketEventType,
     inflight: cloud.IBucketEventHandler,
     opts?: cloud.BucketOnCreateOptions
-  ): Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      this.eventHandlerLocation(),
-      `BucketEventHandlerClient`
-    );
+  ): IAwsCdkFunction {
+    const functionHandler = lift({ handler: inflight, eventType: event }).inflight(async (ctx, event) => {
+      const record = event.Records[0];
+      if (!record) {
+        throw new Error("No record found in the S3 event");
+      }
+      try {
+        await ctx.handler(record.s3.object.key, ctx.eventType);
+      } catch (error) {
+        //TODO: change to some sort of warning- console.warn doesn't seems to work
+        console.log("Error parsing the notification event message: ", error);
+        console.log("Event: ", event);
+      }
+    });
 
-    const fn = new Function(
+    const fn = new cloud.Function(
       this.node.scope!, // ok since we're not a tree root
       App.of(this).makeId(this, `${this.node.id}-${event}`),
       functionHandler,
       opts
     );
 
-    if (!(fn instanceof Function)) {
-      throw new Error(
-        "Bucket only supports creating awscdk.Function right now"
-      );
+    if (!isAwsCdkFunction(fn)) {
+      throw new Error("Expected function to implement IAwsCdkFunction");
     }
 
     return fn;
   }
+
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.BucketInflightMethods.DELETE,
-      cloud.BucketInflightMethods.GET,
-      cloud.BucketInflightMethods.GET_JSON,
-      cloud.BucketInflightMethods.LIST,
-      cloud.BucketInflightMethods.PUT,
-      cloud.BucketInflightMethods.PUT_JSON,
-      cloud.BucketInflightMethods.PUBLIC_URL,
-      cloud.BucketInflightMethods.EXISTS,
-      cloud.BucketInflightMethods.TRY_GET,
-      cloud.BucketInflightMethods.TRY_GET_JSON,
-      cloud.BucketInflightMethods.TRY_DELETE,
-      cloud.BucketInflightMethods.SIGNED_URL,
-      cloud.BucketInflightMethods.METADATA,
-      cloud.BucketInflightMethods.COPY,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.BucketInflightMethods.DELETE]: [],
+      [cloud.BucketInflightMethods.GET]: [],
+      [cloud.BucketInflightMethods.GET_JSON]: [],
+      [cloud.BucketInflightMethods.LIST]: [],
+      [cloud.BucketInflightMethods.PUT]: [],
+      [cloud.BucketInflightMethods.PUT_JSON]: [],
+      [cloud.BucketInflightMethods.PUBLIC_URL]: [],
+      [cloud.BucketInflightMethods.EXISTS]: [],
+      [cloud.BucketInflightMethods.TRY_GET]: [],
+      [cloud.BucketInflightMethods.TRY_GET_JSON]: [],
+      [cloud.BucketInflightMethods.TRY_DELETE]: [],
+      [cloud.BucketInflightMethods.SIGNED_URL]: [],
+      [cloud.BucketInflightMethods.METADATA]: [],
+      [cloud.BucketInflightMethods.COPY]: [],
+      [cloud.BucketInflightMethods.RENAME]: [],
+    };
   }
 
   public onCreate(
     inflight: cloud.IBucketEventHandler,
     opts?: cloud.BucketOnCreateOptions
   ): void {
-    const fn = this.onEventFunction("OnCreate", inflight, opts);
+    const fn = this.onEventFunction(cloud.BucketEventType.CREATE, inflight, opts);
 
     std.Node.of(this).addConnection({
       source: this,
@@ -115,7 +122,7 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
 
     this.bucket.addEventNotification(
       EVENTS[cloud.BucketEventType.CREATE],
-      new LambdaDestination(fn._function)
+      new LambdaDestination(fn.awscdkFunction)
     );
   }
 
@@ -123,7 +130,7 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
     inflight: cloud.IBucketEventHandler,
     opts?: cloud.BucketOnDeleteOptions
   ): void {
-    const fn = this.onEventFunction("OnDelete", inflight, opts);
+    const fn = this.onEventFunction(cloud.BucketEventType.DELETE, inflight, opts);
 
     std.Node.of(this).addConnection({
       source: this,
@@ -133,7 +140,7 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
 
     this.bucket.addEventNotification(
       EVENTS[cloud.BucketEventType.DELETE],
-      new LambdaDestination(fn._function)
+      new LambdaDestination(fn.awscdkFunction)
     );
   }
 
@@ -141,7 +148,7 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
     inflight: cloud.IBucketEventHandler,
     opts?: cloud.BucketOnUpdateOptions
   ): void {
-    const fn = this.onEventFunction("OnUpdate", inflight, opts);
+    const fn = this.onEventFunction(cloud.BucketEventType.UPDATE, inflight, opts);
 
     std.Node.of(this).addConnection({
       source: this,
@@ -151,7 +158,7 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
 
     this.bucket.addEventNotification(
       EVENTS[cloud.BucketEventType.UPDATE],
-      new LambdaDestination(fn._function)
+      new LambdaDestination(fn.awscdkFunction)
     );
   }
 
@@ -159,46 +166,19 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
     inflight: cloud.IBucketEventHandler,
     opts?: cloud.BucketOnEventOptions
   ) {
-    const fn = this.onEventFunction("OnEvent", inflight, opts);
-
-    std.Node.of(this).addConnection({
-      source: this,
-      target: fn,
-      name: "onCreate()",
-    });
-    this.bucket.addEventNotification(
-      EVENTS[cloud.BucketEventType.CREATE],
-      new LambdaDestination(fn._function)
-    );
-
-    std.Node.of(this).addConnection({
-      source: this,
-      target: fn,
-      name: "onDelete()",
-    });
-    this.bucket.addEventNotification(
-      EVENTS[cloud.BucketEventType.DELETE],
-      new LambdaDestination(fn._function)
-    );
-
-    std.Node.of(this).addConnection({
-      source: this,
-      target: fn,
-      name: "onUpdate()",
-    });
-    this.bucket.addEventNotification(
-      EVENTS[cloud.BucketEventType.UPDATE],
-      new LambdaDestination(fn._function)
-    );
+    this.onCreate(inflight, opts);
+    this.onDelete(inflight, opts);
+    this.onUpdate(inflight, opts);
   }
 
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("buckets can only be bound by tfaws.Function for now");
+    if (!isAwsCdkFunction(host)) {
+      throw new Error("Expected 'host' to implement IAwsCdkFunction");
     }
 
-    host.addPolicyStatements(
-      ...calculateBucketPermissions(this.bucket.bucketArn, ops)
+    addPolicyStatements(
+      host.awscdkFunction,
+      calculateBucketPermissions(this.bucket.bucketArn, ops)
     );
 
     // The bucket name needs to be passed through an environment variable since
@@ -210,15 +190,10 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
 
   /** @internal */
   public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
-      __filename,
-      "BucketClient",
-      [
-        `process.env["${this.envName()}"]`,
-        `process.env["${this.isPublicEnvName()}"]`,
-      ]
-    );
+    return core.InflightClient.for(__dirname, __filename, "BucketClient", [
+      `process.env["${this.envName()}"]`,
+      `process.env["${this.isPublicEnvName()}"]`,
+    ]);
   }
 
   private isPublicEnvName(): string {
@@ -249,11 +224,11 @@ export function createEncryptedBucket(
     encryption: BucketEncryption.S3_MANAGED,
     blockPublicAccess: isPublic
       ? {
-        blockPublicAcls: false,
-        blockPublicPolicy: false,
-        ignorePublicAcls: false,
-        restrictPublicBuckets: false,
-      }
+          blockPublicAcls: false,
+          blockPublicPolicy: false,
+          ignorePublicAcls: false,
+          restrictPublicBuckets: false,
+        }
       : BlockPublicAccess.BLOCK_ALL,
     publicReadAccess: isPublic ? true : false,
     removalPolicy: RemovalPolicy.DESTROY,
diff --git a/libs/awscdk/src/counter.ts b/libs/awscdk/src/counter.ts
index ea0ca297454..baee4fbfed4 100644
--- a/libs/awscdk/src/counter.ts
+++ b/libs/awscdk/src/counter.ts
@@ -1,11 +1,12 @@
 import { RemovalPolicy } from "aws-cdk-lib";
 import { AttributeType, BillingMode, Table } from "aws-cdk-lib/aws-dynamodb";
 import { Construct } from "constructs";
-import { Function } from "./function";
 import { cloud, core, std } from "@winglang/sdk";
 import { COUNTER_HASH_KEY } from "@winglang/sdk/lib/shared-aws/commons";
 import { calculateCounterPermissions } from "@winglang/sdk/lib/shared-aws/permissions";
 import { IAwsCounter } from "@winglang/sdk/lib/shared-aws/counter";
+import { addPolicyStatements, isAwsCdkFunction } from "./function";
+import { LiftMap } from "@winglang/sdk/lib/core";
 
 /**
  * AWS implementation of `cloud.Counter`.
@@ -26,22 +27,23 @@ export class Counter extends cloud.Counter implements IAwsCounter {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.CounterInflightMethods.INC,
-      cloud.CounterInflightMethods.DEC,
-      cloud.CounterInflightMethods.PEEK,
-      cloud.CounterInflightMethods.SET,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.CounterInflightMethods.INC]: [],
+      [cloud.CounterInflightMethods.DEC]: [],
+      [cloud.CounterInflightMethods.PEEK]: [],
+      [cloud.CounterInflightMethods.SET]: [],
+    };
   }
 
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("counters can only be bound by awscdk.Function for now");
+    if (!isAwsCdkFunction(host)) {
+      throw new Error("Expected 'host' to implement 'isAwsCdkFunction' method");
     }
 
-    host.addPolicyStatements(
-      ...calculateCounterPermissions(this.table.tableArn, ops)
+    addPolicyStatements(
+      host.awscdkFunction,
+      calculateCounterPermissions(this.table.tableArn, ops)
     );
 
     host.addEnvironment(this.envName(), this.table.tableName);
@@ -51,12 +53,10 @@ export class Counter extends cloud.Counter implements IAwsCounter {
 
   /** @internal */
   public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
-      __filename,
-      "CounterClient",
-      [`process.env["${this.envName()}"]`, `${this.initial}`]
-    );
+    return core.InflightClient.for(__dirname, __filename, "CounterClient", [
+      `process.env["${this.envName()}"]`,
+      `${this.initial}`,
+    ]);
   }
 
   private envName(): string {
diff --git a/libs/awscdk/src/dynamodb-table.inflight.ts b/libs/awscdk/src/dynamodb-table.inflight.ts
deleted file mode 100644
index d3883a1c364..00000000000
--- a/libs/awscdk/src/dynamodb-table.inflight.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DynamodbTableClient } from "@winglang/sdk/lib/shared-aws/dynamodb-table.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/dynamodb-table.ts b/libs/awscdk/src/dynamodb-table.ts
deleted file mode 100644
index b9b110a6f79..00000000000
--- a/libs/awscdk/src/dynamodb-table.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { RemovalPolicy } from "aws-cdk-lib";
-import { AttributeType, BillingMode, Table } from "aws-cdk-lib/aws-dynamodb";
-import { Construct } from "constructs";
-import { Function } from "./function";
-import { core, ex, std } from "@winglang/sdk";
-import { ResourceNames } from "@winglang/sdk/lib/shared/resource-names";
-import { IAwsDynamodbTable, NAME_OPTS } from "@winglang/sdk/lib/shared-aws/dynamodb-table";
-import { calculateDynamodbTablePermissions } from "@winglang/sdk/lib/shared-aws/permissions";
-
-/**
- * AWS implementation of `ex.DynamodbTable`.
- *
- * @inflight `@winglang/sdk.ex.IDynamodbTableClient`
- */
-export class DynamodbTable extends ex.DynamodbTable implements IAwsDynamodbTable {
-  private readonly table: Table;
-
-  constructor(scope: Construct, id: string, props: ex.DynamodbTableProps) {
-    super(scope, id, props);
-
-    const attributeDefinitions = props.attributeDefinitions as any;
-
-    this.table = new Table(this, "Default", {
-      tableName: ResourceNames.generateName(this, {
-        prefix: this.name,
-        ...NAME_OPTS,
-      }),
-      partitionKey: {
-        name: props.hashKey,
-        type: attributeDefinitions[props.hashKey] as AttributeType,
-      },
-      sortKey: props.rangeKey
-        ? {
-          name: props.rangeKey,
-          type: attributeDefinitions[props.rangeKey] as AttributeType,
-        }
-        : undefined,
-      billingMode: BillingMode.PAY_PER_REQUEST,
-      removalPolicy: RemovalPolicy.DESTROY,
-    });
-  }
-
-  public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error(
-        "Dynamodb tables can only be bound by tfaws.Function for now"
-      );
-    }
-
-    host.addPolicyStatements(
-      ...calculateDynamodbTablePermissions(this.table.tableArn, ops)
-    );
-
-    host.addEnvironment(this.envName(), this.table.tableName);
-
-    super.onLift(host, ops);
-  }
-
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      ex.DynamodbTableInflightMethods.PUT_ITEM,
-      ex.DynamodbTableInflightMethods.UPDATE_ITEM,
-      ex.DynamodbTableInflightMethods.DELETE_ITEM,
-      ex.DynamodbTableInflightMethods.GET_ITEM,
-      ex.DynamodbTableInflightMethods.SCAN,
-      ex.DynamodbTableInflightMethods.QUERY,
-      ex.DynamodbTableInflightMethods.TRANSACT_GET_ITEMS,
-      ex.DynamodbTableInflightMethods.TRANSACT_WRITE_ITEMS,
-      ex.DynamodbTableInflightMethods.BATCH_GET_ITEM,
-      ex.DynamodbTableInflightMethods.BATCH_WRITE_ITEM,
-    ];
-  }
-
-  public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
-      __filename,
-      "DynamodbTableClient",
-      [`process.env["${this.envName()}"]`]
-    );
-  }
-
-  private envName(): string {
-    return `DYNAMODB_TABLE_NAME_${this.node.addr.slice(-8)}`;
-  }
-
-  public get dynamoTableArn(): string {
-    return this.table.tableArn;
-  }
-
-  public get dynamoTableName(): string {
-    return this.table.tableName;
-  }
-}
diff --git a/libs/awscdk/src/endpoint.inflight.ts b/libs/awscdk/src/endpoint.inflight.ts
new file mode 100644
index 00000000000..63fcfcb8d0d
--- /dev/null
+++ b/libs/awscdk/src/endpoint.inflight.ts
@@ -0,0 +1 @@
+export { EndpointClient } from "@winglang/sdk/lib/shared-aws/endpoint.inflight";
diff --git a/libs/awscdk/src/endpoint.ts b/libs/awscdk/src/endpoint.ts
new file mode 100644
index 00000000000..63924a1d03f
--- /dev/null
+++ b/libs/awscdk/src/endpoint.ts
@@ -0,0 +1,36 @@
+import { CfnOutput } from "aws-cdk-lib";
+import { Construct } from "constructs";
+import { core, cloud, std } from "@winglang/sdk";
+
+/**
+ * AWS implementation of `cloud.Endpoint`.
+ */
+export class Endpoint extends cloud.Endpoint {
+  constructor(scope: Construct, id: string, url: string, props: cloud.EndpointProps = {}) {
+    super(scope, id, url, props);
+
+    new CfnOutput(this, "Url", {
+      value: this.url,
+    });
+  }
+
+  /** @internal */
+  public onLift(host: std.IInflightHost, ops: string[]): void {
+    host.addEnvironment(this.urlEnvName(), this.url);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return core.InflightClient.for(
+      __dirname,
+      __filename,
+      "EndpointClient",
+      [`process.env["${this.urlEnvName()}"]`]
+    );
+  }
+
+  private urlEnvName(): string {
+    return `ENDPOINT_NAME_${this.node.addr.slice(-8)}`;
+  }
+}
diff --git a/libs/awscdk/src/function.inflight.ts b/libs/awscdk/src/function.inflight.ts
new file mode 100644
index 00000000000..4db651ca9bc
--- /dev/null
+++ b/libs/awscdk/src/function.inflight.ts
@@ -0,0 +1 @@
+export { FunctionClient } from "@winglang/sdk/lib/shared-aws/function.inflight";
diff --git a/libs/awscdk/src/function.ts b/libs/awscdk/src/function.ts
index cdbac4f6d8f..14d71f3af0b 100644
--- a/libs/awscdk/src/function.ts
+++ b/libs/awscdk/src/function.ts
@@ -1,25 +1,63 @@
-import { resolve } from "path";
 import { Duration } from "aws-cdk-lib";
 import { PolicyStatement as CdkPolicyStatement } from "aws-cdk-lib/aws-iam";
 import {
   Architecture,
   Function as CdkFunction,
   Code,
-  IEventSource,
   Runtime,
 } from "aws-cdk-lib/aws-lambda";
-import { Construct } from "constructs";
+import { LogGroup, RetentionDays } from "aws-cdk-lib/aws-logs";
+import { Asset } from "aws-cdk-lib/aws-s3-assets";
+import { Construct, IConstruct } from "constructs";
 import { cloud, std, core } from "@winglang/sdk";
+import { NotImplementedError } from "@winglang/sdk/lib/core/errors";
 import { createBundle } from "@winglang/sdk/lib/shared/bundling";
-import { IAwsFunction, PolicyStatement } from "@winglang/sdk/lib/shared-aws";
+import {
+  IAwsFunction,
+  NetworkConfig,
+  PolicyStatement,
+  externalLibraries,
+} from "@winglang/sdk/lib/shared-aws";
+import { makeAwsLambdaHandler } from "@winglang/sdk/lib/shared-aws/function-util";
+import { resolve } from "path";
+import { renameSync, rmSync, writeFileSync } from "fs";
+import { App } from "./app";
+import { LiftMap } from "@winglang/sdk/lib/core";
+
+/**
+ * Implementation of `awscdk.Function` are expected to implement this
+ */
+export interface IAwsCdkFunction extends IConstruct {
+  awscdkFunction: CdkFunction;
+}
+
+export function isAwsCdkFunction(x: any): x is IAwsCdkFunction {
+  return typeof x["awscdkFunction"] === "object";
+}
+
+/**
+ * Adds a bunch of policy statements to the function's role.
+ */
+export function addPolicyStatements(
+  fn: CdkFunction,
+  statements: PolicyStatement[]
+) {
+  for (const statement of statements) {
+    fn.addToRolePolicy(new CdkPolicyStatement(statement));
+  }
+}
 
 /**
  * AWS implementation of `cloud.Function`.
  *
  * @inflight `@winglang/sdk.cloud.IFunctionClient`
  */
-export class Function extends cloud.Function implements IAwsFunction {
+export class Function
+  extends cloud.Function
+  implements IAwsCdkFunction, IAwsFunction
+{
   private readonly function: CdkFunction;
+  private readonly assetPath: string;
 
   constructor(
     scope: Construct,
@@ -29,45 +67,69 @@ export class Function extends cloud.Function implements IAwsFunction {
   ) {
     super(scope, id, inflight, props);
 
-    // bundled code is guaranteed to be in a fresh directory
-    const bundle = createBundle(this.entrypoint);
+    if (props.concurrency != null) {
+      throw new NotImplementedError(
+        "Function concurrency isn't implemented yet on the current target."
+      );
+    }
 
-    const logRetentionDays =
-      props.logRetentionDays === undefined
-        ? 30
-        : props.logRetentionDays < 0
-          ? undefined // Negative value means Infinite retention
-          : props.logRetentionDays;
+    // The code in `this.entrypoint` will be replaced during preSynthesize
+    // but we produce an initial version and bundle it so that `lambda.Function`
+    // has something to work with.
+    // This is a workaround for https://github.com/aws/aws-cdk/issues/28732
+    const inflightCodeApproximation = this._getCodeLines(inflight).join("\n");
+    writeFileSync(this.entrypoint, inflightCodeApproximation);
+    const bundle = createBundle(this.entrypoint, externalLibraries);
+
+    const code = Code.fromAsset(resolve(bundle.directory));
+
+    this.function = this.createFunction(code, props);
+
+    // hack: accessing private field from aws_lambda.AssetCode
+    // https://github.com/aws/aws-cdk/blob/109b2abe4c713624e731afa1b82c3c1a3ba064c9/packages/aws-cdk-lib/aws-lambda/lib/code.ts#L266
+    const asset: Asset = (code as any).asset;
+    if (!asset.assetPath) {
+      throw new Error(
+        "AWS CDK 'Asset' class no longer has an 'assetPath' property"
+      );
+    }
+    this.assetPath = asset.assetPath;
+  }
 
-    this.function = new CdkFunction(this, "Default", {
-      handler: "index.handler",
-      code: Code.fromAsset(resolve(bundle.directory)),
-      runtime: Runtime.NODEJS_18_X,
-      environment: this.env,
-      timeout: props.timeout
-        ? Duration.seconds(props.timeout.seconds)
-        : Duration.minutes(1),
-      memorySize: props.memory ?? 1024,
-      architecture: Architecture.ARM_64,
-      logRetention: logRetentionDays,
-    });
+  /** @internal */
+  public _preSynthesize(): void {
+    super._preSynthesize();
+
+    // produce an inflight code bundle using the latest information, including all
+    // changes made to captured variables/resources after the constructor
+    const bundle = createBundle(this.entrypoint, externalLibraries);
+
+    // copy files from bundle.directory to this.assetPath
+    const assetDir = resolve(App.of(this).outdir, this.assetPath);
+    rmSync(assetDir, { recursive: true, force: true });
+    renameSync(bundle.directory, assetDir);
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [cloud.FunctionInflightMethods.INVOKE];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.FunctionInflightMethods.INVOKE]: [],
+      [cloud.FunctionInflightMethods.INVOKE_ASYNC]: [],
+    };
   }
 
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("functions can only be bound by awscdk.Function for now");
+    if (!isAwsCdkFunction(host)) {
+      throw new Error("Expected host to implement IAwsCdkFunction");
     }
 
     if (ops.includes(cloud.FunctionInflightMethods.INVOKE)) {
-      host.addPolicyStatements({
-        actions: ["lambda:InvokeFunction"],
-        resources: [`${this.function.functionArn}`],
-      });
+      host.awscdkFunction.addToRolePolicy(
+        new CdkPolicyStatement({
+          actions: ["lambda:InvokeFunction"],
+          resources: [`${this.function.functionArn}`],
+        })
+      );
     }
 
     // The function name needs to be passed through an environment variable since
@@ -79,12 +141,47 @@ export class Function extends cloud.Function implements IAwsFunction {
 
   /** @internal */
   public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
-      __filename,
-      "FunctionClient",
-      [`process.env["${this.envName()}"], "${this.node.path}"`]
-    );
+    return core.InflightClient.for(__dirname, __filename, "FunctionClient", [
+      `process.env["${this.envName()}"], "${this.node.path}"`,
+    ]);
+  }
+
+  /**
+   * Can be overridden by subclasses to customize the AWS CDK function creation.
+   * @param code The AWS Lambda `Code` object that represents the inflight closure defined for this function.
+   * @param props Cloud function properties.
+   * @returns an object that implements `aws-lambda.IFunction`.
+   */
+  protected createFunction(
+    code: Code,
+    props: cloud.FunctionProps
+  ): CdkFunction {
+    const logRetentionDays =
+      props.logRetentionDays === undefined
+        ? 30
+        : props.logRetentionDays < 0
+        ? RetentionDays.INFINITE // Negative value means Infinite retention
+        : props.logRetentionDays;
+
+    const logs = new LogGroup(this, "LogGroup", {
+      retention: logRetentionDays,
+    });
+
+    return new CdkFunction(this, "Default", {
+      handler: "index.handler",
+      code,
+      runtime: Runtime.NODEJS_20_X,
+      environment: {
+        NODE_OPTIONS: "--enable-source-maps",
+        ...this.env,
+      },
+      timeout: props.timeout
+        ? Duration.seconds(props.timeout.seconds)
+        : Duration.minutes(1),
+      memorySize: props.memory ?? 1024,
+      architecture: Architecture.ARM_64,
+      logGroup: logs,
+    });
   }
 
   /**
@@ -108,17 +205,18 @@ export class Function extends cloud.Function implements IAwsFunction {
     }
   }
 
-  /** @internal */
-  public _addEventSource(eventSource: IEventSource) {
-    this.function.addEventSource(eventSource);
+  public addNetwork(config: NetworkConfig): void {
+    config;
+    throw new Error(
+      "The AWS CDK platform provider does not support adding network configurations to AWS Lambda functions at the moment."
+    );
   }
 
   private envName(): string {
     return `FUNCTION_NAME_${this.node.addr.slice(-8)}`;
   }
 
-  /** @internal */
-  get _function() {
+  public get awscdkFunction() {
     return this.function;
   }
 
@@ -129,4 +227,11 @@ export class Function extends cloud.Function implements IAwsFunction {
   public get functionName(): string {
     return this.function.functionName;
   }
+
+  /**
+   * @internal
+   */
+  protected _getCodeLines(handler: cloud.IFunctionHandler): string[] {
+    return makeAwsLambdaHandler(handler);
+  }
 }
diff --git a/libs/awscdk/src/index.ts b/libs/awscdk/src/index.ts
index 627c43533e4..fa65d189a0d 100644
--- a/libs/awscdk/src/index.ts
+++ b/libs/awscdk/src/index.ts
@@ -1,20 +1,15 @@
-export * from "./platform"
+export * from "./platform";
 export * from "./app";
 export * from "./bucket";
-export * from "./bucket.onevent.inflight";
 export * from "./counter";
-export * from "./counter.inflight";
+export * from "./endpoint";
 export * from "./function";
 export * from "./queue";
-export * from "./queue.setconsumer.inflight";
 export * from "./schedule";
-export * from "./schedule.ontick.inflight";
 export * from "./secret";
 export * from "./topic";
-export * from "./topic.onmessage.inflight";
 export * from "./website";
-export * from "./dynamodb-table";
-export * from "./dynamodb-table.inflight";
 export * from "./on-deploy";
 export * from "./test-runner";
 export * from "./tokens";
+export * from "./api";
diff --git a/libs/awscdk/src/on-deploy.inflight.ts b/libs/awscdk/src/on-deploy.inflight.ts
new file mode 100644
index 00000000000..0c8f0be7d43
--- /dev/null
+++ b/libs/awscdk/src/on-deploy.inflight.ts
@@ -0,0 +1 @@
+export { OnDeployClient } from "@winglang/sdk/lib/shared-aws/on-deploy.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/on-deploy.ts b/libs/awscdk/src/on-deploy.ts
index a4e401a0ee2..22b40f14ae1 100644
--- a/libs/awscdk/src/on-deploy.ts
+++ b/libs/awscdk/src/on-deploy.ts
@@ -1,7 +1,7 @@
 import { Trigger } from "aws-cdk-lib/triggers";
 import { Construct } from "constructs";
-import { Function as AwsFunction } from "./function";
 import { cloud, core } from "@winglang/sdk";
+import { isAwsCdkFunction } from "./function";
 
 /**
  * AWS implementation of `cloud.OnDeploy`.
@@ -17,11 +17,14 @@ export class OnDeploy extends cloud.OnDeploy {
   ) {
     super(scope, id, handler, props);
 
-    let fn = new cloud.Function(this, "Function", handler, props);
-    const awsFn = fn as AwsFunction;
+    let fn = new cloud.Function(this, "Function", handler as cloud.IFunctionHandler, props);
+
+    if (!isAwsCdkFunction(fn)) {  
+      throw new Error("Expected function to implement 'IAwsCdkFunction' method");
+    }
 
     let trigger = new Trigger(this, "Trigger", {
-      handler: awsFn._function,
+      handler: fn.awscdkFunction,
     });
 
     trigger.executeAfter(...(props.executeAfter ?? []));
@@ -31,7 +34,7 @@ export class OnDeploy extends cloud.OnDeploy {
   /** @internal */
   public _toInflight(): string {
     return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
+      __dirname,
       __filename,
       "OnDeployClient",
       []
diff --git a/libs/awscdk/src/queue.inflight.ts b/libs/awscdk/src/queue.inflight.ts
new file mode 100644
index 00000000000..dfe9604ce53
--- /dev/null
+++ b/libs/awscdk/src/queue.inflight.ts
@@ -0,0 +1 @@
+export { QueueClient } from "@winglang/sdk/lib/shared-aws/queue.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/queue.setconsumer.inflight.ts b/libs/awscdk/src/queue.setconsumer.inflight.ts
deleted file mode 100644
index fad9a001de7..00000000000
--- a/libs/awscdk/src/queue.setconsumer.inflight.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { QueueSetConsumerHandlerClient } from "@winglang/sdk/lib/shared-aws/queue.setconsumer.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/queue.ts b/libs/awscdk/src/queue.ts
index d0f826556b7..51159109369 100644
--- a/libs/awscdk/src/queue.ts
+++ b/libs/awscdk/src/queue.ts
@@ -1,14 +1,17 @@
-import { join } from "path";
 import { Duration } from "aws-cdk-lib";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { Queue as SQSQueue } from "aws-cdk-lib/aws-sqs";
 import { Construct } from "constructs";
-import { Function } from "./function";
 import { App } from "./app";
 import { std, core, cloud } from "@winglang/sdk";
-import { convertBetweenHandlers } from "@winglang/sdk/lib/shared/convert";
 import { calculateQueuePermissions } from "@winglang/sdk/lib/shared-aws/permissions";
-import { IAwsQueue } from "@winglang/sdk/lib/shared-aws/queue";
+import {
+  IAwsQueue,
+  Queue as AwsQueue,
+  QueueSetConsumerHandler,
+} from "@winglang/sdk/lib/shared-aws/queue";
+import { addPolicyStatements, isAwsCdkFunction } from "./function";
+import { LiftMap } from "@winglang/sdk/lib/core";
 
 /**
  * AWS implementation of `cloud.Queue`.
@@ -23,30 +26,43 @@ export class Queue extends cloud.Queue implements IAwsQueue {
     super(scope, id, props);
     this.timeout = props.timeout ?? std.Duration.fromSeconds(30);
 
-    this.queue = new SQSQueue(this, "Default", {
-      visibilityTimeout: props.timeout
-        ? Duration.seconds(props.timeout?.seconds)
-        : Duration.seconds(30),
-      retentionPeriod: props.retentionPeriod
-        ? Duration.seconds(props.retentionPeriod?.seconds)
-        : Duration.hours(1),
-    });
+    const queueOpt = props.dlq
+      ? {
+          visibilityTimeout: props.timeout
+            ? Duration.seconds(props.timeout?.seconds)
+            : Duration.seconds(30),
+          retentionPeriod: props.retentionPeriod
+            ? Duration.seconds(props.retentionPeriod?.seconds)
+            : Duration.hours(1),
+          deadLetterQueue: {
+            queue: SQSQueue.fromQueueArn(
+              this,
+              "DeadLetterQueue",
+              AwsQueue.from(props.dlq.queue)?.queueArn!
+            ),
+            maxReceiveCount:
+              props.dlq.maxDeliveryAttempts ?? cloud.DEFAULT_DELIVERY_ATTEMPTS,
+          },
+        }
+      : {
+          visibilityTimeout: props.timeout
+            ? Duration.seconds(props.timeout?.seconds)
+            : Duration.seconds(30),
+          retentionPeriod: props.retentionPeriod
+            ? Duration.seconds(props.retentionPeriod?.seconds)
+            : Duration.hours(1),
+        };
+
+    this.queue = new SQSQueue(this, "Default", queueOpt);
   }
 
   public setConsumer(
     inflight: cloud.IQueueSetConsumerHandler,
     props: cloud.QueueSetConsumerOptions = {}
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(
-        __dirname.replace("target-awscdk", "shared-aws"),
-        "queue.setconsumer.inflight.js"
-      ),
-      "QueueSetConsumerHandlerClient"
-    );
+    const functionHandler = QueueSetConsumerHandler.toFunctionHandler(inflight);
 
-    const fn = new Function(
+    const fn = new cloud.Function(
       // ok since we're not a tree root
       this.node.scope!,
       App.of(this).makeId(this, `${this.node.id}-SetConsumer`),
@@ -57,15 +73,16 @@ export class Queue extends cloud.Queue implements IAwsQueue {
       }
     );
 
-    // TODO: remove this constraint by adding generic permission APIs to cloud.Function
-    if (!(fn instanceof Function)) {
-      throw new Error("Queue only supports creating awscdk.Function right now");
+    if (!isAwsCdkFunction(fn)) {
+      throw new Error("Queue only supports creating IAwsCdkFunction right now");
     }
 
     const eventSource = new SqsEventSource(this.queue, {
       batchSize: props.batchSize ?? 1,
+      reportBatchItemFailures: true,
     });
-    fn._addEventSource(eventSource);
+
+    fn.awscdkFunction.addEventSource(eventSource);
 
     std.Node.of(this).addConnection({
       source: this,
@@ -77,24 +94,25 @@ export class Queue extends cloud.Queue implements IAwsQueue {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.QueueInflightMethods.PUSH,
-      cloud.QueueInflightMethods.PURGE,
-      cloud.QueueInflightMethods.APPROX_SIZE,
-      cloud.QueueInflightMethods.POP,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.QueueInflightMethods.PUSH]: [],
+      [cloud.QueueInflightMethods.PURGE]: [],
+      [cloud.QueueInflightMethods.APPROX_SIZE]: [],
+      [cloud.QueueInflightMethods.POP]: [],
+    };
   }
 
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("queues can only be bound by tfaws.Function for now");
+    if (!isAwsCdkFunction(host)) {
+      throw new Error("Expected 'host' to implement IAwsCdkFunction");
     }
 
     const env = this.envName();
 
-    host.addPolicyStatements(
-      ...calculateQueuePermissions(this.queue.queueArn, ops)
+    addPolicyStatements(
+      host.awscdkFunction,
+      calculateQueuePermissions(this.queue.queueArn, ops)
     );
 
     // The queue url needs to be passed through an environment variable since
@@ -106,12 +124,9 @@ export class Queue extends cloud.Queue implements IAwsQueue {
 
   /** @internal */
   public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
-      __filename,
-      "QueueClient",
-      [`process.env["${this.envName()}"]`]
-    );
+    return core.InflightClient.for(__dirname, __filename, "QueueClient", [
+      `process.env["${this.envName()}"]`,
+    ]);
   }
 
   private envName(): string {
diff --git a/libs/awscdk/src/schedule.ontick.inflight.ts b/libs/awscdk/src/schedule.ontick.inflight.ts
deleted file mode 100644
index 09e5582b649..00000000000
--- a/libs/awscdk/src/schedule.ontick.inflight.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ScheduleOnTickHandlerClient } from "@winglang/sdk/lib/shared-aws/schedule.ontick.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/schedule.ts b/libs/awscdk/src/schedule.ts
index c6959c8b363..f49bc33e7cb 100644
--- a/libs/awscdk/src/schedule.ts
+++ b/libs/awscdk/src/schedule.ts
@@ -1,4 +1,3 @@
-import { join } from "path";
 import { Duration } from "aws-cdk-lib";
 import { Rule, Schedule as EventSchedule } from "aws-cdk-lib/aws-events";
 import {
@@ -6,10 +5,11 @@ import {
   addLambdaPermission,
 } from "aws-cdk-lib/aws-events-targets";
 import { Construct } from "constructs";
-import { Function } from "./function";
 import { App } from "./app";
 import { cloud, core, std } from "@winglang/sdk";
-import { convertBetweenHandlers } from "@winglang/sdk/lib/shared/convert";
+import { ScheduleOnTickHandler, convertUnixCronToAWSCron } from "@winglang/sdk/lib/shared-aws/schedule";
+import { isAwsCdkFunction } from "./function";
+
 
 /**
  * AWS implementation of `cloud.Schedule`.
@@ -25,27 +25,15 @@ export class Schedule extends cloud.Schedule {
 
     const { rate, cron } = props;
 
-    /*
-     * The schedule cron string is Unix cron format: [minute] [hour] [day of month] [month] [day of week]
-     * AWS EventBridge Schedule uses a 6 field format which includes year: [minute] [hour] [day of month] [month] [day of week] [year]
-     * https://docs.aws.amazon.com/scheduler/latest/UserGuide/schedule-types.html#cron-based
-     *
-     * We append * to the cron string for year field.
-     */
     if (cron) {
-      const cronArr = cron.split(" ");
-      let cronOpt: { [k: string]: string } = {
-        minute: cronArr[0],
-        hour: cronArr[1],
-        month: cronArr[3],
-        year: "*",
-      };
-      if (cronArr[2] !== "?") {
-        cronOpt.day = cronArr[2];
-      }
-      if (cronArr[4] !== "?") {
-        cronOpt.weekDay = cronArr[4];
-      }
+      let cronOpt: { [k: string]: string } = {};
+      const awsCron = convertUnixCronToAWSCron(cron);
+      const cronArr = awsCron.split(" ");
+      if (cronArr[0] !== "*" && cronArr[0] !== "?") { cronOpt.minute = cronArr[0]; }
+      if (cronArr[1] !== "*" && cronArr[1] !== "?") { cronOpt.hour = cronArr[1]; }
+      if (cronArr[2] !== "*" && cronArr[2] !== "?") { cronOpt.day = cronArr[2]; }
+      if (cronArr[3] !== "*" && cronArr[3] !== "?") { cronOpt.month = cronArr[3]; }
+      if (cronArr[4] !== "*" && cronArr[4] !== "?") { cronOpt.weekDay = cronArr[4]; }
 
       this.scheduleExpression = EventSchedule.cron(cronOpt);
     } else {
@@ -64,16 +52,9 @@ export class Schedule extends cloud.Schedule {
     inflight: cloud.IScheduleOnTickHandler,
     props?: cloud.ScheduleOnTickOptions | undefined
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(
-        __dirname.replace("target-awscdk", "shared-aws"),
-        "schedule.ontick.inflight.js"
-      ),
-      "ScheduleOnTickHandlerClient"
-    );
+    const functionHandler = ScheduleOnTickHandler.toFunctionHandler(inflight);
 
-    const fn = new Function(
+    const fn = new cloud.Function(
       // ok since we're not a tree root
       this.node.scope!,
       App.of(this).makeId(this, `${this.node.id}-OnTick`),
@@ -81,15 +62,12 @@ export class Schedule extends cloud.Schedule {
       props
     );
 
-    // TODO: remove this constraint by adding generic permission APIs to cloud.Function
-    if (!(fn instanceof Function)) {
-      throw new Error(
-        "Schedule only supports creating awscdk.Function right now"
-      );
+    if (!isAwsCdkFunction(fn)) {
+      throw new Error("Expected function to implement 'isAwsCdkFunction' method");
     }
 
-    this.rule.addTarget(new LambdaFunction(fn._function));
-    addLambdaPermission(this.rule, fn._function);
+    this.rule.addTarget(new LambdaFunction(fn.awscdkFunction));
+    addLambdaPermission(this.rule, fn.awscdkFunction);
 
     std.Node.of(this).addConnection({
       source: this,
@@ -103,7 +81,7 @@ export class Schedule extends cloud.Schedule {
   /** @internal */
   public _toInflight(): string {
     return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
+      __dirname,
       __filename,
       "ScheduleClient",
       [`process.env["${this.envName()}"]`]
diff --git a/libs/awscdk/src/secret.inflight.ts b/libs/awscdk/src/secret.inflight.ts
new file mode 100644
index 00000000000..cf35feea6ae
--- /dev/null
+++ b/libs/awscdk/src/secret.inflight.ts
@@ -0,0 +1 @@
+export { SecretClient } from "@winglang/sdk/lib/shared-aws/secret.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/secret.ts b/libs/awscdk/src/secret.ts
index 42a71262e44..e3999d356eb 100644
--- a/libs/awscdk/src/secret.ts
+++ b/libs/awscdk/src/secret.ts
@@ -4,9 +4,10 @@ import {
   Secret as CdkSecret,
 } from "aws-cdk-lib/aws-secretsmanager";
 import { Construct } from "constructs";
-import { Function } from "./function";
+import { addPolicyStatements, isAwsCdkFunction } from "./function";
 import { cloud, core, std } from "@winglang/sdk";
 import { calculateSecretPermissions } from "@winglang/sdk/lib/shared-aws/permissions";
+import { LiftMap } from "@winglang/sdk/lib/core";
 
 /**
  * AWS Implemntation of `cloud.Secret`
@@ -33,11 +34,11 @@ export class Secret extends cloud.Secret {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.SecretInflightMethods.VALUE,
-      cloud.SecretInflightMethods.VALUE_JSON,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.SecretInflightMethods.VALUE]: [],
+      [cloud.SecretInflightMethods.VALUE_JSON]: [],
+    };
   }
 
   /**
@@ -48,12 +49,13 @@ export class Secret extends cloud.Secret {
   }
 
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("secrets can only be bound by awscdk.Function for now");
+    if (!isAwsCdkFunction(host)) {
+      throw new Error("Expected 'host' to implement 'isAwsCdkFunction' method");
     }
 
-    host.addPolicyStatements(
-      ...calculateSecretPermissions(this.arnForPolicies, ops)
+    addPolicyStatements(
+      host.awscdkFunction,
+      calculateSecretPermissions(this.arnForPolicies, ops)
     );
 
     host.addEnvironment(this.envName(), this.secret.secretArn);
@@ -63,12 +65,9 @@ export class Secret extends cloud.Secret {
 
   /** @internal */
   public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
-      __filename,
-      "SecretClient",
-      [`process.env["${this.envName()}"]`]
-    );
+    return core.InflightClient.for(__dirname, __filename, "SecretClient", [
+      `process.env["${this.envName()}"]`,
+    ]);
   }
 
   private envName(): string {
diff --git a/libs/awscdk/src/test-runner.ts b/libs/awscdk/src/test-runner.ts
index 30b6c9c0d5a..23915daea7c 100644
--- a/libs/awscdk/src/test-runner.ts
+++ b/libs/awscdk/src/test-runner.ts
@@ -1,7 +1,7 @@
 import { CfnOutput, Lazy } from "aws-cdk-lib";
 import { Construct } from "constructs";
-import { Function as AwsFunction } from "./function";
 import { core, std } from "@winglang/sdk";
+import { isAwsCdkFunction } from "./function";
 
 const OUTPUT_TEST_RUNNER_FUNCTION_ARNS = "WingTestRunnerFunctionArns";
 
@@ -28,10 +28,6 @@ export class TestRunner extends std.TestRunner {
   }
 
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof AwsFunction)) {
-      throw new Error("TestRunner can only be bound by tfaws.Function for now");
-    }
-
     // Collect all of the test functions and their ARNs, and pass them to the
     // test engine so they can be invoked inflight.
     // TODO: are we going to run into AWS's 4KB environment variable limit here?
@@ -66,12 +62,12 @@ export class TestRunner extends std.TestRunner {
     const arns = new Map<string, string>();
     for (const test of this.findTests()) {
       if (test._fn) {
-        if (!(test._fn instanceof AwsFunction)) {
+        if (!(isAwsCdkFunction(test._fn))) {
           throw new Error(
             `Unsupported test function type, ${test._fn.node.path} was not a tfaws.Function`
           );
         }
-        arns.set(test.node.path, (test._fn as AwsFunction).functionArn);
+        arns.set(test.node.path, test._fn.awscdkFunction.functionArn);
       }
     }
     return arns;
diff --git a/libs/awscdk/src/tokens.ts b/libs/awscdk/src/tokens.ts
index 34247080433..6184860ad0a 100644
--- a/libs/awscdk/src/tokens.ts
+++ b/libs/awscdk/src/tokens.ts
@@ -1,7 +1,7 @@
 import { Fn, Token } from "aws-cdk-lib";
-import { Function } from "@winglang/sdk/lib/cloud";
 import { tokenEnvName, ITokenResolver } from "@winglang/sdk/lib/core/tokens";
 import { IInflightHost } from "@winglang/sdk/lib/std";
+import { isAwsCdkFunction } from "./function";
 
 /**
  * Represents values that can only be resolved after the app is synthesized.
@@ -41,8 +41,8 @@ export class CdkTokens implements ITokenResolver {
    * Binds the given token to the host.
    */
   public onLiftValue(host: IInflightHost, value: any) {
-    if (!(host instanceof Function)) {
-      throw new Error(`Tokens can only be bound by a Function for now`);
+    if (!isAwsCdkFunction(host)) {
+      throw new Error("Expected 'host' to implement 'isAwsCdkFunction' method");
     }
 
     let envValue;
@@ -65,9 +65,8 @@ export class CdkTokens implements ITokenResolver {
     }
 
     const envName = tokenEnvName(value.toString());
+
     // the same token might be bound multiple times by different variables/inflight contexts
-    if (host.env[envName] === undefined) {
-      host.addEnvironment(envName, envValue);
-    }
+    host.addEnvironment(envName, envValue);
   }
 }
diff --git a/libs/awscdk/src/topic.inflight.ts b/libs/awscdk/src/topic.inflight.ts
new file mode 100644
index 00000000000..21b2af289ba
--- /dev/null
+++ b/libs/awscdk/src/topic.inflight.ts
@@ -0,0 +1 @@
+export { TopicClient } from "@winglang/sdk/lib/shared-aws/topic.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/topic.onmessage.inflight.ts b/libs/awscdk/src/topic.onmessage.inflight.ts
deleted file mode 100644
index c20879da70f..00000000000
--- a/libs/awscdk/src/topic.onmessage.inflight.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TopicOnMessageHandlerClient } from "@winglang/sdk/lib/shared-aws/topic.onmessage.inflight";
diff --git a/libs/awscdk/src/topic.ts b/libs/awscdk/src/topic.ts
index ded2208d7df..f938e0ea213 100644
--- a/libs/awscdk/src/topic.ts
+++ b/libs/awscdk/src/topic.ts
@@ -1,13 +1,20 @@
-import { join } from "path";
 import { Topic as SNSTopic } from "aws-cdk-lib/aws-sns";
-import { LambdaSubscription } from "aws-cdk-lib/aws-sns-subscriptions";
+import { Queue as SQSQeueue } from "aws-cdk-lib/aws-sqs";
+import {
+  LambdaSubscription,
+  SqsSubscription,
+} from "aws-cdk-lib/aws-sns-subscriptions";
 import { Construct } from "constructs";
-import { Function } from "./function";
 import { App } from "./app";
 import { cloud, core, std } from "@winglang/sdk";
-import { convertBetweenHandlers } from "@winglang/sdk/lib/shared/convert";
 import { calculateTopicPermissions } from "@winglang/sdk/lib/shared-aws/permissions";
-import { IAwsTopic } from "@winglang/sdk/lib/shared-aws/topic";
+import {
+  IAwsTopic,
+  TopicOnMessageHandler,
+} from "@winglang/sdk/lib/shared-aws/topic";
+import { addPolicyStatements, isAwsCdkFunction } from "./function";
+import { Queue } from "./queue";
+import { LiftMap } from "@winglang/sdk/lib/core";
 
 /**
  * AWS Implementation of `cloud.Topic`.
@@ -26,28 +33,22 @@ export class Topic extends cloud.Topic implements IAwsTopic {
     inflight: cloud.ITopicOnMessageHandler,
     props: cloud.TopicOnMessageOptions = {}
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(
-        __dirname.replace("target-awscdk", "shared-aws"),
-        "topic.onmessage.inflight.js"
-      ),
-      "TopicOnMessageHandlerClient"
-    );
+    const functionHandler = TopicOnMessageHandler.toFunctionHandler(inflight);
 
-    const fn = new Function(
+    const fn = new cloud.Function(
       this.node.scope!, // ok since we're not a tree root
       App.of(this).makeId(this, `${this.node.id}-OnMessage`),
       functionHandler,
       props
     );
 
-    // TODO: remove this constraint by adding geric permission APIs to cloud.Function
-    if (!(fn instanceof Function)) {
-      throw new Error("Topic only supports creating awscdk.Function right now");
+    if (!isAwsCdkFunction(fn)) {
+      throw new Error(
+        "Expected function to implement 'IAwsCdkFunction' method"
+      );
     }
 
-    const subscription = new LambdaSubscription(fn._function);
+    const subscription = new LambdaSubscription(fn.awscdkFunction);
     this.topic.addSubscription(subscription);
 
     std.Node.of(this).addConnection({
@@ -59,13 +60,26 @@ export class Topic extends cloud.Topic implements IAwsTopic {
     return fn;
   }
 
+  public subscribeQueue(queue: cloud.Queue): void {
+    if (!(queue instanceof Queue)) {
+      throw new Error(
+        "'subscribeQueue' allows only tfaws.Queue to be subscribed to the Topic"
+      );
+    }
+
+    const baseTopic = SNSTopic.fromTopicArn(this, "BaseTopic", this.topicArn);
+    const baseQueue = SQSQeueue.fromQueueArn(this, "BaseQueue", queue.queueArn);
+    baseTopic.addSubscription(new SqsSubscription(baseQueue));
+  }
+
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("topics can only be bound by awscdk.Function for now");
+    if (!isAwsCdkFunction(host)) {
+      throw new Error("Expected 'host' to implement 'IAwsCdkFunction' method");
     }
 
-    host.addPolicyStatements(
-      ...calculateTopicPermissions(this.topic.topicArn, ops)
+    addPolicyStatements(
+      host.awscdkFunction,
+      calculateTopicPermissions(this.topic.topicArn, ops)
     );
 
     host.addEnvironment(this.envName(), this.topic.topicArn);
@@ -75,12 +89,15 @@ export class Topic extends cloud.Topic implements IAwsTopic {
 
   /** @internal */
   public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
-      __filename,
-      "TopicClient",
-      [`process.env["${this.envName()}"]`]
-    );
+    return core.InflightClient.for(__dirname, __filename, "TopicClient", [
+      `process.env["${this.envName()}"]`,
+    ]);
+  }
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.TopicInflightMethods.PUBLISH]: [],
+    };
   }
 
   /** @internal */
diff --git a/libs/awscdk/src/website.inflight.ts b/libs/awscdk/src/website.inflight.ts
new file mode 100644
index 00000000000..4bf054650ab
--- /dev/null
+++ b/libs/awscdk/src/website.inflight.ts
@@ -0,0 +1 @@
+export { WebsiteClient } from "@winglang/sdk/lib/shared-aws/website.inflight";
\ No newline at end of file
diff --git a/libs/awscdk/src/website.ts b/libs/awscdk/src/website.ts
index 1bb43307da9..2c8d133a937 100644
--- a/libs/awscdk/src/website.ts
+++ b/libs/awscdk/src/website.ts
@@ -19,6 +19,7 @@ const INDEX_FILE = "index.html";
 export class Website extends cloud.Website implements IAwsWebsite {
   private readonly bucket: S3Bucket;
   private readonly _url: string;
+  private readonly endpoint: cloud.Endpoint;
 
   constructor(scope: Construct, id: string, props: cloud.WebsiteProps) {
     super(scope, id, props);
@@ -56,10 +57,12 @@ export class Website extends cloud.Website implements IAwsWebsite {
     });
 
     this._url = `https://${distribution.domainName}`;
+
+    this.endpoint = new cloud.Endpoint(this, "Endpoint", this._url, { label: `Website ${this.node.path}`, browserSupport: true })
   }
 
-  public get url(): string {
-    return this._url;
+  protected get _endpoint(): cloud.Endpoint {
+    return this.endpoint;
   }
 
   public addFile(
@@ -83,7 +86,7 @@ export class Website extends cloud.Website implements IAwsWebsite {
   /** @internal */
   public _toInflight(): string {
     return core.InflightClient.for(
-      __dirname.replace("target-awscdk", "shared-aws"),
+      __dirname,
       __filename,
       "WebsiteClient",
       []
diff --git a/libs/awscdk/test/__snapshots__/api.test.ts.snap b/libs/awscdk/test/__snapshots__/api.test.ts.snap
new file mode 100644
index 00000000000..e9f77291c68
--- /dev/null
+++ b/libs/awscdk/test/__snapshots__/api.test.ts.snap
@@ -0,0 +1,7409 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`api configured for cors 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "get": {
+                "operationId": "get",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                    "headers": {
+                      "Access-Control-Allow-Headers": {
+                        "schema": {
+                          "type": "string",
+                        },
+                      },
+                      "Access-Control-Allow-Methods": {
+                        "schema": {
+                          "type": "string",
+                        },
+                      },
+                      "Access-Control-Allow-Origin": {
+                        "schema": {
+                          "type": "string",
+                        },
+                      },
+                      "Access-Control-Max-Age": {
+                        "schema": {
+                          "type": "string",
+                        },
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apiget05B158CAF",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "204": {
+                    "description": "204 response",
+                    "headers": {
+                      "Access-Control-Allow-Headers": {
+                        "type": "string",
+                      },
+                      "Access-Control-Allow-Methods": {
+                        "type": "string",
+                      },
+                      "Access-Control-Allow-Origin": {
+                        "type": "string",
+                      },
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                #if ($context.httpMethod == "OPTIONS")
+                    {"statusCode": 204}
+                #else
+                    {"statusCode": 404}
+                #end
+              ",
+                  },
+                  "responses": {
+                    "204": {
+                      "responseParameters": {
+                        "method.response.header.Access-Control-Allow-Headers": "'Content-Type,Authorization,X-Requested-With'",
+                        "method.response.header.Access-Control-Allow-Methods": "'GET,POST,PUT,DELETE,HEAD,OPTIONS'",
+                        "method.response.header.Access-Control-Allow-Origin": "'*'",
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{}",
+                      },
+                      "statusCode": "204",
+                    },
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006a9350fdefb39f2c9c8b6f14c6d2d6da7": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGETc2e3ffa85BF93889": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apiget05B158CAF",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006a9350fdefb39f2c9c8b6f14c6d2d6da7",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apiget05B158CAF": {
+      "DependsOn": [
+        "Apiget0ServiceRole85647A81",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apiget0LogGroupB0A43FFB",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apiget0ServiceRole85647A81",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apiget0LogGroupB0A43FFB": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiget0ServiceRole85647A81": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api url can be used as environment variable 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006910767f1701c246578b56528c67217b8": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006910767f1701c246578b56528c67217b8",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Fn9270CBC0": {
+      "DependsOn": [
+        "FnServiceRoleB9001A96",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "API_URL": {
+              "Fn::Join": [
+                "",
+                [
+                  "https://",
+                  {
+                    "Ref": "Apiapi93AB445C",
+                  },
+                  ".execute-api.",
+                  {
+                    "Ref": "AWS::Region",
+                  },
+                  ".",
+                  {
+                    "Ref": "AWS::URLSuffix",
+                  },
+                  "/",
+                  {
+                    "Ref": "Apiapistage69F1AB31",
+                  },
+                  "/",
+                ],
+              ],
+            },
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FnLogGroup27CC2AC8",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "FnServiceRoleB9001A96",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "FnLogGroup27CC2AC8": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "FnServiceRoleB9001A96": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with 'name' & 'age' parameter 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/{name}/{age}": {
+              "get": {
+                "operationId": "get-:name/:age",
+                "parameters": [
+                  {
+                    "in": "path",
+                    "name": "name",
+                    "required": true,
+                    "schema": {
+                      "type": "string",
+                    },
+                  },
+                  {
+                    "in": "path",
+                    "name": "age",
+                    "required": true,
+                    "schema": {
+                      "type": "string",
+                    },
+                  },
+                ],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigetnameage0C58029A8",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{name}/{age}/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90060cf4119fbf39ca17a86ecca447cf30c8": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET7583b4d702B1A11B": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigetnameage0C58029A8",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/{name}/{age}",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90060cf4119fbf39ca17a86ecca447cf30c8",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigetnameage0C58029A8": {
+      "DependsOn": [
+        "Apigetnameage0ServiceRole637C878A",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigetnameage0LogGroup06FA8F29",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigetnameage0ServiceRole637C878A",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigetnameage0LogGroup06FA8F29": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigetnameage0ServiceRole637C878A": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with 'name' parameter 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/{name}": {
+              "get": {
+                "operationId": "get-:name",
+                "parameters": [
+                  {
+                    "in": "path",
+                    "name": "name",
+                    "required": true,
+                    "schema": {
+                      "type": "string",
+                    },
+                  },
+                ],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigetname024AEE843",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{name}/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006e77e5fce96817943615e86914e22fe63": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET8602bc8a990956A4": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigetname024AEE843",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/{name}",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006e77e5fce96817943615e86914e22fe63",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigetname024AEE843": {
+      "DependsOn": [
+        "Apigetname0ServiceRole01C11C6D",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigetname0LogGroup8430423E",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigetname0ServiceRole01C11C6D",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigetname0LogGroup8430423E": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigetname0ServiceRole01C11C6D": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with CONNECT route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "connect": {
+                "operationId": "connect",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apiconnect0BF1F155E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90068c14f6305292724800daf2c66d8aab90": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionCONNECTc2e3ffa848E50D94": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apiconnect0BF1F155E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/CONNECT/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90068c14f6305292724800daf2c66d8aab90",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apiconnect0BF1F155E": {
+      "DependsOn": [
+        "Apiconnect0ServiceRole72DE9AEA",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apiconnect0LogGroup1650F1E1",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apiconnect0ServiceRole72DE9AEA",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apiconnect0LogGroup1650F1E1": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiconnect0ServiceRole72DE9AEA": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with DELETE route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "delete": {
+                "operationId": "delete",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apidelete05373B3FD",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA900652590e04c0874a94e1360f4a4761e33a": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionDELETEc2e3ffa888232744": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apidelete05373B3FD",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/DELETE/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA900652590e04c0874a94e1360f4a4761e33a",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apidelete05373B3FD": {
+      "DependsOn": [
+        "Apidelete0ServiceRoleF822533F",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apidelete0LogGroupD287E557",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apidelete0ServiceRoleF822533F",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apidelete0LogGroupD287E557": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apidelete0ServiceRoleF822533F": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with GET route at root 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "get": {
+                "operationId": "get",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apiget05B158CAF",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006a3eb210ab6f4ad239a1e2ab7e70baf6c": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGETc2e3ffa85BF93889": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apiget05B158CAF",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006a3eb210ab6f4ad239a1e2ab7e70baf6c",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apiget05B158CAF": {
+      "DependsOn": [
+        "Apiget0ServiceRole85647A81",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apiget0LogGroupB0A43FFB",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apiget0ServiceRole85647A81",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apiget0LogGroupB0A43FFB": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiget0ServiceRole85647A81": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with GET routes with common prefix 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/hello/bat": {
+              "get": {
+                "operationId": "get-hello/bat",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellobat0AB6CDABB",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/hello/foo": {
+              "get": {
+                "operationId": "get-hello/foo",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellofoo0A3E97F8E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006628157807bd818497ef5f0c02bf60a24": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET01d4e10b58D09124": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellobat0AB6CDABB",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/bat",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ApiapipermissionGET4984af0e7ED7CAA2": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellofoo0A3E97F8E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/foo",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006628157807bd818497ef5f0c02bf60a24",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigethellobat0AB6CDABB": {
+      "DependsOn": [
+        "Apigethellobat0ServiceRoleE86D800F",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigethellobat0LogGroup462CC819",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigethellobat0ServiceRoleE86D800F",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigethellobat0LogGroup462CC819": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigethellobat0ServiceRoleE86D800F": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+    "Apigethellofoo0A3E97F8E": {
+      "DependsOn": [
+        "Apigethellofoo0ServiceRoleA704F0C6",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigethellofoo0LogGroup02F88FE3",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigethellofoo0ServiceRoleA704F0C6",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigethellofoo0LogGroup02F88FE3": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigethellofoo0ServiceRoleA704F0C6": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with GET routes with different prefix 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/foo/bar": {
+              "get": {
+                "operationId": "get-foo/bar",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigetfoobar0F9B27558",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/hello/foo": {
+              "get": {
+                "operationId": "get-hello/foo",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellofoo0A3E97F8E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90069af77ebae27120f9cb146237ccc602f1": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET14d002e84040D816": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigetfoobar0F9B27558",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/foo/bar",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ApiapipermissionGET4984af0e7ED7CAA2": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellofoo0A3E97F8E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/foo",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90069af77ebae27120f9cb146237ccc602f1",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigetfoobar0F9B27558": {
+      "DependsOn": [
+        "Apigetfoobar0ServiceRole11654E02",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigetfoobar0LogGroup83F006C8",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigetfoobar0ServiceRole11654E02",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigetfoobar0LogGroup83F006C8": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigetfoobar0ServiceRole11654E02": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+    "Apigethellofoo0A3E97F8E": {
+      "DependsOn": [
+        "Apigethellofoo0ServiceRoleA704F0C6",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigethellofoo0LogGroup02F88FE3",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigethellofoo0ServiceRoleA704F0C6",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigethellofoo0LogGroup02F88FE3": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigethellofoo0ServiceRoleA704F0C6": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with HEAD route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "head": {
+                "operationId": "head",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apihead0567E4746",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006189f3dead8ebb5853ed30011eebac22c": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionHEADc2e3ffa84EAE7826": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apihead0567E4746",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/HEAD/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006189f3dead8ebb5853ed30011eebac22c",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apihead0567E4746": {
+      "DependsOn": [
+        "Apihead0ServiceRole60493D0D",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apihead0LogGroup1D4A092E",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apihead0ServiceRole60493D0D",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apihead0LogGroup1D4A092E": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apihead0ServiceRole60493D0D": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with OPTIONS route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "options": {
+                "operationId": "options",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apioptions0E2B8210C",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA900640e913fb7156d92826ccb4d88cf00d94": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionOPTIONSc2e3ffa8A347CDD2": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apioptions0E2B8210C",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/OPTIONS/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA900640e913fb7156d92826ccb4d88cf00d94",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apioptions0E2B8210C": {
+      "DependsOn": [
+        "Apioptions0ServiceRole6285E621",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apioptions0LogGroup9252C37D",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apioptions0ServiceRole6285E621",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apioptions0LogGroup9252C37D": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apioptions0ServiceRole6285E621": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with PATCH route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "patch": {
+                "operationId": "patch",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apipatch0E9C679B3",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90064f5d9980a974eff1e3d61429956660fb": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionPATCHc2e3ffa81B1A24AB": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apipatch0E9C679B3",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/PATCH/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90064f5d9980a974eff1e3d61429956660fb",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apipatch0E9C679B3": {
+      "DependsOn": [
+        "Apipatch0ServiceRole0AAEF497",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apipatch0LogGroupB991FA81",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apipatch0ServiceRole0AAEF497",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apipatch0LogGroupB991FA81": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apipatch0ServiceRole0AAEF497": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with POST route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "post": {
+                "operationId": "post",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apipost088A4293C",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006528a36383aa0f54328f5727d0d594f86": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionPOSTc2e3ffa84BF1BB79": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apipost088A4293C",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/POST/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006528a36383aa0f54328f5727d0d594f86",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apipost088A4293C": {
+      "DependsOn": [
+        "Apipost0ServiceRoleA5827E1D",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apipost0LogGroup0EB50BDA",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apipost0ServiceRoleA5827E1D",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apipost0LogGroup0EB50BDA": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apipost0ServiceRoleA5827E1D": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with PUT route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "put": {
+                "operationId": "put",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apiput09BCAF5CB",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90062b5c6b2567f30a68924df13648507424": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionPUTc2e3ffa832C407B6": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apiput09BCAF5CB",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/PUT/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90062b5c6b2567f30a68924df13648507424",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apiput09BCAF5CB": {
+      "DependsOn": [
+        "Apiput0ServiceRoleFF8694DA",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apiput0LogGroupD231D4EA",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apiput0ServiceRoleFF8694DA",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apiput0LogGroupD231D4EA": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiput0ServiceRoleFF8694DA": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with multiple GET route and one lambda 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/hello/bat": {
+              "get": {
+                "operationId": "get-hello/bat",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellofoo0A3E97F8E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/hello/foo": {
+              "get": {
+                "operationId": "get-hello/foo",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellofoo0A3E97F8E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90062edea4fc086bea068dac779a93873489": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET01d4e10b58D09124": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellofoo0A3E97F8E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/bat",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ApiapipermissionGET4984af0e7ED7CAA2": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellofoo0A3E97F8E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/foo",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90062edea4fc086bea068dac779a93873489",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigethellofoo0A3E97F8E": {
+      "DependsOn": [
+        "Apigethellofoo0ServiceRoleA704F0C6",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigethellofoo0LogGroup02F88FE3",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigethellofoo0ServiceRoleA704F0C6",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigethellofoo0LogGroup02F88FE3": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigethellofoo0ServiceRoleA704F0C6": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with multiple methods and multiple lambda 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/hello/bat": {
+              "post": {
+                "operationId": "post-hello/bat",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apiposthellobat0392011F7",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/hello/foo": {
+              "get": {
+                "operationId": "get-hello/foo",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellofoo0A3E97F8E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006ae7d6e4a6052298d2abfbe41d9e1e06e": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET4984af0e7ED7CAA2": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellofoo0A3E97F8E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/foo",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ApiapipermissionPOST01d4e10b1C72C9D7": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apiposthellobat0392011F7",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/POST/hello/bat",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006ae7d6e4a6052298d2abfbe41d9e1e06e",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigethellofoo0A3E97F8E": {
+      "DependsOn": [
+        "Apigethellofoo0ServiceRoleA704F0C6",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigethellofoo0LogGroup02F88FE3",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigethellofoo0ServiceRoleA704F0C6",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigethellofoo0LogGroup02F88FE3": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigethellofoo0ServiceRoleA704F0C6": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+    "Apiposthellobat0392011F7": {
+      "DependsOn": [
+        "Apiposthellobat0ServiceRoleE59F22E7",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apiposthellobat0LogGroup4E1A6722",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apiposthellobat0ServiceRoleE59F22E7",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apiposthellobat0LogGroup4E1A6722": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiposthellobat0ServiceRoleE59F22E7": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with multiple methods and one lambda 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/hello/bat": {
+              "post": {
+                "operationId": "post-hello/bat",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellofoo0A3E97F8E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/hello/foo": {
+              "get": {
+                "operationId": "get-hello/foo",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethellofoo0A3E97F8E",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90065e7c510d60086ba47477ff050abadbc9": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET4984af0e7ED7CAA2": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellofoo0A3E97F8E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/foo",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ApiapipermissionPOST01d4e10b1C72C9D7": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethellofoo0A3E97F8E",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/POST/hello/bat",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90065e7c510d60086ba47477ff050abadbc9",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigethellofoo0A3E97F8E": {
+      "DependsOn": [
+        "Apigethellofoo0ServiceRoleA704F0C6",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigethellofoo0LogGroup02F88FE3",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigethellofoo0ServiceRoleA704F0C6",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigethellofoo0LogGroup02F88FE3": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigethellofoo0ServiceRoleA704F0C6": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with multiple methods on same route 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/": {
+              "get": {
+                "operationId": "get",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apiget05B158CAF",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+              "put": {
+                "operationId": "put",
+                "parameters": [],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apiget05B158CAF",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA9006b1eeaaafc7f642195ca45ff4c51112c7": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGETc2e3ffa85BF93889": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apiget05B158CAF",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ApiapipermissionPUTc2e3ffa832C407B6": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apiget05B158CAF",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/PUT/",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA9006b1eeaaafc7f642195ca45ff4c51112c7",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apiget05B158CAF": {
+      "DependsOn": [
+        "Apiget0ServiceRole85647A81",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apiget0LogGroupB0A43FFB",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apiget0ServiceRole85647A81",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apiget0LogGroupB0A43FFB": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiget0ServiceRole85647A81": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`api with path parameter 1`] = `
+{
+  "Outputs": {
+    "ApiEndpointUrl473FEE9F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Ref": "Apiapi93AB445C",
+            },
+            ".execute-api.",
+            {
+              "Ref": "AWS::Region",
+            },
+            ".",
+            {
+              "Ref": "AWS::URLSuffix",
+            },
+            "/",
+            {
+              "Ref": "Apiapistage69F1AB31",
+            },
+            "/",
+          ],
+        ],
+      },
+    },
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Apiapi93AB445C": {
+      "Properties": {
+        "Body": {
+          "openapi": "3.0.3",
+          "paths": {
+            "/hello/{world}": {
+              "get": {
+                "operationId": "get-hello/:world",
+                "parameters": [
+                  {
+                    "in": "path",
+                    "name": "world",
+                    "required": true,
+                    "schema": {
+                      "type": "string",
+                    },
+                  },
+                ],
+                "responses": {
+                  "200": {
+                    "content": {},
+                    "description": "200 response",
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "contentHandling": "CONVERT_TO_TEXT",
+                  "httpMethod": "POST",
+                  "passthroughBehavior": "when_no_match",
+                  "responses": {
+                    "default": {
+                      "statusCode": "200",
+                    },
+                  },
+                  "type": "aws_proxy",
+                  "uri": {
+                    "Fn::Join": [
+                      "",
+                      [
+                        "arn:aws:apigateway:",
+                        {
+                          "Ref": "AWS::Region",
+                        },
+                        ":lambda:path/2015-03-31/functions/",
+                        {
+                          "Fn::GetAtt": [
+                            "Apigethelloworld0919C7F7F",
+                            "Arn",
+                          ],
+                        },
+                        "/invocations",
+                      ],
+                    ],
+                  },
+                },
+              },
+            },
+            "/{proxy+}": {
+              "x-amazon-apigateway-any-method": {
+                "produces": [
+                  "application/json",
+                ],
+                "responses": {
+                  "404": {
+                    "description": "404 response",
+                    "headers": {
+                      "Content-Type": {
+                        "type": "string",
+                      },
+                    },
+                  },
+                },
+                "x-amazon-apigateway-integration": {
+                  "passthroughBehavior": "never",
+                  "requestTemplates": {
+                    "application/json": "
+                {"statusCode": 404}
+              ",
+                  },
+                  "responses": {
+                    "404": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                    "default": {
+                      "responseParameters": {
+                        "method.response.header.Content-Type": "'application/json'",
+                      },
+                      "responseTemplates": {
+                        "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
+                      },
+                      "statusCode": "404",
+                    },
+                  },
+                  "type": "mock",
+                },
+              },
+            },
+          },
+        },
+        "Name": "api",
+      },
+      "Type": "AWS::ApiGateway::RestApi",
+    },
+    "ApiapiAccount3EE8A867": {
+      "DeletionPolicy": "Retain",
+      "DependsOn": [
+        "Apiapi93AB445C",
+      ],
+      "Properties": {
+        "CloudWatchRoleArn": {
+          "Fn::GetAtt": [
+            "ApiapiCloudWatchRole6C699FCE",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::ApiGateway::Account",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapiCloudWatchRole6C699FCE": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "apigateway.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apiapideployment63AA90067964adf987057a6a86baf23dd82e2513": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+      },
+      "Type": "AWS::ApiGateway::Deployment",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ApiapipermissionGET0781b9f92555BD3C": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Ref": "Apigethelloworld0919C7F7F",
+        },
+        "Principal": "apigateway.amazonaws.com",
+        "SourceArn": {
+          "Fn::Join": [
+            "",
+            [
+              "arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":execute-api:",
+              {
+                "Ref": "AWS::Region",
+              },
+              ":",
+              {
+                "Ref": "AWS::AccountId",
+              },
+              ":",
+              {
+                "Ref": "Apiapi93AB445C",
+              },
+              "/*/GET/hello/{world}",
+            ],
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "Apiapistage69F1AB31": {
+      "DependsOn": [
+        "ApiapiAccount3EE8A867",
+      ],
+      "Properties": {
+        "DeploymentId": {
+          "Ref": "Apiapideployment63AA90067964adf987057a6a86baf23dd82e2513",
+        },
+        "RestApiId": {
+          "Ref": "Apiapi93AB445C",
+        },
+        "StageName": "prod",
+      },
+      "Type": "AWS::ApiGateway::Stage",
+    },
+    "Apigethelloworld0919C7F7F": {
+      "DependsOn": [
+        "Apigethelloworld0ServiceRoleC56A0ACC",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "Apigethelloworld0LogGroupDD091C4B",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "Apigethelloworld0ServiceRoleC56A0ACC",
+            "Arn",
+          ],
+        },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "Apigethelloworld0LogGroupDD091C4B": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "Apigethelloworld0ServiceRoleC56A0ACC": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
diff --git a/libs/awscdk/test/__snapshots__/bucket.test.ts.snap b/libs/awscdk/test/__snapshots__/bucket.test.ts.snap
index 365c61628b6..71ef09fa5ab 100644
--- a/libs/awscdk/test/__snapshots__/bucket.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/bucket.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`bucket is public 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -104,11 +99,6 @@ exports[`bucket is public 1`] = `
 
 exports[`bucket with onCreate method 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -129,33 +119,29 @@ import json
 import logging
 import urllib.request
 
-s3 = boto3.client(\\"s3\\")
+s3 = boto3.client("s3")
 
 EVENTBRIDGE_CONFIGURATION = 'EventBridgeConfiguration'
-
-CONFIGURATION_TYPES = [\\"TopicConfigurations\\", \\"QueueConfigurations\\", \\"LambdaFunctionConfigurations\\"]
+CONFIGURATION_TYPES = ["TopicConfigurations", "QueueConfigurations", "LambdaFunctionConfigurations"]
 
 def handler(event: dict, context):
-  response_status = \\"SUCCESS\\"
-  error_message = \\"\\"
+  response_status = "SUCCESS"
+  error_message = ""
   try:
-    props = event[\\"ResourceProperties\\"]
-    bucket = props[\\"BucketName\\"]
-    notification_configuration = props[\\"NotificationConfiguration\\"]
-    request_type = event[\\"RequestType\\"]
+    props = event["ResourceProperties"]
+    notification_configuration = props["NotificationConfiguration"]
     managed = props.get('Managed', 'true').lower() == 'true'
     stack_id = event['StackId']
-
+    old = event.get("OldResourceProperties", {}).get("NotificationConfiguration", {})
     if managed:
-      config = handle_managed(request_type, notification_configuration)
+      config = handle_managed(event["RequestType"], notification_configuration)
     else:
-      config = handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
-
-    put_bucket_notification_configuration(bucket, config)
+      config = handle_unmanaged(props["BucketName"], stack_id, event["RequestType"], notification_configuration, old)
+    s3.put_bucket_notification_configuration(Bucket=props["BucketName"], NotificationConfiguration=config)
   except Exception as e:
-    logging.exception(\\"Failed to put bucket notification configuration\\")
-    response_status = \\"FAILED\\"
-    error_message = f\\"Error: {str(e)}. \\"
+    logging.exception("Failed to put bucket notification configuration")
+    response_status = "FAILED"
+    error_message = f"Error: {str(e)}. "
   finally:
     submit_response(event, context, response_status, error_message)
 
@@ -164,16 +150,26 @@ def handle_managed(request_type, notification_configuration):
     return {}
   return notification_configuration
 
-def handle_unmanaged(bucket, stack_id, request_type, notification_configuration):
-  external_notifications = find_external_notifications(bucket, stack_id)
+def handle_unmanaged(bucket, stack_id, request_type, notification_configuration, old):
+  def with_id(n):
+    n['Id'] = f"{stack_id}-{hash(json.dumps(n, sort_keys=True))}"
+    return n
+
+  external_notifications = {}
+  existing_notifications = s3.get_bucket_notification_configuration(Bucket=bucket)
+  for t in CONFIGURATION_TYPES:
+    if request_type == 'Update':
+        ids = [with_id(n) for n in old.get(t, [])]
+        old_incoming_ids = [n['Id'] for n in ids]
+        external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'] in old_incoming_ids]
+    elif request_type == 'Create':
+        external_notifications[t] = [n for n in existing_notifications.get(t, [])]
+  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
+    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
 
   if request_type == 'Delete':
     return external_notifications
 
-  def with_id(notification):
-    notification['Id'] = f\\"{stack_id}-{hash(json.dumps(notification, sort_keys=True))}\\"
-    return notification
-
   notifications = {}
   for t in CONFIGURATION_TYPES:
     external = external_notifications.get(t, [])
@@ -187,46 +183,29 @@ def handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
 
   return notifications
 
-def find_external_notifications(bucket, stack_id):
-  existing_notifications = get_bucket_notification_configuration(bucket)
-  external_notifications = {}
-  for t in CONFIGURATION_TYPES:
-    external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'].startswith(f\\"{stack_id}-\\")]
-
-  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
-    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
-
-  return external_notifications
-
-def get_bucket_notification_configuration(bucket):
-  return s3.get_bucket_notification_configuration(Bucket=bucket)
-
-def put_bucket_notification_configuration(bucket, notification_configuration):
-  s3.put_bucket_notification_configuration(Bucket=bucket, NotificationConfiguration=notification_configuration)
-
 def submit_response(event: dict, context, response_status: str, error_message: str):
   response_body = json.dumps(
     {
-      \\"Status\\": response_status,
-      \\"Reason\\": f\\"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}\\",
-      \\"PhysicalResourceId\\": event.get(\\"PhysicalResourceId\\") or event[\\"LogicalResourceId\\"],
-      \\"StackId\\": event[\\"StackId\\"],
-      \\"RequestId\\": event[\\"RequestId\\"],
-      \\"LogicalResourceId\\": event[\\"LogicalResourceId\\"],
-      \\"NoEcho\\": False,
+      "Status": response_status,
+      "Reason": f"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}",
+      "PhysicalResourceId": event.get("PhysicalResourceId") or event["LogicalResourceId"],
+      "StackId": event["StackId"],
+      "RequestId": event["RequestId"],
+      "LogicalResourceId": event["LogicalResourceId"],
+      "NoEcho": False,
     }
-  ).encode(\\"utf-8\\")
-  headers = {\\"content-type\\": \\"\\", \\"content-length\\": str(len(response_body))}
+  ).encode("utf-8")
+  headers = {"content-type": "", "content-length": str(len(response_body))}
   try:
-    req = urllib.request.Request(url=event[\\"ResponseURL\\"], headers=headers, data=response_body, method=\\"PUT\\")
+    req = urllib.request.Request(url=event["ResponseURL"], headers=headers, data=response_body, method="PUT")
     with urllib.request.urlopen(req) as response:
-      print(response.read().decode(\\"utf-8\\"))
-    print(\\"Status code: \\" + response.reason)
+      print(response.read().decode("utf-8"))
+    print("Status code: " + response.reason)
   except Exception as e:
-      print(\\"send(..) failed executing request.urlopen(..): \\" + str(e))
+      print("send(..) failed executing request.urlopen(..): " + str(e))
 ",
         },
-        "Description": "AWS CloudFormation handler for \\"Custom::S3BucketNotifications\\" resources (@aws-cdk/aws-s3)",
+        "Description": "AWS CloudFormation handler for "Custom::S3BucketNotifications" resources (@aws-cdk/aws-s3)",
         "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
@@ -291,85 +270,6 @@ def submit_response(event: dict, context, response_status: str, error_message: s
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "mybucketAllowBucketNotificationsTomyprojectmybucketOnCreate0523E7CD109C74964": {
       "Properties": {
         "Action": "lambda:InvokeFunction",
@@ -461,7 +361,17 @@ def submit_response(event: dict, context, response_status: str, error_message: s
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "mybucketOnCreate0LogGroup8E3C4A72",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -469,33 +379,18 @@ def submit_response(event: dict, context, response_status: str, error_message: s
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "mybucketOnCreate0LogRetention8E65097C": {
+    "mybucketOnCreate0LogGroup8E3C4A72": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "mybucketOnCreate071865324",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "mybucketOnCreate0ServiceRole8EB9AE15": {
       "Properties": {
@@ -561,11 +456,6 @@ def submit_response(event: dict, context, response_status: str, error_message: s
 
 exports[`bucket with onDelete method 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -586,33 +476,29 @@ import json
 import logging
 import urllib.request
 
-s3 = boto3.client(\\"s3\\")
+s3 = boto3.client("s3")
 
 EVENTBRIDGE_CONFIGURATION = 'EventBridgeConfiguration'
-
-CONFIGURATION_TYPES = [\\"TopicConfigurations\\", \\"QueueConfigurations\\", \\"LambdaFunctionConfigurations\\"]
+CONFIGURATION_TYPES = ["TopicConfigurations", "QueueConfigurations", "LambdaFunctionConfigurations"]
 
 def handler(event: dict, context):
-  response_status = \\"SUCCESS\\"
-  error_message = \\"\\"
+  response_status = "SUCCESS"
+  error_message = ""
   try:
-    props = event[\\"ResourceProperties\\"]
-    bucket = props[\\"BucketName\\"]
-    notification_configuration = props[\\"NotificationConfiguration\\"]
-    request_type = event[\\"RequestType\\"]
+    props = event["ResourceProperties"]
+    notification_configuration = props["NotificationConfiguration"]
     managed = props.get('Managed', 'true').lower() == 'true'
     stack_id = event['StackId']
-
+    old = event.get("OldResourceProperties", {}).get("NotificationConfiguration", {})
     if managed:
-      config = handle_managed(request_type, notification_configuration)
+      config = handle_managed(event["RequestType"], notification_configuration)
     else:
-      config = handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
-
-    put_bucket_notification_configuration(bucket, config)
+      config = handle_unmanaged(props["BucketName"], stack_id, event["RequestType"], notification_configuration, old)
+    s3.put_bucket_notification_configuration(Bucket=props["BucketName"], NotificationConfiguration=config)
   except Exception as e:
-    logging.exception(\\"Failed to put bucket notification configuration\\")
-    response_status = \\"FAILED\\"
-    error_message = f\\"Error: {str(e)}. \\"
+    logging.exception("Failed to put bucket notification configuration")
+    response_status = "FAILED"
+    error_message = f"Error: {str(e)}. "
   finally:
     submit_response(event, context, response_status, error_message)
 
@@ -621,16 +507,26 @@ def handle_managed(request_type, notification_configuration):
     return {}
   return notification_configuration
 
-def handle_unmanaged(bucket, stack_id, request_type, notification_configuration):
-  external_notifications = find_external_notifications(bucket, stack_id)
+def handle_unmanaged(bucket, stack_id, request_type, notification_configuration, old):
+  def with_id(n):
+    n['Id'] = f"{stack_id}-{hash(json.dumps(n, sort_keys=True))}"
+    return n
+
+  external_notifications = {}
+  existing_notifications = s3.get_bucket_notification_configuration(Bucket=bucket)
+  for t in CONFIGURATION_TYPES:
+    if request_type == 'Update':
+        ids = [with_id(n) for n in old.get(t, [])]
+        old_incoming_ids = [n['Id'] for n in ids]
+        external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'] in old_incoming_ids]
+    elif request_type == 'Create':
+        external_notifications[t] = [n for n in existing_notifications.get(t, [])]
+  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
+    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
 
   if request_type == 'Delete':
     return external_notifications
 
-  def with_id(notification):
-    notification['Id'] = f\\"{stack_id}-{hash(json.dumps(notification, sort_keys=True))}\\"
-    return notification
-
   notifications = {}
   for t in CONFIGURATION_TYPES:
     external = external_notifications.get(t, [])
@@ -644,46 +540,29 @@ def handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
 
   return notifications
 
-def find_external_notifications(bucket, stack_id):
-  existing_notifications = get_bucket_notification_configuration(bucket)
-  external_notifications = {}
-  for t in CONFIGURATION_TYPES:
-    external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'].startswith(f\\"{stack_id}-\\")]
-
-  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
-    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
-
-  return external_notifications
-
-def get_bucket_notification_configuration(bucket):
-  return s3.get_bucket_notification_configuration(Bucket=bucket)
-
-def put_bucket_notification_configuration(bucket, notification_configuration):
-  s3.put_bucket_notification_configuration(Bucket=bucket, NotificationConfiguration=notification_configuration)
-
 def submit_response(event: dict, context, response_status: str, error_message: str):
   response_body = json.dumps(
     {
-      \\"Status\\": response_status,
-      \\"Reason\\": f\\"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}\\",
-      \\"PhysicalResourceId\\": event.get(\\"PhysicalResourceId\\") or event[\\"LogicalResourceId\\"],
-      \\"StackId\\": event[\\"StackId\\"],
-      \\"RequestId\\": event[\\"RequestId\\"],
-      \\"LogicalResourceId\\": event[\\"LogicalResourceId\\"],
-      \\"NoEcho\\": False,
+      "Status": response_status,
+      "Reason": f"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}",
+      "PhysicalResourceId": event.get("PhysicalResourceId") or event["LogicalResourceId"],
+      "StackId": event["StackId"],
+      "RequestId": event["RequestId"],
+      "LogicalResourceId": event["LogicalResourceId"],
+      "NoEcho": False,
     }
-  ).encode(\\"utf-8\\")
-  headers = {\\"content-type\\": \\"\\", \\"content-length\\": str(len(response_body))}
+  ).encode("utf-8")
+  headers = {"content-type": "", "content-length": str(len(response_body))}
   try:
-    req = urllib.request.Request(url=event[\\"ResponseURL\\"], headers=headers, data=response_body, method=\\"PUT\\")
+    req = urllib.request.Request(url=event["ResponseURL"], headers=headers, data=response_body, method="PUT")
     with urllib.request.urlopen(req) as response:
-      print(response.read().decode(\\"utf-8\\"))
-    print(\\"Status code: \\" + response.reason)
+      print(response.read().decode("utf-8"))
+    print("Status code: " + response.reason)
   except Exception as e:
-      print(\\"send(..) failed executing request.urlopen(..): \\" + str(e))
+      print("send(..) failed executing request.urlopen(..): " + str(e))
 ",
         },
-        "Description": "AWS CloudFormation handler for \\"Custom::S3BucketNotifications\\" resources (@aws-cdk/aws-s3)",
+        "Description": "AWS CloudFormation handler for "Custom::S3BucketNotifications" resources (@aws-cdk/aws-s3)",
         "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
@@ -748,85 +627,6 @@ def submit_response(event: dict, context, response_status: str, error_message: s
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "mybucketAllowBucketNotificationsTomyprojectmybucketOnDelete07E2A93E8688C7533": {
       "Properties": {
         "Action": "lambda:InvokeFunction",
@@ -918,7 +718,17 @@ def submit_response(event: dict, context, response_status: str, error_message: s
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "mybucketOnDelete0LogGroup44992347",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -926,33 +736,18 @@ def submit_response(event: dict, context, response_status: str, error_message: s
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "mybucketOnDelete0LogRetentionD5F6857F": {
+    "mybucketOnDelete0LogGroup44992347": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "mybucketOnDelete0BC86CC27",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "mybucketOnDelete0ServiceRole57A03DE1": {
       "Properties": {
@@ -1018,11 +813,6 @@ def submit_response(event: dict, context, response_status: str, error_message: s
 
 exports[`bucket with onEvent method 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -1043,33 +833,29 @@ import json
 import logging
 import urllib.request
 
-s3 = boto3.client(\\"s3\\")
+s3 = boto3.client("s3")
 
 EVENTBRIDGE_CONFIGURATION = 'EventBridgeConfiguration'
-
-CONFIGURATION_TYPES = [\\"TopicConfigurations\\", \\"QueueConfigurations\\", \\"LambdaFunctionConfigurations\\"]
+CONFIGURATION_TYPES = ["TopicConfigurations", "QueueConfigurations", "LambdaFunctionConfigurations"]
 
 def handler(event: dict, context):
-  response_status = \\"SUCCESS\\"
-  error_message = \\"\\"
+  response_status = "SUCCESS"
+  error_message = ""
   try:
-    props = event[\\"ResourceProperties\\"]
-    bucket = props[\\"BucketName\\"]
-    notification_configuration = props[\\"NotificationConfiguration\\"]
-    request_type = event[\\"RequestType\\"]
+    props = event["ResourceProperties"]
+    notification_configuration = props["NotificationConfiguration"]
     managed = props.get('Managed', 'true').lower() == 'true'
     stack_id = event['StackId']
-
+    old = event.get("OldResourceProperties", {}).get("NotificationConfiguration", {})
     if managed:
-      config = handle_managed(request_type, notification_configuration)
+      config = handle_managed(event["RequestType"], notification_configuration)
     else:
-      config = handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
-
-    put_bucket_notification_configuration(bucket, config)
+      config = handle_unmanaged(props["BucketName"], stack_id, event["RequestType"], notification_configuration, old)
+    s3.put_bucket_notification_configuration(Bucket=props["BucketName"], NotificationConfiguration=config)
   except Exception as e:
-    logging.exception(\\"Failed to put bucket notification configuration\\")
-    response_status = \\"FAILED\\"
-    error_message = f\\"Error: {str(e)}. \\"
+    logging.exception("Failed to put bucket notification configuration")
+    response_status = "FAILED"
+    error_message = f"Error: {str(e)}. "
   finally:
     submit_response(event, context, response_status, error_message)
 
@@ -1078,16 +864,26 @@ def handle_managed(request_type, notification_configuration):
     return {}
   return notification_configuration
 
-def handle_unmanaged(bucket, stack_id, request_type, notification_configuration):
-  external_notifications = find_external_notifications(bucket, stack_id)
+def handle_unmanaged(bucket, stack_id, request_type, notification_configuration, old):
+  def with_id(n):
+    n['Id'] = f"{stack_id}-{hash(json.dumps(n, sort_keys=True))}"
+    return n
+
+  external_notifications = {}
+  existing_notifications = s3.get_bucket_notification_configuration(Bucket=bucket)
+  for t in CONFIGURATION_TYPES:
+    if request_type == 'Update':
+        ids = [with_id(n) for n in old.get(t, [])]
+        old_incoming_ids = [n['Id'] for n in ids]
+        external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'] in old_incoming_ids]
+    elif request_type == 'Create':
+        external_notifications[t] = [n for n in existing_notifications.get(t, [])]
+  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
+    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
 
   if request_type == 'Delete':
     return external_notifications
 
-  def with_id(notification):
-    notification['Id'] = f\\"{stack_id}-{hash(json.dumps(notification, sort_keys=True))}\\"
-    return notification
-
   notifications = {}
   for t in CONFIGURATION_TYPES:
     external = external_notifications.get(t, [])
@@ -1101,46 +897,29 @@ def handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
 
   return notifications
 
-def find_external_notifications(bucket, stack_id):
-  existing_notifications = get_bucket_notification_configuration(bucket)
-  external_notifications = {}
-  for t in CONFIGURATION_TYPES:
-    external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'].startswith(f\\"{stack_id}-\\")]
-
-  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
-    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
-
-  return external_notifications
-
-def get_bucket_notification_configuration(bucket):
-  return s3.get_bucket_notification_configuration(Bucket=bucket)
-
-def put_bucket_notification_configuration(bucket, notification_configuration):
-  s3.put_bucket_notification_configuration(Bucket=bucket, NotificationConfiguration=notification_configuration)
-
 def submit_response(event: dict, context, response_status: str, error_message: str):
   response_body = json.dumps(
     {
-      \\"Status\\": response_status,
-      \\"Reason\\": f\\"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}\\",
-      \\"PhysicalResourceId\\": event.get(\\"PhysicalResourceId\\") or event[\\"LogicalResourceId\\"],
-      \\"StackId\\": event[\\"StackId\\"],
-      \\"RequestId\\": event[\\"RequestId\\"],
-      \\"LogicalResourceId\\": event[\\"LogicalResourceId\\"],
-      \\"NoEcho\\": False,
+      "Status": response_status,
+      "Reason": f"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}",
+      "PhysicalResourceId": event.get("PhysicalResourceId") or event["LogicalResourceId"],
+      "StackId": event["StackId"],
+      "RequestId": event["RequestId"],
+      "LogicalResourceId": event["LogicalResourceId"],
+      "NoEcho": False,
     }
-  ).encode(\\"utf-8\\")
-  headers = {\\"content-type\\": \\"\\", \\"content-length\\": str(len(response_body))}
+  ).encode("utf-8")
+  headers = {"content-type": "", "content-length": str(len(response_body))}
   try:
-    req = urllib.request.Request(url=event[\\"ResponseURL\\"], headers=headers, data=response_body, method=\\"PUT\\")
+    req = urllib.request.Request(url=event["ResponseURL"], headers=headers, data=response_body, method="PUT")
     with urllib.request.urlopen(req) as response:
-      print(response.read().decode(\\"utf-8\\"))
-    print(\\"Status code: \\" + response.reason)
+      print(response.read().decode("utf-8"))
+    print("Status code: " + response.reason)
   except Exception as e:
-      print(\\"send(..) failed executing request.urlopen(..): \\" + str(e))
+      print("send(..) failed executing request.urlopen(..): " + str(e))
 ",
         },
-        "Description": "AWS CloudFormation handler for \\"Custom::S3BucketNotifications\\" resources (@aws-cdk/aws-s3)",
+        "Description": "AWS CloudFormation handler for "Custom::S3BucketNotifications" resources (@aws-cdk/aws-s3)",
         "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
@@ -1205,91 +984,56 @@ def submit_response(event: dict, context, response_status: str, error_message: s
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
+    "mybucketAllowBucketNotificationsTomyprojectmybucketOnCreate0523E7CD109C74964": {
       "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "mybucketOnCreate071865324",
+            "Arn",
+          ],
         },
-        "Handler": "index.handler",
-        "Role": {
+        "Principal": "s3.amazonaws.com",
+        "SourceAccount": {
+          "Ref": "AWS::AccountId",
+        },
+        "SourceArn": {
           "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+            "mybucketD601CBAA",
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
       },
-      "Type": "AWS::Lambda::Function",
+      "Type": "AWS::Lambda::Permission",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
+    "mybucketAllowBucketNotificationsTomyprojectmybucketOnDelete07E2A93E8688C7533": {
       "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "mybucketOnDelete0BC86CC27",
+            "Arn",
           ],
-          "Version": "2012-10-17",
         },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
+        "Principal": "s3.amazonaws.com",
+        "SourceAccount": {
+          "Ref": "AWS::AccountId",
+        },
+        "SourceArn": {
+          "Fn::GetAtt": [
+            "mybucketD601CBAA",
+            "Arn",
           ],
-          "Version": "2012-10-17",
         },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
       },
-      "Type": "AWS::IAM::Policy",
+      "Type": "AWS::Lambda::Permission",
     },
-    "mybucketAllowBucketNotificationsTomyprojectmybucketOnEvent02929E14ED42BAD44": {
+    "mybucketAllowBucketNotificationsTomyprojectmybucketOnUpdate036B5F47FED7981DE": {
       "Properties": {
         "Action": "lambda:InvokeFunction",
         "FunctionName": {
           "Fn::GetAtt": [
-            "mybucketOnEvent02DE25E3B",
+            "mybucketOnUpdate06503D6F0",
             "Arn",
           ],
         },
@@ -1330,7 +1074,9 @@ def submit_response(event: dict, context, response_status: str, error_message: s
     },
     "mybucketNotificationsB76B6B79": {
       "DependsOn": [
-        "mybucketAllowBucketNotificationsTomyprojectmybucketOnEvent02929E14ED42BAD44",
+        "mybucketAllowBucketNotificationsTomyprojectmybucketOnCreate0523E7CD109C74964",
+        "mybucketAllowBucketNotificationsTomyprojectmybucketOnDelete07E2A93E8688C7533",
+        "mybucketAllowBucketNotificationsTomyprojectmybucketOnUpdate036B5F47FED7981DE",
       ],
       "Properties": {
         "BucketName": {
@@ -1345,7 +1091,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s
               ],
               "LambdaFunctionArn": {
                 "Fn::GetAtt": [
-                  "mybucketOnEvent02DE25E3B",
+                  "mybucketOnCreate071865324",
                   "Arn",
                 ],
               },
@@ -1356,7 +1102,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s
               ],
               "LambdaFunctionArn": {
                 "Fn::GetAtt": [
-                  "mybucketOnEvent02DE25E3B",
+                  "mybucketOnDelete0BC86CC27",
                   "Arn",
                 ],
               },
@@ -1367,7 +1113,7 @@ def submit_response(event: dict, context, response_status: str, error_message: s
               ],
               "LambdaFunctionArn": {
                 "Fn::GetAtt": [
-                  "mybucketOnEvent02DE25E3B",
+                  "mybucketOnUpdate06503D6F0",
                   "Arn",
                 ],
               },
@@ -1383,9 +1129,9 @@ def submit_response(event: dict, context, response_status: str, error_message: s
       },
       "Type": "Custom::S3BucketNotifications",
     },
-    "mybucketOnEvent02DE25E3B": {
+    "mybucketOnCreate071865324": {
       "DependsOn": [
-        "mybucketOnEvent0ServiceRole1D46FF9D",
+        "mybucketOnCreate0ServiceRole8EB9AE15",
       ],
       "Properties": {
         "Architectures": [
@@ -1397,43 +1143,190 @@ def submit_response(event: dict, context, response_status: str, error_message: s
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "mybucketOnCreate0LogGroup8E3C4A72",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
-            "mybucketOnEvent0ServiceRole1D46FF9D",
+            "mybucketOnCreate0ServiceRole8EB9AE15",
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "mybucketOnEvent0LogRetentionAC7E64C8": {
+    "mybucketOnCreate0LogGroup8E3C4A72": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "mybucketOnEvent02DE25E3B",
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "mybucketOnCreate0ServiceRole8EB9AE15": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
               },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
             ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+    "mybucketOnDelete0BC86CC27": {
+      "DependsOn": [
+        "mybucketOnDelete0ServiceRole57A03DE1",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "mybucketOnDelete0LogGroup44992347",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
+          "Fn::GetAtt": [
+            "mybucketOnDelete0ServiceRole57A03DE1",
+            "Arn",
           ],
         },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "mybucketOnDelete0LogGroup44992347": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
         "RetentionInDays": 30,
-        "ServiceToken": {
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "mybucketOnDelete0ServiceRole57A03DE1": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com",
+              },
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition",
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+              ],
+            ],
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Role",
+    },
+    "mybucketOnUpdate06503D6F0": {
+      "DependsOn": [
+        "mybucketOnUpdate0ServiceRoleAF91E9C7",
+      ],
+      "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
+          },
+          "S3Key": "<S3Key>",
+        },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
+        "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "mybucketOnUpdate0LogGroupFDC75EA3",
+          },
+        },
+        "MemorySize": 1024,
+        "Role": {
           "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
+            "mybucketOnUpdate0ServiceRoleAF91E9C7",
             "Arn",
           ],
         },
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
+      },
+      "Type": "AWS::Lambda::Function",
+    },
+    "mybucketOnUpdate0LogGroupFDC75EA3": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
-    "mybucketOnEvent0ServiceRole1D46FF9D": {
+    "mybucketOnUpdate0ServiceRoleAF91E9C7": {
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
@@ -1497,11 +1390,6 @@ def submit_response(event: dict, context, response_status: str, error_message: s
 
 exports[`bucket with onUpdate method 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -1522,33 +1410,29 @@ import json
 import logging
 import urllib.request
 
-s3 = boto3.client(\\"s3\\")
+s3 = boto3.client("s3")
 
 EVENTBRIDGE_CONFIGURATION = 'EventBridgeConfiguration'
-
-CONFIGURATION_TYPES = [\\"TopicConfigurations\\", \\"QueueConfigurations\\", \\"LambdaFunctionConfigurations\\"]
+CONFIGURATION_TYPES = ["TopicConfigurations", "QueueConfigurations", "LambdaFunctionConfigurations"]
 
 def handler(event: dict, context):
-  response_status = \\"SUCCESS\\"
-  error_message = \\"\\"
+  response_status = "SUCCESS"
+  error_message = ""
   try:
-    props = event[\\"ResourceProperties\\"]
-    bucket = props[\\"BucketName\\"]
-    notification_configuration = props[\\"NotificationConfiguration\\"]
-    request_type = event[\\"RequestType\\"]
+    props = event["ResourceProperties"]
+    notification_configuration = props["NotificationConfiguration"]
     managed = props.get('Managed', 'true').lower() == 'true'
     stack_id = event['StackId']
-
+    old = event.get("OldResourceProperties", {}).get("NotificationConfiguration", {})
     if managed:
-      config = handle_managed(request_type, notification_configuration)
+      config = handle_managed(event["RequestType"], notification_configuration)
     else:
-      config = handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
-
-    put_bucket_notification_configuration(bucket, config)
+      config = handle_unmanaged(props["BucketName"], stack_id, event["RequestType"], notification_configuration, old)
+    s3.put_bucket_notification_configuration(Bucket=props["BucketName"], NotificationConfiguration=config)
   except Exception as e:
-    logging.exception(\\"Failed to put bucket notification configuration\\")
-    response_status = \\"FAILED\\"
-    error_message = f\\"Error: {str(e)}. \\"
+    logging.exception("Failed to put bucket notification configuration")
+    response_status = "FAILED"
+    error_message = f"Error: {str(e)}. "
   finally:
     submit_response(event, context, response_status, error_message)
 
@@ -1557,16 +1441,26 @@ def handle_managed(request_type, notification_configuration):
     return {}
   return notification_configuration
 
-def handle_unmanaged(bucket, stack_id, request_type, notification_configuration):
-  external_notifications = find_external_notifications(bucket, stack_id)
+def handle_unmanaged(bucket, stack_id, request_type, notification_configuration, old):
+  def with_id(n):
+    n['Id'] = f"{stack_id}-{hash(json.dumps(n, sort_keys=True))}"
+    return n
+
+  external_notifications = {}
+  existing_notifications = s3.get_bucket_notification_configuration(Bucket=bucket)
+  for t in CONFIGURATION_TYPES:
+    if request_type == 'Update':
+        ids = [with_id(n) for n in old.get(t, [])]
+        old_incoming_ids = [n['Id'] for n in ids]
+        external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'] in old_incoming_ids]
+    elif request_type == 'Create':
+        external_notifications[t] = [n for n in existing_notifications.get(t, [])]
+  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
+    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
 
   if request_type == 'Delete':
     return external_notifications
 
-  def with_id(notification):
-    notification['Id'] = f\\"{stack_id}-{hash(json.dumps(notification, sort_keys=True))}\\"
-    return notification
-
   notifications = {}
   for t in CONFIGURATION_TYPES:
     external = external_notifications.get(t, [])
@@ -1580,46 +1474,29 @@ def handle_unmanaged(bucket, stack_id, request_type, notification_configuration)
 
   return notifications
 
-def find_external_notifications(bucket, stack_id):
-  existing_notifications = get_bucket_notification_configuration(bucket)
-  external_notifications = {}
-  for t in CONFIGURATION_TYPES:
-    external_notifications[t] = [n for n in existing_notifications.get(t, []) if not n['Id'].startswith(f\\"{stack_id}-\\")]
-
-  if EVENTBRIDGE_CONFIGURATION in existing_notifications:
-    external_notifications[EVENTBRIDGE_CONFIGURATION] = existing_notifications[EVENTBRIDGE_CONFIGURATION]
-
-  return external_notifications
-
-def get_bucket_notification_configuration(bucket):
-  return s3.get_bucket_notification_configuration(Bucket=bucket)
-
-def put_bucket_notification_configuration(bucket, notification_configuration):
-  s3.put_bucket_notification_configuration(Bucket=bucket, NotificationConfiguration=notification_configuration)
-
 def submit_response(event: dict, context, response_status: str, error_message: str):
   response_body = json.dumps(
     {
-      \\"Status\\": response_status,
-      \\"Reason\\": f\\"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}\\",
-      \\"PhysicalResourceId\\": event.get(\\"PhysicalResourceId\\") or event[\\"LogicalResourceId\\"],
-      \\"StackId\\": event[\\"StackId\\"],
-      \\"RequestId\\": event[\\"RequestId\\"],
-      \\"LogicalResourceId\\": event[\\"LogicalResourceId\\"],
-      \\"NoEcho\\": False,
+      "Status": response_status,
+      "Reason": f"{error_message}See the details in CloudWatch Log Stream: {context.log_stream_name}",
+      "PhysicalResourceId": event.get("PhysicalResourceId") or event["LogicalResourceId"],
+      "StackId": event["StackId"],
+      "RequestId": event["RequestId"],
+      "LogicalResourceId": event["LogicalResourceId"],
+      "NoEcho": False,
     }
-  ).encode(\\"utf-8\\")
-  headers = {\\"content-type\\": \\"\\", \\"content-length\\": str(len(response_body))}
+  ).encode("utf-8")
+  headers = {"content-type": "", "content-length": str(len(response_body))}
   try:
-    req = urllib.request.Request(url=event[\\"ResponseURL\\"], headers=headers, data=response_body, method=\\"PUT\\")
+    req = urllib.request.Request(url=event["ResponseURL"], headers=headers, data=response_body, method="PUT")
     with urllib.request.urlopen(req) as response:
-      print(response.read().decode(\\"utf-8\\"))
-    print(\\"Status code: \\" + response.reason)
+      print(response.read().decode("utf-8"))
+    print("Status code: " + response.reason)
   except Exception as e:
-      print(\\"send(..) failed executing request.urlopen(..): \\" + str(e))
+      print("send(..) failed executing request.urlopen(..): " + str(e))
 ",
         },
-        "Description": "AWS CloudFormation handler for \\"Custom::S3BucketNotifications\\" resources (@aws-cdk/aws-s3)",
+        "Description": "AWS CloudFormation handler for "Custom::S3BucketNotifications" resources (@aws-cdk/aws-s3)",
         "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
@@ -1684,85 +1561,6 @@ def submit_response(event: dict, context, response_status: str, error_message: s
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "mybucketAllowBucketNotificationsTomyprojectmybucketOnUpdate036B5F47FED7981DE": {
       "Properties": {
         "Action": "lambda:InvokeFunction",
@@ -1854,7 +1652,17 @@ def submit_response(event: dict, context, response_status: str, error_message: s
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "mybucketOnUpdate0LogGroupFDC75EA3",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -1862,33 +1670,18 @@ def submit_response(event: dict, context, response_status: str, error_message: s
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "mybucketOnUpdate0LogRetention8435180A": {
+    "mybucketOnUpdate0LogGroupFDC75EA3": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "mybucketOnUpdate06503D6F0",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "mybucketOnUpdate0ServiceRoleAF91E9C7": {
       "Properties": {
@@ -1954,11 +1747,6 @@ def submit_response(event: dict, context, response_status: str, error_message: s
 
 exports[`bucket with two preflight files 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -1977,7 +1765,7 @@ exports[`bucket with two preflight files 1`] = `
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
           },
-          "S3Key": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip",
+          "S3Key": "e976a796f036a5efbf44b99e44cfb5a961df08d8dbf7cd37e60bf216fb982a00.zip",
         },
         "Environment": {
           "Variables": {
@@ -2194,7 +1982,7 @@ exports[`bucket with two preflight files 1`] = `
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
           },
-          "S3Key": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip",
+          "S3Key": "3322b7049fb0ed2b7cbb644a2ada8d1116ff80c32dca89e6ada846b5de26f961.zip",
         },
         "Description": "/opt/awscli/aws",
       },
@@ -2266,11 +2054,6 @@ exports[`bucket with two preflight files 1`] = `
 
 exports[`bucket with two preflight objects 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -2578,11 +2361,6 @@ exports[`bucket with two preflight objects 1`] = `
 
 exports[`create a bucket 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
diff --git a/libs/awscdk/test/__snapshots__/counter.test.ts.snap b/libs/awscdk/test/__snapshots__/counter.test.ts.snap
index 5b3c85e5818..918a5922442 100644
--- a/libs/awscdk/test/__snapshots__/counter.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/counter.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`counter with initial value 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -67,30 +62,25 @@ exports[`counter with initial value 1`] = `
 `;
 
 exports[`dec() policy statement 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    const val = await ctx.my_counter.dec(2);
+    console.log(val);
   }
-  async handle(event) {
-  const val = await this.my_counter.dec(2);
-  console.log(val);
+  const $ctx = {
+  my_counter: new (require("[REDACTED]/awscdk/src/counter.inflight")).CounterClient(process.env["DYNAMODB_TABLE_NAME_c7ebcb7a"], 0)
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_counter: new (require(\\"[REDACTED]/awscdk/src/counter.inflight\\")).CounterClient(process.env[\\"DYNAMODB_TABLE_NAME_c7ebcb7a\\"], 0)
-})"
+)())"
 `;
 
 exports[`dec() policy statement 2`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -139,9 +129,15 @@ exports[`dec() policy statement 2`] = `
             "DYNAMODB_TABLE_NAME_c7ebcb7a": {
               "Ref": "Counter44A08DAC",
             },
+            "NODE_OPTIONS": "--enable-source-maps",
           },
         },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -149,33 +145,18 @@ exports[`dec() policy statement 2`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -234,85 +215,6 @@ exports[`dec() policy statement 2`] = `
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -346,11 +248,6 @@ exports[`dec() policy statement 2`] = `
 
 exports[`default counter behavior 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -411,30 +308,25 @@ exports[`default counter behavior 1`] = `
 `;
 
 exports[`function with a counter binding 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    const val = await ctx.my_counter.inc(2);
+    console.log(val);
   }
-  async handle(event) {
-  const val = await this.my_counter.inc(2);
-  console.log(val);
+  const $ctx = {
+  my_counter: new (require("[REDACTED]/awscdk/src/counter.inflight")).CounterClient(process.env["DYNAMODB_TABLE_NAME_c7ebcb7a"], 0)
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_counter: new (require(\\"[REDACTED]/awscdk/src/counter.inflight\\")).CounterClient(process.env[\\"DYNAMODB_TABLE_NAME_c7ebcb7a\\"], 0)
-})"
+)())"
 `;
 
 exports[`function with a counter binding 2`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -483,9 +375,15 @@ exports[`function with a counter binding 2`] = `
             "DYNAMODB_TABLE_NAME_c7ebcb7a": {
               "Ref": "Counter44A08DAC",
             },
+            "NODE_OPTIONS": "--enable-source-maps",
           },
         },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -493,33 +391,18 @@ exports[`function with a counter binding 2`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -578,85 +461,6 @@ exports[`function with a counter binding 2`] = `
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -689,30 +493,25 @@ exports[`function with a counter binding 2`] = `
 `;
 
 exports[`inc() policy statement 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    const val = await ctx.my_counter.inc(2);
+    console.log(val);
   }
-  async handle(event) {
-  const val = await this.my_counter.inc(2);
-  console.log(val);
+  const $ctx = {
+  my_counter: new (require("[REDACTED]/awscdk/src/counter.inflight")).CounterClient(process.env["DYNAMODB_TABLE_NAME_c7ebcb7a"], 0)
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_counter: new (require(\\"[REDACTED]/awscdk/src/counter.inflight\\")).CounterClient(process.env[\\"DYNAMODB_TABLE_NAME_c7ebcb7a\\"], 0)
-})"
+)())"
 `;
 
 exports[`inc() policy statement 2`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -761,9 +560,15 @@ exports[`inc() policy statement 2`] = `
             "DYNAMODB_TABLE_NAME_c7ebcb7a": {
               "Ref": "Counter44A08DAC",
             },
+            "NODE_OPTIONS": "--enable-source-maps",
           },
         },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -771,33 +576,18 @@ exports[`inc() policy statement 2`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -856,85 +646,6 @@ exports[`inc() policy statement 2`] = `
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -967,30 +678,25 @@ exports[`inc() policy statement 2`] = `
 `;
 
 exports[`peek() policy statement 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    const val = await ctx.my_counter.peek();
+    console.log(val);
   }
-  async handle(event) {
-  const val = await this.my_counter.peek();
-  console.log(val);
+  const $ctx = {
+  my_counter: new (require("[REDACTED]/awscdk/src/counter.inflight")).CounterClient(process.env["DYNAMODB_TABLE_NAME_c7ebcb7a"], 0)
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_counter: new (require(\\"[REDACTED]/awscdk/src/counter.inflight\\")).CounterClient(process.env[\\"DYNAMODB_TABLE_NAME_c7ebcb7a\\"], 0)
-})"
+)())"
 `;
 
 exports[`peek() policy statement 2`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -1039,9 +745,15 @@ exports[`peek() policy statement 2`] = `
             "DYNAMODB_TABLE_NAME_c7ebcb7a": {
               "Ref": "Counter44A08DAC",
             },
+            "NODE_OPTIONS": "--enable-source-maps",
           },
         },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -1049,33 +761,18 @@ exports[`peek() policy statement 2`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -1134,85 +831,6 @@ exports[`peek() policy statement 2`] = `
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -1245,30 +863,25 @@ exports[`peek() policy statement 2`] = `
 `;
 
 exports[`set() policy statement 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    const val = await ctx.my_counter.set(12);
+    console.log(val);
   }
-  async handle(event) {
-  const val = await this.my_counter.set();
-  console.log(val);
+  const $ctx = {
+  my_counter: new (require("[REDACTED]/awscdk/src/counter.inflight")).CounterClient(process.env["DYNAMODB_TABLE_NAME_c7ebcb7a"], 0)
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_counter: new (require(\\"[REDACTED]/awscdk/src/counter.inflight\\")).CounterClient(process.env[\\"DYNAMODB_TABLE_NAME_c7ebcb7a\\"], 0)
-})"
+)())"
 `;
 
 exports[`set() policy statement 2`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -1317,9 +930,15 @@ exports[`set() policy statement 2`] = `
             "DYNAMODB_TABLE_NAME_c7ebcb7a": {
               "Ref": "Counter44A08DAC",
             },
+            "NODE_OPTIONS": "--enable-source-maps",
           },
         },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -1327,33 +946,18 @@ exports[`set() policy statement 2`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -1412,85 +1016,6 @@ exports[`set() policy statement 2`] = `
       },
       "Type": "AWS::IAM::Policy",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
diff --git a/libs/awscdk/test/__snapshots__/dynamodb-table.test.ts.snap b/libs/awscdk/test/__snapshots__/dynamodb-table.test.ts.snap
deleted file mode 100644
index 9ec59955f8b..00000000000
--- a/libs/awscdk/test/__snapshots__/dynamodb-table.test.ts.snap
+++ /dev/null
@@ -1,339 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`default dynamodb table behavior 1`] = `
-{
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
-  "Parameters": {
-    "BootstrapVersion": {
-      "Default": "/cdk-bootstrap/hnb659fds/version",
-      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
-      "Type": "AWS::SSM::Parameter::Value<String>",
-    },
-  },
-  "Resources": {
-    "TableCD117FA1": {
-      "DeletionPolicy": "Delete",
-      "Properties": {
-        "AttributeDefinitions": [
-          {
-            "AttributeName": "id",
-            "AttributeType": "S",
-          },
-        ],
-        "BillingMode": "PAY_PER_REQUEST",
-        "KeySchema": [
-          {
-            "AttributeName": "id",
-            "KeyType": "HASH",
-          },
-        ],
-        "TableName": "my-wing-tableTable-c85e6383",
-      },
-      "Type": "AWS::DynamoDB::Table",
-      "UpdateReplacePolicy": "Delete",
-    },
-  },
-  "Rules": {
-    "CheckBootstrapVersion": {
-      "Assertions": [
-        {
-          "Assert": {
-            "Fn::Not": [
-              {
-                "Fn::Contains": [
-                  [
-                    "1",
-                    "2",
-                    "3",
-                    "4",
-                    "5",
-                  ],
-                  {
-                    "Ref": "BootstrapVersion",
-                  },
-                ],
-              },
-            ],
-          },
-          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
-        },
-      ],
-    },
-  },
-}
-`;
-
-exports[`function with a table binding 1`] = `
-{
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
-  "Parameters": {
-    "BootstrapVersion": {
-      "Default": "/cdk-bootstrap/hnb659fds/version",
-      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
-      "Type": "AWS::SSM::Parameter::Value<String>",
-    },
-  },
-  "Resources": {
-    "Function76856677": {
-      "DependsOn": [
-        "FunctionServiceRoleDefaultPolicy2F49994A",
-        "FunctionServiceRole675BB04A",
-      ],
-      "Properties": {
-        "Architectures": [
-          "arm64",
-        ],
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Environment": {
-          "Variables": {
-            "DYNAMODB_TABLE_NAME_8aa2f938": {
-              "Ref": "TableCD117FA1",
-            },
-          },
-        },
-        "Handler": "index.handler",
-        "MemorySize": 1024,
-        "Role": {
-          "Fn::GetAtt": [
-            "FunctionServiceRole675BB04A",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 60,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "FunctionLogRetention5FDF6B4D": {
-      "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
-        "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
-      },
-      "Type": "Custom::LogRetention",
-    },
-    "FunctionServiceRole675BB04A": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "FunctionServiceRoleDefaultPolicy2F49994A": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "dynamodb:PutItem",
-              "Effect": "Allow",
-              "Resource": {
-                "Fn::GetAtt": [
-                  "TableCD117FA1",
-                  "Arn",
-                ],
-              },
-            },
-            {
-              "Action": "dynamodb:Scan",
-              "Effect": "Allow",
-              "Resource": {
-                "Fn::GetAtt": [
-                  "TableCD117FA1",
-                  "Arn",
-                ],
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "FunctionServiceRoleDefaultPolicy2F49994A",
-        "Roles": [
-          {
-            "Ref": "FunctionServiceRole675BB04A",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
-    "TableCD117FA1": {
-      "DeletionPolicy": "Delete",
-      "Properties": {
-        "AttributeDefinitions": [
-          {
-            "AttributeName": "id",
-            "AttributeType": "S",
-          },
-        ],
-        "BillingMode": "PAY_PER_REQUEST",
-        "KeySchema": [
-          {
-            "AttributeName": "id",
-            "KeyType": "HASH",
-          },
-        ],
-        "TableName": "my-wing-tableTable-c85e6383",
-      },
-      "Type": "AWS::DynamoDB::Table",
-      "UpdateReplacePolicy": "Delete",
-    },
-  },
-  "Rules": {
-    "CheckBootstrapVersion": {
-      "Assertions": [
-        {
-          "Assert": {
-            "Fn::Not": [
-              {
-                "Fn::Contains": [
-                  [
-                    "1",
-                    "2",
-                    "3",
-                    "4",
-                    "5",
-                  ],
-                  {
-                    "Ref": "BootstrapVersion",
-                  },
-                ],
-              },
-            ],
-          },
-          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
-        },
-      ],
-    },
-  },
-}
-`;
diff --git a/libs/awscdk/test/__snapshots__/function.test.ts.snap b/libs/awscdk/test/__snapshots__/function.test.ts.snap
index f7005999030..37770b5b07b 100644
--- a/libs/awscdk/test/__snapshots__/function.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/function.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`basic function 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -29,7 +24,17 @@ exports[`basic function 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -37,33 +42,18 @@ exports[`basic function 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -96,85 +86,6 @@ exports[`basic function 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -208,11 +119,6 @@ exports[`basic function 1`] = `
 
 exports[`basic function with custom log retention 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -235,7 +141,17 @@ exports[`basic function with custom log retention 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -243,33 +159,18 @@ exports[`basic function with custom log retention 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 7,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -302,85 +203,6 @@ exports[`basic function with custom log retention 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -414,11 +236,6 @@ exports[`basic function with custom log retention 1`] = `
 
 exports[`basic function with environment variables 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -445,9 +262,15 @@ exports[`basic function with environment variables 1`] = `
           "Variables": {
             "BOOM": "BAM",
             "FOO": "BAR",
+            "NODE_OPTIONS": "--enable-source-maps",
           },
         },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -455,33 +278,18 @@ exports[`basic function with environment variables 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -514,85 +322,6 @@ exports[`basic function with environment variables 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -626,11 +355,6 @@ exports[`basic function with environment variables 1`] = `
 
 exports[`basic function with infinite log retention 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -653,7 +377,17 @@ exports[`basic function with infinite log retention 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -661,11 +395,16 @@ exports[`basic function with infinite log retention 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
     "FunctionServiceRole675BB04A": {
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -730,11 +469,6 @@ exports[`basic function with infinite log retention 1`] = `
 
 exports[`basic function with memory size specified 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -757,7 +491,17 @@ exports[`basic function with memory size specified 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 512,
         "Role": {
           "Fn::GetAtt": [
@@ -765,33 +509,18 @@ exports[`basic function with memory size specified 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -824,31 +553,93 @@ exports[`basic function with memory size specified 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`basic function with standard log retention 1`] = `
+{
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Function76856677": {
       "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+        "FunctionServiceRole675BB04A",
       ],
       "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
         "Code": {
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
+        "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+            "FunctionServiceRole675BB04A",
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "FunctionServiceRole675BB04A": {
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
@@ -879,30 +670,6 @@ exports[`basic function with memory size specified 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
@@ -936,11 +703,6 @@ exports[`basic function with memory size specified 1`] = `
 
 exports[`basic function with timeout explicitly set 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -963,7 +725,17 @@ exports[`basic function with timeout explicitly set 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -971,33 +743,18 @@ exports[`basic function with timeout explicitly set 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 300,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "FunctionLogRetention5FDF6B4D": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "Function76856677",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "FunctionServiceRole675BB04A": {
       "Properties": {
@@ -1030,31 +787,93 @@ exports[`basic function with timeout explicitly set 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`source map setting 1`] = `
+{
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
+    "Function76856677": {
       "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+        "FunctionServiceRole675BB04A",
       ],
       "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
         "Code": {
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "FunctionLogGroup55B80E27",
+          },
+        },
+        "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+            "FunctionServiceRole675BB04A",
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
+    "FunctionLogGroup55B80E27": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "FunctionServiceRole675BB04A": {
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
@@ -1085,30 +904,6 @@ exports[`basic function with timeout explicitly set 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
   },
   "Rules": {
     "CheckBootstrapVersion": {
diff --git a/libs/awscdk/test/__snapshots__/on-deploy.test.ts.snap b/libs/awscdk/test/__snapshots__/on-deploy.test.ts.snap
index b9eb11f5e3e..fc744c95b3f 100644
--- a/libs/awscdk/test/__snapshots__/on-deploy.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/on-deploy.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`create an OnDeploy 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -93,85 +88,6 @@ exports[`create an OnDeploy 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "myondeployFunction47551748": {
       "DependsOn": [
         "myondeployFunctionServiceRole7277F8BB",
@@ -186,7 +102,17 @@ exports[`create an OnDeploy 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "myondeployFunctionLogGroup6E16B2CD",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -194,7 +120,7 @@ exports[`create an OnDeploy 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
@@ -207,28 +133,13 @@ exports[`create an OnDeploy 1`] = `
       },
       "Type": "AWS::Lambda::Version",
     },
-    "myondeployFunctionLogRetention67CB6178": {
+    "myondeployFunctionLogGroup6E16B2CD": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "myondeployFunction47551748",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "myondeployFunctionServiceRole7277F8BB": {
       "Properties": {
@@ -313,11 +224,6 @@ exports[`create an OnDeploy 1`] = `
 
 exports[`execute OnDeploy after other resources 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -404,85 +310,6 @@ exports[`execute OnDeploy after other resources 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "mybucketD601CBAA": {
       "DeletionPolicy": "Delete",
       "Properties": {
@@ -519,7 +346,17 @@ exports[`execute OnDeploy after other resources 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "myondeployFunctionLogGroup6E16B2CD",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -527,7 +364,7 @@ exports[`execute OnDeploy after other resources 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
@@ -540,28 +377,13 @@ exports[`execute OnDeploy after other resources 1`] = `
       },
       "Type": "AWS::Lambda::Version",
     },
-    "myondeployFunctionLogRetention67CB6178": {
+    "myondeployFunctionLogGroup6E16B2CD": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "myondeployFunction47551748",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "myondeployFunctionServiceRole7277F8BB": {
       "Properties": {
@@ -649,11 +471,6 @@ exports[`execute OnDeploy after other resources 1`] = `
 
 exports[`execute OnDeploy before other resources 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -740,85 +557,6 @@ exports[`execute OnDeploy before other resources 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "mybucketD601CBAA": {
       "DeletionPolicy": "Delete",
       "DependsOn": [
@@ -858,7 +596,17 @@ exports[`execute OnDeploy before other resources 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "myondeployFunctionLogGroup6E16B2CD",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -866,7 +614,7 @@ exports[`execute OnDeploy before other resources 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
@@ -879,28 +627,13 @@ exports[`execute OnDeploy before other resources 1`] = `
       },
       "Type": "AWS::Lambda::Version",
     },
-    "myondeployFunctionLogRetention67CB6178": {
+    "myondeployFunctionLogGroup6E16B2CD": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "myondeployFunction47551748",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "myondeployFunctionServiceRole7277F8BB": {
       "Properties": {
diff --git a/libs/awscdk/test/__snapshots__/queue.test.ts.snap b/libs/awscdk/test/__snapshots__/queue.test.ts.snap
index 241ed6ef091..8d8b0eb5892 100644
--- a/libs/awscdk/test/__snapshots__/queue.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/queue.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`default queue behavior 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -55,15 +50,10 @@ exports[`default queue behavior 1`] = `
 }
 `;
 
-exports[`queue with a consumer function 1`] = `"new (require(\\"[REDACTED]/awscdk/src/function.inflight\\")).FunctionClient(process.env[\\"FUNCTION_NAME_27b8b1c8\\"], \\"my-project/Default/Queue-SetConsumer0\\")"`;
+exports[`queue with a consumer function 1`] = `"new (require("[REDACTED]/awscdk/src/function.inflight")).FunctionClient(process.env["FUNCTION_NAME_27b8b1c8"], "my-project/Default/Queue-SetConsumer0")"`;
 
 exports[`queue with a consumer function 2`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -72,85 +62,6 @@ exports[`queue with a consumer function 2`] = `
     },
   },
   "Resources": {
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "Queue4A7E3555": {
       "DeletionPolicy": "Delete",
       "Properties": {
@@ -175,7 +86,17 @@ exports[`queue with a consumer function 2`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "QueueSetConsumer0LogGroupC0386522",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -183,33 +104,18 @@ exports[`queue with a consumer function 2`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 30,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "QueueSetConsumer0LogRetention860508CE": {
+    "QueueSetConsumer0LogGroupC0386522": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "QueueSetConsumer06749388A",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "QueueSetConsumer0ServiceRoleB6E3A7B7": {
       "Properties": {
@@ -286,6 +192,9 @@ exports[`queue with a consumer function 2`] = `
         "FunctionName": {
           "Ref": "QueueSetConsumer06749388A",
         },
+        "FunctionResponseTypes": [
+          "ReportBatchItemFailures",
+        ],
       },
       "Type": "AWS::Lambda::EventSourceMapping",
     },
@@ -322,11 +231,6 @@ exports[`queue with a consumer function 2`] = `
 
 exports[`queue with custom retention 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -377,11 +281,6 @@ exports[`queue with custom retention 1`] = `
 
 exports[`queue with custom timeout 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
diff --git a/libs/awscdk/test/__snapshots__/schedule.test.ts.snap b/libs/awscdk/test/__snapshots__/schedule.test.ts.snap
index 529f094af83..63bb0e132ba 100644
--- a/libs/awscdk/test/__snapshots__/schedule.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/schedule.test.ts.snap
@@ -1,12 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`schedule behavior with cron 1`] = `
+exports[`convert single dayOfWeek from Unix to AWS 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -15,31 +10,89 @@ exports[`schedule behavior with cron 1`] = `
     },
   },
   "Resources": {
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
+    "Schedule251B1F83": {
+      "Properties": {
+        "ScheduleExpression": "cron(* * ? * 0 *)",
+        "State": "ENABLED",
+        "Targets": [
+          {
+            "Arn": {
+              "Fn::GetAtt": [
+                "ScheduleOnTick059D62C99",
+                "Arn",
+              ],
+            },
+            "Id": "Target0",
+          },
+        ],
+      },
+      "Type": "AWS::Events::Rule",
+    },
+    "ScheduleAllowEventRulemyprojectScheduleOnTick0FF908B3EE22FC7ED": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "ScheduleOnTick059D62C99",
+            "Arn",
+          ],
+        },
+        "Principal": "events.amazonaws.com",
+        "SourceArn": {
+          "Fn::GetAtt": [
+            "Schedule251B1F83",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ScheduleOnTick059D62C99": {
       "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+        "ScheduleOnTick0ServiceRole37EF1AE1",
       ],
       "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
         "Code": {
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "ScheduleOnTick0LogGroup389684B1",
+          },
+        },
+        "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+            "ScheduleOnTick0ServiceRole37EF1AE1",
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
+    "ScheduleOnTick0LogGroup389684B1": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ScheduleOnTick0ServiceRole37EF1AE1": {
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
@@ -70,33 +123,50 @@ exports[`schedule behavior with cron 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
           },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
     },
+  },
+}
+`;
+
+exports[`convert the list of dayOfWeek from Unix to AWS 1`] = `
+{
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
     "Schedule251B1F83": {
       "Properties": {
-        "ScheduleExpression": "cron(0/1 * ? * * *)",
+        "ScheduleExpression": "cron(* * ? * 0,2,4,6 *)",
         "State": "ENABLED",
         "Targets": [
           {
@@ -145,7 +215,17 @@ exports[`schedule behavior with cron 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "ScheduleOnTick0LogGroup389684B1",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -153,33 +233,18 @@ exports[`schedule behavior with cron 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "ScheduleOnTick0LogRetentionE66DC540": {
+    "ScheduleOnTick0LogGroup389684B1": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "ScheduleOnTick059D62C99",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "ScheduleOnTick0ServiceRole37EF1AE1": {
       "Properties": {
@@ -243,13 +308,8 @@ exports[`schedule behavior with cron 1`] = `
 }
 `;
 
-exports[`schedule behavior with rate 1`] = `
+exports[`convert the range of dayOfWeek from Unix to AWS 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -258,31 +318,89 @@ exports[`schedule behavior with rate 1`] = `
     },
   },
   "Resources": {
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
+    "Schedule251B1F83": {
+      "Properties": {
+        "ScheduleExpression": "cron(* * ? * 0-6 *)",
+        "State": "ENABLED",
+        "Targets": [
+          {
+            "Arn": {
+              "Fn::GetAtt": [
+                "ScheduleOnTick059D62C99",
+                "Arn",
+              ],
+            },
+            "Id": "Target0",
+          },
+        ],
+      },
+      "Type": "AWS::Events::Rule",
+    },
+    "ScheduleAllowEventRulemyprojectScheduleOnTick0FF908B3EE22FC7ED": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "ScheduleOnTick059D62C99",
+            "Arn",
+          ],
+        },
+        "Principal": "events.amazonaws.com",
+        "SourceArn": {
+          "Fn::GetAtt": [
+            "Schedule251B1F83",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ScheduleOnTick059D62C99": {
       "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+        "ScheduleOnTick0ServiceRole37EF1AE1",
       ],
       "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
         "Code": {
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "ScheduleOnTick0LogGroup389684B1",
+          },
+        },
+        "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+            "ScheduleOnTick0ServiceRole37EF1AE1",
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
+    "ScheduleOnTick0LogGroup389684B1": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ScheduleOnTick0ServiceRole37EF1AE1": {
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
@@ -313,33 +431,50 @@ exports[`schedule behavior with rate 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
           },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
     },
+  },
+}
+`;
+
+exports[`schedule behavior with cron 1`] = `
+{
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
     "Schedule251B1F83": {
       "Properties": {
-        "ScheduleExpression": "rate(2 minutes)",
+        "ScheduleExpression": "cron(0/1 * * * ? *)",
         "State": "ENABLED",
         "Targets": [
           {
@@ -388,7 +523,17 @@ exports[`schedule behavior with rate 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "ScheduleOnTick0LogGroup389684B1",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -396,33 +541,18 @@ exports[`schedule behavior with rate 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "ScheduleOnTick0LogRetentionE66DC540": {
+    "ScheduleOnTick0LogGroup389684B1": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "ScheduleOnTick059D62C99",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "ScheduleOnTick0ServiceRole37EF1AE1": {
       "Properties": {
@@ -486,13 +616,8 @@ exports[`schedule behavior with rate 1`] = `
 }
 `;
 
-exports[`schedule with two functions 1`] = `
+exports[`schedule behavior with rate 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -501,31 +626,89 @@ exports[`schedule with two functions 1`] = `
     },
   },
   "Resources": {
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
+    "Schedule251B1F83": {
+      "Properties": {
+        "ScheduleExpression": "rate(2 minutes)",
+        "State": "ENABLED",
+        "Targets": [
+          {
+            "Arn": {
+              "Fn::GetAtt": [
+                "ScheduleOnTick059D62C99",
+                "Arn",
+              ],
+            },
+            "Id": "Target0",
+          },
+        ],
+      },
+      "Type": "AWS::Events::Rule",
+    },
+    "ScheduleAllowEventRulemyprojectScheduleOnTick0FF908B3EE22FC7ED": {
+      "Properties": {
+        "Action": "lambda:InvokeFunction",
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "ScheduleOnTick059D62C99",
+            "Arn",
+          ],
+        },
+        "Principal": "events.amazonaws.com",
+        "SourceArn": {
+          "Fn::GetAtt": [
+            "Schedule251B1F83",
+            "Arn",
+          ],
+        },
+      },
+      "Type": "AWS::Lambda::Permission",
+    },
+    "ScheduleOnTick059D62C99": {
       "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+        "ScheduleOnTick0ServiceRole37EF1AE1",
       ],
       "Properties": {
+        "Architectures": [
+          "arm64",
+        ],
         "Code": {
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "ScheduleOnTick0LogGroup389684B1",
+          },
+        },
+        "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+            "ScheduleOnTick0ServiceRole37EF1AE1",
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
+        "Runtime": "nodejs20.x",
+        "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
+    "ScheduleOnTick0LogGroup389684B1": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "RetentionInDays": 30,
+      },
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
+    },
+    "ScheduleOnTick0ServiceRole37EF1AE1": {
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
@@ -556,33 +739,50 @@ exports[`schedule with two functions 1`] = `
       },
       "Type": "AWS::IAM::Role",
     },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                  ],
+                  {
+                    "Ref": "BootstrapVersion",
+                  },
+                ],
+              },
+            ],
           },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI.",
+        },
+      ],
     },
+  },
+}
+`;
+
+exports[`schedule with two functions 1`] = `
+{
+  "Parameters": {
+    "BootstrapVersion": {
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]",
+      "Type": "AWS::SSM::Parameter::Value<String>",
+    },
+  },
+  "Resources": {
     "Schedule251B1F83": {
       "Properties": {
-        "ScheduleExpression": "cron(0/1 * ? * * *)",
+        "ScheduleExpression": "cron(0/1 * * * ? *)",
         "State": "ENABLED",
         "Targets": [
           {
@@ -631,7 +831,17 @@ exports[`schedule with two functions 1`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "ScheduleOnTick0LogGroup389684B1",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -639,33 +849,18 @@ exports[`schedule with two functions 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "ScheduleOnTick0LogRetentionE66DC540": {
+    "ScheduleOnTick0LogGroup389684B1": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "ScheduleOnTick059D62C99",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "ScheduleOnTick0ServiceRole37EF1AE1": {
       "Properties": {
diff --git a/libs/awscdk/test/__snapshots__/secret.test.ts.snap b/libs/awscdk/test/__snapshots__/secret.test.ts.snap
index 9233d50a4f8..8822ef25d7e 100644
--- a/libs/awscdk/test/__snapshots__/secret.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/secret.test.ts.snap
@@ -70,8 +70,5 @@ exports[`default secret behavior 2`] = `
       ],
     },
   },
-  "WingTestRunnerFunctionArns": {
-    "Value": "[]",
-  },
 }
 `;
diff --git a/libs/awscdk/test/__snapshots__/topic.test.ts.snap b/libs/awscdk/test/__snapshots__/topic.test.ts.snap
index 04ae3a4eb26..b6c343f77ef 100644
--- a/libs/awscdk/test/__snapshots__/topic.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/topic.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`default topic behavior 1`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -50,42 +45,37 @@ exports[`default topic behavior 1`] = `
 `;
 
 exports[`topic with multiple subscribers 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(event) { console.log(\\"Got Event: \\", event); }
-};
-})())({
-
-})"
+"(await (async () => {
+  const $func = async (_, event) => console.log("Got Event: ", event)
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`topic with multiple subscribers 2`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(event) { console.log(\\"Ohh yea!! \\", event); }
-};
-})())({
-
-})"
+"(await (async () => {
+  const $func = async (_, event) => console.log("Ohh yea!! ", event)
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`topic with multiple subscribers 3`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -94,85 +84,6 @@ exports[`topic with multiple subscribers 3`] = `
     },
   },
   "Resources": {
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "Topic85E630E2": {
       "Type": "AWS::SNS::Topic",
     },
@@ -206,7 +117,17 @@ exports[`topic with multiple subscribers 3`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "TopicOnMessage0LogGroup83A2C34E",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -214,33 +135,18 @@ exports[`topic with multiple subscribers 3`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "TopicOnMessage0LogRetentionAA597DF8": {
+    "TopicOnMessage0LogGroup83A2C34E": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "TopicOnMessage0CC768DDE",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "TopicOnMessage0ServiceRoleCAC8792F": {
       "Properties": {
@@ -318,7 +224,17 @@ exports[`topic with multiple subscribers 3`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "TopicOnMessage1LogGroup54716DB9",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -326,33 +242,18 @@ exports[`topic with multiple subscribers 3`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "TopicOnMessage1LogRetention9CDF0B16": {
+    "TopicOnMessage1LogGroup54716DB9": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "TopicOnMessage1CD15A08F",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "TopicOnMessage1ServiceRole01820192": {
       "Properties": {
@@ -432,27 +333,22 @@ exports[`topic with multiple subscribers 3`] = `
 `;
 
 exports[`topic with subscriber function 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(event) { console.log(\\"Received: \\", event); }
-};
-})())({
-
-})"
+"(await (async () => {
+  const $func = async (_, event) => console.log("Received: ", event)
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`topic with subscriber function 2`] = `
 {
-  "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -461,85 +357,6 @@ exports[`topic with subscriber function 2`] = `
     },
   },
   "Resources": {
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A": {
-      "DependsOn": [
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-      ],
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
-          },
-          "S3Key": "<S3Key>",
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-            "Arn",
-          ],
-        },
-        "Runtime": "nodejs18.x",
-        "Timeout": 900,
-      },
-      "Type": "AWS::Lambda::Function",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB": {
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com",
-              },
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition",
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-              ],
-            ],
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Role",
-    },
-    "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB": {
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "logs:PutRetentionPolicy",
-                "logs:DeleteRetentionPolicy",
-              ],
-              "Effect": "Allow",
-              "Resource": "*",
-            },
-          ],
-          "Version": "2012-10-17",
-        },
-        "PolicyName": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB",
-        "Roles": [
-          {
-            "Ref": "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRole9741ECFB",
-          },
-        ],
-      },
-      "Type": "AWS::IAM::Policy",
-    },
     "Topic85E630E2": {
       "Type": "AWS::SNS::Topic",
     },
@@ -573,7 +390,17 @@ exports[`topic with subscriber function 2`] = `
           },
           "S3Key": "<S3Key>",
         },
+        "Environment": {
+          "Variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+          },
+        },
         "Handler": "index.handler",
+        "LoggingConfig": {
+          "LogGroup": {
+            "Ref": "TopicOnMessage0LogGroup83A2C34E",
+          },
+        },
         "MemorySize": 1024,
         "Role": {
           "Fn::GetAtt": [
@@ -581,33 +408,18 @@ exports[`topic with subscriber function 2`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs20.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
     },
-    "TopicOnMessage0LogRetentionAA597DF8": {
+    "TopicOnMessage0LogGroup83A2C34E": {
+      "DeletionPolicy": "Retain",
       "Properties": {
-        "LogGroupName": {
-          "Fn::Join": [
-            "",
-            [
-              "/aws/lambda/",
-              {
-                "Ref": "TopicOnMessage0CC768DDE",
-              },
-            ],
-          ],
-        },
         "RetentionInDays": 30,
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aFD4BFC8A",
-            "Arn",
-          ],
-        },
       },
-      "Type": "Custom::LogRetention",
+      "Type": "AWS::Logs::LogGroup",
+      "UpdateReplacePolicy": "Retain",
     },
     "TopicOnMessage0ServiceRoleCAC8792F": {
       "Properties": {
diff --git a/libs/awscdk/test/__snapshots__/website.test.ts.snap b/libs/awscdk/test/__snapshots__/website.test.ts.snap
index 5fb571d6359..c211ff0ad57 100644
--- a/libs/awscdk/test/__snapshots__/website.test.ts.snap
+++ b/libs/awscdk/test/__snapshots__/website.test.ts.snap
@@ -3,8 +3,21 @@
 exports[`default website behaviour 1`] = `
 {
   "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
+    "WebsiteEndpointUrl0CC0343F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Fn::GetAtt": [
+                "WebsiteDistribution0C86AB5B",
+                "DomainName",
+              ],
+            },
+          ],
+        ],
+      },
     },
   },
   "Parameters": {
@@ -361,8 +374,21 @@ exports[`default website behaviour 1`] = `
 exports[`website with addFile 1`] = `
 {
   "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
+    "WebsiteEndpointUrl0CC0343F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Fn::GetAtt": [
+                "WebsiteDistribution0C86AB5B",
+                "DomainName",
+              ],
+            },
+          ],
+        ],
+      },
     },
   },
   "Parameters": {
@@ -766,8 +792,21 @@ exports[`website with addFile 1`] = `
 exports[`website with addJson 1`] = `
 {
   "Outputs": {
-    "WingTestRunnerFunctionArns": {
-      "Value": "[]",
+    "WebsiteEndpointUrl0CC0343F": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "https://",
+            {
+              "Fn::GetAtt": [
+                "WebsiteDistribution0C86AB5B",
+                "DomainName",
+              ],
+            },
+          ],
+        ],
+      },
     },
   },
   "Parameters": {
diff --git a/libs/awscdk/test/api.test.ts b/libs/awscdk/test/api.test.ts
new file mode 100644
index 00000000000..9f34c1082d3
--- /dev/null
+++ b/libs/awscdk/test/api.test.ts
@@ -0,0 +1,501 @@
+import { Match, Template } from "aws-cdk-lib/assertions";
+import { test, expect } from "vitest";
+import { simulator } from "@winglang/sdk";
+import * as awscdk from "../src";
+import { mkdtemp } from "@winglang/sdk/test/util";
+import { awscdkSanitize } from "./util";
+import { inflight } from "@winglang/sdk/lib/core";
+
+const CDK_APP_OPTS = {
+  stackName: "my-project",
+  entrypointDir: __dirname,
+};
+
+const INFLIGHT_CODE = inflight(async () => "Hello, World");
+const INFLIGHT_CODE_2 = inflight(async () => "Hello, Wing");
+
+test("api with GET route at root", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/", INFLIGHT_CODE);
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            get: {
+              operationId: "get",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with multiple methods on same route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/", INFLIGHT_CODE);
+  api.put("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            get: {
+              operationId: "get",
+            },
+            put: {
+              operationId: "put",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with GET routes with common prefix", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.get("/hello/bat", INFLIGHT_CODE_2);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 2);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with GET routes with different prefix", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.get("/foo/bar", INFLIGHT_CODE_2);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 2);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with multiple GET route and one lambda", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.get("/hello/bat", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with multiple methods and multiple lambda", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.post("/hello/bat", INFLIGHT_CODE_2);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 2);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with multiple methods and one lambda", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.post("/hello/bat", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with path parameter", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/hello/:world", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with 'name' parameter", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/:name", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with 'name' & 'age' parameter", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.get("/:name/:age", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with POST route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.post("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            post: {
+              operationId: "post",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with PUT route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.put("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            put: {
+              operationId: "put",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with PATCH route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.patch("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            patch: {
+              operationId: "patch",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with DELETE route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.delete("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            delete: {
+              operationId: "delete",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with OPTIONS route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.options("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            options: {
+              operationId: "options",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with HEAD route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.head("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            head: {
+              operationId: "head",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api with CONNECT route", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+
+  api.connect("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            connect: {
+              operationId: "connect",
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api url can be used as environment variable", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api");
+  new awscdk.Function(app, "Fn", INFLIGHT_CODE, {
+    env: {
+      API_URL: api.url,
+    },
+  });
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::Lambda::Function",
+    Match.objectLike({
+      Environment: {
+        Variables: {
+          API_URL: {},
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("api configured for cors", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const api = new awscdk.Api(app, "Api", { cors: true });
+  api.get("/", INFLIGHT_CODE);
+
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::ApiGateway::RestApi", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.hasResourceProperties(
+    "AWS::ApiGateway::RestApi",
+    Match.objectLike({
+      Body: {
+        paths: {
+          "/": {
+            get: {
+              operationId: "get",
+              responses: {
+                "200": {
+                  headers: {
+                    "Access-Control-Allow-Headers": {
+                      schema: {
+                        type: "string",
+                      },
+                    },
+                    "Access-Control-Allow-Methods": {
+                      schema: {
+                        type: "string",
+                      },
+                    },
+                    "Access-Control-Allow-Origin": {
+                      schema: {
+                        type: "string",
+                      },
+                    },
+                    "Access-Control-Max-Age": {
+                      schema: {
+                        type: "string",
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
diff --git a/libs/awscdk/test/app.test.ts b/libs/awscdk/test/app.test.ts
new file mode 100644
index 00000000000..b429aca3f74
--- /dev/null
+++ b/libs/awscdk/test/app.test.ts
@@ -0,0 +1,52 @@
+import { test, expect } from "vitest";
+import * as awscdk from "../src";
+import { CDK_APP_OPTS } from "./util";
+import { Stack } from "aws-cdk-lib";
+import { mkdtemp } from "@winglang/sdk/test/util";
+import { cloud, simulator } from "@winglang/sdk";
+import { Code, Function, Runtime } from "aws-cdk-lib/aws-lambda";
+import { inflight } from "@winglang/sdk/lib/core";
+
+test("custom stack", async () => {
+  const app = new awscdk.App({
+    ...CDK_APP_OPTS,
+    outdir: mkdtemp(),
+    stackFactory: (app, stackName) => {
+      return new Stack(app, stackName, {
+        description: "This is a custom stack description"
+      });
+    }
+  });
+
+  const out = JSON.parse(app.synth());
+  expect(out.Description, "This is a custom stack description");
+});
+
+test("custom Functions", async () => {
+  const app = new awscdk.App({
+    ...CDK_APP_OPTS,
+    outdir: mkdtemp(),
+  });
+
+  class CustomFunction extends awscdk.Function {
+    protected createFunction(code: Code, props: cloud.FunctionProps): Function {
+      return new Function(this, "Function", {
+        code,
+        handler: "index.handler",
+        runtime: Runtime.NODEJS_LATEST,
+        environment: {
+          BOOM: "BAR"
+        }
+      });
+    }
+  }
+
+  new CustomFunction(app, "MyFunction", inflight(async () => {
+    console.log("hello");
+    return undefined;
+  }));
+
+  const cfn = JSON.parse(app.synth());
+
+  expect(cfn.Resources.MyFunctionDBE6350A.Properties.Environment.Variables).toStrictEqual({ BOOM: 'BAR' });
+});
\ No newline at end of file
diff --git a/libs/awscdk/test/bucket.test.ts b/libs/awscdk/test/bucket.test.ts
index 208ca4949bd..e035650a73a 100644
--- a/libs/awscdk/test/bucket.test.ts
+++ b/libs/awscdk/test/bucket.test.ts
@@ -3,12 +3,12 @@ import { test, expect } from "vitest";
 import { cloud, simulator } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-import { awscdkSanitize } from "./util";
+import { awscdkSanitize, CDK_APP_OPTS } from "./util";
+import { inflight } from "@winglang/sdk/lib/core";
 
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
+const EVENT_HANDLER = inflight(async (_, event) => {
+  console.log("Received: ", event.name);
+});
 
 test("create a bucket", async () => {
   // GIVEN
@@ -94,12 +94,7 @@ test("bucket with onCreate method", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const processor = simulator.Testing.makeHandler(`\
-async handle(event) {
-  console.log("Received " + event.name);
-}`
-  );
-  bucket.onCreate(processor);
+  bucket.onCreate(EVENT_HANDLER);
   const output = app.synth();
 
   // THEN
@@ -123,12 +118,7 @@ test("bucket with onDelete method", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const processor = simulator.Testing.makeHandler(`\
-async handle(event) {
-  console.log("Received " + event.name);
-}`
-  );
-  bucket.onDelete(processor);
+  bucket.onDelete(EVENT_HANDLER);
   const output = app.synth();
 
   // THEN
@@ -152,12 +142,7 @@ test("bucket with onUpdate method", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const processor = simulator.Testing.makeHandler(`\
-async handle(event) {
-  console.log("Received " + event.name);
-}`
-  );
-  bucket.onUpdate(processor);
+  bucket.onUpdate(EVENT_HANDLER);
   const output = app.synth();
 
   // THEN
@@ -181,12 +166,7 @@ test("bucket with onEvent method", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const processor = simulator.Testing.makeHandler(`\
-async handle(event) {
-  console.log("Received " + event.name);
-}`
-  );
-  bucket.onEvent(processor);
+  bucket.onEvent(EVENT_HANDLER);
   const output = app.synth();
 
   // THEN
diff --git a/libs/awscdk/test/counter.test.ts b/libs/awscdk/test/counter.test.ts
index afbf2560c25..ef9fa27ab3b 100644
--- a/libs/awscdk/test/counter.test.ts
+++ b/libs/awscdk/test/counter.test.ts
@@ -3,12 +3,8 @@ import { test, expect } from "vitest";
 import { cloud, simulator } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-import { sanitizeCode, awscdkSanitize } from "./util";
-
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
+import { sanitizeCode, awscdkSanitize, CDK_APP_OPTS } from "./util";
+import { lift } from "@winglang/sdk/lib/core";
 
 test("default counter behavior", () => {
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
@@ -49,47 +45,37 @@ test("counter with initial value", () => {
 test("function with a counter binding", () => {
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = simulator.Testing.makeHandler(`async handle(event) {
-  const val = await this.my_counter.inc(2);
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.INC],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+  const handler = lift({ my_counter: counter }).grant({my_counter: [cloud.CounterInflightMethods.INC]}).inflight(async (ctx) => {
+    const val = await ctx.my_counter.inc(2);
+    console.log(val);
+  });
+
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   const template = Template.fromJSON(JSON.parse(output));
   template.resourceCountIs("AWS::DynamoDB::Table", 1);
-  template.resourceCountIs("AWS::IAM::Role", 2);
-  template.resourceCountIs("AWS::IAM::Policy", 2);
-  template.resourceCountIs("AWS::Lambda::Function", 2);
+  template.resourceCountIs("AWS::IAM::Role", 1);
+  template.resourceCountIs("AWS::IAM::Policy", 1);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
 
 test("inc() policy statement", () => {
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = simulator.Testing.makeHandler(`async handle(event) {
-  const val = await this.my_counter.inc(2);
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.INC],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+
+
+  const handler = lift({ my_counter: counter }).grant({my_counter: [cloud.CounterInflightMethods.INC]}).inflight(async (ctx) => {
+    const val = await ctx.my_counter.inc(2);
+    console.log(val);
+    });
+
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   const template = Template.fromJSON(JSON.parse(output));
   template.hasResourceProperties("AWS::IAM::Policy", {
     PolicyDocument: {
@@ -107,21 +93,16 @@ test("inc() policy statement", () => {
 test("dec() policy statement", () => {
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = simulator.Testing.makeHandler(`async handle(event) {
-  const val = await this.my_counter.dec(2);
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.DEC],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+
+  const handler = lift({ my_counter: counter }).grant({my_counter: [cloud.CounterInflightMethods.DEC]}).inflight(async (ctx) => {
+    const val = await ctx.my_counter.dec(2);
+    console.log(val);
+  });
+
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   const template = Template.fromJSON(JSON.parse(output));
   template.hasResourceProperties("AWS::IAM::Policy", {
     PolicyDocument: {
@@ -139,21 +120,16 @@ test("dec() policy statement", () => {
 test("peek() policy statement", () => {
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = simulator.Testing.makeHandler(`async handle(event) {
-  const val = await this.my_counter.peek();
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.PEEK],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+
+  const handler = lift({ my_counter: counter }).grant({my_counter: [cloud.CounterInflightMethods.PEEK]}).inflight(async (ctx) => {
+    const val = await ctx.my_counter.peek();
+    console.log(val);
+  });
+
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   const template = Template.fromJSON(JSON.parse(output));
   template.hasResourceProperties("AWS::IAM::Policy", {
     PolicyDocument: {
@@ -171,21 +147,16 @@ test("peek() policy statement", () => {
 test("set() policy statement", () => {
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = simulator.Testing.makeHandler(`async handle(event) {
-  const val = await this.my_counter.set();
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.SET],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+
+  const handler = lift({ my_counter: counter }).grant({my_counter: [cloud.CounterInflightMethods.SET]}).inflight(async (ctx) => {
+    const val = await ctx.my_counter.set(12);
+    console.log(val);
+  });
+
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   const template = Template.fromJSON(JSON.parse(output));
   template.hasResourceProperties("AWS::IAM::Policy", {
     PolicyDocument: {
diff --git a/libs/awscdk/test/dynamodb-table.test.ts b/libs/awscdk/test/dynamodb-table.test.ts
deleted file mode 100644
index d06fc7565c9..00000000000
--- a/libs/awscdk/test/dynamodb-table.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Match, Template } from "aws-cdk-lib/assertions";
-import { test, expect } from "vitest";
-import { cloud, simulator, ex } from "@winglang/sdk";
-import * as awscdk from "../src";
-import { mkdtemp } from "@winglang/sdk/test/util";
-import { awscdkSanitize } from "./util";
-
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
-
-test("default dynamodb table behavior", () => {
-  // GIVEN
-  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  new ex.DynamodbTable(app, "Table", {
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-    name: "my-wing-table",
-  });
-  const output = app.synth();
-
-  // THEN
-  const template = Template.fromJSON(JSON.parse(output));
-  template.hasResource("AWS::DynamoDB::Table", 1);
-  expect(awscdkSanitize(template)).toMatchSnapshot();
-});
-
-test("function with a table binding", () => {
-  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const table = new ex.DynamodbTable(app, "Table", {
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-    name: "my-wing-table",
-  });
-  const inflight = simulator.Testing.makeHandler(`async handle(event) {
-  await this.my_table.putItem({ item: { id: "test" } });
-  await this.my_table.scan();
-}`,
-    {
-      my_table: {
-        obj: table,
-        ops: [
-          ex.DynamodbTableInflightMethods.PUT_ITEM,
-          ex.DynamodbTableInflightMethods.SCAN,
-        ],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
-  const output = app.synth();
-
-  const template = Template.fromJSON(JSON.parse(output));
-  template.hasResource("Custom::LogRetention", 1);
-  template.hasResource("AWS::DynamoDB::Table", 1);
-  template.hasResource("AWS::IAM::Role", 2);
-  template.hasResource("AWS::IAM::Policy", 2);
-  // 1 inflight function and 1 log retention function
-  template.hasResource("AWS::Lambda::Function", 2);
-  expect(awscdkSanitize(template)).toMatchSnapshot();
-});
diff --git a/libs/awscdk/test/function.test.ts b/libs/awscdk/test/function.test.ts
index 0264b2e0776..48606f8677d 100644
--- a/libs/awscdk/test/function.test.ts
+++ b/libs/awscdk/test/function.test.ts
@@ -3,20 +3,16 @@ import { test, expect } from "vitest";
 import { cloud, simulator, std } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-import { awscdkSanitize } from "./util";
+import { awscdkSanitize, CDK_APP_OPTS } from "./util";
+import { inflight } from "@winglang/sdk/lib/core";
 
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
 
-const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`;
+const INFLIGHT_CODE = inflight(async (_, name) => console.log("Hello, " + name));
 
 test("basic function", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const inflight = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "Function", inflight);
+  new cloud.Function(app, "Function", INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -25,22 +21,18 @@ test("basic function", () => {
     "AWS::Lambda::Function",
     Match.objectLike({
       Handler: "index.handler",
-      Runtime: "nodejs18.x",
+      Runtime: "nodejs20.x",
       Timeout: 60,
     })
   );
-  expect(
-    Object.keys(template.findResources("Custom::LogRetention")).length,
-    "should have LogRetention"
-  ).toEqual(1);
+  template.resourceCountIs("AWS::Logs::LogGroup", 1);
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
 
 test("basic function with environment variables", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const inflight = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  const f = new cloud.Function(app, "Function", inflight, {
+  const f = new cloud.Function(app, "Function", INFLIGHT_CODE, {
     env: {
       FOO: "BAR",
     },
@@ -54,7 +46,7 @@ test("basic function with environment variables", () => {
     "AWS::Lambda::Function",
     Match.objectLike({
       Handler: "index.handler",
-      Runtime: "nodejs18.x",
+      Runtime: "nodejs20.x",
       Timeout: 60,
       Environment: {
         Variables: {
@@ -70,8 +62,7 @@ test("basic function with environment variables", () => {
 test("basic function with timeout explicitly set", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const inflight = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "Function", inflight, {
+  new cloud.Function(app, "Function", INFLIGHT_CODE, {
     timeout: std.Duration.fromMinutes(5),
   });
   const output = app.synth();
@@ -82,7 +73,7 @@ test("basic function with timeout explicitly set", () => {
     "AWS::Lambda::Function",
     Match.objectLike({
       Handler: "index.handler",
-      Runtime: "nodejs18.x",
+      Runtime: "nodejs20.x",
       Timeout: 300,
     })
   );
@@ -92,8 +83,7 @@ test("basic function with timeout explicitly set", () => {
 test("basic function with memory size specified", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const inflight = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "Function", inflight, { memory: 512 });
+  new cloud.Function(app, "Function", INFLIGHT_CODE, { memory: 512 });
   const output = app.synth();
 
   // THEN
@@ -102,41 +92,78 @@ test("basic function with memory size specified", () => {
     "AWS::Lambda::Function",
     Match.objectLike({
       Handler: "index.handler",
-      Runtime: "nodejs18.x",
+      Runtime: "nodejs20.x",
       MemorySize: 512,
     })
   );
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
 
+test("basic function with standard log retention", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  new cloud.Function(app, "Function", INFLIGHT_CODE);
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::Logs::LogGroup", 1);
+  template.hasResourceProperties(
+    "AWS::Logs::LogGroup",
+    Match.objectEquals({
+      RetentionInDays: 30
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
 test("basic function with custom log retention", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const inflight = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "Function", inflight, { logRetentionDays: 7 });
+  new cloud.Function(app, "Function", INFLIGHT_CODE, { logRetentionDays: 7 });
   const output = app.synth();
 
   // THEN
   const template = Template.fromJSON(JSON.parse(output));
-  expect(
-    Object.keys(template.findResources("Custom::LogRetention")).length,
-    "should have LogRetention"
-  ).toEqual(1);
+  template.resourceCountIs("AWS::Logs::LogGroup", 1);
+  template.hasResourceProperties(
+    "AWS::Logs::LogGroup",
+    Match.objectEquals({
+      RetentionInDays: 7
+    })
+  );
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
 
 test("basic function with infinite log retention", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const inflight = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "Function", inflight, { logRetentionDays: -1 });
+  new cloud.Function(app, "Function", INFLIGHT_CODE, { logRetentionDays: -1 });
   const output = app.synth();
 
   // THEN
   const template = Template.fromJSON(JSON.parse(output));
-  expect(
-    Object.keys(template.findResources("Custom::LogRetention")).length,
-    "should NOT have LogRetention"
-  ).toEqual(0);
+  template.resourceCountIs("AWS::Logs::LogGroup", 1);
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
+
+test("source map setting", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const f = new cloud.Function(app, "Function", INFLIGHT_CODE);
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.hasResourceProperties(
+    "AWS::Lambda::Function",
+    Match.objectLike({
+      Environment: {
+        Variables: {
+          NODE_OPTIONS: "--enable-source-maps",
+        },
+      },
+    })
+  );
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+})
\ No newline at end of file
diff --git a/libs/awscdk/test/on-deploy.test.ts b/libs/awscdk/test/on-deploy.test.ts
index 48d94936c3f..63ae506d25d 100644
--- a/libs/awscdk/test/on-deploy.test.ts
+++ b/libs/awscdk/test/on-deploy.test.ts
@@ -3,23 +3,19 @@ import { expect, test } from "vitest";
 import { cloud, simulator } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-import { awscdkSanitize } from "./util";
+import { awscdkSanitize, CDK_APP_OPTS } from "./util";
+import { inflight } from "@winglang/sdk/lib/core";
 
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-};
-
-const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`;
+const INFLIGHT_CODE = inflight(async (_, name) => console.log("Hello, " + name));
 
 test("create an OnDeploy", () => {
   // GIVEN
   const app = new awscdk.App({
     outdir: mkdtemp(),
-    entrypointDir: __dirname,
     ...CDK_APP_OPTS,
   });
-  const handler = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.OnDeploy(app, "my_on_deploy", handler);
+
+  new cloud.OnDeploy(app, "my_on_deploy", INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -32,12 +28,10 @@ test("execute OnDeploy after other resources", () => {
   // GIVEN
   const app = new awscdk.App({
     outdir: mkdtemp(),
-    entrypointDir: __dirname,
     ...CDK_APP_OPTS,
   });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const handler = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.OnDeploy(app, "my_on_deploy", handler, {
+  new cloud.OnDeploy(app, "my_on_deploy", INFLIGHT_CODE, {
     executeAfter: [bucket],
   });
   const output = app.synth();
@@ -55,12 +49,10 @@ test("execute OnDeploy before other resources", () => {
   // GIVEN
   const app = new awscdk.App({
     outdir: mkdtemp(),
-    entrypointDir: __dirname,
     ...CDK_APP_OPTS,
   });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const handler = simulator.Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.OnDeploy(app, "my_on_deploy", handler, {
+  new cloud.OnDeploy(app, "my_on_deploy", INFLIGHT_CODE, {
     executeBefore: [bucket],
   });
   const output = app.synth();
diff --git a/libs/awscdk/test/platform.test.ts b/libs/awscdk/test/platform.test.ts
new file mode 100644
index 00000000000..56de662133e
--- /dev/null
+++ b/libs/awscdk/test/platform.test.ts
@@ -0,0 +1,66 @@
+import { test, expect } from "vitest";
+import { Platform } from "../src/platform"
+import { mkdtemp } from "@winglang/sdk/test/util";
+import { readdirSync } from "fs";
+import { Bucket } from "../src";
+import { Stack } from "aws-cdk-lib";
+
+test("wing platform", async () => {
+  const workdir = mkdtemp();
+  const platform = new Platform();
+  process.env.CDK_STACK_NAME = "MyStack";
+  const app = platform.newApp?.({ entrypointDir: workdir, outdir: workdir });
+
+  new Bucket(app, "bucket");
+
+  const out = app.synth();
+
+  expect(JSON.parse(out).Resources.bucket43879C71).toStrictEqual({
+    DeletionPolicy: "Delete",
+    Properties: {
+      BucketEncryption: {
+        ServerSideEncryptionConfiguration: [
+          {
+            ServerSideEncryptionByDefault: {
+              SSEAlgorithm: "AES256",
+            },
+          },
+        ],
+      },
+      PublicAccessBlockConfiguration: {
+        BlockPublicAcls: true,
+        BlockPublicPolicy: true,
+        IgnorePublicAcls: true,
+        RestrictPublicBuckets: true,
+      },
+    },
+    Type: "AWS::S3::Bucket",
+    UpdateReplacePolicy: "Delete",
+  });
+
+  // output directory only contains wing artifacts. cdk artifacts will be in the cdk.out directory
+  // when the CDK CLI is used
+  expect(readdirSync(workdir)).toStrictEqual([
+    "MyStack.assets.json",
+    "MyStack.template.json",
+    "cdk.out",
+    "connections.json",
+    "manifest.json",
+    "tree.json",
+  ]);
+});
+
+test("CDK_STACK_NAME, CDK_AWS_ACCOUNT, CDK_AWS_REGION", async () => {
+  const workdir = mkdtemp();
+  const platform = new Platform();
+  process.env.CDK_STACK_NAME = "YourStack";
+  process.env.CDK_AWS_ACCOUNT = "123";
+  process.env.CDK_AWS_REGION = "us-west-2";
+
+  const app = platform.newApp?.({ entrypointDir: workdir, outdir: workdir });
+  const stack = Stack.of(app);
+
+  expect(stack.resolve(stack.region)).toStrictEqual("us-west-2");
+  expect(stack.resolve(stack.stackName)).toStrictEqual("YourStack");
+  expect(stack.resolve(stack.account)).toStrictEqual("123");
+});
diff --git a/libs/awscdk/test/queue.test.ts b/libs/awscdk/test/queue.test.ts
index ad24b4ee315..99625ef7aba 100644
--- a/libs/awscdk/test/queue.test.ts
+++ b/libs/awscdk/test/queue.test.ts
@@ -3,12 +3,8 @@ import { test, expect } from "vitest";
 import { std, simulator, cloud } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-import { sanitizeCode, awscdkSanitize } from "./util";
-
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
+import { sanitizeCode, awscdkSanitize, CDK_APP_OPTS } from "./util";
+import { inflight } from "@winglang/sdk/lib/core";
 
 test("default queue behavior", () => {
   // GIVEN
@@ -53,11 +49,10 @@ test("queue with a consumer function", () => {
   const queue = new cloud.Queue(app, "Queue", {
     timeout: std.Duration.fromSeconds(30),
   });
-  const processor = simulator.Testing.makeHandler(`\
-async handle(event) {
-  console.log("Received " + event.name);
-}`
-  );
+  const processor = inflight(async (_, event) => {
+    console.log("Received " + event.name);
+
+  });
   const processorFn = queue.setConsumer(processor);
   const output = app.synth();
 
@@ -66,9 +61,9 @@ async handle(event) {
 
   const template = Template.fromJSON(JSON.parse(output));
   template.resourceCountIs("AWS::SQS::Queue", 1);
-  template.resourceCountIs("AWS::Lambda::Function", 2);
-  template.resourceCountIs("AWS::IAM::Role", 2);
-  template.resourceCountIs("AWS::IAM::Policy", 2);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
+  template.resourceCountIs("AWS::IAM::Role", 1);
+  template.resourceCountIs("AWS::IAM::Policy", 1);
   template.resourceCountIs("AWS::Lambda::EventSourceMapping", 1);
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
diff --git a/libs/awscdk/test/schedule.test.ts b/libs/awscdk/test/schedule.test.ts
index 6ec765850dd..3db356e7f55 100644
--- a/libs/awscdk/test/schedule.test.ts
+++ b/libs/awscdk/test/schedule.test.ts
@@ -3,23 +3,20 @@ import { test, expect } from "vitest";
 import { simulator, cloud, std } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-import { awscdkSanitize } from "./util";
+import { awscdkSanitize, CDK_APP_OPTS } from "./util";
+import { inflight } from "@winglang/sdk/lib/core";
 
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
+const INFLIGHT_CODE = inflight(async (_, event) => {
+  console.log("Received: ", event);
+});
 
 test("schedule behavior with rate", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const fn = simulator.Testing.makeHandler(
-    `async handle(event) { console.log("Received: ", event); }`
-  );
   const schedule = new cloud.Schedule(app, "Schedule", {
     rate: std.Duration.fromMinutes(2),
   });
-  schedule.onTick(fn);
+  schedule.onTick(INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -34,20 +31,71 @@ test("schedule behavior with rate", () => {
 test("schedule behavior with cron", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const fn = simulator.Testing.makeHandler(
-    `async handle(event) { console.log("Received: ", event); }`
-  );
   const schedule = new cloud.Schedule(app, "Schedule", {
-    cron: "0/1 * ? * *",
+    cron: "0/1 * * * *",
+  });
+  schedule.onTick(INFLIGHT_CODE);
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::Events::Rule", 1);
+  template.hasResourceProperties("AWS::Events::Rule", {
+    ScheduleExpression: "cron(0/1 * * * ? *)",
+  });
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("convert single dayOfWeek from Unix to AWS", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const schedule = new cloud.Schedule(app, "Schedule", {
+    cron: "* * * * 1",
+  });
+  schedule.onTick(INFLIGHT_CODE);
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::Events::Rule", 1);
+  template.hasResourceProperties("AWS::Events::Rule", {
+    ScheduleExpression: "cron(* * ? * 0 *)",
+  });
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("convert the range of dayOfWeek from Unix to AWS", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const schedule = new cloud.Schedule(app, "Schedule", {
+    cron: "* * * * 1-7",
+  });
+  schedule.onTick(INFLIGHT_CODE);
+  const output = app.synth();
+
+  // THEN
+  const template = Template.fromJSON(JSON.parse(output));
+  template.resourceCountIs("AWS::Events::Rule", 1);
+  template.hasResourceProperties("AWS::Events::Rule", {
+    ScheduleExpression: "cron(* * ? * 0-6 *)",
+  });
+  expect(awscdkSanitize(template)).toMatchSnapshot();
+});
+
+test("convert the list of dayOfWeek from Unix to AWS", () => {
+  // GIVEN
+  const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
+  const schedule = new cloud.Schedule(app, "Schedule", {
+    cron: "* * * * 1,3,5,7",
   });
-  schedule.onTick(fn);
+  schedule.onTick(INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
   const template = Template.fromJSON(JSON.parse(output));
   template.resourceCountIs("AWS::Events::Rule", 1);
   template.hasResourceProperties("AWS::Events::Rule", {
-    ScheduleExpression: "cron(0/1 * ? * * *)",
+    ScheduleExpression: "cron(* * ? * 0,2,4,6 *)",
   });
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
@@ -55,13 +103,10 @@ test("schedule behavior with cron", () => {
 test("schedule with two functions", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
-  const fn = simulator.Testing.makeHandler(
-    `async handle(event) { console.log("Received: ", event); }`
-  );
   const schedule = new cloud.Schedule(app, "Schedule", {
-    cron: "0/1 * ? * *",
+    cron: "0/1 * * * *",
   });
-  schedule.onTick(fn);
+  schedule.onTick(INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -100,9 +145,7 @@ test("cron with more than five values", () => {
       new cloud.Schedule(app, "Schedule", {
         cron: "0/1 * ? * * *",
       })
-  ).toThrow(
-    "cron string must be UNIX cron format [minute] [hour] [day of month] [month] [day of week]"
-  );
+  ).toThrow("cron string must be in UNIX cron format");
 });
 
 test("schedule without rate or cron", () => {
@@ -128,7 +171,7 @@ test("schedule with rate less than 1 minute", () => {
   ).toThrow("rate can not be set to less than 1 minute.");
 });
 
-test("cron with Day-of-month and Day-of-week setting with *", () => {
+test("cron with day of month and day of week configured at the same time", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
 
@@ -136,9 +179,9 @@ test("cron with Day-of-month and Day-of-week setting with *", () => {
   expect(
     () =>
       new cloud.Schedule(app, "Schedule", {
-        cron: "0/1 * * * *",
+        cron: "* * 1 * 1",
       })
   ).toThrow(
-    "cannot use * in both the Day-of-month and Day-of-week fields. If you use it in one, you must use ? in the other"
+    "Cannot restrict both 'day-of-month' and 'day-of-week' in a cron expression, at least one must be '*'"
   );
 });
diff --git a/libs/awscdk/test/secret.test.ts b/libs/awscdk/test/secret.test.ts
index d30a34e0639..af636c5b280 100644
--- a/libs/awscdk/test/secret.test.ts
+++ b/libs/awscdk/test/secret.test.ts
@@ -4,11 +4,7 @@ import { test, expect } from "vitest";
 import { cloud } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
+import { CDK_APP_OPTS} from "./util"; 
 
 test("default secret behavior", () => {
   // GIVEN
diff --git a/libs/awscdk/test/topic.test.ts b/libs/awscdk/test/topic.test.ts
index dc75e8a6347..66561c0002f 100644
--- a/libs/awscdk/test/topic.test.ts
+++ b/libs/awscdk/test/topic.test.ts
@@ -3,12 +3,8 @@ import { test, expect } from "vitest";
 import { cloud, simulator } from "@winglang/sdk";
 import * as awscdk from "../src";
 import { mkdtemp } from "@winglang/sdk/test/util";
-import { sanitizeCode, awscdkSanitize } from "./util";
-
-const CDK_APP_OPTS = {
-  stackName: "my-project",
-  entrypointDir: __dirname,
-};
+import { sanitizeCode, awscdkSanitize, CDK_APP_OPTS } from "./util";
+import { inflight } from "@winglang/sdk/lib/core";
 
 test("default topic behavior", () => {
   // GIVEN
@@ -25,8 +21,7 @@ test("topic with subscriber function", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const topic = new cloud.Topic(app, "Topic");
-  const subscriber = simulator.Testing.makeHandler(`async handle(event) { console.log("Received: ", event); }`
-  );
+  const subscriber = inflight(async (_, event) => console.log("Received: ", event));
   topic.onMessage(subscriber);
   const output = app.synth();
 
@@ -34,9 +29,9 @@ test("topic with subscriber function", () => {
   expect(sanitizeCode(subscriber._toInflight())).toMatchSnapshot();
   const template = Template.fromJSON(JSON.parse(output));
   template.resourceCountIs("AWS::SNS::Topic", 1);
-  template.resourceCountIs("AWS::Lambda::Function", 2);
+  template.resourceCountIs("AWS::Lambda::Function", 1);
   template.resourceCountIs("AWS::Lambda::Permission", 1);
-  template.resourceCountIs("AWS::IAM::Role", 2);
+  template.resourceCountIs("AWS::IAM::Role", 1);
   template.resourceCountIs("AWS::SNS::Subscription", 1);
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
@@ -45,12 +40,8 @@ test("topic with multiple subscribers", () => {
   // GIVEN
   const app = new awscdk.App({ outdir: mkdtemp(), ...CDK_APP_OPTS });
   const topic = new cloud.Topic(app, "Topic");
-  const subOne = simulator.Testing.makeHandler(
-    `async handle(event) { console.log("Got Event: ", event); }`
-  );
-  const subTwo = simulator.Testing.makeHandler(
-    `async handle(event) { console.log("Ohh yea!! ", event); }`
-  );
+  const subOne = inflight(async (_, event) => console.log("Got Event: ", event));
+  const subTwo = inflight(async (_, event) => console.log("Ohh yea!! ", event));
 
   // WHEN
   topic.onMessage(subOne);
@@ -64,9 +55,9 @@ test("topic with multiple subscribers", () => {
 
   const template = Template.fromJSON(JSON.parse(output));
   template.resourceCountIs("AWS::SNS::Topic", 1);
-  template.resourceCountIs("AWS::Lambda::Function", 3);
+  template.resourceCountIs("AWS::Lambda::Function", 2);
   template.resourceCountIs("AWS::Lambda::Permission", 2);
-  template.resourceCountIs("AWS::IAM::Role", 3);
+  template.resourceCountIs("AWS::IAM::Role", 2);
   template.resourceCountIs("AWS::SNS::Subscription", 2);
   expect(awscdkSanitize(template)).toMatchSnapshot();
 });
diff --git a/libs/awscdk/test/util.ts b/libs/awscdk/test/util.ts
index 4fc76eb7ac3..d57deadd97c 100644
--- a/libs/awscdk/test/util.ts
+++ b/libs/awscdk/test/util.ts
@@ -5,7 +5,7 @@ import { Template } from "aws-cdk-lib/assertions";
  */
 export function sanitizeCode(code: string): string {
   function removeAbsolutePaths(text: string) {
-    const regex = /".+\/libs\/awscdk\/(.+)"/g;
+    const regex = /"[^"]+?\/libs\/awscdk\/(.+?)"/g;
 
     // replace first group with static text
     return text.replace(regex, '"[REDACTED]/awscdk/$1"');
@@ -31,4 +31,9 @@ export function awscdkSanitize(template: Template): any {
   );
 
   return JSON.parse(jsonString);
-}
\ No newline at end of file
+}
+
+export const CDK_APP_OPTS = {
+  stackName: "my-project",
+  entrypointDir: __dirname,
+};
diff --git a/libs/compatibility-spy/.gitignore b/libs/compatibility-spy/.gitignore
new file mode 100644
index 00000000000..c3af857904e
--- /dev/null
+++ b/libs/compatibility-spy/.gitignore
@@ -0,0 +1 @@
+lib/
diff --git a/libs/compatibility-spy/.prettierrc.json b/libs/compatibility-spy/.prettierrc.json
new file mode 100644
index 00000000000..84c85a38828
--- /dev/null
+++ b/libs/compatibility-spy/.prettierrc.json
@@ -0,0 +1,3 @@
+{
+  "overrides": []
+}
diff --git a/libs/compatibility-spy/package.json b/libs/compatibility-spy/package.json
new file mode 100644
index 00000000000..829bafc38bf
--- /dev/null
+++ b/libs/compatibility-spy/package.json
@@ -0,0 +1,43 @@
+{
+  "name": "@winglang/compatibility-spy",
+  "version": "0.0.0",
+  "author": {
+    "name": "Wing Cloud",
+    "email": "ping@wing.cloud",
+    "organization": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/winglang/wing.git",
+    "directory": "libs/compatibility-spy"
+  },
+  "description": "Wing Platform for spying the usage of cloud resources' methods and properties",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org",
+    "tag": "latest"
+  },
+  "main": "lib/index.js",
+  "license": "MIT",
+  "dependencies": {
+    "constructs": "^10.3",
+    "@winglang/sdk": "workspace:^"
+  },
+  "devDependencies": {
+    "bump-pack": "workspace:^",
+    "typescript": "^5.3.3",
+    "tsup": "^8.0.2",
+    "vitest": "^1.6.0"
+  },
+  "scripts": {
+    "compile": "tsup",
+    "package": "bump-pack -b",
+    "test": "vitest run --update"
+  },
+  "files": [
+    "lib"
+  ],
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/libs/compatibility-spy/src/index.ts b/libs/compatibility-spy/src/index.ts
new file mode 100644
index 00000000000..f2dbf42284b
--- /dev/null
+++ b/libs/compatibility-spy/src/index.ts
@@ -0,0 +1,116 @@
+import { writeFileSync, readFileSync } from "node:fs";
+import { resolve, join } from "node:path";
+import { Construct } from "constructs";
+import { platform, core, std } from "@winglang/sdk";
+
+const PARENT_PROPERTIES: Set<string> = new Set([
+  "node",
+  "onLiftMap",
+  ...Object.getOwnPropertyNames(Construct),
+]);
+
+export class Platform implements platform.IPlatform {
+  public readonly target = "*";
+  /**
+   * A summary of methods and property usage for each resource time
+   * @internal
+   */
+  public _usageContext: Map<string, Set<string>> = new Map();
+  private readonly jsii;
+  constructor() {
+    this.jsii = JSON.parse(
+      readFileSync(
+        join(require.resolve("@winglang/sdk"), "..", "..", ".jsii"),
+        {
+          encoding: "utf8",
+        }
+      )
+    );
+  }
+
+  newInstance(fqn: string, scope: Construct, id: string, ...args: any) {
+    const type = core.App.of(scope).typeForFqn(fqn);
+
+    if (!type) {
+      return undefined;
+    }
+
+    const jsiiType = this.jsii.types[fqn];
+    const allowedMethods = [
+      ...(jsiiType?.methods ?? []),
+      ...(jsiiType?.properties ?? []),
+    ];
+
+    return new Proxy(new type(scope, id, ...args), {
+      get: (target, prop: string | Symbol) => {
+        // capturing the lifted ops
+        if (prop === "onLift") {
+          return (host: std.IInflightHost, ops: string[]) => {
+            ops.forEach((op: string) => this._addToUsageContext(target, op));
+            return target[prop](host, ops);
+          };
+        }
+
+        if (
+          typeof prop === "string" &&
+          !prop.startsWith("_") &&
+          !PARENT_PROPERTIES.has(prop) &&
+          !!allowedMethods.find(
+            (o: { name: string; protected?: boolean }) =>
+              o.name === prop && !o.protected
+          )
+        ) {
+          this._addToUsageContext(target, prop);
+        }
+        return target[prop as string];
+      },
+      set: (target, prop, newValue) => {
+        if (typeof prop === "string" && !prop.startsWith("_")) {
+          this._addToUsageContext(target, prop);
+        }
+
+        target[prop] = newValue;
+        return true;
+      },
+    });
+  }
+
+  preSynth(app: Construct) {
+    this._writeAppUsage(app as core.App);
+  }
+
+  /**
+   * Adds an op to usage context
+   * @param op
+   * @internal
+   */
+  public _addToUsageContext(parent: any, op: string): void {
+    const className = parent.constructor.name;
+
+    if (["handle", "$inflight_init"].includes(op)) {
+      return;
+    }
+    const usageContext = this._usageContext.get(className);
+    if (!usageContext) {
+      this._usageContext.set(className, new Set([op]));
+    } else {
+      usageContext.add(op);
+    }
+  }
+
+  /**
+   * Write the usage context into a file in the out dir
+   * @internal
+   */
+  private _writeAppUsage(app: core.App): void {
+    const context: Record<string, string[]> = {};
+    for (const key of this._usageContext.keys()) {
+      context[key] = Array.from(this._usageContext.get(key) ?? []);
+    }
+
+    writeFileSync(
+      resolve(app.outdir, "usage_context.json"),
+      JSON.stringify(context, null, 2)
+    );
+  }
+}
diff --git a/libs/compatibility-spy/test/spy.test.ts b/libs/compatibility-spy/test/spy.test.ts
new file mode 100644
index 00000000000..3ae80b32010
--- /dev/null
+++ b/libs/compatibility-spy/test/spy.test.ts
@@ -0,0 +1,50 @@
+import { test, describe, expect, vi } from "vitest";
+import { join } from "node:path";
+import { Platform } from "../src";
+import { cloud, platform } from "@winglang/sdk";
+import { App as SimApp } from "@winglang/sdk/lib/target-sim/app";
+
+import { Platform as SimPlatform } from "@winglang/sdk/lib/target-sim/platform";
+
+describe("compatibility spy", async () => {
+  let spyPlatform = new Platform();
+
+  vi.spyOn(spyPlatform, "newInstance");
+
+  const manager = new platform.PlatformManager({
+    platformPaths: ["sim", join(__dirname, "../lib")],
+  });
+
+  vi.spyOn(manager, "loadPlatformPath").mockImplementation(
+    (platformPath: string) => {
+      manager.platformInstances.push(
+        platformPath === "sim" ? new SimPlatform() : spyPlatform
+      );
+    }
+  );
+
+  const app = manager.createApp({
+    entrypointDir: __dirname,
+  }) as SimApp;
+
+  test("app overrides and hooks set correctly", () => {
+    expect(app._newInstanceOverrides.length).toBe(1);
+    expect(app._synthHooks?.preSynthesize.length).toBe(1);
+  });
+
+  const bucket = app.newAbstract(
+    cloud.BUCKET_FQN,
+    app,
+    "bucket"
+  ) as cloud.Bucket;
+
+  bucket.addObject("a", "b");
+  bucket.public;
+
+  test("each new instance is wrapped in a proxy", () => {
+    expect(spyPlatform.newInstance).toBeCalledTimes(1);
+    expect(spyPlatform._usageContext.get("Bucket")).toEqual(
+      new Set(["addObject"])
+    );
+  });
+});
diff --git a/libs/compatibility-spy/tsconfig.json b/libs/compatibility-spy/tsconfig.json
new file mode 100644
index 00000000000..0761c4952df
--- /dev/null
+++ b/libs/compatibility-spy/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "strict": true,
+  },
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts",
+  ],
+  "exclude": []
+}
diff --git a/libs/compatibility-spy/tsup.config.ts b/libs/compatibility-spy/tsup.config.ts
new file mode 100644
index 00000000000..ff14a5fbef7
--- /dev/null
+++ b/libs/compatibility-spy/tsup.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  bundle: false,
+  format: "cjs",
+  outDir: "lib",
+});
diff --git a/libs/compatibility-spy/turbo.json b/libs/compatibility-spy/turbo.json
new file mode 100644
index 00000000000..78c048320ad
--- /dev/null
+++ b/libs/compatibility-spy/turbo.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "compile": {
+      "outputs": ["lib/**"]
+    },
+    "test": {
+      "dependsOn": ["compile"]
+    },
+    "package": {
+      "dependsOn": ["compile"],
+      "outputs": ["../../dist/winglang-compatibility-spy-*.tgz"]
+    }
+  }
+}
diff --git a/libs/tree-sitter-wing/.editorconfig b/libs/tree-sitter-wing/.editorconfig
new file mode 100644
index 00000000000..d3a8b5b697f
--- /dev/null
+++ b/libs/tree-sitter-wing/.editorconfig
@@ -0,0 +1,39 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{json,toml,yml,gyp}]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.rs]
+indent_style = space
+indent_size = 4
+
+[*.{c,cc,h}]
+indent_style = space
+indent_size = 4
+
+[*.{py,pyi}]
+indent_style = space
+indent_size = 4
+
+[*.swift]
+indent_style = space
+indent_size = 4
+
+[*.go]
+indent_style = tab
+indent_size = 8
+
+[Makefile]
+indent_style = tab
+indent_size = 8
diff --git a/libs/tree-sitter-wing/.gitattributes b/libs/tree-sitter-wing/.gitattributes
new file mode 100644
index 00000000000..feccd39bb70
--- /dev/null
+++ b/libs/tree-sitter-wing/.gitattributes
@@ -0,0 +1 @@
+/src/grammar.json linguist-generated
diff --git a/libs/tree-sitter-wing/.gitignore b/libs/tree-sitter-wing/.gitignore
index 6d684d8b8a5..219bf0d7f50 100644
--- a/libs/tree-sitter-wing/.gitignore
+++ b/libs/tree-sitter-wing/.gitignore
@@ -1,4 +1,5 @@
 /src/*
 !/src/scanner.c
+!/src/grammar.json
 /log.html
 /*.wasm
diff --git a/libs/tree-sitter-wing/Cargo.toml b/libs/tree-sitter-wing/Cargo.toml
index 48d45c0adf4..a02a668dc0f 100644
--- a/libs/tree-sitter-wing/Cargo.toml
+++ b/libs/tree-sitter-wing/Cargo.toml
@@ -1,31 +1,23 @@
 [package]
 name = "tree-sitter-wing"
-description = "winglang grammar for the tree-sitter parsing library"
+description = "Wing grammar for tree-sitter"
 version = "0.0.0"
-keywords = ["incremental", "parsing", "wing"]
+license = "MIT"
+readme = "README.md"
+keywords = ["incremental", "parsing", "tree-sitter", "wing"]
 categories = ["parsing", "text-editors"]
-repository = "https://github.com/winglang/wing/tree/main/libs/tree-sitter-wing"
+repository = "https://github.com/winglang/tree-sitter-wing"
 edition = "2021"
-license = "MIT"
+autoexamples = false
 
 build = "bindings/rust/build.rs"
-include = [
-  "bindings/rust/*",
-  "grammar.js",
-  "queries/*",
-  "src/*",
-]
+include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "0.20.10"
-
-[dev-dependencies]
-tree-sitter-cli = "0.20.8"
+tree-sitter = "0.22.5"
 
 [build-dependencies]
-cc = "1.0"
-tree-sitter-cli = "0.20.8"
-tree-sitter = "0.20.10"
+cc = "1.0.87"
diff --git a/libs/tree-sitter-wing/Makefile b/libs/tree-sitter-wing/Makefile
new file mode 100644
index 00000000000..34378005408
--- /dev/null
+++ b/libs/tree-sitter-wing/Makefile
@@ -0,0 +1,112 @@
+VERSION := 0.0.0
+
+LANGUAGE_NAME := tree-sitter-wing
+
+# repository
+SRC_DIR := src
+
+PARSER_REPO_URL := $(shell git -C $(SRC_DIR) remote get-url origin 2>/dev/null)
+
+ifeq ($(PARSER_URL),)
+	PARSER_URL := $(subst .git,,$(PARSER_REPO_URL))
+ifeq ($(shell echo $(PARSER_URL) | grep '^[a-z][-+.0-9a-z]*://'),)
+	PARSER_URL := $(subst :,/,$(PARSER_URL))
+	PARSER_URL := $(subst git@,https://,$(PARSER_URL))
+endif
+endif
+
+TS ?= tree-sitter
+
+# ABI versioning
+SONAME_MAJOR := $(word 1,$(subst ., ,$(VERSION)))
+SONAME_MINOR := $(word 2,$(subst ., ,$(VERSION)))
+
+# install directory layout
+PREFIX ?= /usr/local
+INCLUDEDIR ?= $(PREFIX)/include
+LIBDIR ?= $(PREFIX)/lib
+PCLIBDIR ?= $(LIBDIR)/pkgconfig
+
+# source/object files
+PARSER := $(SRC_DIR)/parser.c
+EXTRAS := $(filter-out $(PARSER),$(wildcard $(SRC_DIR)/*.c))
+OBJS := $(patsubst %.c,%.o,$(PARSER) $(EXTRAS))
+
+# flags
+ARFLAGS ?= rcs
+override CFLAGS += -I$(SRC_DIR) -std=c11 -fPIC
+
+# OS-specific bits
+ifeq ($(OS),Windows_NT)
+	$(error "Windows is not supported")
+else ifeq ($(shell uname),Darwin)
+	SOEXT = dylib
+	SOEXTVER_MAJOR = $(SONAME_MAJOR).dylib
+	SOEXTVER = $(SONAME_MAJOR).$(SONAME_MINOR).dylib
+	LINKSHARED := $(LINKSHARED)-dynamiclib -Wl,
+	ifneq ($(ADDITIONAL_LIBS),)
+	LINKSHARED := $(LINKSHARED)$(ADDITIONAL_LIBS),
+	endif
+	LINKSHARED := $(LINKSHARED)-install_name,$(LIBDIR)/lib$(LANGUAGE_NAME).$(SONAME_MAJOR).dylib,-rpath,@executable_path/../Frameworks
+else
+	SOEXT = so
+	SOEXTVER_MAJOR = so.$(SONAME_MAJOR)
+	SOEXTVER = so.$(SONAME_MAJOR).$(SONAME_MINOR)
+	LINKSHARED := $(LINKSHARED)-shared -Wl,
+	ifneq ($(ADDITIONAL_LIBS),)
+	LINKSHARED := $(LINKSHARED)$(ADDITIONAL_LIBS)
+	endif
+	LINKSHARED := $(LINKSHARED)-soname,lib$(LANGUAGE_NAME).so.$(SONAME_MAJOR)
+endif
+ifneq ($(filter $(shell uname),FreeBSD NetBSD DragonFly),)
+	PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+endif
+
+all: lib$(LANGUAGE_NAME).a lib$(LANGUAGE_NAME).$(SOEXT) $(LANGUAGE_NAME).pc
+
+lib$(LANGUAGE_NAME).a: $(OBJS)
+	$(AR) $(ARFLAGS) $@ $^
+
+lib$(LANGUAGE_NAME).$(SOEXT): $(OBJS)
+	$(CC) $(LDFLAGS) $(LINKSHARED) $^ $(LDLIBS) -o $@
+ifneq ($(STRIP),)
+	$(STRIP) $@
+endif
+
+$(LANGUAGE_NAME).pc: bindings/c/$(LANGUAGE_NAME).pc.in
+	sed  -e 's|@URL@|$(PARSER_URL)|' \
+		-e 's|@VERSION@|$(VERSION)|' \
+		-e 's|@LIBDIR@|$(LIBDIR)|' \
+		-e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
+		-e 's|@REQUIRES@|$(REQUIRES)|' \
+		-e 's|@ADDITIONAL_LIBS@|$(ADDITIONAL_LIBS)|' \
+		-e 's|=$(PREFIX)|=$${prefix}|' \
+		-e 's|@PREFIX@|$(PREFIX)|' $< > $@
+
+$(PARSER): $(SRC_DIR)/grammar.json
+	$(TS) generate --no-bindings $^
+
+install: all
+	install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter '$(DESTDIR)$(PCLIBDIR)' '$(DESTDIR)$(LIBDIR)'
+	install -m644 bindings/c/$(LANGUAGE_NAME).h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/$(LANGUAGE_NAME).h
+	install -m644 $(LANGUAGE_NAME).pc '$(DESTDIR)$(PCLIBDIR)'/$(LANGUAGE_NAME).pc
+	install -m644 lib$(LANGUAGE_NAME).a '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).a
+	install -m755 lib$(LANGUAGE_NAME).$(SOEXT) '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXTVER)
+	ln -sf lib$(LANGUAGE_NAME).$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXTVER_MAJOR)
+	ln -sf lib$(LANGUAGE_NAME).$(SOEXTVER_MAJOR) '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXT)
+
+uninstall:
+	$(RM) '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).a \
+		'$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXTVER) \
+		'$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXTVER_MAJOR) \
+		'$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXT) \
+		'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/$(LANGUAGE_NAME).h \
+		'$(DESTDIR)$(PCLIBDIR)'/$(LANGUAGE_NAME).pc
+
+clean:
+	$(RM) $(OBJS) $(LANGUAGE_NAME).pc lib$(LANGUAGE_NAME).a lib$(LANGUAGE_NAME).$(SOEXT)
+
+test:
+	$(TS) test
+
+.PHONY: all install uninstall clean test
diff --git a/libs/tree-sitter-wing/Package.swift b/libs/tree-sitter-wing/Package.swift
new file mode 100644
index 00000000000..26b11f39028
--- /dev/null
+++ b/libs/tree-sitter-wing/Package.swift
@@ -0,0 +1,47 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "TreeSitterWing",
+    products: [
+        .library(name: "TreeSitterWing", targets: ["TreeSitterWing"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "TreeSitterWing",
+                path: ".",
+                exclude: [
+                    "Cargo.toml",
+                    "Makefile",
+                    "binding.gyp",
+                    "bindings/c",
+                    "bindings/go",
+                    "bindings/node",
+                    "bindings/python",
+                    "bindings/rust",
+                    "prebuilds",
+                    "grammar.js",
+                    "package.json",
+                    "package-lock.json",
+                    "pyproject.toml",
+                    "setup.py",
+                    "test",
+                    "examples",
+                    ".editorconfig",
+                    ".github",
+                    ".gitignore",
+                    ".gitattributes",
+                    ".gitmodules",
+                ],
+                sources: [
+                    "src/parser.c",
+                    "src/scanner.c",
+                ],
+                resources: [
+                    .copy("queries")
+                ],
+                publicHeadersPath: "bindings/swift",
+                cSettings: [.headerSearchPath("src")])
+    ],
+    cLanguageStandard: .c11
+)
diff --git a/libs/tree-sitter-wing/README.md b/libs/tree-sitter-wing/README.md
index 032334ea2ed..b263c5a704f 100644
--- a/libs/tree-sitter-wing/README.md
+++ b/libs/tree-sitter-wing/README.md
@@ -1,19 +1,9 @@
 # tree-sitter-wing
 
-TODO
+A tree-sitter parser for the Wing language.
 
-## Build
+Wing is still heavily in development and this grammar/parser is experimental. It is used directly in the Wing compiler and is not considered a public API. It is available here for use but may have breaking changes at any time and no bindings are published or guaranteed to be work.
 
-```sh
-cargo build
-```
+## Contributing
 
-## Test
-
-```sh
-cargo test
-```
-
-## License
-
-Licensed under the MIT license.
+Issues are tracked as part of the [Wing](https://github.com/winglang/wing) repository.
diff --git a/libs/tree-sitter-wing/binding.gyp b/libs/tree-sitter-wing/binding.gyp
index d60fd6cc2c6..fad37c76a4a 100644
--- a/libs/tree-sitter-wing/binding.gyp
+++ b/libs/tree-sitter-wing/binding.gyp
@@ -2,18 +2,29 @@
   "targets": [
     {
       "target_name": "tree_sitter_wing_binding",
+      "dependencies": [
+        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
+      ],
       "include_dirs": [
-        "<!(node -e \"require('nan')\")",
-        "src"
+        "src",
       ],
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # If your language uses an external scanner, add it here.
+        "src/scanner.c"
+      ],
+      "conditions": [
+        ["OS!='win'", {
+          "cflags_c": [
+            "-std=c11",
+          ],
+        }, { # OS == "win"
+          "cflags_c": [
+            "/std:c11",
+            "/utf-8",
+          ],
+        }],
       ],
-      "cflags_c": [
-        "-std=c99",
-      ]
     }
   ]
 }
diff --git a/libs/tree-sitter-wing/bindings/c/tree-sitter-wing.h b/libs/tree-sitter-wing/bindings/c/tree-sitter-wing.h
new file mode 100644
index 00000000000..643f4db955c
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/c/tree-sitter-wing.h
@@ -0,0 +1,16 @@
+#ifndef TREE_SITTER_WING_H_
+#define TREE_SITTER_WING_H_
+
+typedef struct TSLanguage TSLanguage;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const TSLanguage *tree_sitter_wing(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_WING_H_
diff --git a/libs/tree-sitter-wing/bindings/c/tree-sitter-wing.pc.in b/libs/tree-sitter-wing/bindings/c/tree-sitter-wing.pc.in
new file mode 100644
index 00000000000..fa383dc63ff
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/c/tree-sitter-wing.pc.in
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
+
+Name: tree-sitter-wing
+Description: Wing grammar for tree-sitter
+URL: @URL@
+Version: @VERSION@
+Requires: @REQUIRES@
+Libs: -L${libdir} @ADDITIONAL_LIBS@ -ltree-sitter-wing
+Cflags: -I${includedir}
diff --git a/libs/tree-sitter-wing/bindings/go/binding.go b/libs/tree-sitter-wing/bindings/go/binding.go
new file mode 100644
index 00000000000..1aa44bdeeb1
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/go/binding.go
@@ -0,0 +1,13 @@
+package tree_sitter_wing
+
+// #cgo CFLAGS: -std=c11 -fPIC
+// #include "../../src/parser.c"
+// // NOTE: if your language has an external scanner, add it here.
+import "C"
+
+import "unsafe"
+
+// Get the tree-sitter Language for this grammar.
+func Language() unsafe.Pointer {
+	return unsafe.Pointer(C.tree_sitter_wing())
+}
diff --git a/libs/tree-sitter-wing/bindings/go/binding_test.go b/libs/tree-sitter-wing/bindings/go/binding_test.go
new file mode 100644
index 00000000000..4261a661bb2
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/go/binding_test.go
@@ -0,0 +1,15 @@
+package tree_sitter_wing_test
+
+import (
+	"testing"
+
+	tree_sitter "github.com/smacker/go-tree-sitter"
+	"github.com/winglang/tree-sitter-wing"
+)
+
+func TestCanLoadGrammar(t *testing.T) {
+	language := tree_sitter.NewLanguage(tree_sitter_wing.Language())
+	if language == nil {
+		t.Errorf("Error loading Wing grammar")
+	}
+}
diff --git a/libs/tree-sitter-wing/bindings/go/go.mod b/libs/tree-sitter-wing/bindings/go/go.mod
new file mode 100644
index 00000000000..300f7e0ba5f
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/go/go.mod
@@ -0,0 +1,5 @@
+module github.com/winglang/tree-sitter-wing
+
+go 1.22
+
+require github.com/smacker/go-tree-sitter v0.0.0-20230720070738-0d0a9f78d8f8
diff --git a/libs/tree-sitter-wing/bindings/node/binding.cc b/libs/tree-sitter-wing/bindings/node/binding.cc
index 167f23ab374..63fba97b899 100644
--- a/libs/tree-sitter-wing/bindings/node/binding.cc
+++ b/libs/tree-sitter-wing/bindings/node/binding.cc
@@ -1,28 +1,20 @@
-#include "tree_sitter/parser.h"
-#include <node.h>
-#include "nan.h"
+#include <napi.h>
 
-using namespace v8;
+typedef struct TSLanguage TSLanguage;
 
-extern "C" TSLanguage * tree_sitter_wing();
+extern "C" TSLanguage *tree_sitter_wing();
 
-namespace {
+// "tree-sitter", "language" hashed with BLAKE2
+const napi_type_tag LANGUAGE_TYPE_TAG = {
+  0x8AF2E5212AD58ABF, 0xD5006CAD83ABBA16
+};
 
-NAN_METHOD(New) {}
-
-void Init(Local<Object> exports, Local<Object> module) {
-  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
-  tpl->SetClassName(Nan::New("Language").ToLocalChecked());
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
-
-  Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_wing());
-
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("wing").ToLocalChecked());
-  Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+    exports["name"] = Napi::String::New(env, "wing");
+    auto language = Napi::External<TSLanguage>::New(env, tree_sitter_wing());
+    language.TypeTag(&LANGUAGE_TYPE_TAG);
+    exports["language"] = language;
+    return exports;
 }
 
-NODE_MODULE(tree_sitter_wing_binding, Init)
-
-}  // namespace
+NODE_API_MODULE(tree_sitter_wing_binding, Init)
diff --git a/libs/tree-sitter-wing/bindings/node/index.d.ts b/libs/tree-sitter-wing/bindings/node/index.d.ts
new file mode 100644
index 00000000000..efe259eed03
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/node/index.d.ts
@@ -0,0 +1,28 @@
+type BaseNode = {
+  type: string;
+  named: boolean;
+};
+
+type ChildNode = {
+  multiple: boolean;
+  required: boolean;
+  types: BaseNode[];
+};
+
+type NodeInfo =
+  | (BaseNode & {
+      subtypes: BaseNode[];
+    })
+  | (BaseNode & {
+      fields: { [name: string]: ChildNode };
+      children: ChildNode[];
+    });
+
+type Language = {
+  name: string;
+  language: unknown;
+  nodeTypeInfo: NodeInfo[];
+};
+
+declare const language: Language;
+export = language;
diff --git a/libs/tree-sitter-wing/bindings/node/index.js b/libs/tree-sitter-wing/bindings/node/index.js
index e61b689515a..6657bcf42de 100644
--- a/libs/tree-sitter-wing/bindings/node/index.js
+++ b/libs/tree-sitter-wing/bindings/node/index.js
@@ -1,18 +1,6 @@
-try {
-  module.exports = require("../../build/Release/tree_sitter_wing_binding");
-} catch (error1) {
-  if (error1.code !== 'MODULE_NOT_FOUND') {
-    throw error1;
-  }
-  try {
-    module.exports = require("../../build/Debug/tree_sitter_wing_binding");
-  } catch (error2) {
-    if (error2.code !== 'MODULE_NOT_FOUND') {
-      throw error2;
-    }
-    throw error1
-  }
-}
+const root = require("path").join(__dirname, "..", "..");
+
+module.exports = require("node-gyp-build")(root);
 
 try {
   module.exports.nodeTypeInfo = require("../../src/node-types.json");
diff --git a/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/__init__.py b/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/__init__.py
new file mode 100644
index 00000000000..d1756f267c9
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/__init__.py
@@ -0,0 +1,5 @@
+"Wing grammar for tree-sitter"
+
+from ._binding import language
+
+__all__ = ["language"]
diff --git a/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/__init__.pyi b/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/__init__.pyi
new file mode 100644
index 00000000000..5416666fc30
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/__init__.pyi
@@ -0,0 +1 @@
+def language() -> int: ...
diff --git a/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/binding.c b/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/binding.c
new file mode 100644
index 00000000000..edc7a07bbc8
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/binding.c
@@ -0,0 +1,27 @@
+#include <Python.h>
+
+typedef struct TSLanguage TSLanguage;
+
+TSLanguage *tree_sitter_wing(void);
+
+static PyObject* _binding_language(PyObject *self, PyObject *args) {
+    return PyLong_FromVoidPtr(tree_sitter_wing());
+}
+
+static PyMethodDef methods[] = {
+    {"language", _binding_language, METH_NOARGS,
+     "Get the tree-sitter language for this grammar."},
+    {NULL, NULL, 0, NULL}
+};
+
+static struct PyModuleDef module = {
+    .m_base = PyModuleDef_HEAD_INIT,
+    .m_name = "_binding",
+    .m_doc = NULL,
+    .m_size = -1,
+    .m_methods = methods
+};
+
+PyMODINIT_FUNC PyInit__binding(void) {
+    return PyModule_Create(&module);
+}
diff --git a/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/py.typed b/libs/tree-sitter-wing/bindings/python/tree_sitter_wing/py.typed
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/libs/tree-sitter-wing/bindings/rust/build.rs b/libs/tree-sitter-wing/bindings/rust/build.rs
index ed5313fc8a1..4ee87687059 100644
--- a/libs/tree-sitter-wing/bindings/rust/build.rs
+++ b/libs/tree-sitter-wing/bindings/rust/build.rs
@@ -1,35 +1,20 @@
-use std::path::PathBuf;
-use tree_sitter_cli::generate::generate_parser_in_directory;
-
 fn main() {
 	let src_dir = std::path::Path::new("src");
 
-	generate_parser_in_directory(&PathBuf::from("."), None, tree_sitter::LANGUAGE_VERSION, false, None)
-		.expect("Generating parser");
-
 	let mut c_config = cc::Build::new();
-	c_config
-		.include(src_dir)
-		.flag("-Wno-unused-parameter")
-		.flag("-Wno-unused-but-set-variable")
-		.flag("-Wno-trigraphs")
-		.file(&src_dir.join("parser.c"))
-		.file(&src_dir.join("scanner.c"));
+	c_config.std("c11").include(src_dir).flag("-Wno-unused-parameter");
+
+	#[cfg(target_env = "msvc")]
+	c_config.flag("-utf-8");
 
-	if cfg!(target_arch = "wasm32") {
-		// This parser is used in a WASI context, so it needs to be compiled with
-		// the sysroot and other tools needed for WASI-compatible C
-		c_config.flag(
-			format!(
-				"--sysroot={}/share/wasi-sysroot",
-				env!("WASI_SDK", "WASI_SDK env not set")
-			)
-			.as_str(),
-		);
-	}
+	let parser_path = src_dir.join("parser.c");
+	c_config.file(&parser_path);
+	println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
 
-	c_config.compile("parser");
+	// External scanner
+	let scanner_path = src_dir.join("scanner.c");
+	c_config.file(&scanner_path);
+	println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
 
-	println!("cargo:rerun-if-changed=grammar.js");
-	println!("cargo:rerun-if-changed=src/scanner.c");
+	c_config.compile("tree-sitter-wing");
 }
diff --git a/libs/tree-sitter-wing/bindings/rust/lib.rs b/libs/tree-sitter-wing/bindings/rust/lib.rs
index f82ee198f44..1e1fa5a6fb2 100644
--- a/libs/tree-sitter-wing/bindings/rust/lib.rs
+++ b/libs/tree-sitter-wing/bindings/rust/lib.rs
@@ -1,13 +1,15 @@
-//! This crate provides wing language support for the [tree-sitter][] parsing library.
+//! This crate provides Wing language support for the [tree-sitter][] parsing library.
 //!
 //! Typically, you will use the [language][language func] function to add this language to a
 //! tree-sitter [Parser][], and then use the parser to parse some code:
 //!
 //! ```
-//! let code = "";
+//! let code = r#"
+//! "#;
 //! let mut parser = tree_sitter::Parser::new();
-//! parser.set_language(tree_sitter_wing::language()).expect("Error loading wing grammar");
+//! parser.set_language(&tree_sitter_wing::language()).expect("Error loading Wing grammar");
 //! let tree = parser.parse(code, None).unwrap();
+//! assert!(!tree.root_node().has_error());
 //! ```
 //!
 //! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
@@ -18,14 +20,14 @@
 use tree_sitter::Language;
 
 extern "C" {
-	fn tree_sitter_wing() -> Language;
+    fn tree_sitter_wing() -> Language;
 }
 
 /// Get the tree-sitter [Language][] for this grammar.
 ///
 /// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
 pub fn language() -> Language {
-	unsafe { tree_sitter_wing() }
+    unsafe { tree_sitter_wing() }
 }
 
 /// The content of the [`node-types.json`][] file for this grammar.
@@ -35,7 +37,18 @@ pub const NODE_TYPES: &str = include_str!("../../src/node-types.json");
 
 // Uncomment these to include any queries that this grammar contains
 
-pub const HIGHLIGHTS_QUERY: &str = include_str!("../../queries/highlights.scm");
-// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
-pub const LOCALS_QUERY: &str = include_str!("../../queries/locals.scm");
-// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
+// pub const HIGHLIGHTS_QUERY: &str = include_str!("../../queries/highlights.scm");
+// pub const INJECTIONS_QUERY: &str = include_str!("../../queries/injections.scm");
+// pub const LOCALS_QUERY: &str = include_str!("../../queries/locals.scm");
+// pub const TAGS_QUERY: &str = include_str!("../../queries/tags.scm");
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_can_load_grammar() {
+        let mut parser = tree_sitter::Parser::new();
+        parser
+            .set_language(&super::language())
+            .expect("Error loading Wing grammar");
+    }
+}
diff --git a/libs/tree-sitter-wing/bindings/swift/TreeSitterWing/wing.h b/libs/tree-sitter-wing/bindings/swift/TreeSitterWing/wing.h
new file mode 100644
index 00000000000..643f4db955c
--- /dev/null
+++ b/libs/tree-sitter-wing/bindings/swift/TreeSitterWing/wing.h
@@ -0,0 +1,16 @@
+#ifndef TREE_SITTER_WING_H_
+#define TREE_SITTER_WING_H_
+
+typedef struct TSLanguage TSLanguage;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const TSLanguage *tree_sitter_wing(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_WING_H_
diff --git a/libs/tree-sitter-wing/grammar.js b/libs/tree-sitter-wing/grammar.js
index eae0e472dc3..dac4dfd9743 100644
--- a/libs/tree-sitter-wing/grammar.js
+++ b/libs/tree-sitter-wing/grammar.js
@@ -13,14 +13,16 @@ const PREC = {
   UNARY: 120,
   OPTIONAL_TEST: 130,
   POWER: 140,
-  MEMBER: 150,
-  CALL: 160,
+  STRUCTURED_ACCESS: 150, // x[y]
+  MEMBER: 160,
+  CALL: 170,
+  OPTIONAL_UNWRAP: 180,
 };
 
 module.exports = grammar({
   name: "wing",
 
-  extras: ($) => [$.comment, /[\s\p{Zs}\uFEFF\u2060\u200B]/],
+  extras: ($) => [$.comment, $.doc, /[\s\p{Zs}\uFEFF\u2060\u200B]/],
 
   word: ($) => $.identifier,
 
@@ -29,8 +31,9 @@ module.exports = grammar({
   precedences: ($) => [
     // Handle ambiguity in case of empty literal: `a = {}`
     // In this case tree-sitter doesn't know if it's a set or a map literal so just assume its a map
-    [$.json_map_literal, $.map_literal, $.set_literal],
+    [$.json_map_literal, $.map_literal, $.array_literal],
     [$.json_literal, $.structured_access_expression],
+    [$.intrinsic, $.call],
   ],
 
   conflicts: ($) => [
@@ -39,8 +42,8 @@ module.exports = grammar({
 
     // These modifier conflicts should be solved through GLR parsing
     [$.field_modifiers, $.method_modifiers],
-    [$.class_modifiers, $.closure_modifiers],
-    [$.inflight_method_signature, $.field_modifiers]
+    [$.class_modifiers, $.closure_modifiers, $.interface_modifiers],
+    [$.inflight_method_signature, $.field_modifiers],
   ],
 
   supertypes: ($) => [$.expression, $._literal],
@@ -53,9 +56,15 @@ module.exports = grammar({
     _semicolon: ($) => choice(";", $.AUTOMATIC_SEMICOLON),
     comment: ($) =>
       token(
-        choice(seq("//", /.*/), seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, "/"))
+        choice(
+          seq(/\/\/[^\/]/, /.*/),
+          seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, "/")
+        )
       ),
 
+    doc: ($) => seq("///", field("content", $.doc_content)),
+    doc_content: ($) => /.*/,
+
     // Identifiers
     reference: ($) =>
       choice(
@@ -65,6 +74,7 @@ module.exports = grammar({
       ),
 
     identifier: ($) => /([A-Za-z_$][A-Za-z_$0-9]*|[A-Z][A-Z0-9_]*)/,
+    parenthesized_identifier: ($) => seq("(", $.identifier, ")"),
     _type_identifier: ($) => alias($.identifier, $.type_identifier),
     _member_identifier: ($) => alias($.identifier, $.member_identifier),
     _reference_identifier: ($) => alias($.identifier, $.reference_identifier),
@@ -91,13 +101,13 @@ module.exports = grammar({
               $.json_container_type
             )
           ),
-          field("accessor_type", $._accessor),
+          field("accessor_type", $.accessor),
           // While the "property" identifier is optional in this grammar, upstream parsing will fail if it is not present
           optional(field("property", $._member_identifier))
         )
       ),
 
-    _accessor: ($) => choice(".", "?."),
+    accessor: ($) => choice(".", "?."),
 
     inflight_specifier: ($) => "inflight",
 
@@ -123,6 +133,7 @@ module.exports = grammar({
         $.compiler_dbg_env,
         $.super_constructor_statement,
         $.throw_statement,
+        $.lift_statement
       ),
 
     import_statement: ($) =>
@@ -158,6 +169,26 @@ module.exports = grammar({
     throw_statement: ($) =>
       seq("throw", optional(field("expression", $.expression)), $._semicolon),
 
+    lift_statement: ($) =>
+      seq(
+        "lift",
+        field("lift_qualifications", $.lift_qualifications),
+        field("block", $.block)
+      ),
+
+    lift_qualifications: ($) =>
+      seq("{", field("qualification", commaSep1($.lift_qualification)), "}"),
+
+    lift_qualification: ($) =>
+      seq(
+        field("obj", $.expression),
+        ":",
+        choice(
+          field("ops", $.identifier),
+          field("ops", seq("[", commaSep1($.identifier), "]"))
+        )
+      ),
+
     assignment_operator: ($) => choice("=", "+=", "-="),
 
     variable_assignment_statement: ($) =>
@@ -168,7 +199,6 @@ module.exports = grammar({
         $._semicolon
       ),
 
-
     expression_statement: ($) => seq($.expression, $._semicolon),
 
     reassignable: ($) => "var",
@@ -190,7 +220,8 @@ module.exports = grammar({
 
     // Classes
 
-    class_modifiers: ($) => repeat1(choice($.access_modifier, $.inflight_specifier)),
+    class_modifiers: ($) =>
+      repeat1(choice($.access_modifier, $.inflight_specifier)),
 
     class_definition: ($) =>
       seq(
@@ -203,18 +234,18 @@ module.exports = grammar({
       ),
 
     class_implementation: ($) =>
-      braced(
-        repeat(
-          choice(
-            $.initializer,
-            $.method_definition,
-            $.class_field
-          )
+      braced(repeat(choice($.initializer, $.method_definition, $.class_field))),
+
+    field_modifiers: ($) =>
+      repeat1(
+        choice(
+          $.access_modifier,
+          $.static,
+          $.inflight_specifier,
+          $.reassignable
         )
       ),
 
-    field_modifiers: ($) => repeat1(choice($.access_modifier, $.static, $.inflight_specifier, $.reassignable)),
-
     class_field: ($) =>
       seq(
         optional(field("modifiers", $.field_modifiers)),
@@ -224,14 +255,20 @@ module.exports = grammar({
         $._semicolon
       ),
 
+    /// Interfaces
+
+    interface_modifiers: ($) =>
+      repeat1(choice($.access_modifier, $.inflight_specifier)),
+
     interface_definition: ($) =>
       seq(
-        optional(field("access_modifier", $.access_modifier)),
+        optional(field("modifiers", $.interface_modifiers)),
         "interface",
         field("name", $.identifier),
         optional(seq("extends", field("extends", commaSep1($.custom_type)))),
         field("implementation", $.interface_implementation)
       ),
+
     interface_implementation: ($) =>
       braced(
         repeat(
@@ -263,7 +300,8 @@ module.exports = grammar({
 
     break_statement: ($) => seq("break", $._semicolon),
     _super: ($) => "super",
-    super_constructor_statement: ($) => seq($._super, field("args", $.argument_list), $._semicolon),
+    super_constructor_statement: ($) =>
+      seq($._super, field("args", $.argument_list), $._semicolon),
 
     continue_statement: ($) => seq("continue", $._semicolon),
 
@@ -276,7 +314,12 @@ module.exports = grammar({
         "=",
         field("value", $.expression),
         field("block", $.block),
-        repeat(field("elif_let_block", $.elif_let_block)),
+        repeat(
+          choice(
+            field("elif_let_block", $.elif_let_block),
+            field("elif_block", $.elif_block)
+          )
+        ),
         optional(seq("else", field("else_block", $.block)))
       ),
 
@@ -310,7 +353,15 @@ module.exports = grammar({
         optional(
           seq(
             "catch",
-            optional(field("exception_identifier", $.identifier)),
+            optional(
+              choice(
+                field("exception_identifier", $.identifier),
+                field(
+                  "parenthesized_exception_identifier",
+                  $.parenthesized_identifier
+                )
+              )
+            ),
             field("catch_block", $.block)
           )
         ),
@@ -319,6 +370,7 @@ module.exports = grammar({
 
     expression: ($) =>
       choice(
+        $.unwrap_or,
         $.binary_expression,
         $.unary_expression,
         $.new_expression,
@@ -334,11 +386,29 @@ module.exports = grammar({
         $.struct_literal,
         $.optional_test,
         $.compiler_dbg_panic,
+        $.optional_unwrap,
+        $.intrinsic
+      ),
+
+    intrinsic: ($) =>
+      prec.right(
+        seq(
+          field("name", $.intrinsic_identifier),
+          optional(field("args", $.argument_list))
+        )
       ),
+    intrinsic_identifier: ($) => /@[A-Za-z_$0-9]*/,
 
     // Primitives
     _literal: ($) =>
-      choice($.string, $.number, $.bool, $.duration, $.nil_value),
+      choice(
+        $.string,
+        $.non_interpolated_string,
+        $.number,
+        $.bool,
+        $.duration,
+        $.nil_value
+      ),
 
     number: ($) => choice($._integer, $._decimal),
     _integer: ($) => /\d[\d_]*/,
@@ -346,7 +416,16 @@ module.exports = grammar({
 
     bool: ($) => choice("true", "false"),
 
-    duration: ($) => choice($.milliseconds, $.seconds, $.minutes, $.hours, $.days, $.months, $.years),
+    duration: ($) =>
+      choice(
+        $.milliseconds,
+        $.seconds,
+        $.minutes,
+        $.hours,
+        $.days,
+        $.months,
+        $.years
+      ),
     milliseconds: ($) => seq(field("value", $.number), "ms"),
     seconds: ($) => seq(field("value", $.number), "s"),
     minutes: ($) => seq(field("value", $.number), "m"),
@@ -355,6 +434,12 @@ module.exports = grammar({
     months: ($) => seq(field("value", $.number), "mo"),
     years: ($) => seq(field("value", $.number), "y"),
     nil_value: ($) => "nil",
+    non_interpolated_string: ($) =>
+      seq(
+        '#"',
+        repeat(choice($._non_interpolated_string_fragment, $._escape_sequence)),
+        '"'
+      ),
     string: ($) =>
       seq(
         '"',
@@ -369,6 +454,8 @@ module.exports = grammar({
       ),
     template_substitution: ($) => seq("{", $.expression, "}"),
     _string_fragment: ($) => token.immediate(prec(1, /[^{"\\]+/)),
+    _non_interpolated_string_fragment: ($) =>
+      token.immediate(prec(1, /[^"\\]+/)),
     _escape_sequence: ($) =>
       token.immediate(
         seq(
@@ -379,7 +466,7 @@ module.exports = grammar({
             /[0-7]{1,3}/,
             /x[0-9a-fA-F]{2}/,
             /u[0-9a-fA-F]{4}/,
-            /u{[0-9a-fA-F]+}/
+            /u\{[0-9a-fA-F]+\}/
           )
         )
       ),
@@ -393,7 +480,10 @@ module.exports = grammar({
     call: ($) =>
       prec.left(
         PREC.CALL,
-        seq(field("caller", choice($.expression, $.super_call)), field("args", $.argument_list))
+        seq(
+          field("caller", choice($.expression, $.super_call)),
+          field("args", $.argument_list)
+        )
       ),
 
     super_call: ($) => seq($._super, ".", field("method", $.identifier)),
@@ -401,15 +491,7 @@ module.exports = grammar({
     argument_list: ($) =>
       seq(
         "(",
-        choice(
-          commaSep($.positional_argument),
-          commaSep($.keyword_argument),
-          seq(
-            commaSep($.positional_argument),
-            ",",
-            commaSep($.keyword_argument)
-          )
-        ),
+        commaSep(choice($.positional_argument, $.keyword_argument)),
         ")"
       ),
 
@@ -433,7 +515,7 @@ module.exports = grammar({
           // While "args" is optional in this grammar, upstream parsing will fail if it is not present
           field("args", optional($.argument_list)),
           optional(seq("as", field("id", $.expression))),
-          optional(seq("in", field("scope", $.expression))),
+          optional(seq("in", field("scope", $.expression)))
         )
       ),
 
@@ -444,9 +526,12 @@ module.exports = grammar({
         $._builtin_container_type,
         $.json_container_type,
         $.function_type,
-        $.optional
+        $.optional,
+        $._parenthesized_type
       ),
 
+    _parenthesized_type: ($) => seq("(", $._type, ")"),
+
     optional: ($) => seq($._type, "?"),
 
     function_type: ($) =>
@@ -454,7 +539,7 @@ module.exports = grammar({
         seq(
           optional(field("inflight", $.inflight_specifier)),
           field("parameter_types", $.parameter_type_list),
-          optional(seq(":", field("return_type", $._type)))
+          seq(":", field("return_type", $._type))
         )
       ),
 
@@ -466,7 +551,7 @@ module.exports = grammar({
     initializer: ($) =>
       seq(
         optional(field("inflight", $.inflight_specifier)),
-        "new",
+        field("ctor_name", "new"),
         field("parameter_list", $.parameter_list),
         field("block", $.block)
       ),
@@ -483,7 +568,15 @@ module.exports = grammar({
         $._semicolon
       ),
 
-    method_modifiers: ($) => repeat1(choice($.extern_modifier, $.access_modifier, $.static, $.inflight_specifier)),
+    method_modifiers: ($) =>
+      repeat1(
+        choice(
+          $.extern_modifier,
+          $.access_modifier,
+          $.static,
+          $.inflight_specifier
+        )
+      ),
 
     method_definition: ($) =>
       seq(
@@ -512,7 +605,7 @@ module.exports = grammar({
         optional(field("reassignable", $.reassignable)),
         optional(field("variadic", $.variadic)),
         field("name", $.identifier),
-        optional($._type_annotation),
+        optional($._type_annotation)
       ),
 
     parameter_list: ($) => seq("(", commaSep($.parameter_definition), ")"),
@@ -537,6 +630,19 @@ module.exports = grammar({
     _container_value_type: ($) =>
       seq("<", field("type_parameter", $._type), ">"),
 
+    unwrap_or: ($) =>
+      prec.right(
+        PREC.UNWRAP_OR,
+        seq(
+          field("left", $.expression),
+          field("op", "??"),
+          field("right", $.expression)
+        )
+      ),
+
+    optional_unwrap: ($) =>
+      prec.right(PREC.OPTIONAL_UNWRAP, seq($.expression, "!")),
+
     unary_expression: ($) => {
       /** @type {Array<[RuleOrLiteral, number]>} */
       const table = [
@@ -580,7 +686,6 @@ module.exports = grammar({
         //['<<', PREC.SHIFT],
         //['>>', PREC.SHIFT],
         //['>>>', PREC.SHIFT],
-        ["??", PREC.UNWRAP_OR],
       ];
 
       return choice(
@@ -612,19 +717,11 @@ module.exports = grammar({
     defer_expression: ($) => prec.right(seq("defer", $.expression)),
     parenthesized_expression: ($) => seq("(", $.expression, ")"),
 
-    _collection_literal: ($) =>
-      choice($.array_literal, $.set_literal, $.map_literal),
+    _collection_literal: ($) => choice($.array_literal, $.map_literal),
     array_literal: ($) =>
       seq(
         optional(field("type", $._builtin_container_type)),
-        "[",
-        commaSep(field("element", $.expression)),
-        "]"
-      ),
-    set_literal: ($) =>
-      seq(
-        optional(field("type", $._builtin_container_type)),
-        braced(commaSep(field("element", $.expression)))
+        bracketed(commaSep(field("element", $.expression)))
       ),
     map_literal: ($) =>
       seq(
@@ -638,19 +735,26 @@ module.exports = grammar({
       ),
 
     map_literal_member: ($) => seq($.expression, "=>", $.expression),
-    struct_literal_member: ($) => seq($.identifier, ":", $.expression),
+    struct_literal_member: ($) => choice($.identifier, seq($.identifier, ":", $.expression)),
     structured_access_expression: ($) =>
-      prec.right(seq($.expression, "[", $.expression, "]")),
+      prec.right(
+        PREC.STRUCTURED_ACCESS,
+        seq($.expression, "[", $.expression, "]")
+      ),
 
     json_literal: ($) =>
       choice(
-        seq(field("type", $.json_container_type), field("element", $.expression)),
+        seq(
+          field("type", $.json_container_type),
+          field("element", $.expression)
+        ),
         field("element", $.json_map_literal)
       ),
 
-    json_map_literal: ($) => braced(commaSep(field("member", $.json_literal_member))),
-    json_literal_member: ($) => seq(choice($.identifier, $.string), ":", $.expression),
-
+    json_map_literal: ($) =>
+      braced(commaSep(field("member", $.json_literal_member))),
+    json_literal_member: ($) =>
+      choice($.identifier, seq(choice($.identifier, $.string), ":", $.expression)),
     json_container_type: ($) => $._json_types,
 
     _json_types: ($) => choice("Json", "MutJson"),
@@ -664,7 +768,14 @@ module.exports = grammar({
  * @param {Rule} rule
  */
 function braced(rule) {
-  return choice(seq("{", rule, "}"));
+  return seq("{", rule, "}");
+}
+
+/*
+ * @param {Rule} rule
+ */
+function bracketed(rule) {
+  return seq("[", rule, "]");
 }
 
 /**
diff --git a/libs/tree-sitter-wing/package.json b/libs/tree-sitter-wing/package.json
index 3b991c96221..9ca9f834105 100644
--- a/libs/tree-sitter-wing/package.json
+++ b/libs/tree-sitter-wing/package.json
@@ -3,26 +3,44 @@
   "version": "0.0.0",
   "description": "winglang grammar for tree-sitter",
   "main": "bindings/node",
+  "types": "bindings/node",
   "keywords": [
     "parsing",
     "incremental"
   ],
+  "files": [
+    "grammar.js",
+    "binding.gyp",
+    "prebuilds/**",
+    "bindings/node/*",
+    "queries/**",
+    "src/**"
+  ],
   "tree-sitter": [
     {
       "scope": "source.wing",
+      "highlights": "queries/highlights.scm",
       "file-types": [
         "w"
       ]
     }
   ],
   "dependencies": {
-    "nan": "^2.17.0"
+    "node-addon-api": "^7.1.0"
+  },
+  "peerDependencies": {
+    "tree-sitter": "^0.21.0"
+  },
+  "peerDependenciesMeta": {
+    "tree_sitter": {
+      "optional": true
+    }
   },
   "scripts": {
-    "test": "tree-sitter test",
-    "test:update": "tree-sitter test --update",
+    "test": "tree-sitter test --update",
+    "parse": "tree-sitter parse",
     "test:watch": "nodemon --watch grammar.js --watch src/scanner.c --exec \"turbo test\"",
-    "build:generate": "tree-sitter generate",
+    "build:generate": "tree-sitter generate --no-bindings",
     "build:wasm": "tree-sitter build-wasm --docker",
     "build:watch": "nodemon --watch grammar.js --watch src/scanner.c --exec \"turbo compile\"",
     "playground": "tree-sitter playground",
@@ -33,7 +51,7 @@
     "extends": "../../package.json"
   },
   "devDependencies": {
-    "nodemon": "^3.0.1",
-    "tree-sitter-cli": "0.20.6"
+    "nodemon": "^3.1.0",
+    "tree-sitter-cli": "0.22.5"
   }
 }
diff --git a/libs/tree-sitter-wing/pyproject.toml b/libs/tree-sitter-wing/pyproject.toml
new file mode 100644
index 00000000000..7f3a4722ec0
--- /dev/null
+++ b/libs/tree-sitter-wing/pyproject.toml
@@ -0,0 +1,29 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "tree-sitter-wing"
+description = "Wing grammar for tree-sitter"
+version = "0.0.0"
+keywords = ["incremental", "parsing", "tree-sitter", "wing"]
+classifiers = [
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: MIT License",
+  "Topic :: Software Development :: Compilers",
+  "Topic :: Text Processing :: Linguistic",
+  "Typing :: Typed"
+]
+requires-python = ">=3.8"
+license.text = "MIT"
+readme = "README.md"
+
+[project.urls]
+Homepage = "https://github.com/winglang/tree-sitter-wing"
+
+[project.optional-dependencies]
+core = ["tree-sitter~=0.21"]
+
+[tool.cibuildwheel]
+build = "cp38-*"
+build-frontend = "build"
diff --git a/libs/tree-sitter-wing/queries/folds.scm b/libs/tree-sitter-wing/queries/folds.scm
new file mode 100644
index 00000000000..60de6116dac
--- /dev/null
+++ b/libs/tree-sitter-wing/queries/folds.scm
@@ -0,0 +1,15 @@
+[
+  (class_definition)
+  (class_implementation)
+  (interface_definition)
+  (interface_implementation)
+  (for_in_loop)
+  (while_statement)
+  (if_statement)
+  (if_let_statement)
+  (elif_block)
+  (struct_definition)
+  (enum_definition)
+  (try_catch_statement)
+  (method_definition)
+] @fold
diff --git a/libs/tree-sitter-wing/queries/highlights.scm b/libs/tree-sitter-wing/queries/highlights.scm
index 65f097d67e9..0171e09dec2 100644
--- a/libs/tree-sitter-wing/queries/highlights.scm
+++ b/libs/tree-sitter-wing/queries/highlights.scm
@@ -1,50 +1,55 @@
-; Classes
+(identifier) @variable
+
+(reference_identifier) @variable
+
+(member_identifier) @variable.member
 
+; Classes
 (custom_type) @type
-(class_field 
-  name: (identifier) @member
-) 
-(class_definition 
-  name: (identifier) @type
-)
+
+(class_field
+  name: (identifier) @variable.member)
+
+(class_definition
+  name: (identifier) @type)
+
 (method_definition
-  name: (identifier) @function
-)
+  name: (identifier) @function.method)
 
 ; Functions
-
 (keyword_argument_key) @variable.parameter
-(call 
-  caller: (reference 
-  	(nested_identifier 
-    	property: (member_identifier) @function.method)) 
-)
-(call 
-  caller: (reference 
-  	(reference_identifier) @function.method)
-)
+
+(call
+  caller: (reference
+    (nested_identifier
+      property: (member_identifier) @function.method.call)))
+
+(call
+  caller: (reference
+    (reference_identifier) @function.method.call))
 
 ; Primitives
+(number) @number
+
+(duration) @constant
 
-[
- (number)
- (duration)
-] @constant.builtin
 (string) @string
-(bool) @constant.builtin
+
+(bool) @boolean
+
 (builtin_type) @type.builtin
+
 (json_container_type) @type.builtin
 
 ; Special
-
-(comment) @comment
+(comment) @comment @spell
 
 [
   "("
   ")"
   "{"
   "}"
-]  @punctuation.bracket
+] @punctuation.bracket
 
 [
   "-"
@@ -75,17 +80,25 @@
   "as"
   "bring"
   "class"
-  "else"
-  "for"
-  "if"
-  "in"
-  "new"
   "let"
   "new"
-  "return"
   (inflight_specifier)
 ] @keyword
 
-(identifier) @variable
-(reference_identifier) @variable
-(member_identifier) @property
\ No newline at end of file
+[
+  "for"
+  "in"
+] @keyword.repeat
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+[
+  "pub"
+  "protected"
+  "internal"
+] @keyword.modifier
+
+"return" @keyword.return
diff --git a/libs/tree-sitter-wing/queries/locals.scm b/libs/tree-sitter-wing/queries/locals.scm
index b8350eeee76..9a860c5f2dc 100644
--- a/libs/tree-sitter-wing/queries/locals.scm
+++ b/libs/tree-sitter-wing/queries/locals.scm
@@ -1,6 +1,6 @@
 (block) @local.scope
+
 (variable_definition_statement
-  name: (identifier) @local.definition
-)
+  name: (identifier) @local.definition)
 
 ; TODO: Missing "@local.reference" usage tuned for each relevant identifier location
diff --git a/libs/tree-sitter-wing/setup.py b/libs/tree-sitter-wing/setup.py
new file mode 100644
index 00000000000..0bbee214828
--- /dev/null
+++ b/libs/tree-sitter-wing/setup.py
@@ -0,0 +1,60 @@
+from os.path import isdir, join
+from platform import system
+
+from setuptools import Extension, find_packages, setup
+from setuptools.command.build import build
+from wheel.bdist_wheel import bdist_wheel
+
+
+class Build(build):
+    def run(self):
+        if isdir("queries"):
+            dest = join(self.build_lib, "tree_sitter_wing", "queries")
+            self.copy_tree("queries", dest)
+        super().run()
+
+
+class BdistWheel(bdist_wheel):
+    def get_tag(self):
+        python, abi, platform = super().get_tag()
+        if python.startswith("cp"):
+            python, abi = "cp38", "abi3"
+        return python, abi, platform
+
+
+setup(
+    packages=find_packages("bindings/python"),
+    package_dir={"": "bindings/python"},
+    package_data={
+        "tree_sitter_wing": ["*.pyi", "py.typed"],
+        "tree_sitter_wing.queries": ["*.scm"],
+    },
+    ext_package="tree_sitter_wing",
+    ext_modules=[
+        Extension(
+            name="_binding",
+            sources=[
+                "bindings/python/tree_sitter_wing/binding.c",
+                "src/parser.c",
+                "src/scanner.c",
+            ],
+            extra_compile_args=[
+                "-std=c11",
+            ] if system() != "Windows" else [
+                "/std:c11",
+                "/utf-8",
+            ],
+            define_macros=[
+                ("Py_LIMITED_API", "0x03080000"),
+                ("PY_SSIZE_T_CLEAN", None)
+            ],
+            include_dirs=["src"],
+            py_limited_api=True,
+        )
+    ],
+    cmdclass={
+        "build": Build,
+        "bdist_wheel": BdistWheel
+    },
+    zip_safe=False
+)
diff --git a/libs/tree-sitter-wing/src/grammar.json b/libs/tree-sitter-wing/src/grammar.json
new file mode 100644
index 00000000000..2b9f7a61cd9
--- /dev/null
+++ b/libs/tree-sitter-wing/src/grammar.json
@@ -0,0 +1,4791 @@
+{
+  "name": "wing",
+  "word": "identifier",
+  "rules": {
+    "source": {
+      "type": "REPEAT",
+      "content": {
+        "type": "SYMBOL",
+        "name": "_statement"
+      }
+    },
+    "block": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_statement"
+                  }
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "}"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "AUTOMATIC_BLOCK"
+        }
+      ]
+    },
+    "_semicolon": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": ";"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "AUTOMATIC_SEMICOLON"
+        }
+      ]
+    },
+    "comment": {
+      "type": "TOKEN",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "PATTERN",
+                "value": "\\/\\/[^\\/]"
+              },
+              {
+                "type": "PATTERN",
+                "value": ".*"
+              }
+            ]
+          },
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "/*"
+              },
+              {
+                "type": "PATTERN",
+                "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
+              },
+              {
+                "type": "STRING",
+                "value": "/"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "doc": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "///"
+        },
+        {
+          "type": "FIELD",
+          "name": "content",
+          "content": {
+            "type": "SYMBOL",
+            "name": "doc_content"
+          }
+        }
+      ]
+    },
+    "doc_content": {
+      "type": "PATTERN",
+      "value": ".*"
+    },
+    "reference": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "nested_identifier"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_reference_identifier"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "structured_access_expression"
+        }
+      ]
+    },
+    "identifier": {
+      "type": "PATTERN",
+      "value": "([A-Za-z_$][A-Za-z_$0-9]*|[A-Z][A-Z0-9_]*)"
+    },
+    "parenthesized_identifier": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
+    "_type_identifier": {
+      "type": "ALIAS",
+      "content": {
+        "type": "SYMBOL",
+        "name": "identifier"
+      },
+      "named": true,
+      "value": "type_identifier"
+    },
+    "_member_identifier": {
+      "type": "ALIAS",
+      "content": {
+        "type": "SYMBOL",
+        "name": "identifier"
+      },
+      "named": true,
+      "value": "member_identifier"
+    },
+    "_reference_identifier": {
+      "type": "ALIAS",
+      "content": {
+        "type": "SYMBOL",
+        "name": "identifier"
+      },
+      "named": true,
+      "value": "reference_identifier"
+    },
+    "custom_type": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "object",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_type_identifier"
+            }
+          },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "."
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "fields",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "_type_identifier"
+                      }
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "nested_identifier": {
+      "type": "PREC",
+      "value": 160,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "object",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "json_container_type"
+                }
+              ]
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "accessor_type",
+            "content": {
+              "type": "SYMBOL",
+              "name": "accessor"
+            }
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "property",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_member_identifier"
+                }
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "accessor": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "."
+        },
+        {
+          "type": "STRING",
+          "value": "?."
+        }
+      ]
+    },
+    "inflight_specifier": {
+      "type": "STRING",
+      "value": "inflight"
+    },
+    "_statement": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "test_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "import_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "variable_definition_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "variable_assignment_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "return_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "class_definition"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "interface_definition"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "for_in_loop"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "while_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "break_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "continue_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "if_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "if_let_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "struct_definition"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "enum_definition"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "try_catch_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "compiler_dbg_env"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "super_constructor_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "throw_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "lift_statement"
+        }
+      ]
+    },
+    "import_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "bring"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "module_name",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "string"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "as"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "alias",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "struct_definition": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "access_modifier",
+              "content": {
+                "type": "SYMBOL",
+                "name": "access_modifier"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "struct"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "extends"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SEQ",
+                      "members": [
+                        {
+                          "type": "FIELD",
+                          "name": "extends",
+                          "content": {
+                            "type": "SYMBOL",
+                            "name": "custom_type"
+                          }
+                        },
+                        {
+                          "type": "REPEAT",
+                          "content": {
+                            "type": "SEQ",
+                            "members": [
+                              {
+                                "type": "STRING",
+                                "value": ","
+                              },
+                              {
+                                "type": "FIELD",
+                                "name": "extends",
+                                "content": {
+                                  "type": "SYMBOL",
+                                  "name": "custom_type"
+                                }
+                              }
+                            ]
+                          }
+                        },
+                        {
+                          "type": "CHOICE",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ","
+                            },
+                            {
+                              "type": "BLANK"
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{"
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "FIELD",
+                "name": "field",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "struct_field"
+                }
+              }
+            },
+            {
+              "type": "STRING",
+              "value": "}"
+            }
+          ]
+        }
+      ]
+    },
+    "struct_field": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_type_annotation"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "enum_definition": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "access_modifier",
+              "content": {
+                "type": "SYMBOL",
+                "name": "access_modifier"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "enum"
+        },
+        {
+          "type": "FIELD",
+          "name": "enum_name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "ALIAS",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      },
+                      "named": true,
+                      "value": "enum_field"
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "ALIAS",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "identifier"
+                            },
+                            "named": true,
+                            "value": "enum_field"
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "STRING",
+                          "value": ","
+                        },
+                        {
+                          "type": "BLANK"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "}"
+            }
+          ]
+        }
+      ]
+    },
+    "return_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "return"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "expression",
+              "content": {
+                "type": "SYMBOL",
+                "name": "expression"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "throw_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "throw"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "expression",
+              "content": {
+                "type": "SYMBOL",
+                "name": "expression"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "lift_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "lift"
+        },
+        {
+          "type": "FIELD",
+          "name": "lift_qualifications",
+          "content": {
+            "type": "SYMBOL",
+            "name": "lift_qualifications"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
+    "lift_qualifications": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "FIELD",
+          "name": "qualification",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "lift_qualification"
+              },
+              {
+                "type": "REPEAT",
+                "content": {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "lift_qualification"
+                    }
+                  ]
+                }
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "lift_qualification": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "obj",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ":"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "ops",
+              "content": {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            },
+            {
+              "type": "FIELD",
+              "name": "ops",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "["
+                  },
+                  {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      },
+                      {
+                        "type": "REPEAT",
+                        "content": {
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ","
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "identifier"
+                            }
+                          ]
+                        }
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "BLANK"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "]"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "assignment_operator": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "STRING",
+          "value": "+="
+        },
+        {
+          "type": "STRING",
+          "value": "-="
+        }
+      ]
+    },
+    "variable_assignment_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "reference"
+            },
+            "named": true,
+            "value": "lvalue"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "operator",
+          "content": {
+            "type": "SYMBOL",
+            "name": "assignment_operator"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "expression_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "reassignable": {
+      "type": "STRING",
+      "value": "var"
+    },
+    "static": {
+      "type": "STRING",
+      "value": "static"
+    },
+    "variable_definition_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "let"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "reassignable",
+              "content": {
+                "type": "SYMBOL",
+                "name": "reassignable"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_type_annotation"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "_type_annotation": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": ":"
+        },
+        {
+          "type": "FIELD",
+          "name": "type",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_type"
+          }
+        }
+      ]
+    },
+    "class_modifiers": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "access_modifier"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "inflight_specifier"
+          }
+        ]
+      }
+    },
+    "class_definition": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "modifiers",
+              "content": {
+                "type": "SYMBOL",
+                "name": "class_modifiers"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "class"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "extends"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "parent",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "custom_type"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "impl"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "implements",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "custom_type"
+                      },
+                      {
+                        "type": "REPEAT",
+                        "content": {
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ","
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "custom_type"
+                            }
+                          ]
+                        }
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "BLANK"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "implementation",
+          "content": {
+            "type": "SYMBOL",
+            "name": "class_implementation"
+          }
+        }
+      ]
+    },
+    "class_implementation": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "initializer"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "method_definition"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "class_field"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "field_modifiers": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "access_modifier"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "static"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "inflight_specifier"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "reassignable"
+          }
+        ]
+      }
+    },
+    "class_field": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "modifiers",
+              "content": {
+                "type": "SYMBOL",
+                "name": "field_modifiers"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_type_annotation"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "="
+                },
+                {
+                  "type": "FIELD",
+                  "name": "initializer",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "expression"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "interface_modifiers": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "access_modifier"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "inflight_specifier"
+          }
+        ]
+      }
+    },
+    "interface_definition": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "modifiers",
+              "content": {
+                "type": "SYMBOL",
+                "name": "interface_modifiers"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "interface"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "extends"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "extends",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "custom_type"
+                      },
+                      {
+                        "type": "REPEAT",
+                        "content": {
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ","
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "custom_type"
+                            }
+                          ]
+                        }
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "BLANK"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "implementation",
+          "content": {
+            "type": "SYMBOL",
+            "name": "interface_implementation"
+          }
+        }
+      ]
+    },
+    "interface_implementation": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "method_signature"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "inflight_method_signature"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "class_field"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "inclusive_range": {
+      "type": "STRING",
+      "value": "="
+    },
+    "loop_range": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "start",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ".."
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "inclusive",
+              "content": {
+                "type": "SYMBOL",
+                "name": "inclusive_range"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "end",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        }
+      ]
+    },
+    "for_in_loop": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "for"
+        },
+        {
+          "type": "FIELD",
+          "name": "iterator",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "in"
+        },
+        {
+          "type": "FIELD",
+          "name": "iterable",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "expression"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "loop_range"
+              }
+            ]
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
+    "while_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "while"
+        },
+        {
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
+    "break_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "break"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "_super": {
+      "type": "STRING",
+      "value": "super"
+    },
+    "super_constructor_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_super"
+        },
+        {
+          "type": "FIELD",
+          "name": "args",
+          "content": {
+            "type": "SYMBOL",
+            "name": "argument_list"
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "continue_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "continue"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "if_let_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "if"
+        },
+        {
+          "type": "STRING",
+          "value": "let"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "reassignable",
+              "content": {
+                "type": "SYMBOL",
+                "name": "reassignable"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "elif_let_block",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "elif_let_block"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "elif_block",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "elif_block"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "else"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "else_block",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "block"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "elif_let_block": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "elif"
+        },
+        {
+          "type": "STRING",
+          "value": "let"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "reassignable",
+              "content": {
+                "type": "SYMBOL",
+                "name": "reassignable"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
+    "if_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "if"
+        },
+        {
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "FIELD",
+            "name": "elif_block",
+            "content": {
+              "type": "SYMBOL",
+              "name": "elif_block"
+            }
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "else"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "else_block",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "block"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "elif_block": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "elif"
+        },
+        {
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
+    "try_catch_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "try"
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "catch"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "FIELD",
+                          "name": "exception_identifier",
+                          "content": {
+                            "type": "SYMBOL",
+                            "name": "identifier"
+                          }
+                        },
+                        {
+                          "type": "FIELD",
+                          "name": "parenthesized_exception_identifier",
+                          "content": {
+                            "type": "SYMBOL",
+                            "name": "parenthesized_identifier"
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "FIELD",
+                  "name": "catch_block",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "block"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "finally"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "finally_block",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "block"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "expression": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "unwrap_or"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "binary_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "unary_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "new_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "reference"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "call"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "closure"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "await_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "defer_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_collection_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "parenthesized_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "json_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "struct_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "optional_test"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "compiler_dbg_panic"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "optional_unwrap"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "intrinsic"
+        }
+      ]
+    },
+    "intrinsic": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "name",
+            "content": {
+              "type": "SYMBOL",
+              "name": "intrinsic_identifier"
+            }
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "args",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "argument_list"
+                }
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "intrinsic_identifier": {
+      "type": "PATTERN",
+      "value": "@[A-Za-z_$0-9]*"
+    },
+    "_literal": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "string"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "non_interpolated_string"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "number"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "bool"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "duration"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "nil_value"
+        }
+      ]
+    },
+    "number": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_integer"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_decimal"
+        }
+      ]
+    },
+    "_integer": {
+      "type": "PATTERN",
+      "value": "\\d[\\d_]*"
+    },
+    "_decimal": {
+      "type": "PATTERN",
+      "value": "\\d[\\d_]*\\.\\d[\\d_]*"
+    },
+    "bool": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "true"
+        },
+        {
+          "type": "STRING",
+          "value": "false"
+        }
+      ]
+    },
+    "duration": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "milliseconds"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "seconds"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "minutes"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "hours"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "days"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "months"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "years"
+        }
+      ]
+    },
+    "milliseconds": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "number"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "ms"
+        }
+      ]
+    },
+    "seconds": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "number"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "s"
+        }
+      ]
+    },
+    "minutes": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "number"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "m"
+        }
+      ]
+    },
+    "hours": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "number"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "h"
+        }
+      ]
+    },
+    "days": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "number"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "d"
+        }
+      ]
+    },
+    "months": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "number"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "mo"
+        }
+      ]
+    },
+    "years": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "number"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "y"
+        }
+      ]
+    },
+    "nil_value": {
+      "type": "STRING",
+      "value": "nil"
+    },
+    "non_interpolated_string": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "#\""
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_non_interpolated_string_fragment"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_escape_sequence"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "\""
+        }
+      ]
+    },
+    "string": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\""
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_string_fragment"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_escape_sequence"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "template_substitution"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "\""
+        }
+      ]
+    },
+    "template_substitution": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "_string_fragment": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PREC",
+        "value": 1,
+        "content": {
+          "type": "PATTERN",
+          "value": "[^{\"\\\\]+"
+        }
+      }
+    },
+    "_non_interpolated_string_fragment": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PREC",
+        "value": 1,
+        "content": {
+          "type": "PATTERN",
+          "value": "[^\"\\\\]+"
+        }
+      }
+    },
+    "_escape_sequence": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "\\"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "{"
+              },
+              {
+                "type": "PATTERN",
+                "value": "[^xu0-7]"
+              },
+              {
+                "type": "PATTERN",
+                "value": "[0-7]{1,3}"
+              },
+              {
+                "type": "PATTERN",
+                "value": "x[0-9a-fA-F]{2}"
+              },
+              {
+                "type": "PATTERN",
+                "value": "u[0-9a-fA-F]{4}"
+              },
+              {
+                "type": "PATTERN",
+                "value": "u\\{[0-9a-fA-F]+\\}"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "optional_test": {
+      "type": "PREC_RIGHT",
+      "value": 130,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          },
+          {
+            "type": "STRING",
+            "value": "?"
+          }
+        ]
+      }
+    },
+    "compiler_dbg_panic": {
+      "type": "STRING",
+      "value": "😱"
+    },
+    "compiler_dbg_env": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "🗺️"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ";"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "call": {
+      "type": "PREC_LEFT",
+      "value": 170,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "caller",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "super_call"
+                }
+              ]
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "args",
+            "content": {
+              "type": "SYMBOL",
+              "name": "argument_list"
+            }
+          }
+        ]
+      }
+    },
+    "super_call": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_super"
+        },
+        {
+          "type": "STRING",
+          "value": "."
+        },
+        {
+          "type": "FIELD",
+          "name": "method",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        }
+      ]
+    },
+    "argument_list": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "positional_argument"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "keyword_argument"
+                    }
+                  ]
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "SYMBOL",
+                            "name": "positional_argument"
+                          },
+                          {
+                            "type": "SYMBOL",
+                            "name": "keyword_argument"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
+    "positional_argument": {
+      "type": "SYMBOL",
+      "name": "expression"
+    },
+    "keyword_argument": {
+      "type": "PREC",
+      "value": 3,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "identifier"
+            },
+            "named": true,
+            "value": "keyword_argument_key"
+          },
+          {
+            "type": "STRING",
+            "value": ":"
+          },
+          {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "expression"
+            },
+            "named": true,
+            "value": "keyword_argument_value"
+          }
+        ]
+      }
+    },
+    "new_expression": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "new"
+          },
+          {
+            "type": "FIELD",
+            "name": "class",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "custom_type"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "mutable_container_type"
+                }
+              ]
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "args",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "argument_list"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "as"
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "id",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "expression"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "in"
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "scope",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "expression"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "_type": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "custom_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "builtin_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_builtin_container_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "json_container_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "function_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "optional"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_parenthesized_type"
+        }
+      ]
+    },
+    "_parenthesized_type": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_type"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
+    "optional": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_type"
+        },
+        {
+          "type": "STRING",
+          "value": "?"
+        }
+      ]
+    },
+    "function_type": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "inflight",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "inflight_specifier"
+                }
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
+          {
+            "type": "FIELD",
+            "name": "parameter_types",
+            "content": {
+              "type": "SYMBOL",
+              "name": "parameter_type_list"
+            }
+          },
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": ":"
+              },
+              {
+                "type": "FIELD",
+                "name": "return_type",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_type"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "parameter_type_list": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_type"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_type"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
+    "builtin_type": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "num"
+        },
+        {
+          "type": "STRING",
+          "value": "bool"
+        },
+        {
+          "type": "STRING",
+          "value": "any"
+        },
+        {
+          "type": "STRING",
+          "value": "str"
+        },
+        {
+          "type": "STRING",
+          "value": "void"
+        },
+        {
+          "type": "STRING",
+          "value": "duration"
+        }
+      ]
+    },
+    "initializer": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "inflight",
+              "content": {
+                "type": "SYMBOL",
+                "name": "inflight_specifier"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "ctor_name",
+          "content": {
+            "type": "STRING",
+            "value": "new"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "parameter_list",
+          "content": {
+            "type": "SYMBOL",
+            "name": "parameter_list"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
+    "extern_modifier": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "extern"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "string"
+        }
+      ]
+    },
+    "_return_type": {
+      "type": "SYMBOL",
+      "name": "_type_annotation"
+    },
+    "method_signature": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "parameter_list",
+          "content": {
+            "type": "SYMBOL",
+            "name": "parameter_list"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_return_type"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "method_modifiers": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "extern_modifier"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "access_modifier"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "static"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "inflight_specifier"
+          }
+        ]
+      }
+    },
+    "method_definition": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "modifiers",
+              "content": {
+                "type": "SYMBOL",
+                "name": "method_modifiers"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "parameter_list",
+          "content": {
+            "type": "SYMBOL",
+            "name": "parameter_list"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_return_type"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "block",
+              "content": {
+                "type": "SYMBOL",
+                "name": "block"
+              }
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_semicolon"
+            }
+          ]
+        }
+      ]
+    },
+    "inflight_method_signature": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "phase_modifier",
+          "content": {
+            "type": "SYMBOL",
+            "name": "inflight_specifier"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "parameter_list",
+          "content": {
+            "type": "SYMBOL",
+            "name": "parameter_list"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_return_type"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_semicolon"
+        }
+      ]
+    },
+    "access_modifier": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "pub"
+        },
+        {
+          "type": "STRING",
+          "value": "protected"
+        },
+        {
+          "type": "STRING",
+          "value": "internal"
+        }
+      ]
+    },
+    "variadic": {
+      "type": "STRING",
+      "value": "..."
+    },
+    "parameter_definition": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "reassignable",
+              "content": {
+                "type": "SYMBOL",
+                "name": "reassignable"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "variadic",
+              "content": {
+                "type": "SYMBOL",
+                "name": "variadic"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_type_annotation"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "parameter_list": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "parameter_definition"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "parameter_definition"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
+    "immutable_container_type": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "collection_type",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "Array"
+              },
+              {
+                "type": "STRING",
+                "value": "Set"
+              },
+              {
+                "type": "STRING",
+                "value": "Map"
+              },
+              {
+                "type": "STRING",
+                "value": "Promise"
+              }
+            ]
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_container_value_type"
+        }
+      ]
+    },
+    "mutable_container_type": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "collection_type",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "MutSet"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "MutMap"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "MutArray"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_container_value_type"
+            }
+          ]
+        }
+      ]
+    },
+    "_builtin_container_type": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "immutable_container_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "mutable_container_type"
+        }
+      ]
+    },
+    "_container_value_type": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "<"
+        },
+        {
+          "type": "FIELD",
+          "name": "type_parameter",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_type"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ">"
+        }
+      ]
+    },
+    "unwrap_or": {
+      "type": "PREC_RIGHT",
+      "value": 80,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "left",
+            "content": {
+              "type": "SYMBOL",
+              "name": "expression"
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "op",
+            "content": {
+              "type": "STRING",
+              "value": "??"
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "right",
+            "content": {
+              "type": "SYMBOL",
+              "name": "expression"
+            }
+          }
+        ]
+      }
+    },
+    "optional_unwrap": {
+      "type": "PREC_RIGHT",
+      "value": 180,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          },
+          {
+            "type": "STRING",
+            "value": "!"
+          }
+        ]
+      }
+    },
+    "unary_expression": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "PREC_LEFT",
+          "value": 120,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "--"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "arg",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 120,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "-"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "arg",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 120,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "!"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "arg",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "binary_expression": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "PREC_LEFT",
+          "value": 100,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "+"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 100,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "-"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 110,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "*"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 110,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "/"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 110,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "\\"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 110,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "%"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 140,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "**"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 10,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "||"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 20,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "&&"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 60,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "=="
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 60,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "!="
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 70,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": ">"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 70,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": ">="
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 70,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "<="
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 70,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "left",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "op",
+                "content": {
+                  "type": "STRING",
+                  "value": "<"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "right",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "closure_modifiers": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "inflight_specifier"
+          }
+        ]
+      }
+    },
+    "closure": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "modifiers",
+              "content": {
+                "type": "SYMBOL",
+                "name": "closure_modifiers"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "parameter_list",
+          "content": {
+            "type": "SYMBOL",
+            "name": "parameter_list"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_return_type"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "=>"
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
+    "await_expression": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "await"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        ]
+      }
+    },
+    "defer_expression": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "defer"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        ]
+      }
+    },
+    "parenthesized_expression": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
+    "_collection_literal": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "array_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "map_literal"
+        }
+      ]
+    },
+    "array_literal": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "type",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_builtin_container_type"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "["
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "element",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "expression"
+                      }
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "element",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "expression"
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "STRING",
+                          "value": ","
+                        },
+                        {
+                          "type": "BLANK"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "]"
+            }
+          ]
+        }
+      ]
+    },
+    "map_literal": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "type",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_builtin_container_type"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "member",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "map_literal_member"
+                      }
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "member",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "map_literal_member"
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "STRING",
+                          "value": ","
+                        },
+                        {
+                          "type": "BLANK"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "}"
+            }
+          ]
+        }
+      ]
+    },
+    "struct_literal": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "type",
+          "content": {
+            "type": "SYMBOL",
+            "name": "custom_type"
+          }
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "fields",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "struct_literal_member"
+                      }
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "fields",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "struct_literal_member"
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "STRING",
+                          "value": ","
+                        },
+                        {
+                          "type": "BLANK"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "}"
+            }
+          ]
+        }
+      ]
+    },
+    "map_literal_member": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        },
+        {
+          "type": "STRING",
+          "value": "=>"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        }
+      ]
+    },
+    "struct_literal_member": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "identifier"
+            },
+            {
+              "type": "STRING",
+              "value": ":"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "expression"
+            }
+          ]
+        }
+      ]
+    },
+    "structured_access_expression": {
+      "type": "PREC_RIGHT",
+      "value": 150,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          },
+          {
+            "type": "STRING",
+            "value": "["
+          },
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          },
+          {
+            "type": "STRING",
+            "value": "]"
+          }
+        ]
+      }
+    },
+    "json_literal": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "type",
+              "content": {
+                "type": "SYMBOL",
+                "name": "json_container_type"
+              }
+            },
+            {
+              "type": "FIELD",
+              "name": "element",
+              "content": {
+                "type": "SYMBOL",
+                "name": "expression"
+              }
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "element",
+          "content": {
+            "type": "SYMBOL",
+            "name": "json_map_literal"
+          }
+        }
+      ]
+    },
+    "json_map_literal": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "member",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "json_literal_member"
+                  }
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "FIELD",
+                        "name": "member",
+                        "content": {
+                          "type": "SYMBOL",
+                          "name": "json_literal_member"
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "json_literal_member": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "string"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": ":"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "expression"
+            }
+          ]
+        }
+      ]
+    },
+    "json_container_type": {
+      "type": "SYMBOL",
+      "name": "_json_types"
+    },
+    "_json_types": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "Json"
+        },
+        {
+          "type": "STRING",
+          "value": "MutJson"
+        }
+      ]
+    },
+    "test_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "test"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "string"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "block",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    }
+  },
+  "extras": [
+    {
+      "type": "SYMBOL",
+      "name": "comment"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "doc"
+    },
+    {
+      "type": "PATTERN",
+      "value": "[\\s\\p{Zs}\\uFEFF\\u2060\\u200B]"
+    }
+  ],
+  "conflicts": [
+    [
+      "_reference_identifier",
+      "_type_identifier"
+    ],
+    [
+      "parameter_definition",
+      "_reference_identifier"
+    ],
+    [
+      "field_modifiers",
+      "method_modifiers"
+    ],
+    [
+      "class_modifiers",
+      "closure_modifiers",
+      "interface_modifiers"
+    ],
+    [
+      "inflight_method_signature",
+      "field_modifiers"
+    ]
+  ],
+  "precedences": [
+    [
+      {
+        "type": "SYMBOL",
+        "name": "json_map_literal"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "map_literal"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "array_literal"
+      }
+    ],
+    [
+      {
+        "type": "SYMBOL",
+        "name": "json_literal"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "structured_access_expression"
+      }
+    ],
+    [
+      {
+        "type": "SYMBOL",
+        "name": "intrinsic"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "call"
+      }
+    ]
+  ],
+  "externals": [
+    {
+      "type": "SYMBOL",
+      "name": "AUTOMATIC_SEMICOLON"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "AUTOMATIC_BLOCK"
+    }
+  ],
+  "inline": [],
+  "supertypes": [
+    "expression",
+    "_literal"
+  ]
+}
diff --git a/libs/tree-sitter-wing/src/scanner.c b/libs/tree-sitter-wing/src/scanner.c
index c4446cd20d8..1de7b4bc83a 100644
--- a/libs/tree-sitter-wing/src/scanner.c
+++ b/libs/tree-sitter-wing/src/scanner.c
@@ -29,13 +29,35 @@ static void skip(TSLexer * lexer) {
   lexer -> advance(lexer, true);
 }
 
+/**
+ * Skip through a strings until the end of the string or the end of the file.
+ * Handle any escaped \"
+ * Assumes all initial whitespace has been skipped already
+ */
+static void skip_strings(TSLexer * lexer) {
+    while (lexer -> lookahead == '"') {
+      skip(lexer);
+      while (lexer -> lookahead != 0) {
+        if (lexer -> lookahead == '\\') {
+          skip(lexer);
+          if (lexer -> lookahead == '"') {
+            skip(lexer);
+          }
+        } else if (lexer -> lookahead == '"') {
+          skip(lexer);
+          break;
+        } else {
+          skip(lexer);
+        }
+      }
+    }
+}
+
 /**
  * Skip through any whitespace or comments until
  * we've reached a non-whitespace/comment character
- *
- * @return true if we've reached a non-whitespace/comment character, false otherwise (comment is unterminated)
  */
-static bool scan_whitespace_and_comments(TSLexer * lexer) {
+static void skip_whitespace_and_comments(TSLexer * lexer) {
   for (;;) {
     while (iswspace(lexer -> lookahead)) {
       skip(lexer);
@@ -62,11 +84,9 @@ static bool scan_whitespace_and_comments(TSLexer * lexer) {
             skip(lexer);
           }
         }
-      } else {
-        return false;
       }
     } else {
-      return true;
+      break;
     }
   }
 }
@@ -105,8 +125,9 @@ static bool scan_automatic_semicolon(TSLexer * lexer) {
 
   skip(lexer);
 
-  if (!scan_whitespace_and_comments(lexer))
-    return false;
+  while (iswspace(lexer -> lookahead)) {
+      skip(lexer);
+  }
 
   switch (lexer -> lookahead) {
   case ',':
@@ -124,9 +145,13 @@ static bool scan_automatic_semicolon(TSLexer * lexer) {
   case '^':
   case '|':
   case '&':
-  case '/':
     return false;
 
+    // Insert a semicolon before `//` and `/*`
+  case '/':
+    skip(lexer);
+    return lexer -> lookahead == '/' || lexer -> lookahead == '*';
+
     // Insert a semicolon before `--` and `++`, but not before binary `+` or `-`.
   case '+':
     skip(lexer);
@@ -174,25 +199,22 @@ static bool scan_automatic_block(TSLexer * lexer) {
   lexer -> mark_end(lexer);
 
   for (;;) {
-    if (lexer -> lookahead == 0)
-      return true;
-    if (lexer -> lookahead == '}')
-      return false;
-    if (lexer -> is_at_included_range_start(lexer))
-      return true;
-    if (!iswspace(lexer -> lookahead))
-      return false;
+    skip_whitespace_and_comments(lexer);
+    skip_strings(lexer);
+
+    switch (lexer -> lookahead) {
+      case '{':
+        return false;
+      case '}':
+        return true;
+      case ';':
+        return true;
+      case 0:
+        return true;
+    }
     skip(lexer);
   }
 
-  skip(lexer);
-
-  if (!scan_whitespace_and_comments(lexer))
-    return false;
-
-  if (lexer -> lookahead != '{')
-    return false;
-
   return true;
 }
 
@@ -212,4 +234,4 @@ bool tree_sitter_wing_external_scanner_scan(void * payload, TSLexer * lexer,
   }
 
   return false;
-}
\ No newline at end of file
+}
diff --git a/libs/tree-sitter-wing/test/corpus/comments.txt b/libs/tree-sitter-wing/test/corpus/comments.txt
new file mode 100644
index 00000000000..a76b541b314
--- /dev/null
+++ b/libs/tree-sitter-wing/test/corpus/comments.txt
@@ -0,0 +1,22 @@
+================================================================================
+Docstrings & comments
+================================================================================
+
+// This is a plain comment
+/// This is a doc string
+/// This is another one
+// This too is a plain comment
+
+/// This is a doc after an empty line
+
+--------------------------------------------------------------------------------
+
+(source
+  (comment)
+  (doc
+    content: (doc_content))
+  (doc
+    content: (doc_content))
+  (comment)
+  (doc
+    content: (doc_content)))
diff --git a/libs/tree-sitter-wing/test/corpus/expressions.txt b/libs/tree-sitter-wing/test/corpus/expressions.txt
index 7dc01bf48ab..ea84382fd5d 100644
--- a/libs/tree-sitter-wing/test/corpus/expressions.txt
+++ b/libs/tree-sitter-wing/test/corpus/expressions.txt
@@ -111,6 +111,7 @@ obj.method();
         (nested_identifier
           object: (reference
             (reference_identifier))
+          accessor_type: (accessor)
           property: (member_identifier)))
       args: (argument_list))))
 
@@ -132,6 +133,7 @@ x == obj.method();
           (nested_identifier
             object: (reference
               (reference_identifier))
+            accessor_type: (accessor)
             property: (member_identifier)))
         args: (argument_list)))))
 
@@ -173,9 +175,9 @@ New expression with id and scope on different lines
 ================================================================================
 
 new A()
-  as 
-  "b" 
-  in 
+  as
+  "b"
+  in
   c;
 
 --------------------------------------------------------------------------------
@@ -296,17 +298,18 @@ Template string
 maybeVal ?? 2;
 maybeVal ?? 2 + 2;
 maybeVal ?? 2 == 2;
+maybeVal ?? "hi" ?? 2;
 
 --------------------------------------------------------------------------------
 
 (source
   (expression_statement
-    (binary_expression
+    (unwrap_or
       (reference
         (reference_identifier))
       (number)))
   (expression_statement
-    (binary_expression
+    (unwrap_or
       (reference
         (reference_identifier))
       (binary_expression
@@ -314,29 +317,59 @@ maybeVal ?? 2 == 2;
         (number))))
   (expression_statement
     (binary_expression
-      (binary_expression
+      (unwrap_or
         (reference
           (reference_identifier))
         (number))
-      (number))))
+      (number)))
+  (expression_statement
+    (unwrap_or
+      (reference
+        (reference_identifier))
+      (unwrap_or
+        (string)
+        (number)))))
 
 ================================================================================
->>>>>>> 7e08a6d3f92f31497406dace539d6ccbabc6426e
-Set Literal
+Unwrap expression
 ================================================================================
 
-{1, 2, 3};
-Set<num> { 1, 2, 3 };
+maybeVal!;
+tryGet()!;
+!tryGetBool()!;
+
 --------------------------------------------------------------------------------
 
 (source
   (expression_statement
-    (set_literal
-      element: (number)
-      element: (number)
-      element: (number)))
+    (optional_unwrap
+      (reference
+        (reference_identifier))))
+  (expression_statement
+    (optional_unwrap
+      (call
+        (reference
+          (reference_identifier))
+        (argument_list))))
+  (expression_statement
+    (unary_expression
+      (optional_unwrap
+        (call
+          (reference
+            (reference_identifier))
+          (argument_list))))))
+
+================================================================================
+Set Literal
+================================================================================
+
+Set<num>[ 1, 2, 3 ];
+
+--------------------------------------------------------------------------------
+
+(source
   (expression_statement
-    (set_literal
+    (array_literal
       type: (immutable_container_type
         type_parameter: (builtin_type))
       element: (number)
@@ -360,9 +393,9 @@ Empty Json Map Literal
 Map Literal
 ================================================================================
 
-{ 
-  "a" => 1, 
-  "b" => 2, 
+{
+  "a" => 1,
+  "b" => 2,
   str_func() => 3,
 };
 
@@ -490,7 +523,9 @@ a?;
               (nested_identifier
                 object: (reference
                   (reference_identifier))
+                accessor_type: (accessor)
                 property: (member_identifier)))
+            accessor_type: (accessor)
             property: (member_identifier)))))))
 
 ================================================================================
@@ -561,3 +596,69 @@ let mo = 10mo;
     value: (duration
       (months
         value: (number)))))
+
+================================================================================
+Array access
+================================================================================
+
+log(x[y]);
+x[y] += 3;
+assert(x[y] == w[z]);
+
+--------------------------------------------------------------------------------
+
+(source
+  (expression_statement
+    (call
+      (reference
+        (reference_identifier))
+      (argument_list
+        (positional_argument
+          (reference
+            (structured_access_expression
+              (reference
+                (reference_identifier))
+              (reference
+                (reference_identifier))))))))
+  (variable_assignment_statement
+    (lvalue
+      (structured_access_expression
+        (reference
+          (reference_identifier))
+        (reference
+          (reference_identifier))))
+    (assignment_operator)
+    (number))
+  (expression_statement
+    (call
+      (reference
+        (reference_identifier))
+      (argument_list
+        (positional_argument
+          (binary_expression
+            (reference
+              (structured_access_expression
+                (reference
+                  (reference_identifier))
+                (reference
+                  (reference_identifier))))
+            (reference
+              (structured_access_expression
+                (reference
+                  (reference_identifier))
+                (reference
+                  (reference_identifier))))))))))
+
+================================================================================
+Intrinsic
+================================================================================
+
+@hi();
+
+--------------------------------------------------------------------------------
+
+(source
+  (expression_statement
+    (intrinsic
+      (intrinsic_identifier)
+      (argument_list))))
diff --git a/libs/tree-sitter-wing/test/corpus/references.txt b/libs/tree-sitter-wing/test/corpus/references.txt
index 67427d8183d..3edf7f4a531 100644
--- a/libs/tree-sitter-wing/test/corpus/references.txt
+++ b/libs/tree-sitter-wing/test/corpus/references.txt
@@ -14,7 +14,9 @@ test1.test2.test3;
           (nested_identifier
             object: (reference
               (reference_identifier))
+            accessor_type: (accessor)
             property: (member_identifier)))
+        accessor_type: (accessor)
         property: (member_identifier)))))
 
 ================================================================================
@@ -34,6 +36,8 @@ test1.test2.test3();
             (nested_identifier
               object: (reference
                 (reference_identifier))
+              accessor_type: (accessor)
               property: (member_identifier)))
+          accessor_type: (accessor)
           property: (member_identifier)))
       args: (argument_list))))
diff --git a/libs/tree-sitter-wing/test/corpus/statements/class_and_resource.txt b/libs/tree-sitter-wing/test/corpus/statements/class_and_resource.txt
index 8b3c3955ece..36a7110ffb0 100644
--- a/libs/tree-sitter-wing/test/corpus/statements/class_and_resource.txt
+++ b/libs/tree-sitter-wing/test/corpus/statements/class_and_resource.txt
@@ -202,7 +202,7 @@ class A extends B impl C, D {}
 Interface definition
 ================================================================================
 
-interface A extends B, C {
+pub inflight interface A extends B, C {
     do_something();
     inflight do_something_else(x: str): num;
     some_field: num;
@@ -212,6 +212,9 @@ interface A extends B, C {
 
 (source
   (interface_definition
+    modifiers: (interface_modifiers
+      (access_modifier)
+      (inflight_specifier))
     name: (identifier)
     extends: (custom_type
       object: (type_identifier))
diff --git a/libs/tree-sitter-wing/test/corpus/statements/lift.txt b/libs/tree-sitter-wing/test/corpus/statements/lift.txt
new file mode 100644
index 00000000000..2c2aa1b9d08
--- /dev/null
+++ b/libs/tree-sitter-wing/test/corpus/statements/lift.txt
@@ -0,0 +1,29 @@
+====================
+Explicit Lift
+====================
+
+lift {x: y, z: [a,b,c]} {
+  do();
+}
+
+---
+
+(source
+  (lift_statement
+    lift_qualifications: (lift_qualifications
+      qualification: (lift_qualification
+        obj: (reference
+          (reference_identifier))
+        ops: (identifier))
+      qualification: (lift_qualification
+        obj: (reference
+          (reference_identifier))
+        ops: (identifier)
+        ops: (identifier)
+        ops: (identifier)))
+    block: (block
+      (expression_statement
+        (call
+          caller: (reference
+            (reference_identifier))
+          args: (argument_list))))))
diff --git a/libs/tree-sitter-wing/test/corpus/statements/statements.txt b/libs/tree-sitter-wing/test/corpus/statements/statements.txt
index 73fad2b8da8..d6af5cceade 100644
--- a/libs/tree-sitter-wing/test/corpus/statements/statements.txt
+++ b/libs/tree-sitter-wing/test/corpus/statements/statements.txt
@@ -78,6 +78,8 @@ z -= 1;
 
 let var y = "hello";
 
+let w: (((num))) = 1;
+
 --------------------------------------------------------------------------------
 
 (source
@@ -107,7 +109,11 @@ let var y = "hello";
   (variable_definition_statement
     reassignable: (reassignable)
     name: (identifier)
-    value: (string)))
+    value: (string))
+  (variable_definition_statement
+    name: (identifier)
+    type: (builtin_type)
+    value: (number)))
 
 ================================================================================
 If
@@ -461,6 +467,53 @@ if let x = y {} elif let x = z {} else {}
       block: (block))
     else_block: (block)))
 
+================================================================================
+(If Let) (Elif) (Elif Let) (Else)
+================================================================================
+
+if let x = y {} elif let x = z {} else {}
+
+--------------------------------------------------------------------------------
+
+(source
+  (if_let_statement
+    name: (identifier)
+    value: (reference
+      (reference_identifier))
+    block: (block)
+    elif_let_block: (elif_let_block
+      name: (identifier)
+      value: (reference
+        (reference_identifier))
+      block: (block))
+    else_block: (block)))
+
+================================================================================
+(If Let) (Elif Let) (Elif) (Else)
+================================================================================
+
+if let x = y {} elif let x = z {} elif v? {} else {}
+
+--------------------------------------------------------------------------------
+
+(source
+  (if_let_statement
+    name: (identifier)
+    value: (reference
+      (reference_identifier))
+    block: (block)
+    elif_let_block: (elif_let_block
+      name: (identifier)
+      value: (reference
+        (reference_identifier))
+      block: (block))
+    elif_block: (elif_block
+      condition: (optional_test
+        (reference
+          (reference_identifier)))
+      block: (block))
+    else_block: (block)))
+
 ================================================================================
 If Let Var
 ================================================================================
diff --git a/libs/tree-sitter-wing/test/highlight/class.w b/libs/tree-sitter-wing/test/highlight/class.w
new file mode 100644
index 00000000000..602b2f749a2
--- /dev/null
+++ b/libs/tree-sitter-wing/test/highlight/class.w
@@ -0,0 +1,19 @@
+bring cloud;
+// <- @keyword
+
+class Foo {
+// <- @keyword
+//    ^   @type
+//        ^ @punctuation.bracket
+  name: str;
+//^    @variable.member
+//      ^   @type.builtin
+//         ^ @punctuation.delimiter
+  new(name:  str) {
+//^    @keyword
+//    ^    @variable
+    this.name = name;
+//      ^ @punctuation.delimiter
+//            ^ @operator
+  }
+}
diff --git a/libs/tree-sitter-wing/test/highlight/nested_method.w b/libs/tree-sitter-wing/test/highlight/nested_method.w
index 8cb5a4be2e1..cb46f7d7f9f 100644
--- a/libs/tree-sitter-wing/test/highlight/nested_method.w
+++ b/libs/tree-sitter-wing/test/highlight/nested_method.w
@@ -1,4 +1,4 @@
 test1.test2.test3();
 // <- variable
-//    ^ property
-//          ^ function.method
+//    ^ variable.member
+//          ^ function.method.call
diff --git a/libs/tree-sitter-wing/tree-sitter-dsl.d.ts b/libs/tree-sitter-wing/tree-sitter-dsl.d.ts
index 049a56ec927..63f9ed493d9 100644
--- a/libs/tree-sitter-wing/tree-sitter-dsl.d.ts
+++ b/libs/tree-sitter-wing/tree-sitter-dsl.d.ts
@@ -1,21 +1,19 @@
-// Taken from https://www.npmjs.com/package/tree-sitter-cli
-
-type AliasRule = {type: 'ALIAS'; named: boolean; content: Rule; value: string};
-type BlankRule = {type: 'BLANK'};
-type ChoiceRule = {type: 'CHOICE'; members: Rule[]};
-type FieldRule = {type: 'FIELD'; name: string; content: Rule};
-type ImmediateTokenRule = {type: 'IMMEDIATE_TOKEN'; content: Rule};
-type PatternRule = {type: 'PATTERN'; value: string};
-type PrecDynamicRule = {type: 'PREC_DYNAMIC'; content: Rule; value: number};
-type PrecLeftRule = {type: 'PREC_LEFT'; content: Rule; value: number};
-type PrecRightRule = {type: 'PREC_RIGHT'; content: Rule; value: number};
-type PrecRule = {type: 'PREC'; content: Rule; value: number};
-type Repeat1Rule = {type: 'REPEAT1'; content: Rule};
-type RepeatRule = {type: 'REPEAT'; content: Rule};
-type SeqRule = {type: 'SEQ'; members: Rule[]};
-type StringRule = {type: 'STRING'; value: string};
-type SymbolRule<Name extends string> = {type: 'SYMBOL'; name: Name};
-type TokenRule = {type: 'TOKEN'; content: Rule};
+type AliasRule = { type: 'ALIAS'; named: boolean; content: Rule; value: string };
+type BlankRule = { type: 'BLANK' };
+type ChoiceRule = { type: 'CHOICE'; members: Rule[] };
+type FieldRule = { type: 'FIELD'; name: string; content: Rule };
+type ImmediateTokenRule = { type: 'IMMEDIATE_TOKEN'; content: Rule };
+type PatternRule = { type: 'PATTERN'; value: string };
+type PrecDynamicRule = { type: 'PREC_DYNAMIC'; content: Rule; value: number };
+type PrecLeftRule = { type: 'PREC_LEFT'; content: Rule; value: number };
+type PrecRightRule = { type: 'PREC_RIGHT'; content: Rule; value: number };
+type PrecRule = { type: 'PREC'; content: Rule; value: number };
+type Repeat1Rule = { type: 'REPEAT1'; content: Rule };
+type RepeatRule = { type: 'REPEAT'; content: Rule };
+type SeqRule = { type: 'SEQ'; members: Rule[] };
+type StringRule = { type: 'STRING'; value: string };
+type SymbolRule<Name extends string> = { type: 'SYMBOL'; name: Name };
+type TokenRule = { type: 'TOKEN'; content: Rule };
 
 type Rule =
   | AliasRule
@@ -44,14 +42,15 @@ type GrammarSymbols<RuleName extends string> = {
 
 type RuleBuilder<RuleName extends string> = (
   $: GrammarSymbols<RuleName>,
+  previous: Rule,
 ) => RuleOrLiteral;
 
 type RuleBuilders<
   RuleName extends string,
   BaseGrammarRuleName extends string
 > = {
-  [name in RuleName]: RuleBuilder<RuleName | BaseGrammarRuleName>;
-};
+    [name in RuleName]: RuleBuilder<RuleName | BaseGrammarRuleName>;
+  };
 
 interface Grammar<
   RuleName extends string,
@@ -70,11 +69,17 @@ interface Grammar<
   rules: Rules;
 
   /**
-   * An array of arrays of precedence names. Each inner array represents
-   * a *descending* ordering. Names listed earlier in one of these arrays
-   * have higher precedence than any names listed later in the same array.
+   * An array of arrays of precedence names or rules. Each inner array represents
+   * a *descending* ordering. Names/rules listed earlier in one of these arrays
+   * have higher precedence than any names/rules listed later in the same array.
+   *
+   * Using rules is just a shorthand way for using a name then calling prec()
+   * with that name. It is just a convenience.
    */
-  precedences?: () => String[][],
+  precedences?: (
+    $: GrammarSymbols<RuleName | BaseGrammarRuleName>,
+    previous: Rule[][],
+  ) => RuleOrLiteral[][],
 
   /**
    * An array of arrays of rule names. Each inner array represents a set of
@@ -88,6 +93,7 @@ interface Grammar<
    */
   conflicts?: (
     $: GrammarSymbols<RuleName | BaseGrammarRuleName>,
+    previous: Rule[][],
   ) => RuleOrLiteral[][];
 
   /**
@@ -104,7 +110,7 @@ interface Grammar<
   externals?: (
     $: Record<string, SymbolRule<string>>,
     previous: Rule[],
-  ) => SymbolRule<string>[];
+  ) => RuleOrLiteral[];
 
   /**
    * An array of tokens that may appear anywhere in the language. This
@@ -128,6 +134,7 @@ interface Grammar<
    */
   inline?: (
     $: GrammarSymbols<RuleName | BaseGrammarRuleName>,
+    previous: Rule[],
   ) => RuleOrLiteral[];
 
   /**
@@ -140,6 +147,7 @@ interface Grammar<
    */
   supertypes?: (
     $: GrammarSymbols<RuleName | BaseGrammarRuleName>,
+    previous: Rule[],
   ) => RuleOrLiteral[];
 
   /**
@@ -155,8 +163,8 @@ interface Grammar<
 
 type GrammarSchema<RuleName extends string> = {
   [K in keyof Grammar<RuleName>]: K extends 'rules'
-    ? Record<RuleName, Rule>
-    : Grammar<RuleName>[K];
+  ? Record<RuleName, Rule>
+  : Grammar<RuleName>[K];
 };
 
 /**
@@ -368,4 +376,4 @@ declare function grammar<
 >(
   baseGrammar: GrammarSchema<BaseGrammarRuleName>,
   options: Grammar<RuleName, BaseGrammarRuleName>,
-): GrammarSchema<RuleName | BaseGrammarRuleName>;
\ No newline at end of file
+): GrammarSchema<RuleName | BaseGrammarRuleName>;
diff --git a/libs/tree-sitter-wing/turbo.json b/libs/tree-sitter-wing/turbo.json
index a25f0ff3470..68d8b846c2c 100644
--- a/libs/tree-sitter-wing/turbo.json
+++ b/libs/tree-sitter-wing/turbo.json
@@ -4,7 +4,7 @@
   "pipeline": {
     "build:generate": {
       "inputs": ["!*.wasm", "*", "grammar.js", "src/scanner.c"],
-      "outputs": ["src/**", "!src/scanner.c", "bindings/**", "binding.gyp"]
+      "outputs": ["src/**", "!src/scanner.c"]
     },
     "build:wasm": {
       "dependsOn": ["build:generate"],
diff --git a/libs/wingc/Cargo.toml b/libs/wingc/Cargo.toml
index eeef593e62f..2dd9045afeb 100644
--- a/libs/wingc/Cargo.toml
+++ b/libs/wingc/Cargo.toml
@@ -4,8 +4,7 @@ version = "0.0.0"
 edition = "2021"
 
 [dependencies]
-tree-sitter = "0.20.10"
-tree-sitter-traversal = "0.1"
+tree-sitter = "0.22.5"
 derivative = "2.2"
 tree-sitter-wing = { path = "../tree-sitter-wing" }
 wingii = { path = "../wingii" }
@@ -14,15 +13,15 @@ serde_json = "1.0"
 colored = "2.0"
 lazy_static = "1.4"
 globset = "0.4"
-itertools = "0.11"
+itertools = "0.12"
 phf = { version = "0.11", features = ["macros"] }
 indexmap = { version = "2.0", features = ["serde"] }
 aho-corasick = "1.1"
-lsp-types = "0.94"
+lsp-types = "0.95"
 indoc = "2.0"
 const_format = "0.2"
 duplicate = "1.0"
-strum = { version = "0.25", features = ["derive"] }
+strum = { version = "0.26", features = ["derive"] }
 petgraph = "0.6"
 camino = "1.1"
 parcel_sourcemap = "2.1.1"
diff --git a/libs/wingc/package.json b/libs/wingc/package.json
index cad6ae5e78a..0581867cea5 100644
--- a/libs/wingc/package.json
+++ b/libs/wingc/package.json
@@ -2,7 +2,7 @@
   "name": "@winglang/wingc",
   "private": true,
   "scripts": {
-    "compile": "cargo build --target wasm32-wasi --release && ../../.cargo/binaryen-version_116/bin/wasm-opt --enable-bulk-memory --strip-debug --strip-producers -O3 -o wingc.wasm ../../target/wasm32-wasi/release/wingc.wasm",
+    "compile": "cargo build --target wasm32-wasi --release && ./scripts/postcompile.sh",
     "dev": "cargo run --example compile --release",
     "test": "cargo test",
     "lint": "cargo fmt && cargo clippy --fix --no-deps --allow-dirty --target wasm32-wasi --release"
diff --git a/libs/wingc/scripts/postcompile.sh b/libs/wingc/scripts/postcompile.sh
new file mode 100755
index 00000000000..5702df3f046
--- /dev/null
+++ b/libs/wingc/scripts/postcompile.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+###
+# This script should be run after release build of wingc to the wasm32-wasi target.
+# The end result will be a final wasm file in the wingc directory.
+# If running in CI (env "CI" is set), it will run wasm-opt on the generated wasm file.
+# Otherwise, the wasm file will be copied to the wingc directory from its original output location.
+###
+
+wingc=$(cd $(dirname $0)/.. && pwd)
+
+# Currently we only do release wasm builds
+target="release"
+
+wasm_opt="$wingc/../../.cargo/binaryen-version_117/bin/wasm-opt"
+input_wasm="$wingc/../../target/wasm32-wasi/$target/wingc.wasm"
+output_wasm="$wingc/wingc.wasm"
+
+# If CI env is set, run wasm-opt with extra optimizations
+echo "Optimising wasm..."
+if [ -n "$CI" ]; then
+  $wasm_opt --enable-bulk-memory --strip-debug --strip-producers -O3 -o $output_wasm $input_wasm
+else
+  $wasm_opt --enable-bulk-memory --strip-debug --strip-producers -o $output_wasm $input_wasm
+fi
+echo "Done!"
diff --git a/libs/wingc/src/ast.rs b/libs/wingc/src/ast.rs
index 5015a00a443..dacd44ce302 100644
--- a/libs/wingc/src/ast.rs
+++ b/libs/wingc/src/ast.rs
@@ -3,7 +3,7 @@ use std::hash::{Hash, Hasher};
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use camino::Utf8PathBuf;
-use indexmap::{Equivalent, IndexMap, IndexSet};
+use indexmap::{Equivalent, IndexMap};
 use itertools::Itertools;
 
 use crate::diagnostic::WingSpan;
@@ -12,6 +12,7 @@ use crate::type_check::CLOSURE_CLASS_HANDLE_METHOD;
 
 static EXPR_COUNTER: AtomicUsize = AtomicUsize::new(0);
 static SCOPE_COUNTER: AtomicUsize = AtomicUsize::new(0);
+static ARGLIST_COUNTER: AtomicUsize = AtomicUsize::new(0);
 
 #[derive(Debug, Eq, Clone)]
 pub struct Symbol {
@@ -279,7 +280,7 @@ pub enum FunctionBody {
 	/// The function body implemented within a Wing scope.
 	Statements(Scope),
 	/// The `extern` modifier value, pointing to an external implementation file
-	External(String),
+	External(Utf8PathBuf),
 }
 
 #[derive(Debug)]
@@ -294,6 +295,8 @@ pub struct FunctionDefinition {
 	pub is_static: bool,
 	/// Function's access modifier. In case of a closure, this is always public.
 	pub access: AccessModifier,
+	/// Function's documentation
+	pub doc: Option<String>,
 	pub span: WingSpan,
 }
 
@@ -302,34 +305,7 @@ pub struct Stmt {
 	pub kind: StmtKind,
 	pub span: WingSpan,
 	pub idx: usize,
-}
-
-#[derive(Debug)]
-pub enum UtilityFunctions {
-	Log,
-	Assert,
-	UnsafeCast,
-}
-
-impl UtilityFunctions {
-	/// Returns all utility functions.
-	pub fn all() -> Vec<UtilityFunctions> {
-		vec![
-			UtilityFunctions::Log,
-			UtilityFunctions::Assert,
-			UtilityFunctions::UnsafeCast,
-		]
-	}
-}
-
-impl Display for UtilityFunctions {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		match self {
-			UtilityFunctions::Log => write!(f, "log"),
-			UtilityFunctions::Assert => write!(f, "assert"),
-			UtilityFunctions::UnsafeCast => write!(f, "unsafeCast"),
-		}
-	}
+	pub doc: Option<String>,
 }
 
 #[derive(Debug)]
@@ -358,6 +334,7 @@ pub struct Class {
 	pub implements: Vec<UserDefinedType>,
 	pub phase: Phase,
 	pub access: AccessModifier,
+	pub auto_id: bool,
 }
 
 impl Class {
@@ -417,9 +394,27 @@ impl Class {
 #[derive(Debug)]
 pub struct Interface {
 	pub name: Symbol,
-	pub methods: Vec<(Symbol, FunctionSignature)>,
+	// Each method has a symbol, a signature, and an optional documentation string
+	pub methods: Vec<(Symbol, FunctionSignature, Option<String>)>,
 	pub extends: Vec<UserDefinedType>,
 	pub access: AccessModifier,
+	pub phase: Phase,
+}
+
+#[derive(Debug)]
+pub struct Struct {
+	pub name: Symbol,
+	pub extends: Vec<UserDefinedType>,
+	pub fields: Vec<StructField>,
+	pub access: AccessModifier,
+}
+
+#[derive(Debug)]
+pub struct Enum {
+	pub name: Symbol,
+	// Each value has a symbol and an optional documenation string
+	pub values: IndexMap<Symbol, Option<String>>,
+	pub access: AccessModifier,
 }
 
 #[derive(Debug)]
@@ -431,9 +426,9 @@ pub enum BringSource {
 	WingLibrary(Symbol, Utf8PathBuf),
 	JsiiModule(Symbol),
 	/// Refers to a relative path to a file
-	WingFile(Symbol),
+	WingFile(Utf8PathBuf),
 	/// Refers to a relative path to a directory
-	Directory(Symbol),
+	Directory(Utf8PathBuf),
 }
 
 #[derive(Debug)]
@@ -449,10 +444,16 @@ pub struct IfLet {
 	pub var_name: Symbol,
 	pub value: Expr,
 	pub statements: Scope,
-	pub elif_statements: Vec<ElifLetBlock>,
+	pub elif_statements: Vec<Elifs>,
 	pub else_statements: Option<Scope>,
 }
 
+#[derive(Debug)]
+pub enum Elifs {
+	ElifBlock(ElifBlock),
+	ElifLetBlock(ElifLetBlock),
+}
+
 #[derive(Debug)]
 pub enum StmtKind {
 	Bring {
@@ -497,23 +498,36 @@ pub enum StmtKind {
 	Scope(Scope),
 	Class(Class),
 	Interface(Interface),
-	Struct {
-		name: Symbol,
-		extends: Vec<UserDefinedType>,
-		fields: Vec<StructField>,
-		access: AccessModifier,
-	},
-	Enum {
-		name: Symbol,
-		values: IndexSet<Symbol>,
-		access: AccessModifier,
-	},
+	Struct(Struct),
+	Enum(Enum),
 	TryCatch {
 		try_statements: Scope,
 		catch_block: Option<CatchBlock>,
 		finally_statements: Option<Scope>,
 	},
 	CompilerDebugEnv,
+	ExplicitLift(ExplicitLift),
+}
+
+impl StmtKind {
+	pub fn is_type_def(&self) -> bool {
+		matches!(
+			self,
+			StmtKind::Class(_) | StmtKind::Interface(_) | StmtKind::Struct(_) | StmtKind::Enum(_)
+		)
+	}
+}
+
+#[derive(Debug)]
+pub struct ExplicitLift {
+	pub qualifications: Vec<LiftQualification>,
+	pub statements: Scope,
+}
+
+#[derive(Debug)]
+pub struct LiftQualification {
+	pub obj: Expr,
+	pub ops: Vec<Symbol>,
 }
 
 #[derive(Debug)]
@@ -530,6 +544,7 @@ pub struct ClassField {
 	pub phase: Phase,
 	pub is_static: bool,
 	pub access: AccessModifier,
+	pub doc: Option<String>,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -553,6 +568,62 @@ impl Display for AccessModifier {
 pub struct StructField {
 	pub name: Symbol,
 	pub member_type: TypeAnnotation,
+	pub doc: Option<String>,
+}
+
+#[derive(Debug)]
+pub struct Intrinsic {
+	pub name: Symbol,
+	pub arg_list: Option<ArgList>,
+	pub kind: IntrinsicKind,
+}
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub enum IntrinsicKind {
+	/// Error state
+	Unknown,
+	Dirname,
+	Inflight,
+}
+
+impl Display for IntrinsicKind {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			IntrinsicKind::Unknown => write!(f, "@"),
+			IntrinsicKind::Dirname => write!(f, "@dirname"),
+			IntrinsicKind::Inflight => write!(f, "@inflight"),
+		}
+	}
+}
+
+impl IntrinsicKind {
+	pub fn from_str(s: &str) -> Self {
+		match s {
+			"@dirname" => IntrinsicKind::Dirname,
+			"@inflight" => IntrinsicKind::Inflight,
+			_ => IntrinsicKind::Unknown,
+		}
+	}
+
+	pub fn is_valid_phase(&self, phase: &Phase) -> bool {
+		match self {
+			IntrinsicKind::Unknown => true,
+			IntrinsicKind::Dirname => match phase {
+				Phase::Preflight => true,
+				_ => false,
+			},
+			IntrinsicKind::Inflight => match phase {
+				Phase::Preflight => true,
+				_ => false,
+			},
+		}
+	}
+}
+
+impl Into<Symbol> for IntrinsicKind {
+	fn into(self) -> Symbol {
+		Symbol::global(self.to_string())
+	}
 }
 
 #[derive(Debug)]
@@ -565,6 +636,7 @@ pub enum ExprKind {
 		end: Box<Expr>,
 	},
 	Reference(Reference),
+	Intrinsic(Intrinsic),
 	Call {
 		callee: CalleeKind,
 		arg_list: ArgList,
@@ -645,8 +717,24 @@ impl Expr {
 		let id = EXPR_COUNTER.fetch_add(1, Ordering::SeqCst);
 		Self { id, kind, span }
 	}
+
+	pub fn as_static_string(&self) -> Option<&str> {
+		match &self.kind {
+			ExprKind::Literal(Literal::String(s)) => {
+				// strip the quotes ("data")
+				Some(&s[1..s.len() - 1])
+			}
+			ExprKind::Literal(Literal::NonInterpolatedString(s)) => {
+				// strip the quotes (#"data")
+				Some(&s[2..s.len() - 1])
+			}
+			_ => None,
+		}
+	}
 }
 
+pub type ArgListId = usize;
+
 #[derive(Debug)]
 pub struct New {
 	pub class: UserDefinedType,
@@ -659,21 +747,28 @@ pub struct New {
 pub struct ArgList {
 	pub pos_args: Vec<Expr>,
 	pub named_args: IndexMap<Symbol, Expr>,
+	pub id: ArgListId,
 	pub span: WingSpan,
 }
 
 impl ArgList {
-	pub fn new(span: WingSpan) -> Self {
+	pub fn new(pos_args: Vec<Expr>, named_args: IndexMap<Symbol, Expr>, span: WingSpan) -> Self {
 		ArgList {
-			pos_args: vec![],
-			named_args: IndexMap::new(),
+			pos_args,
+			named_args,
 			span,
+			id: ARGLIST_COUNTER.fetch_add(1, Ordering::Relaxed),
 		}
 	}
+
+	pub fn new_empty(span: WingSpan) -> Self {
+		Self::new(vec![], IndexMap::new(), span)
+	}
 }
 
 #[derive(Debug)]
 pub enum Literal {
+	NonInterpolatedString(String),
 	String(String),
 	InterpolatedString(InterpolatedString),
 	Number(f64),
@@ -723,6 +818,7 @@ pub enum UnaryOperator {
 	Minus,
 	Not,
 	OptionalTest,
+	OptionalUnwrap,
 }
 
 #[derive(Debug)]
@@ -755,6 +851,10 @@ pub enum Reference {
 		property: Symbol,
 		optional_accessor: bool,
 	},
+	/// A reference to an accessed member of an object `expression[x]`
+	///
+	/// TODO: should this be a separate type of Expr? (this would require changing how `Assignment` statements are modeled)
+	ElementAccess { object: Box<Expr>, index: Box<Expr> },
 	/// A reference to a member inside a type: `MyType.x` or `MyEnum.A`
 	TypeMember {
 		type_name: UserDefinedType,
@@ -771,6 +871,7 @@ impl Clone for Reference {
 				type_name: type_name.clone(),
 				property: property.clone(),
 			},
+			Reference::ElementAccess { .. } => panic!("Unable to clone reference to element access"),
 		}
 	}
 }
@@ -785,6 +886,14 @@ impl Spanned for Reference {
 				optional_accessor: _,
 			} => object.span().merge(&property.span()),
 			Reference::TypeMember { type_name, property } => type_name.span().merge(&property.span()),
+			Reference::ElementAccess { object, index } => {
+				let mut span = object.span().merge(&index.span());
+				// Add one to include the closing bracket.
+				// TODO: store a dedicated span field?
+				span.end.col += 1;
+				span.end_offset += 1;
+				span
+			}
 		}
 	}
 }
@@ -807,6 +916,9 @@ impl Display for Reference {
 			Reference::TypeMember { type_name, property } => {
 				write!(f, "{}.{}", type_name, property.name)
 			}
+			Reference::ElementAccess { .. } => {
+				write!(f, "element access") // TODO!
+			}
 		}
 	}
 }
@@ -852,6 +964,18 @@ impl Spanned for UserDefinedType {
 	}
 }
 
+impl Spanned for Scope {
+	fn span(&self) -> WingSpan {
+		self.span.clone()
+	}
+}
+
+impl Spanned for FunctionDefinition {
+	fn span(&self) -> WingSpan {
+		self.span.clone()
+	}
+}
+
 impl<T> Spanned for Box<T>
 where
 	T: Spanned,
diff --git a/libs/wingc/src/closure_transform.rs b/libs/wingc/src/closure_transform.rs
index f27635ce64a..6d85628ecac 100644
--- a/libs/wingc/src/closure_transform.rs
+++ b/libs/wingc/src/closure_transform.rs
@@ -156,16 +156,12 @@ impl Fold for ClosureTransformer {
 				let class_fields: Vec<ClassField> = vec![];
 				let class_init_params: Vec<FunctionParameter> = vec![];
 
+				let parent_this = format!("{}_{}", PARENT_THIS_NAME, self.closure_counter);
+				let mut this_transform = RenameThisTransformer::new(&parent_this.as_str());
 				let new_func_def = if self.inside_scope_with_this {
 					// If we are inside a class, we transform inflight closures with an extra
 					// `let __parent_this_${CLOSURE_COUNT} = this;` statement before the class definition, and replace references
 					// to `this` with `__parent_this_${CLOSURE_COUNT}` so that they can access the parent class's fields.
-					let parent_this = format!("{}_{}", PARENT_THIS_NAME, self.closure_counter);
-					let mut this_transform = RenameThisTransformer {
-						from: "this",
-						to: parent_this.as_str(),
-						inside_class: false,
-					};
 					this_transform.fold_function_definition(func_def)
 				} else {
 					func_def
@@ -181,33 +177,30 @@ impl Fold for ClosureTransformer {
 					// we need to set this to false.
 					is_static: false,
 					access: AccessModifier::Public,
+					doc: None,
 				};
 
 				// class_init_body :=
 				// ```
-				// std.Node.of(this).hidden = true;
+				// nodeof(this).hidden = true;
 				// ```
 				let std_display_of_this = Expr::new(
 					ExprKind::Call {
 						callee: CalleeKind::Expr(Box::new(Expr::new(
-							ExprKind::Reference(Reference::TypeMember {
-								type_name: UserDefinedType {
-									root: Symbol::new("std", WingSpan::for_file(file_id)),
-									fields: vec![Symbol::new("Node", WingSpan::for_file(file_id))],
-									span: WingSpan::for_file(file_id),
-								},
-								property: Symbol::new("of", WingSpan::for_file(file_id)),
-							}),
+							ExprKind::Reference(Reference::Identifier(Symbol::new(
+								"nodeof",
+								WingSpan::for_file(file_id),
+							))),
 							WingSpan::for_file(file_id),
 						))),
-						arg_list: ArgList {
-							named_args: IndexMap::new(),
-							pos_args: vec![Expr::new(
+						arg_list: ArgList::new(
+							vec![Expr::new(
 								ExprKind::Reference(Reference::Identifier(Symbol::new("this", WingSpan::for_file(file_id)))),
 								WingSpan::for_file(file_id),
 							)],
-							span: WingSpan::for_file(file_id),
-						},
+							IndexMap::new(),
+							WingSpan::for_file(file_id),
+						),
 					},
 					WingSpan::for_file(file_id),
 				);
@@ -224,15 +217,13 @@ impl Fold for ClosureTransformer {
 						value: Expr::new(ExprKind::Literal(Literal::Boolean(true)), WingSpan::for_file(file_id)),
 					},
 					span: WingSpan::for_file(file_id),
+					doc: None,
 				}];
 
 				// If we are inside a scope with "this", add define `let __parent_this_${CLOSURE_COUNT} = this` which can be
 				// used by the newly-created preflight classes
-				if self.inside_scope_with_this {
-					let parent_this_name = Symbol::new(
-						format!("{}_{}", PARENT_THIS_NAME, self.closure_counter),
-						WingSpan::for_file(file_id),
-					);
+				if self.inside_scope_with_this && this_transform.performed_renames {
+					let parent_this_name = Symbol::new(parent_this, WingSpan::for_file(file_id));
 					let this_name = Symbol::new("this", WingSpan::for_file(file_id));
 					let parent_this_def = Stmt {
 						kind: StmtKind::Let {
@@ -246,6 +237,7 @@ impl Fold for ClosureTransformer {
 						},
 						span: WingSpan::for_file(file_id),
 						idx: 0,
+						doc: None,
 					};
 					self.class_statements.push(parent_this_def);
 				}
@@ -275,6 +267,7 @@ impl Fold for ClosureTransformer {
 							body: FunctionBody::Statements(Scope::new(class_init_body, WingSpan::for_file(file_id))),
 							span: WingSpan::for_file(file_id),
 							access: AccessModifier::Public,
+							doc: None,
 						},
 						fields: class_fields,
 						implements: vec![],
@@ -294,11 +287,14 @@ impl Fold for ClosureTransformer {
 							body: FunctionBody::Statements(Scope::new(vec![], WingSpan::for_file(file_id))),
 							span: WingSpan::for_file(file_id),
 							access: AccessModifier::Public,
+							doc: None,
 						},
 						access: AccessModifier::Private,
+						auto_id: true,
 					}),
 					idx: self.nearest_stmt_idx,
 					span: WingSpan::for_file(file_id),
+					doc: None,
 				};
 
 				// new_class_instance :=
@@ -308,11 +304,7 @@ impl Fold for ClosureTransformer {
 				let new_class_instance = Expr::new(
 					ExprKind::New(New {
 						class: class_udt,
-						arg_list: ArgList {
-							named_args: IndexMap::new(),
-							pos_args: vec![],
-							span: WingSpan::for_file(file_id),
-						},
+						arg_list: ArgList::new_empty(WingSpan::for_file(file_id)),
 						obj_id: None,
 						obj_scope: None,
 					}),
@@ -332,34 +324,31 @@ impl Fold for ClosureTransformer {
 struct RenameThisTransformer<'a> {
 	from: &'a str,
 	to: &'a str,
-	// The transform shouldn't change references to `this` inside inflight classes since
-	// they refer to different objects.
-	inside_class: bool,
+	performed_renames: bool,
 }
 
-impl Default for RenameThisTransformer<'_> {
-	fn default() -> Self {
+impl<'a> RenameThisTransformer<'a> {
+	fn new(to: &'a str) -> Self {
 		Self {
 			from: "this",
-			to: PARENT_THIS_NAME,
-			inside_class: false,
+			to,
+			performed_renames: false,
 		}
 	}
 }
 
 impl<'a> Fold for RenameThisTransformer<'a> {
 	fn fold_class(&mut self, node: Class) -> Class {
-		let old_inside_class = self.inside_class;
-		self.inside_class = true;
-		let new_class = fold::fold_class(self, node);
-		self.inside_class = old_inside_class;
-		new_class
+		// The transform shouldn't change references to `this` inside inflight classes since
+		// they refer to different objects. Skip inner class.
+		node
 	}
 
 	fn fold_reference(&mut self, node: Reference) -> Reference {
 		match node {
 			Reference::Identifier(ident) => {
-				if !self.inside_class && ident.name == self.from {
+				if ident.name == self.from {
+					self.performed_renames = true;
 					Reference::Identifier(Symbol {
 						name: self.to.to_string(),
 						span: ident.span,
@@ -368,7 +357,9 @@ impl<'a> Fold for RenameThisTransformer<'a> {
 					Reference::Identifier(ident)
 				}
 			}
-			Reference::InstanceMember { .. } | Reference::TypeMember { .. } => fold::fold_reference(self, node),
+			Reference::InstanceMember { .. } | Reference::TypeMember { .. } | Reference::ElementAccess { .. } => {
+				fold::fold_reference(self, node)
+			}
 		}
 	}
 }
diff --git a/libs/wingc/src/diagnostic.rs b/libs/wingc/src/diagnostic.rs
index ce16daf2713..cbd4a19c076 100644
--- a/libs/wingc/src/diagnostic.rs
+++ b/libs/wingc/src/diagnostic.rs
@@ -92,6 +92,10 @@ pub struct WingSpan {
 	pub end: WingLocation,
 	/// Relative path to the file based on the entrypoint file
 	pub file_id: String,
+	/// Byte-level offsets into the file.
+	/// Not used for comparisons (start/end are used instead)
+	pub start_offset: usize,
+	pub end_offset: usize,
 }
 
 impl WingSpan {
@@ -213,13 +217,30 @@ impl WingSpan {
 			other.start
 		};
 		let end = if self.end > other.end { self.end } else { other.end };
+		let start_offset = if self.start_offset < other.start_offset {
+			self.start_offset
+		} else {
+			other.start_offset
+		};
+		let end_offset = if self.end_offset > other.end_offset {
+			self.end_offset
+		} else {
+			other.end_offset
+		};
+
 		Self {
 			start,
 			end,
 			file_id: self.file_id.clone(),
+			start_offset,
+			end_offset,
 		}
 	}
 
+	pub fn byte_size(&self) -> usize {
+		self.end_offset - self.start_offset
+	}
+
 	/// Checks if this span is the default span. This means the span is covers nothing by ending at (0,0).
 	pub fn is_default(&self) -> bool {
 		self.end == WingLocation::default()
@@ -279,8 +300,24 @@ impl Diagnostic {
 		});
 	}
 
-	pub fn report(&self) {
-		report_diagnostic(self.clone());
+	pub fn add_hint(&mut self, hint: impl ToString) {
+		self.hints.push(hint.to_string());
+	}
+
+	pub fn annotate(self, msg: impl ToString, span: impl Spanned) -> Self {
+		let mut new = self;
+		new.add_anotation(msg, span);
+		new
+	}
+
+	pub fn hint(self, hint: impl ToString) -> Self {
+		let mut new = self;
+		new.add_hint(hint);
+		new
+	}
+
+	pub fn report(self) {
+		report_diagnostic(self);
 	}
 }
 
@@ -290,13 +327,37 @@ pub struct DiagnosticAnnotation {
 	pub span: WingSpan,
 }
 
+impl DiagnosticAnnotation {
+	pub fn new(msg: impl ToString, span: &impl Spanned) -> Self {
+		Self {
+			message: msg.to_string(),
+			span: span.span(),
+		}
+	}
+}
+
 impl std::fmt::Display for Diagnostic {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		if let Some(span) = &self.span {
-			write!(f, "Error at {} | {}", span, self.message.bold().white())
+			write!(f, "Error at {} | {}", span, self.message.bold().white())?;
 		} else {
-			write!(f, "Error | {}", self.message.bold().white())
+			write!(f, "Error | {}", self.message.bold().white())?;
 		}
+		if !self.annotations.is_empty() {
+			if self.annotations.len() == 1 {
+				write!(f, " ({} annotation)", self.annotations.len())?;
+			} else {
+				write!(f, " ({} annotations)", self.annotations.len())?;
+			}
+		}
+		if !self.hints.is_empty() {
+			if self.hints.len() == 1 {
+				write!(f, " ({} hint)", self.hints.len())?;
+			} else {
+				write!(f, " ({} hints)", self.hints.len())?;
+			}
+		}
+		Ok(())
 	}
 }
 
@@ -391,6 +452,7 @@ pub struct TypeError {
 	pub message: String,
 	pub span: WingSpan,
 	pub annotations: Vec<DiagnosticAnnotation>,
+	pub hints: Vec<String>,
 }
 
 impl std::fmt::Display for TypeError {
@@ -409,6 +471,8 @@ mod tests {
 			start: WingLocation { line: 0, col: 0 },
 			end: WingLocation { line: 1, col: 10 },
 			file_id: "test".to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 
 		let in_position = Position { line: 0, character: 5 };
@@ -426,17 +490,23 @@ mod tests {
 			start: WingLocation { line: 0, col: 0 },
 			end: WingLocation { line: 1, col: 10 },
 			file_id: file_id.to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 
 		let in_span = WingSpan {
 			start: WingLocation { line: 0, col: 5 },
 			end: WingLocation { line: 1, col: 5 },
 			file_id: file_id.to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 		let out_span = WingSpan {
 			start: WingLocation { line: 2, col: 0 },
 			end: WingLocation { line: 2, col: 5 },
 			file_id: file_id.to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 
 		assert!(span.contains_span(&in_span));
@@ -449,6 +519,8 @@ mod tests {
 			start: WingLocation { line: 0, col: 0 },
 			end: WingLocation { line: 1, col: 10 },
 			file_id: "test".to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 
 		let in_location = WingLocation { line: 0, col: 5 };
@@ -464,6 +536,8 @@ mod tests {
 			start: WingLocation { line: 1, col: 5 },
 			end: WingLocation { line: 1, col: 10 },
 			file_id: "test".to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 
 		let like_span1 = span1.clone();
@@ -472,11 +546,15 @@ mod tests {
 			start: WingLocation { line: 0, col: 0 },
 			end: WingLocation { line: 1, col: 1 },
 			file_id: "test".to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 		let later = WingSpan {
 			start: WingLocation { line: 2, col: 0 },
 			end: WingLocation { line: 2, col: 5 },
 			file_id: "test".to_string(),
+			start_offset: 0,
+			end_offset: 10,
 		};
 
 		assert!(span1 == like_span1);
diff --git a/libs/wingc/src/docs.rs b/libs/wingc/src/docs.rs
index c57b6da02c4..8b27d2f4379 100644
--- a/libs/wingc/src/docs.rs
+++ b/libs/wingc/src/docs.rs
@@ -1,21 +1,19 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, sync::OnceLock};
 
 use itertools::Itertools;
+use regex::Regex;
 
 use crate::{
-	ast::{AccessModifier, Phase, Symbol},
+	ast::{AccessModifier, Phase},
 	closure_transform::CLOSURE_CLASS_PREFIX,
 	jsify::codemaker::CodeMaker,
 	type_check::{
-		jsii_importer::is_construct_base, Class, ClassLike, Enum, FunctionSignature, Interface, Namespace, Struct,
-		SymbolKind, Type, TypeRef, VariableInfo, VariableKind, CLASS_INFLIGHT_INIT_NAME, CLASS_INIT_NAME,
+		jsii_importer::is_construct_base, symbol_env::SymbolEnvKind, Class, ClassLike, Enum, FunctionSignature, Interface,
+		Namespace, Struct, SymbolKind, Type, TypeRef, VariableInfo, VariableKind, CLASS_INFLIGHT_INIT_NAME,
+		CLASS_INIT_NAME,
 	},
 };
 
-const FIELD_HEADER: &'static str = "### Fields";
-const METHOD_HEADER: &'static str = "### Methods";
-const PARAMETER_HEADER: &'static str = "### Parameters";
-
 #[derive(Debug, Default, Clone)]
 pub struct Docs {
 	pub summary: Option<String>,
@@ -35,22 +33,98 @@ pub struct Docs {
 }
 
 pub trait Documented {
+	fn docs(&self) -> Option<&Docs>;
 	fn render_docs(&self) -> String;
 }
 
 impl Docs {
+	pub fn render(&self) -> String {
+		let mut markdown = CodeMaker::default();
+
+		render_summary(&mut markdown, self);
+		render_docs(&mut markdown, self);
+
+		markdown.to_string().trim().to_string()
+	}
+
 	pub(crate) fn with_summary(summary: &str) -> Docs {
 		Docs {
 			summary: Some(summary.to_string()),
 			..Default::default()
 		}
 	}
+
+	pub fn as_jsdoc_comment(&self) -> Option<String> {
+		let mut markdown = CodeMaker::default();
+		let mut has_data = false;
+
+		if let Some(_) = &self.summary {
+			has_data = true;
+			render_summary(&mut markdown, self);
+		}
+
+		if let Some(s) = &self.remarks {
+			has_data = true;
+			markdown.line(s);
+		}
+
+		if let Some(s) = &self.example {
+			has_data = true;
+			markdown.line(s);
+		}
+
+		if let Some(s) = &self.returns {
+			has_data = true;
+			markdown.line(format!("@returns {s}"));
+		}
+
+		if let Some(s) = &self.deprecated {
+			has_data = true;
+			markdown.line(format!("@deprecated {s}"));
+		}
+
+		if let Some(s) = &self.see {
+			has_data = true;
+			markdown.line(format!("@see {s}"));
+		}
+
+		if has_data {
+			Some(format!("/** {} */", markdown.to_string()))
+		} else {
+			None
+		}
+	}
 }
 
 impl Documented for SymbolKind {
+	fn docs(&self) -> Option<&Docs> {
+		match self {
+			SymbolKind::Type(t) => t.docs(),
+			SymbolKind::Variable(v) => v.docs(),
+			SymbolKind::Namespace(n) => n.docs(),
+		}
+	}
+
 	fn render_docs(&self) -> String {
 		match self {
-			SymbolKind::Type(t) => t.render_docs(),
+			SymbolKind::Type(t) => {
+				let mut markdown = CodeMaker::default();
+
+				markdown.line("```wing");
+				markdown.line(t.render_docs());
+				markdown.line("```");
+
+				if let Some(d) = t.docs() {
+					if d.summary.is_some() {
+						markdown.line("---");
+					}
+
+					render_summary(&mut markdown, d);
+					render_docs(&mut markdown, d);
+				}
+
+				markdown.to_string().trim().to_string()
+			}
 			SymbolKind::Variable(v) => v.render_docs(),
 			SymbolKind::Namespace(n) => n.render_docs(),
 		}
@@ -61,12 +135,50 @@ impl Documented for Namespace {
 	fn render_docs(&self) -> String {
 		format!("Module `{}`", self.name).to_string()
 	}
+
+	fn docs(&self) -> Option<&Docs> {
+		None
+	}
 }
 
 impl Documented for TypeRef {
+	fn docs(&self) -> Option<&Docs> {
+		match &**self {
+			Type::Function(f) => Some(&f.docs),
+			Type::Class(c) => Some(&c.docs),
+			Type::Interface(i) => Some(&i.docs),
+			Type::Struct(s) => Some(&s.docs),
+			Type::Optional(t) => t.docs(),
+			Type::Enum(e) => Some(&e.docs),
+
+			Type::Anything
+			| Type::Number
+			| Type::String
+			| Type::Duration
+			| Type::Boolean
+			| Type::Void
+			| Type::Json(_)
+			| Type::Stringable
+			| Type::MutJson
+			| Type::Nil
+			| Type::Inferred(_)
+			| Type::Unresolved
+			| Type::Array(_)
+			| Type::MutArray(_)
+			| Type::Map(_)
+			| Type::MutMap(_)
+			| Type::Set(_)
+			| Type::MutSet(_) => None,
+		}
+	}
+
 	fn render_docs(&self) -> String {
+		if let Some(sig) = self.as_deep_function_sig() {
+			return sig.render_docs();
+		}
+
 		match &**self {
-			Type::Function(f) => render_function(f),
+			Type::Function(f) => f.render_docs(),
 			Type::Class(c) => render_class(c),
 			Type::Interface(i) => render_interface(i),
 			Type::Struct(s) => render_struct(s),
@@ -90,12 +202,17 @@ impl Documented for TypeRef {
 			| Type::Map(_)
 			| Type::MutMap(_)
 			| Type::Set(_)
+			| Type::Stringable
 			| Type::MutSet(_) => "".to_string(),
 		}
 	}
 }
 
 impl Documented for VariableInfo {
+	fn docs(&self) -> Option<&Docs> {
+		self.docs.as_ref()
+	}
+
 	fn render_docs(&self) -> String {
 		let mut modifiers = vec![];
 
@@ -113,63 +230,97 @@ impl Documented for VariableInfo {
 			modifiers.push("var");
 		}
 
+		let mut is_initializer = false;
+
 		let modifiers_str = modifiers.join(" ");
 		let name_str = if modifiers.is_empty() {
 			self.name.name.clone()
 		} else {
-			format!("{} {}", modifiers_str, self.name)
+			if self.name.name == CLASS_INFLIGHT_INIT_NAME {
+				is_initializer = true;
+				"inflight new".to_string()
+			} else if self.name.name == CLASS_INIT_NAME {
+				is_initializer = true;
+				"new".to_string()
+			} else {
+				format!("{} {}", modifiers_str, self.name)
+			}
 		};
 
 		let mut markdown = CodeMaker::default();
-		markdown.line("```wing");
-		markdown.line(format!("{name_str}: {}", self.type_));
 
-		let type_docs = self.type_.render_docs();
+		let mut docs = self.docs.as_ref().or_else(|| self.type_.docs());
 
-		if !type_docs.is_empty() {
-			if type_docs.starts_with("```wing") {
-				// skip the first line to combine the code block
-				markdown.line(type_docs.lines().skip(1).join("\n"));
+		markdown.line("```wing");
+		if let Some(sig) = self.type_.maybe_unwrap_option().as_function_sig() {
+			if is_initializer {
+				if let Some(d) = docs {
+					if d.summary.is_none() {
+						// Special case for constructors, just show the resulting type docs
+						docs = sig.return_type.docs();
+					}
+				}
+			}
+			if matches!(self.kind, VariableKind::InstanceMember | VariableKind::StaticMember) {
+				markdown.line(format!("{name_str}({}): {}", render_args(sig), sig.return_type));
 			} else {
-				markdown.line("```");
-				markdown.line("---");
-				markdown.line(type_docs);
+				markdown.line(format!("{name_str}: {}", self.type_));
 			}
+			markdown.line("```");
 		} else {
+			markdown.line(format!("{name_str}: "));
+			let type_docs = self.type_.render_docs();
+			if !type_docs.is_empty() {
+				markdown.append(type_docs);
+			} else {
+				markdown.append(format!("{}", self.type_))
+			}
 			markdown.line("```");
+		};
 
-			if let Some(d) = &self.docs {
+		if let Some(d) = docs {
+			if d.summary.is_some() {
 				markdown.line("---");
-
-				if let Some(summary) = &d.summary {
-					markdown.line(summary);
-					markdown.empty_line();
-				}
-
-				render_docs(&mut markdown, d);
 			}
+			render_summary(&mut markdown, d);
+			render_docs(&mut markdown, d);
 		}
 
 		markdown.to_string().trim().to_string()
 	}
 }
 
+pub fn render_summary(markdown: &mut CodeMaker, docs: &Docs) {
+	if let Some(s) = &docs.summary {
+		markdown.line(fix_markdown_links(s));
+	}
+}
+
+pub fn fix_markdown_links(s: &str) -> String {
+	// Some JSII libraries use {@link URL LABEL} syntax for link, let's convert it to markdown syntax
+	static LINK_REGEX: OnceLock<Regex> = OnceLock::new();
+	LINK_REGEX
+		.get_or_init(|| Regex::new(r"\{@link (\S+) ([^\}]+)\}").unwrap())
+		.replace_all(s, |caps: &regex::Captures| format!("[{}]({})", &caps[2], &caps[1]))
+		.to_string()
+}
+
 fn render_docs(markdown: &mut CodeMaker, docs: &Docs) {
 	if let Some(s) = &docs.returns {
 		markdown.empty_line();
-		markdown.line("### Returns");
-		markdown.line(s);
+		markdown.line("#### Returns");
+		markdown.line(fix_markdown_links(s));
 	}
 
 	if let Some(s) = &docs.remarks {
 		markdown.empty_line();
-		markdown.line("### Remarks");
-		markdown.line(s);
+		markdown.line("#### Remarks");
+		markdown.line(fix_markdown_links(s));
 	}
 
 	if let Some(s) = &docs.example {
 		markdown.empty_line();
-		markdown.line("### Example");
+		markdown.line("#### Example");
 		// For now, the examples are all still in typescript
 		markdown.line("```ts");
 		markdown.line(s);
@@ -211,12 +362,11 @@ fn render_docs(markdown: &mut CodeMaker, docs: &Docs) {
 	}
 }
 
-fn render_signature_help(f: &FunctionSignature) -> String {
-	let mut markdown = CodeMaker::default();
+fn render_args(f: &FunctionSignature) -> String {
+	let mut args = vec![];
 
 	for (param_idx, param) in f.parameters.iter().enumerate() {
 		let param_type = param.typeref;
-		let param_type_unwrapped = param.typeref.maybe_unwrap_option();
 		let is_last = param_idx == f.parameters.len() - 1;
 
 		let param_name = if param.name.is_empty() {
@@ -224,44 +374,28 @@ fn render_signature_help(f: &FunctionSignature) -> String {
 		} else {
 			param.name.clone()
 		};
-		let detail_text = if let Some(summary) = &param.docs.summary {
-			format!("— `{param_type}` — {summary}")
-		} else {
-			format!("— `{param_type}`")
-		};
-
-		if !is_last || !param_type_unwrapped.is_struct() {
-			markdown.line(format!("- `{param_name}` {detail_text}"));
-		} else {
-			markdown.line(format!("- `...{param_name}` {detail_text}"));
+		let is_last_struct = is_last && param_type.maybe_unwrap_option().is_struct();
+		let prefix = if param.variadic || is_last_struct { "..." } else { "" };
 
-			let structy = param_type_unwrapped.as_struct().unwrap();
-			let struct_text = render_classlike_members(structy);
-
-			markdown.indent();
-			markdown.line(struct_text.replace(FIELD_HEADER, ""));
-			markdown.unindent();
-		}
+		args.push(format!("{prefix}{param_name}: {}", param.typeref));
 	}
 
-	markdown.to_string().trim().to_string()
+	args.join(", ")
 }
 
-fn render_function(f: &FunctionSignature) -> String {
-	let mut markdown = CodeMaker::default();
-
-	if let Some(s) = &f.docs.summary {
-		markdown.line(s);
-	}
-
-	if f.parameters.len() > 0 {
-		markdown.line(PARAMETER_HEADER);
-		markdown.line(render_signature_help(f));
+impl Documented for FunctionSignature {
+	fn docs(&self) -> Option<&Docs> {
+		Some(&self.docs)
 	}
 
-	render_docs(&mut markdown, &f.docs);
+	fn render_docs(&self) -> String {
+		let phase = match self.phase {
+			Phase::Inflight => "inflight ",
+			Phase::Preflight | Phase::Independent => "",
+		};
 
-	markdown.to_string().trim().to_string()
+		format!("{phase}({}): {}", render_args(self), self.return_type)
+	}
 }
 
 fn render_struct(s: &Struct) -> String {
@@ -274,18 +408,12 @@ fn render_struct(s: &Struct) -> String {
 		format!(" extends {}", extends)
 	};
 
-	markdown.line("```wing");
-	markdown.line(format!("struct {}{extends}", s.name));
-	markdown.line("```");
-	markdown.line("---");
-
-	if let Some(s) = &s.docs.summary {
-		markdown.line(s);
-	}
+	markdown.empty_line();
+	markdown.open(format!("struct {}{extends} {{", s.name));
 
 	markdown.line(render_classlike_members(s));
 
-	render_docs(&mut markdown, &s.docs);
+	markdown.close("}");
 
 	markdown.to_string().trim().to_string()
 }
@@ -306,20 +434,11 @@ fn render_interface(i: &Interface) -> String {
 		String::default()
 	};
 
-	markdown.line("```wing");
-	markdown.line(format!("interface {}{extends}", i.name));
-	markdown.line("```");
-	markdown.line("---");
-
-	if let Some(s) = &i.docs.summary {
-		markdown.line(s);
-	}
+	markdown.open(format!("interface {}{extends} {{", i.name));
 
 	markdown.line(render_classlike_members(i));
 
-	markdown.empty_line();
-
-	render_docs(&mut markdown, &i.docs);
+	markdown.close("}");
 
 	markdown.to_string().trim().to_string()
 }
@@ -327,22 +446,14 @@ fn render_interface(i: &Interface) -> String {
 fn render_enum(e: &Enum) -> String {
 	let mut markdown = CodeMaker::default();
 
-	markdown.line("```wing");
-	markdown.line(format!("enum {}", e.name));
-	markdown.line("```");
-	markdown.line("---");
-
-	if let Some(s) = &e.docs.summary {
-		markdown.line(s);
-	}
+	markdown.open(format!("enum {} {{", e.name));
 
-	for prop in e.values.iter() {
-		markdown.line(&format!("- `{}`\n", prop));
+	if !e.values.is_empty() {
+		for sym in e.values.keys() {
+			markdown.line(format!("{sym},"));
+		}
 	}
-
-	markdown.empty_line();
-
-	render_docs(&mut markdown, &e.docs);
+	markdown.close("}");
 
 	markdown.to_string().trim().to_string()
 }
@@ -356,8 +467,6 @@ fn render_class(c: &Class) -> String {
 
 	let mut markdown = CodeMaker::default();
 
-	markdown.line("```wing");
-
 	let extends = if let Some(t) = render_typeref(&c.parent) {
 		format!(" extends {}", t)
 	} else {
@@ -377,88 +486,165 @@ fn render_class(c: &Class) -> String {
 		String::default()
 	};
 
-	markdown.line(format!("class {}{}{}", c.name, extends, implements));
-
-	markdown.line("```");
-	markdown.line("---");
-
-	if let Some(s) = &c.docs.summary {
-		markdown.line(s);
-	}
-	render_docs(&mut markdown, &c.docs);
-
-	if matches!(c.phase, Phase::Preflight | Phase::Independent) {
-		if let Some(initializer) = c.get_method(&Symbol::global(CLASS_INIT_NAME)) {
-			let function_sig = initializer.type_.as_function_sig().unwrap();
-			if function_sig.parameters.len() > 0 {
-				markdown.line("### Initializer");
-				markdown.line(render_signature_help(&function_sig));
-			}
-		}
-	}
-
-	if let Some(initializer) = c.get_method(&Symbol::global(CLASS_INFLIGHT_INIT_NAME)) {
-		let function_sig = initializer.type_.as_function_sig().unwrap();
-		if function_sig.parameters.len() > 0 {
-			markdown.line("### Initializer (`inflight`)");
-			markdown.line(render_signature_help(&function_sig));
-		}
-	}
+	markdown.open(format!("class {}{}{} {{", c.name, extends, implements));
 
 	markdown.line(render_classlike_members(c));
 
+	markdown.close("}");
+
 	markdown.to_string().trim().to_string()
 }
 
 fn render_classlike_members(classlike: &impl ClassLike) -> String {
 	let mut field_markdown = CodeMaker::default();
 	let mut method_markdown = CodeMaker::default();
+	let classlike_phase = classlike.get_env().phase;
+
+	let member_name_denylist = vec![CLASS_INIT_NAME, CLASS_INFLIGHT_INIT_NAME];
 
 	let public_member_variables = classlike
 		.get_env()
 		.iter(true)
-		.flat_map(|f| if f.2.init { None } else { f.1.as_variable() })
-		.filter(|v| v.access == AccessModifier::Public)
-		// show optionals first, then sort alphabetically by name
+		.flat_map(|f| {
+			if f.2.init {
+				return None;
+			}
+
+			if f.2.access != AccessModifier::Public {
+				return None;
+			}
+
+			if member_name_denylist.contains(&f.0.as_str()) {
+				return None;
+			}
+
+			if let SymbolEnvKind::Type(t) = f.2.env.kind {
+				if let Some(class) = t.as_class() {
+					if let Some(fqn) = &class.fqn {
+						if fqn.starts_with("constructs.") || is_construct_base(fqn) {
+							return None;
+						}
+					}
+				}
+			}
+
+			f.1.as_variable()
+		})
+		// Use the following ordering:
+		// 1. optionals
+		// 2. phase independent members
+		// 3. phase matching classlike
+		// 4. instance members
+		// 5. fields
+		// 6. methods
 		.sorted_by(|a, b| {
-			let a_is_option = a.type_.is_option();
-			let b_is_option = b.type_.is_option();
-			a_is_option
-				.cmp(&b_is_option)
-				.then_with(|| a.name.name.cmp(&b.name.name))
+			let a_is_optional = a.type_.is_option();
+			let b_is_optional = b.type_.is_option();
+			let a_is_independent = a.phase == Phase::Independent;
+			let b_is_independent = b.phase == Phase::Independent;
+			let a_is_classlike_phase = a.phase == classlike_phase;
+			let b_is_classlike_phase = b.phase == classlike_phase;
+			let a_is_instance = a.kind != VariableKind::StaticMember;
+			let b_is_instance = b.kind != VariableKind::StaticMember;
+			let a_is_field = !a.type_.maybe_unwrap_option().is_function_sig();
+			let b_is_field = !b.type_.maybe_unwrap_option().is_function_sig();
+
+			// 1. optionals
+			if a_is_optional && !b_is_optional {
+				return std::cmp::Ordering::Less;
+			}
+			if !a_is_optional && b_is_optional {
+				return std::cmp::Ordering::Greater;
+			}
+
+			// 2. phase independent members
+			if a_is_independent && !b_is_independent {
+				return std::cmp::Ordering::Less;
+			}
+			if !a_is_independent && b_is_independent {
+				return std::cmp::Ordering::Greater;
+			}
+
+			// 3. phase matching classlike
+			if a_is_classlike_phase && !b_is_classlike_phase {
+				return std::cmp::Ordering::Less;
+			}
+			if !a_is_classlike_phase && b_is_classlike_phase {
+				return std::cmp::Ordering::Greater;
+			}
+
+			// 4. instance members
+			if a_is_instance && !b_is_instance {
+				return std::cmp::Ordering::Less;
+			}
+			if !a_is_instance && b_is_instance {
+				return std::cmp::Ordering::Greater;
+			}
+
+			// 5. fields
+			if a_is_field && !b_is_field {
+				return std::cmp::Ordering::Less;
+			}
+			if !a_is_field && b_is_field {
+				return std::cmp::Ordering::Greater;
+			}
+
+			// 6. methods
+			std::cmp::Ordering::Equal
 		})
 		.collect_vec();
 
-	for member in public_member_variables {
-		let member_type = member.type_;
-		let option_text = if member_type.is_option() { "?" } else { "" };
-		let member_name = &member.name.name;
-		let member_docs = member.docs.as_ref().and_then(|d| d.summary.clone());
-		let text = if let Some(member_docs) = member_docs {
-			format!("- `{member_name}{option_text}` — `{member_type}` — {member_docs}")
+	for (idx, member) in public_member_variables.iter().enumerate() {
+		if idx >= 6 {
+			method_markdown.line("/* ... */");
+			break;
+		}
+
+		let static_text = if matches!(member.kind, VariableKind::StaticMember) {
+			"static "
 		} else {
-			format!("- `{member_name}{option_text}` — `{member_type}`")
+			""
 		};
-
-		if member_type.maybe_unwrap_option().is_function_sig() {
-			if member.name.name == CLASS_INIT_NAME || member.name.name == CLASS_INFLIGHT_INIT_NAME {
-				continue;
+		let phase_text = if member.phase == classlike_phase {
+			""
+		} else {
+			match member.phase {
+				Phase::Inflight => "inflight ",
+				Phase::Preflight => "preflight ",
+				Phase::Independent => "",
 			}
+		};
 
+		let member_type = member.type_;
+		let option_text = if member_type.is_option() { "?" } else { "" };
+		let member_name = &member.name.name;
+
+		if let Some(member_sig) = member_type.maybe_unwrap_option().as_function_sig() {
+			let arg_text = "";
+			let text = format!(
+				"{static_text}{phase_text}{member_name}{option_text}({arg_text}): {};",
+				member_sig.return_type
+			);
 			method_markdown.line(text);
 		} else {
+			let text = format!(
+				"{static_text}{phase_text}{member_name}{option_text}: {};",
+				member_type.maybe_unwrap_option()
+			);
 			field_markdown.line(text);
-		}
+		};
+	}
+
+	if field_markdown.is_empty() && method_markdown.is_empty() {
+		return "// No public members".to_string();
 	}
 
 	let mut markdown = CodeMaker::default();
 
 	if !field_markdown.is_empty() {
-		markdown.line(FIELD_HEADER);
 		markdown.add_code(field_markdown);
 	}
 	if !method_markdown.is_empty() {
-		markdown.line(METHOD_HEADER);
 		markdown.add_code(method_markdown);
 	}
 
diff --git a/libs/wingc/src/dtsify/extern_dtsify.rs b/libs/wingc/src/dtsify/extern_dtsify.rs
new file mode 100644
index 00000000000..d3867b94726
--- /dev/null
+++ b/libs/wingc/src/dtsify/extern_dtsify.rs
@@ -0,0 +1,449 @@
+use std::collections::HashMap;
+
+use camino::Utf8PathBuf;
+use const_format::formatcp;
+use indexmap::IndexMap;
+use itertools::Itertools;
+
+use crate::{
+	ast::{AccessModifier, Expr, Phase},
+	docs::Documented,
+	dtsify::{ignore_member_phase, TYPE_INFLIGHT_POSTFIX},
+	files::{remove_file, update_file, FilesError},
+	jsify::codemaker::CodeMaker,
+	type_check::*,
+	WINGSDK_ASSEMBLY_NAME, WINGSDK_DURATION,
+};
+
+const DURATION_FQN: &str = formatcp!("{WINGSDK_ASSEMBLY_NAME}.{WINGSDK_DURATION}");
+
+/// Generates a self-contained .d.ts file for a given extern file.
+pub struct ExternDTSifier<'a> {
+	/// The type information for any named types seen along the way that need to be hoisted to the top of the file
+	hoisted_types: CodeMaker,
+	/// Named types ecountered so far that have been hoisted.
+	/// The key is a psuedo-FQN and the value is the actual name to use in the .d.ts file. This name is based on name_counter since there may be duplicates.
+	known_types: HashMap<String, String>,
+	/// Because all types will be in the same namespace, if you types have the same name this map will be used to disambiguate them by incrementing the counter.
+	name_counter: HashMap<String, usize>,
+	types: &'a Types,
+}
+
+/// Checks if given file has a valid extension to be considered an extern file
+pub fn is_extern_file(file: &Utf8PathBuf) -> bool {
+	if let Some(ext) = file.extension() {
+		match ext {
+			"js" | "cjs" | "mjs" | "jsx" | "ts" | "cts" | "mts" | "tsx" => true,
+			_ => false,
+		}
+	} else {
+		false
+	}
+}
+
+impl<'a> ExternDTSifier<'a> {
+	pub fn new(types: &'a Types) -> Self {
+		Self {
+			types,
+			known_types: HashMap::new(),
+			name_counter: HashMap::new(),
+			hoisted_types: CodeMaker::default(),
+		}
+	}
+
+	pub fn dtsify_inflight(
+		&mut self,
+		inflight_function: &TypeRef,
+		lifts: &IndexMap<String, (&Expr, Option<&Vec<Expr>>, CodeMaker)>,
+	) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		code.line("/// This file is generated by Wing.");
+		code.open("export interface Lifts {");
+
+		for (name, (expr, ops, _)) in lifts {
+			let e_type = self.types.get_expr_id_type_ref(expr.id);
+			let ops = ops.map(|ops| {
+				ops
+					.iter()
+					.flat_map(|op| op.as_static_string())
+					.map(|op| format!("\"{op}\""))
+					.join(" | ")
+			});
+			if let Some(ops) = ops {
+				code.line(format!("{}: Pick<{}, {ops}>", name, self.dtsify_type(*e_type, true)));
+			} else {
+				code.line(format!("{}: {}", name, self.dtsify_type(*e_type, true)));
+			}
+		}
+
+		code.close("};");
+		code.line("type HandlerFunction<T> = T extends { handle: (...args: any[]) => any } ? T['handle'] : T;");
+		code.line("type ExpectedFunction = HandlerFunction<");
+		code.append(self.dtsify_type(*inflight_function, true));
+		code.append(">;");
+
+		if let Some(docs) = inflight_function
+			.as_deep_function_sig()
+			.and_then(|sig| sig.docs())
+			.and_then(|d| d.as_jsdoc_comment())
+		{
+			code.line(docs);
+		}
+		code.line(
+			"export type Handler = ((ctx: Lifts, ...args: Parameters<ExpectedFunction>) => ReturnType<ExpectedFunction>) & {};",
+		);
+		code.line("export function inflight(handler: Handler): Handler { return handler; }");
+		code.line("export default inflight;");
+		code.line(self.hoisted_types.to_string());
+		code
+	}
+
+	pub fn dtsify(
+		&mut self,
+		extern_file: &'a Utf8PathBuf,
+		extern_file_env: &'a SymbolEnvOrNamespace,
+	) -> Result<(), FilesError> {
+		let mut dts = CodeMaker::default();
+
+		if let SymbolEnvOrNamespace::SymbolEnv(extern_env) = extern_file_env {
+			let list = extern_env.iter(false).collect::<Vec<_>>();
+			if let Some(v) = list.iter().find(|(dd, _, _)| dd == "default") {
+				let sym_type = self.types.maybe_unwrap_inference(v.1.as_variable().unwrap().type_);
+				let phase = if let Some(sig) = sym_type.as_function_sig() {
+					sig.phase
+				} else {
+					v.1.as_variable().unwrap().phase
+				};
+
+				let type_string = self.dtsify_type(sym_type, matches!(phase, Phase::Inflight));
+				dts.line(format!("type extern = {};", type_string));
+				dts.line("export default extern;");
+			} else {
+				dts.open("export default interface extern {");
+				for env_entry in extern_env.iter(false) {
+					if let Some(variable_info) = env_entry.1.as_variable() {
+						let sym_type = self.types.maybe_unwrap_inference(variable_info.type_);
+						let phase = if let Some(sig) = sym_type.as_function_sig() {
+							sig.phase
+						} else {
+							variable_info.phase
+						};
+
+						let type_string = self.dtsify_type(sym_type, matches!(phase, Phase::Inflight));
+						dts.line(format!("{}: {},", env_entry.0, type_string));
+					}
+				}
+				dts.close("}");
+			}
+		}
+		let dts_filename = extern_file.with_extension("extern.d.ts");
+
+		if dts.is_empty() {
+			remove_file(&dts_filename)
+		} else {
+			// add all the known types we found
+			dts.line(self.hoisted_types.to_string());
+
+			update_file(&dts_filename, &dts.to_string())
+		}
+	}
+
+	fn dtsify_type(&mut self, type_: TypeRef, is_inflight: bool) -> String {
+		match &*type_ {
+			Type::Anything => "any".to_string(),
+			Type::Number => "number".to_string(),
+			Type::String => "string".to_string(),
+			Type::Boolean => "boolean".to_string(),
+			Type::Void => "void".to_string(),
+			Type::Nil => "undefined".to_string(),
+			Type::Json(Some(data)) => match &data.kind {
+				JsonDataKind::Type(inner) => self.dtsify_type(inner.type_, is_inflight),
+				JsonDataKind::List(inner_types) => inner_types
+					.iter()
+					.map(|t| self.dtsify_type(t.type_, is_inflight))
+					.join(" | "),
+				JsonDataKind::Fields(fields) => {
+					let mut field_text = vec![];
+					for (name, inner) in fields {
+						field_text.push(format!("{}: {}", name, self.dtsify_type(inner.type_, is_inflight)));
+					}
+					format!("{{ {} }}", field_text.join(", "))
+				}
+			},
+			Type::Json(None) => "Readonly<any>".to_string(),
+			Type::MutJson => "any".to_string(),
+			Type::Duration => {
+				let duration_type = self
+					.types
+					.libraries
+					.lookup_nested_str(DURATION_FQN, None)
+					.unwrap()
+					.0
+					.as_type()
+					.unwrap();
+				self.dtsify_type(duration_type, false)
+			}
+			Type::Optional(t) => format!("({}) | undefined", self.dtsify_type(*t, is_inflight)),
+			Type::Array(t) => format!("(readonly ({})[])", self.dtsify_type(*t, is_inflight)),
+			Type::MutArray(t) => format!("({})[]", self.dtsify_type(*t, is_inflight)),
+			Type::Map(t) => format!("Readonly<Record<string, {}>>", self.dtsify_type(*t, is_inflight)),
+			Type::MutMap(t) => format!("Record<string, {}>", self.dtsify_type(*t, is_inflight)),
+			Type::Set(t) => format!("Readonly<Set<{}>>", self.dtsify_type(*t, is_inflight)),
+			Type::MutSet(t) => format!("Set<{}>", self.dtsify_type(*t, is_inflight)),
+			Type::Function(f) => self.dtsify_function_signature(&f, is_inflight),
+			Type::Class(_) | Type::Interface(_) | Type::Struct(_) | Type::Enum(_) => {
+				self.resolve_named_type(type_, is_inflight)
+			}
+			Type::Inferred(iid) => {
+				let t = self.types.get_inference_by_id(*iid);
+				if let Some(t) = t {
+					self.dtsify_type(t, is_inflight)
+				} else {
+					panic!("Extern must use resolved types")
+				}
+			}
+			Type::Stringable => {
+				panic!("Unsupported type stringable")
+			}
+			Type::Unresolved => {
+				panic!("Extern must use resolved types")
+			}
+		}
+	}
+
+	fn resolve_named_type(&mut self, type_: TypeRef, is_inflight: bool) -> String {
+		let fqn = match &*type_ {
+			Type::Class(c) => c.fqn.as_ref().unwrap_or(&c.name.span.file_id),
+			Type::Interface(i) => i.fqn.as_ref().unwrap_or(&i.name.span.file_id),
+			Type::Struct(s) => s.fqn.as_ref().unwrap_or(&s.name.span.file_id),
+			Type::Enum(e) => &e.name.span.file_id,
+			_ => panic!("Not a named type"),
+		};
+		let base_name = match &*type_ {
+			Type::Class(c) => {
+				if is_inflight {
+					format!("{}{}", c.name.name, TYPE_INFLIGHT_POSTFIX)
+				} else {
+					c.name.name.clone()
+				}
+			}
+			Type::Interface(i) => {
+				if is_inflight {
+					format!("{}{}", i.name.name, TYPE_INFLIGHT_POSTFIX)
+				} else {
+					i.name.name.clone()
+				}
+			}
+			Type::Struct(s) => s.name.name.clone(),
+			Type::Enum(e) => e.name.name.clone(),
+			_ => panic!("Not a named type"),
+		};
+		let type_key = format!("{fqn}|{base_name}");
+
+		if let Some(name) = self.known_types.get(&type_key) {
+			name.clone()
+		} else {
+			let name_counter = self.name_counter.get(&base_name).unwrap_or(&0);
+			let name = if *name_counter == 0 {
+				base_name.to_string()
+			} else {
+				format!("{base_name}{name_counter}")
+			};
+
+			self.name_counter.insert(base_name, name_counter + 1);
+			self.known_types.insert(type_key, name.clone());
+
+			let type_code = match &*type_ {
+				Type::Class(c) => self.dtsify_class(c, is_inflight),
+				Type::Interface(i) => self.dtsify_interface(i, is_inflight),
+				Type::Struct(s) => self.dtsify_struct(s),
+				Type::Enum(e) => self.dtsify_enum(e),
+				_ => panic!("Not a named type"),
+			};
+			self.hoisted_types.line(type_code);
+
+			name
+		}
+	}
+
+	fn dtsify_function_signature(&mut self, f: &FunctionSignature, is_inflight: bool) -> String {
+		let args = self.dtsify_parameters(&f.parameters, is_inflight);
+
+		let is_inflight = matches!(f.phase, Phase::Inflight);
+
+		let return_type = if f.return_type.is_strict_option() {
+			let unwrapped_type = *f.return_type.maybe_unwrap_option();
+			let type_string = self.dtsify_type(unwrapped_type, is_inflight);
+			format!("{} | void", type_string)
+		} else {
+			self.dtsify_type(f.return_type, is_inflight)
+		};
+		let return_type = if is_inflight {
+			format!("Promise<{return_type}>")
+		} else {
+			return_type
+		};
+
+		format!("({args}) => {return_type}")
+	}
+
+	fn dtsify_enum(&mut self, enum_: &Enum) -> CodeMaker {
+		let mut code = CodeMaker::default();
+
+		if let Some(docs) = &enum_.docs.as_jsdoc_comment() {
+			code.line(docs);
+		}
+		code.open(format!("export enum {} {{", enum_.name.name));
+
+		for (i, variant) in enum_.values.iter().enumerate() {
+			code.line(format!("{} = {i},", variant.0));
+		}
+
+		code.close("}");
+
+		code
+	}
+
+	fn dtsify_struct(&mut self, struct_: &Struct) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		if let Some(docs) = &struct_.docs.as_jsdoc_comment() {
+			code.line(docs);
+		}
+		code.open(format!("export interface {} {{", struct_.name.name));
+
+		code.line(self.dtsify_inner_classlike(struct_, false));
+
+		code.close("}");
+
+		code
+	}
+
+	fn dtsify_interface(&mut self, interface: &Interface, is_inflight: bool) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		let interface_name = if is_inflight {
+			format!("{}{TYPE_INFLIGHT_POSTFIX}", &interface.name.name)
+		} else {
+			interface.name.name.to_string()
+		};
+
+		if let Some(docs) = &interface.docs.as_jsdoc_comment() {
+			code.line(docs);
+		}
+		code.line(format!("export interface {interface_name}"));
+		if !interface.extends.is_empty() {
+			code.append(" extends ");
+			code.append(
+				&interface
+					.extends
+					.iter()
+					.map(|udt| self.dtsify_type(*udt, is_inflight))
+					.join(", "),
+			);
+		}
+
+		code.append(" {");
+		code.indent();
+
+		code.line(self.dtsify_inner_classlike(interface, is_inflight));
+
+		code.close("}");
+
+		code
+	}
+
+	fn dtsify_class(&mut self, class: &Class, is_inflight: bool) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		let class_name = if is_inflight {
+			format!("{}{TYPE_INFLIGHT_POSTFIX}", class.name)
+		} else {
+			class.name.name.to_string()
+		};
+
+		if let Some(docs) = &class.docs.as_jsdoc_comment() {
+			code.line(docs);
+		}
+		code.line(format!("export class {class_name}"));
+		if let Some(parent) = &class.parent {
+			code.append(" extends ");
+			code.append(self.dtsify_type(*parent, is_inflight));
+		}
+
+		if !class.implements.is_empty() {
+			code.append(" implements ");
+			code.append(
+				&class
+					.implements
+					.iter()
+					.map(|udt| self.dtsify_type(*udt, is_inflight))
+					.join(", "),
+			);
+		}
+
+		code.append(" {");
+		code.indent();
+
+		code.line(self.dtsify_inner_classlike(class, is_inflight));
+
+		code.close("}");
+		code
+	}
+
+	fn dtsify_parameters(&mut self, arg_list: &Vec<FunctionParameter>, is_inflight: bool) -> String {
+		let mut args = vec![];
+
+		for (i, arg) in arg_list.iter().enumerate() {
+			let arg_name = if arg.name.is_empty() {
+				// function type annotations don't always have names
+				format!("arg{}", i)
+			} else {
+				arg.name.clone()
+			};
+
+			args.push(format!(
+				"{arg_name}{}: {}",
+				if arg.typeref.is_option() { "?" } else { "" },
+				self.dtsify_type(arg.typeref, is_inflight)
+			));
+		}
+		args.join(", ")
+	}
+
+	fn dtsify_inner_classlike(&mut self, classlike: &impl ClassLike, is_inflight: bool) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		for member_var in classlike.get_env().iter(false).filter_map(|(_, kind, lookup)| {
+			if lookup.init || !matches!(lookup.access, AccessModifier::Public) {
+				return None;
+			}
+
+			let variable = kind.as_variable()?;
+
+			if let Some(sig) = variable.type_.as_function_sig() {
+				if ignore_member_phase(sig.phase, is_inflight) {
+					return None;
+				}
+			} else {
+				if ignore_member_phase(variable.phase, is_inflight) {
+					return None;
+				}
+			}
+
+			if variable.kind != VariableKind::InstanceMember {
+				None
+			} else {
+				Some(variable)
+			}
+		}) {
+			if let Some(docs) = member_var.docs.as_ref().and_then(|d| d.as_jsdoc_comment()) {
+				code.line(docs);
+			}
+			code.line(format!(
+				"{}{}{}: {};",
+				if member_var.reassignable { "" } else { "readonly " },
+				member_var.name,
+				if member_var.type_.is_option() { "?" } else { "" },
+				self.dtsify_type(member_var.type_, is_inflight)
+			));
+		}
+		code
+	}
+}
diff --git a/libs/wingc/src/dtsify/mod.rs b/libs/wingc/src/dtsify/mod.rs
new file mode 100644
index 00000000000..f367e267c64
--- /dev/null
+++ b/libs/wingc/src/dtsify/mod.rs
@@ -0,0 +1,464 @@
+use std::cell::RefCell;
+
+use camino::{Utf8Path, Utf8PathBuf};
+use indexmap::IndexMap;
+use itertools::Itertools;
+
+use crate::{
+	ast::*, diagnostic::report_diagnostic, file_graph::FileGraph, files::Files, jsify::codemaker::CodeMaker,
+	type_check::Types, WINGSDK_ASSEMBLY_NAME,
+};
+pub mod extern_dtsify;
+
+pub const TYPE_INFLIGHT_POSTFIX: &str = "$Inflight";
+const TYPE_INTERNAL_NAMESPACE: &str = "$internal";
+const TYPE_STD: &str = "std";
+const EMIT_FILE_EXTENSION: &str = "cjs";
+const EMIT_TYPE_FILE_EXTENSION: &str = "d.cts";
+
+pub struct DTSifier<'a> {
+	preflight_file_map: &'a IndexMap<Utf8PathBuf, String>,
+	source_file_graph: &'a FileGraph,
+	pub types: &'a mut Types,
+	pub output_files: RefCell<Files>,
+}
+
+impl<'a> DTSifier<'a> {
+	pub fn new(
+		types: &'a mut Types,
+		preflight_file_map: &'a IndexMap<Utf8PathBuf, String>,
+		source_file_graph: &'a FileGraph,
+	) -> Self {
+		Self {
+			preflight_file_map,
+			source_file_graph,
+			output_files: RefCell::new(Files::new()),
+			types,
+		}
+	}
+
+	pub fn dtsify(&self, source_path: &Utf8Path, scope: &Scope) {
+		let mut dts = CodeMaker::default();
+
+		if source_path.is_dir() {
+			let directory_children = self.source_file_graph.dependencies_of(source_path);
+
+			for file in directory_children {
+				let preflight_file_name = self.preflight_file_map.get(file).expect("no emitted JS file found");
+				if file.is_dir() {
+					let directory_name = file.file_stem().unwrap();
+					dts.line(format!("export * as {directory_name} from \"./{preflight_file_name}\""));
+				} else {
+					dts.line(format!("export * from \"./{preflight_file_name}\""));
+				}
+			}
+		} else {
+			dts.line(format!(
+				"import * as {TYPE_INTERNAL_NAMESPACE} from \"{WINGSDK_ASSEMBLY_NAME}/lib/core/types\""
+			));
+			dts.line(format!("import {{ {TYPE_STD} }} from \"{WINGSDK_ASSEMBLY_NAME}\""));
+		}
+
+		for statement in &scope.statements {
+			dts.add_code(self.dtsify_statement(statement));
+		}
+
+		let mut dts_file_name = Utf8PathBuf::from(self.preflight_file_map.get(source_path).unwrap());
+
+		assert!(matches!(dts_file_name.extension(), Some(EMIT_FILE_EXTENSION)));
+
+		dts_file_name = dts_file_name.with_extension(EMIT_TYPE_FILE_EXTENSION);
+
+		match self.output_files.borrow_mut().add_file(dts_file_name, dts.to_string()) {
+			Ok(()) => {}
+			Err(err) => report_diagnostic(err.into()),
+		}
+	}
+
+	fn dtsify_function_signature(&self, f: &FunctionSignature, as_inflight: bool) -> String {
+		let args = self.dtsify_parameters(&f.parameters, as_inflight);
+
+		let is_inflight = matches!(f.phase, Phase::Inflight);
+
+		let return_type = self.dtsify_type_annotation(&f.return_type, as_inflight);
+		let return_type = if is_inflight {
+			format!("Promise<{return_type}>")
+		} else {
+			return_type
+		};
+
+		let func = format!("({}) => {return_type}", args,);
+
+		if is_inflight && !as_inflight {
+			// this is the preflight side of an inflight function
+			format!("{TYPE_INTERNAL_NAMESPACE}.Inflight<{func}>")
+		} else {
+			func
+		}
+	}
+
+	fn dtsify_interface(&self, interface: &Interface, as_inflight: bool) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		let interface_name = if as_inflight {
+			format!("{}{TYPE_INFLIGHT_POSTFIX}", &interface.name.name)
+		} else {
+			interface.name.name.to_string()
+		};
+
+		code.line(format!("export interface {interface_name}"));
+
+		if !interface.extends.is_empty() {
+			code.append(" extends ");
+			code.append(
+				&interface
+					.extends
+					.iter()
+					.map(|udt| {
+						if as_inflight {
+							format!("{udt}{TYPE_INFLIGHT_POSTFIX}")
+						} else {
+							udt.to_string()
+						}
+					})
+					.join(", "),
+			);
+		}
+
+		code.open("{");
+
+		for method in interface
+			.methods
+			.iter()
+			.filter(|m| !ignore_member_phase(m.1.phase, as_inflight))
+		{
+			code.line(format!(
+				"readonly {}: {};",
+				method.0.name,
+				self.dtsify_function_signature(&method.1, as_inflight)
+			));
+		}
+
+		code.close("}");
+
+		code
+	}
+
+	fn dtsify_class(&self, class: &Class, as_inflight: bool) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		let class_name = if as_inflight {
+			format!("{}{TYPE_INFLIGHT_POSTFIX}", class.name)
+		} else {
+			class.name.name.to_string()
+		};
+
+		code.line("export class ");
+
+		code.append(&class_name);
+		if let Some(parent) = &class.parent {
+			code.append(" extends ");
+			if as_inflight {
+				code.append(format!("{parent}{TYPE_INFLIGHT_POSTFIX}"));
+			} else {
+				code.append(parent.to_string());
+			}
+		} else if !as_inflight && matches!(class.phase, Phase::Preflight) {
+			code.append(format!(" extends {TYPE_STD}.Resource"));
+		}
+
+		if !class.implements.is_empty() {
+			code.append(" implements ");
+			if as_inflight {
+				code.append(
+					&class
+						.implements
+						.iter()
+						.map(|udt| format!("{udt}{TYPE_INFLIGHT_POSTFIX}"))
+						.join(", "),
+				);
+			} else {
+				code.append(&class.implements.iter().map(|udt| udt.to_string()).join(", "));
+			}
+		}
+
+		code.open("{");
+
+		let constructor_params = self.dtsify_parameters(&class.initializer.signature.parameters, as_inflight);
+		if matches!(class.phase, Phase::Preflight) {
+			if as_inflight {
+				code.line(format!("constructor({constructor_params});"));
+			} else {
+				// add implicit scope and id
+				code.line(format!(
+					"constructor(scope: {TYPE_INTERNAL_NAMESPACE}.Construct, id: string"
+				));
+
+				if constructor_params.is_empty() {
+					code.append(");");
+				} else {
+					code.append(format!(", {constructor_params});"));
+				}
+			}
+		} else {
+			code.line(format!("constructor({constructor_params});"));
+		}
+
+		if !as_inflight {
+			// Emit special preflight marks to tie the inflight side together
+			let inflight_class_name = format!("{class_name}{TYPE_INFLIGHT_POSTFIX}");
+			code.line(format!(
+				"[{TYPE_INTERNAL_NAMESPACE}.INFLIGHT_SYMBOL]?: {inflight_class_name};"
+			));
+		}
+
+		for field in class
+			.fields
+			.iter()
+			.filter(|f| matches!(f.access, AccessModifier::Public))
+			.filter(|f| !ignore_member_phase(f.phase, as_inflight))
+		{
+			code.line(format!(
+				"{}{}: {};",
+				field.name,
+				if matches!(field.member_type.kind, TypeAnnotationKind::Optional(_)) {
+					"?"
+				} else {
+					""
+				},
+				self.dtsify_type_annotation(&field.member_type, true)
+			));
+		}
+		for method in class
+			.methods
+			.iter()
+			.filter(|f| matches!(f.1.access, AccessModifier::Public))
+			.filter(|f| !ignore_member_phase(f.1.signature.phase, as_inflight))
+		{
+			code.line(format!(
+				"{}{}: {};",
+				if method.1.is_static { "static " } else { "" },
+				method.0.name,
+				self.dtsify_function_signature(&method.1.signature, as_inflight)
+			));
+		}
+
+		code.close("}");
+		code
+	}
+
+	fn dtsify_statement(&self, stmt: &Stmt) -> CodeMaker {
+		let mut code = CodeMaker::default();
+		match &stmt.kind {
+			StmtKind::Interface(interface) => {
+				code.line(self.dtsify_interface(interface, false));
+				code.line(self.dtsify_interface(interface, true));
+			}
+			StmtKind::Struct(st) => {
+				if !st.extends.is_empty() {
+					code.open(format!(
+						"export interface {} extends {} {{",
+						st.name.name,
+						st.extends.iter().map(|udt| udt.to_string()).join(", ")
+					));
+				} else {
+					code.open(format!("export interface {} {{", st.name.name));
+				}
+
+				for field in &st.fields {
+					code.line(format!(
+						"readonly {}{}: {};",
+						field.name,
+						if matches!(field.member_type.kind, TypeAnnotationKind::Optional(_)) {
+							"?"
+						} else {
+							""
+						},
+						self.dtsify_type_annotation(&field.member_type, false)
+					));
+				}
+				code.close("}");
+			}
+			StmtKind::Enum(enu) => {
+				code.open(format!("export enum {} {{", enu.name.name));
+				for value in &enu.values {
+					code.line(format!("{},", value.0.name));
+				}
+				code.close("}");
+			}
+			StmtKind::Bring { source, identifier } => {
+				let identifier = identifier.as_ref().map(|i| i.name.clone()).unwrap_or("".to_string());
+
+				match source {
+					BringSource::BuiltinModule(sym) => code.line(format!("import {{ {sym} }} from \"{WINGSDK_ASSEMBLY_NAME}\"")),
+					BringSource::TrustedModule(sym, path) => {
+						let preflight_file_name = self.preflight_file_map.get(path).unwrap();
+						code.line(format!("import * as {sym} from \"./{preflight_file_name}\";"))
+					}
+					BringSource::WingLibrary(sym, path) => {
+						let preflight_file_name = self.preflight_file_map.get(path).unwrap();
+						code.line(format!("import * as {sym} from \"./{preflight_file_name}\";"))
+					}
+					BringSource::JsiiModule(sym) => code.line(format!("import * as {identifier} from \"{sym}\"")),
+					BringSource::WingFile(path) => {
+						let preflight_file_name = self.preflight_file_map.get(path).unwrap();
+						code.line(format!("import * as {identifier} from \"./{preflight_file_name}\";"))
+					}
+					BringSource::Directory(path) => {
+						let preflight_file_name = self.preflight_file_map.get(path).unwrap();
+						code.line(format!("import * as {identifier} from \"./{preflight_file_name}\";"))
+					}
+				}
+			}
+			StmtKind::Class(class) => {
+				code.line(self.dtsify_class(class, false));
+				code.line(self.dtsify_class(class, true));
+			}
+
+			// No need to emit anything for these
+			StmtKind::SuperConstructor { .. }
+			| StmtKind::Let { .. }
+			| StmtKind::ForLoop { .. }
+			| StmtKind::While { .. }
+			| StmtKind::IfLet(_)
+			| StmtKind::If { .. }
+			| StmtKind::Break
+			| StmtKind::Continue
+			| StmtKind::Return(_)
+			| StmtKind::Throw(_)
+			| StmtKind::Expression(_)
+			| StmtKind::Assignment { .. }
+			| StmtKind::Scope(_)
+			| StmtKind::TryCatch { .. }
+			| StmtKind::CompilerDebugEnv
+			| StmtKind::ExplicitLift(_) => {}
+		}
+
+		code
+	}
+
+	fn dtsify_parameters(&self, arg_list: &Vec<FunctionParameter>, ignore_phase: bool) -> String {
+		let mut args = vec![];
+
+		for (i, arg) in arg_list.iter().enumerate() {
+			let arg_name = if arg.name.name.is_empty() {
+				// function type annotations don't always have names
+				format!("arg{}", i)
+			} else {
+				arg.name.name.clone()
+			};
+
+			args.push(format!(
+				"{arg_name}{}: {}",
+				if matches!(arg.type_annotation.kind, TypeAnnotationKind::Optional(_)) {
+					"?"
+				} else {
+					""
+				},
+				self.dtsify_type_annotation(&arg.type_annotation, ignore_phase)
+			));
+		}
+		args.join(", ")
+	}
+
+	fn dtsify_type_annotation(&self, typ: &TypeAnnotation, ignore_phase: bool) -> String {
+		match &typ.kind {
+			TypeAnnotationKind::Inferred => panic!("Should not have any inferred types"),
+			TypeAnnotationKind::Number => "number".to_string(),
+			TypeAnnotationKind::String => "string".to_string(),
+			TypeAnnotationKind::Bool => "boolean".to_string(),
+			TypeAnnotationKind::Void => "void".to_string(),
+			TypeAnnotationKind::Json => format!("Readonly<{TYPE_INTERNAL_NAMESPACE}.Json>"),
+			TypeAnnotationKind::MutJson => format!("{TYPE_INTERNAL_NAMESPACE}.Json"),
+			TypeAnnotationKind::Duration => format!("{TYPE_STD}.Duration"),
+			TypeAnnotationKind::Optional(t) => {
+				format!("({}) | undefined", self.dtsify_type_annotation(&t, ignore_phase))
+			}
+			TypeAnnotationKind::Array(t) => format!("(readonly ({})[])", self.dtsify_type_annotation(&t, ignore_phase)),
+			TypeAnnotationKind::MutArray(t) => format!("({})[]", self.dtsify_type_annotation(&t, ignore_phase)),
+			TypeAnnotationKind::Map(t) => format!(
+				"Readonly<Record<string, {}>>",
+				self.dtsify_type_annotation(&t, ignore_phase)
+			),
+			TypeAnnotationKind::MutMap(t) => {
+				format!("Record<string, {}>", self.dtsify_type_annotation(&t, ignore_phase))
+			}
+			TypeAnnotationKind::Set(t) => format!("Readonly<Set<{}>>", self.dtsify_type_annotation(&t, ignore_phase)),
+			TypeAnnotationKind::MutSet(t) => format!("Set<{}>", self.dtsify_type_annotation(&t, ignore_phase)),
+			TypeAnnotationKind::Function(f) => self.dtsify_function_signature(f, ignore_phase),
+			TypeAnnotationKind::UserDefined(udt) => udt.to_string(),
+		}
+	}
+}
+
+pub fn ignore_member_phase(phase: Phase, is_inflight: bool) -> bool {
+	// If we're an inflight client, we want to ignore preflight members
+	// Or
+	// If we're a preflight client, we want to ignore inflight members
+	(is_inflight && matches!(phase, Phase::Preflight)) || (!is_inflight && matches!(phase, Phase::Inflight))
+}
+
+#[test]
+fn declarations() {
+	assert_compile_dir!(
+		r#"
+pub struct Struct {
+	n: num;
+	d: Array<duration>;
+	j: Json;
+}
+
+pub interface Interface {
+	method(s: Struct): str;
+	inflight inflightMethod(): str;
+}
+
+pub interface ClassInterface {
+	addHandler(handler: inflight (str): str): void;
+	inflight bar(): void;
+}
+
+pub inflight interface InflightInterface {
+  somethingFun(): void;
+}
+
+pub inflight class InflightClass impl InflightInterface {
+  pub somethingFun() {}
+}
+
+pub class ParentClass impl ClassInterface {
+	pub static inflight static_method(): InflightClass {
+	  return new InflightClass();
+	}
+
+	inflight foo() {}
+	pub inflight bar() {}
+
+	pub addHandler(handler: inflight (str): str) {}
+}
+
+pub class Child extends ParentClass impl ClassInterface {}
+"#
+	);
+}
+
+#[test]
+fn optionals() {
+	assert_compile_dir!(
+		r#"
+pub struct Struct {
+	n: num?;
+}
+
+pub interface Interface {
+	method(s: Struct?): str;
+}
+
+pub interface ClassInterface {
+	addHandler(handler: inflight (str?): str, s: Struct?): void;
+}
+
+pub class ParentClass impl ClassInterface {
+	pub addHandler(handler: inflight (str?): str, s: Struct?) {}
+}
+"#
+	)
+}
diff --git a/libs/wingc/src/dtsify/snapshots/declarations.snap b/libs/wingc/src/dtsify/snapshots/declarations.snap
new file mode 100644
index 00000000000..98f93db09e3
--- /dev/null
+++ b/libs/wingc/src/dtsify/snapshots/declarations.snap
@@ -0,0 +1,297 @@
+---
+source: libs/wingc/src/dtsify/mod.rs
+---
+## Code
+
+```w
+
+pub struct Struct {
+  n: num;
+  d: Array<duration>;
+  j: Json;
+}
+
+pub interface Interface {
+  method(s: Struct): str;
+  inflight inflightMethod(): str;
+}
+
+pub interface ClassInterface {
+  addHandler(handler: inflight (str): str): void;
+  inflight bar(): void;
+}
+
+pub inflight interface InflightInterface {
+  somethingFun(): void;
+}
+
+pub inflight class InflightClass impl InflightInterface {
+  pub somethingFun() {}
+}
+
+pub class ParentClass impl ClassInterface {
+  pub static inflight static_method(): InflightClass {
+    return new InflightClass();
+  }
+
+  inflight foo() {}
+  pub inflight bar() {}
+
+  pub addHandler(handler: inflight (str): str) {}
+}
+
+pub class Child extends ParentClass impl ClassInterface {}
+
+```
+
+## inflight.Child-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $ParentClass }) {
+  class Child extends $ParentClass {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return Child;
+}
+//# sourceMappingURL=inflight.Child-1.cjs.map
+```
+
+## inflight.InflightClass-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class InflightClass {
+    async somethingFun() {
+    }
+  }
+  return InflightClass;
+}
+//# sourceMappingURL=inflight.InflightClass-1.cjs.map
+```
+
+## inflight.ParentClass-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $InflightClass }) {
+  class ParentClass {
+    constructor({  }) {
+    }
+    static async static_method() {
+      return (await (async () => {const o = new $InflightClass(); await o.$inflight_init?.(); return o; })());
+    }
+    async foo() {
+    }
+    async bar() {
+    }
+  }
+  return ParentClass;
+}
+//# sourceMappingURL=inflight.ParentClass-1.cjs.map
+```
+
+## preflight.cjs
+
+```js
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {
+  ...require("./preflight.lib-1.cjs"),
+};
+//# sourceMappingURL=preflight.cjs.map
+```
+
+## preflight.d.cts
+
+```js
+export * from "./preflight.lib-1.cjs"
+```
+
+## preflight.lib-1.cjs
+
+```js
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class InflightClass extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.InflightClass-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const InflightClassClient = ${InflightClass._toInflightType()};
+        const client = new InflightClassClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "somethingFun": [
+      ],
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+class ParentClass extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  addHandler(handler) {
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.ParentClass-1.cjs")({
+        $InflightClass: ${$stdlib.core.liftObject(InflightClass)},
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const ParentClassClient = ${ParentClass._toInflightType()};
+        const client = new ParentClassClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "foo": [
+      ],
+      "bar": [
+      ],
+      "$inflight_init": [
+      ],
+    });
+  }
+  static get _liftTypeMap() {
+    return ({
+      "static_method": [
+      ],
+    });
+  }
+}
+class Child extends ParentClass {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Child-1.cjs")({
+        $ParentClass: ${$stdlib.core.liftObject(ParentClass)},
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const ChildClient = ${Child._toInflightType()};
+        const client = new ChildClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return $stdlib.core.mergeLiftDeps(super._liftMap, {
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { InflightClass, ParentClass, Child };
+//# sourceMappingURL=preflight.lib-1.cjs.map
+```
+
+## preflight.lib-1.d.cts
+
+```js
+import * as $internal from "@winglang/sdk/lib/core/types"
+import { std } from "@winglang/sdk"
+export interface Struct {
+  readonly n: number;
+  readonly d: (readonly (std.Duration)[]);
+  readonly j: Readonly<$internal.Json>;
+}
+export interface Interface
+{
+  readonly method: (s: Struct) => string;
+}
+export interface Interface$Inflight
+{
+  readonly inflightMethod: () => Promise<string>;
+}
+export interface ClassInterface
+{
+  readonly addHandler: (handler: $internal.Inflight<(arg0: string) => Promise<string>>) => void;
+}
+export interface ClassInterface$Inflight
+{
+  readonly bar: () => Promise<void>;
+}
+export interface InflightInterface
+{
+}
+export interface InflightInterface$Inflight
+{
+  readonly somethingFun: () => Promise<void>;
+}
+export class InflightClass implements InflightInterface
+{
+  constructor();
+  [$internal.INFLIGHT_SYMBOL]?: InflightClass$Inflight;
+}
+export class InflightClass$Inflight implements InflightInterface$Inflight
+{
+  constructor();
+  somethingFun: () => Promise<void>;
+}
+export class ParentClass extends std.Resource implements ClassInterface
+{
+  constructor(scope: $internal.Construct, id: string);
+  [$internal.INFLIGHT_SYMBOL]?: ParentClass$Inflight;
+  addHandler: (handler: $internal.Inflight<(arg0: string) => Promise<string>>) => void;
+}
+export class ParentClass$Inflight implements ClassInterface$Inflight
+{
+  constructor();
+  static static_method: () => Promise<InflightClass>;
+  bar: () => Promise<void>;
+}
+export class Child extends ParentClass implements ClassInterface
+{
+  constructor(scope: $internal.Construct, id: string);
+  [$internal.INFLIGHT_SYMBOL]?: Child$Inflight;
+}
+export class Child$Inflight extends ParentClass$Inflight implements ClassInterface$Inflight
+{
+  constructor();
+}
+```
+
diff --git a/libs/wingc/src/dtsify/snapshots/optionals.snap b/libs/wingc/src/dtsify/snapshots/optionals.snap
new file mode 100644
index 00000000000..deac88efa6f
--- /dev/null
+++ b/libs/wingc/src/dtsify/snapshots/optionals.snap
@@ -0,0 +1,136 @@
+---
+source: libs/wingc/src/dtsify/mod.rs
+---
+## Code
+
+```w
+
+pub struct Struct {
+  n: num?;
+}
+
+pub interface Interface {
+  method(s: Struct?): str;
+}
+
+pub interface ClassInterface {
+  addHandler(handler: inflight (str?): str, s: Struct?): void;
+}
+
+pub class ParentClass impl ClassInterface {
+  pub addHandler(handler: inflight (str?): str, s: Struct?) {}
+}
+
+```
+
+## inflight.ParentClass-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class ParentClass {
+    constructor({  }) {
+    }
+  }
+  return ParentClass;
+}
+//# sourceMappingURL=inflight.ParentClass-1.cjs.map
+```
+
+## preflight.cjs
+
+```js
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {
+  ...require("./preflight.lib-1.cjs"),
+};
+//# sourceMappingURL=preflight.cjs.map
+```
+
+## preflight.d.cts
+
+```js
+export * from "./preflight.lib-1.cjs"
+```
+
+## preflight.lib-1.cjs
+
+```js
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class ParentClass extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  addHandler(handler, s) {
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.ParentClass-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const ParentClassClient = ${ParentClass._toInflightType()};
+        const client = new ParentClassClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { ParentClass };
+//# sourceMappingURL=preflight.lib-1.cjs.map
+```
+
+## preflight.lib-1.d.cts
+
+```js
+import * as $internal from "@winglang/sdk/lib/core/types"
+import { std } from "@winglang/sdk"
+export interface Struct {
+  readonly n?: (number) | undefined;
+}
+export interface Interface
+{
+  readonly method: (s?: (Struct) | undefined) => string;
+}
+export interface Interface$Inflight
+{
+}
+export interface ClassInterface
+{
+  readonly addHandler: (handler: $internal.Inflight<(arg0?: (string) | undefined) => Promise<string>>, s?: (Struct) | undefined) => void;
+}
+export interface ClassInterface$Inflight
+{
+}
+export class ParentClass extends std.Resource implements ClassInterface
+{
+  constructor(scope: $internal.Construct, id: string);
+  [$internal.INFLIGHT_SYMBOL]?: ParentClass$Inflight;
+  addHandler: (handler: $internal.Inflight<(arg0?: (string) | undefined) => Promise<string>>, s?: (Struct) | undefined) => void;
+}
+export class ParentClass$Inflight implements ClassInterface$Inflight
+{
+  constructor();
+}
+```
+
diff --git a/libs/wingc/src/files.rs b/libs/wingc/src/files.rs
index b4558ed7d05..aade99d82fa 100644
--- a/libs/wingc/src/files.rs
+++ b/libs/wingc/src/files.rs
@@ -84,14 +84,38 @@ impl Files {
 				fs::create_dir_all(parent).map_err(FilesError::IoError)?;
 			}
 
-			let mut file = File::create(full_path).map_err(FilesError::IoError)?;
-			file.write_all(content.as_bytes()).map_err(FilesError::IoError)?;
-			file.flush().map_err(FilesError::IoError)?;
+			update_file(&full_path, content)?;
 		}
 		Ok(())
 	}
 }
 
+/// Write file to disk
+pub fn write_file(path: &Utf8Path, content: &str) -> Result<(), FilesError> {
+	let mut file = File::create(path).map_err(FilesError::IoError)?;
+	file.write_all(content.as_bytes()).map_err(FilesError::IoError)?;
+	file.flush().map_err(FilesError::IoError)?;
+	Ok(())
+}
+
+// Check if the content of a file is the same as existing content. If so, skip writing the file.
+pub fn update_file(path: &Utf8Path, content: &str) -> Result<(), FilesError> {
+	let Ok(existing_content) = fs::read(path) else {
+		return write_file(path, content);
+	};
+
+	if existing_content != content.as_bytes() {
+		write_file(path, content)
+	} else {
+		Ok(())
+	}
+}
+
+/// Remove file from the filesystem
+pub fn remove_file(path: &Utf8Path) -> Result<(), FilesError> {
+	fs::remove_file(path).map_err(FilesError::IoError)
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -146,6 +170,46 @@ mod tests {
 		assert_eq!(file2_content, "content2");
 	}
 
+	#[test]
+	fn test_emit_files_avoids_rewrites() {
+		let temp_dir = tempfile::tempdir().expect("Failed to create temporary directory");
+		let out_dir = Utf8Path::from_path(temp_dir.path()).expect("invalid unicode path");
+
+		write_file(&out_dir.join("file1"), "content1").expect("Failed to write file");
+
+		let file1_stat = out_dir.join("file1").metadata().expect("Failed to get file metadata");
+		let file1_modified = file1_stat.modified().expect("Failed to get file modified time");
+
+		let mut files = Files::new();
+		files
+			.add_file("file1", "content1".to_owned())
+			.expect("Failed to add file");
+		files
+			.add_file("file2", "content2".to_owned())
+			.expect("Failed to add file");
+
+		assert!(files.emit_files(out_dir).is_ok());
+
+		// Verify that the files were emitted correctly
+		let file1_path = &out_dir.join("file1");
+		let file2_path = out_dir.join("file2");
+		assert!(file1_path.exists());
+		assert!(file2_path.exists());
+
+		let file1_content = fs::read_to_string(file1_path).expect("Failed to read file");
+		let file2_content = fs::read_to_string(file2_path).expect("Failed to read file");
+		assert_eq!(file1_content, "content1");
+		assert_eq!(file2_content, "content2");
+
+		// Verify that file1 was not updated
+		let updated = file1_path
+			.metadata()
+			.expect("Failed to get file metadata")
+			.modified()
+			.expect("Failed to get file modified time");
+		assert_eq!(updated, file1_modified);
+	}
+
 	#[test]
 	fn test_emit_files_creates_intermediate_directories() {
 		let temp_dir = tempfile::tempdir().expect("Failed to create temporary directory");
@@ -165,4 +229,39 @@ mod tests {
 		let file1_content = fs::read_to_string(file1_path).expect("Failed to read file");
 		assert_eq!(file1_content, "content1");
 	}
+	#[test]
+	fn test_update_file() {
+		let temp_dir = tempfile::tempdir().expect("Failed to create temporary directory");
+		let out_dir = Utf8Path::from_path(temp_dir.path()).expect("invalid unicode path");
+
+		let file_path = out_dir.join("file");
+
+		// Write the file for the first time
+		assert!(update_file(&file_path, "content").is_ok());
+
+		// Update the file
+		let new_content = "new content";
+		assert!(update_file(&file_path, new_content).is_ok());
+
+		// Verify that the file was updated
+		let file_content = fs::read_to_string(file_path.clone()).expect("Failed to read file");
+		assert_eq!(file_content, new_content);
+		let last_updated = file_path
+			.metadata()
+			.expect("Failed to get file metadata")
+			.modified()
+			.expect("Failed to get file modified time");
+
+		// Try to update the file with the same content
+		assert!(update_file(&file_path, new_content).is_ok());
+
+		// Verify that the file was not updated (check the timestamps via stat)
+		let updated = file_path
+			.metadata()
+			.expect("Failed to get file metadata")
+			.modified()
+			.expect("Failed to get file modified time");
+
+		assert_eq!(updated, last_updated);
+	}
 }
diff --git a/libs/wingc/src/fold.rs b/libs/wingc/src/fold.rs
index 6fd2be08e12..5881d7487a3 100644
--- a/libs/wingc/src/fold.rs
+++ b/libs/wingc/src/fold.rs
@@ -1,9 +1,9 @@
 use crate::{
 	ast::{
-		ArgList, BringSource, CalleeKind, CatchBlock, Class, ClassField, ElifBlock, ElifLetBlock, Expr, ExprKind,
-		FunctionBody, FunctionDefinition, FunctionParameter, FunctionSignature, IfLet, Interface, InterpolatedString,
-		InterpolatedStringPart, Literal, New, Reference, Scope, Stmt, StmtKind, StructField, Symbol, TypeAnnotation,
-		TypeAnnotationKind, UserDefinedType,
+		ArgList, BringSource, CalleeKind, CatchBlock, Class, ClassField, ElifBlock, ElifLetBlock, Elifs, Enum,
+		ExplicitLift, Expr, ExprKind, FunctionBody, FunctionDefinition, FunctionParameter, FunctionSignature, IfLet,
+		Interface, InterpolatedString, InterpolatedStringPart, Intrinsic, LiftQualification, Literal, New, Reference,
+		Scope, Stmt, StmtKind, Struct, StructField, Symbol, TypeAnnotation, TypeAnnotationKind, UserDefinedType,
 	},
 	dbg_panic,
 };
@@ -24,12 +24,18 @@ pub trait Fold {
 	fn fold_class_field(&mut self, node: ClassField) -> ClassField {
 		fold_class_field(self, node)
 	}
+	fn fold_struct(&mut self, node: Struct) -> Struct {
+		fold_struct(self, node)
+	}
 	fn fold_struct_field(&mut self, node: StructField) -> StructField {
 		fold_struct_field(self, node)
 	}
 	fn fold_interface(&mut self, node: Interface) -> Interface {
 		fold_interface(self, node)
 	}
+	fn fold_enum(&mut self, node: Enum) -> Enum {
+		fold_enum(self, node)
+	}
 	fn fold_expr(&mut self, node: Expr) -> Expr {
 		fold_expr(self, node)
 	}
@@ -87,8 +93,8 @@ where
 				BringSource::TrustedModule(name, module_dir) => BringSource::TrustedModule(f.fold_symbol(name), module_dir),
 				BringSource::WingLibrary(name, module_dir) => BringSource::WingLibrary(f.fold_symbol(name), module_dir),
 				BringSource::JsiiModule(name) => BringSource::JsiiModule(f.fold_symbol(name)),
-				BringSource::WingFile(name) => BringSource::WingFile(f.fold_symbol(name)),
-				BringSource::Directory(name) => BringSource::Directory(f.fold_symbol(name)),
+				BringSource::WingFile(path) => BringSource::WingFile(path),
+				BringSource::Directory(path) => BringSource::Directory(path),
 			},
 			identifier: identifier.map(|id| f.fold_symbol(id)),
 		},
@@ -130,11 +136,21 @@ where
 			var_name: f.fold_symbol(var_name),
 			elif_statements: elif_statements
 				.into_iter()
-				.map(|elif_let_block| ElifLetBlock {
-					reassignable: elif_let_block.reassignable,
-					statements: f.fold_scope(elif_let_block.statements),
-					value: f.fold_expr(elif_let_block.value),
-					var_name: f.fold_symbol(elif_let_block.var_name),
+				.map(|elif_block| match elif_block {
+					Elifs::ElifBlock(elif_block) => {
+						return Elifs::ElifBlock(ElifBlock {
+							condition: f.fold_expr(elif_block.condition),
+							statements: f.fold_scope(elif_block.statements),
+						})
+					}
+					Elifs::ElifLetBlock(elif_let_block) => {
+						return Elifs::ElifLetBlock(ElifLetBlock {
+							reassignable: elif_let_block.reassignable,
+							statements: f.fold_scope(elif_let_block.statements),
+							value: f.fold_expr(elif_let_block.value),
+							var_name: f.fold_symbol(elif_let_block.var_name),
+						});
+					}
 				})
 				.collect(),
 			else_statements: else_statements.map(|statements| f.fold_scope(statements)),
@@ -169,22 +185,8 @@ where
 		StmtKind::Scope(scope) => StmtKind::Scope(f.fold_scope(scope)),
 		StmtKind::Class(class) => StmtKind::Class(f.fold_class(class)),
 		StmtKind::Interface(interface) => StmtKind::Interface(f.fold_interface(interface)),
-		StmtKind::Struct {
-			name,
-			extends,
-			fields,
-			access,
-		} => StmtKind::Struct {
-			name: f.fold_symbol(name),
-			extends: extends.into_iter().map(|e| f.fold_user_defined_type(e)).collect(),
-			fields: fields.into_iter().map(|field| f.fold_struct_field(field)).collect(),
-			access,
-		},
-		StmtKind::Enum { name, values, access } => StmtKind::Enum {
-			name: f.fold_symbol(name),
-			values: values.into_iter().map(|value| f.fold_symbol(value)).collect(),
-			access,
-		},
+		StmtKind::Struct(st) => StmtKind::Struct(f.fold_struct(st)),
+		StmtKind::Enum(enu) => StmtKind::Enum(f.fold_enum(enu)),
 		StmtKind::TryCatch {
 			try_statements,
 			catch_block,
@@ -201,11 +203,23 @@ where
 		StmtKind::SuperConstructor { arg_list } => StmtKind::SuperConstructor {
 			arg_list: f.fold_args(arg_list),
 		},
+		StmtKind::ExplicitLift(explicit_lift) => StmtKind::ExplicitLift(ExplicitLift {
+			qualifications: explicit_lift
+				.qualifications
+				.into_iter()
+				.map(|q| LiftQualification {
+					obj: f.fold_expr(q.obj),
+					ops: q.ops.into_iter().map(|op| f.fold_symbol(op)).collect(),
+				})
+				.collect(),
+			statements: f.fold_scope(explicit_lift.statements),
+		}),
 	};
 	Stmt {
 		kind,
 		span: node.span,
 		idx: node.idx,
+		doc: node.doc,
 	}
 }
 
@@ -232,6 +246,7 @@ where
 		phase: node.phase,
 		inflight_initializer: f.fold_function_definition(node.inflight_initializer),
 		access: node.access,
+		auto_id: node.auto_id,
 	}
 }
 
@@ -246,6 +261,7 @@ where
 		phase: node.phase,
 		is_static: node.is_static,
 		access: node.access,
+		doc: node.doc,
 	}
 }
 
@@ -256,6 +272,7 @@ where
 	StructField {
 		name: f.fold_symbol(node.name),
 		member_type: f.fold_type_annotation(node.member_type),
+		doc: node.doc,
 	}
 }
 
@@ -268,7 +285,7 @@ where
 		methods: node
 			.methods
 			.into_iter()
-			.map(|(name, sig)| (f.fold_symbol(name), f.fold_function_signature(sig)))
+			.map(|(name, sig, doc)| (f.fold_symbol(name), f.fold_function_signature(sig), doc))
 			.collect(),
 		extends: node
 			.extends
@@ -276,6 +293,34 @@ where
 			.map(|interface| f.fold_user_defined_type(interface))
 			.collect(),
 		access: node.access,
+		phase: node.phase,
+	}
+}
+
+pub fn fold_struct<F>(f: &mut F, node: Struct) -> Struct
+where
+	F: Fold + ?Sized,
+{
+	Struct {
+		name: f.fold_symbol(node.name),
+		extends: node.extends.into_iter().map(|e| f.fold_user_defined_type(e)).collect(),
+		fields: node
+			.fields
+			.into_iter()
+			.map(|field| f.fold_struct_field(field))
+			.collect(),
+		access: node.access,
+	}
+}
+
+pub fn fold_enum<F>(f: &mut F, node: Enum) -> Enum
+where
+	F: Fold + ?Sized,
+{
+	Enum {
+		name: f.fold_symbol(node.name),
+		values: node.values.into_iter().map(|v| (f.fold_symbol(v.0), v.1)).collect(),
+		access: node.access,
 	}
 }
 
@@ -292,6 +337,11 @@ where
 			end: Box::new(f.fold_expr(*end)),
 		},
 		ExprKind::Reference(reference) => ExprKind::Reference(f.fold_reference(reference)),
+		ExprKind::Intrinsic(intrinsic) => ExprKind::Intrinsic(Intrinsic {
+			arg_list: intrinsic.arg_list.map(|arg_list| f.fold_args(arg_list)),
+			name: f.fold_symbol(intrinsic.name),
+			kind: intrinsic.kind,
+		}),
 		ExprKind::Call { callee, arg_list } => ExprKind::Call {
 			callee: match callee {
 				CalleeKind::Expr(expr) => CalleeKind::Expr(Box::new(f.fold_expr(*expr))),
@@ -391,6 +441,7 @@ where
 		Literal::Boolean(x) => Literal::Boolean(x),
 		Literal::Number(x) => Literal::Number(x),
 		Literal::String(x) => Literal::String(x),
+		Literal::NonInterpolatedString(x) => Literal::NonInterpolatedString(x),
 		Literal::Nil => Literal::Nil,
 	}
 }
@@ -414,6 +465,10 @@ where
 			type_name: f.fold_user_defined_type(type_name),
 			property: f.fold_symbol(property),
 		},
+		Reference::ElementAccess { object, index } => Reference::ElementAccess {
+			object: Box::new(f.fold_expr(*object)),
+			index: Box::new(f.fold_expr(*index)),
+		},
 	}
 }
 
@@ -431,6 +486,7 @@ where
 		is_static: node.is_static,
 		span: node.span,
 		access: node.access,
+		doc: node.doc,
 	}
 }
 
@@ -473,6 +529,7 @@ where
 			.map(|(name, arg)| (f.fold_symbol(name), f.fold_expr(arg)))
 			.collect(),
 		span: node.span,
+		id: node.id,
 	}
 }
 
diff --git a/libs/wingc/src/jsify.rs b/libs/wingc/src/jsify.rs
index f1f08ee43e9..c6539e5076a 100644
--- a/libs/wingc/src/jsify.rs
+++ b/libs/wingc/src/jsify.rs
@@ -6,51 +6,61 @@ use camino::{Utf8Path, Utf8PathBuf};
 use const_format::formatcp;
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
+use parcel_sourcemap::utils::make_relative_path;
 
 use std::{borrow::Borrow, cell::RefCell, cmp::Ordering, collections::BTreeMap, vec};
 
 use crate::{
 	ast::{
-		AccessModifier, ArgList, AssignmentKind, BinaryOperator, BringSource, CalleeKind, Class as AstClass, ElifLetBlock,
-		Expr, ExprKind, FunctionBody, FunctionDefinition, IfLet, InterpolatedStringPart, Literal, New, Phase, Reference,
-		Scope, Stmt, StmtKind, Symbol, UnaryOperator, UserDefinedType,
+		AccessModifier, ArgList, AssignmentKind, BinaryOperator, BringSource, CalleeKind, Class as AstClass, Elifs, Enum,
+		Expr, ExprKind, FunctionBody, FunctionDefinition, IfLet, InterpolatedStringPart, IntrinsicKind, Literal, New,
+		Phase, Reference, Scope, Stmt, StmtKind, Symbol, UnaryOperator, UserDefinedType,
 	},
 	comp_ctx::{CompilationContext, CompilationPhase},
 	dbg_panic,
 	diagnostic::{report_diagnostic, Diagnostic, WingSpan},
+	dtsify::extern_dtsify::ExternDTSifier,
 	file_graph::FileGraph,
 	files::Files,
-	parser::is_entrypoint_file,
+	parser::{is_entrypoint_file, normalize_path},
 	type_check::{
 		is_udt_struct_type,
-		lifts::{Liftable, Lifts},
+		lifts::{LiftQualification, Liftable, Lifts},
 		resolve_super_method, resolve_user_defined_type,
-		symbol_env::SymbolEnv,
-		ClassLike, Type, TypeRef, Types, VariableKind, CLASS_INFLIGHT_INIT_NAME,
+		symbol_env::{SymbolEnv, SymbolEnvKind},
+		ClassLike, Type, TypeRef, Types, CLASS_INFLIGHT_INIT_NAME,
 	},
 	visit_context::{VisitContext, VisitorWithContext},
-	MACRO_REPLACE_ARGS, MACRO_REPLACE_ARGS_TEXT, MACRO_REPLACE_SELF, WINGSDK_ASSEMBLY_NAME, WINGSDK_RESOURCE,
-	WINGSDK_STD_MODULE,
+	MACRO_REPLACE_ARGS, MACRO_REPLACE_ARGS_TEXT, MACRO_REPLACE_SELF, WINGSDK_ASSEMBLY_NAME, WINGSDK_AUTOID_RESOURCE,
+	WINGSDK_RESOURCE, WINGSDK_STD_MODULE,
 };
 
 use self::codemaker::CodeMaker;
 
-const PREFLIGHT_FILE_NAME: &str = "preflight.js";
+const PREFLIGHT_FILE_NAME: &str = "preflight.cjs";
 
 const STDLIB: &str = "$stdlib";
 const STDLIB_CORE: &str = formatcp!("{STDLIB}.core");
 const STDLIB_CORE_RESOURCE: &str = formatcp!("{}.{}", STDLIB, WINGSDK_RESOURCE);
+const STDLIB_CORE_AUTOID_RESOURCE: &str = formatcp!("{}.{}", STDLIB, WINGSDK_AUTOID_RESOURCE);
 const STDLIB_MODULE: &str = WINGSDK_ASSEMBLY_NAME;
 
 const ENV_WING_IS_TEST: &str = "$wing_is_test";
 const OUTDIR_VAR: &str = "$outdir";
 const PLATFORMS_VAR: &str = "$platforms";
+const HELPERS_VAR: &str = "$helpers";
+const EXTERN_VAR: &str = "$extern";
 
 const ROOT_CLASS: &str = "$Root";
 const JS_CONSTRUCTOR: &str = "constructor";
+const NODE_MODULES_DIR: &str = "node_modules";
+const NODE_MODULES_SCOPE_SPECIFIER: &str = "@";
+const __DIRNAME: &str = "__dirname";
 
 const SUPER_CLASS_INFLIGHT_INIT_NAME: &str = formatcp!("super_{CLASS_INFLIGHT_INIT_NAME}");
 
+const SCOPE_PARAM: &str = "$scope";
+
 pub struct JSifyContext<'a> {
 	pub lifts: Option<&'a Lifts>,
 	pub visit_ctx: &'a mut VisitContext,
@@ -62,7 +72,7 @@ pub struct JSifier<'a> {
 	/// Store the output files here.
 	pub output_files: RefCell<Files>,
 	/// Stored struct schemas that are referenced in the code.
-	pub referenced_struct_schemas: RefCell<BTreeMap<String, CodeMaker>>,
+	pub referenced_struct_schemas: RefCell<IndexMap<Utf8PathBuf, BTreeMap<String, CodeMaker>>>,
 	/// Counter for generating unique preflight file names.
 	preflight_file_counter: RefCell<usize>,
 
@@ -72,12 +82,13 @@ pub struct JSifier<'a> {
 	inflight_file_map: RefCell<IndexMap<String, usize>>,
 
 	/// Map from source file paths to the JS file names they are emitted to.
-	/// e.g. "bucket.w" -> "preflight.bucket-1.js"
-	preflight_file_map: RefCell<IndexMap<Utf8PathBuf, String>>,
+	/// e.g. "bucket.w" -> "preflight.bucket-1.cjs"
+	pub preflight_file_map: RefCell<IndexMap<Utf8PathBuf, String>>,
 	source_files: &'a Files,
 	source_file_graph: &'a FileGraph,
 	/// The path that compilation started at (file or directory)
 	compilation_init_path: &'a Utf8Path,
+	out_dir: &'a Utf8Path,
 }
 
 impl VisitorWithContext for JSifyContext<'_> {
@@ -89,6 +100,7 @@ impl VisitorWithContext for JSifyContext<'_> {
 /// Preflight classes have two types of host binding methods:
 /// `Type` for binding static fields and methods to the host and
 /// `instance` for binding instance fields and methods to the host.
+#[derive(PartialEq, Eq)]
 enum BindMethod {
 	Type,
 	Instance,
@@ -100,6 +112,7 @@ impl<'a> JSifier<'a> {
 		source_files: &'a Files,
 		source_file_graph: &'a FileGraph,
 		compilation_init_path: &'a Utf8Path,
+		out_dir: &'a Utf8Path,
 	) -> Self {
 		let output_files = Files::default();
 		Self {
@@ -107,7 +120,8 @@ impl<'a> JSifier<'a> {
 			source_files,
 			source_file_graph,
 			compilation_init_path,
-			referenced_struct_schemas: RefCell::new(BTreeMap::new()),
+			out_dir,
+			referenced_struct_schemas: RefCell::new(IndexMap::new()),
 			inflight_file_counter: RefCell::new(0),
 			inflight_file_map: RefCell::new(IndexMap::new()),
 			preflight_file_counter: RefCell::new(0),
@@ -130,9 +144,12 @@ impl<'a> JSifier<'a> {
 		jsify_context.visit_ctx.push_env(self.types.get_scope_env(&scope));
 		for statement in scope.statements.iter().sorted_by(|a, b| match (&a.kind, &b.kind) {
 			// Put type definitions first so JS won't complain of unknown types
-			(StmtKind::Class(AstClass { .. }), StmtKind::Class(AstClass { .. })) => Ordering::Equal,
-			(StmtKind::Class(AstClass { .. }), _) => Ordering::Less,
-			(_, StmtKind::Class(AstClass { .. })) => Ordering::Greater,
+			(StmtKind::Enum(_), StmtKind::Enum(_)) => Ordering::Equal,
+			(StmtKind::Enum(_), _) => Ordering::Less,
+			(_, StmtKind::Enum(_)) => Ordering::Greater,
+			(StmtKind::Class(_), StmtKind::Class(_)) => Ordering::Equal,
+			(StmtKind::Class(_), _) => Ordering::Less,
+			(_, StmtKind::Class(_)) => Ordering::Greater,
 			_ => Ordering::Equal,
 		}) {
 			let scope_env = self.types.get_scope_env(&scope);
@@ -156,8 +173,9 @@ impl<'a> JSifier<'a> {
 
 		output.line("\"use strict\";");
 
+		output.line(format!("const {STDLIB} = require('{STDLIB_MODULE}');"));
+
 		if is_entrypoint {
-			output.line(format!("const {} = require('{}');", STDLIB, STDLIB_MODULE));
 			output.line(format!(
 				"const {} = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);",
 				PLATFORMS_VAR
@@ -167,20 +185,22 @@ impl<'a> JSifier<'a> {
 				"const {} = process.env.WING_IS_TEST === \"true\";",
 				ENV_WING_IS_TEST
 			));
-		} else {
-			output.open(format!("module.exports = function({{ {} }}) {{", STDLIB));
 		}
 
 		// "std" is implicitly imported
 		output.line(format!("const std = {STDLIB}.{WINGSDK_STD_MODULE};"));
+		output.line(format!("const {HELPERS_VAR} = {STDLIB}.helpers;"));
+		output.line(format!(
+			"const {EXTERN_VAR} = {HELPERS_VAR}.createExternRequire({__DIRNAME});"
+		));
 		output.add_code(imports);
 
 		if is_entrypoint {
 			let mut root_class = CodeMaker::default();
 			root_class.open(format!("class {} extends {} {{", ROOT_CLASS, STDLIB_CORE_RESOURCE));
-			root_class.open(format!("{JS_CONSTRUCTOR}($scope, $id) {{"));
-			root_class.line("super($scope, $id);");
-			root_class.add_code(self.jsify_struct_schemas());
+			root_class.open(format!("{JS_CONSTRUCTOR}({SCOPE_PARAM}, $id) {{"));
+			root_class.line(format!("super({SCOPE_PARAM}, $id);"));
+			root_class.add_code(self.jsify_struct_schemas(source_path));
 			root_class.add_code(js);
 			root_class.close("}");
 			root_class.close("}");
@@ -203,37 +223,34 @@ impl<'a> JSifier<'a> {
 			// supposing a directory has two files and two subdirectories in it,
 			// we generate code like this:
 			// ```
-			// return {
-			//   inner_directory1: require("./preflight.inner-directory1.js")({ $stdlib }),
-			//   inner_directory2: require("./preflight.inner-directory2.js")({ $stdlib }),
-			//   ...require("./preflight.inner-file1.js")({ $stdlib }),
-			//   ...require("./preflight.inner-file2.js")({ $stdlib }),
+			// module.exports = {
+			//   get inner_directory1() { return require("./preflight.inner-directory1.cjs") },
+			//   get inner_directory2() { return require("./preflight.inner-directory2.cjs") },
+			//   ...require("./preflight.inner-file1.cjs"),
+			//   ...require("./preflight.inner-file2.cjs"),
 			// };
 			// ```
-			output.open("return {");
+			output.open("module.exports = {");
 			for file in directory_children {
 				let preflight_file_name = preflight_file_map.get(file).expect("no emitted JS file found");
 				if file.is_dir() {
 					let directory_name = file.file_stem().unwrap();
 					output.line(format!(
-						"{}: require(\"./{}\")({{ {} }}),",
-						directory_name, preflight_file_name, STDLIB
+						"get {directory_name}() {{ return require(\"./{preflight_file_name}\") }},"
 					));
 				} else {
-					output.line(format!("...require(\"./{}\")({{ {} }}),", preflight_file_name, STDLIB));
+					output.line(format!("...require(\"./{preflight_file_name}\"),"));
 				}
 			}
 			output.close("};");
-			output.close("};");
 		} else {
-			output.add_code(self.jsify_struct_schemas());
+			output.add_code(self.jsify_struct_schemas(source_path));
 			output.add_code(js);
 			let exports = get_public_symbols(&scope);
 			output.line(format!(
-				"return {{ {} }};",
+				"module.exports = {{ {} }};",
 				exports.iter().map(ToString::to_string).join(", ")
 			));
-			output.close("};");
 		}
 
 		// Generate a name for the JS file this preflight code will be written to
@@ -250,7 +267,7 @@ impl<'a> JSifier<'a> {
 			// add a number to the end to avoid name collisions
 			let mut preflight_file_counter = self.preflight_file_counter.borrow_mut();
 			*preflight_file_counter += 1;
-			format!("preflight.{}-{}.js", sanitized_name, preflight_file_counter)
+			format!("preflight.{}-{}.cjs", sanitized_name, preflight_file_counter)
 		};
 
 		// Store the file name in a map so if anyone tries to "bring" it as a module,
@@ -265,7 +282,11 @@ impl<'a> JSifier<'a> {
 		let source_content = self.source_files.get_file(source_path.as_str()).unwrap();
 
 		let output_base = output.to_string();
-		let output_sourcemap = output.generate_sourcemap(source_path.as_str(), source_content, &preflight_file_name);
+		let output_sourcemap = output.generate_sourcemap(
+			&make_relative_path(self.out_dir.as_str(), source_path.as_str()),
+			source_content,
+			&preflight_file_name,
+		);
 
 		// Emit the file
 		match self
@@ -286,13 +307,17 @@ impl<'a> JSifier<'a> {
 		}
 	}
 
-	fn jsify_struct_schemas(&self) -> CodeMaker {
+	fn jsify_struct_schemas(&self, source_path: &Utf8Path) -> CodeMaker {
 		// For each struct schema that is referenced in the code
 		// (this is determined by the StructSchemaVisitor before jsification starts)
 		// we write an inline call to stdlib struct class to instantiate the schema object
 		// preflight root class.
 		let mut code = CodeMaker::default();
-		for (name, schema_code) in self.referenced_struct_schemas.borrow().iter() {
+		let file_schemas = self.referenced_struct_schemas.borrow();
+		let Some(file_schemas) = file_schemas.get(source_path) else {
+			return code;
+		};
+		for (name, schema_code) in file_schemas.iter() {
 			let flat_name = name.replace(".", "_");
 
 			code.line(format!(
@@ -318,7 +343,7 @@ impl<'a> JSifier<'a> {
 		code
 	}
 
-	fn jsify_reference(&self, reference: &Reference, ctx: &mut JSifyContext) -> CodeMaker {
+	pub fn jsify_reference(&self, reference: &Reference, ctx: &mut JSifyContext) -> CodeMaker {
 		match reference {
 			Reference::Identifier(identifier) => new_code!(&identifier.span, &identifier.name),
 			Reference::InstanceMember {
@@ -339,6 +364,14 @@ impl<'a> JSifier<'a> {
 					&property.name
 				)
 			}
+			Reference::ElementAccess { object, index } => new_code!(
+				&object.span,
+				"$helpers.lookup(",
+				self.jsify_expression(object, ctx),
+				", ",
+				self.jsify_expression(index, ctx),
+				")"
+			),
 		}
 	}
 
@@ -373,7 +406,7 @@ impl<'a> JSifier<'a> {
 			));
 		}
 
-		if !structure_args.is_empty() {
+		if !structure_args.is_empty() || self.types.append_empty_struct_to_arglist.contains(&arg_list.id) {
 			args.push(new_code!(&arg_list.span, "{ ", structure_args, " }"));
 		}
 
@@ -485,7 +518,24 @@ impl<'a> JSifier<'a> {
 					if let Some(scope) = obj_scope {
 						Some(self.jsify_expression(scope, ctx).to_string())
 					} else {
-						Some("this".to_string())
+						// If the current method has an implicit scope arg then use it, if not we can assume `this` is available
+						if ctx.visit_ctx.current_method_env().map_or(false, |e| {
+							let SymbolEnvKind::Function { sig, .. } = e.kind else {
+								panic!("Method env not a function env");
+							};
+							sig.as_function_sig().unwrap().implicit_scope_param
+						}) {
+							Some(SCOPE_PARAM.to_string())
+						} else {
+							// By default use `this` as the scope.
+							// If we're inside an argument to a `super()` call then `this` isn't avialble, in which case
+							// we can safely use the ctor's `$scope` arg.
+							if ctx.visit_ctx.current_stmt_is_super_call() {
+								Some(SCOPE_PARAM.to_string())
+							} else {
+								Some("this".to_string())
+							}
+						}
 					}
 				} else {
 					None
@@ -495,7 +545,11 @@ impl<'a> JSifier<'a> {
 					Some(if let Some(id_exp) = obj_id {
 						self.jsify_expression(id_exp, ctx).to_string()
 					} else {
-						format!("\"{}\"", ctor.to_string())
+						// take only the last part of the fully qualified name (the class name) because any
+						// leading parts like the namespace are volatile and can be changed easily by the user
+						let s = ctor.to_string();
+						let class_name = s.split(".").last().unwrap().to_string();
+						format!("\"{}\"", class_name)
 					})
 				} else {
 					None
@@ -509,10 +563,10 @@ impl<'a> JSifier<'a> {
 					match scope.clone() {
 						None => None,
 						Some(scope) => Some(if scope == "this" {
-								"this".to_string()
-							} else {
-								"$scope".to_string()
-							})
+							"this".to_string()
+						} else {
+							SCOPE_PARAM.to_string()
+						}),
 					}
 				};
 
@@ -528,7 +582,18 @@ impl<'a> JSifier<'a> {
 
 					// if a scope is defined, use it to find the root object, otherwise use "this"
 					if node_scope != "this" {
-						new_code!(expr_span, "($scope => $scope.node.root.new(\"", fqn, "\", ", ctor, ", ", args, "))(", node_scope, ")")
+						new_code!(
+							expr_span,
+							format!("({SCOPE_PARAM} => {SCOPE_PARAM}.node.root.new(\""),
+							fqn,
+							"\", ",
+							ctor,
+							", ",
+							args,
+							"))(",
+							node_scope,
+							")"
+						)
 					} else {
 						new_code!(expr_span, "this.node.root.new(\"", fqn, "\", ", ctor, ", ", args, ")")
 					}
@@ -559,9 +624,16 @@ impl<'a> JSifier<'a> {
 			}
 			ExprKind::Literal(lit) => match lit {
 				Literal::Nil => new_code!(expr_span, "undefined"),
+				Literal::NonInterpolatedString(s) => {
+					// escape newlines
+					let s = s.replace("\r", "\\r").replace("\n", "\\n");
+					new_code!(expr_span, s)
+				}
 				Literal::String(s) => {
 					// Unescape our string interpolation braces because in JS they don't need escaping
 					let s = s.replace("\\{", "{");
+					// escape newlines
+					let s = s.replace("\r", "\\r").replace("\n", "\\n");
 					new_code!(expr_span, s)
 				}
 				Literal::InterpolatedString(s) => {
@@ -570,6 +642,8 @@ impl<'a> JSifier<'a> {
 						.iter()
 						.filter_map(|p| match p {
 							InterpolatedStringPart::Static(static_string) => {
+								// Unescape our string interpolation braces because in JS they don't need escaping
+								let static_string = static_string.replace("\\{", "{");
 								// escape any raw newlines in the string because js `"` strings can't contain them
 								let escaped = static_string.replace("\r\n", "\\r\\n").replace("\n", "\\n");
 
@@ -597,29 +671,208 @@ impl<'a> JSifier<'a> {
 				Literal::Number(n) => new_code!(expr_span, n.to_string()),
 				Literal::Boolean(b) => new_code!(expr_span, (if *b { "true" } else { "false" }).to_string()),
 			},
-			ExprKind::Range { start, inclusive, end } => match ctx.visit_ctx.current_phase() {
-				Phase::Inflight => new_code!(expr_span,
-					"((s,e,i) => { function* iterator(start,end,inclusive) { let i = start; let limit = inclusive ? ((end < start) ? end - 1 : end + 1) : end; while (i < limit) yield i++; while (i > limit) yield i--; }; return iterator(s,e,i); })(",
-					self.jsify_expression(start, ctx),
-					",",
-					self.jsify_expression(end, ctx),
-					",",
-					inclusive.unwrap().to_string(),
-					")"
-				),
-				_ => new_code!(
-					expr_span,
-					STDLIB,
-					".std.Range.of(",
-					self.jsify_expression(start, ctx),
-					", ",
-					self.jsify_expression(end, ctx),
-					", ",
-					inclusive.unwrap().to_string(),
-					")"
-				),
-			},
+			ExprKind::Range { start, inclusive, end } => new_code!(
+				expr_span,
+				format!("{HELPERS_VAR}.range("),
+				self.jsify_expression(start, ctx),
+				",",
+				self.jsify_expression(end, ctx),
+				",",
+				inclusive.unwrap().to_string(),
+				")"
+			),
 			ExprKind::Reference(_ref) => new_code!(expr_span, self.jsify_reference(&_ref, ctx)),
+			ExprKind::Intrinsic(intrinsic) => match intrinsic.kind {
+				IntrinsicKind::Unknown => new_code!(expr_span, ""),
+				IntrinsicKind::Dirname => {
+					let Some(source_path) = ctx.source_path else {
+						// Only happens inflight, so we can assume an error was caught earlier
+						return new_code!(expr_span, "");
+					};
+					let relative_source_path = make_relative_path(
+						self.out_dir.as_str(),
+						source_path
+							.parent()
+							.expect("source path is file in a directory")
+							.as_str(),
+					);
+					new_code!(
+						expr_span,
+						HELPERS_VAR,
+						".resolveDirname(",
+						__DIRNAME,
+						", \"",
+						relative_source_path,
+						"\")"
+					)
+				}
+				IntrinsicKind::Inflight => {
+					let arg_list = intrinsic.arg_list.as_ref().unwrap();
+
+					let mut export_name = new_code!(&expression.span, "\"default\"");
+					let mut lifts: IndexMap<String, (&Expr, Option<&Vec<Expr>>, CodeMaker)> = IndexMap::new();
+					for x in &arg_list.named_args {
+						if x.0.name == "export" {
+							export_name = self.jsify_expression(&x.1, ctx);
+						} else if x.0.name == "lifts" {
+							let items = match &x.1.kind {
+								ExprKind::JsonLiteral { element, .. } => {
+									if let ExprKind::ArrayLiteral { items, .. } = &element.kind {
+										items
+									} else {
+										panic!("Must specify an statically-known array of lifts");
+									}
+								}
+								ExprKind::ArrayLiteral { items, .. } => items,
+								_ => {
+									report_diagnostic(Diagnostic {
+										message: "Must specify an statically-known array of lifts".to_string(),
+										annotations: vec![],
+										hints: vec![],
+										span: Some(x.1.span.clone()),
+									});
+									continue;
+								}
+							};
+							for item in items {
+								if let ExprKind::JsonLiteral { element, .. } = &item.kind {
+									if let ExprKind::JsonMapLiteral { fields } = &element.kind {
+										let Some(obj_expression) = fields.get("obj") else {
+											report_diagnostic(Diagnostic {
+												message: "Must specify an \"obj\" to lift".to_string(),
+												annotations: vec![],
+												hints: vec![],
+												span: Some(item.span.clone()),
+											});
+											continue;
+										};
+										let ops = fields.get("ops").and_then(|ops| {
+											if let ExprKind::ArrayLiteral { items, .. } = &ops.kind {
+												Some(items)
+											} else {
+												None
+											}
+										});
+
+										let alias = if let Some(alias) = fields.get("alias") {
+											if let Some(alias) = alias.as_static_string() {
+												alias.to_string()
+											} else {
+												report_diagnostic(Diagnostic {
+													message: "\"alias\" must be a non-interpolated string literal".to_string(),
+													annotations: vec![],
+													hints: vec![],
+													span: Some(alias.span.clone()),
+												});
+												continue;
+											}
+										} else {
+											match &obj_expression.kind {
+												ExprKind::Reference(reference) => {
+													if let Reference::Identifier(identifier) = reference {
+														identifier.name.clone()
+													} else {
+														report_diagnostic(Diagnostic {
+															message: "Must specify an \"alias\"  for a non-identifier reference".to_string(),
+															annotations: vec![],
+															hints: vec![],
+															span: Some(obj_expression.span.clone()),
+														});
+														continue;
+													}
+												}
+												_ => {
+													report_diagnostic(Diagnostic {
+														message: "Must specify an \"alias\" to lift this expression".to_string(),
+														annotations: vec![],
+														hints: vec![],
+														span: Some(obj_expression.span.clone()),
+													});
+													continue;
+												}
+											}
+										};
+
+										// manually build the expression to inject the alias
+										let mut expr_text = CodeMaker::default();
+										expr_text.append("({ obj: ");
+										expr_text.append(self.jsify_expression(obj_expression, ctx));
+										if let Some(ops) = ops {
+											expr_text.append(", ops: [");
+											for op in ops {
+												expr_text.append(self.jsify_expression(op, ctx));
+												expr_text.append(", ");
+											}
+											expr_text.append("]");
+										}
+										expr_text.append(", alias: \"");
+										expr_text.append(&alias);
+										expr_text.append("\" })");
+
+										lifts.insert(alias, (obj_expression, ops, expr_text));
+									}
+								}
+							}
+						}
+					}
+
+					let mut dts = ExternDTSifier::new(self.types);
+					let function_type = self.types.get_expr_type(expression);
+					let function_type = self.types.maybe_unwrap_inference(function_type);
+					let shim = dts.dtsify_inflight(&function_type, &lifts);
+
+					let inflight_absolute_path = if let Some(ss) = &arg_list.pos_args[0].as_static_string() {
+						let extern_path = Utf8Path::new(&ss);
+
+						// TODO Warn if path does not exist or create it automatically?
+						normalize_path(extern_path, ctx.source_path)
+					} else {
+						report_diagnostic(Diagnostic {
+							message: "Inflight path must be a non-interpolated string literal".to_string(),
+							span: Some(arg_list.pos_args[0].span.clone()),
+							annotations: vec![],
+							hints: vec![],
+						});
+
+						return CodeMaker::default();
+					};
+					let shim_path = inflight_absolute_path
+						.with_file_name(format!(".{}", inflight_absolute_path.file_name().unwrap()))
+						.with_extension("inflight.ts");
+					let shim_path = make_relative_path(self.out_dir.as_str(), shim_path.as_str());
+
+					self
+						.output_files
+						.borrow_mut()
+						.add_file(&shim_path, shim.to_string())
+						.unwrap();
+
+					let mut lift_string = new_code!(expr_span, STDLIB_CORE, ".importInflight(");
+
+					let require_path = self.get_require_path(&inflight_absolute_path, expr_span);
+					if let Some(require_path) = require_path {
+						lift_string.append("`require('");
+						lift_string.append(require_path);
+						lift_string.append("')[");
+						lift_string.append(export_name);
+						lift_string.append("]`");
+					}
+
+					if arg_list.named_args.get("lifts").is_some() {
+						let list = lifts
+							.iter()
+							.map(|(.., (.., expr_code))| expr_code.clone())
+							.collect_vec();
+						lift_string.append(", [");
+						lift_string.append(CodeMaker::from(list));
+						lift_string.append("]");
+					}
+
+					lift_string.append(")");
+
+					return lift_string;
+				}
+			},
 			ExprKind::Call { callee, arg_list } => {
 				let function_type = match callee {
 					CalleeKind::Expr(expr) => self.types.get_expr_type(expr),
@@ -632,11 +885,13 @@ impl<'a> JSifier<'a> {
 				let is_option = function_type.is_option();
 				let function_type = function_type.maybe_unwrap_option();
 				let function_sig = function_type.as_function_sig();
+
 				let expr_string = match callee {
 					CalleeKind::Expr(expr) => self.jsify_expression(expr, ctx).to_string(),
 					CalleeKind::SuperCall(method) => format!("super.{}", method),
 				};
-				let args_string = self.jsify_arg_list(&arg_list, None, None, ctx).to_string();
+				let mut args_string = self.jsify_arg_list(&arg_list, None, None, ctx).to_string();
+
 				let mut args_text_string = lookup_span(&arg_list.span, &self.source_files);
 				if args_text_string.len() > 0 {
 					// remove the parens
@@ -673,13 +928,47 @@ impl<'a> JSifier<'a> {
 						let ac = AhoCorasick::new(patterns).expect("Failed to create macro pattern");
 						return new_code!(expr_span, ac.replace_all(js_override, replace_with));
 					}
+
+					// If this function requires an implicit scope argument, we need to add it to the args string
+					if function_sig.implicit_scope_param {
+						// If the current function we're in also has an implicit scope parameter then use it
+						// TODO: make a helper function to get the `current_function_type`
+						let implicit_scope_arg_available = ctx.visit_ctx.current_function_env().map_or(false, |e| {
+							if let SymbolEnvKind::Function { sig, .. } = e.kind {
+								sig.as_function_sig().expect("a function sig").implicit_scope_param
+							} else {
+								false
+							}
+						});
+
+						let prepend_scope_arg = if implicit_scope_arg_available {
+							SCOPE_PARAM.to_string()
+						} else {
+							// Otherwise, we can just use `this`. We can assume `this` is available since othesize we should have had an implicit scope arg available.
+							"this".to_string()
+						};
+						if args_string.len() > 0 {
+							args_string = format!("{}, {}", prepend_scope_arg, args_string);
+						} else {
+							args_string = prepend_scope_arg;
+						}
+					}
 				}
 
 				let optional_access = if is_option { "?." } else { "" };
 
 				// NOTE: if the expression is a "handle" class, the object itself is callable (see
 				// `jsify_class_inflight` below), so we can just call it as-is.
-				new_code!(expr_span, "(", auto_await, expr_string, optional_access, "(", args_string, "))")
+				new_code!(
+					expr_span,
+					"(",
+					auto_await,
+					expr_string,
+					optional_access,
+					"(",
+					args_string,
+					"))"
+				)
 			}
 			ExprKind::Unary { op, exp } => {
 				let js_exp = self.jsify_expression(exp, ctx);
@@ -690,6 +979,9 @@ impl<'a> JSifier<'a> {
 						// We use the abstract inequality operator here because we want to check for null or undefined
 						new_code!(expr_span, "((", js_exp, ") != null)")
 					}
+					UnaryOperator::OptionalUnwrap => {
+						new_code!(expr_span, "$helpers.unwrap(", js_exp, ")")
+					}
 				}
 			}
 			ExprKind::Binary { op, left, right } => {
@@ -701,21 +993,15 @@ impl<'a> JSifier<'a> {
 					BinaryOperator::Sub => "-",
 					BinaryOperator::Mul => "*",
 					BinaryOperator::Div => "/",
-					BinaryOperator::FloorDiv => {
-						return new_code!(expr_span, "Math.trunc(", js_left, " / ", js_right, ")")
-					}
+					BinaryOperator::FloorDiv => return new_code!(expr_span, "Math.trunc(", js_left, " / ", js_right, ")"),
 					BinaryOperator::Mod => "%",
 					BinaryOperator::Power => "**",
 					BinaryOperator::Greater => ">",
 					BinaryOperator::GreaterOrEqual => ">=",
 					BinaryOperator::Less => "<",
 					BinaryOperator::LessOrEqual => "<=",
-					BinaryOperator::Equal => {
-						return new_code!(expr_span, "(((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(", js_left, ",", js_right, "))")
-					},
-					BinaryOperator::NotEqual => {
-						return new_code!(expr_span, "(((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(", js_left, ",", js_right, "))")
-					},
+					BinaryOperator::Equal => return new_code!(expr_span, HELPERS_VAR, ".eq(", js_left, ", ", js_right, ")"),
+					BinaryOperator::NotEqual => return new_code!(expr_span, HELPERS_VAR, ".neq(", js_left, ", ", js_right, ")"),
 					BinaryOperator::LogicalAnd => "&&",
 					BinaryOperator::LogicalOr => "||",
 					BinaryOperator::UnwrapOr => {
@@ -727,21 +1013,20 @@ impl<'a> JSifier<'a> {
 				new_code!(expr_span, "(", js_left, " ", js_op, " ", js_right, ")")
 			}
 			ExprKind::ArrayLiteral { items, .. } => {
-				let item_list = items
-					.iter()
-					.map(|expr| self.jsify_expression(expr, ctx))
-					.collect_vec();
+				let item_list = items.iter().map(|expr| self.jsify_expression(expr, ctx)).collect_vec();
 
 				new_code!(expr_span, "[", item_list, "]")
 			}
 			ExprKind::StructLiteral { fields, .. } => {
 				new_code!(
 					expr_span,
-					"({",  
+					"({",
 					fields
-				.iter()
-				.map(|(name, expr)| new_code!(expr_span, "\"", &name.name, "\": ",  self.jsify_expression(expr, ctx)))
-				.collect_vec(), "})")
+						.iter()
+						.map(|(name, expr)| new_code!(expr_span, "\"", &name.name, "\": ", self.jsify_expression(expr, ctx)))
+						.collect_vec(),
+					"})"
+				)
 			}
 			ExprKind::JsonLiteral { element, .. } => {
 				ctx.visit_ctx.push_json();
@@ -752,15 +1037,7 @@ impl<'a> JSifier<'a> {
 			ExprKind::JsonMapLiteral { fields } => {
 				let f = fields
 					.iter()
-					.map(|(key, expr)| {
-						new_code!(
-							expr_span,
-							"\"",
-							&key.name,
-							"\": ",
-							self.jsify_expression(expr, ctx)
-						)
-					})
+					.map(|(key, expr)| new_code!(expr_span, "\"", &key.name, "\": ", self.jsify_expression(expr, ctx)))
 					.collect_vec();
 				new_code!(expr_span, "({", f, "})")
 			}
@@ -776,13 +1053,10 @@ impl<'a> JSifier<'a> {
 				new_code!(expr_span, "({", f, "})")
 			}
 			ExprKind::SetLiteral { items, .. } => {
-				let item_list = items
-					.iter()
-					.map(|expr| self.jsify_expression(expr, ctx))
-					.collect_vec();
+				let item_list = items.iter().map(|expr| self.jsify_expression(expr, ctx)).collect_vec();
 				new_code!(expr_span, "new Set([", item_list, "])")
 			}
-			ExprKind::FunctionClosure(func_def) => self.jsify_function(None, func_def, ctx),
+			ExprKind::FunctionClosure(func_def) => self.jsify_function(None, func_def, true, ctx),
 			ExprKind::CompilerDebugPanic => {
 				// Handle the debug panic expression (during jsifying)
 				dbg_panic!();
@@ -827,39 +1101,50 @@ impl<'a> JSifier<'a> {
 	fn jsify_elif_statements(
 		&self,
 		code: &mut CodeMaker,
-		elif_statements: &Vec<ElifLetBlock>,
+		elif_statements: &Vec<Elifs>,
 		index: usize,
 		else_statements: &Option<Scope>,
 		ctx: &mut JSifyContext,
 	) {
-		let elif_let_value = "$elif_let_value";
-
-		let value = format!("{}{}", elif_let_value, index);
-		let elif_block = elif_statements.get(index).unwrap();
-
-		code.line(new_code!(
-			&elif_block.value.span,
-			"const ",
-			value,
-			" = ",
-			self.jsify_expression(&elif_block.value, ctx),
-			";"
-		));
-		let value = format!("{}{}", elif_let_value, index);
-		code.open(format!("if ({value} != undefined) {{"));
-		if elif_block.reassignable {
-			code.line(format!("let {} = {};", elif_block.var_name, value));
-		} else {
-			code.line(format!("const {} = {};", elif_block.var_name, value));
-		}
+		match elif_statements.get(index).unwrap() {
+			Elifs::ElifLetBlock(elif_let_to_jsify) => {
+				// Emit a JavaScript "else {" for each Wing "elif_let_block",
+				// and emit the closing "}" bracket in jsify_statement()'s StmtKind::IfLet match case
+				code.open("else {");
+				let elif_let_value = "$elif_let_value";
 
-		code.add_code(self.jsify_scope_body(&elif_block.statements, ctx));
-		code.close("}");
+				let value = format!("{}{}", elif_let_value, index);
+
+				code.line(new_code!(
+					&elif_let_to_jsify.value.span,
+					"const ",
+					value,
+					" = ",
+					self.jsify_expression(&elif_let_to_jsify.value, ctx),
+					";"
+				));
+				let value = format!("{}{}", elif_let_value, index);
+				code.open(format!("if ({value} != undefined) {{"));
+				if elif_let_to_jsify.reassignable {
+					code.line(format!("let {} = {};", elif_let_to_jsify.var_name, value));
+				} else {
+					code.line(format!("const {} = {};", elif_let_to_jsify.var_name, value));
+				}
 
+				code.add_code(self.jsify_scope_body(&elif_let_to_jsify.statements, ctx));
+				code.close("}");
+			}
+			Elifs::ElifBlock(elif_to_jsify) => {
+				let condition = self.jsify_expression(&elif_to_jsify.condition, ctx);
+				// TODO: this puts the "else if" in a separate line from the closing block but
+				// technically that shouldn't be a problem, its just ugly
+				code.open(new_code!(&elif_to_jsify.condition.span, "else if (", condition, ") {"));
+				code.add_code(self.jsify_scope_body(&elif_to_jsify.statements, ctx));
+				code.close("}");
+			}
+		}
 		if index < elif_statements.len() - 1 {
-			code.open("else {");
 			self.jsify_elif_statements(code, elif_statements, index + 1, else_statements, ctx);
-			code.close("}");
 		} else if let Some(else_scope) = else_statements {
 			code.open("else {");
 			code.add_code(self.jsify_scope_body(else_scope, ctx));
@@ -872,66 +1157,45 @@ impl<'a> JSifier<'a> {
 		let mut code = CodeMaker::with_source(&statement.span);
 
 		CompilationContext::set(CompilationPhase::Jsifying, &statement.span);
-		ctx.visit_ctx.push_stmt(statement.idx);
+		ctx.visit_ctx.push_stmt(statement);
 		match &statement.kind {
 			StmtKind::Bring { source, identifier } => match source {
 				BringSource::BuiltinModule(name) => {
-					let var_name = if let Some(identifier) = identifier {
-						identifier
-					} else {
-						name
-					};
+					let var_name = identifier.as_ref().unwrap_or(&name);
 
-					code.line(format!("const {} = {}.{};", var_name, STDLIB, name))
+					code.line(format!("const {var_name} = {STDLIB}.{name};"))
 				}
 				BringSource::TrustedModule(name, module_dir) => {
 					let preflight_file_map = self.preflight_file_map.borrow();
 					let preflight_file_name = preflight_file_map.get(module_dir).unwrap();
-					code.line(format!(
-						"const {} = require(\"./{}\")({{ {} }});",
-						identifier.as_ref().unwrap_or(&name),
-						preflight_file_name,
-						STDLIB,
-					))
+					let var_name = identifier.as_ref().unwrap_or(&name);
+					code.line(format!("const {var_name} = require(\"./{preflight_file_name}\");"))
 				}
-				BringSource::JsiiModule(name) => code.line(format!(
-					"const {} = require(\"{}\");",
+				BringSource::JsiiModule(name) => {
 					// checked during type checking
-					identifier.as_ref().expect("bring jsii module requires an alias"),
-					name
-				)),
+					let var_name = identifier.as_ref().unwrap_or(&name);
+					code.line(format!("const {var_name} = require(\"{name}\");"))
+				}
 				BringSource::WingLibrary(_, module_dir) => {
+					// checked during type checking
+					let var_name = identifier.as_ref().expect("bring wing library requires an alias");
 					let preflight_file_map = self.preflight_file_map.borrow();
 					let preflight_file_name = preflight_file_map.get(module_dir).unwrap();
-					code.line(format!(
-						"const {} = require(\"./{}\")({{ {} }});",
-						// checked during type checking
-						identifier.as_ref().expect("bring wing file requires an alias"),
-						preflight_file_name,
-						STDLIB,
-					))
+					code.line(format!("const {var_name} = require(\"./{preflight_file_name}\");"))
 				}
-				BringSource::WingFile(name) => {
+				BringSource::WingFile(path) => {
+					// checked during type checking
+					let var_name = identifier.as_ref().expect("bring wing file requires an alias");
 					let preflight_file_map = self.preflight_file_map.borrow();
-					let preflight_file_name = preflight_file_map.get(Utf8Path::new(&name.name)).unwrap();
-					code.line(format!(
-						"const {} = require(\"./{}\")({{ {} }});",
-						// checked during type checking
-						identifier.as_ref().expect("bring wing file requires an alias"),
-						preflight_file_name,
-						STDLIB,
-					))
+					let preflight_file_name = preflight_file_map.get(path).unwrap();
+					code.line(format!("const {var_name} = require(\"./{preflight_file_name}\");"))
 				}
-				BringSource::Directory(name) => {
+				BringSource::Directory(path) => {
+					// checked during type checking
 					let preflight_file_map = self.preflight_file_map.borrow();
-					let preflight_file_name = preflight_file_map.get(Utf8Path::new(&name.name)).unwrap();
-					code.line(format!(
-						"const {} = require(\"./{}\")({{ {} }});",
-						// checked during type checking
-						identifier.as_ref().expect("bring wing file requires an alias"),
-						preflight_file_name,
-						STDLIB,
-					))
+					let preflight_file_name = preflight_file_map.get(path).unwrap();
+					let var_name = identifier.as_ref().expect("bring wing directory requires an alias");
+					code.line(format!("const {var_name} = require(\"./{preflight_file_name}\");"))
 				}
 			},
 			StmtKind::SuperConstructor { arg_list } => {
@@ -945,7 +1209,12 @@ impl<'a> JSifier<'a> {
 						args,
 						");"
 					)),
-					Phase::Preflight => code.line(new_code!(&arg_list.span, "super($scope, $id, ", args, ");")),
+					Phase::Preflight => code.line(new_code!(
+						&arg_list.span,
+						format!("super({SCOPE_PARAM}, $id, "),
+						args,
+						");"
+					)),
 					Phase::Independent => {
 						// If our parent is phase independent then we don't call its super, instead a call to its super will be
 						// generated in `jsify_inflight_init` when we generate the inflight init for this class.
@@ -1066,9 +1335,15 @@ impl<'a> JSifier<'a> {
 				code.close("}");
 
 				if elif_statements.len() > 0 {
-					code.open("else {");
 					self.jsify_elif_statements(&mut code, elif_statements, 0, else_statements, ctx);
-					code.close("}");
+					for elif_statement in elif_statements {
+						if let Elifs::ElifLetBlock(_) = elif_statement {
+							// "elif_let_block" statements emit "else {" in jsify_elif_statements(),
+							//  but no closing bracket "}". The closing brackets are emitted here instead to
+							// deal with properly nesting "elif_let_block", "elif_block", and "else" statements
+							code.close("}");
+						}
+					}
 				} else if let Some(else_scope) = else_statements {
 					code.open("else {");
 					code.add_code(self.jsify_scope_body(else_scope, ctx));
@@ -1116,15 +1391,35 @@ impl<'a> JSifier<'a> {
 					AssignmentKind::AssignDecr => "-=",
 				};
 
-				code.line(new_code!(
-					&statement.span,
-					self.jsify_reference(variable, ctx),
-					" ",
-					operator,
-					" ",
-					self.jsify_expression(value, ctx),
-					";"
-				));
+				match variable {
+					Reference::ElementAccess { object, index } => {
+						let object = self.jsify_expression(object, ctx);
+						let index = self.jsify_expression(index, ctx);
+						code.line(new_code!(
+							&statement.span,
+							"$helpers.assign(",
+							object,
+							", ",
+							index,
+							", \"",
+							operator,
+							"\", ",
+							self.jsify_expression(value, ctx),
+							");"
+						));
+					}
+					_ => {
+						code.line(new_code!(
+							&statement.span,
+							self.jsify_reference(variable, ctx),
+							" ",
+							operator,
+							" ",
+							self.jsify_expression(value, ctx),
+							";"
+						));
+					}
+				};
 			}
 			StmtKind::Scope(scope) => {
 				if !scope.statements.is_empty() {
@@ -1150,10 +1445,15 @@ impl<'a> JSifier<'a> {
 			StmtKind::Interface { .. } => {
 				// This is a no-op in JS
 			}
-			StmtKind::Struct { .. } => {
+			StmtKind::Struct(_) => {
 				// Struct schemas are emitted before jsification phase
 			}
-			StmtKind::Enum { name, values, .. } => {
+			StmtKind::Enum(enu) => {
+				let Enum {
+					name,
+					values,
+					access: _,
+				} = enu;
 				code.open(format!("const {name} ="));
 				code.add_code(self.jsify_enum(name, values));
 				code.close(";");
@@ -1188,25 +1488,28 @@ impl<'a> JSifier<'a> {
 				}
 			}
 			StmtKind::CompilerDebugEnv => {}
+			StmtKind::ExplicitLift(explicit_lift_block) => {
+				code.open("{");
+				code.add_code(self.jsify_scope_body(&explicit_lift_block.statements, ctx));
+				code.close("}");
+			}
 		};
 		ctx.visit_ctx.pop_stmt();
 		code
 	}
 
-	fn jsify_enum(&self, name: &Symbol, values: &IndexSet<Symbol>) -> CodeMaker {
+	fn jsify_enum(&self, name: &Symbol, values: &IndexMap<Symbol, Option<String>>) -> CodeMaker {
 		let mut code = CodeMaker::with_source(&name.span);
 		let mut value_index = 0;
 
 		code.open("(function (tmp) {");
 
-		for value in values {
+		for value in values.keys() {
 			code.line(new_code!(
 				&value.span,
-				"tmp[tmp[\"",
+				"tmp[\"",
 				jsify_symbol(value),
-				"\"] = ",
-				value_index.to_string(),
-				"] = \",",
+				"\"] = \"",
 				jsify_symbol(value),
 				"\";"
 			));
@@ -1292,31 +1595,75 @@ impl<'a> JSifier<'a> {
 
 	fn jsify_function(
 		&self,
-		class: Option<&AstClass>,
+		class_type: Option<TypeRef>,
 		func_def: &FunctionDefinition,
+		is_closure: bool,
 		ctx: &mut JSifyContext,
 	) -> CodeMaker {
 		let parameters = jsify_function_parameters(func_def);
 
+		// If this function requires an implicit scope parameter then add it to the parameters
+		let parameters = if class_type.map_or(false, |t| {
+			t.as_class()
+				.unwrap()
+				.get_method(func_def.name.as_ref().unwrap())
+				.unwrap()
+				.type_
+				.as_function_sig()
+				.unwrap()
+				.implicit_scope_param
+		}) {
+			let mut res = CodeMaker::one_line(SCOPE_PARAM);
+			if !parameters.is_empty() {
+				res.append(", ");
+				res.append(parameters);
+			}
+			res
+		} else {
+			parameters
+		};
+
 		let (name, arrow) = match &func_def.name {
 			Some(name) => (name.name.clone(), " ".to_string()),
 			None => ("".to_string(), " => ".to_string()),
 		};
 
 		let body = match &func_def.body {
-			FunctionBody::Statements(scope) => self.jsify_scope_body(scope, ctx),
-			FunctionBody::External(file_path) => {
-				new_code!(
-					&func_def.span,
-					format!("return (require(\"{file_path}\")[\"{name}\"])("),
-					parameters.clone(),
-					")"
+			FunctionBody::Statements(scope) => {
+				let function_env = self.types.get_scope_env(&scope);
+				ctx.with_function_def(
+					func_def.name.as_ref(),
+					&func_def.signature,
+					func_def.is_static,
+					function_env,
+					|ctx| self.jsify_scope_body(scope, ctx),
 				)
 			}
+			FunctionBody::External(extern_path) => {
+				// check if the first part of the path is the node module directory
+				let require_path = self.get_require_path(extern_path, &func_def.span);
+
+				if let Some(require_path) = require_path {
+					let require = if ctx.visit_ctx.current_phase() == Phase::Inflight {
+						"require"
+					} else {
+						EXTERN_VAR
+					};
+
+					new_code!(
+						&func_def.span,
+						format!("return ({require}(\"{require_path}\")[\"{name}\"])("),
+						parameters.clone(),
+						")"
+					)
+				} else {
+					CodeMaker::default()
+				}
+			}
 		};
 		let mut prefix = vec![];
 
-		if func_def.is_static && class.is_some() {
+		if func_def.is_static && class_type.is_some() {
 			prefix.push("static")
 		}
 
@@ -1338,14 +1685,77 @@ impl<'a> JSifier<'a> {
 		code.add_code(body);
 		code.close("}");
 
-		// if prefix is empty it means this is a closure, so we need to wrap it in `(`, `)`.
-		if prefix.is_empty() {
+		// if the function is a closure, we need to wrap it in `(`, `)`
+		if is_closure {
 			new_code!(&func_def.span, "(", code, ")")
 		} else {
 			code
 		}
 	}
 
+	fn get_require_path(&self, absolute_target: &Utf8PathBuf, span: &WingSpan) -> Option<String> {
+		let entrypoint_is_file = self.compilation_init_path.is_file();
+		let entrypoint_dir = if entrypoint_is_file {
+			self.compilation_init_path.parent().unwrap()
+		} else {
+			self.compilation_init_path
+		};
+
+		if !entrypoint_is_file {
+			// We are possibly compiling a package, so we need to make sure all externs
+			// are actually contained in this directory to make sure it gets packaged
+
+			if !absolute_target.starts_with(entrypoint_dir) {
+				report_diagnostic(Diagnostic {
+					message: format!("{absolute_target} must be a sub directory of {entrypoint_dir}"),
+					annotations: vec![],
+					hints: vec![],
+					span: Some(span.clone()),
+				});
+				return None;
+			}
+		}
+
+		let rel_path = make_relative_path(entrypoint_dir.as_str(), absolute_target.as_str());
+		let rel_path = Utf8PathBuf::from(rel_path);
+
+		let mut path_components = rel_path.components();
+
+		// check if the first part of the path is the node module directory
+		let path = if path_components.next().expect("extern path must not be empty").as_str() == NODE_MODULES_DIR {
+			// We are loading an extern from a node module, so we want that path to be relative to the package itself
+			// e.g. require("../node_modules/@winglibs/blah/util.js") should be require("@winglibs/blah/util.js") instead
+
+			// the second part of the path will either be the package name or the package scope
+			let second_component = path_components
+				.next()
+				.expect("extern path in node module must have at least two components")
+				.as_str();
+
+			let module_name = if second_component.starts_with(NODE_MODULES_SCOPE_SPECIFIER) {
+				// scoped package, prepend the scope to the next part of the path
+				format!(
+					"{second_component}/{}",
+					path_components
+						.next()
+						.expect("extern path in scoped node module must have at least three components")
+				)
+			} else {
+				// regular package
+				second_component.to_string()
+			};
+
+			// combine the module name with the rest of the iterator to get the full import path
+			format!("{module_name}/{}", path_components.join("/"))
+		} else {
+			// go from the out_dir to the entrypoint dir
+			let up_dirs = "../".repeat(self.out_dir.components().count() - entrypoint_dir.components().count());
+
+			format!("{up_dirs}{rel_path}")
+		};
+		Some(path)
+	}
+
 	fn jsify_class(&self, env: &SymbolEnv, class: &AstClass, ctx: &mut JSifyContext) -> CodeMaker {
 		ctx.with_class(class, |ctx| {
 			// lookup the class type
@@ -1366,7 +1776,7 @@ impl<'a> JSifier<'a> {
 			};
 
 			// emit the inflight side of the class into a separate file
-			let inflight_class_code = self.jsify_class_inflight(&class, ctx);
+			let inflight_class_code = self.jsify_class_inflight(class_type, &class, ctx);
 
 			// if this is inflight/independent, class, just emit the inflight class code inline and move on
 			// with your life.
@@ -1383,16 +1793,11 @@ impl<'a> JSifier<'a> {
 
 			if let Some(parent) = &class.parent {
 				// If this is an imported type (with a package fqn) attemp to go through the stdlib target dep-injection mechanism
-				let parent_type = env
-					.lookup_nested_str(&parent.full_path_str(), None)
-					.unwrap()
-					.0
-					.as_type()
-					.unwrap();
+				let parent_type = class_type.as_class().unwrap().parent.unwrap();
 				if let Some(fqn) = &parent_type.as_class().unwrap().fqn {
 					code.append(new_code!(
 						&class.name.span,
-						" extends (this.node.root.typeForFqn(\"",
+						" extends (this?.node?.root?.typeForFqn(\"",
 						fqn,
 						"\") ?? ",
 						self.jsify_user_defined_type(parent, ctx),
@@ -1407,7 +1812,15 @@ impl<'a> JSifier<'a> {
 				}
 			} else {
 				// default base class for preflight classes is `core.Resource`
-				code.append(new_code!(&class.name.span, " extends ", STDLIB_CORE_RESOURCE));
+				code.append(new_code!(
+					&class.name.span,
+					" extends ",
+					if class.auto_id {
+						STDLIB_CORE_AUTOID_RESOURCE
+					} else {
+						STDLIB_CORE_RESOURCE
+					}
+				));
 			};
 
 			code.append(" {");
@@ -1415,7 +1828,7 @@ impl<'a> JSifier<'a> {
 
 			// TODO Hack to make sure closures match the IInflight contract from wingsdk
 			if class_type.is_closure() {
-				code.line("_hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');")
+				code.line(format!("_id = {STDLIB_CORE}.closureId();"))
 			}
 
 			// emit the preflight constructor
@@ -1423,16 +1836,15 @@ impl<'a> JSifier<'a> {
 
 			// emit preflight methods
 			for m in class.preflight_methods(false) {
-				code.line(self.jsify_function(Some(class), m, ctx));
+				code.line(self.jsify_function(Some(class_type), m, false, ctx));
 			}
 
 			// emit the `_toInflight` and `_toInflightType` methods (TODO: renamed to `_liftObject` and
 			// `_liftType`).
 			code.add_code(self.jsify_to_inflight_type_method(&class, ctx));
-			code.add_code(self.jsify_to_inflight_method(&class.name, ctx));
-			code.add_code(self.jsify_get_inflight_ops_method(&class));
+			code.add_code(self.jsify_to_inflight_method(&class.name, class_type));
 
-			// emit `_registerOnLiftObject` to register bindings (for type & instance binds)
+			// emit `onLift` and `onLiftType` to bind permissions and environment variables to inflight hosts
 			code.add_code(self.jsify_register_bind_method(class, class_type, BindMethod::Instance, ctx));
 			code.add_code(self.jsify_register_bind_method(class, class_type, BindMethod::Type, ctx));
 
@@ -1445,7 +1857,7 @@ impl<'a> JSifier<'a> {
 		let mut code = new_code!(
 			&class.name.span,
 			JS_CONSTRUCTOR,
-			"($scope, $id, ",
+			format!("({SCOPE_PARAM}, $id, "),
 			jsify_function_parameters(&class.initializer),
 			") {"
 		);
@@ -1457,7 +1869,7 @@ impl<'a> JSifier<'a> {
 		};
 
 		// Check if the first statement is a super constructor call, if not we need to add one
-		let super_called = if let Some(s) = init_statements.statements.first() {
+		let super_called = if let Some(s) = init_statements.statements.iter().find(|s| !s.kind.is_type_def()) {
 			matches!(s.kind, StmtKind::SuperConstructor { .. })
 		} else {
 			false
@@ -1468,9 +1880,16 @@ impl<'a> JSifier<'a> {
 		// we always need a super() call because even if the class doesn't have an explicit parent, it
 		// will inherit from core.Resource.
 		if !super_called {
-			body_code.line("super($scope, $id);");
+			body_code.line(format!("super({SCOPE_PARAM}, $id);"));
 		}
-		body_code.add_code(self.jsify_scope_body(&init_statements, ctx));
+		let init_code = ctx.with_function_def(
+			class.initializer.name.as_ref(),
+			&class.initializer.signature,
+			class.initializer.is_static,
+			self.types.get_scope_env(init_statements),
+			|ctx| self.jsify_scope_body(init_statements, ctx),
+		);
+		body_code.add_code(init_code);
 
 		code.add_code(body_code);
 
@@ -1478,24 +1897,6 @@ impl<'a> JSifier<'a> {
 		code
 	}
 
-	fn jsify_get_inflight_ops_method(&self, class: &AstClass) -> CodeMaker {
-		let mut code = CodeMaker::with_source(&class.name.span);
-
-		code.open("_supportedOps() {");
-
-		let mut ops = vec![];
-		for field in class.inflight_fields() {
-			ops.push(format!("\"{}\"", field.name.name));
-		}
-		for method in class.inflight_methods(true) {
-			ops.push(format!("\"{}\"", method.name.as_ref().unwrap().name));
-		}
-
-		code.line(format!("return [...super._supportedOps(), {}];", ops.join(", ")));
-		code.close("}");
-		code
-	}
-
 	fn jsify_to_inflight_type_method(&self, class: &AstClass, ctx: &JSifyContext) -> CodeMaker {
 		let client_path = self.inflight_filename(class);
 
@@ -1505,7 +1906,9 @@ impl<'a> JSifier<'a> {
 
 		code.open("return `");
 
-		code.open(format!("require(\"./{client_path}\")({{"));
+		code.open(format!(
+			"require(\"${{{HELPERS_VAR}.normalPath({__DIRNAME})}}/{client_path}\")({{"
+		));
 
 		if let Some(lifts) = &ctx.lifts {
 			for (token, capture) in lifts.captures.iter().filter(|(_, cap)| !cap.is_field) {
@@ -1522,8 +1925,24 @@ impl<'a> JSifier<'a> {
 		code
 	}
 
-	fn jsify_to_inflight_method(&self, resource_name: &Symbol, ctx: &JSifyContext) -> CodeMaker {
-		let mut code = CodeMaker::with_source(&resource_name.span);
+	// Recursively get all lifted fields from a class and its ancestry
+	fn class_lifted_fields(class_type: TypeRef) -> IndexMap<String, String> {
+		let mut res = IndexMap::new();
+		let class_type = class_type.as_class().unwrap();
+
+		if let Some(lifts) = &class_type.lifts {
+			res.extend(lifts.lifted_fields());
+		}
+
+		if let Some(parent) = class_type.parent {
+			res.extend(Self::class_lifted_fields(parent));
+		}
+
+		res
+	}
+
+	fn jsify_to_inflight_method(&self, class_name: &Symbol, class_type: TypeRef) -> CodeMaker {
+		let mut code = CodeMaker::with_source(&class_name.span);
 
 		code.open("_toInflight() {");
 
@@ -1532,16 +1951,17 @@ impl<'a> JSifier<'a> {
 		code.open("(await (async () => {");
 
 		code.line(format!(
-			"const {}Client = ${{{}._toInflightType(this)}};",
-			resource_name.name, resource_name.name,
+			"const {}Client = ${{{}._toInflightType()}};",
+			class_name.name, class_name.name,
 		));
 
-		code.open(format!("const client = new {}Client({{", resource_name.name));
+		code.open(format!("const client = new {}Client({{", class_name.name));
 
-		if let Some(lifts) = &ctx.lifts {
-			for (token, obj) in lifts.lifted_fields() {
-				code.line(format!("{token}: ${{{STDLIB_CORE}.liftObject({obj})}},"));
-			}
+		// Get lifted fields from entire class ancestry
+		let lifts = Self::class_lifted_fields(class_type);
+
+		for (token, obj) in lifts {
+			code.line(format!("{token}: ${{{STDLIB_CORE}.liftObject({obj})}},"));
 		}
 
 		code.close("});");
@@ -1560,7 +1980,7 @@ impl<'a> JSifier<'a> {
 	}
 
 	// Write a class's inflight to a file
-	fn jsify_class_inflight(&self, class: &AstClass, mut ctx: &mut JSifyContext) -> CodeMaker {
+	fn jsify_class_inflight(&self, class_type: TypeRef, class: &AstClass, mut ctx: &mut JSifyContext) -> CodeMaker {
 		ctx.visit_ctx.push_phase(Phase::Inflight);
 
 		let mut class_code = new_code!(&class.name.span, "class ", &class.name.name);
@@ -1575,11 +1995,11 @@ impl<'a> JSifier<'a> {
 
 		// if this is a preflight class, emit the binding constructor
 		if class.phase == Phase::Preflight {
-			self.jsify_inflight_binding_constructor(class, &mut class_code, &ctx);
+			self.jsify_inflight_binding_constructor(class, class_type, &mut class_code);
 		}
 
 		for def in class.inflight_methods(false) {
-			class_code.line(self.jsify_function(Some(class), def, &mut ctx));
+			class_code.line(self.jsify_function(Some(class_type), def, false, ctx));
 		}
 
 		// emit the $inflight_init function (if it has a body).
@@ -1594,9 +2014,12 @@ impl<'a> JSifier<'a> {
 		class_code
 	}
 
-	pub fn add_referenced_struct_schema(&self, struct_name: String, schema: CodeMaker) {
+	pub fn add_referenced_struct_schema(&self, file_path: &Utf8Path, struct_name: String, schema: CodeMaker) {
 		let mut struct_schemas = self.referenced_struct_schemas.borrow_mut();
-		struct_schemas.insert(struct_name, schema);
+		struct_schemas
+			.entry(file_path.into())
+			.or_default()
+			.insert(struct_name, schema);
 	}
 
 	fn emit_inflight_file(&self, class: &AstClass, inflight_class_code: CodeMaker, ctx: &mut JSifyContext) {
@@ -1617,6 +2040,7 @@ impl<'a> JSifier<'a> {
 		let sourcemap_file = format!("{}.map", filename);
 
 		code.line("\"use strict\";");
+		code.line(format!("const {HELPERS_VAR} = require(\"@winglang/sdk/lib/helpers\");"));
 		code.open(format!("module.exports = function({{ {inputs} }}) {{"));
 		code.add_code(inflight_class_code);
 		code.line(format!("return {name};"));
@@ -1634,10 +2058,11 @@ impl<'a> JSifier<'a> {
 			Ok(()) => {}
 			Err(err) => report_diagnostic(err.into()),
 		}
+
 		match self.output_files.borrow_mut().add_file(
 			sourcemap_file,
 			code.generate_sourcemap(
-				root_source.as_str(),
+				&make_relative_path(self.out_dir.as_str(), &root_source),
 				self.source_files.get_file(root_source.as_str()).unwrap(),
 				filename.as_str(),
 			),
@@ -1647,43 +2072,34 @@ impl<'a> JSifier<'a> {
 		}
 	}
 
-	fn jsify_inflight_binding_constructor(&self, class: &AstClass, class_code: &mut CodeMaker, ctx: &JSifyContext) {
+	fn jsify_inflight_binding_constructor(&self, class: &AstClass, class_type: TypeRef, class_code: &mut CodeMaker) {
+		let class_type = class_type.as_class().unwrap();
+
 		// Get the fields that are lifted by this class but not by its parent, they will be initialized
 		// in the generated constructor
-		let lifted_fields = if let Some(lifts) = &ctx.lifts {
-			lifts.lifted_fields().keys().map(|f| f.clone()).collect_vec()
+		let lifted_fields = if let Some(lifts) = &class_type.lifts {
+			lifts.lifted_fields().map(|(f, _)| f.clone()).collect()
 		} else {
-			vec![]
+			IndexSet::new()
 		};
 
-		let parent_fields = if let Some(parent) = &class.parent {
-			let parent_type = resolve_user_defined_type(
-				parent,
-				ctx.visit_ctx.current_env().expect("an env"),
-				ctx.visit_ctx.current_stmt_idx(),
-			)
-			.expect("resolved type");
-			if let Some(parent_lifts) = &parent_type.as_class().unwrap().lifts {
-				parent_lifts.lifted_fields().keys().map(|f| f.clone()).collect_vec()
-			} else {
-				vec![]
-			}
+		let parent_fields = if let Some(parent) = class_type.parent {
+			Self::class_lifted_fields(parent).keys().cloned().collect()
 		} else {
-			vec![]
+			IndexSet::new()
 		};
 
 		class_code.open(format!(
 			"{JS_CONSTRUCTOR}({{ {} }}) {{",
 			lifted_fields
-				.iter()
-				.merge(parent_fields.iter())
+				.union(&parent_fields)
 				.map(|token| { token.clone() })
 				.collect_vec()
 				.join(", ")
 		));
 
 		if class.parent.is_some() {
-			class_code.line(format!("super({{ {} }});", parent_fields.join(", ")));
+			class_code.line(format!("super({{ {} }});", parent_fields.iter().join(", ")));
 		}
 
 		for token in &lifted_fields {
@@ -1713,8 +2129,8 @@ impl<'a> JSifier<'a> {
 	) -> CodeMaker {
 		let mut bind_method = CodeMaker::with_source(&class.span);
 		let (modifier, bind_method_name) = match bind_method_kind {
-			BindMethod::Type => ("static ", "_registerOnLift"),
-			BindMethod::Instance => ("", "_registerOnLift"),
+			BindMethod::Type => ("static ", "_liftTypeMap"),
+			BindMethod::Instance => ("", "_liftMap"),
 		};
 
 		let class_name = class.name.to_string();
@@ -1723,40 +2139,88 @@ impl<'a> JSifier<'a> {
 			return bind_method;
 		};
 
-		let lift_qualifications = lifts
-			.lifts_qualifications
-			.iter()
-			.filter(|(m, _)| {
-				let var_kind = &class_type
-					.as_class()
-					.unwrap()
-					.get_method(&m.as_str().into())
-					.as_ref()
-					.expect(&format!("method \"{m}\" doesn't exist in {class_name}"))
-					.kind;
-				let is_static = matches!(var_kind, VariableKind::StaticMember);
-				(*m == CLASS_INFLIGHT_INIT_NAME || !is_static) ^ (matches!(bind_method_kind, BindMethod::Type))
-			})
-			.collect_vec();
-
-		// Skip jsifying this method if there are no lifts (in this case we'll use super's register bind method)
+		let mut lift_qualifications: Vec<(&String, &BTreeMap<String, LiftQualification>)> = vec![];
+		let empty_map = BTreeMap::new();
+
+		// Collect all the methods and fields that are accessible inflight on this class
+		// and their lift qualifications, if any.
+		// Even if a method does not require any other permissions (for example, it just
+		// logs something), it is still included in the map as a way of indicating
+		// it's a supported operation.
+		//
+		// Methods on the parent class are not included here, as they are inherited
+		// and will be included in the parent's _liftMap or _liftTypeMap instead
+		for m in class.all_methods(true) {
+			let name = m.name.as_ref().unwrap();
+			let method = class_type.as_class().unwrap().get_method(&name);
+			let var_info = method.expect(&format!("method \"{name}\" doesn't exist in {class_name}"));
+
+			let is_static = m.is_static;
+			let is_inflight = var_info.phase == Phase::Inflight;
+			let filter = match bind_method_kind {
+				BindMethod::Instance => is_inflight && !is_static,
+				BindMethod::Type => is_inflight && is_static && name.name != CLASS_INFLIGHT_INIT_NAME,
+			};
+			if filter {
+				if let Some(quals) = lifts.lifts_qualifications.get(&name.name) {
+					lift_qualifications.push((&name.name, quals));
+				} else {
+					lift_qualifications.push((&name.name, &empty_map));
+				}
+			}
+		}
+
+		for m in class.inflight_fields() {
+			let name = &m.name;
+			let is_static = m.is_static;
+			let filter = match bind_method_kind {
+				BindMethod::Instance => !is_static,
+				BindMethod::Type => is_static,
+			};
+			if filter {
+				if let Some(quals) = lifts.lifts_qualifications.get(&name.name) {
+					lift_qualifications.push((&name.name, quals));
+				} else {
+					lift_qualifications.push((&name.name, &empty_map));
+				}
+			}
+		}
+
+		// Skip jsifying this method if there are no lifts (in this case we'll use super's lifting methods)
 		if lift_qualifications.is_empty() {
 			return bind_method;
 		}
 
-		bind_method.open(format!("{modifier}{bind_method_name}(host, ops) {{"));
-		for (method_name, method_qual) in lift_qualifications {
-			bind_method.open(format!("if (ops.includes(\"{method_name}\")) {{"));
-			for (code, method_lift_qual) in method_qual {
-				let ops_strings = method_lift_qual.ops.iter().map(|op| format!("\"{}\"", op)).join(", ");
+		bind_method.open(format!("{modifier}get {bind_method_name}() {{"));
 
-				bind_method.line(format!(
-					"{class_name}._registerOnLiftObject({code}, host, [{ops_strings}]);",
-				));
+		if !lift_qualifications.is_empty() {
+			if bind_method_kind == BindMethod::Instance && class.parent.is_some() {
+				// mergeLiftDeps is a helper method that combines the lift deps of the parent class with the
+				// lift deps of this class
+				bind_method.open(format!("return {STDLIB_CORE}.mergeLiftDeps(super._liftMap, {{"));
+			} else {
+				bind_method.open("return ({".to_string());
 			}
-			bind_method.close("}");
+
+			for (method_name, method_qual) in lift_qualifications {
+				bind_method.open(format!("\"{method_name}\": [",));
+				for (code, method_lift_qual) in method_qual {
+					let ops = method_lift_qual.ops.iter().join(", ");
+					// To keep the code concise treat no ops, single op and multiple ops differenly here, although the multiple ops is the generic case
+					if method_lift_qual.ops.len() == 0 {
+						bind_method.line(format!("[{code}, []],"));
+					} else if method_lift_qual.ops.len() == 1 {
+						bind_method.line(format!("[{code}, {ops}],"));
+					} else {
+						bind_method.line(format!("[{code}, [].concat({ops})],"));
+					}
+				}
+				bind_method.close("],");
+			}
+
+			bind_method.close("});");
 		}
-		bind_method.line(format!("super.{bind_method_name}(host, ops);"));
+
 		bind_method.close("}");
 		bind_method
 	}
@@ -1771,7 +2235,7 @@ impl<'a> JSifier<'a> {
 			file_map.insert(class.name.span.file_id.clone(), *id);
 			*id
 		};
-		format!("inflight.{}-{}.js", class.name.name, id)
+		format!("inflight.{}-{}.cjs", class.name.name, id)
 	}
 }
 
@@ -1793,22 +2257,24 @@ fn jsify_symbol(symbol: &Symbol) -> CodeMaker {
 	new_code!(&symbol.span, &symbol.name)
 }
 
-fn parent_class_phase(ctx: &JSifyContext<'_>) -> Phase {
+fn parent_class_type(ctx: &JSifyContext<'_>) -> TypeRef {
+	// Get the current class type
 	let current_class_type = resolve_user_defined_type(
 		ctx.visit_ctx.current_class().expect("a class"),
 		ctx.visit_ctx.current_env().expect("an env"),
 		ctx.visit_ctx.current_stmt_idx(),
 	)
 	.expect("a class type");
-	let parent_class_phase = current_class_type
+	// Return the parent class type
+	current_class_type
 		.as_class()
 		.expect("a class")
 		.parent
 		.expect("a parent class")
-		.as_class()
-		.expect("a class")
-		.phase;
-	parent_class_phase
+}
+
+fn parent_class_phase(ctx: &JSifyContext<'_>) -> Phase {
+	parent_class_type(ctx).as_class().expect("a class").phase
 }
 
 fn get_public_symbols(scope: &Scope) -> Vec<Symbol> {
@@ -1839,14 +2305,15 @@ fn get_public_symbols(scope: &Scope) -> Vec<Symbol> {
 			StmtKind::Interface(_) => {}
 			// structs are bringable, but we don't emit anything for them
 			// unless a static method is called on them
-			StmtKind::Struct { .. } => {}
-			StmtKind::Enum { name, access, .. } => {
-				if *access == AccessModifier::Public {
-					symbols.push(name.clone());
+			StmtKind::Struct(_) => {}
+			StmtKind::Enum(enu) => {
+				if enu.access == AccessModifier::Public {
+					symbols.push(enu.name.clone());
 				}
 			}
 			StmtKind::TryCatch { .. } => {}
 			StmtKind::CompilerDebugEnv => {}
+			StmtKind::ExplicitLift(_) => {}
 		}
 	}
 
diff --git a/libs/wingc/src/jsify/codemaker.rs b/libs/wingc/src/jsify/codemaker.rs
index 7aa603ed52f..be192444f21 100644
--- a/libs/wingc/src/jsify/codemaker.rs
+++ b/libs/wingc/src/jsify/codemaker.rs
@@ -368,7 +368,7 @@ mod tests {
 		assert_eq!(code.to_string(), "1\n2\n3");
 
 		let sourcemap: Value =
-			serde_json::from_str(&code.generate_sourcemap("test.w", "1\n2\n3", "test.js")).expect("sourcemap");
+			serde_json::from_str(&code.generate_sourcemap("test.w", "1\n2\n3", "test.cjs")).expect("sourcemap");
 
 		// "A" just means the line comes from somewhere in the provided source root
 		assert_eq!(sourcemap["mappings"], "A;A;A");
@@ -380,6 +380,8 @@ mod tests {
 			file_id: "test.w".to_string(),
 			start: WingLocation { line: 2, col: 4 },
 			end: WingLocation { line: 2, col: 8 },
+			start_offset: 0,
+			end_offset: 0,
 		};
 		let mut code = CodeMaker::with_source(&base_span);
 		code.line("1");
@@ -398,10 +400,10 @@ mod tests {
 		assert!(code.lines.len() == 4);
 		assert_eq!(code.to_string(), "1\n2\n3\n4");
 		let sourcemap: Value =
-			serde_json::from_str(&code.generate_sourcemap("test.w", "1\n2\n3", "test.js")).expect("sourcemap");
+			serde_json::from_str(&code.generate_sourcemap("test.w", "1\n2\n3", "test.cjs")).expect("sourcemap");
 
 		assert_eq!(sourcemap["version"], 3);
-		assert_eq!(sourcemap["file"], "test.js");
+		assert_eq!(sourcemap["file"], "test.cjs");
 		assert_eq!(sourcemap["sources"], json!(["test.w"]));
 		assert_eq!(sourcemap["names"], json!([]));
 
@@ -415,6 +417,8 @@ mod tests {
 			file_id: "test.w".to_string(),
 			start: WingLocation { line: 2, col: 4 },
 			end: WingLocation { line: 2, col: 8 },
+			start_offset: 0,
+			end_offset: 0,
 		};
 		let mut code = CodeMaker::with_source(&base_span);
 		code.line("1");
diff --git a/libs/wingc/src/jsify/snapshots/access_methods_and_properties_on_collections.snap b/libs/wingc/src/jsify/snapshots/access_methods_and_properties_on_collections.snap
index 077a7704f3e..ebc433dcb62 100644
--- a/libs/wingc/src/jsify/snapshots/access_methods_and_properties_on_collections.snap
+++ b/libs/wingc/src/jsify/snapshots/access_methods_and_properties_on_collections.snap
@@ -15,11 +15,12 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______y__0_, $x_length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $x, $y }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -27,16 +28,16 @@ module.exports = function({ $__arr__index_______if__index___0____index____arr_le
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($x_length,3)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: y.at(0) == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______y__0_,"hello")))};
+      $helpers.assert($helpers.eq($x.length, 3), "x.length == 3");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($y, 0), "hello"), "y.at(0) == \"hello\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -45,27 +46,29 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______y__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(y, 0))},
-            $x_length: ${$stdlib.core.liftObject(x.length)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $x: ${$stdlib.core.liftObject(x)},
+            $y: ${$stdlib.core.liftObject(y)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -73,15 +76,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(y, 0), host, []);
-          $Closure1._registerOnLiftObject(x.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, ["length"]],
+            [y, ["at"]],
+          ],
+          "$inflight_init": [
+            [x, []],
+            [y, []],
+          ],
+        });
       }
     }
     const x = [1, 2, 3];
@@ -92,6 +97,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/access_property_on_primitive.snap b/libs/wingc/src/jsify/snapshots/access_property_on_primitive.snap
index 6146def64bf..b5771fcc0b9 100644
--- a/libs/wingc/src/jsify/snapshots/access_property_on_primitive.snap
+++ b/libs/wingc/src/jsify/snapshots/access_property_on_primitive.snap
@@ -13,11 +13,12 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $s_length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $s }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -25,15 +26,15 @@ module.exports = function({ $s_length }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: s.length == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($s_length,5)))};
+      $helpers.assert($helpers.eq($s.length, 5), "s.length == 5");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,26 +43,28 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $s_length: ${$stdlib.core.liftObject(s.length)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $s: ${$stdlib.core.liftObject(s)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,14 +72,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(s.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [s, ["length"]],
+          ],
+          "$inflight_init": [
+            [s, []],
+          ],
+        });
       }
     }
     const s = "hello";
@@ -86,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/access_property_on_value_returned_from_collection.snap b/libs/wingc/src/jsify/snapshots/access_property_on_value_returned_from_collection.snap
index 97979bb9887..fdce5f92022 100644
--- a/libs/wingc/src/jsify/snapshots/access_property_on_value_returned_from_collection.snap
+++ b/libs/wingc/src/jsify/snapshots/access_property_on_value_returned_from_collection.snap
@@ -13,11 +13,12 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______s___hello___length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $s }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -25,15 +26,15 @@ module.exports = function({ $__obj__key_______if____key_in_obj___throw_new_Error
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: s.get(\"hello\").length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______s___hello___length,3)))};
+      $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })($s, "hello").length, 3), "s.get(\"hello\").length == 3");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,26 +43,28 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______s___hello___length: ${$stdlib.core.liftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(s, "hello").length)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $s: ${$stdlib.core.liftObject(s)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,14 +72,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(s, "hello").length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [s, ["get"]],
+          ],
+          "$inflight_init": [
+            [s, []],
+          ],
+        });
       }
     }
     const s = ({["hello"]: "123"});
@@ -86,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/allow_type_def_before_super.snap b/libs/wingc/src/jsify/snapshots/allow_type_def_before_super.snap
new file mode 100644
index 00000000000..bd00d29aa47
--- /dev/null
+++ b/libs/wingc/src/jsify/snapshots/allow_type_def_before_super.snap
@@ -0,0 +1,172 @@
+---
+source: libs/wingc/src/jsify/tests.rs
+---
+## Code
+
+```w
+
+    class Foo {
+      new(x: num) {}
+    }
+    class Bar extends Foo {
+      new() {
+        class Baz {}
+        super(1);
+      }
+    }
+    
+```
+
+## inflight.Bar-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $Foo }) {
+  class Bar extends $Foo {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return Bar;
+}
+//# sourceMappingURL=inflight.Bar-1.cjs.map
+```
+
+## inflight.Baz-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Baz {
+    constructor({  }) {
+    }
+  }
+  return Baz;
+}
+//# sourceMappingURL=inflight.Baz-1.cjs.map
+```
+
+## inflight.Foo-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Foo {
+    constructor({  }) {
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## preflight.cjs
+
+```js
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, x) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class Bar extends Foo {
+      constructor($scope, $id, ) {
+        class Baz extends $stdlib.std.Resource {
+          constructor($scope, $id, ) {
+            super($scope, $id);
+          }
+          static _toInflightType() {
+            return `
+              require("${$helpers.normalPath(__dirname)}/inflight.Baz-1.cjs")({
+              })
+            `;
+          }
+          _toInflight() {
+            return `
+              (await (async () => {
+                const BazClient = ${Baz._toInflightType()};
+                const client = new BazClient({
+                });
+                if (client.$inflight_init) { await client.$inflight_init(); }
+                return client;
+              })())
+            `;
+          }
+          get _liftMap() {
+            return ({
+              "$inflight_init": [
+              ],
+            });
+          }
+        }
+        super($scope, $id, 1);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
+            $Foo: ${$stdlib.core.liftObject(Foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const BarClient = ${Bar._toInflightType()};
+            const client = new BarClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/libs/wingc/src/jsify/snapshots/base_class.snap b/libs/wingc/src/jsify/snapshots/base_class.snap
deleted file mode 100644
index 0f2d60783d0..00000000000
--- a/libs/wingc/src/jsify/snapshots/base_class.snap
+++ /dev/null
@@ -1,115 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    class A {}
-    class B extends A {}
-    
-```
-
-## inflight.A.js
-
-```js
-module.exports = function({  }) {
-  class A {
-    constructor({  }) {
-    }
-  }
-  return A;
-}
-```
-
-## inflight.B.js
-
-```js
-module.exports = function({ $A }) {
-  class B extends A {
-    constructor({  }) {
-      super({});
-    }
-  }
-  return B;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class A extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this._addInflightOps("$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.A.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const AClient = ${A._toInflightType(this).text};
-            const client = new AClient({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-    }
-    class B extends A {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this._addInflightOps("$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.B.js")({
-            $A: ${context._lift(A)},
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const BClient = ${B._toInflightType(this).text};
-            const client = new BClient({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-    }
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/base_class_captures_inflight.snap b/libs/wingc/src/jsify/snapshots/base_class_captures_inflight.snap
index f98a23950fe..c996859fb2d 100644
--- a/libs/wingc/src/jsify/snapshots/base_class_captures_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/base_class_captures_inflight.snap
@@ -21,27 +21,29 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class Base {
     constructor({  }) {
     }
     async bar() {
-      {console.log($x)};
+      console.log($x);
     }
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({  }) {
@@ -53,10 +55,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -65,6 +67,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -74,7 +78,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -82,7 +86,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -90,14 +94,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bar", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("bar")) {
-          Base._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "bar": [
+            [x, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -106,7 +111,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -114,7 +119,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -122,14 +127,14 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("foo")) {
-          Derived._registerOnLiftObject(this, host, ["bar"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "foo": [
+            [this, ["bar"]],
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const x = "hello";
@@ -138,6 +143,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/base_class_captures_preflight.snap b/libs/wingc/src/jsify/snapshots/base_class_captures_preflight.snap
index 3c60f34e793..989c402998a 100644
--- a/libs/wingc/src/jsify/snapshots/base_class_captures_preflight.snap
+++ b/libs/wingc/src/jsify/snapshots/base_class_captures_preflight.snap
@@ -21,10 +21,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
     constructor({  }) {
@@ -32,13 +33,14 @@ module.exports = function({  }) {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({  }) {
@@ -47,10 +49,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -59,6 +61,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -67,18 +71,18 @@ class $Root extends $stdlib.std.Resource {
         super($scope, $id);
       }
       bar() {
-        {console.log(x)};
+        console.log(x);
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -86,8 +90,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -99,7 +106,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -107,7 +114,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -115,8 +122,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const x = "hello";
@@ -125,6 +135,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/base_class_lift_indirect.snap b/libs/wingc/src/jsify/snapshots/base_class_lift_indirect.snap
index e61ab2d0496..a1098a4325a 100644
--- a/libs/wingc/src/jsify/snapshots/base_class_lift_indirect.snap
+++ b/libs/wingc/src/jsify/snapshots/base_class_lift_indirect.snap
@@ -27,10 +27,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
     constructor({ $this_b }) {
@@ -43,13 +44,14 @@ module.exports = function({  }) {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({ $this_b }) {
@@ -61,10 +63,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -73,6 +75,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -80,18 +84,18 @@ class $Root extends $stdlib.std.Resource {
     class Base extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
               $this_b: ${$stdlib.core.liftObject(this.b)},
             });
@@ -100,17 +104,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "put", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Base._registerOnLiftObject(this.b, host, []);
-        }
-        if (ops.includes("put")) {
-          Base._registerOnLiftObject(this.b, host, ["list", "put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "put": [
+            [this.b, [].concat(["put"], ["list"])],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -119,7 +121,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -127,22 +129,23 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
+              $this_b: ${$stdlib.core.liftObject(this.b)},
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("foo")) {
-          Derived._registerOnLiftObject(this, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "foo": [
+            [this, ["put"]],
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
   }
@@ -150,6 +153,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/base_class_with_fields_inflight.snap b/libs/wingc/src/jsify/snapshots/base_class_with_fields_inflight.snap
index 076f8ac6431..1bcabfc5528 100644
--- a/libs/wingc/src/jsify/snapshots/base_class_with_fields_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/base_class_with_fields_inflight.snap
@@ -26,10 +26,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
     constructor({  }) {
@@ -40,13 +41,14 @@ module.exports = function({  }) {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({  }) {
@@ -62,10 +64,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -74,6 +76,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -83,14 +87,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -98,8 +102,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "f", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+          "f": [
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -108,7 +117,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -116,7 +125,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -124,8 +133,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "g", "foo", "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "foo": [
+          ],
+          "$inflight_init": [
+          ],
+          "g": [
+          ],
+        });
       }
     }
   }
@@ -133,6 +149,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/base_class_with_fields_preflight.snap b/libs/wingc/src/jsify/snapshots/base_class_with_fields_preflight.snap
index 1d9cff29a84..c5faa235839 100644
--- a/libs/wingc/src/jsify/snapshots/base_class_with_fields_preflight.snap
+++ b/libs/wingc/src/jsify/snapshots/base_class_with_fields_preflight.snap
@@ -26,10 +26,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
     constructor({  }) {
@@ -37,13 +38,14 @@ module.exports = function({  }) {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({  }) {
@@ -52,10 +54,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -64,6 +66,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -74,14 +78,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -89,8 +93,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -104,7 +111,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -112,7 +119,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -120,8 +127,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
   }
@@ -129,6 +139,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/base_class_with_lifted_field_object.snap b/libs/wingc/src/jsify/snapshots/base_class_with_lifted_field_object.snap
index d8f9645b4b4..e2a2891ef78 100644
--- a/libs/wingc/src/jsify/snapshots/base_class_with_lifted_field_object.snap
+++ b/libs/wingc/src/jsify/snapshots/base_class_with_lifted_field_object.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
     constructor({  }) {
@@ -33,13 +34,14 @@ module.exports = function({  }) {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({ $this_b }) {
@@ -52,10 +54,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -64,6 +66,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -71,18 +75,18 @@ class $Root extends $stdlib.std.Resource {
     class Base extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -90,8 +94,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -100,7 +107,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -108,7 +115,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
               $this_b: ${$stdlib.core.liftObject(this.b)},
             });
@@ -117,17 +124,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Derived._registerOnLiftObject(this.b, host, []);
-        }
-        if (ops.includes("foo")) {
-          Derived._registerOnLiftObject(this.b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "foo": [
+            [this.b, ["put"]],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+          ],
+        });
       }
     }
   }
@@ -135,6 +140,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/base_class_with_lifted_fields.snap b/libs/wingc/src/jsify/snapshots/base_class_with_lifted_fields.snap
index 4f633be761c..7793850313b 100644
--- a/libs/wingc/src/jsify/snapshots/base_class_with_lifted_fields.snap
+++ b/libs/wingc/src/jsify/snapshots/base_class_with_lifted_fields.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
     constructor({  }) {
@@ -33,13 +34,14 @@ module.exports = function({  }) {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({ $this_f }) {
@@ -52,10 +54,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -64,6 +66,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -74,14 +78,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -89,8 +93,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -99,7 +106,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -107,7 +114,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
               $this_f: ${$stdlib.core.liftObject(this.f)},
             });
@@ -116,17 +123,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Derived._registerOnLiftObject(this.f, host, []);
-        }
-        if (ops.includes("foo")) {
-          Derived._registerOnLiftObject(this.f, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "foo": [
+            [this.f, []],
+          ],
+          "$inflight_init": [
+            [this.f, []],
+          ],
+        });
       }
     }
     const x = "hello";
@@ -135,6 +140,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/builtins.snap b/libs/wingc/src/jsify/snapshots/builtins.snap
index e6178d19381..53008dfdff0 100644
--- a/libs/wingc/src/jsify/snapshots/builtins.snap
+++ b/libs/wingc/src/jsify/snapshots/builtins.snap
@@ -11,10 +11,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -23,15 +24,15 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {console.log("hello")};
+      console.log("hello");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -40,25 +41,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -66,8 +69,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -76,6 +84,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/call_static_inflight_from_static_inflight.snap b/libs/wingc/src/jsify/snapshots/call_static_inflight_from_static_inflight.snap
index 3c3eba75183..d131a1db629 100644
--- a/libs/wingc/src/jsify/snapshots/call_static_inflight_from_static_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/call_static_inflight_from_static_inflight.snap
@@ -17,27 +17,29 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
     }
     static async foo() {
-      {console.log("hello")};
+      console.log("hello");
     }
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## inflight.B-1.js
+## inflight.B-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class B {
     static async bar() {
@@ -46,10 +48,10 @@ module.exports = function({ $A }) {
   }
   return B;
 }
-//# sourceMappingURL=inflight.B-1.js.map
+//# sourceMappingURL=inflight.B-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -58,6 +60,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -67,14 +71,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -82,8 +86,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "foo": [
+          ],
+        });
       }
     }
     class B extends $stdlib.std.Resource {
@@ -92,7 +105,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.B-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -100,7 +113,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BClient = ${B._toInflightType(this)};
+            const BClient = ${B._toInflightType()};
             const client = new BClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -108,14 +121,19 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bar", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [A, []],
+          ],
+        });
       }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("bar")) {
-          B._registerOnLiftObject(A, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "bar": [
+            [A, ["foo"]],
+          ],
+        });
       }
     }
   }
@@ -123,6 +141,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/calls_methods_on_preflight_object.snap b/libs/wingc/src/jsify/snapshots/calls_methods_on_preflight_object.snap
index 03cde59090a..e34ef9d6acd 100644
--- a/libs/wingc/src/jsify/snapshots/calls_methods_on_preflight_object.snap
+++ b/libs/wingc/src/jsify/snapshots/calls_methods_on_preflight_object.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure1 {
     constructor({  }) {
@@ -33,10 +34,10 @@ module.exports = function({ $b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -45,19 +46,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -65,7 +68,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -73,23 +76,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, ["list", "put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, [].concat(["put"], ["list"])],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_from_inside_an_inflight_closure.snap b/libs/wingc/src/jsify/snapshots/capture_from_inside_an_inflight_closure.snap
index ecd13ad0492..09e9197b655 100644
--- a/libs/wingc/src/jsify/snapshots/capture_from_inside_an_inflight_closure.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_from_inside_an_inflight_closure.snap
@@ -14,10 +14,11 @@ source: libs/wingc/src/jsify/tests.rs
     }
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -26,17 +27,17 @@ module.exports = function({ $foo }) {
       return $obj;
     }
     async handle() {
-      const r = async () => {
+      const r = (async () => {
         return $foo;
-      };
+      });
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -45,19 +46,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $foo: ${$stdlib.core.liftObject(foo)},
           })
         `;
@@ -65,7 +68,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -73,14 +76,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(foo, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, []],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
       }
     }
     const foo = "test";
@@ -90,6 +94,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_identifier_closure_from_preflight_scope.snap b/libs/wingc/src/jsify/snapshots/capture_identifier_closure_from_preflight_scope.snap
index 130289aacae..855df068e77 100644
--- a/libs/wingc/src/jsify/snapshots/capture_identifier_closure_from_preflight_scope.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_identifier_closure_from_preflight_scope.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -28,13 +29,14 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
+## inflight.$Closure2-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $foo }) {
   class $Closure2 {
     constructor({  }) {
@@ -48,10 +50,10 @@ module.exports = function({ $foo }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -60,25 +62,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -86,19 +90,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $foo: ${$stdlib.core.liftObject(foo)},
           })
         `;
@@ -106,7 +115,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -114,14 +123,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(foo, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, ["handle"]],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
       }
     }
     const foo = new $Closure1(this, "$Closure1");
@@ -131,6 +141,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope.snap b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope.snap
index 3b18de322ce..7fc9b80532b 100644
--- a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -24,15 +25,15 @@ module.exports = function({ $x }) {
       return $obj;
     }
     async handle() {
-      {console.log($x)};
+      console.log($x);
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -41,18 +42,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -60,7 +63,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -68,14 +71,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
     const x = "hello";
@@ -85,6 +89,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_method_call.snap b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_method_call.snap
index 66e123926c9..13cc38e59bb 100644
--- a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_method_call.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_method_call.snap
@@ -16,10 +16,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f }) {
   class $Closure1 {
     constructor({  }) {
@@ -33,13 +34,14 @@ module.exports = function({ $f }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -49,10 +51,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -61,6 +63,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -70,14 +74,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -85,19 +89,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bar", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "bar": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
           })
         `;
@@ -105,7 +114,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -113,14 +122,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(f, host, ["bar"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["bar"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
     const f = new Foo(this, "Foo");
@@ -130,6 +140,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_nested_object.snap b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_nested_object.snap
index 1d850c115c4..b5fbf73536b 100644
--- a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_nested_object.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_nested_object.snap
@@ -21,10 +21,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f_b }) {
   class $Closure1 {
     constructor({  }) {
@@ -38,13 +39,14 @@ module.exports = function({ $f_b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -52,10 +54,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -64,6 +66,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -71,18 +75,18 @@ class $Root extends $stdlib.std.Resource {
     class Foo extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -90,19 +94,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $f_b: ${$stdlib.core.liftObject(f.b)},
           })
         `;
@@ -110,7 +117,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -118,14 +125,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(f.b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f.b, ["put"]],
+          ],
+          "$inflight_init": [
+            [f.b, []],
+          ],
+        });
       }
     }
     const f = new Foo(this, "Foo");
@@ -135,6 +143,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_property.snap b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_property.snap
index 4558c41a8f4..a758b92f8cc 100644
--- a/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_property.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_identifier_from_preflight_scope_with_property.snap
@@ -12,11 +12,12 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $x_length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $x }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -24,15 +25,15 @@ module.exports = function({ $x_length }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x.length > 0")})(($x_length > 0))};
+      $helpers.assert(($x.length > 0), "x.length > 0");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -41,26 +42,28 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $x_length: ${$stdlib.core.liftObject(x.length)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $x: ${$stdlib.core.liftObject(x)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -68,14 +71,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, ["length"]],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
     const x = "hello";
@@ -85,6 +89,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_in_keyword_args.snap b/libs/wingc/src/jsify/snapshots/capture_in_keyword_args.snap
index 82f7870026d..312283f1f43 100644
--- a/libs/wingc/src/jsify/snapshots/capture_in_keyword_args.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_in_keyword_args.snap
@@ -10,15 +10,16 @@ source: libs/wingc/src/jsify/tests.rs
     let x = 1s;
     
     test "test" {
-      util.waitUntil((): bool => {}, interval: x);
+      util.waitUntil((): bool => { return true; }, interval: x);
     }
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $util_Util, $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -27,16 +28,17 @@ module.exports = function({ $util_Util, $x }) {
       return $obj;
     }
     async handle() {
-      (await $util_Util.waitUntil(async () => {
-      }, { interval: $x }));
+      (await $util_Util.waitUntil((async () => {
+        return true;
+      }), { interval: $x }));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -45,19 +47,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
             $x: ${$stdlib.core.liftObject(x)},
           })
@@ -66,7 +70,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -74,14 +78,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
     const x = (std.Duration.fromSeconds(1));
@@ -91,6 +96,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_object_with_this_in_name.snap b/libs/wingc/src/jsify/snapshots/capture_object_with_this_in_name.snap
index 169e979af5c..e08d93d3d5f 100644
--- a/libs/wingc/src/jsify/snapshots/capture_object_with_this_in_name.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_object_with_this_in_name.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket_this }) {
   class $Closure1 {
     constructor({  }) {
@@ -30,10 +31,10 @@ module.exports = function({ $bucket_this }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,19 +43,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bucket_this: ${$stdlib.core.liftObject(bucket_this)},
           })
         `;
@@ -62,7 +65,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -70,23 +73,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket_this, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket_this, ["put"]],
+          ],
+          "$inflight_init": [
+            [bucket_this, []],
+          ],
+        });
       }
     }
-    const bucket_this = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const bucket_this = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const fn = new $Closure1(this, "$Closure1");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_token.snap b/libs/wingc/src/jsify/snapshots/capture_token.snap
index c53661f3143..7d280541b37 100644
--- a/libs/wingc/src/jsify/snapshots/capture_token.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_token.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     }
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url }) {
   class $Closure1 {
     constructor({  }) {
@@ -24,15 +25,15 @@ module.exports = function({ $api_url }) {
       return $obj;
     }
     async handle() {
-      {console.log($api_url)};
+      console.log($api_url);
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -41,19 +42,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
           })
         `;
@@ -61,7 +64,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,23 +72,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_init.snap b/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_init.snap
index cd42a57a5bb..e33734b441e 100644
--- a/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_init.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_init.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -53,10 +54,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -65,25 +66,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -91,8 +94,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -101,6 +109,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_method.snap b/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_method.snap
index f7aa74655f7..47fb417fa00 100644
--- a/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_method.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_type_inflight_class_sibling_from_method.snap
@@ -16,10 +16,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -39,10 +40,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -51,25 +52,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -77,8 +80,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -87,6 +95,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_inner_no_capture.snap b/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_inner_no_capture.snap
index ef44ba413fa..b0d4cbe8f02 100644
--- a/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_inner_no_capture.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_inner_no_capture.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -31,10 +32,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -43,25 +44,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,8 +72,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -79,6 +87,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_outer.snap b/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_outer.snap
index 0c992cb8afc..8489eec5041 100644
--- a/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_outer.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_type_new_inflight_class_outer.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -30,22 +31,23 @@ module.exports = function({ $Foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -54,6 +56,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -63,14 +67,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -78,19 +82,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -98,7 +105,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -106,8 +113,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -116,6 +128,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_type_static_method.snap b/libs/wingc/src/jsify/snapshots/capture_type_static_method.snap
index a2de18918a7..b6277673600 100644
--- a/libs/wingc/src/jsify/snapshots/capture_type_static_method.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_type_static_method.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -32,13 +33,14 @@ module.exports = function({ $Foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -49,10 +51,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -61,6 +63,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -70,14 +74,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -85,19 +89,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bars", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "bars": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -105,7 +118,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -113,14 +126,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(Foo, host, ["bars"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [Foo, ["bars"]],
+          ],
+          "$inflight_init": [
+            [Foo, []],
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -129,6 +143,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_type_static_method_inflight_class.snap b/libs/wingc/src/jsify/snapshots/capture_type_static_method_inflight_class.snap
index a0bbf3fe7fa..cd7cc8981dd 100644
--- a/libs/wingc/src/jsify/snapshots/capture_type_static_method_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_type_static_method_inflight_class.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -32,13 +33,14 @@ module.exports = function({ $Foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     static async bar() {
@@ -47,10 +49,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -59,6 +61,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -68,14 +72,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -83,19 +87,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bar", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "bar": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -103,7 +116,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -111,8 +124,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -121,6 +139,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/capture_var_from_method_inflight.snap b/libs/wingc/src/jsify/snapshots/capture_var_from_method_inflight.snap
index 8fd69315e1e..9254bf82239 100644
--- a/libs/wingc/src/jsify/snapshots/capture_var_from_method_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/capture_var_from_method_inflight.snap
@@ -14,10 +14,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -36,10 +37,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -48,25 +49,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -74,8 +77,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -84,6 +92,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/chain_functions.snap b/libs/wingc/src/jsify/snapshots/chain_functions.snap
deleted file mode 100644
index b12851d6548..00000000000
--- a/libs/wingc/src/jsify/snapshots/chain_functions.snap
+++ /dev/null
@@ -1,167 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    bring cloud;
-
-    class Foo {
-      b: cloud.Bucket;
-
-      init() {
-        this.b = new cloud.Bucket();
-      }
-
-      inflight getBucket(): cloud.Bucket {
-        return this.b;
-      }
-    }
-
-    let f = new Foo();
-    let b = new cloud.Bucket();
-
-    test "test" {
-      f.getBucket().put("hello", "world");
-    }
-    
-```
-
-## inflight.$Closure1.js
-
-```js
-module.exports = function({ $f }) {
-  class $Closure1 {
-    async handle() {
-      (await (await $f.getBucket()).put("hello","world"));
-    }
-    constructor({  }) {
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-  }
-  return $Closure1;
-}
-```
-
-## inflight.Foo.js
-
-```js
-module.exports = function({  }) {
-  class Foo {
-    async getBucket() {
-      return this.$this_b;
-    }
-    constructor({ $this_b }) {
-      this.$this_b = $this_b;
-    }
-  }
-  return Foo;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-const cloud = require('@winglang/sdk').cloud;
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class Foo extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.b = this.node.root.newAbstract("@winglang/sdk.cloud.Bucket",this,"cloud.Bucket");
-        this._addInflightOps("getBucket", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.Foo.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const FooClient = ${Foo._toInflightType(this).text};
-            const client = new FooClient({
-              $this_b: ${this._lift(this.b)},
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-      _registerBind(host, ops) {
-        if (ops.includes("getBucket")) {
-          Foo._registerBindObject(this.b, host, []);
-        }
-        super._registerBind(host, ops);
-      }
-      static _registerTypeBind(host, ops) {
-        super._registerTypeBind(host, ops);
-      }
-    }
-    class $Closure1 extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.display.hidden = true;
-        this._addInflightOps("handle", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.$Closure1.js")({
-            $f: ${context._lift(f)},
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this).text};
-            const client = new $Closure1Client({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-      _registerBind(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerBindObject(f, host, ["getBucket"]);
-        }
-        super._registerBind(host, ops);
-      }
-      static _registerTypeBind(host, ops) {
-        super._registerTypeBind(host, ops);
-      }
-    }
-    const f = new Foo(this,"Foo");
-    const b = this.node.root.newAbstract("@winglang/sdk.cloud.Bucket",this,"cloud.Bucket");
-    this.node.root.new("@winglang/sdk.std.Test",std.Test,this,"test:test",new $Closure1(this,"$Closure1"));
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/closed_inflight_class_extends_outer_inflight_class.snap b/libs/wingc/src/jsify/snapshots/closed_inflight_class_extends_outer_inflight_class.snap
index 593697450f2..ebda1fe8f15 100644
--- a/libs/wingc/src/jsify/snapshots/closed_inflight_class_extends_outer_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/closed_inflight_class_extends_outer_inflight_class.snap
@@ -14,10 +14,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class $Closure1 {
     constructor({  }) {
@@ -33,22 +34,23 @@ module.exports = function({ $Base }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -57,6 +59,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -66,14 +70,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -81,19 +85,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -101,7 +108,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -109,8 +116,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -119,6 +131,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/closure_field.snap b/libs/wingc/src/jsify/snapshots/closure_field.snap
index 5efb417bd10..22d34a6d686 100644
--- a/libs/wingc/src/jsify/snapshots/closure_field.snap
+++ b/libs/wingc/src/jsify/snapshots/closure_field.snap
@@ -32,10 +32,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $globalBucket }) {
   class $Closure1 {
     constructor({  }) {
@@ -50,13 +51,14 @@ module.exports = function({ $globalBucket }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
+## inflight.$Closure2-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class $Closure2 {
     constructor({  }) {
@@ -66,18 +68,19 @@ module.exports = function({ $x }) {
     }
     async handle() {
       const val = (await $x.foo());
-      {((cond) => {if (!cond) throw new Error("assertion failed: val == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(val,"hello")))};
+      $helpers.assert($helpers.eq(val, "hello"), "val == \"hello\"");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.MyResource-1.js
+## inflight.MyResource-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyResource {
     constructor({ $this_closure }) {
@@ -89,10 +92,10 @@ module.exports = function({  }) {
   }
   return MyResource;
 }
-//# sourceMappingURL=inflight.MyResource-1.js.map
+//# sourceMappingURL=inflight.MyResource-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -101,6 +104,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -108,16 +113,15 @@ class $Root extends $stdlib.std.Resource {
     class MyResource extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure1-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
                 $globalBucket: ${$stdlib.core.liftObject(globalBucket)},
               })
             `;
@@ -125,7 +129,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this)};
+                const $Closure1Client = ${$Closure1._toInflightType()};
                 const client = new $Closure1Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -133,28 +137,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure1._registerOnLiftObject(globalBucket, host, ["list"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [globalBucket, ["list"]],
+              ],
+              "$inflight_init": [
+                [globalBucket, []],
+              ],
+            });
           }
         }
         this.closure = new $Closure1(this, "$Closure1");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyResource-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyResource-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyResourceClient = ${MyResource._toInflightType(this)};
+            const MyResourceClient = ${MyResource._toInflightType()};
             const client = new MyResourceClient({
               $this_closure: ${$stdlib.core.liftObject(this.closure)},
             });
@@ -163,28 +168,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyResource._registerOnLiftObject(this.closure, host, []);
-        }
-        if (ops.includes("foo")) {
-          MyResource._registerOnLiftObject(this.closure, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "foo": [
+            [this.closure, ["handle"]],
+          ],
+          "$inflight_init": [
+            [this.closure, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -192,7 +195,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -200,17 +203,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(x, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, ["foo"]],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
-    const globalBucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const globalBucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const x = new MyResource(this, "MyResource");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:variable can be an inflight closure", new $Closure2(this, "$Closure2"));
   }
@@ -218,6 +222,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/entrypoint_this.snap b/libs/wingc/src/jsify/snapshots/entrypoint_this.snap
new file mode 100644
index 00000000000..b61f8369c14
--- /dev/null
+++ b/libs/wingc/src/jsify/snapshots/entrypoint_this.snap
@@ -0,0 +1,34 @@
+---
+source: libs/wingc/src/jsify/tests.rs
+---
+## Code
+
+```w
+
+    this;
+    
+```
+
+## preflight.cjs
+
+```js
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    this;
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/libs/wingc/src/jsify/snapshots/enum_value.snap b/libs/wingc/src/jsify/snapshots/enum_value.snap
index a264bb719a4..e48c24d9f1e 100644
--- a/libs/wingc/src/jsify/snapshots/enum_value.snap
+++ b/libs/wingc/src/jsify/snapshots/enum_value.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $MyEnum, $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -27,16 +28,16 @@ module.exports = function({ $MyEnum, $x }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: MyEnum.B != MyEnum.C")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($MyEnum.B,$MyEnum.C)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == MyEnum.C")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($x,$MyEnum.C)))};
+      $helpers.assert($helpers.neq($MyEnum.B, $MyEnum.C), "MyEnum.B != MyEnum.C");
+      $helpers.assert($helpers.eq($x, $MyEnum.C), "x == MyEnum.C");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -45,18 +46,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    const MyEnum =
+      (function (tmp) {
+        tmp["B"] = "B";
+        tmp["C"] = "C";
+        return tmp;
+      })({})
+    ;
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $MyEnum: ${$stdlib.core.liftObject(MyEnum)},
             $x: ${$stdlib.core.liftObject(x)},
           })
@@ -65,7 +75,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -73,23 +83,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
-    const MyEnum =
-      (function (tmp) {
-        tmp[tmp["B"] = 0] = ",B";
-        tmp[tmp["C"] = 1] = ",C";
-        return tmp;
-      })({})
-    ;
     const x = MyEnum.C;
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
@@ -97,6 +101,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/fail_unqualified_lift.snap b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift.snap
index 3dfd4e255c4..6861d930dce 100644
--- a/libs/wingc/src/jsify/snapshots/fail_unqualified_lift.snap
+++ b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift.snap
@@ -2,4 +2,4 @@
 source: libs/wingc/src/jsify/tests.rs
 ---
 ## Errors
-Cannot qualify access to a lifted object of type "Queue" (see https://github.com/winglang/wing/issues/76 for more details) 6:6
+Expression of type "Queue" references an unknown preflight object, can't qualify its capabilities 7:6
diff --git a/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_as_arg.snap b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_as_arg.snap
new file mode 100644
index 00000000000..d8c3b97da67
--- /dev/null
+++ b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_as_arg.snap
@@ -0,0 +1,5 @@
+---
+source: libs/wingc/src/jsify/tests.rs
+---
+## Errors
+Expression of type "Queue" references an unknown preflight object, can't qualify its capabilities 6:6
diff --git a/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_element_from_collection_of_objects.snap b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_element_from_collection_of_objects.snap
index f5624b6639f..e69e408fd6d 100644
--- a/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_element_from_collection_of_objects.snap
+++ b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_element_from_collection_of_objects.snap
@@ -2,4 +2,4 @@
 source: libs/wingc/src/jsify/tests.rs
 ---
 ## Errors
-Cannot qualify access to a lifted object of type "Bucket" (see https://github.com/winglang/wing/issues/76 for more details) 5:6
+Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities 6:6
diff --git a/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_return.snap b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_return.snap
new file mode 100644
index 00000000000..181889d0b26
--- /dev/null
+++ b/libs/wingc/src/jsify/snapshots/fail_unqualified_lift_return.snap
@@ -0,0 +1,5 @@
+---
+source: libs/wingc/src/jsify/tests.rs
+---
+## Errors
+Expression of type "Queue" references an unknown preflight object, can't qualify its capabilities 11:6
diff --git a/libs/wingc/src/jsify/snapshots/fails_base_class_with_lifted_field_object_unqualified.snap b/libs/wingc/src/jsify/snapshots/fails_base_class_with_lifted_field_object_unqualified.snap
deleted file mode 100644
index 39c7cef06a2..00000000000
--- a/libs/wingc/src/jsify/snapshots/fails_base_class_with_lifted_field_object_unqualified.snap
+++ /dev/null
@@ -1,6 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Errors
-Cannot access private member "b" of "Derived" 12:13
-Cannot qualify access to a lifted object of type "Bucket" (see https://github.com/winglang/wing/issues/76 for more details) 12:8
diff --git a/libs/wingc/src/jsify/snapshots/fails_if_referencing_unknown_field.snap b/libs/wingc/src/jsify/snapshots/fails_if_referencing_unknown_field.snap
index ec1c17df827..86418eae8c3 100644
--- a/libs/wingc/src/jsify/snapshots/fails_if_referencing_unknown_field.snap
+++ b/libs/wingc/src/jsify/snapshots/fails_if_referencing_unknown_field.snap
@@ -2,4 +2,4 @@
 source: libs/wingc/src/jsify/tests.rs
 ---
 ## Errors
-Unknown symbol "b" 3:13
+Member "b" does not exist in "MyInflightClass" 3:13
diff --git a/libs/wingc/src/jsify/snapshots/fails_lift_collection_of_objects.snap b/libs/wingc/src/jsify/snapshots/fails_lift_collection_of_objects.snap
deleted file mode 100644
index d4cea83b53e..00000000000
--- a/libs/wingc/src/jsify/snapshots/fails_lift_collection_of_objects.snap
+++ /dev/null
@@ -1,104 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    bring cloud;
-    let a = [new cloud.Bucket()];
-
-    test "test" {
-      let i = 0;
-      a.at(i).put("hello", "world");
-    }
-    
-```
-
-## inflight.$Closure1.js
-
-```js
-module.exports = function({ $_a_at_i__ }) {
-  class $Closure1 {
-    async handle() {
-      const i = 0;
-      (await $_a_at_i__.put("hello","world"));
-    }
-    constructor({  }) {
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-  }
-  return $Closure1;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-const cloud = require('@winglang/sdk').cloud;
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class $Closure1 extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.display.hidden = true;
-        this._addInflightOps("handle", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.$Closure1.js")({
-            $_a_at_i__: ${context._lift((a.at(i)))},
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this).text};
-            const client = new $Closure1Client({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-      _registerBind(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerBindObject((a.at(i)), host, ["put"]);
-        }
-        super._registerBind(host, ops);
-      }
-      static _registerTypeBind(host, ops) {
-        super._registerTypeBind(host, ops);
-      }
-    }
-    const a = Object.freeze([this.node.root.newAbstract("@winglang/sdk.cloud.Bucket",this,"cloud.Bucket")]);
-    this.node.root.new("@winglang/sdk.std.Test",std.Test,this,"test:test",new $Closure1(this,"$Closure1"));
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/fails_lift_with_inflight_arguments.snap b/libs/wingc/src/jsify/snapshots/fails_lift_with_inflight_arguments.snap
deleted file mode 100644
index 3365b84f4ec..00000000000
--- a/libs/wingc/src/jsify/snapshots/fails_lift_with_inflight_arguments.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Errors
-Cannot reference an inflight value from within a preflight expression 5:11
diff --git a/libs/wingc/src/jsify/snapshots/fails_on_preflight_static.snap b/libs/wingc/src/jsify/snapshots/fails_on_preflight_static.snap
index 448f6bbbfbc..84d07b23a6f 100644
--- a/libs/wingc/src/jsify/snapshots/fails_on_preflight_static.snap
+++ b/libs/wingc/src/jsify/snapshots/fails_on_preflight_static.snap
@@ -2,5 +2,6 @@
 source: libs/wingc/src/jsify/tests.rs
 ---
 ## Errors
+A function whose return type is "str" must return a value. 2:33
 Cannot access private member "staticMethod" of "MyType" 6:17
 Cannot call into preflight phase while inflight 6:10
diff --git a/libs/wingc/src/jsify/snapshots/fails_when_referencing_this_from_static.snap b/libs/wingc/src/jsify/snapshots/fails_when_referencing_this_from_static.snap
index 175bb0c025a..f683e035597 100644
--- a/libs/wingc/src/jsify/snapshots/fails_when_referencing_this_from_static.snap
+++ b/libs/wingc/src/jsify/snapshots/fails_when_referencing_this_from_static.snap
@@ -2,4 +2,4 @@
 source: libs/wingc/src/jsify/tests.rs
 ---
 ## Errors
-Unknown symbol "this" 3:8
+Member "print" does not exist in "Construct" 3:13
diff --git a/libs/wingc/src/jsify/snapshots/foo.snap b/libs/wingc/src/jsify/snapshots/foo.snap
deleted file mode 100644
index f57f1b3f496..00000000000
--- a/libs/wingc/src/jsify/snapshots/foo.snap
+++ /dev/null
@@ -1,138 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    class Foo {
-      value: str;
-      init() { this.value = "hello"; }
-    }
-
-    let foo_this = new Foo();
-    test "test" {
-      assert(foo_this.value == "hello");
-    }
-    
-```
-
-## inflight.$Closure1.js
-
-```js
-module.exports = function({  }) {
-  class $Closure1 {
-    async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo_this.value == \"hello\"")})((this.$foo_this_value === "hello"))};
-    }
-    constructor({ $foo_this_value }) {
-      this.$foo_this_value = $foo_this_value;
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-  }
-  return $Closure1;
-}
-```
-
-## inflight.Foo.js
-
-```js
-module.exports = function({  }) {
-  class Foo {
-    constructor({  }) {
-    }
-  }
-  return Foo;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class Foo extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.value = "hello";
-        this._addInflightOps("$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.Foo.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const FooClient = ${Foo._toInflightType(this).text};
-            const client = new FooClient({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-    }
-    class $Closure1 extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.display.hidden = true;
-        this._addInflightOps("handle", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.$Closure1.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this).text};
-            const client = new $Closure1Client({
-              $foo_this_value: ${this._lift(foo_this.value)},
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-      _registerBind(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerBindObject(foo_this.value, host, []);
-        }
-        super._registerBind(host, ops);
-      }
-    }
-    const foo_this = new Foo(this,"Foo");
-    this.node.root.new("@winglang/sdk.std.Test",std.Test,this,"test:test",new $Closure1(this,"$Closure1"));
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/free_inflight_obj_from_inflight.snap b/libs/wingc/src/jsify/snapshots/free_inflight_obj_from_inflight.snap
index deb4ce7d2f1..5257f8a3c70 100644
--- a/libs/wingc/src/jsify/snapshots/free_inflight_obj_from_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/free_inflight_obj_from_inflight.snap
@@ -17,10 +17,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -33,7 +34,7 @@ module.exports = function({  }) {
       class A {
         constructor(){
           this.$inflight_init = async () => {
-            {console.log(y)};
+            console.log(y);
           }
         }
       }
@@ -41,10 +42,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -53,25 +54,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -79,8 +82,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -89,6 +97,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/free_preflight_object_from_preflight.snap b/libs/wingc/src/jsify/snapshots/free_preflight_object_from_preflight.snap
index ca80acea4b5..15ebf279878 100644
--- a/libs/wingc/src/jsify/snapshots/free_preflight_object_from_preflight.snap
+++ b/libs/wingc/src/jsify/snapshots/free_preflight_object_from_preflight.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -24,10 +25,10 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -36,6 +37,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -44,18 +47,18 @@ class $Root extends $stdlib.std.Resource {
         super($scope, $id);
       }
       foo() {
-        {console.log(x)};
+        console.log(x);
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -63,8 +66,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const x = "hello";
@@ -73,6 +79,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/func_returns_func.snap b/libs/wingc/src/jsify/snapshots/func_returns_func.snap
index 28c2b296d1a..2b8e67d67c0 100644
--- a/libs/wingc/src/jsify/snapshots/func_returns_func.snap
+++ b/libs/wingc/src/jsify/snapshots/func_returns_func.snap
@@ -7,18 +7,20 @@ source: libs/wingc/src/jsify/tests.rs
 
     test "test" {
       (s: str): (): bool => {
-        (): bool => { 
+        return (): bool => {
           s;
+          return true;
         };
       };
     }
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -27,19 +29,20 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      async (s) => {
-        async () => {
+      (async (s) => {
+        return (async () => {
           s;
-        };
-      };
+          return true;
+        });
+      });
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -48,25 +51,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -74,8 +79,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -84,6 +94,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/identify_field.snap b/libs/wingc/src/jsify/snapshots/identify_field.snap
index 96e92759fa2..8cdc9ae7a00 100644
--- a/libs/wingc/src/jsify/snapshots/identify_field.snap
+++ b/libs/wingc/src/jsify/snapshots/identify_field.snap
@@ -18,10 +18,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({ $this_bucket_this }) {
@@ -33,10 +34,10 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -45,6 +46,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -52,18 +55,18 @@ class $Root extends $stdlib.std.Resource {
     class A extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.bucket_this = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.bucket_this = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
               $this_bucket_this: ${$stdlib.core.liftObject(this.bucket_this)},
             });
@@ -72,17 +75,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          A._registerOnLiftObject(this.bucket_this, host, []);
-        }
-        if (ops.includes("foo")) {
-          A._registerOnLiftObject(this.bucket_this, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "foo": [
+            [this.bucket_this, ["put"]],
+          ],
+          "$inflight_init": [
+            [this.bucket_this, []],
+          ],
+        });
       }
     }
   }
@@ -90,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/identify_field_in_brackets.snap b/libs/wingc/src/jsify/snapshots/identify_field_in_brackets.snap
deleted file mode 100644
index 9bbdae39277..00000000000
--- a/libs/wingc/src/jsify/snapshots/identify_field_in_brackets.snap
+++ /dev/null
@@ -1,99 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    bring cloud;
-    class A {
-      bucket: cloud.Bucket;
-
-      init() { this.bucket = new cloud.Bucket(); }
-
-      inflight foo() {
-        (this.bucket).put("hello", "world");
-      }
-    }
-    
-```
-
-## inflight.A.js
-
-```js
-module.exports = function({  }) {
-  class A {
-    async foo() {
-      (await this.$this_bucket.put("hello","world"));
-    }
-    constructor({ $this_bucket }) {
-      this.$this_bucket = $this_bucket;
-    }
-  }
-  return A;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-const cloud = require('@winglang/sdk').cloud;
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class A extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.bucket = this.node.root.newAbstract("@winglang/sdk.cloud.Bucket",this,"cloud.Bucket");
-        this._addInflightOps("foo", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.A.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const AClient = ${A._toInflightType(this).text};
-            const client = new AClient({
-              $this_bucket: ${this._lift(this.bucket)},
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-      _registerBind(host, ops) {
-        if (ops.includes("foo")) {
-          A._registerBindObject(this.bucket, host, ["put"]);
-        }
-        super._registerBind(host, ops);
-      }
-    }
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/identify_field_inside_expression.snap b/libs/wingc/src/jsify/snapshots/identify_field_inside_expression.snap
deleted file mode 100644
index 9bbdae39277..00000000000
--- a/libs/wingc/src/jsify/snapshots/identify_field_inside_expression.snap
+++ /dev/null
@@ -1,99 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    bring cloud;
-    class A {
-      bucket: cloud.Bucket;
-
-      init() { this.bucket = new cloud.Bucket(); }
-
-      inflight foo() {
-        (this.bucket).put("hello", "world");
-      }
-    }
-    
-```
-
-## inflight.A.js
-
-```js
-module.exports = function({  }) {
-  class A {
-    async foo() {
-      (await this.$this_bucket.put("hello","world"));
-    }
-    constructor({ $this_bucket }) {
-      this.$this_bucket = $this_bucket;
-    }
-  }
-  return A;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-const cloud = require('@winglang/sdk').cloud;
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class A extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.bucket = this.node.root.newAbstract("@winglang/sdk.cloud.Bucket",this,"cloud.Bucket");
-        this._addInflightOps("foo", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.A.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const AClient = ${A._toInflightType(this).text};
-            const client = new AClient({
-              $this_bucket: ${this._lift(this.bucket)},
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-      _registerBind(host, ops) {
-        if (ops.includes("foo")) {
-          A._registerBindObject(this.bucket, host, ["put"]);
-        }
-        super._registerBind(host, ops);
-      }
-    }
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/implicit_lift_inflight_init.snap b/libs/wingc/src/jsify/snapshots/implicit_lift_inflight_init.snap
index 67bafdf2232..ede8b4806e1 100644
--- a/libs/wingc/src/jsify/snapshots/implicit_lift_inflight_init.snap
+++ b/libs/wingc/src/jsify/snapshots/implicit_lift_inflight_init.snap
@@ -30,10 +30,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({ $this_c }) {
@@ -43,7 +44,7 @@ module.exports = function({  }) {
       (await this.$this_c.inc());
     }
     async dontTouchCounter() {
-      {console.log("hello")};
+      console.log("hello");
     }
     async $inflight_init() {
       this.myField2 = "hello";
@@ -51,10 +52,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -63,6 +64,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -70,18 +73,18 @@ class $Root extends $stdlib.std.Resource {
     class Foo extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.c = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+        this.c = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
               $this_c: ${$stdlib.core.liftObject(this.c)},
             });
@@ -90,17 +93,19 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "myField2", "incCounter", "dontTouchCounter", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(this.c, host, []);
-        }
-        if (ops.includes("incCounter")) {
-          Foo._registerOnLiftObject(this.c, host, ["inc"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "incCounter": [
+            [this.c, ["inc"]],
+          ],
+          "dontTouchCounter": [
+          ],
+          "$inflight_init": [
+            [this.c, []],
+          ],
+          "myField2": [
+          ],
+        });
       }
     }
   }
@@ -108,6 +113,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/indirect_capture.snap b/libs/wingc/src/jsify/snapshots/indirect_capture.snap
index 56004936c02..15a89bd9a55 100644
--- a/libs/wingc/src/jsify/snapshots/indirect_capture.snap
+++ b/libs/wingc/src/jsify/snapshots/indirect_capture.snap
@@ -28,10 +28,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f }) {
   class $Closure1 {
     constructor({  }) {
@@ -45,13 +46,14 @@ module.exports = function({ $f }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Capture-1.js
+## inflight.Capture-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class Capture {
     constructor({  }) {
@@ -65,10 +67,10 @@ module.exports = function({ $b }) {
   }
   return Capture;
 }
-//# sourceMappingURL=inflight.Capture-1.js.map
+//# sourceMappingURL=inflight.Capture-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -77,6 +79,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -84,11 +88,11 @@ class $Root extends $stdlib.std.Resource {
     class Capture extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Capture-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Capture-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -96,7 +100,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const CaptureClient = ${Capture._toInflightType(this)};
+            const CaptureClient = ${Capture._toInflightType()};
             const client = new CaptureClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -104,28 +108,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "goo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("foo")) {
-          Capture._registerOnLiftObject(b, host, ["list"]);
-        }
-        if (ops.includes("goo")) {
-          Capture._registerOnLiftObject(this, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "foo": [
+            [b, ["list"]],
+          ],
+          "goo": [
+            [this, ["foo"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
           })
         `;
@@ -133,7 +138,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -141,17 +146,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(f, host, ["goo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["goo"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const f = new Capture(this, "Capture");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
@@ -159,6 +165,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/inflight_class_extends_both_inside_inflight_closure.snap b/libs/wingc/src/jsify/snapshots/inflight_class_extends_both_inside_inflight_closure.snap
index 830a8a9b579..c496a96fb04 100644
--- a/libs/wingc/src/jsify/snapshots/inflight_class_extends_both_inside_inflight_closure.snap
+++ b/libs/wingc/src/jsify/snapshots/inflight_class_extends_both_inside_inflight_closure.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -32,10 +33,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -44,25 +45,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -70,8 +73,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -80,6 +88,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/inflight_class_extends_inflight_class.snap b/libs/wingc/src/jsify/snapshots/inflight_class_extends_inflight_class.snap
index c71e6aaf796..681b87585d6 100644
--- a/libs/wingc/src/jsify/snapshots/inflight_class_extends_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/inflight_class_extends_inflight_class.snap
@@ -10,31 +10,33 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## inflight.B-1.js
+## inflight.B-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class B extends $A {
   }
   return B;
 }
-//# sourceMappingURL=inflight.B-1.js.map
+//# sourceMappingURL=inflight.B-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -43,6 +45,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -52,14 +56,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -67,8 +71,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class B extends A {
@@ -77,7 +84,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.B-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -85,7 +92,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BClient = ${B._toInflightType(this)};
+            const BClient = ${B._toInflightType()};
             const client = new BClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -93,8 +100,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
   }
@@ -102,6 +112,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/inflight_class_extends_inflight_class_inside_inflight_closure.snap b/libs/wingc/src/jsify/snapshots/inflight_class_extends_inflight_class_inside_inflight_closure.snap
deleted file mode 100644
index dcdab88a374..00000000000
--- a/libs/wingc/src/jsify/snapshots/inflight_class_extends_inflight_class_inside_inflight_closure.snap
+++ /dev/null
@@ -1,109 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    test "test" {
-      class A {}
-      class B extends A {}
-    }
-    
-```
-
-## inflight.$Closure1.js
-
-```js
-module.exports = function({  }) {
-  class $Closure1 {
-    async handle() {
-      const A = require("./inflight.A.js")({});
-      const B = require("./inflight.B.js")({});
-    }
-    constructor({  }) {
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-  }
-  return $Closure1;
-}
-```
-
-## inflight.A.js
-
-```js
-module.exports = function({  }) {
-  class A {
-  }
-  return A;
-}
-```
-
-## inflight.B.js
-
-```js
-module.exports = function({  }) {
-  class B extends A {
-  }
-  return B;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class $Closure1 extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.display.hidden = true;
-        this._addInflightOps("handle", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.$Closure1.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this).text};
-            const client = new $Closure1Client({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-    }
-    this.node.root.new("@winglang/sdk.std.Test",std.Test,this,"test:test",new $Closure1(this,"$Closure1"));
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/inflight_constructor.snap b/libs/wingc/src/jsify/snapshots/inflight_constructor.snap
index 322e331dd2f..80faa3b1138 100644
--- a/libs/wingc/src/jsify/snapshots/inflight_constructor.snap
+++ b/libs/wingc/src/jsify/snapshots/inflight_constructor.snap
@@ -19,10 +19,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -36,10 +37,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -48,6 +49,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -57,14 +60,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -72,8 +75,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "x", "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "foo": [
+          ],
+          "$inflight_init": [
+          ],
+          "x": [
+          ],
+        });
       }
     }
   }
@@ -81,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/inflight_field.snap b/libs/wingc/src/jsify/snapshots/inflight_field.snap
index 7c0a9e9613d..0cfde3b80c0 100644
--- a/libs/wingc/src/jsify/snapshots/inflight_field.snap
+++ b/libs/wingc/src/jsify/snapshots/inflight_field.snap
@@ -18,16 +18,17 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
     }
     async method() {
-      {console.log(this.x)};
+      console.log(this.x);
     }
     async $inflight_init() {
       this.x = "hello";
@@ -35,10 +36,10 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -47,6 +48,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -56,14 +59,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -71,8 +74,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "x", "method", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "method": [
+          ],
+          "$inflight_init": [
+          ],
+          "x": [
+          ],
+        });
       }
     }
   }
@@ -80,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight.snap b/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight.snap
index 7cabbf661a0..f300ef416e6 100644
--- a/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight.snap
@@ -17,16 +17,17 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     constructor({  }) {
     }
     async foo() {
-      {console.log(this.s)};
+      console.log(this.s);
     }
     async $inflight_init() {
       this.s = "hey there!";
@@ -34,10 +35,10 @@ module.exports = function({  }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -46,6 +47,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -55,14 +58,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -70,8 +73,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "s", "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "foo": [
+          ],
+          "$inflight_init": [
+          ],
+          "s": [
+          ],
+        });
       }
     }
   }
@@ -79,6 +89,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight_class.snap b/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight_class.snap
index b82d7c2ee69..04d361bfed3 100644
--- a/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/inflight_field_from_inflight_class.snap
@@ -16,10 +16,11 @@ source: libs/wingc/src/jsify/tests.rs
   
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     async getField() {
@@ -33,10 +34,10 @@ module.exports = function({  }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -45,6 +46,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -54,14 +57,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,17 +72,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "field", "getField", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyType._registerOnLiftObject(this, host, ["field"]);
-        }
-        if (ops.includes("getField")) {
-          MyType._registerOnLiftObject(this, host, ["field"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "getField": [
+            [this, ["field"]],
+          ],
+          "$inflight_init": [
+            [this, ["field"]],
+          ],
+          "field": [
+          ],
+        });
       }
     }
   }
@@ -87,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/inflight_inner_class_captures_variable.snap b/libs/wingc/src/jsify/snapshots/inflight_inner_class_captures_variable.snap
deleted file mode 100644
index d2c2dfaca38..00000000000
--- a/libs/wingc/src/jsify/snapshots/inflight_inner_class_captures_variable.snap
+++ /dev/null
@@ -1,107 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    test "test" {
-      let var i = 10;
-    
-      class Inner {
-        dang(): num {
-          i = i + 1;
-        }
-      }
-    }
-    
-```
-
-## inflight.$Closure1.js
-
-```js
-module.exports = function({  }) {
-  class $Closure1 {
-    async handle() {
-      let i = 10;
-      const Inner = require("./inflight.Inner.js")({$i});
-    }
-    constructor({  }) {
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-  }
-  return $Closure1;
-}
-```
-
-## inflight.Inner.js
-
-```js
-module.exports = function({ $i }) {
-  class Inner {
-    async dang() {
-      $i = ($i + 1);
-    }
-  }
-  return Inner;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class $Closure1 extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this.display.hidden = true;
-        this._addInflightOps("handle", "$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.$Closure1.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this).text};
-            const client = new $Closure1Client({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-    }
-    this.node.root.new("@winglang/sdk.std.Test",std.Test,this,"test:test",new $Closure1(this,"$Closure1"));
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/inline_inflight_class.snap b/libs/wingc/src/jsify/snapshots/inline_inflight_class.snap
index 58f212a4791..2a44a3b8b81 100644
--- a/libs/wingc/src/jsify/snapshots/inline_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/inline_inflight_class.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_1_b }) {
   class $Closure1 {
     constructor({  }) {
@@ -39,13 +40,14 @@ module.exports = function({ $__parent_this_1_b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -53,10 +55,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -65,6 +67,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -72,18 +76,18 @@ class $Root extends $stdlib.std.Resource {
     class Foo extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
         const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure1-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
                 $__parent_this_1_b: ${$stdlib.core.liftObject(__parent_this_1.b)},
               })
             `;
@@ -91,7 +95,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this)};
+                const $Closure1Client = ${$Closure1._toInflightType()};
                 const client = new $Closure1Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -99,28 +103,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure1._registerOnLiftObject(__parent_this_1.b, host, ["put"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_1.b, ["put"]],
+              ],
+              "$inflight_init": [
+                [__parent_this_1.b, []],
+              ],
+            });
           }
         }
         (this.q.setConsumer(new $Closure1(this, "$Closure1")));
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -128,8 +133,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
   }
@@ -137,6 +145,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/json_object.snap b/libs/wingc/src/jsify/snapshots/json_object.snap
index a5a4517fe4c..62036dd7fef 100644
--- a/libs/wingc/src/jsify/snapshots/json_object.snap
+++ b/libs/wingc/src/jsify/snapshots/json_object.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $jsonObj1, $std_Json }) {
   class $Closure1 {
     constructor({  }) {
@@ -25,15 +26,15 @@ module.exports = function({ $jsonObj1, $std_Json }) {
       return $obj;
     }
     async handle() {
-      {console.log(((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([$jsonObj1]))};
+      console.log(((json, opts) => { return JSON.stringify(json, null, opts?.indent) })($jsonObj1));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,18 +43,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $jsonObj1: ${$stdlib.core.liftObject(jsonObj1)},
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
           })
@@ -62,7 +65,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -70,14 +73,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(jsonObj1, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [jsonObj1, []],
+          ],
+          "$inflight_init": [
+            [jsonObj1, []],
+          ],
+        });
       }
     }
     const jsonObj1 = ({"key1": "value1"});
@@ -87,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_binary_preflight_and_inflight_expression.snap b/libs/wingc/src/jsify/snapshots/lift_binary_preflight_and_inflight_expression.snap
index a005c75ecbf..b61054c3b05 100644
--- a/libs/wingc/src/jsify/snapshots/lift_binary_preflight_and_inflight_expression.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_binary_preflight_and_inflight_expression.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -31,10 +32,10 @@ module.exports = function({ $x }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -43,18 +44,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -62,7 +65,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -70,14 +73,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
     const x = 1;
@@ -87,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_binary_preflight_expression.snap b/libs/wingc/src/jsify/snapshots/lift_binary_preflight_expression.snap
index a65be3c8def..229498fdb1d 100644
--- a/libs/wingc/src/jsify/snapshots/lift_binary_preflight_expression.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_binary_preflight_expression.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x, $y }) {
   class $Closure1 {
     constructor({  }) {
@@ -30,10 +31,10 @@ module.exports = function({ $x, $y }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,18 +43,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
             $y: ${$stdlib.core.liftObject(y)},
           })
@@ -62,7 +65,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -70,15 +73,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, []);
-          $Closure1._registerOnLiftObject(y, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, []],
+            [y, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+            [y, []],
+          ],
+        });
       }
     }
     const x = 1;
@@ -89,6 +94,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_element_from_collection_as_field.snap b/libs/wingc/src/jsify/snapshots/lift_element_from_collection_as_field.snap
index 1bc8cf351af..c047a224ca7 100644
--- a/libs/wingc/src/jsify/snapshots/lift_element_from_collection_as_field.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_element_from_collection_as_field.snap
@@ -13,31 +13,32 @@ source: libs/wingc/src/jsify/tests.rs
       }
 
       inflight foo() {
-        this.arr.at(0).put("hello", "world");
+        this.arr[0].put("hello", "world");
       }
     }
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
-    constructor({ $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__0_ }) {
-      this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__0_ = $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__0_;
+    constructor({ $_helpers_lookup_this_arr__0_ }) {
+      this.$_helpers_lookup_this_arr__0_ = $_helpers_lookup_this_arr__0_;
     }
     async foo() {
-      (await this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__0_.put("hello", "world"));
+      (await this.$_helpers_lookup_this_arr__0_.put("hello", "world"));
     }
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -46,6 +47,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -53,37 +56,35 @@ class $Root extends $stdlib.std.Resource {
     class Foo extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.arr = [this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket")];
+        this.arr = [this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket")];
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
-              $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arr, 0))},
+              $_helpers_lookup_this_arr__0_: ${$stdlib.core.liftObject($helpers.lookup(this.arr, 0))},
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arr, 0), host, []);
-        }
-        if (ops.includes("foo")) {
-          Foo._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arr, 0), host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "foo": [
+            [$helpers.lookup(this.arr, 0), ["put"]],
+          ],
+          "$inflight_init": [
+            [$helpers.lookup(this.arr, 0), []],
+          ],
+        });
       }
     }
   }
@@ -91,6 +92,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_element_from_collection_of_objects.snap b/libs/wingc/src/jsify/snapshots/lift_element_from_collection_of_objects.snap
index b20b4694596..3cbfadf715d 100644
--- a/libs/wingc/src/jsify/snapshots/lift_element_from_collection_of_objects.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_element_from_collection_of_objects.snap
@@ -9,16 +9,17 @@ source: libs/wingc/src/jsify/tests.rs
     let a = [new cloud.Bucket()];
 
     test "test" {
-      a.at(0).put("hello", "world");
+      a[0].put("hello", "world");
     }
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______a__0_ }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $_helpers_lookup_a__0_ }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -26,15 +27,15 @@ module.exports = function({ $__arr__index_______if__index___0____index____arr_le
       return $obj;
     }
     async handle() {
-      (await $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______a__0_.put("hello", "world"));
+      (await $_helpers_lookup_a__0_.put("hello", "world"));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -43,27 +44,29 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______a__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(a, 0))},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $_helpers_lookup_a__0_: ${$stdlib.core.liftObject($helpers.lookup(a, 0))},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -71,23 +74,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(a, 0), host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [$helpers.lookup(a, 0), ["put"]],
+          ],
+          "$inflight_init": [
+            [$helpers.lookup(a, 0), []],
+          ],
+        });
       }
     }
-    const a = [this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket")];
+    const a = [this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket")];
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_inflight_closure.snap b/libs/wingc/src/jsify/snapshots/lift_inflight_closure.snap
index f9d99cca2f9..28b88a5ba27 100644
--- a/libs/wingc/src/jsify/snapshots/lift_inflight_closure.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_inflight_closure.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -29,13 +30,14 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
+## inflight.$Closure2-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f }) {
   class $Closure2 {
     constructor({  }) {
@@ -49,10 +51,10 @@ module.exports = function({ $f }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -61,25 +63,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -87,19 +91,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
           })
         `;
@@ -107,7 +116,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -115,14 +124,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(f, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["handle"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
     const f = new $Closure1(this, "$Closure1");
@@ -132,6 +142,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_inside_preflight_method.snap b/libs/wingc/src/jsify/snapshots/lift_inside_preflight_method.snap
index 279e2eaf8df..4e5080a5db6 100644
--- a/libs/wingc/src/jsify/snapshots/lift_inside_preflight_method.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_inside_preflight_method.snap
@@ -23,10 +23,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure1 {
     constructor({  }) {
@@ -40,13 +41,14 @@ module.exports = function({ $b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -54,10 +56,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -66,6 +68,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -78,16 +82,15 @@ class $Root extends $stdlib.std.Resource {
       }
       defineBucket(name) {
         const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, name);
-        const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure1-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
                 $b: ${$stdlib.core.liftObject(b)},
               })
             `;
@@ -95,7 +98,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this)};
+                const $Closure1Client = ${$Closure1._toInflightType()};
                 const client = new $Closure1Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -103,28 +106,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure1._registerOnLiftObject(b, host, ["put"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [b, ["put"]],
+              ],
+              "$inflight_init": [
+                [b, []],
+              ],
+            });
           }
         }
         new $Closure1(this, "$Closure1");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -132,8 +136,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
   }
@@ -141,6 +148,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_self_reference.snap b/libs/wingc/src/jsify/snapshots/lift_self_reference.snap
index 005ec723f3a..a7b5c6332a4 100644
--- a/libs/wingc/src/jsify/snapshots/lift_self_reference.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_self_reference.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -31,10 +32,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -43,6 +44,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -52,14 +55,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -67,14 +70,21 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "static_method", "bar", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "bar": [
+            [Foo, ["static_method"]],
+          ],
+          "$inflight_init": [
+            [Foo, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("bar")) {
-          Foo._registerOnLiftObject(Foo, host, ["static_method"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "static_method": [
+          ],
+        });
       }
     }
   }
@@ -82,6 +92,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_string.snap b/libs/wingc/src/jsify/snapshots/lift_string.snap
index f8625069edf..72b030f22ac 100644
--- a/libs/wingc/src/jsify/snapshots/lift_string.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_string.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure1 {
     constructor({  }) {
@@ -24,15 +25,15 @@ module.exports = function({ $b }) {
       return $obj;
     }
     async handle() {
-      {console.log($b)};
+      console.log($b);
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -41,18 +42,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -60,7 +63,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -68,14 +71,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, []],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
     const b = "hello";
@@ -85,6 +89,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_this.snap b/libs/wingc/src/jsify/snapshots/lift_this.snap
index 9cdd3455010..6ab8730b88c 100644
--- a/libs/wingc/src/jsify/snapshots/lift_this.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_this.snap
@@ -26,10 +26,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f }) {
   class $Closure1 {
     constructor({  }) {
@@ -38,18 +39,19 @@ module.exports = function({ $f }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: f.foo() == 21")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $f.foo()),21)))};
+      $helpers.assert($helpers.eq((await $f.foo()), 21), "f.foo() == 21");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -66,10 +68,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -78,6 +80,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -87,14 +91,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -102,25 +106,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "x", "bar", "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("foo")) {
-          Foo._registerOnLiftObject(this, host, ["bar"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "bar": [
+          ],
+          "foo": [
+            [this, ["bar"]],
+          ],
+          "$inflight_init": [
+          ],
+          "x": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
           })
         `;
@@ -128,7 +136,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -136,14 +144,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(f, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["foo"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
     const f = new Foo(this, "Foo");
@@ -153,6 +162,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_var_with_this.snap b/libs/wingc/src/jsify/snapshots/lift_var_with_this.snap
index 0950d03a183..1274cd10e3a 100644
--- a/libs/wingc/src/jsify/snapshots/lift_var_with_this.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_var_with_this.snap
@@ -17,10 +17,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({ $foo_this_value }) {
@@ -30,18 +31,19 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo_this.value == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$foo_this_value,"hello")))};
+      $helpers.assert($helpers.eq(this.$foo_this_value, "hello"), "foo_this.value == \"hello\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -49,10 +51,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -61,6 +63,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -71,14 +75,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -86,26 +90,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
               $foo_this_value: ${$stdlib.core.liftObject(foo_this.value)},
             });
@@ -114,17 +121,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          $Closure1._registerOnLiftObject(foo_this.value, host, []);
-        }
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(foo_this.value, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo_this.value, []],
+          ],
+          "$inflight_init": [
+            [foo_this.value, []],
+          ],
+        });
       }
     }
     const foo_this = new Foo(this, "Foo");
@@ -134,6 +139,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_via_closure.snap b/libs/wingc/src/jsify/snapshots/lift_via_closure.snap
index 1e0d5cab5f4..c2031ed3b27 100644
--- a/libs/wingc/src/jsify/snapshots/lift_via_closure.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_via_closure.snap
@@ -19,10 +19,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket }) {
   class $Closure1 {
     constructor({  }) {
@@ -36,13 +37,14 @@ module.exports = function({ $bucket }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
+## inflight.$Closure2-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fn }) {
   class $Closure2 {
     constructor({  }) {
@@ -56,10 +58,10 @@ module.exports = function({ $fn }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -68,19 +70,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bucket: ${$stdlib.core.liftObject(bucket)},
           })
         `;
@@ -88,7 +92,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -96,25 +100,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket, ["put"]],
+          ],
+          "$inflight_init": [
+            [bucket, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $fn: ${$stdlib.core.liftObject(fn)},
           })
         `;
@@ -122,7 +127,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -130,17 +135,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(fn, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, ["handle"]],
+          ],
+          "$inflight_init": [
+            [fn, []],
+          ],
+        });
       }
     }
-    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const fn = new $Closure1(this, "$Closure1");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure2(this, "$Closure2"));
   }
@@ -148,6 +154,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/lift_via_closure_class_explicit.snap b/libs/wingc/src/jsify/snapshots/lift_via_closure_class_explicit.snap
index 556af436ff0..460441dd0a4 100644
--- a/libs/wingc/src/jsify/snapshots/lift_via_closure_class_explicit.snap
+++ b/libs/wingc/src/jsify/snapshots/lift_via_closure_class_explicit.snap
@@ -30,10 +30,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fn }) {
   class $Closure1 {
     constructor({  }) {
@@ -47,13 +48,14 @@ module.exports = function({ $fn }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyClosure-1.js
+## inflight.MyClosure-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyClosure {
     constructor({ $this_q }) {
@@ -71,10 +73,10 @@ module.exports = function({  }) {
   }
   return MyClosure;
 }
-//# sourceMappingURL=inflight.MyClosure-1.js.map
+//# sourceMappingURL=inflight.MyClosure-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -83,26 +85,28 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class MyClosure extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyClosure-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyClosure-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyClosureClient = ${MyClosure._toInflightType(this)};
+            const MyClosureClient = ${MyClosure._toInflightType()};
             const client = new MyClosureClient({
               $this_q: ${$stdlib.core.liftObject(this.q)},
             });
@@ -111,31 +115,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "another", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyClosure._registerOnLiftObject(this.q, host, []);
-        }
-        if (ops.includes("another")) {
-          MyClosure._registerOnLiftObject(this.q, host, ["push"]);
-        }
-        if (ops.includes("handle")) {
-          MyClosure._registerOnLiftObject(this, host, ["another"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [this, ["another"]],
+          ],
+          "another": [
+            [this.q, ["push"]],
+          ],
+          "$inflight_init": [
+            [this.q, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $fn: ${$stdlib.core.liftObject(fn)},
           })
         `;
@@ -143,7 +145,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -151,14 +153,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(fn, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, ["handle"]],
+          ],
+          "$inflight_init": [
+            [fn, []],
+          ],
+        });
       }
     }
     const fn = new MyClosure(this, "MyClosure");
@@ -168,6 +171,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/namespaced_static_from_inflight.snap b/libs/wingc/src/jsify/snapshots/namespaced_static_from_inflight.snap
index 0e5a0a1cd02..d7c67b36828 100644
--- a/libs/wingc/src/jsify/snapshots/namespaced_static_from_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/namespaced_static_from_inflight.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $util_Util }) {
   class $Closure1 {
     constructor({  }) {
@@ -29,10 +30,10 @@ module.exports = function({ $util_Util }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -41,19 +42,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
           })
         `;
@@ -61,7 +64,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,8 +72,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -79,6 +87,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/nested_inflight_after_preflight_operation.snap b/libs/wingc/src/jsify/snapshots/nested_inflight_after_preflight_operation.snap
index 374fc9c19cd..2c771b0b1f7 100644
--- a/libs/wingc/src/jsify/snapshots/nested_inflight_after_preflight_operation.snap
+++ b/libs/wingc/src/jsify/snapshots/nested_inflight_after_preflight_operation.snap
@@ -21,10 +21,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $y }) {
   class $Closure1 {
     constructor({  }) {
@@ -33,18 +34,19 @@ module.exports = function({ $y }) {
       return $obj;
     }
     async handle() {
-      {console.log($y.b)};
+      console.log($y.b);
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.YourType-1.js
+## inflight.YourType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class YourType {
     constructor({  }) {
@@ -55,10 +57,10 @@ module.exports = function({  }) {
   }
   return YourType;
 }
-//# sourceMappingURL=inflight.YourType-1.js.map
+//# sourceMappingURL=inflight.YourType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -67,6 +69,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -77,14 +81,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.YourType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.YourType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const YourTypeClient = ${YourType._toInflightType(this)};
+            const YourTypeClient = ${YourType._toInflightType()};
             const client = new YourTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -92,19 +96,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "b", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+          "b": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $y: ${$stdlib.core.liftObject(y)},
           })
         `;
@@ -112,7 +121,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -120,14 +129,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(y, host, ["b"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [y, ["b"]],
+          ],
+          "$inflight_init": [
+            [y, []],
+          ],
+        });
       }
     }
     const y = new YourType(this, "YourType");
@@ -137,6 +147,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/nested_preflight_operation.snap b/libs/wingc/src/jsify/snapshots/nested_preflight_operation.snap
index bfbb71ff725..91257bfd431 100644
--- a/libs/wingc/src/jsify/snapshots/nested_preflight_operation.snap
+++ b/libs/wingc/src/jsify/snapshots/nested_preflight_operation.snap
@@ -27,10 +27,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $t_y_b }) {
   class $Closure1 {
     constructor({  }) {
@@ -44,13 +45,14 @@ module.exports = function({ $t_y_b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     constructor({  }) {
@@ -58,13 +60,14 @@ module.exports = function({  }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## inflight.YourType-1.js
+## inflight.YourType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class YourType {
     constructor({  }) {
@@ -72,10 +75,10 @@ module.exports = function({  }) {
   }
   return YourType;
 }
-//# sourceMappingURL=inflight.YourType-1.js.map
+//# sourceMappingURL=inflight.YourType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -84,6 +87,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -91,18 +96,18 @@ class $Root extends $stdlib.std.Resource {
     class YourType extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.YourType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.YourType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const YourTypeClient = ${YourType._toInflightType(this)};
+            const YourTypeClient = ${YourType._toInflightType()};
             const client = new YourTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -110,8 +115,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class MyType extends $stdlib.std.Resource {
@@ -121,14 +129,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -136,19 +144,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $t_y_b: ${$stdlib.core.liftObject(t.y.b)},
           })
         `;
@@ -156,7 +167,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -164,14 +175,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(t.y.b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [t.y.b, ["put"]],
+          ],
+          "$inflight_init": [
+            [t.y.b, []],
+          ],
+        });
       }
     }
     const t = new MyType(this, "MyType");
@@ -181,6 +193,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/new_inflight_object.snap b/libs/wingc/src/jsify/snapshots/new_inflight_object.snap
index 2918108e462..4c0fcdbb3da 100644
--- a/libs/wingc/src/jsify/snapshots/new_inflight_object.snap
+++ b/libs/wingc/src/jsify/snapshots/new_inflight_object.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -30,22 +31,23 @@ module.exports = function({ $Foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -54,6 +56,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -63,14 +67,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -78,19 +82,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -98,7 +105,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -106,8 +113,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -116,6 +128,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/no_capture_inside_methods.snap b/libs/wingc/src/jsify/snapshots/no_capture_inside_methods.snap
index 7098e129c96..c053dcae157 100644
--- a/libs/wingc/src/jsify/snapshots/no_capture_inside_methods.snap
+++ b/libs/wingc/src/jsify/snapshots/no_capture_inside_methods.snap
@@ -14,10 +14,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -34,10 +35,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -46,25 +47,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -72,8 +75,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -82,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_inner_scope.snap b/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_inner_scope.snap
index 70b31680c3a..d3992988748 100644
--- a/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_inner_scope.snap
+++ b/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_inner_scope.snap
@@ -14,10 +14,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -28,16 +29,16 @@ module.exports = function({  }) {
     async handle() {
       const x = "hello";
       if (true) {
-        {console.log(x)};
+        console.log(x);
       }
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -46,25 +47,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -72,8 +75,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -82,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_same_scope.snap b/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_same_scope.snap
index b279c5c7a1e..8c96fb27ae5 100644
--- a/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_same_scope.snap
+++ b/libs/wingc/src/jsify/snapshots/no_capture_of_identifier_from_same_scope.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -25,15 +26,15 @@ module.exports = function({  }) {
     }
     async handle() {
       const x = "hello";
-      {console.log(x)};
+      console.log(x);
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,25 +43,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -68,8 +71,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -78,6 +86,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/no_capture_shadow_inside_inner_scopes.snap b/libs/wingc/src/jsify/snapshots/no_capture_shadow_inside_inner_scopes.snap
index d4901aa9625..54db26e1554 100644
--- a/libs/wingc/src/jsify/snapshots/no_capture_shadow_inside_inner_scopes.snap
+++ b/libs/wingc/src/jsify/snapshots/no_capture_shadow_inside_inner_scopes.snap
@@ -19,10 +19,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -33,19 +34,19 @@ module.exports = function({  }) {
     async handle() {
       const arr = [0];
       const i = 1;
-      (await arr.push(i));
+      arr.push(i);
       if (true) {
         const i = 2;
-        (await arr.push(i));
+        arr.push(i);
       }
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -54,25 +55,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -80,8 +83,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:testing", new $Closure1(this, "$Closure1"));
@@ -90,6 +98,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/no_lift_shadow_inside_inner_scopes.snap b/libs/wingc/src/jsify/snapshots/no_lift_shadow_inside_inner_scopes.snap
index df200285092..5b6c9f12da8 100644
--- a/libs/wingc/src/jsify/snapshots/no_lift_shadow_inside_inner_scopes.snap
+++ b/libs/wingc/src/jsify/snapshots/no_lift_shadow_inside_inner_scopes.snap
@@ -18,10 +18,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $i }) {
   class $Closure1 {
     constructor({  }) {
@@ -31,19 +32,19 @@ module.exports = function({ $i }) {
     }
     async handle() {
       const arr = [0];
-      (await arr.push($i));
+      arr.push($i);
       if (true) {
         const i = 2;
-        (await arr.push(i));
+        arr.push(i);
       }
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -52,18 +53,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $i: ${$stdlib.core.liftObject(i)},
           })
         `;
@@ -71,7 +74,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -79,14 +82,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(i, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [i, []],
+          ],
+          "$inflight_init": [
+            [i, []],
+          ],
+        });
       }
     }
     const i = 1;
@@ -96,6 +100,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_class_extends_preflight_class.snap b/libs/wingc/src/jsify/snapshots/preflight_class_extends_preflight_class.snap
index 16f1ff91091..f8df6a1e343 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_class_extends_preflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_class_extends_preflight_class.snap
@@ -10,10 +10,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Base-1.js
+## inflight.Base-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Base {
     constructor({  }) {
@@ -21,13 +22,14 @@ module.exports = function({  }) {
   }
   return Base;
 }
-//# sourceMappingURL=inflight.Base-1.js.map
+//# sourceMappingURL=inflight.Base-1.cjs.map
 ```
 
-## inflight.Derived-1.js
+## inflight.Derived-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Base }) {
   class Derived extends $Base {
     constructor({  }) {
@@ -36,10 +38,10 @@ module.exports = function({ $Base }) {
   }
   return Derived;
 }
-//# sourceMappingURL=inflight.Derived-1.js.map
+//# sourceMappingURL=inflight.Derived-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -48,6 +50,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -57,14 +61,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Base-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClient = ${Base._toInflightType(this)};
+            const BaseClient = ${Base._toInflightType()};
             const client = new BaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -72,8 +76,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Derived extends Base {
@@ -82,7 +89,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Derived-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
             $Base: ${$stdlib.core.liftObject(Base)},
           })
         `;
@@ -90,7 +97,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this)};
+            const DerivedClient = ${Derived._toInflightType()};
             const client = new DerivedClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -98,8 +105,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
   }
@@ -107,6 +117,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_collection.snap b/libs/wingc/src/jsify/snapshots/preflight_collection.snap
index 29d086ff64c..a2e0f01dcee 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_collection.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_collection.snap
@@ -13,11 +13,12 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______a__0_, $a_length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $a }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -25,16 +26,16 @@ module.exports = function({ $__arr__index_______if__index___0____index____arr_le
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: a.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($a_length,2)))};
-      {console.log($__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______a__0_)};
+      $helpers.assert($helpers.eq($a.length, 2), "a.length == 2");
+      console.log(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($a, 0));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -43,27 +44,28 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______a__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(a, 0))},
-            $a_length: ${$stdlib.core.liftObject(a.length)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $a: ${$stdlib.core.liftObject(a)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -71,15 +73,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(a, 0), host, []);
-          $Closure1._registerOnLiftObject(a.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [a, [].concat(["length"], ["at"])],
+          ],
+          "$inflight_init": [
+            [a, []],
+          ],
+        });
       }
     }
     const a = ["hello", "world"];
@@ -89,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_collection_of_preflight_objects.snap b/libs/wingc/src/jsify/snapshots/preflight_collection_of_preflight_objects.snap
index e41c5a9ad38..ccbf4ba8352 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_collection_of_preflight_objects.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_collection_of_preflight_objects.snap
@@ -12,16 +12,17 @@ source: libs/wingc/src/jsify/tests.rs
     ];
     test "test" {
       assert(arr.length == 2);
-      arr.at(0).put("hello", "world");
+      arr[0].put("hello", "world");
     }
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__0_, $arr_length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $_helpers_lookup_arr__0_, $arr }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -29,16 +30,16 @@ module.exports = function({ $__arr__index_______if__index___0____index____arr_le
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: arr.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($arr_length,2)))};
-      (await $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__0_.put("hello", "world"));
+      $helpers.assert($helpers.eq($arr.length, 2), "arr.length == 2");
+      (await $_helpers_lookup_arr__0_.put("hello", "world"));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -47,28 +48,30 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr, 0))},
-            $arr_length: ${$stdlib.core.liftObject(arr.length)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $_helpers_lookup_arr__0_: ${$stdlib.core.liftObject($helpers.lookup(arr, 0))},
+            $arr: ${$stdlib.core.liftObject(arr)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -76,15 +79,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr, 0), host, ["put"]);
-          $Closure1._registerOnLiftObject(arr.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [$helpers.lookup(arr, 0), ["put"]],
+            [arr, ["length"]],
+          ],
+          "$inflight_init": [
+            [$helpers.lookup(arr, 0), []],
+            [arr, []],
+          ],
+        });
       }
     }
     const arr = [this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b1"), this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b2")];
@@ -94,6 +99,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_nested_object_with_operations.snap b/libs/wingc/src/jsify/snapshots/preflight_nested_object_with_operations.snap
index 0ad77a15eff..d1f4f50769d 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_nested_object_with_operations.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_nested_object_with_operations.snap
@@ -21,10 +21,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $a_bucky }) {
   class $Closure1 {
     constructor({  }) {
@@ -38,13 +39,14 @@ module.exports = function({ $a_bucky }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -52,10 +54,10 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -64,6 +66,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -75,14 +79,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -90,19 +94,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $a_bucky: ${$stdlib.core.liftObject(a.bucky)},
           })
         `;
@@ -110,7 +117,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -118,17 +125,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(a.bucky, host, ["list"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [a.bucky, ["list"]],
+          ],
+          "$inflight_init": [
+            [a.bucky, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const a = new A(this, "A");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
@@ -136,6 +144,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_object.snap b/libs/wingc/src/jsify/snapshots/preflight_object.snap
index f96a9d8f4a7..c7d6b9c02a2 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_object.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_object.snap
@@ -17,10 +17,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $pf_obj }) {
   class $Closure1 {
     constructor({  }) {
@@ -35,13 +36,14 @@ module.exports = function({ $pf_obj }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -53,10 +55,10 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -65,6 +67,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -74,14 +78,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -89,19 +93,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "hello", "goodbye", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "hello": [
+          ],
+          "goodbye": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $pf_obj: ${$stdlib.core.liftObject(pf_obj)},
           })
         `;
@@ -109,7 +120,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -117,14 +128,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(pf_obj, host, ["goodbye", "hello"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [pf_obj, [].concat(["hello"], ["goodbye"])],
+          ],
+          "$inflight_init": [
+            [pf_obj, []],
+          ],
+        });
       }
     }
     const pf_obj = new A(this, "A");
@@ -134,6 +146,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_object_through_property.snap b/libs/wingc/src/jsify/snapshots/preflight_object_through_property.snap
index 0588033ac35..73ae66c5d8a 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_object_through_property.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_object_through_property.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $t_b }) {
   class $Closure1 {
     constructor({  }) {
@@ -39,13 +40,14 @@ module.exports = function({ $t_b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     constructor({  }) {
@@ -53,10 +55,10 @@ module.exports = function({  }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -65,6 +67,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -72,18 +76,18 @@ class $Root extends $stdlib.std.Resource {
     class MyType extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -91,19 +95,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $t_b: ${$stdlib.core.liftObject(t.b)},
           })
         `;
@@ -111,7 +118,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -119,14 +126,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(t.b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [t.b, ["put"]],
+          ],
+          "$inflight_init": [
+            [t.b, []],
+          ],
+        });
       }
     }
     const t = new MyType(this, "MyType");
@@ -136,6 +144,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_object_with_operations.snap b/libs/wingc/src/jsify/snapshots/preflight_object_with_operations.snap
index e5fbd24cbb5..3118c933228 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_object_with_operations.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_object_with_operations.snap
@@ -14,10 +14,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure1 {
     constructor({  }) {
@@ -32,10 +33,10 @@ module.exports = function({ $b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -44,19 +45,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -64,7 +67,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -72,23 +75,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, ["list", "put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, [].concat(["list"], ["put"])],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_object_with_operations_multiple_methods.snap b/libs/wingc/src/jsify/snapshots/preflight_object_with_operations_multiple_methods.snap
index 67cabfc0aaf..30684d0011d 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_object_with_operations_multiple_methods.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_object_with_operations_multiple_methods.snap
@@ -20,10 +20,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class Foo {
     constructor({  }) {
@@ -37,10 +38,10 @@ module.exports = function({ $b }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -49,6 +50,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -59,7 +62,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -67,7 +70,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -75,25 +78,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "put", "list", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("list")) {
-          Foo._registerOnLiftObject(b, host, ["list"]);
-        }
-        if (ops.includes("put")) {
-          Foo._registerOnLiftObject(b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "put": [
+            [b, ["put"]],
+          ],
+          "list": [
+            [b, ["list"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/preflight_value_field.snap b/libs/wingc/src/jsify/snapshots/preflight_value_field.snap
index 3a9bd39abbe..9a150a8c71d 100644
--- a/libs/wingc/src/jsify/snapshots/preflight_value_field.snap
+++ b/libs/wingc/src/jsify/snapshots/preflight_value_field.snap
@@ -25,11 +25,12 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $t_last, $t_name, $t_name_length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $t_last, $t_name }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -37,20 +38,21 @@ module.exports = function({ $t_last, $t_name, $t_name_length }) {
       return $obj;
     }
     async handle() {
-      {console.log($t_name)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: t.name.length > 0")})(($t_name_length > 0))};
-      {console.log($t_last)};
+      console.log($t_name);
+      $helpers.assert(($t_name.length > 0), "t.name.length > 0");
+      console.log($t_last);
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     constructor({  }) {
@@ -58,10 +60,10 @@ module.exports = function({  }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -70,6 +72,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -81,14 +85,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -96,29 +100,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $t_last: ${$stdlib.core.liftObject(t.last)},
             $t_name: ${$stdlib.core.liftObject(t.name)},
-            $t_name_length: ${$stdlib.core.liftObject(t.name.length)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -126,16 +132,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(t.last, host, []);
-          $Closure1._registerOnLiftObject(t.name, host, []);
-          $Closure1._registerOnLiftObject(t.name.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [t.last, []],
+            [t.name, ["length"]],
+          ],
+          "$inflight_init": [
+            [t.last, []],
+            [t.name, []],
+          ],
+        });
       }
     }
     const t = new MyType(this, "MyType");
@@ -145,6 +152,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/read_primitive_value.snap b/libs/wingc/src/jsify/snapshots/read_primitive_value.snap
index cfbf1a5717e..774da98ff7f 100644
--- a/libs/wingc/src/jsify/snapshots/read_primitive_value.snap
+++ b/libs/wingc/src/jsify/snapshots/read_primitive_value.snap
@@ -13,10 +13,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -25,15 +26,15 @@ module.exports = function({ $x }) {
       return $obj;
     }
     async handle() {
-      {console.log($x)};
+      console.log($x);
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,18 +43,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -61,7 +64,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,14 +72,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
     const x = "my_string";
@@ -86,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reassign_captured_variable.snap b/libs/wingc/src/jsify/snapshots/reassign_captured_variable.snap
index 2c2274f09c2..cdab8211e67 100644
--- a/libs/wingc/src/jsify/snapshots/reassign_captured_variable.snap
+++ b/libs/wingc/src/jsify/snapshots/reassign_captured_variable.snap
@@ -9,7 +9,7 @@ source: libs/wingc/src/jsify/tests.rs
       let var i = 10;
     
       class Inner {
-        dang(): num {
+        dang(): void {
           i = i + 1;
         }
       }
@@ -17,10 +17,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -39,10 +40,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -51,25 +52,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -77,8 +80,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -87,6 +95,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reassigned_captured_variable_preflight.snap b/libs/wingc/src/jsify/snapshots/reassigned_captured_variable_preflight.snap
index db09167a75b..bbde03ffe57 100644
--- a/libs/wingc/src/jsify/snapshots/reassigned_captured_variable_preflight.snap
+++ b/libs/wingc/src/jsify/snapshots/reassigned_captured_variable_preflight.snap
@@ -12,7 +12,7 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -21,6 +21,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -33,6 +35,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/ref_std_macro.snap b/libs/wingc/src/jsify/snapshots/ref_std_macro.snap
index 9fb94d5957f..d421e6a3c7d 100644
--- a/libs/wingc/src/jsify/snapshots/ref_std_macro.snap
+++ b/libs/wingc/src/jsify/snapshots/ref_std_macro.snap
@@ -13,11 +13,12 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
-module.exports = function({ $arr_length }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $arr }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -25,15 +26,15 @@ module.exports = function({ $arr_length }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: arr.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($arr_length,3)))};
+      $helpers.assert($helpers.eq($arr.length, 3), "arr.length == 3");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,26 +43,28 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $arr_length: ${$stdlib.core.liftObject(arr.length)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $arr: ${$stdlib.core.liftObject(arr)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,14 +72,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(arr.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [arr, ["length"]],
+          ],
+          "$inflight_init": [
+            [arr, []],
+          ],
+        });
       }
     }
     const arr = [1, 2, 3];
@@ -86,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_from_static_inflight.snap b/libs/wingc/src/jsify/snapshots/reference_from_static_inflight.snap
index 6762dc2efdc..b4e479c49bf 100644
--- a/libs/wingc/src/jsify/snapshots/reference_from_static_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_from_static_inflight.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $s }) {
   class MyType {
     constructor({  }) {
@@ -29,10 +30,10 @@ module.exports = function({ $s }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -41,6 +42,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -50,7 +53,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
             $s: ${$stdlib.core.liftObject(s)},
           })
         `;
@@ -58,7 +61,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -66,14 +69,19 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "staticMethod", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [s, []],
+          ],
+        });
       }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("staticMethod")) {
-          MyType._registerOnLiftObject(s, host, []);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "staticMethod": [
+            [s, []],
+          ],
+        });
       }
     }
     const s = "hello";
@@ -82,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_inflight_class.snap b/libs/wingc/src/jsify/snapshots/reference_inflight_class.snap
index 9d48498b180..7037afed5fc 100644
--- a/libs/wingc/src/jsify/snapshots/reference_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_inflight_class.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -27,18 +28,19 @@ module.exports = function({ $Foo }) {
       return $obj;
     }
     async handle() {
-      {console.log((await $Foo.a()))};
+      console.log((await $Foo.a()));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     static async a() {
@@ -47,10 +49,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -59,6 +61,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -68,14 +72,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -83,19 +87,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "a", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "a": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -103,7 +116,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -111,8 +124,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -121,6 +139,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_inflight_field.snap b/libs/wingc/src/jsify/snapshots/reference_inflight_field.snap
index f93d77dfd5f..28ee4f47cc6 100644
--- a/libs/wingc/src/jsify/snapshots/reference_inflight_field.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_inflight_field.snap
@@ -19,10 +19,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -36,10 +37,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -48,6 +49,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -57,14 +60,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -72,8 +75,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "x", "method", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "method": [
+          ],
+          "$inflight_init": [
+          ],
+          "x": [
+          ],
+        });
       }
     }
   }
@@ -81,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_inflight_from_inflight.snap b/libs/wingc/src/jsify/snapshots/reference_inflight_from_inflight.snap
index df3fdfa09b2..6ddf585201a 100644
--- a/libs/wingc/src/jsify/snapshots/reference_inflight_from_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_inflight_from_inflight.snap
@@ -27,10 +27,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -44,25 +45,26 @@ module.exports = function({ $Foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $s }) {
   class Foo {
     async foofoo1() {
-      {console.log($s)};
+      console.log($s);
     }
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -71,6 +73,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -80,7 +84,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $s: ${$stdlib.core.liftObject(s)},
           })
         `;
@@ -88,7 +92,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -96,25 +100,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foofoo1", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("foofoo1")) {
-          Foo._registerOnLiftObject(s, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "foofoo1": [
+            [s, []],
+          ],
+          "$inflight_init": [
+            [s, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -122,7 +127,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -130,8 +135,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const s = "hello";
@@ -141,6 +151,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_lift_of_collection.snap b/libs/wingc/src/jsify/snapshots/reference_lift_of_collection.snap
new file mode 100644
index 00000000000..4baa0e5b574
--- /dev/null
+++ b/libs/wingc/src/jsify/snapshots/reference_lift_of_collection.snap
@@ -0,0 +1,95 @@
+---
+source: libs/wingc/src/jsify/tests.rs
+---
+## Code
+
+```w
+
+    let a = [1,2,3];
+
+    test "test" {
+      a;
+    }
+    
+```
+
+## inflight.$Closure1-1.cjs
+
+```js
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $a }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $a;
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## preflight.cjs
+
+```js
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $a: ${$stdlib.core.liftObject(a)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [a, []],
+          ],
+          "$inflight_init": [
+            [a, []],
+          ],
+        });
+      }
+    }
+    const a = [1, 2, 3];
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/libs/wingc/src/jsify/snapshots/reference_preflight_field.snap b/libs/wingc/src/jsify/snapshots/reference_preflight_field.snap
index ad7bf7a2f8d..6d418fe4b67 100644
--- a/libs/wingc/src/jsify/snapshots/reference_preflight_field.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_preflight_field.snap
@@ -19,10 +19,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({ $this_x }) {
@@ -34,10 +35,10 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -46,6 +47,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -56,14 +59,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
               $this_x: ${$stdlib.core.liftObject(this.x)},
             });
@@ -72,17 +75,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "method", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(this.x, host, []);
-        }
-        if (ops.includes("method")) {
-          Foo._registerOnLiftObject(this.x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "method": [
+            [this.x, []],
+          ],
+          "$inflight_init": [
+            [this.x, []],
+          ],
+        });
       }
     }
   }
@@ -90,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_preflight_field_call_independent_method.snap b/libs/wingc/src/jsify/snapshots/reference_preflight_field_call_independent_method.snap
index b57cea70bde..17388473e70 100644
--- a/libs/wingc/src/jsify/snapshots/reference_preflight_field_call_independent_method.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_preflight_field_call_independent_method.snap
@@ -19,25 +19,26 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
-    constructor({ $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__1_ }) {
-      this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__1_ = $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__1_;
+    constructor({ $this_arr }) {
+      this.$this_arr = $this_arr;
     }
     async method() {
-      this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__1_;
+      ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.$this_arr, 1);
     }
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -46,6 +47,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -56,33 +59,31 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
-              $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arr__1_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arr, 1))},
+              $this_arr: ${$stdlib.core.liftObject(this.arr)},
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "method", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arr, 1), host, []);
-        }
-        if (ops.includes("method")) {
-          Foo._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arr, 1), host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "method": [
+            [this.arr, ["at"]],
+          ],
+          "$inflight_init": [
+            [this.arr, []],
+          ],
+        });
       }
     }
   }
@@ -90,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_preflight_field_from_inflight_expr.snap b/libs/wingc/src/jsify/snapshots/reference_preflight_field_from_inflight_expr.snap
new file mode 100644
index 00000000000..288c07757e1
--- /dev/null
+++ b/libs/wingc/src/jsify/snapshots/reference_preflight_field_from_inflight_expr.snap
@@ -0,0 +1,6 @@
+---
+source: libs/wingc/src/jsify/tests.rs
+---
+## Errors
+Can't access preflight member "x" on inflight instance of type "A" 9:14
+Expression of type "A" references an unknown preflight object, can't qualify its capabilities 9:12
diff --git a/libs/wingc/src/jsify/snapshots/reference_preflight_fields.snap b/libs/wingc/src/jsify/snapshots/reference_preflight_fields.snap
index e9899fa89a9..cabd4783e02 100644
--- a/libs/wingc/src/jsify/snapshots/reference_preflight_fields.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_preflight_fields.snap
@@ -29,19 +29,20 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
-    constructor({ $this_b, $this_s_length }) {
+    constructor({ $this_b, $this_s }) {
       this.$this_b = $this_b;
-      this.$this_s_length = $this_s_length;
+      this.$this_s = $this_s;
     }
     async boom() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.s.length > 0")})((this.$this_s_length > 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.b.list().length > 0")})(((await this.$this_b.list()).length > 0))};
+      $helpers.assert((this.$this_s.length > 0), "this.s.length > 0");
+      $helpers.assert(((await this.$this_b.list()).length > 0), "this.b.list().length > 0");
     }
     async bam() {
       (await this.$this_b.put("hello", "world"));
@@ -50,10 +51,10 @@ module.exports = function({  }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -62,6 +63,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -70,43 +73,41 @@ class $Root extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
         this.s = "hello";
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
               $this_b: ${$stdlib.core.liftObject(this.b)},
-              $this_s_length: ${$stdlib.core.liftObject(this.s.length)},
+              $this_s: ${$stdlib.core.liftObject(this.s)},
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "boom", "bam", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyType._registerOnLiftObject(this.b, host, []);
-          MyType._registerOnLiftObject(this.s.length, host, []);
-        }
-        if (ops.includes("bam")) {
-          MyType._registerOnLiftObject(this.b, host, ["get", "put"]);
-        }
-        if (ops.includes("boom")) {
-          MyType._registerOnLiftObject(this.b, host, ["list"]);
-          MyType._registerOnLiftObject(this.s.length, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "boom": [
+            [this.b, ["list"]],
+            [this.s, ["length"]],
+          ],
+          "bam": [
+            [this.b, [].concat(["put"], ["get"])],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+            [this.s, []],
+          ],
+        });
       }
     }
   }
@@ -114,6 +115,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_preflight_free_variable_with_this_in_the_expression.snap b/libs/wingc/src/jsify/snapshots/reference_preflight_free_variable_with_this_in_the_expression.snap
index e61dabffdcb..f7b74ca97e8 100644
--- a/libs/wingc/src/jsify/snapshots/reference_preflight_free_variable_with_this_in_the_expression.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_preflight_free_variable_with_this_in_the_expression.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.Foo-1.js
+## inflight.Foo-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class Foo {
     constructor({ $this_name }) {
@@ -37,10 +38,10 @@ module.exports = function({ $b }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -49,6 +50,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -60,7 +63,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -68,7 +71,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
               $this_name: ${$stdlib.core.liftObject(this.name)},
             });
@@ -77,26 +80,25 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "method", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(this.name, host, []);
-        }
-        if (ops.includes("method")) {
-          Foo._registerOnLiftObject(b, host, ["put"]);
-          Foo._registerOnLiftObject(this.name, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "method": [
+            [b, ["put"]],
+            [this.name, []],
+          ],
+          "$inflight_init": [
+            [b, []],
+            [this.name, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_preflight_object_from_static_inflight.snap b/libs/wingc/src/jsify/snapshots/reference_preflight_object_from_static_inflight.snap
index 9aebf1940e6..bee06339319 100644
--- a/libs/wingc/src/jsify/snapshots/reference_preflight_object_from_static_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_preflight_object_from_static_inflight.snap
@@ -17,10 +17,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $q }) {
   class MyType {
     constructor({  }) {
@@ -31,10 +32,10 @@ module.exports = function({ $q }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -43,6 +44,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -53,7 +56,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
             $q: ${$stdlib.core.liftObject(q)},
           })
         `;
@@ -61,7 +64,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -69,22 +72,27 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "addToQueue", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [q, []],
+          ],
+        });
       }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("addToQueue")) {
-          MyType._registerOnLiftObject(q, host, ["push"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "addToQueue": [
+            [q, ["push"]],
+          ],
+        });
       }
     }
-    const q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+    const q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_static_inflight.snap b/libs/wingc/src/jsify/snapshots/reference_static_inflight.snap
index 15fadd27603..39e5714deae 100644
--- a/libs/wingc/src/jsify/snapshots/reference_static_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_static_inflight.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/jsify/tests.rs
 ```w
 
     class MyType {
-      pub static inflight myStaticMethod(): str {}
+      pub static inflight myStaticMethod(): str { return "hi"; }
     }
 
     test "test" {
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $MyType }) {
   class $Closure1 {
     constructor({  }) {
@@ -27,31 +28,33 @@ module.exports = function({ $MyType }) {
       return $obj;
     }
     async handle() {
-      {console.log((await $MyType.myStaticMethod()))};
+      console.log((await $MyType.myStaticMethod()));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     constructor({  }) {
     }
     static async myStaticMethod() {
+      return "hi";
     }
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -60,6 +63,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -69,14 +74,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -84,19 +89,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "myStaticMethod", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "myStaticMethod": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $MyType: ${$stdlib.core.liftObject(MyType)},
           })
         `;
@@ -104,7 +118,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -112,14 +126,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(MyType, host, ["myStaticMethod"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [MyType, ["myStaticMethod"]],
+          ],
+          "$inflight_init": [
+            [MyType, []],
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -128,6 +143,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/reference_static_inflight_which_references_preflight_object.snap b/libs/wingc/src/jsify/snapshots/reference_static_inflight_which_references_preflight_object.snap
index 68bd48cc8f7..5fe4ab94cc7 100644
--- a/libs/wingc/src/jsify/snapshots/reference_static_inflight_which_references_preflight_object.snap
+++ b/libs/wingc/src/jsify/snapshots/reference_static_inflight_which_references_preflight_object.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $MyType }) {
   class $Closure1 {
     constructor({  }) {
@@ -34,18 +35,19 @@ module.exports = function({ $MyType }) {
       return $obj;
     }
     async handle() {
-      {console.log((await $MyType.staticMethod()))};
+      console.log((await $MyType.staticMethod()));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class MyType {
     constructor({  }) {
@@ -57,10 +59,10 @@ module.exports = function({ $b }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -69,6 +71,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -79,7 +83,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -87,7 +91,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -95,25 +99,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "staticMethod", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("staticMethod")) {
-          MyType._registerOnLiftObject(b, host, ["list"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "staticMethod": [
+            [b, ["list"]],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $MyType: ${$stdlib.core.liftObject(MyType)},
           })
         `;
@@ -121,7 +130,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -129,23 +138,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(MyType, host, ["staticMethod"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [MyType, ["staticMethod"]],
+          ],
+          "$inflight_init": [
+            [MyType, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/some_test.snap b/libs/wingc/src/jsify/snapshots/some_test.snap
deleted file mode 100644
index 282cf273c04..00000000000
--- a/libs/wingc/src/jsify/snapshots/some_test.snap
+++ /dev/null
@@ -1,150 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    bring cloud;
-
-    class Foo {
-      defineBucket(name: str) {
-          let b = new cloud.Bucket() as name;
-
-
-          inflight () => {
-            b.put("dirty","x"); // <- this is a lift, so we need to know `b` was defined outside of this closure (or is this handled by our closure folding??).
-          };
-      }
-    
-      init() {
-        this.defineBucket("b1");
-        this.defineBucket("b2");
-      }
-    }
-    
-```
-
-## inflight.$Closure1.js
-
-```js
-module.exports = function({ $b }) {
-  class $Closure1 {
-    async handle() {
-      (await $b.put("dirty","x"));
-    }
-    constructor({  }) {
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-  }
-  return $Closure1;
-}
-```
-
-## inflight.Foo.js
-
-```js
-module.exports = function({  }) {
-  class Foo {
-    constructor({  }) {
-    }
-  }
-  return Foo;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-const cloud = require('@winglang/sdk').cloud;
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class Foo extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        (this.defineBucket("b1"));
-        (this.defineBucket("b2"));
-        this._addInflightOps("$inflight_init");
-      }
-      defineBucket(name) {
-        const b = this.node.root.newAbstract("@winglang/sdk.cloud.Bucket",this,name);
-        const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          constructor(scope, id, ) {
-            super(scope, id);
-            this.display.hidden = true;
-            this._addInflightOps("handle", "$inflight_init");
-          }
-          static _toInflightType(context) {
-            return $stdlib.core.NodeJsCode.fromInline(`
-              require("./inflight.$Closure1.js")({
-                $b: ${context._lift(b)},
-              })
-            `);
-          }
-          _toInflight() {
-            return $stdlib.core.NodeJsCode.fromInline(`
-              (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this).text};
-                const client = new $Closure1Client({
-                });
-                if (client.$inflight_init) { await client.$inflight_init(); }
-                return client;
-              })())
-            `);
-          }
-          _registerBind(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure1._registerBindObject(b, host, ["put"]);
-            }
-            super._registerBind(host, ops);
-          }
-        }
-        new $Closure1(this,"$Closure1");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.Foo.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const FooClient = ${Foo._toInflightType(this).text};
-            const client = new FooClient({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-    }
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/static_external_inflight_class.snap b/libs/wingc/src/jsify/snapshots/static_external_inflight_class.snap
index b52b9e9775a..1478a64ae25 100644
--- a/libs/wingc/src/jsify/snapshots/static_external_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/static_external_inflight_class.snap
@@ -21,10 +21,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class $Closure1 {
     constructor({  }) {
@@ -43,25 +44,26 @@ module.exports = function({ $A }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     static async foo() {
-      {console.log("hello")};
+      console.log("hello");
     }
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -70,6 +72,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -79,14 +83,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -94,19 +98,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "foo": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -114,7 +127,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -122,8 +135,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -132,6 +150,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/static_external_preflight_class.snap b/libs/wingc/src/jsify/snapshots/static_external_preflight_class.snap
index 51aeedb29c1..6bdecac309e 100644
--- a/libs/wingc/src/jsify/snapshots/static_external_preflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/static_external_preflight_class.snap
@@ -19,10 +19,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class $Closure1 {
     constructor({  }) {
@@ -40,27 +41,28 @@ module.exports = function({ $A }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
     }
     static async foo() {
-      {console.log("hello")};
+      console.log("hello");
     }
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -69,6 +71,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -78,14 +82,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -93,19 +97,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "foo": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -113,7 +126,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -121,14 +134,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(A, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [A, ["foo"]],
+          ],
+          "$inflight_init": [
+            [A, []],
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -137,6 +151,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/static_inflight_operation.snap b/libs/wingc/src/jsify/snapshots/static_inflight_operation.snap
index d3181d8d244..a3afeeb210c 100644
--- a/libs/wingc/src/jsify/snapshots/static_inflight_operation.snap
+++ b/libs/wingc/src/jsify/snapshots/static_inflight_operation.snap
@@ -20,10 +20,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class $Closure1 {
     constructor({  }) {
@@ -37,13 +38,14 @@ module.exports = function({ $A }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.A-1.js
+## inflight.A-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class A {
     constructor({  }) {
@@ -54,10 +56,10 @@ module.exports = function({ $b }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -66,6 +68,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -76,7 +80,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -84,7 +88,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -92,25 +96,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "myop", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("myop")) {
-          A._registerOnLiftObject(b, host, ["list"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "myop": [
+            [b, ["list"]],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -118,7 +127,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -126,23 +135,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(A, host, ["myop"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [A, ["myop"]],
+          ],
+          "$inflight_init": [
+            [A, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/static_local_inflight_class.snap b/libs/wingc/src/jsify/snapshots/static_local_inflight_class.snap
index 329d8fa2812..ddd7d0bbc12 100644
--- a/libs/wingc/src/jsify/snapshots/static_local_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/static_local_inflight_class.snap
@@ -21,10 +21,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -35,7 +36,7 @@ module.exports = function({  }) {
     async handle() {
       class A {
         static async foo() {
-          {console.log("hello")};
+          console.log("hello");
         }
       }
       class B {
@@ -50,10 +51,10 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -62,25 +63,27 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -88,8 +91,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -98,6 +106,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/static_on_std_type.snap b/libs/wingc/src/jsify/snapshots/static_on_std_type.snap
index 0fadcf1ac29..cddb49b66f0 100644
--- a/libs/wingc/src/jsify/snapshots/static_on_std_type.snap
+++ b/libs/wingc/src/jsify/snapshots/static_on_std_type.snap
@@ -12,10 +12,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $std_Json, $std_String }) {
   class $Closure1 {
     constructor({  }) {
@@ -24,16 +25,16 @@ module.exports = function({ $std_Json, $std_String }) {
       return $obj;
     }
     async handle() {
-      {console.log((await $std_String.fromJson("hello")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: Json.values(Json {}).length == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((Object.values(({}))).length,0)))};
+      console.log((await $std_String.fromJson("hello")));
+      $helpers.assert($helpers.eq(Object.values(({})).length, 0), "Json.values(Json {}).length == 0");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -42,18 +43,20 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
             $std_String: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.String, "@winglang/sdk/std", "String"))},
           })
@@ -62,7 +65,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -70,8 +73,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -80,6 +88,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/top_level_inflight_class_extends_inflight_class.snap b/libs/wingc/src/jsify/snapshots/top_level_inflight_class_extends_inflight_class.snap
deleted file mode 100644
index 4ce6479181c..00000000000
--- a/libs/wingc/src/jsify/snapshots/top_level_inflight_class_extends_inflight_class.snap
+++ /dev/null
@@ -1,116 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    inflight class Base {}
-    inflight class Derived extends Base {}
-    
-```
-
-## inflight.Base.js
-
-```js
-module.exports = function({  }) {
-  class Base {
-  }
-  return Base;
-}
-```
-
-## inflight.Derived.js
-
-```js
-module.exports = function({ $Base }) {
-  class Derived extends $Base {
-  }
-  return Derived;
-}
-```
-
-## preflight.js
-
-```js
-const $stdlib = require('@winglang/sdk');
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const std = $stdlib.std;
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const $AppBase = $stdlib.core.App.for(process.env.WING_TARGET);
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class Base extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this._addInflightOps("$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.Base.js")({
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const BaseClient = ${Base._toInflightType(this).text};
-            const client = new BaseClient({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-    }
-    class Derived extends Base {
-      constructor(scope, id, ) {
-        super(scope, id);
-        this._addInflightOps("$inflight_init");
-      }
-      static _toInflightType(context) {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          require("./inflight.Derived.js")({
-            $Base: ${context._lift(Base)},
-          })
-        `);
-      }
-      _toInflight() {
-        return $stdlib.core.NodeJsCode.fromInline(`
-          (await (async () => {
-            const DerivedClient = ${Derived._toInflightType(this).text};
-            const client = new DerivedClient({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `);
-      }
-      _registerBind(host, ops) {
-        super._registerBind(host, ops);
-      }
-      static _registerTypeBind(host, ops) {
-        super._registerTypeBind(host, ops);
-      }
-    }
-  }
-}
-class $App extends $AppBase {
-  constructor() {
-    super({ outdir: $outdir, name: "main", plugins: $plugins, isTestEnvironment: $wing_is_test });
-    if ($wing_is_test) {
-      new $Root(this, "env0");
-      const $test_runner = this.testRunner;
-      const $tests = $test_runner.findTests();
-      for (let $i = 1; $i < $tests.length; $i++) {
-        new $Root(this, "env" + $i);
-      }
-    } else {
-      new $Root(this, "Default");
-    }
-  }
-}
-new $App().synth();
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/transitive_reference.snap b/libs/wingc/src/jsify/snapshots/transitive_reference.snap
index b86b691da78..847626e2f23 100644
--- a/libs/wingc/src/jsify/snapshots/transitive_reference.snap
+++ b/libs/wingc/src/jsify/snapshots/transitive_reference.snap
@@ -32,10 +32,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $t }) {
   class $Closure1 {
     constructor({  }) {
@@ -49,33 +50,34 @@ module.exports = function({ $t }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     constructor({ $this_b }) {
       this.$this_b = $this_b;
     }
     async isEmpty() {
-      return (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await this.$this_b.list()).length,0));
+      return $helpers.eq((await this.$this_b.list()).length, 0);
     }
     async checkIfEmpty() {
       if ((await this.isEmpty())) {
-        {console.log("empty!")};
+        console.log("empty!");
       }
     }
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -84,6 +86,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -91,18 +95,18 @@ class $Root extends $stdlib.std.Resource {
     class MyType extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
               $this_b: ${$stdlib.core.liftObject(this.b)},
             });
@@ -111,31 +115,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "isEmpty", "checkIfEmpty", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyType._registerOnLiftObject(this.b, host, []);
-        }
-        if (ops.includes("checkIfEmpty")) {
-          MyType._registerOnLiftObject(this, host, ["isEmpty"]);
-        }
-        if (ops.includes("isEmpty")) {
-          MyType._registerOnLiftObject(this.b, host, ["list"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "isEmpty": [
+            [this.b, ["list"]],
+          ],
+          "checkIfEmpty": [
+            [this, ["isEmpty"]],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $t: ${$stdlib.core.liftObject(t)},
           })
         `;
@@ -143,7 +145,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -151,14 +153,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(t, host, ["checkIfEmpty"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [t, ["checkIfEmpty"]],
+          ],
+          "$inflight_init": [
+            [t, []],
+          ],
+        });
       }
     }
     const t = new MyType(this, "MyType");
@@ -168,6 +171,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/transitive_reference_via_inflight_class.snap b/libs/wingc/src/jsify/snapshots/transitive_reference_via_inflight_class.snap
index 6593f1351b9..4d646d3361c 100644
--- a/libs/wingc/src/jsify/snapshots/transitive_reference_via_inflight_class.snap
+++ b/libs/wingc/src/jsify/snapshots/transitive_reference_via_inflight_class.snap
@@ -22,10 +22,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $MyInflightClass }) {
   class $Closure1 {
     constructor({  }) {
@@ -40,13 +41,14 @@ module.exports = function({ $MyInflightClass }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyInflightClass-1.js
+## inflight.MyInflightClass-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class MyInflightClass {
     async putInBucket() {
@@ -55,10 +57,10 @@ module.exports = function({ $b }) {
   }
   return MyInflightClass;
 }
-//# sourceMappingURL=inflight.MyInflightClass-1.js.map
+//# sourceMappingURL=inflight.MyInflightClass-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -67,6 +69,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -77,7 +81,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyInflightClass-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyInflightClass-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -85,7 +89,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const MyInflightClassClient = ${MyInflightClass._toInflightType(this)};
+            const MyInflightClassClient = ${MyInflightClass._toInflightType()};
             const client = new MyInflightClassClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -93,25 +97,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "putInBucket", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("putInBucket")) {
-          MyInflightClass._registerOnLiftObject(b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "putInBucket": [
+            [b, ["put"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $MyInflightClass: ${$stdlib.core.liftObject(MyInflightClass)},
           })
         `;
@@ -119,7 +124,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -127,17 +132,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/transitive_reference_via_static.snap b/libs/wingc/src/jsify/snapshots/transitive_reference_via_static.snap
index 21dce45b511..6360ecad233 100644
--- a/libs/wingc/src/jsify/snapshots/transitive_reference_via_static.snap
+++ b/libs/wingc/src/jsify/snapshots/transitive_reference_via_static.snap
@@ -28,10 +28,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $t }) {
   class $Closure1 {
     constructor({  }) {
@@ -45,13 +46,14 @@ module.exports = function({ $t }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class MyType {
     constructor({  }) {
@@ -62,13 +64,14 @@ module.exports = function({ $b }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## inflight.YourType-1.js
+## inflight.YourType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $MyType }) {
   class YourType {
     constructor({  }) {
@@ -79,10 +82,10 @@ module.exports = function({ $MyType }) {
   }
   return YourType;
 }
-//# sourceMappingURL=inflight.YourType-1.js.map
+//# sourceMappingURL=inflight.YourType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -91,6 +94,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -101,7 +106,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -109,7 +114,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -117,14 +122,19 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "putInBucket", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("putInBucket")) {
-          MyType._registerOnLiftObject(b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "putInBucket": [
+            [b, ["put"]],
+          ],
+        });
       }
     }
     class YourType extends $stdlib.std.Resource {
@@ -133,7 +143,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.YourType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.YourType-1.cjs")({
             $MyType: ${$stdlib.core.liftObject(MyType)},
           })
         `;
@@ -141,7 +151,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const YourTypeClient = ${YourType._toInflightType(this)};
+            const YourTypeClient = ${YourType._toInflightType()};
             const client = new YourTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -149,25 +159,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "putIndirect", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("putIndirect")) {
-          YourType._registerOnLiftObject(MyType, host, ["putInBucket"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "putIndirect": [
+            [MyType, ["putInBucket"]],
+          ],
+          "$inflight_init": [
+            [MyType, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $t: ${$stdlib.core.liftObject(t)},
           })
         `;
@@ -175,7 +186,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -183,17 +194,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(t, host, ["putIndirect"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [t, ["putIndirect"]],
+          ],
+          "$inflight_init": [
+            [t, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const t = new YourType(this, "YourType");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
@@ -201,6 +213,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/two_identical_lifts.snap b/libs/wingc/src/jsify/snapshots/two_identical_lifts.snap
index 447d4111eec..bc7e393332e 100644
--- a/libs/wingc/src/jsify/snapshots/two_identical_lifts.snap
+++ b/libs/wingc/src/jsify/snapshots/two_identical_lifts.snap
@@ -18,10 +18,11 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure1 {
     constructor({  }) {
@@ -31,17 +32,17 @@ module.exports = function({ $b }) {
     }
     async handle() {
       (await $b.put("hello", "world"));
-      async () => {
+      (async () => {
         (await $b.put("hello", "world"));
-      };
+      });
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -50,19 +51,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -70,7 +73,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -78,23 +81,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, ["put"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/unqualified_lift.snap b/libs/wingc/src/jsify/snapshots/unqualified_lift.snap
deleted file mode 100644
index 5f1c16a6066..00000000000
--- a/libs/wingc/src/jsify/snapshots/unqualified_lift.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Errors
-Cannot qualify access to a lifted object 6:6
diff --git a/libs/wingc/src/jsify/snapshots/unqualified_lift_of_collection.snap b/libs/wingc/src/jsify/snapshots/unqualified_lift_of_collection.snap
deleted file mode 100644
index 0250722fc81..00000000000
--- a/libs/wingc/src/jsify/snapshots/unqualified_lift_of_collection.snap
+++ /dev/null
@@ -1,91 +0,0 @@
----
-source: libs/wingc/src/jsify/tests.rs
----
-## Code
-
-```w
-
-    let a = [1,2,3];
-
-    test "test" {
-      a;
-    }
-    
-```
-
-## inflight.$Closure1-1.js
-
-```js
-"use strict";
-module.exports = function({ $a }) {
-  class $Closure1 {
-    constructor({  }) {
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-    async handle() {
-      $a;
-    }
-  }
-  return $Closure1;
-}
-//# sourceMappingURL=inflight.$Closure1-1.js.map
-```
-
-## preflight.js
-
-```js
-"use strict";
-const $stdlib = require('@winglang/sdk');
-const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const std = $stdlib.std;
-class $Root extends $stdlib.std.Resource {
-  constructor($scope, $id) {
-    super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
-      constructor($scope, $id, ) {
-        super($scope, $id);
-        (std.Node.of(this)).hidden = true;
-      }
-      static _toInflightType() {
-        return `
-          require("./inflight.$Closure1-1.js")({
-            $a: ${$stdlib.core.liftObject(a)},
-          })
-        `;
-      }
-      _toInflight() {
-        return `
-          (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
-            const client = new $Closure1Client({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `;
-      }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(a, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    const a = [1, 2, 3];
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
-  }
-}
-const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
-const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
-$APP.synth();
-//# sourceMappingURL=preflight.js.map
-```
-
diff --git a/libs/wingc/src/jsify/snapshots/use_util_functions.snap b/libs/wingc/src/jsify/snapshots/use_util_functions.snap
index 984bc94a4dd..85f8f9563f2 100644
--- a/libs/wingc/src/jsify/snapshots/use_util_functions.snap
+++ b/libs/wingc/src/jsify/snapshots/use_util_functions.snap
@@ -11,10 +11,11 @@ source: libs/wingc/src/jsify/tests.rs
     }
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $util_Util }) {
   class $Closure1 {
     constructor({  }) {
@@ -28,10 +29,10 @@ module.exports = function({ $util_Util }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -40,19 +41,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
           })
         `;
@@ -60,7 +63,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -68,8 +71,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
@@ -78,6 +86,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/var_inflight_field_from_inflight.snap b/libs/wingc/src/jsify/snapshots/var_inflight_field_from_inflight.snap
index c5cdfa6e0cf..d0e74b4002d 100644
--- a/libs/wingc/src/jsify/snapshots/var_inflight_field_from_inflight.snap
+++ b/libs/wingc/src/jsify/snapshots/var_inflight_field_from_inflight.snap
@@ -18,16 +18,17 @@ source: libs/wingc/src/jsify/tests.rs
     
 ```
 
-## inflight.MyType-1.js
+## inflight.MyType-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyType {
     constructor({  }) {
     }
     async foo() {
-      {console.log(this.s)};
+      console.log(this.s);
       this.s = "hello!";
     }
     async $inflight_init() {
@@ -36,10 +37,10 @@ module.exports = function({  }) {
   }
   return MyType;
 }
-//# sourceMappingURL=inflight.MyType-1.js.map
+//# sourceMappingURL=inflight.MyType-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -48,6 +49,8 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -57,14 +60,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyType-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyType-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyTypeClient = ${MyType._toInflightType(this)};
+            const MyTypeClient = ${MyType._toInflightType()};
             const client = new MyTypeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -72,8 +75,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "s", "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "foo": [
+          ],
+          "$inflight_init": [
+          ],
+          "s": [
+          ],
+        });
       }
     }
   }
@@ -81,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/snapshots/wait_util.snap b/libs/wingc/src/jsify/snapshots/wait_util.snap
index 6dd236e3f82..e2f23baff21 100644
--- a/libs/wingc/src/jsify/snapshots/wait_util.snap
+++ b/libs/wingc/src/jsify/snapshots/wait_util.snap
@@ -15,10 +15,11 @@ source: libs/wingc/src/jsify/tests.rs
     }
 ```
 
-## inflight.$Closure1-1.js
+## inflight.$Closure1-1.cjs
 
 ```js
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $util_Util }) {
   class $Closure1 {
     constructor({  }) {
@@ -27,18 +28,18 @@ module.exports = function({ $util_Util }) {
       return $obj;
     }
     async handle() {
-      const r = async () => {
+      const r = (async () => {
         return true;
-      };
+      });
       (await $util_Util.waitUntil(r));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## preflight.js
+## preflight.cjs
 
 ```js
 "use strict";
@@ -47,19 +48,21 @@ const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
           })
         `;
@@ -67,7 +70,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -75,8 +78,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const foo = "test";
@@ -86,6 +94,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "main", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/libs/wingc/src/jsify/tests.rs b/libs/wingc/src/jsify/tests.rs
index 2a9d73e1c94..a07511e90c7 100644
--- a/libs/wingc/src/jsify/tests.rs
+++ b/libs/wingc/src/jsify/tests.rs
@@ -200,7 +200,7 @@ fn preflight_collection_of_preflight_objects() {
     ];
     test "test" {
       assert(arr.length == 2);
-      arr.at(0).put("hello", "world");
+      arr[0].put("hello", "world");
     }
     "#
 	);
@@ -299,6 +299,25 @@ fn inflight_field() {
 	);
 }
 
+#[test]
+fn reference_preflight_field_from_inflight_expr() {
+	assert_compile_fail!(
+		r#"
+    class A {
+      x: str;
+      new() {
+        this.x = "hello";
+      }
+
+      inflight method() {
+        let y = this;
+        log(y.x);
+      }
+    }
+    "#
+	);
+}
+
 #[test]
 fn reference_inflight_field() {
 	assert_compile_ok!(
@@ -837,7 +856,7 @@ fn reference_static_inflight() {
 	assert_compile_ok!(
 		r#"
     class MyType {
-      pub static inflight myStaticMethod(): str {}
+      pub static inflight myStaticMethod(): str { return "hi"; }
     }
 
     test "test" {
@@ -1220,7 +1239,7 @@ fn capture_in_keyword_args() {
     let x = 1s;
     
     test "test" {
-      util.waitUntil((): bool => {}, interval: x);
+      util.waitUntil((): bool => { return true; }, interval: x);
     }
     "#
 	);
@@ -1272,34 +1291,60 @@ fn fail_unqualified_lift() {
     let q = new cloud.Queue();
 
     test "test "{
-      q;
+      let x = q;
+      x.push("hello");
     }
     "#
 	);
 }
 
 #[test]
-fn unqualified_lift_of_collection() {
-	assert_compile_ok!(
+fn fail_unqualified_lift_as_arg() {
+	assert_compile_fail!(
 		r#"
-    let a = [1,2,3];
+    bring cloud;
 
-    test "test" {
-      a;
+    let q = new cloud.Queue();
+
+    let f = inflight (q: cloud.Queue) => {
+      q.push("hello");
+    };
+
+    test "test "{
+      f(q);
     }
     "#
 	);
 }
 
 #[test]
-fn fails_lift_with_inflight_arguments() {
+fn fail_unqualified_lift_return() {
 	assert_compile_fail!(
 		r#"
-    let a = [1234];
+    bring cloud;
+
+    let q = new cloud.Queue();
+
+    let f = inflight (): cloud.Queue => {
+      return q;
+    };
+
+    test "test "{
+      f(); // this is fine
+      f().push("hello"); // unknown lift origin
+    }
+    "#
+	);
+}
+
+#[test]
+fn reference_lift_of_collection() {
+	assert_compile_ok!(
+		r#"
+    let a = [1,2,3];
 
     test "test" {
-      let i = 0;
-      a.at(i);
+      a;
     }
     "#
 	);
@@ -1313,7 +1358,8 @@ fn fail_unqualified_lift_element_from_collection_of_objects() {
     let a = [new cloud.Bucket()];
 
     test "test" {
-      a.at(0);
+      let x = 0;
+      a.at(x).list();
     }
     "#
 	);
@@ -1327,7 +1373,7 @@ fn lift_element_from_collection_of_objects() {
     let a = [new cloud.Bucket()];
 
     test "test" {
-      a.at(0).put("hello", "world");
+      a[0].put("hello", "world");
     }
     "#
 	);
@@ -1345,7 +1391,7 @@ fn lift_element_from_collection_as_field() {
       }
 
       inflight foo() {
-        this.arr.at(0).put("hello", "world");
+        this.arr[0].put("hello", "world");
       }
     }
     "#
@@ -1391,8 +1437,9 @@ fn func_returns_func() {
 		r#"
     test "test" {
       (s: str): (): bool => {
-        (): bool => { 
+        return (): bool => {
           s;
+          return true;
         };
       };
     }
@@ -1585,29 +1632,6 @@ fn base_class_with_lifted_fields() {
 	);
 }
 
-#[test]
-fn fails_base_class_with_lifted_field_object_unqualified() {
-	assert_compile_fail!(
-		r#"
-    bring cloud;
-
-    class Base {
-      b: cloud.Bucket;
-      new() {
-        this.b = new cloud.Bucket();
-      }
-    }
-
-    class Derived extends Base {
-      inflight foo() {
-        this.b;
-//           ^ Cannot qualify access to a lifted object of type "Bucket"
-      }
-    }
-    "#
-	);
-}
-
 #[test]
 fn base_class_with_lifted_field_object() {
 	assert_compile_ok!(
@@ -1769,7 +1793,7 @@ fn reassign_captured_variable() {
       let var i = 10;
     
       class Inner {
-        dang(): num {
+        dang(): void {
           i = i + 1;
         }
       }
@@ -2007,3 +2031,29 @@ fn lift_self_reference() {
     "#
 	);
 }
+
+#[test]
+fn entrypoint_this() {
+	assert_compile_ok!(
+		r#"
+    this;
+    "#
+	);
+}
+
+#[test]
+fn allow_type_def_before_super() {
+	assert_compile_ok!(
+		r#"
+    class Foo {
+      new(x: num) {}
+    }
+    class Bar extends Foo {
+      new() {
+        class Baz {}
+        super(1);
+      }
+    }
+    "#
+	);
+}
diff --git a/libs/wingc/src/json_schema_generator.rs b/libs/wingc/src/json_schema_generator.rs
index e585879cdbe..507946ed83a 100644
--- a/libs/wingc/src/json_schema_generator.rs
+++ b/libs/wingc/src/json_schema_generator.rs
@@ -79,7 +79,7 @@ impl JsonSchemaGenerator {
 				code.to_string()
 			}
 			Type::Optional(t) => self.get_struct_schema_field(&t),
-			Type::Json(_) => "{ type: \"object\" }".to_string(),
+			Type::Json(_) => "{ type: [\"object\", \"string\", \"boolean\", \"number\", \"array\"] }".to_string(),
 			_ => "{ type: \"null\" }".to_string(),
 		}
 	}
@@ -88,7 +88,7 @@ impl JsonSchemaGenerator {
 		let mut code = CodeMaker::default();
 
 		code.open("{");
-		code.line(format!("id: \"/{}\",", struct_.name));
+		code.line(format!("$id: \"/{}\",", struct_.name));
 		code.line("type: \"object\",".to_string());
 
 		code.open("properties: {");
diff --git a/libs/wingc/src/lib.rs b/libs/wingc/src/lib.rs
index 5321a2da592..965fd5a164d 100644
--- a/libs/wingc/src/lib.rs
+++ b/libs/wingc/src/lib.rs
@@ -7,11 +7,13 @@
 #[macro_use]
 extern crate lazy_static;
 
-use ast::{AccessModifier, Scope, Symbol, UtilityFunctions};
+use ast::{Scope, Symbol};
 use camino::{Utf8Path, Utf8PathBuf};
 use closure_transform::ClosureTransformer;
 use comp_ctx::set_custom_panic_hook;
+use const_format::formatcp;
 use diagnostic::{found_errors, report_diagnostic, Diagnostic};
+use dtsify::extern_dtsify::{is_extern_file, ExternDTSifier};
 use file_graph::FileGraph;
 use files::Files;
 use fold::Fold;
@@ -19,19 +21,18 @@ use indexmap::IndexMap;
 use jsify::JSifier;
 
 use lifting::LiftVisitor;
-use parser::parse_wing_project;
+use parser::{is_entrypoint_file, parse_wing_project};
+use serde::Serialize;
 use struct_schema::StructSchemaVisitor;
 use type_check::jsii_importer::JsiiImportSpec;
-use type_check::symbol_env::{StatementIdx, SymbolEnvKind};
+use type_check::symbol_env::SymbolEnvKind;
 use type_check::type_reference_transform::TypeReferenceTransformer;
-use type_check::{FunctionSignature, SymbolKind, Type};
 use type_check_assert::TypeCheckAssert;
 use valid_json_visitor::ValidJsonVisitor;
 use visit::Visit;
 use wasm_util::{ptr_to_str, string_to_combined_ptr, WASM_RETURN_ERROR};
 use wingii::type_system::TypeSystem;
 
-use crate::docs::Docs;
 use crate::parser::normalize_path;
 use std::alloc::{alloc, dealloc, Layout};
 
@@ -39,7 +40,7 @@ use std::mem;
 
 use crate::ast::Phase;
 use crate::type_check::symbol_env::SymbolEnv;
-use crate::type_check::{FunctionParameter, TypeChecker, Types};
+use crate::type_check::{SymbolEnvOrNamespace, TypeChecker, Types};
 
 #[macro_use]
 #[cfg(test)]
@@ -51,6 +52,7 @@ mod comp_ctx;
 pub mod debug;
 pub mod diagnostic;
 mod docs;
+mod dtsify;
 mod file_graph;
 mod files;
 pub mod fold;
@@ -60,6 +62,7 @@ mod lifting;
 pub mod lsp;
 pub mod parser;
 pub mod struct_schema;
+mod ts_traversal;
 pub mod type_check;
 mod type_check_assert;
 mod valid_json_visitor;
@@ -111,11 +114,18 @@ const WINGSDK_STRING: &'static str = "std.String";
 const WINGSDK_JSON: &'static str = "std.Json";
 const WINGSDK_MUT_JSON: &'static str = "std.MutJson";
 const WINGSDK_RESOURCE: &'static str = "std.Resource";
+const WINGSDK_IRESOURCE: &'static str = "std.IResource";
+const WINGSDK_AUTOID_RESOURCE: &'static str = "std.AutoIdResource";
 const WINGSDK_STRUCT: &'static str = "std.Struct";
 const WINGSDK_TEST_CLASS_NAME: &'static str = "Test";
+const WINGSDK_NODE: &'static str = "std.Node";
+
+const WINGSDK_SIM_IRESOURCE: &'static str = "sim.IResource";
+const WINGSDK_SIM_IRESOURCE_FQN: &'static str = formatcp!("{}.{}", WINGSDK_ASSEMBLY_NAME, WINGSDK_SIM_IRESOURCE);
 
 const CONSTRUCT_BASE_CLASS: &'static str = "constructs.Construct";
 const CONSTRUCT_BASE_INTERFACE: &'static str = "constructs.IConstruct";
+const CONSTRUCT_NODE_PROPERTY: &'static str = "node";
 
 const MACRO_REPLACE_SELF: &'static str = "$self$";
 const MACRO_REPLACE_ARGS: &'static str = "$args$";
@@ -123,7 +133,10 @@ const MACRO_REPLACE_ARGS_TEXT: &'static str = "$args_text$";
 
 pub const TRUSTED_LIBRARY_NPM_NAMESPACE: &'static str = "@winglibs";
 
-pub struct CompilerOutput {}
+#[derive(Serialize)]
+pub struct CompilerOutput {
+	imported_namespaces: Vec<String>,
+}
 
 /// Exposes an allocation function to the WASM host
 ///
@@ -199,10 +212,11 @@ pub unsafe extern "C" fn wingc_compile(ptr: u32, len: u32) -> u64 {
 	}
 
 	let results = compile(project_dir, source_path, None, output_dir);
-	if results.is_err() {
-		WASM_RETURN_ERROR
+
+	if let Ok(results) = results {
+		string_to_combined_ptr(serde_json::to_string(&results).unwrap())
 	} else {
-		string_to_combined_ptr("".to_string())
+		WASM_RETURN_ERROR
 	}
 }
 
@@ -215,66 +229,8 @@ pub fn type_check(
 	jsii_imports: &mut Vec<JsiiImportSpec>,
 ) {
 	let mut env = types.add_symbol_env(SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Preflight, 0));
-	types.set_scope_env(scope, env);
 
-	// note: Globals are emitted here and wrapped in "{ ... }" blocks. Wrapping makes these emissions, actual
-	// statements and not expressions. this makes the runtime panic if these are used in place of expressions.
-	add_builtin(
-		UtilityFunctions::Log.to_string().as_str(),
-		Type::Function(FunctionSignature {
-			this_type: None,
-			parameters: vec![FunctionParameter {
-				name: "message".into(),
-				typeref: types.string(),
-				docs: Docs::with_summary("The message to log"),
-				variadic: false,
-			}],
-			return_type: types.void(),
-			phase: Phase::Independent,
-			js_override: Some("{console.log($args$)}".to_string()),
-			docs: Docs::with_summary("Logs a message"),
-		}),
-		scope,
-		types,
-	);
-	add_builtin(
-		UtilityFunctions::Assert.to_string().as_str(),
-		Type::Function(FunctionSignature {
-			this_type: None,
-			parameters: vec![FunctionParameter {
-				name: "condition".into(),
-				typeref: types.bool(),
-				docs: Docs::with_summary("The condition to assert"),
-				variadic: false,
-			}],
-			return_type: types.void(),
-			phase: Phase::Independent,
-			js_override: Some(
-				"{((cond) => {if (!cond) throw new Error(\"assertion failed: $args_text$\")})($args$)}".to_string(),
-			),
-			docs: Docs::with_summary("Asserts that a condition is true"),
-		}),
-		scope,
-		types,
-	);
-	add_builtin(
-		UtilityFunctions::UnsafeCast.to_string().as_str(),
-		Type::Function(FunctionSignature {
-			this_type: None,
-			parameters: vec![FunctionParameter {
-				name: "value".into(),
-				typeref: types.anything(),
-				docs: Docs::with_summary("The value to cast into a different type"),
-				variadic: false,
-			}],
-			return_type: types.anything(),
-			phase: Phase::Independent,
-			js_override: Some("$args$".to_string()),
-			docs: Docs::with_summary("Casts a value into a different type. This is unsafe and can cause runtime errors"),
-		}),
-		scope,
-		types,
-	);
+	types.set_scope_env(scope, env);
 
 	let mut tc = TypeChecker::new(types, file_path, file_graph, jsii_types, jsii_imports);
 	tc.add_jsii_module_to_env(
@@ -284,22 +240,15 @@ pub fn type_check(
 		&Symbol::global(WINGSDK_STD_MODULE),
 		None,
 	);
+	tc.add_builtins(scope);
+	tc.patch_constructs();
 
-	tc.type_check_file_or_dir(file_path, scope);
-}
+	// If the file is an entrypoint file, we add "this" to its symbol environment
+	if is_entrypoint_file(file_path) {
+		tc.add_this(&mut env);
+	}
 
-// TODO: refactor this (why is scope needed?) (move to separate module?)
-fn add_builtin(name: &str, typ: Type, scope: &mut Scope, types: &mut Types) {
-	let sym = Symbol::global(name);
-	let mut scope_env = types.get_scope_env(&scope);
-	scope_env
-		.define(
-			&sym,
-			SymbolKind::make_free_variable(sym.clone(), types.add_type(typ), false, Phase::Independent),
-			AccessModifier::Private,
-			StatementIdx::Top,
-		)
-		.expect("Failed to add builtin");
+	tc.type_check_file_or_dir(file_path, scope);
 }
 
 pub fn compile(
@@ -348,7 +297,7 @@ pub fn compile(
 	// Type check all files in topological order (start with files that don't bring any other
 	// Wing files, then move on to files that depend on those, and repeat)
 	for file in &topo_sorted_files {
-		let mut scope = asts.remove(file).expect("matching AST not found");
+		let mut scope = asts.swap_remove(file).expect("matching AST not found");
 		type_check(
 			&mut scope,
 			&mut types,
@@ -384,7 +333,7 @@ pub fn compile(
 		return Err(());
 	}
 
-	let mut jsifier = JSifier::new(&mut types, &files, &file_graph, &source_path);
+	let mut jsifier = JSifier::new(&mut types, &files, &file_graph, &source_path, &out_dir);
 
 	// -- LIFTING PHASE --
 
@@ -407,7 +356,7 @@ pub fn compile(
 	asts = asts
 		.into_iter()
 		.map(|(path, scope)| {
-			let mut reference_visitor = StructSchemaVisitor::new(&jsifier);
+			let mut reference_visitor = StructSchemaVisitor::new(&path, &jsifier);
 			reference_visitor.visit_scope(&scope);
 			(path, scope)
 		})
@@ -419,18 +368,57 @@ pub fn compile(
 		let scope = asts.get_mut(file).expect("matching AST not found");
 		jsifier.jsify(file, &scope);
 	}
+	if !found_errors() {
+		match jsifier.output_files.borrow().emit_files(out_dir) {
+			Ok(()) => {}
+			Err(err) => report_diagnostic(err.into()),
+		}
+	}
+
+	// -- DTSIFICATION PHASE --
+	if source_path.is_dir() {
+		let preflight_file_map = jsifier.preflight_file_map.borrow();
+		let dtsifier = dtsify::DTSifier::new(&mut types, &preflight_file_map, &mut file_graph);
+		for file in &topo_sorted_files {
+			let scope = asts.get_mut(file).expect("matching AST not found");
+			dtsifier.dtsify(file, &scope);
+		}
+		if !found_errors() {
+			let output_files = dtsifier.output_files.borrow();
+			match output_files.emit_files(out_dir) {
+				Ok(()) => {}
+				Err(err) => report_diagnostic(err.into()),
+			}
+		}
+	}
 
-	let files = jsifier.output_files.borrow_mut();
-	match files.emit_files(out_dir) {
-		Ok(()) => {}
-		Err(err) => report_diagnostic(err.into()),
+	// -- EXTERN DTSIFICATION PHASE --
+	for source_files_env in &types.source_file_envs {
+		if is_extern_file(source_files_env.0) {
+			let mut extern_dtsifier = ExternDTSifier::new(&types);
+			if !found_errors() {
+				match extern_dtsifier.dtsify(source_files_env.0, source_files_env.1) {
+					Ok(()) => {}
+					Err(err) => report_diagnostic(err.into()),
+				};
+			}
+		}
 	}
 
 	if found_errors() {
 		return Err(());
 	}
 
-	return Ok(CompilerOutput {});
+	let imported_namespaces = types
+		.source_file_envs
+		.iter()
+		.filter_map(|(k, v)| match v {
+			SymbolEnvOrNamespace::Namespace(_) => Some(k.to_string()),
+			_ => None,
+		})
+		.collect::<Vec<String>>();
+
+	Ok(CompilerOutput { imported_namespaces })
 }
 
 pub fn is_absolute_path(path: &Utf8Path) -> bool {
diff --git a/libs/wingc/src/lifting.rs b/libs/wingc/src/lifting.rs
index 0182f8ac1ab..3be3514185f 100644
--- a/libs/wingc/src/lifting.rs
+++ b/libs/wingc/src/lifting.rs
@@ -1,6 +1,9 @@
+use itertools::Itertools;
+
 use crate::{
 	ast::{
-		Class, Expr, ExprKind, FunctionBody, FunctionDefinition, Phase, Reference, Scope, Stmt, Symbol, UserDefinedType,
+		Class, Expr, ExprKind, FunctionBody, FunctionDefinition, Phase, Reference, Scope, Stmt, StmtKind, Symbol,
+		UserDefinedType,
 	},
 	comp_ctx::{CompilationContext, CompilationPhase},
 	diagnostic::{report_diagnostic, Diagnostic},
@@ -12,13 +15,17 @@ use crate::{
 		ClassLike, ResolveSource, SymbolKind, TypeRef, CLOSURE_CLASS_HANDLE_METHOD,
 	},
 	visit::{self, Visit},
-	visit_context::{VisitContext, VisitorWithContext},
+	visit_context::{PropertyObject, VisitContext, VisitorWithContext},
 };
 
 pub struct LiftVisitor<'a> {
 	ctx: VisitContext,
 	jsify: &'a JSifier<'a>,
 	lifts_stack: Vec<Lifts>,
+	// Used during visiting to track whether we're inside an explicit `lift` qualification block
+	in_disable_lift_qual_err: usize,
+	// Used during visiting to track whether we're inside an inner inflight class
+	in_inner_inflight_class: usize,
 }
 
 impl<'a> LiftVisitor<'a> {
@@ -27,6 +34,8 @@ impl<'a> LiftVisitor<'a> {
 			jsify: jsifier,
 			ctx: VisitContext::new(),
 			lifts_stack: vec![],
+			in_inner_inflight_class: 0,
+			in_disable_lift_qual_err: 0,
 		}
 	}
 
@@ -151,18 +160,26 @@ impl<'a> LiftVisitor<'a> {
 			udt_js
 		}
 	}
+
+	// Used for generating a js array represtining a lift qualificaiton (an operation done on a lifted preflight object)
+	// lift qualifcations are in array format so multiple ops can be bunched together in some cases.
+	fn jsify_symbol_to_op_array(&self, symb: &Symbol) -> String {
+		format!("[\"{symb}\"]")
+	}
 }
 
 impl<'a> Visit<'a> for LiftVisitor<'a> {
 	fn visit_reference(&mut self, node: &'a Reference) {
 		match node {
-			Reference::InstanceMember { property, .. } => {
-				self.ctx.push_property(property);
+			Reference::InstanceMember { property, object, .. } => {
+				self.ctx.push_property(PropertyObject::Instance(object.id), property);
 				visit::visit_reference(self, &node);
 				self.ctx.pop_property();
 			}
-			Reference::TypeMember { property, .. } => {
-				self.ctx.push_property(property);
+			Reference::TypeMember { property, type_name } => {
+				self
+					.ctx
+					.push_property(PropertyObject::UserDefinedType(type_name.clone()), property);
 				visit::visit_reference(self, &node);
 				self.ctx.pop_property();
 			}
@@ -170,6 +187,9 @@ impl<'a> Visit<'a> for LiftVisitor<'a> {
 				self.verify_defined_in_current_env(symb);
 				visit::visit_reference(self, &node);
 			}
+			Reference::ElementAccess { .. } => {
+				visit::visit_reference(self, &node);
+			}
 		}
 	}
 
@@ -181,8 +201,8 @@ impl<'a> Visit<'a> for LiftVisitor<'a> {
 
 	fn visit_expr(&mut self, node: &'a Expr) {
 		CompilationContext::set(CompilationPhase::Lifting, &node.span);
-		self.with_expr(node.id, |v|	{
-			let expr_phase = self.jsify.types.get_expr_phase(&node).unwrap();
+		self.with_expr(node.id, |v| {
+			let expr_phase = v.jsify.types.get_expr_phase(&node).unwrap();
 			let expr_type = v.jsify.types.get_expr_type(&node);
 
 			// Skip expressions of an unresoved type (type errors)
@@ -197,46 +217,58 @@ impl<'a> Visit<'a> for LiftVisitor<'a> {
 				return;
 			}
 
+			// Inflight expressions that evaluate to a preflight type are currently unsupported because
+			// we can't determine exactly which preflight object is being accessed and therefore can't
+			// qualify the original lift expression.
+			if expr_phase == Phase::Inflight
+				&& expr_type.is_preflight_object_type()
+				&& v.ctx.current_property().is_some()
+				&& v.in_disable_lift_qual_err == 0
+			{
+				Diagnostic::new(
+					format!(
+						"Expression of type \"{expr_type}\" references an unknown preflight object, can't qualify its capabilities"
+					),
+					node,
+				)
+				.hint("Use a `lift` block to explicitly qualify the preflight object and disable this error")
+				.hint("For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification")
+				.report();
+			}
+
 			//---------------
 			// LIFT
 			if expr_phase == Phase::Preflight {
-				// jsify the expression so we can get the preflight code
-				let code = v.jsify_expr(&node);
-
-				let property = if let Some(property) = v.ctx.current_property() {
-					Some(property)
-				} else if expr_type.is_closure() {
-					// this is the case where we are lifting a "closure class" (e.g. a class that has a "handle"
-					// method) the reason we might not have "property" set is because closure classes might be
-					// syntheticaly generated by the compiler from closures.
-					Some(Symbol::global(CLOSURE_CLASS_HANDLE_METHOD))
-				} else {
-					None
+				// Get the property being accessed on the preflight expression, this is used to qualify the lift
+				let property = match v.ctx.current_property() {
+					Some((PropertyObject::Instance(prop_expr_id), property)) if node.id == prop_expr_id => Some(property),
+					_ => {
+						if expr_type.is_closure() {
+							// this is the case where we are lifting a "closure class" (e.g. a class that has a "handle"
+							// method). The "property" here is implicitly `handle`, these are generally syntheticaly generated by the compiler
+							// from closures.
+							Some(Symbol::global(CLOSURE_CLASS_HANDLE_METHOD))
+						} else {
+							None
+						}
+					}
 				};
 
-				// check that we can qualify the lift (e.g. determine which property is being accessed)
-				if property.is_none() && expr_type.is_preflight_class() {
-					report_diagnostic(Diagnostic {
-						message: format!(
-							"Cannot qualify access to a lifted object of type \"{}\" (see https://github.com/winglang/wing/issues/76 for more details)",
-							expr_type.to_string()
-						),
-						span: Some(node.span.clone()),
-						annotations: vec![],
-			hints: vec![],
-		});
-
-					return;
-				}
-
 				// if this is an inflight field of "this" no need to lift it
 				if is_inflight_field(&node, expr_type, &property) {
 					return;
 				}
 
+				// jsify the expression so we can get the preflight code
+				let code = v.jsify_expr(&node);
+
 				let mut lifts = v.lifts_stack.pop().unwrap();
 				let is_field = code.contains("this."); // TODO: starts_with?
-				lifts.lift(v.ctx.current_method().map(|(m,_)|m), property, &code, is_field);
+				lifts.lift(
+					v.ctx.current_method().map(|(m, _)| m).expect("a method"),
+					property.map(|p| v.jsify_symbol_to_op_array(&p)),
+					&code,
+				);
 				lifts.capture(&Liftable::Expr(node.id), &code, is_field);
 				v.lifts_stack.push(lifts);
 				return;
@@ -289,14 +321,18 @@ impl<'a> Visit<'a> for LiftVisitor<'a> {
 						"Cannot qualify access to a lifted type \"{udt_type}\" (see https://github.com/winglang/wing/issues/76 for more details)"),
 					span: Some(node.span.clone()),
 					annotations: vec![],
-			hints: vec![],
-		});
+					hints: vec![],
+				});
 
 				return;
 			}
 
 			let mut lifts = self.lifts_stack.pop().unwrap();
-			lifts.lift(self.ctx.current_method().map(|(m, _)| m), property, &code, false);
+			lifts.lift(
+				self.ctx.current_method().map(|(m, _)| m).expect("a method"),
+				property.map(|(_, p)| self.jsify_symbol_to_op_array(&p)),
+				&code,
+			);
 			self.lifts_stack.push(lifts);
 		}
 
@@ -321,66 +357,60 @@ impl<'a> Visit<'a> for LiftVisitor<'a> {
 	fn visit_function_definition(&mut self, node: &'a FunctionDefinition) {
 		match &node.body {
 			FunctionBody::Statements(scope) => {
-				self.ctx.push_function_definition(
-					node.name.as_ref(),
-					&node.signature,
-					node.is_static,
-					self.jsify.types.get_scope_env(&scope),
-				);
+				// If we're in an inner inflight class then we don't need to track this inner method since lifts are
+				// collected for methods of classes defined preflight.
+				if self.in_inner_inflight_class == 0 {
+					self.ctx.push_function_definition(
+						node.name.as_ref(),
+						&node.signature,
+						node.is_static,
+						self.jsify.types.get_scope_env(&scope),
+					);
+				}
 
 				visit::visit_function_definition(self, node);
-				self.ctx.pop_function_definition();
+
+				if self.in_inner_inflight_class == 0 {
+					self.ctx.pop_function_definition();
+				}
 			}
 			FunctionBody::External(_) => visit::visit_function_definition(self, node),
 		}
 	}
 
 	fn visit_class(&mut self, node: &'a Class) {
-		// nothing to do if we are emitting an inflight class from within an inflight scope
-		if self.ctx.current_phase() == Phase::Inflight && node.phase == Phase::Inflight {
-			self.visit_symbol(&node.name);
+		let in_inner_inflight_class = self.ctx.current_phase() == Phase::Inflight && node.phase == Phase::Inflight;
+		if in_inner_inflight_class {
+			// nothing to do if we are emitting an inflight class from within an inflight scope:
+			// inner inflight classes collect lifts in their outer class, just mark we're in such a class and do nothing
+			self.in_inner_inflight_class += 1;
+		} else {
+			self.ctx.push_class(node);
 
-			visit::visit_function_definition(self, &node.initializer);
-			visit::visit_function_definition(self, &node.inflight_initializer);
+			self.lifts_stack.push(Lifts::new());
 
-			for field in node.fields.iter() {
-				self.visit_symbol(&field.name);
-				self.visit_type_annotation(&field.member_type);
-			}
-			for (name, def) in node.methods.iter() {
-				self.visit_symbol(&name);
-				visit::visit_function_definition(self, &def);
-			}
 			if let Some(parent) = &node.parent {
-				self.visit_user_defined_type(&parent);
-			}
-			for interface in node.implements.iter() {
-				self.visit_user_defined_type(&interface);
+				let mut lifts = self.lifts_stack.pop().unwrap();
+				lifts.capture(&Liftable::Type(parent.clone()), &self.jsify_udt(&parent), false);
+				self.lifts_stack.push(lifts);
 			}
-			return;
-		}
-
-		self.ctx.push_class(node);
-
-		self.lifts_stack.push(Lifts::new());
-
-		if let Some(parent) = &node.parent {
-			let mut lifts = self.lifts_stack.pop().unwrap();
-			lifts.capture(&Liftable::Type(parent.clone()), &self.jsify_udt(&parent), false);
-			self.lifts_stack.push(lifts);
 		}
 
 		visit::visit_class(self, node);
 
-		self.ctx.pop_class();
-
-		let lifts = self.lifts_stack.pop().expect("Unable to pop class tokens");
+		if in_inner_inflight_class {
+			self.in_inner_inflight_class -= 1;
+		} else {
+			let lifts = self.lifts_stack.pop().expect("Unable to pop class tokens");
 
-		if let Some(env) = self.ctx.current_env() {
-			if let Some(mut t) = resolve_user_defined_type(&UserDefinedType::for_class(node), env, 0).ok() {
-				let mut_class = t.as_class_mut().unwrap();
-				mut_class.set_lifts(lifts);
+			if let Some(env) = self.ctx.current_env() {
+				if let Some(mut t) = resolve_user_defined_type(&UserDefinedType::for_class(node), env, 0).ok() {
+					let mut_class = t.as_class_mut().unwrap();
+					mut_class.set_lifts(lifts);
+				}
 			}
+
+			self.ctx.pop_class();
 		}
 	}
 
@@ -393,8 +423,35 @@ impl<'a> Visit<'a> for LiftVisitor<'a> {
 	fn visit_stmt(&mut self, node: &'a Stmt) {
 		CompilationContext::set(CompilationPhase::Lifting, &node.span);
 
-		self.ctx.push_stmt(node.idx);
+		self.ctx.push_stmt(node);
+
+		// If this is an explicit lift statement then add the explicit lift
+		if let StmtKind::ExplicitLift(explicit_lift) = &node.kind {
+			// Mark that within this scope we should ignore unknown preflight objects
+			self.in_disable_lift_qual_err += 1;
+
+			// Add the explicit lifts
+			let mut lifts = self.lifts_stack.pop().unwrap();
+			for qual in explicit_lift.qualifications.iter() {
+				// jsify the reference to the preflight object so we can get the preflight code
+				let preflight_code = self.jsify_expr(&qual.obj);
+
+				let ops_str = format!(
+					"[{}]",
+					qual.ops.iter().map(|op| format!("\"{op}\"")).collect_vec().join(", ")
+				);
+				lifts.lift(
+					self.ctx.current_method().map(|(m, _)| m).expect("a method"),
+					Some(ops_str),
+					&preflight_code,
+				);
+			}
+			self.lifts_stack.push(lifts);
+		}
 		visit::visit_stmt(self, node);
+		if let StmtKind::ExplicitLift(_) = &node.kind {
+			self.in_disable_lift_qual_err -= 1;
+		}
 		self.ctx.pop_stmt();
 	}
 }
diff --git a/libs/wingc/src/lsp/completions.rs b/libs/wingc/src/lsp/completions.rs
index 0acf9a7fc69..bfc6a55c06f 100644
--- a/libs/wingc/src/lsp/completions.rs
+++ b/libs/wingc/src/lsp/completions.rs
@@ -13,7 +13,8 @@ use crate::closure_transform::{CLOSURE_CLASS_PREFIX, PARENT_THIS_NAME};
 use crate::diagnostic::{WingLocation, WingSpan};
 use crate::docs::Documented;
 use crate::lsp::sync::{JSII_TYPES, PROJECT_DATA, WING_TYPES};
-use crate::type_check::symbol_env::{LookupResult, StatementIdx};
+use crate::type_check::jsii_importer::is_construct_base;
+use crate::type_check::symbol_env::{LookupResult, StatementIdx, SymbolEnvKind};
 use crate::type_check::{
 	fully_qualify_std_type, import_udt_from_jsii, resolve_super_method, ClassLike, Namespace, Struct, SymbolKind, Type,
 	TypeRef, Types, UnsafeRef, VariableKind, CLASS_INFLIGHT_INIT_NAME, CLASS_INIT_NAME,
@@ -24,7 +25,7 @@ use crate::{UTIL_CLASS_NAME, WINGSDK_BRINGABLE_MODULES, WINGSDK_STD_MODULE};
 
 use super::sync::check_utf8;
 
-const BUILTIN_TYPES: [&str; 6] = ["bool", "duration", "Json", "MutJson", "num", "str"];
+const BUILTIN_TYPES: [&str; 8] = ["bool", "duration", "Json", "MutJson", "num", "str", "datetime", "regex"];
 const BUILTIN_GENERICS: [&str; 6] = ["Array", "Map", "MutArray", "MutMap", "MutSet", "Set"];
 
 #[no_mangle]
@@ -179,11 +180,15 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 					start: parent.start_position().into(),
 					end: parent.end_position().into(),
 					file_id: file.to_string(),
+					start_offset: parent.start_byte(),
+					end_offset: parent.end_byte(),
 				}),
 				WingSpan {
 					start: node_to_complete.start_position().into(),
 					end: node_to_complete.end_position().into(),
 					file_id: file.to_string(),
+					start_offset: node_to_complete.start_byte(),
+					end_offset: node_to_complete.end_byte(),
 				},
 				params.text_document_position.position.into(),
 				&root_scope,
@@ -195,8 +200,25 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 				node_to_complete_kind,
 				"." | "?." | "member_identifier" | "type_identifier"
 			) {
+				// We need to double-check for an invalid nested reference (e.g. If there are multiple dots in a row)
+				if preceding_text.ends_with("..")
+					|| preceding_text.ends_with(".?.?")
+					|| preceding_text.ends_with("..")
+					|| preceding_text.ends_with(".?.")
+					|| preceding_text.ends_with("..?")
+				{
+					return vec![];
+				}
+
 				let parent = node_to_complete.parent().expect("A dot must have a parent");
 
+				// If the parent is an accessor node (the container of the "." or ".?" nodes) then move up one more level
+				let parent = if parent.kind() == "accessor" {
+					parent.parent().expect("An accessor must have a parent")
+				} else {
+					parent
+				};
+
 				if let Some(nearest_expr) = scope_visitor.nearest_expr {
 					let mut nearest_expr_type = types.get_expr_type(nearest_expr);
 					if let ExprKind::Call { .. } = &nearest_expr.kind {
@@ -207,17 +229,8 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 
 					// If we are inside an incomplete reference, there is possibly a type error or an anything which has no completions
 					if !nearest_expr_type.is_unresolved() {
-						// We need to double-check for an invalid nested reference (e.g. If there are multiple dots in a row)
-						if preceding_text.ends_with("..") || preceding_text.ends_with(".?.?") {
-							return vec![];
-						}
-
 						let access_context = if let ExprKind::Reference(Reference::Identifier(ident)) = &nearest_expr.kind {
-							match ident.name.as_str() {
-								"this" => ObjectAccessContext::This,
-								"super" => ObjectAccessContext::Super,
-								_ => ObjectAccessContext::Outside,
-							}
+							str_to_access_context(&ident.name)
 						} else {
 							ObjectAccessContext::Outside
 						};
@@ -285,7 +298,13 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 				};
 
 				// We're likely in a type reference of some kind, so let's use the raw text for a lookup
-				let reference_bytes = &preceding_text.as_bytes()[parent.start_byte()..node_to_complete.start_byte()];
+				let start_byte = parent.start_byte();
+				let mut end_byte = node_to_complete.start_byte();
+				if start_byte == end_byte {
+					end_byte = node_to_complete.end_byte();
+				}
+
+				let reference_bytes = &preceding_text.as_bytes()[start_byte..end_byte];
 				let mut reference_text = std::str::from_utf8(reference_bytes)
 					.expect("Reference must be valid utf8")
 					.trim_end_matches(".")
@@ -302,35 +321,68 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 								get_completions_from_type(&t, &types, Some(found_env.phase), &ObjectAccessContext::Static)
 							}
 							SymbolKind::Variable(v) => {
+								// Handle cases where the parser incorrectly thinks we're in a type reference
+								// This often happens before return statements when returning an anonymous struct literal:
+								// let a = S { a: 2 };
+								// a.
+								//   ^ The parser is reading this as `a.return { a: 2 }`
+								// return { a: 2 };
+								if parent.kind() == "custom_type" {
+									let mut sibling_iter = node_to_complete;
+									while let Some(sibling) = sibling_iter.next_named_sibling() {
+										if sibling.kind() == "type_identifier" {
+											if sibling.utf8_text(contents.as_bytes()) == Ok("return") {
+												return get_completions_from_type(
+													&v.type_,
+													&types,
+													Some(found_env.phase),
+													&str_to_access_context(&reference_text),
+												);
+											}
+										}
+										sibling_iter = sibling;
+									}
+								}
+
 								get_completions_from_type(&v.type_, &types, Some(found_env.phase), &ObjectAccessContext::Static)
 							}
 							SymbolKind::Namespace(n) => {
-								// If the types in this namespace aren't loaded yet, load them now to get completions
-								if !n.loaded {
-									JSII_TYPES.with(|jsii_types| {
-										let jsii_types = jsii_types.borrow();
-										let parts = reference_text.split(".").collect::<Vec<_>>();
-										// Dummy type representing the namespace to be loaded
-										let udt = UserDefinedType {
-											root: Symbol::global(parts[0].to_string()),
-											fields: parts[1..].iter().map(|s| Symbol::global(s.to_string())).collect(),
-											span: WingSpan::default(),
-										};
-										// Import all types in the namespace by trying to load the "dummy type"
-										import_udt_from_jsii(&mut types, &jsii_types, &udt, &project_data.jsii_imports);
-									});
-								}
+								// In case the types in this namespace aren't loaded yet, load them now to get completions
+								JSII_TYPES.with(|jsii_types| {
+									let jsii_types = jsii_types.borrow();
+									let parts = reference_text.split(".").collect::<Vec<_>>();
+									// Dummy type representing the namespace to be loaded
+									let udt = UserDefinedType {
+										root: Symbol::global(parts[0].to_string()),
+										fields: parts[1..].iter().map(|s| Symbol::global(s.to_string())).collect(),
+										span: WingSpan::default(),
+									};
+									// Import all types in the namespace by trying to load the "dummy type"
+									import_udt_from_jsii(&mut types, &jsii_types, &udt, &project_data.jsii_imports);
+								});
 								get_completions_from_namespace(&n, Some(found_env.phase))
 							}
 						};
 
 						return filter_completions(completions);
 					}
+
+					if node_to_complete_kind == "type_identifier" {
+						// we're in an incomplete bare type (e.g. `new clou` or `extends clo`),
+						// we should attempt to use the text we have to match existing scope symbols
+						return filter_completions(get_current_scope_completions(
+							&types,
+							&scope_visitor,
+							&node_to_complete,
+							&preceding_text,
+						));
+					}
+
 					return vec![];
 				}
 			} else if matches!(
 				nearest_non_reference.kind(),
-				"struct_literal" | "json_map_literal" | "set_literal" | "struct_literal_member"
+				"struct_literal" | "json_map_literal" | "struct_literal_member"
 			) {
 				// check to see if ":" is the last character of the same line up to the cursor
 				// if it is, we want an expression instead of struct completions
@@ -357,6 +409,12 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 								return vec![];
 							};
 
+							(fields, *structy)
+						} else if let ExprKind::JsonMapLiteral { fields } = &expr.kind {
+							let Some(structy) = types.get_type_from_json_cast(expr.id) else {
+								return vec![];
+							};
+
 							(fields, *structy)
 						} else {
 							return vec![];
@@ -369,7 +427,7 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 						};
 					}
 				}
-			} else if !last_char_is_colon && (nearest_non_reference.kind() == "argument_list") {
+			} else if !last_char_is_colon && matches!(nearest_non_reference.kind(), "argument_list" | "positional_argument") {
 				if let Some(callish_expr) = scope_visitor.expression_trail.iter().rev().find_map(|e| match &e.kind {
 					ExprKind::Call { arg_list, callee } => Some((
 						match callee {
@@ -383,8 +441,15 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 					ExprKind::New(new_expr) => Some((types.get_expr_type(&e), &new_expr.arg_list)),
 					_ => None,
 				}) {
-					let mut completions =
-						get_current_scope_completions(&types, &scope_visitor, &node_to_complete, &preceding_text);
+					let mut completions = vec![];
+
+					if !matches!(
+						nearest_non_reference.prev_named_sibling().map(|n| n.kind()),
+						Some("keyword_argument")
+					) {
+						// We haven't run into any keyword args yet, so let's show options for positional args (expressions)
+						completions = get_current_scope_completions(&types, &scope_visitor, &node_to_complete, &preceding_text);
+					}
 
 					let arg_list_strings = &callish_expr
 						.1
@@ -433,6 +498,8 @@ pub fn on_completion(params: lsp_types::CompletionParams) -> CompletionResponse
 
 					return completions;
 				}
+			} else if nearest_non_reference.kind() == "intrinsic_identifier" {
+				return get_intrinsic_list(&types);
 			}
 
 			// fallback: no special completions, just get stuff from the current scope
@@ -483,7 +550,7 @@ fn get_current_scope_completions(
 
 		// { a: } or { a: 1, b: }
 		//     ^               ^
-		"set_literal" | "struct_literal" | "json_map_literal" | "json_literal_member" => {
+		"struct_literal" | "json_map_literal" | "json_literal_member" => {
 			in_type = false;
 		}
 
@@ -546,7 +613,6 @@ fn get_current_scope_completions(
 			"argument_list"
 			| "call"
 			| "struct_literal"
-			| "set_literal"
 			| "struct_literal_member"
 			| "new_expression"
 			| "keyword_argument_value" => {
@@ -739,7 +805,7 @@ fn nearest_non_reference_ancestor<'a>(start_node: &'a tree_sitter::Node<'a>) ->
 		|| !nearest_non_reference.is_named()
 		|| matches!(
 			nearest_non_reference.kind(),
-			"identifier" | "reference" | "reference_identifier" | "expression_statement"
+			"identifier" | "reference" | "reference_identifier" | "expression_statement" | "accessor"
 		) {
 		let parent = nearest_non_reference.parent();
 		if let Some(parent) = parent {
@@ -813,7 +879,7 @@ fn get_inner_struct_completions(struct_: &Struct, existing_fields: &Vec<String>)
 		if !existing_fields.contains(&field_data.0) {
 			if let Some(mut base_completion) = format_symbol_kind_as_completion(&field_data.0, &field_data.1) {
 				let v = field_data.1.as_variable().unwrap();
-				let is_optional = v.type_.is_option();
+				let is_optional = v.type_.is_strict_option();
 
 				if v.type_.maybe_unwrap_option().is_struct() {
 					base_completion.insert_text = Some(format!("{}: {{\n$1\n}}", field_data.0));
@@ -864,7 +930,7 @@ fn get_completions_from_type(
 			let variants = &enum_.values;
 			variants
 				.iter()
-				.map(|item| CompletionItem {
+				.map(|(item, _)| CompletionItem {
 					label: item.name.clone(),
 					detail: Some(enum_.name.name.clone()),
 					kind: Some(CompletionItemKind::ENUM_MEMBER),
@@ -931,10 +997,7 @@ fn get_completions_from_class(
 			if symbol_data.0 == CLASS_INIT_NAME || symbol_data.0 == CLASS_INFLIGHT_INIT_NAME {
 				return None;
 			}
-			let variable = symbol_data
-				.1
-				.as_variable()
-				.expect("Symbols in classes are always variables");
+			let variable = symbol_data.1.as_variable()?;
 
 			match access_context {
 				// hide private and protected members when accessing from outside the class
@@ -958,6 +1021,17 @@ fn get_completions_from_class(
 				return None;
 			}
 
+			// ignore members from the constructs library
+			if let SymbolEnvKind::Type(t) = symbol_data.2.env.kind {
+				if let Some(class) = t.as_class() {
+					if let Some(fqn) = &class.fqn {
+						if fqn.starts_with("constructs.") || is_construct_base(fqn) {
+							return None;
+						}
+					}
+				}
+			}
+
 			// See `Phase::can_call_to` for phase access rules
 			if let Some(current_phase) = current_phase {
 				if variable.type_.maybe_unwrap_option().as_function_sig().is_some()
@@ -967,36 +1041,48 @@ fn get_completions_from_class(
 				}
 			}
 
-			let completion_item = format_symbol_kind_as_completion(&symbol_data.0, &symbol_data.1);
-			if let Some(mut completion_item) = completion_item {
-				completion_item.kind = match completion_item.kind {
-					Some(CompletionItemKind::FUNCTION) => Some(CompletionItemKind::METHOD),
-					Some(CompletionItemKind::VARIABLE) => Some(CompletionItemKind::FIELD),
-					_ => completion_item.kind,
-				};
-				Some(completion_item)
-			} else {
-				None
-			}
+			let mut completion_item = format_symbol_kind_as_completion(&symbol_data.0, &symbol_data.1)?;
+			completion_item.kind = match completion_item.kind {
+				Some(CompletionItemKind::FUNCTION) => Some(CompletionItemKind::METHOD),
+				Some(CompletionItemKind::VARIABLE) => Some(CompletionItemKind::FIELD),
+				_ => completion_item.kind,
+			};
+			Some(completion_item)
 		})
 		.collect()
 }
 
+fn make_documentation(text: String) -> Option<Documentation> {
+	if text.is_empty() {
+		None
+	} else {
+		Some(Documentation::MarkupContent(MarkupContent {
+			kind: MarkupKind::Markdown,
+			value: text,
+		}))
+	}
+}
+
+fn get_intrinsic_list(types: &Types) -> Vec<CompletionItem> {
+	let mut completions = vec![];
+
+	for intrinsic in types.intrinsics.iter(false) {
+		let item = format_symbol_kind_as_completion(&intrinsic.0, intrinsic.1).unwrap();
+		completions.push(item);
+	}
+	completions
+}
+
 /// Formats a SymbolKind from a SymbolEnv as a CompletionItem
 fn format_symbol_kind_as_completion(name: &str, symbol_kind: &SymbolKind) -> Option<CompletionItem> {
 	if should_exclude_symbol(name) {
 		return None;
 	}
 
-	let documentation = Some(Documentation::MarkupContent(MarkupContent {
-		kind: MarkupKind::Markdown,
-		value: symbol_kind.render_docs(),
-	}));
-
 	Some(match symbol_kind {
 		SymbolKind::Type(t) => CompletionItem {
 			label: name.to_string(),
-			documentation,
+			documentation: make_documentation(symbol_kind.render_docs()),
 			kind: Some(match **t {
 				Type::Array(_)
 				| Type::MutArray(_)
@@ -1008,6 +1094,7 @@ fn format_symbol_kind_as_completion(name: &str, symbol_kind: &SymbolKind) -> Opt
 				Type::Anything
 				| Type::Number
 				| Type::String
+				| Type::Stringable
 				| Type::Duration
 				| Type::Boolean
 				| Type::Void
@@ -1031,11 +1118,12 @@ fn format_symbol_kind_as_completion(name: &str, symbol_kind: &SymbolKind) -> Opt
 				Some(CompletionItemKind::VARIABLE)
 			};
 			let is_method = kind == Some(CompletionItemKind::FUNCTION);
+			let docs = v.docs.as_ref().or_else(|| v.type_.docs());
 
 			let mut completion_item = CompletionItem {
 				label: name.to_string(),
 				detail: Some(v.type_.to_string()),
-				documentation,
+				documentation: docs.and_then(|d| make_documentation(d.render())),
 				kind,
 				..Default::default()
 			};
@@ -1059,7 +1147,7 @@ fn format_symbol_kind_as_completion(name: &str, symbol_kind: &SymbolKind) -> Opt
 		}
 		SymbolKind::Namespace(..) => CompletionItem {
 			label: name.to_string(),
-			documentation,
+			documentation: make_documentation(symbol_kind.render_docs()),
 			kind: Some(CompletionItemKind::MODULE),
 			..Default::default()
 		},
@@ -1070,6 +1158,14 @@ fn should_exclude_symbol(symbol: &str) -> bool {
 	symbol == WINGSDK_STD_MODULE || symbol.starts_with(CLOSURE_CLASS_PREFIX) || symbol.starts_with(PARENT_THIS_NAME)
 }
 
+fn str_to_access_context(s: &str) -> ObjectAccessContext {
+	match s {
+		"this" => ObjectAccessContext::This,
+		"super" => ObjectAccessContext::Super,
+		_ => ObjectAccessContext::Outside,
+	}
+}
+
 /// This visitor is used to find the scope
 /// and relevant expression that contains a given location.
 pub struct ScopeVisitor<'a> {
@@ -1136,6 +1232,17 @@ impl<'a> Visit<'a> for ScopeVisitor<'a> {
 	fn visit_expr(&mut self, node: &'a Expr) {
 		let mut set_node = false;
 
+		if self.nearest_expr.is_none() && !node.span.is_default() && node.span.contains_location(&self.exact_position) {
+			if let Some(last) = self.expression_trail.last() {
+				if node.span.byte_size() > last.span.byte_size() {
+					// This typically happens when inside transformed/generated code
+					// where the order of nodes is not necessarily depth-first
+					return;
+				}
+			}
+			self.expression_trail.push(node);
+		}
+
 		// if the span is exactly the same, we want to set the node
 		if node.span.start == self.target_span.start && node.span.end == self.target_span.end {
 			set_node = true;
@@ -1162,10 +1269,6 @@ impl<'a> Visit<'a> for ScopeVisitor<'a> {
 			}
 		}
 
-		if self.nearest_expr.is_none() && node.span.contains_location(&self.exact_position) {
-			self.expression_trail.push(node);
-		}
-
 		// if this node is possibly what we're looking for, no need to visit its children
 		// (we will still visit sibling expressions, just in case)
 		if set_node {
@@ -1264,6 +1367,21 @@ new cloud.
 		// assert!(new_expression_nested.iter().all(|item| item.detail.as_ref().unwrap().starts_with("preflight")))
 	);
 
+	test_completion_list!(
+		new_expression_partial_namespace,
+		r#"
+bring cloud;
+
+struct cloudy {}
+
+new clo
+     //^
+"#,
+		assert!(!new_expression_partial_namespace.is_empty())
+		assert!(new_expression_partial_namespace.len() == 1)
+		assert!(new_expression_partial_namespace.get(0).unwrap().label == "cloud")
+	);
+
 	test_completion_list!(
 		static_method_call,
 		r#"
@@ -1545,6 +1663,18 @@ Foo { x: "hi", }
 "#
 	);
 
+	test_completion_list!(
+		struct_literal_empty_nospace,
+		r#"
+struct Foo {
+	x: str;
+}
+
+let x: Foo = {}
+            //^
+"#
+	);
+
 	test_completion_list!(
 		struct_literal_all,
 		r#"
@@ -1643,6 +1773,21 @@ x(one: "", )
 "#
 	);
 
+	test_completion_list!(
+		call_struct_expansion_partial_text,
+		r#"
+struct A {
+	one: str;
+	two: str;
+}
+
+let x = (arg1: A) => {};
+
+x(one: "", tw )
+           //^
+"#
+	);
+
 	test_completion_list!(
 		nested_struct_literal,
 		r#"
@@ -1770,8 +1915,9 @@ S.
 		hide_private,
 		r#"
 class S {
-  a: num;
-  new() { this.a = 2; }
+  shouldBeHidden: num;
+	pub shouldBeVisible: num;
+  new() { this.a = 0; this.shouldBeVisible = 0 }
 }
 let x = new S();
 x.
@@ -1844,11 +1990,21 @@ let s: S = { a: 1, b:  };
 		assert!(struct_show_values.iter().any(|c| c.label == "x"))
 	);
 
+	test_completion_list!(
+		struct_arg_expansion_partial,
+		r#"
+struct S { a1: num; b1: num; }
+let func = (a: num, s: S) => {};
+func(1, a )
+       //^
+"#,
+	);
+
 	test_completion_list!(
 		partial_type_reference,
 		r#"
 class C {
-	pub static func() {}
+  pub static func() {}
 }
 C.fu
   //^
@@ -1884,4 +2040,70 @@ let x: Array< >
 "#,
 		assert!(!type_parameter.is_empty())
 	);
+
+	test_completion_list!(
+		dot_before_returning_struct,
+		r#"
+struct S { s: str; }
+
+let s1 = S { s: "" };
+
+let x: (): S = () => {
+  s1.
+   //^
+  return { s: "" };
+};
+"#,
+		assert!(dot_before_returning_struct.get(0).unwrap().label == "s")
+	);
+
+	test_completion_list!(
+			if_before_return_type_ref,
+			r#"
+class C {
+static inflight staticMethod(): num { return 0; }
+inflight otherInflight(){}
+inflight status(): num {
+  if this.
+        //^
+  return C.staticMethod();
+} 
+}
+"#,
+	assert!(if_before_return_type_ref.iter().any(|c| c.label == "otherInflight"))
+	assert!(!if_before_return_type_ref.iter().any(|c| c.label == "staticMethod"))
+		);
+
+	test_completion_list!(
+			forin_before_return_type_ref,
+			r#"
+class C {
+static inflight staticMethod(): num { return 0; }
+inflight otherInflight(){}
+inflight status(): num {
+  for x in this.
+              //^
+  return C.staticMethod();
+} 
+}
+"#,
+	assert!(forin_before_return_type_ref.iter().any(|c| c.label == "otherInflight"))
+	assert!(!forin_before_return_type_ref.iter().any(|c| c.label == "staticMethod"))
+		);
+
+	test_completion_list!(
+		intrinsics,
+		r#"
+let x = @
+       //^
+		"#,
+	);
+
+	test_completion_list!(
+		intrinsics_partial,
+		r#"
+let x = @dir
+         //^
+		"#,
+	);
 }
diff --git a/libs/wingc/src/lsp/document_symbols.rs b/libs/wingc/src/lsp/document_symbols.rs
index 4e50bc2deb6..9c6dde4c93a 100644
--- a/libs/wingc/src/lsp/document_symbols.rs
+++ b/libs/wingc/src/lsp/document_symbols.rs
@@ -67,14 +67,14 @@ impl Visit<'_> for DocumentSymbolVisitor {
 					.document_symbols
 					.push(create_document_symbol(symbol, SymbolKind::CLASS));
 			}
-			StmtKind::Struct { name, .. } => {
-				let symbol = name;
+			StmtKind::Struct(st) => {
+				let symbol = &st.name;
 				self
 					.document_symbols
 					.push(create_document_symbol(symbol, SymbolKind::STRUCT));
 			}
-			StmtKind::Enum { name, .. } => {
-				let symbol = name;
+			StmtKind::Enum(enu) => {
+				let symbol = &enu.name;
 				self
 					.document_symbols
 					.push(create_document_symbol(symbol, SymbolKind::ENUM));
diff --git a/libs/wingc/src/lsp/hover.rs b/libs/wingc/src/lsp/hover.rs
index bf334d8830f..dcb30179c7a 100644
--- a/libs/wingc/src/lsp/hover.rs
+++ b/libs/wingc/src/lsp/hover.rs
@@ -37,18 +37,21 @@ pub fn on_hover(params: lsp_types::HoverParams) -> Option<Hover> {
 					});
 				}
 			} else {
-				if let SymbolLocatorResult::LooseField { field_type, field, .. } = &symbol_finder.result {
-					let span = symbol_finder.located_span().unwrap();
-					let value = format!("```wing\n{}: {field_type}\n```", field.name);
-
-					return Some(Hover {
-						contents: HoverContents::Markup(MarkupContent {
-							kind: MarkupKind::Markdown,
-							value,
-						}),
-						range: Some(span.into()),
-					});
-				}
+				return match &symbol_finder.result {
+					SymbolLocatorResult::LooseField { field_type, field, .. } => {
+						let span = symbol_finder.located_span().unwrap();
+						let value = format!("```wing\n{}: {field_type}\n```", field.name);
+
+						Some(Hover {
+							contents: HoverContents::Markup(MarkupContent {
+								kind: MarkupKind::Markdown,
+								value,
+							}),
+							range: Some(span.into()),
+						})
+					}
+					_ => None,
+				};
 			}
 
 			None
@@ -117,7 +120,7 @@ mod tests {
 		r#"
 bring cloud;
 new cloud. 
-		//^
+    //^
 "#,
 	);
 
@@ -412,4 +415,236 @@ Json.stringify({});
 //^
 "#
 	);
+
+	test_hover_list!(
+		variadic_args,
+		r#"
+  class Arr {
+    pub addMany(...items: Array<str>) {
+  
+    }
+  }
+  
+  let arr = new Arr();
+  arr.addMany("a","b","c");
+      //^
+  "#,
+	);
+
+	test_hover_list!(
+		class_doc,
+		r#"
+  /// Class doc
+  class Foo {
+      //^
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		enum_doc,
+		r#"
+  /// Enum doc
+  enum Foo {
+     //^
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		struct_doc,
+		r#"
+  /// Struct doc
+  struct Foo {
+       //^
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		interface_doc,
+		r#"
+  /// Interface doc
+  interface Foo {
+          //^
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		class_field_doc,
+		r#"
+  class Foo {
+    /// Class field doc
+    field: num;
+  //^		
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		class_method_doc,
+		r#"
+  class Foo {
+    /// Class method doc
+    do() { }
+  //^		
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		interface_method_doc,
+		r#"
+  interface Foo {
+    /// Interface method doc
+    do(): void;
+  //^		
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		enum_variant_doc,
+		r#"
+  enum Foo {
+    /// Enum variant doc
+    A
+  }
+	Foo.A;
+    //^		
+  "#,
+	);
+
+	test_hover_list!(
+		struct_field_doc,
+		r#"
+  struct Foo {
+    /// Struct field doc
+    field: num;
+  //^		
+  }
+  "#,
+	);
+
+	test_hover_list!(
+		inherited_struct_field_doc,
+		r#"
+  struct Foo {
+    /// Parent struct field doc
+    field: num;
+  }
+  struct ChildFoo extends Foo {
+	    child_field: num;
+  }
+  let child = ChildFoo { field: 1, child_field: 2 };
+  child.field;
+      //^
+ 	"#,
+	);
+
+	test_hover_list!(
+		inherited_interface_method_doc,
+		r#"
+  interface Foo {
+    /// Parent interface method doc
+    do(): void;
+  }
+  interface ChildFoo extends Foo {
+    child_do(): void;
+  }		
+  (x: ChildFoo) => {
+    x.do();
+    //^
+  };
+ 	"#,
+	);
+
+	test_hover_list!(
+		ignoe_empty_lines_in_doc,
+		r#"
+  /// Class doc with empty lines after it
+
+  class Foo {
+      //^
+  
+	"#,
+	);
+
+	test_hover_list!(
+		class_doc_with_multiline_and_markdown,
+		r#"
+  /// Class doc
+  /// With multiline
+  /// ## And markdown
+  class Foo {
+      //^
+    pub a: num;
+  }
+	"#,
+	);
+
+	test_hover_list!(
+		member_doc_on_same_line_as_something_else,
+		r#"
+  class Foo { /// Member doc in unexpected place
+    field: num;
+  //^
+  }
+	"#,
+	);
+
+	test_hover_list!(
+		ctor_doc,
+		r#"
+  class Bob {
+    /// I'm bob the constructor
+    new() {}
+  //^
+  }
+	"#
+	);
+
+	test_hover_list!(
+		inflight_ctor_doc,
+		r#"
+  class Bob {
+    /// I'm bob the constructor (inflight)
+    inflight new() {}
+           //^
+  }
+	"#
+	);
+
+	test_hover_list!(
+		ctor_doc_from_new_expr,
+		r#"
+  class Bob {
+    /// I'm bob the constructor
+    new() {}
+  }
+  new Bob();
+    //^	
+	"#
+	);
+
+	test_hover_list!(
+		inflight_ctor_doc_from_new_expr,
+		r#"
+  inflight class Bob {
+    /// I'm bob the constructor (inflight)
+    new() {}
+  }
+  inflight () => { new Bob(); };
+                     //^
+	"#
+	);
+
+	test_hover_list!(
+		intrinsics,
+		r#"
+@dirname
+  //^
+  "#,
+	);
 }
diff --git a/libs/wingc/src/lsp/mod.rs b/libs/wingc/src/lsp/mod.rs
index ef279dae549..2753bef8c73 100644
--- a/libs/wingc/src/lsp/mod.rs
+++ b/libs/wingc/src/lsp/mod.rs
@@ -3,6 +3,9 @@ mod completions;
 mod document_symbols;
 mod goto_definition;
 mod hover;
+mod rename_prepare;
+mod rename_request;
+mod rename_visitor;
 mod signature;
 mod symbol_locator;
 mod sync;
diff --git a/libs/wingc/src/lsp/rename_prepare.rs b/libs/wingc/src/lsp/rename_prepare.rs
new file mode 100644
index 00000000000..c60f4bc1784
--- /dev/null
+++ b/libs/wingc/src/lsp/rename_prepare.rs
@@ -0,0 +1,379 @@
+use crate::lsp::sync::PROJECT_DATA;
+use crate::visit::Visit;
+use crate::wasm_util::extern_json_fn;
+use lsp_types::{PrepareRenameResponse, TextDocumentPositionParams};
+
+use super::rename_visitor::RenameVisitor;
+use super::sync::{check_utf8, WING_TYPES};
+
+#[no_mangle]
+pub unsafe extern "C" fn wingc_on_prepare_rename(ptr: u32, len: u32) -> u64 {
+	extern_json_fn(ptr, len, on_prepare_rename)
+}
+
+pub fn on_prepare_rename(params: TextDocumentPositionParams) -> PrepareRenameResponse {
+	WING_TYPES.with(|types| {
+		let types = types.borrow();
+		PROJECT_DATA.with(|project_data| -> PrepareRenameResponse {
+			let project_data = project_data.borrow();
+			let uri = params.text_document.uri;
+			let file = check_utf8(uri.to_file_path().expect("LSP only works on real filesystems"));
+			let scope = project_data.asts.get(&file).unwrap();
+
+			let position = params.position;
+
+			let mut reference_visitor = RenameVisitor::new(&types);
+			reference_visitor.visit_scope(scope);
+
+			reference_visitor.prepare_rename(position)
+		})
+	})
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::lsp::rename_prepare::*;
+	use crate::lsp::sync::test_utils::*;
+
+	/// Creates a snapshot test for a given wing program's rename_prepare at a given position
+	/// In the wing program, place a comment "//^" into the text where the "^" is pointing to the desired character position
+	/// To assert on the target range of the result, place a comment "//-" below the target, with additional "-" characters to extend the range
+	///
+	/// First parameter will be the name of the tests, as well as the identifier to use for the list of completion in the asserts (see last parameter)
+	/// Second parameter is the wing code block as a string literal
+	/// After the first two parameters, additional statements can optionally be provided to assert on the returned data.
+	///
+	/// Result is a PrepareRenameResponse
+	macro_rules! test_rename_prepare {
+		($name:ident, $code:literal) => {
+			test_rename_prepare!($name, $code,);
+		};
+		($name:ident, $code:literal, $($assertion:stmt)*) => {
+			#[test]
+			fn $name() {
+				// NOTE: this is needed for debugging to work regardless of where you run the test
+				std::env::set_current_dir(env!("CARGO_MANIFEST_DIR")).unwrap();
+
+				let text_document_position_params = load_file_with_contents($code);
+
+				let $name = on_prepare_rename(TextDocumentPositionParams {
+					text_document: text_document_position_params.text_document.clone(),
+          position: text_document_position_params.position.clone(),
+				});
+
+      let ranges = get_ranges($code);
+
+      match $name {
+        PrepareRenameResponse::DefaultBehavior{default_behavior} => {
+          assert_eq!(
+            ranges.len(),
+						0,
+						"target_range did not match"
+					);
+          assert_eq!(
+            default_behavior,
+						false,
+						"target_range did not match"
+					);
+        }
+          PrepareRenameResponse::Range(range) => {
+            assert_eq!(
+              ranges[0],
+              range,
+              "target_range did not match"
+            );
+      }
+      PrepareRenameResponse::RangeWithPlaceholder{range, ..} => {
+        assert_eq!(
+          ranges[0],
+          range,
+          "target_range did not match"
+        );
+  }
+    }
+
+				$($assertion)*
+			}
+		};
+	}
+
+	test_rename_prepare!(
+		cant_rename_equal_sign,
+		r#"
+let thing = "thing";
+let thing2 = thing;
+         //^
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_let,
+		r#"
+let thing = "thing";
+//^
+let thing2 = thing;
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_str,
+		r#"
+let thing = "thing";
+              //^
+let thing2 = thing;
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_semicolon,
+		r#"
+let thing = "thing";
+                 //^
+let thing2 = thing;
+		"#
+	);
+	//
+
+	test_rename_prepare!(
+		cant_rename_numbers,
+		r#"
+let var thing = 6;
+              //^   
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_log,
+		r#"
+    log("hi!")
+   //^
+  
+		"#
+	);
+
+	test_rename_prepare!(
+		can_rename_symbol,
+		r#"
+    let var thing = 6;
+    if (thing > 8) {
+    thing = 6;
+
+    } else {
+    if (thing < 0) {
+      let thing = 0;
+      log(thing);
+        //----^
+    }
+    log(thing)
+    }
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_class_keyword,
+		r#"
+class User {
+//^
+  name: str;
+}
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_for,
+		r#"
+    bring cloud;
+
+    let buckets = [new cloud.Bucket()];
+    for bucket in buckets {
+  //^
+      bucket.addObject("bucket","bucket");
+      log(bucket.toString());
+    }
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_in,
+		r#"
+    bring cloud;
+
+    let buckets = [new cloud.Bucket()];
+    for bucket in buckets {
+              //^
+      bucket.addObject("bucket","bucket");
+      log(bucket.toString());
+    }
+		"#
+	);
+
+	test_rename_prepare!(
+		can_rename_vars,
+		r#"
+    bring cloud;
+
+    let buckets = [new cloud.Bucket()];
+      //------^
+		"#
+	);
+
+	// TODO: not supported yet - therefore disabled
+	test_rename_prepare!(
+		cant_rename_namespace,
+		r#"
+    bring cloud;
+           //^
+    let bucket = new cloud.Bucket();
+		"#
+	);
+
+	// TODO: not supported yet - therefore disabled
+	test_rename_prepare!(
+		cant_rename_namespace_from_property,
+		r#"
+    bring cloud;
+    let bucket = new cloud.Bucket();
+                     //^
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_comments,
+		r#"
+    bring cloud;
+    // let bucket = new cloud.Bucket();
+          //^
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_tests,
+		r#"
+    test "this is a test" {
+    //^ 
+      assert(true);
+    } 
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_struct_keyword,
+		r#"
+    struct user {
+    //^
+      name: str;
+    }
+    
+    let a: user = {name: "a"};
+		"#
+	);
+	// TODO: not supported yet - therefore disabled
+	test_rename_prepare!(
+		cant_rename_interface_key,
+		r#"
+    interface ICat {
+      inflight stepOnKeyboard(): str;
+              //^
+    }
+    
+    class Cat impl ICat {
+      pub inflight stepOnKeyboard(): str {
+                 
+         return "/..,.o0e";
+      }
+    }
+    
+    let hershy = new Cat();
+    
+    test "cat misbehaves" {
+      hershy.stepOnKeyboard();
+    }
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_interface_keyword,
+		r#"
+    interface ICat {
+      //^
+      inflight stepOnKeyboard(): str;
+    }
+    
+    class Cat impl ICat {
+      pub inflight stepOnKeyboard(): str {
+                 
+         return "/..,.o0e";
+      }
+    }
+    
+    let hershy = new Cat();
+    
+    test "cat misbehaves" {
+      hershy.stepOnKeyboard();
+    }
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_types,
+		r#"
+    let a: str = "hi";
+          //^
+    "#
+	);
+
+	test_rename_prepare!(
+		cant_rename_super,
+		r#"
+   class A {}
+   class B extends A {
+    new() {
+      super();
+      //^
+    }
+   }
+    "#
+	);
+
+	test_rename_prepare!(
+		cant_rename_new,
+		r#"
+   class A {}
+   class B extends A {
+    new() {
+   //^
+      super();
+    }
+   }
+    "#
+	);
+
+	test_rename_prepare!(
+		cant_rename_inflight_new,
+		r#"
+   inflight class A {
+    inflight new() {
+     //^
+    }
+   }
+    "#
+	);
+
+	test_rename_prepare!(
+		cant_rename_json_key,
+		r#"
+ let a = {name: "a"};
+
+ log(a.name);
+      //^
+		"#
+	);
+
+	test_rename_prepare!(
+		cant_rename_json_val,
+		r#"
+    let j = {a: "hi"};
+               //^
+    "#
+	);
+}
diff --git a/libs/wingc/src/lsp/rename_request.rs b/libs/wingc/src/lsp/rename_request.rs
new file mode 100644
index 00000000000..e15fa2d8df9
--- /dev/null
+++ b/libs/wingc/src/lsp/rename_request.rs
@@ -0,0 +1,630 @@
+use std::collections::HashMap;
+
+use crate::lsp::sync::PROJECT_DATA;
+use crate::visit::Visit;
+use crate::wasm_util::extern_json_fn;
+use lsp_types::{RenameParams, WorkspaceEdit};
+
+use super::rename_visitor::RenameVisitor;
+use super::sync::{check_utf8, WING_TYPES};
+
+#[no_mangle]
+pub unsafe extern "C" fn wingc_on_rename(ptr: u32, len: u32) -> u64 {
+	extern_json_fn(ptr, len, on_rename_request)
+}
+
+pub fn on_rename_request(params: RenameParams) -> WorkspaceEdit {
+	WING_TYPES.with(|types| {
+		let types = types.borrow();
+		PROJECT_DATA.with(|project_data| -> WorkspaceEdit {
+			let project_data = project_data.borrow();
+			let uri = params.text_document_position.text_document.uri;
+			let file = check_utf8(uri.to_file_path().expect("LSP only works on real filesystems"));
+			let scope = project_data.asts.get(&file).unwrap();
+
+			let new_word = params.new_name;
+			let position = params.text_document_position.position;
+
+			let mut reference_visitor = RenameVisitor::new(&types);
+			reference_visitor.visit_scope(scope);
+
+			let text_edits = reference_visitor.create_text_edits(position, new_word.clone());
+
+			let mut changes = HashMap::new();
+			changes.insert(uri, text_edits);
+
+			WorkspaceEdit {
+				changes: Some(changes),
+				document_changes: None,
+				change_annotations: None,
+			}
+		})
+	})
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::lsp::rename_request::*;
+	use crate::lsp::sync::test_utils::*;
+	use lsp_types::Range;
+
+	/// Creates a snapshot test for a given wing program's rename_request at a given position
+	/// In the wing program, place a comment "//^" into the text where the "^" is pointing to the desired character position
+	/// To assert on the target range of the result, place a comment "//-" below the target, with additional "-" characters to extend the range
+	///
+	/// First parameter will be the name of the tests, as well as the identifier to use for the list of completion in the asserts (see last parameter)
+	/// Second parameter is the wing code block as a string literal
+	/// Third one will be the new name to apply
+	/// After the first two parameters, additional statements can optionally be provided to assert on the returned data.
+	///
+	/// Result is a Workspace Edit
+	macro_rules! test_rename_request {
+		($name:ident, $code:literal, $new_word:literal) => {
+			test_rename_request!($name, $code, $new_word,);
+		};
+		($name:ident, $code:literal, $new_word:literal, $($assertion:stmt)*) => {
+			#[test]
+			fn $name() {
+				// NOTE: this is needed for debugging to work regardless of where you run the test
+				std::env::set_current_dir(env!("CARGO_MANIFEST_DIR")).unwrap();
+
+				let text_document_position_params = load_file_with_contents($code);
+
+				let $name = on_rename_request(RenameParams {
+					text_document_position: text_document_position_params.clone(),
+					work_done_progress_params: Default::default(),
+          new_name: String::from($new_word)
+				});
+
+      let mut text_edit_ranges: Vec<Range> = vec![];
+      if let Some(changes) = &$name.changes {
+        for text_edits in changes.values() {
+            for text_edit in text_edits {
+              assert_eq!(
+                $new_word,
+                text_edit.new_text,
+                "new_word did not match"
+              );
+              text_edit_ranges.push(text_edit.range.clone());
+            }
+        }
+      }
+
+        assert_eq!(
+            get_ranges($code),
+						text_edit_ranges,
+						"target_range did not match"
+					);
+
+				$($assertion)*
+			}
+		};
+	}
+
+	test_rename_request!(
+		variable_same_scope,
+		r#"
+let thing = "thing";
+  //-----
+let thing2 = thing;
+           //----^
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		variable_same_scope_declaration,
+		r#"
+let thing = "thing";
+  //----^
+let thing2 = thing;
+           //-----
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_str,
+		r#"
+let thing = "thing";
+               //^
+let thing2 = thing;
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_symbol,
+		r#"
+let thing = "thing";
+                 //^
+let thing2 = thing;
+		"#,
+		"t1"
+	);
+	//
+
+	test_rename_request!(
+		rename_inner_scope,
+		r#"
+let var thing = 6;
+      //-----
+if (thing > 8) {
+  //-----
+  thing = 6;
+//----^
+} else {
+  if (thing < 0) {
+    //-----
+    let thing = 0;
+    log(thing);
+  }
+  log(thing)
+    //-----
+}               
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_outer_scope,
+		r#"
+    let var thing = 6;
+          //----^
+    if (thing > 8) {
+      //-----
+    thing = 6;
+  //-----
+    } else {
+    if (thing < 0) {
+      //-----
+      let thing = 0;
+      log(thing);
+    }
+    log(thing)
+      //-----
+    }
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_inner_scope_shadowing,
+		r#"
+    let var thing = 6;
+    if (thing > 8) {
+    thing = 6;
+
+    } else {
+    if (thing < 0) {
+      let thing = 0;
+        //-----
+      log(thing);
+        //----^
+    }
+    log(thing)
+    }
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_class,
+		r#"
+class User {
+    //----
+  name: str;
+}
+
+class Admin extends User {
+                  //----
+  permission: num;
+}
+
+let a = new User();
+          //---^
+let b = new Admin();
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_closure,
+		r#"
+let pow = inflight (x: num) => {
+  //--^
+  return x * x;
+};
+
+test "pow" {
+  assert(pow(5) == 25);
+       //---
+  assert(pow(25) == pow( pow(5) ));
+       //---      //---//---
+}
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_for_iterator,
+		r#"
+    bring cloud;
+
+    let buckets = [new cloud.Bucket()];
+    for bucket in buckets {
+      //-----^
+      bucket.addObject("bucket","bucket");
+    //------
+      log(bucket.toString());
+        //------
+    }
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_for_iterator_reference,
+		r#"
+    bring cloud;
+
+    let buckets = [new cloud.Bucket()];
+    for bucket in buckets {
+      //------
+      bucket.addObject("bucket","bucket");
+    //------
+      log(bucket.toString());
+        //-----^
+    }
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_for_loop,
+		r#"
+    bring cloud;
+
+    let buckets = [new cloud.Bucket()];
+      //------^
+    for bucket in buckets {
+                //-------
+      bucket.addObject("bucket","bucket");
+      log(bucket.toString());
+    }
+		"#,
+		"t1"
+	);
+
+	// TODO: not supported yet
+	test_rename_request!(
+		rename_namespace,
+		r#"
+    bring cloud;
+           //^
+    let bucket = new cloud.Bucket();
+		"#,
+		"t1"
+	);
+
+	// TODO: not supported yet
+	test_rename_request!(
+		rename_namespace_from_property,
+		r#"
+    bring cloud;
+    let bucket = new cloud.Bucket();
+                     //^
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_struct_key,
+		r#"
+    struct User {
+      name: str;
+    //---^
+    }
+ 
+ let a: User = {name: "a"};
+              //----
+
+ log(a.name);
+     //----
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_struct_key_usage,
+		r#"
+    struct User {
+      name: str;
+    //----
+    }
+ 
+ let a: User = {name: "a"};
+              //----
+
+ log(a.name);
+     //---^
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_struct_name,
+		r#"
+    struct user {
+         //----
+      name: str;
+    }
+    
+    let a: user = {name: "a"};
+         //---^
+		"#,
+		"t1"
+	);
+	// TODO: not supported yet
+	test_rename_request!(
+		rename_interface_key,
+		r#"
+    interface ICat {
+      inflight stepOnKeyboard(): str;
+              //^
+    }
+    
+    class Cat impl ICat {
+      pub inflight stepOnKeyboard(): str {
+                 
+         return "/..,.o0e";
+      }
+    }
+    
+    let hershy = new Cat();
+    
+    test "cat misbehaves" {
+      hershy.stepOnKeyboard();
+    }
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_interface_name,
+		r#"
+    interface ICat {
+            //---^
+      inflight stepOnKeyboard(): str;
+    }
+    
+    class Cat impl ICat {
+                 //----
+      pub inflight stepOnKeyboard(): str {
+                 
+         return "/..,.o0e";
+      }
+    }
+    
+    let hershy = new Cat();
+    
+    test "cat misbehaves" {
+      hershy.stepOnKeyboard();
+    }
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_class_property,
+		r#"
+class Cat {
+  pub name: str;
+    //---^
+  new(name: str) {
+    this.name = name;
+       //----
+  }
+
+  inflight pub jump(height: num) {}
+  pub sleep(d: duration) {
+    log("{this.name} sleeps");
+             //----
+  }
+}
+
+let a = new Cat("A") as "a cat";
+let b = new Cat("B") as "b cat";
+
+a.sleep(18h);
+b.sleep(24h);
+log(b.name);
+    //----
+
+test "a cat scares b cat" {
+  a.jump(5);
+  b.jump(-5);
+}
+		"#,
+		"t1"
+	);
+	test_rename_request!(
+		rename_class_property_from_usage,
+		r#"
+class Cat {
+  pub name: str;
+    //----
+  new(name: str) {
+    this.name = name;
+       //----
+  }
+
+  inflight pub jump(height: num) {}
+  pub sleep(d: duration) {
+    log("{this.name} sleeps");
+             //----
+  }
+}
+
+let a = new Cat("A") as "a cat";
+let b = new Cat("B") as "b cat";
+
+a.sleep(18h);
+b.sleep(24h);
+log(b.name);
+    //---^
+
+test "a cat scares b cat" {
+  a.jump(5);
+  b.jump(-5);
+}
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_class_inflight_method,
+		r#"
+class Cat {
+  pub name: str;
+  new(name: str) {
+    this.name = name;
+  }
+
+  inflight pub jump(height: num) {}
+             //---^
+  pub sleep(d: duration) {
+    log("{this.name} sleeps");
+  }
+}
+
+let a = new Cat("A") as "a cat";
+let b = new Cat("B") as "b cat";
+
+a.sleep(18h);
+b.sleep(24h);
+log(b.name);
+
+test "a cat scares b cat" {
+  a.jump(5);
+  //----
+  b.jump(-5);
+  //----
+}
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_class_inflight_method_from_usage,
+		r#"
+class Cat {
+  pub name: str;
+  new(name: str) {
+    this.name = name;
+  }
+
+  inflight pub jump(height: num) {}
+             //----
+  pub sleep(d: duration) {
+    log("{this.name} sleeps");
+  }
+}
+
+let a = new Cat("A") as "a cat";
+let b = new Cat("B") as "b cat";
+
+a.sleep(18h);
+b.sleep(24h);
+log(b.name);
+
+test "a cat scares b cat" {
+  a.jump(5);
+  //----
+  b.jump(-5);
+  //---^
+}
+		"#,
+		"t1"
+	);
+	test_rename_request!(
+		rename_class_preflight_method,
+		r#"
+class Cat {
+  pub name: str;
+  new(name: str) {
+    this.name = name;
+  }
+
+  inflight pub jump(height: num) {}
+  pub sleep(d: duration) {
+    //----^
+    log("{this.name} sleeps");
+  }
+}
+
+let a = new Cat("A") as "a cat";
+let b = new Cat("B") as "b cat";
+
+a.sleep(18h);
+//-----
+b.sleep(24h);
+//-----
+log(b.name);
+
+test "a cat scares b cat" {
+  a.jump(5);
+  b.jump(-5);
+}
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		rename_class_preflight_method_from_usage,
+		r#"
+class Cat {
+  pub name: str;
+  new(name: str) {
+    this.name = name;
+  }
+
+  inflight pub jump(height: num) {}
+  pub sleep(d: duration) {
+    //-----
+    log("{this.name} sleeps");
+  }
+}
+
+let a = new Cat("A") as "a cat";
+let b = new Cat("B") as "b cat";
+
+a.sleep(18h);
+//----^
+b.sleep(24h);
+//-----
+log(b.name);
+
+test "a cat scares b cat" {
+  a.jump(5);
+  b.jump(-5);
+}
+		"#,
+		"t1"
+	);
+
+	test_rename_request!(
+		new_scope_args,
+		r#"
+	  class Cat {
+	    pub name: str;
+	    new(name: str) {
+	      //---^
+	      this.name = name;
+	                //----
+	    }
+	  }
+	  "#,
+		"t1"
+	);
+}
diff --git a/libs/wingc/src/lsp/rename_visitor.rs b/libs/wingc/src/lsp/rename_visitor.rs
new file mode 100644
index 00000000000..5d7f90e925b
--- /dev/null
+++ b/libs/wingc/src/lsp/rename_visitor.rs
@@ -0,0 +1,277 @@
+use lsp_types::{Position, PrepareRenameResponse, Range, TextEdit};
+
+use crate::diagnostic::WingLocation;
+use crate::type_check::symbol_env::{LookupResult, SymbolEnv};
+use crate::type_check::{SymbolKind, Types, UnsafeRef, CLASS_INFLIGHT_INIT_NAME, CLASS_INIT_NAME};
+use crate::visit::{visit_scope, Visit};
+use crate::visit_context::{VisitContext, VisitorWithContext};
+use crate::{ast::*, visit_context};
+pub struct LinkedSymbol<'a> {
+	symbol: Symbol,
+	references: Vec<&'a Symbol>,
+}
+pub struct RenameVisitor<'a> {
+	types: &'a Types,
+	linked_symbols: Vec<LinkedSymbol<'a>>,
+	ctx: VisitContext,
+}
+
+impl<'a> RenameVisitor<'a> {
+	pub fn new(types: &'a Types) -> Self {
+		Self {
+			types,
+			linked_symbols: vec![],
+			ctx: VisitContext::new(),
+		}
+	}
+
+	fn is_symbol_linked(&mut self, symbol: &'a Symbol) -> bool {
+		self
+			.linked_symbols
+			.iter()
+			.any(|s: &LinkedSymbol<'a>| symbol.same(&s.symbol) || s.references.iter().any(|r| symbol.same(r)))
+	}
+
+	fn add_reference_symbol(&mut self, symbol: &'a Symbol, symbol_env: Option<&UnsafeRef<SymbolEnv>>) {
+		// symbols that appear in let/if lef statements will point to a prev declaration of a variable of the same name if exists
+		// this is why we add them in advance during visit_statement
+		// the other condition is for "this" that points to the "new" keyword for some reason
+		if self.is_symbol_linked(symbol) || symbol.name == "this" {
+			return;
+		}
+		if let Some(env) = symbol_env.or(self.ctx.current_env()) {
+			match env.lookup_ext(symbol, None) {
+				LookupResult::Found(symbol_kind, lookup_info) | LookupResult::NotPublic(symbol_kind, lookup_info) => {
+					// TODO: remove to support rename-refactor of namespaces - after adjusting the edit
+					if matches!(symbol_kind, &SymbolKind::Namespace(_)) {
+						// as their rename include " as ___"
+						return;
+					}
+					// Default spans are either generated or global, so we don't want to rename them
+					if lookup_info.span.is_default() {
+						return;
+					}
+					if let Some(linked) = self
+						.linked_symbols
+						.iter_mut()
+						.find(|s| lookup_info.span.eq(&s.symbol.span))
+					{
+						linked.references.push(symbol);
+					} else {
+						self.linked_symbols.push(LinkedSymbol {
+							symbol: Symbol {
+								name: symbol.name.clone(),
+								span: lookup_info.span.clone(),
+							},
+							references: if lookup_info.span.eq(&symbol.span) {
+								vec![]
+							} else {
+								vec![symbol]
+							},
+						});
+					}
+				}
+				_ => {}
+			}
+		}
+	}
+
+	pub fn create_text_edits(&mut self, position: Position, new_text: String) -> Vec<TextEdit> {
+		let location = WingLocation {
+			line: position.line,
+			col: position.character,
+		};
+		for symbol in &mut self.linked_symbols {
+			if symbol.symbol.span.contains_location(&location) {
+				return format_references_to_edit(symbol, new_text);
+			}
+
+			let mut is_found = false;
+			// to remove the lock we must get out of the for loop
+			for child in symbol.references.iter_mut() {
+				if child.span.contains_location(&location) {
+					is_found = true;
+					break;
+				}
+			}
+			if is_found {
+				return format_references_to_edit(symbol, new_text);
+			}
+		}
+		vec![]
+	}
+
+	fn prepare_symbol_rename(&self, symbol: &Symbol) -> PrepareRenameResponse {
+		return PrepareRenameResponse::RangeWithPlaceholder {
+			range: Range {
+				start: Position {
+					line: symbol.span.start.line,
+					character: symbol.span.start.col,
+				},
+				end: Position {
+					line: symbol.span.end.line,
+					character: symbol.span.end.col,
+				},
+			},
+			placeholder: symbol.name.clone(),
+		};
+	}
+
+	pub fn prepare_rename(&mut self, position: Position) -> PrepareRenameResponse {
+		let location = WingLocation {
+			line: position.line,
+			col: position.character,
+		};
+		for symbol in &self.linked_symbols {
+			if symbol.symbol.span.contains_location(&location) {
+				return self.prepare_symbol_rename(&symbol.symbol);
+			}
+
+			// to remove the lock we must get out of the for loop
+			for child in symbol.references.iter() {
+				if child.span.contains_location(&location) {
+					return self.prepare_symbol_rename(child);
+				}
+			}
+		}
+		PrepareRenameResponse::DefaultBehavior {
+			default_behavior: false,
+		}
+	}
+}
+
+impl<'a> VisitorWithContext for RenameVisitor<'a> {
+	fn ctx(&mut self) -> &mut visit_context::VisitContext {
+		&mut self.ctx
+	}
+}
+
+impl<'a> Visit<'a> for RenameVisitor<'a> {
+	fn visit_scope(&mut self, node: &'a Scope) {
+		self.ctx.push_env(self.types.get_scope_env(&node));
+		visit_scope(self, node);
+		self.ctx.pop_env();
+	}
+
+	fn visit_symbol(&mut self, node: &'a Symbol) {
+		self.add_reference_symbol(node, None);
+		crate::visit::visit_symbol(self, node);
+	}
+
+	fn visit_expr(&mut self, node: &'a Expr) {
+		if let ExprKind::JsonMapLiteral { fields, .. } = &node.kind {
+			let type_ = self.types.maybe_unwrap_inference(self.types.get_expr_type(node));
+			let type_ = *if let Some(type_) = self.types.get_type_from_json_cast(node.id) {
+				*type_
+			} else {
+				type_
+			}
+			.maybe_unwrap_option();
+
+			if let Some(c) = type_.as_struct() {
+				for (field, ..) in fields {
+					self.add_reference_symbol(field, Some(&UnsafeRef::from(&c.env)));
+				}
+			}
+		}
+		crate::visit::visit_expr(self, node);
+	}
+
+	fn visit_reference(&mut self, node: &'a Reference) {
+		match node {
+			Reference::InstanceMember { property, object, .. } => {
+				let object_type = self.types.get_expr_id_type_ref(object.id);
+				if let Some(inner_env) = object_type.as_env() {
+					self.add_reference_symbol(property, Some(&UnsafeRef::from(inner_env)));
+				}
+			}
+			_ => {}
+		}
+
+		crate::visit::visit_reference(self, node);
+	}
+
+	fn visit_stmt(&mut self, stmt: &'a Stmt) {
+		match &stmt.kind {
+			StmtKind::IfLet(IfLet { var_name, .. }) => self.linked_symbols.push(LinkedSymbol {
+				symbol: var_name.clone(),
+				references: vec![],
+			}),
+			StmtKind::Let { var_name, .. } => self.linked_symbols.push(LinkedSymbol {
+				symbol: var_name.clone(),
+				references: vec![],
+			}),
+			//TODO: to be handled in a following PR, renaming interface fields is not supported yet
+			// StmtKind::Interface(c) => {
+			// for field in &c.methods {
+			// 	self.linked_symbols.push(LinkedSymbol {
+			// 		symbol: field.0.clone(),
+			// 		references: vec![],
+			// 	})
+			// }
+			// }
+			StmtKind::Struct(s) => {
+				for field in &s.fields {
+					self.linked_symbols.push(LinkedSymbol {
+						symbol: field.name.clone(),
+						references: vec![],
+					})
+				}
+			}
+			StmtKind::Class(c) => {
+				for (m, ..) in &c.methods {
+					if m.name == CLASS_INIT_NAME || m.name == CLASS_INFLIGHT_INIT_NAME {
+						continue;
+					}
+					self.linked_symbols.push(LinkedSymbol {
+						symbol: m.clone(),
+						references: vec![],
+					})
+				}
+				for f in &c.fields {
+					self.linked_symbols.push(LinkedSymbol {
+						symbol: f.name.clone(),
+						references: vec![],
+					})
+				}
+			}
+			_ => {}
+		}
+		crate::visit::visit_stmt(self, stmt);
+	}
+}
+
+fn format_references_to_edit(linked: &mut LinkedSymbol, new_text: String) -> Vec<TextEdit> {
+	let mut edits = vec![];
+	edits.push(TextEdit {
+		new_text: String::from(&new_text),
+		range: Range {
+			start: Position {
+				line: linked.symbol.span.start.line,
+				character: linked.symbol.span.start.col,
+			},
+			end: Position {
+				line: linked.symbol.span.end.line,
+				character: linked.symbol.span.end.col,
+			},
+		},
+	});
+
+	for child in linked.references.iter_mut() {
+		edits.push(TextEdit {
+			new_text: String::from(&new_text),
+			range: Range {
+				start: Position {
+					line: child.span.start.line,
+					character: child.span.start.col,
+				},
+				end: Position {
+					line: child.span.end.line,
+					character: child.span.end.col,
+				},
+			},
+		});
+	}
+
+	edits
+}
diff --git a/libs/wingc/src/lsp/signature.rs b/libs/wingc/src/lsp/signature.rs
index 2cdbe364052..7bf36c8e243 100644
--- a/libs/wingc/src/lsp/signature.rs
+++ b/libs/wingc/src/lsp/signature.rs
@@ -4,14 +4,17 @@ use lsp_types::{
 	SignatureInformation,
 };
 
-use crate::ast::{CalleeKind, Expr, ExprKind, New, Symbol};
-use crate::docs::Documented;
+use crate::ast::{CalleeKind, Class, Expr, ExprKind, New, Stmt, StmtKind, Symbol};
+use crate::docs::{render_summary, Documented};
+use crate::jsify::codemaker::CodeMaker;
 use crate::lsp::sync::PROJECT_DATA;
 use crate::lsp::sync::WING_TYPES;
 
 use crate::type_check::symbol_env::SymbolEnvRef;
-use crate::type_check::{resolve_super_method, resolve_user_defined_type, Types, CLASS_INIT_NAME};
-use crate::visit::{visit_expr, visit_scope, Visit};
+use crate::type_check::{
+	resolve_super_method, resolve_user_defined_type, TypeRef, Types, CLASS_INFLIGHT_INIT_NAME, CLASS_INIT_NAME,
+};
+use crate::visit::{visit_expr, visit_scope, visit_stmt, Visit};
 use crate::wasm_util::extern_json_fn;
 
 use super::sync::check_utf8;
@@ -32,41 +35,65 @@ pub fn on_signature_help(params: lsp_types::SignatureHelpParams) -> Option<Signa
 
 			let mut scope_visitor = ScopeVisitor::new(&types, params.text_document_position_params.position);
 			scope_visitor.visit_scope(root_scope);
-			let expr = scope_visitor.call_expr?;
-			let env = scope_visitor.call_env?;
-
-			let sig_data: (
-				crate::type_check::UnsafeRef<crate::type_check::Type>,
-				&crate::ast::ArgList,
-			) = match &expr.kind {
-				ExprKind::New(new_expr) => {
-					let New { class, arg_list, .. } = new_expr;
-
-					let Some(t) = resolve_user_defined_type(class, &types.get_scope_env(&root_scope), 0).ok() else {
-						return None;
-					};
-
-					let init_lookup = t.as_class()?.env.lookup(
-						&Symbol {
-							name: CLASS_INIT_NAME.into(),
-							span: Default::default(),
-						},
-						None,
-					);
 
-					(init_lookup?.as_variable()?.type_, arg_list)
+			let sig_data: (TypeRef, &crate::ast::ArgList) = if scope_visitor.call_stmt.is_some() {
+				let stmt = scope_visitor.call_stmt?;
+				let class = scope_visitor.class?;
+
+				match &stmt.kind {
+					StmtKind::SuperConstructor { arg_list } => {
+						if let Some(p) = &class.parent {
+							let t = resolve_user_defined_type(&p, &types.get_scope_env(&root_scope), 0).ok()?;
+							let init_lookup = t.as_class()?.env.lookup(
+								&if t.is_preflight_class() {
+									CLASS_INIT_NAME
+								} else {
+									CLASS_INFLIGHT_INIT_NAME
+								}
+								.into(),
+								None,
+							);
+
+							(init_lookup?.as_variable()?.type_, arg_list)
+						} else {
+							return None;
+						}
+					}
+					_ => return None,
 				}
-				ExprKind::Call { callee, arg_list } => {
-					let t = match callee {
-						CalleeKind::Expr(expr) => types.get_expr_type(expr),
-						CalleeKind::SuperCall(method) => resolve_super_method(method, &env, &types)
-							.ok()
-							.map_or(types.error(), |t| t.0),
-					};
-
-					(t, arg_list)
+			} else {
+				let expr = scope_visitor.call_expr?;
+				let env = scope_visitor.call_env?;
+				match &expr.kind {
+					ExprKind::New(new_expr) => {
+						let New { class, arg_list, .. } = new_expr;
+
+						let Some(t) = resolve_user_defined_type(class, &types.get_scope_env(&root_scope), 0).ok() else {
+							return None;
+						};
+
+						let init_lookup = t.as_class()?.env.lookup(
+							&Symbol {
+								name: CLASS_INIT_NAME.into(),
+								span: Default::default(),
+							},
+							None,
+						);
+
+						(init_lookup?.as_variable()?.type_, arg_list)
+					}
+					ExprKind::Call { callee, arg_list } => {
+						let t = match callee {
+							CalleeKind::Expr(expr) => types.get_expr_type(expr),
+							CalleeKind::SuperCall(method) => resolve_super_method(method, &env, &types)
+								.ok()
+								.map_or(types.error(), |t| t.0),
+						};
+
+						(t, arg_list)
+					}
+					_ => return None,
 				}
-				_ => return None,
 			};
 
 			let sig = sig_data.0.as_function_sig()?;
@@ -108,11 +135,17 @@ pub fn on_signature_help(params: lsp_types::SignatureHelpParams) -> Option<Signa
 			let param_text = param_data.join(", ");
 			let label = format!("({}): {}", param_text, sig.return_type);
 
+			let mut sig_docs = CodeMaker::default();
+			if let Some(d) = sig_data.0.docs() {
+				render_summary(&mut sig_docs, d);
+			}
+			let sig_docs = sig_docs.to_string();
+
 			let signature_info = SignatureInformation {
 				label,
 				documentation: Some(Documentation::MarkupContent(MarkupContent {
 					kind: MarkupKind::Markdown,
-					value: sig_data.0.render_docs(),
+					value: sig_docs.to_string(),
 				})),
 				parameters: Some(
 					sig
@@ -124,15 +157,21 @@ pub fn on_signature_help(params: lsp_types::SignatureHelpParams) -> Option<Signa
 							let p_type = p.1.typeref;
 							let structy = p_type.maybe_unwrap_option();
 							let structy = structy.as_struct();
-							let p_docs = p_type.render_docs();
-							let p_docs = if p_docs.is_empty() {
+
+							let docstring = p.1.docs.render();
+							let p_docs = if docstring.is_empty() {
 								None
 							} else {
 								Some(Documentation::MarkupContent(MarkupContent {
 									kind: MarkupKind::Markdown,
-									value: p_docs,
+									value: if sig_docs.is_empty() {
+										docstring
+									} else {
+										format!("{docstring}\n\n")
+									},
 								}))
 							};
+
 							ParameterInformation {
 								label: if last_arg && structy.is_some() {
 									ParameterLabel::Simple(format!("...{}", p.1.name))
@@ -144,7 +183,7 @@ pub fn on_signature_help(params: lsp_types::SignatureHelpParams) -> Option<Signa
 									if p.0 == sig.parameters.len() - 1 {
 										Some(Documentation::MarkupContent(MarkupContent {
 											kind: MarkupKind::Markdown,
-											value: p_type.render_docs(),
+											value: format!("```wing\n{}\n```\n", p_type.render_docs()),
 										}))
 									} else {
 										p_docs
@@ -177,10 +216,14 @@ pub struct ScopeVisitor<'a> {
 	pub location: Position,
 	/// The nearest expression before (or containing) the target location
 	pub call_expr: Option<&'a Expr>,
+	/// The nearest statement before (or containing) the target location - on a case we're on a super() call
+	pub call_stmt: Option<&'a Stmt>,
 	// The env of the found expression
 	pub call_env: Option<SymbolEnvRef>,
 	/// The current symbol env we're in
 	curr_env: Vec<SymbolEnvRef>,
+	/// the nearest class containing the call_stmt
+	pub class: Option<&'a Class>,
 }
 
 impl<'a> ScopeVisitor<'a> {
@@ -189,7 +232,9 @@ impl<'a> ScopeVisitor<'a> {
 			types,
 			location,
 			call_expr: None,
+			call_stmt: None,
 			call_env: None,
+			class: None,
 			curr_env: vec![],
 		}
 	}
@@ -199,7 +244,7 @@ impl<'a> Visit<'a> for ScopeVisitor<'a> {
 	fn visit_expr(&mut self, node: &'a Expr) {
 		visit_expr(self, node);
 
-		if self.call_expr.is_some() {
+		if self.call_expr.is_some() || self.call_stmt.is_some() {
 			return;
 		}
 
@@ -214,6 +259,26 @@ impl<'a> Visit<'a> for ScopeVisitor<'a> {
 		}
 	}
 
+	fn visit_stmt(&mut self, node: &'a Stmt) {
+		visit_stmt(self, node);
+
+		if self.call_expr.is_some() || (self.call_stmt.is_some() && self.class.is_some()) {
+			return;
+		}
+
+		if node.span.contains_lsp_position(&self.location) {
+			match &node.kind {
+				StmtKind::SuperConstructor { .. } => {
+					self.call_stmt = Some(node);
+				}
+				StmtKind::Class(c) => {
+					self.class = Some(c);
+				}
+				_ => {}
+			}
+		}
+	}
+
 	fn visit_scope(&mut self, node: &'a crate::ast::Scope) {
 		let env = self.types.get_scope_env(node);
 		self.curr_env.push(env);
@@ -320,6 +385,58 @@ class T {
     handler("123");
   }
 }
+"#,
+	);
+
+	test_signature!(
+		class_super,
+		r#"
+    class Base {
+      new(hello: num) {}
+    }
+    
+    class Derived extends Base {
+      new() {
+        super( );
+            //^
+      }
+    }
+    
+    new Derived();
+"#,
+	);
+
+	test_signature!(
+		inflight_class_super,
+		r#"
+    inflight class A {
+      pub sound: str;
+    
+      inflight new(sound: str) {
+        this.sound = sound;
+      }
+    }
+    
+    inflight class B extends A {
+      inflight new(sound: str) {
+        super( );
+            //^
+      }
+    }
+"#,
+	);
+
+	test_signature!(
+		empty_super,
+		r#"
+    class A {}
+    
+    class B extends A {
+      new() {
+        super( );
+            //^
+      }
+    }
 "#,
 	);
 }
diff --git a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap
index e296f4def96..e3910ae14c6 100644
--- a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap
@@ -4,21 +4,37 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "a:"
   kind: 5
   detail: str
-  documentation:
-    kind: markdown
-    value: "```wing\na: str\n```"
   sortText: "ab|a|a:"
   insertText: "a: $1"
   insertTextFormat: 2
   command:
     title: triggerCompletion
     command: editor.action.triggerSuggest
+- label: this
+  kind: 6
+  detail: Construct
+  documentation:
+    kind: markdown
+    value: "Represents the building block of the construct graph.\n\n#### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct."
+  sortText: bb|this
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: unsafeCast
   kind: 3
   detail: "(value: any): any"
   documentation:
     kind: markdown
-    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
   sortText: cc|unsafeCast
   insertText: unsafeCast($1)
   insertTextFormat: 2
@@ -29,7 +45,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct A\n```\n---\n### Fields\n- `a` — `str`"
+    value: "```wing\nstruct A {\n  a: str;\n}\n```"
   sortText: hh|A
 - label: Json
   kind: 14
@@ -40,12 +56,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap
index ecd1402ea8c..71ba9424430 100644
--- a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap
@@ -4,21 +4,37 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "two:"
   kind: 5
   detail: str
-  documentation:
-    kind: markdown
-    value: "```wing\ntwo: str\n```"
   sortText: "ab|a|two:"
   insertText: "two: $1"
   insertTextFormat: 2
   command:
     title: triggerCompletion
     command: editor.action.triggerSuggest
+- label: this
+  kind: 6
+  detail: Construct
+  documentation:
+    kind: markdown
+    value: "Represents the building block of the construct graph.\n\n#### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct."
+  sortText: bb|this
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: unsafeCast
   kind: 3
   detail: "(value: any): any"
   documentation:
     kind: markdown
-    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
   sortText: cc|unsafeCast
   insertText: unsafeCast($1)
   insertTextFormat: 2
@@ -29,7 +45,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct A\n```\n---\n### Fields\n- `one` — `str`\n- `two` — `str`"
+    value: "```wing\nstruct A {\n  one: str;\n  two: str;\n}\n```"
   sortText: hh|A
 - label: Json
   kind: 14
@@ -40,12 +56,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial_text.snap b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial_text.snap
new file mode 100644
index 00000000000..34370a1fd21
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial_text.snap
@@ -0,0 +1,13 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: "two:"
+  kind: 5
+  detail: str
+  sortText: "ab|a|two:"
+  insertText: "two: $1"
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/capture_in_test.snap b/libs/wingc/src/lsp/snapshots/completions/capture_in_test.snap
index c21f475829e..44eac1a5138 100644
--- a/libs/wingc/src/lsp/snapshots/completions/capture_in_test.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/capture_in_test.snap
@@ -1,19 +1,12 @@
 ---
 source: libs/wingc/src/lsp/completions.rs
 ---
-- label: node
-  kind: 5
-  detail: Node
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight node: Node\nclass Node\n```\n---\nRepresents the construct node in the scope tree.\n\n### Initializer\n- `host` — `Construct`\n- `scope` — `IConstruct`\n- `id` — `str`\n### Fields\n- `PATH_SEP` — `str` — Separator used to delimit construct path components.\n- `addr` — `str` — Returns an opaque tree-unique address for this construct.\n- `children` — `Array<IConstruct>` — All direct children of this construct.\n- `dependencies` — `Array<IConstruct>` — Return all dependencies registered on this node (non-recursive).\n- `id` — `str` — The id of this construct within the current scope.\n- `locked` — `bool` — Returns true if this construct or the scopes in which it is defined are locked.\n- `metadata` — `Array<MetadataEntry>` — An immutable array of metadata objects associated with this construct.\n- `path` — `str` — The full, absolute path of this construct in the tree.\n- `root` — `IConstruct` — Returns the root of the construct tree.\n- `scopes` — `Array<IConstruct>` — All parent scopes of this construct.\n- `defaultChild?` — `IConstruct?` — Returns the child construct that has the id `Default` or `Resource\"`.\n- `scope?` — `IConstruct?` — Returns the scope in which this construct is defined.\n### Methods\n- `addDependency` — `(deps: Array<IDependable>?): void` — Add an ordering dependency on another construct.\n- `addMetadata` — `(type: str, data: any, options: MetadataOptions?): void` — Adds a metadata entry to this construct.\n- `addValidation` — `(validation: IValidation): void` — Adds a validation to this construct.\n- `findAll` — `(order: ConstructOrder?): Array<IConstruct>` — Return this construct and all of its children in the given order.\n- `findChild` — `(id: str): IConstruct` — Return a direct child by id.\n- `getContext` — `(key: str): any` — Retrieves a value from tree context if present. Otherwise, would throw an error.\n- `lock` — `(): void` — Locks this construct from allowing more children to be added.\n- `of` — `(construct: IConstruct): Node` — Returns the node associated with a construct.\n- `setContext` — `(key: str, value: any): void` — This can be used to set contextual values.\n- `tryFindChild` — `(id: str): IConstruct?` — Return a direct child by id, or undefined.\n- `tryGetContext` — `(key: str): any` — Retrieves a value from tree context.\n- `tryRemoveChild` — `(childName: str): bool` — Remove the child with the given name, if present.\n- `validate` — `(): Array<str>` — Validates this construct."
-  sortText: ab|node
 - label: copy
   kind: 2
   detail: "inflight (srcKey: str, dstKey: str): void"
   documentation:
     kind: markdown
-    value: "```wing\ninflight copy: inflight (srcKey: str, dstKey: str): void\n```\n---\nCopy an object to a new location in the bucket.\n### Parameters\n- `srcKey` — `str` — The key of the source object you wish to copy.\n- `dstKey` — `str` — The key of the destination object after copying.\n\n### Remarks\nIf the destination object\nalready exists, it will be overwritten. Returns once the copying is finished.\n\n*@throws* *if `srcKey` object doesn't exist.*"
+    value: "Copy an object to a new location in the bucket.\n\n#### Remarks\nIf the destination object\nalready exists, it will be overwritten.\n\n*@throws* *if `srcKey` object doesn't exist.*"
   sortText: ff|copy
   insertText: copy($1)
   insertTextFormat: 2
@@ -25,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str, opts: BucketDeleteOptions?): void"
   documentation:
     kind: markdown
-    value: "```wing\ninflight delete: inflight (key: str, opts: BucketDeleteOptions?): void\n```\n---\nDelete an existing object using a key from the bucket.\n### Parameters\n- `key` — `str` — Key of the object.\n- `...opts` — `BucketDeleteOptions?` — Options available for delete an item from a bucket.\n  \n  - `mustExist?` — `bool?` — Check failures on the method and retrieve errors if any."
+    value: Delete an existing object using a key from the bucket.
   sortText: ff|delete
   insertText: delete($1)
   insertTextFormat: 2
@@ -37,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str): bool"
   documentation:
     kind: markdown
-    value: "```wing\ninflight exists: inflight (key: str): bool\n```\n---\nCheck if an object exists in the bucket.\n### Parameters\n- `key` — `str` — Key of the object."
+    value: Check if an object exists in the bucket.
   sortText: ff|exists
   insertText: exists($1)
   insertTextFormat: 2
@@ -46,10 +39,10 @@ source: libs/wingc/src/lsp/completions.rs
     command: editor.action.triggerParameterHints
 - label: get
   kind: 2
-  detail: "inflight (key: str): str"
+  detail: "inflight (key: str, options: BucketGetOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\ninflight get: inflight (key: str): str\n```\n---\nRetrieve an object from the bucket.\n### Parameters\n- `key` — `str` — Key of the object.\n\n*@Returns* *the object's body.*\n*@Throws* *if no object with the given key exists.*"
+    value: "Retrieve an object from the bucket.\n\n#### Remarks\nIf the bytes returned are not a valid UTF-8 string, an error is thrown.\n\n*@Returns* *the object's body.*\n*@Throws* *if no object with the given key exists.*"
   sortText: ff|get
   insertText: get($1)
   insertTextFormat: 2
@@ -61,7 +54,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\ninflight getJson: inflight (key: str): Json\n```\n---\nRetrieve a Json object from the bucket.\n### Parameters\n- `key` — `str` — Key of the object.\n\n*@Returns* *the object's parsed Json.*\n*@Throws* *if no object with the given key exists.*"
+    value: "Retrieve a Json object from the bucket.\n\n*@Returns* *the object's parsed Json.*\n*@Throws* *if no object with the given key exists.*"
   sortText: ff|getJson
   insertText: getJson($1)
   insertTextFormat: 2
@@ -73,7 +66,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (prefix: str?): Array<str>"
   documentation:
     kind: markdown
-    value: "```wing\ninflight list: inflight (prefix: str?): Array<str>\n```\n---\nRetrieve existing objects keys from the bucket.\n### Parameters\n- `prefix` — `str?` — Limits the response to keys that begin with the specified prefix.\n\n### Returns\na list of keys or an empty array if the bucket is empty."
+    value: "Retrieve existing objects keys from the bucket.\n\n#### Returns\na list of keys or an empty array if the bucket is empty."
   sortText: ff|list
   insertText: list($1)
   insertTextFormat: 2
@@ -85,7 +78,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str): ObjectMetadata"
   documentation:
     kind: markdown
-    value: "```wing\ninflight metadata: inflight (key: str): ObjectMetadata\n```\n---\nGet the metadata of an object in the bucket.\n### Parameters\n- `key` — `str` — Key of the object.\n\n*@Throws* *if there is no object with the given key.*"
+    value: "Get the metadata of an object in the bucket.\n\n*@Throws* *if there is no object with the given key.*"
   sortText: ff|metadata
   insertText: metadata($1)
   insertTextFormat: 2
@@ -97,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str): str"
   documentation:
     kind: markdown
-    value: "```wing\ninflight publicUrl: inflight (key: str): str\n```\n---\nReturns a url to the given file.\n### Parameters\n- `key` — `str`\n\n*@Throws* *if the file is not public or if object does not exist.*"
+    value: "Returns a url to the given file.\n\n*@Throws* *if the file is not public or if object does not exist.*"
   sortText: ff|publicUrl
   insertText: publicUrl($1)
   insertTextFormat: 2
@@ -109,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str, body: str, options: BucketPutOptions?): void"
   documentation:
     kind: markdown
-    value: "```wing\ninflight put: inflight (key: str, body: str, options: BucketPutOptions?): void\n```\n---\nPut an object in the bucket.\n### Parameters\n- `key` — `str` — Key of the object.\n- `body` — `str` — Content of the object we want to store into the bucket.\n- `...options` — `BucketPutOptions?` — Additional options.\n  \n  - `contentType` — `str` — The HTTP Content-Type of the object."
+    value: Put an object in the bucket.
   sortText: ff|put
   insertText: put($1)
   insertTextFormat: 2
@@ -121,19 +114,31 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str, body: Json): void"
   documentation:
     kind: markdown
-    value: "```wing\ninflight putJson: inflight (key: str, body: Json): void\n```\n---\nPut a Json object in the bucket.\n### Parameters\n- `key` — `str` — Key of the object.\n- `body` — `Json` — Json object that we want to store into the bucket."
+    value: Put a Json object in the bucket.
   sortText: ff|putJson
   insertText: putJson($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: rename
+  kind: 2
+  detail: "inflight (srcKey: str, dstKey: str): void"
+  documentation:
+    kind: markdown
+    value: "Move an object to a new location in the bucket.\n\n#### Remarks\nIf the destination object\nalready exists, it will be overwritten. Returns once the renaming is finished.\n\n*@throws* *if `srcKey` object doesn't exist or if it matches `dstKey`.*"
+  sortText: ff|rename
+  insertText: rename($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: signedUrl
   kind: 2
   detail: "inflight (key: str, options: BucketSignedUrlOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\ninflight signedUrl: inflight (key: str, options: BucketSignedUrlOptions?): str\n```\n---\nReturns a signed url to the given file.\n### Parameters\n- `key` — `str` — The key to access the cloud object.\n- `...options` — `BucketSignedUrlOptions?` — The signedUrlOptions where you can provide the configurations of the signed url.\n  \n  - `duration?` — `duration?` — The duration for the signed url to expire.\n\n### Returns\nA string representing the signed url of the object which can be used to download in any downstream system\n\n*@Throws* *if object does not exist.*"
+    value: "Returns a signed url to the given file.\n\n#### Returns\nA string representing the signed url of the object which can be used to download in any downstream system\n\n*@Throws* *if object does not exist.*"
   sortText: ff|signedUrl
   insertText: signedUrl($1)
   insertTextFormat: 2
@@ -145,7 +150,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str): bool"
   documentation:
     kind: markdown
-    value: "```wing\ninflight tryDelete: inflight (key: str): bool\n```\n---\nDelete an object from the bucket if it exists.\n### Parameters\n- `key` — `str` — Key of the object.\n\n### Returns\nthe result of the delete operation"
+    value: "Delete an object from the bucket if it exists.\n\n#### Returns\nthe result of the delete operation"
   sortText: ff|tryDelete
   insertText: tryDelete($1)
   insertTextFormat: 2
@@ -154,10 +159,10 @@ source: libs/wingc/src/lsp/completions.rs
     command: editor.action.triggerParameterHints
 - label: tryGet
   kind: 2
-  detail: "inflight (key: str): str?"
+  detail: "inflight (key: str, options: BucketTryGetOptions?): str?"
   documentation:
     kind: markdown
-    value: "```wing\ninflight tryGet: inflight (key: str): str?\n```\n---\nGet an object from the bucket if it exists.\n### Parameters\n- `key` — `str` — Key of the object.\n\n### Returns\nthe contents of the object as a string if it exists, nil otherwise"
+    value: "Get an object from the bucket if it exists If the bytes returned are not a valid UTF-8 string, an error is thrown.\n\n#### Returns\nthe contents of the object as a string if it exists, nil otherwise"
   sortText: ff|tryGet
   insertText: tryGet($1)
   insertTextFormat: 2
@@ -169,7 +174,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (key: str): Json?"
   documentation:
     kind: markdown
-    value: "```wing\ninflight tryGetJson: inflight (key: str): Json?\n```\n---\nGets an object from the bucket if it exists, parsing it as Json.\n### Parameters\n- `key` — `str` — Key of the object.\n\n### Returns\nthe contents of the object as Json if it exists, nil otherwise"
+    value: "Gets an object from the bucket if it exists, parsing it as Json.\n\n#### Returns\nthe contents of the object as Json if it exists, nil otherwise"
   sortText: ff|tryGetJson
   insertText: tryGetJson($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/dot_before_returning_struct.snap b/libs/wingc/src/lsp/snapshots/completions/dot_before_returning_struct.snap
new file mode 100644
index 00000000000..dcc421b7775
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/dot_before_returning_struct.snap
@@ -0,0 +1,8 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: s
+  kind: 5
+  detail: str
+  sortText: ab|s
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/empty.snap b/libs/wingc/src/lsp/snapshots/completions/empty.snap
index b2a2890caba..beef6a5ebb0 100644
--- a/libs/wingc/src/lsp/snapshots/completions/empty.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/empty.snap
@@ -1,12 +1,19 @@
 ---
 source: libs/wingc/src/lsp/completions.rs
 ---
+- label: this
+  kind: 6
+  detail: Construct
+  documentation:
+    kind: markdown
+    value: "Represents the building block of the construct graph.\n\n#### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct."
+  sortText: bb|this
 - label: assert
   kind: 3
-  detail: "(condition: bool): void"
+  detail: "(condition: bool, message: str?): void"
   documentation:
     kind: markdown
-    value: "```wing\nassert: (condition: bool): void\n```\n---\nAsserts that a condition is true\n### Parameters\n- `condition` — `bool` — The condition to assert"
+    value: Asserts that a condition is true
   sortText: cc|assert
   insertText: assert($1)
   insertTextFormat: 2
@@ -15,22 +22,34 @@ source: libs/wingc/src/lsp/completions.rs
     command: editor.action.triggerParameterHints
 - label: log
   kind: 3
-  detail: "(message: str): void"
+  detail: "(value: stringable): void"
   documentation:
     kind: markdown
-    value: "```wing\nlog: (message: str): void\n```\n---\nLogs a message\n### Parameters\n- `message` — `str` — The message to log"
+    value: Logs a value
   sortText: cc|log
   insertText: log($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: unsafeCast
   kind: 3
   detail: "(value: any): any"
   documentation:
     kind: markdown
-    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
   sortText: cc|unsafeCast
   insertText: unsafeCast($1)
   insertTextFormat: 2
@@ -46,12 +65,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/forin_before_return_type_ref.snap b/libs/wingc/src/lsp/snapshots/completions/forin_before_return_type_ref.snap
new file mode 100644
index 00000000000..8432e6b4d40
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/forin_before_return_type_ref.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: otherInflight
+  kind: 2
+  detail: "inflight (): void"
+  sortText: ff|otherInflight
+  insertText: otherInflight()
+- label: status
+  kind: 2
+  detail: "inflight (): num"
+  sortText: ff|status
+  insertText: status()
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap b/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap
index b81cb72ef38..4ab06337a4a 100644
--- a/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap
@@ -4,23 +4,17 @@ source: libs/wingc/src/lsp/completions.rs
 - label: this
   kind: 6
   detail: "inflight (): void"
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight this: inflight (): void\n```"
   sortText: bb|this
 - label: x
   kind: 6
   detail: num
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight x: num\n```"
   sortText: bb|x
 - label: assert
   kind: 3
-  detail: "(condition: bool): void"
+  detail: "(condition: bool, message: str?): void"
   documentation:
     kind: markdown
-    value: "```wing\nassert: (condition: bool): void\n```\n---\nAsserts that a condition is true\n### Parameters\n- `condition` — `bool` — The condition to assert"
+    value: Asserts that a condition is true
   sortText: cc|assert
   insertText: assert($1)
   insertTextFormat: 2
@@ -29,22 +23,34 @@ source: libs/wingc/src/lsp/completions.rs
     command: editor.action.triggerParameterHints
 - label: log
   kind: 3
-  detail: "(message: str): void"
+  detail: "(value: stringable): void"
   documentation:
     kind: markdown
-    value: "```wing\nlog: (message: str): void\n```\n---\nLogs a message\n### Parameters\n- `message` — `str` — The message to log"
+    value: Logs a value
   sortText: cc|log
   insertText: log($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: unsafeCast
   kind: 3
   detail: "(value: any): any"
   documentation:
     kind: markdown
-    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
   sortText: cc|unsafeCast
   insertText: unsafeCast($1)
   insertTextFormat: 2
@@ -60,12 +66,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/hide_private.snap b/libs/wingc/src/lsp/snapshots/completions/hide_private.snap
index 4a2b71b2423..bb80cdf871b 100644
--- a/libs/wingc/src/lsp/snapshots/completions/hide_private.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/hide_private.snap
@@ -1,31 +1,8 @@
 ---
 source: libs/wingc/src/lsp/completions.rs
 ---
-- label: node
+- label: shouldBeVisible
   kind: 5
-  detail: Node
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight node: Node\nclass Node\n```\n---\nRepresents the construct node in the scope tree.\n\n### Initializer\n- `host` — `Construct`\n- `scope` — `IConstruct`\n- `id` — `str`\n### Fields\n- `PATH_SEP` — `str` — Separator used to delimit construct path components.\n- `addr` — `str` — Returns an opaque tree-unique address for this construct.\n- `children` — `Array<IConstruct>` — All direct children of this construct.\n- `dependencies` — `Array<IConstruct>` — Return all dependencies registered on this node (non-recursive).\n- `id` — `str` — The id of this construct within the current scope.\n- `locked` — `bool` — Returns true if this construct or the scopes in which it is defined are locked.\n- `metadata` — `Array<MetadataEntry>` — An immutable array of metadata objects associated with this construct.\n- `path` — `str` — The full, absolute path of this construct in the tree.\n- `root` — `IConstruct` — Returns the root of the construct tree.\n- `scopes` — `Array<IConstruct>` — All parent scopes of this construct.\n- `defaultChild?` — `IConstruct?` — Returns the child construct that has the id `Default` or `Resource\"`.\n- `scope?` — `IConstruct?` — Returns the scope in which this construct is defined.\n### Methods\n- `addDependency` — `(deps: Array<IDependable>?): void` — Add an ordering dependency on another construct.\n- `addMetadata` — `(type: str, data: any, options: MetadataOptions?): void` — Adds a metadata entry to this construct.\n- `addValidation` — `(validation: IValidation): void` — Adds a validation to this construct.\n- `findAll` — `(order: ConstructOrder?): Array<IConstruct>` — Return this construct and all of its children in the given order.\n- `findChild` — `(id: str): IConstruct` — Return a direct child by id.\n- `getContext` — `(key: str): any` — Retrieves a value from tree context if present. Otherwise, would throw an error.\n- `lock` — `(): void` — Locks this construct from allowing more children to be added.\n- `of` — `(construct: IConstruct): Node` — Returns the node associated with a construct.\n- `setContext` — `(key: str, value: any): void` — This can be used to set contextual values.\n- `tryFindChild` — `(id: str): IConstruct?` — Return a direct child by id, or undefined.\n- `tryGetContext` — `(key: str): any` — Retrieves a value from tree context.\n- `tryRemoveChild` — `(childName: str): bool` — Remove the child with the given name, if present.\n- `validate` — `(): Array<str>` — Validates this construct."
-  sortText: ab|node
-- label: onLift
-  kind: 2
-  detail: "preflight (host: IInflightHost, ops: Array<str>): void"
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight onLift: preflight (host: IInflightHost, ops: Array<str>): void\n```\n---\nA hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n### Parameters\n- `host` — `IInflightHost`\n- `ops` — `Array<str>`\n\n### Remarks\nYou can override this method to perform additional logic like granting\nIAM permissions to the host based on what methods are being called. But\nyou must call `super.bind(host, ops)` to ensure that the resource is\nactually bound."
-  sortText: ff|onLift
-  insertText: onLift($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
-- label: toString
-  kind: 2
-  detail: "preflight (): str"
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight toString: preflight (): str\n```\n---\nReturns a string representation of this construct."
-  sortText: ff|toString
-  insertText: toString()
+  detail: num
+  sortText: ab|shouldBeVisible
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/if_before_return_type_ref.snap b/libs/wingc/src/lsp/snapshots/completions/if_before_return_type_ref.snap
new file mode 100644
index 00000000000..8432e6b4d40
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/if_before_return_type_ref.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: otherInflight
+  kind: 2
+  detail: "inflight (): void"
+  sortText: ff|otherInflight
+  insertText: otherInflight()
+- label: status
+  kind: 2
+  detail: "inflight (): num"
+  sortText: ff|status
+  insertText: status()
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/incomplete_if_statement.snap b/libs/wingc/src/lsp/snapshots/completions/incomplete_if_statement.snap
index f0c4b6a6748..e167e73464e 100644
--- a/libs/wingc/src/lsp/snapshots/completions/incomplete_if_statement.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/incomplete_if_statement.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): void"
   documentation:
     kind: markdown
-    value: "```wing\nclear: (): void\n```\n---\nRemoves all elements."
+    value: Removes all elements.
   sortText: ff|clear
   insertText: clear()
 - label: copy
@@ -14,7 +14,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): Map"
   documentation:
     kind: markdown
-    value: "```wing\ncopy: (): Map\n```\n---\nCreate an immutable shallow copy of this map.\n\n### Returns\nan ImmutableMap with the same values as this map"
+    value: "Create an immutable shallow copy of this map.\n\n#### Returns\nan ImmutableMap with the same values as this map"
   sortText: ff|copy
   insertText: copy()
 - label: delete
@@ -22,19 +22,27 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): bool"
   documentation:
     kind: markdown
-    value: "```wing\ndelete: (key: str): bool\n```\n---\nRemoves the specified element from a map.\n### Parameters\n- `key` — `str` — The key.\n\n### Returns\ntrue if the given key is no longer present"
+    value: "Removes the specified element from a map.\n\n#### Returns\ntrue if the given key is no longer present"
   sortText: ff|delete
   insertText: delete($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: entries
+  kind: 2
+  detail: "(): Array<ArrayEntry>"
+  documentation:
+    kind: markdown
+    value: "Returns the entries from the map.\n\n#### Returns\nthe entries as Array<ArrayEntry>"
+  sortText: ff|entries
+  insertText: entries()
 - label: get
   kind: 2
   detail: "(key: str): T1"
   documentation:
     kind: markdown
-    value: "```wing\nget: (key: str): T1\n```\n---\nReturns a specified element from the map.\n### Parameters\n- `key` — `str` — The key of the element to return.\n\n### Returns\nThe element associated with the specified key, or undefined if the key can't be found\n\n### Remarks\nIf the value that is associated to the provided key is an object, then you will get a reference\nto that object and any change made to that object will effectively modify it inside the map."
+    value: "Returns a specified element from the map.\n\n#### Returns\nThe element associated with the specified key, or throw an error if the key can't be found\n\n#### Remarks\nIf the value that is associated to the provided key is an object, then you will get a reference\nto that object and any change made to that object will effectively modify it inside the map."
   sortText: ff|get
   insertText: get($1)
   insertTextFormat: 2
@@ -46,7 +54,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): bool"
   documentation:
     kind: markdown
-    value: "```wing\nhas: (key: str): bool\n```\n---\nReturns a boolean indicating whether an element with the specified key exists or not.\n### Parameters\n- `key` — `str` — The key of the element to test for presence.\n\n### Returns\ntrue if an element with the specified key exists in the map; otherwise false."
+    value: "Returns a boolean indicating whether an element with the specified key exists or not.\n\n#### Returns\ntrue if an element with the specified key exists in the map; otherwise false."
   sortText: ff|has
   insertText: has($1)
   insertTextFormat: 2
@@ -58,7 +66,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): Array<str>"
   documentation:
     kind: markdown
-    value: "```wing\nkeys: (): Array<str>\n```\n---\nReturns the keys of this map.\n\n### Returns\nan array containing the keys of this map"
+    value: "Returns the keys of this map.\n\n#### Returns\nan array containing the keys of this map"
   sortText: ff|keys
   insertText: keys()
 - label: set
@@ -66,7 +74,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str, value: T1): void"
   documentation:
     kind: markdown
-    value: "```wing\nset: (key: str, value: T1): void\n```\n---\nAdds or updates an entry in a Map object with a specified key and a value.\n### Parameters\n- `key` — `str` — The key of the element to add.\n- `value` — `T1` — The value of the element to add.\n\n### Remarks\nTODO: revisit this macro after we support indexed args https://github.com/winglang/wing/issues/1659"
+    value: "Adds or updates an entry in a Map object with a specified key and a value.\n\n#### Remarks\nTODO: revisit this macro after we support indexed args https://github.com/winglang/wing/issues/1659"
   sortText: ff|set
   insertText: set($1)
   insertTextFormat: 2
@@ -78,7 +86,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num"
   documentation:
     kind: markdown
-    value: "```wing\nsize: (): num\n```\n---\nReturns the number of elements in the map.\n\n### Returns\nThe number of elements in map\n\n### Remarks\nTODO: For now this has to be a method rather than a getter as macros only work on methods https://github.com/winglang/wing/issues/1658"
+    value: "Returns the number of elements in the map.\n\n#### Returns\nThe number of elements in map\n\n#### Remarks\nTODO: For now this has to be a method rather than a getter as macros only work on methods https://github.com/winglang/wing/issues/1658"
   sortText: ff|size
   insertText: size()
 - label: tryGet
@@ -86,7 +94,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): T1?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGet: (key: str): T1?\n```\n---\nOptionally returns a specified element from the map.\n### Parameters\n- `key` — `str` — The key of the element to return.\n\n### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
+    value: "Optionally returns a specified element from the map.\n\n#### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
   sortText: ff|tryGet
   insertText: tryGet($1)
   insertTextFormat: 2
@@ -98,7 +106,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): Array"
   documentation:
     kind: markdown
-    value: "```wing\nvalues: (): Array\n```\n---\nReturns the values of this map.\n\n### Returns\nan array containing of type T the values of this map"
+    value: "Returns the values of this map.\n\n#### Returns\nan array containing of type T the values of this map"
   sortText: ff|values
   insertText: values()
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/incomplete_inflight_namespace.snap b/libs/wingc/src/lsp/snapshots/completions/incomplete_inflight_namespace.snap
index c00d48e21f8..ed3a11ecc17 100644
--- a/libs/wingc/src/lsp/snapshots/completions/incomplete_inflight_namespace.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/incomplete_inflight_namespace.snap
@@ -5,510 +5,570 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Api\n```\n---\nFunctionality shared between all `Api` implementations.\n\n### Initializer\n- `...props` — `ApiProps?`\n  \n  - `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n  - `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes.\n### Fields\n- `node` — `Node` — The tree node.\n- `url` — `str` — The base URL of the API endpoint.\n### Methods\n- `connect` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiConnectOptions?): void` — Add a inflight handler to the api for CONNECT requests on the given path.\n- `delete` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiDeleteOptions?): void` — Add a inflight handler to the api for DELETE requests on the given path.\n- `get` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiGetOptions?): void` — Add a inflight handler to the api for GET requests on the given path.\n- `head` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiHeadOptions?): void` — Add a inflight handler to the api for HEAD requests on the given path.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `options` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiOptionsOptions?): void` — Add a inflight handler to the api for OPTIONS requests on the given path.\n- `patch` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPatchOptions?): void` — Add a inflight handler to the api for PATCH requests on the given path.\n- `post` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPostOptions?): void` — Add a inflight handler to the api for POST requests on the given path.\n- `put` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPutOptions?): void` — Add a inflight handler to the api for PUT requests on the given path.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Api {\n  url: str;\n  connect(): void;\n  delete(): void;\n  get(): void;\n  head(): void;\n  options(): void;\n  /* ... */\n}\n```\n---\nFunctionality shared between all `Api` implementations."
   sortText: gg|Api
 - label: Bucket
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\nclass Bucket {\n  addFile(): void;\n  addObject(): void;\n  onCreate(): void;\n  onDelete(): void;\n  onEvent(): void;\n  onUpdate(): void;\n  /* ... */\n}\n```\n---\nA cloud object store."
   sortText: gg|Bucket
 - label: Counter
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Counter\n```\n---\nA distributed atomic counter.\n\n### Initializer\n- `...props` — `CounterProps?`\n  \n  - `initial?` — `num?` — The initial value of the counter.\n### Fields\n- `initial` — `num` — The initial value of the counter.\n- `node` — `Node` — The tree node.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Counter {\n  initial: num;\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nA distributed atomic counter."
   sortText: gg|Counter
 - label: Domain
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Domain\n```\n---\nA cloud Domain.\n\n### Initializer\n- `...props` — `DomainProps`\n  \n  - `domainName` — `str` — The website's custom domain name.\n### Fields\n- `domainName` — `str` — The domain name.\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Domain {\n  domainName: str;\n}\n```\n---\nA cloud Domain."
   sortText: gg|Domain
+- label: Endpoint
+  kind: 7
+  documentation:
+    kind: markdown
+    value: "```wing\nclass Endpoint {\n  url: str;\n}\n```\n---\nA cloud Endpoint."
+  sortText: gg|Endpoint
 - label: Function
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Function impl IInflightHost\n```\n---\nA function.\n\n### Initializer\n- `handler` — `inflight (event: str): void`\n- `...props` — `FunctionProps?`\n  \n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n  - `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n  - `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n  - `timeout?` — `duration?` — The maximum amount of time the function can run.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Function impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nA function."
   sortText: gg|Function
 - label: OnDeploy
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass OnDeploy\n```\n---\nRun code every time the app is deployed.\n\n### Initializer\n- `handler` — `inflight (): void`\n- `...props` — `OnDeployProps?`\n  \n  - `env?` — `Map<str>?`\n  - `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n  - `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n  - `logRetentionDays?` — `num?`\n  - `memory?` — `num?`\n  - `timeout?` — `duration?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass OnDeploy {\n  // No public members\n}\n```\n---\nRun code every time the app is deployed."
   sortText: gg|OnDeploy
 - label: Queue
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Queue\n```\n---\nA queue.\n\n### Initializer\n- `...props` — `QueueProps?`\n  \n  - `retentionPeriod?` — `duration?` — How long a queue retains a message.\n  - `timeout?` — `duration?` — How long a queue's consumers have to process a message.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue.\n- `setConsumer` — `preflight (handler: inflight (message: str): void, props: QueueSetConsumerOptions?): Function` — Create a function to consume messages from this queue.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Queue {\n  setConsumer(): Function;\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nA queue."
   sortText: gg|Queue
 - label: Schedule
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Schedule\n```\n---\nA schedule.\n\n### Initializer\n- `...props` — `ScheduleProps?`\n  \n  - `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n  - `rate?` — `duration?` — Trigger events at a periodic rate.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onTick` — `preflight (inflight: inflight (): void, props: ScheduleOnTickOptions?): Function` — Create a function that runs when receiving the scheduled event.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Schedule {\n  onTick(): Function;\n}\n```\n---\nA schedule."
   sortText: gg|Schedule
 - label: Secret
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Secret\n```\n---\nA cloud secret.\n\n### Initializer\n- `...props` — `SecretProps?`\n  \n  - `name?` — `str?` — The secret's name.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\nclass Secret {\n  name?: str;\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nA cloud secret."
   sortText: gg|Secret
 - label: Service
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Service impl IInflightHost\n```\n---\nA long-running service.\n\n### Initializer\n- `handler` — `inflight (): inflight (): void?`\n- `...props` — `ServiceProps?`\n  \n  - `autoStart?` — `bool?` — Whether the service should start automatically.\n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Service impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nA long-running service."
   sortText: gg|Service
 - label: Topic
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Topic\n```\n---\nA topic.\n\n### Initializer\n- `...props` — `TopicProps?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onMessage` — `preflight (inflight: inflight (event: str): void, props: TopicOnMessageOptions?): Function` — Run an inflight whenever an message is published to the topic.\n- `publish` — `inflight (message: str): void` — Publish message to topic.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Topic {\n  onMessage(): Function;\n  subscribeQueue(): void;\n  inflight publish(): void;\n}\n```\n---\nA topic."
   sortText: gg|Topic
 - label: Website
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Website impl IWebsite\n```\n---\nA cloud static website.\n\n### Initializer\n- `...props` — `WebsiteProps`\n  \n  - `path` — `str`\n  - `domain?` — `Domain?`\n### Fields\n- `node` — `Node` — The tree node.\n- `path` — `str` — Absolute local path to the website's static files.\n- `url` — `str` — The website's url.\n### Methods\n- `addFile` — `preflight (path: str, data: str, options: AddFileOptions?): str` — Add a file to the website during deployment.\n- `addJson` — `preflight (path: str, data: Json): str` — Add a JSON file with custom values during the website's deployment.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Website impl IWebsite {\n  path: str;\n  url: str;\n  addFile(): str;\n  addJson(): str;\n}\n```\n---\nA cloud static website."
   sortText: gg|Website
 - label: AddFileOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct AddFileOptions\n```\n---\nOptions for adding a file with custom value during the website's deployment.\n### Fields\n- `contentType?` — `str?` — File's content type."
+    value: "```wing\nstruct AddFileOptions {\n  contentType?: str;\n}\n```\n---\nOptions for adding a file with custom value during the website's deployment."
   sortText: hh|AddFileOptions
 - label: ApiConnectOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiConnectOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiConnectOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiConnectOptions
 - label: ApiCorsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiCorsOptions\n```\n---\nCors Options for `Api`.\n### Fields\n- `allowCredentials?` — `bool?` — Whether to allow credentials.\n- `allowHeaders?` — `Array<str>?` — The list of allowed headers.\n- `allowMethods?` — `Array<HttpMethod>?` — The list of allowed methods.\n- `allowOrigin?` — `Array<str>?` — The list of allowed allowOrigin.\n- `exposeHeaders?` — `Array<str>?` — The list of exposed headers.\n- `maxAge?` — `duration?` — How long the browser should cache preflight request results."
+    value: "```wing\nstruct ApiCorsOptions {\n  allowCredentials?: bool;\n  allowHeaders?: Array<str>;\n  allowMethods?: Array<HttpMethod>;\n  allowOrigin?: str;\n  exposeHeaders?: Array<str>;\n  maxAge?: duration;\n}\n```\n---\nCors Options for `Api`."
   sortText: hh|ApiCorsOptions
 - label: ApiDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiDeleteOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiDeleteOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiDeleteOptions
+- label: ApiEndpointOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct ApiEndpointOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nBase options for Api endpoints."
+  sortText: hh|ApiEndpointOptions
 - label: ApiGetOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiGetOptions\n```\n---\nOptions for Api get endpoint."
+    value: "```wing\nstruct ApiGetOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api get endpoint."
   sortText: hh|ApiGetOptions
 - label: ApiHeadOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiHeadOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiHeadOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiHeadOptions
 - label: ApiOptionsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiOptionsOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiOptionsOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiOptionsOptions
 - label: ApiPatchOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPatchOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiPatchOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiPatchOptions
 - label: ApiPostOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPostOptions\n```\n---\nOptions for Api post endpoint."
+    value: "```wing\nstruct ApiPostOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api post endpoint."
   sortText: hh|ApiPostOptions
 - label: ApiProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiProps\n```\n---\nOptions for `Api`.\n### Fields\n- `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n- `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes."
+    value: "```wing\nstruct ApiProps {\n  cors?: bool;\n  corsOptions?: ApiCorsOptions;\n}\n```\n---\nOptions for `Api`."
   sortText: hh|ApiProps
 - label: ApiPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPutOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiPutOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiPutOptions
 - label: ApiRequest
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiRequest\n```\n---\nShape of a request to an inflight handler.\n### Fields\n- `method` — `HttpMethod` — The request's HTTP method.\n- `path` — `str` — The request's path.\n- `query` — `Map<str>` — The request's query string values.\n- `vars` — `Map<str>` — The path variables.\n- `body?` — `str?` — The request's body.\n- `headers?` — `Map<str>?` — The request's headers."
+    value: "```wing\nstruct ApiRequest {\n  body?: str;\n  headers?: Map<str>;\n  method: HttpMethod;\n  path: str;\n  query: Map<str>;\n  vars: Map<str>;\n}\n```\n---\nShape of a request to an inflight handler."
   sortText: hh|ApiRequest
 - label: ApiResponse
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiResponse\n```\n---\nShape of a response from a inflight handler.\n### Fields\n- `status` — `num` — The response's status code.\n- `body?` — `str?` — The response's body.\n- `headers?` — `Map<str>?` — The response's headers."
+    value: "```wing\nstruct ApiResponse {\n  body?: str;\n  headers?: Map<str>;\n  status?: num;\n}\n```\n---\nShape of a response from a inflight handler."
   sortText: hh|ApiResponse
 - label: BucketDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketDeleteOptions\n```\n---\nOptions for `Bucket.delete()`.\n### Fields\n- `mustExist?` — `bool?` — Check failures on the method and retrieve errors if any."
+    value: "```wing\nstruct BucketDeleteOptions {\n  mustExist?: bool;\n}\n```\n---\nOptions for `Bucket.delete()`."
   sortText: hh|BucketDeleteOptions
 - label: BucketEvent
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketEvent\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927.\n### Fields\n- `key` — `str` — The bucket key that triggered the event.\n- `type` — `BucketEventType` — Type of event."
+    value: "```wing\nstruct BucketEvent {\n  key: str;\n  type: BucketEventType;\n}\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927."
   sortText: hh|BucketEvent
+- label: BucketGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.get()`."
+  sortText: hh|BucketGetOptions
 - label: BucketOnCreateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnCreateOptions\n```\n---\n`onCreate` event options."
+    value: "```wing\nstruct BucketOnCreateOptions {\n  // No public members\n}\n```\n---\n`onCreate` event options."
   sortText: hh|BucketOnCreateOptions
 - label: BucketOnDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnDeleteOptions\n```\n---\n`onDelete` event options."
+    value: "```wing\nstruct BucketOnDeleteOptions {\n  // No public members\n}\n```\n---\n`onDelete` event options."
   sortText: hh|BucketOnDeleteOptions
 - label: BucketOnEventOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnEventOptions\n```\n---\n`onEvent` options."
+    value: "```wing\nstruct BucketOnEventOptions {\n  // No public members\n}\n```\n---\n`onEvent` options."
   sortText: hh|BucketOnEventOptions
 - label: BucketOnUpdateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnUpdateOptions\n```\n---\n`onUpdate` event options."
+    value: "```wing\nstruct BucketOnUpdateOptions {\n  // No public members\n}\n```\n---\n`onUpdate` event options."
   sortText: hh|BucketOnUpdateOptions
 - label: BucketProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketProps\n```\n---\nOptions for `Bucket`.\n### Fields\n- `public?` — `bool?` — Whether the bucket's objects should be publicly accessible."
+    value: "```wing\nstruct BucketProps {\n  public?: bool;\n}\n```\n---\nOptions for `Bucket`."
   sortText: hh|BucketProps
 - label: BucketPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketPutOptions\n```\n---\nOptions for `Bucket.put()`.\n### Fields\n- `contentType` — `str` — The HTTP Content-Type of the object."
+    value: "```wing\nstruct BucketPutOptions {\n  contentType: str;\n}\n```\n---\nOptions for `Bucket.put()`."
   sortText: hh|BucketPutOptions
 - label: BucketSignedUrlOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketSignedUrlOptions\n```\n---\nOptions for `Bucket.signedUrl()`.\n### Fields\n- `duration?` — `duration?` — The duration for the signed url to expire."
+    value: "```wing\nstruct BucketSignedUrlOptions {\n  action?: BucketSignedUrlAction;\n  duration?: duration;\n}\n```\n---\nOptions for `Bucket.signedUrl()`."
   sortText: hh|BucketSignedUrlOptions
+- label: BucketTryGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketTryGetOptions extends BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.tryGet()`."
+  sortText: hh|BucketTryGetOptions
+- label: CorsHeaders
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct CorsHeaders {\n  defaultResponse: Map<str>;\n  optionsResponse: Map<str>;\n}\n```\n---\nType definition for CORS headers which includes default and options headers."
+  sortText: hh|CorsHeaders
 - label: CounterProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct CounterProps\n```\n---\nOptions for `Counter`.\n### Fields\n- `initial?` — `num?` — The initial value of the counter."
+    value: "```wing\nstruct CounterProps {\n  initial?: num;\n}\n```\n---\nOptions for `Counter`."
   sortText: hh|CounterProps
+- label: DeadLetterQueueProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct DeadLetterQueueProps {\n  maxDeliveryAttempts?: num;\n  queue: Queue;\n}\n```\n---\nDead letter queue options."
+  sortText: hh|DeadLetterQueueProps
 - label: DomainProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct DomainProps\n```\n---\nOptions for `Domain`.\n### Fields\n- `domainName` — `str` — The website's custom domain name."
+    value: "```wing\nstruct DomainProps {\n  domainName: str;\n}\n```\n---\nOptions for `Domain`."
   sortText: hh|DomainProps
+- label: EndpointProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct EndpointProps {\n  browserSupport?: bool;\n  label?: str;\n}\n```\n---\nOptions for `Endpoint`."
+  sortText: hh|EndpointProps
 - label: FunctionProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct FunctionProps\n```\n---\nOptions for `Function`.\n### Fields\n- `env?` — `Map<str>?` — Environment variables to pass to the function.\n- `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n- `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n- `timeout?` — `duration?` — The maximum amount of time the function can run."
+    value: "```wing\nstruct FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Function`."
   sortText: hh|FunctionProps
 - label: GetSecretValueOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct GetSecretValueOptions\n```\n---\nOptions when getting a secret value.\n### Fields\n- `cache?` — `bool?` — Whether to cache the value."
+    value: "```wing\nstruct GetSecretValueOptions {\n  cache?: bool;\n}\n```\n---\nOptions when getting a secret value."
   sortText: hh|GetSecretValueOptions
 - label: ObjectMetadata
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ObjectMetadata\n```\n---\nMetadata of a bucket object.\n### Fields\n- `lastModified` — `Datetime` — The time the object was last modified.\n- `size` — `num` — The size of the object in bytes.\n- `contentType?` — `str?` — The content type of the object, if it is known."
+    value: "```wing\nstruct ObjectMetadata {\n  contentType?: str;\n  lastModified: Datetime;\n  size: num;\n}\n```\n---\nMetadata of a bucket object."
   sortText: hh|ObjectMetadata
 - label: OnDeployProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct OnDeployProps extends FunctionProps\n```\n---\nOptions for `OnDeploy`.\n### Fields\n- `env?` — `Map<str>?`\n- `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n- `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct OnDeployProps extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  executeAfter?: Array<Construct>;\n  executeBefore?: Array<Construct>;\n  logRetentionDays?: num;\n  memory?: num;\n  /* ... */\n}\n```\n---\nOptions for `OnDeploy`."
   sortText: hh|OnDeployProps
 - label: QueueProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueProps\n```\n---\nOptions for `Queue`.\n### Fields\n- `retentionPeriod?` — `duration?` — How long a queue retains a message.\n- `timeout?` — `duration?` — How long a queue's consumers have to process a message."
+    value: "```wing\nstruct QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Queue`."
   sortText: hh|QueueProps
 - label: QueueSetConsumerOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps\n```\n---\nOptions for Queue.setConsumer.\n### Fields\n- `batchSize?` — `num?` — The maximum number of messages to send to subscribers at once.\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps {\n  batchSize?: num;\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Queue.setConsumer."
   sortText: hh|QueueSetConsumerOptions
 - label: ScheduleOnTickOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps\n```\n---\nOptions for Schedule.onTick.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Schedule.onTick."
   sortText: hh|ScheduleOnTickOptions
 - label: ScheduleProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleProps\n```\n---\nOptions for `Schedule`.\n### Fields\n- `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n- `rate?` — `duration?` — Trigger events at a periodic rate."
+    value: "```wing\nstruct ScheduleProps {\n  cron?: str;\n  rate?: duration;\n}\n```\n---\nOptions for `Schedule`."
   sortText: hh|ScheduleProps
 - label: SecretProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct SecretProps\n```\n---\nOptions for `Secret`.\n### Fields\n- `name?` — `str?` — The secret's name."
+    value: "```wing\nstruct SecretProps {\n  name?: str;\n}\n```\n---\nOptions for `Secret`."
   sortText: hh|SecretProps
 - label: ServiceOnStartOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps\n```\n---\nOptions for Service.onStart.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Service.onStart."
   sortText: hh|ServiceOnStartOptions
 - label: ServiceProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceProps\n```\n---\nOptions for `Service`.\n### Fields\n- `autoStart?` — `bool?` — Whether the service should start automatically.\n- `env?` — `Map<str>?` — Environment variables to pass to the function."
+    value: "```wing\nstruct ServiceProps {\n  autoStart?: bool;\n  env?: Map<str>;\n}\n```\n---\nOptions for `Service`."
   sortText: hh|ServiceProps
 - label: TopicOnMessageOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps\n```\n---\nOptions for `Topic.onMessage`.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.onMessage`."
   sortText: hh|TopicOnMessageOptions
 - label: TopicProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicProps\n```\n---\nOptions for `Topic`."
+    value: "```wing\nstruct TopicProps {\n  // No public members\n}\n```\n---\nOptions for `Topic`."
   sortText: hh|TopicProps
+- label: TopicSubscribeQueueOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct TopicSubscribeQueueOptions extends QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.subscribeQueue`."
+  sortText: hh|TopicSubscribeQueueOptions
 - label: WebsiteDomainOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteDomainOptions\n```\n---\nOptions for `Website`, and `ReactApp`.\n### Fields\n- `domain?` — `Domain?` — The website's custom domain object."
+    value: "```wing\nstruct WebsiteDomainOptions {\n  domain?: Domain;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteDomainOptions
 - label: WebsiteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteOptions\n```\n---\nBasic options for `Website`.\n### Fields\n- `path` — `str` — Local path to the website's static files, relative to the Wing source file or absolute."
+    value: "```wing\nstruct WebsiteOptions {\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nBasic options for `Website`."
   sortText: hh|WebsiteOptions
 - label: WebsiteProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions\n```\n---\nOptions for `Website`.\n### Fields\n- `path` — `str`\n- `domain?` — `Domain?`"
+    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions {\n  domain?: Domain;\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteProps
 - label: IApiClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiClient\n```\n---\nInflight methods and members of `cloud.Api`."
+    value: "```wing\ninterface IApiClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Api`."
   sortText: ii|IApiClient
 - label: IApiEndpointHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods."
   sortText: ii|IApiEndpointHandler
 - label: IApiEndpointHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandlerClient\n```\n---\nInflight client for `IApiEndpointHandler`.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint."
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nInflight client for `IApiEndpointHandler`."
   sortText: ii|IApiEndpointHandlerClient
 - label: IBucketClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketClient\n```\n---\nInflight interface for `Bucket`.\n### Methods\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\ninterface IBucketClient {\n  inflight copy(): void;\n  inflight delete(): void;\n  inflight exists(): bool;\n  inflight get(): str;\n  inflight getJson(): Json;\n  inflight list(): Array<str>;\n  /* ... */\n}\n```\n---\nInflight interface for `Bucket`."
   sortText: ii|IBucketClient
 - label: IBucketEventHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandler
 - label: IBucketEventHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandlerClient\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired."
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandlerClient
 - label: ICounterClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ICounterClient\n```\n---\nInflight interface for `Counter`.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value."
+    value: "```wing\ninterface ICounterClient {\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nInflight interface for `Counter`."
   sortText: ii|ICounterClient
 - label: IDomainClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IDomainClient\n```\n---\nInflight interface for `Domain`."
+    value: "```wing\ninterface IDomainClient {\n  // No public members\n}\n```\n---\nInflight interface for `Domain`."
   sortText: ii|IDomainClient
+- label: IEndpointClient
+  kind: 8
+  documentation:
+    kind: markdown
+    value: "```wing\ninterface IEndpointClient {\n  // No public members\n}\n```\n---\nInflight interface for `Endpoint`."
+  sortText: ii|IEndpointClient
 - label: IFunctionClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionClient\n```\n---\nInflight interface for `Function`.\n### Methods\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result."
+    value: "```wing\ninterface IFunctionClient {\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nInflight interface for `Function`."
   sortText: ii|IFunctionClient
 - label: IFunctionHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`."
   sortText: ii|IFunctionHandler
 - label: IFunctionHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandlerClient\n```\n---\nInflight client for `IFunctionHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked."
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nInflight client for `IFunctionHandler`."
   sortText: ii|IFunctionHandlerClient
 - label: IOnDeployClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployClient\n```\n---\nInflight interface for `OnDeploy`."
+    value: "```wing\ninterface IOnDeployClient {\n  // No public members\n}\n```\n---\nInflight interface for `OnDeploy`."
   sortText: ii|IOnDeployClient
 - label: IOnDeployHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`."
   sortText: ii|IOnDeployHandler
 - label: IOnDeployHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandlerClient\n```\n---\nInflight client for `IOnDeployHandler`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IOnDeployHandler`."
   sortText: ii|IOnDeployHandlerClient
 - label: IQueueClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueClient\n```\n---\nInflight interface for `Queue`.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue."
+    value: "```wing\ninterface IQueueClient {\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nInflight interface for `Queue`."
   sortText: ii|IQueueClient
 - label: IQueueSetConsumerHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (message: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`."
   sortText: ii|IQueueSetConsumerHandler
 - label: IQueueSetConsumerHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandlerClient\n```\n---\nInflight client for `IQueueSetConsumerHandler`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue."
+    value: "```wing\ninflight (message: str): void\n```\n---\nInflight client for `IQueueSetConsumerHandler`."
   sortText: ii|IQueueSetConsumerHandlerClient
 - label: IScheduleClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleClient\n```\n---\nInflight interface for `Schedule`."
+    value: "```wing\ninterface IScheduleClient {\n  // No public members\n}\n```\n---\nInflight interface for `Schedule`."
   sortText: ii|IScheduleClient
 - label: IScheduleOnTickHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`."
   sortText: ii|IScheduleOnTickHandler
 - label: IScheduleOnTickHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandlerClient\n```\n---\nInflight client for `IScheduleOnTickHandler`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IScheduleOnTickHandler`."
   sortText: ii|IScheduleOnTickHandlerClient
 - label: ISecretClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ISecretClient\n```\n---\nInflight interface for `Secret`.\n### Methods\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\ninterface ISecretClient {\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nInflight interface for `Secret`."
   sortText: ii|ISecretClient
 - label: IServiceClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceClient\n```\n---\nInflight interface for `Service`.\n### Methods\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service."
+    value: "```wing\ninterface IServiceClient {\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nInflight interface for `Service`."
   sortText: ii|IServiceClient
 - label: IServiceHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is started.\n### Methods\n- `handle` — `inflight (): inflight (): void?` — Handler to run when the service starts.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nExecuted when a `cloud.Service` is started."
   sortText: ii|IServiceHandler
 - label: IServiceHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandlerClient\n```\n---\nInflight client for `IServiceHandler`.\n### Methods\n- `handle` — `preflight (): inflight (): void?` — Handler to run when the service starts."
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nInflight client for `IServiceHandler`."
   sortText: ii|IServiceHandlerClient
 - label: IServiceStopHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is stopped.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nExecuted when a `cloud.Service` is stopped."
   sortText: ii|IServiceStopHandler
 - label: IServiceStopHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandlerClient\n```\n---\nInflight client for `IServiceStopHandler`.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IServiceStopHandler`."
   sortText: ii|IServiceStopHandlerClient
 - label: ITopicClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicClient\n```\n---\nInflight interface for `Topic`.\n### Methods\n- `publish` — `inflight (message: str): void` — Publish message to topic."
+    value: "```wing\ninterface ITopicClient {\n  inflight publish(): void;\n}\n```\n---\nInflight interface for `Topic`."
   sortText: ii|ITopicClient
 - label: ITopicOnMessageHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`."
   sortText: ii|ITopicOnMessageHandler
 - label: ITopicOnMessageHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandlerClient\n```\n---\nInflight client for `ITopicOnMessageHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic."
+    value: "```wing\ninflight (event: str): void\n```\n---\nInflight client for `ITopicOnMessageHandler`."
   sortText: ii|ITopicOnMessageHandlerClient
 - label: IWebsite
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsite\n```\n---\nBase interface for a website.\n### Fields\n- `url` — `str` — The website URL."
+    value: "```wing\ninterface IWebsite {\n  url: str;\n}\n```\n---\nBase interface for a website."
   sortText: ii|IWebsite
 - label: IWebsiteClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsiteClient\n```\n---\nInflight methods and members of `cloud.Website`."
+    value: "```wing\ninterface IWebsiteClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Website`."
   sortText: ii|IWebsiteClient
 - label: BucketEventType
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum BucketEventType\n```\n---\nBucket events to subscribe to.\n- `CREATE`\n- `DELETE`\n- `UPDATE`"
+    value: "```wing\nenum BucketEventType {\n  CREATE,\n  DELETE,\n  UPDATE,\n}\n```\n---\nBucket events to subscribe to."
   sortText: jj|BucketEventType
+- label: BucketSignedUrlAction
+  kind: 13
+  documentation:
+    kind: markdown
+    value: "```wing\nenum BucketSignedUrlAction {\n  DOWNLOAD,\n  UPLOAD,\n}\n```\n---\nSpecifies the action permitted by a presigned URL for a bucket."
+  sortText: jj|BucketSignedUrlAction
 - label: HttpMethod
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum HttpMethod\n```\n---\nAllowed HTTP methods for a endpoint.\n- `GET`\n- `HEAD`\n- `POST`\n- `PUT`\n- `DELETE`\n- `CONNECT`\n- `OPTIONS`\n- `PATCH`"
+    value: "```wing\nenum HttpMethod {\n  GET,\n  HEAD,\n  POST,\n  PUT,\n  DELETE,\n  CONNECT,\n  OPTIONS,\n  PATCH,\n}\n```\n---\nAllowed HTTP methods for a endpoint."
   sortText: jj|HttpMethod
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/interface_expansion.snap b/libs/wingc/src/lsp/snapshots/completions/interface_expansion.snap
new file mode 100644
index 00000000000..7d54a51f3a2
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/interface_expansion.snap
@@ -0,0 +1,119 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: "f:"
+  kind: 5
+  detail: "preflight (): void"
+  documentation:
+    kind: markdown
+    value: "```wing\npreflight f: preflight (): void\n```"
+  sortText: "ab|a|f:"
+  insertText: "f: $1"
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: this
+  kind: 6
+  detail: Construct
+  documentation:
+    kind: markdown
+    value: "```wing\npreflight this: Construct\nclass Construct impl IConstruct\n```\n---\nRepresents the building block of the construct graph.\n\n### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct.\n\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+  sortText: bb|this
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: "```wing\nnodeof: preflight (construct: IConstruct): Node\n```\n---\nObtain the tree node of a preflight resource.\n### Parameters\n- `construct` — `IConstruct` — The construct to obtain the tree node of"
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
+- label: unsafeCast
+  kind: 3
+  detail: "(value: any): any"
+  documentation:
+    kind: markdown
+    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+  sortText: cc|unsafeCast
+  insertText: unsafeCast($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
+- label: Json
+  kind: 14
+  sortText: kl|zyJson
+- label: MutJson
+  kind: 14
+  sortText: kl|zyMutJson
+- label: bool
+  kind: 14
+  sortText: kl|zybool
+- label: duration
+  kind: 14
+  sortText: kl|zyduration
+- label: num
+  kind: 14
+  sortText: kl|zynum
+- label: str
+  kind: 14
+  sortText: kl|zystr
+- label: Array<T>
+  kind: 14
+  sortText: kl|zzArray
+  insertText: Array<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: Map<T>
+  kind: 14
+  sortText: kl|zzMap
+  insertText: Map<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: MutArray<T>
+  kind: 14
+  sortText: kl|zzMutArray
+  insertText: MutArray<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: MutMap<T>
+  kind: 14
+  sortText: kl|zzMutMap
+  insertText: MutMap<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: MutSet<T>
+  kind: 14
+  sortText: kl|zzMutSet
+  insertText: MutSet<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: Set<T>
+  kind: 14
+  sortText: kl|zzSet
+  insertText: Set<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: "inflight () => {}"
+  kind: 15
+  sortText: ll|zzinflight
+  filterText: inflight
+  insertText: "inflight ($1) => {$0}"
+  insertTextFormat: 2
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/intrinsics.snap b/libs/wingc/src/lsp/snapshots/completions/intrinsics.snap
new file mode 100644
index 00000000000..bd0ddafda66
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/intrinsics.snap
@@ -0,0 +1,23 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: "@dirname"
+  kind: 6
+  detail: str
+  documentation:
+    kind: markdown
+    value: "Get the normalized absolute path of the current source file's directory.\n\nThe resolved path represents a path during preflight only and is not guaranteed to be valid while inflight.\nIt should primarily be used in preflight or in inflights that are guaranteed to be executed in the same filesystem where preflight executed."
+  sortText: bb|@dirname
+- label: "@inflight"
+  kind: 3
+  detail: "preflight (file: str, options: ImportInflightOptions?): any"
+  documentation:
+    kind: markdown
+    value: "Create an inflight function from the given file.\nThe file must be a JavaScript or TypeScript file with a default export that matches the inferred return where `@inflight` is used.\n\nFor example:\n\n```wing\nbring cloud;\nnew cloud.Function(@inflight(\"./handler.ts\"));\n```\n\n`./handler.ts` Must default export an `async ({}, string?) => string?` function. The first argument is anything lifted into that function, e.g.:\n\n```wing\nlet bucket = new cloud.Bucket();\nnew cloud.Function(@inflight(\"./handler.ts\"), lifts: { bucket: [\"put\"] });\n```"
+  sortText: cc|@inflight
+  insertText: "@inflight($1)"
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/intrinsics_partial.snap b/libs/wingc/src/lsp/snapshots/completions/intrinsics_partial.snap
new file mode 100644
index 00000000000..bd0ddafda66
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/intrinsics_partial.snap
@@ -0,0 +1,23 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: "@dirname"
+  kind: 6
+  detail: str
+  documentation:
+    kind: markdown
+    value: "Get the normalized absolute path of the current source file's directory.\n\nThe resolved path represents a path during preflight only and is not guaranteed to be valid while inflight.\nIt should primarily be used in preflight or in inflights that are guaranteed to be executed in the same filesystem where preflight executed."
+  sortText: bb|@dirname
+- label: "@inflight"
+  kind: 3
+  detail: "preflight (file: str, options: ImportInflightOptions?): any"
+  documentation:
+    kind: markdown
+    value: "Create an inflight function from the given file.\nThe file must be a JavaScript or TypeScript file with a default export that matches the inferred return where `@inflight` is used.\n\nFor example:\n\n```wing\nbring cloud;\nnew cloud.Function(@inflight(\"./handler.ts\"));\n```\n\n`./handler.ts` Must default export an `async ({}, string?) => string?` function. The first argument is anything lifted into that function, e.g.:\n\n```wing\nlet bucket = new cloud.Bucket();\nnew cloud.Function(@inflight(\"./handler.ts\"), lifts: { bucket: [\"put\"] });\n```"
+  sortText: cc|@inflight
+  insertText: "@inflight($1)"
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/json_literal_cast_inner.snap b/libs/wingc/src/lsp/snapshots/completions/json_literal_cast_inner.snap
index 47d293bb9fa..b60862f6acd 100644
--- a/libs/wingc/src/lsp/snapshots/completions/json_literal_cast_inner.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/json_literal_cast_inner.snap
@@ -4,9 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "durationThing:"
   kind: 5
   detail: duration
-  documentation:
-    kind: markdown
-    value: "```wing\ndurationThing: duration\n```"
   sortText: "ab|a|durationThing:"
   insertText: "durationThing: $1"
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/json_statics.snap b/libs/wingc/src/lsp/snapshots/completions/json_statics.snap
index 365b8c2425c..a1ef50a4beb 100644
--- a/libs/wingc/src/lsp/snapshots/completions/json_statics.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/json_statics.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopy: (json: MutJson): Json\n```\n---\nCreates an immutable deep copy of the Json.\n### Parameters\n- `json` — `MutJson` — to copy.\n\n### Returns\nthe immutable copy of the Json"
+    value: "Creates an immutable deep copy of the Json.\n\n#### Returns\nthe immutable copy of the Json"
   sortText: ff|deepCopy
   insertText: deepCopy($1)
   insertTextFormat: 2
@@ -18,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): MutJson"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopyMut: (json: Json): MutJson\n```\n---\nCreates a mutable deep copy of the Json.\n### Parameters\n- `json` — `Json` — to copy.\n\n### Returns\nthe mutable copy of the Json"
+    value: "Creates a mutable deep copy of the Json.\n\n#### Returns\nthe mutable copy of the Json"
   sortText: ff|deepCopyMut
   insertText: deepCopyMut($1)
   insertTextFormat: 2
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson, key: str): void"
   documentation:
     kind: markdown
-    value: "```wing\nstatic delete: (json: MutJson, key: str): void\n```\n---\nDeletes a key in a given Json.\n### Parameters\n- `json` — `MutJson` — to delete key from.\n- `key` — `str` — the key to delete."
+    value: Deletes a key in a given Json.
   sortText: ff|delete
   insertText: delete($1)
   insertTextFormat: 2
@@ -42,31 +42,19 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<JsonEntry>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic entries: (json: Json): Array<JsonEntry>\n```\n---\nReturns the entries from the Json.\n### Parameters\n- `json` — `Json` — map to get the entries from.\n\n### Returns\nthe entries as Array<JsonEntry>"
+    value: "Returns the entries from the Json.\n\n#### Returns\nthe entries as Array<JsonEntry>"
   sortText: ff|entries
   insertText: entries($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
-- label: has
-  kind: 2
-  detail: "(json: Json, key: str): bool"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic has: (json: Json, key: str): bool\n```\n---\nChecks if a Json object has a given key.\n### Parameters\n- `json` — `Json` — The json object to inspect.\n- `key` — `str` — The key to check.\n\n### Returns\nBoolean value corresponding to whether the key exists"
-  sortText: ff|has
-  insertText: has($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
 - label: keys
   kind: 2
   detail: "(json: any): Array<str>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic keys: (json: any): Array<str>\n```\n---\nReturns the keys from the Json.\n### Parameters\n- `json` — `any` — map to get the keys from.\n\n### Returns\nthe keys as Array<String>"
+    value: "Returns the keys from the Json.\n\n#### Returns\nthe keys as Array<String>"
   sortText: ff|keys
   insertText: keys($1)
   insertTextFormat: 2
@@ -78,7 +66,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic parse: (str: str): Json\n```\n---\nParse a string into a Json.\n### Parameters\n- `str` — `str` — to parse as Json.\n\n### Returns\nJson representation of the string"
+    value: "Parse a string into a Json.\n\n#### Returns\nJson representation of the string"
   sortText: ff|parse
   insertText: parse($1)
   insertTextFormat: 2
@@ -90,7 +78,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: any, options: JsonStringifyOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic stringify: (json: any, options: JsonStringifyOptions?): str\n```\n---\nFormats Json as string.\n### Parameters\n- `json` — `any` — to format as string.\n- `...options` — `JsonStringifyOptions?`\n  \n  - `indent` — `num` — Indentation spaces number.\n\n### Returns\nstring representation of the Json"
+    value: "Formats Json as string.\n\n#### Returns\nstring representation of the Json"
   sortText: ff|stringify
   insertText: stringify($1)
   insertTextFormat: 2
@@ -102,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str?): Json?"
   documentation:
     kind: markdown
-    value: "```wing\nstatic tryParse: (str: str?): Json?\n```\n---\nTry to parse a string into a Json.\n### Parameters\n- `str` — `str?` — to parse as Json.\n\n### Returns\nJson representation of the string or undefined if string is not parsable"
+    value: "Try to parse a string into a Json.\n\n#### Returns\nJson representation of the string or undefined if string is not parsable"
   sortText: ff|tryParse
   insertText: tryParse($1)
   insertTextFormat: 2
@@ -114,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<Json>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic values: (json: Json): Array<Json>\n```\n---\nReturns the values from the Json.\n### Parameters\n- `json` — `Json` — map to get the values from.\n\n### Returns\nthe values as Array<Json>"
+    value: "Returns the values from the Json.\n\n#### Returns\nthe values as Array<Json>"
   sortText: ff|values
   insertText: values($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/mut_json_methods.snap b/libs/wingc/src/lsp/snapshots/completions/mut_json_methods.snap
index c26469afc94..a7355c9d3fe 100644
--- a/libs/wingc/src/lsp/snapshots/completions/mut_json_methods.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/mut_json_methods.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): bool"
   documentation:
     kind: markdown
-    value: "```wing\nasBool: (): bool\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|asBool
   insertText: asBool()
 - label: asNum
@@ -14,7 +14,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num"
   documentation:
     kind: markdown
-    value: "```wing\nasNum: (): num\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|asNum
   insertText: asNum()
 - label: asStr
@@ -22,15 +22,27 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\nasStr: (): str\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|asStr
   insertText: asStr()
+- label: delete
+  kind: 2
+  detail: "(key: str): bool"
+  documentation:
+    kind: markdown
+    value: "Removes the specified element from a map.\n\n#### Returns\ntrue if the given key is no longer present"
+  sortText: ff|delete
+  insertText: delete($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: get
   kind: 2
   detail: "(key: str): MutJson"
   documentation:
     kind: markdown
-    value: "```wing\nget: (key: str): MutJson\n```\n---\nReturns the value associated with the specified Json key.\n### Parameters\n- `key` — `str` — The key of the Json property.\n\n### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
+    value: "Returns the value associated with the specified Json key.\n\n#### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
   sortText: ff|get
   insertText: get($1)
   insertTextFormat: 2
@@ -42,19 +54,31 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): MutJson"
   documentation:
     kind: markdown
-    value: "```wing\ngetAt: (index: num): MutJson\n```\n---\nReturns a specified element at a given index from MutJson Array.\n### Parameters\n- `index` — `num` — The index of the element in the MutJson Array to return.\n\n### Returns\nThe element at given index in MutJson Array\n\n*@throws* *index out of bounds error if the given index does not exist for the MutJson Array*"
+    value: "Returns a specified element at a given index from MutJson Array.\n\n#### Returns\nThe element at given index in MutJson Array\n\n*@throws* *index out of bounds error if the given index does not exist for the MutJson Array*"
   sortText: ff|getAt
   insertText: getAt($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: has
+  kind: 2
+  detail: "(key: str): bool"
+  documentation:
+    kind: markdown
+    value: "Checks if a Json object has a given key.\n\n#### Returns\nBoolean value corresponding to whether the key exists"
+  sortText: ff|has
+  insertText: has($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: set
   kind: 2
   detail: "(key: str, value: MutJson): void"
   documentation:
     kind: markdown
-    value: "```wing\nset: (key: str, value: MutJson): void\n```\n---\nAdds or updates an element in MutJson with a specific key and value.\n### Parameters\n- `key` — `str` — The key of the element to add.\n- `value` — `MutJson` — The value of the element to add."
+    value: Adds or updates an element in MutJson with a specific key and value.
   sortText: ff|set
   insertText: set($1)
   insertTextFormat: 2
@@ -66,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num, value: MutJson): void"
   documentation:
     kind: markdown
-    value: "```wing\nsetAt: (index: num, value: MutJson): void\n```\n---\nSet element in MutJson Array with a specific key and value.\n### Parameters\n- `index` — `num`\n- `value` — `MutJson` — The value of the element to set."
+    value: Set element in MutJson Array with a specific key and value.
   sortText: ff|setAt
   insertText: setAt($1)
   insertTextFormat: 2
@@ -78,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): bool?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsBool: (): bool?\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|tryAsBool
   insertText: tryAsBool()
 - label: tryAsNum
@@ -86,7 +110,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsNum: (): num?\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|tryAsNum
   insertText: tryAsNum()
 - label: tryAsStr
@@ -94,7 +118,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsStr: (): str?\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|tryAsStr
   insertText: tryAsStr()
 - label: tryGet
@@ -102,7 +126,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): MutJson?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGet: (key: str): MutJson?\n```\n---\nOptionally returns an specified element from the Json.\n### Parameters\n- `key` — `str` — The key of the element to return.\n\n### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
+    value: "Optionally returns an specified element from the Json.\n\n#### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
   sortText: ff|tryGet
   insertText: tryGet($1)
   insertTextFormat: 2
@@ -114,7 +138,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): MutJson?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGetAt: (index: num): MutJson?\n```\n---\nOptionally returns a specified element at a given index from Json Array.\n### Parameters\n- `index` — `num` — The index of the element in the Json Array to return.\n\n### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
+    value: "Optionally returns a specified element at a given index from Json Array.\n\n#### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
   sortText: ff|tryGetAt
   insertText: tryGetAt($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/namespace_inflight.snap b/libs/wingc/src/lsp/snapshots/completions/namespace_inflight.snap
index ea122b6d0cb..37bfac8859a 100644
--- a/libs/wingc/src/lsp/snapshots/completions/namespace_inflight.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/namespace_inflight.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (url: str, options: RequestOptions?): Response"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight delete: inflight (url: str, options: RequestOptions?): Response\n```\n---\nExecutes a DELETE request to a specified URL and provides a formatted response.\n### Parameters\n- `url` — `str` — The target URL for the DELETE request.\n- `...options` — `RequestOptions?` — Optional parameters for customizing the DELETE request.\n  \n  - `body?` — `str?` — Any body that you want to add to your request.\n  - `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n  - `headers?` — `Map<str>?` — Any headers you want to add to your request.\n  - `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n  - `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n  - `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL.\n\n### Returns\nthe formatted response of the call"
+    value: "Executes a DELETE request to a specified URL and provides a formatted response.\n\n#### Returns\nthe formatted response of the call"
   sortText: ff|delete
   insertText: delete($1)
   insertTextFormat: 2
@@ -18,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (url: str, options: RequestOptions?): Response"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight fetch: inflight (url: str, options: RequestOptions?): Response\n```\n---\nExecutes a HTTP request to a specified URL and provides a formatted response.\n### Parameters\n- `url` — `str` — The target URL for the request.\n- `...options` — `RequestOptions?` — Optional parameters for customizing the HTTP request.\n  \n  - `body?` — `str?` — Any body that you want to add to your request.\n  - `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n  - `headers?` — `Map<str>?` — Any headers you want to add to your request.\n  - `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n  - `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n  - `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL.\n\n### Returns\nthe formatted response of the call\n\n### Remarks\nThis method allows various HTTP methods based on the provided options.\n\n*@throws* *Only throws if there is a networking error*"
+    value: "Executes a HTTP request to a specified URL and provides a formatted response.\n\n#### Returns\nthe formatted response of the call\n\n#### Remarks\nThis method allows various HTTP methods based on the provided options.\n\n*@throws* *Only throws if there is a networking error*"
   sortText: ff|fetch
   insertText: fetch($1)
   insertTextFormat: 2
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (url: Url, options: FormatUrlOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight formatUrl: inflight (url: Url, options: FormatUrlOptions?): str\n```\n---\nSerializes an URL Struct to a String.\n### Parameters\n- `url` — `Url` — The URL Struct to be formatted.\n- `...options` — `FormatUrlOptions?`\n  \n  - `auth?` — `bool?` — Whether the formatted URL should include the username and password.\n  - `fragment?` — `bool?` — Whether the formatted URL should include the fragment identifier.\n  - `search?` — `bool?` — Whether the formatted URL should include the search query.\n  - `unicode?` — `bool?` — Whether the formatted URL should represent Unicode characters for the host component.\n\n### Returns\nA formatted URL String.\n\n*@throws* *Will throw an error if the input URL has invalid fields.*"
+    value: "Serializes an URL Struct to a String.\n\n#### Returns\nA formatted URL String.\n\n*@throws* *Will throw an error if the input URL has invalid fields.*"
   sortText: ff|formatUrl
   insertText: formatUrl($1)
   insertTextFormat: 2
@@ -42,7 +42,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (url: str, options: RequestOptions?): Response"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight get: inflight (url: str, options: RequestOptions?): Response\n```\n---\nExecutes a GET request to a specified URL and provides a formatted response.\n### Parameters\n- `url` — `str` — The target URL for the GET request.\n- `...options` — `RequestOptions?` — Optional parameters for customizing the GET request.\n  \n  - `body?` — `str?` — Any body that you want to add to your request.\n  - `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n  - `headers?` — `Map<str>?` — Any headers you want to add to your request.\n  - `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n  - `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n  - `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL.\n\n### Returns\nthe formatted response of the call"
+    value: "Executes a GET request to a specified URL and provides a formatted response.\n\n#### Returns\nthe formatted response of the call"
   sortText: ff|get
   insertText: get($1)
   insertTextFormat: 2
@@ -54,7 +54,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (urlString: str): Url"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight parseUrl: inflight (urlString: str): Url\n```\n---\nParses the input URL String using WHATWG URL API and returns an URL Struct.\n### Parameters\n- `urlString` — `str` — The URL String to be parsed.\n\n### Returns\nAn URL Struct.\n\n*@throws* *Will throw an error if the input String is not a valid URL.*"
+    value: "Parses the input URL String using WHATWG URL API and returns an URL Struct.\n\n#### Returns\nAn URL Struct.\n\n*@throws* *Will throw an error if the input String is not a valid URL.*"
   sortText: ff|parseUrl
   insertText: parseUrl($1)
   insertTextFormat: 2
@@ -66,7 +66,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (url: str, options: RequestOptions?): Response"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight patch: inflight (url: str, options: RequestOptions?): Response\n```\n---\nExecutes a PATCH request to a specified URL and provides a formatted response.\n### Parameters\n- `url` — `str` — The target URL for the PATCH request.\n- `...options` — `RequestOptions?` — Optional parameters for customizing the PATCH request.\n  \n  - `body?` — `str?` — Any body that you want to add to your request.\n  - `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n  - `headers?` — `Map<str>?` — Any headers you want to add to your request.\n  - `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n  - `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n  - `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL.\n\n### Returns\nthe formatted response of the call"
+    value: "Executes a PATCH request to a specified URL and provides a formatted response.\n\n#### Returns\nthe formatted response of the call"
   sortText: ff|patch
   insertText: patch($1)
   insertTextFormat: 2
@@ -78,7 +78,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (url: str, options: RequestOptions?): Response"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight post: inflight (url: str, options: RequestOptions?): Response\n```\n---\nExecutes a POST request to a specified URL and provides a formatted response.\n### Parameters\n- `url` — `str` — The target URL for the POST request.\n- `...options` — `RequestOptions?` — Optional parameters for customizing the POST request.\n  \n  - `body?` — `str?` — Any body that you want to add to your request.\n  - `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n  - `headers?` — `Map<str>?` — Any headers you want to add to your request.\n  - `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n  - `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n  - `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL.\n\n### Returns\nthe formatted response of the call"
+    value: "Executes a POST request to a specified URL and provides a formatted response.\n\n#### Returns\nthe formatted response of the call"
   sortText: ff|post
   insertText: post($1)
   insertTextFormat: 2
@@ -90,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "inflight (url: str, options: RequestOptions?): Response"
   documentation:
     kind: markdown
-    value: "```wing\nstatic inflight put: inflight (url: str, options: RequestOptions?): Response\n```\n---\nExecutes a PUT request to a specified URL and provides a formatted response.\n### Parameters\n- `url` — `str` — The target URL for the PUT request.\n- `...options` — `RequestOptions?` — ptional parameters for customizing the PUT request.\n  \n  - `body?` — `str?` — Any body that you want to add to your request.\n  - `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n  - `headers?` — `Map<str>?` — Any headers you want to add to your request.\n  - `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n  - `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n  - `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL.\n\n### Returns\nthe formatted response of the call"
+    value: "Executes a PUT request to a specified URL and provides a formatted response.\n\n#### Returns\nthe formatted response of the call"
   sortText: ff|put
   insertText: put($1)
   insertTextFormat: 2
@@ -101,48 +101,48 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Util\n```\n---\nThe Http class is used for calling different HTTP methods and requesting and sending information online,  as well as testing public accessible resources.\n\n### Methods\n- `delete` — `inflight (url: str, options: RequestOptions?): Response` — Executes a DELETE request to a specified URL and provides a formatted response.\n- `fetch` — `inflight (url: str, options: RequestOptions?): Response` — Executes a HTTP request to a specified URL and provides a formatted response.\n- `formatUrl` — `inflight (url: Url, options: FormatUrlOptions?): str` — Serializes an URL Struct to a String.\n- `get` — `inflight (url: str, options: RequestOptions?): Response` — Executes a GET request to a specified URL and provides a formatted response.\n- `parseUrl` — `inflight (urlString: str): Url` — Parses the input URL String using WHATWG URL API and returns an URL Struct.\n- `patch` — `inflight (url: str, options: RequestOptions?): Response` — Executes a PATCH request to a specified URL and provides a formatted response.\n- `post` — `inflight (url: str, options: RequestOptions?): Response` — Executes a POST request to a specified URL and provides a formatted response.\n- `put` — `inflight (url: str, options: RequestOptions?): Response` — Executes a PUT request to a specified URL and provides a formatted response."
+    value: "```wing\nclass Util {\n  static inflight delete(): Response;\n  static inflight fetch(): Response;\n  static inflight formatUrl(): str;\n  static inflight get(): Response;\n  static inflight parseUrl(): Url;\n  static inflight patch(): Response;\n  /* ... */\n}\n```\n---\nThe Http class is used for calling different HTTP methods and requesting and sending information online,  as well as testing public accessible resources."
   sortText: gg|Util
 - label: FormatUrlOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct FormatUrlOptions\n```\n---\nOptions for serializing a WHATWG URL to a String.\n### Fields\n- `auth?` — `bool?` — Whether the formatted URL should include the username and password.\n- `fragment?` — `bool?` — Whether the formatted URL should include the fragment identifier.\n- `search?` — `bool?` — Whether the formatted URL should include the search query.\n- `unicode?` — `bool?` — Whether the formatted URL should represent Unicode characters for the host component."
+    value: "```wing\nstruct FormatUrlOptions {\n  auth?: bool;\n  fragment?: bool;\n  search?: bool;\n  unicode?: bool;\n}\n```\n---\nOptions for serializing a WHATWG URL to a String."
   sortText: hh|FormatUrlOptions
 - label: RequestOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct RequestOptions\n```\n---\nAn object containing any custom settings that you want to apply to the request.\n### Fields\n- `body?` — `str?` — Any body that you want to add to your request.\n- `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n- `headers?` — `Map<str>?` — Any headers you want to add to your request.\n- `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n- `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n- `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL."
+    value: "```wing\nstruct RequestOptions {\n  body?: str;\n  cache?: RequestCache;\n  headers?: Map<str>;\n  method?: HttpMethod;\n  redirect?: RequestRedirect;\n  referrer?: str;\n}\n```\n---\nAn object containing any custom settings that you want to apply to the request."
   sortText: hh|RequestOptions
 - label: Response
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct Response\n```\n---\nThe response to a HTTP request.\n### Fields\n- `body` — `str` — A string representation of the body contents.\n- `headers` — `Map<str>` — The map of header information associated with the response.\n- `ok` — `bool` — A boolean indicating whether the response was successful (status in the range 200 – 299) or not.\n- `status` — `num` — The status code of the response.\n- `url` — `str` — The URL of the response."
+    value: "```wing\nstruct Response {\n  body: str;\n  headers: Map<str>;\n  ok: bool;\n  status: num;\n  url: str;\n}\n```\n---\nThe response to a HTTP request."
   sortText: hh|Response
 - label: Url
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct Url\n```\n---\nAn URL following WHATWG URL Standard.\n### Fields\n- `hash` — `str` — The URL's fragment.\n- `host` — `str` — The URL's host.\n- `hostname` — `str` — The URL's hostname.\n- `href` — `str` — The entire URL.\n- `origin` — `str` — The URL's origin.\n- `password` — `str` — The URL’s password.\n- `pathname` — `str` — The URL's pathname.\n- `port` — `str` — The URL's port.\n- `protocol` — `str` — The URL's protocol.\n- `search` — `str` — The URL's search.\n- `username` — `str` — The URL's username."
+    value: "```wing\nstruct Url {\n  hash: str;\n  host: str;\n  hostname: str;\n  href: str;\n  origin: str;\n  password: str;\n  /* ... */\n}\n```\n---\nAn URL following WHATWG URL Standard."
   sortText: hh|Url
 - label: HttpMethod
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum HttpMethod\n```\n---\nThe request's method.\n- `GET`\n- `PUT`\n- `DELETE`\n- `PATCH`\n- `POST`\n- `OPTIONS`\n- `HEAD`"
+    value: "```wing\nenum HttpMethod {\n  GET,\n  PUT,\n  DELETE,\n  PATCH,\n  POST,\n  OPTIONS,\n  HEAD,\n}\n```\n---\nThe request's method."
   sortText: jj|HttpMethod
 - label: RequestCache
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum RequestCache\n```\n---\nThe cache mode of the request.\n- `DEFAULT`\n- `NO_STORE`\n- `RELOAD`\n- `NO_CACHE`\n- `FORCE_CACHE`\n\n\n### Remarks\nIt controls how a request will interact with the system's HTTP cache."
+    value: "```wing\nenum RequestCache {\n  DEFAULT,\n  NO_STORE,\n  RELOAD,\n  NO_CACHE,\n  FORCE_CACHE,\n}\n```\n---\nThe cache mode of the request.\n\n#### Remarks\nIt controls how a request will interact with the system's HTTP cache."
   sortText: jj|RequestCache
 - label: RequestRedirect
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum RequestRedirect\n```\n---\nThe redirect read-only property that contains the mode for how redirects are handled.\n- `FOLLOW`\n- `ERROR`"
+    value: "```wing\nenum RequestRedirect {\n  MANUAL,\n  FOLLOW,\n  ERROR,\n}\n```\n---\nThe redirect read-only property that contains the mode for how redirects are handled."
   sortText: jj|RequestRedirect
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/namespace_middle_dot.snap b/libs/wingc/src/lsp/snapshots/completions/namespace_middle_dot.snap
index c00d48e21f8..ed3a11ecc17 100644
--- a/libs/wingc/src/lsp/snapshots/completions/namespace_middle_dot.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/namespace_middle_dot.snap
@@ -5,510 +5,570 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Api\n```\n---\nFunctionality shared between all `Api` implementations.\n\n### Initializer\n- `...props` — `ApiProps?`\n  \n  - `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n  - `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes.\n### Fields\n- `node` — `Node` — The tree node.\n- `url` — `str` — The base URL of the API endpoint.\n### Methods\n- `connect` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiConnectOptions?): void` — Add a inflight handler to the api for CONNECT requests on the given path.\n- `delete` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiDeleteOptions?): void` — Add a inflight handler to the api for DELETE requests on the given path.\n- `get` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiGetOptions?): void` — Add a inflight handler to the api for GET requests on the given path.\n- `head` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiHeadOptions?): void` — Add a inflight handler to the api for HEAD requests on the given path.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `options` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiOptionsOptions?): void` — Add a inflight handler to the api for OPTIONS requests on the given path.\n- `patch` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPatchOptions?): void` — Add a inflight handler to the api for PATCH requests on the given path.\n- `post` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPostOptions?): void` — Add a inflight handler to the api for POST requests on the given path.\n- `put` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPutOptions?): void` — Add a inflight handler to the api for PUT requests on the given path.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Api {\n  url: str;\n  connect(): void;\n  delete(): void;\n  get(): void;\n  head(): void;\n  options(): void;\n  /* ... */\n}\n```\n---\nFunctionality shared between all `Api` implementations."
   sortText: gg|Api
 - label: Bucket
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\nclass Bucket {\n  addFile(): void;\n  addObject(): void;\n  onCreate(): void;\n  onDelete(): void;\n  onEvent(): void;\n  onUpdate(): void;\n  /* ... */\n}\n```\n---\nA cloud object store."
   sortText: gg|Bucket
 - label: Counter
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Counter\n```\n---\nA distributed atomic counter.\n\n### Initializer\n- `...props` — `CounterProps?`\n  \n  - `initial?` — `num?` — The initial value of the counter.\n### Fields\n- `initial` — `num` — The initial value of the counter.\n- `node` — `Node` — The tree node.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Counter {\n  initial: num;\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nA distributed atomic counter."
   sortText: gg|Counter
 - label: Domain
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Domain\n```\n---\nA cloud Domain.\n\n### Initializer\n- `...props` — `DomainProps`\n  \n  - `domainName` — `str` — The website's custom domain name.\n### Fields\n- `domainName` — `str` — The domain name.\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Domain {\n  domainName: str;\n}\n```\n---\nA cloud Domain."
   sortText: gg|Domain
+- label: Endpoint
+  kind: 7
+  documentation:
+    kind: markdown
+    value: "```wing\nclass Endpoint {\n  url: str;\n}\n```\n---\nA cloud Endpoint."
+  sortText: gg|Endpoint
 - label: Function
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Function impl IInflightHost\n```\n---\nA function.\n\n### Initializer\n- `handler` — `inflight (event: str): void`\n- `...props` — `FunctionProps?`\n  \n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n  - `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n  - `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n  - `timeout?` — `duration?` — The maximum amount of time the function can run.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Function impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nA function."
   sortText: gg|Function
 - label: OnDeploy
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass OnDeploy\n```\n---\nRun code every time the app is deployed.\n\n### Initializer\n- `handler` — `inflight (): void`\n- `...props` — `OnDeployProps?`\n  \n  - `env?` — `Map<str>?`\n  - `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n  - `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n  - `logRetentionDays?` — `num?`\n  - `memory?` — `num?`\n  - `timeout?` — `duration?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass OnDeploy {\n  // No public members\n}\n```\n---\nRun code every time the app is deployed."
   sortText: gg|OnDeploy
 - label: Queue
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Queue\n```\n---\nA queue.\n\n### Initializer\n- `...props` — `QueueProps?`\n  \n  - `retentionPeriod?` — `duration?` — How long a queue retains a message.\n  - `timeout?` — `duration?` — How long a queue's consumers have to process a message.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue.\n- `setConsumer` — `preflight (handler: inflight (message: str): void, props: QueueSetConsumerOptions?): Function` — Create a function to consume messages from this queue.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Queue {\n  setConsumer(): Function;\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nA queue."
   sortText: gg|Queue
 - label: Schedule
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Schedule\n```\n---\nA schedule.\n\n### Initializer\n- `...props` — `ScheduleProps?`\n  \n  - `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n  - `rate?` — `duration?` — Trigger events at a periodic rate.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onTick` — `preflight (inflight: inflight (): void, props: ScheduleOnTickOptions?): Function` — Create a function that runs when receiving the scheduled event.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Schedule {\n  onTick(): Function;\n}\n```\n---\nA schedule."
   sortText: gg|Schedule
 - label: Secret
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Secret\n```\n---\nA cloud secret.\n\n### Initializer\n- `...props` — `SecretProps?`\n  \n  - `name?` — `str?` — The secret's name.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\nclass Secret {\n  name?: str;\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nA cloud secret."
   sortText: gg|Secret
 - label: Service
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Service impl IInflightHost\n```\n---\nA long-running service.\n\n### Initializer\n- `handler` — `inflight (): inflight (): void?`\n- `...props` — `ServiceProps?`\n  \n  - `autoStart?` — `bool?` — Whether the service should start automatically.\n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Service impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nA long-running service."
   sortText: gg|Service
 - label: Topic
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Topic\n```\n---\nA topic.\n\n### Initializer\n- `...props` — `TopicProps?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onMessage` — `preflight (inflight: inflight (event: str): void, props: TopicOnMessageOptions?): Function` — Run an inflight whenever an message is published to the topic.\n- `publish` — `inflight (message: str): void` — Publish message to topic.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Topic {\n  onMessage(): Function;\n  subscribeQueue(): void;\n  inflight publish(): void;\n}\n```\n---\nA topic."
   sortText: gg|Topic
 - label: Website
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Website impl IWebsite\n```\n---\nA cloud static website.\n\n### Initializer\n- `...props` — `WebsiteProps`\n  \n  - `path` — `str`\n  - `domain?` — `Domain?`\n### Fields\n- `node` — `Node` — The tree node.\n- `path` — `str` — Absolute local path to the website's static files.\n- `url` — `str` — The website's url.\n### Methods\n- `addFile` — `preflight (path: str, data: str, options: AddFileOptions?): str` — Add a file to the website during deployment.\n- `addJson` — `preflight (path: str, data: Json): str` — Add a JSON file with custom values during the website's deployment.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Website impl IWebsite {\n  path: str;\n  url: str;\n  addFile(): str;\n  addJson(): str;\n}\n```\n---\nA cloud static website."
   sortText: gg|Website
 - label: AddFileOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct AddFileOptions\n```\n---\nOptions for adding a file with custom value during the website's deployment.\n### Fields\n- `contentType?` — `str?` — File's content type."
+    value: "```wing\nstruct AddFileOptions {\n  contentType?: str;\n}\n```\n---\nOptions for adding a file with custom value during the website's deployment."
   sortText: hh|AddFileOptions
 - label: ApiConnectOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiConnectOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiConnectOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiConnectOptions
 - label: ApiCorsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiCorsOptions\n```\n---\nCors Options for `Api`.\n### Fields\n- `allowCredentials?` — `bool?` — Whether to allow credentials.\n- `allowHeaders?` — `Array<str>?` — The list of allowed headers.\n- `allowMethods?` — `Array<HttpMethod>?` — The list of allowed methods.\n- `allowOrigin?` — `Array<str>?` — The list of allowed allowOrigin.\n- `exposeHeaders?` — `Array<str>?` — The list of exposed headers.\n- `maxAge?` — `duration?` — How long the browser should cache preflight request results."
+    value: "```wing\nstruct ApiCorsOptions {\n  allowCredentials?: bool;\n  allowHeaders?: Array<str>;\n  allowMethods?: Array<HttpMethod>;\n  allowOrigin?: str;\n  exposeHeaders?: Array<str>;\n  maxAge?: duration;\n}\n```\n---\nCors Options for `Api`."
   sortText: hh|ApiCorsOptions
 - label: ApiDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiDeleteOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiDeleteOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiDeleteOptions
+- label: ApiEndpointOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct ApiEndpointOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nBase options for Api endpoints."
+  sortText: hh|ApiEndpointOptions
 - label: ApiGetOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiGetOptions\n```\n---\nOptions for Api get endpoint."
+    value: "```wing\nstruct ApiGetOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api get endpoint."
   sortText: hh|ApiGetOptions
 - label: ApiHeadOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiHeadOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiHeadOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiHeadOptions
 - label: ApiOptionsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiOptionsOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiOptionsOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiOptionsOptions
 - label: ApiPatchOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPatchOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiPatchOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiPatchOptions
 - label: ApiPostOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPostOptions\n```\n---\nOptions for Api post endpoint."
+    value: "```wing\nstruct ApiPostOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api post endpoint."
   sortText: hh|ApiPostOptions
 - label: ApiProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiProps\n```\n---\nOptions for `Api`.\n### Fields\n- `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n- `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes."
+    value: "```wing\nstruct ApiProps {\n  cors?: bool;\n  corsOptions?: ApiCorsOptions;\n}\n```\n---\nOptions for `Api`."
   sortText: hh|ApiProps
 - label: ApiPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPutOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiPutOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiPutOptions
 - label: ApiRequest
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiRequest\n```\n---\nShape of a request to an inflight handler.\n### Fields\n- `method` — `HttpMethod` — The request's HTTP method.\n- `path` — `str` — The request's path.\n- `query` — `Map<str>` — The request's query string values.\n- `vars` — `Map<str>` — The path variables.\n- `body?` — `str?` — The request's body.\n- `headers?` — `Map<str>?` — The request's headers."
+    value: "```wing\nstruct ApiRequest {\n  body?: str;\n  headers?: Map<str>;\n  method: HttpMethod;\n  path: str;\n  query: Map<str>;\n  vars: Map<str>;\n}\n```\n---\nShape of a request to an inflight handler."
   sortText: hh|ApiRequest
 - label: ApiResponse
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiResponse\n```\n---\nShape of a response from a inflight handler.\n### Fields\n- `status` — `num` — The response's status code.\n- `body?` — `str?` — The response's body.\n- `headers?` — `Map<str>?` — The response's headers."
+    value: "```wing\nstruct ApiResponse {\n  body?: str;\n  headers?: Map<str>;\n  status?: num;\n}\n```\n---\nShape of a response from a inflight handler."
   sortText: hh|ApiResponse
 - label: BucketDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketDeleteOptions\n```\n---\nOptions for `Bucket.delete()`.\n### Fields\n- `mustExist?` — `bool?` — Check failures on the method and retrieve errors if any."
+    value: "```wing\nstruct BucketDeleteOptions {\n  mustExist?: bool;\n}\n```\n---\nOptions for `Bucket.delete()`."
   sortText: hh|BucketDeleteOptions
 - label: BucketEvent
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketEvent\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927.\n### Fields\n- `key` — `str` — The bucket key that triggered the event.\n- `type` — `BucketEventType` — Type of event."
+    value: "```wing\nstruct BucketEvent {\n  key: str;\n  type: BucketEventType;\n}\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927."
   sortText: hh|BucketEvent
+- label: BucketGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.get()`."
+  sortText: hh|BucketGetOptions
 - label: BucketOnCreateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnCreateOptions\n```\n---\n`onCreate` event options."
+    value: "```wing\nstruct BucketOnCreateOptions {\n  // No public members\n}\n```\n---\n`onCreate` event options."
   sortText: hh|BucketOnCreateOptions
 - label: BucketOnDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnDeleteOptions\n```\n---\n`onDelete` event options."
+    value: "```wing\nstruct BucketOnDeleteOptions {\n  // No public members\n}\n```\n---\n`onDelete` event options."
   sortText: hh|BucketOnDeleteOptions
 - label: BucketOnEventOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnEventOptions\n```\n---\n`onEvent` options."
+    value: "```wing\nstruct BucketOnEventOptions {\n  // No public members\n}\n```\n---\n`onEvent` options."
   sortText: hh|BucketOnEventOptions
 - label: BucketOnUpdateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnUpdateOptions\n```\n---\n`onUpdate` event options."
+    value: "```wing\nstruct BucketOnUpdateOptions {\n  // No public members\n}\n```\n---\n`onUpdate` event options."
   sortText: hh|BucketOnUpdateOptions
 - label: BucketProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketProps\n```\n---\nOptions for `Bucket`.\n### Fields\n- `public?` — `bool?` — Whether the bucket's objects should be publicly accessible."
+    value: "```wing\nstruct BucketProps {\n  public?: bool;\n}\n```\n---\nOptions for `Bucket`."
   sortText: hh|BucketProps
 - label: BucketPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketPutOptions\n```\n---\nOptions for `Bucket.put()`.\n### Fields\n- `contentType` — `str` — The HTTP Content-Type of the object."
+    value: "```wing\nstruct BucketPutOptions {\n  contentType: str;\n}\n```\n---\nOptions for `Bucket.put()`."
   sortText: hh|BucketPutOptions
 - label: BucketSignedUrlOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketSignedUrlOptions\n```\n---\nOptions for `Bucket.signedUrl()`.\n### Fields\n- `duration?` — `duration?` — The duration for the signed url to expire."
+    value: "```wing\nstruct BucketSignedUrlOptions {\n  action?: BucketSignedUrlAction;\n  duration?: duration;\n}\n```\n---\nOptions for `Bucket.signedUrl()`."
   sortText: hh|BucketSignedUrlOptions
+- label: BucketTryGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketTryGetOptions extends BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.tryGet()`."
+  sortText: hh|BucketTryGetOptions
+- label: CorsHeaders
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct CorsHeaders {\n  defaultResponse: Map<str>;\n  optionsResponse: Map<str>;\n}\n```\n---\nType definition for CORS headers which includes default and options headers."
+  sortText: hh|CorsHeaders
 - label: CounterProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct CounterProps\n```\n---\nOptions for `Counter`.\n### Fields\n- `initial?` — `num?` — The initial value of the counter."
+    value: "```wing\nstruct CounterProps {\n  initial?: num;\n}\n```\n---\nOptions for `Counter`."
   sortText: hh|CounterProps
+- label: DeadLetterQueueProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct DeadLetterQueueProps {\n  maxDeliveryAttempts?: num;\n  queue: Queue;\n}\n```\n---\nDead letter queue options."
+  sortText: hh|DeadLetterQueueProps
 - label: DomainProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct DomainProps\n```\n---\nOptions for `Domain`.\n### Fields\n- `domainName` — `str` — The website's custom domain name."
+    value: "```wing\nstruct DomainProps {\n  domainName: str;\n}\n```\n---\nOptions for `Domain`."
   sortText: hh|DomainProps
+- label: EndpointProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct EndpointProps {\n  browserSupport?: bool;\n  label?: str;\n}\n```\n---\nOptions for `Endpoint`."
+  sortText: hh|EndpointProps
 - label: FunctionProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct FunctionProps\n```\n---\nOptions for `Function`.\n### Fields\n- `env?` — `Map<str>?` — Environment variables to pass to the function.\n- `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n- `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n- `timeout?` — `duration?` — The maximum amount of time the function can run."
+    value: "```wing\nstruct FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Function`."
   sortText: hh|FunctionProps
 - label: GetSecretValueOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct GetSecretValueOptions\n```\n---\nOptions when getting a secret value.\n### Fields\n- `cache?` — `bool?` — Whether to cache the value."
+    value: "```wing\nstruct GetSecretValueOptions {\n  cache?: bool;\n}\n```\n---\nOptions when getting a secret value."
   sortText: hh|GetSecretValueOptions
 - label: ObjectMetadata
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ObjectMetadata\n```\n---\nMetadata of a bucket object.\n### Fields\n- `lastModified` — `Datetime` — The time the object was last modified.\n- `size` — `num` — The size of the object in bytes.\n- `contentType?` — `str?` — The content type of the object, if it is known."
+    value: "```wing\nstruct ObjectMetadata {\n  contentType?: str;\n  lastModified: Datetime;\n  size: num;\n}\n```\n---\nMetadata of a bucket object."
   sortText: hh|ObjectMetadata
 - label: OnDeployProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct OnDeployProps extends FunctionProps\n```\n---\nOptions for `OnDeploy`.\n### Fields\n- `env?` — `Map<str>?`\n- `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n- `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct OnDeployProps extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  executeAfter?: Array<Construct>;\n  executeBefore?: Array<Construct>;\n  logRetentionDays?: num;\n  memory?: num;\n  /* ... */\n}\n```\n---\nOptions for `OnDeploy`."
   sortText: hh|OnDeployProps
 - label: QueueProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueProps\n```\n---\nOptions for `Queue`.\n### Fields\n- `retentionPeriod?` — `duration?` — How long a queue retains a message.\n- `timeout?` — `duration?` — How long a queue's consumers have to process a message."
+    value: "```wing\nstruct QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Queue`."
   sortText: hh|QueueProps
 - label: QueueSetConsumerOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps\n```\n---\nOptions for Queue.setConsumer.\n### Fields\n- `batchSize?` — `num?` — The maximum number of messages to send to subscribers at once.\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps {\n  batchSize?: num;\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Queue.setConsumer."
   sortText: hh|QueueSetConsumerOptions
 - label: ScheduleOnTickOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps\n```\n---\nOptions for Schedule.onTick.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Schedule.onTick."
   sortText: hh|ScheduleOnTickOptions
 - label: ScheduleProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleProps\n```\n---\nOptions for `Schedule`.\n### Fields\n- `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n- `rate?` — `duration?` — Trigger events at a periodic rate."
+    value: "```wing\nstruct ScheduleProps {\n  cron?: str;\n  rate?: duration;\n}\n```\n---\nOptions for `Schedule`."
   sortText: hh|ScheduleProps
 - label: SecretProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct SecretProps\n```\n---\nOptions for `Secret`.\n### Fields\n- `name?` — `str?` — The secret's name."
+    value: "```wing\nstruct SecretProps {\n  name?: str;\n}\n```\n---\nOptions for `Secret`."
   sortText: hh|SecretProps
 - label: ServiceOnStartOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps\n```\n---\nOptions for Service.onStart.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Service.onStart."
   sortText: hh|ServiceOnStartOptions
 - label: ServiceProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceProps\n```\n---\nOptions for `Service`.\n### Fields\n- `autoStart?` — `bool?` — Whether the service should start automatically.\n- `env?` — `Map<str>?` — Environment variables to pass to the function."
+    value: "```wing\nstruct ServiceProps {\n  autoStart?: bool;\n  env?: Map<str>;\n}\n```\n---\nOptions for `Service`."
   sortText: hh|ServiceProps
 - label: TopicOnMessageOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps\n```\n---\nOptions for `Topic.onMessage`.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.onMessage`."
   sortText: hh|TopicOnMessageOptions
 - label: TopicProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicProps\n```\n---\nOptions for `Topic`."
+    value: "```wing\nstruct TopicProps {\n  // No public members\n}\n```\n---\nOptions for `Topic`."
   sortText: hh|TopicProps
+- label: TopicSubscribeQueueOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct TopicSubscribeQueueOptions extends QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.subscribeQueue`."
+  sortText: hh|TopicSubscribeQueueOptions
 - label: WebsiteDomainOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteDomainOptions\n```\n---\nOptions for `Website`, and `ReactApp`.\n### Fields\n- `domain?` — `Domain?` — The website's custom domain object."
+    value: "```wing\nstruct WebsiteDomainOptions {\n  domain?: Domain;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteDomainOptions
 - label: WebsiteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteOptions\n```\n---\nBasic options for `Website`.\n### Fields\n- `path` — `str` — Local path to the website's static files, relative to the Wing source file or absolute."
+    value: "```wing\nstruct WebsiteOptions {\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nBasic options for `Website`."
   sortText: hh|WebsiteOptions
 - label: WebsiteProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions\n```\n---\nOptions for `Website`.\n### Fields\n- `path` — `str`\n- `domain?` — `Domain?`"
+    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions {\n  domain?: Domain;\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteProps
 - label: IApiClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiClient\n```\n---\nInflight methods and members of `cloud.Api`."
+    value: "```wing\ninterface IApiClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Api`."
   sortText: ii|IApiClient
 - label: IApiEndpointHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods."
   sortText: ii|IApiEndpointHandler
 - label: IApiEndpointHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandlerClient\n```\n---\nInflight client for `IApiEndpointHandler`.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint."
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nInflight client for `IApiEndpointHandler`."
   sortText: ii|IApiEndpointHandlerClient
 - label: IBucketClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketClient\n```\n---\nInflight interface for `Bucket`.\n### Methods\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\ninterface IBucketClient {\n  inflight copy(): void;\n  inflight delete(): void;\n  inflight exists(): bool;\n  inflight get(): str;\n  inflight getJson(): Json;\n  inflight list(): Array<str>;\n  /* ... */\n}\n```\n---\nInflight interface for `Bucket`."
   sortText: ii|IBucketClient
 - label: IBucketEventHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandler
 - label: IBucketEventHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandlerClient\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired."
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandlerClient
 - label: ICounterClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ICounterClient\n```\n---\nInflight interface for `Counter`.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value."
+    value: "```wing\ninterface ICounterClient {\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nInflight interface for `Counter`."
   sortText: ii|ICounterClient
 - label: IDomainClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IDomainClient\n```\n---\nInflight interface for `Domain`."
+    value: "```wing\ninterface IDomainClient {\n  // No public members\n}\n```\n---\nInflight interface for `Domain`."
   sortText: ii|IDomainClient
+- label: IEndpointClient
+  kind: 8
+  documentation:
+    kind: markdown
+    value: "```wing\ninterface IEndpointClient {\n  // No public members\n}\n```\n---\nInflight interface for `Endpoint`."
+  sortText: ii|IEndpointClient
 - label: IFunctionClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionClient\n```\n---\nInflight interface for `Function`.\n### Methods\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result."
+    value: "```wing\ninterface IFunctionClient {\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nInflight interface for `Function`."
   sortText: ii|IFunctionClient
 - label: IFunctionHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`."
   sortText: ii|IFunctionHandler
 - label: IFunctionHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandlerClient\n```\n---\nInflight client for `IFunctionHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked."
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nInflight client for `IFunctionHandler`."
   sortText: ii|IFunctionHandlerClient
 - label: IOnDeployClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployClient\n```\n---\nInflight interface for `OnDeploy`."
+    value: "```wing\ninterface IOnDeployClient {\n  // No public members\n}\n```\n---\nInflight interface for `OnDeploy`."
   sortText: ii|IOnDeployClient
 - label: IOnDeployHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`."
   sortText: ii|IOnDeployHandler
 - label: IOnDeployHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandlerClient\n```\n---\nInflight client for `IOnDeployHandler`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IOnDeployHandler`."
   sortText: ii|IOnDeployHandlerClient
 - label: IQueueClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueClient\n```\n---\nInflight interface for `Queue`.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue."
+    value: "```wing\ninterface IQueueClient {\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nInflight interface for `Queue`."
   sortText: ii|IQueueClient
 - label: IQueueSetConsumerHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (message: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`."
   sortText: ii|IQueueSetConsumerHandler
 - label: IQueueSetConsumerHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandlerClient\n```\n---\nInflight client for `IQueueSetConsumerHandler`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue."
+    value: "```wing\ninflight (message: str): void\n```\n---\nInflight client for `IQueueSetConsumerHandler`."
   sortText: ii|IQueueSetConsumerHandlerClient
 - label: IScheduleClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleClient\n```\n---\nInflight interface for `Schedule`."
+    value: "```wing\ninterface IScheduleClient {\n  // No public members\n}\n```\n---\nInflight interface for `Schedule`."
   sortText: ii|IScheduleClient
 - label: IScheduleOnTickHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`."
   sortText: ii|IScheduleOnTickHandler
 - label: IScheduleOnTickHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandlerClient\n```\n---\nInflight client for `IScheduleOnTickHandler`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IScheduleOnTickHandler`."
   sortText: ii|IScheduleOnTickHandlerClient
 - label: ISecretClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ISecretClient\n```\n---\nInflight interface for `Secret`.\n### Methods\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\ninterface ISecretClient {\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nInflight interface for `Secret`."
   sortText: ii|ISecretClient
 - label: IServiceClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceClient\n```\n---\nInflight interface for `Service`.\n### Methods\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service."
+    value: "```wing\ninterface IServiceClient {\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nInflight interface for `Service`."
   sortText: ii|IServiceClient
 - label: IServiceHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is started.\n### Methods\n- `handle` — `inflight (): inflight (): void?` — Handler to run when the service starts.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nExecuted when a `cloud.Service` is started."
   sortText: ii|IServiceHandler
 - label: IServiceHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandlerClient\n```\n---\nInflight client for `IServiceHandler`.\n### Methods\n- `handle` — `preflight (): inflight (): void?` — Handler to run when the service starts."
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nInflight client for `IServiceHandler`."
   sortText: ii|IServiceHandlerClient
 - label: IServiceStopHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is stopped.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nExecuted when a `cloud.Service` is stopped."
   sortText: ii|IServiceStopHandler
 - label: IServiceStopHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandlerClient\n```\n---\nInflight client for `IServiceStopHandler`.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IServiceStopHandler`."
   sortText: ii|IServiceStopHandlerClient
 - label: ITopicClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicClient\n```\n---\nInflight interface for `Topic`.\n### Methods\n- `publish` — `inflight (message: str): void` — Publish message to topic."
+    value: "```wing\ninterface ITopicClient {\n  inflight publish(): void;\n}\n```\n---\nInflight interface for `Topic`."
   sortText: ii|ITopicClient
 - label: ITopicOnMessageHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`."
   sortText: ii|ITopicOnMessageHandler
 - label: ITopicOnMessageHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandlerClient\n```\n---\nInflight client for `ITopicOnMessageHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic."
+    value: "```wing\ninflight (event: str): void\n```\n---\nInflight client for `ITopicOnMessageHandler`."
   sortText: ii|ITopicOnMessageHandlerClient
 - label: IWebsite
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsite\n```\n---\nBase interface for a website.\n### Fields\n- `url` — `str` — The website URL."
+    value: "```wing\ninterface IWebsite {\n  url: str;\n}\n```\n---\nBase interface for a website."
   sortText: ii|IWebsite
 - label: IWebsiteClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsiteClient\n```\n---\nInflight methods and members of `cloud.Website`."
+    value: "```wing\ninterface IWebsiteClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Website`."
   sortText: ii|IWebsiteClient
 - label: BucketEventType
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum BucketEventType\n```\n---\nBucket events to subscribe to.\n- `CREATE`\n- `DELETE`\n- `UPDATE`"
+    value: "```wing\nenum BucketEventType {\n  CREATE,\n  DELETE,\n  UPDATE,\n}\n```\n---\nBucket events to subscribe to."
   sortText: jj|BucketEventType
+- label: BucketSignedUrlAction
+  kind: 13
+  documentation:
+    kind: markdown
+    value: "```wing\nenum BucketSignedUrlAction {\n  DOWNLOAD,\n  UPLOAD,\n}\n```\n---\nSpecifies the action permitted by a presigned URL for a bucket."
+  sortText: jj|BucketSignedUrlAction
 - label: HttpMethod
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum HttpMethod\n```\n---\nAllowed HTTP methods for a endpoint.\n- `GET`\n- `HEAD`\n- `POST`\n- `PUT`\n- `DELETE`\n- `CONNECT`\n- `OPTIONS`\n- `PATCH`"
+    value: "```wing\nenum HttpMethod {\n  GET,\n  HEAD,\n  POST,\n  PUT,\n  DELETE,\n  CONNECT,\n  OPTIONS,\n  PATCH,\n}\n```\n---\nAllowed HTTP methods for a endpoint."
   sortText: jj|HttpMethod
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/nested_json_literal_cast_inner.snap b/libs/wingc/src/lsp/snapshots/completions/nested_json_literal_cast_inner.snap
index 47d293bb9fa..b60862f6acd 100644
--- a/libs/wingc/src/lsp/snapshots/completions/nested_json_literal_cast_inner.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/nested_json_literal_cast_inner.snap
@@ -4,9 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "durationThing:"
   kind: 5
   detail: duration
-  documentation:
-    kind: markdown
-    value: "```wing\ndurationThing: duration\n```"
   sortText: "ab|a|durationThing:"
   insertText: "durationThing: $1"
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/nested_struct_literal.snap b/libs/wingc/src/lsp/snapshots/completions/nested_struct_literal.snap
index 47d293bb9fa..b60862f6acd 100644
--- a/libs/wingc/src/lsp/snapshots/completions/nested_struct_literal.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/nested_struct_literal.snap
@@ -4,9 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "durationThing:"
   kind: 5
   detail: duration
-  documentation:
-    kind: markdown
-    value: "```wing\ndurationThing: duration\n```"
   sortText: "ab|a|durationThing:"
   insertText: "durationThing: $1"
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/new_expression_nested.snap b/libs/wingc/src/lsp/snapshots/completions/new_expression_nested.snap
index 32ebf078aeb..af97b279799 100644
--- a/libs/wingc/src/lsp/snapshots/completions/new_expression_nested.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/new_expression_nested.snap
@@ -5,7 +5,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Api\n```\n---\nFunctionality shared between all `Api` implementations.\n\n### Initializer\n- `...props` — `ApiProps?`\n  \n  - `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n  - `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes.\n### Fields\n- `node` — `Node` — The tree node.\n- `url` — `str` — The base URL of the API endpoint.\n### Methods\n- `connect` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiConnectOptions?): void` — Add a inflight handler to the api for CONNECT requests on the given path.\n- `delete` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiDeleteOptions?): void` — Add a inflight handler to the api for DELETE requests on the given path.\n- `get` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiGetOptions?): void` — Add a inflight handler to the api for GET requests on the given path.\n- `head` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiHeadOptions?): void` — Add a inflight handler to the api for HEAD requests on the given path.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `options` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiOptionsOptions?): void` — Add a inflight handler to the api for OPTIONS requests on the given path.\n- `patch` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPatchOptions?): void` — Add a inflight handler to the api for PATCH requests on the given path.\n- `post` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPostOptions?): void` — Add a inflight handler to the api for POST requests on the given path.\n- `put` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPutOptions?): void` — Add a inflight handler to the api for PUT requests on the given path.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Api {\n  url: str;\n  connect(): void;\n  delete(): void;\n  get(): void;\n  head(): void;\n  options(): void;\n  /* ... */\n}\n```\n---\nFunctionality shared between all `Api` implementations."
   sortText: gg|Api
   insertText: Api($1)
   insertTextFormat: 2
@@ -16,7 +16,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\nclass Bucket {\n  addFile(): void;\n  addObject(): void;\n  onCreate(): void;\n  onDelete(): void;\n  onEvent(): void;\n  onUpdate(): void;\n  /* ... */\n}\n```\n---\nA cloud object store."
   sortText: gg|Bucket
   insertText: Bucket($1)
   insertTextFormat: 2
@@ -27,7 +27,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Counter\n```\n---\nA distributed atomic counter.\n\n### Initializer\n- `...props` — `CounterProps?`\n  \n  - `initial?` — `num?` — The initial value of the counter.\n### Fields\n- `initial` — `num` — The initial value of the counter.\n- `node` — `Node` — The tree node.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Counter {\n  initial: num;\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nA distributed atomic counter."
   sortText: gg|Counter
   insertText: Counter($1)
   insertTextFormat: 2
@@ -38,18 +38,29 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Domain\n```\n---\nA cloud Domain.\n\n### Initializer\n- `...props` — `DomainProps`\n  \n  - `domainName` — `str` — The website's custom domain name.\n### Fields\n- `domainName` — `str` — The domain name.\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Domain {\n  domainName: str;\n}\n```\n---\nA cloud Domain."
   sortText: gg|Domain
   insertText: Domain($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: Endpoint
+  kind: 7
+  documentation:
+    kind: markdown
+    value: "```wing\nclass Endpoint {\n  url: str;\n}\n```\n---\nA cloud Endpoint."
+  sortText: gg|Endpoint
+  insertText: Endpoint($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: Function
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Function impl IInflightHost\n```\n---\nA function.\n\n### Initializer\n- `handler` — `inflight (event: str): void`\n- `...props` — `FunctionProps?`\n  \n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n  - `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n  - `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n  - `timeout?` — `duration?` — The maximum amount of time the function can run.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Function impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nA function."
   sortText: gg|Function
   insertText: Function($1)
   insertTextFormat: 2
@@ -60,7 +71,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass OnDeploy\n```\n---\nRun code every time the app is deployed.\n\n### Initializer\n- `handler` — `inflight (): void`\n- `...props` — `OnDeployProps?`\n  \n  - `env?` — `Map<str>?`\n  - `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n  - `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n  - `logRetentionDays?` — `num?`\n  - `memory?` — `num?`\n  - `timeout?` — `duration?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass OnDeploy {\n  // No public members\n}\n```\n---\nRun code every time the app is deployed."
   sortText: gg|OnDeploy
   insertText: OnDeploy($1)
   insertTextFormat: 2
@@ -71,7 +82,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Queue\n```\n---\nA queue.\n\n### Initializer\n- `...props` — `QueueProps?`\n  \n  - `retentionPeriod?` — `duration?` — How long a queue retains a message.\n  - `timeout?` — `duration?` — How long a queue's consumers have to process a message.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue.\n- `setConsumer` — `preflight (handler: inflight (message: str): void, props: QueueSetConsumerOptions?): Function` — Create a function to consume messages from this queue.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Queue {\n  setConsumer(): Function;\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nA queue."
   sortText: gg|Queue
   insertText: Queue($1)
   insertTextFormat: 2
@@ -82,7 +93,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Schedule\n```\n---\nA schedule.\n\n### Initializer\n- `...props` — `ScheduleProps?`\n  \n  - `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n  - `rate?` — `duration?` — Trigger events at a periodic rate.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onTick` — `preflight (inflight: inflight (): void, props: ScheduleOnTickOptions?): Function` — Create a function that runs when receiving the scheduled event.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Schedule {\n  onTick(): Function;\n}\n```\n---\nA schedule."
   sortText: gg|Schedule
   insertText: Schedule($1)
   insertTextFormat: 2
@@ -93,7 +104,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Secret\n```\n---\nA cloud secret.\n\n### Initializer\n- `...props` — `SecretProps?`\n  \n  - `name?` — `str?` — The secret's name.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\nclass Secret {\n  name?: str;\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nA cloud secret."
   sortText: gg|Secret
   insertText: Secret($1)
   insertTextFormat: 2
@@ -104,7 +115,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Service impl IInflightHost\n```\n---\nA long-running service.\n\n### Initializer\n- `handler` — `inflight (): inflight (): void?`\n- `...props` — `ServiceProps?`\n  \n  - `autoStart?` — `bool?` — Whether the service should start automatically.\n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Service impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nA long-running service."
   sortText: gg|Service
   insertText: Service($1)
   insertTextFormat: 2
@@ -115,7 +126,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Topic\n```\n---\nA topic.\n\n### Initializer\n- `...props` — `TopicProps?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onMessage` — `preflight (inflight: inflight (event: str): void, props: TopicOnMessageOptions?): Function` — Run an inflight whenever an message is published to the topic.\n- `publish` — `inflight (message: str): void` — Publish message to topic.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Topic {\n  onMessage(): Function;\n  subscribeQueue(): void;\n  inflight publish(): void;\n}\n```\n---\nA topic."
   sortText: gg|Topic
   insertText: Topic($1)
   insertTextFormat: 2
@@ -126,7 +137,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Website impl IWebsite\n```\n---\nA cloud static website.\n\n### Initializer\n- `...props` — `WebsiteProps`\n  \n  - `path` — `str`\n  - `domain?` — `Domain?`\n### Fields\n- `node` — `Node` — The tree node.\n- `path` — `str` — Absolute local path to the website's static files.\n- `url` — `str` — The website's url.\n### Methods\n- `addFile` — `preflight (path: str, data: str, options: AddFileOptions?): str` — Add a file to the website during deployment.\n- `addJson` — `preflight (path: str, data: Json): str` — Add a JSON file with custom values during the website's deployment.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Website impl IWebsite {\n  path: str;\n  url: str;\n  addFile(): str;\n  addJson(): str;\n}\n```\n---\nA cloud static website."
   sortText: gg|Website
   insertText: Website($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/new_expression_partial_namespace.snap b/libs/wingc/src/lsp/snapshots/completions/new_expression_partial_namespace.snap
new file mode 100644
index 00000000000..bc37b6bf184
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/new_expression_partial_namespace.snap
@@ -0,0 +1,10 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: cloud
+  kind: 9
+  documentation:
+    kind: markdown
+    value: "Module `cloud`"
+  sortText: kk|cloud
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap b/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap
index a53b6f738e1..6d8e6e8943f 100644
--- a/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap
@@ -4,16 +4,32 @@ source: libs/wingc/src/lsp/completions.rs
 - label: a
   kind: 6
   detail: num
+  sortText: bb|a
+- label: this
+  kind: 6
+  detail: Construct
   documentation:
     kind: markdown
-    value: "```wing\npreflight a: num\n```"
-  sortText: bb|a
+    value: "Represents the building block of the construct graph.\n\n#### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct."
+  sortText: bb|this
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: unsafeCast
   kind: 3
   detail: "(value: any): any"
   documentation:
     kind: markdown
-    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
   sortText: cc|unsafeCast
   insertText: unsafeCast($1)
   insertTextFormat: 2
@@ -29,12 +45,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/optional_chaining.snap b/libs/wingc/src/lsp/snapshots/completions/optional_chaining.snap
index 9ffa80db684..bed5ec38a5b 100644
--- a/libs/wingc/src/lsp/snapshots/completions/optional_chaining.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/optional_chaining.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): bool"
   documentation:
     kind: markdown
-    value: "```wing\nasBool: (): bool\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|asBool
   insertText: asBool()
 - label: asNum
@@ -14,7 +14,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num"
   documentation:
     kind: markdown
-    value: "```wing\nasNum: (): num\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|asNum
   insertText: asNum()
 - label: asStr
@@ -22,7 +22,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\nasStr: (): str\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|asStr
   insertText: asStr()
 - label: get
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\nget: (key: str): Json\n```\n---\nReturns the value associated with the specified Json key.\n### Parameters\n- `key` — `str` — The key of the Json property.\n\n### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
+    value: "Returns the value associated with the specified Json key.\n\n#### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
   sortText: ff|get
   insertText: get($1)
   insertTextFormat: 2
@@ -42,19 +42,31 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): Json"
   documentation:
     kind: markdown
-    value: "```wing\ngetAt: (index: num): Json\n```\n---\nReturns a specified element at a given index from Json Array.\n### Parameters\n- `index` — `num` — The index of the element in the Json Array to return.\n\n### Returns\nThe element at given index in Json Array\n\n*@throws* *index out of bounds error if the given index does not exist for the Json Array*"
+    value: "Returns a specified element at a given index from Json Array.\n\n#### Returns\nThe element at given index in Json Array\n\n*@throws* *index out of bounds error if the given index does not exist for the Json Array*"
   sortText: ff|getAt
   insertText: getAt($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: has
+  kind: 2
+  detail: "(key: str): bool"
+  documentation:
+    kind: markdown
+    value: "Checks if a Json object has a given key.\n\n#### Returns\nBoolean value corresponding to whether the key exists"
+  sortText: ff|has
+  insertText: has($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: tryAsBool
   kind: 2
   detail: "(): bool?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsBool: (): bool?\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|tryAsBool
   insertText: tryAsBool()
 - label: tryAsNum
@@ -62,7 +74,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsNum: (): num?\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|tryAsNum
   insertText: tryAsNum()
 - label: tryAsStr
@@ -70,7 +82,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsStr: (): str?\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|tryAsStr
   insertText: tryAsStr()
 - label: tryGet
@@ -78,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): Json?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGet: (key: str): Json?\n```\n---\nOptionally returns an specified element from the Json.\n### Parameters\n- `key` — `str` — The key of the element to return.\n\n### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
+    value: "Optionally returns an specified element from the Json.\n\n#### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
   sortText: ff|tryGet
   insertText: tryGet($1)
   insertTextFormat: 2
@@ -90,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): Json?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGetAt: (index: num): Json?\n```\n---\nOptionally returns a specified element at a given index from Json Array.\n### Parameters\n- `index` — `num` — The index of the element in the Json Array to return.\n\n### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
+    value: "Optionally returns a specified element at a given index from Json Array.\n\n#### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
   sortText: ff|tryGetAt
   insertText: tryGetAt($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/optional_chaining_auto.snap b/libs/wingc/src/lsp/snapshots/completions/optional_chaining_auto.snap
index c5129c8a827..aab56141bcd 100644
--- a/libs/wingc/src/lsp/snapshots/completions/optional_chaining_auto.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/optional_chaining_auto.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): bool"
   documentation:
     kind: markdown
-    value: "```wing\nasBool: (): bool\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|asBool
   insertText: asBool()
   additionalTextEdits:
@@ -23,7 +23,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num"
   documentation:
     kind: markdown
-    value: "```wing\nasNum: (): num\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|asNum
   insertText: asNum()
   additionalTextEdits:
@@ -40,7 +40,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\nasStr: (): str\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|asStr
   insertText: asStr()
   additionalTextEdits:
@@ -57,7 +57,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\nget: (key: str): Json\n```\n---\nReturns the value associated with the specified Json key.\n### Parameters\n- `key` — `str` — The key of the Json property.\n\n### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
+    value: "Returns the value associated with the specified Json key.\n\n#### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
   sortText: ff|get
   insertText: get($1)
   insertTextFormat: 2
@@ -78,7 +78,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): Json"
   documentation:
     kind: markdown
-    value: "```wing\ngetAt: (index: num): Json\n```\n---\nReturns a specified element at a given index from Json Array.\n### Parameters\n- `index` — `num` — The index of the element in the Json Array to return.\n\n### Returns\nThe element at given index in Json Array\n\n*@throws* *index out of bounds error if the given index does not exist for the Json Array*"
+    value: "Returns a specified element at a given index from Json Array.\n\n#### Returns\nThe element at given index in Json Array\n\n*@throws* *index out of bounds error if the given index does not exist for the Json Array*"
   sortText: ff|getAt
   insertText: getAt($1)
   insertTextFormat: 2
@@ -94,12 +94,33 @@ source: libs/wingc/src/lsp/completions.rs
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: has
+  kind: 2
+  detail: "(key: str): bool"
+  documentation:
+    kind: markdown
+    value: "Checks if a Json object has a given key.\n\n#### Returns\nBoolean value corresponding to whether the key exists"
+  sortText: ff|has
+  insertText: has($1)
+  insertTextFormat: 2
+  additionalTextEdits:
+    - range:
+        start:
+          line: 2
+          character: 12
+        end:
+          line: 2
+          character: 13
+      newText: "?."
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: tryAsBool
   kind: 2
   detail: "(): bool?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsBool: (): bool?\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|tryAsBool
   insertText: tryAsBool()
   additionalTextEdits:
@@ -116,7 +137,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsNum: (): num?\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|tryAsNum
   insertText: tryAsNum()
   additionalTextEdits:
@@ -133,7 +154,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsStr: (): str?\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|tryAsStr
   insertText: tryAsStr()
   additionalTextEdits:
@@ -150,7 +171,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): Json?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGet: (key: str): Json?\n```\n---\nOptionally returns an specified element from the Json.\n### Parameters\n- `key` — `str` — The key of the element to return.\n\n### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
+    value: "Optionally returns an specified element from the Json.\n\n#### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
   sortText: ff|tryGet
   insertText: tryGet($1)
   insertTextFormat: 2
@@ -171,7 +192,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): Json?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGetAt: (index: num): Json?\n```\n---\nOptionally returns a specified element at a given index from Json Array.\n### Parameters\n- `index` — `num` — The index of the element in the Json Array to return.\n\n### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
+    value: "Optionally returns a specified element at a given index from Json Array.\n\n#### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
   sortText: ff|tryGetAt
   insertText: tryGetAt($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/parentheses_expression.snap b/libs/wingc/src/lsp/snapshots/completions/parentheses_expression.snap
index 9ffa80db684..bed5ec38a5b 100644
--- a/libs/wingc/src/lsp/snapshots/completions/parentheses_expression.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/parentheses_expression.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): bool"
   documentation:
     kind: markdown
-    value: "```wing\nasBool: (): bool\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|asBool
   insertText: asBool()
 - label: asNum
@@ -14,7 +14,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num"
   documentation:
     kind: markdown
-    value: "```wing\nasNum: (): num\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|asNum
   insertText: asNum()
 - label: asStr
@@ -22,7 +22,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\nasStr: (): str\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|asStr
   insertText: asStr()
 - label: get
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\nget: (key: str): Json\n```\n---\nReturns the value associated with the specified Json key.\n### Parameters\n- `key` — `str` — The key of the Json property.\n\n### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
+    value: "Returns the value associated with the specified Json key.\n\n#### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
   sortText: ff|get
   insertText: get($1)
   insertTextFormat: 2
@@ -42,19 +42,31 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): Json"
   documentation:
     kind: markdown
-    value: "```wing\ngetAt: (index: num): Json\n```\n---\nReturns a specified element at a given index from Json Array.\n### Parameters\n- `index` — `num` — The index of the element in the Json Array to return.\n\n### Returns\nThe element at given index in Json Array\n\n*@throws* *index out of bounds error if the given index does not exist for the Json Array*"
+    value: "Returns a specified element at a given index from Json Array.\n\n#### Returns\nThe element at given index in Json Array\n\n*@throws* *index out of bounds error if the given index does not exist for the Json Array*"
   sortText: ff|getAt
   insertText: getAt($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: has
+  kind: 2
+  detail: "(key: str): bool"
+  documentation:
+    kind: markdown
+    value: "Checks if a Json object has a given key.\n\n#### Returns\nBoolean value corresponding to whether the key exists"
+  sortText: ff|has
+  insertText: has($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: tryAsBool
   kind: 2
   detail: "(): bool?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsBool: (): bool?\n```\n---\nConvert Json element to boolean if possible.\n\n### Returns\na boolean."
+    value: "Convert Json element to boolean if possible.\n\n#### Returns\na boolean."
   sortText: ff|tryAsBool
   insertText: tryAsBool()
 - label: tryAsNum
@@ -62,7 +74,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): num?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsNum: (): num?\n```\n---\nConvert Json element to number if possible.\n\n### Returns\na number."
+    value: "Convert Json element to number if possible.\n\n#### Returns\na number."
   sortText: ff|tryAsNum
   insertText: tryAsNum()
 - label: tryAsStr
@@ -70,7 +82,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str?"
   documentation:
     kind: markdown
-    value: "```wing\ntryAsStr: (): str?\n```\n---\nConvert Json element to string if possible.\n\n### Returns\na string."
+    value: "Convert Json element to string if possible.\n\n#### Returns\na string."
   sortText: ff|tryAsStr
   insertText: tryAsStr()
 - label: tryGet
@@ -78,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(key: str): Json?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGet: (key: str): Json?\n```\n---\nOptionally returns an specified element from the Json.\n### Parameters\n- `key` — `str` — The key of the element to return.\n\n### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
+    value: "Optionally returns an specified element from the Json.\n\n#### Returns\nThe element associated with the specified key, or undefined if the key can't be found"
   sortText: ff|tryGet
   insertText: tryGet($1)
   insertTextFormat: 2
@@ -90,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(index: num): Json?"
   documentation:
     kind: markdown
-    value: "```wing\ntryGetAt: (index: num): Json?\n```\n---\nOptionally returns a specified element at a given index from Json Array.\n### Parameters\n- `index` — `num` — The index of the element in the Json Array to return.\n\n### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
+    value: "Optionally returns a specified element at a given index from Json Array.\n\n#### Returns\nThe element at given index in Json Array, or undefined if index is not valid"
   sortText: ff|tryGetAt
   insertText: tryGetAt($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/partial_reference_2.snap b/libs/wingc/src/lsp/snapshots/completions/partial_reference_2.snap
index 8eae7f21956..c038e2cd557 100644
--- a/libs/wingc/src/lsp/snapshots/completions/partial_reference_2.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/partial_reference_2.snap
@@ -4,8 +4,5 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bThing
   kind: 5
   detail: Inner
-  documentation:
-    kind: markdown
-    value: "```wing\nbThing: Inner\nstruct Inner\n```\n---\n### Fields\n- `durationThing` — `duration`"
   sortText: ab|bThing
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/partial_reference_3.snap b/libs/wingc/src/lsp/snapshots/completions/partial_reference_3.snap
index 85d11824bde..7c1b54a677f 100644
--- a/libs/wingc/src/lsp/snapshots/completions/partial_reference_3.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/partial_reference_3.snap
@@ -4,8 +4,5 @@ source: libs/wingc/src/lsp/completions.rs
 - label: durationThing
   kind: 5
   detail: duration
-  documentation:
-    kind: markdown
-    value: "```wing\ndurationThing: duration\n```"
   sortText: ab|durationThing
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/partial_reference_call.snap b/libs/wingc/src/lsp/snapshots/completions/partial_reference_call.snap
index 37ac58eb4ef..0414cb6b862 100644
--- a/libs/wingc/src/lsp/snapshots/completions/partial_reference_call.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/partial_reference_call.snap
@@ -6,14 +6,14 @@ source: libs/wingc/src/lsp/completions.rs
   detail: num
   documentation:
     kind: markdown
-    value: "```wing\nlength: num\n```\n---\nThe length of the string."
+    value: The length of the string.
   sortText: ab|length
 - label: at
   kind: 2
   detail: "(index: num): str"
   documentation:
     kind: markdown
-    value: "```wing\nat: (index: num): str\n```\n---\nReturns the character at the specified index.\n### Parameters\n- `index` — `num` — position of the character.\n\n### Returns\nstring at the specified index."
+    value: "Returns the character at the specified index.\n\n#### Returns\nstring at the specified index."
   sortText: ff|at
   insertText: at($1)
   insertTextFormat: 2
@@ -25,7 +25,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(strN: str): str"
   documentation:
     kind: markdown
-    value: "```wing\nconcat: (strN: str): str\n```\n---\nCombines the text of two (or more) strings and returns a new string.\n### Parameters\n- `strN` — `str` — one or more strings to concatenate to this string.\n\n### Returns\na new combined string."
+    value: "Combines the text of two (or more) strings and returns a new string.\n\n#### Returns\na new combined string."
   sortText: ff|concat
   insertText: concat($1)
   insertTextFormat: 2
@@ -37,7 +37,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(searchString: str): bool"
   documentation:
     kind: markdown
-    value: "```wing\ncontains: (searchString: str): bool\n```\n---\nChecks if string includes substring.\n### Parameters\n- `searchString` — `str` — substring to search for.\n\n### Returns\ntrue if string includes substring."
+    value: "Checks if string includes substring.\n\n#### Returns\ntrue if string includes substring."
   sortText: ff|contains
   insertText: contains($1)
   insertTextFormat: 2
@@ -49,7 +49,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(searchString: str): bool"
   documentation:
     kind: markdown
-    value: "```wing\nendsWith: (searchString: str): bool\n```\n---\nDoes this string end with the given searchString?\n### Parameters\n- `searchString` — `str` — substring to search for.\n\n### Returns\ntrue if string ends with searchString."
+    value: "Does this string end with the given searchString?\n\n#### Returns\ntrue if string ends with searchString."
   sortText: ff|endsWith
   insertText: endsWith($1)
   insertTextFormat: 2
@@ -61,7 +61,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(searchString: str): num"
   documentation:
     kind: markdown
-    value: "```wing\nindexOf: (searchString: str): num\n```\n---\nReturns the index of the first occurrence of searchString found.\n### Parameters\n- `searchString` — `str` — substring to search for.\n\n### Returns\nthe index of the first occurrence of searchString found, or -1 if not found."
+    value: "Returns the index of the first occurrence of searchString found.\n\n#### Returns\nthe index of the first occurrence of searchString found, or -1 if not found."
   sortText: ff|indexOf
   insertText: indexOf($1)
   insertTextFormat: 2
@@ -73,7 +73,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\nlowercase: (): str\n```\n---\nReturns this string in lower case.\n\n### Returns\na new lower case string."
+    value: "Returns this string in lower case.\n\n#### Returns\na new lower case string."
   sortText: ff|lowercase
   insertText: lowercase()
 - label: replace
@@ -81,7 +81,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(searchString: str, replaceString: str): str"
   documentation:
     kind: markdown
-    value: "```wing\nreplace: (searchString: str, replaceString: str): str\n```\n---\nReplaces the first occurence of a substring within a string.\n### Parameters\n- `searchString` — `str` — The substring to search for.\n- `replaceString` — `str` — The replacement substring.\n\n### Returns\nThe modified string after replacement."
+    value: "Replaces the first occurence of a substring within a string.\n\n#### Returns\nThe modified string after replacement."
   sortText: ff|replace
   insertText: replace($1)
   insertTextFormat: 2
@@ -93,7 +93,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(searchString: str, replaceString: str): str"
   documentation:
     kind: markdown
-    value: "```wing\nreplaceAll: (searchString: str, replaceString: str): str\n```\n---\nReplaces all occurrences of a substring within a string.\n### Parameters\n- `searchString` — `str` — The substring to search for.\n- `replaceString` — `str` — The replacement substring.\n\n### Returns\nThe modified string after replacement."
+    value: "Replaces all occurrences of a substring within a string.\n\n#### Returns\nThe modified string after replacement."
   sortText: ff|replaceAll
   insertText: replaceAll($1)
   insertTextFormat: 2
@@ -105,7 +105,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(separator: str): Array<str>"
   documentation:
     kind: markdown
-    value: "```wing\nsplit: (separator: str): Array<str>\n```\n---\nSplits string by separator.\n### Parameters\n- `separator` — `str` — separator to split by.\n\n### Returns\narray of strings."
+    value: "Splits string by separator.\n\n#### Returns\narray of strings."
   sortText: ff|split
   insertText: split($1)
   insertTextFormat: 2
@@ -117,7 +117,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(searchString: str): bool"
   documentation:
     kind: markdown
-    value: "```wing\nstartsWith: (searchString: str): bool\n```\n---\nDoes this string start with the given searchString?\n### Parameters\n- `searchString` — `str` — substring to search for.\n\n### Returns\ntrue if string starts with searchString."
+    value: "Does this string start with the given searchString?\n\n#### Returns\ntrue if string starts with searchString."
   sortText: ff|startsWith
   insertText: startsWith($1)
   insertTextFormat: 2
@@ -129,7 +129,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(indexStart: num, indexEnd: num?): str"
   documentation:
     kind: markdown
-    value: "```wing\nsubstring: (indexStart: num, indexEnd: num?): str\n```\n---\nReturns a string between indexStart, indexEnd.\n### Parameters\n- `indexStart` — `num` — index of the character we slice at.\n- `indexEnd` — `num?` — optional - index of the character we end slicing at.\n\n### Returns\nthe string contained from indexStart to indexEnd."
+    value: "Returns a string between indexStart, indexEnd.\n\n#### Returns\nthe string contained from indexStart to indexEnd."
   sortText: ff|substring
   insertText: substring($1)
   insertTextFormat: 2
@@ -141,7 +141,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\ntrim: (): str\n```\n---\nRemoves white spaces from start and end of this string.\n\n### Returns\na new string with white spaces removed from start and end."
+    value: "Removes white spaces from start and end of this string.\n\n#### Returns\na new string with white spaces removed from start and end."
   sortText: ff|trim
   insertText: trim()
 - label: uppercase
@@ -149,7 +149,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\nuppercase: (): str\n```\n---\nReturns this string in upper case.\n\n### Returns\na new upper case string."
+    value: "Returns this string in upper case.\n\n#### Returns\na new upper case string."
   sortText: ff|uppercase
   insertText: uppercase()
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/partial_type_reference.snap b/libs/wingc/src/lsp/snapshots/completions/partial_type_reference.snap
index a79d3ea2b91..3cca6b8f097 100644
--- a/libs/wingc/src/lsp/snapshots/completions/partial_type_reference.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/partial_type_reference.snap
@@ -4,21 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: func
   kind: 2
   detail: "preflight (): void"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic preflight func: preflight (): void\n```"
   sortText: ff|func
   insertText: func()
-- label: isConstruct
-  kind: 2
-  detail: "preflight (x: any): bool"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic preflight isConstruct: preflight (x: any): bool\n```\n---\nChecks if `x` is a construct.\n### Parameters\n- `x` — `any` — Any object.\n\n### Returns\ntrue if `x` is an object created from a class which extends `Construct`.\n\n### Remarks\nUse this method instead of `instanceof` to properly detect `Construct`\ninstances, even when the construct library is symlinked.\n\nExplanation: in JavaScript, multiple copies of the `constructs` library on\ndisk are seen as independent, completely different libraries. As a\nconsequence, the class `Construct` in each copy of the `constructs` library\nis seen as a different class, and an instance of one class will not test as\n`instanceof` the other class. `npm install` will not create installations\nlike this, but users may manually symlink construct libraries together or\nuse a monorepo tool: in those cases, multiple copies of the `constructs`\nlibrary can be accidentally installed, and `instanceof` will behave\nunpredictably. It is safest to avoid using `instanceof`, and using\nthis type-testing method instead."
-  sortText: ff|isConstruct
-  insertText: isConstruct($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/partial_type_reference_annotation.snap b/libs/wingc/src/lsp/snapshots/completions/partial_type_reference_annotation.snap
index c00d48e21f8..ed3a11ecc17 100644
--- a/libs/wingc/src/lsp/snapshots/completions/partial_type_reference_annotation.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/partial_type_reference_annotation.snap
@@ -5,510 +5,570 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Api\n```\n---\nFunctionality shared between all `Api` implementations.\n\n### Initializer\n- `...props` — `ApiProps?`\n  \n  - `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n  - `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes.\n### Fields\n- `node` — `Node` — The tree node.\n- `url` — `str` — The base URL of the API endpoint.\n### Methods\n- `connect` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiConnectOptions?): void` — Add a inflight handler to the api for CONNECT requests on the given path.\n- `delete` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiDeleteOptions?): void` — Add a inflight handler to the api for DELETE requests on the given path.\n- `get` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiGetOptions?): void` — Add a inflight handler to the api for GET requests on the given path.\n- `head` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiHeadOptions?): void` — Add a inflight handler to the api for HEAD requests on the given path.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `options` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiOptionsOptions?): void` — Add a inflight handler to the api for OPTIONS requests on the given path.\n- `patch` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPatchOptions?): void` — Add a inflight handler to the api for PATCH requests on the given path.\n- `post` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPostOptions?): void` — Add a inflight handler to the api for POST requests on the given path.\n- `put` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPutOptions?): void` — Add a inflight handler to the api for PUT requests on the given path.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Api {\n  url: str;\n  connect(): void;\n  delete(): void;\n  get(): void;\n  head(): void;\n  options(): void;\n  /* ... */\n}\n```\n---\nFunctionality shared between all `Api` implementations."
   sortText: gg|Api
 - label: Bucket
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\nclass Bucket {\n  addFile(): void;\n  addObject(): void;\n  onCreate(): void;\n  onDelete(): void;\n  onEvent(): void;\n  onUpdate(): void;\n  /* ... */\n}\n```\n---\nA cloud object store."
   sortText: gg|Bucket
 - label: Counter
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Counter\n```\n---\nA distributed atomic counter.\n\n### Initializer\n- `...props` — `CounterProps?`\n  \n  - `initial?` — `num?` — The initial value of the counter.\n### Fields\n- `initial` — `num` — The initial value of the counter.\n- `node` — `Node` — The tree node.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Counter {\n  initial: num;\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nA distributed atomic counter."
   sortText: gg|Counter
 - label: Domain
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Domain\n```\n---\nA cloud Domain.\n\n### Initializer\n- `...props` — `DomainProps`\n  \n  - `domainName` — `str` — The website's custom domain name.\n### Fields\n- `domainName` — `str` — The domain name.\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Domain {\n  domainName: str;\n}\n```\n---\nA cloud Domain."
   sortText: gg|Domain
+- label: Endpoint
+  kind: 7
+  documentation:
+    kind: markdown
+    value: "```wing\nclass Endpoint {\n  url: str;\n}\n```\n---\nA cloud Endpoint."
+  sortText: gg|Endpoint
 - label: Function
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Function impl IInflightHost\n```\n---\nA function.\n\n### Initializer\n- `handler` — `inflight (event: str): void`\n- `...props` — `FunctionProps?`\n  \n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n  - `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n  - `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n  - `timeout?` — `duration?` — The maximum amount of time the function can run.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Function impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nA function."
   sortText: gg|Function
 - label: OnDeploy
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass OnDeploy\n```\n---\nRun code every time the app is deployed.\n\n### Initializer\n- `handler` — `inflight (): void`\n- `...props` — `OnDeployProps?`\n  \n  - `env?` — `Map<str>?`\n  - `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n  - `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n  - `logRetentionDays?` — `num?`\n  - `memory?` — `num?`\n  - `timeout?` — `duration?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass OnDeploy {\n  // No public members\n}\n```\n---\nRun code every time the app is deployed."
   sortText: gg|OnDeploy
 - label: Queue
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Queue\n```\n---\nA queue.\n\n### Initializer\n- `...props` — `QueueProps?`\n  \n  - `retentionPeriod?` — `duration?` — How long a queue retains a message.\n  - `timeout?` — `duration?` — How long a queue's consumers have to process a message.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue.\n- `setConsumer` — `preflight (handler: inflight (message: str): void, props: QueueSetConsumerOptions?): Function` — Create a function to consume messages from this queue.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Queue {\n  setConsumer(): Function;\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nA queue."
   sortText: gg|Queue
 - label: Schedule
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Schedule\n```\n---\nA schedule.\n\n### Initializer\n- `...props` — `ScheduleProps?`\n  \n  - `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n  - `rate?` — `duration?` — Trigger events at a periodic rate.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onTick` — `preflight (inflight: inflight (): void, props: ScheduleOnTickOptions?): Function` — Create a function that runs when receiving the scheduled event.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Schedule {\n  onTick(): Function;\n}\n```\n---\nA schedule."
   sortText: gg|Schedule
 - label: Secret
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Secret\n```\n---\nA cloud secret.\n\n### Initializer\n- `...props` — `SecretProps?`\n  \n  - `name?` — `str?` — The secret's name.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\nclass Secret {\n  name?: str;\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nA cloud secret."
   sortText: gg|Secret
 - label: Service
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Service impl IInflightHost\n```\n---\nA long-running service.\n\n### Initializer\n- `handler` — `inflight (): inflight (): void?`\n- `...props` — `ServiceProps?`\n  \n  - `autoStart?` — `bool?` — Whether the service should start automatically.\n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Service impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nA long-running service."
   sortText: gg|Service
 - label: Topic
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Topic\n```\n---\nA topic.\n\n### Initializer\n- `...props` — `TopicProps?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onMessage` — `preflight (inflight: inflight (event: str): void, props: TopicOnMessageOptions?): Function` — Run an inflight whenever an message is published to the topic.\n- `publish` — `inflight (message: str): void` — Publish message to topic.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Topic {\n  onMessage(): Function;\n  subscribeQueue(): void;\n  inflight publish(): void;\n}\n```\n---\nA topic."
   sortText: gg|Topic
 - label: Website
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Website impl IWebsite\n```\n---\nA cloud static website.\n\n### Initializer\n- `...props` — `WebsiteProps`\n  \n  - `path` — `str`\n  - `domain?` — `Domain?`\n### Fields\n- `node` — `Node` — The tree node.\n- `path` — `str` — Absolute local path to the website's static files.\n- `url` — `str` — The website's url.\n### Methods\n- `addFile` — `preflight (path: str, data: str, options: AddFileOptions?): str` — Add a file to the website during deployment.\n- `addJson` — `preflight (path: str, data: Json): str` — Add a JSON file with custom values during the website's deployment.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Website impl IWebsite {\n  path: str;\n  url: str;\n  addFile(): str;\n  addJson(): str;\n}\n```\n---\nA cloud static website."
   sortText: gg|Website
 - label: AddFileOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct AddFileOptions\n```\n---\nOptions for adding a file with custom value during the website's deployment.\n### Fields\n- `contentType?` — `str?` — File's content type."
+    value: "```wing\nstruct AddFileOptions {\n  contentType?: str;\n}\n```\n---\nOptions for adding a file with custom value during the website's deployment."
   sortText: hh|AddFileOptions
 - label: ApiConnectOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiConnectOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiConnectOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiConnectOptions
 - label: ApiCorsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiCorsOptions\n```\n---\nCors Options for `Api`.\n### Fields\n- `allowCredentials?` — `bool?` — Whether to allow credentials.\n- `allowHeaders?` — `Array<str>?` — The list of allowed headers.\n- `allowMethods?` — `Array<HttpMethod>?` — The list of allowed methods.\n- `allowOrigin?` — `Array<str>?` — The list of allowed allowOrigin.\n- `exposeHeaders?` — `Array<str>?` — The list of exposed headers.\n- `maxAge?` — `duration?` — How long the browser should cache preflight request results."
+    value: "```wing\nstruct ApiCorsOptions {\n  allowCredentials?: bool;\n  allowHeaders?: Array<str>;\n  allowMethods?: Array<HttpMethod>;\n  allowOrigin?: str;\n  exposeHeaders?: Array<str>;\n  maxAge?: duration;\n}\n```\n---\nCors Options for `Api`."
   sortText: hh|ApiCorsOptions
 - label: ApiDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiDeleteOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiDeleteOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiDeleteOptions
+- label: ApiEndpointOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct ApiEndpointOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nBase options for Api endpoints."
+  sortText: hh|ApiEndpointOptions
 - label: ApiGetOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiGetOptions\n```\n---\nOptions for Api get endpoint."
+    value: "```wing\nstruct ApiGetOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api get endpoint."
   sortText: hh|ApiGetOptions
 - label: ApiHeadOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiHeadOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiHeadOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiHeadOptions
 - label: ApiOptionsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiOptionsOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiOptionsOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiOptionsOptions
 - label: ApiPatchOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPatchOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiPatchOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiPatchOptions
 - label: ApiPostOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPostOptions\n```\n---\nOptions for Api post endpoint."
+    value: "```wing\nstruct ApiPostOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api post endpoint."
   sortText: hh|ApiPostOptions
 - label: ApiProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiProps\n```\n---\nOptions for `Api`.\n### Fields\n- `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n- `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes."
+    value: "```wing\nstruct ApiProps {\n  cors?: bool;\n  corsOptions?: ApiCorsOptions;\n}\n```\n---\nOptions for `Api`."
   sortText: hh|ApiProps
 - label: ApiPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPutOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiPutOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiPutOptions
 - label: ApiRequest
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiRequest\n```\n---\nShape of a request to an inflight handler.\n### Fields\n- `method` — `HttpMethod` — The request's HTTP method.\n- `path` — `str` — The request's path.\n- `query` — `Map<str>` — The request's query string values.\n- `vars` — `Map<str>` — The path variables.\n- `body?` — `str?` — The request's body.\n- `headers?` — `Map<str>?` — The request's headers."
+    value: "```wing\nstruct ApiRequest {\n  body?: str;\n  headers?: Map<str>;\n  method: HttpMethod;\n  path: str;\n  query: Map<str>;\n  vars: Map<str>;\n}\n```\n---\nShape of a request to an inflight handler."
   sortText: hh|ApiRequest
 - label: ApiResponse
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiResponse\n```\n---\nShape of a response from a inflight handler.\n### Fields\n- `status` — `num` — The response's status code.\n- `body?` — `str?` — The response's body.\n- `headers?` — `Map<str>?` — The response's headers."
+    value: "```wing\nstruct ApiResponse {\n  body?: str;\n  headers?: Map<str>;\n  status?: num;\n}\n```\n---\nShape of a response from a inflight handler."
   sortText: hh|ApiResponse
 - label: BucketDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketDeleteOptions\n```\n---\nOptions for `Bucket.delete()`.\n### Fields\n- `mustExist?` — `bool?` — Check failures on the method and retrieve errors if any."
+    value: "```wing\nstruct BucketDeleteOptions {\n  mustExist?: bool;\n}\n```\n---\nOptions for `Bucket.delete()`."
   sortText: hh|BucketDeleteOptions
 - label: BucketEvent
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketEvent\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927.\n### Fields\n- `key` — `str` — The bucket key that triggered the event.\n- `type` — `BucketEventType` — Type of event."
+    value: "```wing\nstruct BucketEvent {\n  key: str;\n  type: BucketEventType;\n}\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927."
   sortText: hh|BucketEvent
+- label: BucketGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.get()`."
+  sortText: hh|BucketGetOptions
 - label: BucketOnCreateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnCreateOptions\n```\n---\n`onCreate` event options."
+    value: "```wing\nstruct BucketOnCreateOptions {\n  // No public members\n}\n```\n---\n`onCreate` event options."
   sortText: hh|BucketOnCreateOptions
 - label: BucketOnDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnDeleteOptions\n```\n---\n`onDelete` event options."
+    value: "```wing\nstruct BucketOnDeleteOptions {\n  // No public members\n}\n```\n---\n`onDelete` event options."
   sortText: hh|BucketOnDeleteOptions
 - label: BucketOnEventOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnEventOptions\n```\n---\n`onEvent` options."
+    value: "```wing\nstruct BucketOnEventOptions {\n  // No public members\n}\n```\n---\n`onEvent` options."
   sortText: hh|BucketOnEventOptions
 - label: BucketOnUpdateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnUpdateOptions\n```\n---\n`onUpdate` event options."
+    value: "```wing\nstruct BucketOnUpdateOptions {\n  // No public members\n}\n```\n---\n`onUpdate` event options."
   sortText: hh|BucketOnUpdateOptions
 - label: BucketProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketProps\n```\n---\nOptions for `Bucket`.\n### Fields\n- `public?` — `bool?` — Whether the bucket's objects should be publicly accessible."
+    value: "```wing\nstruct BucketProps {\n  public?: bool;\n}\n```\n---\nOptions for `Bucket`."
   sortText: hh|BucketProps
 - label: BucketPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketPutOptions\n```\n---\nOptions for `Bucket.put()`.\n### Fields\n- `contentType` — `str` — The HTTP Content-Type of the object."
+    value: "```wing\nstruct BucketPutOptions {\n  contentType: str;\n}\n```\n---\nOptions for `Bucket.put()`."
   sortText: hh|BucketPutOptions
 - label: BucketSignedUrlOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketSignedUrlOptions\n```\n---\nOptions for `Bucket.signedUrl()`.\n### Fields\n- `duration?` — `duration?` — The duration for the signed url to expire."
+    value: "```wing\nstruct BucketSignedUrlOptions {\n  action?: BucketSignedUrlAction;\n  duration?: duration;\n}\n```\n---\nOptions for `Bucket.signedUrl()`."
   sortText: hh|BucketSignedUrlOptions
+- label: BucketTryGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketTryGetOptions extends BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.tryGet()`."
+  sortText: hh|BucketTryGetOptions
+- label: CorsHeaders
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct CorsHeaders {\n  defaultResponse: Map<str>;\n  optionsResponse: Map<str>;\n}\n```\n---\nType definition for CORS headers which includes default and options headers."
+  sortText: hh|CorsHeaders
 - label: CounterProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct CounterProps\n```\n---\nOptions for `Counter`.\n### Fields\n- `initial?` — `num?` — The initial value of the counter."
+    value: "```wing\nstruct CounterProps {\n  initial?: num;\n}\n```\n---\nOptions for `Counter`."
   sortText: hh|CounterProps
+- label: DeadLetterQueueProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct DeadLetterQueueProps {\n  maxDeliveryAttempts?: num;\n  queue: Queue;\n}\n```\n---\nDead letter queue options."
+  sortText: hh|DeadLetterQueueProps
 - label: DomainProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct DomainProps\n```\n---\nOptions for `Domain`.\n### Fields\n- `domainName` — `str` — The website's custom domain name."
+    value: "```wing\nstruct DomainProps {\n  domainName: str;\n}\n```\n---\nOptions for `Domain`."
   sortText: hh|DomainProps
+- label: EndpointProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct EndpointProps {\n  browserSupport?: bool;\n  label?: str;\n}\n```\n---\nOptions for `Endpoint`."
+  sortText: hh|EndpointProps
 - label: FunctionProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct FunctionProps\n```\n---\nOptions for `Function`.\n### Fields\n- `env?` — `Map<str>?` — Environment variables to pass to the function.\n- `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n- `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n- `timeout?` — `duration?` — The maximum amount of time the function can run."
+    value: "```wing\nstruct FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Function`."
   sortText: hh|FunctionProps
 - label: GetSecretValueOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct GetSecretValueOptions\n```\n---\nOptions when getting a secret value.\n### Fields\n- `cache?` — `bool?` — Whether to cache the value."
+    value: "```wing\nstruct GetSecretValueOptions {\n  cache?: bool;\n}\n```\n---\nOptions when getting a secret value."
   sortText: hh|GetSecretValueOptions
 - label: ObjectMetadata
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ObjectMetadata\n```\n---\nMetadata of a bucket object.\n### Fields\n- `lastModified` — `Datetime` — The time the object was last modified.\n- `size` — `num` — The size of the object in bytes.\n- `contentType?` — `str?` — The content type of the object, if it is known."
+    value: "```wing\nstruct ObjectMetadata {\n  contentType?: str;\n  lastModified: Datetime;\n  size: num;\n}\n```\n---\nMetadata of a bucket object."
   sortText: hh|ObjectMetadata
 - label: OnDeployProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct OnDeployProps extends FunctionProps\n```\n---\nOptions for `OnDeploy`.\n### Fields\n- `env?` — `Map<str>?`\n- `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n- `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct OnDeployProps extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  executeAfter?: Array<Construct>;\n  executeBefore?: Array<Construct>;\n  logRetentionDays?: num;\n  memory?: num;\n  /* ... */\n}\n```\n---\nOptions for `OnDeploy`."
   sortText: hh|OnDeployProps
 - label: QueueProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueProps\n```\n---\nOptions for `Queue`.\n### Fields\n- `retentionPeriod?` — `duration?` — How long a queue retains a message.\n- `timeout?` — `duration?` — How long a queue's consumers have to process a message."
+    value: "```wing\nstruct QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Queue`."
   sortText: hh|QueueProps
 - label: QueueSetConsumerOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps\n```\n---\nOptions for Queue.setConsumer.\n### Fields\n- `batchSize?` — `num?` — The maximum number of messages to send to subscribers at once.\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps {\n  batchSize?: num;\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Queue.setConsumer."
   sortText: hh|QueueSetConsumerOptions
 - label: ScheduleOnTickOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps\n```\n---\nOptions for Schedule.onTick.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Schedule.onTick."
   sortText: hh|ScheduleOnTickOptions
 - label: ScheduleProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleProps\n```\n---\nOptions for `Schedule`.\n### Fields\n- `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n- `rate?` — `duration?` — Trigger events at a periodic rate."
+    value: "```wing\nstruct ScheduleProps {\n  cron?: str;\n  rate?: duration;\n}\n```\n---\nOptions for `Schedule`."
   sortText: hh|ScheduleProps
 - label: SecretProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct SecretProps\n```\n---\nOptions for `Secret`.\n### Fields\n- `name?` — `str?` — The secret's name."
+    value: "```wing\nstruct SecretProps {\n  name?: str;\n}\n```\n---\nOptions for `Secret`."
   sortText: hh|SecretProps
 - label: ServiceOnStartOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps\n```\n---\nOptions for Service.onStart.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Service.onStart."
   sortText: hh|ServiceOnStartOptions
 - label: ServiceProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceProps\n```\n---\nOptions for `Service`.\n### Fields\n- `autoStart?` — `bool?` — Whether the service should start automatically.\n- `env?` — `Map<str>?` — Environment variables to pass to the function."
+    value: "```wing\nstruct ServiceProps {\n  autoStart?: bool;\n  env?: Map<str>;\n}\n```\n---\nOptions for `Service`."
   sortText: hh|ServiceProps
 - label: TopicOnMessageOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps\n```\n---\nOptions for `Topic.onMessage`.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.onMessage`."
   sortText: hh|TopicOnMessageOptions
 - label: TopicProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicProps\n```\n---\nOptions for `Topic`."
+    value: "```wing\nstruct TopicProps {\n  // No public members\n}\n```\n---\nOptions for `Topic`."
   sortText: hh|TopicProps
+- label: TopicSubscribeQueueOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct TopicSubscribeQueueOptions extends QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.subscribeQueue`."
+  sortText: hh|TopicSubscribeQueueOptions
 - label: WebsiteDomainOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteDomainOptions\n```\n---\nOptions for `Website`, and `ReactApp`.\n### Fields\n- `domain?` — `Domain?` — The website's custom domain object."
+    value: "```wing\nstruct WebsiteDomainOptions {\n  domain?: Domain;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteDomainOptions
 - label: WebsiteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteOptions\n```\n---\nBasic options for `Website`.\n### Fields\n- `path` — `str` — Local path to the website's static files, relative to the Wing source file or absolute."
+    value: "```wing\nstruct WebsiteOptions {\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nBasic options for `Website`."
   sortText: hh|WebsiteOptions
 - label: WebsiteProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions\n```\n---\nOptions for `Website`.\n### Fields\n- `path` — `str`\n- `domain?` — `Domain?`"
+    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions {\n  domain?: Domain;\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteProps
 - label: IApiClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiClient\n```\n---\nInflight methods and members of `cloud.Api`."
+    value: "```wing\ninterface IApiClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Api`."
   sortText: ii|IApiClient
 - label: IApiEndpointHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods."
   sortText: ii|IApiEndpointHandler
 - label: IApiEndpointHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandlerClient\n```\n---\nInflight client for `IApiEndpointHandler`.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint."
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nInflight client for `IApiEndpointHandler`."
   sortText: ii|IApiEndpointHandlerClient
 - label: IBucketClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketClient\n```\n---\nInflight interface for `Bucket`.\n### Methods\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\ninterface IBucketClient {\n  inflight copy(): void;\n  inflight delete(): void;\n  inflight exists(): bool;\n  inflight get(): str;\n  inflight getJson(): Json;\n  inflight list(): Array<str>;\n  /* ... */\n}\n```\n---\nInflight interface for `Bucket`."
   sortText: ii|IBucketClient
 - label: IBucketEventHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandler
 - label: IBucketEventHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandlerClient\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired."
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandlerClient
 - label: ICounterClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ICounterClient\n```\n---\nInflight interface for `Counter`.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value."
+    value: "```wing\ninterface ICounterClient {\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nInflight interface for `Counter`."
   sortText: ii|ICounterClient
 - label: IDomainClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IDomainClient\n```\n---\nInflight interface for `Domain`."
+    value: "```wing\ninterface IDomainClient {\n  // No public members\n}\n```\n---\nInflight interface for `Domain`."
   sortText: ii|IDomainClient
+- label: IEndpointClient
+  kind: 8
+  documentation:
+    kind: markdown
+    value: "```wing\ninterface IEndpointClient {\n  // No public members\n}\n```\n---\nInflight interface for `Endpoint`."
+  sortText: ii|IEndpointClient
 - label: IFunctionClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionClient\n```\n---\nInflight interface for `Function`.\n### Methods\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result."
+    value: "```wing\ninterface IFunctionClient {\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nInflight interface for `Function`."
   sortText: ii|IFunctionClient
 - label: IFunctionHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`."
   sortText: ii|IFunctionHandler
 - label: IFunctionHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandlerClient\n```\n---\nInflight client for `IFunctionHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked."
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nInflight client for `IFunctionHandler`."
   sortText: ii|IFunctionHandlerClient
 - label: IOnDeployClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployClient\n```\n---\nInflight interface for `OnDeploy`."
+    value: "```wing\ninterface IOnDeployClient {\n  // No public members\n}\n```\n---\nInflight interface for `OnDeploy`."
   sortText: ii|IOnDeployClient
 - label: IOnDeployHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`."
   sortText: ii|IOnDeployHandler
 - label: IOnDeployHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandlerClient\n```\n---\nInflight client for `IOnDeployHandler`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IOnDeployHandler`."
   sortText: ii|IOnDeployHandlerClient
 - label: IQueueClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueClient\n```\n---\nInflight interface for `Queue`.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue."
+    value: "```wing\ninterface IQueueClient {\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nInflight interface for `Queue`."
   sortText: ii|IQueueClient
 - label: IQueueSetConsumerHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (message: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`."
   sortText: ii|IQueueSetConsumerHandler
 - label: IQueueSetConsumerHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandlerClient\n```\n---\nInflight client for `IQueueSetConsumerHandler`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue."
+    value: "```wing\ninflight (message: str): void\n```\n---\nInflight client for `IQueueSetConsumerHandler`."
   sortText: ii|IQueueSetConsumerHandlerClient
 - label: IScheduleClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleClient\n```\n---\nInflight interface for `Schedule`."
+    value: "```wing\ninterface IScheduleClient {\n  // No public members\n}\n```\n---\nInflight interface for `Schedule`."
   sortText: ii|IScheduleClient
 - label: IScheduleOnTickHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`."
   sortText: ii|IScheduleOnTickHandler
 - label: IScheduleOnTickHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandlerClient\n```\n---\nInflight client for `IScheduleOnTickHandler`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IScheduleOnTickHandler`."
   sortText: ii|IScheduleOnTickHandlerClient
 - label: ISecretClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ISecretClient\n```\n---\nInflight interface for `Secret`.\n### Methods\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\ninterface ISecretClient {\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nInflight interface for `Secret`."
   sortText: ii|ISecretClient
 - label: IServiceClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceClient\n```\n---\nInflight interface for `Service`.\n### Methods\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service."
+    value: "```wing\ninterface IServiceClient {\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nInflight interface for `Service`."
   sortText: ii|IServiceClient
 - label: IServiceHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is started.\n### Methods\n- `handle` — `inflight (): inflight (): void?` — Handler to run when the service starts.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nExecuted when a `cloud.Service` is started."
   sortText: ii|IServiceHandler
 - label: IServiceHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandlerClient\n```\n---\nInflight client for `IServiceHandler`.\n### Methods\n- `handle` — `preflight (): inflight (): void?` — Handler to run when the service starts."
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nInflight client for `IServiceHandler`."
   sortText: ii|IServiceHandlerClient
 - label: IServiceStopHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is stopped.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nExecuted when a `cloud.Service` is stopped."
   sortText: ii|IServiceStopHandler
 - label: IServiceStopHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandlerClient\n```\n---\nInflight client for `IServiceStopHandler`.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IServiceStopHandler`."
   sortText: ii|IServiceStopHandlerClient
 - label: ITopicClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicClient\n```\n---\nInflight interface for `Topic`.\n### Methods\n- `publish` — `inflight (message: str): void` — Publish message to topic."
+    value: "```wing\ninterface ITopicClient {\n  inflight publish(): void;\n}\n```\n---\nInflight interface for `Topic`."
   sortText: ii|ITopicClient
 - label: ITopicOnMessageHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`."
   sortText: ii|ITopicOnMessageHandler
 - label: ITopicOnMessageHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandlerClient\n```\n---\nInflight client for `ITopicOnMessageHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic."
+    value: "```wing\ninflight (event: str): void\n```\n---\nInflight client for `ITopicOnMessageHandler`."
   sortText: ii|ITopicOnMessageHandlerClient
 - label: IWebsite
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsite\n```\n---\nBase interface for a website.\n### Fields\n- `url` — `str` — The website URL."
+    value: "```wing\ninterface IWebsite {\n  url: str;\n}\n```\n---\nBase interface for a website."
   sortText: ii|IWebsite
 - label: IWebsiteClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsiteClient\n```\n---\nInflight methods and members of `cloud.Website`."
+    value: "```wing\ninterface IWebsiteClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Website`."
   sortText: ii|IWebsiteClient
 - label: BucketEventType
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum BucketEventType\n```\n---\nBucket events to subscribe to.\n- `CREATE`\n- `DELETE`\n- `UPDATE`"
+    value: "```wing\nenum BucketEventType {\n  CREATE,\n  DELETE,\n  UPDATE,\n}\n```\n---\nBucket events to subscribe to."
   sortText: jj|BucketEventType
+- label: BucketSignedUrlAction
+  kind: 13
+  documentation:
+    kind: markdown
+    value: "```wing\nenum BucketSignedUrlAction {\n  DOWNLOAD,\n  UPLOAD,\n}\n```\n---\nSpecifies the action permitted by a presigned URL for a bucket."
+  sortText: jj|BucketSignedUrlAction
 - label: HttpMethod
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum HttpMethod\n```\n---\nAllowed HTTP methods for a endpoint.\n- `GET`\n- `HEAD`\n- `POST`\n- `PUT`\n- `DELETE`\n- `CONNECT`\n- `OPTIONS`\n- `PATCH`"
+    value: "```wing\nenum HttpMethod {\n  GET,\n  HEAD,\n  POST,\n  PUT,\n  DELETE,\n  CONNECT,\n  OPTIONS,\n  PATCH,\n}\n```\n---\nAllowed HTTP methods for a endpoint."
   sortText: jj|HttpMethod
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/show_private.snap b/libs/wingc/src/lsp/snapshots/completions/show_private.snap
index 60798aa7f1e..af462eca267 100644
--- a/libs/wingc/src/lsp/snapshots/completions/show_private.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/show_private.snap
@@ -4,35 +4,5 @@ source: libs/wingc/src/lsp/completions.rs
 - label: a
   kind: 5
   detail: num
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight a: num\n```"
   sortText: ab|a
-- label: node
-  kind: 5
-  detail: Node
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight node: Node\nclass Node\n```\n---\nRepresents the construct node in the scope tree.\n\n### Initializer\n- `host` — `Construct`\n- `scope` — `IConstruct`\n- `id` — `str`\n### Fields\n- `PATH_SEP` — `str` — Separator used to delimit construct path components.\n- `addr` — `str` — Returns an opaque tree-unique address for this construct.\n- `children` — `Array<IConstruct>` — All direct children of this construct.\n- `dependencies` — `Array<IConstruct>` — Return all dependencies registered on this node (non-recursive).\n- `id` — `str` — The id of this construct within the current scope.\n- `locked` — `bool` — Returns true if this construct or the scopes in which it is defined are locked.\n- `metadata` — `Array<MetadataEntry>` — An immutable array of metadata objects associated with this construct.\n- `path` — `str` — The full, absolute path of this construct in the tree.\n- `root` — `IConstruct` — Returns the root of the construct tree.\n- `scopes` — `Array<IConstruct>` — All parent scopes of this construct.\n- `defaultChild?` — `IConstruct?` — Returns the child construct that has the id `Default` or `Resource\"`.\n- `scope?` — `IConstruct?` — Returns the scope in which this construct is defined.\n### Methods\n- `addDependency` — `(deps: Array<IDependable>?): void` — Add an ordering dependency on another construct.\n- `addMetadata` — `(type: str, data: any, options: MetadataOptions?): void` — Adds a metadata entry to this construct.\n- `addValidation` — `(validation: IValidation): void` — Adds a validation to this construct.\n- `findAll` — `(order: ConstructOrder?): Array<IConstruct>` — Return this construct and all of its children in the given order.\n- `findChild` — `(id: str): IConstruct` — Return a direct child by id.\n- `getContext` — `(key: str): any` — Retrieves a value from tree context if present. Otherwise, would throw an error.\n- `lock` — `(): void` — Locks this construct from allowing more children to be added.\n- `of` — `(construct: IConstruct): Node` — Returns the node associated with a construct.\n- `setContext` — `(key: str, value: any): void` — This can be used to set contextual values.\n- `tryFindChild` — `(id: str): IConstruct?` — Return a direct child by id, or undefined.\n- `tryGetContext` — `(key: str): any` — Retrieves a value from tree context.\n- `tryRemoveChild` — `(childName: str): bool` — Remove the child with the given name, if present.\n- `validate` — `(): Array<str>` — Validates this construct."
-  sortText: ab|node
-- label: onLift
-  kind: 2
-  detail: "preflight (host: IInflightHost, ops: Array<str>): void"
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight onLift: preflight (host: IInflightHost, ops: Array<str>): void\n```\n---\nA hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n### Parameters\n- `host` — `IInflightHost`\n- `ops` — `Array<str>`\n\n### Remarks\nYou can override this method to perform additional logic like granting\nIAM permissions to the host based on what methods are being called. But\nyou must call `super.bind(host, ops)` to ensure that the resource is\nactually bound."
-  sortText: ff|onLift
-  insertText: onLift($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
-- label: toString
-  kind: 2
-  detail: "preflight (): str"
-  documentation:
-    kind: markdown
-    value: "```wing\npreflight toString: preflight (): str\n```\n---\nReturns a string representation of this construct."
-  sortText: ff|toString
-  insertText: toString()
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/static_completions_after_expression.snap b/libs/wingc/src/lsp/snapshots/completions/static_completions_after_expression.snap
index 365b8c2425c..a1ef50a4beb 100644
--- a/libs/wingc/src/lsp/snapshots/completions/static_completions_after_expression.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/static_completions_after_expression.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopy: (json: MutJson): Json\n```\n---\nCreates an immutable deep copy of the Json.\n### Parameters\n- `json` — `MutJson` — to copy.\n\n### Returns\nthe immutable copy of the Json"
+    value: "Creates an immutable deep copy of the Json.\n\n#### Returns\nthe immutable copy of the Json"
   sortText: ff|deepCopy
   insertText: deepCopy($1)
   insertTextFormat: 2
@@ -18,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): MutJson"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopyMut: (json: Json): MutJson\n```\n---\nCreates a mutable deep copy of the Json.\n### Parameters\n- `json` — `Json` — to copy.\n\n### Returns\nthe mutable copy of the Json"
+    value: "Creates a mutable deep copy of the Json.\n\n#### Returns\nthe mutable copy of the Json"
   sortText: ff|deepCopyMut
   insertText: deepCopyMut($1)
   insertTextFormat: 2
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson, key: str): void"
   documentation:
     kind: markdown
-    value: "```wing\nstatic delete: (json: MutJson, key: str): void\n```\n---\nDeletes a key in a given Json.\n### Parameters\n- `json` — `MutJson` — to delete key from.\n- `key` — `str` — the key to delete."
+    value: Deletes a key in a given Json.
   sortText: ff|delete
   insertText: delete($1)
   insertTextFormat: 2
@@ -42,31 +42,19 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<JsonEntry>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic entries: (json: Json): Array<JsonEntry>\n```\n---\nReturns the entries from the Json.\n### Parameters\n- `json` — `Json` — map to get the entries from.\n\n### Returns\nthe entries as Array<JsonEntry>"
+    value: "Returns the entries from the Json.\n\n#### Returns\nthe entries as Array<JsonEntry>"
   sortText: ff|entries
   insertText: entries($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
-- label: has
-  kind: 2
-  detail: "(json: Json, key: str): bool"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic has: (json: Json, key: str): bool\n```\n---\nChecks if a Json object has a given key.\n### Parameters\n- `json` — `Json` — The json object to inspect.\n- `key` — `str` — The key to check.\n\n### Returns\nBoolean value corresponding to whether the key exists"
-  sortText: ff|has
-  insertText: has($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
 - label: keys
   kind: 2
   detail: "(json: any): Array<str>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic keys: (json: any): Array<str>\n```\n---\nReturns the keys from the Json.\n### Parameters\n- `json` — `any` — map to get the keys from.\n\n### Returns\nthe keys as Array<String>"
+    value: "Returns the keys from the Json.\n\n#### Returns\nthe keys as Array<String>"
   sortText: ff|keys
   insertText: keys($1)
   insertTextFormat: 2
@@ -78,7 +66,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic parse: (str: str): Json\n```\n---\nParse a string into a Json.\n### Parameters\n- `str` — `str` — to parse as Json.\n\n### Returns\nJson representation of the string"
+    value: "Parse a string into a Json.\n\n#### Returns\nJson representation of the string"
   sortText: ff|parse
   insertText: parse($1)
   insertTextFormat: 2
@@ -90,7 +78,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: any, options: JsonStringifyOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic stringify: (json: any, options: JsonStringifyOptions?): str\n```\n---\nFormats Json as string.\n### Parameters\n- `json` — `any` — to format as string.\n- `...options` — `JsonStringifyOptions?`\n  \n  - `indent` — `num` — Indentation spaces number.\n\n### Returns\nstring representation of the Json"
+    value: "Formats Json as string.\n\n#### Returns\nstring representation of the Json"
   sortText: ff|stringify
   insertText: stringify($1)
   insertTextFormat: 2
@@ -102,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str?): Json?"
   documentation:
     kind: markdown
-    value: "```wing\nstatic tryParse: (str: str?): Json?\n```\n---\nTry to parse a string into a Json.\n### Parameters\n- `str` — `str?` — to parse as Json.\n\n### Returns\nJson representation of the string or undefined if string is not parsable"
+    value: "Try to parse a string into a Json.\n\n#### Returns\nJson representation of the string or undefined if string is not parsable"
   sortText: ff|tryParse
   insertText: tryParse($1)
   insertTextFormat: 2
@@ -114,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<Json>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic values: (json: Json): Array<Json>\n```\n---\nReturns the values from the Json.\n### Parameters\n- `json` — `Json` — map to get the values from.\n\n### Returns\nthe values as Array<Json>"
+    value: "Returns the values from the Json.\n\n#### Returns\nthe values as Array<Json>"
   sortText: ff|values
   insertText: values($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression.snap b/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression.snap
index 365b8c2425c..a1ef50a4beb 100644
--- a/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopy: (json: MutJson): Json\n```\n---\nCreates an immutable deep copy of the Json.\n### Parameters\n- `json` — `MutJson` — to copy.\n\n### Returns\nthe immutable copy of the Json"
+    value: "Creates an immutable deep copy of the Json.\n\n#### Returns\nthe immutable copy of the Json"
   sortText: ff|deepCopy
   insertText: deepCopy($1)
   insertTextFormat: 2
@@ -18,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): MutJson"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopyMut: (json: Json): MutJson\n```\n---\nCreates a mutable deep copy of the Json.\n### Parameters\n- `json` — `Json` — to copy.\n\n### Returns\nthe mutable copy of the Json"
+    value: "Creates a mutable deep copy of the Json.\n\n#### Returns\nthe mutable copy of the Json"
   sortText: ff|deepCopyMut
   insertText: deepCopyMut($1)
   insertTextFormat: 2
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson, key: str): void"
   documentation:
     kind: markdown
-    value: "```wing\nstatic delete: (json: MutJson, key: str): void\n```\n---\nDeletes a key in a given Json.\n### Parameters\n- `json` — `MutJson` — to delete key from.\n- `key` — `str` — the key to delete."
+    value: Deletes a key in a given Json.
   sortText: ff|delete
   insertText: delete($1)
   insertTextFormat: 2
@@ -42,31 +42,19 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<JsonEntry>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic entries: (json: Json): Array<JsonEntry>\n```\n---\nReturns the entries from the Json.\n### Parameters\n- `json` — `Json` — map to get the entries from.\n\n### Returns\nthe entries as Array<JsonEntry>"
+    value: "Returns the entries from the Json.\n\n#### Returns\nthe entries as Array<JsonEntry>"
   sortText: ff|entries
   insertText: entries($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
-- label: has
-  kind: 2
-  detail: "(json: Json, key: str): bool"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic has: (json: Json, key: str): bool\n```\n---\nChecks if a Json object has a given key.\n### Parameters\n- `json` — `Json` — The json object to inspect.\n- `key` — `str` — The key to check.\n\n### Returns\nBoolean value corresponding to whether the key exists"
-  sortText: ff|has
-  insertText: has($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
 - label: keys
   kind: 2
   detail: "(json: any): Array<str>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic keys: (json: any): Array<str>\n```\n---\nReturns the keys from the Json.\n### Parameters\n- `json` — `any` — map to get the keys from.\n\n### Returns\nthe keys as Array<String>"
+    value: "Returns the keys from the Json.\n\n#### Returns\nthe keys as Array<String>"
   sortText: ff|keys
   insertText: keys($1)
   insertTextFormat: 2
@@ -78,7 +66,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic parse: (str: str): Json\n```\n---\nParse a string into a Json.\n### Parameters\n- `str` — `str` — to parse as Json.\n\n### Returns\nJson representation of the string"
+    value: "Parse a string into a Json.\n\n#### Returns\nJson representation of the string"
   sortText: ff|parse
   insertText: parse($1)
   insertTextFormat: 2
@@ -90,7 +78,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: any, options: JsonStringifyOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic stringify: (json: any, options: JsonStringifyOptions?): str\n```\n---\nFormats Json as string.\n### Parameters\n- `json` — `any` — to format as string.\n- `...options` — `JsonStringifyOptions?`\n  \n  - `indent` — `num` — Indentation spaces number.\n\n### Returns\nstring representation of the Json"
+    value: "Formats Json as string.\n\n#### Returns\nstring representation of the Json"
   sortText: ff|stringify
   insertText: stringify($1)
   insertTextFormat: 2
@@ -102,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str?): Json?"
   documentation:
     kind: markdown
-    value: "```wing\nstatic tryParse: (str: str?): Json?\n```\n---\nTry to parse a string into a Json.\n### Parameters\n- `str` — `str?` — to parse as Json.\n\n### Returns\nJson representation of the string or undefined if string is not parsable"
+    value: "Try to parse a string into a Json.\n\n#### Returns\nJson representation of the string or undefined if string is not parsable"
   sortText: ff|tryParse
   insertText: tryParse($1)
   insertTextFormat: 2
@@ -114,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<Json>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic values: (json: Json): Array<Json>\n```\n---\nReturns the values from the Json.\n### Parameters\n- `json` — `Json` — map to get the values from.\n\n### Returns\nthe values as Array<Json>"
+    value: "Returns the values from the Json.\n\n#### Returns\nthe values as Array<Json>"
   sortText: ff|values
   insertText: values($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression_statement.snap b/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression_statement.snap
index 365b8c2425c..a1ef50a4beb 100644
--- a/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression_statement.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/static_json_after_expression_statement.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopy: (json: MutJson): Json\n```\n---\nCreates an immutable deep copy of the Json.\n### Parameters\n- `json` — `MutJson` — to copy.\n\n### Returns\nthe immutable copy of the Json"
+    value: "Creates an immutable deep copy of the Json.\n\n#### Returns\nthe immutable copy of the Json"
   sortText: ff|deepCopy
   insertText: deepCopy($1)
   insertTextFormat: 2
@@ -18,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): MutJson"
   documentation:
     kind: markdown
-    value: "```wing\nstatic deepCopyMut: (json: Json): MutJson\n```\n---\nCreates a mutable deep copy of the Json.\n### Parameters\n- `json` — `Json` — to copy.\n\n### Returns\nthe mutable copy of the Json"
+    value: "Creates a mutable deep copy of the Json.\n\n#### Returns\nthe mutable copy of the Json"
   sortText: ff|deepCopyMut
   insertText: deepCopyMut($1)
   insertTextFormat: 2
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: MutJson, key: str): void"
   documentation:
     kind: markdown
-    value: "```wing\nstatic delete: (json: MutJson, key: str): void\n```\n---\nDeletes a key in a given Json.\n### Parameters\n- `json` — `MutJson` — to delete key from.\n- `key` — `str` — the key to delete."
+    value: Deletes a key in a given Json.
   sortText: ff|delete
   insertText: delete($1)
   insertTextFormat: 2
@@ -42,31 +42,19 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<JsonEntry>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic entries: (json: Json): Array<JsonEntry>\n```\n---\nReturns the entries from the Json.\n### Parameters\n- `json` — `Json` — map to get the entries from.\n\n### Returns\nthe entries as Array<JsonEntry>"
+    value: "Returns the entries from the Json.\n\n#### Returns\nthe entries as Array<JsonEntry>"
   sortText: ff|entries
   insertText: entries($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
-- label: has
-  kind: 2
-  detail: "(json: Json, key: str): bool"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic has: (json: Json, key: str): bool\n```\n---\nChecks if a Json object has a given key.\n### Parameters\n- `json` — `Json` — The json object to inspect.\n- `key` — `str` — The key to check.\n\n### Returns\nBoolean value corresponding to whether the key exists"
-  sortText: ff|has
-  insertText: has($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
 - label: keys
   kind: 2
   detail: "(json: any): Array<str>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic keys: (json: any): Array<str>\n```\n---\nReturns the keys from the Json.\n### Parameters\n- `json` — `any` — map to get the keys from.\n\n### Returns\nthe keys as Array<String>"
+    value: "Returns the keys from the Json.\n\n#### Returns\nthe keys as Array<String>"
   sortText: ff|keys
   insertText: keys($1)
   insertTextFormat: 2
@@ -78,7 +66,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str): Json"
   documentation:
     kind: markdown
-    value: "```wing\nstatic parse: (str: str): Json\n```\n---\nParse a string into a Json.\n### Parameters\n- `str` — `str` — to parse as Json.\n\n### Returns\nJson representation of the string"
+    value: "Parse a string into a Json.\n\n#### Returns\nJson representation of the string"
   sortText: ff|parse
   insertText: parse($1)
   insertTextFormat: 2
@@ -90,7 +78,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: any, options: JsonStringifyOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic stringify: (json: any, options: JsonStringifyOptions?): str\n```\n---\nFormats Json as string.\n### Parameters\n- `json` — `any` — to format as string.\n- `...options` — `JsonStringifyOptions?`\n  \n  - `indent` — `num` — Indentation spaces number.\n\n### Returns\nstring representation of the Json"
+    value: "Formats Json as string.\n\n#### Returns\nstring representation of the Json"
   sortText: ff|stringify
   insertText: stringify($1)
   insertTextFormat: 2
@@ -102,7 +90,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(str: str?): Json?"
   documentation:
     kind: markdown
-    value: "```wing\nstatic tryParse: (str: str?): Json?\n```\n---\nTry to parse a string into a Json.\n### Parameters\n- `str` — `str?` — to parse as Json.\n\n### Returns\nJson representation of the string or undefined if string is not parsable"
+    value: "Try to parse a string into a Json.\n\n#### Returns\nJson representation of the string or undefined if string is not parsable"
   sortText: ff|tryParse
   insertText: tryParse($1)
   insertTextFormat: 2
@@ -114,7 +102,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): Array<Json>"
   documentation:
     kind: markdown
-    value: "```wing\nstatic values: (json: Json): Array<Json>\n```\n---\nReturns the values from the Json.\n### Parameters\n- `json` — `Json` — map to get the values from.\n\n### Returns\nthe values as Array<Json>"
+    value: "Returns the values from the Json.\n\n#### Returns\nthe values as Array<Json>"
   sortText: ff|values
   insertText: values($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/static_method_call.snap b/libs/wingc/src/lsp/snapshots/completions/static_method_call.snap
index e9a385a77a7..21fe52dcfe4 100644
--- a/libs/wingc/src/lsp/snapshots/completions/static_method_call.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/static_method_call.snap
@@ -4,21 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: hello
   kind: 2
   detail: "preflight (): void"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic preflight hello: preflight (): void\n```"
   sortText: ff|hello
   insertText: hello()
-- label: isConstruct
-  kind: 2
-  detail: "preflight (x: any): bool"
-  documentation:
-    kind: markdown
-    value: "```wing\nstatic preflight isConstruct: preflight (x: any): bool\n```\n---\nChecks if `x` is a construct.\n### Parameters\n- `x` — `any` — Any object.\n\n### Returns\ntrue if `x` is an object created from a class which extends `Construct`.\n\n### Remarks\nUse this method instead of `instanceof` to properly detect `Construct`\ninstances, even when the construct library is symlinked.\n\nExplanation: in JavaScript, multiple copies of the `constructs` library on\ndisk are seen as independent, completely different libraries. As a\nconsequence, the class `Construct` in each copy of the `constructs` library\nis seen as a different class, and an instance of one class will not test as\n`instanceof` the other class. `npm install` will not create installations\nlike this, but users may manually symlink construct libraries together or\nuse a monorepo tool: in those cases, multiple copies of the `constructs`\nlibrary can be accidentally installed, and `instanceof` will behave\nunpredictably. It is safest to avoid using `instanceof`, and using\nthis type-testing method instead."
-  sortText: ff|isConstruct
-  insertText: isConstruct($1)
-  insertTextFormat: 2
-  command:
-    title: triggerParameterHints
-    command: editor.action.triggerParameterHints
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_arg_expansion_partial.snap b/libs/wingc/src/lsp/snapshots/completions/struct_arg_expansion_partial.snap
new file mode 100644
index 00000000000..9390aaa24d5
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_arg_expansion_partial.snap
@@ -0,0 +1,137 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: "a1:"
+  kind: 5
+  detail: num
+  sortText: "ab|a|a1:"
+  insertText: "a1: $1"
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: "b1:"
+  kind: 5
+  detail: num
+  sortText: "ab|a|b1:"
+  insertText: "b1: $1"
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: this
+  kind: 6
+  detail: Construct
+  documentation:
+    kind: markdown
+    value: "Represents the building block of the construct graph.\n\n#### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct."
+  sortText: bb|this
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
+- label: unsafeCast
+  kind: 3
+  detail: "(value: any): any"
+  documentation:
+    kind: markdown
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
+  sortText: cc|unsafeCast
+  insertText: unsafeCast($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
+- label: S
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct S {\n  a1: num;\n  b1: num;\n}\n```"
+  sortText: hh|S
+- label: Json
+  kind: 14
+  sortText: kl|zyJson
+- label: MutJson
+  kind: 14
+  sortText: kl|zyMutJson
+- label: bool
+  kind: 14
+  sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
+- label: duration
+  kind: 14
+  sortText: kl|zyduration
+- label: num
+  kind: 14
+  sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
+- label: str
+  kind: 14
+  sortText: kl|zystr
+- label: Array<T>
+  kind: 14
+  sortText: kl|zzArray
+  insertText: Array<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: Map<T>
+  kind: 14
+  sortText: kl|zzMap
+  insertText: Map<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: MutArray<T>
+  kind: 14
+  sortText: kl|zzMutArray
+  insertText: MutArray<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: MutMap<T>
+  kind: 14
+  sortText: kl|zzMutMap
+  insertText: MutMap<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: MutSet<T>
+  kind: 14
+  sortText: kl|zzMutSet
+  insertText: MutSet<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: Set<T>
+  kind: 14
+  sortText: kl|zzSet
+  insertText: Set<$1>
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+- label: "inflight () => {}"
+  kind: 15
+  sortText: ll|zzinflight
+  filterText: inflight
+  insertText: "inflight ($1) => {$0}"
+  insertTextFormat: 2
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_completion_in_test.snap b/libs/wingc/src/lsp/snapshots/completions/struct_completion_in_test.snap
index 1b5b2ca57aa..c1ff7ba98b1 100644
--- a/libs/wingc/src/lsp/snapshots/completions/struct_completion_in_test.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_completion_in_test.snap
@@ -4,9 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "ab:"
   kind: 5
   detail: num
-  documentation:
-    kind: markdown
-    value: "```wing\nab: num\n```"
   sortText: "ab|a|ab:"
   insertText: "ab: $1"
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap b/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap
index f7cb5592831..26c043077fe 100644
--- a/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap
@@ -5,7 +5,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct Foo\n```\n---"
+    value: "```wing\nstruct Foo {\n  // No public members\n}\n```"
   sortText: hh|Foo
 - label: cloud
   kind: 9
@@ -22,12 +22,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_literal_all.snap b/libs/wingc/src/lsp/snapshots/completions/struct_literal_all.snap
index 6982f19bd47..ebe2ec76db6 100644
--- a/libs/wingc/src/lsp/snapshots/completions/struct_literal_all.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_literal_all.snap
@@ -4,9 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "x:"
   kind: 5
   detail: str
-  documentation:
-    kind: markdown
-    value: "```wing\nx: str\n```"
   sortText: "ab|a|x:"
   insertText: "x: $1"
   insertTextFormat: 2
@@ -16,9 +13,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "y:"
   kind: 5
   detail: num
-  documentation:
-    kind: markdown
-    value: "```wing\ny: num\n```"
   sortText: "ab|a|y:"
   insertText: "y: $1"
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_literal_empty_nospace.snap b/libs/wingc/src/lsp/snapshots/completions/struct_literal_empty_nospace.snap
new file mode 100644
index 00000000000..f8de678453c
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_literal_empty_nospace.snap
@@ -0,0 +1,13 @@
+---
+source: libs/wingc/src/lsp/completions.rs
+---
+- label: "x:"
+  kind: 5
+  detail: str
+  sortText: "ab|a|x:"
+  insertText: "x: $1"
+  insertTextFormat: 2
+  command:
+    title: triggerCompletion
+    command: editor.action.triggerSuggest
+
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_literal_unused.snap b/libs/wingc/src/lsp/snapshots/completions/struct_literal_unused.snap
index 97885fb9f1d..d7596a184aa 100644
--- a/libs/wingc/src/lsp/snapshots/completions/struct_literal_unused.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_literal_unused.snap
@@ -4,9 +4,6 @@ source: libs/wingc/src/lsp/completions.rs
 - label: "y:"
   kind: 5
   detail: num
-  documentation:
-    kind: markdown
-    value: "```wing\ny: num\n```"
   sortText: "ab|a|y:"
   insertText: "y: $1"
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap b/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap
index 1b9d234b5a5..21a43adb971 100644
--- a/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap
@@ -1,12 +1,31 @@
 ---
 source: libs/wingc/src/lsp/completions.rs
 ---
+- label: this
+  kind: 6
+  detail: Construct
+  documentation:
+    kind: markdown
+    value: "Represents the building block of the construct graph.\n\n#### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct."
+  sortText: bb|this
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
+  documentation:
+    kind: markdown
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: unsafeCast
   kind: 3
   detail: "(value: any): any"
   documentation:
     kind: markdown
-    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
   sortText: cc|unsafeCast
   insertText: unsafeCast($1)
   insertTextFormat: 2
@@ -17,7 +36,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct Foo\n```\n---\n### Fields\n- `x` — `str`\n- `y` — `num`"
+    value: "```wing\nstruct Foo {\n  x: str;\n  y: num;\n}\n```"
   sortText: hh|Foo
 - label: Json
   kind: 14
@@ -28,12 +47,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap b/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap
index b25ee967f11..e7fe01330cb 100644
--- a/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap
@@ -1,19 +1,35 @@
 ---
 source: libs/wingc/src/lsp/completions.rs
 ---
+- label: this
+  kind: 6
+  detail: Construct
+  documentation:
+    kind: markdown
+    value: "Represents the building block of the construct graph.\n\n#### Remarks\nAll constructs besides the root construct must be created within the scope of\nanother construct."
+  sortText: bb|this
 - label: x
   kind: 6
   detail: num
+  sortText: bb|x
+- label: nodeof
+  kind: 3
+  detail: "preflight (construct: IConstruct): Node"
   documentation:
     kind: markdown
-    value: "```wing\npreflight x: num\n```"
-  sortText: bb|x
+    value: Obtain the tree node of a preflight resource.
+  sortText: cc|nodeof
+  insertText: nodeof($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: unsafeCast
   kind: 3
   detail: "(value: any): any"
   documentation:
     kind: markdown
-    value: "```wing\nunsafeCast: (value: any): any\n```\n---\nCasts a value into a different type. This is unsafe and can cause runtime errors\n### Parameters\n- `value` — `any` — The value to cast into a different type"
+    value: Casts a value into a different type. This is unsafe and can cause runtime errors
   sortText: cc|unsafeCast
   insertText: unsafeCast($1)
   insertTextFormat: 2
@@ -24,7 +40,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct S\n```\n---\n### Fields\n- `a` — `num`\n- `b` — `num`"
+    value: "```wing\nstruct S {\n  a: num;\n  b: num;\n}\n```"
   sortText: hh|S
 - label: Json
   kind: 14
@@ -35,12 +51,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_static.snap b/libs/wingc/src/lsp/snapshots/completions/struct_static.snap
index 026e19406aa..ac99a94ba36 100644
--- a/libs/wingc/src/lsp/snapshots/completions/struct_static.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/struct_static.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json, options: JsonValidationOptions?): T1"
   documentation:
     kind: markdown
-    value: "```wing\nstatic fromJson: (json: Json, options: JsonValidationOptions?): T1\n```\n---\nConverts a Json to a Struct.\n### Parameters\n- `json` — `Json`\n- `...options` — `JsonValidationOptions?`\n  \n  - `unsafe?` — `bool?` — Unsafe mode to skip validation (may lead to runtime errors)."
+    value: Converts a Json to a Struct.
   sortText: ff|fromJson
   insertText: fromJson($1)
   insertTextFormat: 2
@@ -18,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: str): T1"
   documentation:
     kind: markdown
-    value: "```wing\nstatic parseJson: (json: str): T1\n```\n---\nParse a Json string into a Struct.\n### Parameters\n- `json` — `str`"
+    value: Parse a Json string into a Struct.
   sortText: ff|parseJson
   insertText: parseJson($1)
   insertTextFormat: 2
@@ -30,7 +30,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(): JsonSchema"
   documentation:
     kind: markdown
-    value: "```wing\nstatic schema: (): JsonSchema\n```\n---\nRetrieve the schema for this struct."
+    value: Retrieve the schema for this struct.
   sortText: ff|schema
   insertText: schema()
 - label: tryFromJson
@@ -38,7 +38,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: Json): T1?"
   documentation:
     kind: markdown
-    value: "```wing\nstatic tryFromJson: (json: Json): T1?\n```\n---\nConverts a Json to a Struct, returning nil if the Json is not valid.\n### Parameters\n- `json` — `Json`"
+    value: "Converts a Json to a Struct, returning nil if the Json is not valid."
   sortText: ff|tryFromJson
   insertText: tryFromJson($1)
   insertTextFormat: 2
@@ -50,7 +50,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(json: str?): T1?"
   documentation:
     kind: markdown
-    value: "```wing\nstatic tryParseJson: (json: str?): T1?\n```\n---\nParse a Json string into a Struct, returning nil if the Json is not valid.\n### Parameters\n- `json` — `str?`"
+    value: "Parse a Json string into a Struct, returning nil if the Json is not valid."
   sortText: ff|tryParseJson
   insertText: tryParseJson($1)
   insertTextFormat: 2
diff --git a/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap b/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap
index 41ebbe87e15..067f932d154 100644
--- a/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap
@@ -5,7 +5,7 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct Foo\n```\n---"
+    value: "```wing\nstruct Foo {\n  // No public members\n}\n```"
   sortText: hh|Foo
 - label: Json
   kind: 14
@@ -16,12 +16,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap b/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap
index 8d625512ae6..4d715c940df 100644
--- a/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap
@@ -10,12 +10,18 @@ source: libs/wingc/src/lsp/completions.rs
 - label: bool
   kind: 14
   sortText: kl|zybool
+- label: datetime
+  kind: 14
+  sortText: kl|zydatetime
 - label: duration
   kind: 14
   sortText: kl|zyduration
 - label: num
   kind: 14
   sortText: kl|zynum
+- label: regex
+  kind: 14
+  sortText: kl|zyregex
 - label: str
   kind: 14
   sortText: kl|zystr
diff --git a/libs/wingc/src/lsp/snapshots/completions/util_static_methods.snap b/libs/wingc/src/lsp/snapshots/completions/util_static_methods.snap
index b9e76ff0093..6ab3c704c6b 100644
--- a/libs/wingc/src/lsp/snapshots/completions/util_static_methods.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/util_static_methods.snap
@@ -6,7 +6,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(stringToDecode: str, url: bool?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic base64Decode: (stringToDecode: str, url: bool?): str\n```\n---\nConverts a string from base64 to UTF-8.\n### Parameters\n- `stringToDecode` — `str` — base64 string to decode.\n- `url` — `bool?` — If `true`, the source is expected to be a URL-safe base64 string.\n\n### Returns\nThe UTF-8 string."
+    value: "Converts a string from base64 to UTF-8.\n\n#### Returns\nThe UTF-8 string."
   sortText: ff|base64Decode
   insertText: base64Decode($1)
   insertTextFormat: 2
@@ -18,7 +18,7 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(stringToEncode: str, url: bool?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic base64Encode: (stringToEncode: str, url: bool?): str\n```\n---\nConverts a string from UTF-8 to base64.\n### Parameters\n- `stringToEncode` — `str` — The name of the UTF-8 string to encode.\n- `url` — `bool?` — If `true`, a URL-safe base64 string is returned.\n\n### Returns\nThe base64 string."
+    value: "Converts a string from UTF-8 to base64.\n\n#### Returns\nThe base64 string."
   sortText: ff|base64Encode
   insertText: base64Encode($1)
   insertTextFormat: 2
@@ -30,85 +30,189 @@ source: libs/wingc/src/lsp/completions.rs
   detail: "(name: str): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic env: (name: str): str\n```\n---\nReturns the value of an environment variable.\n### Parameters\n- `name` — `str` — The name of the environment variable.\n\n### Remarks\nThrows if not found or empty."
+    value: "Returns the value of an environment variable.\n\n#### Remarks\nThrows if not found or empty."
   sortText: ff|env
   insertText: env($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: exec
+  kind: 2
+  detail: "(program: str, args: Array<str>, opts: ExecOptions?): Output"
+  documentation:
+    kind: markdown
+    value: "Execute a program with the given arguments, wait for it to finish, and return its outputs.\n\n#### Returns\nA struct containing `stdout`, `stderr` and exit `status` of the executed program."
+  sortText: ff|exec
+  insertText: exec($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: nanoid
   kind: 2
   detail: "(options: NanoidOptions?): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic nanoid: (options: NanoidOptions?): str\n```\n---\nGenerates a unique ID using the nanoid library.\n### Parameters\n- `...options` — `NanoidOptions?` — - Optional options object for generating the ID.\n  \n  - `alphabet?` — `str?` — Characters that make up the alphabet to generate the ID, limited to 256 characters or fewer.\n  - `size?` — `num?` — Size of ID.\n\n### Remarks\n# @link https://github.com/ai/nanoid"
+    value: "Generates a unique ID using the nanoid library.\n\n#### Remarks\n#\n\n*@link* *https://github.com/ai/nanoid*"
   sortText: ff|nanoid
   insertText: nanoid($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: os
+  kind: 2
+  detail: "(): str"
+  documentation:
+    kind: markdown
+    value: "Returns a string identifying the operating system platform.\n\n#### Returns\nThe operating system platform\n\n#### Example\n```ts\n\"linux\", \"darwin\", \"win32\"\n```"
+  sortText: ff|os
+  insertText: os()
+- label: setEnv
+  kind: 2
+  detail: "(name: str, value: str): void"
+  documentation:
+    kind: markdown
+    value: Sets the given name and value as an environment variable.
+  sortText: ff|setEnv
+  insertText: setEnv($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: sha256
   kind: 2
   detail: "(data: str): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic sha256: (data: str): str\n```\n---\nComputes the SHA256 hash of the given data.\n### Parameters\n- `data` — `str` — - The string to be hashed."
+    value: Computes the SHA256 hash of the given data.
   sortText: ff|sha256
   insertText: sha256($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: shell
+  kind: 2
+  detail: "(command: str, opts: ShellOptions?): str"
+  documentation:
+    kind: markdown
+    value: "Executes a command in the shell and returns its standard output.\n\n#### Returns\nThe standard output of the shell command.\n\n*@throws* *An error if the shell command execution fails or returns a non-zero exit code.*"
+  sortText: ff|shell
+  insertText: shell($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: tryEnv
   kind: 2
   detail: "(name: str): str?"
   documentation:
     kind: markdown
-    value: "```wing\nstatic tryEnv: (name: str): str?\n```\n---\nReturns the value of an environment variable.\n### Parameters\n- `name` — `str` — The name of the environment variable.\n\n### Returns\nThe value of the environment variable or `nil`.\n\n### Remarks\nReturns `nil` if not found or empty."
+    value: "Returns the value of an environment variable.\n\n#### Returns\nThe value of the environment variable or `nil`.\n\n#### Remarks\nReturns `nil` if not found or empty."
   sortText: ff|tryEnv
   insertText: tryEnv($1)
   insertTextFormat: 2
   command:
     title: triggerParameterHints
     command: editor.action.triggerParameterHints
+- label: ulid
+  kind: 2
+  detail: "(options: UlidOptions?): str"
+  documentation:
+    kind: markdown
+    value: "Generates universally unique lexicographically sortable identifier.\n\n#### Remarks\n#\n\n*@link* *https://github.com/ulid/javascript*"
+  sortText: ff|ulid
+  insertText: ulid($1)
+  insertTextFormat: 2
+  command:
+    title: triggerParameterHints
+    command: editor.action.triggerParameterHints
 - label: uuidv4
   kind: 2
   detail: "(): str"
   documentation:
     kind: markdown
-    value: "```wing\nstatic uuidv4: (): str\n```\n---\nGenerates a version 4 UUID."
+    value: Generates a version 4 UUID.
   sortText: ff|uuidv4
   insertText: uuidv4()
+- label: ChildProcess
+  kind: 7
+  documentation:
+    kind: markdown
+    value: "```wing\nclass ChildProcess {\n  pid?: num;\n  kill(): void;\n  wait(): Output;\n}\n```\n---\nHandle to a running child process."
+  sortText: gg|ChildProcess
 - label: Util
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Util\n```\n---\nUtility functions.\n\n### Methods\n- `base64Decode` — `(stringToDecode: str, url: bool?): str` — Converts a string from base64 to UTF-8.\n- `base64Encode` — `(stringToEncode: str, url: bool?): str` — Converts a string from UTF-8 to base64.\n- `env` — `(name: str): str` — Returns the value of an environment variable.\n- `nanoid` — `(options: NanoidOptions?): str` — Generates a unique ID using the nanoid library.\n- `sha256` — `(data: str): str` — Computes the SHA256 hash of the given data.\n- `sleep` — `inflight (delay: duration): void` — Suspends execution for a given duration.\n- `tryEnv` — `(name: str): str?` — Returns the value of an environment variable.\n- `uuidv4` — `(): str` — Generates a version 4 UUID.\n- `waitUntil` — `inflight (predicate: inflight (): bool, props: WaitUntilProps?): bool` — Run a predicate repeatedly, waiting until it returns true or until the timeout elapses."
+    value: "```wing\nclass Util {\n  static base64Decode(): str;\n  static base64Encode(): str;\n  static env(): str;\n  static exec(): Output;\n  static nanoid(): str;\n  static os(): str;\n  /* ... */\n}\n```\n---\nUtility functions."
   sortText: gg|Util
+- label: CommandOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct CommandOptions {\n  cwd?: str;\n  env?: Map<str>;\n  inheritEnv?: bool;\n}\n```\n---\nBase command options."
+  sortText: hh|CommandOptions
+- label: ExecOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct ExecOptions extends CommandOptions {\n  cwd?: str;\n  env?: Map<str>;\n  inheritEnv?: bool;\n}\n```\n---\nAdditional options for `util.exec()`."
+  sortText: hh|ExecOptions
 - label: NanoidOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct NanoidOptions\n```\n---\nOptions to generating a unique ID.\n### Fields\n- `alphabet?` — `str?` — Characters that make up the alphabet to generate the ID, limited to 256 characters or fewer.\n- `size?` — `num?` — Size of ID."
+    value: "```wing\nstruct NanoidOptions {\n  alphabet?: str;\n  size?: num;\n}\n```\n---\nOptions to generating a unique ID."
   sortText: hh|NanoidOptions
+- label: Output
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct Output {\n  status: num;\n  stderr: str;\n  stdout: str;\n}\n```\n---\nOutput of a finished process."
+  sortText: hh|Output
+- label: ShellOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct ShellOptions extends CommandOptions {\n  cwd?: str;\n  env?: Map<str>;\n  inheritEnv?: bool;\n  throw?: bool;\n}\n```\n---\nAdditional options for `util.shell()`."
+  sortText: hh|ShellOptions
+- label: SpawnOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct SpawnOptions extends CommandOptions {\n  cwd?: str;\n  env?: Map<str>;\n  inheritEnv?: bool;\n  stderr?: Stdio;\n  stdin?: Stdio;\n  stdout?: Stdio;\n}\n```\n---\nAdditional options for `util.spawn()`."
+  sortText: hh|SpawnOptions
+- label: UlidOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct UlidOptions {\n  seed?: num;\n}\n```\n---\nOptions to generate universally unique lexicographically sortable identifiers."
+  sortText: hh|UlidOptions
 - label: WaitUntilProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WaitUntilProps\n```\n---\nProperties for `util.waitUntil`.\n### Fields\n- `interval?` — `duration?` — Interval between predicate retries.\n- `timeout?` — `duration?` — The timeout for keep trying predicate."
+    value: "```wing\nstruct WaitUntilProps {\n  interval?: duration;\n  throws?: bool;\n  timeout?: duration;\n}\n```\n---\nProperties for `util.waitUntil`."
   sortText: hh|WaitUntilProps
 - label: IPredicateHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IPredicateHandler extends IInflight\n```\n---\nA predicate with an inflight \"handle\" method that can be passed to `util.busyWait`.\n### Methods\n- `handle` — `inflight (): bool` — The Predicate function that is called.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): bool\n```\n---\nA predicate with an inflight \"handle\" method that can be passed to `util.busyWait`."
   sortText: ii|IPredicateHandler
 - label: IPredicateHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IPredicateHandlerClient\n```\n---\nInflight client for `IPredicateHandler`.\n### Methods\n- `handle` — `inflight (): bool` — The Predicate function that is called."
+    value: "```wing\ninflight (): bool\n```\n---\nInflight client for `IPredicateHandler`."
   sortText: ii|IPredicateHandlerClient
+- label: Stdio
+  kind: 13
+  documentation:
+    kind: markdown
+    value: "```wing\nenum Stdio {\n  INHERIT,\n  PIPED,\n  NULL,\n}\n```\n---\nDescribes what to do with a standard I/O stream for a child process."
+  sortText: jj|Stdio
 
diff --git a/libs/wingc/src/lsp/snapshots/completions/variable_type_annotation_namespace.snap b/libs/wingc/src/lsp/snapshots/completions/variable_type_annotation_namespace.snap
index c00d48e21f8..ed3a11ecc17 100644
--- a/libs/wingc/src/lsp/snapshots/completions/variable_type_annotation_namespace.snap
+++ b/libs/wingc/src/lsp/snapshots/completions/variable_type_annotation_namespace.snap
@@ -5,510 +5,570 @@ source: libs/wingc/src/lsp/completions.rs
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Api\n```\n---\nFunctionality shared between all `Api` implementations.\n\n### Initializer\n- `...props` — `ApiProps?`\n  \n  - `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n  - `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes.\n### Fields\n- `node` — `Node` — The tree node.\n- `url` — `str` — The base URL of the API endpoint.\n### Methods\n- `connect` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiConnectOptions?): void` — Add a inflight handler to the api for CONNECT requests on the given path.\n- `delete` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiDeleteOptions?): void` — Add a inflight handler to the api for DELETE requests on the given path.\n- `get` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiGetOptions?): void` — Add a inflight handler to the api for GET requests on the given path.\n- `head` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiHeadOptions?): void` — Add a inflight handler to the api for HEAD requests on the given path.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `options` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiOptionsOptions?): void` — Add a inflight handler to the api for OPTIONS requests on the given path.\n- `patch` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPatchOptions?): void` — Add a inflight handler to the api for PATCH requests on the given path.\n- `post` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPostOptions?): void` — Add a inflight handler to the api for POST requests on the given path.\n- `put` — `preflight (path: str, inflight: inflight (request: ApiRequest): ApiResponse, props: ApiPutOptions?): void` — Add a inflight handler to the api for PUT requests on the given path.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Api {\n  url: str;\n  connect(): void;\n  delete(): void;\n  get(): void;\n  head(): void;\n  options(): void;\n  /* ... */\n}\n```\n---\nFunctionality shared between all `Api` implementations."
   sortText: gg|Api
 - label: Bucket
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\nclass Bucket {\n  addFile(): void;\n  addObject(): void;\n  onCreate(): void;\n  onDelete(): void;\n  onEvent(): void;\n  onUpdate(): void;\n  /* ... */\n}\n```\n---\nA cloud object store."
   sortText: gg|Bucket
 - label: Counter
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Counter\n```\n---\nA distributed atomic counter.\n\n### Initializer\n- `...props` — `CounterProps?`\n  \n  - `initial?` — `num?` — The initial value of the counter.\n### Fields\n- `initial` — `num` — The initial value of the counter.\n- `node` — `Node` — The tree node.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Counter {\n  initial: num;\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nA distributed atomic counter."
   sortText: gg|Counter
 - label: Domain
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Domain\n```\n---\nA cloud Domain.\n\n### Initializer\n- `...props` — `DomainProps`\n  \n  - `domainName` — `str` — The website's custom domain name.\n### Fields\n- `domainName` — `str` — The domain name.\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Domain {\n  domainName: str;\n}\n```\n---\nA cloud Domain."
   sortText: gg|Domain
+- label: Endpoint
+  kind: 7
+  documentation:
+    kind: markdown
+    value: "```wing\nclass Endpoint {\n  url: str;\n}\n```\n---\nA cloud Endpoint."
+  sortText: gg|Endpoint
 - label: Function
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Function impl IInflightHost\n```\n---\nA function.\n\n### Initializer\n- `handler` — `inflight (event: str): void`\n- `...props` — `FunctionProps?`\n  \n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n  - `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n  - `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n  - `timeout?` — `duration?` — The maximum amount of time the function can run.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Function impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nA function."
   sortText: gg|Function
 - label: OnDeploy
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass OnDeploy\n```\n---\nRun code every time the app is deployed.\n\n### Initializer\n- `handler` — `inflight (): void`\n- `...props` — `OnDeployProps?`\n  \n  - `env?` — `Map<str>?`\n  - `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n  - `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n  - `logRetentionDays?` — `num?`\n  - `memory?` — `num?`\n  - `timeout?` — `duration?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass OnDeploy {\n  // No public members\n}\n```\n---\nRun code every time the app is deployed."
   sortText: gg|OnDeploy
 - label: Queue
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Queue\n```\n---\nA queue.\n\n### Initializer\n- `...props` — `QueueProps?`\n  \n  - `retentionPeriod?` — `duration?` — How long a queue retains a message.\n  - `timeout?` — `duration?` — How long a queue's consumers have to process a message.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue.\n- `setConsumer` — `preflight (handler: inflight (message: str): void, props: QueueSetConsumerOptions?): Function` — Create a function to consume messages from this queue.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Queue {\n  setConsumer(): Function;\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nA queue."
   sortText: gg|Queue
 - label: Schedule
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Schedule\n```\n---\nA schedule.\n\n### Initializer\n- `...props` — `ScheduleProps?`\n  \n  - `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n  - `rate?` — `duration?` — Trigger events at a periodic rate.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onTick` — `preflight (inflight: inflight (): void, props: ScheduleOnTickOptions?): Function` — Create a function that runs when receiving the scheduled event.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Schedule {\n  onTick(): Function;\n}\n```\n---\nA schedule."
   sortText: gg|Schedule
 - label: Secret
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Secret\n```\n---\nA cloud secret.\n\n### Initializer\n- `...props` — `SecretProps?`\n  \n  - `name?` — `str?` — The secret's name.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\nclass Secret {\n  name?: str;\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nA cloud secret."
   sortText: gg|Secret
 - label: Service
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Service impl IInflightHost\n```\n---\nA long-running service.\n\n### Initializer\n- `handler` — `inflight (): inflight (): void?`\n- `...props` — `ServiceProps?`\n  \n  - `autoStart?` — `bool?` — Whether the service should start automatically.\n  - `env?` — `Map<str>?` — Environment variables to pass to the function.\n### Fields\n- `env` — `Map<str>` — Returns the set of environment variables for this function.\n- `node` — `Node` — The tree node.\n### Methods\n- `addEnvironment` — `preflight (name: str, value: str): void` — Add an environment variable to the function.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Service impl IInflightHost {\n  env: Map<str>;\n  addEnvironment(): void;\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nA long-running service."
   sortText: gg|Service
 - label: Topic
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Topic\n```\n---\nA topic.\n\n### Initializer\n- `...props` — `TopicProps?`\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onMessage` — `preflight (inflight: inflight (event: str): void, props: TopicOnMessageOptions?): Function` — Run an inflight whenever an message is published to the topic.\n- `publish` — `inflight (message: str): void` — Publish message to topic.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Topic {\n  onMessage(): Function;\n  subscribeQueue(): void;\n  inflight publish(): void;\n}\n```\n---\nA topic."
   sortText: gg|Topic
 - label: Website
   kind: 7
   documentation:
     kind: markdown
-    value: "```wing\nclass Website impl IWebsite\n```\n---\nA cloud static website.\n\n### Initializer\n- `...props` — `WebsiteProps`\n  \n  - `path` — `str`\n  - `domain?` — `Domain?`\n### Fields\n- `node` — `Node` — The tree node.\n- `path` — `str` — Absolute local path to the website's static files.\n- `url` — `str` — The website's url.\n### Methods\n- `addFile` — `preflight (path: str, data: str, options: AddFileOptions?): str` — Add a file to the website during deployment.\n- `addJson` — `preflight (path: str, data: Json): str` — Add a JSON file with custom values during the website's deployment.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+    value: "```wing\nclass Website impl IWebsite {\n  path: str;\n  url: str;\n  addFile(): str;\n  addJson(): str;\n}\n```\n---\nA cloud static website."
   sortText: gg|Website
 - label: AddFileOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct AddFileOptions\n```\n---\nOptions for adding a file with custom value during the website's deployment.\n### Fields\n- `contentType?` — `str?` — File's content type."
+    value: "```wing\nstruct AddFileOptions {\n  contentType?: str;\n}\n```\n---\nOptions for adding a file with custom value during the website's deployment."
   sortText: hh|AddFileOptions
 - label: ApiConnectOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiConnectOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiConnectOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiConnectOptions
 - label: ApiCorsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiCorsOptions\n```\n---\nCors Options for `Api`.\n### Fields\n- `allowCredentials?` — `bool?` — Whether to allow credentials.\n- `allowHeaders?` — `Array<str>?` — The list of allowed headers.\n- `allowMethods?` — `Array<HttpMethod>?` — The list of allowed methods.\n- `allowOrigin?` — `Array<str>?` — The list of allowed allowOrigin.\n- `exposeHeaders?` — `Array<str>?` — The list of exposed headers.\n- `maxAge?` — `duration?` — How long the browser should cache preflight request results."
+    value: "```wing\nstruct ApiCorsOptions {\n  allowCredentials?: bool;\n  allowHeaders?: Array<str>;\n  allowMethods?: Array<HttpMethod>;\n  allowOrigin?: str;\n  exposeHeaders?: Array<str>;\n  maxAge?: duration;\n}\n```\n---\nCors Options for `Api`."
   sortText: hh|ApiCorsOptions
 - label: ApiDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiDeleteOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiDeleteOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiDeleteOptions
+- label: ApiEndpointOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct ApiEndpointOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nBase options for Api endpoints."
+  sortText: hh|ApiEndpointOptions
 - label: ApiGetOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiGetOptions\n```\n---\nOptions for Api get endpoint."
+    value: "```wing\nstruct ApiGetOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api get endpoint."
   sortText: hh|ApiGetOptions
 - label: ApiHeadOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiHeadOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiHeadOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiHeadOptions
 - label: ApiOptionsOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiOptionsOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiOptionsOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiOptionsOptions
 - label: ApiPatchOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPatchOptions\n```\n---\nOptions for Api patch endpoint."
+    value: "```wing\nstruct ApiPatchOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api patch endpoint."
   sortText: hh|ApiPatchOptions
 - label: ApiPostOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPostOptions\n```\n---\nOptions for Api post endpoint."
+    value: "```wing\nstruct ApiPostOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api post endpoint."
   sortText: hh|ApiPostOptions
 - label: ApiProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiProps\n```\n---\nOptions for `Api`.\n### Fields\n- `cors?` — `bool?` — Options for configuring the API's CORS behavior across all routes.\n- `corsOptions?` — `ApiCorsOptions?` — Options for configuring the API's CORS behavior across all routes."
+    value: "```wing\nstruct ApiProps {\n  cors?: bool;\n  corsOptions?: ApiCorsOptions;\n}\n```\n---\nOptions for `Api`."
   sortText: hh|ApiProps
 - label: ApiPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiPutOptions\n```\n---\nOptions for Api put endpoint."
+    value: "```wing\nstruct ApiPutOptions extends ApiEndpointOptions {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Api put endpoint."
   sortText: hh|ApiPutOptions
 - label: ApiRequest
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiRequest\n```\n---\nShape of a request to an inflight handler.\n### Fields\n- `method` — `HttpMethod` — The request's HTTP method.\n- `path` — `str` — The request's path.\n- `query` — `Map<str>` — The request's query string values.\n- `vars` — `Map<str>` — The path variables.\n- `body?` — `str?` — The request's body.\n- `headers?` — `Map<str>?` — The request's headers."
+    value: "```wing\nstruct ApiRequest {\n  body?: str;\n  headers?: Map<str>;\n  method: HttpMethod;\n  path: str;\n  query: Map<str>;\n  vars: Map<str>;\n}\n```\n---\nShape of a request to an inflight handler."
   sortText: hh|ApiRequest
 - label: ApiResponse
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ApiResponse\n```\n---\nShape of a response from a inflight handler.\n### Fields\n- `status` — `num` — The response's status code.\n- `body?` — `str?` — The response's body.\n- `headers?` — `Map<str>?` — The response's headers."
+    value: "```wing\nstruct ApiResponse {\n  body?: str;\n  headers?: Map<str>;\n  status?: num;\n}\n```\n---\nShape of a response from a inflight handler."
   sortText: hh|ApiResponse
 - label: BucketDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketDeleteOptions\n```\n---\nOptions for `Bucket.delete()`.\n### Fields\n- `mustExist?` — `bool?` — Check failures on the method and retrieve errors if any."
+    value: "```wing\nstruct BucketDeleteOptions {\n  mustExist?: bool;\n}\n```\n---\nOptions for `Bucket.delete()`."
   sortText: hh|BucketDeleteOptions
 - label: BucketEvent
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketEvent\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927.\n### Fields\n- `key` — `str` — The bucket key that triggered the event.\n- `type` — `BucketEventType` — Type of event."
+    value: "```wing\nstruct BucketEvent {\n  key: str;\n  type: BucketEventType;\n}\n```\n---\nOn_event notification payload- will be in use after solving issue: https://github.com/winglang/wing/issues/1927."
   sortText: hh|BucketEvent
+- label: BucketGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.get()`."
+  sortText: hh|BucketGetOptions
 - label: BucketOnCreateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnCreateOptions\n```\n---\n`onCreate` event options."
+    value: "```wing\nstruct BucketOnCreateOptions {\n  // No public members\n}\n```\n---\n`onCreate` event options."
   sortText: hh|BucketOnCreateOptions
 - label: BucketOnDeleteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnDeleteOptions\n```\n---\n`onDelete` event options."
+    value: "```wing\nstruct BucketOnDeleteOptions {\n  // No public members\n}\n```\n---\n`onDelete` event options."
   sortText: hh|BucketOnDeleteOptions
 - label: BucketOnEventOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnEventOptions\n```\n---\n`onEvent` options."
+    value: "```wing\nstruct BucketOnEventOptions {\n  // No public members\n}\n```\n---\n`onEvent` options."
   sortText: hh|BucketOnEventOptions
 - label: BucketOnUpdateOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketOnUpdateOptions\n```\n---\n`onUpdate` event options."
+    value: "```wing\nstruct BucketOnUpdateOptions {\n  // No public members\n}\n```\n---\n`onUpdate` event options."
   sortText: hh|BucketOnUpdateOptions
 - label: BucketProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketProps\n```\n---\nOptions for `Bucket`.\n### Fields\n- `public?` — `bool?` — Whether the bucket's objects should be publicly accessible."
+    value: "```wing\nstruct BucketProps {\n  public?: bool;\n}\n```\n---\nOptions for `Bucket`."
   sortText: hh|BucketProps
 - label: BucketPutOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketPutOptions\n```\n---\nOptions for `Bucket.put()`.\n### Fields\n- `contentType` — `str` — The HTTP Content-Type of the object."
+    value: "```wing\nstruct BucketPutOptions {\n  contentType: str;\n}\n```\n---\nOptions for `Bucket.put()`."
   sortText: hh|BucketPutOptions
 - label: BucketSignedUrlOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct BucketSignedUrlOptions\n```\n---\nOptions for `Bucket.signedUrl()`.\n### Fields\n- `duration?` — `duration?` — The duration for the signed url to expire."
+    value: "```wing\nstruct BucketSignedUrlOptions {\n  action?: BucketSignedUrlAction;\n  duration?: duration;\n}\n```\n---\nOptions for `Bucket.signedUrl()`."
   sortText: hh|BucketSignedUrlOptions
+- label: BucketTryGetOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct BucketTryGetOptions extends BucketGetOptions {\n  endByte?: num;\n  startByte?: num;\n}\n```\n---\nOptions for `Bucket.tryGet()`."
+  sortText: hh|BucketTryGetOptions
+- label: CorsHeaders
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct CorsHeaders {\n  defaultResponse: Map<str>;\n  optionsResponse: Map<str>;\n}\n```\n---\nType definition for CORS headers which includes default and options headers."
+  sortText: hh|CorsHeaders
 - label: CounterProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct CounterProps\n```\n---\nOptions for `Counter`.\n### Fields\n- `initial?` — `num?` — The initial value of the counter."
+    value: "```wing\nstruct CounterProps {\n  initial?: num;\n}\n```\n---\nOptions for `Counter`."
   sortText: hh|CounterProps
+- label: DeadLetterQueueProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct DeadLetterQueueProps {\n  maxDeliveryAttempts?: num;\n  queue: Queue;\n}\n```\n---\nDead letter queue options."
+  sortText: hh|DeadLetterQueueProps
 - label: DomainProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct DomainProps\n```\n---\nOptions for `Domain`.\n### Fields\n- `domainName` — `str` — The website's custom domain name."
+    value: "```wing\nstruct DomainProps {\n  domainName: str;\n}\n```\n---\nOptions for `Domain`."
   sortText: hh|DomainProps
+- label: EndpointProps
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct EndpointProps {\n  browserSupport?: bool;\n  label?: str;\n}\n```\n---\nOptions for `Endpoint`."
+  sortText: hh|EndpointProps
 - label: FunctionProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct FunctionProps\n```\n---\nOptions for `Function`.\n### Fields\n- `env?` — `Map<str>?` — Environment variables to pass to the function.\n- `logRetentionDays?` — `num?` — Specifies the number of days that function logs will be kept.\n- `memory?` — `num?` — The amount of memory to allocate to the function, in MB.\n- `timeout?` — `duration?` — The maximum amount of time the function can run."
+    value: "```wing\nstruct FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Function`."
   sortText: hh|FunctionProps
 - label: GetSecretValueOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct GetSecretValueOptions\n```\n---\nOptions when getting a secret value.\n### Fields\n- `cache?` — `bool?` — Whether to cache the value."
+    value: "```wing\nstruct GetSecretValueOptions {\n  cache?: bool;\n}\n```\n---\nOptions when getting a secret value."
   sortText: hh|GetSecretValueOptions
 - label: ObjectMetadata
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ObjectMetadata\n```\n---\nMetadata of a bucket object.\n### Fields\n- `lastModified` — `Datetime` — The time the object was last modified.\n- `size` — `num` — The size of the object in bytes.\n- `contentType?` — `str?` — The content type of the object, if it is known."
+    value: "```wing\nstruct ObjectMetadata {\n  contentType?: str;\n  lastModified: Datetime;\n  size: num;\n}\n```\n---\nMetadata of a bucket object."
   sortText: hh|ObjectMetadata
 - label: OnDeployProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct OnDeployProps extends FunctionProps\n```\n---\nOptions for `OnDeploy`.\n### Fields\n- `env?` — `Map<str>?`\n- `executeAfter?` — `Array<Construct>?` — Execute this trigger only after these resources have been provisioned.\n- `executeBefore?` — `Array<Construct>?` — Adds this trigger as a dependency on other constructs.\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct OnDeployProps extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  executeAfter?: Array<Construct>;\n  executeBefore?: Array<Construct>;\n  logRetentionDays?: num;\n  memory?: num;\n  /* ... */\n}\n```\n---\nOptions for `OnDeploy`."
   sortText: hh|OnDeployProps
 - label: QueueProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueProps\n```\n---\nOptions for `Queue`.\n### Fields\n- `retentionPeriod?` — `duration?` — How long a queue retains a message.\n- `timeout?` — `duration?` — How long a queue's consumers have to process a message."
+    value: "```wing\nstruct QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Queue`."
   sortText: hh|QueueProps
 - label: QueueSetConsumerOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps\n```\n---\nOptions for Queue.setConsumer.\n### Fields\n- `batchSize?` — `num?` — The maximum number of messages to send to subscribers at once.\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct QueueSetConsumerOptions extends FunctionProps {\n  batchSize?: num;\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Queue.setConsumer."
   sortText: hh|QueueSetConsumerOptions
 - label: ScheduleOnTickOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps\n```\n---\nOptions for Schedule.onTick.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ScheduleOnTickOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Schedule.onTick."
   sortText: hh|ScheduleOnTickOptions
 - label: ScheduleProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ScheduleProps\n```\n---\nOptions for `Schedule`.\n### Fields\n- `cron?` — `str?` — Trigger events according to a cron schedule using the UNIX cron format.\n- `rate?` — `duration?` — Trigger events at a periodic rate."
+    value: "```wing\nstruct ScheduleProps {\n  cron?: str;\n  rate?: duration;\n}\n```\n---\nOptions for `Schedule`."
   sortText: hh|ScheduleProps
 - label: SecretProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct SecretProps\n```\n---\nOptions for `Secret`.\n### Fields\n- `name?` — `str?` — The secret's name."
+    value: "```wing\nstruct SecretProps {\n  name?: str;\n}\n```\n---\nOptions for `Secret`."
   sortText: hh|SecretProps
 - label: ServiceOnStartOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps\n```\n---\nOptions for Service.onStart.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct ServiceOnStartOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for Service.onStart."
   sortText: hh|ServiceOnStartOptions
 - label: ServiceProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct ServiceProps\n```\n---\nOptions for `Service`.\n### Fields\n- `autoStart?` — `bool?` — Whether the service should start automatically.\n- `env?` — `Map<str>?` — Environment variables to pass to the function."
+    value: "```wing\nstruct ServiceProps {\n  autoStart?: bool;\n  env?: Map<str>;\n}\n```\n---\nOptions for `Service`."
   sortText: hh|ServiceProps
 - label: TopicOnMessageOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps\n```\n---\nOptions for `Topic.onMessage`.\n### Fields\n- `env?` — `Map<str>?`\n- `logRetentionDays?` — `num?`\n- `memory?` — `num?`\n- `timeout?` — `duration?`"
+    value: "```wing\nstruct TopicOnMessageOptions extends FunctionProps {\n  concurrency?: num;\n  env?: Map<str>;\n  logRetentionDays?: num;\n  memory?: num;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.onMessage`."
   sortText: hh|TopicOnMessageOptions
 - label: TopicProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct TopicProps\n```\n---\nOptions for `Topic`."
+    value: "```wing\nstruct TopicProps {\n  // No public members\n}\n```\n---\nOptions for `Topic`."
   sortText: hh|TopicProps
+- label: TopicSubscribeQueueOptions
+  kind: 22
+  documentation:
+    kind: markdown
+    value: "```wing\nstruct TopicSubscribeQueueOptions extends QueueProps {\n  dlq?: DeadLetterQueueProps;\n  retentionPeriod?: duration;\n  timeout?: duration;\n}\n```\n---\nOptions for `Topic.subscribeQueue`."
+  sortText: hh|TopicSubscribeQueueOptions
 - label: WebsiteDomainOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteDomainOptions\n```\n---\nOptions for `Website`, and `ReactApp`.\n### Fields\n- `domain?` — `Domain?` — The website's custom domain object."
+    value: "```wing\nstruct WebsiteDomainOptions {\n  domain?: Domain;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteDomainOptions
 - label: WebsiteOptions
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteOptions\n```\n---\nBasic options for `Website`.\n### Fields\n- `path` — `str` — Local path to the website's static files, relative to the Wing source file or absolute."
+    value: "```wing\nstruct WebsiteOptions {\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nBasic options for `Website`."
   sortText: hh|WebsiteOptions
 - label: WebsiteProps
   kind: 22
   documentation:
     kind: markdown
-    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions\n```\n---\nOptions for `Website`.\n### Fields\n- `path` — `str`\n- `domain?` — `Domain?`"
+    value: "```wing\nstruct WebsiteProps extends WebsiteOptions, WebsiteDomainOptions {\n  domain?: Domain;\n  errorDocument?: str;\n  path: str;\n}\n```\n---\nOptions for `Website`."
   sortText: hh|WebsiteProps
 - label: IApiClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiClient\n```\n---\nInflight methods and members of `cloud.Api`."
+    value: "```wing\ninterface IApiClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Api`."
   sortText: ii|IApiClient
 - label: IApiEndpointHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nA resource with an inflight \"handle\" method that can be passed to one of the `Api` request preflight methods."
   sortText: ii|IApiEndpointHandler
 - label: IApiEndpointHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IApiEndpointHandlerClient\n```\n---\nInflight client for `IApiEndpointHandler`.\n### Methods\n- `handle` — `inflight (request: ApiRequest): ApiResponse` — Inflight that will be called when a request is made to the endpoint."
+    value: "```wing\ninflight (...request: ApiRequest): ApiResponse?\n```\n---\nInflight client for `IApiEndpointHandler`."
   sortText: ii|IApiEndpointHandlerClient
 - label: IBucketClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketClient\n```\n---\nInflight interface for `Bucket`.\n### Methods\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+    value: "```wing\ninterface IBucketClient {\n  inflight copy(): void;\n  inflight delete(): void;\n  inflight exists(): bool;\n  inflight get(): str;\n  inflight getJson(): Json;\n  inflight list(): Array<str>;\n  /* ... */\n}\n```\n---\nInflight interface for `Bucket`."
   sortText: ii|IBucketClient
 - label: IBucketEventHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandler
 - label: IBucketEventHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IBucketEventHandlerClient\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events.\n### Methods\n- `handle` — `inflight (key: str, type: BucketEventType): void` — Function that will be called when an event notification is fired."
+    value: "```wing\ninflight (key: str, type: BucketEventType): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to the bucket events."
   sortText: ii|IBucketEventHandlerClient
 - label: ICounterClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ICounterClient\n```\n---\nInflight interface for `Counter`.\n### Methods\n- `dec` — `inflight (amount: num?, key: str?): num` — Decrement the counter, returning the previous value.\n- `inc` — `inflight (amount: num?, key: str?): num` — Increments the counter atomically by a certain amount and returns the previous value.\n- `peek` — `inflight (key: str?): num` — Get the current value of the counter.\n- `set` — `inflight (value: num, key: str?): void` — Set a counter to a given value."
+    value: "```wing\ninterface ICounterClient {\n  inflight dec(): num;\n  inflight inc(): num;\n  inflight peek(): num;\n  inflight set(): void;\n}\n```\n---\nInflight interface for `Counter`."
   sortText: ii|ICounterClient
 - label: IDomainClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IDomainClient\n```\n---\nInflight interface for `Domain`."
+    value: "```wing\ninterface IDomainClient {\n  // No public members\n}\n```\n---\nInflight interface for `Domain`."
   sortText: ii|IDomainClient
+- label: IEndpointClient
+  kind: 8
+  documentation:
+    kind: markdown
+    value: "```wing\ninterface IEndpointClient {\n  // No public members\n}\n```\n---\nInflight interface for `Endpoint`."
+  sortText: ii|IEndpointClient
 - label: IFunctionClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionClient\n```\n---\nInflight interface for `Function`.\n### Methods\n- `invoke` — `inflight (payload: str): str` — Invokes the function with a payload and waits for the result."
+    value: "```wing\ninterface IFunctionClient {\n  inflight invoke(): str?;\n  inflight invokeAsync(): void;\n}\n```\n---\nInflight interface for `Function`."
   sortText: ii|IFunctionClient
 - label: IFunctionHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nA resource with an inflight \"handle\" method that can be used to create a `cloud.Function`."
   sortText: ii|IFunctionHandler
 - label: IFunctionHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IFunctionHandlerClient\n```\n---\nInflight client for `IFunctionHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Entrypoint function that will be called when the cloud function is invoked."
+    value: "```wing\ninflight (event: str?): str?\n```\n---\nInflight client for `IFunctionHandler`."
   sortText: ii|IFunctionHandlerClient
 - label: IOnDeployClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployClient\n```\n---\nInflight interface for `OnDeploy`."
+    value: "```wing\ninterface IOnDeployClient {\n  // No public members\n}\n```\n---\nInflight interface for `OnDeploy`."
   sortText: ii|IOnDeployClient
 - label: IOnDeployHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be used by `cloud.OnDeploy`."
   sortText: ii|IOnDeployHandler
 - label: IOnDeployHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IOnDeployHandlerClient\n```\n---\nInflight client for `IOnDeployHandler`.\n### Methods\n- `handle` — `inflight (): void` — Entrypoint function that will be called when the app is deployed."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IOnDeployHandler`."
   sortText: ii|IOnDeployHandlerClient
 - label: IQueueClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueClient\n```\n---\nInflight interface for `Queue`.\n### Methods\n- `approxSize` — `inflight (): num` — Retrieve the approximate number of messages in the queue.\n- `pop` — `inflight (): str?` — Pop a message from the queue.\n- `purge` — `inflight (): void` — Purge all of the messages in the queue.\n- `push` — `inflight (messages: Array<str>?): void` — Push one or more messages to the queue."
+    value: "```wing\ninterface IQueueClient {\n  inflight approxSize(): num;\n  inflight pop(): str?;\n  inflight purge(): void;\n  inflight push(): void;\n}\n```\n---\nInflight interface for `Queue`."
   sortText: ii|IQueueClient
 - label: IQueueSetConsumerHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (message: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Queue.setConsumer`."
   sortText: ii|IQueueSetConsumerHandler
 - label: IQueueSetConsumerHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IQueueSetConsumerHandlerClient\n```\n---\nInflight client for `IQueueSetConsumerHandler`.\n### Methods\n- `handle` — `inflight (message: str): void` — Function that will be called when a message is received from the queue."
+    value: "```wing\ninflight (message: str): void\n```\n---\nInflight client for `IQueueSetConsumerHandler`."
   sortText: ii|IQueueSetConsumerHandlerClient
 - label: IScheduleClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleClient\n```\n---\nInflight interface for `Schedule`."
+    value: "```wing\ninterface IScheduleClient {\n  // No public members\n}\n```\n---\nInflight interface for `Schedule`."
   sortText: ii|IScheduleClient
 - label: IScheduleOnTickHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Schedule.on_tick`."
   sortText: ii|IScheduleOnTickHandler
 - label: IScheduleOnTickHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IScheduleOnTickHandlerClient\n```\n---\nInflight client for `IScheduleOnTickHandler`.\n### Methods\n- `handle` — `inflight (): void` — Function that will be called when a message is received from the schedule."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IScheduleOnTickHandler`."
   sortText: ii|IScheduleOnTickHandlerClient
 - label: ISecretClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ISecretClient\n```\n---\nInflight interface for `Secret`.\n### Methods\n- `value` — `inflight (options: GetSecretValueOptions?): str` — Retrieve the value of the secret.\n- `valueJson` — `inflight (options: GetSecretValueOptions?): Json` — Retrieve the Json value of the secret."
+    value: "```wing\ninterface ISecretClient {\n  inflight value(): str;\n  inflight valueJson(): Json;\n}\n```\n---\nInflight interface for `Secret`."
   sortText: ii|ISecretClient
 - label: IServiceClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceClient\n```\n---\nInflight interface for `Service`.\n### Methods\n- `start` — `inflight (): void` — Start the service.\n- `started` — `inflight (): bool` — Indicates whether the service is started.\n- `stop` — `inflight (): void` — Stop the service."
+    value: "```wing\ninterface IServiceClient {\n  inflight start(): void;\n  inflight started(): bool;\n  inflight stop(): void;\n}\n```\n---\nInflight interface for `Service`."
   sortText: ii|IServiceClient
 - label: IServiceHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is started.\n### Methods\n- `handle` — `inflight (): inflight (): void?` — Handler to run when the service starts.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nExecuted when a `cloud.Service` is started."
   sortText: ii|IServiceHandler
 - label: IServiceHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceHandlerClient\n```\n---\nInflight client for `IServiceHandler`.\n### Methods\n- `handle` — `preflight (): inflight (): void?` — Handler to run when the service starts."
+    value: "```wing\ninflight (): inflight (): void?\n```\n---\nInflight client for `IServiceHandler`."
   sortText: ii|IServiceHandlerClient
 - label: IServiceStopHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandler extends IInflight\n```\n---\nExecuted when a `cloud.Service` is stopped.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (): void\n```\n---\nExecuted when a `cloud.Service` is stopped."
   sortText: ii|IServiceStopHandler
 - label: IServiceStopHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IServiceStopHandlerClient\n```\n---\nInflight client for `IServiceStopHandler`.\n### Methods\n- `handle` — `inflight (): void` — Handler to run when the service stops."
+    value: "```wing\ninflight (): void\n```\n---\nInflight client for `IServiceStopHandler`."
   sortText: ii|IServiceStopHandlerClient
 - label: ITopicClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicClient\n```\n---\nInflight interface for `Topic`.\n### Methods\n- `publish` — `inflight (message: str): void` — Publish message to topic."
+    value: "```wing\ninterface ITopicClient {\n  inflight publish(): void;\n}\n```\n---\nInflight interface for `Topic`."
   sortText: ii|ITopicClient
 - label: ITopicOnMessageHandler
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandler extends IInflight\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void`"
+    value: "```wing\ninflight (event: str): void\n```\n---\nA resource with an inflight \"handle\" method that can be passed to `Topic.on_message`."
   sortText: ii|ITopicOnMessageHandler
 - label: ITopicOnMessageHandlerClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface ITopicOnMessageHandlerClient\n```\n---\nInflight client for `ITopicOnMessageHandler`.\n### Methods\n- `handle` — `inflight (event: str): void` — Function that will be called when a message is received from the topic."
+    value: "```wing\ninflight (event: str): void\n```\n---\nInflight client for `ITopicOnMessageHandler`."
   sortText: ii|ITopicOnMessageHandlerClient
 - label: IWebsite
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsite\n```\n---\nBase interface for a website.\n### Fields\n- `url` — `str` — The website URL."
+    value: "```wing\ninterface IWebsite {\n  url: str;\n}\n```\n---\nBase interface for a website."
   sortText: ii|IWebsite
 - label: IWebsiteClient
   kind: 8
   documentation:
     kind: markdown
-    value: "```wing\ninterface IWebsiteClient\n```\n---\nInflight methods and members of `cloud.Website`."
+    value: "```wing\ninterface IWebsiteClient {\n  // No public members\n}\n```\n---\nInflight methods and members of `cloud.Website`."
   sortText: ii|IWebsiteClient
 - label: BucketEventType
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum BucketEventType\n```\n---\nBucket events to subscribe to.\n- `CREATE`\n- `DELETE`\n- `UPDATE`"
+    value: "```wing\nenum BucketEventType {\n  CREATE,\n  DELETE,\n  UPDATE,\n}\n```\n---\nBucket events to subscribe to."
   sortText: jj|BucketEventType
+- label: BucketSignedUrlAction
+  kind: 13
+  documentation:
+    kind: markdown
+    value: "```wing\nenum BucketSignedUrlAction {\n  DOWNLOAD,\n  UPLOAD,\n}\n```\n---\nSpecifies the action permitted by a presigned URL for a bucket."
+  sortText: jj|BucketSignedUrlAction
 - label: HttpMethod
   kind: 13
   documentation:
     kind: markdown
-    value: "```wing\nenum HttpMethod\n```\n---\nAllowed HTTP methods for a endpoint.\n- `GET`\n- `HEAD`\n- `POST`\n- `PUT`\n- `DELETE`\n- `CONNECT`\n- `OPTIONS`\n- `PATCH`"
+    value: "```wing\nenum HttpMethod {\n  GET,\n  HEAD,\n  POST,\n  PUT,\n  DELETE,\n  CONNECT,\n  OPTIONS,\n  PATCH,\n}\n```\n---\nAllowed HTTP methods for a endpoint."
   sortText: jj|HttpMethod
 
diff --git a/libs/wingc/src/lsp/snapshots/goto_definition/class_init_this_field.snap b/libs/wingc/src/lsp/snapshots/goto_definition/class_init_this_field.snap
index b92671dd4af..bac304d33a0 100644
--- a/libs/wingc/src/lsp/snapshots/goto_definition/class_init_this_field.snap
+++ b/libs/wingc/src/lsp/snapshots/goto_definition/class_init_this_field.snap
@@ -4,7 +4,7 @@ source: libs/wingc/src/lsp/goto_definition.rs
 - originSelectionRange:
     start:
       line: 6
-      character: 4
+      character: 9
     end:
       line: 6
       character: 14
diff --git a/libs/wingc/src/lsp/snapshots/goto_definition/user_defined_type_reference_property.snap b/libs/wingc/src/lsp/snapshots/goto_definition/user_defined_type_reference_property.snap
index 7b38106ef6f..d36cb70b751 100644
--- a/libs/wingc/src/lsp/snapshots/goto_definition/user_defined_type_reference_property.snap
+++ b/libs/wingc/src/lsp/snapshots/goto_definition/user_defined_type_reference_property.snap
@@ -4,7 +4,7 @@ source: libs/wingc/src/lsp/goto_definition.rs
 - originSelectionRange:
     start:
       line: 5
-      character: 0
+      character: 4
     end:
       line: 5
       character: 17
diff --git a/libs/wingc/src/lsp/snapshots/hovers/builtin_in_inflight.snap b/libs/wingc/src/lsp/snapshots/hovers/builtin_in_inflight.snap
index f6163bbacb2..b72c68e90ab 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/builtin_in_inflight.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/builtin_in_inflight.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nassert: (condition: bool): void\n```\n---\nAsserts that a condition is true\n### Parameters\n- `condition` — `bool` — The condition to assert"
+  value: "```wing\nassert: (condition: bool, message: str?): void\n```\n---\nAsserts that a condition is true"
 range:
   start:
     line: 3
diff --git a/libs/wingc/src/lsp/snapshots/hovers/builtin_in_preflight.snap b/libs/wingc/src/lsp/snapshots/hovers/builtin_in_preflight.snap
index cb544f537f1..914db050acd 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/builtin_in_preflight.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/builtin_in_preflight.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nassert: (condition: bool): void\n```\n---\nAsserts that a condition is true\n### Parameters\n- `condition` — `bool` — The condition to assert"
+  value: "```wing\nassert: (condition: bool, message: str?): void\n```\n---\nAsserts that a condition is true"
 range:
   start:
     line: 1
diff --git a/libs/wingc/src/lsp/snapshots/hovers/builtin_instance_method.snap b/libs/wingc/src/lsp/snapshots/hovers/builtin_instance_method.snap
index 3a83f716ba7..07da8f36839 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/builtin_instance_method.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/builtin_instance_method.snap
@@ -3,11 +3,11 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nstartsWith: (searchString: str): bool\n```\n---\nDoes this string start with the given searchString?\n### Parameters\n- `searchString` — `str` — substring to search for.\n\n### Returns\ntrue if string starts with searchString."
+  value: "```wing\nstartsWith(searchString: str): bool\n```\n---\nDoes this string start with the given searchString?\n\n#### Returns\ntrue if string starts with searchString."
 range:
   start:
     line: 1
-    character: 0
+    character: 8
   end:
     line: 1
     character: 18
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/class_doc.snap
new file mode 100644
index 00000000000..fd05488a179
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nclass Foo {\n  // No public members\n}\n```\n---\n Class doc"
+range:
+  start:
+    line: 2
+    character: 8
+  end:
+    line: 2
+    character: 11
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_doc_with_multiline_and_markdown.snap b/libs/wingc/src/lsp/snapshots/hovers/class_doc_with_multiline_and_markdown.snap
new file mode 100644
index 00000000000..241f80a4a26
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_doc_with_multiline_and_markdown.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nclass Foo {\n  a: num;\n}\n```\n---\n Class doc\n With multiline\n ## And markdown"
+range:
+  start:
+    line: 4
+    character: 8
+  end:
+    line: 4
+    character: 11
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_field_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/class_field_doc.snap
new file mode 100644
index 00000000000..99064f04659
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_field_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\npreflight field: num\n```\n---\n Class field doc"
+range:
+  start:
+    line: 3
+    character: 4
+  end:
+    line: 3
+    character: 9
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_init_this_field.snap b/libs/wingc/src/lsp/snapshots/hovers/class_init_this_field.snap
index 5ff02a95c84..1ccb2302781 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/class_init_this_field.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_init_this_field.snap
@@ -7,7 +7,7 @@ contents:
 range:
   start:
     line: 5
-    character: 4
+    character: 9
   end:
     line: 5
     character: 14
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_method_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/class_method_doc.snap
new file mode 100644
index 00000000000..b05ad8ecf6f
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_method_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\npreflight do(): void\n```\n---\n Class method doc"
+range:
+  start:
+    line: 3
+    character: 4
+  end:
+    line: 3
+    character: 6
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_property.snap b/libs/wingc/src/lsp/snapshots/hovers/class_property.snap
index 0eed3f7910b..3a6ec980fdc 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/class_property.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_property.snap
@@ -3,11 +3,11 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\npreflight addObject: preflight (key: str, body: str): void\n```\n---\nAdd a file to the bucket that is uploaded when the app is deployed.\n### Parameters\n- `key` — `str`\n- `body` — `str`\n\n### Remarks\nTODO: In the future this will support uploading any `Blob` type or\nreferencing a file from the local filesystem."
+  value: "```wing\npreflight addObject(key: str, body: str): void\n```\n---\nAdd a file to the bucket that is uploaded when the app is deployed.\n\n#### Remarks\nTODO: In the future this will support uploading any `Blob` type or\nreferencing a file from the local filesystem."
 range:
   start:
     line: 4
-    character: 0
+    character: 7
   end:
     line: 4
     character: 16
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_symbol.snap b/libs/wingc/src/lsp/snapshots/hovers/class_symbol.snap
index 4cd9eb87b97..3dab2db3add 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/class_symbol.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_symbol.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\npreflight bucket: Bucket\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+  value: "```wing\npreflight bucket: class Bucket {\n  addFile(): void;\n  addObject(): void;\n  onCreate(): void;\n  onDelete(): void;\n  onEvent(): void;\n  onUpdate(): void;\n  /* ... */\n}\n```\n---\nA cloud object store."
 range:
   start:
     line: 3
diff --git a/libs/wingc/src/lsp/snapshots/hovers/class_symbol_in_closure.snap b/libs/wingc/src/lsp/snapshots/hovers/class_symbol_in_closure.snap
index 2c65c19e3ed..e416e48a73c 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/class_symbol_in_closure.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/class_symbol_in_closure.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\ninflight myClass: MyClass\nclass MyClass\n```\n---"
+  value: "```wing\ninflight myClass: class MyClass {\n  // No public members\n}\n```"
 range:
   start:
     line: 4
diff --git a/libs/wingc/src/lsp/snapshots/hovers/ctor_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/ctor_doc.snap
new file mode 100644
index 00000000000..d1b08ecdbaa
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/ctor_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nnew(): Bob\n```\n---\n I'm bob the constructor"
+range:
+  start:
+    line: 3
+    character: 4
+  end:
+    line: 3
+    character: 7
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/ctor_doc_from_new_expr.snap b/libs/wingc/src/lsp/snapshots/hovers/ctor_doc_from_new_expr.snap
new file mode 100644
index 00000000000..45fc03e5ef3
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/ctor_doc_from_new_expr.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nnew(): Bob\n```\n---\n I'm bob the constructor"
+range:
+  start:
+    line: 5
+    character: 6
+  end:
+    line: 5
+    character: 9
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/enum_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/enum_doc.snap
new file mode 100644
index 00000000000..276411098e7
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/enum_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nenum Foo {\n}\n```\n---\n Enum doc"
+range:
+  start:
+    line: 2
+    character: 7
+  end:
+    line: 2
+    character: 10
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/enum_variant_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/enum_variant_doc.snap
new file mode 100644
index 00000000000..98210ae330d
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/enum_variant_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nenum Foo {\n  A,\n}\n```"
+range:
+  start:
+    line: 5
+    character: 5
+  end:
+    line: 5
+    character: 6
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/ignoe_empty_lines_in_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/ignoe_empty_lines_in_doc.snap
new file mode 100644
index 00000000000..8c94a552d96
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/ignoe_empty_lines_in_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nclass Foo {\n  // No public members\n}\n```\n---\n Class doc with empty lines after it"
+range:
+  start:
+    line: 3
+    character: 8
+  end:
+    line: 3
+    character: 11
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/inflight_ctor_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/inflight_ctor_doc.snap
new file mode 100644
index 00000000000..9408e1280a1
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/inflight_ctor_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\ninflight new(): Bob\n```\n---\n I'm bob the constructor (inflight)"
+range:
+  start:
+    line: 3
+    character: 13
+  end:
+    line: 3
+    character: 16
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/inflight_ctor_doc_from_new_expr.snap b/libs/wingc/src/lsp/snapshots/hovers/inflight_ctor_doc_from_new_expr.snap
new file mode 100644
index 00000000000..95c2f6f7070
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/inflight_ctor_doc_from_new_expr.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\ninflight new(): Bob\n```\n---\n I'm bob the constructor (inflight)"
+range:
+  start:
+    line: 5
+    character: 23
+  end:
+    line: 5
+    character: 26
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/inflight_init.snap b/libs/wingc/src/lsp/snapshots/hovers/inflight_init.snap
index 123fa21d988..8feac2a5c0f 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/inflight_init.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/inflight_init.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nstruct Data\n```\n---\n### Fields\n- `field` — `str`"
+  value: "```wing\nstruct Data {\n  field: str;\n}\n```"
 range:
   start:
     line: 11
diff --git a/libs/wingc/src/lsp/snapshots/hovers/inherited_interface_method_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/inherited_interface_method_doc.snap
new file mode 100644
index 00000000000..f6a194f22c5
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/inherited_interface_method_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\npreflight do(): void\n```\n---\n Parent interface method doc"
+range:
+  start:
+    line: 9
+    character: 6
+  end:
+    line: 9
+    character: 8
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/inherited_struct_field_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/inherited_struct_field_doc.snap
new file mode 100644
index 00000000000..37d05837728
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/inherited_struct_field_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nfield: num\n```\n---\n Parent struct field doc"
+range:
+  start:
+    line: 9
+    character: 8
+  end:
+    line: 9
+    character: 13
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/inside_class_field.snap b/libs/wingc/src/lsp/snapshots/hovers/inside_class_field.snap
index 437d947c202..726a611afac 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/inside_class_field.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/inside_class_field.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\npreflight my_bucket: Bucket\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+  value: "```wing\npreflight my_bucket: class Bucket {\n  addFile(): void;\n  addObject(): void;\n  onCreate(): void;\n  onDelete(): void;\n  onEvent(): void;\n  onUpdate(): void;\n  /* ... */\n}\n```\n---\nA cloud object store."
 range:
   start:
     line: 3
diff --git a/libs/wingc/src/lsp/snapshots/hovers/interface_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/interface_doc.snap
new file mode 100644
index 00000000000..d085a5e4263
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/interface_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\ninterface Foo extends IResource {\n  // No public members\n}\n```\n---\n Interface doc"
+range:
+  start:
+    line: 2
+    character: 12
+  end:
+    line: 2
+    character: 15
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/interface_method_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/interface_method_doc.snap
new file mode 100644
index 00000000000..9e25195b051
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/interface_method_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\npreflight do(): void\n```\n---\n Interface method doc"
+range:
+  start:
+    line: 3
+    character: 4
+  end:
+    line: 3
+    character: 6
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/intrinsics.snap b/libs/wingc/src/lsp/snapshots/hovers/intrinsics.snap
new file mode 100644
index 00000000000..6a908874edd
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/intrinsics.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nstatic preflight @dirname: str\n```\n---\nGet the normalized absolute path of the current source file's directory.\n\nThe resolved path represents a path during preflight only and is not guaranteed to be valid while inflight.\nIt should primarily be used in preflight or in inflights that are guaranteed to be executed in the same filesystem where preflight executed."
+range:
+  start:
+    line: 1
+    character: 0
+  end:
+    line: 1
+    character: 8
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/member_doc_on_same_line_as_something_else.snap b/libs/wingc/src/lsp/snapshots/hovers/member_doc_on_same_line_as_something_else.snap
new file mode 100644
index 00000000000..46da7552606
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/member_doc_on_same_line_as_something_else.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\npreflight field: num\n```\n---\n Member doc in unexpected place"
+range:
+  start:
+    line: 2
+    character: 4
+  end:
+    line: 2
+    character: 9
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/multipart_reference_hover_middle.snap b/libs/wingc/src/lsp/snapshots/hovers/multipart_reference_hover_middle.snap
index bb721f7d085..fe1340ae611 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/multipart_reference_hover_middle.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/multipart_reference_hover_middle.snap
@@ -3,11 +3,11 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nget: (key: str): Json\n```\n---\nReturns the value associated with the specified Json key.\n### Parameters\n- `key` — `str` — The key of the Json property.\n\n### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
+  value: "```wing\nget(key: str): Json\n```\n---\nReturns the value associated with the specified Json key.\n\n#### Returns\nThe value associated with the specified Json key\n\n*@throws* *Json property does not exist if the given key is not part of an existing property*"
 range:
   start:
     line: 2
-    character: 0
+    character: 2
   end:
     line: 2
     character: 5
diff --git a/libs/wingc/src/lsp/snapshots/hovers/new_statement.snap b/libs/wingc/src/lsp/snapshots/hovers/new_statement.snap
index daf46f1d541..6aeb8bd32c5 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/new_statement.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/new_statement.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nclass Bucket\n```\n---\nA cloud object store.\n\n### Initializer\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible.\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `addFile` — `preflight (key: str, path: str, encoding: str?): void` — Add a file to the bucket from system folder.\n- `addObject` — `preflight (key: str, body: str): void` — Add a file to the bucket that is uploaded when the app is deployed.\n- `copy` — `inflight (srcKey: str, dstKey: str): void` — Copy an object to a new location in the bucket.\n- `delete` — `inflight (key: str, opts: BucketDeleteOptions?): void` — Delete an existing object using a key from the bucket.\n- `exists` — `inflight (key: str): bool` — Check if an object exists in the bucket.\n- `get` — `inflight (key: str): str` — Retrieve an object from the bucket.\n- `getJson` — `inflight (key: str): Json` — Retrieve a Json object from the bucket.\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `list` — `inflight (prefix: str?): Array<str>` — Retrieve existing objects keys from the bucket.\n- `metadata` — `inflight (key: str): ObjectMetadata` — Get the metadata of an object in the bucket.\n- `onCreate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnCreateOptions?): void` — Run an inflight whenever a file is uploaded to the bucket.\n- `onDelete` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnDeleteOptions?): void` — Run an inflight whenever a file is deleted from the bucket.\n- `onEvent` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnEventOptions?): void` — Run an inflight whenever a file is uploaded, modified, or deleted from the bucket.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `onUpdate` — `preflight (fn: inflight (key: str, type: BucketEventType): void, opts: BucketOnUpdateOptions?): void` — Run an inflight whenever a file is updated in the bucket.\n- `publicUrl` — `inflight (key: str): str` — Returns a url to the given file.\n- `put` — `inflight (key: str, body: str, options: BucketPutOptions?): void` — Put an object in the bucket.\n- `putJson` — `inflight (key: str, body: Json): void` — Put a Json object in the bucket.\n- `signedUrl` — `inflight (key: str, options: BucketSignedUrlOptions?): str` — Returns a signed url to the given file.\n- `toString` — `preflight (): str` — Returns a string representation of this construct.\n- `tryDelete` — `inflight (key: str): bool` — Delete an object from the bucket if it exists.\n- `tryGet` — `inflight (key: str): str?` — Get an object from the bucket if it exists.\n- `tryGetJson` — `inflight (key: str): Json?` — Gets an object from the bucket if it exists, parsing it as Json."
+  value: "```wing\nnew(...props: BucketProps?): Bucket\n```\n---\nA cloud object store."
 range:
   start:
     line: 2
diff --git a/libs/wingc/src/lsp/snapshots/hovers/static_method.snap b/libs/wingc/src/lsp/snapshots/hovers/static_method.snap
index a2dc4d76f32..9b2d87b76b2 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/static_method.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/static_method.snap
@@ -3,11 +3,11 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nstatic preflight my: preflight (a: str, b: bool): str\n```\n---\n### Parameters\n- `a` — `str`\n- `b` — `bool`"
+  value: "```wing\nstatic preflight my(a: str, b: bool): str\n```"
 range:
   start:
     line: 5
-    character: 0
+    character: 4
   end:
     line: 5
     character: 6
diff --git a/libs/wingc/src/lsp/snapshots/hovers/static_method_root.snap b/libs/wingc/src/lsp/snapshots/hovers/static_method_root.snap
index 04e5543ad8d..37576f2bd93 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/static_method_root.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/static_method_root.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nclass Json\n```\n---\nImmutable Json.\n\n### Methods\n- `asBool` — `(): bool` — Convert Json element to boolean if possible.\n- `asNum` — `(): num` — Convert Json element to number if possible.\n- `asStr` — `(): str` — Convert Json element to string if possible.\n- `deepCopy` — `(json: MutJson): Json` — Creates an immutable deep copy of the Json.\n- `deepCopyMut` — `(json: Json): MutJson` — Creates a mutable deep copy of the Json.\n- `delete` — `(json: MutJson, key: str): void` — Deletes a key in a given Json.\n- `entries` — `(json: Json): Array<JsonEntry>` — Returns the entries from the Json.\n- `get` — `(key: str): Json` — Returns the value associated with the specified Json key.\n- `getAt` — `(index: num): Json` — Returns a specified element at a given index from Json Array.\n- `has` — `(json: Json, key: str): bool` — Checks if a Json object has a given key.\n- `keys` — `(json: any): Array<str>` — Returns the keys from the Json.\n- `parse` — `(str: str): Json` — Parse a string into a Json.\n- `stringify` — `(json: any, options: JsonStringifyOptions?): str` — Formats Json as string.\n- `tryAsBool` — `(): bool?` — Convert Json element to boolean if possible.\n- `tryAsNum` — `(): num?` — Convert Json element to number if possible.\n- `tryAsStr` — `(): str?` — Convert Json element to string if possible.\n- `tryGet` — `(key: str): Json?` — Optionally returns an specified element from the Json.\n- `tryGetAt` — `(index: num): Json?` — Optionally returns a specified element at a given index from Json Array.\n- `tryParse` — `(str: str?): Json?` — Try to parse a string into a Json.\n- `values` — `(json: Json): Array<Json>` — Returns the values from the Json."
+  value: "```wing\nclass Json {\n  asBool(): bool;\n  asNum(): num;\n  asStr(): str;\n  get(): Json;\n  getAt(): Json;\n  has(): bool;\n  /* ... */\n}\n```\n---\nImmutable Json."
 range:
   start:
     line: 1
diff --git a/libs/wingc/src/lsp/snapshots/hovers/static_stdtype_method.snap b/libs/wingc/src/lsp/snapshots/hovers/static_stdtype_method.snap
index b5b0bed7a2a..80316b4e50a 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/static_stdtype_method.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/static_stdtype_method.snap
@@ -3,11 +3,11 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nstatic stringify: (json: any, options: JsonStringifyOptions?): str\n```\n---\nFormats Json as string.\n### Parameters\n- `json` — `any` — to format as string.\n- `...options` — `JsonStringifyOptions?`\n  \n  - `indent` — `num` — Indentation spaces number.\n\n### Returns\nstring representation of the Json"
+  value: "```wing\nstatic stringify(json: any, ...options: JsonStringifyOptions?): str\n```\n---\nFormats Json as string.\n\n#### Returns\nstring representation of the Json"
 range:
   start:
     line: 1
-    character: 0
+    character: 5
   end:
     line: 1
     character: 14
diff --git a/libs/wingc/src/lsp/snapshots/hovers/struct_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/struct_doc.snap
new file mode 100644
index 00000000000..a3c19a15423
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/struct_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nstruct Foo {\n  // No public members\n}\n```\n---\n Struct doc"
+range:
+  start:
+    line: 2
+    character: 9
+  end:
+    line: 2
+    character: 12
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/struct_field_doc.snap b/libs/wingc/src/lsp/snapshots/hovers/struct_field_doc.snap
new file mode 100644
index 00000000000..affa401135b
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/struct_field_doc.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\nfield: num\n```\n---\n Struct field doc"
+range:
+  start:
+    line: 3
+    character: 4
+  end:
+    line: 3
+    character: 9
+
diff --git a/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_annotation.snap b/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_annotation.snap
index faaa02cba65..6b13f2f31fc 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_annotation.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_annotation.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nclass Foo\n```\n---\n\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+  value: "```wing\nclass Foo {\n  // No public members\n}\n```"
 range:
   start:
     line: 2
diff --git a/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_property.snap b/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_property.snap
index fe9305daba1..c27d7bf34b3 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_property.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_property.snap
@@ -3,11 +3,11 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nstatic preflight static_method: preflight (): void\n```"
+  value: "```wing\nstatic preflight static_method(): void\n```"
 range:
   start:
     line: 4
-    character: 0
+    character: 4
   end:
     line: 4
     character: 17
diff --git a/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_type.snap b/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_type.snap
index 70be0d90362..12427da76ad 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_type.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/user_defined_type_reference_type.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nclass Foo\n```\n---\n\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+  value: "```wing\nclass Foo {\n  // No public members\n}\n```"
 range:
   start:
     line: 4
diff --git a/libs/wingc/src/lsp/snapshots/hovers/user_defined_types.snap b/libs/wingc/src/lsp/snapshots/hovers/user_defined_types.snap
index e984c1688d8..dcdd73534f3 100644
--- a/libs/wingc/src/lsp/snapshots/hovers/user_defined_types.snap
+++ b/libs/wingc/src/lsp/snapshots/hovers/user_defined_types.snap
@@ -3,7 +3,7 @@ source: libs/wingc/src/lsp/hover.rs
 ---
 contents:
   kind: markdown
-  value: "```wing\nclass Foo\n```\n---\n\n### Fields\n- `node` — `Node` — The tree node.\n### Methods\n- `isConstruct` — `preflight (x: any): bool` — Checks if `x` is a construct.\n- `onLift` — `preflight (host: IInflightHost, ops: Array<str>): void` — A hook called by the Wing compiler once for each inflight host that needs to use this resource inflight.\n- `toString` — `preflight (): str` — Returns a string representation of this construct."
+  value: "```wing\nclass Foo {\n  // No public members\n}\n```"
 range:
   start:
     line: 1
diff --git a/libs/wingc/src/lsp/snapshots/hovers/variadic_args.snap b/libs/wingc/src/lsp/snapshots/hovers/variadic_args.snap
new file mode 100644
index 00000000000..b5b91c403d4
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/hovers/variadic_args.snap
@@ -0,0 +1,14 @@
+---
+source: libs/wingc/src/lsp/hover.rs
+---
+contents:
+  kind: markdown
+  value: "```wing\npreflight addMany(...items: Array<str>): void\n```"
+range:
+  start:
+    line: 8
+    character: 6
+  end:
+    line: 8
+    character: 13
+
diff --git a/libs/wingc/src/lsp/snapshots/signature/class_super.snap b/libs/wingc/src/lsp/snapshots/signature/class_super.snap
new file mode 100644
index 00000000000..131e973ddbd
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/signature/class_super.snap
@@ -0,0 +1,12 @@
+---
+source: libs/wingc/src/lsp/signature.rs
+---
+signatures:
+  - label: "(hello: num): Base"
+    documentation:
+      kind: markdown
+      value: ""
+    parameters:
+      - label: "hello: num"
+    activeParameter: 0
+
diff --git a/libs/wingc/src/lsp/snapshots/signature/constructor_arg.snap b/libs/wingc/src/lsp/snapshots/signature/constructor_arg.snap
index f1a79843375..6b86677c6f7 100644
--- a/libs/wingc/src/lsp/snapshots/signature/constructor_arg.snap
+++ b/libs/wingc/src/lsp/snapshots/signature/constructor_arg.snap
@@ -5,11 +5,11 @@ signatures:
   - label: "(...props): Bucket"
     documentation:
       kind: markdown
-      value: "### Parameters\n- `...props` — `BucketProps?`\n  \n  - `public?` — `bool?` — Whether the bucket's objects should be publicly accessible."
+      value: ""
     parameters:
       - label: "...props"
         documentation:
           kind: markdown
-          value: "```wing\nstruct BucketProps\n```\n---\nOptions for `Bucket`.\n### Fields\n- `public?` — `bool?` — Whether the bucket's objects should be publicly accessible."
+          value: "```wing\nstruct BucketProps {\n  public?: bool;\n}\n```\n"
     activeParameter: 0
 
diff --git a/libs/wingc/src/lsp/snapshots/signature/empty_super.snap b/libs/wingc/src/lsp/snapshots/signature/empty_super.snap
new file mode 100644
index 00000000000..c1a9a4adb8c
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/signature/empty_super.snap
@@ -0,0 +1,11 @@
+---
+source: libs/wingc/src/lsp/signature.rs
+---
+signatures:
+  - label: "(): A"
+    documentation:
+      kind: markdown
+      value: ""
+    parameters: []
+    activeParameter: 0
+
diff --git a/libs/wingc/src/lsp/snapshots/signature/inflight_class_super.snap b/libs/wingc/src/lsp/snapshots/signature/inflight_class_super.snap
new file mode 100644
index 00000000000..3a637ac7751
--- /dev/null
+++ b/libs/wingc/src/lsp/snapshots/signature/inflight_class_super.snap
@@ -0,0 +1,12 @@
+---
+source: libs/wingc/src/lsp/signature.rs
+---
+signatures:
+  - label: "(sound: str): A"
+    documentation:
+      kind: markdown
+      value: ""
+    parameters:
+      - label: "sound: str"
+    activeParameter: 0
+
diff --git a/libs/wingc/src/lsp/snapshots/signature/named_arg_active.snap b/libs/wingc/src/lsp/snapshots/signature/named_arg_active.snap
index 8ca3aaf4291..d9895f0f06f 100644
--- a/libs/wingc/src/lsp/snapshots/signature/named_arg_active.snap
+++ b/libs/wingc/src/lsp/snapshots/signature/named_arg_active.snap
@@ -5,12 +5,15 @@ signatures:
   - label: "(key: str, ...opts): void"
     documentation:
       kind: markdown
-      value: "Delete an existing object using a key from the bucket.\n### Parameters\n- `key` — `str` — Key of the object.\n- `...opts` — `BucketDeleteOptions?` — Options available for delete an item from a bucket.\n  \n  - `mustExist?` — `bool?` — Check failures on the method and retrieve errors if any."
+      value: Delete an existing object using a key from the bucket.
     parameters:
       - label: "key: str"
+        documentation:
+          kind: markdown
+          value: "Key of the object.\n\n"
       - label: "...opts"
         documentation:
           kind: markdown
-          value: "```wing\nstruct BucketDeleteOptions\n```\n---\nOptions for `Bucket.delete()`.\n### Fields\n- `mustExist?` — `bool?` — Check failures on the method and retrieve errors if any."
+          value: "```wing\nstruct BucketDeleteOptions {\n  mustExist?: bool;\n}\n```\n"
     activeParameter: 1
 
diff --git a/libs/wingc/src/lsp/snapshots/signature/nested_class_calls.snap b/libs/wingc/src/lsp/snapshots/signature/nested_class_calls.snap
index 2c8322b4aee..7a3ccd03b76 100644
--- a/libs/wingc/src/lsp/snapshots/signature/nested_class_calls.snap
+++ b/libs/wingc/src/lsp/snapshots/signature/nested_class_calls.snap
@@ -5,12 +5,15 @@ signatures:
   - label: "(url: str, ...options): Response"
     documentation:
       kind: markdown
-      value: "Executes a GET request to a specified URL and provides a formatted response.\n### Parameters\n- `url` — `str` — The target URL for the GET request.\n- `...options` — `RequestOptions?` — Optional parameters for customizing the GET request.\n  \n  - `body?` — `str?` — Any body that you want to add to your request.\n  - `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n  - `headers?` — `Map<str>?` — Any headers you want to add to your request.\n  - `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n  - `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n  - `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL.\n\n### Returns\nthe formatted response of the call"
+      value: Executes a GET request to a specified URL and provides a formatted response.
     parameters:
       - label: "url: str"
+        documentation:
+          kind: markdown
+          value: "The target URL for the GET request.\n\n"
       - label: "...options"
         documentation:
           kind: markdown
-          value: "```wing\nstruct RequestOptions\n```\n---\nAn object containing any custom settings that you want to apply to the request.\n### Fields\n- `body?` — `str?` — Any body that you want to add to your request.\n- `cache?` — `RequestCache?` — The cache mode you want to use for the request.\n- `headers?` — `Map<str>?` — Any headers you want to add to your request.\n- `method?` — `HttpMethod?` — The request method, e.g., GET, POST. The default is GET.\n- `redirect?` — `RequestRedirect?` — The redirect mode to use: follow, error.\n- `referrer?` — `str?` — A string specifying \"no-referrer\", client, or a URL."
+          value: "```wing\nstruct RequestOptions {\n  body?: str;\n  cache?: RequestCache;\n  headers?: Map<str>;\n  method?: HttpMethod;\n  redirect?: RequestRedirect;\n  referrer?: str;\n}\n```\n"
     activeParameter: 0
 
diff --git a/libs/wingc/src/lsp/snapshots/signature/second_arg_active.snap b/libs/wingc/src/lsp/snapshots/signature/second_arg_active.snap
index f0bc836a384..2124e2e73a7 100644
--- a/libs/wingc/src/lsp/snapshots/signature/second_arg_active.snap
+++ b/libs/wingc/src/lsp/snapshots/signature/second_arg_active.snap
@@ -5,7 +5,7 @@ signatures:
   - label: "(key: str, body: str): void"
     documentation:
       kind: markdown
-      value: "Add a file to the bucket that is uploaded when the app is deployed.\n### Parameters\n- `key` — `str`\n- `body` — `str`\n\n### Remarks\nTODO: In the future this will support uploading any `Blob` type or\nreferencing a file from the local filesystem."
+      value: Add a file to the bucket that is uploaded when the app is deployed.
     parameters:
       - label: "key: str"
       - label: "body: str"
diff --git a/libs/wingc/src/lsp/snapshots/signature/single_arg_builtin.snap b/libs/wingc/src/lsp/snapshots/signature/single_arg_builtin.snap
deleted file mode 100644
index a29aca3ff13..00000000000
--- a/libs/wingc/src/lsp/snapshots/signature/single_arg_builtin.snap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-source: libs/wingc/src/lsp/signature.rs
----
-signatures:
-  - label: "(0: str?): str"
-    parameters:
-      - label: "0: str?"
-    activeParameter: 0
-
diff --git a/libs/wingc/src/lsp/symbol_locator.rs b/libs/wingc/src/lsp/symbol_locator.rs
index 1ebb62b8a00..9bdbd0b0b20 100644
--- a/libs/wingc/src/lsp/symbol_locator.rs
+++ b/libs/wingc/src/lsp/symbol_locator.rs
@@ -10,7 +10,7 @@ use crate::{
 };
 
 #[derive(Debug)]
-/// Result of using the [SymbolLocato]
+/// Result of using the [SymbolLocator]
 pub enum SymbolLocatorResult {
 	NotFound,
 	/// Simple symbol reference
@@ -43,6 +43,11 @@ pub enum SymbolLocatorResult {
 		field_type: TypeRef,
 		field: Symbol,
 	},
+	/// Intrinsic
+	Intrinsic {
+		name: Symbol,
+		kind: IntrinsicKind,
+	},
 }
 
 pub struct SymbolLocator<'a> {
@@ -121,7 +126,8 @@ impl<'a> SymbolLocator<'a> {
 			| Type::Unresolved
 			| Type::Inferred(_)
 			| Type::Function(_)
-			| Type::Enum(_) => None,
+			| Type::Enum(_)
+			| Type::Stringable => None,
 
 			Type::Array(_)
 			| Type::MutArray(_)
@@ -184,6 +190,7 @@ impl<'a> SymbolLocator<'a> {
 			}
 			SymbolLocatorResult::StructField { struct_type, field } => self.lookup_property_on_type(&struct_type, field),
 			SymbolLocatorResult::LooseField { .. } => None,
+			SymbolLocatorResult::Intrinsic { name, .. } => Some(self.types.intrinsics.lookup_ext(name, None)),
 		}
 	}
 
@@ -194,9 +201,10 @@ impl<'a> SymbolLocator<'a> {
 			SymbolLocatorResult::Symbol(symbol) => Some(&symbol.span),
 			SymbolLocatorResult::StructField { field, .. } => Some(&field.span),
 			SymbolLocatorResult::LooseField { field, .. } => Some(&field.span),
-			SymbolLocatorResult::TypePropertyReference { span, .. }
-			| SymbolLocatorResult::ObjectPropertyReference { span, .. }
-			| SymbolLocatorResult::TypeReference { span, .. } => Some(&span),
+			SymbolLocatorResult::TypePropertyReference { property, .. }
+			| SymbolLocatorResult::ObjectPropertyReference { property, .. } => Some(&property.span),
+			SymbolLocatorResult::TypeReference { span, .. } => Some(&span),
+			SymbolLocatorResult::Intrinsic { name, .. } => Some(&name.span),
 		}
 	}
 }
@@ -217,18 +225,18 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 			return;
 		}
 
-		self.ctx.push_stmt(node.idx);
+		self.ctx.push_stmt(node);
 
 		// Handle situations where symbols are actually defined in inner scopes
 		match &node.kind {
-			StmtKind::Struct { name, fields, .. } => {
-				let Some(struct_env) = self.get_env_from_classlike_symbol(name) else {
+			StmtKind::Struct(st) => {
+				let Some(struct_env) = self.get_env_from_classlike_symbol(&st.name) else {
 					return;
 				};
 
 				self.ctx.push_env(struct_env);
 
-				for field in fields {
+				for field in &st.fields {
 					self.visit_symbol(&field.name);
 				}
 
@@ -274,9 +282,11 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 				self.ctx.pop_env();
 
 				for elif in elif_statements {
-					self.push_scope_env(&elif.statements);
-					self.visit_symbol(&elif.var_name);
-					self.ctx.pop_env();
+					if let Elifs::ElifLetBlock(elif_let_block) = elif {
+						self.push_scope_env(&elif_let_block.statements);
+						self.visit_symbol(&elif_let_block.var_name);
+						self.ctx.pop_env();
+					}
 				}
 			}
 			_ => {}
@@ -295,7 +305,34 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 		self.ctx.push_expr(node.id);
 
 		match &node.kind {
-			ExprKind::New(new_expr) => {
+			ExprKind::New(new_expr) => 'new_expr: {
+				let class_type = self.types.get_expr_type(node);
+				let Some(class_type) = class_type.as_class() else {
+					break 'new_expr;
+				};
+				let Some(class_phase) = self.types.get_expr_phase(node) else {
+					break 'new_expr;
+				};
+				let init_symb = Symbol::new(
+					match class_phase {
+						Phase::Inflight => CLASS_INFLIGHT_INIT_NAME,
+						Phase::Preflight | Phase::Independent => CLASS_INIT_NAME,
+					},
+					new_expr.class.span(),
+				);
+
+				if new_expr.class.span.contains_location(&self.location) {
+					let class_env = class_type.get_env().get_ref();
+
+					self.ctx.push_env(class_env);
+
+					self.set_result(SymbolLocatorResult::Symbol(init_symb));
+
+					self.ctx.pop_env();
+
+					return;
+				}
+
 				let found_named_arg = new_expr
 					.arg_list
 					.named_args
@@ -304,18 +341,7 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 
 				if let Some((arg_name, ..)) = found_named_arg {
 					// we need to get the struct type from the class constructor
-					let class_type = self.types.get_expr_type(node);
-					let Some(class_phase) = self.types.get_expr_phase(node) else {
-						return;
-					};
-					let Some(class_type) = class_type.as_class() else {
-						return;
-					};
-					let init_info = match class_phase {
-						Phase::Inflight => class_type.get_method(&Symbol::global(CLASS_INFLIGHT_INIT_NAME)),
-						Phase::Preflight => class_type.get_method(&Symbol::global(CLASS_INIT_NAME)),
-						Phase::Independent => panic!("Cannot get hover info for independent class"),
-					};
+					let init_info = class_type.get_method(&init_symb);
 					if let Some(var_info) = init_info {
 						if let Some(func) = var_info.type_.maybe_unwrap_option().as_function_sig() {
 							if let Some(arg) = func.parameters.last() {
@@ -329,6 +355,14 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 					}
 				}
 			}
+			ExprKind::Intrinsic(intrinsic) => {
+				if intrinsic.name.span.contains_location(&self.location) {
+					self.set_result(SymbolLocatorResult::Intrinsic {
+						kind: intrinsic.kind.clone(),
+						name: intrinsic.name.clone(),
+					});
+				}
+			}
 			ExprKind::Call { arg_list, callee } => {
 				let x = arg_list
 					.named_args
@@ -399,6 +433,13 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 			return;
 		}
 
+		// if let Some(name) = &node.name {
+		// 	self.visit_symbol(name);
+		// 	if self.is_found() {
+		// 		return;
+		// 	}
+		// }
+
 		if let FunctionBody::Statements(scope) = &node.body {
 			self.push_scope_env(scope);
 			for param in &node.signature.parameters {
@@ -428,6 +469,14 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 			self.visit_symbol(&method.0);
 		}
 
+		if let Some(ctor_name) = &node.initializer.name {
+			self.visit_symbol(ctor_name);
+		}
+
+		if let Some(ctor_name) = &node.inflight_initializer.name {
+			self.visit_symbol(ctor_name);
+		}
+
 		self.ctx.pop_env();
 
 		visit_class(self, node);
@@ -462,6 +511,9 @@ impl<'a> Visit<'a> for SymbolLocator<'a> {
 					self.visit_user_defined_type(type_name);
 				}
 			}
+			Reference::ElementAccess { object, .. } => {
+				self.visit_expr(object);
+			}
 		}
 
 		visit_reference(self, node);
diff --git a/libs/wingc/src/lsp/sync.rs b/libs/wingc/src/lsp/sync.rs
index 7c132549540..9ed4f84eaa2 100644
--- a/libs/wingc/src/lsp/sync.rs
+++ b/libs/wingc/src/lsp/sync.rs
@@ -120,7 +120,7 @@ pub fn on_document_did_change(params: DidChangeTextDocumentParams) {
 fn partial_compile(
 	source_path: &Path,
 	source_text: String,
-	mut types: &mut Types, // TODO: does this need to be shared between recompiles?
+	mut types: &mut Types,
 	jsii_types: &mut TypeSystem,
 	project_data: &mut ProjectData,
 ) {
@@ -144,29 +144,28 @@ fn partial_compile(
 	// Transform all inflight closures defined in preflight into single-method resources
 	for file in &topo_sorted_files {
 		let mut inflight_transformer = ClosureTransformer::new();
-		let scope = project_data.asts.remove(file).unwrap();
+		let scope = project_data.asts.swap_remove(file).unwrap();
 		let new_scope = inflight_transformer.fold_scope(scope);
 		project_data.asts.insert(file.clone(), new_scope);
 	}
 
 	// Reset all type information
-	types.reset_expr_types();
-	types.reset_scope_envs();
+	*types = Types::new();
+	project_data.jsii_imports.clear();
 
 	// -- TYPECHECKING PHASE --
-	let mut jsii_imports = vec![];
 
 	// Type check all files in topological order (start with files that don't require any other
 	// Wing files, then move on to files that depend on those, etc.)
 	for file in &topo_sorted_files {
-		let mut scope = project_data.asts.remove(file).expect("matching AST not found");
+		let mut scope = project_data.asts.swap_remove(file).expect("matching AST not found");
 		type_check(
 			&mut scope,
 			&mut types,
 			&file,
 			&project_data.file_graph,
 			jsii_types,
-			&mut jsii_imports,
+			&mut project_data.jsii_imports,
 		);
 
 		// Make sure all type reference are no longer considered references
@@ -186,10 +185,17 @@ fn partial_compile(
 
 	// -- LIFTING PHASE --
 
-	let jsifier = JSifier::new(&mut types, &project_data.files, &project_data.file_graph, &source_path);
+	let jsifier = JSifier::new(
+		&mut types,
+		&project_data.files,
+		&project_data.file_graph,
+		&source_path,
+		// out_dir will not be used
+		&source_path,
+	);
 	for file in &topo_sorted_files {
 		let mut lift = LiftVisitor::new(&jsifier);
-		let scope = project_data.asts.remove(file).expect("matching AST not found");
+		let scope = project_data.asts.swap_remove(file).expect("matching AST not found");
 		lift.visit_scope(&scope);
 		project_data.asts.insert(file.clone(), scope);
 	}
@@ -203,6 +209,7 @@ pub fn check_utf8(path: PathBuf) -> Utf8PathBuf {
 
 #[cfg(test)]
 pub mod test_utils {
+	use regex::Regex;
 	use std::{fs, str::FromStr};
 	use uuid::Uuid;
 
@@ -280,24 +287,27 @@ pub mod test_utils {
 	/// Finds all ranges in the document starting with `//-`
 	pub fn get_ranges(content: &str) -> Vec<Range> {
 		let lines = content.lines();
+		let regex = Regex::new(r"\/\/[-^]+").unwrap();
 
 		let mut ranges = vec![];
 		for line in lines.enumerate() {
 			if line.1.contains("//-") {
-				let start_col = line.1.match_indices("//-").next().unwrap().0 + 2;
-				let end_col = line.1.len();
-				let line_num = line.0 - 1;
-
-				ranges.push(Range {
-					start: Position {
-						line: line_num as u32,
-						character: start_col as u32,
-					},
-					end: Position {
-						line: line_num as u32,
-						character: end_col as u32,
-					},
-				});
+				for i in regex.find_iter(line.1) {
+					let start_col = i.start() + 2;
+					let end_col = i.end();
+					let line_num = line.0 - 1;
+
+					ranges.push(Range {
+						start: Position {
+							line: line_num as u32,
+							character: start_col as u32,
+						},
+						end: Position {
+							line: line_num as u32,
+							character: end_col as u32,
+						},
+					});
+				}
 			}
 		}
 
diff --git a/libs/wingc/src/parser.rs b/libs/wingc/src/parser.rs
index 3af59c5a43d..d9662107e6f 100644
--- a/libs/wingc/src/parser.rs
+++ b/libs/wingc/src/parser.rs
@@ -1,22 +1,25 @@
 use camino::{Utf8Component, Utf8Path, Utf8PathBuf};
-use indexmap::{IndexMap, IndexSet};
+use indexmap::IndexMap;
 use itertools::Itertools;
 use phf::{phf_map, phf_set};
 use regex::Regex;
 use std::cell::RefCell;
 use std::collections::HashSet;
+use std::ops::Range;
 use std::{fs, str, vec};
 use tree_sitter::Node;
-use tree_sitter_traversal::{traverse, Order};
 
 use crate::ast::{
 	AccessModifier, ArgList, AssignmentKind, BinaryOperator, BringSource, CalleeKind, CatchBlock, Class, ClassField,
-	ElifBlock, ElifLetBlock, Expr, ExprKind, FunctionBody, FunctionDefinition, FunctionParameter, FunctionSignature,
-	IfLet, Interface, InterpolatedString, InterpolatedStringPart, Literal, New, Phase, Reference, Scope, Spanned, Stmt,
-	StmtKind, StructField, Symbol, TypeAnnotation, TypeAnnotationKind, UnaryOperator, UserDefinedType,
+	ElifBlock, ElifLetBlock, Elifs, Enum, ExplicitLift, Expr, ExprKind, FunctionBody, FunctionDefinition,
+	FunctionParameter, FunctionSignature, IfLet, Interface, InterpolatedString, InterpolatedStringPart, Intrinsic,
+	IntrinsicKind, LiftQualification, Literal, New, Phase, Reference, Scope, Spanned, Stmt, StmtKind, Struct,
+	StructField, Symbol, TypeAnnotation, TypeAnnotationKind, UnaryOperator, UserDefinedType,
 };
 use crate::comp_ctx::{CompilationContext, CompilationPhase};
-use crate::diagnostic::{report_diagnostic, Diagnostic, DiagnosticResult, WingSpan, ERR_EXPECTED_SEMICOLON};
+use crate::diagnostic::{
+	report_diagnostic, Diagnostic, DiagnosticResult, WingLocation, WingSpan, ERR_EXPECTED_SEMICOLON,
+};
 use crate::file_graph::FileGraph;
 use crate::files::Files;
 use crate::type_check::{CLASS_INFLIGHT_INIT_NAME, CLASS_INIT_NAME};
@@ -113,7 +116,6 @@ static RESERVED_WORDS: phf::Set<&'static str> = phf_set! {
 	"inflight",
 	"preflight",
 	"elif",
-	"init",
 	"any",
 	"num",
 	"str",
@@ -238,7 +240,7 @@ fn parse_wing_file(
 
 	let language = tree_sitter_wing::language();
 	let mut tree_sitter_parser = tree_sitter::Parser::new();
-	tree_sitter_parser.set_language(language).unwrap();
+	tree_sitter_parser.set_language(&language).unwrap();
 
 	let tree_sitter_tree = match tree_sitter_parser.parse(&source_text.as_bytes(), None) {
 		Some(tree) => tree,
@@ -345,7 +347,7 @@ fn parse_wing_directory(
 
 	// Create a fake AST (since the directory doesn't have any source code to parse)
 	let mut tree_sitter_parser = tree_sitter::Parser::new();
-	tree_sitter_parser.set_language(tree_sitter_wing::language()).unwrap();
+	tree_sitter_parser.set_language(&tree_sitter_wing::language()).unwrap();
 	let tree_sitter_tree = tree_sitter_parser.parse("", None).unwrap();
 	let scope = Scope::empty();
 	let dependent_wing_paths = files_and_dirs;
@@ -483,6 +485,10 @@ impl<'s> Parser<'s> {
 		return str::from_utf8(&self.source[node.byte_range()]).unwrap();
 	}
 
+	fn node_text_from_range(&self, byte_range: Range<usize>) -> &str {
+		return str::from_utf8(&self.source[byte_range]).unwrap();
+	}
+
 	fn check_error<'a>(&'a self, node: Node<'a>, expected: &str) -> DiagnosticResult<Node> {
 		if node.is_error() {
 			self.with_error(format!("Expected {}", expected), &node)
@@ -493,7 +499,7 @@ impl<'s> Parser<'s> {
 
 	fn get_child_field<'a>(&'a self, node: &'a Node<'a>, field: &str) -> DiagnosticResult<Node> {
 		let checked_node = self.check_error(*node, field)?;
-		let child = checked_node.child_by_field_name(field);
+		let child = get_actual_child_by_field_name(checked_node, field);
 		if let Some(child) = child {
 			self.check_error(child, field)
 		} else {
@@ -548,11 +554,11 @@ impl<'s> Parser<'s> {
 					}),
 					span.clone(),
 				))),
-				arg_list: ArgList {
-					pos_args: vec![Expr::new(ExprKind::Literal(Literal::Number(seconds)), span.clone())],
-					named_args: IndexMap::new(),
-					span: span.clone(),
-				},
+				arg_list: ArgList::new(
+					vec![Expr::new(ExprKind::Literal(Literal::Number(seconds)), span.clone())],
+					IndexMap::new(),
+					span.clone(),
+				),
 			},
 			span.clone(),
 		))
@@ -564,6 +570,8 @@ impl<'s> Parser<'s> {
 			start: node_range.start_point.into(),
 			end: node_range.end_point.into(),
 			file_id: self.source_name.to_string(),
+			start_offset: node_range.start_byte,
+			end_offset: node_range.end_byte,
 		}
 	}
 
@@ -572,16 +580,31 @@ impl<'s> Parser<'s> {
 		CompilationContext::set(CompilationPhase::Parsing, &span);
 		let mut cursor = scope_node.walk();
 
-		let statements = scope_node
-			.named_children(&mut cursor)
-			.filter(|child| !child.is_extra() && child.kind() != "AUTOMATIC_BLOCK")
-			.enumerate()
-			.filter_map(|(i, st_node)| self.build_statement(&st_node, i, phase).ok())
-			.collect();
+		let mut statements = vec![];
+		let mut doc_builder = DocBuilder::new(self);
+
+		for child in scope_node.named_children(&mut cursor) {
+			let DocBuilderResult::Done(doc) = doc_builder.process_node(&child) else {
+				continue;
+			};
+			if child.kind() == "AUTOMATIC_BLOCK" {
+				continue;
+			}
+
+			if let Ok(stmt) = self.build_statement(&child, statements.len(), phase, doc) {
+				statements.push(stmt);
+			}
+		}
 		Scope::new(statements, span)
 	}
 
-	fn build_statement(&self, statement_node: &Node, idx: usize, phase: Phase) -> DiagnosticResult<Stmt> {
+	fn build_statement(
+		&self,
+		statement_node: &Node,
+		idx: usize,
+		phase: Phase,
+		doc: Option<String>,
+	) -> DiagnosticResult<Stmt> {
 		let span = self.node_span(statement_node);
 		CompilationContext::set(CompilationPhase::Parsing, &span);
 		let stmt_kind = match statement_node.kind() {
@@ -617,7 +640,8 @@ impl<'s> Parser<'s> {
 			"struct_definition" => self.build_struct_definition_statement(statement_node, phase)?,
 			"test_statement" => self.build_test_statement(statement_node)?,
 			"compiler_dbg_env" => StmtKind::CompilerDebugEnv,
-			"super_constructor_statement" => self.build_super_constructor_statement(statement_node, phase, idx)?,
+			"super_constructor_statement" => self.build_super_constructor_statement(statement_node, phase)?,
+			"lift_statement" => self.build_lift_statement(statement_node, phase)?,
 			"ERROR" => return self.with_error("Expected statement", statement_node),
 			other => return self.report_unimplemented_grammar(other, "statement", statement_node),
 		};
@@ -626,12 +650,54 @@ impl<'s> Parser<'s> {
 			kind: stmt_kind,
 			span,
 			idx,
+			doc,
 		})
 	}
 
+	fn build_lift_statement(&self, statement_node: &Node, phase: Phase) -> DiagnosticResult<StmtKind> {
+		// Lift statements are only legal in inflight
+		if phase != Phase::Inflight {
+			return self.with_error("Lift blocks are only allowed in inflight phase", statement_node);
+		}
+
+		let lift_qualifications_node = statement_node.child_by_field_name("lift_qualifications").unwrap();
+		let statements = self.build_scope(&statement_node.child_by_field_name("block").unwrap(), phase);
+
+		let mut qualifications = vec![];
+
+		let mut qual_cursor = lift_qualifications_node
+			.child_by_field_name("qualification")
+			.unwrap()
+			.walk();
+
+		for qual_node in lift_qualifications_node.named_children(&mut qual_cursor) {
+			let obj = self.build_expression(&qual_node.child_by_field_name("obj").unwrap(), phase)?;
+			let mut ops = vec![];
+			for op_node in get_actual_children_by_field_name(qual_node, "ops") {
+				ops.push(self.node_symbol(&op_node)?);
+			}
+			qualifications.push(LiftQualification { obj, ops });
+		}
+
+		Ok(StmtKind::ExplicitLift(ExplicitLift {
+			qualifications,
+			statements,
+		}))
+	}
+
 	fn build_try_catch_statement(&self, statement_node: &Node, phase: Phase) -> DiagnosticResult<StmtKind> {
 		let try_statements = self.build_scope(&statement_node.child_by_field_name("block").unwrap(), phase);
 		let catch_block = if let Some(catch_block) = statement_node.child_by_field_name("catch_block") {
+			if let Some(parenthesized_identifier) = statement_node.child_by_field_name("parenthesized_exception_identifier") {
+				return self.with_error::<StmtKind>(
+					format!(
+						"Unexpected parentheses in catch block. Use 'catch {}' instead of 'catch {}'.",
+						self.node_text(&parenthesized_identifier.child(1).expect("no identifier found")),
+						self.node_text(&parenthesized_identifier)
+					),
+					&parenthesized_identifier,
+				);
+			}
 			Some(CatchBlock {
 				statements: self.build_scope(&catch_block, phase),
 				exception_var: if let Some(exception_var_node) = statement_node.child_by_field_name("exception_identifier") {
@@ -734,17 +800,31 @@ impl<'s> Parser<'s> {
 
 		let mut elif_vec = vec![];
 		let mut cursor = statement_node.walk();
-		for node in statement_node.children_by_field_name("elif_let_block", &mut cursor) {
-			let statements = self.build_scope(&node.child_by_field_name("block").unwrap(), phase);
-			let value = self.build_expression(&node.child_by_field_name("value").unwrap(), phase)?;
-			let name = self.check_reserved_symbol(&node.child_by_field_name("name").unwrap())?;
-			let elif = ElifLetBlock {
-				reassignable: node.child_by_field_name("reassignable").is_some(),
-				statements: statements,
-				value: value,
-				var_name: name,
-			};
-			elif_vec.push(elif);
+		for node in statement_node.children(&mut cursor) {
+			match node.kind() {
+				"elif_let_block" => {
+					let statements = self.build_scope(&node.child_by_field_name("block").unwrap(), phase);
+					let value = self.build_expression(&node.child_by_field_name("value").unwrap(), phase)?;
+					let name = self.check_reserved_symbol(&node.child_by_field_name("name").unwrap())?;
+					let elif = Elifs::ElifLetBlock(ElifLetBlock {
+						reassignable: node.child_by_field_name("reassignable").is_some(),
+						statements: statements,
+						value: value,
+						var_name: name,
+					});
+					elif_vec.push(elif);
+				}
+				"elif_block" => {
+					let conditions = self.build_expression(&node.child_by_field_name("condition").unwrap(), phase);
+					let statements = self.build_scope(&node.child_by_field_name("block").unwrap(), phase);
+					let elif = Elifs::ElifBlock(ElifBlock {
+						condition: conditions.unwrap(),
+						statements: statements,
+					});
+					elif_vec.push(elif);
+				}
+				_ => {}
+			}
 		}
 
 		let else_block = if let Some(else_block) = statement_node.child_by_field_name("else_block") {
@@ -816,18 +896,27 @@ impl<'s> Parser<'s> {
 		let mut cursor = statement_node.walk();
 		let mut members = vec![];
 
-		for field_node in statement_node.children_by_field_name("field", &mut cursor) {
+		let mut doc_builder = DocBuilder::new(self);
+
+		for field_node in statement_node.named_children(&mut cursor) {
+			let DocBuilderResult::Done(doc) = doc_builder.process_node(&field_node) else {
+				continue;
+			};
+			if field_node.kind() != "struct_field" {
+				continue;
+			}
 			let identifier = self.node_symbol(&self.get_child_field(&field_node, "name")?)?;
 			let type_ = self.get_child_field(&field_node, "type").ok();
 			let f = StructField {
 				name: identifier,
 				member_type: self.build_type_annotation(type_, phase)?,
+				doc,
 			};
 			members.push(f);
 		}
 
 		let mut extends = vec![];
-		for super_node in statement_node.children_by_field_name("extends", &mut cursor) {
+		for super_node in get_actual_children_by_field_name(*statement_node, "extends") {
 			let super_type = self.build_type_annotation(Some(super_node), phase)?;
 			match super_type.kind {
 				TypeAnnotationKind::UserDefined(t) => {
@@ -851,16 +940,16 @@ impl<'s> Parser<'s> {
 			)?;
 		}
 
-		Ok(StmtKind::Struct {
+		Ok(StmtKind::Struct(Struct {
 			name,
 			extends,
 			fields: members,
 			access,
-		})
+		}))
 	}
 
 	fn build_variable_def_statement(&self, statement_node: &Node, phase: Phase) -> DiagnosticResult<StmtKind> {
-		let type_ = if let Some(type_node) = statement_node.child_by_field_name("type") {
+		let type_ = if let Some(type_node) = get_actual_child_by_field_name(*statement_node, "type") {
 			Some(self.build_type_annotation(Some(type_node), phase)?)
 		} else {
 			None
@@ -933,10 +1022,7 @@ impl<'s> Parser<'s> {
 				// parse error if no alias is provided
 				let module = if let Some(alias) = alias {
 					Ok(StmtKind::Bring {
-						source: BringSource::WingFile(Symbol {
-							name: source_path.to_string(),
-							span: module_name.span,
-						}),
+						source: BringSource::WingFile(source_path),
 						identifier: Some(alias),
 					})
 				} else {
@@ -958,10 +1044,7 @@ impl<'s> Parser<'s> {
 				// parse error if no alias is provided
 				let module = if let Some(alias) = alias {
 					Ok(StmtKind::Bring {
-						source: BringSource::Directory(Symbol {
-							name: source_path.to_string(),
-							span: module_name.span,
-						}),
+						source: BringSource::Directory(source_path),
 						identifier: Some(alias),
 					})
 				} else {
@@ -1098,8 +1181,13 @@ impl<'s> Parser<'s> {
 		}
 
 		let mut cursor = statement_node.walk();
-		let mut values = IndexSet::<Symbol>::new();
+		let mut values = IndexMap::<Symbol, Option<String>>::new();
+		let mut doc_builder = DocBuilder::new(self);
+
 		for node in statement_node.named_children(&mut cursor) {
+			let DocBuilderResult::Done(value_doc) = doc_builder.process_node(&node) else {
+				continue;
+			};
 			if node.kind() != "enum_field" {
 				continue;
 			}
@@ -1111,8 +1199,7 @@ impl<'s> Parser<'s> {
 			}
 
 			let symbol = diagnostic.unwrap();
-			let success = values.insert(symbol.clone());
-			if !success {
+			if values.insert(symbol.clone(), value_doc).is_some() {
 				self
 					.with_error::<Node>(format!("Duplicated enum value {}", symbol.name), &node)
 					.err();
@@ -1128,11 +1215,11 @@ impl<'s> Parser<'s> {
 			)?;
 		}
 
-		Ok(StmtKind::Enum {
+		Ok(StmtKind::Enum(Enum {
 			name: name.unwrap(),
 			values,
 			access,
-		})
+		}))
 	}
 
 	fn get_modifier<'a>(&'a self, modifier: &str, maybe_modifiers: &'a Option<Node>) -> DiagnosticResult<Option<Node>> {
@@ -1172,21 +1259,26 @@ impl<'s> Parser<'s> {
 		let mut initializer = None;
 		let mut inflight_initializer = None;
 		let name = self.check_reserved_symbol(&statement_node.child_by_field_name("name").unwrap())?;
+
+		let mut doc_builder = DocBuilder::new(self);
+
 		for class_element in statement_node
 			.child_by_field_name("implementation")
 			.unwrap()
 			.named_children(&mut cursor)
 		{
-			if class_element.is_extra() {
+			let DocBuilderResult::Done(doc) = doc_builder.process_node(&class_element) else {
 				continue;
-			}
+			};
+
 			match class_element.kind() {
 				"method_definition" => {
 					let Ok(method_name) = self.node_symbol(&class_element.child_by_field_name("name").unwrap()) else {
 						continue;
 					};
 
-					let Ok(func_def) = self.build_function_definition(Some(method_name.clone()), &class_element, class_phase)
+					let Ok(func_def) =
+						self.build_function_definition(Some(method_name.clone()), &class_element, class_phase, false, doc)
 					else {
 						continue;
 					};
@@ -1201,7 +1293,7 @@ impl<'s> Parser<'s> {
 					methods.push((method_name, func_def))
 				}
 				"class_field" => {
-					let Ok(class_field) = self.build_class_field(class_element, class_phase) else {
+					let Ok(class_field) = self.build_class_field(class_element, class_phase, doc) else {
 						continue;
 					};
 
@@ -1215,23 +1307,23 @@ impl<'s> Parser<'s> {
 					if initializer.is_some() && !is_inflight {
 						self
 							.with_error::<Node>(
-								format!("Multiple initializers defined in class {}", name.name),
+								format!("Multiple constructors defined in class {}", name.name),
 								&class_element,
 							)
 							.err();
 					} else if inflight_initializer.is_some() && is_inflight {
 						self
 							.with_error::<Node>(
-								format!("Multiple inflight initializers defined in class {}", name.name),
+								format!("Multiple inflight constructors defined in class {}", name.name),
 								&class_element,
 							)
 							.err();
 					}
 					let parameters_node = class_element.child_by_field_name("parameter_list").unwrap();
-					let parameters = self.build_parameter_list(&parameters_node, class_phase)?;
+					let parameters = self.build_parameter_list(&parameters_node, class_phase, false)?;
 					if !parameters.is_empty() && is_inflight && class_phase == Phase::Preflight {
 						self
-							.with_error::<Node>("Inflight initializers cannot have parameters", &parameters_node)
+							.with_error::<Node>("Inflight constructors cannot have parameters", &parameters_node)
 							.err();
 					}
 
@@ -1244,9 +1336,11 @@ impl<'s> Parser<'s> {
 						span: self.node_span(&class_element),
 					});
 
+					let ctor_symb_span = self.node_span(&class_element.child_by_field_name("ctor_name").unwrap());
+
 					if is_inflight {
 						inflight_initializer = Some(FunctionDefinition {
-							name: Some(CLASS_INFLIGHT_INIT_NAME.into()),
+							name: Some(Symbol::new(CLASS_INFLIGHT_INIT_NAME, ctor_symb_span)),
 							body: FunctionBody::Statements(
 								self.build_scope(&class_element.child_by_field_name("block").unwrap(), Phase::Inflight),
 							),
@@ -1258,10 +1352,11 @@ impl<'s> Parser<'s> {
 							is_static: false,
 							span: self.node_span(&class_element),
 							access: AccessModifier::Public,
+							doc,
 						})
 					} else {
 						initializer = Some(FunctionDefinition {
-							name: Some(CLASS_INIT_NAME.into()),
+							name: Some(Symbol::new(CLASS_INIT_NAME, ctor_symb_span)),
 							body: FunctionBody::Statements(
 								self.build_scope(&class_element.child_by_field_name("block").unwrap(), Phase::Preflight),
 							),
@@ -1273,6 +1368,7 @@ impl<'s> Parser<'s> {
 							},
 							span: self.node_span(&class_element),
 							access: AccessModifier::Public,
+							doc,
 						})
 					}
 				}
@@ -1290,7 +1386,7 @@ impl<'s> Parser<'s> {
 		for method in &methods {
 			if method.0.name == "constructor" {
 				Diagnostic::new(
-					"Reserved method name. Initializers are declared with \"init\"",
+					"Reserved method name. Constructors are declared with a method named \"new\"",
 					&method.0,
 				)
 				.report();
@@ -1308,16 +1404,17 @@ impl<'s> Parser<'s> {
 						kind: TypeAnnotationKind::UserDefined(UserDefinedType {
 							root: name.clone(),
 							fields: vec![],
-							span: WingSpan::default(),
+							span: name.span(),
 						}),
-						span: WingSpan::default(),
+						span: name.span(),
 					}),
 					phase: Phase::Preflight,
 				},
-				body: FunctionBody::Statements(Scope::new(vec![], WingSpan::default())),
+				body: FunctionBody::Statements(Scope::new(vec![], name.span())),
 				is_static: false,
-				span: WingSpan::default(),
+				span: name.span(),
 				access: AccessModifier::Public,
+				doc: None,
 			},
 		};
 
@@ -1333,20 +1430,21 @@ impl<'s> Parser<'s> {
 						kind: TypeAnnotationKind::UserDefined(UserDefinedType {
 							root: name.clone(),
 							fields: vec![],
-							span: WingSpan::default(),
+							span: name.span(),
 						}),
-						span: WingSpan::default(),
+						span: name.span(),
 					}),
 					phase: Phase::Inflight,
 				},
-				body: FunctionBody::Statements(Scope::new(vec![], WingSpan::default())),
+				body: FunctionBody::Statements(Scope::new(vec![], name.span())),
 				is_static: false,
-				span: WingSpan::default(),
+				span: name.span(),
 				access: AccessModifier::Public,
+				doc: None,
 			},
 		};
 
-		let parent = if let Some(parent_node) = statement_node.child_by_field_name("parent") {
+		let parent = if let Some(parent_node) = get_actual_child_by_field_name(*statement_node, "parent") {
 			let parent_type = self.build_type_annotation(Some(parent_node), class_phase)?;
 			match parent_type.kind {
 				TypeAnnotationKind::UserDefined(parent_type) => Some(parent_type),
@@ -1363,17 +1461,7 @@ impl<'s> Parser<'s> {
 		};
 
 		let mut implements = vec![];
-		for type_node in statement_node.children_by_field_name("implements", &mut cursor) {
-			// ignore comments
-			if type_node.is_extra() {
-				continue;
-			}
-
-			// ignore commas
-			if !type_node.is_named() {
-				continue;
-			}
-
+		for type_node in get_actual_children_by_field_name(*statement_node, "implements") {
 			let interface_type = self.build_type_annotation(Some(type_node), class_phase)?;
 			match interface_type.kind {
 				TypeAnnotationKind::UserDefined(interface_type) => implements.push(interface_type),
@@ -1410,10 +1498,16 @@ impl<'s> Parser<'s> {
 			phase: class_phase,
 			inflight_initializer,
 			access,
+			auto_id: false,
 		}))
 	}
 
-	fn build_class_field(&self, class_element: Node<'_>, class_phase: Phase) -> Result<ClassField, ()> {
+	fn build_class_field(
+		&self,
+		class_element: Node<'_>,
+		class_phase: Phase,
+		doc: Option<String>,
+	) -> Result<ClassField, ()> {
 		let modifiers = class_element.child_by_field_name("modifiers");
 		let is_static = self.get_modifier("static", &modifiers)?.is_some();
 		if is_static {
@@ -1430,11 +1524,12 @@ impl<'s> Parser<'s> {
 		};
 		Ok(ClassField {
 			name: self.node_symbol(&class_element.child_by_field_name("name").unwrap())?,
-			member_type: self.build_type_annotation(class_element.child_by_field_name("type"), phase)?,
+			member_type: self.build_type_annotation(get_actual_child_by_field_name(class_element, "type"), phase)?,
 			reassignable: self.get_modifier("reassignable", &modifiers)?.is_some(),
 			is_static,
 			phase,
 			access: self.get_access_modifier(&class_element.child_by_field_name("modifiers"))?,
+			doc,
 		})
 	}
 
@@ -1442,31 +1537,46 @@ impl<'s> Parser<'s> {
 		let mut cursor = statement_node.walk();
 		let mut extends = vec![];
 		let mut methods = vec![];
+
+		let interface_modifiers = statement_node.child_by_field_name("modifiers");
+		let phase = if self.get_modifier("inflight_specifier", &interface_modifiers)?.is_some() {
+			Phase::Inflight
+		} else {
+			phase
+		};
+
 		let name = self.check_reserved_symbol(&statement_node.child_by_field_name("name").unwrap())?;
+		let mut doc_builder = DocBuilder::new(self);
 
 		for interface_element in statement_node
 			.child_by_field_name("implementation")
 			.unwrap()
 			.named_children(&mut cursor)
 		{
-			if interface_element.is_extra() {
+			let DocBuilderResult::Done(doc) = doc_builder.process_node(&interface_element) else {
 				continue;
-			}
+			};
 			match interface_element.kind() {
 				"method_signature" => {
-					let method_name = self.node_symbol(&interface_element.child_by_field_name("name").unwrap());
-					let func_sig = self.build_function_signature(&interface_element, phase);
-					match (method_name, func_sig) {
-						(Ok(method_name), Ok(func_sig)) => methods.push((method_name, func_sig)),
-						_ => {}
+					if let Ok((method_name, func_sig)) = self.build_interface_method(interface_element, phase) {
+						methods.push((method_name, func_sig, doc))
 					}
 				}
 				"inflight_method_signature" => {
 					if let Ok((method_name, func_sig)) = self.build_interface_method(interface_element, Phase::Inflight) {
-						methods.push((method_name, func_sig))
+						methods.push((method_name, func_sig, doc))
 					}
 				}
 				"class_field" => {
+					// Interface method signatures can't have access modifiers like 'pub'
+					if let Some(first_child_node) = interface_element.child(0) {
+						if let "field_modifiers" = first_child_node.kind() {
+							self
+								.with_error::<Node>("Access modifiers are not allowed in interfaces", &interface_element)
+								.err();
+							continue;
+						}
+					}
 					self
 						.with_error::<Node>("Properties are not supported in interfaces", &interface_element)
 						.err();
@@ -1505,12 +1615,11 @@ impl<'s> Parser<'s> {
 			}
 		}
 
-		let access_modifier_node = statement_node.child_by_field_name("access_modifier");
-		let access = self.build_access_modifier(&access_modifier_node);
+		let access = self.get_access_modifier(&interface_modifiers)?;
 		if access == AccessModifier::Protected {
 			self.with_error::<Node>(
 				"Interfaces must be public (\"pub\") or private",
-				&access_modifier_node.expect("access modifier node"),
+				&interface_modifiers.expect("access modifier node"),
 			)?;
 		}
 
@@ -1519,6 +1628,7 @@ impl<'s> Parser<'s> {
 			methods,
 			extends,
 			access,
+			phase,
 		}))
 	}
 
@@ -1529,15 +1639,27 @@ impl<'s> Parser<'s> {
 	) -> DiagnosticResult<(Symbol, FunctionSignature)> {
 		let name = interface_element.child_by_field_name("name").unwrap();
 		let method_name = self.node_symbol(&name)?;
-		let func_sig = self.build_function_signature(&interface_element, phase)?;
+		let func_sig = self.build_function_signature(&interface_element, phase, true)?;
 		Ok((method_name, func_sig))
 	}
 
-	fn build_function_signature(&self, func_sig_node: &Node, phase: Phase) -> DiagnosticResult<FunctionSignature> {
-		let parameters = self.build_parameter_list(&func_sig_node.child_by_field_name("parameter_list").unwrap(), phase)?;
-		let return_type = if let Some(rt) = func_sig_node.child_by_field_name("type") {
+	fn build_function_signature(
+		&self,
+		func_sig_node: &Node,
+		phase: Phase,
+		require_annotations: bool,
+	) -> DiagnosticResult<FunctionSignature> {
+		let parameters = self.build_parameter_list(
+			&func_sig_node.child_by_field_name("parameter_list").unwrap(),
+			phase,
+			require_annotations,
+		)?;
+		let return_type = if let Some(rt) = get_actual_child_by_field_name(*func_sig_node, "type") {
 			self.build_type_annotation(Some(rt), phase)?
 		} else {
+			if require_annotations {
+				self.add_error("Expected function return type", &func_sig_node);
+			}
 			let func_sig_kind = func_sig_node.kind();
 			if func_sig_kind == "closure" {
 				TypeAnnotation {
@@ -1560,7 +1682,7 @@ impl<'s> Parser<'s> {
 	}
 
 	fn build_anonymous_closure(&self, anon_closure_node: &Node, phase: Phase) -> DiagnosticResult<FunctionDefinition> {
-		self.build_function_definition(None, anon_closure_node, phase)
+		self.build_function_definition(None, anon_closure_node, phase, false, None)
 	}
 
 	fn build_function_definition(
@@ -1568,6 +1690,8 @@ impl<'s> Parser<'s> {
 		name: Option<Symbol>,
 		func_def_node: &Node,
 		phase: Phase,
+		require_annotations: bool,
+		doc: Option<String>,
 	) -> DiagnosticResult<FunctionDefinition> {
 		let modifiers = func_def_node.child_by_field_name("modifiers");
 
@@ -1578,7 +1702,7 @@ impl<'s> Parser<'s> {
 
 		let is_static = self.get_modifier("static", &modifiers)?.is_some();
 
-		let signature = self.build_function_signature(func_def_node, phase)?;
+		let signature = self.build_function_signature(func_def_node, phase, require_annotations)?;
 		let statements = if let Some(external) = self.get_modifier("extern_modifier", &modifiers)? {
 			let node_text = self.node_text(&external.named_child(0).unwrap());
 			let file_path = Utf8Path::new(&node_text[1..node_text.len() - 1]);
@@ -1595,7 +1719,7 @@ impl<'s> Parser<'s> {
 					.report();
 			}
 
-			FunctionBody::External(file_path.to_string())
+			FunctionBody::External(file_path)
 		} else {
 			FunctionBody::Statements(self.build_scope(&self.get_child_field(func_def_node, "block")?, phase))
 		};
@@ -1607,6 +1731,7 @@ impl<'s> Parser<'s> {
 			is_static,
 			span: self.node_span(func_def_node),
 			access: self.get_access_modifier(&modifiers)?,
+			doc,
 		})
 	}
 
@@ -1615,7 +1740,12 @@ impl<'s> Parser<'s> {
 	/// # Returns
 	/// A vector of tuples for each parameter in the list. The tuples are the name, type and a bool letting
 	/// us know whether the parameter is reassignable or not respectively.
-	fn build_parameter_list(&self, parameter_list_node: &Node, phase: Phase) -> DiagnosticResult<Vec<FunctionParameter>> {
+	fn build_parameter_list(
+		&self,
+		parameter_list_node: &Node,
+		phase: Phase,
+		require_annotations: bool,
+	) -> DiagnosticResult<Vec<FunctionParameter>> {
 		let mut res = vec![];
 		let mut cursor = parameter_list_node.walk();
 		for definition_node in parameter_list_node.named_children(&mut cursor) {
@@ -1623,12 +1753,18 @@ impl<'s> Parser<'s> {
 				continue;
 			}
 
-			res.push(FunctionParameter {
+			let param = FunctionParameter {
 				name: self.check_reserved_symbol(&definition_node.child_by_field_name("name").unwrap())?,
-				type_annotation: self.build_type_annotation(definition_node.child_by_field_name("type"), phase)?,
+				type_annotation: self.build_type_annotation(get_actual_child_by_field_name(definition_node, "type"), phase)?,
 				reassignable: definition_node.child_by_field_name("reassignable").is_some(),
 				variadic: definition_node.child_by_field_name("variadic").is_some(),
-			});
+			};
+
+			if require_annotations && matches!(param.type_annotation.kind, TypeAnnotationKind::Inferred) {
+				self.add_error("Expected type annotation", &definition_node);
+			}
+
+			res.push(param);
 		}
 
 		Ok(res)
@@ -1734,7 +1870,7 @@ impl<'s> Parser<'s> {
 				other => return self.report_unimplemented_grammar(other, "builtin", type_node),
 			},
 			"optional" => {
-				let inner_type = self.build_type_annotation(type_node.named_child(0), phase).unwrap();
+				let inner_type = self.build_type_annotation(type_node.named_child(0), phase)?;
 				Ok(TypeAnnotation {
 					kind: TypeAnnotationKind::Optional(Box::new(inner_type)),
 					span,
@@ -1757,21 +1893,21 @@ impl<'s> Parser<'s> {
 					})
 				}
 
-				match type_node.child_by_field_name("return_type") {
-					Some(return_type) => Ok(TypeAnnotation {
-						kind: TypeAnnotationKind::Function(FunctionSignature {
-							parameters,
-							return_type: Box::new(self.build_type_annotation(Some(return_type), phase)?),
-							phase: if type_node.child_by_field_name("inflight").is_some() {
-								Phase::Inflight
-							} else {
-								phase // inherit from scope
-							},
-						}),
-						span,
+				Ok(TypeAnnotation {
+					kind: TypeAnnotationKind::Function(FunctionSignature {
+						parameters,
+						return_type: Box::new(self.build_type_annotation(
+							Some(get_actual_child_by_field_name(*type_node, "return_type").unwrap()),
+							phase,
+						)?),
+						phase: if type_node.child_by_field_name("inflight").is_some() {
+							Phase::Inflight
+						} else {
+							phase // inherit from scope
+						},
 					}),
-					None => self.with_error("Expected function return type".to_string(), &type_node),
-				}
+					span,
+				})
 			}
 			"json_container_type" => {
 				let container_type = self.node_text(&type_node);
@@ -1789,7 +1925,7 @@ impl<'s> Parser<'s> {
 			}
 			"mutable_container_type" | "immutable_container_type" => {
 				let container_type = self.node_text(&type_node.child_by_field_name("collection_type").unwrap());
-				let element_type = type_node.child_by_field_name("type_parameter");
+				let element_type = get_actual_child_by_field_name(*type_node, "type_parameter");
 				match container_type {
 					"Map" => Ok(TypeAnnotation {
 						kind: TypeAnnotationKind::Map(Box::new(self.build_type_annotation(element_type, phase)?)),
@@ -1906,13 +2042,27 @@ impl<'s> Parser<'s> {
 				actual_node_span,
 			)),
 			"nested_identifier" => Ok(self.build_nested_identifier(&actual_node, phase)?),
-			"structured_access_expression" => {
-				self.report_unimplemented_grammar("structured_access_expression", "reference", &actual_node)
-			}
+			"structured_access_expression" => Ok(self.build_structured_access_expression(&actual_node, phase)?),
 			other => self.with_error(format!("Expected reference, got {other}"), &actual_node),
 		}
 	}
 
+	fn build_structured_access_expression(&self, structured_access_node: &Node, phase: Phase) -> DiagnosticResult<Expr> {
+		let object_expr = structured_access_node.named_child(0).unwrap();
+		let object_expr = self.build_expression(&object_expr, phase)?;
+
+		let index_expr = structured_access_node.named_child(1).unwrap();
+		let index_expr = self.build_expression(&index_expr, phase)?;
+
+		Ok(Expr::new(
+			ExprKind::Reference(Reference::ElementAccess {
+				object: Box::new(object_expr),
+				index: Box::new(index_expr),
+			}),
+			self.node_span(structured_access_node),
+		))
+	}
+
 	fn build_arg_list(&self, arg_list_node: &Node, phase: Phase) -> DiagnosticResult<ArgList> {
 		let span = self.node_span(arg_list_node);
 		let mut pos_args = vec![];
@@ -1948,11 +2098,7 @@ impl<'s> Parser<'s> {
 			}
 		}
 
-		Ok(ArgList {
-			pos_args,
-			named_args,
-			span,
-		})
+		Ok(ArgList::new(pos_args, named_args, span))
 	}
 
 	fn build_expression(&self, exp_node: &Node, phase: Phase) -> DiagnosticResult<Expr> {
@@ -1966,7 +2112,7 @@ impl<'s> Parser<'s> {
 				let arg_list = if let Ok(args_node) = self.get_child_field(expression_node, "args") {
 					self.build_arg_list(&args_node, phase)
 				} else {
-					Ok(ArgList::new(WingSpan::default()))
+					Ok(ArgList::new_empty(WingSpan::default()))
 				};
 
 				let obj_id = if let Some(id_node) = expression_node.child_by_field_name("id") {
@@ -1990,7 +2136,7 @@ impl<'s> Parser<'s> {
 					expression_span,
 				))
 			}
-			"binary_expression" => Ok(Expr::new(
+			"binary_expression" | "unwrap_or" => Ok(Expr::new(
 				ExprKind::Binary {
 					left: Box::new(self.build_expression(&expression_node.child_by_field_name("left").unwrap(), phase)?),
 					right: Box::new(self.build_expression(&expression_node.child_by_field_name("right").unwrap(), phase)?),
@@ -2029,6 +2175,16 @@ impl<'s> Parser<'s> {
 				},
 				expression_span,
 			)),
+			"non_interpolated_string" => {
+				// skipping the first #
+				let byte_range = (expression_node.start_byte() + 1)..expression_node.end_byte();
+				Ok(Expr::new(
+					ExprKind::Literal(Literal::NonInterpolatedString(
+						self.node_text_from_range(byte_range).into(),
+					)),
+					expression_span,
+				))
+			}
 			"string" => {
 				if expression_node.named_child_count() == 0 {
 					Ok(Expr::new(
@@ -2126,6 +2282,24 @@ impl<'s> Parser<'s> {
 				})),
 				expression_span,
 			)),
+			"intrinsic" => {
+				let name = self.node_symbol(&self.get_child_field(expression_node, "name")?)?;
+				let kind = IntrinsicKind::from_str(&name.name);
+				let arg_list = if let Some(arg_node) = expression_node.child_by_field_name("args") {
+					Some(self.build_arg_list(&arg_node, phase)?)
+				} else {
+					None
+				};
+
+				if matches!(kind, IntrinsicKind::Unknown) {
+					self.add_error("Invalid intrinsic", &expression_node);
+				}
+
+				Ok(Expr::new(
+					ExprKind::Intrinsic(Intrinsic { name, arg_list, kind }),
+					expression_span,
+				))
+			}
 			"duration" => self.build_duration(&expression_node),
 			"reference" => self.build_reference(&expression_node, phase),
 			"positional_argument" => self.build_expression(&expression_node.named_child(0).unwrap(), phase),
@@ -2151,12 +2325,20 @@ impl<'s> Parser<'s> {
 				expression_span,
 			)),
 			"array_literal" => {
-				let array_type = if let Some(type_node) = expression_node.child_by_field_name("type") {
+				let array_type = if let Some(type_node) = get_actual_child_by_field_name(*expression_node, "type") {
 					self.build_type_annotation(Some(type_node), phase).ok()
 				} else {
 					None
 				};
 
+				// check if the array type is annotated as a Set/MutSet
+				// if so, we should build a set literal instead
+				if let Some(TypeAnnotation { kind, .. }) = &array_type {
+					if matches!(kind, TypeAnnotationKind::Set(_) | TypeAnnotationKind::MutSet(_)) {
+						return self.build_set_literal(expression_node, phase);
+					}
+				}
+
 				let mut items = Vec::new();
 				let mut cursor = expression_node.walk();
 				for element_node in expression_node.children_by_field_name("element", &mut cursor) {
@@ -2176,7 +2358,7 @@ impl<'s> Parser<'s> {
 				Ok(Expr::new(ExprKind::JsonMapLiteral { fields }, expression_span))
 			}
 			"map_literal" => {
-				let map_type = if let Some(type_node) = expression_node.child_by_field_name("type") {
+				let map_type = if let Some(type_node) = get_actual_child_by_field_name(*expression_node, "type") {
 					self.build_type_annotation(Some(type_node), phase).ok()
 				} else {
 					None
@@ -2184,14 +2366,6 @@ impl<'s> Parser<'s> {
 
 				let fields = self.build_map_fields(expression_node, phase)?;
 
-				// Special case: empty {} (which is detected as map by tree-sitter) -
-				// if it is annotated as a Set/MutSet we should treat it as a set literal
-				if let Some(TypeAnnotation { kind, .. }) = &map_type {
-					if matches!(kind, TypeAnnotationKind::Set(_) | TypeAnnotationKind::MutSet(_)) && fields.is_empty() {
-						return self.build_set_literal(expression_node, phase);
-					}
-				}
-
 				Ok(Expr::new(
 					ExprKind::MapLiteral {
 						fields,
@@ -2247,9 +2421,8 @@ impl<'s> Parser<'s> {
 				let element = Box::new(exp);
 				Ok(Expr::new(ExprKind::JsonLiteral { is_mut, element }, expression_span))
 			}
-			"set_literal" => self.build_set_literal(expression_node, phase),
 			"struct_literal" => {
-				let type_ = self.build_type_annotation(expression_node.child_by_field_name("type"), phase);
+				let type_ = self.build_type_annotation(get_actual_child_by_field_name(*expression_node, "type"), phase);
 				let mut fields = IndexMap::new();
 				let mut cursor = expression_node.walk();
 				for field in expression_node.children_by_field_name("fields", &mut cursor) {
@@ -2257,7 +2430,19 @@ impl<'s> Parser<'s> {
 						continue;
 					}
 					let field_name = self.node_symbol(&field.named_child(0).unwrap());
-					let field_value = self.build_expression(&field.named_child(1).unwrap(), phase);
+					let field_value = if let Some(field_expr_node) = field.named_child(1) {
+						self.build_expression(&field_expr_node, phase)
+					} else {
+						if let Ok(field_name) = &field_name {
+							Ok(Expr::new(
+								ExprKind::Reference(Reference::Identifier(field_name.clone())),
+								self.node_span(&field),
+							))
+						} else {
+							Err(())
+						}
+					};
+
 					// Add fields to our struct literal, if some are missing or aren't part of the type we'll fail on type checking
 					if let (Ok(k), Ok(v)) = (field_name, field_value) {
 						if fields.contains_key(&k) {
@@ -2282,6 +2467,16 @@ impl<'s> Parser<'s> {
 					expression_span,
 				))
 			}
+			"optional_unwrap" => {
+				let expression = self.build_expression(&expression_node.named_child(0).unwrap(), phase);
+				Ok(Expr::new(
+					ExprKind::Unary {
+						op: UnaryOperator::OptionalUnwrap,
+						exp: Box::new(expression?),
+					},
+					expression_span,
+				))
+			}
 			"compiler_dbg_panic" => {
 				// Handle the debug panic expression (during parsing)
 				dbg_panic!();
@@ -2309,11 +2504,15 @@ impl<'s> Parser<'s> {
 				"identifier" => self.node_symbol(&key_node)?,
 				other => panic!("Unexpected map key type {} at {:?}", other, key_node),
 			};
-			let value_node = field_node.named_child(1).unwrap();
+			let value = if let Some(value_node) = field_node.named_child(1) {
+				self.build_expression(&value_node, phase)?
+			} else {
+				Expr::new(ExprKind::Reference(Reference::Identifier(key.clone())), key.span())
+			};
 			if fields.contains_key(&key) {
-				self.add_error(format!("Duplicate key {} in map literal", key), &key_node);
+				self.add_error(format!("Duplicate key {} in json object literal", key), &key_node);
 			} else {
-				fields.insert(key, self.build_expression(&value_node, phase)?);
+				fields.insert(key, value);
 			}
 		}
 		Ok(fields)
@@ -2338,7 +2537,7 @@ impl<'s> Parser<'s> {
 
 	fn build_set_literal(&self, expression_node: &Node, phase: Phase) -> Result<Expr, ()> {
 		let expression_span = self.node_span(expression_node);
-		let set_type = if let Some(type_node) = expression_node.child_by_field_name("type") {
+		let set_type = if let Some(type_node) = get_actual_child_by_field_name(*expression_node, "type") {
 			self.build_type_annotation(Some(type_node), phase).ok()
 		} else {
 			None
@@ -2368,41 +2567,56 @@ impl<'s> Parser<'s> {
 	}
 	/// Given a node, returns the last non-extra node before it.
 	fn last_non_extra(node: Node) -> Node {
-		let parent = node.parent();
-		if let Some(parent) = parent {
-			if parent.is_extra() {
-				return Self::last_non_extra(parent);
+		let mut sibling = node.prev_sibling();
+		while let Some(s) = sibling {
+			if !s.is_extra() {
+				break;
 			}
+			sibling = s.prev_sibling();
 		}
-		if node.is_extra() {
-			let mut sibling = node.prev_sibling();
-			while let Some(s) = sibling {
-				if !s.is_extra() {
-					break;
-				}
-				sibling = s.prev_sibling();
-			}
 
-			return sibling.unwrap_or(node);
-		} else {
-			return node;
-		}
+		return sibling.unwrap_or(node);
 	}
 
 	fn report_unhandled_errors(&self, root: &Node) {
-		let iter = traverse(root.walk(), Order::Pre);
-		for node in iter {
+		let iterator = crate::ts_traversal::PostOrderIter::new(root);
+		for node in iterator {
 			if node.kind() == "AUTOMATIC_SEMICOLON" {
-				let target_node = Self::last_non_extra(node);
+				let target_node = Self::last_non_extra(node).range();
+				let end_byte = target_node.end_byte;
+				let end_point: WingLocation = target_node.end_point.into();
+
 				let diag = Diagnostic {
 					message: ERR_EXPECTED_SEMICOLON.to_string(),
-					span: Some(self.node_span(&target_node)),
+					span: Some(WingSpan {
+						start: end_point,
+						end: end_point,
+						end_offset: end_byte,
+						start_offset: end_byte,
+						file_id: self.source_name.to_string(),
+					}),
 					annotations: vec![],
 					hints: vec![],
 				};
 				report_diagnostic(diag);
 			} else if node.kind() == "AUTOMATIC_BLOCK" {
-				self.add_error("Expected block".to_string(), &Self::last_non_extra(node));
+				let target_node = Self::last_non_extra(node).range();
+				let end_byte = target_node.end_byte;
+				let end_point: WingLocation = target_node.end_point.into();
+
+				let diag = Diagnostic {
+					message: "Expected block".to_string(),
+					span: Some(WingSpan {
+						start: end_point,
+						end: end_point,
+						end_offset: end_byte,
+						start_offset: end_byte,
+						file_id: self.source_name.to_string(),
+					}),
+					annotations: vec![],
+					hints: vec![],
+				};
+				report_diagnostic(diag);
 			} else if !self.error_nodes.borrow().contains(&node.id()) {
 				if node.is_error() {
 					if node.named_child_count() == 0 {
@@ -2428,10 +2642,9 @@ impl<'s> Parser<'s> {
 		}
 	}
 
-	fn build_super_constructor_statement(&self, statement_node: &Node, phase: Phase, idx: usize) -> Result<StmtKind, ()> {
+	fn build_super_constructor_statement(&self, statement_node: &Node, phase: Phase) -> Result<StmtKind, ()> {
 		// Calls to super constructor can only occur in specific scenario:
-		// 1. We are in a derived class' constructor
-		// 2. The statement is the first statement in the block
+		// We are in a derived class' constructor
 		let parent_block = statement_node.parent();
 		if let Some(p) = parent_block {
 			let parent_block_context = p.parent();
@@ -2439,14 +2652,6 @@ impl<'s> Parser<'s> {
 			if let Some(context) = parent_block_context {
 				match context.kind() {
 					"initializer" | "inflight_initializer" => {
-						// Check that call to super constructor was first in statement block
-						if idx != 0 {
-							self.with_error(
-								"Call to super constructor must be first statement in constructor",
-								statement_node,
-							)?;
-						};
-
 						// Check that the class has a parent
 						let class_node = context.parent().unwrap().parent().unwrap();
 						let parent_class = class_node.child_by_field_name("parent");
@@ -2513,6 +2718,7 @@ impl<'s> Parser<'s> {
 				is_static: true,
 				span: statements_span.clone(),
 				access: AccessModifier::Public,
+				doc: None,
 			}),
 			statements_span.clone(),
 		);
@@ -2527,17 +2733,81 @@ impl<'s> Parser<'s> {
 				},
 				obj_id: Some(test_id),
 				obj_scope: None,
-				arg_list: ArgList {
-					pos_args: vec![inflight_closure],
-					named_args: IndexMap::new(),
-					span: type_span.clone(),
-				},
+				arg_list: ArgList::new(vec![inflight_closure], IndexMap::new(), type_span.clone()),
 			}),
 			span,
 		)))
 	}
 }
 
+struct DocBuilder<'a> {
+	doc_lines: Vec<&'a str>,
+	parser: &'a Parser<'a>,
+}
+
+enum DocBuilderResult {
+	Done(Option<String>),
+	Continue,
+	Skip,
+}
+
+impl<'a> DocBuilder<'a> {
+	fn new(parser: &'a Parser) -> Self {
+		Self {
+			doc_lines: Vec::new(),
+			parser,
+		}
+	}
+
+	fn process_node(&mut self, node: &Node) -> DocBuilderResult {
+		if node.kind() == "doc" {
+			self.doc_lines.push(
+				self
+					.parser
+					.get_child_field(&node, "content")
+					.map_or("", |n| self.parser.node_text(&n)),
+			);
+			DocBuilderResult::Continue
+		} else if node.is_extra() {
+			DocBuilderResult::Skip
+		} else {
+			let doc = if self.doc_lines.is_empty() {
+				DocBuilderResult::Done(None)
+			} else {
+				DocBuilderResult::Done(Some(self.doc_lines.join("\n")))
+			};
+			self.doc_lines.clear();
+			doc
+		}
+	}
+}
+
+/// Get actual child by field name when multiple children exist because of extra nodes.
+/// It should be safe to use this instead of `node.get_child_by_field_name`
+/// in cases where there's doubt.
+fn get_actual_child_by_field_name<'a>(node: Node<'a>, field_name: &str) -> Option<Node<'a>> {
+	get_actual_children_by_field_name(node, field_name).into_iter().next()
+}
+
+/// Get actual children by field name when the children might contain extra nodes.
+/// It should be safe to use this instead of `node.get_children_by_field_name`
+/// in cases where there's doubt.
+fn get_actual_children_by_field_name<'a>(node: Node<'a>, field_name: &str) -> Vec<Node<'a>> {
+	let mut cursor = node.walk();
+	let mut children = Vec::new();
+
+	for child_node in node.children_by_field_name(field_name, &mut cursor) {
+		if child_node.is_extra() {
+			continue;
+		}
+		if !child_node.is_named() {
+			continue;
+		}
+		children.push(child_node);
+	}
+	children
+}
+
 /// Check if the package.json in the given directory has a `wing` field
 fn is_wing_library(module_dir: &Utf8Path) -> bool {
 	let package_json_path = Utf8Path::new(module_dir).join("package.json");
@@ -2591,6 +2861,7 @@ fn is_valid_module_statement(stmt: &Stmt) -> bool {
 		StmtKind::Assignment { .. } => false,
 		StmtKind::Scope(_) => false,
 		StmtKind::TryCatch { .. } => false,
+		StmtKind::ExplicitLift(_) => false,
 		// TODO: support constants https://github.com/winglang/wing/issues/3606
 		// TODO: support test statements https://github.com/winglang/wing/issues/3571
 		StmtKind::Let { .. } => false,
@@ -2657,6 +2928,28 @@ fn parse_number(s: &str) -> f64 {
 mod tests {
 	use super::*;
 
+	#[test]
+	fn filter_unnamed_nodes() {
+		// Test get_actual_children_by_field_name
+		let language = tree_sitter_wing::language();
+		let mut tree_sitter_parser = tree_sitter::Parser::new();
+		tree_sitter_parser.set_language(&language).unwrap();
+
+		let tree_sitter_tree = tree_sitter_parser
+			.parse("let x: ((num)) = 1;".as_bytes(), None)
+			.unwrap();
+		let stmt_node = tree_sitter_tree.root_node().named_child(0).expect("a statement node");
+
+		// We expect 5 sibling nodes because of the parentheses nodes
+		let mut cursor = stmt_node.walk();
+		let unnamed_type_nodes = stmt_node.children_by_field_name("type", &mut cursor);
+		assert!(unnamed_type_nodes.count() == 5);
+
+		// get_actual_children_by_field_name should filter out the unnamed nodes leaving us with the actual type node
+		let type_node = get_actual_children_by_field_name(stmt_node, "type");
+		assert!(type_node.len() == 1);
+	}
+
 	#[test]
 	fn normalize_path_relative_to_nothing() {
 		let file_path = Utf8Path::new("/a/b/c/d/e.f");
diff --git a/libs/wingc/src/struct_schema.rs b/libs/wingc/src/struct_schema.rs
index 87edcf05502..2845e28239a 100644
--- a/libs/wingc/src/struct_schema.rs
+++ b/libs/wingc/src/struct_schema.rs
@@ -1,3 +1,5 @@
+use camino::Utf8Path;
+
 use crate::{
 	ast::{Reference, Scope},
 	jsify::JSifier,
@@ -9,14 +11,16 @@ use crate::{
 
 pub struct StructSchemaVisitor<'a> {
 	jsify: &'a JSifier<'a>,
+	path: &'a Utf8Path,
 	ctx: VisitContext,
 }
 
 impl<'a> StructSchemaVisitor<'a> {
-	pub fn new(jsifier: &'a JSifier<'a>) -> Self {
+	pub fn new(path: &'a Utf8Path, jsifier: &'a JSifier<'a>) -> Self {
 		Self {
 			jsify: jsifier,
 			ctx: VisitContext::new(),
+			path,
 		}
 	}
 }
@@ -37,13 +41,16 @@ impl<'a> Visit<'a> for StructSchemaVisitor<'a> {
 					// add the schema to the jsifier's referenced struct schemas
 					self
 						.jsify
-						.add_referenced_struct_schema(type_name.clone().to_string(), struct_code);
+						.add_referenced_struct_schema(&self.path, type_name.clone().to_string(), struct_code);
 				}
 				visit::visit_reference(self, node);
 			}
 			Reference::Identifier(_) => {
 				visit::visit_reference(self, node);
 			}
+			Reference::ElementAccess { .. } => {
+				visit::visit_reference(self, node);
+			}
 		}
 	}
 
diff --git a/libs/wingc/src/test_utils.rs b/libs/wingc/src/test_utils.rs
index 8af573f2fe2..7de5a646afe 100644
--- a/libs/wingc/src/test_utils.rs
+++ b/libs/wingc/src/test_utils.rs
@@ -10,6 +10,18 @@ use crate::{
 	diagnostic::{found_errors, get_diagnostics},
 };
 
+#[macro_export]
+macro_rules! assert_compile_dir {
+  ($code:literal) => {
+    insta::with_settings!({
+      prepend_module_to_snapshot => false,
+      omit_expression => true,
+    }, {
+      insta::assert_snapshot!($crate::test_utils::compile_dir($code));
+    })
+  };
+}
+
 #[macro_export]
 macro_rules! assert_compile_ok {
   ($code:literal) => {
@@ -34,8 +46,17 @@ macro_rules! assert_compile_fail {
   };
 }
 
+pub fn compile_dir(code: &str) -> String {
+	let snap = compile_code(code, true);
+	if found_errors() {
+		get_diagnostics().iter().for_each(|d| println!("{}", d));
+		assert!(false, "expected no errors");
+	}
+	snap
+}
+
 pub fn compile_ok(code: &str) -> String {
-	let snap = compile_code(code);
+	let snap = compile_code(code, false);
 	if found_errors() {
 		get_diagnostics().iter().for_each(|d| println!("{}", d));
 		assert!(false, "expected no errors");
@@ -44,16 +65,15 @@ pub fn compile_ok(code: &str) -> String {
 }
 
 pub fn compile_fail(code: &str) -> String {
-	let snap = compile_code(code);
+	let snap = compile_code(code, false);
 	assert!(found_errors());
 	snap
 }
 
 /// Compiles `code` and returns the capture scanner results as a string that can be snapshotted
-fn compile_code(code: &str) -> String {
+fn compile_code(code: &str, as_dir: bool) -> String {
 	let project_dir = tempfile::tempdir().unwrap();
 	let project_dir = Utf8Path::from_path(project_dir.path()).unwrap();
-	let source_path = project_dir.join("main.w");
 	let out_dir = project_dir.join("target/main.out/.wing");
 
 	// NOTE: this is needed for debugging to work regardless of where you run the test
@@ -62,7 +82,14 @@ fn compile_code(code: &str) -> String {
 	// convert tabs to 2 spaces
 	let code = code.replace("\t", "  ");
 
-	let result = compile(project_dir, &source_path, Some(code.clone()), &out_dir);
+	let result = if as_dir {
+		// Write lib.w to the project dir because compiling a directory requires an actual file to exist
+		std::fs::write(project_dir.join("lib.w"), &code).unwrap();
+
+		compile(project_dir, &project_dir, None, &out_dir)
+	} else {
+		compile(project_dir, &project_dir.join("main.w"), Some(code.clone()), &out_dir)
+	};
 
 	let mut snap = vec![];
 
diff --git a/libs/wingc/src/ts_traversal.rs b/libs/wingc/src/ts_traversal.rs
new file mode 100644
index 00000000000..e12eefc6815
--- /dev/null
+++ b/libs/wingc/src/ts_traversal.rs
@@ -0,0 +1,59 @@
+use tree_sitter::Node;
+
+/// Create a post-order tree iterator for a tree-sitter node.
+pub struct PostOrderIter<'a> {
+	stack: Vec<Node<'a>>,
+}
+
+impl<'a> PostOrderIter<'a> {
+	pub fn new(root: &'a Node) -> Self {
+		let mut stack = Vec::new();
+		stack.push(*root);
+		PostOrderIter { stack }
+	}
+}
+
+impl<'a> Iterator for PostOrderIter<'a> {
+	type Item = Node<'a>;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		if let Some(node) = self.stack.pop() {
+			for i in (0..node.child_count()).rev() {
+				self.stack.push(node.child(i).unwrap());
+			}
+			return Some(node);
+		} else {
+			None
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use tree_sitter::Parser;
+	use tree_sitter_wing::language;
+
+	#[test]
+	fn test_post_order_iter() {
+		let code = r#"
+			a;
+			if true {
+				b;
+			}
+			c;
+		"#;
+		let mut parser = Parser::new();
+		parser.set_language(&language()).unwrap();
+		let tree = parser.parse(code, None).unwrap();
+		let root = tree.root_node();
+		let nodes: Vec<Node> = PostOrderIter::new(&root).collect();
+		let reference_nodes = nodes
+			.iter()
+			.filter(|n| n.kind() == "reference_identifier")
+			.map(|n| n.utf8_text(&code.as_bytes()).unwrap().to_string())
+			.collect::<Vec<String>>();
+
+		assert_eq!(reference_nodes, vec!["a", "b", "c"]);
+	}
+}
diff --git a/libs/wingc/src/type_check.rs b/libs/wingc/src/type_check.rs
index 85fe601242d..09c8080533f 100644
--- a/libs/wingc/src/type_check.rs
+++ b/libs/wingc/src/type_check.rs
@@ -1,4 +1,5 @@
 mod class_fields_init;
+mod has_type_stmt;
 mod inference_visitor;
 pub(crate) mod jsii_importer;
 pub mod lifts;
@@ -6,36 +7,39 @@ pub mod symbol_env;
 pub(crate) mod type_reference_transform;
 
 use crate::ast::{
-	self, AccessModifier, AssignmentKind, BringSource, CalleeKind, ClassField, ExprId, FunctionDefinition, IfLet, New,
-	TypeAnnotationKind,
+	self, AccessModifier, ArgListId, AssignmentKind, BringSource, CalleeKind, ClassField, ExplicitLift, ExprId,
+	FunctionDefinition, IfLet, Intrinsic, IntrinsicKind, New, TypeAnnotationKind,
 };
 use crate::ast::{
-	ArgList, BinaryOperator, Class as AstClass, Expr, ExprKind, FunctionBody, FunctionParameter as AstFunctionParameter,
-	Interface as AstInterface, InterpolatedStringPart, Literal, Phase, Reference, Scope, Spanned, Stmt, StmtKind, Symbol,
-	TypeAnnotation, UnaryOperator, UserDefinedType,
+	ArgList, BinaryOperator, Class as AstClass, Elifs, Enum as AstEnum, Expr, ExprKind, FunctionBody,
+	FunctionParameter as AstFunctionParameter, Interface as AstInterface, InterpolatedStringPart, Literal, Phase,
+	Reference, Scope, Spanned, Stmt, StmtKind, Struct as AstStruct, Symbol, TypeAnnotation, UnaryOperator,
+	UserDefinedType,
 };
 use crate::comp_ctx::{CompilationContext, CompilationPhase};
 use crate::diagnostic::{report_diagnostic, Diagnostic, DiagnosticAnnotation, TypeError, WingSpan};
 use crate::docs::Docs;
 use crate::file_graph::FileGraph;
+use crate::type_check::has_type_stmt::HasStatementVisitor;
 use crate::type_check::symbol_env::SymbolEnvKind;
 use crate::visit_context::{VisitContext, VisitorWithContext};
 use crate::visit_types::{VisitType, VisitTypeMut};
 use crate::{
-	dbg_panic, debug, CONSTRUCT_BASE_INTERFACE, UTIL_CLASS_NAME, WINGSDK_ARRAY, WINGSDK_ASSEMBLY_NAME,
-	WINGSDK_BRINGABLE_MODULES, WINGSDK_DURATION, WINGSDK_GENERIC, WINGSDK_JSON, WINGSDK_MAP, WINGSDK_MUT_ARRAY,
-	WINGSDK_MUT_JSON, WINGSDK_MUT_MAP, WINGSDK_MUT_SET, WINGSDK_RESOURCE, WINGSDK_SET, WINGSDK_STD_MODULE,
-	WINGSDK_STRING, WINGSDK_STRUCT,
+	dbg_panic, debug, CONSTRUCT_BASE_CLASS, CONSTRUCT_BASE_INTERFACE, CONSTRUCT_NODE_PROPERTY, UTIL_CLASS_NAME,
+	WINGSDK_ARRAY, WINGSDK_ASSEMBLY_NAME, WINGSDK_BRINGABLE_MODULES, WINGSDK_DURATION, WINGSDK_GENERIC,
+	WINGSDK_IRESOURCE, WINGSDK_JSON, WINGSDK_MAP, WINGSDK_MUT_ARRAY, WINGSDK_MUT_JSON, WINGSDK_MUT_MAP, WINGSDK_MUT_SET,
+	WINGSDK_NODE, WINGSDK_RESOURCE, WINGSDK_SET, WINGSDK_SIM_IRESOURCE_FQN, WINGSDK_STD_MODULE, WINGSDK_STRING,
+	WINGSDK_STRUCT,
 };
 use camino::{Utf8Path, Utf8PathBuf};
 use derivative::Derivative;
 use duplicate::duplicate_item;
-use indexmap::{IndexMap, IndexSet};
+use indexmap::IndexMap;
 use itertools::{izip, Itertools};
 use jsii_importer::JsiiImporter;
 
 use std::cmp;
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, HashMap, HashSet};
 use std::fmt::{Debug, Display};
 use std::iter::FilterMap;
 use symbol_env::{StatementIdx, SymbolEnv};
@@ -245,9 +249,13 @@ pub enum Type {
 	Interface(Interface),
 	Struct(Struct),
 	Enum(Enum),
+	/// A special type for parameters that accept any stringable value.
+	/// If you have a value of this type, the only thing you know you can do
+	/// for sure is that you can stringify it.
+	Stringable,
 }
 
-pub const CLASS_INIT_NAME: &'static str = "init";
+pub const CLASS_INIT_NAME: &'static str = "new";
 pub const CLASS_INFLIGHT_INIT_NAME: &'static str = "$inflight_init";
 
 pub const CLOSURE_CLASS_HANDLE_METHOD: &'static str = "handle";
@@ -285,12 +293,6 @@ pub struct Namespace {
 	#[derivative(Debug = "ignore")]
 	pub envs: Vec<SymbolEnvRef>,
 
-	// Indicate whether all the types in this namespace have been loaded, this is part of our
-	// lazy loading mechanism and is used by the lsp's autocomplete in case we need to load
-	// the types after initial compilation.
-	#[derivative(Debug = "ignore")]
-	pub loaded: bool,
-
 	/// Where we can resolve this namespace from
 	pub module_path: ResolveSource,
 }
@@ -321,7 +323,6 @@ pub struct Class {
 	pub env: SymbolEnv,
 	pub fqn: Option<String>,
 	pub is_abstract: bool,
-	pub type_parameters: Option<Vec<TypeRef>>,
 	pub phase: Phase,
 	pub docs: Docs,
 	pub lifts: Option<Lifts>,
@@ -351,27 +352,14 @@ impl Class {
 #[derivative(Debug)]
 pub struct Interface {
 	pub name: Symbol,
+	pub fqn: Option<String>,
 	pub docs: Docs,
 	pub extends: Vec<TypeRef>, // Must be a Type::Interface type
+	pub phase: Phase,
 	#[derivative(Debug = "ignore")]
 	pub env: SymbolEnv,
 }
 
-impl Interface {
-	fn is_resource(&self) -> bool {
-		// TODO: This should check that the interface extends `IResource` from
-		// the SDK, not just any interface with the name `IResource`
-		// https://github.com/winglang/wing/issues/2098
-		self.name.name == "IResource"
-			|| self.extends.iter().any(|i| {
-				i.as_interface()
-					.expect("Interface extends a type that isn't an interface")
-					.name
-					.name == "IResource"
-			})
-	}
-}
-
 impl Display for Interface {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		if let LookupResult::Found(method, _) = self.get_env().lookup_ext(&CLOSURE_CLASS_HANDLE_METHOD.into(), None) {
@@ -395,18 +383,18 @@ pub trait ClassLike: Display {
 
 	fn methods(&self, with_ancestry: bool) -> ClassLikeIterator<'_> {
 		self.get_env().iter(with_ancestry).filter_map(|(s, t, ..)| {
-			t.as_variable()
-				.unwrap()
-				.type_
-				.as_function_sig()
-				.map(|_| (s.clone(), t.as_variable().unwrap().type_))
+			if t.as_variable()?.type_.as_function_sig().is_some() {
+				Some((s, t.as_variable()?.type_))
+			} else {
+				None
+			}
 		})
 	}
 
 	fn fields(&self, with_ancestry: bool) -> ClassLikeIterator<'_> {
 		self.get_env().iter(with_ancestry).filter_map(|(s, t, ..)| {
-			if t.as_variable().unwrap().type_.as_function_sig().is_none() {
-				Some((s, t.as_variable().unwrap().type_))
+			if t.as_variable()?.type_.as_function_sig().is_none() {
+				Some((s, t.as_variable()?.type_))
 			} else {
 				None
 			}
@@ -414,13 +402,7 @@ pub trait ClassLike: Display {
 	}
 
 	fn get_method(&self, name: &Symbol) -> Option<&VariableInfo> {
-		let v = self
-			.get_env()
-			.lookup_ext(name, None)
-			.ok()?
-			.0
-			.as_variable()
-			.expect("class env should only contain variables");
+		let v = self.get_env().lookup_ext(name, None).ok()?.0.as_variable()?;
 		if v.type_.is_closure() {
 			Some(v)
 		} else {
@@ -429,13 +411,7 @@ pub trait ClassLike: Display {
 	}
 
 	fn get_field(&self, name: &Symbol) -> Option<&VariableInfo> {
-		let v = self
-			.get_env()
-			.lookup_ext(name, None)
-			.ok()?
-			.0
-			.as_variable()
-			.expect("class env should only contain variables");
+		let v = self.get_env().lookup_ext(name, None).ok()?.0.as_variable()?;
 		if !v.type_.is_closure() {
 			Some(v)
 		} else {
@@ -466,12 +442,16 @@ impl ClassLike for Struct {
 pub struct ArgListTypes {
 	pub pos_args: Vec<TypeRef>,
 	pub named_args: IndexMap<Symbol, SpannedTypeInfo>,
+	// Indicates if any of the arguments were an inflight expression, this is useful for determining if a
+	// phase independent call needs to be resolved as an inflight call or not.
+	pub includes_inflights: bool,
 }
 
 #[derive(Derivative)]
 #[derivative(Debug)]
 pub struct Struct {
 	pub name: Symbol,
+	pub fqn: Option<String>,
 	pub docs: Docs,
 	pub extends: Vec<TypeRef>, // Must be a Type::Struct type
 	#[derivative(Debug = "ignore")]
@@ -488,7 +468,8 @@ impl Display for Struct {
 pub struct Enum {
 	pub name: Symbol,
 	pub docs: Docs,
-	pub values: IndexSet<Symbol>,
+	/// Variant name and optional documentation
+	pub values: IndexMap<Symbol, Option<String>>,
 }
 
 #[derive(Debug)]
@@ -572,7 +553,9 @@ impl Subtype for Type {
 
 				// Next, compare the function to a method on the interface named "handle" if it exists
 				if let Some((method, _)) = r0.get_env().lookup_ext(&CLOSURE_CLASS_HANDLE_METHOD.into(), None).ok() {
-					let method = method.as_variable().unwrap();
+					let Some(method) = method.as_variable() else {
+						return false;
+					};
 					if !method.phase.is_subtype_of(&Phase::Inflight) {
 						return false;
 					}
@@ -768,6 +751,13 @@ impl Subtype for Type {
 			(Self::Boolean, Self::Boolean) => true,
 			(Self::Duration, Self::Duration) => true,
 			(Self::Void, Self::Void) => true,
+			// These types are stringable
+			(Self::String, Self::Stringable) => true,
+			(Self::Number, Self::Stringable) => true,
+			(Self::Boolean, Self::Stringable) => true,
+			(Self::Json(_), Self::Stringable) => true,
+			(Self::MutJson, Self::Stringable) => true,
+			(Self::Enum(_), Self::Stringable) => true,
 			_ => false,
 		}
 	}
@@ -786,9 +776,15 @@ pub struct FunctionSignature {
 	/// The type of "this" inside the function, if any. This should be None for
 	/// static or anonymous functions.
 	pub this_type: Option<TypeRef>,
+	/// The parameters of the function.
 	pub parameters: Vec<FunctionParameter>,
+	/// The return type of the function.
 	pub return_type: TypeRef,
+	/// The phase in which this function exists
 	pub phase: Phase,
+	/// Expects an implicit caller scope argument to be passed to the function (for static preflight functions
+	/// so they can instantiate preflight classes)
+	pub implicit_scope_param: bool,
 	/// During jsify, calls to this function will be replaced with this string
 	/// In JSII imports, this is denoted by the `@macro` attribute
 	/// This string may contain special tokens:
@@ -860,6 +856,7 @@ impl Display for Type {
 			Type::Anything => write!(f, "any"),
 			Type::Number => write!(f, "num"),
 			Type::String => write!(f, "str"),
+			Type::Stringable => write!(f, "stringable"),
 			Type::Duration => write!(f, "duration"),
 			Type::Boolean => write!(f, "bool"),
 			Type::Void => write!(f, "void"),
@@ -868,7 +865,13 @@ impl Display for Type {
 			Type::Nil => write!(f, "nil"),
 			Type::Unresolved => write!(f, "unresolved"),
 			Type::Inferred(_) => write!(f, "unknown"),
-			Type::Optional(v) => write!(f, "{}?", v),
+			Type::Optional(v) => {
+				if v.is_closure() {
+					write!(f, "({})?", v)
+				} else {
+					write!(f, "{}?", v)
+				}
+			}
 			Type::Function(sig) => write!(f, "{}", sig),
 			Type::Class(class) => write!(f, "{}", class),
 
@@ -899,7 +902,8 @@ impl Display for FunctionSignature {
 				if a.name.is_empty() {
 					format!("{}", a.typeref)
 				} else {
-					format!("{}: {}", a.name, a.typeref)
+					let prefix = if a.variadic { "..." } else { "" };
+					format!("{}{}: {}", prefix, a.name, a.typeref)
 				}
 			})
 			.collect::<Vec<String>>()
@@ -925,6 +929,24 @@ impl TypeRef {
 		None
 	}
 
+	pub fn as_env(&self) -> Option<&SymbolEnv> {
+		match &**self {
+			Type::Class(class) => Some(&class.env),
+			Type::Interface(iface) => Some(&iface.env),
+			Type::Struct(st) => Some(&st.env),
+			_ => None,
+		}
+	}
+
+	pub fn as_env_mut(&mut self) -> Option<&mut SymbolEnv> {
+		match &mut **self {
+			Type::Class(class) => Some(&mut class.env),
+			Type::Interface(iface) => Some(&mut iface.env),
+			Type::Struct(st) => Some(&mut st.env),
+			_ => None,
+		}
+	}
+
 	pub fn as_class_mut(&mut self) -> Option<&mut Class> {
 		match **self {
 			Type::Class(ref mut class) => Some(class),
@@ -948,7 +970,7 @@ impl TypeRef {
 		}
 	}
 
-	pub fn as_mut_struct(&mut self) -> Option<&mut Struct> {
+	pub fn as_struct_mut(&mut self) -> Option<&mut Struct> {
 		if let Type::Struct(ref mut st) = **self {
 			Some(st)
 		} else {
@@ -963,7 +985,7 @@ impl TypeRef {
 			None
 		}
 	}
-	fn as_mut_interface(&mut self) -> Option<&mut Interface> {
+	fn as_interface_mut(&mut self) -> Option<&mut Interface> {
 		if let Type::Interface(ref mut iface) = **self {
 			Some(iface)
 		} else {
@@ -987,7 +1009,7 @@ impl TypeRef {
 		}
 	}
 
-	pub fn as_mut_function_sig(&mut self) -> Option<&mut FunctionSignature> {
+	pub fn as_function_sig_mut(&mut self) -> Option<&mut FunctionSignature> {
 		if let Type::Function(ref mut sig) = **self {
 			Some(sig)
 		} else {
@@ -1003,7 +1025,7 @@ impl TypeRef {
 
 		if let Some(class) = self.as_class() {
 			if let LookupResult::Found(method, _) = class.get_env().lookup_ext(&CLOSURE_CLASS_HANDLE_METHOD.into(), None) {
-				return method.as_variable().unwrap().type_.as_function_sig();
+				return method.as_variable()?.type_.as_function_sig();
 			}
 		}
 
@@ -1012,7 +1034,7 @@ impl TypeRef {
 				.get_env()
 				.lookup_ext(&CLOSURE_CLASS_HANDLE_METHOD.into(), None)
 			{
-				return method.as_variable().unwrap().type_.as_function_sig();
+				return method.as_variable()?.type_.as_function_sig();
 			}
 		}
 
@@ -1047,6 +1069,18 @@ impl TypeRef {
 		return false;
 	}
 
+	pub fn is_preflight_object_type(&self) -> bool {
+		if let Type::Class(ref class) = **self {
+			return class.phase == Phase::Preflight;
+		}
+
+		if let Type::Interface(ref iface) = **self {
+			return iface.phase == Phase::Preflight;
+		}
+
+		false
+	}
+
 	/// Returns whether type represents a closure (either a function or a closure class).
 	pub fn is_closure(&self) -> bool {
 		if self.as_function_sig().is_some() {
@@ -1063,12 +1097,16 @@ impl TypeRef {
 		matches!(**self, Type::String)
 	}
 
+	pub fn is_number(&self) -> bool {
+		matches!(**self, Type::Number)
+	}
+
 	pub fn is_struct(&self) -> bool {
 		matches!(**self, Type::Struct(_))
 	}
 
 	pub fn is_map(&self) -> bool {
-		matches!(**self, Type::Map(_))
+		matches!(**self, Type::Map(_) | Type::MutMap(_))
 	}
 
 	pub fn is_void(&self) -> bool {
@@ -1080,6 +1118,11 @@ impl TypeRef {
 		matches!(**self, Type::Optional(_) | Type::Anything)
 	}
 
+	/// Same as is_option, but does not consider `anything` as an optional
+	pub fn is_strict_option(&self) -> bool {
+		matches!(**self, Type::Optional(_))
+	}
+
 	pub fn is_immutable_collection(&self) -> bool {
 		matches!(**self, Type::Array(_) | Type::Map(_) | Type::Set(_))
 	}
@@ -1096,6 +1139,17 @@ impl TypeRef {
 		matches!(**self, Type::Function(_))
 	}
 
+	pub fn is_enum(&self) -> bool {
+		matches!(**self, Type::Enum(_))
+	}
+
+	pub fn is_stringable(&self) -> bool {
+		matches!(
+			**self,
+			Type::String | Type::Number | Type::Boolean | Type::Json(_) | Type::MutJson | Type::Enum(_) | Type::Anything
+		)
+	}
+
 	/// If this is a function and its last argument is a struct, return that struct.
 	pub fn get_function_struct_arg(&self) -> Option<&Struct> {
 		if let Some(func) = self.maybe_unwrap_option().as_function_sig() {
@@ -1132,36 +1186,6 @@ impl TypeRef {
 		)
 	}
 
-	pub fn is_capturable(&self) -> bool {
-		match &**self {
-			Type::Interface(iface) => iface.is_resource(),
-			Type::Enum(_) => true,
-			Type::Number => true,
-			Type::String => true,
-			Type::Duration => true,
-			Type::Boolean => true,
-			Type::Json(_) => true,
-			Type::Nil => true,
-			Type::Array(v) => v.is_capturable(),
-			Type::Map(v) => v.is_capturable(),
-			Type::Set(v) => v.is_capturable(),
-			Type::Struct(_) => true,
-			Type::Optional(v) => v.is_capturable(),
-			Type::Anything => false,
-			Type::Unresolved => false,
-			Type::Inferred(..) => false,
-			Type::Void => false,
-			Type::MutJson => true,
-			Type::MutArray(v) => v.is_capturable(),
-			Type::MutMap(v) => v.is_capturable(),
-			Type::MutSet(v) => v.is_capturable(),
-			Type::Function(sig) => sig.phase == Phase::Inflight,
-
-			// only preflight classes can be captured
-			Type::Class(c) => c.phase == Phase::Preflight,
-		}
-	}
-
 	// returns true if mutable type or if immutable container type contains a mutable type
 	pub fn is_mutable(&self) -> bool {
 		match &**self {
@@ -1177,6 +1201,37 @@ impl TypeRef {
 		}
 	}
 
+	pub fn is_serializable(&self) -> bool {
+		match &**self {
+			// serializable
+			Type::Anything => true,
+			Type::Number => true,
+			Type::String => true,
+			Type::Boolean => true,
+			Type::Void => true,
+			Type::Json(_) => true,
+			Type::MutJson => true,
+			Type::Nil => true,
+			Type::Unresolved => true,
+			Type::Optional(t) => t.is_serializable(),
+			Type::Array(t) => t.is_serializable(),
+			Type::MutArray(t) => t.is_serializable(),
+			Type::Map(t) => t.is_serializable(),
+			Type::MutMap(t) => t.is_serializable(),
+			Type::Struct(s) => s.fields(true).map(|(_, t)| t).all(|t| t.is_serializable()),
+			Type::Enum(_) => true,
+			// not serializable
+			Type::Duration => false,
+			Type::Inferred(_) => false,
+			Type::Set(_) => false,
+			Type::MutSet(_) => false,
+			Type::Function(_) => false,
+			Type::Class(_) => false,
+			Type::Interface(_) => false,
+			Type::Stringable => false,
+		}
+	}
+
 	pub fn is_nil(&self) -> bool {
 		match &**self {
 			Type::Nil => true,
@@ -1307,8 +1362,9 @@ pub struct Types {
 	/// A map from source paths to type information about that path
 	/// If it's a file, we save its symbol environment, and if it's a directory, we save a namespace that points to
 	/// all of the symbol environments of the files (or subdirectories) in that directory
-	source_file_envs: IndexMap<Utf8PathBuf, SymbolEnvOrNamespace>,
+	pub source_file_envs: IndexMap<Utf8PathBuf, SymbolEnvOrNamespace>,
 	pub libraries: SymbolEnv,
+	pub intrinsics: SymbolEnv,
 	numeric_idx: usize,
 	string_idx: usize,
 	bool_idx: usize,
@@ -1319,6 +1375,7 @@ pub struct Types {
 	mut_json_idx: usize,
 	nil_idx: usize,
 	err_idx: usize,
+	stringable_idx: usize,
 
 	inferences: Vec<Option<TypeRef>>,
 	/// Lookup table from an Expr's `id` to its resolved type and phase
@@ -1330,6 +1387,8 @@ pub struct Types {
 	/// Expressions used in references that actually refer to a type.
 	/// Key is the ExprId of the object of a InstanceMember, and the value is a TypeMember representing the whole reference.
 	type_expressions: IndexMap<ExprId, Reference>,
+	/// Append empty struct to end of arg list
+	pub append_empty_struct_to_arglist: HashSet<ArgListId>,
 }
 
 impl Types {
@@ -1355,15 +1414,14 @@ impl Types {
 		let nil_idx = types.len() - 1;
 		types.push(Box::new(Type::Unresolved));
 		let err_idx = types.len() - 1;
-
-		let libraries = SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Preflight, 0);
+		types.push(Box::new(Type::Stringable));
+		let stringable_idx = types.len() - 1;
 
 		Self {
 			types,
 			namespaces: Vec::new(),
 			symbol_envs: Vec::new(),
 			source_file_envs: IndexMap::new(),
-			libraries,
 			numeric_idx,
 			string_idx,
 			bool_idx,
@@ -1374,11 +1432,15 @@ impl Types {
 			mut_json_idx,
 			nil_idx,
 			err_idx,
+			stringable_idx,
 			type_for_expr: Vec::new(),
 			json_literal_casts: IndexMap::new(),
 			scope_envs: Vec::new(),
 			inferences: Vec::new(),
 			type_expressions: IndexMap::new(),
+			append_empty_struct_to_arglist: HashSet::new(),
+			libraries: SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Preflight, 0),
+			intrinsics: SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Independent, 0),
 		}
 	}
 
@@ -1390,6 +1452,10 @@ impl Types {
 		self.get_typeref(self.string_idx)
 	}
 
+	pub fn stringable(&self) -> TypeRef {
+		self.get_typeref(self.stringable_idx)
+	}
+
 	pub fn nil(&self) -> TypeRef {
 		self.get_typeref(self.nil_idx)
 	}
@@ -1526,18 +1592,6 @@ impl Types {
 		self.get_typeref(self.mut_json_idx)
 	}
 
-	pub fn stringables(&self) -> Vec<TypeRef> {
-		// TODO: This should be more complex and return all types that have some stringification facility
-		// see: https://github.com/winglang/wing/issues/741
-		vec![
-			self.string(),
-			self.number(),
-			self.json(),
-			self.mut_json(),
-			self.anything(),
-		]
-	}
-
 	pub fn add_namespace(&mut self, n: Namespace) -> NamespaceRef {
 		self.namespaces.push(Box::new(n));
 		self.get_namespaceref(self.namespaces.len() - 1)
@@ -1563,10 +1617,31 @@ impl Types {
 		self
 			.libraries
 			.lookup_nested_str(&resource_fqn, None)
-			.expect("Resouce base class to be loaded")
+			.expect("Resource base class to be loaded")
 			.0
 			.as_type()
-			.expect("Resouce base class to be a type")
+			.expect("Resource base class to be a type")
+	}
+
+	pub fn resource_base_interface(&self) -> TypeRef {
+		let resource_fqn = format!("{}.{}", WINGSDK_ASSEMBLY_NAME, WINGSDK_IRESOURCE);
+		self
+			.libraries
+			.lookup_nested_str(&resource_fqn, None)
+			.expect("Resource base interface to be loaded")
+			.0
+			.as_type()
+			.expect("Resource base interface to be a type")
+	}
+
+	pub fn construct_base_type(&self) -> TypeRef {
+		self
+			.libraries
+			.lookup_nested_str(&CONSTRUCT_BASE_CLASS, None)
+			.expect("Construct base class to be loaded")
+			.0
+			.as_type()
+			.expect("Construct base class to be a type")
 	}
 
 	pub fn construct_interface(&self) -> TypeRef {
@@ -1624,12 +1699,6 @@ impl Types {
 		self.scope_envs[scope_id].expect("Scope should have an env")
 	}
 
-	pub fn reset_scope_envs(&mut self) {
-		for elem in self.scope_envs.iter_mut() {
-			*elem = None;
-		}
-	}
-
 	/// Obtain the type of a given expression id. Returns None if the expression has not been type checked yet. If
 	/// this is called after type checking, it should always return Some.
 	pub fn try_get_expr_type(&self, expr_id: ExprId) -> Option<TypeRef> {
@@ -1651,12 +1720,6 @@ impl Types {
 		self.json_literal_casts.get(&expr_id)
 	}
 
-	pub fn reset_expr_types(&mut self) {
-		for elem in self.type_for_expr.iter_mut() {
-			*elem = None;
-		}
-	}
-
 	/// Given a builtin type, return the full class info from the standard library.
 	///
 	/// This is needed because our builtin types have no API.
@@ -1687,6 +1750,7 @@ impl Types {
 			| Type::Class(_)
 			| Type::Interface(_)
 			| Type::Enum(_)
+			| Type::Stringable
 			| Type::Void
 			| Type::Nil
 			| Type::Anything
@@ -1700,6 +1764,26 @@ impl Types {
 	}
 }
 
+/// Enum of builtin functions, this are defined as hard coded AST nodes in `add_builtins`
+#[derive(Debug)]
+pub enum UtilityFunctions {
+	Log,
+	Assert,
+	UnsafeCast,
+	Nodeof,
+}
+
+impl Display for UtilityFunctions {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			UtilityFunctions::Log => write!(f, "log"),
+			UtilityFunctions::Assert => write!(f, "assert"),
+			UtilityFunctions::UnsafeCast => write!(f, "unsafeCast"),
+			UtilityFunctions::Nodeof => write!(f, "nodeof"),
+		}
+	}
+}
+
 pub struct TypeChecker<'a> {
 	types: &'a mut Types,
 
@@ -1815,12 +1899,26 @@ impl<'a> TypeChecker<'a> {
 		});
 	}
 
-	fn spanned_error_with_hints<S: Into<String>>(&self, spanned: &impl Spanned, message: S, hints: Vec<String>) {
+	fn spanned_error_with_hints<S: ToString, H: ToString>(&self, spanned: &impl Spanned, message: S, hints: &[H]) {
 		report_diagnostic(Diagnostic {
-			message: message.into(),
+			message: message.to_string(),
 			span: Some(spanned.span()),
 			annotations: vec![],
-			hints: hints,
+			hints: hints.iter().map(|h| h.to_string()).collect(),
+		});
+	}
+
+	fn spanned_error_with_annotations<S: Into<String>>(
+		&self,
+		spanned: &impl Spanned,
+		message: S,
+		annotations: Vec<DiagnosticAnnotation>,
+	) {
+		report_diagnostic(Diagnostic {
+			message: message.into(),
+			span: Some(spanned.span()),
+			annotations,
+			hints: vec![],
 		});
 	}
 
@@ -1838,12 +1936,13 @@ impl<'a> TypeChecker<'a> {
 			message,
 			span,
 			annotations,
+			hints,
 		} = type_error;
 		report_diagnostic(Diagnostic {
 			message,
 			span: Some(span),
 			annotations,
-			hints: vec![],
+			hints,
 		});
 
 		self.types.error()
@@ -1861,10 +1960,285 @@ impl<'a> TypeChecker<'a> {
 		}
 	}
 
+	pub fn add_this(&mut self, env: &mut SymbolEnv) {
+		let sym = Symbol::global("this");
+		env
+			.define(
+				&sym,
+				SymbolKind::make_free_variable(sym.clone(), self.types.construct_base_type(), false, Phase::Preflight),
+				AccessModifier::Private,
+				StatementIdx::Top,
+			)
+			.expect("Failed to add this");
+	}
+
+	/// Patch some of the types from the "constructs" package to provide a better DX
+	pub fn patch_constructs(&mut self) {
+		// Hide the "node" field from constructs so that users go through
+		// the `nodeof` utility function to get the tree node of a construct.
+		// The `Node` instance provided by Wing has some extra methods not
+		// available in the constructs package, and also modifies how the
+		// root node is obtained.
+		let mut constructs_iface = self
+			.types
+			.libraries
+			.lookup_nested_str(&CONSTRUCT_BASE_INTERFACE, None)
+			.expect("constructs.IConstruct not found in type system")
+			.0
+			.as_type()
+			.expect("constructs.IConstruct was found but it's not a type");
+		let iface = constructs_iface
+			.as_interface_mut()
+			.expect("constructs.IConstruct was found but it's not a class");
+		iface.env.symbol_map.remove(CONSTRUCT_NODE_PROPERTY);
+
+		let mut constructs_class = self
+			.types
+			.libraries
+			.lookup_nested_str(&CONSTRUCT_BASE_CLASS, None)
+			.expect("constructs.Construct not found in type system")
+			.0
+			.as_type()
+			.expect("constructs.Construct was found but it's not a type");
+		let class = constructs_class
+			.as_class_mut()
+			.expect("constructs.Construct was found but it's not a class");
+		class.env.symbol_map.remove(CONSTRUCT_NODE_PROPERTY);
+	}
+
+	pub fn add_builtins(&mut self, scope: &mut Scope) {
+		let optional_string = self.types.make_option(self.types.string());
+		self.add_builtin(
+			UtilityFunctions::Log.to_string().as_str(),
+			Type::Function(FunctionSignature {
+				this_type: None,
+				parameters: vec![FunctionParameter {
+					name: "value".into(),
+					typeref: self.types.stringable(),
+					docs: Docs::with_summary("The value to log"),
+					variadic: false,
+				}],
+				return_type: self.types.void(),
+				phase: Phase::Independent,
+				js_override: Some("console.log($args$)".to_string()),
+				docs: Docs::with_summary("Logs a value"),
+				implicit_scope_param: false,
+			}),
+			scope,
+		);
+		self.add_builtin(
+			UtilityFunctions::Assert.to_string().as_str(),
+			Type::Function(FunctionSignature {
+				this_type: None,
+				parameters: vec![
+					FunctionParameter {
+						name: "condition".into(),
+						typeref: self.types.bool(),
+						docs: Docs::with_summary("The condition to assert"),
+						variadic: false,
+					},
+					FunctionParameter {
+						name: "message".into(),
+						typeref: optional_string,
+						docs: Docs::with_summary("The message to log if the condition is false"),
+						variadic: false,
+					},
+				],
+				return_type: self.types.void(),
+				phase: Phase::Independent,
+				js_override: Some("$helpers.assert($args$, \"$args_text$\")".to_string()),
+				docs: Docs::with_summary("Asserts that a condition is true"),
+				implicit_scope_param: false,
+			}),
+			scope,
+		);
+		self.add_builtin(
+			UtilityFunctions::UnsafeCast.to_string().as_str(),
+			Type::Function(FunctionSignature {
+				this_type: None,
+				parameters: vec![FunctionParameter {
+					name: "value".into(),
+					typeref: self.types.anything(),
+					docs: Docs::with_summary("The value to cast into a different type"),
+					variadic: false,
+				}],
+				return_type: self.types.anything(),
+				phase: Phase::Independent,
+				js_override: Some("$args$".to_string()),
+				docs: Docs::with_summary("Casts a value into a different type. This is unsafe and can cause runtime errors"),
+				implicit_scope_param: false,
+			}),
+			scope,
+		);
+
+		let std_node_fqn = format!("{}.{}", WINGSDK_ASSEMBLY_NAME, WINGSDK_NODE);
+		let std_node = self
+			.types
+			.libraries
+			.lookup_nested_str(&std_node_fqn, None)
+			.expect("std.Node not found in type system")
+			.0
+			.as_type()
+			.expect("std.Node was found but it's not a type");
+		self.add_builtin(
+			UtilityFunctions::Nodeof.to_string().as_str(),
+			Type::Function(FunctionSignature {
+				this_type: None,
+				parameters: vec![FunctionParameter {
+					name: "construct".into(),
+					typeref: self.types.construct_interface(),
+					docs: Docs::with_summary("The construct to obtain the tree node of"),
+					variadic: false,
+				}],
+				return_type: std_node,
+				phase: Phase::Preflight,
+				js_override: Some("$helpers.nodeof($args$)".to_string()),
+				docs: Docs::with_summary("Obtain the tree node of a preflight resource."),
+				implicit_scope_param: false,
+			}),
+			scope,
+		);
+
+		// Intrinsics
+		let _ = self.types.intrinsics.define(
+			&Symbol::global(IntrinsicKind::Dirname.to_string()),
+			SymbolKind::Variable(VariableInfo {
+				access: AccessModifier::Public,
+				name: Symbol::global(IntrinsicKind::Dirname.to_string()),
+				docs: Some(Docs::with_summary(r#"Get the normalized absolute path of the current source file's directory.
+
+The resolved path represents a path during preflight only and is not guaranteed to be valid while inflight.
+It should primarily be used in preflight or in inflights that are guaranteed to be executed in the same filesystem where preflight executed."#)),
+				kind: VariableKind::StaticMember,
+				phase: Phase::Preflight,
+				type_: self.types.string(),
+				reassignable: false,
+			}),
+			AccessModifier::Public,
+			StatementIdx::Top,
+		);
+
+		let import_inflight_options_fqn = format!("{}.std.ImportInflightOptions", WINGSDK_ASSEMBLY_NAME);
+		let import_inflight_options = self
+			.types
+			.libraries
+			.lookup_nested_str(&import_inflight_options_fqn, None)
+			.expect("std.ImportInflightOptions not found in type system")
+			.0
+			.as_type()
+			.expect("std.ImportInflightOptions was found but it's not a type");
+		let inflight_t = Type::Function(FunctionSignature {
+			this_type: None,
+			parameters: vec![
+				FunctionParameter {
+					name: "file".into(),
+					typeref: self.types.string(),
+					docs: Docs::with_summary("Path to extern file to create inflight. Relative to the current wing file."),
+					variadic: false,
+				},
+				FunctionParameter {
+					name: "options".into(),
+					typeref: self.types.make_option(import_inflight_options),
+					docs: import_inflight_options.as_struct().unwrap().docs.clone(),
+					variadic: false,
+				},
+			],
+			// In practice, this function returns an inferred type upon each use
+			return_type: self.types.anything(),
+			phase: Phase::Preflight,
+			// The emitted JS is dynamic
+			js_override: None,
+			docs: Docs::with_summary(
+				r#"Create an inflight function from the given file.
+The file must be a JavaScript or TypeScript file with a default export that matches the inferred return where `@inflight` is used.
+
+For example:
+
+```wing
+bring cloud;
+new cloud.Function(@inflight("./handler.ts"));
+```
+
+`./handler.ts` Must default export an `async ({}, string?) => string?` function. The first argument is anything lifted into that function, e.g.:
+
+```wing
+let bucket = new cloud.Bucket();
+new cloud.Function(@inflight("./handler.ts"), lifts: { bucket: ["put"] });
+```
+"#,
+			),
+			implicit_scope_param: false,
+		});
+		let inflight_t = self.types.add_type(inflight_t);
+		let _ = self.types.intrinsics.define(
+			&IntrinsicKind::Inflight.clone().into(),
+			SymbolKind::Variable(VariableInfo {
+				access: AccessModifier::Public,
+				name: IntrinsicKind::Inflight.into(),
+				docs: None,
+				kind: VariableKind::StaticMember,
+				phase: Phase::Preflight,
+				type_: inflight_t,
+				reassignable: false,
+			}),
+			AccessModifier::Public,
+			StatementIdx::Top,
+		);
+	}
+
+	fn add_builtin(&mut self, name: &str, typ: Type, scope: &mut Scope) {
+		let sym = Symbol::global(name);
+		let mut scope_env = self.types.get_scope_env(&scope);
+		scope_env
+			.define(
+				&sym,
+				SymbolKind::make_free_variable(sym.clone(), self.types.add_type(typ), false, Phase::Independent),
+				AccessModifier::Private,
+				StatementIdx::Top,
+			)
+			.expect("Failed to add builtin");
+	}
+
 	// Validates types in the expression make sense and returns the expression's inferred type
 	fn type_check_exp(&mut self, exp: &Expr, env: &mut SymbolEnv) -> (TypeRef, Phase) {
 		CompilationContext::set(CompilationPhase::TypeChecking, &exp.span);
-		let (mut t, phase) = self.type_check_exp_helper(&exp, env);
+
+		let (mut t, phase) = match &exp.kind {
+			ExprKind::Literal(lit) => self.type_check_lit(lit, env),
+			ExprKind::Binary { op, left, right } => self.type_check_binary_op(left, env, right, op, exp),
+			ExprKind::Unary { op, exp: unary_exp } => self.type_check_unary_op(unary_exp, env, op),
+			ExprKind::Range { start, end, .. } => self.type_check_range(start, env, end),
+			ExprKind::Reference(_ref) => self.type_check_reference(_ref, env),
+			ExprKind::Intrinsic(intrinsic) => self.type_check_intrinsic(intrinsic, env, exp),
+			ExprKind::New(new_expr) => self.type_check_new(new_expr, env, exp),
+			ExprKind::Call { callee, arg_list } => self.type_check_call(arg_list, env, callee, exp),
+			ExprKind::ArrayLiteral { type_, items } => self.type_check_array_lit(type_, env, exp, items),
+			ExprKind::MapLiteral { fields, type_ } => self.type_check_map_lit(type_, env, fields, exp),
+			ExprKind::SetLiteral { type_, items } => self.type_check_set_lit(type_, env, items, exp),
+			ExprKind::StructLiteral { type_, fields } => self.type_check_struct_lit(type_, env, fields, exp),
+			ExprKind::JsonLiteral { is_mut, element } => self.type_check_json_lit(is_mut, element, env, exp),
+			ExprKind::JsonMapLiteral { fields } => self.type_check_json_map_lit(fields, env, exp),
+			ExprKind::FunctionClosure(func_def) => self.type_check_closure(func_def, env),
+			ExprKind::CompilerDebugPanic => {
+				// Handle the debug panic expression (during type-checking)
+				dbg_panic!();
+				(
+					self.type_error(TypeError {
+						message: "Panic expression".to_string(),
+						span: exp.span.clone(),
+						annotations: vec![],
+						hints: vec![],
+					}),
+					env.phase,
+				)
+			}
+		};
+
+		// If we're inflight but the expression is a lifted (preflight) expression then make it immutable
+		if env.phase == Phase::Inflight && phase == Phase::Preflight {
+			t = self.make_immutable(t);
+		}
+
 		self.types.assign_type_to_expr(exp, t, phase);
 
 		// In case any type inferences were updated during this check, ensure all related inferences are updated
@@ -1873,724 +2247,824 @@ impl<'a> TypeChecker<'a> {
 		(t, phase)
 	}
 
-	/// Helper function for type_check_exp. This is needed because we want to be able to `return`
-	/// and break early, while still setting the evaluated type on the expression.
-	///
-	/// Do not use this function directly, use `type_check_exp` instead.
-	fn type_check_exp_helper(&mut self, exp: &Expr, env: &mut SymbolEnv) -> (TypeRef, Phase) {
-		match &exp.kind {
-			ExprKind::Literal(lit) => match lit {
-				Literal::String(_) => (self.types.string(), Phase::Independent),
-				Literal::Nil => (self.types.nil(), Phase::Independent),
-				Literal::InterpolatedString(s) => {
-					s.parts.iter().for_each(|part| {
-						if let InterpolatedStringPart::Expr(interpolated_expr) = part {
-							let (exp_type, _) = self.type_check_exp(interpolated_expr, env);
-							self.validate_type_in(exp_type, &self.types.stringables(), interpolated_expr);
-						}
-					});
-					(self.types.string(), Phase::Independent)
-				}
-				Literal::Number(_) => (self.types.number(), Phase::Independent),
-				Literal::Boolean(_) => (self.types.bool(), Phase::Independent),
-			},
-			ExprKind::Binary { op, left, right } => {
-				let (ltype, ltype_phase) = self.type_check_exp(left, env);
-				let (rtype, _) = self.type_check_exp(right, env);
-
-				match op {
-					BinaryOperator::LogicalAnd | BinaryOperator::LogicalOr => {
-						self.validate_type(ltype, self.types.bool(), left);
-						self.validate_type(rtype, self.types.bool(), right);
-						(self.types.bool(), Phase::Independent)
-					}
-					BinaryOperator::AddOrConcat => {
-						if ltype.is_subtype_of(&self.types.number()) && rtype.is_subtype_of(&self.types.number()) {
-							(self.types.number(), Phase::Independent)
-						} else if ltype.is_subtype_of(&self.types.string()) && rtype.is_subtype_of(&self.types.string()) {
-							(self.types.string(), Phase::Independent)
-						} else {
-							// If any of the types are unresolved (error) then don't report this assuming the error has already been reported
-							if !ltype.is_unresolved() && !rtype.is_unresolved() {
-								self.spanned_error(
-									exp,
-									format!(
-										"Binary operator '+' cannot be applied to operands of type '{}' and '{}'; only ({}, {}) and ({}, {}) are supported",
-										ltype,
-										rtype,
-										self.types.number(),
-										self.types.number(),
-										self.types.string(),
-										self.types.string(),
-									),
-								);
-							}
-							self.resolved_error()
-						}
-					}
-					BinaryOperator::Sub
-					| BinaryOperator::Mul
-					| BinaryOperator::Div
-					| BinaryOperator::FloorDiv
-					| BinaryOperator::Mod
-					| BinaryOperator::Power => {
-						self.validate_type(ltype, self.types.number(), left);
-						self.validate_type(rtype, self.types.number(), right);
-						(self.types.number(), Phase::Independent)
-					}
-					BinaryOperator::Equal | BinaryOperator::NotEqual => {
-						self.validate_type_binary_equality(rtype, ltype, exp);
-						(self.types.bool(), Phase::Independent)
-					}
-					BinaryOperator::Less
-					| BinaryOperator::LessOrEqual
-					| BinaryOperator::Greater
-					| BinaryOperator::GreaterOrEqual => {
-						self.validate_type(ltype, self.types.number(), left);
-						self.validate_type(rtype, self.types.number(), right);
-						(self.types.bool(), Phase::Independent)
-					}
-					BinaryOperator::UnwrapOr => {
-						// Left argument must be an optional type
-						if !ltype.is_option() {
-							self.spanned_error(left, format!("Expected optional type, found \"{}\"", ltype));
-							(ltype, ltype_phase)
-						} else {
-							// Right argument must be a subtype of the inner type of the left argument
-							let inner_type = *ltype.maybe_unwrap_option();
-							self.validate_type(rtype, inner_type, right);
-							(inner_type, ltype_phase)
-						}
+	fn type_check_lit(&mut self, lit: &Literal, env: &mut SymbolEnv) -> (TypeRef, Phase) {
+		match lit {
+			Literal::String(_) => (self.types.string(), Phase::Independent),
+			Literal::NonInterpolatedString(_) => (self.types.string(), Phase::Independent),
+			Literal::Nil => (self.types.nil(), Phase::Independent),
+			Literal::InterpolatedString(s) => {
+				let mut phase = Phase::Independent;
+				s.parts.iter().for_each(|part| {
+					if let InterpolatedStringPart::Expr(interpolated_expr) = part {
+						let (exp_type, p) = self.type_check_exp(interpolated_expr, env);
+						phase = combine_phases(phase, p);
+						self.validate_type_in(exp_type, &[self.types.stringable()], interpolated_expr, None, None);
 					}
-				}
+				});
+				(self.types.string(), phase)
 			}
-			ExprKind::Unary { op, exp: unary_exp } => {
-				let (type_, phase) = self.type_check_exp(unary_exp, env);
+			Literal::Number(_) => (self.types.number(), Phase::Independent),
+			Literal::Boolean(_) => (self.types.bool(), Phase::Independent),
+		}
+	}
 
-				match op {
-					UnaryOperator::Not => (self.validate_type(type_, self.types.bool(), unary_exp), phase),
-					UnaryOperator::Minus => (self.validate_type(type_, self.types.number(), unary_exp), phase),
-					UnaryOperator::OptionalTest => {
-						if !type_.is_option() {
-							self.spanned_error(unary_exp, format!("Expected optional type, found \"{}\"", type_));
-						}
-						(self.types.bool(), phase)
+	fn type_check_binary_op(
+		&mut self,
+		left: &Expr,
+		env: &mut SymbolEnv,
+		right: &Expr,
+		op: &BinaryOperator,
+		exp: &Expr,
+	) -> (TypeRef, Phase) {
+		let (ltype, ltype_phase) = self.type_check_exp(left, env);
+		let (rtype, rtype_phase) = self.type_check_exp(right, env);
+
+		// Resolve the phase
+		let phase = combine_phases(ltype_phase, rtype_phase);
+
+		match op {
+			BinaryOperator::LogicalAnd | BinaryOperator::LogicalOr => {
+				self.validate_type(ltype, self.types.bool(), left);
+				self.validate_type(rtype, self.types.bool(), right);
+				(self.types.bool(), phase)
+			}
+			BinaryOperator::AddOrConcat => {
+				if ltype.is_subtype_of(&self.types.number()) && rtype.is_subtype_of(&self.types.number()) {
+					(self.types.number(), phase)
+				} else if ltype.is_subtype_of(&self.types.string()) && rtype.is_subtype_of(&self.types.string()) {
+					(self.types.string(), phase)
+				} else {
+					// If any of the types are unresolved (error) then don't report this assuming the error has already been reported
+					if !ltype.is_unresolved() && !rtype.is_unresolved() {
+						self.spanned_error(
+							exp,
+							format!(
+														"Binary operator '+' cannot be applied to operands of type '{}' and '{}'; only ({}, {}) and ({}, {}) are supported",
+														ltype,
+														rtype,
+														self.types.number(),
+														self.types.number(),
+														self.types.string(),
+														self.types.string(),
+													),
+						);
 					}
+					self.resolved_error()
 				}
 			}
-			ExprKind::Range {
-				start,
-				inclusive: _,
-				end,
-			} => {
-				let (stype, stype_phase) = self.type_check_exp(start, env);
-				let (etype, _) = self.type_check_exp(end, env);
+			BinaryOperator::Sub
+			| BinaryOperator::Mul
+			| BinaryOperator::Div
+			| BinaryOperator::FloorDiv
+			| BinaryOperator::Mod
+			| BinaryOperator::Power => {
+				self.validate_type(ltype, self.types.number(), left);
+				self.validate_type(rtype, self.types.number(), right);
+				(self.types.number(), phase)
+			}
+			BinaryOperator::Equal | BinaryOperator::NotEqual => {
+				self.validate_type_binary_equality(rtype, ltype, exp, None, None);
+				(self.types.bool(), phase)
+			}
+			BinaryOperator::Less | BinaryOperator::LessOrEqual | BinaryOperator::Greater | BinaryOperator::GreaterOrEqual => {
+				self.validate_type(ltype, self.types.number(), left);
+				self.validate_type(rtype, self.types.number(), right);
+				(self.types.bool(), phase)
+			}
+			BinaryOperator::UnwrapOr => {
+				// Left argument must be an optional type
+				if !ltype.is_option() {
+					self.spanned_error(left, format!("Expected optional type, found \"{}\"", ltype));
+					(ltype, phase)
+				} else {
+					// Right argument must be a subtype of the inner type of the left argument
+					let inner_type = *ltype.maybe_unwrap_option();
+					self.validate_type(rtype, inner_type, right);
+					(inner_type, phase)
+				}
+			}
+		}
+	}
 
-				self.validate_type(stype, self.types.number(), start);
-				self.validate_type(etype, self.types.number(), end);
-				(self.types.add_type(Type::Array(stype)), stype_phase)
+	fn type_check_unary_op(&mut self, unary_exp: &Expr, env: &mut SymbolEnv, op: &UnaryOperator) -> (TypeRef, Phase) {
+		let (type_, phase) = self.type_check_exp(unary_exp, env);
+
+		match op {
+			UnaryOperator::Not => (self.validate_type(type_, self.types.bool(), unary_exp), phase),
+			UnaryOperator::Minus => (self.validate_type(type_, self.types.number(), unary_exp), phase),
+			UnaryOperator::OptionalTest => {
+				if !type_.is_option() {
+					self.spanned_error(unary_exp, format!("Expected optional type, found \"{}\"", type_));
+				}
+				(self.types.bool(), phase)
 			}
-			ExprKind::Reference(_ref) => {
-				let (vi, phase) = self.resolve_reference(_ref, env);
-				(vi.type_, phase)
+			UnaryOperator::OptionalUnwrap => {
+				if !type_.is_option() {
+					self.spanned_error(unary_exp, format!("'!' expects an optional type, found \"{}\"", type_));
+					(type_, phase)
+				} else {
+					let inner_type = *type_.maybe_unwrap_option();
+					(inner_type, phase)
+				}
 			}
-			ExprKind::New(new_expr) => {
-				let New {
-					class,
-					obj_id,
-					arg_list,
-					obj_scope,
-				} = new_expr;
-				// Type check everything
-				let class_type = self
-					.resolve_user_defined_type(class, env, self.ctx.current_stmt_idx())
-					.unwrap_or_else(|e| self.type_error(e));
-				let obj_scope_type = obj_scope.as_ref().map(|x| self.type_check_exp(x, env).0);
-				let obj_id_type = obj_id.as_ref().map(|x| self.type_check_exp(x, env).0);
-				let arg_list_types = self.type_check_arg_list(arg_list, env);
-
-				// Lookup the class's type in the env
-				let (class_env, class_symbol) = match *class_type {
-					Type::Class(ref class) => {
-						if class.is_abstract {
-							self.spanned_error(exp, format!("Cannot instantiate abstract class \"{}\"", class.name));
-						}
-
-						// error if we are trying to instantiate a preflight in a static method
-						// without an explicit scope (there is no "this" to use as the scope)
-						if class.phase == Phase::Preflight && obj_scope.is_none() {
-							// check if there is a "this" symbol in the current environment
-							let has_this = env.lookup(&"this".into(), Some(self.ctx.current_stmt_idx())).is_some();
-
-							// if we have a "this", it means we can use it as a default scope, so we are fine
-							if !has_this {
-								// we don't have a "this", so we need to check if we are in a static method
-								// because the entrypoint scope doesn't have a "this" but it is not static
-								let is_static = self.ctx().current_function().map(|f| f.is_static);
-								if let Some(true) = is_static {
-									self.spanned_error(
-										exp,
-										format!(
-											"Cannot instantiate preflight class \"{}\" in a static method without an explicit scope",
-											class.name
-										),
-									);
-								}
-							}
-						}
+		}
+	}
 
-						if class.phase == Phase::Independent || env.phase == class.phase {
-							(&class.env, &class.name)
-						} else {
-							self.spanned_error(
-								exp,
-								format!(
-									"Cannot create {} class \"{}\" in {} phase",
-									class.phase, class.name, env.phase
-								),
-							);
-							return (self.types.error(), Phase::Independent);
-						}
-					}
-					// If type is anything we have to assume it's ok to initialize it
-					Type::Anything => return (self.types.anything(), Phase::Independent),
-					// If type is error, we assume the error was already reported and evauate the new expression to error as well
-					Type::Unresolved => return self.resolved_error(),
-					Type::Struct(_) => {
+	fn type_check_json_map_lit(
+		&mut self,
+		fields: &IndexMap<Symbol, Expr>,
+		env: &mut SymbolEnv,
+		exp: &Expr,
+	) -> (TypeRef, Phase) {
+		let mut known_types = IndexMap::new();
+		fields.iter().for_each(|(name, v)| {
+			let (known_type, _) = self.type_check_exp(v, env);
+			known_types.insert(
+				name.clone(),
+				SpannedTypeInfo {
+					type_: known_type,
+					span: v.span(),
+				},
+			);
+			// Ensure we don't allow MutJson to Json or vice versa
+			match *known_type {
+				Type::Json(_) => {
+					if self.is_in_mut_json {
 						self.spanned_error(
-							class,
-							format!(
-								"Cannot instantiate type \"{}\" because it is a struct and not a class. Use struct instantiation instead.",
-								class_type
-							),
-						);
-						return self.resolved_error();
+							v,
+							"\"MutJson\" fields cannot be \"Json\" (hint: try using Json.deepMutCopy())",
+						)
 					}
-					_ => {
+				}
+				Type::MutJson => {
+					if !self.is_in_mut_json {
 						self.spanned_error(
-							class,
-							format!("Cannot instantiate type \"{}\" because it is not a class", class_type),
-						);
-						return self.resolved_error();
+							v,
+							"\"Json\" fields cannot be \"MutJson\" (hint: try using Json.deepCopy())",
+						)
 					}
-				};
+				}
+				_ => {}
+			};
 
-				// Type check args against constructor
-				let init_method_name = if env.phase == Phase::Preflight || class_env.phase == Phase::Independent {
-					CLASS_INIT_NAME
-				} else {
-					CLASS_INFLIGHT_INIT_NAME
-				};
+			if self.is_in_mut_json && !known_type.is_json_legal_value() {
+				self.spanned_error(
+					v,
+					format!(
+						"Expected a valid Json value (https://www.json.org/json-en.html), but got \"{}\"",
+						known_type
+					),
+				);
+			}
+		});
 
-				let lookup_res = class_env.lookup_ext(&init_method_name.into(), None);
-				let constructor_type = if let LookupResult::Found(k, _) = lookup_res {
-					k.as_variable().expect("Expected constructor to be a variable").type_
-				} else {
-					self.type_error(lookup_result_to_type_error(
-						lookup_res,
-						&Symbol {
-							name: CLASS_INIT_NAME.into(),
-							span: class_symbol.span.clone(),
-						},
-					));
-					return self.resolved_error();
-				};
-				let constructor_sig = constructor_type
-					.as_function_sig()
-					.expect("Expected constructor to be a function signature");
+		(
+			self.types.add_type(Type::Json(Some(JsonData {
+				expression_id: exp.id,
+				kind: JsonDataKind::Fields(known_types),
+			}))),
+			env.phase,
+		)
+	}
 
-				// Verify return type (This should never fail since we define the constructors return type during AST building)
-				self.validate_type(constructor_sig.return_type, class_type, exp);
+	fn type_check_json_lit(
+		&mut self,
+		is_mut: &bool,
+		element: &Expr,
+		env: &mut SymbolEnv,
+		exp: &Expr,
+	) -> (TypeRef, Phase) {
+		if *is_mut {
+			self.is_in_mut_json = true;
+		}
 
-				self.type_check_arg_list_against_function_sig(&arg_list, &constructor_sig, exp, arg_list_types);
+		self.ctx.push_json();
+		let (known_type, _) = self.type_check_exp(&element, env);
+		self.ctx.pop_json();
 
-				let non_std_args = !class_type.as_class().unwrap().std_construct_args;
+		// When we are no longer in a Json literal, we reset the is_in_mut_json flag
+		if !self.ctx.in_json() {
+			self.is_in_mut_json = false;
+		}
 
-				// If this is a preflight class make sure the object's scope and id are of correct type
-				if class_type.is_preflight_class() {
-					// Get reference to resource object's scope
-					let obj_scope_type = if obj_scope_type.is_none() {
-						// If this returns None, this means we're instantiating a preflight object in the global scope, which is valid
-						env
-							.lookup(&"this".into(), Some(self.ctx.current_stmt_idx()))
-							.map(|v| v.as_variable().expect("Expected \"this\" to be a variable").type_)
-					} else {
-						// If this is a non-standard preflight class, make sure the object's scope isn't explicitly set (using the `in` keywords)
-						if non_std_args {
-							self.spanned_error(
-								obj_scope.as_ref().unwrap(),
-								format!(
-									"Cannot set scope of non-standard preflight class \"{}\" using `in`",
-									class_type
-								),
-							);
-						}
+		if *is_mut {
+			(self.types.mut_json(), env.phase)
+		} else {
+			if known_type.is_json() {
+				(known_type, env.phase)
+			} else {
+				(
+					self.types.add_type(Type::Json(Some(JsonData {
+						expression_id: exp.id,
+						kind: JsonDataKind::Type(SpannedTypeInfo {
+							type_: known_type,
+							span: element.span(),
+						}),
+					}))),
+					env.phase,
+				)
+			}
+		}
+	}
 
-						obj_scope_type
-					};
+	fn type_check_struct_lit(
+		&mut self,
+		type_: &TypeAnnotation,
+		env: &mut SymbolEnv,
+		fields: &IndexMap<Symbol, Expr>,
+		exp: &Expr,
+	) -> (TypeRef, Phase) {
+		// Find this struct's type in the environment
+		let struct_type = self.resolve_type_annotation(type_, env);
+
+		// Type check each of the struct's fields
+		let field_types: IndexMap<Symbol, TypeRef> = fields
+			.iter()
+			.map(|(name, exp)| {
+				let (t, _) = self.type_check_exp(exp, env);
+				(name.clone(), t)
+			})
+			.collect();
 
-					// Verify the object scope is a construct
-					if let Some(obj_scope_type) = obj_scope_type {
-						if !obj_scope_type.is_subtype_of(&self.types.construct_interface()) {
-							self.spanned_error(
-								exp,
-								format!(
-									"Expected scope to be a preflight object, instead found \"{}\"",
-									obj_scope_type
-								),
-							);
-						}
-					}
+		// If we don't have type information for the struct we don't need to validate the fields
+		if struct_type.is_anything() || struct_type.is_unresolved() {
+			return (struct_type, env.phase);
+		}
 
-					// Verify the object id is a string
-					if let Some(obj_id_type) = obj_id_type {
-						self.validate_type(obj_id_type, self.types.string(), obj_id.as_ref().unwrap());
-						// If this is a non-standard preflight class, make sure the object's id isn't explicitly set (using the `as` keywords)
-						if non_std_args {
-							self.spanned_error(
-								obj_id.as_ref().unwrap(),
-								format!(
-									"Cannot set id of non-standard preflight class \"{}\" using `as`",
-									class_type
-								),
-							);
-						}
-					}
-				} else {
-					// This is an inflight class, make sure the object scope and id are not set
-					if let Some(obj_scope) = obj_scope {
-						self.spanned_error(obj_scope, "Inflight classes cannot have a scope");
-					}
-					if let Some(obj_id) = obj_id {
-						self.spanned_error(obj_id, "Inflight classes cannot have an id");
+		// Make sure it really is a struct type
+		let st = struct_type
+			.as_struct()
+			.expect(&format!("Expected \"{}\" to be a struct type", struct_type));
+
+		// Verify that all expected fields are present and are the right type
+		for (name, field_type) in st.fields(true) {
+			match fields.get(name.as_str()) {
+				Some(field_exp) => {
+					let t = field_types.get(name.as_str()).unwrap();
+					self.validate_type(*t, field_type, field_exp);
+				}
+				None => {
+					if !field_type.is_option() {
+						self.spanned_error(exp, format!("\"{}\" is not initialized", name));
 					}
 				}
+			}
+		}
 
-				(class_type, env.phase)
+		// Verify that no unexpected fields are present
+		for (name, _t) in field_types.iter() {
+			if st.env.lookup(name, Some(self.ctx.current_stmt_idx())).is_none() {
+				self.spanned_error(exp, format!("\"{}\" is not a field of \"{}\"", name.name, st.name.name));
 			}
-			ExprKind::Call { callee, arg_list } => {
-				// Resolve the function's reference (either a method in the class's env or a function in the current env)
-				let (func_type, callee_phase) = match callee {
-					CalleeKind::Expr(expr) => self.type_check_exp(expr, env),
-					CalleeKind::SuperCall(method) => resolve_super_method(method, env, &self.types).unwrap_or_else(|e| {
-						self.type_error(e);
-						self.resolved_error()
-					}),
-				};
-				let is_option = func_type.is_option();
-				let func_type = func_type.maybe_unwrap_option();
+		}
 
-				let arg_list_types = self.type_check_arg_list(arg_list, env);
+		(struct_type, env.phase)
+	}
 
-				// If the callee's signature type is unknown, just evaluate the entire call expression as an error
-				if func_type.is_unresolved() {
-					return self.resolved_error();
+	fn type_check_set_lit(
+		&mut self,
+		type_: &Option<TypeAnnotation>,
+		env: &mut SymbolEnv,
+		items: &Vec<Expr>,
+		exp: &Expr,
+	) -> (TypeRef, Phase) {
+		// Infer type based on either the explicit type or the value in one of the items
+		let (mut container_type, mut element_type) = if let Some(type_) = type_ {
+			let container_type = self.resolve_type_annotation(type_, env);
+			let element_type = match *container_type {
+				Type::Set(t) | Type::MutSet(t) => t,
+				_ => {
+					self.spanned_error(
+						&type_.span,
+						format!("Expected \"Set\" or \"MutSet\", found \"{container_type}\""),
+					);
+					self.types.error()
 				}
+			};
+			(container_type, element_type)
+		} else {
+			let inner_type = self.types.make_inference();
+			(self.types.add_type(Type::Set(inner_type)), inner_type)
+		};
 
-				// If the caller's signature is `any`, then just evaluate the entire call expression as `any`
-				if func_type.is_anything() {
-					return (self.types.anything(), Phase::Independent);
-				}
+		// Verify all types are the same as the inferred type
+		for item in items {
+			let (t, _) = self.type_check_exp(item, env);
 
-				// Make sure this is a function signature type
-				let func_sig = if let Some(func_sig) = func_type.as_function_sig() {
-					func_sig.clone()
-				} else if let Some(class) = func_type.as_preflight_class() {
-					// return the signature of the "handle" method
-					let lookup_res = class.get_method(&CLOSURE_CLASS_HANDLE_METHOD.into());
-					let handle_type = if let Some(method) = lookup_res {
-						method.type_
-					} else {
-						self.spanned_error(callee, "Expected a function or method");
-						return self.resolved_error();
-					};
-					if let Some(sig_type) = handle_type.as_function_sig() {
-						sig_type.clone()
-					} else {
-						self.spanned_error(callee, "Expected a function or method");
-						return self.resolved_error();
-					}
-				} else {
-					self.spanned_error(
-						callee,
-						format!("Expected a function or method, found \"{}\"", func_type),
-					);
-					return self.resolved_error();
+			if t.is_json() && !matches!(*element_type, Type::Json(Some(..))) {
+				// this is an set of JSON, change the element type to reflect that
+				let json_data = JsonData {
+					expression_id: exp.id,
+					kind: JsonDataKind::List(vec![]),
 				};
+				element_type = self.types.add_type(Type::Json(Some(json_data)));
+			}
 
-				if !env.phase.can_call_to(&func_sig.phase) {
-					self.spanned_error(
-						exp,
-						format!("Cannot call into {} phase while {}", func_sig.phase, env.phase),
-					);
+			// Augment the json list data with the new element type
+			if let Type::Json(Some(JsonData { ref mut kind, .. })) = &mut *element_type {
+				if let JsonDataKind::List(ref mut json_list) = kind {
+					json_list.push(SpannedTypeInfo {
+						type_: t,
+						span: item.span(),
+					});
 				}
+			}
 
-				// if the function is phase independent, then inherit from the callee
-				let func_phase = if func_sig.phase == Phase::Independent {
-					callee_phase
-				} else {
-					func_sig.phase
-				};
+			self.validate_type(t, element_type, item);
+			element_type = self.types.maybe_unwrap_inference(element_type);
+		}
 
-				if let Some(value) = self.type_check_arg_list_against_function_sig(arg_list, &func_sig, exp, arg_list_types) {
-					return (value, func_phase);
-				}
+		if let Type::Set(ref mut inner) | Type::MutSet(ref mut inner) = &mut *container_type {
+			*inner = element_type;
+		}
 
-				// If the function is "wingc_env", then print out the current environment
-				if let CalleeKind::Expr(call_expr) = callee {
-					if let ExprKind::Reference(Reference::Identifier(ident)) = &call_expr.kind {
-						if ident.name == "wingc_env" {
-							println!("[symbol environment at {}]", exp.span().file_id);
-							println!("{}", env.to_string());
-						}
-					}
-				}
+		(container_type, env.phase)
+	}
 
-				if is_option {
-					// When calling a an optional function, the return type is always optional
-					// To allow this to be both safe and unsurprising,
-					// the callee must be a reference with an optional accessor
-					if let CalleeKind::Expr(call_expr) = callee {
-						if let ExprKind::Reference(Reference::InstanceMember { optional_accessor, .. }) = &call_expr.kind {
-							if *optional_accessor {
-								(self.types.make_option(func_sig.return_type), func_phase)
-							} else {
-								// No additional error is needed here, since the type checker will already have errored without optional chaining
-								(self.types.error(), func_phase)
-							}
-						} else {
-							// TODO do we want syntax for this? e.g. `foo?.()`
-							self.spanned_error(callee, "Cannot call an optional function");
-							(self.types.error(), func_phase)
-						}
-					} else {
-						// TODO do we want syntax for this? e.g. `foo?.()`
-						self.spanned_error(callee, "Cannot call an optional function");
-						(self.types.error(), func_phase)
-					}
-				} else {
-					(func_sig.return_type, func_phase)
+	fn type_check_map_lit(
+		&mut self,
+		type_: &Option<TypeAnnotation>,
+		env: &mut SymbolEnv,
+		fields: &Vec<(Expr, Expr)>,
+		exp: &Expr,
+	) -> (TypeRef, Phase) {
+		// Infer type based on either the explicit type or the value in one of the fields
+		let (mut container_type, mut element_type) = if let Some(type_) = type_ {
+			let container_type = self.resolve_type_annotation(type_, env);
+			let element_type = match *container_type {
+				Type::Map(t) | Type::MutMap(t) => t,
+				_ => {
+					self.spanned_error(
+						&type_.span,
+						format!("Expected \"Map\" or \"MutMap\", found \"{container_type}\""),
+					);
+					self.types.error()
 				}
-			}
-			ExprKind::ArrayLiteral { type_, items } => {
-				// Infer type based on either the explicit type or the value in one of the items
-				let (mut container_type, mut element_type) = if let Some(type_) = type_ {
-					let container_type = self.resolve_type_annotation(type_, env);
-					let element_type = match *container_type {
-						Type::Array(t) | Type::MutArray(t) => t,
-						_ => {
-							self.spanned_error(
-								&type_.span,
-								format!("Expected \"Array\" or \"MutArray\", found \"{container_type}\""),
-							);
-							self.types.error()
-						}
-					};
-					(container_type, element_type)
-				} else if self.ctx.in_json() {
-					let json_data = JsonData {
-						expression_id: exp.id,
-						kind: JsonDataKind::List(vec![]),
-					};
-					let inner_type = self.types.add_type(Type::Json(Some(json_data)));
-					(self.types.add_type(Type::Array(inner_type)), inner_type)
-				} else {
-					let inner_type = self.types.make_inference();
-					(self.types.add_type(Type::Array(inner_type)), inner_type)
+			};
+			(container_type, element_type)
+		} else {
+			let inner_type = self.types.make_inference();
+			(self.types.add_type(Type::Map(inner_type)), inner_type)
+		};
+
+		// Verify all types are the same as the inferred type and that all keys are of string type
+		for (key, value) in fields {
+			let (t, _) = self.type_check_exp(value, env);
+			if t.is_json() && !matches!(*element_type, Type::Json(Some(..))) {
+				// This is an field of JSON, change the element type to reflect that
+				let json_data = JsonData {
+					expression_id: exp.id,
+					kind: JsonDataKind::Fields(IndexMap::new()),
 				};
+				element_type = self.types.add_type(Type::Json(Some(json_data)));
+			}
 
-				// Verify all types are the same as the inferred type
-				for item in items {
-					let (t, _) = self.type_check_exp(item, env);
+			self.validate_type(t, element_type, value);
+			element_type = self.types.maybe_unwrap_inference(element_type);
 
-					if t.is_json() && !matches!(*element_type, Type::Json(Some(..))) {
-						// This is an array of JSON, change the element type to reflect that
-						let json_data = JsonData {
-							expression_id: exp.id,
-							kind: JsonDataKind::List(vec![]),
-						};
-						element_type = self.types.add_type(Type::Json(Some(json_data)));
-					}
+			// Verify that the key is a string
+			let (key_type, _) = self.type_check_exp(key, env);
+			self.validate_type(key_type, self.types.string(), key);
+		}
 
-					// Augment the json list data with the new element type
-					if let Type::Json(Some(JsonData { ref mut kind, .. })) = &mut *element_type {
-						if let JsonDataKind::List(ref mut json_list) = kind {
-							json_list.push(SpannedTypeInfo {
-								type_: t,
-								span: item.span(),
-							});
-						}
-					}
+		if let Type::Map(ref mut inner) | Type::MutMap(ref mut inner) = &mut *container_type {
+			*inner = element_type;
+		}
 
-					if !self.ctx.in_json() {
-						// If we're not in a Json literal, validate the type of each element
-						self.validate_type(t, element_type, item);
-						element_type = self.types.maybe_unwrap_inference(element_type);
-					} else if self.is_in_mut_json && !t.is_json_legal_value() {
-						// if we're in a MutJson literal, we only need to check that each field is legal json
-						self.spanned_error(
-							item,
-							format!("Expected a valid Json value (https://www.json.org/json-en.html), but got \"{t}\""),
-						);
-					}
+		(container_type, env.phase)
+	}
+
+	fn type_check_array_lit(
+		&mut self,
+		type_: &Option<TypeAnnotation>,
+		env: &mut SymbolEnv,
+		exp: &Expr,
+		items: &Vec<Expr>,
+	) -> (TypeRef, Phase) {
+		// Infer type based on either the explicit type or the value in one of the items
+		let (mut container_type, mut element_type) = if let Some(type_) = type_ {
+			let container_type = self.resolve_type_annotation(type_, env);
+			let element_type = match *container_type {
+				Type::Array(t) | Type::MutArray(t) => t,
+				_ => {
+					self.spanned_error(
+						&type_.span,
+						format!("Expected \"Array\" or \"MutArray\", found \"{container_type}\""),
+					);
+					self.types.error()
 				}
+			};
+			(container_type, element_type)
+		} else if self.ctx.in_json() {
+			let json_data = JsonData {
+				expression_id: exp.id,
+				kind: JsonDataKind::List(vec![]),
+			};
+			let inner_type = self.types.add_type(Type::Json(Some(json_data)));
+			(self.types.add_type(Type::Array(inner_type)), inner_type)
+		} else {
+			let inner_type = self.types.make_inference();
+			(self.types.add_type(Type::Array(inner_type)), inner_type)
+		};
 
-				if let Type::Array(ref mut inner) | Type::MutArray(ref mut inner) = &mut *container_type {
-					*inner = element_type;
+		// Verify all types are the same as the inferred type and find the aggregate phase of all the items
+		let mut phase = Phase::Independent;
+		for item in items {
+			let (t, item_phase) = self.type_check_exp(item, env);
+			phase = combine_phases(phase, item_phase);
+
+			if t.is_json()
+				&& !matches!(
+					*t,
+					Type::Json(Some(JsonData {
+						kind: JsonDataKind::List(_),
+						..
+					}))
+				) {
+				// This is an array of JSON, change the element type to reflect that
+				let json_data = JsonData {
+					expression_id: exp.id,
+					kind: JsonDataKind::List(vec![]),
+				};
+				element_type = self.types.add_type(Type::Json(Some(json_data)));
+			}
+
+			// Augment the json list data with the new element type
+			if let Type::Json(Some(JsonData { ref mut kind, .. })) = &mut *element_type {
+				if let JsonDataKind::List(ref mut json_list) = kind {
+					json_list.push(SpannedTypeInfo {
+						type_: t,
+						span: item.span(),
+					});
 				}
+			}
 
-				(container_type, env.phase)
+			if !self.ctx.in_json() && !t.is_json() {
+				// If we're not in a Json literal, validate the type of each element
+				self.validate_type(t, element_type, item);
+				element_type = self.types.maybe_unwrap_inference(element_type);
+			} else if self.is_in_mut_json && !t.is_json_legal_value() {
+				// if we're in a MutJson literal, we only need to check that each field is legal json
+				self.spanned_error(
+					item,
+					format!("Expected a valid Json value (https://www.json.org/json-en.html), but got \"{t}\""),
+				);
 			}
-			ExprKind::MapLiteral { fields, type_ } => {
-				// Infer type based on either the explicit type or the value in one of the fields
-				let (mut container_type, mut element_type) = if let Some(type_) = type_ {
-					let container_type = self.resolve_type_annotation(type_, env);
-					let element_type = match *container_type {
-						Type::Map(t) | Type::MutMap(t) => t,
-						_ => {
-							self.spanned_error(
-								&type_.span,
-								format!("Expected \"Map\" or \"MutMap\", found \"{container_type}\""),
-							);
-							self.types.error()
-						}
-					};
-					(container_type, element_type)
-				} else {
-					let inner_type = self.types.make_inference();
-					(self.types.add_type(Type::Map(inner_type)), inner_type)
-				};
+		}
 
-				// Verify all types are the same as the inferred type and that all keys are of string type
-				for (key, value) in fields {
-					let (t, _) = self.type_check_exp(value, env);
-					if t.is_json() && !matches!(*element_type, Type::Json(Some(..))) {
-						// This is an field of JSON, change the element type to reflect that
-						let json_data = JsonData {
-							expression_id: exp.id,
-							kind: JsonDataKind::Fields(IndexMap::new()),
-						};
-						element_type = self.types.add_type(Type::Json(Some(json_data)));
-					}
+		if let Type::Array(ref mut inner) | Type::MutArray(ref mut inner) = &mut *container_type {
+			*inner = element_type;
+		}
 
-					self.validate_type(t, element_type, value);
-					element_type = self.types.maybe_unwrap_inference(element_type);
+		(container_type, phase)
+	}
 
-					// Verify that the key is a string
-					let (key_type, _) = self.type_check_exp(key, env);
-					self.validate_type(key_type, self.types.string(), key);
-				}
+	fn type_check_call(
+		&mut self,
+		arg_list: &ArgList,
+		env: &mut SymbolEnv,
+		callee: &CalleeKind,
+		exp: &Expr,
+	) -> (TypeRef, Phase) {
+		// Type check the call arguments
+		let arg_list_types = self.type_check_arg_list(arg_list, env);
 
-				if let Type::Map(ref mut inner) | Type::MutMap(ref mut inner) = &mut *container_type {
-					*inner = element_type;
-				}
+		// Resolve the function's reference (either a method in the class's env or a function in the current env)
+		let (func_type, callee_phase) = match callee {
+			CalleeKind::Expr(expr) => self.type_check_exp(expr, env),
+			CalleeKind::SuperCall(method) => resolve_super_method(method, env, &self.types).unwrap_or_else(|e| {
+				self.type_error(e);
+				self.resolved_error()
+			}),
+		};
+		let is_option = func_type.is_option();
+		let func_type = func_type.maybe_unwrap_option();
+
+		// If the callee's signature type is unknown, just evaluate the entire call expression as an error
+		if func_type.is_unresolved() {
+			return self.resolved_error();
+		}
+
+		// If the caller's signature is `any`, then just evaluate the entire call expression as `any`
+		if func_type.is_anything() {
+			return (self.types.anything(), Phase::Independent);
+		}
 
-				(container_type, env.phase)
+		// Make sure this is a function signature type
+		let func_sig = if let Some(func_sig) = func_type.as_deep_function_sig() {
+			func_sig.clone()
+		} else if let Some(class) = func_type.as_preflight_class() {
+			// return the signature of the "handle" method
+			let lookup_res = class.get_method(&CLOSURE_CLASS_HANDLE_METHOD.into());
+			let handle_type = if let Some(method) = lookup_res {
+				method.type_
+			} else {
+				self.spanned_error(callee, "Expected a function or method");
+				return self.resolved_error();
+			};
+			if let Some(sig_type) = handle_type.as_function_sig() {
+				sig_type.clone()
+			} else {
+				self.spanned_error(callee, "Expected a function or method");
+				return self.resolved_error();
 			}
-			ExprKind::SetLiteral { type_, items } => {
-				// Infer type based on either the explicit type or the value in one of the items
-				let (mut container_type, mut element_type) = if let Some(type_) = type_ {
-					let container_type = self.resolve_type_annotation(type_, env);
-					let element_type = match *container_type {
-						Type::Set(t) | Type::MutSet(t) => t,
-						_ => {
-							self.spanned_error(
-								&type_.span,
-								format!("Expected \"Set\" or \"MutSet\", found \"{container_type}\""),
-							);
-							self.types.error()
-						}
-					};
-					(container_type, element_type)
-				} else {
-					let inner_type = self.types.make_inference();
-					(self.types.add_type(Type::Set(inner_type)), inner_type)
-				};
+		} else {
+			self.spanned_error(
+				callee,
+				format!("Expected a function or method, found \"{}\"", func_type),
+			);
+			return self.resolved_error();
+		};
 
-				// Verify all types are the same as the inferred type
-				for item in items {
-					let (t, _) = self.type_check_exp(item, env);
+		if !env.phase.can_call_to(&func_sig.phase) {
+			self.spanned_error(
+				exp,
+				format!("Cannot call into {} phase while {}", func_sig.phase, env.phase),
+			);
+		}
 
-					if t.is_json() && !matches!(*element_type, Type::Json(Some(..))) {
-						// this is an set of JSON, change the element type to reflect that
-						let json_data = JsonData {
-							expression_id: exp.id,
-							kind: JsonDataKind::List(vec![]),
-						};
-						element_type = self.types.add_type(Type::Json(Some(json_data)));
-					}
+		// If the function is phase independent, then inherit from the callee
+		let func_phase = if func_sig.phase == Phase::Independent {
+			callee_phase
+		} else {
+			func_sig.phase
+		};
 
-					// Augment the json list data with the new element type
-					if let Type::Json(Some(JsonData { ref mut kind, .. })) = &mut *element_type {
-						if let JsonDataKind::List(ref mut json_list) = kind {
-							json_list.push(SpannedTypeInfo {
-								type_: t,
-								span: item.span(),
-							});
-						}
-					}
+		if let Some(value) = self.type_check_arg_list_against_function_sig(arg_list, &func_sig, exp, arg_list_types) {
+			return (value, func_phase);
+		}
 
-					self.validate_type(t, element_type, item);
-					element_type = self.types.maybe_unwrap_inference(element_type);
+		// If the function is "wingc_env", then print out the current environment
+		if let CalleeKind::Expr(call_expr) = callee {
+			if let ExprKind::Reference(Reference::Identifier(ident)) = &call_expr.kind {
+				if ident.name == "wingc_env" {
+					println!("[symbol environment at {}]", exp.span().file_id);
+					println!("{}", env.to_string());
 				}
+			}
+		}
 
-				if let Type::Set(ref mut inner) | Type::MutSet(ref mut inner) = &mut *container_type {
-					*inner = element_type;
+		if is_option {
+			// When calling a an optional function, the return type is always optional
+			// To allow this to be both safe and unsurprising,
+			// the callee must be a reference with an optional accessor
+			if let CalleeKind::Expr(call_expr) = callee {
+				if let ExprKind::Reference(Reference::InstanceMember { optional_accessor, .. }) = &call_expr.kind {
+					if *optional_accessor {
+						(self.types.make_option(func_sig.return_type), func_phase)
+					} else {
+						// No additional error is needed here, since the type checker will already have errored without optional chaining
+						(self.types.error(), func_phase)
+					}
+				} else {
+					// TODO do we want syntax for this? e.g. `foo?.()`
+					self.spanned_error(callee, "Cannot call an optional function");
+					(self.types.error(), func_phase)
 				}
-
-				(container_type, env.phase)
+			} else {
+				// TODO do we want syntax for this? e.g. `foo?.()`
+				self.spanned_error(callee, "Cannot call an optional function");
+				(self.types.error(), func_phase)
 			}
-			ExprKind::StructLiteral { type_, fields } => {
-				// Find this struct's type in the environment
-				let struct_type = self.resolve_type_annotation(type_, env);
+		} else {
+			(func_sig.return_type, func_phase)
+		}
+	}
 
-				// Type check each of the struct's fields
-				let field_types: IndexMap<Symbol, TypeRef> = fields
-					.iter()
-					.map(|(name, exp)| {
-						let (t, _) = self.type_check_exp(exp, env);
-						(name.clone(), t)
-					})
-					.collect();
+	fn type_check_intrinsic(&mut self, intrinsic: &Intrinsic, env: &mut SymbolEnv, exp: &Expr) -> (TypeRef, Phase) {
+		if !intrinsic.kind.is_valid_phase(&env.phase) {
+			self.spanned_error(exp, format!("{} cannot be used in {}", intrinsic.kind, env.phase));
+		}
+		let arg_list = intrinsic
+			.arg_list
+			.as_ref()
+			.map(|arg_list| (arg_list, self.type_check_arg_list(arg_list, env)));
 
-				// If we don't have type information for the struct we don't need to validate the fields
-				if struct_type.is_anything() || struct_type.is_unresolved() {
-					return (struct_type, env.phase);
+		if let Some(intrinsic_type) = self
+			.types
+			.intrinsics
+			.lookup(&intrinsic.kind.clone().into(), None)
+			.and_then(|x| x.as_variable())
+			.map(|x| x.type_)
+		{
+			if let Some(sig) = intrinsic_type.as_function_sig() {
+				if let Some((arg_list, arg_list_types)) = arg_list {
+					self.type_check_arg_list_against_function_sig(arg_list, &sig, exp, arg_list_types);
+				} else {
+					self.spanned_error(exp, format!("{} requires arguments", intrinsic.kind));
 				}
 
-				// Make sure it really is a struct type
-				let st = struct_type
-					.as_struct()
-					.expect(&format!("Expected \"{}\" to be a struct type", struct_type));
-
-				// Verify that all expected fields are present and are the right type
-				for (name, field_type) in st.fields(true) {
-					match fields.get(name.as_str()) {
-						Some(field_exp) => {
-							let t = field_types.get(name.as_str()).unwrap();
-							self.validate_type(*t, field_type, field_exp);
-						}
-						None => {
-							if !field_type.is_option() {
-								self.spanned_error(exp, format!("\"{}\" is not initialized", name));
-							}
-						}
+				match intrinsic.kind {
+					IntrinsicKind::Inflight => {
+						return (self.types.make_inference(), Phase::Preflight);
 					}
-				}
-
-				// Verify that no unexpected fields are present
-				for (name, _t) in field_types.iter() {
-					if st.env.lookup(name, Some(self.ctx.current_stmt_idx())).is_none() {
-						self.spanned_error(exp, format!("\"{}\" is not a field of \"{}\"", name.name, st.name.name));
+					IntrinsicKind::Dirname | IntrinsicKind::Unknown => {
+						return (sig.return_type, sig.phase);
 					}
 				}
-
-				(struct_type, env.phase)
-			}
-			ExprKind::JsonLiteral { is_mut, element } => {
-				if *is_mut {
-					self.is_in_mut_json = true;
+			} else {
+				if let Some(arg_list) = &intrinsic.arg_list {
+					self.spanned_error(&arg_list.span, format!("{} does not expect arguments", intrinsic.kind));
 				}
+				return (intrinsic_type, Phase::Independent);
+			}
+		};
+
+		(self.types.error(), Phase::Independent)
+	}
 
-				self.ctx.push_json();
-				let (known_type, _) = self.type_check_exp(&element, env);
-				self.ctx.pop_json();
+	fn type_check_range(&mut self, start: &Expr, env: &mut SymbolEnv, end: &Expr) -> (TypeRef, Phase) {
+		let (stype, stype_phase) = self.type_check_exp(start, env);
+		let (etype, _) = self.type_check_exp(end, env);
+
+		self.validate_type(stype, self.types.number(), start);
+		self.validate_type(etype, self.types.number(), end);
+		(self.types.add_type(Type::Array(stype)), stype_phase)
+	}
+
+	fn type_check_new(&mut self, new_expr: &New, env: &mut SymbolEnv, exp: &Expr) -> (TypeRef, Phase) {
+		let New {
+			class,
+			obj_id,
+			arg_list,
+			obj_scope,
+		} = new_expr;
+		// Type check everything
+		let class_type = self
+			.resolve_user_defined_type(class, env, self.ctx.current_stmt_idx())
+			.unwrap_or_else(|e| self.type_error(e));
+		let obj_scope_type = obj_scope.as_ref().map(|x| self.type_check_exp(x, env).0);
+		let obj_id_type = obj_id.as_ref().map(|x| self.type_check_exp(x, env).0);
+		let arg_list_types = self.type_check_arg_list(arg_list, env);
 
-				// When we are no longer in a Json literal, we reset the is_in_mut_json flag
-				if !self.ctx.in_json() {
-					self.is_in_mut_json = false;
+		// Lookup the class's type in the env
+		let (class_env, class_symbol) = match *class_type {
+			Type::Class(ref class) => {
+				if class.is_abstract {
+					self.spanned_error(exp, format!("Cannot instantiate abstract class \"{}\"", class.name));
 				}
 
-				if *is_mut {
-					(self.types.mut_json(), env.phase)
+				if class.phase == Phase::Independent || env.phase == class.phase {
+					(&class.env, &class.name)
 				} else {
-					if known_type.is_json() {
-						(known_type, env.phase)
-					} else {
-						(
-							self.types.add_type(Type::Json(Some(JsonData {
-								expression_id: exp.id,
-								kind: JsonDataKind::Type(SpannedTypeInfo {
-									type_: known_type,
-									span: element.span(),
-								}),
-							}))),
-							env.phase,
-						)
-					}
+					self.spanned_error(
+						exp,
+						format!(
+							"Cannot create {} class \"{}\" in {} phase",
+							class.phase, class.name, env.phase
+						),
+					);
+					return (self.types.error(), Phase::Independent);
 				}
 			}
-			ExprKind::JsonMapLiteral { fields } => {
-				let mut known_types = IndexMap::new();
-				fields.iter().for_each(|(name, v)| {
-					let (known_type, _) = self.type_check_exp(v, env);
-					known_types.insert(
-						name.clone(),
-						SpannedTypeInfo {
-							type_: known_type,
-							span: v.span(),
-						},
+			// If type is anything we have to assume it's ok to initialize it
+			Type::Anything => return (self.types.anything(), Phase::Independent),
+			// If type is error, we assume the error was already reported and evauate the new expression to error as well
+			Type::Unresolved => return self.resolved_error(),
+			Type::Struct(_) => {
+				self.spanned_error(
+					class,
+					format!(
+						"Cannot instantiate type \"{}\" because it is a struct and not a class. Use struct instantiation instead.",
+						class_type
+					),
+				);
+				return self.resolved_error();
+			}
+			_ => {
+				self.spanned_error(
+					class,
+					format!("Cannot instantiate type \"{}\" because it is not a class", class_type),
+				);
+				return self.resolved_error();
+			}
+		};
+
+		// Type check args against constructor
+		let init_method_name = if env.phase == Phase::Preflight || class_env.phase == Phase::Independent {
+			CLASS_INIT_NAME
+		} else {
+			CLASS_INFLIGHT_INIT_NAME
+		};
+
+		let lookup_res = class_env.lookup_ext(&init_method_name.into(), None);
+		let constructor_type = match lookup_res {
+			LookupResult::Found(k, _) => k.as_variable().expect("Expected constructor to be a variable").type_,
+			LookupResult::NotFound(_, _) => {
+				self.spanned_error(
+					exp,
+					format!("Constructor for class \"{}\" is private", class_symbol.name),
+				);
+				return self.resolved_error();
+			}
+			LookupResult::NotPublic(_, _)
+			| LookupResult::MultipleFound
+			| LookupResult::DefinedLater(_)
+			| LookupResult::ExpectedNamespace(_) => {
+				self.type_error(lookup_result_to_type_error(
+					lookup_res,
+					&Symbol {
+						name: CLASS_INIT_NAME.into(),
+						span: class_symbol.span.clone(),
+					},
+				));
+				return self.resolved_error();
+			}
+		};
+		let constructor_sig = constructor_type
+			.as_function_sig()
+			.expect("Expected constructor to be a function signature");
+
+		// Verify return type (This should never fail since we define the constructors return type during AST building)
+		self.validate_type(constructor_sig.return_type, class_type, exp);
+
+		self.type_check_arg_list_against_function_sig(&arg_list, &constructor_sig, exp, arg_list_types);
+
+		let non_std_args = !class_type.as_class().unwrap().std_construct_args;
+
+		// If this is a preflight class make sure the object's scope and id are of correct type
+		if class_type.is_preflight_class() {
+			// Get reference to resource object's scope
+			let obj_scope_type = if obj_scope_type.is_none() {
+				// If this returns None, this means we're instantiating a preflight object in the global scope, which is valid
+				env
+					.lookup(&"this".into(), Some(self.ctx.current_stmt_idx()))
+					.map(|v| v.as_variable().expect("Expected \"this\" to be a variable").type_)
+			} else {
+				// If this is a non-standard preflight class, make sure the object's scope isn't explicitly set (using the `in` keywords)
+				if non_std_args {
+					self.spanned_error(
+						obj_scope.as_ref().unwrap(),
+						format!(
+							"Cannot set scope of non-standard preflight class \"{}\" using `in`",
+							class_type
+						),
 					);
-					// Ensure we don't allow MutJson to Json or vice versa
-					match *known_type {
-						Type::Json(_) => {
-							if self.is_in_mut_json {
-								self.spanned_error(
-									v,
-									"\"MutJson\" fields cannot be \"Json\" (hint: try using Json.deepMutCopy())",
-								)
-							}
-						}
-						Type::MutJson => {
-							if !self.is_in_mut_json {
-								self.spanned_error(
-									v,
-									"\"Json\" fields cannot be \"MutJson\" (hint: try using Json.deepCopy())",
-								)
-							}
-						}
-						_ => {}
-					};
+				}
 
-					if self.is_in_mut_json && !known_type.is_json_legal_value() {
-						self.spanned_error(
-							v,
-							format!(
-								"Expected a valid Json value (https://www.json.org/json-en.html), but got \"{}\"",
-								known_type
-							),
-						);
-					}
-				});
+				obj_scope_type
+			};
 
-				(
-					self.types.add_type(Type::Json(Some(JsonData {
-						expression_id: exp.id,
-						kind: JsonDataKind::Fields(known_types),
-					}))),
-					env.phase,
-				)
+			// Verify the object scope is a construct
+			if let Some(obj_scope_type) = obj_scope_type {
+				if !obj_scope_type.is_subtype_of(&self.types.construct_interface()) {
+					self.spanned_error(
+						exp,
+						format!(
+							"Expected scope to be a preflight object, instead found \"{}\"",
+							obj_scope_type
+						),
+					);
+				}
 			}
-			ExprKind::FunctionClosure(func_def) => self.type_check_closure(func_def, env),
-			ExprKind::CompilerDebugPanic => {
-				// Handle the debug panic expression (during type-checking)
-				dbg_panic!();
-				(
-					self.type_error(TypeError {
-						message: "Panic expression".to_string(),
-						span: exp.span.clone(),
-						annotations: vec![],
-					}),
-					env.phase,
-				)
+
+			// Verify the object id is a string
+			if let Some(obj_id_type) = obj_id_type {
+				self.validate_type(obj_id_type, self.types.string(), obj_id.as_ref().unwrap());
+				// If this is a non-standard preflight class, make sure the object's id isn't explicitly set (using the `as` keywords)
+				if non_std_args {
+					self.spanned_error(
+						obj_id.as_ref().unwrap(),
+						format!(
+							"Cannot set id of non-standard preflight class \"{}\" using `as`",
+							class_type
+						),
+					);
+				}
+			}
+		} else {
+			// This is an inflight class, make sure the object scope and id are not set
+			if let Some(obj_scope) = obj_scope {
+				self.spanned_error(obj_scope, "Inflight classes cannot have a scope");
+			}
+			if let Some(obj_id) = obj_id {
+				self.spanned_error(obj_id, "Inflight classes cannot have an id");
 			}
 		}
+
+		(class_type, env.phase)
+	}
+
+	fn type_check_reference(&mut self, _ref: &Reference, env: &mut SymbolEnv) -> (TypeRef, Phase) {
+		let (vi, phase) = self.resolve_reference(_ref, env);
+		let var_type = match vi {
+			ResolveReferenceResult::Variable(var) => var.type_,
+			ResolveReferenceResult::Location(_, type_) => type_,
+		};
+		(var_type, phase)
 	}
 
 	fn resolved_error(&mut self) -> (TypeRef, Phase) {
 		(self.types.error(), Phase::Independent)
 	}
 
+	pub fn all_optional_struct(t: TypeRef) -> bool {
+		match &*t {
+			Type::Struct(s) => s.fields(true).all(|(_, t)| t.is_option()),
+			_ => false,
+		}
+	}
+
 	fn type_check_arg_list_against_function_sig(
 		&mut self,
 		arg_list: &ArgList,
@@ -2601,6 +3075,7 @@ impl<'a> TypeChecker<'a> {
 		// Verify named args
 		let last_param = func_sig.parameters.last();
 		let is_last_param_struct = last_param.is_some() && last_param.unwrap().typeref.maybe_unwrap_option().is_struct();
+		let last_param_all_optional_struct = last_param.is_some() && Self::all_optional_struct(last_param.unwrap().typeref);
 		let is_last_param_not_optional_struct = last_param.is_some() && last_param.unwrap().typeref.is_struct();
 
 		if !arg_list.named_args.is_empty() {
@@ -2626,7 +3101,7 @@ impl<'a> TypeChecker<'a> {
 			};
 
 		// Verify arity
-		let min_args = func_sig.min_parameters() + if is_last_param_not_optional_struct { 1 } else { 0 };
+		let mut min_args = func_sig.min_parameters() + if is_last_param_not_optional_struct { 1 } else { 0 };
 		let max_args = func_sig.parameters.len() - if variadic_index.is_some() { 1 } else { 0 };
 		let named_args_text = if is_last_param_struct {
 			"or named arguments for the last parameter "
@@ -2639,6 +3114,13 @@ impl<'a> TypeChecker<'a> {
 			""
 		};
 
+		// If the last parameter is an all-optional struct and there's no argument for it,
+		// then append a default empty struct to the argument list and indicate we need one less arg
+		if last_param_all_optional_struct && non_variadic_args_len + 1 == min_args {
+			min_args -= 1;
+			self.types.append_empty_struct_to_arglist.insert(arg_list.id);
+		}
+
 		// Check arity
 		if non_variadic_args_len < min_args || pos_args_len > max_args {
 			let err_text = if min_args == max_args {
@@ -2679,7 +3161,7 @@ impl<'a> TypeChecker<'a> {
 				arg_list.pos_args.iter().skip(variadic_index),
 				arg_list_types.pos_args.iter().skip(variadic_index),
 			) {
-				// If your calling a method on some container type, and it takes a generic variadic argument,
+				// If you're calling a method on some container type, and it takes a generic variadic argument,
 				// then substitute that argument type (T1) with the container's element type when typechecking the function arguments
 				if let Some(element_type) = func_sig.this_type.and_then(|x| x.collection_item_type()) {
 					if let Some(object) = variadic_args_inner_type.as_class() {
@@ -2803,27 +3285,53 @@ impl<'a> TypeChecker<'a> {
 		actual_type: TypeRef,
 		expected_type: TypeRef,
 		span: &impl Spanned,
+		actual_original_type: Option<TypeRef>,
+		expected_original_type: Option<TypeRef>,
 	) -> TypeRef {
 		if let (
 			Type::Array(inner_actual) | Type::MutArray(inner_actual),
 			Type::Array(inner_expected) | Type::MutArray(inner_expected),
 		) = (&*actual_type, &*expected_type)
 		{
-			self.validate_type_binary_equality(*inner_actual, *inner_expected, span)
+			self.validate_type_binary_equality(
+				*inner_actual,
+				*inner_expected,
+				span,
+				Some(actual_original_type.unwrap_or(actual_type)),
+				Some(expected_original_type.unwrap_or(expected_type)),
+			)
 		} else if let (
 			Type::Map(inner_actual) | Type::MutMap(inner_actual),
 			Type::Map(inner_expected) | Type::MutMap(inner_expected),
 		) = (&*actual_type, &*expected_type)
 		{
-			self.validate_type_binary_equality(*inner_actual, *inner_expected, span)
+			self.validate_type_binary_equality(
+				*inner_actual,
+				*inner_expected,
+				span,
+				Some(actual_original_type.unwrap_or(actual_type)),
+				Some(expected_original_type.unwrap_or(expected_type)),
+			)
 		} else if let (
 			Type::Set(inner_actual) | Type::MutSet(inner_actual),
 			Type::Set(inner_expected) | Type::MutSet(inner_expected),
 		) = (&*actual_type, &*expected_type)
 		{
-			self.validate_type_binary_equality(*inner_actual, *inner_expected, span)
+			self.validate_type_binary_equality(
+				*inner_actual,
+				*inner_expected,
+				span,
+				Some(actual_original_type.unwrap_or(actual_type)),
+				Some(expected_original_type.unwrap_or(expected_type)),
+			)
 		} else {
-			self.validate_type(actual_type, expected_type, span)
+			self.validate_nested_type(
+				actual_type,
+				expected_type,
+				span,
+				actual_original_type,
+				expected_original_type,
+			)
 		}
 	}
 
@@ -2881,7 +3389,7 @@ impl<'a> TypeChecker<'a> {
 				if expected_type_unwrapped.is_struct() {
 					self.validate_structural_type(fields, expected_type_unwrapped, span);
 					true
-				} else if let Some(inner_expected) = inner_expected {
+				} else if let (Some(inner_expected), true) = (inner_expected, expected_type_unwrapped.is_map()) {
 					// The expected type is a Map
 					for field_info in fields.values() {
 						self.validate_type(field_info.type_, inner_expected, &field_info.span);
@@ -2910,13 +3418,45 @@ impl<'a> TypeChecker<'a> {
 	///
 	/// Returns the given type on success, otherwise returns the expected type.
 	fn validate_type(&mut self, actual_type: TypeRef, expected_type: TypeRef, span: &impl Spanned) -> TypeRef {
-		self.validate_type_in(actual_type, &[expected_type], span)
+		self.validate_type_in(actual_type, &[expected_type], span, None, None)
+	}
+
+	/// Validate that the given type is a subtype (or same) as the expected type. If not, add an error
+	/// to the diagnostics- based on the parent type.
+	///
+	/// Returns the given type on success, otherwise returns the expected type.
+	fn validate_nested_type(
+		&mut self,
+		actual_type: TypeRef,
+		expected_type: TypeRef,
+		span: &impl Spanned,
+		actual_original_type: Option<TypeRef>,
+		expected_original_type: Option<TypeRef>,
+	) -> TypeRef {
+		if let Some(expected_original_t) = expected_original_type {
+			self.validate_type_in(
+				actual_type,
+				&[expected_type],
+				span,
+				actual_original_type,
+				Some(&[expected_original_t]),
+			)
+		} else {
+			self.validate_type_in(actual_type, &[expected_type], span, actual_original_type, None)
+		}
 	}
 
 	/// Validate that the given type is a subtype (or same) as the one of the expected types. If not, add
 	/// an error to the diagnostics.
 	/// Returns the given type on success, otherwise returns one of the expected types.
-	fn validate_type_in(&mut self, actual_type: TypeRef, expected_types: &[TypeRef], span: &impl Spanned) -> TypeRef {
+	fn validate_type_in(
+		&mut self,
+		actual_type: TypeRef,
+		expected_types: &[TypeRef],
+		span: &impl Spanned,
+		actual_original_type: Option<TypeRef>,
+		expected_original_types: Option<&[TypeRef]>,
+	) -> TypeRef {
 		assert!(expected_types.len() > 0);
 		let first_expected_type = expected_types[0];
 		let mut return_type = actual_type;
@@ -2965,25 +3505,28 @@ impl<'a> TypeChecker<'a> {
 			}
 		}
 
-		let expected_type_str = if expected_types.len() > 1 {
-			let expected_types_list = expected_types
+		let expected_type_origin = expected_original_types.unwrap_or(expected_types);
+		let expected_type_str = if expected_type_origin.len() > 1 {
+			let expected_types_list = expected_type_origin
 				.iter()
 				.map(|t| format!("{}", t))
 				.collect::<Vec<String>>()
 				.join(",");
 			format!("one of \"{}\"", expected_types_list)
 		} else {
-			format!("\"{}\"", first_expected_type)
+			format!("\"{}\"", expected_type_origin[0])
 		};
 
-		let message = format!("Expected type to be {expected_type_str}, but got \"{return_type}\" instead");
+		let return_type_str = actual_original_type.unwrap_or(return_type);
+		let message = format!("Expected type to be {expected_type_str}, but got \"{return_type_str}\" instead");
 		let mut hints: Vec<String> = vec![];
 		if return_type.is_nil() && expected_types.len() == 1 {
 			hints.push(format!(
 				"to allow \"nil\" assignment use optional type: \"{first_expected_type}?\""
 			));
 		}
-		if return_type.maybe_unwrap_option().is_json() {
+
+		if matches!(**return_type.maybe_unwrap_option(), Type::Json(None) | Type::MutJson) {
 			// known json data is statically known
 			hints.push(format!(
 				"use {first_expected_type}.fromJson() to convert dynamic Json\""
@@ -3009,152 +3552,464 @@ impl<'a> TypeChecker<'a> {
 			}
 		}
 
-		self.spanned_error_with_hints(span, message, hints);
+		if expected_types.len() == 1 && matches!(*expected_types[0], Type::Stringable) {
+			if actual_type.maybe_unwrap_option().is_stringable() {
+				hints.push(format!(
+					"{} is an optional, try unwrapping it with 'x ?? \"nil\"' or 'x!'",
+					actual_type
+				));
+			} else {
+				hints.push("str, num, bool, json, and enums are stringable".to_string());
+			};
+		}
+
+		self.spanned_error_with_hints(span, message, &hints);
 
 		// Evaluate to one of the expected types
 		first_expected_type
 	}
 
-	pub fn type_check_file_or_dir(&mut self, source_path: &Utf8Path, scope: &Scope) {
-		CompilationContext::set(CompilationPhase::TypeChecking, &scope.span);
-		self.type_check_scope(scope);
+	pub fn type_check_file_or_dir(&mut self, source_path: &Utf8Path, scope: &Scope) {
+		CompilationContext::set(CompilationPhase::TypeChecking, &scope.span);
+		self.type_check_scope(scope);
+
+		if source_path.is_dir() {
+			self.type_check_dir(source_path);
+			return;
+		}
+
+		// Save the file's symbol environment to `self.types.source_file_envs`
+		// (replacing any existing ones if there was already a SymbolEnv from a previous compilation)
+		let scope_env = self.types.get_scope_env(scope);
+		self
+			.types
+			.source_file_envs
+			.insert(source_path.to_owned(), SymbolEnvOrNamespace::SymbolEnv(scope_env));
+	}
+
+	pub fn type_check_dir(&mut self, source_path: &Utf8Path) {
+		// Get a list of all children paths (files or directories) through the file graph
+		let children = self.file_graph.dependencies_of(source_path);
+
+		// Obtain each child's symbol environment or namespace
+		// If it's a namespace (i.e. it's a directory), wrap it in a symbol env
+		let mut child_envs = vec![];
+		for child_path in children.iter() {
+			match self.types.source_file_envs.get(*child_path) {
+				Some(SymbolEnvOrNamespace::SymbolEnv(env)) => {
+					child_envs.push(*env);
+				}
+				Some(SymbolEnvOrNamespace::Namespace(ns)) => {
+					let mut new_env = SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Independent, 0);
+					new_env
+						.define(
+							&Symbol::global(child_path.file_stem().unwrap().to_string()),
+							SymbolKind::Namespace(*ns),
+							AccessModifier::Public,
+							StatementIdx::Top,
+						)
+						.unwrap();
+					let wrapper_env = self.types.add_symbol_env(new_env);
+					child_envs.push(wrapper_env);
+				}
+				Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
+					self
+						.types
+						.source_file_envs
+						.insert(source_path.to_owned(), SymbolEnvOrNamespace::Error(diagnostic.clone()));
+					return;
+				}
+				None => {
+					self.types.source_file_envs.insert(
+						source_path.to_owned(),
+						SymbolEnvOrNamespace::Error(Diagnostic {
+							message: format!("Could not bring \"{}\" due to cyclic bring statements", source_path,),
+							span: None,
+							annotations: vec![],
+							hints: vec![],
+						}),
+					);
+					return;
+				}
+			};
+		}
+
+		// Check that there aren't multiply-defined public symbols in the directory
+		let mut seen_public_symbols = HashSet::new();
+		for child_env in &child_envs {
+			for key in child_env.symbol_map.keys() {
+				if child_env.symbol_map[key].access != AccessModifier::Public {
+					continue;
+				}
+
+				if seen_public_symbols.contains(key) {
+					self.types.source_file_envs.insert(
+						source_path.to_owned(),
+						SymbolEnvOrNamespace::Error(Diagnostic {
+							message: format!("Symbol \"{}\" has multiple definitions in \"{}\"", key, source_path),
+							span: None,
+							annotations: vec![],
+							hints: vec![],
+						}),
+					);
+					return;
+				}
+				seen_public_symbols.insert(key.clone());
+			}
+		}
+
+		let ns = self.types.add_namespace(Namespace {
+			name: source_path.file_stem().unwrap().to_string(),
+			envs: child_envs,
+			module_path: ResolveSource::WingFile,
+		});
+		self
+			.types
+			.source_file_envs
+			.insert(source_path.to_owned(), SymbolEnvOrNamespace::Namespace(ns));
+	}
+
+	fn type_check_scope(&mut self, scope: &Scope) {
+		assert!(self.inner_scopes.is_empty());
+		let mut env = self.types.get_scope_env(scope);
+
+		self.hoist_type_definitions(scope, &mut env);
+
+		for statement in scope.statements.iter() {
+			self.type_check_statement(statement, &mut env);
+		}
+
+		let inner_scopes = self.inner_scopes.drain(..).collect::<Vec<_>>();
+		for (inner_scope, ctx) in inner_scopes {
+			let scope = unsafe { &*inner_scope };
+			self.ctx = ctx;
+			self.type_check_scope(scope);
+		}
+
+		if let SymbolEnvKind::Function { sig, is_init, .. } = env.kind {
+			let mut return_type = sig.as_function_sig().expect("a function type").return_type;
+			if let Type::Inferred(n) = &*return_type {
+				if self.types.get_inference_by_id(*n).is_none() {
+					// If function types don't return anything then we should set the return type to void
+					self.types.update_inferred_type(*n, self.types.void(), &scope.span);
+				}
+				self.update_known_inferences(&mut return_type, &scope.span);
+			}
+
+			// iterate over the statements in the scope and check if there are any statements
+			// we care about
+			let mut has_stmt_visitor = HasStatementVisitor::default();
+			has_stmt_visitor.visit(&scope.statements);
+
+			// If the scope doesn't contain any return statements and the return type isn't void or T? or
+			// the scope itself does not have a throw error, throw an error to the user
+			if !has_stmt_visitor.seen_throw
+				&& !has_stmt_visitor.seen_return
+				&& !return_type.is_void()
+				&& !return_type.is_option()
+				&& !is_init
+			{
+				self.spanned_error(
+					scope,
+					format!(
+						"A function whose return type is \"{}\" must return a value.",
+						return_type
+					),
+				);
+			}
+		}
+
+		for symbol_data in env.symbol_map.values_mut() {
+			if let SymbolKind::Variable(ref mut var_info) = symbol_data.kind {
+				// Update any possible inferred types in this variable.
+				// This must be called before checking for un-inferred types because some variable were not used in this scope so they did not get a chance to get updated.
+				self.update_known_inferences(&mut var_info.type_, &var_info.name.span);
+
+				// If we found a variable with an inferred type, this is an error because it means we failed to infer its type
+				// Ignores any transient (no file_id) variables e.g. `this`. Those failed inferences are cascading errors and not useful to the user
+				if !var_info.name.span.file_id.is_empty() && self.check_for_inferences(&var_info.type_) {
+					self.spanned_error(
+						&var_info.name,
+						"Unable to infer type by usage, an explicit type annotation is required",
+					);
+				}
+			}
+		}
+	}
+
+	/// Check if there are any type declaration statements in the given scope.
+	/// If so, define the the respective types in the environment so that the type can be referenced by other
+	/// type declarations, even if they come before the type declaration.
+	fn hoist_type_definitions(&mut self, scope: &Scope, env: &mut SymbolEnv) {
+		for statement in scope.statements.iter() {
+			match &statement.kind {
+				StmtKind::Bring { source, identifier } => self.hoist_bring_statement(source, identifier, statement, env),
+				StmtKind::Struct(st) => self.hoist_struct_definition(st, env, &statement.doc),
+				StmtKind::Interface(iface) => self.hoist_interface_definition(iface, env, &statement.doc),
+				StmtKind::Enum(enu) => self.hoist_enum_definition(enu, env, &statement.doc),
+				_ => {}
+			}
+		}
+	}
+
+	fn hoist_bring_statement(
+		&mut self,
+		source: &BringSource,
+		identifier: &Option<Symbol>,
+		stmt: &Stmt,
+		env: &mut SymbolEnv,
+	) {
+		let library_name: String;
+		let namespace_filter: Vec<String>;
+		let alias: &Symbol;
+		match &source {
+			BringSource::BuiltinModule(name) => {
+				if WINGSDK_BRINGABLE_MODULES.contains(&name.name.as_str()) {
+					library_name = WINGSDK_ASSEMBLY_NAME.to_string();
+					namespace_filter = vec![name.name.clone()];
+					alias = identifier.as_ref().unwrap_or(&name);
+				} else if name.name.as_str() == WINGSDK_STD_MODULE {
+					self.spanned_error(stmt, format!("Redundant bring of \"{}\"", WINGSDK_STD_MODULE));
+					return;
+				} else {
+					self.spanned_error(stmt, format!("\"{}\" is not a built-in module", name));
+					return;
+				}
+			}
+			BringSource::JsiiModule(name) => {
+				library_name = name.name.to_string();
+				// no namespace filter (we only support importing entire libraries at the moment)
+				namespace_filter = vec![];
+				alias = identifier.as_ref().unwrap();
+			}
+			BringSource::WingFile(path) => {
+				let brought_env = match self.types.source_file_envs.get(path) {
+					Some(SymbolEnvOrNamespace::SymbolEnv(env)) => *env,
+					Some(SymbolEnvOrNamespace::Namespace(_)) => {
+						panic!("Expected a symbol environment to be associated with the file")
+					}
+					Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
+						report_diagnostic(Diagnostic {
+							span: Some(stmt.span()),
+							..diagnostic.clone()
+						});
+						return;
+					}
+					None => {
+						self.spanned_error(
+							stmt,
+							format!("Could not type check \"{}\" due to cyclic bring statements", path),
+						);
+						return;
+					}
+				};
+				let ns = self.types.add_namespace(Namespace {
+					name: path.to_string(),
+					envs: vec![brought_env],
+					module_path: ResolveSource::WingFile,
+				});
+				if let Err(e) = env.define(
+					identifier.as_ref().unwrap(),
+					SymbolKind::Namespace(ns),
+					AccessModifier::Private,
+					StatementIdx::Top,
+				) {
+					self.type_error(e);
+				}
+				return;
+			}
+			BringSource::WingLibrary(name, module_dir) | BringSource::TrustedModule(name, module_dir) => {
+				let brought_ns = match self.types.source_file_envs.get(module_dir) {
+					Some(SymbolEnvOrNamespace::SymbolEnv(_)) => {
+						panic!("Expected a namespace to be associated with the library")
+					}
+					Some(SymbolEnvOrNamespace::Namespace(ns)) => ns,
+					Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
+						report_diagnostic(Diagnostic {
+							span: Some(stmt.span()),
+							..diagnostic.clone()
+						});
+						return;
+					}
+					None => {
+						self.spanned_error(
+							stmt,
+							format!("Could not type check \"{}\" due to cyclic bring statements", name),
+						);
+						return;
+					}
+				};
+				if let Err(e) = env.define(
+					identifier.as_ref().unwrap_or(&name),
+					SymbolKind::Namespace(*brought_ns),
+					AccessModifier::Private,
+					StatementIdx::Top,
+				) {
+					self.type_error(e);
+				}
+				return;
+			}
+			BringSource::Directory(path) => {
+				let brought_ns = match self.types.source_file_envs.get(path) {
+					Some(SymbolEnvOrNamespace::SymbolEnv(_)) => {
+						panic!("Expected a namespace to be associated with the directory")
+					}
+					Some(SymbolEnvOrNamespace::Namespace(ns)) => ns,
+					Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
+						report_diagnostic(Diagnostic {
+							span: Some(stmt.span()),
+							..diagnostic.clone()
+						});
+						return;
+					}
+					None => {
+						self.spanned_error(
+							stmt,
+							format!("Could not type check \"{}\" due to cyclic bring statements", path),
+						);
+						return;
+					}
+				};
+				if let Err(e) = env.define(
+					identifier.as_ref().unwrap(),
+					SymbolKind::Namespace(*brought_ns),
+					AccessModifier::Private,
+					StatementIdx::Top,
+				) {
+					self.type_error(e);
+				}
+				return;
+			}
+		}
+		self.add_jsii_module_to_env(env, library_name, namespace_filter, alias, Some(&stmt));
+		// library_name is the name of the library we are importing from the JSII world
+		// namespace_filter describes what types we are importing from the library
+		// e.g. [] means we are importing everything from `mylib`
+		// e.g. ["ns1", "ns2"] means we are importing everything from `mylib.ns1.ns2`
+		// alias is the symbol we are giving to the imported library or namespace
+	}
+
+	fn hoist_struct_definition(&mut self, st: &AstStruct, env: &mut SymbolEnv, doc: &Option<String>) {
+		let AstStruct {
+			name, extends, access, ..
+		} = st;
 
-		if source_path.is_dir() {
-			self.type_check_dir(source_path);
-			return;
+		// Structs can't be defined in preflight or inflight contexts, only at the top-level of a program
+		if let Some(_) = env.parent {
+			self.spanned_error(
+				name,
+				format!("struct \"{name}\" must be declared at the top-level of a file"),
+			);
 		}
 
-		// Save the file's symbol environment to `self.types.source_file_envs`
-		// (replacing any existing ones if there was already a SymbolEnv from a previous compilation)
-		let scope_env = self.types.get_scope_env(scope);
-		self
-			.types
-			.source_file_envs
-			.insert(source_path.to_owned(), SymbolEnvOrNamespace::SymbolEnv(scope_env));
-	}
-
-	pub fn type_check_dir(&mut self, source_path: &Utf8Path) {
-		// Get a list of all children paths (files or directories) through the file graph
-		let children = self.file_graph.dependencies_of(source_path);
+		// Create environment representing this struct, for now it'll be empty just so we can support referencing it
+		let dummy_env = SymbolEnv::new(None, SymbolEnvKind::Type(self.types.void()), env.phase, 0);
 
-		// Obtain each child's symbol environment or namespace
-		// If it's a namespace (i.e. it's a directory), wrap it in a symbol env
-		let mut child_envs = vec![];
-		for child_path in children.iter() {
-			match self.types.source_file_envs.get(*child_path) {
-				Some(SymbolEnvOrNamespace::SymbolEnv(env)) => {
-					child_envs.push(*env);
-				}
-				Some(SymbolEnvOrNamespace::Namespace(ns)) => {
-					let mut new_env = SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Independent, 0);
-					new_env
-						.define(
-							&Symbol::global(child_path.file_stem().unwrap().to_string()),
-							SymbolKind::Namespace(*ns),
-							AccessModifier::Public,
-							StatementIdx::Top,
-						)
-						.unwrap();
-					let wrapper_env = self.types.add_symbol_env(new_env);
-					child_envs.push(wrapper_env);
-				}
-				Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
-					self
-						.types
-						.source_file_envs
-						.insert(source_path.to_owned(), SymbolEnvOrNamespace::Error(diagnostic.clone()));
-					return;
-				}
-				None => {
-					self.types.source_file_envs.insert(
-						source_path.to_owned(),
-						SymbolEnvOrNamespace::Error(Diagnostic {
-							message: format!("Could not bring \"{}\" due to cyclic bring statements", source_path,),
-							span: None,
-							annotations: vec![],
-							hints: vec![],
-						}),
-					);
-					return;
+		// Collect types this struct extends
+		let extends_types = extends
+			.iter()
+			.filter_map(|ext| {
+				let t = self
+					.resolve_user_defined_type(ext, &env, self.ctx.current_stmt_idx())
+					.unwrap_or_else(|e| self.type_error(e));
+				if t.as_struct().is_some() {
+					Some(t)
+				} else {
+					self.spanned_error(ext, format!("Expected a struct, found type \"{}\"", t));
+					None
 				}
-			};
-		}
+			})
+			.collect::<Vec<_>>();
 
-		// Check that there aren't multiply-defined public symbols in the directory
-		let mut seen_public_symbols = HashSet::new();
-		for child_env in &child_envs {
-			for key in child_env.symbol_map.keys() {
-				if child_env.symbol_map[key].access != AccessModifier::Public {
-					continue;
-				}
+		// Create the struct type with the empty environment
+		let struct_type = self.types.add_type(Type::Struct(Struct {
+			name: name.clone(),
+			fqn: None,
+			extends: extends_types.clone(),
+			env: dummy_env,
+			docs: doc.as_ref().map_or(Docs::default(), |s| Docs::with_summary(s)),
+		}));
 
-				if seen_public_symbols.contains(key) {
-					self.types.source_file_envs.insert(
-						source_path.to_owned(),
-						SymbolEnvOrNamespace::Error(Diagnostic {
-							message: format!("Symbol \"{}\" has multiple definitions in \"{}\"", key, source_path),
-							span: None,
-							annotations: vec![],
-							hints: vec![],
-						}),
-					);
-					return;
-				}
-				seen_public_symbols.insert(key.clone());
+		match env.define(name, SymbolKind::Type(struct_type), *access, StatementIdx::Top) {
+			Err(type_error) => {
+				self.type_error(type_error);
 			}
-		}
-
-		let ns = self.types.add_namespace(Namespace {
-			name: source_path.file_stem().unwrap().to_string(),
-			envs: child_envs,
-			loaded: true,
-			module_path: ResolveSource::WingFile,
-		});
-		self
-			.types
-			.source_file_envs
-			.insert(source_path.to_owned(), SymbolEnvOrNamespace::Namespace(ns));
+			_ => {}
+		};
 	}
 
-	fn type_check_scope(&mut self, scope: &Scope) {
-		assert!(self.inner_scopes.is_empty());
-		let mut env = self.types.get_scope_env(scope);
+	fn hoist_interface_definition(&mut self, iface: &AstInterface, env: &mut SymbolEnv, doc: &Option<String>) {
+		// Create environment representing this interface, for now it'll be empty just so we can support referencing ourselves
+		// from the interface definition or by other type definitions that come before the interface statement.
+		let dummy_env = SymbolEnv::new(
+			None,
+			SymbolEnvKind::Type(self.types.void()),
+			env.phase,
+			self.ctx.current_stmt_idx(),
+		);
 
-		for statement in scope.statements.iter() {
-			self.type_check_statement(statement, &mut env);
-		}
+		// Collect types this interface extends
+		let extend_interfaces = iface
+			.extends
+			.iter()
+			.filter_map(|i| {
+				let t = self
+					.resolve_user_defined_type(i, env, self.ctx.current_stmt_idx())
+					.unwrap_or_else(|e| self.type_error(e));
+				if t.as_interface().is_some() {
+					Some(t)
+				} else {
+					// The type checker resolves non-existing definitions to `any`, so we avoid duplicate errors by checking for that here
+					if !t.is_unresolved() {
+						self.spanned_error(i, format!("Expected an interface, instead found type \"{}\"", t));
+					}
+					None
+				}
+			})
+			.collect::<Vec<_>>();
 
-		let inner_scopes = self.inner_scopes.drain(..).collect::<Vec<_>>();
-		for (inner_scope, ctx) in inner_scopes {
-			let scope = unsafe { &*inner_scope };
-			self.ctx = ctx;
-			self.type_check_scope(scope);
-		}
+		// Create the interface type with the empty environment
+		let interface_spec = Interface {
+			name: iface.name.clone(),
+			fqn: None,
+			docs: doc.as_ref().map_or(Docs::default(), |s| Docs::with_summary(s)),
+			env: dummy_env,
+			extends: extend_interfaces.clone(),
+			phase: iface.phase,
+		};
+		let interface_type = self.types.add_type(Type::Interface(interface_spec));
 
-		if let SymbolEnvKind::Function { sig, .. } = env.kind {
-			let mut return_type = sig.as_function_sig().expect("a function type").return_type;
-			if let Type::Inferred(n) = &*return_type {
-				if self.types.get_inference_by_id(*n).is_none() {
-					// If function types don't return anything then we should set the return type to void
-					self.types.update_inferred_type(*n, self.types.void(), &scope.span);
-				}
-				self.update_known_inferences(&mut return_type, &scope.span);
+		match env.define(
+			&iface.name,
+			SymbolKind::Type(interface_type),
+			iface.access,
+			StatementIdx::Top,
+		) {
+			Err(type_error) => {
+				self.type_error(type_error);
 			}
-		}
+			_ => {}
+		};
+	}
 
-		for symbol_data in env.symbol_map.values_mut() {
-			if let SymbolKind::Variable(ref mut var_info) = symbol_data.kind {
-				// Update any possible inferred types in this variable.
-				// This must be called before checking for un-inferred types because some variable were not used in this scope so they did not get a chance to get updated.
-				self.update_known_inferences(&mut var_info.type_, &var_info.name.span);
+	fn hoist_enum_definition(&mut self, enu: &AstEnum, env: &mut SymbolEnv, doc: &Option<String>) {
+		let enum_type_ref = self.types.add_type(Type::Enum(Enum {
+			name: enu.name.clone(),
+			values: enu.values.clone(),
+			docs: doc.as_ref().map_or(Docs::default(), |s| Docs::with_summary(s)),
+		}));
 
-				// If we found a variable with an inferred type, this is an error because it means we failed to infer its type
-				// Ignores any transient (no file_id) variables e.g. `this`. Those failed inferences are cascading errors and not useful to the user
-				if !var_info.name.span.file_id.is_empty() && self.check_for_inferences(&var_info.type_) {
-					self.spanned_error(&var_info.name, "Unable to infer type".to_string());
-				}
+		match env.define(
+			&enu.name,
+			SymbolKind::Type(enum_type_ref),
+			enu.access,
+			StatementIdx::Top,
+		) {
+			Err(type_error) => {
+				self.type_error(type_error);
 			}
-		}
+			_ => {}
+		};
 	}
 
 	fn resolve_type_annotation(&mut self, annotation: &TypeAnnotation, env: &SymbolEnv) -> TypeRef {
@@ -3222,6 +4077,7 @@ impl<'a> TypeChecker<'a> {
 					phase: ast_sig.phase,
 					js_override: None,
 					docs: Docs::default(),
+					implicit_scope_param: false,
 				};
 				// TODO: avoid creating a new type for each function_sig resolution
 				self.types.add_type(Type::Function(sig))
@@ -3263,11 +4119,18 @@ impl<'a> TypeChecker<'a> {
 	}
 
 	fn type_check_arg_list(&mut self, arg_list: &ArgList, env: &mut SymbolEnv) -> ArgListTypes {
+		// By default assume there are no inflight expressions in the arg list
+		let mut inflight_args = false;
+
 		// Type check the positional arguments, e.g. fn(exp1, exp2, exp3)
 		let pos_arg_types = arg_list
 			.pos_args
 			.iter()
-			.map(|pos_arg| self.type_check_exp(pos_arg, env).0)
+			.map(|pos_arg| {
+				let (t, p) = self.type_check_exp(pos_arg, env);
+				inflight_args |= p == Phase::Inflight;
+				t
+			})
 			.collect();
 
 		// Type check the named arguments, e.g. fn(named_arg1: exp4, named_arg2: exp5)
@@ -3275,7 +4138,8 @@ impl<'a> TypeChecker<'a> {
 			.named_args
 			.iter()
 			.map(|(sym, expr)| {
-				let arg_type = self.type_check_exp(&expr, env).0;
+				let (arg_type, p) = self.type_check_exp(&expr, env);
+				inflight_args |= p == Phase::Inflight;
 				(
 					sym.clone(),
 					SpannedTypeInfo {
@@ -3289,6 +4153,7 @@ impl<'a> TypeChecker<'a> {
 		ArgListTypes {
 			pos_args: pos_arg_types,
 			named_args: named_arg_types,
+			includes_inflights: inflight_args,
 		}
 	}
 
@@ -3296,7 +4161,7 @@ impl<'a> TypeChecker<'a> {
 		CompilationContext::set(CompilationPhase::TypeChecking, &stmt.span);
 
 		// Set the current statement index for symbol lookup checks.
-		self.with_stmt(stmt.idx, |tc| match &stmt.kind {
+		self.with_stmt(stmt, |tc| match &stmt.kind {
 			StmtKind::Let {
 				reassignable,
 				var_name,
@@ -3333,8 +4198,8 @@ impl<'a> TypeChecker<'a> {
 			StmtKind::Assignment { kind, variable, value } => {
 				tc.type_check_assignment(kind, value, variable, env);
 			}
-			StmtKind::Bring { source, identifier } => {
-				tc.type_check_bring(source, identifier, stmt, env);
+			StmtKind::Bring { .. } => {
+				// nothing to do here - bring statements are hoisted during type_check_scope
 			}
 			StmtKind::Scope(scope) => {
 				let scope_env = tc.types.add_symbol_env(SymbolEnv::new(
@@ -3358,16 +4223,11 @@ impl<'a> TypeChecker<'a> {
 			StmtKind::Interface(ast_iface) => {
 				tc.type_check_interface(ast_iface, env);
 			}
-			StmtKind::Struct {
-				name,
-				extends,
-				fields,
-				access,
-			} => {
-				tc.type_check_struct(fields, extends, name, access, env);
+			StmtKind::Struct(st) => {
+				tc.type_check_struct(st, env);
 			}
-			StmtKind::Enum { name, values, access } => {
-				tc.type_check_enum(name, values, access, env);
+			StmtKind::Enum(_) => {
+				// nothing to do here - enums are hoisted during type_check_scope
 			}
 			StmtKind::TryCatch {
 				try_statements,
@@ -3383,6 +4243,9 @@ impl<'a> TypeChecker<'a> {
 			StmtKind::SuperConstructor { arg_list } => {
 				tc.type_check_super_constructor_against_parent_initializer(stmt, arg_list, env);
 			}
+			StmtKind::ExplicitLift(lift_quals) => {
+				tc.type_check_lift_statement(lift_quals, env);
+			}
 		});
 	}
 
@@ -3443,72 +4306,30 @@ impl<'a> TypeChecker<'a> {
 		}
 	}
 
-	fn type_check_enum(
-		&mut self,
-		name: &Symbol,
-		values: &IndexSet<Symbol>,
-		access: &AccessModifier,
-		env: &mut SymbolEnv,
-	) {
-		let enum_type_ref = self.types.add_type(Type::Enum(Enum {
-			name: name.clone(),
-			values: values.clone(),
-			docs: Default::default(),
-		}));
-
-		match env.define(name, SymbolKind::Type(enum_type_ref), *access, StatementIdx::Top) {
-			Err(type_error) => {
-				self.type_error(type_error);
-			}
-			_ => {}
-		};
-	}
+	fn type_check_struct(&mut self, st: &AstStruct, env: &mut SymbolEnv) {
+		let AstStruct {
+			name,
+			extends: _,
+			fields,
+			access: _,
+		} = st;
+
+		// Note: to support mutually recursive type definitions (types that refer to each other), struct types
+		// are initialized during `type_check_scope`. The struct type is created with a dummy environment and
+		// then replaced with the real environment after the struct's fields are type checked.
+		// In this method, we are filling in the struct's environment with the fields and parent members
+		// and updating the struct's Type with the new environment.
+		let mut struct_type = env
+			.lookup(name, Some(self.ctx.current_stmt_idx()))
+			.expect("struct type should have been defined in the environment")
+			.as_type()
+			.unwrap();
 
-	fn type_check_struct(
-		&mut self,
-		fields: &Vec<ast::StructField>,
-		extends: &Vec<UserDefinedType>,
-		name: &Symbol,
-		access: &AccessModifier,
-		env: &mut SymbolEnv,
-	) {
 		// Note: structs don't have a parent environment, instead they flatten their parent's members into the struct's env.
 		//   If we encounter an existing member with the same name and type we skip it, if the types are different we
 		//   fail type checking.
 
-		// Create a dummy environment for the struct so we can create the struct type
-		let dummy_env = SymbolEnv::new(
-			None,
-			SymbolEnvKind::Type(self.types.void()),
-			Phase::Independent,
-			self.ctx.current_stmt_idx(),
-		);
-
-		// Collect types this struct extends
-		let extends_types = extends
-			.iter()
-			.filter_map(|ext| {
-				let t = self
-					.resolve_user_defined_type(ext, env, self.ctx.current_stmt_idx())
-					.unwrap_or_else(|e| self.type_error(e));
-				if t.as_struct().is_some() {
-					Some(t)
-				} else {
-					self.spanned_error(ext, format!("Expected a struct, found type \"{}\"", t));
-					None
-				}
-			})
-			.collect::<Vec<_>>();
-
-		// Create the struct type
-		let mut struct_type = self.types.add_type(Type::Struct(Struct {
-			name: name.clone(),
-			extends: extends_types.clone(),
-			env: dummy_env,
-			docs: Docs::default(),
-		}));
-
-		// Create the actual environment for the struct
+		// Create an environment for the struct's members
 		let mut struct_env = SymbolEnv::new(
 			None,
 			SymbolEnvKind::Type(struct_type),
@@ -3531,7 +4352,7 @@ impl<'a> TypeChecker<'a> {
 					false,
 					Phase::Independent,
 					AccessModifier::Public,
-					None,
+					field.doc.as_ref().map(|s| Docs::with_summary(s)),
 				),
 				AccessModifier::Public,
 				StatementIdx::Top,
@@ -3541,69 +4362,28 @@ impl<'a> TypeChecker<'a> {
 				}
 				_ => {}
 			};
-		}
-
-		if let Err(e) = add_parent_members_to_struct_env(&extends_types, name, &mut struct_env) {
-			self.type_error(e);
-		}
-		match env.define(name, SymbolKind::Type(struct_type), *access, StatementIdx::Top) {
-			Err(type_error) => {
-				self.type_error(type_error);
-			}
-			_ => {}
-		};
+		}
+
+		let extends_types = &struct_type.as_struct().unwrap().extends;
+		if let Err(e) = add_parent_members_to_struct_env(extends_types, name, &mut struct_env) {
+			self.type_error(e);
+		}
 
 		// Replace the dummy struct environment with the real one
-		struct_type.as_mut_struct().unwrap().env = struct_env;
+		struct_type.as_struct_mut().unwrap().env = struct_env;
 	}
 
 	fn type_check_interface(&mut self, ast_iface: &AstInterface, env: &mut SymbolEnv) {
-		let AstInterface {
-			name,
-			extends,
-			methods,
-			access,
-		} = ast_iface;
-		// Create environment representing this interface, for now it'll be empty just so we can support referencing ourselves from the interface definition.
-		let dummy_env = SymbolEnv::new(
-			None,
-			SymbolEnvKind::Type(self.types.void()),
-			env.phase,
-			self.ctx.current_stmt_idx(),
-		);
-
-		let extend_interfaces = extends
-			.iter()
-			.filter_map(|i| {
-				let t = self
-					.resolve_user_defined_type(i, env, self.ctx.current_stmt_idx())
-					.unwrap_or_else(|e| self.type_error(e));
-				if t.as_interface().is_some() {
-					Some(t)
-				} else {
-					// The type checker resolves non-existing definitions to `any`, so we avoid duplicate errors by checking for that here
-					if !t.is_unresolved() {
-						self.spanned_error(i, format!("Expected an interface, instead found type \"{}\"", t));
-					}
-					None
-				}
-			})
-			.collect::<Vec<_>>();
-
-		// Create the interface type and add it to the current environment (so interface implementation can reference itself)
-		let interface_spec = Interface {
-			name: name.clone(),
-			docs: Docs::default(),
-			env: dummy_env,
-			extends: extend_interfaces.clone(),
-		};
-		let mut interface_type = self.types.add_type(Type::Interface(interface_spec));
-		match env.define(name, SymbolKind::Type(interface_type), *access, StatementIdx::Top) {
-			Err(type_error) => {
-				self.type_error(type_error);
-			}
-			_ => {}
-		};
+		// Note: to support mutually recursive type definitions (types that refer to each other), interface types
+		// are initialized during `type_check_scope`. The interface type is created with a dummy environment and
+		// then replaced with the real environment after the interface's fields are type checked.
+		// In this method, we are filling in the interface's environment with its members
+		// and updating the interface's Type with the new environment.
+		let mut interface_type = env
+			.lookup(&ast_iface.name, Some(self.ctx.current_stmt_idx()))
+			.expect("interface type should have been defined in the environment")
+			.as_type()
+			.unwrap();
 
 		// Create the real interface environment to be filled with the interface AST types
 		let mut interface_env = SymbolEnv::new(
@@ -3614,7 +4394,7 @@ impl<'a> TypeChecker<'a> {
 		);
 
 		// Add methods to the interface env
-		for (method_name, sig) in methods.iter() {
+		for (method_name, sig, doc) in ast_iface.methods.iter() {
 			let mut method_type = self.resolve_type_annotation(&sig.to_type_annotation(), env);
 			// use the interface type as the function's "this" type
 			if let Type::Function(ref mut f) = *method_type {
@@ -3632,7 +4412,7 @@ impl<'a> TypeChecker<'a> {
 					false,
 					sig.phase,
 					AccessModifier::Public,
-					None,
+					doc.as_ref().map(|s| Docs::with_summary(s)),
 				),
 				AccessModifier::Public,
 				StatementIdx::Top,
@@ -3644,13 +4424,42 @@ impl<'a> TypeChecker<'a> {
 			};
 		}
 
+		let extend_interfaces = &interface_type.as_interface().unwrap().extends;
+
+		// If this is a preflight interface and it doesn't extend any other preflight interfaces then implicitly make it extend
+		// the base resource interface. This is so there's some expression in the type system that this is an
+		// interface that can only be implemented on a preflight class. This is safe because all preflight classes implement
+		// `std.Resource` which itself implements `std.IResource`.
+		let need_to_add_base_iresource = ast_iface.phase == Phase::Preflight
+			&& !extend_interfaces
+				.iter()
+				.any(|i| i.as_interface().unwrap().phase == Phase::Preflight);
+
+		// Verify extended interfaces are of valid phase for this interface
+		for interface in extend_interfaces.iter().map(|t| t.as_interface().unwrap()) {
+			if ast_iface.phase == Phase::Inflight && interface.phase == Phase::Preflight {
+				self.spanned_error(
+					&ast_iface.name,
+					format!(
+						"Inflight interface {} cannot extend a preflight interface {}",
+						ast_iface.name, interface.name
+					),
+				);
+			}
+		}
+
 		// add methods from all extended interfaces to the interface env
-		if let Err(e) = add_parent_members_to_iface_env(&extend_interfaces, name, &mut interface_env) {
+		if let Err(e) = add_parent_members_to_iface_env(extend_interfaces, &ast_iface.name, &mut interface_env) {
 			self.type_error(e);
 		}
 
 		// Replace the dummy interface environment with the real one
-		interface_type.as_mut_interface().unwrap().env = interface_env;
+		interface_type.as_interface_mut().unwrap().env = interface_env;
+
+		if need_to_add_base_iresource {
+			let base_resource = self.types.resource_base_interface();
+			interface_type.as_interface_mut().unwrap().extends.push(base_resource);
+		}
 	}
 
 	fn type_check_class(&mut self, stmt: &Stmt, ast_class: &AstClass, env: &mut SymbolEnv) {
@@ -3687,6 +4496,19 @@ impl<'a> TypeChecker<'a> {
 			})
 			.collect::<Vec<_>>();
 
+		// Verify implemented interfaces are of valid phase for this class
+		for interface in impl_interfaces.iter().map(|t| t.as_interface().unwrap()) {
+			if ast_class.phase == Phase::Inflight && interface.phase == Phase::Preflight {
+				self.spanned_error(
+					stmt,
+					format!(
+						"Inflight class {} cannot implement a preflight interface {}",
+						ast_class.name, interface.name
+					),
+				);
+			}
+		}
+
 		// Create the resource/class type and add it to the current environment (so class implementation can reference itself)
 		let class_spec = Class {
 			name: ast_class.name.clone(),
@@ -3696,8 +4518,7 @@ impl<'a> TypeChecker<'a> {
 			implements: impl_interfaces.clone(),
 			is_abstract: false,
 			phase: ast_class.phase,
-			type_parameters: None, // TODO no way to have generic args in wing yet
-			docs: Docs::default(),
+			docs: stmt.doc.as_ref().map_or(Docs::default(), |s| Docs::with_summary(s)),
 			std_construct_args: ast_class.phase == Phase::Preflight,
 			lifts: None,
 		};
@@ -3729,7 +4550,7 @@ impl<'a> TypeChecker<'a> {
 					field.is_static,
 					field.phase,
 					field.access,
-					None,
+					field.doc.as_ref().map(|s| Docs::with_summary(s)),
 				),
 				field.access,
 				StatementIdx::Top,
@@ -3742,15 +4563,18 @@ impl<'a> TypeChecker<'a> {
 		}
 
 		// Add methods to the class env
+		let mut method_types: BTreeMap<&Symbol, TypeRef> = BTreeMap::new();
 		for (method_name, method_def) in ast_class.methods.iter() {
+			let mut method_type = self.resolve_type_annotation(&method_def.signature.to_type_annotation(), env);
 			self.add_method_to_class_env(
-				&method_def.signature,
-				env,
+				&mut method_type,
+				method_def,
 				if method_def.is_static { None } else { Some(class_type) },
 				method_def.access,
 				&mut class_env,
 				method_name,
 			);
+			method_types.insert(&method_name, method_type);
 		}
 
 		// Add the constructor to the class env
@@ -3759,14 +4583,16 @@ impl<'a> TypeChecker<'a> {
 			span: ast_class.initializer.span.clone(),
 		};
 
+		let mut init_func_type = self.resolve_type_annotation(&ast_class.initializer.signature.to_type_annotation(), env);
 		self.add_method_to_class_env(
-			&ast_class.initializer.signature,
-			env,
+			&mut init_func_type,
+			&ast_class.initializer,
 			None,
 			ast_class.initializer.access,
 			&mut class_env,
 			&init_symb,
 		);
+		method_types.insert(&init_symb, init_func_type);
 
 		let inflight_init_symb = Symbol {
 			name: CLASS_INFLIGHT_INIT_NAME.into(),
@@ -3774,14 +4600,17 @@ impl<'a> TypeChecker<'a> {
 		};
 
 		// Add the inflight initializer to the class env
+		let mut inflight_init_func_type =
+			self.resolve_type_annotation(&ast_class.inflight_initializer.signature.to_type_annotation(), env);
 		self.add_method_to_class_env(
-			&ast_class.inflight_initializer.signature,
-			env,
+			&mut inflight_init_func_type,
+			&ast_class.inflight_initializer,
 			Some(class_type),
 			ast_class.inflight_initializer.access,
 			&mut class_env,
 			&inflight_init_symb,
 		);
+		method_types.insert(&inflight_init_symb, inflight_init_func_type);
 
 		// Replace the dummy class environment with the real one before type checking the methods
 		if let Some(mut_class) = class_type.as_class_mut() {
@@ -3795,20 +4624,88 @@ impl<'a> TypeChecker<'a> {
 		};
 
 		// Type check constructor
-		self.type_check_method(class_type, &init_symb, env, stmt.idx, &ast_class.initializer);
+		self.type_check_method(
+			class_type,
+			&init_symb,
+			&mut init_func_type,
+			env,
+			stmt.idx,
+			&ast_class.initializer,
+		);
 
-		// Verify if all fields of a class/resource are initialized in the initializer.
+		// Verify if all fields of a class/resource are initialized in the ctor.
 		let init_statements = match &ast_class.initializer.body {
 			FunctionBody::Statements(s) => s,
 			FunctionBody::External(_) => panic!("init cannot be extern"),
 		};
-
 		self.check_class_field_initialization(&init_statements, &ast_class.fields, Phase::Preflight);
 
-		// Type check the inflight initializer
+		// If our parent's ctor has any parameters make sure there's a call to it as the first statement of our ctor
+		// (otherwise the call can be implicit and we don't need to check for it)
+		if let (Some(parent_class_env), Some(parent_class_type)) = (parent_class_env, parent_class) {
+			let ctor_def = if ast_class.phase == Phase::Inflight {
+				&ast_class.inflight_initializer
+			} else {
+				&ast_class.initializer
+			};
+			let parent_ctor_symb = if parent_class_type.as_class().unwrap().phase == Phase::Inflight {
+				&inflight_init_symb
+			} else {
+				// note: In case of phase independent classes (brought from JSII) the init synbol is the same as preflight
+				&init_symb
+			};
+
+			let parent_ctor_sig = parent_class_env
+				.lookup(&parent_ctor_symb, None)
+				.expect("a ctor")
+				.as_variable()
+				.unwrap()
+				.type_
+				.as_function_sig()
+				.expect("ctor to be a function");
+			if let FunctionBody::Statements(ctor_body) = &ctor_def.body {
+				// Make sure there's a `super()` call to the parent ctor
+				if parent_ctor_sig.min_parameters() > 0 {
+					// Find the `super()` call
+					if let Some((idx, super_call)) = ctor_body
+						.statements
+						.iter()
+						.enumerate()
+						.find(|(_, s)| matches!(s.kind, StmtKind::SuperConstructor { .. }))
+					{
+						// We have a super call, make sure it's the first statement (after any type defs)
+						let expected_idx = ctor_body
+							.statements
+							.iter()
+							.position(|s| !s.kind.is_type_def())
+							.expect("at least the super call stmt");
+						if idx != expected_idx {
+							self.spanned_error(
+								super_call,
+								format!(
+									"super() call must be the first statement of {}'s constructor",
+									ast_class.name
+								),
+							);
+						}
+					} else {
+						self.spanned_error(
+							ctor_body,
+							format!(
+								"Missing super() call as first statement of {}'s constructor",
+								ast_class.name
+							),
+						);
+					}
+				}
+			}
+		}
+
+		// Type check the inflight ctor
 		self.type_check_method(
 			class_type,
 			&inflight_init_symb,
+			&mut inflight_init_func_type,
 			env,
 			stmt.idx,
 			&ast_class.inflight_initializer,
@@ -3819,7 +4716,8 @@ impl<'a> TypeChecker<'a> {
 
 		// Type check methods
 		for (method_name, method_def) in ast_class.methods.iter() {
-			self.type_check_method(class_type, method_name, env, stmt.idx, method_def);
+			let mut method_type = *method_types.get(&method_name).unwrap();
+			self.type_check_method(class_type, method_name, &mut method_type, env, stmt.idx, method_def);
 		}
 
 		// Check that the class satisfies all of its interfaces
@@ -3842,7 +4740,7 @@ impl<'a> TypeChecker<'a> {
 				{
 					let class_method_var = symbol.as_variable().expect("Expected method to be a variable");
 					let class_method_type = class_method_var.type_;
-					self.validate_type(class_method_type, method_type, &ast_class.name);
+					self.validate_type(class_method_type, method_type, &class_method_var.name);
 					// Make sure the method is public (interface methods must be public)
 					if class_method_var.access != AccessModifier::Public {
 						self.spanned_error(
@@ -3864,9 +4762,52 @@ impl<'a> TypeChecker<'a> {
 				}
 			}
 		}
+
+		// Check that if the class implements sim.IResource, then the
+		// types used in its methods are serializable and immutable
+		if impl_interfaces
+			.iter()
+			.any(|i| i.as_interface().unwrap().fqn.as_deref() == Some(WINGSDK_SIM_IRESOURCE_FQN))
+		{
+			for (method_name, method_def) in ast_class.methods.iter() {
+				let method_type = method_types.get(&method_name).unwrap();
+				self.check_method_is_resource_compatible(*method_type, method_def);
+			}
+		}
+
 		self.ctx.pop_class();
 	}
 
+	fn check_method_is_resource_compatible(&mut self, method_type: TypeRef, method_def: &FunctionDefinition) {
+		let sig = method_type
+			.as_function_sig()
+			.expect("Expected method type to be a function signature");
+
+		let check_type = |param_name: Option<&str>, t: TypeRef| {
+			let prefix = match param_name {
+				Some(name) => format!("Parameter \"{}\"", name),
+				None => "Return value".to_string(),
+			};
+			if t.is_mutable() {
+				self.spanned_error(
+					method_def,
+					format!("{} cannot have a mutable type \"{}\" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.", prefix, t),
+				);
+			}
+			if !t.is_serializable() {
+				self.spanned_error(
+					method_def,
+					format!("{} cannot have a non-serializable type \"{}\" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.", prefix, t),
+				);
+			}
+		};
+
+		for param in sig.parameters.iter() {
+			check_type(Some(&param.name), param.typeref);
+		}
+		check_type(None, sig.return_type);
+	}
+
 	fn type_check_return(&mut self, stmt: &Stmt, exp: &Option<Expr>, env: &mut SymbolEnv) {
 		// Type check the return expression
 		let return_type = exp.as_ref().map(|exp| (self.type_check_exp(exp, env).0, exp));
@@ -3915,166 +4856,116 @@ impl<'a> TypeChecker<'a> {
 		self.validate_type(exp_type, self.types.string(), exp);
 	}
 
-	fn type_check_bring(&mut self, source: &BringSource, identifier: &Option<Symbol>, stmt: &Stmt, env: &mut SymbolEnv) {
-		let library_name: String;
-		let namespace_filter: Vec<String>;
-		let alias: &Symbol;
-		match &source {
-			BringSource::BuiltinModule(name) => {
-				if WINGSDK_BRINGABLE_MODULES.contains(&name.name.as_str()) {
-					library_name = WINGSDK_ASSEMBLY_NAME.to_string();
-					namespace_filter = vec![name.name.clone()];
-					alias = identifier.as_ref().unwrap_or(&name);
-				} else if name.name.as_str() == WINGSDK_STD_MODULE {
-					self.spanned_error(stmt, format!("Redundant bring of \"{}\"", WINGSDK_STD_MODULE));
-					return;
-				} else {
-					self.spanned_error(stmt, format!("\"{}\" is not a built-in module", name));
-					return;
-				}
-			}
-			BringSource::JsiiModule(name) => {
-				library_name = name.name.to_string();
-				// no namespace filter (we only support importing entire libraries at the moment)
-				namespace_filter = vec![];
-				alias = identifier.as_ref().unwrap();
-			}
-			BringSource::WingFile(name) => {
-				let brought_env = match self.types.source_file_envs.get(Utf8Path::new(&name.name)) {
-					Some(SymbolEnvOrNamespace::SymbolEnv(env)) => *env,
-					Some(SymbolEnvOrNamespace::Namespace(_)) => {
-						panic!("Expected a symbol environment to be associated with the file")
-					}
-					Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
-						report_diagnostic(Diagnostic {
-							span: Some(stmt.span()),
-							..diagnostic.clone()
-						});
-						return;
-					}
-					None => {
-						self.spanned_error(
-							stmt,
-							format!("Could not type check \"{}\" due to cyclic bring statements", name),
-						);
-						return;
-					}
-				};
-				let ns = self.types.add_namespace(Namespace {
-					name: name.name.to_string(),
-					envs: vec![brought_env],
-					loaded: true,
-					module_path: ResolveSource::WingFile,
-				});
-				if let Err(e) = env.define(
-					identifier.as_ref().unwrap(),
-					SymbolKind::Namespace(ns),
-					AccessModifier::Private,
-					StatementIdx::Top,
-				) {
-					self.type_error(e);
-				}
-				return;
-			}
-			BringSource::WingLibrary(name, module_dir) | BringSource::TrustedModule(name, module_dir) => {
-				let brought_ns = match self.types.source_file_envs.get(module_dir) {
-					Some(SymbolEnvOrNamespace::SymbolEnv(_)) => {
-						panic!("Expected a namespace to be associated with the library")
-					}
-					Some(SymbolEnvOrNamespace::Namespace(ns)) => ns,
-					Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
-						report_diagnostic(Diagnostic {
-							span: Some(stmt.span()),
-							..diagnostic.clone()
-						});
-						return;
-					}
-					None => {
-						self.spanned_error(
-							stmt,
-							format!("Could not type check \"{}\" due to cyclic bring statements", name),
-						);
-						return;
-					}
-				};
-				if let Err(e) = env.define(
-					identifier.as_ref().unwrap_or(&name),
-					SymbolKind::Namespace(*brought_ns),
-					AccessModifier::Private,
-					StatementIdx::Top,
-				) {
-					self.type_error(e);
-				}
-				return;
-			}
-			BringSource::Directory(name) => {
-				let brought_ns = match self.types.source_file_envs.get(Utf8Path::new(&name.name)) {
-					Some(SymbolEnvOrNamespace::SymbolEnv(_)) => {
-						panic!("Expected a namespace to be associated with the directory")
-					}
-					Some(SymbolEnvOrNamespace::Namespace(ns)) => ns,
-					Some(SymbolEnvOrNamespace::Error(diagnostic)) => {
-						report_diagnostic(Diagnostic {
-							span: Some(stmt.span()),
-							..diagnostic.clone()
-						});
-						return;
-					}
-					None => {
-						self.spanned_error(
-							stmt,
-							format!("Could not type check \"{}\" due to cyclic bring statements", name),
-						);
-						return;
-					}
-				};
-				if let Err(e) = env.define(
-					identifier.as_ref().unwrap(),
-					SymbolKind::Namespace(*brought_ns),
-					AccessModifier::Private,
-					StatementIdx::Top,
-				) {
-					self.type_error(e);
-				}
-				return;
-			}
-		}
-		self.add_jsii_module_to_env(env, library_name, namespace_filter, alias, Some(&stmt));
-		// library_name is the name of the library we are importing from the JSII world
-		// namespace_filter describes what types we are importing from the library
-		// e.g. [] means we are importing everything from `mylib`
-		// e.g. ["ns1", "ns2"] means we are importing everything from `mylib.ns1.ns2`
-		// alias is the symbol we are giving to the imported library or namespace
-	}
-
 	fn type_check_assignment(&mut self, kind: &AssignmentKind, value: &Expr, variable: &Reference, env: &mut SymbolEnv) {
 		let (exp_type, _) = self.type_check_exp(value, env);
-
-		// TODO: we need to verify that if this variable is defined in a parent environment (i.e.
-		// being captured) it cannot be reassigned: https://github.com/winglang/wing/issues/3069
-
 		let (var, var_phase) = self.resolve_reference(&variable, env);
+		let var_type = match &var {
+			ResolveReferenceResult::Variable(var) => var.type_,
+			ResolveReferenceResult::Location(_, elem_type) => *elem_type,
+		};
 
-		if !var.type_.is_unresolved() && !var.reassignable {
-			report_diagnostic(Diagnostic {
-				message: "Variable is not reassignable".to_string(),
-				span: Some(variable.span()),
-				annotations: vec![DiagnosticAnnotation {
-					message: "defined here (try adding \"var\" in front)".to_string(),
-					span: var.name.span(),
-				}],
-				hints: vec![],
-			});
-		} else if var_phase == Phase::Preflight && env.phase == Phase::Inflight {
-			self.spanned_error(variable, "Variable cannot be reassigned from inflight".to_string());
+		// First, check if the assignment violates any mutability restrictions.
+		//
+		// Examples:
+		//
+		// ```
+		// let x = 5;
+		// x = 6; // error: x is not reassignable
+		// ```
+		//
+		// ```
+		// let x = Array<num>[1, 2, 3];
+		// x[0] = 4; // error: cannot update elements of an immutable array
+		// ```
+		match &var {
+			ResolveReferenceResult::Variable(var) => {
+				if !var.reassignable && !var.type_.is_unresolved() {
+					self.spanned_error_with_annotations(
+						variable,
+						"Variable is not reassignable".to_string(),
+						vec![DiagnosticAnnotation {
+							message: "defined here (try adding \"var\" in front)".to_string(),
+							span: var.name.span(),
+						}],
+					);
+				} else if var_phase == Phase::Preflight && env.phase == Phase::Inflight {
+					self.spanned_error(variable, "Variable cannot be reassigned from inflight");
+				}
+			}
+			ResolveReferenceResult::Location(container_type, _) => match **container_type {
+				Type::Anything | Type::MutJson | Type::MutArray(_) | Type::MutMap(_) => {}
+				Type::Map(_) => {
+					self.spanned_error_with_hints(
+						variable,
+						"Cannot update elements of an immutable Map",
+						&["Consider using MutMap instead"],
+					);
+				}
+				Type::Json(_) => {
+					self.spanned_error_with_hints(
+						variable,
+						"Cannot update elements of an immutable Json",
+						&["Consider using MutJson instead"],
+					);
+				}
+				Type::Array(_) => {
+					self.spanned_error_with_hints(
+						variable,
+						"Cannot update elements of an immutable Array",
+						&["Consider using MutArray instead"],
+					);
+				}
+				Type::String => {
+					self.spanned_error(variable, "Strings are immutable");
+				}
+				Type::Inferred(_)
+				| Type::Unresolved
+				| Type::Number
+				| Type::Duration
+				| Type::Boolean
+				| Type::Void
+				| Type::Nil
+				| Type::Optional(_)
+				| Type::Set(_)
+				| Type::MutSet(_)
+				| Type::Function(_)
+				| Type::Class(_)
+				| Type::Interface(_)
+				| Type::Struct(_)
+				| Type::Stringable
+				| Type::Enum(_) => self.spanned_error(
+					variable,
+					format!("Unsupported reassignment of element of type {}", var_type),
+				),
+			},
 		}
 
-		if matches!(kind, AssignmentKind::AssignIncr | AssignmentKind::AssignDecr) {
-			self.validate_type(exp_type, self.types.number(), value);
-			self.validate_type(var.type_, self.types.number(), variable);
+		// Next, check if the RHS type is compatible the LHS type and satisfies
+		// the assignment kind (like +=, -=, etc.).
+		//
+		// Examples:
+		//
+		// ```
+		// let x = 5;
+		// x = "hello"; // error: cannot assign a string to a number
+		// ```
+		//
+		// ```
+		// let y = MutArray<num>["hello", "world"];
+		// y[0] -= "!"; // error: expected a number, found a string
+		// ```
+		match kind {
+			AssignmentKind::AssignIncr => {
+				self.validate_type_in(exp_type, &[self.types.number(), self.types.string()], value, None, None);
+				self.validate_type_in(var_type, &[self.types.number(), self.types.string()], value, None, None);
+			}
+			AssignmentKind::AssignDecr => {
+				self.validate_type(exp_type, self.types.number(), value);
+				self.validate_type(var_type, self.types.number(), variable);
+			}
+			AssignmentKind::Assign => {}
 		}
-
-		self.validate_type(exp_type, var.type_, value);
+		self.validate_type(exp_type, var_type, value);
 	}
 
 	fn type_check_if(
@@ -4113,13 +5004,20 @@ impl<'a> TypeChecker<'a> {
 		);
 
 		for elif_scope in &iflet.elif_statements {
-			self.type_check_if_let_statement(
-				&elif_scope.value,
-				&elif_scope.statements,
-				&elif_scope.reassignable,
-				&elif_scope.var_name,
-				env,
-			);
+			match elif_scope {
+				Elifs::ElifBlock(elif_block) => {
+					self.type_check_if_statement(&elif_block.condition, &elif_block.statements, env);
+				}
+				Elifs::ElifLetBlock(elif_let_block) => {
+					self.type_check_if_let_statement(
+						&elif_let_block.value,
+						&elif_let_block.statements,
+						&elif_let_block.reassignable,
+						&elif_let_block.var_name,
+						env,
+					);
+				}
+			}
 		}
 
 		if let Some(else_scope) = &iflet.else_statements {
@@ -4368,7 +5266,7 @@ impl<'a> TypeChecker<'a> {
 			return;
 		};
 
-		// If the parent class is phase independent than its init name is just "init" regadless of
+		// If the parent class is phase independent than its constructor name is just "new" regardless of
 		// whether we're inflight or not.
 		let parent_init_name = if parent_class.as_class().unwrap().phase == Phase::Independent {
 			CLASS_INIT_NAME
@@ -4421,7 +5319,7 @@ impl<'a> TypeChecker<'a> {
 					self.spanned_error(
 						matching_field,
 						format!(
-							"\"{}\" cannot be initialized in the {} initializer",
+							"\"{}\" cannot be initialized in the {} constructor",
 							matching_field.name,
 							current_phase.to_lowercase()
 						),
@@ -4443,6 +5341,7 @@ impl<'a> TypeChecker<'a> {
 		&mut self,
 		class_type: TypeRef,
 		method_name: &Symbol,
+		method_type: &mut TypeRef,
 		parent_env: &SymbolEnv, // the environment in which the class is declared
 		statement_idx: usize,
 		method_def: &FunctionDefinition,
@@ -4450,13 +5349,6 @@ impl<'a> TypeChecker<'a> {
 		let class_env = &class_type.as_class().unwrap().env;
 		// TODO: make sure this function returns on all control paths when there's a return type (can be done by recursively traversing the statements and making sure there's a "return" statements in all control paths)
 		// https://github.com/winglang/wing/issues/457
-		// Lookup the method in the class_env
-		let method_type = class_env
-			.lookup(&method_name, None)
-			.expect(format!("Expected method '{}' to be in class env", method_name.name).as_str())
-			.as_variable()
-			.expect("Expected method to be a variable")
-			.type_;
 
 		let method_sig = method_type
 			.as_function_sig()
@@ -4468,7 +5360,7 @@ impl<'a> TypeChecker<'a> {
 			Some(parent_env.get_ref()),
 			SymbolEnvKind::Function {
 				is_init,
-				sig: method_type,
+				sig: *method_type,
 			},
 			method_sig.phase,
 			statement_idx,
@@ -4500,13 +5392,63 @@ impl<'a> TypeChecker<'a> {
 					tc.inner_scopes.push((scope, tc.ctx.clone()));
 				}
 
-				if let FunctionBody::External(_) = &method_def.body {
+				if let FunctionBody::External(extern_path) = &method_def.body {
 					if !method_def.is_static {
 						tc.spanned_error(
 							method_name,
 							"Extern methods must be declared \"static\" (they cannot access instance members)",
 						);
 					}
+					if !tc.types.source_file_envs.contains_key(extern_path) {
+						let new_env = tc.types.add_symbol_env(SymbolEnv::new(
+							None,
+							SymbolEnvKind::Type(tc.types.void()),
+							method_sig.phase,
+							0,
+						));
+						tc.types
+							.source_file_envs
+							.insert(extern_path.clone(), SymbolEnvOrNamespace::SymbolEnv(new_env));
+					}
+
+					if let Some(SymbolEnvOrNamespace::SymbolEnv(extern_env)) = tc.types.source_file_envs.get_mut(extern_path) {
+						let lookup = extern_env.lookup(method_name, None);
+						if let Some(lookup) = lookup {
+							// check if it's the same type
+							if let Some(lookup) = lookup.as_variable() {
+								if !lookup.type_.is_same_type_as(method_type) {
+									report_diagnostic(Diagnostic {
+										message: "extern type must be the same in all usages".to_string(),
+										span: Some(method_name.span.clone()),
+										annotations: vec![DiagnosticAnnotation {
+											message: "First declared here".to_string(),
+											span: lookup.name.span.clone(),
+										}],
+										hints: vec![format!("Change type to match first declaration: {}", lookup.type_)],
+									});
+								}
+							} else {
+								panic!("Expected extern to be a variable");
+							}
+						} else {
+							extern_env
+								.define(
+									method_name,
+									SymbolKind::Variable(VariableInfo {
+										name: method_name.clone(),
+										type_: *method_type,
+										access: method_def.access,
+										phase: method_def.signature.phase,
+										docs: None,
+										kind: VariableKind::StaticMember,
+										reassignable: false,
+									}),
+									method_def.access,
+									StatementIdx::Top,
+								)
+								.expect("Expected extern to be defined");
+						}
+					}
 				}
 			},
 		);
@@ -4514,19 +5456,45 @@ impl<'a> TypeChecker<'a> {
 
 	fn add_method_to_class_env(
 		&mut self,
-		method_sig: &ast::FunctionSignature,
-		env: &mut SymbolEnv,
+		method_type: &mut TypeRef,
+		method_def: &FunctionDefinition,
 		instance_type: Option<TypeRef>,
 		access: AccessModifier,
 		class_env: &mut SymbolEnv,
 		method_name: &Symbol,
 	) {
-		let mut method_type = self.resolve_type_annotation(&method_sig.to_type_annotation(), env);
+		// Modify the method's type based on the fact we know it's a method and not just a function
+		let method_sig = method_type
+			.as_function_sig_mut()
+			.expect("Expected method type to be a function");
+
 		// use the class type as the function's "this" type (or None if static)
-		method_type
-			.as_mut_function_sig()
-			.expect("Expected method type to be a function")
-			.this_type = instance_type;
+		method_sig.this_type = instance_type;
+
+		// For now all static preflight methods require an implicit scope argument. In the future we may be smart and if
+		// the method doesn't instantiate any preflight classes then we can do away with it.
+		//
+		// Special cases:
+		// 1) If we're overriding a method from a parent class, we assume its `implicit_scope_param`. Note that
+		//    this isn't stricly correct and we don't have clearly defined rules for static method inheritance, but this
+		//    resolves the issue of calling the base `Resource` class's onTypeLift method which doesn't expect a scope param.
+		// 2) If the method is extern we can't add any implicit params.
+		let inherit_implicit_scope_param = class_env.parent.and_then(|e| {
+			e.lookup(method_name, None).and_then(|s| {
+				s.as_variable()
+					.unwrap()
+					.type_
+					.as_function_sig()
+					.map(|s| s.implicit_scope_param)
+			})
+		});
+		method_sig.implicit_scope_param = if let Some(inherit_implicit_scope_param) = inherit_implicit_scope_param {
+			inherit_implicit_scope_param
+		} else {
+			instance_type.is_none()
+				&& method_sig.phase == Phase::Preflight
+				&& !matches!(method_def.body, FunctionBody::External(_))
+		};
 
 		// If this method is overriding a parent method, check access modifiers allow it, note this is only relevant for instance methods
 		if instance_type.is_some() {
@@ -4562,16 +5530,18 @@ impl<'a> TypeChecker<'a> {
 			}
 		}
 
+		let method_phase = method_type.as_function_sig().unwrap().phase;
+
 		match class_env.define(
 			method_name,
 			SymbolKind::make_member_variable(
 				method_name.clone(),
-				method_type,
+				*method_type,
 				false,
 				instance_type.is_none(),
-				method_sig.phase,
+				method_phase,
 				access,
-				None,
+				method_def.doc.as_ref().map(|s| Docs::with_summary(s)),
 			),
 			access,
 			StatementIdx::Top,
@@ -4604,7 +5574,7 @@ impl<'a> TypeChecker<'a> {
 			// location to locate the SDK, whereas for the other modules we need to search for them from the source directory.
 			let assembly_name = if library_name == WINGSDK_ASSEMBLY_NAME {
 				// in runtime, if "WINGSDK_MANIFEST_ROOT" env var is set, read it. otherwise set to "../wingsdk" for dev
-				let manifest_root = std::env::var("WINGSDK_MANIFEST_ROOT").unwrap_or_else(|_| "../wingsdk".to_string());
+				let manifest_root = std::env::var("WINGSDK_MANIFEST_ROOT").unwrap_or_else(|_| "../../libs/wingsdk".to_string());
 				let assembly_name = match self.jsii_types.load_module(&Utf8Path::new(&manifest_root)) {
 					Ok(name) => name,
 					Err(type_error) => {
@@ -4644,7 +5614,6 @@ impl<'a> TypeChecker<'a> {
 				assembly_name: assembly_name.to_string(),
 				namespace_filter,
 				alias: alias.clone(),
-				import_statement_idx: stmt.map(|s| s.idx).unwrap_or(0),
 			});
 
 			self
@@ -4655,14 +5624,14 @@ impl<'a> TypeChecker<'a> {
 		};
 
 		// check if we've already defined the given alias in the current scope
-		if env
-			.lookup(&jsii.alias.name.as_str().into(), Some(jsii.import_statement_idx))
-			.is_some()
-		{
+		if env.lookup(&jsii.alias.name.as_str().into(), None).is_some() {
 			self.spanned_error(alias, format!("\"{}\" is already defined", alias.name));
 		} else {
 			let mut importer = JsiiImporter::new(&jsii, self.types, self.jsii_types);
 
+			importer.import_root_types();
+			importer.import_submodules_to_env(env);
+
 			// If we're importing from the the wing sdk, eagerly import all the types within it
 			// The wing sdk is special because it's currently the only jsii module we import with a specific target namespace
 			if jsii.assembly_name == WINGSDK_ASSEMBLY_NAME {
@@ -4672,9 +5641,6 @@ impl<'a> TypeChecker<'a> {
 					Some(jsii.namespace_filter.join("."))
 				});
 			}
-
-			importer.import_root_types();
-			importer.import_submodules_to_env(env);
 		}
 	}
 
@@ -4718,24 +5684,21 @@ impl<'a> TypeChecker<'a> {
 	fn hydrate_class_type_arguments(
 		&mut self,
 		env: &SymbolEnv,
-		original_fqn: &str,
+		original_type: TypeRef,
 		type_params: Vec<TypeRef>,
 	) -> TypeRef {
-		let original_type = env.lookup_nested_str(original_fqn, None).unwrap().0.as_type().unwrap();
-		let original_type_class = original_type.as_class().unwrap();
-		let original_type_params = if let Some(tp) = original_type_class.type_parameters.as_ref() {
-			tp
-		} else {
-			panic!(
-				"\"{}\" does not have type parameters and does not need hydration",
-				original_fqn
-			);
+		let Some(original_type_env) = original_type.as_env() else {
+			panic!("\"{original_type}\" does not have an environment and does not need hydration");
+		};
+
+		let Some(original_type_params) = original_type_env.type_parameters.as_ref() else {
+			panic!("\"{original_type}\" does not have type parameters and does not need hydration");
 		};
 
 		if original_type_params.len() != type_params.len() {
 			self.unspanned_error(format!(
 				"Type \"{}\" has {} type parameters, but {} were provided",
-				original_fqn,
+				original_type,
 				original_type_params.len(),
 				type_params.len()
 			));
@@ -4749,120 +5712,87 @@ impl<'a> TypeChecker<'a> {
 		}
 
 		let dummy_env = SymbolEnv::new(None, SymbolEnvKind::Type(original_type), Phase::Independent, 0);
-		let tt = Type::Class(Class {
-			name: original_type_class.name.clone(),
-			env: dummy_env,
-			fqn: Some(original_fqn.to_string()),
-			parent: original_type_class.parent,
-			implements: original_type_class.implements.clone(),
-			is_abstract: original_type_class.is_abstract,
-			type_parameters: Some(type_params),
-			phase: original_type_class.phase,
-			docs: original_type_class.docs.clone(),
-			std_construct_args: original_type_class.std_construct_args,
-			lifts: None,
-		});
+		let tt = match &*original_type {
+			Type::Class(c) => Type::Class(Class {
+				name: c.name.clone(),
+				env: dummy_env,
+				fqn: c.fqn.clone(),
+				parent: c.parent,
+				implements: c.implements.clone(),
+				is_abstract: c.is_abstract,
+				phase: c.phase,
+				docs: c.docs.clone(),
+				std_construct_args: c.std_construct_args,
+				lifts: None,
+			}),
+			Type::Interface(iface) => Type::Interface(Interface {
+				name: iface.name.clone(),
+				env: dummy_env,
+				fqn: iface.fqn.clone(),
+				docs: iface.docs.clone(),
+				extends: iface.extends.clone(),
+				phase: iface.phase,
+			}),
+			Type::Struct(s) => Type::Struct(Struct {
+				name: s.name.clone(),
+				env: dummy_env,
+				fqn: s.fqn.clone(),
+				docs: s.docs.clone(),
+				extends: s.extends.clone(),
+			}),
+			_ => panic!("Expected type to be a class, interface, or struct"),
+		};
 
 		// TODO: here we add a new type regardless whether we already "hydrated" `original_type` with these `type_params`. Cache!
 		let mut new_type = self.types.add_type(tt);
-		let new_env = SymbolEnv::new(None, SymbolEnvKind::Type(new_type), Phase::Independent, 0);
-
-		let new_type_class = new_type.as_class_mut().unwrap();
+		let new_env =
+			SymbolEnv::new_with_type_params(None, SymbolEnvKind::Type(new_type), Phase::Independent, 0, type_params);
 
-		// Update the class's env to point to the new env
-		new_type_class.env = new_env;
-
-		let SymbolEnvKind::Type(new_type) = new_type_class.env.kind else {
-			// TODO: Ugly hack to get non mut ref of new_type so we can use it
-			panic!("Expected class env to be a type");
-		};
+		// Update the types's env to point to the new env
+		match *new_type {
+			Type::Class(ref mut class) => {
+				class.env = new_env;
+			}
+			Type::Interface(ref mut iface) => {
+				iface.env = new_env;
+			}
+			Type::Struct(ref mut s) => {
+				s.env = new_env;
+			}
+			_ => {}
+		}
 
 		// Add symbols from original type to new type
 		// Note: this is currently limited to top-level function signatures and fields
-		for (name, symbol, _) in original_type_class.env.iter(true) {
+		for (_, symbol, _) in original_type_env.iter(true) {
 			match symbol {
 				SymbolKind::Variable(VariableInfo {
-					name: _,
-					type_: v,
+					name,
+					type_,
 					reassignable,
-					phase: flight,
+					phase,
 					kind,
 					access,
-					docs: _,
+					docs,
 				}) => {
-					// Replace type params in function signatures
-					if let Some(sig) = v.as_function_sig() {
-						let new_return_type = self.get_concrete_type_for_generic(sig.return_type, &types_map);
-						let new_this_type = if let Some(this_type) = sig.this_type {
-							Some(self.get_concrete_type_for_generic(this_type, &types_map))
-						} else {
-							None
-						};
-
-						let new_params = sig
-							.parameters
-							.iter()
-							.map(|param| FunctionParameter {
-								name: param.name.clone(),
-								docs: param.docs.clone(),
-								typeref: self.get_concrete_type_for_generic(param.typeref, &types_map),
-								variadic: param.variadic,
-							})
-							.collect();
-
-						let new_sig = FunctionSignature {
-							this_type: new_this_type,
-							parameters: new_params,
-							return_type: new_return_type,
-							phase: sig.phase,
-							js_override: sig.js_override.clone(),
-							docs: Docs::default(),
-						};
-
-						let sym = Symbol::global(name);
-						match new_type_class.env.define(
-							// TODO: Original symbol is not available. SymbolKind::Variable should probably expose it
-							&sym,
-							SymbolKind::make_member_variable(
-								sym.clone(),
-								self.types.add_type(Type::Function(new_sig)),
-								*reassignable,
-								matches!(kind, VariableKind::StaticMember),
-								*flight,
-								*access,
-								None,
-							),
-							*access,
-							StatementIdx::Top,
-						) {
-							Err(type_error) => {
-								self.type_error(type_error);
-							}
-							_ => {}
-						}
-					} else {
-						let new_var_type = self.get_concrete_type_for_generic(*v, &types_map);
-						let var_name = Symbol::global(name);
-						match new_type_class.env.define(
-							// TODO: Original symbol is not available. SymbolKind::Variable should probably expose it
-							&var_name,
-							SymbolKind::make_member_variable(
-								var_name.clone(),
-								new_var_type,
-								*reassignable,
-								matches!(kind, VariableKind::StaticMember),
-								*flight,
-								*access,
-								None,
-							),
+					match new_type.as_env_mut().unwrap().define(
+						&name,
+						SymbolKind::make_member_variable(
+							name.clone(),
+							self.get_concrete_type_for_generic(env, *type_, &types_map),
+							*reassignable,
+							matches!(kind, VariableKind::StaticMember),
+							*phase,
 							*access,
-							StatementIdx::Top,
-						) {
-							Err(type_error) => {
-								self.type_error(type_error);
-							}
-							_ => {}
+							docs.clone(),
+						),
+						*access,
+						StatementIdx::Top,
+					) {
+						Err(type_error) => {
+							self.type_error(type_error);
 						}
+						_ => {}
 					}
 				}
 				_ => {
@@ -4876,6 +5806,7 @@ impl<'a> TypeChecker<'a> {
 
 	fn get_concrete_type_for_generic(
 		&mut self,
+		env: &SymbolEnv,
 		type_to_maybe_replace: TypeRef,
 		types_map: &HashMap<String, (TypeRef, TypeRef)>,
 	) -> TypeRef {
@@ -4887,15 +5818,43 @@ impl<'a> TypeChecker<'a> {
 		{
 			return *new_type_arg;
 		} else {
-			// Handle generic return types
-			// TODO: If a generic class has a method that returns another generic, it must be a builtin
 			if let Type::Optional(t) = *type_to_maybe_replace {
-				let concrete_t = self.get_concrete_type_for_generic(t, types_map);
+				let concrete_t = self.get_concrete_type_for_generic(env, t, types_map);
 				return self.types.add_type(Type::Optional(concrete_t));
 			}
 
-			if let Some(c) = type_to_maybe_replace.as_class() {
-				if let Some(type_parameters) = &c.type_parameters {
+			if let Some(sig) = type_to_maybe_replace.as_function_sig() {
+				let new_this_type = sig
+					.this_type
+					.map(|t| self.get_concrete_type_for_generic(env, t, types_map));
+				let new_return_type = self.get_concrete_type_for_generic(env, sig.return_type, types_map);
+
+				let new_params = sig
+					.parameters
+					.iter()
+					.map(|param| FunctionParameter {
+						name: param.name.clone(),
+						docs: param.docs.clone(),
+						typeref: self.get_concrete_type_for_generic(env, param.typeref, types_map),
+						variadic: param.variadic,
+					})
+					.collect();
+
+				let new_sig = FunctionSignature {
+					this_type: new_this_type,
+					parameters: new_params,
+					return_type: new_return_type,
+					phase: if new_this_type.is_none() { env.phase } else { sig.phase },
+					js_override: sig.js_override.clone(),
+					docs: sig.docs.clone(),
+					implicit_scope_param: sig.implicit_scope_param,
+				};
+
+				return self.types.add_type(Type::Function(new_sig));
+			}
+
+			if let Some(inner_env) = type_to_maybe_replace.as_env() {
+				if let Some(type_parameters) = &inner_env.type_parameters {
 					// For now all our generics only have a single type parameter so use the first type parameter as our "T1"
 					let t1 = type_parameters[0];
 					let t1_replacement = *types_map
@@ -4903,23 +5862,62 @@ impl<'a> TypeChecker<'a> {
 						.filter(|(o, _)| t1.is_same_type_as(o))
 						.map(|(_, n)| n)
 						.expect("generic must have a type parameter");
-					let fqn = format!("{}.{}", WINGSDK_STD_MODULE, c.name.name);
-
-					return match fqn.as_str() {
-						WINGSDK_MUT_ARRAY => self.types.add_type(Type::MutArray(t1_replacement)),
-						WINGSDK_ARRAY => self.types.add_type(Type::Array(t1_replacement)),
-						WINGSDK_MAP => self.types.add_type(Type::Map(t1_replacement)),
-						WINGSDK_MUT_MAP => self.types.add_type(Type::MutMap(t1_replacement)),
-						WINGSDK_SET => self.types.add_type(Type::Set(t1_replacement)),
-						WINGSDK_MUT_SET => self.types.add_type(Type::MutSet(t1_replacement)),
-						_ => {
-							self.unspanned_error(format!("\"{}\" is not a supported generic return type", fqn));
-							self.types.error()
+
+					let fqn = match &*type_to_maybe_replace {
+						Type::Class(c) => c.fqn.as_ref(),
+						Type::Interface(i) => i.fqn.as_ref(),
+						Type::Struct(s) => s.fqn.as_ref(),
+						_ => None,
+					};
+
+					return if let Some(fqn) = fqn {
+						match fqn
+							.replace(const_format::formatcp!("{WINGSDK_ASSEMBLY_NAME}."), "")
+							.as_str()
+						{
+							WINGSDK_MUT_ARRAY => self.types.add_type(Type::MutArray(t1_replacement)),
+							WINGSDK_ARRAY => self.types.add_type(Type::Array(t1_replacement)),
+							WINGSDK_MAP => self.types.add_type(Type::Map(t1_replacement)),
+							WINGSDK_MUT_MAP => self.types.add_type(Type::MutMap(t1_replacement)),
+							WINGSDK_SET => self.types.add_type(Type::Set(t1_replacement)),
+							WINGSDK_MUT_SET => self.types.add_type(Type::MutSet(t1_replacement)),
+							_ => self.hydrate_class_type_arguments(env, type_to_maybe_replace, vec![t1_replacement]),
 						}
+					} else {
+						self.hydrate_class_type_arguments(env, type_to_maybe_replace, vec![t1_replacement])
 					};
 				}
+			} else {
+				match &*type_to_maybe_replace {
+					Type::Array(inner_t) => {
+						let new_inner = self.get_concrete_type_for_generic(env, *inner_t, types_map);
+						return self.types.add_type(Type::Array(new_inner));
+					}
+					Type::MutArray(inner_t) => {
+						let new_inner = self.get_concrete_type_for_generic(env, *inner_t, types_map);
+						return self.types.add_type(Type::MutArray(new_inner));
+					}
+					Type::Set(inner_t) => {
+						let new_inner = self.get_concrete_type_for_generic(env, *inner_t, types_map);
+						return self.types.add_type(Type::Set(new_inner));
+					}
+					Type::MutSet(inner_t) => {
+						let new_inner = self.get_concrete_type_for_generic(env, *inner_t, types_map);
+						return self.types.add_type(Type::MutSet(new_inner));
+					}
+					Type::Map(inner_t) => {
+						let new_inner = self.get_concrete_type_for_generic(env, *inner_t, types_map);
+						return self.types.add_type(Type::Map(new_inner));
+					}
+					Type::MutMap(inner_t) => {
+						let new_inner = self.get_concrete_type_for_generic(env, *inner_t, types_map);
+						return self.types.add_type(Type::MutMap(new_inner));
+					}
+					_ => {}
+				}
 			}
 		}
+
 		return type_to_maybe_replace;
 	}
 
@@ -4936,6 +5934,10 @@ impl<'a> TypeChecker<'a> {
 				name: "Datetime".to_string(),
 				span: symbol.span.clone(),
 			}),
+			"regex" => Some(Symbol {
+				name: "Regex".to_string(),
+				span: symbol.span.clone(),
+			}),
 			"str" => Some(Symbol {
 				name: "String".to_string(),
 				span: symbol.span.clone(),
@@ -4988,6 +5990,8 @@ impl<'a> TypeChecker<'a> {
 					path.push(type_name.root.clone());
 					break;
 				}
+				// a[b] cannot be a type reference
+				Reference::ElementAccess { .. } => return None,
 			}
 		}
 
@@ -4998,11 +6002,19 @@ impl<'a> TypeChecker<'a> {
 		let start = root.span.start;
 		let end = path.last().map(|s| s.span.end).unwrap_or(root.span.end);
 		let file_id = root.span.file_id.clone();
+		let start_offset = root.span.start_offset;
+		let end_offset = path.last().map(|s| s.span.end_offset).unwrap_or(root.span.end_offset);
 
 		Some(UserDefinedType {
 			root,
 			fields: path,
-			span: WingSpan { start, end, file_id },
+			span: WingSpan {
+				start,
+				end,
+				file_id,
+				start_offset,
+				end_offset,
+			},
 		})
 	}
 
@@ -5046,7 +6058,30 @@ impl<'a> TypeChecker<'a> {
 			.map(|_| base_udt)
 	}
 
-	fn resolve_reference(&mut self, reference: &Reference, env: &mut SymbolEnv) -> (VariableInfo, Phase) {
+	fn make_immutable(&mut self, type_: TypeRef) -> TypeRef {
+		match *type_ {
+			Type::MutArray(inner) => {
+				let inner = self.make_immutable(inner);
+				self.types.add_type(Type::Array(inner))
+			}
+			Type::MutJson => self.types.json(),
+			Type::MutMap(inner) => {
+				let inner = self.make_immutable(inner);
+				self.types.add_type(Type::Map(inner))
+			}
+			Type::MutSet(inner) => {
+				let inner = self.make_immutable(inner);
+				self.types.add_type(Type::Set(inner))
+			}
+			Type::Optional(inner) => {
+				let inner = self.make_immutable(inner);
+				self.types.add_type(Type::Optional(inner))
+			}
+			_ => type_,
+		}
+	}
+
+	fn resolve_reference(&mut self, reference: &Reference, env: &mut SymbolEnv) -> (ResolveReferenceResult, Phase) {
 		match reference {
 			Reference::Identifier(symbol) => {
 				let lookup_res = env.lookup_ext_mut(symbol, Some(self.ctx.current_stmt_idx()));
@@ -5054,12 +6089,13 @@ impl<'a> TypeChecker<'a> {
 					if let Some(var) = var.as_variable_mut() {
 						let phase = var.phase;
 						self.update_known_inferences(&mut var.type_, &var.name.span);
-						(var.clone(), phase)
+						(ResolveReferenceResult::Variable(var.clone()), phase)
 					} else {
-						self.spanned_error_with_var(
+						let err = self.spanned_error_with_var(
 							symbol,
 							format!("Expected identifier \"{symbol}\" to be a variable, but it's a {var}",),
-						)
+						);
+						(ResolveReferenceResult::Variable(err.0), err.1)
 					}
 				} else {
 					// Give a specific error message if someone tries to write "print" instead of "log"
@@ -5068,7 +6104,10 @@ impl<'a> TypeChecker<'a> {
 					} else {
 						self.type_error(lookup_result_mut_to_type_error(lookup_res, symbol));
 					}
-					(self.make_error_variable_info(), Phase::Independent)
+					(
+						ResolveReferenceResult::Variable(self.make_error_variable_info()),
+						Phase::Independent,
+					)
 				}
 			}
 			Reference::InstanceMember {
@@ -5110,14 +6149,45 @@ impl<'a> TypeChecker<'a> {
 
 				// If resolving the object's type failed, we can't resolve the property either
 				if instance_type.is_unresolved() {
-					return (self.make_error_variable_info(), Phase::Independent);
+					return (
+						ResolveReferenceResult::Variable(self.make_error_variable_info()),
+						Phase::Independent,
+					);
 				}
 
-				let mut property_variable = self.resolve_variable_from_instance_type(instance_type, property, env, object);
+				let mut property_variable = self.resolve_variable_from_instance_type(instance_type, property, env);
+
+				// Make sure we're not referencing a preflight field on an inflight instance
+				let mut property_phase = property_variable.phase;
+				if property_phase == Phase::Preflight && instance_phase == Phase::Inflight {
+					self.spanned_error_with_annotations(
+						property,
+						format!("Can't access preflight member \"{property}\" on inflight instance of type \"{instance_type}\"",),
+						vec![DiagnosticAnnotation::new("Object phase is in inflight", object)],
+					);
+					return (
+						ResolveReferenceResult::Variable(self.make_error_variable_info()),
+						Phase::Independent,
+					);
+				}
 
-				// if the object is `this`, then use the property's phase instead of the object phase
-				let property_phase = if property_variable.phase == Phase::Independent {
-					instance_phase
+				// Try to resolve phase independent property's actual phase
+				property_phase = if property_phase == Phase::Independent {
+					// Phase independent properties get the env phase, this makes sure calls to phase independent
+					// methods on lifted preflight objects are executed inflight. This is important in the following cases:
+					// 1. Strings might be tokens and not evaluated yet. Tokenized strings accessed inflight
+					//    must be evaluated in inflight.
+					// 2. Methods returning mutable objects need to be called inflight, because we un-mut these objects
+					//    on lift, but the use expects the return value to be mutable. Calling them inflight resolves this.
+					// 3. Any side effect as a result of the call (non-pure functions) is probably expected to happen inflight.
+					//    So generally, we should call phase independent methods inflight.
+					if instance_type.is_struct() {
+						// Struct fields aren't methods so we can safely leave them phase independent,
+						// without this accessing methods on struct fields don't get correctly lift qualified
+						instance_phase
+					} else {
+						env.phase
+					}
 				} else {
 					property_variable.phase
 				};
@@ -5144,7 +6214,7 @@ impl<'a> TypeChecker<'a> {
 					property_variable.type_ = self.types.make_option(property_variable.type_);
 				}
 
-				(property_variable, property_phase)
+				(ResolveReferenceResult::Variable(property_variable), property_phase)
 			}
 			Reference::TypeMember { type_name, property } => {
 				let type_ = self
@@ -5152,9 +6222,9 @@ impl<'a> TypeChecker<'a> {
 					.unwrap_or_else(|e| self.type_error(e));
 				match *type_ {
 					Type::Enum(ref e) => {
-						if e.values.contains(property) {
+						if e.values.contains_key(property) {
 							(
-								VariableInfo {
+								ResolveReferenceResult::Variable(VariableInfo {
 									name: property.clone(),
 									kind: VariableKind::StaticMember,
 									type_,
@@ -5162,14 +6232,15 @@ impl<'a> TypeChecker<'a> {
 									phase: Phase::Independent,
 									access: AccessModifier::Public,
 									docs: None,
-								},
+								}),
 								Phase::Independent,
 							)
 						} else {
-							self.spanned_error_with_var(
+							let err = self.spanned_error_with_var(
 								property,
 								format!("Enum \"{}\" does not contain value \"{}\"", type_, property.name),
-							)
+							);
+							(ResolveReferenceResult::Variable(err.0), err.1)
 						}
 					}
 					Type::Struct(ref s) => {
@@ -5187,43 +6258,131 @@ impl<'a> TypeChecker<'a> {
 											type_, name
 										),
 									);
-									return (self.make_error_variable_info(), Phase::Independent);
+									return (
+										ResolveReferenceResult::Variable(self.make_error_variable_info()),
+										Phase::Independent,
+									);
 								}
 							}
 						}
 
-						let new_class = self.hydrate_class_type_arguments(env, WINGSDK_STRUCT, vec![type_]);
+						let new_class = self.hydrate_class_type_arguments(env, lookup_known_type(WINGSDK_STRUCT, env), vec![type_]);
 						let v = self.get_property_from_class_like(new_class.as_class().unwrap(), property, true, env);
-						(v, Phase::Independent)
+						(ResolveReferenceResult::Variable(v), Phase::Independent)
 					}
 					Type::Class(ref c) => {
 						let v = self.get_property_from_class_like(c, property, true, env);
 						if matches!(v.kind, VariableKind::InstanceMember) {
-							return self.spanned_error_with_var(
+							let err = self.spanned_error_with_var(
 								property,
 								format!("Class \"{c}\" contains a member \"{property}\" but it is not static"),
 							);
+							return (ResolveReferenceResult::Variable(err.0), err.1);
 						}
-						(v.clone(), v.phase)
+						// If the property is phase independent then resolve its actual phase to the current execution phase
+						let phase = if v.phase == Phase::Independent {
+							env.phase
+						} else {
+							v.phase
+						};
+						(ResolveReferenceResult::Variable(v.clone()), phase)
+					}
+					_ => {
+						let err = self.spanned_error_with_var(property, format!("\"{}\" not a valid reference", reference));
+						(ResolveReferenceResult::Variable(err.0), err.1)
 					}
-					_ => self.spanned_error_with_var(property, format!("\"{}\" not a valid reference", reference)),
 				}
 			}
+			Reference::ElementAccess { object, index } => {
+				let (instance_type, instance_phase) = self.type_check_exp(object, env);
+				let (index_type, index_phase) = self.type_check_exp(index, env);
+
+				// Given a[b], we type check the expression according to the type of a.
+				let res = match *instance_type {
+					// TODO: it might be possible to look at Type::Json's inner data to give a more specific type
+					Type::Json(_) => {
+						self.validate_type_in(
+							index_type,
+							&[self.types.number(), self.types.string()],
+							index,
+							None,
+							None,
+						);
+						ResolveReferenceResult::Location(instance_type, self.types.json()) // indexing into a Json object returns a Json object
+					}
+					Type::MutJson => {
+						self.validate_type_in(
+							index_type,
+							&[self.types.number(), self.types.string()],
+							index,
+							None,
+							None,
+						);
+						ResolveReferenceResult::Location(instance_type, self.types.mut_json()) // indexing into a MutJson object returns a MutJson object
+					}
+					Type::Array(inner_type) | Type::MutArray(inner_type) => {
+						self.validate_type(index_type, self.types.number(), index);
+						ResolveReferenceResult::Location(instance_type, inner_type)
+					}
+					Type::Map(inner_type) | Type::MutMap(inner_type) => {
+						self.validate_type(index_type, self.types.string(), index);
+						ResolveReferenceResult::Location(instance_type, inner_type)
+					}
+					Type::Anything => ResolveReferenceResult::Location(self.types.anything(), self.types.anything()),
+					Type::Unresolved => ResolveReferenceResult::Location(self.types.error(), self.types.error()),
+					Type::Inferred(_) => {
+						self.spanned_error(object, "Indexing into an inferred type is not supported");
+						ResolveReferenceResult::Location(self.types.error(), self.types.error())
+					}
+					Type::String => {
+						self.validate_type(index_type, self.types.number(), index);
+
+						ResolveReferenceResult::Location(instance_type, self.types.string())
+					}
+					Type::Number
+					| Type::Duration
+					| Type::Boolean
+					| Type::Void
+					| Type::Nil
+					| Type::Optional(_)
+					| Type::Set(_)
+					| Type::MutSet(_)
+					| Type::Function(_)
+					| Type::Class(_)
+					| Type::Interface(_)
+					| Type::Struct(_)
+					| Type::Enum(_)
+					| Type::Stringable => {
+						let err = self.spanned_error_with_var(object, format!("Type \"{}\" is not indexable", instance_type));
+						ResolveReferenceResult::Variable(err.0)
+					}
+				};
+				(
+					res,
+					if index_phase == Phase::Independent && instance_phase == Phase::Preflight {
+						// In case of a phase independent index on a preflight instance we can lift the entire expression
+						// so use the instance phase. Using combine_phases here would result in the entire expression to be
+						// phase independent and then we'll lift only the instance and won't be able to correctly qualify
+						// the expression:
+						// bucket_arr[0].put(..) // we need to qualify the entire expression with "put"
+						instance_phase
+					} else {
+						combine_phases(index_phase, instance_phase)
+					},
+				)
+			}
 		}
 	}
 
 	/// Check if the given property on the given type with the given access modifier can be accessed from the current context
-
 	fn resolve_variable_from_instance_type(
 		&mut self,
 		instance_type: TypeRef,
 		property: &Symbol,
 		env: &SymbolEnv,
-		// only used for recursion
-		_object: &Expr,
 	) -> VariableInfo {
 		match *instance_type {
-			Type::Optional(t) => self.resolve_variable_from_instance_type(t, property, env, _object),
+			Type::Optional(t) => self.resolve_variable_from_instance_type(t, property, env),
 			Type::Class(ref class) => self.get_property_from_class_like(class, property, false, env),
 			Type::Interface(ref interface) => self.get_property_from_class_like(interface, property, false, env),
 			Type::Anything => VariableInfo {
@@ -5238,87 +6397,55 @@ impl<'a> TypeChecker<'a> {
 
 			// Lookup wingsdk std types, hydrating generics if necessary
 			Type::Array(t) => {
-				let new_class = self.hydrate_class_type_arguments(env, WINGSDK_ARRAY, vec![t]);
+				let new_class = self.hydrate_class_type_arguments(env, lookup_known_type(WINGSDK_ARRAY, env), vec![t]);
 				self.get_property_from_class_like(new_class.as_class().unwrap(), property, false, env)
 			}
 			Type::MutArray(t) => {
-				let new_class = self.hydrate_class_type_arguments(env, WINGSDK_MUT_ARRAY, vec![t]);
+				let new_class = self.hydrate_class_type_arguments(env, lookup_known_type(WINGSDK_MUT_ARRAY, env), vec![t]);
 				self.get_property_from_class_like(new_class.as_class().unwrap(), property, false, env)
 			}
 			Type::Set(t) => {
-				let new_class = self.hydrate_class_type_arguments(env, WINGSDK_SET, vec![t]);
+				let new_class = self.hydrate_class_type_arguments(env, lookup_known_type(WINGSDK_SET, env), vec![t]);
 				self.get_property_from_class_like(new_class.as_class().unwrap(), property, false, env)
 			}
 			Type::MutSet(t) => {
-				let new_class = self.hydrate_class_type_arguments(env, WINGSDK_MUT_SET, vec![t]);
+				let new_class = self.hydrate_class_type_arguments(env, lookup_known_type(WINGSDK_MUT_SET, env), vec![t]);
 				self.get_property_from_class_like(new_class.as_class().unwrap(), property, false, env)
 			}
 			Type::Map(t) => {
-				let new_class = self.hydrate_class_type_arguments(env, WINGSDK_MAP, vec![t]);
+				let new_class = self.hydrate_class_type_arguments(env, lookup_known_type(WINGSDK_MAP, env), vec![t]);
 				self.get_property_from_class_like(new_class.as_class().unwrap(), property, false, env)
 			}
 			Type::MutMap(t) => {
-				let new_class = self.hydrate_class_type_arguments(env, WINGSDK_MUT_MAP, vec![t]);
+				let new_class = self.hydrate_class_type_arguments(env, lookup_known_type(WINGSDK_MUT_MAP, env), vec![t]);
 				self.get_property_from_class_like(new_class.as_class().unwrap(), property, false, env)
 			}
 			Type::Json(_) => self.get_property_from_class_like(
-				env
-					.lookup_nested_str(WINGSDK_JSON, None)
-					.unwrap()
-					.0
-					.as_type()
-					.unwrap()
-					.as_class()
-					.unwrap(),
+				lookup_known_type(WINGSDK_JSON, env).as_class().unwrap(),
 				property,
 				false,
 				env,
 			),
 			Type::MutJson => self.get_property_from_class_like(
-				env
-					.lookup_nested_str(WINGSDK_MUT_JSON, None)
-					.unwrap()
-					.0
-					.as_type()
-					.unwrap()
-					.as_class()
-					.unwrap(),
+				lookup_known_type(WINGSDK_MUT_JSON, env).as_class().unwrap(),
 				property,
 				false,
 				env,
 			),
 			Type::String => self.get_property_from_class_like(
-				env
-					.lookup_nested_str(WINGSDK_STRING, None)
-					.unwrap()
-					.0
-					.as_type()
-					.unwrap()
-					.as_class()
-					.unwrap(),
+				lookup_known_type(WINGSDK_STRING, env).as_class().unwrap(),
 				property,
 				false,
 				env,
 			),
 			Type::Duration => self.get_property_from_class_like(
-				env
-					.lookup_nested_str(WINGSDK_DURATION, None)
-					.unwrap()
-					.0
-					.as_type()
-					.unwrap()
-					.as_class()
-					.unwrap(),
+				lookup_known_type(WINGSDK_DURATION, env).as_class().unwrap(),
 				property,
 				false,
 				env,
 			),
 			Type::Struct(ref s) => self.get_property_from_class_like(s, property, true, env),
-			_ => {
-				self
-					.spanned_error_with_var(property, "Property not found".to_string())
-					.0
-			}
+			_ => self.spanned_error_with_var(property, "Property not found").0,
 		}
 	}
 
@@ -5358,18 +6485,32 @@ impl<'a> TypeChecker<'a> {
 			match var.access {
 				AccessModifier::Private => {
 					if !private_access {
-						self.spanned_error(
-							property,
-							format!("Cannot access private member \"{property}\" of \"{class}\""),
-						);
+						report_diagnostic(Diagnostic {
+							message: format!("Cannot access private member \"{property}\" of \"{class}\""),
+							span: Some(property.span()),
+							annotations: vec![DiagnosticAnnotation {
+								message: "defined here".to_string(),
+								span: lookup_info.span,
+							}],
+							hints: vec![format!(
+								"the definition of \"{property}\" needs a broader access modifier like \"pub\" or \"protected\" to be used outside of \"{class}\"",
+							)],
+						});
 					}
 				}
 				AccessModifier::Protected => {
 					if !protected_access {
-						self.spanned_error(
-							property,
-							format!("Cannot access protected member \"{property}\" of \"{class}\""),
-						);
+						report_diagnostic(Diagnostic {
+							message: format!("Cannot access protected member \"{property}\" of \"{class}\""),
+							span: Some(property.span()),
+							annotations: vec![DiagnosticAnnotation {
+								message: "defined here".to_string(),
+								span: lookup_info.span,
+							}],
+							hints: vec![format!(
+								"the definition of \"{property}\" needs a broader access modifier like \"pub\" to be used outside of \"{class}\"",
+							)],
+						});
 					}
 				}
 				AccessModifier::Public => {} // keep this here to make sure we don't add a new access modifier without handling it here
@@ -5410,12 +6551,8 @@ impl<'a> TypeChecker<'a> {
 		}
 
 		// If the type is not found, attempt to import it from a jsii library
-		if import_udt_from_jsii(self.types, self.jsii_types, user_defined_type, &self.jsii_imports) {
-			return resolve_user_defined_type(user_defined_type, env, statement_idx);
-		}
-
-		// If the type is still not found, return the original error
-		res
+		import_udt_from_jsii(self.types, self.jsii_types, user_defined_type, &self.jsii_imports);
+		resolve_user_defined_type(user_defined_type, env, statement_idx)
 	}
 
 	fn extract_parent_class(
@@ -5449,7 +6586,7 @@ impl<'a> TypeChecker<'a> {
 		}
 
 		if &parent.root == name && parent.fields.is_empty() {
-			self.spanned_error(parent, "Class cannot extend itself".to_string());
+			self.spanned_error(parent, "Class cannot extend itself");
 			return (None, None);
 		}
 
@@ -5472,6 +6609,71 @@ impl<'a> TypeChecker<'a> {
 			(None, None)
 		}
 	}
+
+	fn type_check_lift_statement(&mut self, lift_quals: &ExplicitLift, env: &mut SymbolEnv) {
+		for qual in lift_quals.qualifications.iter() {
+			let (obj_type, obj_phase) = self.type_check_exp(&qual.obj, env);
+			// Skip unknown references (diagnotics already emitted in `resolve_reference`)
+			if obj_type.is_unresolved() {
+				continue;
+			}
+			// Make sure the object isn't inflight
+			if obj_phase == Phase::Inflight {
+				self.spanned_error(
+					&qual.obj,
+					format!("Expected a preflight object, but found {obj_phase} expression instead"),
+				);
+			}
+			// Make sure the object type is a preflight type
+			if !obj_type.is_preflight_object_type() {
+				self.spanned_error_with_hints(
+					&qual.obj,
+					format!("Expected a preflight object type, but found {obj_type} instead"),
+					&["Preflight objects are instances of either a class or interface defined preflight without the `inflight` modifier"],
+				);
+				continue;
+			}
+			// Make sure all the ops are inflight instance members of the object
+			for op in qual.ops.iter() {
+				let obj_env = obj_type.as_env().expect("a preflight object to have an env");
+				match obj_env.lookup(op, None) {
+					Some(SymbolKind::Variable(v)) => {
+						if v.phase != Phase::Inflight {
+							self.spanned_error(
+								op,
+								format!(
+									"Only inflight members may be qualified. \"{op}\" is a {} member.",
+									v.phase
+								),
+							);
+						}
+						if v.kind != VariableKind::InstanceMember {
+							self.spanned_error(op, "Only instance (non-static) members may be qualified".to_string());
+						}
+					}
+					Some(_) => panic!("expected object envs to only have variables"),
+					None => self.spanned_error_with_annotations(
+						op,
+						format!("Object of type {obj_type} does not have an inflight member named \"{op}\""),
+						vec![DiagnosticAnnotation::new(
+							"Operation does not exist in this object",
+							&qual.obj,
+						)],
+					),
+				}
+			}
+		}
+
+		// Type check the inner statements
+		let scope_env = self.types.add_symbol_env(SymbolEnv::new(
+			Some(env.get_ref()),
+			SymbolEnvKind::Scope,
+			env.phase,
+			self.ctx.current_stmt_idx(),
+		));
+		self.types.set_scope_env(&lift_quals.statements, scope_env);
+		self.inner_scopes.push((&lift_quals.statements, self.ctx.clone()));
+	}
 }
 
 impl VisitorWithContext for TypeChecker<'_> {
@@ -5480,6 +6682,22 @@ impl VisitorWithContext for TypeChecker<'_> {
 	}
 }
 
+/**
+ * Given two phases (typically from two sub expressions of an expression) will return a valid phase
+ * for the top level expression.
+ */
+fn combine_phases(phase1: Phase, phase2: Phase) -> Phase {
+	match (phase1, phase2) {
+		// If any of the expressions are inflight then the result is inflight since
+		// the entire expression can only be evaluated in inflight context.
+		(Phase::Inflight, _) | (_, Phase::Inflight) => Phase::Inflight,
+		// Otherwise we'll treat the expression as phase independent
+		// Note: we never result in a preflight expression since we currently prefer
+		// to lift the smaller preflight components and evaluate them in inflight context
+		_ => Phase::Independent,
+	}
+}
+
 fn add_parent_members_to_struct_env(
 	extends_types: &Vec<TypeRef>,
 	name: &Symbol,
@@ -5497,6 +6715,7 @@ fn add_parent_members_to_struct_env(
 				),
 				span: name.span.clone(),
 				annotations: vec![],
+				hints: vec![],
 			});
 		};
 		// Add each member of current parent to the struct's environment (if it wasn't already added by a previous parent)
@@ -5520,6 +6739,7 @@ fn add_parent_members_to_struct_env(
 							name, parent_type, parent_member_name, parent_member_type, existing_type
 						),
 						annotations: vec![],
+						hints: vec![],
 					});
 				}
 			} else {
@@ -5536,7 +6756,7 @@ fn add_parent_members_to_struct_env(
 						false,
 						struct_env.phase,
 						AccessModifier::Public,
-						None,
+						parent_member_var.docs.clone(),
 					),
 					AccessModifier::Public,
 					StatementIdx::Top,
@@ -5565,6 +6785,7 @@ fn add_parent_members_to_iface_env(
 				),
 				span: name.span.clone(),
 				annotations: vec![],
+				hints: vec![],
 			});
 		};
 		// Add each member of current parent to the interface's environment (if it wasn't already added by a previous parent)
@@ -5585,6 +6806,7 @@ fn add_parent_members_to_iface_env(
 						),
 						span: name.span.clone(),
 						annotations: vec![],
+						hints: vec![],
 					});
 				}
 			} else {
@@ -5601,7 +6823,7 @@ fn add_parent_members_to_iface_env(
 						member_var.kind == VariableKind::StaticMember,
 						member_var.phase,
 						AccessModifier::Public,
-						None,
+						member_var.docs.clone(),
 					),
 					AccessModifier::Public,
 					StatementIdx::Top,
@@ -5622,11 +6844,23 @@ where
 	T: Spanned + Display,
 {
 	match lookup_result {
-		LookupResult::NotFound(s) => TypeError {
-			message: format!("Unknown symbol \"{s}\""),
-			span: s.span(),
-			annotations: vec![],
-		},
+		LookupResult::NotFound(s, maybe_t) => {
+			let message = if let Some(env_type) = maybe_t {
+				format!("Member \"{s}\" does not exist in \"{env_type}\"")
+			} else {
+				format!("Unknown symbol \"{s}\"")
+			};
+			let mut hints = vec![];
+			if s.name == CONSTRUCT_NODE_PROPERTY {
+				hints.push("use nodeof(x) to access the tree node on a preflight class".to_string());
+			}
+			TypeError {
+				message,
+				span: s.span(),
+				annotations: vec![],
+				hints,
+			}
+		}
 		LookupResult::NotPublic(kind, lookup_info) => TypeError {
 			message: {
 				let access = lookup_info.access.to_string();
@@ -5653,11 +6887,13 @@ where
 				message: "defined here".to_string(),
 				span: lookup_info.span,
 			}],
+			hints: vec![],
 		},
 		LookupResult::MultipleFound => TypeError {
 			message: format!("Ambiguous symbol \"{looked_up_object}\""),
 			span: looked_up_object.span(),
 			annotations: vec![],
+			hints: vec![],
 		},
 		LookupResult::DefinedLater(span) => TypeError {
 			message: format!("Symbol \"{looked_up_object}\" used before being defined"),
@@ -5666,11 +6902,13 @@ where
 				message: "defined later here".to_string(),
 				span,
 			}],
+			hints: vec![],
 		},
 		LookupResult::ExpectedNamespace(ns_name) => TypeError {
 			message: format!("Expected \"{ns_name}\" in \"{looked_up_object}\" to be a namespace"),
 			span: ns_name.span(),
 			annotations: vec![],
+			hints: vec![],
 		},
 		LookupResult::Found(..) => panic!("Expected a lookup error, but found a successful lookup"),
 	}
@@ -5705,6 +6943,7 @@ pub fn resolve_user_defined_type_ref<'a>(
 				message: format!("Expected \"{}\" to be a type but it's a {symb_kind}", symb.name),
 				span: symb.span.clone(),
 				annotations: vec![],
+				hints: vec![],
 			})
 		}
 	} else {
@@ -5735,6 +6974,7 @@ pub fn resolve_super_method(method: &Symbol, env: &SymbolEnv, types: &Types) ->
 						.to_string(),
 				span: method.span.clone(),
 				annotations: vec![],
+				hints: vec![],
 			});
 		}
 		// Get the parent type of "this" (if it's a preflight class that's directly derived from `std.Resource` it's an implicit derive so we'll treat it as if there's no parent)
@@ -5754,6 +6994,7 @@ pub fn resolve_super_method(method: &Symbol, env: &SymbolEnv, types: &Types) ->
 					),
 					span: method.span.clone(),
 					annotations: vec![],
+					hints: vec![],
 				})
 			}
 		} else {
@@ -5761,6 +7002,7 @@ pub fn resolve_super_method(method: &Symbol, env: &SymbolEnv, types: &Types) ->
 				message: format!("Cannot call super method because class {} has no parent", type_),
 				span: method.span.clone(),
 				annotations: vec![],
+				hints: vec![],
 			})
 		}
 	} else {
@@ -5773,6 +7015,7 @@ pub fn resolve_super_method(method: &Symbol, env: &SymbolEnv, types: &Types) ->
 			.to_string(),
 			span: method.span.clone(),
 			annotations: vec![],
+			hints: vec![],
 		})
 	}
 }
@@ -5782,23 +7025,29 @@ pub fn import_udt_from_jsii(
 	jsii_types: &TypeSystem,
 	user_defined_type: &UserDefinedType,
 	jsii_imports: &[JsiiImportSpec],
-) -> bool {
+) {
 	for jsii in jsii_imports {
 		if jsii.alias.name == user_defined_type.root.name {
 			let mut importer = JsiiImporter::new(&jsii, wing_types, jsii_types);
 
 			let mut udt_string = if jsii.assembly_name == WINGSDK_ASSEMBLY_NAME {
 				// when importing from the std lib, the "alias" is the submodule
-				format!("{}.{}.", jsii.assembly_name, jsii.alias.name)
+				format!("{}.{}", jsii.assembly_name, jsii.alias.name)
 			} else {
-				format!("{}.", jsii.assembly_name)
+				if user_defined_type.fields.is_empty() {
+					return;
+				}
+				jsii.assembly_name.to_string()
 			};
-			udt_string.push_str(&user_defined_type.fields.iter().map(|g| g.name.clone()).join("."));
 
-			return importer.import_type(&FQN::from(udt_string.as_str()));
+			for field in &user_defined_type.fields {
+				udt_string.push('.');
+				udt_string.push_str(&field.name);
+			}
+
+			importer.import_type(&FQN::from(udt_string.as_str()));
 		}
 	}
-	false
 }
 
 /// *Hacky* If the given type is from the std namespace, add the implicit `std.` to it.
@@ -5811,11 +7060,12 @@ pub fn import_udt_from_jsii(
 pub fn fully_qualify_std_type(type_: &str) -> String {
 	// Additionally, this doesn't handle for generics
 	let type_ = match type_ {
-		"str" => "String",
 		"duration" => "Duration",
 		"datetime" => "Datetime",
-		"bool" => "Boolean",
+		"regex" => "Regex",
+		"str" => "String",
 		"num" => "Number",
+		"bool" => "Boolean",
 		_ => {
 			// Check for generics or Json
 			let type_ = if let Some((prefix, _)) = type_.split_once(" ") {
@@ -5838,6 +7088,23 @@ pub fn fully_qualify_std_type(type_: &str) -> String {
 	format!("{WINGSDK_STD_MODULE}.{type_}")
 }
 
+/// If the string is known at compile time and should be assumed to exist,
+/// then this function will return the type reference. Otherwise, it will panic.
+fn lookup_known_type(name: &'static str, env: &SymbolEnv) -> TypeRef {
+	env
+		.lookup_nested_str(name, None)
+		.expect(&format!("Expected known type \"{}\" to be defined", name))
+		.0
+		.as_type()
+		.expect(&format!("Expected known type \"{}\" to be a type", name))
+}
+
+#[derive(Debug)]
+enum ResolveReferenceResult {
+	Variable(VariableInfo),
+	Location(TypeRef, TypeRef), // (container type, element type)
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -5870,6 +7137,7 @@ mod tests {
 			phase,
 			js_override: None,
 			docs: Docs::default(),
+			implicit_scope_param: false,
 		})
 	}
 
diff --git a/libs/wingc/src/type_check/class_fields_init.rs b/libs/wingc/src/type_check/class_fields_init.rs
index 3439974f82e..19a4297e28a 100644
--- a/libs/wingc/src/type_check/class_fields_init.rs
+++ b/libs/wingc/src/type_check/class_fields_init.rs
@@ -1,5 +1,5 @@
 use crate::{
-	ast::{AssignmentKind, Reference, Stmt, StmtKind, Symbol},
+	ast::{AssignmentKind, FunctionDefinition, Reference, Stmt, StmtKind, Symbol},
 	visit::{self, Visit},
 };
 
@@ -39,4 +39,9 @@ impl Visit<'_> for VisitClassInit {
 		}
 		visit::visit_stmt(self, node);
 	}
+
+	fn visit_function_definition(&mut self, _node: &FunctionDefinition) {
+		// Skip visiting inner functions since any assignments inside them are
+		// (probably) not executed in the constructor.
+	}
 }
diff --git a/libs/wingc/src/type_check/has_type_stmt.rs b/libs/wingc/src/type_check/has_type_stmt.rs
new file mode 100644
index 00000000000..8782e9f8492
--- /dev/null
+++ b/libs/wingc/src/type_check/has_type_stmt.rs
@@ -0,0 +1,35 @@
+use crate::{
+	ast::{FunctionDefinition, Stmt, StmtKind},
+	visit::{self, Visit},
+};
+
+// List in this file the fields that are initialized in a class constructor.
+#[derive(Default)]
+pub struct HasStatementVisitor {
+	pub seen_return: bool,
+	pub seen_throw: bool,
+}
+
+impl HasStatementVisitor {
+	pub fn visit(&mut self, statements: &[Stmt]) {
+		for stmt in statements {
+			self.visit_stmt(stmt);
+		}
+	}
+}
+
+impl Visit<'_> for HasStatementVisitor {
+	fn visit_stmt(&mut self, node: &Stmt) {
+		match &node.kind {
+			StmtKind::Throw(_) => self.seen_throw = true,
+			StmtKind::Return(_) => self.seen_return = true,
+			_ => (),
+		}
+		visit::visit_stmt(self, node);
+	}
+
+	fn visit_function_definition(&mut self, _: &'_ FunctionDefinition) {
+		// Don't recurse into functions. This way our search will ignore stmts in inner functions.
+		return;
+	}
+}
diff --git a/libs/wingc/src/type_check/inference_visitor.rs b/libs/wingc/src/type_check/inference_visitor.rs
index 39ed98ef7d1..683576a0236 100644
--- a/libs/wingc/src/type_check/inference_visitor.rs
+++ b/libs/wingc/src/type_check/inference_visitor.rs
@@ -107,6 +107,7 @@ impl<'a> crate::visit_types::VisitType<'_> for InferenceVisitor<'a> {
 				Type::Anything
 				| Type::Number
 				| Type::String
+				| Type::Stringable
 				| Type::Duration
 				| Type::Boolean
 				| Type::Void
@@ -165,7 +166,7 @@ impl<'a> crate::visit_types::VisitType<'_> for InferenceVisitor<'a> {
 
 	fn visit_function_signature(&mut self, node: &'_ FunctionSignature) {
 		let expected_function_sig = if let Some(ref expected) = self.expected_type {
-			expected.as_deep_function_sig()
+			expected.maybe_unwrap_option().as_deep_function_sig()
 		} else {
 			None
 		};
diff --git a/libs/wingc/src/type_check/jsii_importer.rs b/libs/wingc/src/type_check/jsii_importer.rs
index bfe740802bd..65c99014da2 100644
--- a/libs/wingc/src/type_check/jsii_importer.rs
+++ b/libs/wingc/src/type_check/jsii_importer.rs
@@ -3,7 +3,6 @@ use std::collections::BTreeMap;
 use crate::{
 	ast::{AccessModifier, Phase, Symbol},
 	debug,
-	diagnostic::{WingLocation, WingSpan},
 	docs::Docs,
 	type_check::{
 		self,
@@ -14,6 +13,7 @@ use crate::{
 	CONSTRUCT_BASE_CLASS, WINGSDK_ASSEMBLY_NAME, WINGSDK_DURATION, WINGSDK_JSON, WINGSDK_MUT_JSON, WINGSDK_RESOURCE,
 };
 use colored::Colorize;
+use indexmap::IndexMap;
 use wingii::{
 	fqn::FQN,
 	jsii::{self, CollectionKind, PrimitiveType, TypeReference},
@@ -62,11 +62,6 @@ pub struct JsiiImportSpec {
 	pub namespace_filter: Vec<String>,
 	/// The name to assign to the module in the Wing type system.
 	pub alias: Symbol,
-	/// The index of the import statement that triggered this import. This is required so we'll know
-	/// later on if types defined by this import come before or after other statements in the code.
-	/// If type definitions in wing are always location agnostic this doesn't really matter and we
-	/// might be able to remove this.
-	pub import_statement_idx: usize,
 }
 
 pub struct JsiiImporter<'a> {
@@ -138,84 +133,55 @@ impl<'a> JsiiImporter<'a> {
 			return t.as_type().expect(&format!("Expected {} to be a type", type_fqn));
 		}
 		// Define new type and return it
-		self.import_type(type_fqn);
-		self
-			.wing_types
-			.libraries
-			.lookup_nested_str(type_fqn.as_str(), None)
-			.expect(&format!("Expected {} to be defined", type_fqn))
-			.0
-			.as_type()
-			.unwrap()
+		if let Some(t) = self.import_type(type_fqn) {
+			t
+		} else {
+			panic!("Expected {type_fqn} to be defined")
+		}
 	}
 
-	pub fn import_type(&mut self, type_fqn: &FQN) -> bool {
-		let type_str = type_fqn.as_str();
-
+	pub fn import_type(&mut self, type_fqn: &FQN) -> Option<TypeRef> {
 		// check if type is already imported
-		if let LookupResult::Found(sym, ..) = self.wing_types.libraries.lookup_nested_str(type_str, None) {
+		if let LookupResult::Found(sym, ..) = self.wing_types.libraries.lookup_nested_str(type_fqn.raw, None) {
 			if let SymbolKind::Namespace(n) = sym {
 				// We are trying to import a namespace directly, so let's eagerly load all of its types
 				self.deep_import_submodule_to_env(Some(n.name.clone()));
+				None
+			} else {
+				sym.as_type()
 			}
-			return true;
-		}
-
-		// Check if this is a JSII interface and import it if it is
-		let jsii_interface = self.jsii_types.find_interface(type_fqn);
-		if let Some(jsii_interface) = jsii_interface {
-			self.import_interface(jsii_interface);
-			return true;
-		}
-
-		// Check if this is a JSII class and import it if it is
-		let jsii_class = self.jsii_types.find_class(type_fqn);
-		if let Some(jsii_class) = jsii_class {
-			self.import_class(jsii_class);
-			return true;
-		}
-
-		// Check if this is a JSII enum and import it if it is
-		let jsii_enum = self.jsii_types.find_enum(type_fqn);
-		if let Some(jsii_enum) = jsii_enum {
-			self.import_enum(jsii_enum);
-			return true;
+		} else if let Some(jsii_interface) = self.jsii_types.find_interface(type_fqn) {
+			Some(self.import_interface(jsii_interface))
+		} else if let Some(jsii_class) = self.jsii_types.find_class(type_fqn) {
+			Some(self.import_class(jsii_class))
+		} else if let Some(jsii_enum) = self.jsii_types.find_enum(type_fqn) {
+			Some(self.import_enum(jsii_enum))
+		} else {
+			None
 		}
-
-		false
 	}
 
 	pub fn setup_namespaces_for(&mut self, type_name: &FQN) {
 		// First, create a namespace in the Wing type system (if there isn't one already) corresponding to the JSII assembly
 		// the type belongs to.
 		debug!("Setting up namespaces for {}", type_name);
-		let assembly = type_name.assembly();
+		let assembly = Symbol::global(type_name.assembly());
 
-		if let Some(symb) = self.wing_types.libraries.lookup_mut(&assembly.into(), None) {
-			if let SymbolKind::Namespace(_) = symb {
-				// do nothing
-			} else {
-				// TODO: make this a proper error
-				panic!(
-					"Tried importing {} but {} already defined as a {}",
-					type_name, assembly, symb
-				)
-			}
-		} else {
+		// First, setup the assembly namespace
+		if self.wing_types.libraries.lookup(&assembly, None).is_none() {
 			let ns_env = self
 				.wing_types
 				.add_symbol_env(SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Preflight, 0));
 			let ns = self.wing_types.add_namespace(Namespace {
 				name: assembly.to_string(),
 				envs: vec![ns_env],
-				loaded: false,
-				module_path: ResolveSource::ExternalModule(assembly.to_string()),
+				module_path: ResolveSource::ExternalModule(assembly.name.clone()),
 			});
 			self
 				.wing_types
 				.libraries
 				.define(
-					&Symbol::global(assembly),
+					&assembly,
 					SymbolKind::Namespace(ns),
 					AccessModifier::Public,
 					StatementIdx::Top,
@@ -224,9 +190,10 @@ impl<'a> JsiiImporter<'a> {
 		};
 
 		// Next, ensure there is a namespace for each of the namespaces in the type name
-		for (ns_idx, namespace_name) in type_name.namespaces().enumerate() {
-			let mut lookup_vec = vec![assembly];
-			lookup_vec.extend(type_name.namespaces().take(ns_idx));
+		for (ns_idx, namespace_name) in type_name.namespaces().iter().enumerate() {
+			let ns_sym = Symbol::global(*namespace_name);
+			let mut lookup_vec = vec![assembly.name.as_str()];
+			lookup_vec.extend(type_name.namespaces()[..ns_idx].iter());
 			let lookup_str = lookup_vec.join(".");
 
 			let mut parent_ns = self
@@ -238,27 +205,12 @@ impl<'a> JsiiImporter<'a> {
 				.as_namespace_ref()
 				.unwrap();
 
-			if let Some(symb) = parent_ns
-				.envs
-				.get_mut(0)
-				.unwrap()
-				.lookup_mut(&namespace_name.into(), None)
-			{
-				if let SymbolKind::Namespace(_) = symb {
-					// do nothing
-				} else {
-					// TODO: make this a proper error
-					panic!(
-						"Tried importing {} but {} already defined as a {}",
-						type_name, namespace_name, symb
-					)
-				}
-			} else {
+			if parent_ns.envs.get_mut(0).unwrap().lookup_mut(&ns_sym, None).is_none() {
 				let ns_env = self
 					.wing_types
 					.add_symbol_env(SymbolEnv::new(None, SymbolEnvKind::Scope, Phase::Preflight, 0));
 				// Special case for the SDK, we are able to alias the namespace
-				let module_path = if assembly == WINGSDK_ASSEMBLY_NAME {
+				let module_path = if assembly.name == WINGSDK_ASSEMBLY_NAME {
 					format!("{}/{}", lookup_vec.join("/"), namespace_name)
 				} else {
 					lookup_vec.join("/")
@@ -267,7 +219,6 @@ impl<'a> JsiiImporter<'a> {
 				let ns = self.wing_types.add_namespace(Namespace {
 					name: namespace_name.to_string(),
 					envs: vec![ns_env],
-					loaded: false,
 					module_path: ResolveSource::ExternalModule(module_path),
 				});
 				parent_ns
@@ -275,7 +226,7 @@ impl<'a> JsiiImporter<'a> {
 					.get_mut(0)
 					.unwrap()
 					.define(
-						&Symbol::global(namespace_name),
+						&ns_sym,
 						SymbolKind::Namespace(ns),
 						AccessModifier::Public,
 						StatementIdx::Top,
@@ -285,22 +236,87 @@ impl<'a> JsiiImporter<'a> {
 		}
 	}
 
-	pub fn import_enum(&mut self, jsii_enum: &jsii::EnumType) {
+	pub fn import_enum(&mut self, jsii_enum: &jsii::EnumType) -> TypeRef {
 		let enum_name = &jsii_enum.name;
 		let enum_fqn = FQN::from(jsii_enum.fqn.as_str());
 		let enum_symbol = Self::jsii_name_to_symbol(enum_name, &jsii_enum.location_in_module);
 
+		let values = jsii_enum
+			.members
+			.iter()
+			.map(|m| {
+				(
+					Self::jsii_name_to_symbol(&m.name, &jsii_enum.location_in_module),
+					m.docs.as_ref().and_then(|d| d.summary.clone()),
+				)
+			})
+			.collect::<IndexMap<_, _>>();
+
 		let enum_type_ref = self.wing_types.add_type(Type::Enum(Enum {
 			name: enum_symbol.clone(),
 			docs: Docs::from(&jsii_enum.docs),
-			values: jsii_enum
-				.members
-				.iter()
-				.map(|m| Self::jsii_name_to_symbol(&m.name, &jsii_enum.location_in_module))
-				.collect(),
+			values,
+		}));
+
+		self.register_jsii_type(&enum_fqn, &enum_symbol, enum_type_ref)
+	}
+
+	/// Import a JSII interface as a function instead.
+	/// These interfaces must have the @callable annotation and only one method defined, which will be the function signature.
+	fn import_closure(&mut self, jsii_interface: &wingii::jsii::InterfaceType) -> TypeRef {
+		let jsii_interface_fqn = FQN::from(jsii_interface.fqn.as_str());
+		debug!("Importing closure {}", jsii_interface_fqn.as_str().green());
+
+		let type_name = jsii_interface_fqn.type_name();
+
+		// TODO These should technically be "phase independent" by default, but wing currently doesn't have a way to create
+		// a phase independent function, so it's more useful to pick one for now.
+		let phase = Phase::Preflight;
+
+		let new_type_symbol = Self::jsii_name_to_symbol(&type_name, &jsii_interface.location_in_module);
+
+		let first_method = if let Some(methods) = &jsii_interface.methods {
+			if methods.len() != 1 {
+				panic!("Expected exactly one method defined in {jsii_interface_fqn} annotated with @callable")
+			} else {
+				methods.first().unwrap()
+			}
+		} else {
+			panic!("Expected at least one method in {jsii_interface_fqn} annotated with @callable")
+		};
+
+		let return_type = if let Some(jsii_return_type) = &first_method.returns {
+			self.optional_type_to_wing_type(&jsii_return_type)
+		} else {
+			self.wing_types.void()
+		};
+		let parameters: Vec<FunctionParameter> = first_method
+			.parameters
+			.as_ref()
+			.map(|params| {
+				params
+					.iter()
+					.map(|param| FunctionParameter {
+						name: param.name.clone(),
+						typeref: self.parameter_to_wing_type(&param),
+						docs: Docs::from(&param.docs),
+						variadic: param.variadic.unwrap_or(false),
+					})
+					.collect()
+			})
+			.unwrap_or_default();
+
+		let wing_type = self.wing_types.add_type(Type::Function(FunctionSignature {
+			docs: Docs::from(&jsii_interface.docs),
+			this_type: None,
+			parameters,
+			return_type,
+			phase,
+			js_override: extract_docstring_tag(&first_method.docs, "macro").map(|s| s.to_string()),
+			implicit_scope_param: false,
 		}));
 
-		self.register_jsii_type(&enum_fqn, &enum_symbol, enum_type_ref);
+		self.register_jsii_type(&jsii_interface_fqn, &new_type_symbol, wing_type)
 	}
 
 	/// Import a JSII interface into the Wing type system.
@@ -311,7 +327,12 @@ impl<'a> JsiiImporter<'a> {
 	/// Structs can be distinguished non-structs with the "datatype: true" property in `jsii::InterfaceType`.
 	///
 	/// See https://aws.github.io/jsii/specification/2-type-system/#interfaces-structs
-	fn import_interface(&mut self, jsii_interface: &wingii::jsii::InterfaceType) {
+	fn import_interface(&mut self, jsii_interface: &wingii::jsii::InterfaceType) -> TypeRef {
+		// check if this interface has a `@callable` tag
+		if extract_docstring_tag(&jsii_interface.docs, "callable").is_some() {
+			return self.import_closure(jsii_interface);
+		}
+
 		let jsii_interface_fqn = FQN::from(jsii_interface.fqn.as_str());
 		debug!("Importing interface {}", jsii_interface_fqn.as_str().green());
 
@@ -330,13 +351,18 @@ impl<'a> JsiiImporter<'a> {
 		let phase = if is_struct {
 			Phase::Independent
 		} else {
-			Phase::Preflight
+			if extract_docstring_tag(&jsii_interface.docs, "inflight") == Some("true") {
+				Phase::Inflight
+			} else {
+				Phase::Preflight
+			}
 		};
 
 		let new_type_symbol = Self::jsii_name_to_symbol(&type_name, &jsii_interface.location_in_module);
 		let mut wing_type = match is_struct {
 			true => self.wing_types.add_type(Type::Struct(Struct {
 				name: new_type_symbol.clone(),
+				fqn: Some(jsii_interface_fqn.to_string()),
 				// Will be replaced below
 				extends: vec![],
 				docs: Docs::from(&jsii_interface.docs),
@@ -345,21 +371,18 @@ impl<'a> JsiiImporter<'a> {
 					None,
 					SymbolEnvKind::Type(self.wing_types.void()),
 					Phase::Independent, // structs are phase-independent
-					self.jsii_spec.import_statement_idx,
+					0,
 				),
 			})),
 			false => self.wing_types.add_type(Type::Interface(Interface {
 				name: new_type_symbol.clone(),
+				fqn: Some(jsii_interface_fqn.to_string()),
 				// Will be replaced below
 				extends: vec![],
 				docs: Docs::from(&jsii_interface.docs),
 				// Will be replaced below
-				env: SymbolEnv::new(
-					None,
-					SymbolEnvKind::Type(self.wing_types.void()),
-					phase,
-					self.jsii_spec.import_statement_idx,
-				),
+				env: SymbolEnv::new(None, SymbolEnvKind::Type(self.wing_types.void()), phase, 0),
+				phase,
 			})),
 		};
 
@@ -376,12 +399,8 @@ impl<'a> JsiiImporter<'a> {
 			}
 		};
 
-		let mut iface_env = SymbolEnv::new(
-			None,
-			SymbolEnvKind::Type(wing_type),
-			phase,
-			self.jsii_spec.import_statement_idx,
-		);
+		let mut iface_env = SymbolEnv::new(None, SymbolEnvKind::Type(wing_type), phase, 0);
+		iface_env.type_parameters = self.type_param_from_docs(&jsii_interface_fqn, &jsii_interface.docs);
 
 		self.add_members_to_class_env(
 			jsii_interface,
@@ -419,35 +438,7 @@ impl<'a> JsiiImporter<'a> {
 			));
 
 			// Look for a client interface for this resource
-			let inflight_tag: Option<&str> = extract_docstring_tag(&jsii_interface.docs, "inflight");
-
-			let client_interface = inflight_tag
-				.map(|fqn| {
-					// Some fully qualified package names include "@" characters,
-					// so they have to be escaped in the original docstring.
-					if fqn.starts_with("`") && fqn.ends_with("`") {
-						&fqn[1..fqn.len() - 1]
-					} else {
-						fqn
-					}
-				})
-				.and_then(|fqn| self.jsii_types.find_interface(&FQN::from(fqn)));
-
-			if let Some(client_interface) = client_interface {
-				// Add client interface's methods to the class environment
-				self.add_members_to_class_env(
-					client_interface,
-					Phase::Inflight,
-					Phase::Inflight,
-					&mut iface_env,
-					wing_type,
-				);
-			} else {
-				debug!(
-					"Interface {} does not seem to have an inflight client",
-					type_name.green()
-				);
-			}
+			self.add_inflight_client(&mut wing_type, &mut iface_env, &jsii_interface.docs);
 		}
 
 		// Replace the dummy struct environment with the real one after adding all properties
@@ -455,6 +446,53 @@ impl<'a> JsiiImporter<'a> {
 			Type::Struct(Struct { ref mut env, .. }) | Type::Interface(Interface { ref mut env, .. }) => *env = iface_env,
 			_ => panic!("Expected {} to be an interface or struct", type_name),
 		};
+		wing_type
+	}
+
+	fn add_inflight_client(
+		&mut self,
+		wing_type: &mut TypeRef,
+		original_env: &mut SymbolEnv,
+		docs: &Option<wingii::jsii::Docs>,
+	) {
+		// Look for a client interface for this resource
+		let inflight_tag: Option<&str> = extract_docstring_tag(docs, "inflight");
+
+		if inflight_tag == Some("true") {
+			debug!("{wing_type} does not seem to have an inflight client");
+			return;
+		}
+
+		let client_interface = inflight_tag.map(|fqn| {
+			// Some fully qualified package names include "@" characters,
+			// so they have to be escaped in the original docstring.
+			FQN::from(if fqn.starts_with("`") && fqn.ends_with("`") {
+				&fqn[1..fqn.len() - 1]
+			} else {
+				fqn
+			})
+		});
+
+		if let Some(client_interface) = client_interface {
+			let client_interface = self.lookup_or_create_type(&client_interface);
+
+			// Manually add the client interface's methods to the class environment (because this type does not *actually* implement it)
+			for client_interface_data in client_interface.as_env().unwrap().iter(true) {
+				if let SymbolKind::Variable(vvv) = client_interface_data.1 {
+					let _ = original_env.define(
+						&Symbol {
+							name: client_interface_data.0.clone(),
+							span: client_interface_data.2.span.clone(),
+						},
+						SymbolKind::Variable(vvv.clone()),
+						AccessModifier::Public,
+						StatementIdx::Top,
+					);
+				}
+			}
+		} else {
+			debug!("{wing_type} does not seem to have an inflight client");
+		}
 	}
 
 	fn add_members_to_class_env<T: JsiiInterface>(
@@ -511,11 +549,8 @@ impl<'a> JsiiImporter<'a> {
 					parameters: fn_params,
 					return_type,
 					phase: member_phase,
-					js_override: m
-						.docs
-						.as_ref()
-						.and_then(|d| d.custom.as_ref().map(|c| c.get("macro").map(|j| j.clone())))
-						.flatten(),
+					js_override: extract_docstring_tag(&m.docs, "macro").map(|s| s.to_string()),
+					implicit_scope_param: false,
 				}));
 				let sym = Self::jsii_name_to_symbol(&m.name, &m.location_in_module);
 				let access_modifier = if matches!(m.protected, Some(true)) {
@@ -548,9 +583,6 @@ impl<'a> JsiiImporter<'a> {
 		if let Some(properties) = jsii_interface.properties() {
 			for p in properties {
 				debug!("Found property {} with type {:?}", p.name.green(), p.type_);
-				if member_phase == Phase::Inflight {
-					todo!("No support for inflight properties yet");
-				}
 				let base_wing_type = self.type_ref_to_wing_type(&p.type_);
 				let is_optional = if let Some(true) = p.optional { true } else { false };
 				let is_static = if let Some(true) = p.static_ { true } else { false };
@@ -591,29 +623,34 @@ impl<'a> JsiiImporter<'a> {
 		}
 	}
 
-	fn jsii_name_to_symbol(name: &str, jsii_source_location: &Option<jsii::SourceLocation>) -> Symbol {
-		let span = if let Some(jsii_source_location) = jsii_source_location {
-			WingSpan {
-				start: WingLocation {
-					line: (jsii_source_location.line - 1.0) as u32,
-					col: 0,
-				},
-				end: WingLocation {
-					line: (jsii_source_location.line - 1.0) as u32,
-					col: 0,
-				},
-				file_id: jsii_source_location.filename.clone(),
-			}
-		} else {
-			Default::default()
-		};
+	fn jsii_name_to_symbol(name: &str, _jsii_source_location: &Option<jsii::SourceLocation>) -> Symbol {
+		// JSII source location is not used right now since it doesn't necessarily map to a file on the user's disk
+		// (the JSII library might include .js files but not the original .ts files)
+		// if this information is useful, we could consider changing `Span` or `Symbol` to
+		// model whether or not the span represents a file on disk that we can read.
 		Symbol {
 			name: name.to_string(),
-			span,
+			span: Default::default(),
 		}
 	}
 
-	fn import_class(&mut self, jsii_class: &'a wingii::jsii::ClassType) {
+	fn type_param_from_docs(&mut self, fqn: &FQN, docs: &Option<jsii::Docs>) -> Option<Vec<TypeRef>> {
+		docs.as_ref().and_then(|d| {
+			d.custom.as_ref().and_then(|c| {
+				c.get("typeparam").map(|type_param_name| {
+					let args = type_param_name.split(",").map(|s| s.trim()).collect::<Vec<&str>>();
+					args
+						.iter()
+						.map(|a| {
+							self.lookup_or_create_type(&FQN::from(format!("{}.{}", fqn.as_str_without_type_name(), a).as_str()))
+						})
+						.collect::<Vec<_>>()
+				})
+			})
+		})
+	}
+
+	fn import_class(&mut self, jsii_class: &'a wingii::jsii::ClassType) -> TypeRef {
 		let mut class_phase = if is_construct_base(&jsii_class.fqn) {
 			Phase::Preflight
 		} else {
@@ -685,24 +722,6 @@ impl<'a> JsiiImporter<'a> {
 		// Create the new resource/class type and add it to the current environment.
 		// When adding the class methods below we'll be able to reference this type.
 		debug!("Adding type {} to namespace", type_name.green());
-		let type_params = jsii_class.docs.as_ref().and_then(|docs| {
-			// `@typeparam` allows us to add type args to JSII types
-			// `@typeparam <types>` - where <types> is a comma separated list of type parameters, referencing a class in the same namespace
-			// e.g. `@typeparam T1, T2` - T1 and T2 are type parameters of the class and will be replaced with the actual types when the class is used
-			docs.custom.as_ref().and_then(|c| {
-				c.get("typeparam").map(|type_param_name| {
-					let args = type_param_name.split(",").map(|s| s.trim()).collect::<Vec<&str>>();
-					args
-						.iter()
-						.map(|a| {
-							self.lookup_or_create_type(&FQN::from(
-								format!("{}.{}", jsii_class_fqn.as_str_without_type_name(), a).as_str(),
-							))
-						})
-						.collect::<Vec<_>>()
-				})
-			})
-		});
 
 		let class_spec = Class {
 			name: new_type_symbol.clone(),
@@ -712,7 +731,6 @@ impl<'a> JsiiImporter<'a> {
 			// Will be replaced below
 			implements: vec![],
 			is_abstract: jsii_class.abstract_.unwrap_or(false),
-			type_parameters: type_params,
 			phase: class_phase,
 			docs: Docs::from(&jsii_class.docs),
 			std_construct_args: false, // Temporary value, will be updated once we parse the initializer args
@@ -735,8 +753,9 @@ impl<'a> JsiiImporter<'a> {
 
 		// Create class's actual environment before we add properties and methods to it
 		let mut class_env = SymbolEnv::new(base_class_env, SymbolEnvKind::Type(new_type), class_phase, 0);
+		class_env.type_parameters = self.type_param_from_docs(&jsii_class_fqn, &jsii_class.docs);
 
-		// Add constructor to the class environment
+		// Add the class's constructor to the class environment, if the class has one which is public
 		let jsii_initializer = jsii_class.initializer.as_ref();
 		if let Some(initializer) = jsii_initializer {
 			let mut fn_params = vec![];
@@ -786,6 +805,7 @@ impl<'a> JsiiImporter<'a> {
 				phase: member_phase,
 				js_override: None,
 				docs: Docs::from(&initializer.docs),
+				implicit_scope_param: false,
 			}));
 			let sym = Self::jsii_name_to_symbol(CLASS_INIT_NAME, &initializer.location_in_module);
 			let access_modifier = if matches!(initializer.protected, Some(true)) {
@@ -815,33 +835,9 @@ impl<'a> JsiiImporter<'a> {
 		self.add_members_to_class_env(jsii_class, class_phase, member_phase, &mut class_env, new_type);
 		if class_phase == Phase::Preflight {
 			// Look for a client interface for this resource
-			let inflight_tag: Option<&str> = extract_docstring_tag(&jsii_class.docs, "inflight");
-
-			let client_interface = inflight_tag
-				.map(|fqn| {
-					// Some fully qualified package names include "@" characters,
-					// so they have to be escaped in the original docstring.
-					if fqn.starts_with("`") && fqn.ends_with("`") {
-						&fqn[1..fqn.len() - 1]
-					} else {
-						fqn
-					}
-				})
-				.and_then(|fqn| self.jsii_types.find_interface(&FQN::from(fqn)));
-
-			if let Some(client_interface) = client_interface {
-				// Add client interface's methods to the class environment
-				self.add_members_to_class_env(
-					client_interface,
-					Phase::Inflight,
-					Phase::Inflight,
-					&mut class_env,
-					new_type,
-				);
-			} else {
-				debug!("Resource {} does not seem to have a client", type_name.green());
-			}
+			self.add_inflight_client(&mut new_type, &mut class_env, &jsii_class.docs);
 		}
+
 		// Replace the dummy class environment with the real one before type checking the methods
 		match *new_type {
 			Type::Class(ref mut class) => {
@@ -849,6 +845,7 @@ impl<'a> JsiiImporter<'a> {
 			}
 			_ => panic!("Expected {} to be a class or resource ", type_name),
 		};
+		new_type
 	}
 
 	fn optional_type_to_wing_type(&mut self, jsii_optional_type: &jsii::OptionalValue) -> TypeRef {
@@ -864,10 +861,8 @@ impl<'a> JsiiImporter<'a> {
 	fn parameter_to_wing_type(&mut self, parameter: &jsii::Parameter) -> TypeRef {
 		let mut param_type = self.type_ref_to_wing_type(&parameter.type_);
 
-		// TODO variadic parameter support https://github.com/winglang/wing/issues/397
 		if parameter.variadic.unwrap_or(false) {
 			param_type = self.wing_types.add_type(Type::Array(param_type));
-			param_type = self.wing_types.add_type(Type::Optional(param_type));
 		}
 
 		if parameter.optional.unwrap_or(false) {
@@ -879,12 +874,7 @@ impl<'a> JsiiImporter<'a> {
 
 	/// Imports all types within a given submodule
 	pub fn deep_import_submodule_to_env(&mut self, submodule: Option<String>) {
-		let match_namespace = |jsii_type: &jsii::Type| match jsii_type {
-			jsii::Type::ClassType(c) => c.namespace == submodule,
-			jsii::Type::EnumType(e) => e.namespace == submodule,
-			jsii::Type::InterfaceType(i) => i.namespace == submodule,
-		};
-
+		let prefix = submodule.map(|s| format!("{}.{s}", self.jsii_spec.assembly_name));
 		for entry in self
 			.jsii_types
 			.find_assembly(&self.jsii_spec.assembly_name)
@@ -893,52 +883,43 @@ impl<'a> JsiiImporter<'a> {
 			.as_ref()
 			.unwrap()
 			.iter()
-			.skip_while(|e| !match_namespace(e.1))
+			.map(|(k, v)| (FQN::from(k.as_str()), v))
+			.skip_while(|e| !e.0.has_prefix(&prefix))
 		{
-			if match_namespace(entry.1) {
-				self.import_type(&FQN::from(entry.0.as_str()));
+			if entry.0.has_prefix(&prefix) {
+				self.import_type(&entry.0);
 			} else {
 				// the types should be well ordered, so we can break early
 				break;
 			}
 		}
-
-		// Mark the namespace as loaded after recursively importing all types to its environment
-		let mut submodule_fqn = self.jsii_spec.assembly_name.clone();
-		if let Some(submodule) = submodule {
-			submodule_fqn.push_str(&format!(".{}", submodule));
-		}
-		self.mark_namespace_as_loaded(&submodule_fqn);
-	}
-
-	fn mark_namespace_as_loaded(&mut self, module_name: &str) {
-		let n = self
-			.wing_types
-			.libraries
-			.lookup_nested_str_mut(&module_name, None)
-			.ok()
-			.expect(&format!("Namespace {} to be in libraries", module_name))
-			.0
-			.as_namespace_mut()
-			.expect(&format!("{} to be a namespace", module_name));
-
-		n.loaded = true;
 	}
 
 	/// Import all top-level types that are not in a submodule
 	pub fn import_root_types(&mut self) {
 		let assembly = self.jsii_types.find_assembly(&self.jsii_spec.assembly_name).unwrap();
+		let mut last_inner_namespace: Option<FQN> = None;
 		for entry in assembly.types.as_ref().unwrap().iter() {
-			if match entry.1 {
-				jsii::Type::ClassType(c) => c.namespace.is_none(),
-				jsii::Type::EnumType(e) => e.namespace.is_none(),
-				jsii::Type::InterfaceType(i) => i.namespace.is_none(),
-			} {
-				self.import_type(&FQN::from(entry.0.as_str()));
-			} else {
+			let ns = match entry.1 {
+				jsii::Type::ClassType(c) => &c.namespace,
+				jsii::Type::EnumType(e) => &e.namespace,
+				jsii::Type::InterfaceType(i) => &i.namespace,
+			};
+			let fqn = FQN::from(entry.0.as_str());
+
+			if let Some(ns) = ns {
+				if let Some(ref last_inner_namespace) = last_inner_namespace {
+					// If the namespace is within the last imported type (not namespace), we should consider it a top-level type
+					if ns == last_inner_namespace.type_name() {
+						self.import_type(&fqn);
+						continue;
+					}
+				}
 				// the types should be well ordered, so we can break early
 				break;
 			}
+			self.import_type(&fqn);
+			last_inner_namespace = Some(fqn)
 		}
 	}
 
@@ -982,7 +963,6 @@ impl<'a> JsiiImporter<'a> {
 				let ns = self.wing_types.add_namespace(Namespace {
 					name: assembly.name.clone(),
 					envs: vec![ns_env],
-					loaded: false,
 					module_path: ResolveSource::ExternalModule(assembly.name.clone()),
 				});
 				self
@@ -998,10 +978,6 @@ impl<'a> JsiiImporter<'a> {
 			}
 		}
 
-		// Mark the namespace as loaded. Note that its inner submodules might not be marked as
-		// loaded yet. But if they'll be accessed then they'll be marked as well.
-		self.mark_namespace_as_loaded(&assembly.name);
-
 		// Create a symbol in the environment for the imported module
 		// For example, `bring cloud` will create a symbol named `cloud` in the environment
 		// that points to the `@winglang/sdk.cloud` NamespaceRef
@@ -1025,41 +1001,61 @@ impl<'a> JsiiImporter<'a> {
 				&self.jsii_spec.alias,
 				SymbolKind::Namespace(ns),
 				AccessModifier::Private,
-				StatementIdx::Index(self.jsii_spec.import_statement_idx),
+				StatementIdx::Top,
 			)
 			.unwrap();
 	}
 
-	fn register_jsii_type(&mut self, fqn: &FQN, symbol: &Symbol, type_ref: TypeRef) {
+	fn register_jsii_type(&mut self, fqn: &FQN, symbol: &Symbol, type_ref: TypeRef) -> TypeRef {
 		// make this function idempotent
 		if matches!(
 			self.wing_types.libraries.lookup_nested_str(fqn.as_str(), None),
 			LookupResult::Found(..)
 		) {
-			return;
+			return type_ref;
 		}
 
-		// make sure we have a namespace for this type
-		self.setup_namespaces_for(&fqn);
+		let parent_fqn = fqn.as_str_without_type_name();
 
-		let mut ns = self
+		// make sure we have the namespaces loaded
+		if !matches!(
+			self.wing_types.libraries.lookup_nested_str(parent_fqn, None),
+			LookupResult::Found(..)
+		) {
+			if fqn.namespaces().len() == 0 {
+				self.setup_namespaces_for(&fqn)
+			} else {
+				// load as type first in case it's a class instead of namespace
+				self.import_type(&FQN::from(parent_fqn));
+				self.setup_namespaces_for(&fqn)
+			}
+		}
+
+		let tt = self
 			.wing_types
 			.libraries
-			.lookup_nested_str_mut(fqn.as_str_without_type_name(), None)
-			.unwrap()
-			.0
-			.as_namespace_ref()
-			.unwrap();
-		ns.envs
-			.get_mut(0)
+			.lookup_nested_str_mut(parent_fqn, None)
 			.unwrap()
-			.define(
-				&symbol,
-				SymbolKind::Type(type_ref),
-				AccessModifier::Public,
-				StatementIdx::Top,
-			)
-			.expect(&format!("Invalid JSII library: failed to define type {}", fqn));
+			.0;
+		if let Some(mut ns) = tt.as_namespace_ref() {
+			ns.envs
+				.get_mut(0)
+				.unwrap()
+				.define(
+					&symbol,
+					SymbolKind::Type(type_ref),
+					AccessModifier::Public,
+					StatementIdx::Top,
+				)
+				.expect(&format!("Invalid JSII library: failed to define type {}", fqn));
+		} else if let Some(t) = tt.as_type() {
+			if t.as_env().is_none() {
+				panic!("Invalid JSII library: '{}' Is not a valid class", fqn);
+			}
+		} else {
+			panic!("Invalid JSII library: '{}' Is not a valid class or namespace", fqn);
+		}
+		type_ref
 	}
 }
 
diff --git a/libs/wingc/src/type_check/lifts.rs b/libs/wingc/src/type_check/lifts.rs
index fbb2dc311fe..8606c5e2bdc 100644
--- a/libs/wingc/src/type_check/lifts.rs
+++ b/libs/wingc/src/type_check/lifts.rs
@@ -1,4 +1,6 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap};
+use std::collections::{BTreeMap, HashMap};
+
+use indexmap::IndexSet;
 
 use crate::ast::{Symbol, UserDefinedType};
 
@@ -30,7 +32,7 @@ pub enum Liftable {
 #[derive(Debug)]
 pub struct LiftQualification {
 	/// The operations that qualify the lift (the property names)
-	pub ops: BTreeSet<String>,
+	pub ops: IndexSet<String>,
 }
 
 /// A record that describes a lift from a class.
@@ -57,27 +59,26 @@ impl Lifts {
 	}
 
 	/// Adds a lift for an expression.
-	pub fn lift(&mut self, method: Option<Symbol>, property: Option<Symbol>, code: &str, is_field: bool) {
-		let method = method.map(|m| m.name).unwrap_or(Default::default());
-
-		self.add_lift(method, code, property.as_ref().map(|s| s.name.clone()));
+	pub fn lift(&mut self, method: Symbol, qualification: Option<String>, code: &str) {
+		self.add_lift(method.to_string(), code, qualification.clone());
 
-		// add a lift to the inflight initializer or capture it if its not a field
-		if is_field {
+		// Add a lift to the inflight initializer to signify this class requires access to that preflight object.
+		// "this" is a special case since it's already in scope and doesn't need to be lifted.
+		if code != "this" {
 			self.add_lift(CLASS_INFLIGHT_INIT_NAME.to_string(), code, None);
 		}
 	}
 
-	fn add_lift(&mut self, method: String, code: &str, property: Option<String>) {
+	fn add_lift(&mut self, method: String, code: &str, qualification: Option<String>) {
 		let lift = self
 			.lifts_qualifications
 			.entry(method)
 			.or_default()
 			.entry(code.to_string())
-			.or_insert(LiftQualification { ops: BTreeSet::new() });
+			.or_insert(LiftQualification { ops: IndexSet::new() });
 
-		if let Some(op) = &property {
-			lift.ops.insert(op.clone());
+		if let Some(op) = qualification {
+			lift.ops.insert(op);
 		}
 	}
 
@@ -124,17 +125,12 @@ impl Lifts {
 	}
 
 	/// List of all lifted fields in the class. (map from lift token to preflight code)
-	pub fn lifted_fields(&self) -> BTreeMap<String, String> {
-		let mut result: BTreeMap<String, String> = BTreeMap::new();
-
+	pub fn lifted_fields(&self) -> impl Iterator<Item = (String, String)> + '_ {
 		self
 			.captures
 			.iter()
 			.filter(|(_, lift)| lift.is_field)
-			.for_each(|(token, lift)| {
-				result.insert(token.clone(), lift.code.clone());
-			});
-		result
+			.map(|(t, c)| (t.clone(), c.code.clone()))
 	}
 }
 
diff --git a/libs/wingc/src/type_check/symbol_env.rs b/libs/wingc/src/type_check/symbol_env.rs
index 44246538d56..c5a77b20473 100644
--- a/libs/wingc/src/type_check/symbol_env.rs
+++ b/libs/wingc/src/type_check/symbol_env.rs
@@ -31,9 +31,11 @@ pub struct SymbolEnv {
 	pub kind: SymbolEnvKind,
 
 	pub phase: Phase,
+	pub type_parameters: Option<Vec<TypeRef>>,
 	statement_idx: usize,
 }
 
+#[derive(Debug)]
 pub struct SymbolEnvEntry {
 	pub statement_idx: StatementIdx,
 	pub span: WingSpan,
@@ -113,7 +115,8 @@ pub enum LookupResult<'a> {
 	/// A matching symbol was found but it's not public
 	NotPublic(reference([a], [SymbolKind]), SymbolLookupInfo),
 	/// The symbol was not found in the environment, contains the name of the symbol or part of it that was not found
-	NotFound(Symbol),
+	/// If the lookup environment was a type environment (SymbolEnvKind::Type) such as a class, the type is also included
+	NotFound(Symbol, Option<TypeRef>),
 	/// A symbol with a matching name was found in multiple environments.
 	MultipleFound,
 	/// The symbol exists in the environment but it's not defined yet (based on the statement
@@ -133,7 +136,7 @@ impl<'a> LookupResult<'a> {
 		match self {
 			LookupResult::Found(kind, info) => (kind, info),
 			LookupResult::NotPublic(x, _) => panic!("LookupResult::unwrap({x}) called on LookupResult::NotPublic"),
-			LookupResult::NotFound(x) => panic!("LookupResult::unwrap({x}) called on LookupResult::NotFound"),
+			LookupResult::NotFound(x, ..) => panic!("LookupResult::unwrap({x}) called on LookupResult::NotFound"),
 			LookupResult::MultipleFound => panic!("LookupResult::unwrap() called on LookupResult::MultipleFound"),
 			LookupResult::DefinedLater(_) => panic!("LookupResult::unwrap() called on LookupResult::DefinedLater"),
 			LookupResult::ExpectedNamespace(symbol) => panic!(
@@ -183,12 +186,26 @@ pub struct SymbolLookupInfo {
 
 impl SymbolEnv {
 	pub fn new(parent: Option<SymbolEnvRef>, kind: SymbolEnvKind, phase: Phase, statement_idx: usize) -> Self {
-		// Some sanity checks
-		// If parent is a type-environent this must be one too
-		assert!(
-			parent.is_none()
-				|| matches!(parent, Some(parent) if matches!(parent.kind, SymbolEnvKind::Type(_)) == matches!(kind, SymbolEnvKind::Type(_)))
-		);
+		assert_is_type_env(parent, &kind);
+
+		Self {
+			symbol_map: BTreeMap::new(),
+			parent,
+			kind,
+			phase,
+			statement_idx,
+			type_parameters: None,
+		}
+	}
+
+	pub fn new_with_type_params(
+		parent: Option<SymbolEnvRef>,
+		kind: SymbolEnvKind,
+		phase: Phase,
+		statement_idx: usize,
+		type_params: Vec<UnsafeRef<Type>>,
+	) -> Self {
+		assert_is_type_env(parent, &kind);
 
 		Self {
 			symbol_map: BTreeMap::new(),
@@ -196,6 +213,7 @@ impl SymbolEnv {
 			kind,
 			phase,
 			statement_idx,
+			type_parameters: Some(type_params),
 		}
 	}
 
@@ -249,6 +267,7 @@ impl SymbolEnv {
 					message: "previous definition".to_string(),
 					span: self.symbol_map[&symbol.name].span.clone(),
 				}],
+				hints: vec![],
 			});
 		}
 
@@ -320,13 +339,26 @@ impl SymbolEnv {
 			);
 		}
 
+		// Get the type of this env (if it's a type env) to include in the result
+		let env_type = if let SymbolEnvKind::Type(t) = self.kind {
+			Some(t)
+		} else {
+			None
+		};
+
 		// we couldn't find the symbol in the current environment, let's look up in the parent
 		// environment.
 		if let Some(ref_annotation([parent_env])) = self.parent {
-			return parent_env.lookup_ext(symbol, not_after_stmt_idx.map(|_| self.statement_idx));
+			let res = parent_env.lookup_ext(symbol, not_after_stmt_idx.map(|_| self.statement_idx));
+			// The `NotFound` result needs to include the type of the original (non-parent) environment (if applicable)
+			let res = match res {
+				LookupResult::NotFound(s, ..) => LookupResult::NotFound(s, env_type),
+				_ => res,
+			};
+			return res;
 		}
 
-		LookupResult::NotFound(symbol.clone())
+		LookupResult::NotFound(symbol.clone(), env_type)
 	}
 
 	#[allow(clippy::needless_arbitrary_self_type)]
@@ -368,7 +400,7 @@ impl SymbolEnv {
 
 			// Look up the result in each env. If there are multiple results, throw a special error
 			// otherwise proceed normally
-			let mut lookup_result = LookupResult::NotFound((*next_symb).clone());
+			let mut lookup_result = LookupResult::NotFound((*next_symb).clone(), None);
 			for env in ns.envs.vec_iter() {
 				// invariant: lookup_result is never "ExpectedNamespace" or "MultipleFound"
 
@@ -400,7 +432,7 @@ impl SymbolEnv {
 				if (matches!(partial_result, LookupResult::Found(_, _))
 					|| matches!(partial_result, LookupResult::DefinedLater(_)))
 					&& (matches!(lookup_result, LookupResult::NotPublic(_, _))
-						|| matches!(lookup_result, LookupResult::NotFound(_)))
+						|| matches!(lookup_result, LookupResult::NotFound(..)))
 				{
 					lookup_result = partial_result;
 				}
@@ -408,7 +440,7 @@ impl SymbolEnv {
 				// result if we're currently "NotFound". "Found", "DefinedLater", and any
 				// existing "NotPublic" results take precedence.
 				else if (matches!(partial_result, LookupResult::NotPublic(_, _)))
-					&& (matches!(lookup_result, LookupResult::NotFound(_)))
+					&& (matches!(lookup_result, LookupResult::NotFound(..)))
 				{
 					lookup_result = partial_result;
 				}
@@ -504,6 +536,16 @@ impl<'a> Iterator for SymbolEnvIter<'a> {
 	}
 }
 
+/// Asserts that if the given environment is not `None` and the given kind is a type environment,
+/// then the environment is also a type environment.
+fn assert_is_type_env(env: Option<SymbolEnvRef>, kind: &SymbolEnvKind) {
+	if let Some(env) = &env {
+		if matches!(kind, SymbolEnvKind::Type(_)) {
+			assert!(matches!(env.kind, SymbolEnvKind::Type(_)));
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use crate::{
@@ -584,7 +626,7 @@ mod tests {
 		// Lookup non-existent variable
 		assert!(matches!(
 			parent_env.lookup_nested_str("non_existent_var", None),
-			LookupResult::NotFound(_)
+			LookupResult::NotFound(..)
 		));
 
 		// Lookup globally visible variable
@@ -632,7 +674,7 @@ mod tests {
 		// Lookup for a child var in the parent env
 		assert!(matches!(
 			parent_env.lookup_nested_str("child_global_var", None),
-			LookupResult::NotFound(_)
+			LookupResult::NotFound(..)
 		));
 
 		// Lookup for a var in the child env
@@ -664,13 +706,11 @@ mod tests {
 		let ns1 = types.add_namespace(Namespace {
 			name: "ns1".to_string(),
 			envs: vec![ns1_env],
-			loaded: false,
 			module_path: ResolveSource::WingFile,
 		});
 		let ns2 = types.add_namespace(Namespace {
 			name: "ns2".to_string(),
 			envs: vec![ns2_env],
-			loaded: false,
 			module_path: ResolveSource::WingFile,
 		});
 
@@ -744,7 +784,7 @@ mod tests {
 		// Perform a nested lookup for a non-existent var
 		let res = child_env.lookup_nested_str("ns1.ns2.non_existent", None);
 		match res {
-			LookupResult::NotFound(s) => {
+			LookupResult::NotFound(s, ..) => {
 				assert!(s.name == "non_existent")
 			}
 			_ => panic!("Expected LookupResult::NotFount(_) but got {:?}", res),
@@ -753,7 +793,7 @@ mod tests {
 		// Perform a nested lookup through a non-existent namespace
 		let res = child_env.lookup_nested_str("ns1.non_existent.ns2_var", None);
 		match res {
-			LookupResult::NotFound(s) => {
+			LookupResult::NotFound(s, ..) => {
 				assert!(s.name == "non_existent")
 			}
 			_ => panic!("Expected LookupResult::NotFount(_) but got {:?}", res),
diff --git a/libs/wingc/src/type_check/type_reference_transform.rs b/libs/wingc/src/type_check/type_reference_transform.rs
index 7e6adb064c4..0e34e5d3d39 100644
--- a/libs/wingc/src/type_check/type_reference_transform.rs
+++ b/libs/wingc/src/type_check/type_reference_transform.rs
@@ -19,13 +19,13 @@ impl<'a> Fold for TypeReferenceTransformer<'a> {
 	fn fold_reference(&mut self, node: Reference) -> Reference {
 		match node {
 			Reference::InstanceMember { ref object, .. } => {
-				if let Some(new_ref) = self.types.type_expressions.remove(&object.id) {
+				if let Some(new_ref) = self.types.type_expressions.swap_remove(&object.id) {
 					new_ref
 				} else {
 					fold::fold_reference(self, node)
 				}
 			}
-			Reference::Identifier(..) | Reference::TypeMember { .. } => node,
+			Reference::Identifier(..) | Reference::TypeMember { .. } | Reference::ElementAccess { .. } => node,
 		}
 	}
 }
diff --git a/libs/wingc/src/type_check_assert.rs b/libs/wingc/src/type_check_assert.rs
index d29c06b5512..6e60e2a950b 100644
--- a/libs/wingc/src/type_check_assert.rs
+++ b/libs/wingc/src/type_check_assert.rs
@@ -26,11 +26,10 @@ impl<'a> TypeCheckAssert<'a> {
 impl<'a> Visit<'_> for TypeCheckAssert<'a> {
 	fn visit_expr(&mut self, expr: &Expr) {
 		if let Some(t) = self.types.try_get_expr_type(expr.id) {
-			assert!(
-				self.tc_found_errors || !t.is_unresolved(),
-				"Expr's type was not resolved: {:?}",
-				expr
-			);
+			// skip if we found errors during type checking
+			if !self.tc_found_errors && t.is_unresolved() {
+				panic!("Expr's type was unresolved: {:?}", expr);
+			}
 		} else {
 			panic!("Expr was not type checked: {:?}", expr)
 		}
diff --git a/libs/wingc/src/valid_json_visitor.rs b/libs/wingc/src/valid_json_visitor.rs
index 1a9b29557e3..8778a478bbf 100644
--- a/libs/wingc/src/valid_json_visitor.rs
+++ b/libs/wingc/src/valid_json_visitor.rs
@@ -1,7 +1,7 @@
 use crate::{
-	ast::{Expr, ExprKind, Scope},
+	ast::{Expr, ExprKind, Intrinsic, IntrinsicKind, Scope},
 	diagnostic::{report_diagnostic, Diagnostic},
-	type_check::{JsonData, JsonDataKind, Type, Types},
+	type_check::{JsonData, JsonDataKind, SpannedTypeInfo, Type, Types},
 	visit::{self, Visit},
 };
 
@@ -22,11 +22,54 @@ impl<'a> ValidJsonVisitor<'a> {
 	pub fn check(&mut self, scope: &Scope) {
 		self.visit_scope(scope);
 	}
+
+	fn report_invalid_json_value(&mut self, inner: &SpannedTypeInfo) {
+		let tt = self.types.maybe_unwrap_inference(inner.type_);
+		// Report an error if this isn't a valid type to put in a json (avoiding cascading errors resulting from unresolved types)
+		if !tt.is_json_legal_value() && !tt.is_unresolved() {
+			report_diagnostic(Diagnostic {
+				message: format!("\"{tt}\" is not a legal JSON value"),
+				span: Some(inner.span.clone()),
+				annotations: vec![],
+				hints: vec![],
+			})
+		}
+	}
 }
 
 impl<'a> Visit<'_> for ValidJsonVisitor<'a> {
 	fn visit_expr(&mut self, expr: &Expr) {
+		if matches!(
+			expr.kind,
+			ExprKind::Intrinsic(Intrinsic {
+				kind: IntrinsicKind::Unknown,
+				..
+			})
+		) {
+			// don't bother checking unknown intrinsics
+			return;
+		}
+
 		if let Some(t) = self.types.try_get_expr_type(expr.id) {
+			let t = self.types.maybe_unwrap_inference(t);
+
+			// If the type is Array<Json>, check if the entire array is being cast to a Array<Struct>
+			if let Type::Array(inner_t) = &*t {
+				let inner_t = self.types.maybe_unwrap_inference(*inner_t);
+				if let Type::Json(Some(JsonData { expression_id, .. })) = &*inner_t {
+					let exclude = if expr.id == *expression_id {
+						// this is a origin of the Json literal data, so check if it's being cast to something else
+						self.types.get_type_from_json_cast(*expression_id).is_some()
+					} else {
+						// only bother checking literals, no reason to check references to Json data
+						matches!(expr.kind, ExprKind::JsonLiteral { .. })
+					};
+					if exclude {
+						return;
+					}
+				}
+			}
+
 			// if the type is json with known values, then we may need to validate that the values are legal json values
 			if let Type::Json(Some(JsonData { kind, expression_id })) = &*t {
 				// if this json expr is not being cast to something else, then it must be a legal json value
@@ -40,43 +83,22 @@ impl<'a> Visit<'_> for ValidJsonVisitor<'a> {
 				if !exclude {
 					match kind {
 						JsonDataKind::Type(inner) => {
-							let tt = self.types.maybe_unwrap_inference(inner.type_);
-							if !tt.is_json_legal_value() {
-								report_diagnostic(Diagnostic {
-									message: format!("\"{tt}\" is not a legal JSON value"),
-									span: Some(inner.span.clone()),
-									annotations: vec![],
-									hints: vec![],
-								})
-							}
+							self.report_invalid_json_value(inner);
 						}
 						JsonDataKind::Fields(fields) => {
 							for (_, inner) in fields {
-								let tt = self.types.maybe_unwrap_inference(inner.type_);
-								if !tt.is_json_legal_value() {
-									report_diagnostic(Diagnostic {
-										message: format!("\"{tt}\" is not a legal JSON value"),
-										span: Some(inner.span.clone()),
-										annotations: vec![],
-										hints: vec![],
-									})
-								}
+								self.report_invalid_json_value(inner);
 							}
 						}
 						JsonDataKind::List(list) => {
 							for v in list {
-								let tt = self.types.maybe_unwrap_inference(v.type_);
-								if !tt.is_json_legal_value() {
-									report_diagnostic(Diagnostic {
-										message: format!("\"{tt}\" is not a legal JSON value"),
-										span: Some(v.span.clone()),
-										annotations: vec![],
-										hints: vec![],
-									})
-								}
+								self.report_invalid_json_value(v);
 							}
 						}
 					}
+
+					// don't bother checking the children of this expr since we've already validated the json values
+					return;
 				}
 			}
 		}
diff --git a/libs/wingc/src/visit.rs b/libs/wingc/src/visit.rs
index a1b0abdab89..fcf68c9a755 100644
--- a/libs/wingc/src/visit.rs
+++ b/libs/wingc/src/visit.rs
@@ -1,8 +1,8 @@
 use crate::{
 	ast::{
-		ArgList, BringSource, CalleeKind, Class, Expr, ExprKind, FunctionBody, FunctionDefinition, FunctionParameter,
-		FunctionSignature, IfLet, Interface, InterpolatedStringPart, Literal, New, Reference, Scope, Stmt, StmtKind,
-		Symbol, TypeAnnotation, TypeAnnotationKind, UserDefinedType,
+		ArgList, BringSource, CalleeKind, Class, Elifs, Enum, Expr, ExprKind, FunctionBody, FunctionDefinition,
+		FunctionParameter, FunctionSignature, IfLet, Interface, InterpolatedStringPart, Literal, New, Reference, Scope,
+		Stmt, StmtKind, Struct, Symbol, TypeAnnotation, TypeAnnotationKind, UserDefinedType,
 	},
 	dbg_panic,
 };
@@ -42,9 +42,15 @@ pub trait Visit<'ast> {
 	fn visit_class(&mut self, node: &'ast Class) {
 		visit_class(self, node);
 	}
+	fn visit_struct(&mut self, node: &'ast Struct) {
+		visit_struct(self, node);
+	}
 	fn visit_interface(&mut self, node: &'ast Interface) {
 		visit_interface(self, node);
 	}
+	fn visit_enum(&mut self, node: &'ast Enum) {
+		visit_enum(self, node);
+	}
 	fn visit_expr(&mut self, node: &'ast Expr) {
 		visit_expr(self, node);
 	}
@@ -100,8 +106,7 @@ where
 				BringSource::TrustedModule(name, _module_dir) => v.visit_symbol(name),
 				BringSource::WingLibrary(name, _module_dir) => v.visit_symbol(name),
 				BringSource::JsiiModule(name) => v.visit_symbol(name),
-				BringSource::WingFile(name) => v.visit_symbol(name),
-				BringSource::Directory(name) => v.visit_symbol(name),
+				BringSource::WingFile(_) | BringSource::Directory(_) => {}
 			}
 			if let Some(identifier) = identifier {
 				v.visit_symbol(identifier);
@@ -146,9 +151,17 @@ where
 			v.visit_expr(value);
 			v.visit_scope(statements);
 			for elif in elif_statements {
-				v.visit_symbol(&elif.var_name);
-				v.visit_expr(&elif.value);
-				v.visit_scope(&elif.statements);
+				match elif {
+					Elifs::ElifBlock(elif_block) => {
+						v.visit_expr(&elif_block.condition);
+						v.visit_scope(&elif_block.statements);
+					}
+					Elifs::ElifLetBlock(elif_let_block) => {
+						v.visit_symbol(&elif_let_block.var_name);
+						v.visit_expr(&elif_let_block.value);
+						v.visit_scope(&elif_let_block.statements);
+					}
+				}
 			}
 			if let Some(statements) = else_statements {
 				v.visit_scope(statements);
@@ -170,9 +183,7 @@ where
 				v.visit_scope(statements);
 			}
 		}
-		StmtKind::Expression(expr) => {
-			v.visit_expr(&expr);
-		}
+		StmtKind::Expression(expr) => v.visit_expr(&expr),
 		StmtKind::Assignment {
 			kind: _,
 			variable,
@@ -186,43 +197,12 @@ where
 				v.visit_expr(expr);
 			}
 		}
-		StmtKind::Throw(expr) => {
-			v.visit_expr(expr);
-		}
-		StmtKind::Scope(scope) => {
-			v.visit_scope(scope);
-		}
-		StmtKind::Class(class) => {
-			v.visit_class(class);
-		}
-		StmtKind::Interface(interface) => {
-			v.visit_interface(interface);
-		}
-		StmtKind::Struct {
-			name,
-			extends,
-			fields,
-			access: _,
-		} => {
-			v.visit_symbol(name);
-			for extend in extends {
-				v.visit_user_defined_type(extend);
-			}
-			for member in fields {
-				v.visit_symbol(&member.name);
-				v.visit_type_annotation(&member.member_type);
-			}
-		}
-		StmtKind::Enum {
-			name,
-			values,
-			access: _,
-		} => {
-			v.visit_symbol(name);
-			for value in values {
-				v.visit_symbol(value);
-			}
-		}
+		StmtKind::Throw(expr) => v.visit_expr(expr),
+		StmtKind::Scope(scope) => v.visit_scope(scope),
+		StmtKind::Class(class) => v.visit_class(class),
+		StmtKind::Interface(interface) => v.visit_interface(interface),
+		StmtKind::Struct(st) => v.visit_struct(st),
+		StmtKind::Enum(enu) => v.visit_enum(enu),
 		StmtKind::TryCatch {
 			try_statements,
 			catch_block,
@@ -240,6 +220,15 @@ where
 			}
 		}
 		StmtKind::CompilerDebugEnv => {}
+		StmtKind::ExplicitLift(explict_lift) => {
+			for q in explict_lift.qualifications.iter() {
+				v.visit_expr(&q.obj);
+				for op in q.ops.iter() {
+					v.visit_symbol(op);
+				}
+			}
+			v.visit_scope(&explict_lift.statements);
+		}
 	}
 }
 
@@ -271,6 +260,20 @@ where
 	}
 }
 
+pub fn visit_struct<'ast, V>(v: &mut V, node: &'ast Struct)
+where
+	V: Visit<'ast> + ?Sized,
+{
+	v.visit_symbol(&node.name);
+	for extend in &node.extends {
+		v.visit_user_defined_type(&extend);
+	}
+	for member in &node.fields {
+		v.visit_symbol(&member.name);
+		v.visit_type_annotation(&member.member_type);
+	}
+}
+
 pub fn visit_interface<'ast, V>(v: &mut V, node: &'ast Interface)
 where
 	V: Visit<'ast> + ?Sized,
@@ -287,6 +290,17 @@ where
 	}
 }
 
+pub fn visit_enum<'ast, V>(v: &mut V, node: &'ast Enum)
+where
+	V: Visit<'ast> + ?Sized,
+{
+	v.visit_symbol(&node.name);
+	for (value, _doc) in &node.values {
+		v.visit_symbol(value);
+		// TODO: Visit _doc
+	}
+}
+
 pub fn visit_new_expr<'ast, V>(v: &mut V, node: &'ast New)
 where
 	V: Visit<'ast> + ?Sized,
@@ -323,6 +337,12 @@ where
 		ExprKind::Reference(ref_) => {
 			v.visit_reference(ref_);
 		}
+		ExprKind::Intrinsic(instrinsic) => {
+			v.visit_symbol(&instrinsic.name);
+			if let Some(arg_list) = &instrinsic.arg_list {
+				v.visit_args(arg_list);
+			}
+		}
 		ExprKind::Call { callee, arg_list } => {
 			match callee {
 				CalleeKind::Expr(expr) => v.visit_expr(expr),
@@ -404,6 +424,7 @@ where
 		Literal::Boolean(_) => {}
 		Literal::Number(_) => {}
 		Literal::String(_) => {}
+		Literal::NonInterpolatedString(_) => {}
 	}
 }
 
@@ -427,6 +448,10 @@ where
 			v.visit_user_defined_type(type_name);
 			v.visit_symbol(property);
 		}
+		Reference::ElementAccess { object, index } => {
+			v.visit_expr(object);
+			v.visit_expr(index);
+		}
 	}
 }
 
diff --git a/libs/wingc/src/visit_context.rs b/libs/wingc/src/visit_context.rs
index d93eb4bc5e7..5004ba58074 100644
--- a/libs/wingc/src/visit_context.rs
+++ b/libs/wingc/src/visit_context.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
 
 use crate::{
-	ast::{Class, ExprId, FunctionSignature, Phase, Symbol, UserDefinedType},
+	ast::{Class, ExprId, FunctionSignature, Phase, Stmt, StmtKind, Symbol, UserDefinedType},
 	type_check::symbol_env::SymbolEnvRef,
 };
 
@@ -12,15 +12,27 @@ pub struct FunctionContext {
 	pub is_static: bool,
 }
 
+#[derive(Clone)]
+pub enum PropertyObject {
+	UserDefinedType(UserDefinedType),
+	Instance(ExprId),
+}
+
+#[derive(Clone)]
+pub struct StmtContext {
+	pub idx: usize,
+	pub super_call: bool,
+}
+
 #[derive(Clone)]
 pub struct VisitContext {
 	phase: Vec<Phase>,
 	env: Vec<SymbolEnvRef>,
 	function_env: Vec<SymbolEnvRef>,
-	property: Vec<Symbol>,
+	property: Vec<(PropertyObject, Symbol)>,
 	function: Vec<FunctionContext>,
 	class: Vec<UserDefinedType>,
-	statement: Vec<usize>,
+	statement: Vec<StmtContext>,
 	in_json: Vec<bool>,
 	in_type_annotation: Vec<bool>,
 	expression: Vec<ExprId>,
@@ -58,8 +70,11 @@ impl VisitContext {
 
 	// --
 
-	pub fn push_stmt(&mut self, stmt: usize) {
-		self.statement.push(stmt);
+	pub fn push_stmt(&mut self, stmt: &Stmt) {
+		self.statement.push(StmtContext {
+			idx: stmt.idx,
+			super_call: matches!(stmt.kind, StmtKind::SuperConstructor { .. }),
+		});
 	}
 
 	pub fn pop_stmt(&mut self) {
@@ -67,7 +82,11 @@ impl VisitContext {
 	}
 
 	pub fn current_stmt_idx(&self) -> usize {
-		*self.statement.last().unwrap_or(&0)
+		self.statement.last().map_or(0, |s| s.idx)
+	}
+
+	pub fn current_stmt_is_super_call(&self) -> bool {
+		self.statement.last().map_or(false, |s| s.super_call)
 	}
 
 	// --
@@ -164,15 +183,15 @@ impl VisitContext {
 
 	// --
 
-	pub fn push_property(&mut self, property: &Symbol) {
-		self.property.push(property.clone());
+	pub fn push_property(&mut self, property_object: PropertyObject, property: &Symbol) {
+		self.property.push((property_object, property.clone()));
 	}
 
 	pub fn pop_property(&mut self) {
 		self.property.pop();
 	}
 
-	pub fn current_property(&self) -> Option<Symbol> {
+	pub fn current_property(&self) -> Option<(PropertyObject, Symbol)> {
 		self.property.last().cloned()
 	}
 
@@ -224,7 +243,7 @@ pub trait VisitorWithContext {
 		self.ctx().pop_expr();
 	}
 
-	fn with_stmt(&mut self, stmt: usize, f: impl FnOnce(&mut Self)) {
+	fn with_stmt(&mut self, stmt: &Stmt, f: impl FnOnce(&mut Self)) {
 		self.ctx().push_stmt(stmt);
 		f(self);
 		self.ctx().pop_stmt();
diff --git a/libs/wingc/src/visit_types.rs b/libs/wingc/src/visit_types.rs
index dc8d73283ab..df69f8404a0 100644
--- a/libs/wingc/src/visit_types.rs
+++ b/libs/wingc/src/visit_types.rs
@@ -53,7 +53,8 @@ where
 		| Type::MutJson
 		| Type::Nil
 		| Type::Unresolved
-		| Type::Enum(_) => {}
+		| Type::Enum(_)
+		| Type::Stringable => {}
 
 		Type::Inferred(node_unwrap([n])) => {
 			v.visit_inference(n);
diff --git a/libs/wingc/turbo.json b/libs/wingc/turbo.json
index c36f0446d23..fe5a8359885 100644
--- a/libs/wingc/turbo.json
+++ b/libs/wingc/turbo.json
@@ -3,7 +3,11 @@
   "extends": ["//"],
   "pipeline": {
     "compile": {
-      "dependsOn": ["@winglang/wingii#compile", "@winglang/tree-sitter-wing#compile"],
+      "dependsOn": [
+        "@winglang/wingii#compile",
+        "@winglang/tree-sitter-wing#compile"
+      ],
+      "inputs": ["*.json", "*.toml", "src/**/*.rs", "scripts/postcompile.sh"],
       "outputs": [
         "../../target/wasm32-wasi/release/wingc.wasm",
         "../../target/wasm32-wasi/release/libwingc.*",
@@ -11,9 +15,15 @@
       ]
     },
     "test": {
-      "dependsOn": ["compile", "@winglang/sdk#compile", "examples-valid#topo", "examples-invalid#topo"]
+      "dependsOn": [
+        "@winglang/tree-sitter-wing#compile",
+        "@winglang/sdk#compile",
+        "examples-valid#topo",
+        "examples-invalid#topo"
+      ]
     },
     "dev": {
+      "inputs": ["*.json", "*.toml", "src/**/*.rs", "examples/**/*.rs"],
       "dependsOn": ["@winglang/sdk#compile"]
     }
   }
diff --git a/libs/wingcompiler/.npmignore b/libs/wingcompiler/.npmignore
deleted file mode 100644
index dae619c8be8..00000000000
--- a/libs/wingcompiler/.npmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-wasm/.gitkeep
-scripts
-*.tgz
diff --git a/libs/wingcompiler/jest.config.js b/libs/wingcompiler/jest.config.js
deleted file mode 100644
index 530ebab9e2c..00000000000
--- a/libs/wingcompiler/jest.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: "ts-jest",
-  testEnvironment: "node",
-  testMatch: ["**/*.test.ts"],
-};
diff --git a/libs/wingcompiler/package.json b/libs/wingcompiler/package.json
index c3935a3d1ca..4585116a06e 100644
--- a/libs/wingcompiler/package.json
+++ b/libs/wingcompiler/package.json
@@ -4,14 +4,14 @@
   "description": "Wing Compiler",
   "files": [
     "wingc.wasm",
+    "preflight.shim.cjs",
     "dist/"
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=v18.0.0"
+    "node": ">=v20.0.0"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "dist/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/winglang/wing.git"
@@ -24,19 +24,21 @@
     "package": "bump-pack -b"
   },
   "dependencies": {
+    "@wingcloud/framework": "workspace:^",
     "@winglang/sdk": "workspace:^",
+    "jiti": "^1.21.0",
     "wasi-js": "^1.7.3"
   },
   "bundledDependencies": [
     "wasi-js"
   ],
   "devDependencies": {
-    "@types/node": "^18.17.13",
+    "@types/node": "^20.11.0",
     "@winglang/wingc": "workspace:^",
     "bump-pack": "workspace:^",
-    "tsup": "^6.7.0",
-    "typescript": "^4.9.5",
-    "vitest": "^0.30.1",
+    "tsup": "^8.0.2",
+    "typescript": "^5.3.3",
+    "vitest": "^1.6.0",
     "wasi-js": "^1.7.3"
   },
   "volta": {
diff --git a/libs/wingcompiler/preflight.shim.cjs b/libs/wingcompiler/preflight.shim.cjs
new file mode 100644
index 00000000000..b7c5ae1a495
--- /dev/null
+++ b/libs/wingcompiler/preflight.shim.cjs
@@ -0,0 +1,51 @@
+/// This serves as the preflight execution entrypoint to set up the following behaviors
+/// 1. Override module resolution to force @winglang/sdk to always resolve to the same path
+/// 2. Handle communication with parent process to handle errors and load the true entrypoint
+///
+/// This file has the following expectations:
+/// 1. The environment variable WING_PREFLIGHT_ENTRYPOINT is a JSON string of the entrypoint to load
+/// 2. Runs in a child process with an IPC channel to the parent process
+
+process.on("uncaughtException", (reason) => {
+  if (reason instanceof Error) {
+    // The Error object does not serialize well over IPC (even with 'advanced' serialization)
+    // So we extract the properties we need to recreate most error objects
+    reason = {
+      message: reason.message,
+      stack: reason.stack,
+      name: reason.name,
+      code: reason.code,
+    };
+  }
+  process.send(reason);
+});
+
+if (!process.send) {
+  throw new Error(
+    "process.send is undefined. This file should only be run in a child process with an IPC connection to the parent."
+  );
+}
+
+var Module = require("module");
+const { join } = require("path");
+const original_resolveFilename = Module._resolveFilename;
+const WINGSDK = "@winglang/sdk";
+const WINGSDK_PATH = require.resolve(WINGSDK);
+const WINGSDK_DIR = join(WINGSDK_PATH, "..", "..");
+
+Module._resolveFilename = function () {
+  const path = arguments[0];
+  if (path === WINGSDK) return WINGSDK_PATH;
+  if (path.startsWith(WINGSDK)) {
+    arguments[0] = path.replace(WINGSDK, WINGSDK_DIR);
+  }
+  return original_resolveFilename.apply(this, arguments);
+};
+
+if (!process.env.WING_PREFLIGHT_ENTRYPOINT) {
+  throw new Error("Missing environment variable WING_PREFLIGHT_ENTRYPOINT");
+}
+const entrypoint = JSON.parse(process.env.WING_PREFLIGHT_ENTRYPOINT);
+delete process.env.WING_PREFLIGHT_ENTRYPOINT;
+
+require(entrypoint);
diff --git a/libs/wingcompiler/src/compile.test.ts b/libs/wingcompiler/src/compile.test.ts
index 5af0948fe9c..7c9f37efa81 100644
--- a/libs/wingcompiler/src/compile.test.ts
+++ b/libs/wingcompiler/src/compile.test.ts
@@ -12,60 +12,72 @@ export async function generateTmpDir() {
   return mkdtemp(join(tmpdir(), "-wing-compile-test"));
 }
 
-describe(
-  "compile tests",
-  () => {
-    test("should produce stable artifacts for tf-aws", async () => {
-      const targetDir = `${await generateTmpDir()}/target`;
-      const artifactDir = await compile(exampleFilePath, {
-        platform: [BuiltinPlatform.TF_AWS],
-        targetDir,
-      });
+describe("compile tests", () => {
+  test("should produce stable artifacts for tf-aws", async () => {
+    const targetDir = `${await generateTmpDir()}/target`;
+    const artifactDir = await compile(exampleFilePath, {
+      platform: [BuiltinPlatform.TF_AWS],
+      targetDir,
+    });
+
+    const stats = await stat(artifactDir);
+    expect(stats.isDirectory()).toBeTruthy();
+    expect(artifactDir).toContain(targetDir);
+    expect(basename(artifactDir)).toEqual("enums.test.tfaws");
+  });
 
-      const stats = await stat(artifactDir);
-      expect(stats.isDirectory()).toBeTruthy();
-      expect(artifactDir).toContain(targetDir);
-      expect(basename(artifactDir)).toEqual("enums.test.tfaws")
+  test("should produce temp artifacts for tf-aws testing", async () => {
+    const targetDir = `${await generateTmpDir()}/target`;
+    const artifactDir = await compile(exampleFilePath, {
+      platform: [BuiltinPlatform.TF_AWS],
+      targetDir,
+      testing: true,
     });
 
-    test("should produce temp artifacts for tf-aws testing", async () => {
-      const targetDir = `${await generateTmpDir()}/target`;
-      const artifactDir = await compile(exampleFilePath, {
-        platform: [BuiltinPlatform.TF_AWS],
-        targetDir,
-        testing: true,
-      });
+    const stats = await stat(artifactDir);
+    expect(stats.isDirectory()).toBeTruthy();
+    expect(artifactDir).toContain(targetDir);
+    expect(basename(artifactDir).match(/enums\.test\.tfaws\.\d+$/)).toBeTruthy();
+  });
 
-      const stats = await stat(artifactDir);
-      expect(stats.isDirectory()).toBeTruthy();
-      expect(artifactDir).toContain(targetDir);
-      expect(basename(artifactDir).match(/enums\.test\.tfaws\.\d+$/)).toBeTruthy();
+  test("should produce stable artifacts for sim", async () => {
+    const targetDir = `${await generateTmpDir()}/target`;
+    const artifactDir = await compile(exampleFilePath, {
+      platform: [BuiltinPlatform.SIM],
+      targetDir,
     });
 
-    test("should produce stable artifacts for sim", async () => {
-      const targetDir = `${await generateTmpDir()}/target`;
-      const artifactDir = await compile(exampleFilePath, {
-        platform: [BuiltinPlatform.SIM],
-        targetDir,
-      });
+    const stats = await stat(artifactDir);
+    expect(stats.isDirectory()).toBeTruthy();
+    expect(artifactDir).toContain(targetDir);
+    expect(basename(artifactDir)).toEqual("enums.test.wsim");
+  });
 
-      const stats = await stat(artifactDir);
-      expect(stats.isDirectory()).toBeTruthy();
-      expect(artifactDir).toContain(targetDir);
-      expect(basename(artifactDir)).toEqual("enums.test.wsim")
+  test("should produce stable artifacts for sim testing", async () => {
+    const targetDir = `${await generateTmpDir()}/target`;
+    const artifactDir = await compile(exampleFilePath, {
+      platform: [BuiltinPlatform.SIM],
+      targetDir,
+      testing: true,
     });
 
-    test("should produce stable artifacts for sim testing", async () => {
-      const targetDir = `${await generateTmpDir()}/target`;
-      const artifactDir = await compile(exampleFilePath, {
-        platform: [BuiltinPlatform.SIM],
-        targetDir,
-        testing: true,
-      });
+    const stats = await stat(artifactDir);
+    expect(stats.isDirectory()).toBeTruthy();
+    expect(artifactDir).toContain(targetDir);
+    expect(basename(artifactDir)).toEqual("enums.test.wsim");
+  });
 
-      const stats = await stat(artifactDir);
-      expect(stats.isDirectory()).toBeTruthy();
-      expect(artifactDir).toContain(targetDir);
-      expect(basename(artifactDir)).toEqual("enums.test.wsim")
+  test("should be able to override the target directory", async () => {
+    const output = `${await generateTmpDir()}/a/b/dir.out`;
+    const artifactDir = await compile(exampleFilePath, {
+      platform: [BuiltinPlatform.SIM],
+      output,
+      testing: true,
     });
+
+    const stats = await stat(artifactDir);
+    expect(stats.isDirectory()).toBeTruthy();
+    expect(artifactDir).toBe(output);
+    expect(basename(artifactDir)).toEqual("dir.out");
+  });
 });
diff --git a/libs/wingcompiler/src/compile.ts b/libs/wingcompiler/src/compile.ts
index 1602d08ce26..af9f712d91c 100644
--- a/libs/wingcompiler/src/compile.ts
+++ b/libs/wingcompiler/src/compile.ts
@@ -1,14 +1,14 @@
-import * as vm from "vm";
-
 import { promises as fs, lstatSync } from "fs";
 import { basename, dirname, join, resolve } from "path";
 import * as os from "os";
 
 import * as wingCompiler from "./wingc";
-import { copyDir, normalPath } from "./util";
+import { normalPath } from "./util";
 import { existsSync } from "fs";
 import { BuiltinPlatform } from "./constants";
 import { CompileError, PreflightError } from "./errors";
+import { readFile } from "fs/promises";
+import { fork } from "child_process";
 
 // increase the stack trace limit to 50, useful for debugging Rust panics
 // (not setting the limit too high in case of infinite recursion)
@@ -16,7 +16,8 @@ Error.stackTraceLimit = 50;
 
 // const log = debug("wing:compile");
 const WINGC_COMPILE = "wingc_compile";
-const WINGC_PREFLIGHT = "preflight.js";
+const WINGC_PREFLIGHT = "preflight.cjs";
+const DOT_WING = ".wing";
 
 const BUILTIN_PLATFORMS = [
   BuiltinPlatform.SIM,
@@ -62,6 +63,9 @@ export interface CompileOptions {
 
   // target directory for the output files
   readonly targetDir?: string;
+
+  // overrides the target directory for the output files
+  readonly output?: string;
 }
 
 /**
@@ -69,13 +73,7 @@ export interface CompileOptions {
  * within the output directory where the SDK app will synthesize its artifacts
  * for the given target.
  */
-function resolveSynthDir(
-  outDir: string,
-  entrypoint: string,
-  target: string,
-  testing: boolean = false,
-  tmp: boolean = false
-) {
+function resolveSynthDir(outDir: string, entrypoint: string, target: string, testing: boolean) {
   const targetDirSuffix = defaultSynthDir(target);
 
   let entrypointName;
@@ -95,9 +93,8 @@ function resolveSynthDir(
     throw new Error("Source file cannot be found");
   }
   const randomPart =
-    tmp || (testing && target !== BuiltinPlatform.SIM) ? `.${Date.now().toString().slice(-6)}` : "";
-  const tmpSuffix = tmp ? ".tmp" : "";
-  const lastPart = `${entrypointName}.${targetDirSuffix}${randomPart}${tmpSuffix}`;
+    testing && target !== BuiltinPlatform.SIM ? `.${Date.now().toString().slice(-6)}` : "";
+  const lastPart = `${entrypointName}.${targetDirSuffix}${randomPart}`;
   if (testing) {
     return join(outDir, "test", lastPart);
   } else {
@@ -112,7 +109,9 @@ function resolveSynthDir(
  * @returns the resolved model
  */
 export function determineTargetFromPlatforms(platforms: string[]): string {
-  if (platforms.length === 0) { return ""; }
+  if (platforms.length === 0) {
+    return "";
+  }
   // determine target based on first platform
   const platform = platforms[0];
 
@@ -136,121 +135,87 @@ export async function compile(entrypoint: string, options: CompileOptions): Prom
   const { log } = options;
   // create a unique temporary directory for the compilation
   const targetdir = options.targetDir ?? join(dirname(entrypoint), "target");
-  const wingFile = resolve(entrypoint);
-  log?.("wing file: %s", wingFile);
-  const wingDir = resolve(dirname(wingFile));
+  const entrypointFile = resolve(entrypoint);
+  log?.("wing file: %s", entrypointFile);
+  const wingDir = resolve(dirname(entrypointFile));
   log?.("wing dir: %s", wingDir);
   const testing = options.testing ?? false;
   log?.("testing: %s", testing);
   const target = determineTargetFromPlatforms(options.platform);
-  const tmpSynthDir = resolveSynthDir(targetdir, wingFile, target, testing, true);
-  log?.("temp synth dir: %s", tmpSynthDir);
-  const synthDir = resolveSynthDir(targetdir, wingFile, target, testing);
+  const synthDir = options.output ?? resolveSynthDir(targetdir, entrypointFile, target, testing);
   log?.("synth dir: %s", synthDir);
-  const workDir = resolve(tmpSynthDir, ".wing");
+  const workDir = resolve(synthDir, DOT_WING);
   log?.("work dir: %s", workDir);
 
-  // TODO: couldn't be moved to the context's since used in utils.env(...)
-  // in the future we may look for a unified approach
-  process.env["WING_TARGET"] = target;
-  process.env["WING_VALUES"] = options.value?.length == 0 ? undefined : options.value;
-  process.env["WING_VALUES_FILE"] = options.values;
-  process.env["WING_IS_TEST"] = testing.toString();
-  process.env["WING_PLATFORMS"] = resolvePlatformPaths(options.platform);
+  const nearestNodeModules = (dir: string): string => {
+    let nodeModules = join(dir, "node_modules");
+    while (!existsSync(nodeModules)) {
+      nodeModules = dirname(dirname(nodeModules));
 
-  const tempProcess: { env: Record<string, string | undefined> } = { env: { ...process.env } };
+      if (nodeModules === "/" || nodeModules.match(/^[A-Z]:\\/)) {
+        break;
+      }
 
-  tempProcess.env["WING_SOURCE_DIR"] = wingDir;
-  if (options.rootId) {
-    tempProcess.env["WING_ROOT_ID"] = options.rootId;
-  }
-  // from wingDir, find the nearest node_modules directory
-  let wingNodeModules = join(wingDir, "node_modules");
-  while (!existsSync(wingNodeModules)) {
-    wingNodeModules = dirname(dirname(wingNodeModules));
-
-    if (wingNodeModules === "/" || wingNodeModules.match(/^[A-Z]:\\/)) {
-      break;
+      nodeModules = resolve(nodeModules, "node_modules");
     }
 
-    wingNodeModules = resolve(wingNodeModules, "node_modules");
-  }
-
-  tempProcess.env["WING_SYNTH_DIR"] = tmpSynthDir;
-  tempProcess.env["WING_NODE_MODULES"] = wingNodeModules;
-
-  await Promise.all([
-    fs.mkdir(workDir, { recursive: true }),
-    fs.mkdir(tmpSynthDir, { recursive: true }),
-  ]);
-
-  let env: Record<string, string> = {
-    RUST_BACKTRACE: "full",
-    WING_SYNTH_DIR: normalPath(tmpSynthDir),
+    return nodeModules;
   };
-  if (options.color !== undefined) {
-    env.CLICOLOR = options.color ? "1" : "0";
-  }
 
-  const wingc = await wingCompiler.load({
-    env,
-    imports: {
-      env: {
-        send_diagnostic,
-      },
-    },
-  });
-
-  const errors: wingCompiler.WingDiagnostic[] = [];
+  let wingNodeModules = nearestNodeModules(wingDir);
 
-  function send_diagnostic(data_ptr: number, data_len: number) {
-    const data_buf = Buffer.from(
-      (wingc.exports.memory as WebAssembly.Memory).buffer,
-      data_ptr,
-      data_len
-    );
-    const data_str = new TextDecoder().decode(data_buf);
-    errors.push(JSON.parse(data_str));
-  }
-
-  const arg = `${normalPath(wingFile)};${normalPath(workDir)};${normalPath(wingDir)}`;
-  log?.(`invoking %s with: "%s"`, WINGC_COMPILE, arg);
-  let compileSuccess: boolean;
-  try {
-    compileSuccess = wingCompiler.invoke(wingc, WINGC_COMPILE, arg) !== 0;
-  } catch (error) {
-    // This is a bug in the compiler, indicate a compilation failure.
-    // The bug details should be part of the diagnostics handling below.
-    compileSuccess = false;
-  }
-  if (!compileSuccess) {
-    // This is a bug in the user's code. Print the compiler diagnostics.
-    throw new CompileError(errors);
+  if (!existsSync(synthDir)) {
+    await fs.mkdir(workDir, { recursive: true });
   }
+  const compileForPreflightResult = await compileForPreflight({
+    entrypointFile,
+    workDir,
+    wingDir,
+    synthDir,
+    color: options.color,
+    log,
+  });
 
   if (isEntrypointFile(entrypoint)) {
-    await runPreflightCodeInVm(workDir, wingDir, tempProcess, log);
-  }
+    let preflightEnv: Record<string, string | undefined> = {
+      ...process.env,
+      WING_TARGET: target,
+      WING_PLATFORMS: resolvePlatformPaths(options.platform),
+      WING_SYNTH_DIR: synthDir,
+      WING_SOURCE_DIR: wingDir,
+      WING_IS_TEST: process.env["WING_IS_TEST"] ?? testing.toString(),
+      WING_VALUES: options.value?.length == 0 ? undefined : options.value,
+      WING_VALUES_FILE: options.values ?? defaultValuesFile(),
+      WING_NODE_MODULES: wingNodeModules,
+      WING_IMPORTED_NAMESPACES:
+        compileForPreflightResult.compilerOutput?.imported_namespaces.join(";"),
+    };
+
+    if (options.rootId) {
+      preflightEnv.WING_ROOT_ID = options.rootId;
+    }
 
-  if (os.platform() === "win32") {
-    // Windows doesn't really support fully atomic moves.
-    // So we just copy the directory instead.
-    // Also only using sync methods to avoid possible async fs issues.
-    await fs.rm(synthDir, { recursive: true, force: true });
-    await fs.mkdir(synthDir, { recursive: true });
-    await copyDir(tmpSynthDir, synthDir);
-    await fs.rm(tmpSynthDir, { recursive: true, force: true });
-  } else {
-    // Move the temporary directory to the final target location in an atomic operation
-    await copyDir(tmpSynthDir, synthDir);
-    await fs.rm(tmpSynthDir, { recursive: true, force: true });
-  }
+    if (os.platform() === "win32") {
+      // In worker threads on Windows, environment variables are case-sensitive.
+      // Most people probably already assume this is the case everywhere, so
+      // it is sufficient for now to just to normalize common automatic env vars.
 
+      if ("Path" in preflightEnv) {
+        preflightEnv.PATH = preflightEnv.Path;
+        delete preflightEnv.Path;
+      }
+    }
+    await runPreflightCodeInWorkerThread(
+      compileForPreflightResult.preflightEntrypoint,
+      preflightEnv
+    );
+  }
   return synthDir;
 }
 
 function isEntrypointFile(path: string) {
   return (
+    path.endsWith(".ts") ||
     path.endsWith(".main.w") ||
     path.endsWith(".test.w") ||
     path.endsWith("/main.w") ||
@@ -259,57 +224,137 @@ function isEntrypointFile(path: string) {
   );
 }
 
-async function runPreflightCodeInVm(
-  workDir: string,
-  wingDir: string,
-  tempProcess: { env: Record<string, string | undefined> },
-  log?: (...args: any[]) => void
-): Promise<void> {
-  const artifactPath = join(workDir, WINGC_PREFLIGHT);
-  log?.("reading artifact from %s", artifactPath);
-  const artifact = await fs.readFile(artifactPath, "utf-8");
-  log?.("artifact: %s", artifact);
-
-  // Try looking for dependencies not only in the current directory (wherever
-  // the wing CLI was installed to), but also in the source code directory.
-  // This is necessary because the Wing app may have installed dependencies in
-  // the project directory.
-  const requireResolve = (path: string) =>
-    require.resolve(path, { paths: [__dirname, wingDir, workDir] });
-  const preflightRequire = (path: string) => require(requireResolve(path));
-  preflightRequire.resolve = requireResolve;
-
-  // If you're wondering how the execution of the preflight works, despite it
-  // being in a different directory: it works because at the top of the file
-  // require.resolve is called to cache wingsdk in-memory. So by the time VM
-  // is starting up, the passed context already has wingsdk in it.
-  // "__dirname" is also synthetically changed so nested requires work.
-  const context = vm.createContext({
-    require: preflightRequire,
-    process: tempProcess,
-    console,
-    __dirname: workDir,
-    __filename: artifactPath,
-    // since the SDK is loaded in the outer VM, we need these to be the same class instance,
-    // otherwise "instanceof" won't work between preflight code and the SDK. this is needed e.g. in
-    // `serializeImmutableData` which has special cases for serializing these types.
-    Map,
-    Set,
-    Array,
-    Promise,
-    Object,
-    RegExp,
-    String,
-    Date,
-    Function,
-  });
+interface CompileForPreflightResult {
+  readonly preflightEntrypoint: string;
+  readonly compilerOutput?: {
+    imported_namespaces: string[];
+  };
+}
+
+async function compileForPreflight(props: {
+  entrypointFile: string;
+  workDir: string;
+  wingDir: string;
+  synthDir: string;
+  color?: boolean;
+  log?: (...args: any[]) => void;
+}): Promise<CompileForPreflightResult> {
+  if (props.entrypointFile.endsWith(".ts")) {
+    const typescriptFramework = await import("@wingcloud/framework")
+      .then((m) => m.internal)
+      .catch((err) => {
+        throw new Error(`\
+Failed to load "@wingcloud/framework": ${err.message}
+
+To use Wing with TypeScript files, you must install "@wingcloud/framework" as a dependency of your project.
+npm i @wingcloud/framework
+`);
+      });
+
+    return {
+      preflightEntrypoint: await typescriptFramework.compile({
+        workDir: props.workDir,
+        entrypoint: props.entrypointFile,
+      }),
+    };
+  } else {
+    let env: Record<string, string> = {
+      RUST_BACKTRACE: "full",
+      WING_SYNTH_DIR: normalPath(props.synthDir),
+    };
+    if (props.color !== undefined) {
+      env.CLICOLOR = props.color ? "1" : "0";
+    }
+
+    const wingc = await wingCompiler.load({
+      env,
+      imports: {
+        env: {
+          send_diagnostic,
+        },
+      },
+    });
+
+    const errors: wingCompiler.WingDiagnostic[] = [];
+
+    function send_diagnostic(data_ptr: number, data_len: number) {
+      const data_buf = Buffer.from(
+        (wingc.exports.memory as WebAssembly.Memory).buffer,
+        data_ptr,
+        data_len
+      );
+      const data_str = new TextDecoder().decode(data_buf);
+      errors.push(JSON.parse(data_str));
+    }
+
+    const arg = `${normalPath(props.entrypointFile)};${normalPath(props.workDir)};${normalPath(
+      props.wingDir
+    )}`;
+    props.log?.(`invoking %s with: "%s"`, WINGC_COMPILE, arg);
+    let compileSuccess: boolean;
+    let compilerOutput: string | number = "";
+    try {
+      compilerOutput = wingCompiler.invoke(wingc, WINGC_COMPILE, arg);
+      compileSuccess = compilerOutput !== 0;
+    } catch (error) {
+      // This is a bug in the compiler, indicate a compilation failure.
+      // The bug details should be part of the diagnostics handling below.
+      compileSuccess = false;
+    }
+    if (!compileSuccess) {
+      // This is a bug in the user's code. Print the compiler diagnostics.
+      throw new CompileError(errors);
+    }
+
+    return {
+      preflightEntrypoint: join(props.workDir, WINGC_PREFLIGHT),
+      compilerOutput: JSON.parse(compilerOutput as string),
+    };
+  }
+}
+
+/**
+ * Check if in the current working directory there is a default values file
+ * only the first match is returned from the list of default values files
+ *
+ * @returns default values file from the current working directory
+ */
+function defaultValuesFile() {
+  const defaultConfigs = ["wing.toml", "wing.yaml", "wing.yml", "wing.json"];
 
+  for (const configFile of defaultConfigs) {
+    if (existsSync(join(process.cwd(), configFile))) {
+      return configFile;
+    }
+  }
+  return "";
+}
+
+async function runPreflightCodeInWorkerThread(
+  entrypoint: string,
+  env: Record<string, string | undefined>
+): Promise<void> {
   try {
-    vm.runInContext(artifact, context, {
-      filename: artifactPath
+    env.WING_PREFLIGHT_ENTRYPOINT = JSON.stringify(entrypoint);
+
+    await new Promise((resolve, reject) => {
+      const worker = fork(join(__dirname, "..", "preflight.shim.cjs"), {
+        env,
+        stdio: "inherit",
+      });
+      worker.on("message", reject);
+      worker.on("error", reject);
+      worker.on("exit", (code) => {
+        if (code === 0) {
+          resolve(undefined);
+        } else {
+          reject(new Error(`Worker stopped with exit code ${code}`));
+        }
+      });
     });
   } catch (error) {
-    throw new PreflightError(error as any, artifactPath, artifact);
+    const artifact = await readFile(entrypoint, "utf-8");
+    throw new PreflightError(error as any, entrypoint, artifact);
   }
 }
 
diff --git a/libs/wingcompiler/src/util.ts b/libs/wingcompiler/src/util.ts
index 6a8d1c0e483..cca3ba73c80 100644
--- a/libs/wingcompiler/src/util.ts
+++ b/libs/wingcompiler/src/util.ts
@@ -1,6 +1,3 @@
-import { copyFileSync, promises as fsPromise } from "fs";
-import path from "path";
-
 /**
  * Normalize windows paths to be posix-like.
  */
@@ -15,15 +12,3 @@ export function normalPath(path: string) {
     return path;
   }
 }
-
-export async function copyDir(src: string, dest: string) {
-  await fsPromise.mkdir(dest, { recursive: true });
-  let entries = await fsPromise.readdir(src, { withFileTypes: true });
-
-  for (let entry of entries) {
-    let srcPath = path.join(src, entry.name);
-    let destPath = path.join(dest, entry.name);
-
-    entry.isDirectory() ? await copyDir(srcPath, destPath) : copyFileSync(srcPath, destPath);
-  }
-}
diff --git a/libs/wingcompiler/src/wingc.ts b/libs/wingcompiler/src/wingc.ts
index 56fd5a64569..72badc4ffde 100644
--- a/libs/wingcompiler/src/wingc.ts
+++ b/libs/wingcompiler/src/wingc.ts
@@ -13,6 +13,8 @@ export type WingCompilerFunction =
   | "wingc_on_signature_help"
   | "wingc_on_goto_definition"
   | "wingc_on_document_symbol"
+  | "wingc_on_rename"
+  | "wingc_on_prepare_rename"
   | "wingc_on_semantic_tokens"
   | "wingc_on_hover"
   | "wingc_on_code_action";
@@ -188,7 +190,7 @@ export async function load(options: WingCompilerLoadOptions) {
     wasi_snapshot_preview1: wasi.wasiImport,
     env: {
       // This function is used only by the lsp
-      send_diagnostic: () => { },
+      send_diagnostic: () => {},
     },
     ...(options.imports ?? {}),
   } as any;
@@ -222,34 +224,28 @@ const HIGH_MASK = BigInt(32);
 // From diagnostic.rs
 export interface WingDiagnostic {
   message: string;
-  span?: {
-    start: {
-      line: number;
-      col: number;
-    };
-    end: {
-      line: number;
-      col: number;
-    };
-    file_id: string;
-  };
+  span?: WingSpan;
   annotations: {
     message: string;
-    span: {
-      start: {
-        line: number;
-        col: number;
-      };
-      end: {
-        line: number;
-        col: number;
-      };
-      file_id: string;
-    };
+    span: WingSpan;
   }[];
   hints: string[];
 }
 
+export interface WingSpan {
+  start: {
+    line: number;
+    col: number;
+  };
+  end: {
+    line: number;
+    col: number;
+  };
+  file_id: string;
+  start_offset: number;
+  end_offset: number;
+}
+
 /**
  * Runs the given WASM function in the Wing Compiler WASM instance.
  *
diff --git a/libs/wingii/src/fixtures/constructs/package.json b/libs/wingii/src/fixtures/constructs/package.json
index 3afee36931f..da07637c86c 100644
--- a/libs/wingii/src/fixtures/constructs/package.json
+++ b/libs/wingii/src/fixtures/constructs/package.json
@@ -13,24 +13,22 @@
   },
   "devDependencies": {
     "@types/jest": "^27",
-    "@types/node": "^14",
+    "@types/node": "^20.11.0",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
     "eslint": "^8",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.26.0",
-    "jest": "^27",
-    "jest-junit": "^13",
-    "jsii": "^1.67.0",
-    "jsii-diff": "^1.67.0",
-    "jsii-docgen": "^1.8.110",
-    "jsii-pacmak": "^1.67.0",
+    "jsii": "~5.3.11",
+    "jsii-diff": "^1.94.0",
+    "jsii-docgen": "^10.3.19",
+    "jsii-pacmak": "^1.94.0",
     "json-schema": "^0.4.0",
     "npm-check-updates": "^15",
     "projen": "^0.62.3",
     "standard-version": "^9",
-    "ts-jest": "^27",
+    "ts-jest": "^29.1.2",
     "typescript": "^3.9.10"
   },
   "keywords": [
@@ -39,53 +37,10 @@
     "constructs",
     "jsii"
   ],
-  "engines": {
-    "node": ">= 14.17.0"
-  },
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "homepage": "https://github.com/aws/constructs",
   "version": "10.1.101",
-  "jest": {
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.ts?(x)",
-      "<rootDir>/(test|src)/**/*(*.)@(spec|test).ts?(x)"
-    ],
-    "clearMocks": true,
-    "collectCoverage": true,
-    "coverageReporters": [
-      "json",
-      "lcov",
-      "clover",
-      "cobertura",
-      "text"
-    ],
-    "coverageDirectory": "coverage",
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "watchPathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "reporters": [
-      "default",
-      [
-        "jest-junit",
-        {
-          "outputDirectory": "test-reports"
-        }
-      ]
-    ],
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "tsconfig": "tsconfig.dev.json"
-      }
-    }
-  },
   "types": "lib/index.d.ts",
   "stability": "stable",
   "jsii": {
diff --git a/libs/wingii/src/fqn.rs b/libs/wingii/src/fqn.rs
index 273c6fd13aa..7c9e4e4668b 100644
--- a/libs/wingii/src/fqn.rs
+++ b/libs/wingii/src/fqn.rs
@@ -1,5 +1,7 @@
 use std::fmt::{Display, Formatter};
 
+const FQN_SEPARATOR: char = '.';
+
 /// Represents a fully-qualified name (FQN) of a type in a JSII library.
 /// For example, `@aws-cdk/aws-ec2.Vpc` is a FQN.
 /// The FQN uniquely identifies a type within the JSII ecosystem.
@@ -11,49 +13,59 @@ use std::fmt::{Display, Formatter};
 /// TODO: What if a jsii library an npm package that has a dot in its name?
 /// https://github.com/winglang/wing/issues/1515
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct FQN<'a>(&'a str);
+pub struct FQN<'a> {
+	pub raw: &'a str,
+	pub parts: Vec<&'a str>,
+}
 
 impl<'a> From<&'a str> for FQN<'a> {
 	fn from(fqn: &'a str) -> Self {
-		if fqn.split('.').count() < 2 {
-			panic!("Invalid FQN: {}", fqn);
-		}
-		FQN(fqn)
+		FQN::new(fqn)
 	}
 }
 
 impl<'a> FQN<'a> {
+	pub fn new(raw: &'a str) -> Self {
+		let parts: Vec<&str> = raw.split(FQN_SEPARATOR).collect();
+		if parts.len() < 2 {
+			panic!("Invalid FQN: {raw}");
+		}
+
+		FQN { raw, parts }
+	}
+
 	/// Returns the FQN as a string.
 	pub fn as_str(&self) -> &str {
-		self.0
+		self.raw
 	}
 
 	/// Returns the FQN as a string without the type name.
 	pub fn as_str_without_type_name(&self) -> &str {
-		let index = self.0.rfind('.').unwrap();
-		&self.0[..index]
+		let index = self.raw.rfind(FQN_SEPARATOR).unwrap();
+		&self.raw[..index]
 	}
 
 	/// Returns the "assembly" part of the FQN. This is the name of the
 	/// JSII library or Wing library the type is defined in.
 	pub fn assembly(&self) -> &str {
-		self.0.split('.').next().unwrap()
+		self.parts[0]
 	}
 
 	/// Returns the "type name" part of the FQN. This is the name of the
 	/// type itself.
 	pub fn type_name(&self) -> &str {
-		self.0.split('.').last().unwrap()
+		self.parts[self.parts.len() - 1]
 	}
 
 	/// Returns an iterator over the namespaces of the FQN. The namespaces
 	/// are the parts of the FQN between the assembly name and the type name
 	/// which are used to group types together.
-	pub fn namespaces(&self) -> impl Iterator<Item = &str> {
-		let mut parts = self.0.split('.');
-		parts.next();
-		parts.next_back().unwrap();
-		parts
+	pub fn namespaces(&self) -> &[&str] {
+		if self.parts.len() > 2 {
+			&self.parts[1..self.parts.len() - 1]
+		} else {
+			&[]
+		}
 	}
 
 	/// Returns true if the FQN belongs to a namespace that is a prefix of the given namespace filter.
@@ -66,17 +78,26 @@ impl<'a> FQN<'a> {
 	/// - `["ns1", "ns2", "ns3"]`
 	/// - `["ns2"]`
 	pub fn is_in_namespace<T: AsRef<str>>(&self, namespace_filter: &[T]) -> bool {
-		self.namespaces().count() >= namespace_filter.len()
+		self.namespaces().len() >= namespace_filter.len()
 			&& self
 				.namespaces()
+				.iter()
 				.zip(namespace_filter.iter())
-				.all(|(ns, filter)| ns == filter.as_ref())
+				.all(|(ns, filter)| *ns == filter.as_ref())
+	}
+
+	pub fn has_prefix(&self, prefix: &Option<String>) -> bool {
+		if let Some(prefix) = prefix {
+			self.raw.starts_with(prefix)
+		} else {
+			self.namespaces().len() == 0
+		}
 	}
 }
 
 impl Display for FQN<'_> {
 	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-		write!(f, "{}", self.0)
+		self.raw.fmt(f)
 	}
 }
 
@@ -87,37 +108,37 @@ mod tests {
 
 	#[test]
 	fn test_fqn1() {
-		let fqn = FQN("@aws-cdk/aws-ec2.Vpc");
+		let fqn = FQN::new("@aws-cdk/aws-ec2.Vpc");
 		assert_eq!(fqn.assembly(), "@aws-cdk/aws-ec2");
-		assert_eq!(fqn.namespaces().collect::<Vec<_>>(), vec![] as Vec<&str>);
+		assert_eq!(fqn.namespaces(), vec![] as Vec<&str>);
 		assert_eq!(fqn.type_name(), "Vpc");
 	}
 
 	#[test]
 	fn test_fqn2() {
-		let fqn = FQN("@winglang/sdk.cloud.Bucket");
+		let fqn = FQN::new("@winglang/sdk.cloud.Bucket");
 		assert_eq!(fqn.assembly(), "@winglang/sdk");
-		assert_eq!(fqn.namespaces().collect::<Vec<_>>(), vec!["cloud"]);
+		assert_eq!(fqn.namespaces(), vec!["cloud"]);
 		assert_eq!(fqn.type_name(), "Bucket");
 	}
 
 	#[test]
 	fn test_fqn3() {
-		let fqn = FQN("my_lib.ns1.ns2.MyResource");
+		let fqn = FQN::new("my_lib.ns1.ns2.MyResource");
 		assert_eq!(fqn.assembly(), "my_lib");
-		assert_eq!(fqn.namespaces().collect::<Vec<_>>(), vec!["ns1", "ns2"]);
+		assert_eq!(fqn.namespaces(), vec!["ns1", "ns2"]);
 		assert_eq!(fqn.type_name(), "MyResource");
 	}
 
 	#[test]
 	fn test_fqn_as_str_without_type_name() {
-		let fqn = FQN("my_lib.ns1.ns2.MyResource");
+		let fqn = FQN::new("my_lib.ns1.ns2.MyResource");
 		assert_eq!(fqn.as_str_without_type_name(), "my_lib.ns1.ns2");
 	}
 
 	#[test]
 	fn test_fqn_is_in_namespace() {
-		let fqn = FQN("my_lib.ns1.ns2.MyResource");
+		let fqn = FQN::new("my_lib.ns1.ns2.MyResource");
 
 		assert_eq!(fqn.is_in_namespace::<&str>(&vec![]), true);
 		assert_eq!(fqn.is_in_namespace(&vec!["ns1"]), true);
diff --git a/libs/wingii/src/node_resolve.rs b/libs/wingii/src/node_resolve.rs
index e63067c751e..25f2e101603 100644
--- a/libs/wingii/src/node_resolve.rs
+++ b/libs/wingii/src/node_resolve.rs
@@ -12,7 +12,8 @@ use camino::{Utf8Path, Utf8PathBuf};
 use serde_json::Value;
 
 static ROOT: &str = "/";
-static NODE_EXTENSIONS: [&str; 3] = [".js", "json", ".node"];
+static NODE_WING_FIELD: &str = "wing";
+static NODE_EXTENSIONS: [&str; 5] = [".js", ".cjs", ".mjs", "json", ".node"];
 static NODE_MAIN_FIELDS: [&str; 1] = ["main"];
 static NODE_BUILTINS: [&str; 33] = [
 	"assert",
@@ -103,17 +104,20 @@ fn resolve_as_file(path: &Utf8Path) -> Result<Utf8PathBuf, Box<dyn Error>> {
 /// Resolve by walking up node_modules folders.
 fn resolve_node_modules(target: &str, basedir: &Utf8Path) -> Result<Utf8PathBuf, Box<dyn Error>> {
 	let node_modules = basedir.join("node_modules");
-	if node_modules.is_dir() {
+	let result = if node_modules.is_dir() {
 		let path = node_modules.join(target);
-		let result = resolve_as_file(&path).or_else(|_| resolve_as_directory(&path));
-		if result.is_ok() {
-			return result;
-		}
+		resolve_as_file(&path).or_else(|_| resolve_as_directory(&path))
+	} else {
+		Err(String::from("Not Found").into())
+	};
+
+	if result.is_ok() {
+		return result;
 	}
 
 	match basedir.parent() {
 		Some(parent) => resolve_node_modules(target, parent),
-		None => Err(String::from("Not Found").into()),
+		None => result,
 	}
 }
 
@@ -145,6 +149,11 @@ fn resolve_package_main(pkg_path: &Utf8Path) -> Result<Utf8PathBuf, Box<dyn Erro
 		return Err(String::from("package.json is not an object").into());
 	}
 
+	// wing packages don't need a main field
+	if pkg[NODE_WING_FIELD].as_bool().unwrap_or(false) {
+		return Ok(pkg_dir.into());
+	}
+
 	let main_field = NODE_MAIN_FIELDS
 		.iter()
 		.find(|name| pkg[name].is_string())
diff --git a/libs/wingii/src/util.rs b/libs/wingii/src/util.rs
index 3061b117904..babd9ad2822 100644
--- a/libs/wingii/src/util.rs
+++ b/libs/wingii/src/util.rs
@@ -11,11 +11,11 @@ pub mod package_json {
 	pub fn dependencies_of(package_json: &serde_json::Value) -> HashSet<String> {
 		// merge both dependencies and peerDependencies and return the list of keys
 		let mut deps = HashSet::new();
-		if let Some(deps_obj) = package_json.get("dependencies") {
-			deps.extend(deps_obj.as_object().unwrap().keys().cloned());
+		if let Some(deps_obj) = package_json.get("dependencies").and_then(|x| x.as_object()) {
+			deps.extend(deps_obj.keys().cloned());
 		}
-		if let Some(deps_obj) = package_json.get("peerDependencies") {
-			deps.extend(deps_obj.as_object().unwrap().keys().cloned());
+		if let Some(deps_obj) = package_json.get("peerDependencies").and_then(|x| x.as_object()) {
+			deps.extend(deps_obj.keys().cloned());
 		}
 		deps
 	}
@@ -23,23 +23,11 @@ pub mod package_json {
 	pub fn bundled_dependencies_of(package_json: &serde_json::Value) -> Vec<String> {
 		// merge both bundledDependencies and bundleDependencies and return the list of keys
 		let mut deps = Vec::new();
-		if let Some(deps_obj) = package_json.get("bundledDependencies") {
-			deps.extend(
-				deps_obj
-					.as_array()
-					.unwrap()
-					.iter()
-					.map(|s| s.as_str().unwrap().to_string()),
-			);
+		if let Some(deps_obj) = package_json.get("bundledDependencies").and_then(|x| x.as_array()) {
+			deps.extend(deps_obj.iter().filter_map(|s| s.as_str().map(|s| s.to_string())));
 		}
-		if let Some(deps_obj) = package_json.get("bundleDependencies") {
-			deps.extend(
-				deps_obj
-					.as_array()
-					.unwrap()
-					.iter()
-					.map(|s| s.as_str().unwrap().to_string()),
-			);
+		if let Some(deps_obj) = package_json.get("bundleDependencies").and_then(|x| x.as_array()) {
+			deps.extend(deps_obj.iter().filter_map(|s| s.as_str().map(|s| s.to_string())));
 		}
 		deps
 	}
@@ -86,3 +74,56 @@ pub mod package_json {
 		}
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use serde_json::json;
+	#[test]
+	fn test_dependencies_of() {
+		let package_json = json!({
+			"dependencies": {
+				"serde": "^1.0",
+				"serde_json": "^1.0"
+			},
+			"peerDependencies": {
+				"regex": "^1.0"
+			}
+		});
+
+		let dependencies = package_json::dependencies_of(&package_json);
+
+		assert_eq!(dependencies.len(), 3);
+		assert!(dependencies.contains("serde"));
+		assert!(dependencies.contains("serde_json"));
+		assert!(dependencies.contains("regex"));
+	}
+
+	#[test]
+	fn test_bundled_dependencies_of() {
+		let package_json = json!({
+			"bundledDependencies": ["uuid", "chrono"],
+			"bundleDependencies": ["reqwest"]
+		});
+
+		let bundled_dependencies = package_json::bundled_dependencies_of(&package_json);
+
+		assert_eq!(bundled_dependencies.len(), 3);
+		assert!(bundled_dependencies.contains(&"uuid".to_string()));
+		assert!(bundled_dependencies.contains(&"chrono".to_string()));
+		assert!(bundled_dependencies.contains(&"reqwest".to_string()));
+	}
+
+	#[test]
+	fn test_invalid_bundled_dependencies_of() {
+		let package_json = json!({
+			"bundledDependencies": ["uuid"],
+			"bundleDependencies": "reqwest"
+		});
+
+		let bundled_dependencies = package_json::bundled_dependencies_of(&package_json);
+
+		assert_eq!(bundled_dependencies.len(), 1);
+		assert!(bundled_dependencies.contains(&"uuid".to_string()));
+	}
+}
diff --git a/libs/wingsdk/.eslintrc.json b/libs/wingsdk/.eslintrc.json
index 04cd8603ade..3a1dc728cc9 100644
--- a/libs/wingsdk/.eslintrc.json
+++ b/libs/wingsdk/.eslintrc.json
@@ -38,11 +38,8 @@
     }
   },
   "ignorePatterns": [
-    "*.js",
-    "*.d.ts",
-    "node_modules/",
-    "*.generated.ts",
-    "coverage",
+    "src/.gen/",
+    "**/*.d.ts",
     "!.projenrc.ts",
     "!projenrc/**/*.ts"
   ],
@@ -58,7 +55,7 @@
       {
         "devDependencies": [
           "**/test/**",
-          "**/build-tools/**",
+          "**/scripts/**",
           ".projenrc.ts",
           "projenrc/**/*.ts"
         ],
@@ -131,6 +128,7 @@
         ]
       }
     ],
+    "@typescript-eslint/no-misused-promises": "error",
     "import/no-restricted-paths": [
       "error",
       {
@@ -185,6 +183,19 @@
         ]
       }
     },
+    {
+      "files": [
+        "vitest.config.mts"
+      ],
+      "rules": {
+        "import/no-extraneous-dependencies": [
+          "error",
+          {
+            "devDependencies": true
+          }
+        ]
+      }
+    },
     {
       "files": [
         ".projenrc.ts"
diff --git a/libs/wingsdk/.projen/deps.json b/libs/wingsdk/.projen/deps.json
index a37df272ec1..bd21866776f 100644
--- a/libs/wingsdk/.projen/deps.json
+++ b/libs/wingsdk/.projen/deps.json
@@ -2,7 +2,7 @@
   "dependencies": [
     {
       "name": "@cdktf/provider-aws",
-      "version": "^15.0.0",
+      "version": "^19",
       "type": "build"
     },
     {
@@ -17,13 +17,17 @@
       "name": "@types/fs-extra",
       "type": "build"
     },
+    {
+      "name": "@types/glob",
+      "type": "build"
+    },
     {
       "name": "@types/mime-types",
       "type": "build"
     },
     {
       "name": "@types/node",
-      "version": "^18",
+      "version": "^20",
       "type": "build"
     },
     {
@@ -32,16 +36,12 @@
     },
     {
       "name": "@typescript-eslint/eslint-plugin",
-      "version": "^5",
+      "version": "^7",
       "type": "build"
     },
     {
       "name": "@typescript-eslint/parser",
-      "version": "^5",
-      "type": "build"
-    },
-    {
-      "name": "@vitest/coverage-v8",
+      "version": "^7",
       "type": "build"
     },
     {
@@ -49,11 +49,13 @@
       "type": "build"
     },
     {
-      "name": "aws-sdk-client-mock",
+      "name": "aws-sdk-client-mock-jest",
+      "version": "3.0.0",
       "type": "build"
     },
     {
-      "name": "aws-sdk-client-mock-jest",
+      "name": "aws-sdk-client-mock",
+      "version": "3.0.0",
       "type": "build"
     },
     {
@@ -62,7 +64,7 @@
     },
     {
       "name": "cdktf-cli",
-      "version": "0.17.0",
+      "version": "0.20.3",
       "type": "build"
     },
     {
@@ -71,7 +73,7 @@
     },
     {
       "name": "constructs",
-      "version": "~10.2.69",
+      "version": "^10.3",
       "type": "build"
     },
     {
@@ -100,7 +102,7 @@
     },
     {
       "name": "eslint",
-      "version": "^8",
+      "version": "^8.56.0",
       "type": "build"
     },
     {
@@ -117,23 +119,18 @@
     },
     {
       "name": "jsii",
-      "version": "5.0.11",
+      "version": "~5.3.11",
       "type": "build"
     },
     {
       "name": "mock-gcs",
-      "version": "^1.0.0",
+      "version": "^1.2.0",
       "type": "build"
     },
     {
       "name": "nanoid",
       "type": "build"
     },
-    {
-      "name": "npm-check-updates",
-      "version": "^16",
-      "type": "build"
-    },
     {
       "name": "prettier",
       "type": "build"
@@ -148,7 +145,7 @@
       "type": "build"
     },
     {
-      "name": "ts-node",
+      "name": "tsx",
       "type": "build"
     },
     {
@@ -165,66 +162,70 @@
     },
     {
       "name": "@aws-sdk/client-cloudwatch-logs",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/client-dynamodb",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/client-elasticache",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/client-lambda",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/client-s3",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/client-secrets-manager",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/client-sns",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/client-sqs",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/s3-request-presigner",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/types",
-      "version": "3.449.0",
       "type": "bundled"
     },
     {
       "name": "@aws-sdk/util-dynamodb",
-      "version": "3.449.0",
+      "version": "3.577.0",
       "type": "bundled"
     },
     {
       "name": "@azure/core-paging",
       "type": "bundled"
     },
+    {
+      "name": "@azure/data-tables",
+      "version": "13.2.2",
+      "type": "bundled"
+    },
     {
       "name": "@azure/identity",
-      "version": "3.1.3",
+      "version": "4.0.1",
       "type": "bundled"
     },
     {
@@ -232,6 +233,11 @@
       "version": "12.14.0",
       "type": "bundled"
     },
+    {
+      "name": "@google-cloud/datastore",
+      "version": "8.4.0",
+      "type": "bundled"
+    },
     {
       "name": "@google-cloud/storage",
       "version": "6.9.5",
@@ -251,9 +257,18 @@
       "name": "@types/aws-lambda",
       "type": "bundled"
     },
+    {
+      "name": "@winglang/wingtunnels",
+      "version": "workspace:^",
+      "type": "bundled"
+    },
+    {
+      "name": "ajv",
+      "type": "bundled"
+    },
     {
       "name": "cdktf",
-      "version": "0.17.0",
+      "version": "0.20.3",
       "type": "bundled"
     },
     {
@@ -261,13 +276,17 @@
       "type": "bundled"
     },
     {
-      "name": "esbuild-wasm",
+      "name": "cron-validator",
       "type": "bundled"
     },
     {
       "name": "express",
       "type": "bundled"
     },
+    {
+      "name": "glob",
+      "type": "bundled"
+    },
     {
       "name": "google-auth-library",
       "type": "bundled"
@@ -277,7 +296,7 @@
       "type": "bundled"
     },
     {
-      "name": "jsonschema",
+      "name": "jiti",
       "type": "bundled"
     },
     {
@@ -294,6 +313,11 @@
       "version": "^3.3.6",
       "type": "bundled"
     },
+    {
+      "name": "protobufjs",
+      "version": "7.2.5",
+      "type": "bundled"
+    },
     {
       "name": "safe-stable-stringify",
       "type": "bundled"
@@ -303,25 +327,38 @@
       "type": "bundled"
     },
     {
-      "name": "undici",
+      "name": "toml",
+      "type": "bundled"
+    },
+    {
+      "name": "ulid",
       "type": "bundled"
     },
     {
       "name": "uuid",
       "type": "bundled"
     },
+    {
+      "name": "vlq",
+      "type": "bundled"
+    },
     {
       "name": "yaml",
       "type": "bundled"
     },
+    {
+      "name": "@types/node",
+      "version": "^20.11.0",
+      "type": "devenv"
+    },
     {
       "name": "constructs",
-      "version": "~10.2.69",
+      "version": "^10.3",
       "type": "peer"
     },
     {
       "name": "constructs",
-      "version": "~10.2.69",
+      "version": "^10.3",
       "type": "runtime"
     }
   ],
diff --git a/libs/wingsdk/.projen/tasks.json b/libs/wingsdk/.projen/tasks.json
index 72f970f5026..7980134af10 100644
--- a/libs/wingsdk/.projen/tasks.json
+++ b/libs/wingsdk/.projen/tasks.json
@@ -112,7 +112,7 @@
       "description": "Synthesize project files",
       "steps": [
         {
-          "exec": "ts-node --project tsconfig.dev.json .projenrc.ts"
+          "exec": "tsx --tsconfig tsconfig.dev.json .projenrc.ts"
         }
       ]
     },
@@ -121,331 +121,7 @@
       "description": "Generate API.md from .jsii manifest",
       "steps": [
         {
-          "exec": "cp -r src/cloud/*.md ../../docs/docs/04-standard-library/01-cloud/"
-        },
-        {
-          "exec": "cp -r src/ex/*.md ../../docs/docs/04-standard-library/02-ex/"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule expect"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/expect"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the expect module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/expect/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/expect/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule fs"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/fs"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the fs module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/fs/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/fs/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule http"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/http"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the http module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/http/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/http/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule math"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/math"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the math module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/math/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/math/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule regex"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/regex"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the regex module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/regex/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/regex/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule aws"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/aws"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the aws module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/aws/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/aws/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule sim"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/sim"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the sim module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/sim/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/sim/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule ui"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/ui"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the ui module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/ui/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/ui/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule util"
-        },
-        {
-          "exec": "mkdir -p ../../docs/docs/04-standard-library/util"
-        },
-        {
-          "exec": "echo '---\ntitle: API reference\nid: api-reference\ndescription: Wing standard library API reference for the util module\nkeywords: [Wing sdk, sdk, Wing API Reference]\nhide_title: true\nsidebar_position: 100\n---\n\n<!-- This file is automatically generated. Do not edit manually. -->\n' > ../../docs/docs/04-standard-library/util/api-reference.md"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/util/api-reference.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/api"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/api.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/bucket"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/bucket.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/counter"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/counter.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/domain"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/domain.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/function"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/function.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/on-deploy"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/on-deploy.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/queue"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/queue.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/schedule"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/schedule.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/secret"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/secret.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/service"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/service.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/topic"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/topic.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/website"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/website.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule cloud/workload"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/01-cloud/workload.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule ex/dynamodb-table"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/02-ex/dynamodb-table.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule ex/react-app"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/02-ex/react-app.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule ex/redis"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/02-ex/redis.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule ex/table"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/02-ex/table.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: array\nid: array\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/array.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/array"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/array.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: bool\nid: bool\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/bool.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/bool"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/bool.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: datetime\nid: datetime\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/datetime.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/datetime"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/datetime.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: duration\nid: duration\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/duration.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/duration"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/duration.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: json\nid: json\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/json.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/json"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/json.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: jsonSchema\nid: jsonSchema\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/json_schema.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/json_schema"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/json_schema.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: map\nid: map\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/map.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/map"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/map.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: node\nid: node\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/node.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/node"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/node.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: number\nid: number\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/number.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/number"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/number.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: set\nid: set\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/set.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/set"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/set.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: string\nid: string\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/string.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/string"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/string.md"
-        },
-        {
-          "exec": "echo \"---\ntitle: struct\nid: struct\n---\n\n\" > ../../docs/docs/04-standard-library/03-std/struct.md"
-        },
-        {
-          "exec": "jsii-docgen -o API.md -l wing --submodule std/struct"
-        },
-        {
-          "exec": "cat API.md >> ../../docs/docs/04-standard-library/03-std/struct.md"
-        },
-        {
-          "exec": "rm API.md"
+          "exec": "tsx scripts/docgen.mts"
         }
       ]
     },
@@ -466,7 +142,7 @@
       "description": "Runs eslint against the codebase",
       "steps": [
         {
-          "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools projenrc .projenrc.ts"
+          "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test scripts projenrc .projenrc.ts"
         }
       ]
     },
@@ -527,16 +203,12 @@
         }
       ]
     },
-    "post-upgrade": {
-      "name": "post-upgrade",
-      "description": "Runs after upgrading dependencies"
-    },
     "pre-compile": {
       "name": "pre-compile",
       "description": "Prepare the project for compilation",
       "steps": [
         {
-          "exec": "cdktf get --force"
+          "exec": "cdktf get"
         }
       ]
     },
@@ -569,7 +241,7 @@
       "description": "Run tests",
       "steps": [
         {
-          "exec": "vitest run --coverage --update --passWithNoTests"
+          "exec": "vitest run --update"
         },
         {
           "spawn": "eslint"
@@ -601,45 +273,6 @@
         }
       ]
     },
-    "upgrade": {
-      "name": "upgrade",
-      "description": "upgrade dependencies",
-      "env": {
-        "CI": "0"
-      },
-      "steps": [
-        {
-          "exec": "pnpm update npm-check-updates"
-        },
-        {
-          "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='cdktf-cli,constructs,jsii,@aws-sdk/client-cloudwatch-logs,@aws-sdk/client-dynamodb,@aws-sdk/client-elasticache,@aws-sdk/client-lambda,@aws-sdk/client-s3,@aws-sdk/client-secrets-manager,@aws-sdk/client-sns,@aws-sdk/client-sqs,@aws-sdk/s3-request-presigner,@aws-sdk/types,@aws-sdk/util-dynamodb,@azure/identity,@azure/storage-blob,@google-cloud/storage,@smithy/util-stream,@smithy/util-utf8,cdktf'"
-        },
-        {
-          "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='cdktf-cli,constructs,jsii,@aws-sdk/client-cloudwatch-logs,@aws-sdk/client-dynamodb,@aws-sdk/client-elasticache,@aws-sdk/client-lambda,@aws-sdk/client-s3,@aws-sdk/client-secrets-manager,@aws-sdk/client-sns,@aws-sdk/client-sqs,@aws-sdk/s3-request-presigner,@aws-sdk/types,@aws-sdk/util-dynamodb,@azure/identity,@azure/storage-blob,@google-cloud/storage,@smithy/util-stream,@smithy/util-utf8,cdktf'"
-        },
-        {
-          "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='cdktf-cli,constructs,jsii,@aws-sdk/client-cloudwatch-logs,@aws-sdk/client-dynamodb,@aws-sdk/client-elasticache,@aws-sdk/client-lambda,@aws-sdk/client-s3,@aws-sdk/client-secrets-manager,@aws-sdk/client-sns,@aws-sdk/client-sqs,@aws-sdk/s3-request-presigner,@aws-sdk/types,@aws-sdk/util-dynamodb,@azure/identity,@azure/storage-blob,@google-cloud/storage,@smithy/util-stream,@smithy/util-utf8,cdktf'"
-        },
-        {
-          "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='cdktf-cli,constructs,jsii,@aws-sdk/client-cloudwatch-logs,@aws-sdk/client-dynamodb,@aws-sdk/client-elasticache,@aws-sdk/client-lambda,@aws-sdk/client-s3,@aws-sdk/client-secrets-manager,@aws-sdk/client-sns,@aws-sdk/client-sqs,@aws-sdk/s3-request-presigner,@aws-sdk/types,@aws-sdk/util-dynamodb,@azure/identity,@azure/storage-blob,@google-cloud/storage,@smithy/util-stream,@smithy/util-utf8,cdktf'"
-        },
-        {
-          "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='cdktf-cli,constructs,jsii,@aws-sdk/client-cloudwatch-logs,@aws-sdk/client-dynamodb,@aws-sdk/client-elasticache,@aws-sdk/client-lambda,@aws-sdk/client-s3,@aws-sdk/client-secrets-manager,@aws-sdk/client-sns,@aws-sdk/client-sqs,@aws-sdk/s3-request-presigner,@aws-sdk/types,@aws-sdk/util-dynamodb,@azure/identity,@azure/storage-blob,@google-cloud/storage,@smithy/util-stream,@smithy/util-utf8,cdktf'"
-        },
-        {
-          "exec": "pnpm i --no-frozen-lockfile"
-        },
-        {
-          "exec": "pnpm update @cdktf/provider-aws @types/aws-lambda @types/express @types/fs-extra @types/mime-types @types/node @types/uuid @typescript-eslint/eslint-plugin @typescript-eslint/parser @vitest/coverage-v8 @winglang/jsii-docgen aws-sdk-client-mock aws-sdk-client-mock-jest bump-pack cdktf-cli chalk constructs eslint-config-prettier eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint-plugin-sort-exports eslint fs-extra jsii-diff jsii-pacmak jsii mock-gcs nanoid npm-check-updates prettier projen standard-version ts-node typescript vitest wing-api-checker @aws-sdk/client-cloudwatch-logs @aws-sdk/client-dynamodb @aws-sdk/client-elasticache @aws-sdk/client-lambda @aws-sdk/client-s3 @aws-sdk/client-secrets-manager @aws-sdk/client-sns @aws-sdk/client-sqs @aws-sdk/s3-request-presigner @aws-sdk/types @aws-sdk/util-dynamodb @azure/core-paging @azure/identity @azure/storage-blob @google-cloud/storage @smithy/util-stream @smithy/util-utf8 @types/aws-lambda cdktf cron-parser esbuild-wasm express google-auth-library ioredis jsonschema mime-types mime nanoid safe-stable-stringify stacktracey undici uuid yaml constructs constructs"
-        },
-        {
-          "exec": "pnpm exec projen"
-        },
-        {
-          "spawn": "post-upgrade"
-        }
-      ]
-    },
     "watch": {
       "name": "watch",
       "description": "Watch & compile in the background",
diff --git a/libs/wingsdk/.projenrc.ts b/libs/wingsdk/.projenrc.ts
index 01dc224edba..3ebe2dcbaf8 100644
--- a/libs/wingsdk/.projenrc.ts
+++ b/libs/wingsdk/.projenrc.ts
@@ -1,27 +1,16 @@
-import { readdirSync } from "fs";
-import { JsonFile, cdk, javascript } from "projen";
-import * as cloud from "./src";
+import { JsonFile, cdk, javascript, DependencyType } from "projen";
 
-const JSII_DEPS = ["constructs@~10.2.69"];
-const CDKTF_VERSION = "0.17.0";
+const JSII_DEPS = ["constructs@^10.3"];
+const CDKTF_VERSION = "0.20.3";
+const AWS_SDK_VERSION = "3.577.0";
 
 const CDKTF_PROVIDERS = [
-  "aws@~>4.65.0",
+  "aws@~>5.31.0",
   "random@~>3.5.1",
-  "azurerm@~>3.54.0",
-  "google@~>4.63.1",
+  "azurerm@~>3.96.0",
+  "google@~>5.10.0",
 ];
 
-// those will be skipped out of the docs
-const SKIPPED_MODULES = ["cloud", "ex", "std", "simulator", "core", "platform"];
-const publicModules = Object.keys(cloud).filter(
-  (item) => !SKIPPED_MODULES.includes(item)
-);
-
-const CLOUD_DOCS_PREFIX = "../../docs/docs/04-standard-library/01-cloud/";
-const EX_DOCS_PREFIX = "../../docs/docs/04-standard-library/02-ex/";
-const STD_DOCS_PREFIX = "../../docs/docs/04-standard-library/03-std/";
-
 // defines the list of dependencies required for each compilation target that is not built into the
 // compiler (like Terraform targets).
 const TARGET_DEPS: { [key: string]: string[] } = {};
@@ -44,6 +33,7 @@ const project = new cdk.JsiiProject({
   peerDeps: [...JSII_DEPS],
   deps: [...JSII_DEPS],
   tsconfig: {
+    include: ["src/**/*.ts", "test/**/*.ts", "*.ts", "*.mts", "scripts/*.mts"],
     compilerOptions: {
       lib: ["es2020", "dom", "dom.iterable"],
     },
@@ -52,91 +42,146 @@ const project = new cdk.JsiiProject({
     `cdktf@${CDKTF_VERSION}`,
     ...sideLoad,
     // preflight dependencies
-    "esbuild-wasm",
     "safe-stable-stringify",
-    // aws client dependencies
-    // (note: these should always be updated together, otherwise they will
-    // conflict with each other)
-    "@aws-sdk/client-cloudwatch-logs@3.449.0",
-    "@aws-sdk/client-dynamodb@3.449.0",
-    "@aws-sdk/client-elasticache@3.449.0",
-    "@aws-sdk/util-dynamodb@3.449.0",
-    "@aws-sdk/client-lambda@3.449.0",
-    "@aws-sdk/client-secrets-manager@3.449.0",
-    "@aws-sdk/client-sqs@3.449.0",
-    "@aws-sdk/client-sns@3.449.0",
-    "@aws-sdk/client-s3@3.449.0",
-    "@aws-sdk/s3-request-presigner@3.449.0",
-    "@aws-sdk/types@3.449.0",
+    "jiti",
+    // aws sdk client dependencies
+    // change `AWS_SDK_VERSION` to update all deps at once
+    "@aws-sdk/client-cloudwatch-logs",
+    "@aws-sdk/client-dynamodb",
+    "@aws-sdk/client-elasticache",
+    "@aws-sdk/client-lambda",
+    "@aws-sdk/client-s3",
+    "@aws-sdk/client-secrets-manager",
+    "@aws-sdk/client-sns",
+    "@aws-sdk/client-sqs",
+    "@aws-sdk/s3-request-presigner",
+    "@aws-sdk/util-dynamodb",
+    // aws other client dependencies
     "@smithy/util-stream@2.0.17",
     "@smithy/util-utf8@2.0.0",
     "@types/aws-lambda",
+    "@aws-sdk/types",
     "mime-types",
     "mime@^3.0.0",
     // azure client dependencies
     "@azure/storage-blob@12.14.0",
-    "@azure/identity@3.1.3",
+    "@azure/data-tables@13.2.2",
+    "@azure/identity@4.0.1",
     "@azure/core-paging",
     // gcp client dependencies
     "@google-cloud/storage@6.9.5",
+    "@google-cloud/datastore@8.4.0",
     "google-auth-library",
+    "protobufjs@7.2.5",
     // simulator dependencies
     "express",
     "uuid",
-    "undici",
     // using version 3 because starting from version 4, it no longer works with CommonJS.
     "nanoid@^3.3.6",
     "cron-parser",
     // shared client dependencies
     "ioredis",
-    "jsonschema",
+    "ajv",
+    "cron-validator",
     // fs module dependency
     "yaml",
+    "toml",
     // enhanced diagnostics
     "stacktracey",
+    "ulid",
+    "vlq",
+    // tunnels
+    "@winglang/wingtunnels@workspace:^",
+    "glob",
   ],
   devDeps: [
-    `@cdktf/provider-aws@^15.0.0`, // only for testing Wing plugins
+    `@cdktf/provider-aws@^19`, // only for testing Wing plugins
     "wing-api-checker",
     "bump-pack",
     "@types/aws-lambda",
     "@types/fs-extra",
     "@types/mime-types",
-    "mock-gcs@^1.0.0",
+    "mock-gcs@^1.2.0",
     "@types/express",
-    "aws-sdk-client-mock",
-    "aws-sdk-client-mock-jest",
+    "@types/glob",
+    "aws-sdk-client-mock@3.0.0",
+    "aws-sdk-client-mock-jest@3.0.0",
     `cdktf-cli@${CDKTF_VERSION}`,
     "eslint-plugin-sort-exports",
     "fs-extra",
     "vitest",
     "@types/uuid",
-    "@vitest/coverage-v8",
     "nanoid", // for ESM import test in target-sim/function.test.ts
     "chalk",
+    "tsx",
     ...JSII_DEPS,
   ],
+  eslintOptions: {
+    dirs: ["src"],
+    devdirs: ["test", "scripts"],
+    ignorePatterns: ["src/.gen/", "**/*.d.ts"],
+  },
   jest: false,
+  depsUpgrade: false,
   prettier: true,
   npmignoreEnabled: false,
-  minNodeVersion: "18.13.0",
+  minNodeVersion: "20.0.0",
   projenCommand: "pnpm exec projen",
   packageManager: javascript.NodePackageManager.PNPM,
   codeCov: true,
   codeCovTokenSecret: "CODECOV_TOKEN",
   github: false,
   projenrcTs: true,
-  jsiiVersion: "5.0.11",
+  jsiiVersion: "~5.3.11",
 });
+project.defaultTask!.reset("tsx --tsconfig tsconfig.dev.json .projenrc.ts");
+project.deps.removeDependency("ts-node");
 
-project.eslint?.addPlugins("sort-exports");
-project.eslint?.addOverride({
+/**
+ * Pin AWS SDK version and keep deps in sync
+ *
+ * `@aws-sdk/types` is excluded since it gets updated independently
+ * and its version may not match that of the AWS SDK clients
+ */
+project.deps.all
+  .filter(
+    (dep) => dep.name.startsWith("@aws-sdk/") && dep.name !== "@aws-sdk/types"
+  )
+  .map((dep) => project.addBundledDeps(`${dep.name}@${AWS_SDK_VERSION}`));
+
+project.deps.addDependency("eslint@^8.56.0", DependencyType.BUILD);
+project.deps.addDependency(
+  "@typescript-eslint/eslint-plugin@^7",
+  DependencyType.BUILD
+);
+project.deps.addDependency(
+  "@typescript-eslint/parser@^7",
+  DependencyType.BUILD
+);
+project.eslint!.addPlugins("sort-exports");
+project.eslint!.addOverride({
   files: ["src/**/index.ts"],
   rules: {
     "sort-exports/sort-exports": ["error", { sortDir: "asc" }],
   },
 });
 
+project.eslint!.addOverride({
+  files: ["vitest.config.mts"],
+  rules: {
+    "import/no-extraneous-dependencies": [
+      "error",
+      {
+        devDependencies: true,
+      },
+    ],
+  },
+});
+
+project.package.addField("optionalDependencies", {
+  esbuild: "^0.19.12",
+});
+
 // use fork of jsii-docgen with wing-ish support
 project.deps.removeDependency("jsii-docgen");
 project.addDevDeps("@winglang/jsii-docgen");
@@ -186,6 +231,7 @@ function disallowImportsRule(target: Zone, from: Zone): DisallowImportsRule {
 
 // Prevent unsafe imports between preflight and inflight and simulator code
 project.eslint!.addRules({
+  "@typescript-eslint/no-misused-promises": "error",
   "import/no-restricted-paths": [
     "error",
     {
@@ -248,114 +294,15 @@ project.tasks
 
 // --------------- docs -----------------
 
-const docsPrefix = (name: string) => {
-  return `../../docs/docs/04-standard-library/${name}`;
-};
-const docsFrontMatter = (name: string) => `---
-title: API reference
-id: api-reference
-description: Wing standard library API reference for the ${name} module
-keywords: [Wing sdk, sdk, Wing API Reference]
-hide_title: true
-sidebar_position: 100
----
-
-<!-- This file is automatically generated. Do not edit manually. -->
-`;
-
 const docgen = project.tasks.tryFind("docgen")!;
 docgen.reset();
-
-// copy readme docs
-docgen.exec(`cp -r src/cloud/*.md ${CLOUD_DOCS_PREFIX}`);
-docgen.exec(`cp -r src/ex/*.md ${EX_DOCS_PREFIX}`);
-
-// generate api reference for each submodule
-for (const mod of publicModules) {
-  const prefix = docsPrefix(mod);
-  const docsPath = prefix + "/api-reference.md";
-  docgen.exec(`jsii-docgen -o API.md -l wing --submodule ${mod}`);
-  docgen.exec(`mkdir -p ${prefix}`);
-  docgen.exec(`echo '${docsFrontMatter(mod)}' > ${docsPath}`);
-  docgen.exec(`cat API.md >> ${docsPath}`);
-}
-
-const UNDOCUMENTED_CLOUD_FILES = ["index", "test-runner"];
-const UNDOCUMENTED_EX_FILES = ["index"];
-
-const toCamelCase = (str: string) =>
-  str.replace(/_(.)/g, (_, chr) => chr.toUpperCase());
-
-function generateResourceApiDocs(
-  module: string,
-  pathToFolder: string,
-  docsPath: string,
-  excludedFiles: string[] = [],
-  allowUndocumented = false
-) {
-  const cloudFiles = readdirSync(pathToFolder);
-
-  const cloudResources: Set<string> = new Set(
-    cloudFiles.map((filename) => filename.split(".")[0])
-  );
-
-  excludedFiles.forEach((file) => cloudResources.delete(file));
-
-  const undocumentedResources = Array.from(cloudResources).filter(
-    (file) => !cloudFiles.includes(`${file}.md`)
-  );
-
-  if (undocumentedResources.length && !allowUndocumented) {
-    throw new Error(
-      `Detected undocumented resources: ${undocumentedResources.join(
-        ", "
-      )}. Please add the corresponding .md files in ${pathToFolder} folder.`
-    );
-  }
-
-  // generate api reference for each cloud/submodule and append it to the doc file
-  for (const mod of cloudResources) {
-    if (undocumentedResources.includes(mod)) {
-      // adding a title
-      docgen.exec(
-        `echo "---\ntitle: ${toCamelCase(mod)}\nid: ${toCamelCase(
-          mod
-        )}\n---\n\n" > ${docsPath}${mod}.md`
-      );
-    }
-    docgen.exec(`jsii-docgen -o API.md -l wing --submodule ${module}/${mod}`);
-    docgen.exec(`cat API.md >> ${docsPath}${mod}.md`);
-  }
-}
-
-generateResourceApiDocs(
-  "cloud",
-  "./src/cloud",
-  CLOUD_DOCS_PREFIX,
-  UNDOCUMENTED_CLOUD_FILES
-);
-generateResourceApiDocs(
-  "ex",
-  "./src/ex",
-  EX_DOCS_PREFIX,
-  UNDOCUMENTED_EX_FILES
-);
-
-generateResourceApiDocs(
-  "std",
-  "./src/std",
-  STD_DOCS_PREFIX,
-  ["README", "index", "test-runner", "resource", "test", "range", "generics"],
-  true
-);
-
-docgen.exec("rm API.md");
+docgen.exec("tsx scripts/docgen.mts");
 
 // --------------- end of docs -----------------
 
 // set up vitest related config
 project.addGitIgnore("/coverage/");
-project.testTask.reset("vitest run --coverage --update --passWithNoTests");
+project.testTask.reset("vitest run --update");
 const testWatch = project.addTask("test:watch");
 testWatch.exec("vitest"); // Watch is default mode for vitest
 testWatch.description = "Run vitest in watch mode";
@@ -390,7 +337,7 @@ new JsonFile(project, "cdktf.json", {
 });
 project.gitignore.addPatterns("src/.gen");
 
-project.preCompileTask.exec("cdktf get --force");
+project.preCompileTask.exec("cdktf get");
 
 project.package.file.addDeletionOverride("pnpm");
 
@@ -398,4 +345,6 @@ project.tryRemoveFile(".npmrc");
 
 project.packageTask.reset("bump-pack -b");
 
+project.deps.addDependency("@types/node@^20.11.0", DependencyType.DEVENV);
+
 project.synth();
diff --git a/libs/wingsdk/LICENSE b/libs/wingsdk/LICENSE
index 8baea73aae7..99cf6257708 100644
--- a/libs/wingsdk/LICENSE
+++ b/libs/wingsdk/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2023 Wing Cloud
+Copyright (c) 2024 Wing Cloud
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libs/wingsdk/README.md b/libs/wingsdk/README.md
index f5df41b11b4..a6d20618e41 100644
--- a/libs/wingsdk/README.md
+++ b/libs/wingsdk/README.md
@@ -29,7 +29,7 @@ bring cloud;
 let queue = new cloud.Queue();
 
 queue.setConsumer(inflight (message) => {
-  log("Hello, ${message}!");
+  log("Hello, {message}!");
 });
 ```
 
@@ -41,13 +41,13 @@ The Wing SDK can be used just like ordinary [CDK for TF Constructs](https://gith
 
 ```ts
 import { Construct } from "constructs";
-import * as sdk from "@winglang/sdk";
+import { cloud } from "@winglang/sdk";
 
 class HelloWorld extends Construct {
   constructor(scope: Construct, id: string) {
     super(scope, id);
 
-    let bucket = new sdk.cloud.Bucket(this, "bucket", {
+    let bucket = new cloud.Bucket(this, "bucket", {
       public: true,
     });
   }
@@ -85,9 +85,9 @@ We welcome community contributions and pull requests. See the [Wing Contributor'
 
 ## 🐣 Getting help
 
-If you need help either using or contributing to this project, please join us on our [Wing Slack].
+If you need help either using or contributing to this project, please join us on our [Wing Discord].
 
-[Wing Slack]: https://t.winglang.io/slack
+[Wing Discord]: https://t.winglang.io/discord
 
 ## ⚖️ License
 
diff --git a/libs/wingsdk/cdktf.json b/libs/wingsdk/cdktf.json
index d1c0e6dd47f..9c028d3b83e 100644
--- a/libs/wingsdk/cdktf.json
+++ b/libs/wingsdk/cdktf.json
@@ -2,10 +2,10 @@
   "language": "typescript",
   "app": "echo noop",
   "terraformProviders": [
-    "aws@~>4.65.0",
+    "aws@~>5.31.0",
     "random@~>3.5.1",
-    "azurerm@~>3.54.0",
-    "google@~>4.63.1"
+    "azurerm@~>3.96.0",
+    "google@~>5.10.0"
   ],
   "codeMakerOutput": "src/.gen",
   "projectId": "93afdbfa-23ed-40cf-9ce4-495b3289c519",
diff --git a/libs/wingsdk/package.json b/libs/wingsdk/package.json
index ff0e1fe636f..548be28fb39 100644
--- a/libs/wingsdk/package.json
+++ b/libs/wingsdk/package.json
@@ -21,13 +21,11 @@
     "package-all": "pnpm exec projen package-all",
     "package:js": "pnpm exec projen package:js",
     "post-compile": "pnpm exec projen post-compile",
-    "post-upgrade": "pnpm exec projen post-upgrade",
     "pre-compile": "pnpm exec projen pre-compile",
     "release": "pnpm exec projen release",
     "test": "pnpm exec projen test",
     "test:watch": "pnpm exec projen test:watch",
     "unbump": "pnpm exec projen unbump",
-    "upgrade": "pnpm exec projen upgrade",
     "watch": "pnpm exec projen watch",
     "projen": "pnpm exec projen"
   },
@@ -37,24 +35,24 @@
     "organization": true
   },
   "devDependencies": {
-    "@cdktf/provider-aws": "^15.0.0",
+    "@cdktf/provider-aws": "^19",
     "@types/aws-lambda": "^8.10.109",
     "@types/express": "^4.17.17",
     "@types/fs-extra": "^11.0.1",
+    "@types/glob": "^7.2.0",
     "@types/mime-types": "^2.1.2",
-    "@types/node": "^18",
+    "@types/node": "^20.11.0",
     "@types/uuid": "^9.0.3",
-    "@typescript-eslint/eslint-plugin": "^5",
-    "@typescript-eslint/parser": "^5",
-    "@vitest/coverage-v8": "^0.32.4",
+    "@typescript-eslint/eslint-plugin": "^7",
+    "@typescript-eslint/parser": "^7",
     "@winglang/jsii-docgen": "workspace:^",
-    "aws-sdk-client-mock": "^2.2.0",
-    "aws-sdk-client-mock-jest": "^2.2.0",
+    "aws-sdk-client-mock": "3.0.0",
+    "aws-sdk-client-mock-jest": "3.0.0",
     "bump-pack": "workspace:^",
-    "cdktf-cli": "0.17.0",
+    "cdktf-cli": "0.20.3",
     "chalk": "^4.1.2",
-    "constructs": "~10.2.69",
-    "eslint": "^8",
+    "constructs": "^10.3",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^3.6.0",
@@ -62,57 +60,64 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-sort-exports": "^0.8.0",
     "fs-extra": "^10.1.0",
-    "jsii": "5.0.11",
-    "jsii-diff": "^1.88.0",
-    "jsii-pacmak": "^1.88.0",
-    "mock-gcs": "^1.0.0",
+    "jsii": "~5.3.11",
+    "jsii-diff": "^1.94.0",
+    "jsii-pacmak": "^1.94.0",
+    "mock-gcs": "^1.2.0",
     "nanoid": "^3.3.4",
-    "npm-check-updates": "^16",
     "prettier": "^2.8.8",
     "projen": "^0.71.163",
     "standard-version": "^9",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.5",
-    "vitest": "^0.32.4",
+    "tsx": "^4.7.0",
+    "typescript": "^5.3.3",
+    "vitest": "^1.6.0",
     "wing-api-checker": "workspace:^"
   },
   "peerDependencies": {
-    "constructs": "~10.2.69"
+    "constructs": "^10.3"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "3.449.0",
-    "@aws-sdk/client-dynamodb": "3.449.0",
-    "@aws-sdk/client-elasticache": "3.449.0",
-    "@aws-sdk/client-lambda": "3.449.0",
-    "@aws-sdk/client-s3": "3.449.0",
-    "@aws-sdk/client-secrets-manager": "3.449.0",
-    "@aws-sdk/client-sns": "3.449.0",
-    "@aws-sdk/client-sqs": "3.449.0",
-    "@aws-sdk/s3-request-presigner": "3.449.0",
+    "@aws-sdk/client-cloudwatch-logs": "3.577.0",
+    "@aws-sdk/client-dynamodb": "3.577.0",
+    "@aws-sdk/client-elasticache": "3.577.0",
+    "@aws-sdk/client-lambda": "3.577.0",
+    "@aws-sdk/client-s3": "3.577.0",
+    "@aws-sdk/client-secrets-manager": "3.577.0",
+    "@aws-sdk/client-sns": "3.577.0",
+    "@aws-sdk/client-sqs": "3.577.0",
+    "@aws-sdk/s3-request-presigner": "3.577.0",
     "@aws-sdk/types": "3.449.0",
-    "@aws-sdk/util-dynamodb": "3.449.0",
+    "@aws-sdk/util-dynamodb": "3.577.0",
     "@azure/core-paging": "^1.5.0",
-    "@azure/identity": "3.1.3",
+    "@azure/data-tables": "13.2.2",
+    "@azure/identity": "4.0.1",
     "@azure/storage-blob": "12.14.0",
+    "@google-cloud/datastore": "8.4.0",
     "@google-cloud/storage": "6.9.5",
     "@smithy/util-stream": "2.0.17",
     "@smithy/util-utf8": "2.0.0",
     "@types/aws-lambda": "^8.10.119",
-    "cdktf": "0.17.0",
-    "constructs": "~10.2.69",
+    "@winglang/wingtunnels": "workspace:^",
+    "ajv": "^8.12.0",
+    "cdktf": "0.20.3",
+    "constructs": "^10.3",
     "cron-parser": "^4.9.0",
-    "esbuild-wasm": "^0.18.20",
-    "express": "^4.18.2",
+    "cron-validator": "^1.3.1",
+    "express": "^4.19.2",
+    "glob": "^8.1.0",
     "google-auth-library": "^8.9.0",
     "ioredis": "^5.3.2",
-    "jsonschema": "^1.4.1",
+    "jiti": "^1.21.0",
     "mime": "^3.0.0",
     "mime-types": "^2.1.35",
     "nanoid": "^3.3.6",
+    "protobufjs": "7.2.5",
     "safe-stable-stringify": "^2.4.3",
     "stacktracey": "^2.1.8",
-    "undici": "^5.25.4",
+    "toml": "^3.0.0",
+    "ulid": "^2.3.0",
     "uuid": "^8.3.2",
+    "vlq": "^2.0.4",
     "yaml": "^2.3.2"
   },
   "bundledDependencies": [
@@ -128,30 +133,38 @@
     "@aws-sdk/types",
     "@aws-sdk/util-dynamodb",
     "@azure/core-paging",
+    "@azure/data-tables",
     "@azure/identity",
     "@azure/storage-blob",
+    "@google-cloud/datastore",
     "@google-cloud/storage",
     "@smithy/util-stream",
     "@smithy/util-utf8",
     "@types/aws-lambda",
+    "@winglang/wingtunnels",
+    "ajv",
     "cdktf",
     "cron-parser",
-    "esbuild-wasm",
+    "cron-validator",
     "express",
+    "glob",
     "google-auth-library",
     "ioredis",
-    "jsonschema",
+    "jiti",
     "mime",
     "mime-types",
     "nanoid",
+    "protobufjs",
     "safe-stable-stringify",
     "stacktracey",
-    "undici",
+    "toml",
+    "ulid",
     "uuid",
+    "vlq",
     "yaml"
   ],
   "engines": {
-    "node": ">= 18.13.0"
+    "node": ">= 20.0.0"
   },
   "main": "lib/index.js",
   "license": "MIT",
@@ -166,6 +179,9 @@
       "rootDir": "src"
     }
   },
+  "optionalDependencies": {
+    "esbuild": "^0.19.12"
+  },
   "volta": {
     "extends": "../../package.json"
   },
diff --git a/libs/wingsdk/scripts/docgen.mts b/libs/wingsdk/scripts/docgen.mts
new file mode 100644
index 00000000000..ed55c71c5ec
--- /dev/null
+++ b/libs/wingsdk/scripts/docgen.mts
@@ -0,0 +1,198 @@
+import { readdir, writeFile, readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { Language, Documentation } from "@winglang/jsii-docgen";
+import * as sdk from "../lib";
+
+console.log("Generating SDK Docs...\n");
+let docCounter = 0;
+
+// go up one line, then clear it
+const ANSI_LINE_CLEAR = "\x1b[1A\x1b[2K";
+
+const rootDir = fileURLToPath(new URL("../", import.meta.url));
+const docsDir = join(rootDir, "..", "..", "docs", "docs");
+const WING_LANGUAGE = Language.fromString("wing");
+
+const SDK_DOCS = await Documentation.forProject(rootDir);
+
+const getStdlibDocsDir = (name: string) => {
+  return join(docsDir, "04-standard-library", name);
+};
+
+const docsFrontMatter = (name: string) => `---
+title: API reference
+id: api-reference
+description: Wing standard library API reference for the ${name} module
+keywords: [Wing sdk, sdk, Wing API Reference]
+hide_title: true
+sidebar_position: 100
+---
+
+<!-- This file is automatically generated. Do not edit manually. -->
+`;
+
+const UNDOCUMENTED_CLOUD_FILES = ["index", "test-runner"];
+const UNDOCUMENTED_EX_FILES = ["index"];
+const UNDOCUMENTED_STD_FILES = [
+  "README",
+  "index",
+  "test-runner",
+  "resource",
+  "test",
+  "range",
+  "generics",
+];
+
+// those will be skipped out of the docs
+const SKIPPED_MODULES = [
+  "cloud",
+  "ex",
+  "std",
+  "simulator",
+  "core",
+  "platform",
+  "helpers",
+];
+const publicModules = Object.keys(sdk).filter(
+  (item) =>
+    item !== "default" &&
+    !item.startsWith("_") &&
+    !SKIPPED_MODULES.includes(item)
+);
+
+const toCamelCase = (str: string) =>
+  str.replace(/_(.)/g, (_, chr) => chr.toUpperCase());
+
+async function runDocgen(
+  submodule: string,
+  header: string,
+  outputFile: string
+) {
+  console.log(`${ANSI_LINE_CLEAR}[${submodule}]`);
+  const content =
+    header +
+    (await SDK_DOCS.toMarkdown({
+      readme: false,
+      language: WING_LANGUAGE,
+      submodule,
+      allSubmodules: false,
+    }).then((x) => x.render()));
+  await writeFile(outputFile, content);
+  docCounter++;
+}
+
+enum DocumentationFilter {
+  /**
+   * Generate docs for all modules, and require they all have .md files
+   */
+  ALL_REQUIRE_MD,
+  /**
+   * Generate docs for all modules (even if they don't have .md files)
+   */
+  ALL,
+  /**
+   * Generate docs only for modules with .md files
+   */
+  ONLY_WITH_MD,
+}
+
+async function generateResourceApiDocs(
+  folder: string,
+  options: {
+    docsPath: string;
+    excludedFiles?: string[];
+    jsiiModule?: string;
+    filter: DocumentationFilter;
+  }
+) {
+  const pathToFolder = join(rootDir, "src", folder);
+  const { docsPath, excludedFiles = [], filter, jsiiModule = folder } = options;
+
+  const cloudFiles = await readdir(pathToFolder);
+
+  const cloudResources: Set<string> = new Set(
+    cloudFiles.map((filename: string) => filename.split(".")[0])
+  );
+
+  excludedFiles.forEach((file) => cloudResources.delete(file));
+
+  const undocumentedResources = Array.from(cloudResources).filter(
+    (file) => !cloudFiles.includes(`${file}.md`)
+  );
+
+  if (
+    undocumentedResources.length &&
+    filter === DocumentationFilter.ALL_REQUIRE_MD
+  ) {
+    throw new Error(
+      `Detected undocumented resources: ${undocumentedResources.join(
+        ", "
+      )}. Please add the corresponding .md files in ${pathToFolder} folder.`
+    );
+  }
+
+  // generate api reference for each cloud/submodule and append it to the doc file
+  for (const subResource of cloudResources) {
+    let header = "";
+
+    const hasMd = !undocumentedResources.includes(subResource);
+    if (!hasMd && filter === DocumentationFilter.ONLY_WITH_MD) {
+      continue;
+    }
+
+    if (hasMd) {
+      header = await readFile(join(pathToFolder, `${subResource}.md`), "utf-8");
+    } else {
+      header = `\
+---
+title: ${toCamelCase(subResource)}
+id: ${toCamelCase(subResource)}
+---
+
+`;
+    }
+    await runDocgen(
+      `${jsiiModule}/${subResource}`,
+      header,
+      join(docsPath, `${subResource}.md`)
+    );
+  }
+}
+
+// Generate api reference for each submodule
+for (const mod of publicModules) {
+  await runDocgen(
+    mod,
+    docsFrontMatter(mod),
+    join(getStdlibDocsDir(mod), "api-reference.md")
+  );
+}
+
+await generateResourceApiDocs("cloud", {
+  docsPath: getStdlibDocsDir("cloud"),
+  excludedFiles: UNDOCUMENTED_CLOUD_FILES,
+  filter: DocumentationFilter.ALL_REQUIRE_MD,
+});
+
+await generateResourceApiDocs("ex", {
+  docsPath: getStdlibDocsDir("ex"),
+  excludedFiles: UNDOCUMENTED_EX_FILES,
+  filter: DocumentationFilter.ALL_REQUIRE_MD,
+});
+
+await generateResourceApiDocs("std", {
+  docsPath: getStdlibDocsDir("std"),
+  excludedFiles: UNDOCUMENTED_STD_FILES,
+  filter: DocumentationFilter.ALL,
+});
+
+await generateResourceApiDocs("target-sim", {
+  docsPath: getStdlibDocsDir("sim"),
+  filter: DocumentationFilter.ONLY_WITH_MD,
+  jsiiModule: "sim",
+});
+
+console.log(
+  `${ANSI_LINE_CLEAR}${ANSI_LINE_CLEAR}${docCounter} Docs Generated!`
+);
diff --git a/libs/wingsdk/src/cloud/api.md b/libs/wingsdk/src/cloud/api.md
index 21d7d363eeb..ddf81b9cbbd 100644
--- a/libs/wingsdk/src/cloud/api.md
+++ b/libs/wingsdk/src/cloud/api.md
@@ -29,7 +29,7 @@ When a client invokes a route, the corresponding event handler function executes
 
 The following example shows a complete REST API implementation using `cloud.Api`, `ex.Table` & `cloud.Counter`
 
-```ts playground
+```ts playground example
 bring cloud;
 bring ex;
 
diff --git a/libs/wingsdk/src/cloud/api.ts b/libs/wingsdk/src/cloud/api.ts
index 742cd1d94bc..44ef54dfd73 100644
--- a/libs/wingsdk/src/cloud/api.ts
+++ b/libs/wingsdk/src/cloud/api.ts
@@ -1,6 +1,9 @@
 import { Construct } from "constructs";
+import { Endpoint } from "./endpoint";
+import { FunctionProps } from "./function";
 import { fqnForType } from "../constants";
 import { AbstractMemberError } from "../core/errors";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Node, Resource, Duration, IInflight } from "../std";
 
 /**
@@ -14,11 +17,11 @@ export const API_FQN = fqnForType("cloud.Api");
  */
 export interface ApiCorsOptions {
   /**
-   * The list of allowed allowOrigin.
-   * @example ["https://example.com"]
-   * @default - ["*"]
+   * The allowed origin.
+   * @example "https://example.com"
+   * @default - "*"
    */
-  readonly allowOrigin?: Array<string>;
+  readonly allowOrigin?: string;
 
   /**
    * The list of allowed methods.
@@ -73,9 +76,9 @@ export interface ApiProps {
    * Options for configuring the API's CORS behavior across all routes.
    * Options can also be overridden on a per-route basis. (not yet implemented)
    *
-   * @example { allowOrigin: ["https://example.com"] }
+   * @example { allowOrigin: "https://example.com" }
    * @default - Default CORS options are applied when `cors` is set to `true`
-   *  allowOrigin: ["*"],
+   *  allowOrigin: "*",
    *  allowMethods: [
    *   HttpMethod.GET,
    *   HttpMethod.POST,
@@ -110,64 +113,36 @@ export type OpenApiCorsHeaders = Record<string, { schema: { type: string } }>;
 
 /**
  * Type definition for default CORS headers.
+ * @property {string} "Access-Control-Allow-Origin" - Specifies the origin that is allowed to access the resource. See {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin}
+ * @property {string} "Access-Control-Expose-Headers" - Lists the headers that the client can access. See {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Expose-Headers}
+ * @property {string} "Access-Control-Allow-Credentials" - Indicates whether the response to the request can be exposed when the credentials flag is true. See {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials}
  */
-type CorsDefaultResponseHeaders = {
-  /**
-   * Specifies the origin that is allowed to access the resource.
-   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
-   */
-  "Access-Control-Allow-Origin": string;
-
-  /**
-   * Lists the headers that the client can access.
-   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Expose-Headers
-   */
-  "Access-Control-Expose-Headers": string;
-
-  /**
-   * Indicates whether the response to the request can
-   * be exposed when the credentials flag is true.
-   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
-   */
-  "Access-Control-Allow-Credentials": string;
-};
+type CorsDefaultResponseHeaders = { [key: string]: string };
 
 /**
  * Type definition for CORS option headers.
+ * @property {string} "Access-Control-Allow-Origin" - Specifies the origin that is allowed to access the resource. See {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin}
+ * @property {string} "Access-Control-Allow-Headers" - Specifies the headers that are allowed in a request. See {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers}
+ * @property {string} "Access-Control-Allow-Methods" - Specifies the methods that are allowed in a request. See {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods}
+ * @property {string} "Access-Control-Max-Age" - Indicates how long the results of a preflight request can be cached. See {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age}
  */
-type CorsOptionsResponseHeaders = {
-  /**
-   * Specifies the origin that is allowed to access the resource.
-   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
-   */
-  "Access-Control-Allow-Origin": string;
-
-  /**
-   * Specifies the headers that are allowed in a request.
-   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
-   */
-  "Access-Control-Allow-Headers": string;
+type CorsOptionsResponseHeaders = { [key: string]: string };
 
+/**
+ * Type definition for CORS headers which includes default and options headers.
+ */
+export interface CorsHeaders {
   /**
-   * Specifies the methods that are allowed in a request.
-   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
+   * Default CORS response headers.
    */
-  "Access-Control-Allow-Methods": string;
+  readonly defaultResponse: CorsDefaultResponseHeaders;
 
   /**
-   * Indicates how long the results of a preflight request can be cached.
-   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age
+   * CORS options response headers.
    */
-  "Access-Control-Max-Age": string;
-};
+  readonly optionsResponse: CorsOptionsResponseHeaders;
+}
 
-/**
- * Type definition for CORS headers which includes default and options headers.
- */
-export type CorsHeaders = {
-  defaultResponse: CorsDefaultResponseHeaders; // Default CORS headers for all requests.
-  optionsResponse: CorsOptionsResponseHeaders; // CORS option headers for OPTIONS requests.
-};
 /**
  * Functionality shared between all `Api` implementations.
  * @inflight `@winglang/sdk.cloud.IApiClient`
@@ -179,17 +154,64 @@ export class Api extends Resource {
    * Converts input path to a valid OpenAPI path (replaces `:` based path params with `{}`)
    * @param path The path to convert (assumes path is valid)
    * @returns OpenAPI path
-   * @internal
    */
-  public static _toOpenApiPath(path: string) {
+  public static renderOpenApiPath(path: string) {
     return path.replace(/\/:([A-Za-z0-9_-]+)/g, "/{$1}");
   }
 
+  /**
+   * Generates an object containing default CORS response headers and OPTIONS response headers.
+   * @param corsOptions The CORS options to generate the headers from.
+   * @returns An object containing default CORS response headers and OPTIONS response headers.
+   */
+  public static renderCorsHeaders(
+    corsOptions?: ApiCorsOptions
+  ): CorsHeaders | undefined {
+    if (corsOptions == undefined) {
+      return;
+    }
+
+    const {
+      allowOrigin = "*",
+      allowHeaders = [],
+      allowMethods = [],
+      exposeHeaders = [],
+      allowCredentials = false,
+      maxAge = Duration.fromMinutes(5),
+    } = corsOptions;
+
+    const defaultHeaders: CorsDefaultResponseHeaders = {
+      "Access-Control-Allow-Origin": allowOrigin || "*",
+      "Access-Control-Expose-Headers": exposeHeaders.join(",") || "",
+      "Access-Control-Allow-Credentials": allowCredentials ? "true" : "false",
+    };
+
+    const optionsHeaders: CorsOptionsResponseHeaders = {
+      "Access-Control-Allow-Origin": allowOrigin || "*",
+      "Access-Control-Allow-Headers": allowHeaders.join(",") || "",
+      "Access-Control-Allow-Methods": allowMethods.join(",") || "",
+      "Access-Control-Max-Age": maxAge.seconds.toString(),
+    };
+
+    return {
+      defaultResponse: defaultHeaders,
+      optionsResponse: optionsHeaders,
+    };
+  }
+
   /**
    * The base URL of the API endpoint.
-   * @abstract
    */
   public get url(): string {
+    return this._endpoint.url;
+  }
+
+  /**
+   * The Endpoint of the API.
+   * @abstract
+   * @internal
+   */
+  protected get _endpoint(): Endpoint {
     throw new AbstractMemberError();
   }
 
@@ -199,7 +221,7 @@ export class Api extends Resource {
   };
 
   private corsDefaultValues: ApiCorsOptions = {
-    allowOrigin: ["*"],
+    allowOrigin: "*",
     allowMethods: [
       HttpMethod.GET,
       HttpMethod.POST,
@@ -219,6 +241,9 @@ export class Api extends Resource {
    */
   protected corsOptions?: ApiCorsOptions;
 
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IApiClient;
+
   constructor(scope: Construct, id: string, props: ApiProps = {}) {
     if (new.target === Api) {
       return Resource._newFromFactory(API_FQN, scope, id, props);
@@ -384,9 +409,7 @@ export class Api extends Resource {
    */
   protected _validatePath(path: string) {
     if (
-      !/^(\/[a-zA-Z0-9_\-\.]+(\/\:[a-zA-Z0-9_\-]+|\/[a-zA-Z0-9_\-\.]+)*(?:\?[^#]*)?)?$|^(\/\:[a-zA-Z0-9_\-]+)*\/?$/g.test(
-        path
-      )
+      !/^((\/\:[a-zA-Z0-9_\-]+|\/[a-zA-Z0-9_\-\.]*)*(?:\?[^#]*)?)?$/g.test(path)
     ) {
       throw new Error(
         `Invalid path ${path}. Url parts can only contain alpha-numeric chars, "-", "_" and ".". Params can only contain alpha-numeric chars and "_".`
@@ -407,6 +430,42 @@ export class Api extends Resource {
     };
   }
 
+  /**
+   * Checks if two given paths are siblings.
+   * @param pathA
+   * @param pathB
+   * @returns A boolean value indicating if provided paths are siblings.
+   * @internal
+   */
+
+  protected _arePathsSiblings(pathA: string, pathB: string): boolean {
+    const partsA = pathA.split("/");
+    const partsB = pathB.split("/");
+
+    let shorter = partsA.length < partsB.length ? partsA : partsB;
+
+    for (let i = 0; i < shorter.length; i++) {
+      const partA = partsA[i];
+      const partB = partsB[i];
+      if (
+        (!partA.match(/^:.+?$/) || !partB.match(/^:.+?$/)) &&
+        partA[i] !== partB[i]
+      ) {
+        return false;
+      }
+
+      if (
+        partA.match(/^:.+?$/) &&
+        partB.match(/^:.+?$/) &&
+        partA[i] !== partB[i]
+      ) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   /**
    * Checks if two given paths are ambiguous.
    * @param pathA
@@ -454,6 +513,20 @@ export class Api extends Resource {
     );
   }
 
+  /**
+   * Checks if provided path is a sibling of paths already defined in the api spec- i.e "/:username" and "/:id".
+   * @param path Path to be checked
+   * @returns A boolean value indicating if provided path has a sibling.
+   * @internal
+   */
+  private _findSiblingPath(path: string): string | undefined {
+    const existingPaths = Object.keys(this.apiSpec.paths);
+
+    return existingPaths.find((existingPath) =>
+      this._arePathsSiblings(existingPath, path)
+    );
+  }
+
   /**
    * Generates the OpenAPI schema for CORS headers based on the provided CORS options.
    * @param corsOptions The CORS options to generate the schema from.
@@ -475,47 +548,6 @@ export class Api extends Resource {
     return corsHeaders;
   }
 
-  /**
-   * Generates an object containing default CORS response headers and OPTIONS response headers.
-   * @param corsOptions The CORS options to generate the headers from.
-   * @returns An object containing default CORS response headers and OPTIONS response headers.
-   * @internal
-   */
-  protected _generateCorsHeaders(
-    corsOptions?: ApiCorsOptions
-  ): CorsHeaders | undefined {
-    if (corsOptions == undefined) {
-      return;
-    }
-
-    const {
-      allowOrigin = [],
-      allowHeaders = [],
-      allowMethods = [],
-      exposeHeaders = [],
-      allowCredentials = false,
-      maxAge = Duration.fromMinutes(5),
-    } = corsOptions;
-
-    const defaultHeaders: CorsDefaultResponseHeaders = {
-      "Access-Control-Allow-Origin": allowOrigin.join(",") || "",
-      "Access-Control-Expose-Headers": exposeHeaders.join(",") || "",
-      "Access-Control-Allow-Credentials": allowCredentials ? "true" : "false",
-    };
-
-    const optionsHeaders: CorsOptionsResponseHeaders = {
-      "Access-Control-Allow-Origin": allowOrigin.join(",") || "",
-      "Access-Control-Allow-Headers": allowHeaders.join(",") || "",
-      "Access-Control-Allow-Methods": allowMethods.join(",") || "",
-      "Access-Control-Max-Age": maxAge.seconds.toString(),
-    };
-
-    return {
-      defaultResponse: defaultHeaders,
-      optionsResponse: optionsHeaders,
-    };
-  }
-
   /**
    * Add a route to the api spec.
    * @param path The path to add.
@@ -541,6 +573,12 @@ export class Api extends Resource {
         `Endpoint for path '${path}' and method '${method}' is ambiguous - it conflicts with existing endpoint for path '${ambiguousPath}'`
       );
     }
+    const siblingPath = this._findSiblingPath(path);
+    if (!!siblingPath) {
+      throw new Error(
+        `Endpoint for path '${path}' and method '${method}' conflicts with existing sibling endpoint for path '${siblingPath}'- try to match the parameter names to avoid this error.`
+      );
+    }
     const operationId = `${method.toLowerCase()}${
       path === "/" ? "" : path.replace("/", "-")
     }`;
@@ -589,62 +627,77 @@ export class Api extends Resource {
     // Convert our paths to valid OpenAPI paths
     let paths: { [key: string]: any } = {};
     Object.keys(this.apiSpec.paths).forEach((key) => {
-      paths[Api._toOpenApiPath(key)] = this.apiSpec.paths[key];
+      paths[Api.renderOpenApiPath(key)] = this.apiSpec.paths[key];
     });
 
     // https://spec.openapis.org/oas/v3.0.3
     return {
+      ...this.apiSpec,
       openapi: "3.0.3",
       paths: paths,
     };
   }
 }
 
+/**
+ * Base options for Api endpoints.
+ */
+export interface ApiEndpointOptions extends FunctionProps {}
+
 /**
  * Options for Api get endpoint.
  */
-export interface ApiGetOptions {}
+export interface ApiGetOptions extends ApiEndpointOptions {}
 
 /**
  * Options for Api post endpoint.
  */
-export interface ApiPostOptions {}
+export interface ApiPostOptions extends ApiEndpointOptions {}
 
 /**
  * Options for Api put endpoint.
  */
-export interface ApiPutOptions {}
+export interface ApiPutOptions extends ApiEndpointOptions {}
 
 /**
  * Options for Api put endpoint.
  */
-export interface ApiDeleteOptions {}
+export interface ApiDeleteOptions extends ApiEndpointOptions {}
 
 /**
  * Options for Api patch endpoint.
  */
-export interface ApiPatchOptions {}
+export interface ApiPatchOptions extends ApiEndpointOptions {}
 
 /**
  * Options for Api patch endpoint.
  */
-export interface ApiOptionsOptions {}
+export interface ApiOptionsOptions extends ApiEndpointOptions {}
 
 /**
  * Options for Api patch endpoint.
  */
-export interface ApiHeadOptions {}
+export interface ApiHeadOptions extends ApiEndpointOptions {}
 
 /**
  * Options for Api patch endpoint.
  */
-export interface ApiConnectOptions {}
+export interface ApiConnectOptions extends ApiEndpointOptions {}
 
 /**
  * Inflight methods and members of `cloud.Api`.
  */
 export interface IApiClient {}
 
+/**
+ * List of inflight operations available for `Api`.
+ * @internal
+ */
+export enum ApiInflightMethods {
+  /** When the API endpoint receives a request. */
+  REQUEST = "request",
+}
+
 /**
  * Allowed HTTP methods for a endpoint.
  */
@@ -685,15 +738,27 @@ export interface ApiRequest {
   readonly headers?: Record<string, string>;
 }
 
+export const DEFAULT_RESPONSE_STATUS = 200;
+
 /**
  * Shape of a response from a inflight handler.
  */
 export interface ApiResponse {
-  /** The response's status code. */
-  readonly status: number;
-  /** The response's body. */
+  /**
+   * The response's status code.
+   * @default 200
+   **/
+  readonly status?: number;
+
+  /**
+   * The response's body.
+   * @default - no body
+   **/
   readonly body?: string;
-  /** The response's headers. */
+  /**
+   * The response's headers.
+   * @default {}
+   **/
   readonly headers?: Record<string, string>;
 }
 
@@ -703,7 +768,10 @@ export interface ApiResponse {
  *
  * @inflight `@winglang/sdk.cloud.IApiEndpointHandlerClient`
  */
-export interface IApiEndpointHandler extends IInflight {}
+export interface IApiEndpointHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IApiEndpointHandlerClient["handle"];
+}
 
 /**
  * Inflight client for `IApiEndpointHandler`.
@@ -713,7 +781,7 @@ export interface IApiEndpointHandlerClient {
    * Inflight that will be called when a request is made to the endpoint.
    * @inflight
    */
-  handle(request: ApiRequest): Promise<ApiResponse>;
+  handle(request: ApiRequest): Promise<ApiResponse | undefined>;
 }
 
 /**
diff --git a/libs/wingsdk/src/cloud/bucket.md b/libs/wingsdk/src/cloud/bucket.md
index cfae2d71f18..1384616d717 100644
--- a/libs/wingsdk/src/cloud/bucket.md
+++ b/libs/wingsdk/src/cloud/bucket.md
@@ -26,7 +26,7 @@ Unlike other kinds of storage like file storage, data is not stored in a hierarc
 
 ### Defining a bucket
 
-```js
+```js example
 bring cloud;
 
 let bucket = new cloud.Bucket(
@@ -38,7 +38,7 @@ let bucket = new cloud.Bucket(
 
 If you have static data that you want to upload to the bucket each time your app is deployed, you can call the preflight method `addObject`:
 
-```js
+```js example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -48,7 +48,7 @@ bucket.addObject("my-file.txt", "Hello, world!");
 
 ### Using a bucket inflight
 
-```js playground
+```js playground example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -80,7 +80,7 @@ Use the `onEvent` method for responding to any event.
 
 Each method creates a new `cloud.Function` resource which will be triggered by the given event type.
 
-```js playground
+```js playground example
 bring cloud;
 
 let store = new cloud.Bucket();
diff --git a/libs/wingsdk/src/cloud/bucket.ts b/libs/wingsdk/src/cloud/bucket.ts
index daf30824104..28583912b55 100644
--- a/libs/wingsdk/src/cloud/bucket.ts
+++ b/libs/wingsdk/src/cloud/bucket.ts
@@ -1,11 +1,11 @@
 import * as fs from "fs";
 import { isAbsolute, resolve } from "path";
 import { Construct } from "constructs";
-import { Topic } from "./topic";
+import { ITopicOnMessageHandler, Topic, TopicInflightMethods } from "./topic";
 import { fqnForType } from "../constants";
 import { App } from "../core";
 import { AbstractMemberError } from "../core/errors";
-import { convertBetweenHandlers } from "../shared/convert";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Json, Node, Resource, Datetime, Duration, IInflight } from "../std";
 
 /**
@@ -33,6 +33,8 @@ export interface BucketProps {
 export class Bucket extends Resource {
   /** @internal */
   protected readonly _topics = new Map<BucketEventType, Topic>();
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IBucketClient;
 
   constructor(scope: Construct, id: string, props: BucketProps = {}) {
     if (new.target === Bucket) {
@@ -84,60 +86,37 @@ export class Bucket extends Resource {
   /**
    * Creates a topic for subscribing to notification events
    * @param actionType
-   * @returns the created topi
+   * @returns the created topic
    */
   protected createTopic(actionType: BucketEventType): Topic {
-    const topic = new Topic(this, actionType.toLowerCase());
-
+    const topic = new Topic(this, actionType);
     this.node.addDependency(topic);
-
-    Node.of(this).addConnection({
-      source: this,
-      target: topic,
-      name: `${actionType}()`,
-    });
-
     return topic;
   }
 
   /**
    * Gets topic form the topics map, or creates if not exists
    * @param actionType
-   * @returns
    */
-  private getTopic(actionType: BucketEventType): Topic {
+  protected getTopic(actionType: BucketEventType): Topic {
     if (!this._topics.has(actionType)) {
       this._topics.set(actionType, this.createTopic(actionType));
     }
     return this._topics.get(actionType) as Topic;
   }
 
-  /**
-   * Resolves the path to the bucket.onevent.inflight file
-   */
-  protected eventHandlerLocation(): string {
-    throw new Error(
-      "please specify under the target file (to get the right relative path)"
-    );
-  }
-
   /**
    * Creates an inflight handler from inflight code
    * @param eventType
    * @param inflight
-   * @returns
    */
-  private createInflightHandler(
+  protected createTopicHandler(
     eventType: BucketEventType,
     inflight: IBucketEventHandler
-  ): IInflight {
-    return convertBetweenHandlers(
-      inflight,
-      // since uses __dirname should be specified under the target directory
-      this.eventHandlerLocation(),
-      "BucketEventHandlerClient",
-      { eventType }
-    );
+  ): ITopicOnMessageHandler {
+    eventType;
+    inflight;
+    throw new Error("Method not implemented.");
   }
 
   /**
@@ -153,19 +132,55 @@ export class Bucket extends Resource {
   ) {
     opts;
     if (eventNames.includes(BucketEventType.CREATE)) {
-      this.getTopic(BucketEventType.CREATE).onMessage(
-        this.createInflightHandler(BucketEventType.CREATE, inflight)
+      const topic = this.getTopic(BucketEventType.CREATE).onMessage(
+        this.createTopicHandler(BucketEventType.CREATE, inflight)
       );
+      for (const op of [
+        BucketInflightMethods.PUT,
+        BucketInflightMethods.PUT_JSON,
+      ]) {
+        Node.of(this).addConnection({
+          source: this,
+          sourceOp: op,
+          target: topic,
+          targetOp: TopicInflightMethods.PUBLISH,
+          name: BucketEventType.CREATE,
+        });
+      }
     }
     if (eventNames.includes(BucketEventType.UPDATE)) {
-      this.getTopic(BucketEventType.UPDATE).onMessage(
-        this.createInflightHandler(BucketEventType.UPDATE, inflight)
+      const topic = this.getTopic(BucketEventType.UPDATE).onMessage(
+        this.createTopicHandler(BucketEventType.UPDATE, inflight)
       );
+      for (const op of [
+        BucketInflightMethods.PUT,
+        BucketInflightMethods.PUT_JSON,
+      ]) {
+        Node.of(this).addConnection({
+          source: this,
+          sourceOp: op,
+          target: topic,
+          targetOp: TopicInflightMethods.PUBLISH,
+          name: BucketEventType.UPDATE,
+        });
+      }
     }
     if (eventNames.includes(BucketEventType.DELETE)) {
-      this.getTopic(BucketEventType.DELETE).onMessage(
-        this.createInflightHandler(BucketEventType.DELETE, inflight)
+      const topic = this.getTopic(BucketEventType.DELETE).onMessage(
+        this.createTopicHandler(BucketEventType.DELETE, inflight)
       );
+      for (const op of [
+        BucketInflightMethods.DELETE,
+        BucketInflightMethods.TRY_DELETE,
+      ]) {
+        Node.of(this).addConnection({
+          source: this,
+          sourceOp: op,
+          target: topic,
+          targetOp: TopicInflightMethods.PUBLISH,
+          name: BucketEventType.DELETE,
+        });
+      }
     }
   }
 
@@ -228,6 +243,28 @@ export interface ObjectMetadata {
   readonly contentType?: string;
 }
 
+/**
+ * Options for `Bucket.get()`.
+ */
+export interface BucketGetOptions {
+  /**
+   * The starting byte to read from.
+   * @default - undefined
+   */
+  readonly startByte?: number;
+
+  /**
+   * The ending byte to read up to (including).
+   * @default - undefined
+   */
+  readonly endByte?: number;
+}
+
+/**
+ * Options for `Bucket.tryGet()`.
+ */
+export interface BucketTryGetOptions extends BucketGetOptions {}
+
 /**
  * Options for `Bucket.put()`.
  */
@@ -252,14 +289,35 @@ export interface BucketDeleteOptions {
   readonly mustExist?: boolean;
 }
 
+/**
+ * Specifies the action permitted by a presigned URL for a bucket.
+ */
+export enum BucketSignedUrlAction {
+  /**
+   * Represents a HTTP GET request for a presigned URL, allowing read access for an object in the bucket.
+   */
+  DOWNLOAD = "DOWNLOAD",
+  /**
+   * Represents a HTTP PUT request for a presigned URL, allowing write access for an object in the bucket.
+   */
+  UPLOAD = "UPLOAD",
+}
+
 /**
  * Options for `Bucket.signedUrl()`.
  */
 export interface BucketSignedUrlOptions {
   /**
-   * The duration for the signed url to expire
+   * The duration for the signed URL to expire.
+   * @default 15m
    */
   readonly duration?: Duration;
+
+  /**
+   * The action allowed by the signed URL.
+   * @default BucketSignedUrlAction.DOWNLOAD
+   */
+  readonly action?: BucketSignedUrlAction;
 }
 
 /**
@@ -292,20 +350,27 @@ export interface IBucketClient {
 
   /**
    * Retrieve an object from the bucket.
+   * If the bytes returned are not a valid UTF-8 string, an error is thrown.
    * @param key Key of the object.
+   * @param options Additional get options
    * @Throws if no object with the given key exists.
    * @Returns the object's body.
    * @inflight
    */
-  get(key: string): Promise<string>;
+  get(key: string, options?: BucketGetOptions): Promise<string>;
 
   /**
    * Get an object from the bucket if it exists
+   * If the bytes returned are not a valid UTF-8 string, an error is thrown.
    * @param key Key of the object.
+   * @param options Additional get options
    * @returns the contents of the object as a string if it exists, nil otherwise
    * @inflight
    */
-  tryGet(key: string): Promise<string | undefined>;
+  tryGet(
+    key: string,
+    options?: BucketTryGetOptions
+  ): Promise<string | undefined>;
 
   /**
    * Retrieve a Json object from the bucket.
@@ -375,14 +440,23 @@ export interface IBucketClient {
 
   /**
    * Copy an object to a new location in the bucket. If the destination object
-   * already exists, it will be overwritten. Returns once the copying is finished.
-   *
+   * already exists, it will be overwritten.
    * @param srcKey The key of the source object you wish to copy.
    * @param dstKey The key of the destination object after copying.
    * @throws if `srcKey` object doesn't exist.
    * @inflight
    */
   copy(srcKey: string, dstKey: string): Promise<void>;
+
+  /**
+   * Move an object to a new location in the bucket. If the destination object
+   * already exists, it will be overwritten. Returns once the renaming is finished.
+   * @param srcKey The key of the source object you wish to rename.
+   * @param dstKey The key of the destination object after renaming.
+   * @throws if `srcKey` object doesn't exist or if it matches `dstKey`.
+   * @inflight
+   */
+  rename(srcKey: string, dstKey: string): Promise<void>;
 }
 
 /**
@@ -409,9 +483,12 @@ export interface BucketOnEventOptions {}
  * A resource with an inflight "handle" method that can be passed to
  * the bucket events.
  *
- * @inflight  `@winglang/sdk.cloud.IBucketEventHandlerClient`
+ * @inflight `@winglang/sdk.cloud.IBucketEventHandlerClient`
  */
-export interface IBucketEventHandler extends IInflight {}
+export interface IBucketEventHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IBucketEventHandlerClient["handle"];
+}
 
 /**
  * A resource with an inflight "handle" method that can be passed to
@@ -447,15 +524,15 @@ export enum BucketEventType {
   /**
    * Create
    */
-  CREATE = "onCreate",
+  CREATE = "OnCreate",
   /**
    * Delete
    */
-  DELETE = "onDelete",
+  DELETE = "OnDelete",
   /**
    * Update
    */
-  UPDATE = "onUpdate",
+  UPDATE = "OnUpdate",
 }
 
 /**
@@ -491,4 +568,6 @@ export enum BucketInflightMethods {
   METADATA = "metadata",
   /** `Bucket.copy` */
   COPY = "copy",
+  /** `Bucket.rename` */
+  RENAME = "rename",
 }
diff --git a/libs/wingsdk/src/cloud/counter.md b/libs/wingsdk/src/cloud/counter.md
index 18ca1456251..61d1e794f2c 100644
--- a/libs/wingsdk/src/cloud/counter.md
+++ b/libs/wingsdk/src/cloud/counter.md
@@ -20,7 +20,7 @@ The `cloud.Counter` resource represents a stateful container for one or more num
 
 ### Defining a counter
 
-```js
+```js example
 bring cloud;
 
 let counter = new cloud.Counter(
@@ -30,7 +30,7 @@ let counter = new cloud.Counter(
 
 ### Using a counter inflight
 
-```js playground
+```js playground example
 bring cloud;
 
 let counter = new cloud.Counter();
@@ -51,7 +51,7 @@ new cloud.Function(counterFunc);
 
 ### Using keys to manage multiple counter values
 
-```js playground
+```js playground example
 bring cloud;
 
 let counter = new cloud.Counter(initial: 100);
diff --git a/libs/wingsdk/src/cloud/counter.ts b/libs/wingsdk/src/cloud/counter.ts
index 7ccd2c6170f..2c86ceee312 100644
--- a/libs/wingsdk/src/cloud/counter.ts
+++ b/libs/wingsdk/src/cloud/counter.ts
@@ -1,5 +1,6 @@
 import { Construct } from "constructs";
 import { fqnForType } from "../constants";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Node, Resource } from "../std";
 
 /**
@@ -24,6 +25,9 @@ export interface CounterProps {
  * @abstract
  */
 export class Counter extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: ICounterClient;
+
   /**
    * The initial value of the counter.
    */
diff --git a/libs/wingsdk/src/cloud/domain.md b/libs/wingsdk/src/cloud/domain.md
index cd78bb7d651..b5f92d064c7 100644
--- a/libs/wingsdk/src/cloud/domain.md
+++ b/libs/wingsdk/src/cloud/domain.md
@@ -24,7 +24,7 @@ The `cloud.Domain` resource represents a domain configuration in the cloud.
 bring cloud;
 
 let domain = new cloud.Domain(
-  domain: "www.example.com",
+  domainName: "www.example.com",
 );
 
 new cloud.Website(path: "./site", domain: domain);
@@ -42,14 +42,18 @@ Note that domain data is not persisted between simulator runs.
 
 The AWS implementation of `cloud.Domain` requires certain platform-specific values such as the `hostedZoneId` and either `iamCertificate` or `acmCertificateArn` to be provided.
 
-To provide these values, there are two options. You can either pass the values in the command line or you can provide a YAML file with the configurations.
+To provide these values, there are two options. You can either pass the values in the command line or you can provide a TOML file with the configurations:
 
-This YAML file should contain the data as shown in the example below:
+```
+wing compile -t tf-aws main.w --value root/Default/Default/Domain/acmCertificateArn=arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee --value root/Default/Default/Domain/hostedZoneId=Z0111111111111111111F
+```
+
+Alternatively, create a `wing.toml` file in your project directory:
 
-```yaml
-root/Default/Default/cloud.Domain:
-  hostedZoneId: Z0XXXXXXXXXXXXXXXXXXF
-  acmCertificateArn: arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee
+```toml
+[root.Default.Default.Domain]
+hostedZoneId = "Z0XXXXXXXXXXXXXXXXXXF"
+acmCertificateArn = "arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
 ```
 
 ### Azure (`tf-azure`)
diff --git a/libs/wingsdk/src/cloud/domain.ts b/libs/wingsdk/src/cloud/domain.ts
index 43e5c1018ce..35f3781cc94 100644
--- a/libs/wingsdk/src/cloud/domain.ts
+++ b/libs/wingsdk/src/cloud/domain.ts
@@ -20,6 +20,7 @@ export interface DomainProps {
 
 /**
  * A cloud Domain
+ * @inflight `@winglang/sdk.cloud.IDomainClient`
  * @abstract
  */
 export class Domain extends Resource {
diff --git a/libs/wingsdk/src/cloud/endpoint.md b/libs/wingsdk/src/cloud/endpoint.md
new file mode 100644
index 00000000000..a03aad1fcd8
--- /dev/null
+++ b/libs/wingsdk/src/cloud/endpoint.md
@@ -0,0 +1,136 @@
+---
+title: Endpoint
+id: endpoint
+description: A resource that represents an endpoint.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    Endpoint,
+    URL,
+  ]
+sidebar_position: 1
+---
+
+The `cloud.Endpoint` represents a publicly accessible endpoint and outputs it as part of the compilation target.
+
+## Usage
+
+```ts playground example
+bring cloud;
+
+let endpoint = new cloud.Endpoint("https://example.com");
+```
+
+## Target-specific details
+
+### Simulator (`sim`)
+
+The sim implementation of `cloud.Endpoint` outputs the endpoint URL.
+
+### AWS (`tf-aws`)
+
+The TF AWS implementation of `cloud.Endpoint` uses a [Terraform Output](https://developer.hashicorp.com/terraform/language/values/outputs).
+
+### AWS (`awscdk`)
+
+The AWS CDK implementation of `cloud.Endpoint` uses a [Cloudformation Output](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html).
+
+### Azure (`tf-azure`)
+
+🚧 Not supported yet
+
+### GCP (`tf-gcp`)
+
+🚧 Not supported yet
+## API Reference <a name="API Reference" id="API Reference"></a>
+
+### Endpoint <a name="Endpoint" id="@winglang/sdk.cloud.Endpoint"></a>
+
+represents a publicly accessible endpoint and outputs it as part of the compilation target.
+
+#### Initializers <a name="Initializers" id="@winglang/sdk.cloud.Endpoint.Initializer"></a>
+
+```wing example
+bring cloud;
+
+new cloud.Endpoint("https://example.com");
+```
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.property.url">url</a></code> | <code>str</code> | *The endpoint URL* |
+| <code><a href="#@winglang/sdk.cloud.Endpoint.property.props">props</a></code> | <code>winglang/sdk.cloud.EndpointProps</code> | *The endpoint Props* |
+|
+
+---
+
+##### `url`<sup>Required</sup> <a name="url" id="@winglang/sdk.cloud.Endpoint.property.url"></a>
+
+- *Type:* str
+
+---
+
+##### `props` <a name="props" id="@winglang/sdk.cloud.Endpoint.property.props"></a>
+
+- *Type:* winglang/sdk.cloud.EndpointProps
+
+---
+
+
+
+## Structs <a name="Structs" id="Structs"></a>
+
+### EndpointProps <a name="EndpointProps" id="@winglang/sdk.cloud.EndpointProps"></a>
+
+Options for `Endpoint`.
+
+#### Initializer <a name="Initializer" id="@winglang/sdk.cloud.EndpointProps.Initializer"></a>
+
+```wing
+bring cloud;
+
+let EndpointProps = cloud.EndpointProps{ ... };
+```
+
+#### Properties <a name="Properties" id="Properties"></a>
+
+| **Name** | **Type** | **Description** |
+| --- | --- | --- |
+| <code><a href="#@winglang/sdk.cloud.EndpointProps.property.label">label</a></code> | <code>str</code> | The endpoint's label. For UI purposes. |
+| <code><a href="#@winglang/sdk.cloud.EndpointProps.property.browserSupport">browserSupport</a></code> | <code>bool</code> | Whether the endpoint is supported through browsers. For UI purposes. |
+
+---
+
+##### `label` <a name="label" id="@winglang/sdk.cloud.EndpointProps.property.label"></a>
+
+```wing
+label: str;
+```
+
+- *Type:* str
+
+The endpoint's label. For UI purposes.
+
+---
+
+*Example*
+
+```wing
+"My Dashboard"
+```
+
+---
+
+##### `browserSupport` <a name="browserSupport" id="@winglang/sdk.cloud.EndpointProps.property.browserSupport"></a>
+
+```wing
+browserSupport: bool;
+```
+
+- *Type:* bool
+
+Whether the endpoint is supported through browsers. For UI purposes.
diff --git a/libs/wingsdk/src/cloud/endpoint.ts b/libs/wingsdk/src/cloud/endpoint.ts
new file mode 100644
index 00000000000..fa49790743d
--- /dev/null
+++ b/libs/wingsdk/src/cloud/endpoint.ts
@@ -0,0 +1,92 @@
+import { Construct } from "constructs";
+import { fqnForType } from "../constants";
+import { Node, Resource } from "../std";
+
+/**
+ * Global identifier for `Endpoint`.
+ */
+export const ENDPOINT_FQN = fqnForType("cloud.Endpoint");
+
+/**
+ * Options for `Endpoint`.
+ */
+export interface EndpointProps {
+  /**
+   * The endpoint's label. For UI purposes.
+   * @example "My Dashboard"
+   * @default undefined
+   */
+  readonly label?: string;
+
+  /**
+   * Whether the endpoint is supported through browsers. For UI purposes.
+   * @default undefined
+   */
+  readonly browserSupport?: boolean;
+}
+
+/**
+ * A cloud Endpoint
+ * @inflight `@winglang/sdk.cloud.IEndpointClient`
+ * @abstract
+ */
+export class Endpoint extends Resource {
+  /** @internal */
+  private _url!: string;
+
+  /** @internal */
+  protected _label: string | undefined;
+
+  /** @internal */
+  protected _browserSupport: boolean | undefined;
+
+  /**
+   * The endpoint url.
+   * @param url
+   */
+  constructor(
+    scope: Construct,
+    id: string,
+    url: string,
+    props?: EndpointProps
+  ) {
+    if (new.target === Endpoint) {
+      return Resource._newFromFactory(ENDPOINT_FQN, scope, id, url, props);
+    }
+
+    super(scope, id);
+
+    Node.of(this).title = "Endpoint";
+    Node.of(this).description = props?.label ?? "A cloud endpoint";
+
+    this._url = url;
+    this._label = props?.label;
+    this._browserSupport = props?.browserSupport;
+  }
+
+  /**
+   * The endpoint url.
+   */
+  public get url(): string {
+    return this._url;
+  }
+
+  /**
+   * The endpoint label.
+   */
+  protected get label(): string | undefined {
+    return this._label;
+  }
+
+  /**
+   * The endpoint browser support.
+   */
+  protected get browserSupport(): boolean | undefined {
+    return this._browserSupport;
+  }
+}
+
+/**
+ * Inflight interface for `Endpoint`.
+ */
+export interface IEndpointClient {}
diff --git a/libs/wingsdk/src/cloud/function.md b/libs/wingsdk/src/cloud/function.md
index 813412f6b75..ea649f9c4ac 100644
--- a/libs/wingsdk/src/cloud/function.md
+++ b/libs/wingsdk/src/cloud/function.md
@@ -17,43 +17,101 @@ sidebar_position: 1
 The `cloud.Function` resource represents a serverless function for performing short, stateless tasks.
 Functions are typically used to run business logic in response to events, such as a file being uploaded to a bucket, a message being pushed to a queue, or a timer expiring.
 
-When a function is invoked on a cloud provider, it is typically executed in a container that is spun up on demand.
-The container is then destroyed after the function finishes executing.
+When a function is invoked on a cloud provider, it is typically executed in a container/host which is provisioned on demand.
 
 Functions may be invoked more than once, and some cloud providers may automatically retry failed invocations.
 For performance reasons, most cloud providers impose a timeout on functions, after which the function is automatically terminated.
 
 ## Usage
 
-```ts playground
+A function can be invoked in two ways:
+
+* **invoke()** - Executes the function with a payload and waits for the result.
+* **invokeAsync()** - Kicks off the execution of the function with a payload and returns immediately while the function is running.
+
+```ts playground example
 bring cloud;
+bring util;
 
 // defining a cloud.Function resource
-let countWords = new cloud.Function(inflight (s: str): str => {
-  return "${s.split(" ").length}";
+let countWords = new cloud.Function(inflight (s: str?): str => {
+  return "{s?.split(" ")?.length ?? 0}";
 }) as "countWords";
 
+let longTask = new cloud.Function(inflight () => {
+  util.sleep(30s);
+  log("done!");
+});
+
 new cloud.Function(inflight () => {
   let sentence = "I am a sentence with 7 words";
   // invoking cloud.Function from inflight context
   let wordsCount = countWords.invoke(sentence);
-  log("'${sentence}' has ${wordsCount} words");
+  log("'{sentence}' has {wordsCount ?? "0"} words");
+
+  longTask.invokeAsync("");
+  log("task started");
 }) as "Invoke Me";
 ```
 
+## Function container reuse
+
+Most cloud providers will opportunistically reuse the function's container in additional invocations.
+It is possible to leverage this behavior to cache objects across function executions using `inflight new` and inflight fields.
+
+The following example reads the `bigdata.json` file once and reuses it every time `query()` is called.
+
+```ts playground example
+bring cloud;
+
+let big = new cloud.Bucket();
+
+big.addObject("bigdata.json", Json.stringify({
+  "my-key": "my-value"
+}));
+
+class MyDatabase {
+  inflight bigdata: Json;
+  inflight new() {
+    // download big data once
+    this.bigdata = big.getJson("bigdata.json");
+  }
+
+  pub inflight query(key: str): Json {
+    return this.bigdata.get(key);
+  }
+}
+
+let db = new MyDatabase();
+
+new cloud.Function(inflight () => {
+  log(Json.stringify(db.query("my-key")));
+});
+```
+
 ## Target-specific details
 
 ### Simulator (`sim`)
 
 The sim implementation of `cloud.Function` runs the inflight code as a JavaScript function.
 
+By default, a maximum of 10 workers can be processing requests sent to a `cloud.Function` concurrently, but this number can be adjusted with the `concurrency` property:
+
+```ts playground
+bring cloud;
+
+new cloud.Function(inflight () => {
+  // ... code that shouldn't run concurrently ...
+}, concurrency: 1);
+```
+
 ### AWS (`tf-aws` and `awscdk`)
 
 The AWS implementation of `cloud.Function` uses [AWS Lambda](https://aws.amazon.com/lambda/).
 
 To add extra IAM permissions to the function, you can use the `aws.Function` class as shown below.
 
-```ts playground
+```ts playground example
 bring aws;
 bring cloud;
 
@@ -71,6 +129,25 @@ if let lambdaFn = aws.Function.from(f) {
 }
 ```
 
+To access the AWS Lambda context object, you can use the `aws.Function` class as shown below.
+
+```ts playground example
+bring aws;
+bring cloud;
+
+let f = new cloud.Function(inflight () => {
+  if let ctx = aws.Function.context() {
+    log(ctx.logGroupName); // prints the log group name
+    log(ctx.logStreamName); // prints the log stream name
+
+    let remainingTime = ctx.remainingTimeInMillis();
+    assert(remainingTime > 0);
+  }
+});
+```
+
+The `context()` method returns `nil` when ran on non-AWS targets.
+
 ### Azure (`tf-azure`)
 
 The Azure implementation of `cloud.Function` uses [Azure Functions](https://azure.microsoft.com/en-us/products/functions).
diff --git a/libs/wingsdk/src/cloud/function.ts b/libs/wingsdk/src/cloud/function.ts
index ec8e6dcf46e..d4c116fcd84 100644
--- a/libs/wingsdk/src/cloud/function.ts
+++ b/libs/wingsdk/src/cloud/function.ts
@@ -2,7 +2,8 @@ import { mkdirSync, writeFileSync } from "fs";
 import { join } from "path";
 import { Construct } from "constructs";
 import { fqnForType } from "../constants";
-import { App } from "../core";
+import { App, Lifting } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { CaseConventions, ResourceNames } from "../shared/resource-names";
 import { Duration, IInflight, IInflightHost, Node, Resource } from "../std";
 
@@ -39,6 +40,12 @@ export interface FunctionProps {
    * @default 30
    */
   readonly logRetentionDays?: number;
+
+  /**
+   * The maximum concurrent invocations that can run at one time.
+   * @default - platform specific limits (100 on the simulator)
+   */
+  readonly concurrency?: number;
 }
 
 /**
@@ -48,10 +55,16 @@ export interface FunctionProps {
  * @abstract
  */
 export class Function extends Resource implements IInflightHost {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IFunctionClient;
   private readonly _env: Record<string, string> = {};
+  /**
+   * Reference to the function handler - an inflight closure.
+   */
+  protected readonly handler!: IFunctionHandler;
 
   /**
-   * The path to the entrypoint source code of the function.
+   * The path where the entrypoint of the function source code will be eventually written to.
    */
   protected readonly entrypoint!: string;
 
@@ -74,11 +87,7 @@ export class Function extends Resource implements IInflightHost {
       this.addEnvironment(key, value);
     }
 
-    // indicates that we are calling the inflight constructor and the
-    // inflight "handle" method on the handler resource.
-    handler._registerOnLift(this, ["handle", "$inflight_init"]);
-
-    const lines = this._getCodeLines(handler);
+    this.handler = handler;
     const assetName = ResourceNames.generateName(this, {
       // Avoid characters that may cause path issues
       disallowedRegex: /[><:"/\\|?*\s]/g,
@@ -86,18 +95,34 @@ export class Function extends Resource implements IInflightHost {
       sep: "_",
     });
 
-    // write the entrypoint next to the partial inflight code emitted by the compiler, so that
-    // `require` resolves naturally.
-
     const workdir = App.of(this).workdir;
     mkdirSync(workdir, { recursive: true });
-    const entrypoint = join(workdir, `${assetName}.js`);
-    writeFileSync(entrypoint, lines.join("\n"));
+    const entrypoint = join(workdir, `${assetName}.cjs`);
     this.entrypoint = entrypoint;
 
     if (process.env.WING_TARGET) {
       this.addEnvironment("WING_TARGET", process.env.WING_TARGET);
     }
+
+    if (props.concurrency !== undefined && props.concurrency <= 0) {
+      throw new Error(
+        "concurrency option on cloud.Function must be a positive integer"
+      );
+    }
+  }
+
+  /** @internal */
+  public _preSynthesize(): void {
+    super._preSynthesize();
+
+    // write the entrypoint next to the partial inflight code emitted by the compiler,
+    // so that `require` resolves naturally.
+    const lines = this._getCodeLines(this.handler);
+    writeFileSync(this.entrypoint, lines.join("\n"));
+
+    // indicates that we are calling the inflight constructor and the
+    // inflight "handle" method on the handler resource.
+    Lifting.lift(this.handler, this, ["handle"]);
   }
 
   /**
@@ -108,10 +133,13 @@ export class Function extends Resource implements IInflightHost {
   protected _getCodeLines(handler: IFunctionHandler): string[] {
     const inflightClient = handler._toInflight();
     const lines = new Array<string>();
+    const client = "$handler";
 
     lines.push('"use strict";');
+    lines.push(`var ${client} = undefined;`);
     lines.push("exports.handler = async function(event) {");
-    lines.push(`  return await (${inflightClient}).handle(event);`);
+    lines.push(`  ${client} = ${client} ?? (${inflightClient});`);
+    lines.push(`  return await ${client}.handle(event);`);
     lines.push("};");
 
     return lines;
@@ -143,9 +171,18 @@ export class Function extends Resource implements IInflightHost {
 export interface IFunctionClient {
   /**
    * Invokes the function with a payload and waits for the result.
+   * @param payload payload to pass to the function. If not defined, an empty string will be passed.
+   * @returns An optional response from the function
+   * @inflight
+   */
+  invoke(payload?: string): Promise<string | undefined>;
+
+  /**
+   * Kicks off the execution of the function with a payload and returns immediately while the function is running.
+   * @param payload payload to pass to the function. If not defined, an empty string will be passed.
    * @inflight
    */
-  invoke(payload: string): Promise<string>;
+  invokeAsync(payload?: string): Promise<void>;
 }
 
 /**
@@ -154,7 +191,10 @@ export interface IFunctionClient {
  *
  * @inflight `@winglang/sdk.cloud.IFunctionHandlerClient`
  */
-export interface IFunctionHandler extends IInflight {}
+export interface IFunctionHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IFunctionHandlerClient["handle"];
+}
 
 /**
  * Inflight client for `IFunctionHandler`.
@@ -164,7 +204,7 @@ export interface IFunctionHandlerClient {
    * Entrypoint function that will be called when the cloud function is invoked.
    * @inflight
    */
-  handle(event: string): Promise<void>;
+  handle(event?: string): Promise<string | undefined>;
 }
 
 /**
@@ -174,4 +214,6 @@ export interface IFunctionHandlerClient {
 export enum FunctionInflightMethods {
   /** `Function.invoke` */
   INVOKE = "invoke",
+  /** `Function.invokeAsync` */
+  INVOKE_ASYNC = "invokeAsync",
 }
diff --git a/libs/wingsdk/src/cloud/index.ts b/libs/wingsdk/src/cloud/index.ts
index 2463de1422c..5ef91370d87 100644
--- a/libs/wingsdk/src/cloud/index.ts
+++ b/libs/wingsdk/src/cloud/index.ts
@@ -2,6 +2,7 @@ export * from "./api";
 export * from "./bucket";
 export * from "./counter";
 export * from "./domain";
+export * from "./endpoint";
 export * from "./function";
 export * from "./on-deploy";
 export * from "./queue";
diff --git a/libs/wingsdk/src/cloud/on-deploy.md b/libs/wingsdk/src/cloud/on-deploy.md
index 2e868a3dce2..8874d4feafd 100644
--- a/libs/wingsdk/src/cloud/on-deploy.md
+++ b/libs/wingsdk/src/cloud/on-deploy.md
@@ -20,7 +20,7 @@ The `cloud.OnDeploy` resource runs a block of inflight code each time the applic
 
 ## Usage
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let bucket = new cloud.Bucket();
@@ -35,7 +35,7 @@ let setup = new cloud.OnDeploy(inflight () => {
 
 To specify that the `cloud.OnDeploy` resource should be run before or after another resource is created or updated, use the `executeBefore` or `executeAfter` properties:
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let counter = new cloud.Counter();
diff --git a/libs/wingsdk/src/cloud/on-deploy.ts b/libs/wingsdk/src/cloud/on-deploy.ts
index d21a8aec752..2b3e62c105f 100644
--- a/libs/wingsdk/src/cloud/on-deploy.ts
+++ b/libs/wingsdk/src/cloud/on-deploy.ts
@@ -1,6 +1,7 @@
 import { Construct } from "constructs";
 import { FunctionProps } from "./function";
 import { fqnForType } from "../constants";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { IInflight, Node, Resource } from "../std";
 
 /**
@@ -32,6 +33,9 @@ export interface OnDeployProps extends FunctionProps {
  * @abstract
  */
 export class OnDeploy extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IOnDeployClient;
+
   constructor(
     scope: Construct,
     id: string,
@@ -57,7 +61,10 @@ export class OnDeploy extends Resource {
  *
  * @inflight `@winglang/sdk.cloud.IOnDeployHandlerClient`
  */
-export interface IOnDeployHandler extends IInflight {}
+export interface IOnDeployHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IOnDeployHandlerClient["handle"];
+}
 
 /**
  * Inflight client for `IOnDeployHandler`.
diff --git a/libs/wingsdk/src/cloud/queue.md b/libs/wingsdk/src/cloud/queue.md
index 3bc93e71a7e..0b45cb570a0 100644
--- a/libs/wingsdk/src/cloud/queue.md
+++ b/libs/wingsdk/src/cloud/queue.md
@@ -26,7 +26,7 @@ Queues by default are not FIFO (first in, first out) - so the order of messages
 
 ### Setting a Queue Consumer
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let q = new cloud.Queue();
@@ -43,9 +43,9 @@ new cloud.Function(inflight () => {
 
 ### Using Queue inflight api
 
-Pusing messages, popping them, and purge
+Pushing messages, popping them, and purging.
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let q = new cloud.Queue();
@@ -54,14 +54,55 @@ new cloud.Function(inflight () => {
   q.push("message a");
   q.push("message b", "message c", "message d");
   log("approxSize is ${q.approxSize()}");
-  log("popping message ${q.pop()}");
-  log("popping message ${q.pop()}");
+  log("popping message ${q.pop()!}");
+  log("popping message ${q.pop()!}");
   log("approxSize is ${q.approxSize()}");
   q.purge();
   log("approxSize is ${q.approxSize()}");
 });
 ```
 
+### Adding a dead-letter queue
+
+Creating a queue and adding a dead-letter queue with the maximum number of attempts configured
+
+```ts playground example
+bring cloud;
+
+let dlq = new cloud.Queue() as "dead-letter queue";
+let q = new cloud.Queue(
+  dlq: { 
+    queue: dlq,
+    maxDeliveryAttempts: 2
+  }
+);
+```
+
+### Referencing an external queue
+
+If you would like to reference an existing queue from within your application you can use the
+`QueueRef` classes in the target-specific namespaces.
+
+> This is currently only supported for `aws`.
+
+The following example defines a reference to an Amazon SQS queue with a specific ARN and sends a
+message to the queue from the function:
+
+```js example
+bring cloud;
+bring aws;
+
+let outbox = new aws.QueueRef("arn:aws:sqs:us-east-1:111111111111:Outbox");
+
+new cloud.Function(inflight () => {
+  outbox.push("send an email");
+});
+```
+
+This works both when running in the simulator (requires AWS credentials on the developer's machine)
+and when deployed to AWS. When this is deployed to AWS, the AWS Lambda IAM policy will include the
+needed permissions.
+
 ## Target-specific details
 
 ### Simulator (`sim`)
diff --git a/libs/wingsdk/src/cloud/queue.ts b/libs/wingsdk/src/cloud/queue.ts
index 4f3c6fca414..2380d2a7331 100644
--- a/libs/wingsdk/src/cloud/queue.ts
+++ b/libs/wingsdk/src/cloud/queue.ts
@@ -2,6 +2,7 @@ import { Construct } from "constructs";
 import { Function, FunctionProps } from "./function";
 import { fqnForType } from "../constants";
 import { AbstractMemberError } from "../core/errors";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Duration, IInflight, Node, Resource } from "../std";
 
 /**
@@ -9,6 +10,27 @@ import { Duration, IInflight, Node, Resource } from "../std";
  */
 export const QUEUE_FQN = fqnForType("cloud.Queue");
 
+/**
+ * Dead-letter queue default retries
+ */
+export const DEFAULT_DELIVERY_ATTEMPTS = 1;
+
+/**
+ * Dead letter queue options.
+ */
+export interface DeadLetterQueueProps {
+  /**
+   * Queue to receive messages that failed processing.
+   */
+  readonly queue: Queue;
+  /**
+   * Number of times a message will be processed before being
+   * sent to the dead-letter queue.
+   * @default 1
+   */
+  readonly maxDeliveryAttempts?: number;
+}
+
 /**
  * Options for `Queue`.
  */
@@ -24,6 +46,12 @@ export interface QueueProps {
    * @default 1h
    */
   readonly retentionPeriod?: Duration;
+
+  /**
+   * A dead-letter queue.
+   * @default - no dead letter queue
+   */
+  readonly dlq?: DeadLetterQueueProps;
 }
 
 /**
@@ -33,6 +61,9 @@ export interface QueueProps {
  * @abstract
  */
 export class Queue extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IQueueClient;
+
   constructor(scope: Construct, id: string, props: QueueProps = {}) {
     if (new.target === Queue) {
       return Resource._newFromFactory(QUEUE_FQN, scope, id, props);
@@ -108,7 +139,10 @@ export interface IQueueClient {
  *
  * @inflight `@winglang/sdk.cloud.IQueueSetConsumerHandlerClient`
  */
-export interface IQueueSetConsumerHandler extends IInflight {}
+export interface IQueueSetConsumerHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IQueueSetConsumerHandlerClient["handle"];
+}
 
 /**
  * Inflight client for `IQueueSetConsumerHandler`.
diff --git a/libs/wingsdk/src/cloud/schedule.md b/libs/wingsdk/src/cloud/schedule.md
index 86e69620639..44f37c09e1d 100644
--- a/libs/wingsdk/src/cloud/schedule.md
+++ b/libs/wingsdk/src/cloud/schedule.md
@@ -23,10 +23,10 @@ The timezone used in cron expressions is always UTC.
 
 ### From cron
 
-```ts playground
+```ts playground example
 bring cloud;
 
-let schedule = new cloud.Schedule(cron: "* * * * ?");
+let schedule = new cloud.Schedule(cron: "* * * * *");
 
 schedule.onTick(inflight () => {
   log("schedule: triggered");
@@ -35,7 +35,7 @@ schedule.onTick(inflight () => {
 
 ### From rate
 
-```ts playground
+```ts playground example
 bring cloud;
 
 let schedule = new cloud.Schedule(rate: 1m);
diff --git a/libs/wingsdk/src/cloud/schedule.ts b/libs/wingsdk/src/cloud/schedule.ts
index 9ba322dfb82..4d8543be0af 100644
--- a/libs/wingsdk/src/cloud/schedule.ts
+++ b/libs/wingsdk/src/cloud/schedule.ts
@@ -1,7 +1,9 @@
 import { Construct } from "constructs";
+import { isValidCron } from "cron-validator";
 import { Function, FunctionProps } from "./function";
 import { fqnForType } from "../constants";
 import { AbstractMemberError } from "../core/errors";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Duration, IInflight, Node, Resource } from "../std";
 
 /**
@@ -23,7 +25,15 @@ export interface ScheduleProps {
   /**
    * Trigger events according to a cron schedule using the UNIX cron format. Timezone is UTC.
    * [minute] [hour] [day of month] [month] [day of week]
-   * @example "0/1 * ? * *"
+   * '*' means all possible values.
+   * '-' means a range of values.
+   * ',' means a list of values.
+   * [minute] allows 0-59.
+   * [hour] allows 0-23.
+   * [day of month] allows 1-31.
+   * [month] allows 1-12 or JAN-DEC.
+   * [day of week] allows 0-6 or SUN-SAT.
+   * @example "* * * * *"
    * @default undefined
    */
   readonly cron?: string;
@@ -36,6 +46,9 @@ export interface ScheduleProps {
  * @abstract
  */
 export class Schedule extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IScheduleClient;
+
   constructor(scope: Construct, id: string, props: ScheduleProps = {}) {
     if (new.target === Schedule) {
       return Resource._newFromFactory(SCHEDULE_FQN, scope, id, props);
@@ -58,15 +71,18 @@ export class Schedule extends Resource {
     if (rate && rate.seconds < 60) {
       throw new Error("rate can not be set to less than 1 minute.");
     }
-    if (cron && cron.split(" ").length > 5) {
-      throw new Error(
-        "cron string must be UNIX cron format [minute] [hour] [day of month] [month] [day of week]"
-      );
-    }
-    if (cron && cron.split(" ")[2] == "*" && cron.split(" ")[4] == "*") {
-      throw new Error(
-        "cannot use * in both the Day-of-month and Day-of-week fields. If you use it in one, you must use ? in the other"
-      );
+    // Check for valid UNIX cron format
+    // https://www.ibm.com/docs/en/db2/11.5?topic=task-unix-cron-format
+    if (
+      cron &&
+      !isValidCron(cron, {
+        alias: true,
+        allowSevenAsSunday: true,
+        allowBlankDay: false,
+        seconds: false,
+      })
+    ) {
+      throw new Error("cron string must be in UNIX cron format");
     }
   }
 
@@ -95,13 +111,25 @@ export interface ScheduleOnTickOptions extends FunctionProps {}
  *
  * @inflight `@winglang/sdk.cloud.IScheduleOnTickHandlerClient`
  */
-export interface IScheduleOnTickHandler extends IInflight {}
+export interface IScheduleOnTickHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IScheduleOnTickHandlerClient["handle"];
+}
 
 /**
  * Inflight interface for `Schedule`.
  */
 export interface IScheduleClient {}
 
+/**
+ * List of inflight operations available for `Schedule`.
+ * @internal
+ */
+export enum ScheduleInflightMethods {
+  /** When the schedule runs its scheduled actions. */
+  TICK = "tick",
+}
+
 /**
  * Inflight client for `IScheduleOnTickHandler`.
  */
diff --git a/libs/wingsdk/src/cloud/secret.md b/libs/wingsdk/src/cloud/secret.md
index f0a321a3f3d..6acb91f4202 100644
--- a/libs/wingsdk/src/cloud/secret.md
+++ b/libs/wingsdk/src/cloud/secret.md
@@ -19,11 +19,13 @@ The `cloud.Secret` class represents a secret value (like an API key, certificate
 Secrets are encrypted at rest and in transit, and are only decrypted when they are used in a task.
 Storing a secret allows you to use the value in different compute tasks while only having to rotate or revoke it in one place.
 
+You can use the [`wing secrets`](https://www.winglang.io/docs/tools/cli#store-secrets-wing-secrets) command to store secrets in the target platform.
+
 ## Usage
 
 ### Defining a secret
 
-```js
+```js example
 bring cloud;
 
 let secret = new cloud.Secret(
@@ -35,7 +37,7 @@ Before deploying your application, you will be expected to store the secret valu
 
 ### Retrieving secret values
 
-```js
+```js example
 bring cloud;
 
 let secret = new cloud.Secret(
@@ -52,15 +54,14 @@ new cloud.Function(inflight () => {
 
 ### Simulator (`sim`)
 
-When using a secret in Wing's simulator, a secrets file must be added to your home directory at `~/.wing/secrets.json`.
+When using a secret in Wing's simulator, a secrets file must be added to your project in a file called: `.env`.
 The simulator will look up secrets in this file by their `name`.
-Secrets should be saved in a JSON format:
+Secrets should be saved in a key=value format:
 
 ```json
-// secrets.json
-{
-  "my-api-key": "1234567890"
-}
+// .env
+my-api-key=1234567890
+secret-key=secret-value
 ```
 
 ### AWS (`tf-aws` and `awscdk`)
diff --git a/libs/wingsdk/src/cloud/secret.ts b/libs/wingsdk/src/cloud/secret.ts
index 922bee987d4..51da9bedd43 100644
--- a/libs/wingsdk/src/cloud/secret.ts
+++ b/libs/wingsdk/src/cloud/secret.ts
@@ -1,5 +1,6 @@
 import { Construct } from "constructs";
 import { fqnForType } from "../constants";
+import { INFLIGHT_SYMBOL, SECRET_SYMBOL } from "../core/types";
 import { Json, Node, Resource } from "../std";
 
 /**
@@ -30,6 +31,14 @@ export interface SecretProps {
  * @abstract
  */
 export class Secret extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: ISecretClient;
+  /** @internal */
+  public [SECRET_SYMBOL] = true;
+
+  /** @internal */
+  protected _name?: string;
+
   constructor(scope: Construct, id: string, props: SecretProps = {}) {
     if (new.target === Secret) {
       return Resource._newFromFactory(SECRET_FQN, scope, id, props);
@@ -40,7 +49,12 @@ export class Secret extends Resource {
     Node.of(this).title = "Secret";
     Node.of(this).description = "A cloud secret";
 
-    props;
+    this._name = props.name;
+  }
+
+  /** Get secret name */
+  public get name(): string | undefined {
+    return this._name;
   }
 }
 
diff --git a/libs/wingsdk/src/cloud/service.ts b/libs/wingsdk/src/cloud/service.ts
index b570e603650..b15be9acf73 100644
--- a/libs/wingsdk/src/cloud/service.ts
+++ b/libs/wingsdk/src/cloud/service.ts
@@ -3,7 +3,8 @@ import { join } from "path";
 import { Construct } from "constructs";
 import { FunctionProps } from "./function";
 import { fqnForType } from "../constants";
-import { App } from "../core";
+import { App, Lifting } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { CaseConventions, ResourceNames } from "../shared/resource-names";
 import { IInflight, IInflightHost, Node, Resource } from "../std";
 
@@ -38,11 +39,19 @@ export interface ServiceProps {
  * @abstract
  */
 export class Service extends Resource implements IInflightHost {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IServiceClient;
+
   /**
-   * The entrypoint of the service.
+   * The path where the entrypoint of the service source code will be eventually written to.
    */
   protected readonly entrypoint!: string;
 
+  /**
+   * Reference to the service's handler - an inflight closure.
+   */
+  protected readonly handler!: IServiceHandler;
+
   private readonly _env: Record<string, string> = {};
 
   constructor(
@@ -64,25 +73,6 @@ export class Service extends Resource implements IInflightHost {
     Node.of(this).title = "Service";
     Node.of(this).description = "A cloud service";
 
-    // indicates that we are calling the inflight constructor and the
-    // inflight "handle" method on the handler resource.
-    handler._registerOnLift(this, ["handle", "$inflight_init"]);
-
-    const inflightClient = handler._toInflight();
-    const lines = new Array<string>();
-
-    lines.push('"use strict";');
-    lines.push("let $obj;");
-
-    lines.push("async function $initOnce() {");
-    lines.push(`  $obj = $obj || (await (${inflightClient}));`);
-    lines.push("  return $obj;");
-    lines.push("};");
-
-    lines.push("exports.handle = async function() {");
-    lines.push("  return (await $initOnce()).handle();");
-    lines.push("};");
-
     const assetName = ResourceNames.generateName(this, {
       disallowedRegex: /[><:"/\\|?*\s]/g, // avoid characters that may cause path issues
       case: CaseConventions.LOWERCASE,
@@ -91,13 +81,47 @@ export class Service extends Resource implements IInflightHost {
 
     const workdir = App.of(this).workdir;
     mkdirSync(workdir, { recursive: true });
-    const entrypoint = join(workdir, `${assetName}.js`);
-    writeFileSync(entrypoint, lines.join("\n"));
+    const entrypoint = join(workdir, `${assetName}.cjs`);
     this.entrypoint = entrypoint;
 
     if (process.env.WING_TARGET) {
       this.addEnvironment("WING_TARGET", process.env.WING_TARGET);
     }
+
+    this.handler = handler;
+  }
+
+  /** @internal */
+  public _preSynthesize(): void {
+    super._preSynthesize();
+
+    const inflightClient = this.handler._toInflight();
+    const code = `\
+      "use strict";
+      let $stop;
+      exports.start = async function() {
+        if ($stop) {
+          throw Error('service already started');
+        }
+        const client = await ${inflightClient};
+        const noop = () => {};
+        $stop = (await client.handle()) ?? noop;
+      };
+
+      exports.stop = async function() {
+        if (!$stop) {
+          throw Error('service not started');
+        }
+        await $stop();
+        $stop = undefined;
+      };
+      `;
+
+    writeFileSync(this.entrypoint, code);
+
+    // indicates that we are calling the inflight constructor and the
+    // inflight "handle" method on the handler resource.
+    Lifting.lift(this.handler, this, ["handle"]);
   }
 
   /**
@@ -153,7 +177,10 @@ export interface IServiceClient {
  *
  * @inflight `@winglang/sdk.cloud.IServiceHandlerClient`
  */
-export interface IServiceHandler extends IInflight {}
+export interface IServiceHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IServiceHandlerClient["handle"];
+}
 
 /**
  * Inflight client for `IServiceHandler`.
@@ -166,7 +193,7 @@ export interface IServiceHandlerClient {
    * DO NOT BLOCK! This handler should return as quickly as possible. If you need to run a long
    * running process, start it asynchronously.
    *
-   *
+   * @inflight
    * @returns an optional function that can be used to cleanup any resources when the service is
    * stopped.
    *
@@ -180,7 +207,6 @@ export interface IServiceHandlerClient {
    *     log("stoping service...");
    *   };
    * });
-   *
    */
   handle(): Promise<IServiceStopHandler | undefined>;
 }
@@ -190,7 +216,10 @@ export interface IServiceHandlerClient {
  *
  * @inflight `@winglang/sdk.cloud.IServiceStopHandlerClient`
  */
-export interface IServiceStopHandler extends IInflight {}
+export interface IServiceStopHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IServiceStopHandlerClient["handle"];
+}
 
 /**
  * Inflight client for `IServiceStopHandler`.
diff --git a/libs/wingsdk/src/cloud/topic.md b/libs/wingsdk/src/cloud/topic.md
index ce4d2addd7f..b3b48e61d42 100644
--- a/libs/wingsdk/src/cloud/topic.md
+++ b/libs/wingsdk/src/cloud/topic.md
@@ -22,7 +22,7 @@ Topics are a staple of event-driven architectures, especially those that rely on
 
 ### Creating a topic
 
-```js
+```js example
 bring cloud;
 
 let topic = new cloud.Topic();
@@ -30,7 +30,7 @@ let topic = new cloud.Topic();
 
 ### Subscribing to a topic
 
-```js
+```js example
 bring cloud;
 
 let topic = new cloud.Topic();
@@ -40,17 +40,34 @@ topic.onMessage(inflight (message: str) => {
 });
 ```
 
+### Subscribing a Queue to a Topic
+
+```js example
+bring cloud;
+
+let queue = new cloud.Queue();
+queue.setConsumer(inflight (message: str) => {
+  log("Topic published message: {message}");
+});
+
+let topic = new cloud.Topic();
+topic.subscribeQueue(queue);
+```
+
 ### Publishing to a topic
 
-The inflight method `publish` sends a message to all of the topic's subscribers.
+The inflight method `publish` sends messages to all of the topic's subscribers.
 
-```js
+```js example
 bring cloud;
 
 let topic = new cloud.Topic();
 
 inflight () => {
-  topic.publish("Hello World!");
+  topic.publish(
+    "Topics can now publish",
+    "multiple messages at once"
+  );
 };
 ```
 
@@ -59,7 +76,7 @@ inflight () => {
 Here is an example of combining the preflight and inflight apis for a topic and creating an adorable
 simple pub-sub application.
 
-```js
+```js example
 bring cloud;
 
 // First we create a topic
diff --git a/libs/wingsdk/src/cloud/topic.ts b/libs/wingsdk/src/cloud/topic.ts
index 8a7daed8464..67da95d3ad7 100644
--- a/libs/wingsdk/src/cloud/topic.ts
+++ b/libs/wingsdk/src/cloud/topic.ts
@@ -1,7 +1,9 @@
 import { Construct } from "constructs";
 import { Function, FunctionProps } from "./function";
+import { Queue, QueueProps } from "./queue";
 import { fqnForType } from "../constants";
 import { AbstractMemberError } from "../core/errors";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Node, Resource, IInflight } from "../std";
 
 export const TOPIC_FQN = fqnForType("cloud.Topic");
@@ -18,6 +20,9 @@ export interface TopicProps {}
  * @abstract
  */
 export class Topic extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: ITopicClient;
+
   constructor(scope: Construct, id: string, props: TopicProps = {}) {
     if (new.target === Topic) {
       return Resource._newFromFactory(TOPIC_FQN, scope, id, props);
@@ -43,23 +48,41 @@ export class Topic extends Resource {
     props;
     throw new AbstractMemberError();
   }
+
+  /**
+   * Subscribing queue to the topic
+   * @abstract
+   */
+  public subscribeQueue(
+    queue: Queue,
+    props?: TopicSubscribeQueueOptions
+  ): void {
+    queue;
+    props;
+    throw new AbstractMemberError();
+  }
 }
 
 /**
  * Options for `Topic.onMessage`.
  */
 export interface TopicOnMessageOptions extends FunctionProps {}
+/**
+ * Options for `Topic.subscribeQueue`.
+ */
+export interface TopicSubscribeQueueOptions extends QueueProps {}
 
 /**
  * Inflight interface for `Topic`.
  */
 export interface ITopicClient {
   /**
-   * Publish message to topic
-   * @param message Payload to publish to Topic
+   * Publish messages to topic, if multiple messages are passed then they
+   * will be published as a batch if supported by the target platform
+   * @param messages Payload to publish to Topic
    * @inflight
    */
-  publish(message: string): Promise<void>;
+  publish(...messages: string[]): Promise<void>;
 }
 
 /**
@@ -68,7 +91,10 @@ export interface ITopicClient {
  *
  * @inflight `@winglang/sdk.cloud.ITopicOnMessageHandlerClient`
  */
-export interface ITopicOnMessageHandler extends IInflight {}
+export interface ITopicOnMessageHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: ITopicOnMessageHandlerClient["handle"];
+}
 
 /**
  * Inflight client for `ITopicOnMessageHandler`.
diff --git a/libs/wingsdk/src/cloud/website.ts b/libs/wingsdk/src/cloud/website.ts
index 96577d573fd..87199c4fa14 100644
--- a/libs/wingsdk/src/cloud/website.ts
+++ b/libs/wingsdk/src/cloud/website.ts
@@ -4,6 +4,7 @@ import { cloud } from "..";
 import { fqnForType } from "../constants";
 import { App } from "../core";
 import { AbstractMemberError } from "../core/errors";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Json, Node, Resource } from "../std";
 
 /**
@@ -25,10 +26,17 @@ export interface WebsiteOptions {
    * @example "./dist"
    */
   readonly path: string;
+
+  /**
+   * Name of the error document for the website.
+   * @example "404.html"
+   * @default - undefined
+   */
+  readonly errorDocument?: string;
 }
 
 /**
- * Options for `Website`, and `ReactApp`
+ * Options for `Website`
  */
 export interface WebsiteDomainOptions {
   /**
@@ -45,6 +53,9 @@ export interface WebsiteDomainOptions {
  * @abstract
  */
 export class Website extends Resource implements IWebsite {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IWebsiteClient;
+
   /** @internal */
   private readonly _path!: string;
 
@@ -77,9 +88,17 @@ export class Website extends Resource implements IWebsite {
 
   /**
    * The website's url.
-   * @abstract
    */
   public get url(): string {
+    return this._endpoint.url;
+  }
+
+  /**
+   * The Endpoint of the Website.
+   * @abstract
+   * @internal
+   */
+  protected get _endpoint(): cloud.Endpoint {
     throw new AbstractMemberError();
   }
 
diff --git a/libs/wingsdk/src/cloud/workload.md b/libs/wingsdk/src/cloud/workload.md
index 997a9788433..fa1c5b984ad 100644
--- a/libs/wingsdk/src/cloud/workload.md
+++ b/libs/wingsdk/src/cloud/workload.md
@@ -36,7 +36,7 @@ orchestration system such as [Amazon ECS](https://aws.amazon.com/ecs/), [fly.io]
 [ControlPlane](https://controlplane.com/).
 
 > :warning: This resource is still experimental. Please ping the team on [Wing
-> Slack](https://t.winglang.io/slack) if you encounter any issues or have any questions and let us
+> Discord](https://t.winglang.io/discord) if you encounter any issues or have any questions and let us
 > know what you think. See [roadmap](#roadmap) below for more details about our plans.
 
 ## Installation
diff --git a/libs/wingsdk/src/core/app.ts b/libs/wingsdk/src/core/app.ts
index c2971f8efc4..ec9a6f14eca 100644
--- a/libs/wingsdk/src/core/app.ts
+++ b/libs/wingsdk/src/core/app.ts
@@ -1,8 +1,9 @@
 import { Construct, IConstruct } from "constructs";
 import { NotImplementedError } from "./errors";
 import { SDK_PACKAGE_NAME } from "../constants";
+import { ParameterRegistrar } from "../platform";
 import { APP_SYMBOL, IApp, Node } from "../std/node";
-import { IResource } from "../std/resource";
+import { type IResource } from "../std/resource";
 import { TestRunner } from "../std/test-runner";
 
 /**
@@ -21,13 +22,6 @@ export interface AppProps {
    */
   readonly name?: string;
 
-  /**
-   * The path to a state file which will track all synthesized files. If a
-   * statefile is not specified, we won't be able to remove extrenous files.
-   * @default - no state file
-   */
-  readonly stateFile?: string;
-
   /**
    * The root construct class that should be instantiated with a scope and id.
    * If provided, then it will be instantiated on the user's behalf.
@@ -66,6 +60,12 @@ export interface AppProps {
    * @default - []
    */
   readonly newInstanceOverrides?: any[];
+
+  /**
+   * ParameterRegistrar of composed platforms
+   * @default - undefined
+   */
+  readonly platformParameterRegistrar?: ParameterRegistrar;
 }
 
 /**
@@ -99,27 +99,6 @@ export abstract class App extends Construct implements IApp {
     return Node.of(scope).app as App;
   }
 
-  /**
-   * Loads the `App` class for the given target.
-   * @param target one of the supported targets
-   * @returns an `App` class constructor
-   */
-  public static for(target: string): any {
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      return require(`../target-${target}/app`).App;
-    } catch (e: any) {
-      if (e.code === "MODULE_NOT_FOUND") {
-        const cannotFindModule = e.message.split("\n")[0];
-        throw new Error(
-          `${cannotFindModule}. The target "${target}" requires this module to be installed globally (using "npm i -g").`
-        );
-      }
-
-      throw new Error(`Unknown compilation target: "${target}": ${e.message}`);
-    }
-  }
-
   /** @internal */
   public readonly [APP_SYMBOL] = true;
 
@@ -152,7 +131,7 @@ export abstract class App extends Construct implements IApp {
   /**
    * Whether or not this app is being synthesized into a test environment.
    */
-  public abstract readonly isTestEnvironment: boolean;
+  public readonly isTestEnvironment: boolean;
 
   /**
    * NewInstance hooks for defining resource implementations.
@@ -160,6 +139,24 @@ export abstract class App extends Construct implements IApp {
    */
   public readonly _newInstanceOverrides: any[];
 
+  /**
+   * The test runner for this app. Only created if `isTestEnvironment` is true.
+   * @internal
+   */
+  public _testRunner: TestRunner | undefined;
+
+  /**
+   * SynthHooks hooks of dependent platforms
+   * @internal
+   */
+  protected _synthHooks?: SynthHooks;
+
+  /**
+   * Parameter registrar of composed platforms
+   * @internal
+   */
+  protected _parameters?: ParameterRegistrar;
+
   constructor(scope: Construct, id: string, props: AppProps) {
     super(scope, id);
     if (!props.entrypointDir) {
@@ -173,6 +170,8 @@ export abstract class App extends Construct implements IApp {
 
     this.entrypointDir = props.entrypointDir;
     this._newInstanceOverrides = props.newInstanceOverrides ?? [];
+    this._synthHooks = props.synthHooks;
+    this.isTestEnvironment = props.isTestEnvironment ?? false;
   }
 
   /**
@@ -184,6 +183,17 @@ export abstract class App extends Construct implements IApp {
     return `${this.outdir}/.wing`;
   }
 
+  /**
+   * The parameter registrar for the app, can be used to find and register
+   * parameter values that were provided to the wing application.
+   */
+  public get parameters() {
+    if (!this._parameters) {
+      this._parameters = new ParameterRegistrar(this, "ParameterRegistrar");
+    }
+    return this._parameters!;
+  }
+
   /**
    * Synthesize the app into an artifact.
    */
@@ -229,8 +239,10 @@ export abstract class App extends Construct implements IApp {
     const instance = this.tryNew(fqn, scope, id, ...args);
     if (!instance) {
       const typeName = fqn.replace(`${SDK_PACKAGE_NAME}.`, "");
+      const typeNameParts = typeName.split(".");
       throw new NotImplementedError(
-        `Resource "${fqn}" is not yet implemented for "${this._target}" target. Please refer to the roadmap https://github.com/orgs/winglang/projects/3/views/1?filterQuery=${typeName}`
+        `Resource "${fqn}" is not yet implemented for "${this._target}" target. Please refer to the roadmap https://github.com/orgs/winglang/projects/3/views/1?filterQuery=${typeName}`,
+        { resource: typeNameParts[typeNameParts.length - 1] }
       );
     }
 
@@ -283,35 +295,8 @@ export abstract class App extends Construct implements IApp {
     if (!type) {
       return undefined;
     }
-    return new type(scope, id, ...args);
-  }
 
-  /**
-   * Synthesize the root construct if one was given. If this is a test environment, then
-   * we will synthesize one root construct per test. Otherwise, we will synthesize exactly
-   * one root construct.
-   *
-   * @param props The App props
-   * @param testRunner The test runner
-   */
-  protected synthRoots(props: AppProps, testRunner: TestRunner) {
-    if (props.rootConstruct) {
-      const Root = props.rootConstruct;
-
-      // mark the root type so that we can find it later through
-      // Node.of(root).root
-      Node._markRoot(Root);
-
-      if (this.isTestEnvironment) {
-        new Root(this, "env0");
-        const tests = testRunner.findTests();
-        for (let i = 1; i < tests.length; i++) {
-          new Root(this, "env" + i);
-        }
-      } else {
-        new Root(this, "Default");
-      }
-    }
+    return new type(scope, id, ...args);
   }
 }
 
diff --git a/libs/wingsdk/src/core/connections.ts b/libs/wingsdk/src/core/connections.ts
index 7368f5ea19b..eed606c9aa5 100644
--- a/libs/wingsdk/src/core/connections.ts
+++ b/libs/wingsdk/src/core/connections.ts
@@ -32,18 +32,16 @@ export class Connections {
    * metadata describing how one construct is related to another construct.
    */
   public add(props: AddConnectionProps) {
-    const connection = {
-      source: props.source,
-      target: props.target,
-      name: props.name,
-    };
+    const connection = props;
 
     // avoid duplicate connections
     if (
       this._connections.some(
         (c) =>
           c.source === connection.source &&
+          c.sourceOp === connection.sourceOp &&
           c.target === connection.target &&
+          c.targetOp === connection.targetOp &&
           c.name === connection.name
       )
     ) {
@@ -59,7 +57,9 @@ export class Connections {
   public synth(outdir: string) {
     const connections = this._connections.map((c) => ({
       source: c.source.node.path,
+      sourceOp: c.sourceOp,
       target: c.target.node.path,
+      targetOp: c.targetOp,
       name: c.name,
     }));
 
@@ -85,11 +85,23 @@ export interface AddConnectionProps {
    */
   readonly source: IConstruct;
 
+  /**
+   * An operation that the source object supports.
+   * @default - no operation
+   */
+  readonly sourceOp?: string;
+
   /**
    * The target of the connection.
    */
   readonly target: IConstruct;
 
+  /**
+   * An operation that the target object supports.
+   * @default - no operation
+   */
+  readonly targetOp?: string;
+
   /**
    * A name for the connection.
    */
@@ -105,11 +117,23 @@ export interface Connection {
    */
   readonly source: IConstruct;
 
+  /**
+   * An operation that the source object supports.
+   * @default - no operation
+   */
+  readonly sourceOp?: string;
+
   /**
    * The target of the connection.
    */
   readonly target: IConstruct;
 
+  /**
+   * An operation that the target object supports.
+   * @default - no operation
+   */
+  readonly targetOp?: string;
+
   /**
    * A name for the connection.
    */
diff --git a/libs/wingsdk/src/core/errors.ts b/libs/wingsdk/src/core/errors.ts
index fc9b3dbbd01..f2cd13b71f5 100644
--- a/libs/wingsdk/src/core/errors.ts
+++ b/libs/wingsdk/src/core/errors.ts
@@ -1,12 +1,23 @@
+interface NotImplementedErrorOptions {
+  issue?: string;
+  resource?: string;
+  operation?: string;
+}
+
 export class NotImplementedError extends Error {
-  constructor(message: string, issue?: string) {
+  public name: string = "NotImplementedError";
+  public resource?: string;
+  public operation?: string;
+  constructor(message: string, options?: NotImplementedErrorOptions) {
     super(
       `${message}${
-        issue
-          ? `\nFor more information see: ${issue}.\nContributions welcome ❤️`
+        options?.issue
+          ? `\nFor more information see: ${options.issue}.\nContributions welcome ❤️`
           : ""
       }`
     );
+    this.resource = options?.resource;
+    this.operation = options?.operation;
   }
 }
 
diff --git a/libs/wingsdk/src/core/inflight.ts b/libs/wingsdk/src/core/inflight.ts
index dc7a1603989..752ff0be0c9 100644
--- a/libs/wingsdk/src/core/inflight.ts
+++ b/libs/wingsdk/src/core/inflight.ts
@@ -1,5 +1,20 @@
 import { basename } from "path";
+import { liftObject, LiftMap, INFLIGHT_INIT_METHOD_NAME } from "./lifting";
+import {
+  AsyncFunction,
+  INFLIGHT_SYMBOL,
+  Inflight,
+  OperationsOf,
+} from "./types";
+import { LiftableRecord, LiftedMap, PickNonFunctions } from "./utility-types";
 import { normalPath } from "../shared/misc";
+import type { IHostedLiftable, ImportInflightOptions } from "../std/resource";
+
+let closureCount = 0;
+
+export function closureId(): number {
+  return closureCount++;
+}
 
 export type InflightBindings = Record<string, InflightBinding>;
 
@@ -47,3 +62,241 @@ export class InflightClient {
 
   private constructor() {}
 }
+
+/**
+ * Prepares preflight objects for use in inflight functions.
+ *
+ * Conventionally, this is used by passing in a `const` object to bind it with the same name
+ *
+ * ```ts
+ * const bucket = new cloud.Bucket(app, "Bucket");
+ * const number = 5;
+ *
+ * lift({ bucket, number })
+ *   .inflight(({ bucket, number }) => { ... }))
+ * ```
+ *
+ * However, the name is not required to match the variable in the current scope.
+ *
+ * This is especially useful/necessary when lifting data via a reference or some other expression
+ *
+ * ```ts
+ * const bucket = new cloud.Bucket(app, "Bucket");
+ *
+ * lift({ bkt: bucket, sum: 2 + 2, field: bucket.field })
+ *   .inflight(({ bkt, sum, field }) => { ... }))
+ * ```
+ */
+export function lift<TToLift extends LiftableRecord>(
+  captures: TToLift
+): Lifter<LiftedMap<TToLift>, {}> {
+  return new Lifter().lift(captures);
+}
+
+/**
+ * Creates a inflight function.
+ *
+ * This function must not reference any variables outside of its scope.
+ * If needed, use `lift` to bind variables to the scope of the function.
+ *
+ * Built-in NodeJS globals are available, such as `console` and `process`.
+ * @wing inflight
+ */
+export function inflight<TFunction extends AsyncFunction>(
+  fn: (ctx: {}, ...args: Parameters<TFunction>) => ReturnType<TFunction>
+) {
+  return new Lifter().inflight(fn);
+}
+
+/**
+ * Create an inflight function from a string.
+ */
+export function importInflight(
+  /**
+   * Raw JavaScript to use as the inflight function.
+   */
+  inflightText: string,
+
+  /**
+   * The lifts the JS needs to be able to access.
+   */
+  lifts?: ImportInflightOptions["lifts"]
+) {
+  const newLifts: Record<string, any> = {};
+  const newGrants: Record<string, string[]> = {};
+
+  // convert the lifts to the correct format for the Lifter
+  for (const liftAnnotation of lifts ?? []) {
+    if (liftAnnotation.alias === undefined) {
+      throw new Error("The alias field is required for all lifts");
+    }
+
+    newLifts[liftAnnotation.alias] = liftAnnotation.obj;
+    if (liftAnnotation.ops) {
+      newGrants[liftAnnotation.alias] = liftAnnotation.ops;
+    }
+  }
+
+  return (
+    lift(newLifts)
+      .grant(newGrants)
+      // cast as any because the inflight has already been pre-serialized
+      .inflight(inflightText as any)
+  );
+}
+
+/**
+ * Manages the liftable objects and operations for an inflight function.
+ */
+class Lifter<
+  TLifted extends Record<string, any>,
+  TOperations extends Record<string, string[]>
+> {
+  constructor(
+    private lifts: LiftableRecord = {},
+    private grants: Record<string, string[]> = {}
+  ) {}
+
+  /**
+   * Add additional liftable objects to the scope of the inflight function.
+   * Any existing liftable objects with the same name will be overwritten.
+   *
+   * Conventionally, this is used by passing in a `const` object to bind it with the same name
+   *
+   * ```ts
+   * const bucket = new cloud.Bucket(app, "Bucket");
+   * const number = 5;
+   *
+   * lift({ bucket, number })
+   *   .inflight(({ bucket, number }) => { ... }))
+   * ```
+   *
+   * However, the name is not required to match the variable in the current scope.
+   *
+   * This is especially useful/necessary when lifting data via a reference or some other expression
+   *
+   * ```ts
+   * const bucket = new cloud.Bucket(app, "Bucket");
+   *
+   * lift({ bkt: bucket, sum: 2 + 2, field: bucket.field })
+   *   .inflight(({ bkt, sum, field }) => { ... }))
+   * ```
+   */
+  public lift<TWillLift extends LiftableRecord>(captures: TWillLift) {
+    return new Lifter<
+      Omit<TLifted, keyof TWillLift> & LiftedMap<TWillLift>,
+      TOperations
+    >(
+      {
+        ...this.lifts,
+        ...captures,
+      },
+      this.grants
+    );
+  }
+
+  /**
+   * Grant permissions for lifted resources.
+   *
+   * By default, all all possible methods are granted to lifted resources.
+   * This function restricts those:
+   *
+   * ```ts
+   * const bucket = new cloud.Bucket(app, "Bucket");
+   *
+   * lift({ bucket })
+   *   .grant({ bucket: ["get"] })
+   *   .inflight(({ bucket }) => {
+   *     await bucket.get("key");
+   *     await bucket.set("key", "value"); // Error: set is not granted
+   *   });
+   * ```
+   *
+   * fields are always accessible, even if not granted.
+   */
+  public grant<
+    TNewOps extends Partial<{
+      [K in keyof TLifted]: OperationsOf<TLifted[K]>;
+    }>
+  >(grants: TNewOps) {
+    return new Lifter<TLifted, Omit<TOperations, keyof TNewOps> & TNewOps>(
+      this.lifts,
+      {
+        ...this.grants,
+        ...grants,
+      }
+    );
+  }
+
+  /**
+   * Create an inflight function with the available lifted data.
+   *
+   * This function must not reference any variables outside of its scope.
+   * If needed, use `lift` again to bind variables to the scope of the function.
+   * Bound variables will be available as properties on the `ctx` object passed as the first argument to the function.
+   *
+   * Built-in NodeJS globals are available, such as `console` and `process`.
+   * @wing inflight
+   */
+  public inflight<TFunction extends AsyncFunction>(
+    fn: (
+      /** All lifted data available in this inflight */
+      ctx: // Get all the lifted types which were not explicitly granted
+      Omit<TLifted, keyof TOperations> & {
+        // For each of the granted types, get the lifted type with only the granted operations available (and any fields as well)
+        [K in keyof TOperations &
+          keyof TLifted]: TOperations[K] extends (infer TGrantedOps extends keyof TLifted[K])[]
+          ? PickNonFunctions<TLifted[K]> & Pick<TLifted[K], TGrantedOps>
+          : TLifted[K];
+      },
+      ...args: Parameters<TFunction>
+    ) => ReturnType<TFunction>
+  ): Inflight<TFunction> {
+    // This is a simplified version of the Wing compiler's _liftMap generation
+    // It specifies what transitive permissions need to be added based on what
+    // inflight methods are called on an object
+    // The SDK models inflight functions as objects with a "handle" property,
+    // so here we annotate that "handle" needs all of the required permissions
+    const _liftMap: LiftMap = { handle: [] };
+    for (const [key, obj] of Object.entries(this.lifts)) {
+      const knownOps =
+        this.grants[key] ??
+        Object.keys((obj as IHostedLiftable)._liftMap ?? {}).filter(
+          (x) => x !== INFLIGHT_INIT_METHOD_NAME // filter "$inflight_init"
+        );
+
+      _liftMap.handle.push([obj, knownOps]);
+    }
+
+    return {
+      _id: closureId(),
+      _toInflight: () => {
+        // Extremely advanced function serialization
+        const serializedFunction = fn.toString();
+
+        return `\
+(await (async () => {
+  const $func = ${serializedFunction}
+  const $ctx = {
+  ${Object.entries(this.lifts)
+    .map(([name, liftable]) => `${name}: ${liftObject(liftable)}`)
+    .join(",\n")}
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())`;
+      },
+      _liftMap,
+      // @ts-expect-error This function's type doesn't actually match, but it will just throw anyways
+      [INFLIGHT_SYMBOL]: () => {
+        throw new Error(
+          "This is a inflight function and can only be invoked while inflight"
+        );
+      },
+    };
+  }
+}
diff --git a/libs/wingsdk/src/core/lifting.ts b/libs/wingsdk/src/core/lifting.ts
index 9b186d0e10a..737f4cfd434 100644
--- a/libs/wingsdk/src/core/lifting.ts
+++ b/libs/wingsdk/src/core/lifting.ts
@@ -1,6 +1,31 @@
+import { Construct } from "constructs";
+import { NotImplementedError } from "./errors";
 import { getTokenResolver } from "./tokens";
-import { Duration } from "../std/duration";
-import { IResource } from "../std/resource";
+import { IInflightHost, ILiftable, IHostedLiftable } from "../std";
+
+/**
+ * This is the name of a special operation that is used as a key
+ * by the compiler in the `_liftMap` matrix to indicate that
+ * some transitive object dependencies are always required no matter
+ * what operations are passed to the `host`.
+ *
+ * As a user, this operation is hidden so it will not be
+ * passed as an op to `onLift` or `onLiftType` methods.
+ */
+export const INFLIGHT_INIT_METHOD_NAME = "$inflight_init";
+
+/**
+ * Inflight closures are liftable objects that have a single inflight
+ * method called "handle". This method contains the inflight code
+ * that will be executed by the inflight host.
+ */
+const INFLIGHT_CLOSURE_HANDLE_METHOD = "handle";
+
+/**
+ * The prefix used to name inflight closure object types.
+ */
+const INFLIGHT_CLOSURE_TYPE_PREFIX = "$Closure";
+
 /**
  * Creates a liftable type from a class or enum
  * @param type The type to lift, Should be a class or enum.
@@ -53,14 +78,6 @@ export function liftObject(obj: any): string {
         return `[${obj.map((o) => liftObject(o)).join(",")}]`;
       }
 
-      if (obj instanceof Duration) {
-        return liftObject({
-          seconds: obj.seconds,
-          minutes: obj.minutes,
-          hours: obj.hours,
-        });
-      }
-
       if (obj instanceof Set) {
         return `new Set(${liftObject(Array.from(obj))})`;
       }
@@ -71,8 +88,8 @@ export function liftObject(obj: any): string {
 
       // if the object is a resource (i.e. has a "_toInflight" method"), we use it to serialize
       // itself.
-      if (typeof (obj as IResource)._toInflight === "function") {
-        return (obj as IResource)._toInflight();
+      if (typeof (obj as ILiftable)._toInflight === "function") {
+        return (obj as ILiftable)._toInflight();
       }
 
       // structs are just plain objects
@@ -91,3 +108,323 @@ export function liftObject(obj: any): string {
 
   throw new Error(`Unable to lift object of type ${obj?.constructor?.name}`);
 }
+
+export type LiftMap = Record<string, Array<[any, Array<string>]>>;
+export type LiftMapNormalized = Record<string, Map<any, Set<string>>>;
+
+/**
+ * Merge two matrixes of lifting dependencies.
+ *
+ * See the unit tests in `lifting.test.ts` for examples.
+ */
+export function mergeLiftDeps(
+  matrix1: LiftMapNormalized = {},
+  matrix2: LiftMapNormalized = {}
+): LiftMapNormalized {
+  const result: LiftMapNormalized = {};
+  for (const [op, deps] of Object.entries(matrix1)) {
+    result[op] = new Map();
+    for (const [obj, objDeps] of deps) {
+      result[op].set(obj, new Set(objDeps));
+    }
+  }
+
+  for (const [op, deps] of Object.entries(matrix2)) {
+    const resultDeps = result[op] ?? new Map();
+    for (const [obj, objDeps] of deps) {
+      const resultObjDeps = resultDeps.get(obj) ?? new Set();
+      for (const dep of objDeps) {
+        resultObjDeps.add(dep);
+      }
+      resultDeps.set(obj, resultObjDeps);
+    }
+    result[op] = resultDeps;
+  }
+
+  return result;
+}
+
+/**
+ * Converts a matrix of lifting dependencies from the format emitted by the Wing compiler
+ * (using plain objects and arrays) to a denser format (using Maps and Sets),
+ * deduplicating object references if needed.
+ *
+ * The deduplication is needed because the compiler might generate something like:
+ * ```
+ * [
+ *   [obj1, ["op1"]],
+ *   [obj2, ["op2"]],
+ * ]
+ * ```
+ * not knowing that during preflight execution, obj1 and obj2 are the same object.
+ * The deduplication will turn this into:
+ * ```
+ * new Map([obj1, new Set(["op1", "op2"])])
+ * ```
+ */
+function parseMatrix(data: LiftMap): LiftMapNormalized {
+  const result: LiftMapNormalized = {};
+  for (const [op, pairs] of Object.entries(data)) {
+    result[op] = new Map();
+    for (const [obj, objDeps] of pairs) {
+      if (!result[op].has(obj)) {
+        result[op].set(obj, new Set());
+      }
+      const depSet = result[op].get(obj)!;
+      for (const dep of objDeps) {
+        depSet.add(dep);
+      }
+    }
+  }
+  return result;
+}
+
+// for debugging
+// function printMatrix(data: LiftMapNormalized): string {
+//   const lines = [];
+//   for (const [op, pairs] of Object.entries(data)) {
+//     lines.push(`${op}: {`);
+//     for (const [obj, objDeps] of pairs) {
+//       if (Construct.isConstruct(obj)) {
+//         lines.push(`  ${obj.node.path}: [${[...objDeps]}]`);
+//       } else {
+//         lines.push(`  ${obj?.constructor?.name ?? obj}: [${[...objDeps]}]`);
+//       }
+//     }
+//     lines.push("}");
+//   }
+//   return lines.join("\n");
+// }
+
+/**
+ * Collects all of the objects that need to be lifted for a given object and set of operations, by
+ * traversing the object graph.
+ *
+ * Internally, it keeps track of a queue of objects and corresponding operations that need to be lifted
+ * by the inflight host (the explored set), and a queue of objects and operations that need to be
+ * explored (the queue). Objects (any JavaScript values) can be re-added to the queue multiple times
+ * if new operations are determined as needed by the inflight host.
+ *
+ * For example, suppose an inflight host needs to call op1 on object A and op2 on object B.
+ * In addition, object B needs op3 on object A.
+ * The explored set and queue after each step of the main loop is shown below:
+ *
+ * ```
+ * explored: {} | queue: [(A, [op1]), (B, [op2])]
+ * explored: {A: [op1]} | queue: [(B, [op2])]
+ * explored: {A: [op1], B: [op2]} | queue: [(A, [op3])]
+ * explored: {A: [op1, op3], B: [op2]} | queue: []
+ */
+export function collectLifts(
+  initialObj: any,
+  initialOps: Array<string>
+): Map<any, Set<string>> {
+  if (initialOps.includes(INFLIGHT_INIT_METHOD_NAME)) {
+    throw new Error(
+      `The operation ${INFLIGHT_INIT_METHOD_NAME} is implicit and should not be requested explicitly.`
+    );
+  }
+
+  const explored = new Map<any, Set<string>>();
+  const queue = new Array<[any, Array<string>]>([initialObj, [...initialOps]]);
+  const matrixCache = new Map<any, LiftMapNormalized>();
+
+  while (queue.length > 0) {
+    // `obj` and `ops` are the preflight object and operations requested on it
+    let [obj, ops]: [any, Array<string>] = queue.shift()!;
+
+    let newObj = false;
+    if (!explored.has(obj)) {
+      explored.set(obj, new Set());
+      newObj = true;
+    }
+
+    let existingOps = explored.get(obj)!;
+
+    // Filter out any ops that we've already processed for this object.
+    ops = ops.filter((op) => !existingOps.has(op));
+
+    // If there are no ops left and we have already seen the object, skip further processing.
+    if (ops.length === 0 && !newObj) {
+      continue;
+    }
+
+    // Add the new ops to the explored set.
+    for (const op of ops) {
+      existingOps.add(op);
+    }
+
+    // Inspect the object to see if there are any transitive dependency information.
+    // Currently there are a few ways to do this:
+    // - The compiler may generate a _liftMap property on the object
+    // - The compiler may generate a static _liftTypeMap method on a class
+
+    let matrix: LiftMapNormalized;
+    if (matrixCache.has(obj)) {
+      matrix = matrixCache.get(obj)!;
+    } else if (typeof obj === "object" && obj._liftMap !== undefined) {
+      matrix = parseMatrix(obj._liftMap ?? {});
+      matrixCache.set(obj, matrix);
+    } else if (
+      typeof obj === "function" &&
+      typeof obj._liftTypeMap !== undefined
+    ) {
+      matrix = parseMatrix(obj._liftTypeMap ?? {});
+      matrixCache.set(obj, matrix);
+    } else {
+      // If the object doesn't have any dependency information, we can skip it.
+      // In the future, we might want to do more advanced analysis to
+      // lift collections of objects with onLift methods etc.
+
+      // Before we `continue` to the next iteration, check for some basic collection types
+      // so if the user puts tokens in a collection, they'll get lifted.
+      //
+      // We can't calculate what ops to put for the collection items (for
+      // example, for cases where the items are resources) since the compiler
+      // doesn't produce that information yet.
+
+      let items_to_explore: Iterable<any> = [];
+      if (Array.isArray(obj)) {
+        items_to_explore = obj;
+      } else if (obj instanceof Set) {
+        items_to_explore = obj;
+      } else if (obj instanceof Map) {
+        items_to_explore = obj.values();
+      } else if (typeof obj === "object" && obj.constructor.name === "Object") {
+        items_to_explore = Object.values(obj);
+      }
+
+      for (const item of items_to_explore) {
+        if (!explored.has(item)) {
+          let item_ops: string[] = [];
+          // If the item is an inflight closure type then implicitly add the "handle" operation
+          if (isInflightClosureObject(item)) {
+            item_ops.push(INFLIGHT_CLOSURE_HANDLE_METHOD);
+          }
+          queue.push([item, item_ops]);
+        }
+      }
+      continue;
+    }
+
+    for (const op of [...ops, INFLIGHT_INIT_METHOD_NAME]) {
+      const objDeps = matrix[op];
+
+      // If the op is $inflight_init, then the operation is implicit
+      // so it's okay it's not defined in the matrix
+      if (op === INFLIGHT_INIT_METHOD_NAME && !objDeps) {
+        continue;
+      }
+
+      if (!objDeps) {
+        if (Construct.isConstruct(obj)) {
+          throw new NotImplementedError(
+            `Resource ${obj.node.path} does not support inflight operation ${op}.\nIt might not be implemented yet.`,
+            { resource: obj.constructor.name, operation: op }
+          );
+        } else {
+          throw new Error(
+            `Unknown operation ${op} requested for object ${obj} (${obj.constructor.name})`
+          );
+        }
+      }
+
+      for (const [depObj, depOps] of objDeps.entries()) {
+        if (depOps.has(INFLIGHT_INIT_METHOD_NAME)) {
+          throw new Error(
+            `The operation ${INFLIGHT_INIT_METHOD_NAME} is implicit and should not be requested explicitly.`
+          );
+        }
+        queue.push([depObj, [...depOps]]);
+      }
+    }
+  }
+
+  return explored;
+}
+
+/**
+ * Returns whether the given item is an inflight closure object.
+ */
+function isInflightClosureObject(item: any): boolean {
+  return (
+    typeof item === "object" &&
+    typeof item.constructor === "function" &&
+    typeof item.constructor.name === "string" &&
+    item.constructor.name.startsWith(INFLIGHT_CLOSURE_TYPE_PREFIX) &&
+    item._liftMap !== undefined &&
+    item._liftMap[INFLIGHT_CLOSURE_HANDLE_METHOD] !== undefined
+  );
+}
+
+/**
+ * Represents a type with static methods that may have other things to lift.
+ */
+export interface ILiftableType {
+  /**
+   * Compiler-generated data that describes the dependencies of this object on other
+   * objects. This is used to determine which permissions need to be granted to the
+   * inflight host.
+   * @internal
+   */
+  _liftTypeMap?: LiftMap;
+
+  /**
+   * A hook called by the Wing compiler once for each inflight host that needs to
+   * use this type inflight. The list of requested inflight methods
+   * needed by the inflight host are given by `ops`.
+   *
+   * This method is commonly used for adding permissions, environment variables, or
+   * other capabilities to the inflight host.
+   */
+  onLiftType(host: IInflightHost, ops: string[]): void;
+}
+
+/**
+ * Lifting utilities.
+ */
+export class Lifting {
+  /**
+   * Perform the full lifting process on an object.
+   *
+   * Use this instead of calling `onLift` since it will also lift all of the
+   * object's dependencies, and it will ensure that the onLift methods of
+   * all objects are all called at most once.
+   */
+  public static lift(
+    obj: IHostedLiftable,
+    host: IInflightHost,
+    ops: Array<string>
+  ) {
+    // obtain all of the objects that need lifting
+    const lifts = collectLifts(obj, ops);
+
+    // call all of the onLift methods
+    for (const [liftedObj, liftedOps] of lifts) {
+      const tokens = getTokenResolver(liftedObj);
+      if (tokens) {
+        tokens.onLiftValue(host, liftedObj);
+        continue;
+      }
+
+      if (
+        typeof liftedObj === "object" &&
+        typeof liftedObj.onLift === "function"
+      ) {
+        liftedObj.onLift(host, [...liftedOps]);
+        continue;
+      }
+
+      if (
+        typeof liftedObj === "function" &&
+        typeof liftedObj.onLiftType === "function"
+      ) {
+        liftedObj.onLiftType(host, [...liftedOps]);
+        continue;
+      }
+
+      // no lift-related methods to call - it's probably a primitive
+      // so no capabilities need to be added to the inflight host
+    }
+  }
+}
diff --git a/libs/wingsdk/src/core/tree.ts b/libs/wingsdk/src/core/tree.ts
index 61115da8abe..f5fd8ee5c40 100644
--- a/libs/wingsdk/src/core/tree.ts
+++ b/libs/wingsdk/src/core/tree.ts
@@ -2,8 +2,9 @@ import * as fs from "fs";
 import * as path from "path";
 import { IConstruct } from "constructs";
 import { App } from "./app";
-import { IResource, Node, Resource } from "../std";
+import { Node } from "../std";
 import { VisualComponent } from "../ui/base";
+import { Colors, isOfTypeColors } from "../ui/colors";
 
 export const TREE_FILE_PATH = "tree.json";
 
@@ -75,10 +76,33 @@ export interface DisplayInfo {
    * @default - no UI components
    */
   readonly ui?: any[]; // UIComponent
+
+  /**
+   * The color of the resource in the UI.
+   */
+  readonly color?: Colors;
+
+  /**
+   * The icon of the resource in the UI.
+   */
+  readonly icon?: string;
+
+  /**
+   * Whether the node is expanded or collapsed by default in the UI.
+   * By default, nodes are collapsed. Set this to `true` if you want the node to be expanded by default.
+   *
+   * @default false
+   */
+  readonly expanded?: boolean;
 }
 
 /** @internal */
-export type UIComponent = UIField | UISection | UIButton;
+export type UIComponent =
+  | UIField
+  | UISection
+  | UIButton
+  | UIHttpClient
+  | UIFileBrowser;
 
 /** @internal */
 export interface UIField {
@@ -87,6 +111,7 @@ export interface UIField {
   /** The construct path to a cloud.Function */
   readonly handler: string;
   readonly refreshRate: number | undefined;
+  readonly link?: boolean;
 }
 
 /** @internal */
@@ -104,6 +129,24 @@ export interface UISection {
   readonly children: UIComponent[];
 }
 
+/** @internal */
+export interface UIHttpClient {
+  readonly kind: "http-client";
+  readonly label: string;
+  readonly getUrlHandler: string;
+  readonly getApiSpecHandler: string;
+}
+
+/** @internal */
+export interface UIFileBrowser {
+  readonly kind: "file-browser";
+  readonly label: string;
+  readonly putHandler: string;
+  readonly deleteHandler: string;
+  readonly getHandler: string;
+  readonly listHandler: string;
+}
+
 /**
  * The construct tree.
  */
@@ -185,14 +228,7 @@ export function synthesizeTree(app: App, outdir: string) {
   );
 }
 
-function isIResource(construct: IConstruct): construct is IResource {
-  return construct instanceof Resource;
-}
-
 function synthDisplay(construct: IConstruct): DisplayInfo | undefined {
-  if (!isIResource(construct)) {
-    return;
-  }
   const display = Node.of(construct);
 
   const ui: UIComponent[] = [];
@@ -206,13 +242,24 @@ function synthDisplay(construct: IConstruct): DisplayInfo | undefined {
     }
   }
 
-  if (display.description || display.title || display.hidden || ui) {
+  if (
+    display.description ||
+    display.title ||
+    display.hidden ||
+    ui ||
+    display.color ||
+    display.icon ||
+    display.expanded
+  ) {
     return {
       title: display.title,
       description: display.description,
       hidden: display.hidden,
       sourceModule: display.sourceModule,
       ui: ui.length > 0 ? ui : undefined,
+      color: isOfTypeColors(display.color) ? display.color : undefined,
+      icon: display.icon,
+      expanded: display.expanded,
     };
   }
   return;
diff --git a/libs/wingsdk/src/core/types.ts b/libs/wingsdk/src/core/types.ts
new file mode 100644
index 00000000000..a65e1950fa2
--- /dev/null
+++ b/libs/wingsdk/src/core/types.ts
@@ -0,0 +1,43 @@
+/// This file is used to generate types within the compiler and make sure they're shared for external usage
+
+import type { IInflight } from "../std/resource";
+
+// re-exporting useful types
+export { Construct } from "constructs";
+
+/** Flag to signify the `inflight` side of a `preflight` object  */
+export const INFLIGHT_SYMBOL: unique symbol = Symbol("@winglang/sdk.inflight");
+
+/** This symbol is not defined in cloud/secrets.ts due to circular dependencies
+ * between cloud/secrets.ts and platform/platform-manager.ts, which need to be revisited
+ * in the meantime this dependency inversion is used to avoid the circular dependency
+ */
+export const SECRET_SYMBOL = Symbol("@winglang/sdk.cloud.Secret");
+
+/** `preflight` representation of an `inflight`  */
+export type Inflight<F extends AsyncFunction> = IInflight & {
+  /** Note: This is not actually callable,
+   *  this is a phantom type to ensure the type information can cross the phase boundary
+   */
+  [INFLIGHT_SYMBOL]?: F;
+};
+
+/** Extract async methods of an object and return them as discriminant types of an array */
+export type OperationsOf<T> = (keyof Pick<
+  T,
+  {
+    [K in keyof T]: T[K] extends AsyncFunction ? K : never;
+  }[keyof T]
+>)[];
+
+export type AnyFunction = (...args: any[]) => any;
+export type AsyncFunction = (...args: any[]) => Promise<any>;
+
+/** An object that contains only valid data for JSON.stringify() */
+export type Json =
+  | null
+  | string
+  | number
+  | boolean
+  | Json[]
+  | { [key: string]: Json };
diff --git a/libs/wingsdk/src/core/utility-types.ts b/libs/wingsdk/src/core/utility-types.ts
new file mode 100644
index 00000000000..ff917f73096
--- /dev/null
+++ b/libs/wingsdk/src/core/utility-types.ts
@@ -0,0 +1,66 @@
+import { INFLIGHT_SYMBOL } from "./types";
+import type { IHostedLiftable, ILiftable } from "../std/resource";
+
+/**
+ * Extracts the non-function properties from a given type as an array of their discriminated keys.
+ */
+export type PickNonFunctions<T> = Pick<
+  T,
+  {
+    [K in keyof T]: T[K] extends (...args: any[]) => any ? never : K;
+  }[keyof T]
+>;
+
+/**
+ * Represents a map of liftable objects with string keys.
+ */
+export type LiftableRecord = { [key: string]: Liftable };
+
+/**
+ * Represents a set of liftable objects.
+ */
+export type LiftableSet = Set<Liftable>;
+
+/**
+ * Array of liftable objects.
+ */
+export type LiftableArray = Liftable[];
+
+/**
+ * Represents a map of liftable objects with string keys.
+ */
+export type LiftableMap = Map<string, Liftable>;
+
+/**
+ * Liftable primitives: number, string, or boolean.
+ */
+export type LiftablePrimitives = number | string | boolean;
+
+/**
+ * An object that can be lifted.
+ */
+export type Liftable =
+  | undefined
+  | LiftablePrimitives
+  | LiftableArray
+  | ILiftable
+  | IHostedLiftable
+  | LiftableRecord
+  | LiftableMap
+  | LiftableSet;
+
+/**
+ * The lifted side of a liftable object.
+ */
+export type Lifted<T> = T extends { [INFLIGHT_SYMBOL]?: infer TClient }
+  ? TClient
+  : T extends Liftable
+  ? T
+  : never;
+
+/**
+ * Map of strings to lifted objects.
+ */
+export type LiftedMap<T extends Record<string, any>> = {
+  [K in keyof T]: Lifted<T[K]>;
+};
diff --git a/libs/wingsdk/src/ex/dynamodb-table.md b/libs/wingsdk/src/ex/dynamodb-table.md
deleted file mode 100644
index c650fed609a..00000000000
--- a/libs/wingsdk/src/ex/dynamodb-table.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Dynamodb Table
-id: dynamodb-table
-description: A cloud Dynamodb table.
-keywords: [dynamoDB, NoSQL, store, DB, database, cache, table]
-sidebar_position: 1
----
diff --git a/libs/wingsdk/src/ex/dynamodb-table.ts b/libs/wingsdk/src/ex/dynamodb-table.ts
deleted file mode 100644
index c88a631a8b6..00000000000
--- a/libs/wingsdk/src/ex/dynamodb-table.ts
+++ /dev/null
@@ -1,1499 +0,0 @@
-import {
-  BatchGetItemCommand,
-  BatchWriteItemCommand,
-  DeleteItemCommand,
-  DynamoDBClient,
-  GetItemCommand,
-  PutItemCommand,
-  QueryCommand,
-  ScanCommand,
-  TransactGetItem,
-  TransactGetItemsCommand,
-  TransactWriteItem,
-  TransactWriteItemsCommand,
-  UpdateItemCommand,
-} from "@aws-sdk/client-dynamodb";
-import { marshall, unmarshall } from "@aws-sdk/util-dynamodb";
-import { Construct } from "constructs";
-import { fqnForType } from "../constants";
-import { Json, Node, Resource } from "../std";
-
-/**
- * Global identifier for `DynamodbTable`.
- */
-export const DYNAMODB_TABLE_FQN = fqnForType("ex.DynamodbTable");
-
-/**
- * Properties for `DynamodbTable`.
- */
-export interface DynamodbTableProps {
-  /**
-   * The table's name.
-   */
-  readonly name: string;
-  /**
-   * Table attribute definitions. e.g.  { "myKey": "S", "myOtherKey": "S" }.
-   */
-  readonly attributeDefinitions: Json;
-  /**
-   * Hash key for this table.
-   */
-  readonly hashKey: string;
-  /**
-   * Range key for this table.
-   * @default undefined
-   */
-  readonly rangeKey?: string;
-}
-
-/**
- * A cloud Dynamodb table.
- *
- * @inflight `@winglang/sdk.ex.IDynamodbTableClient`
- * @abstract
- */
-export class DynamodbTable extends Resource {
-  /**
-   * Table name
-   */
-  public readonly name!: string;
-
-  constructor(scope: Construct, id: string, props: DynamodbTableProps) {
-    if (new.target === DynamodbTable) {
-      return Resource._newFromFactory(DYNAMODB_TABLE_FQN, scope, id, props);
-    }
-
-    super(scope, id);
-
-    Node.of(this).title = "DynamodbTable";
-    Node.of(this).description = "A DynamoDb Table";
-
-    if (!props.name) {
-      throw new Error("Dynamodb table name is not defined");
-    }
-    this.name = props.name;
-  }
-}
-
-/**
- * Options for `DynamodbTable.putItem`.
- */
-export interface DynamodbTablePutItemOptions {
-  /**
-   * The values of the item to be put.
-   */
-  readonly item: Json;
-
-  /**
-   * A condition that must be satisfied in order for an operation to succeed.
-   */
-  readonly conditionExpression?: string;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-
-  /**
-   * Determines whether item collection metrics are returned.
-   * @default "NONE"
-   */
-  readonly returnItemCollectionMetrics?: "SIZE" | "NONE";
-
-  /**
-   * Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Put condition fails.
-   * @default "NONE"
-   */
-  readonly returnValuesOnConditionCheckFailure?: "ALL_OLD" | "NONE";
-}
-
-/**
- * Result for `DynamodbTable.putItem`.
- */
-export interface DynamodbTablePutItemResult {
-  /**
-   * The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-   */
-  readonly attributes?: Json;
-
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * Information about item collections, if any, that were affected by the operation.
-   */
-  readonly itemCollectionMetrics?: Json;
-}
-
-/**
- * Options for `DynamodbTable.updateItem`.
- */
-export interface DynamodbTableUpdateItemOptions {
-  /**
-   * The primary key of the item to be updated.
-   */
-  readonly key: Json;
-
-  /**
-   * An expression that defines one or more attributes to be updated.
-   */
-  readonly updateExpression?: string;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * A condition that must be satisfied in order for a conditional update to succeed.
-   */
-  readonly conditionExpression?: string;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-
-  /**
-   * Determines whether item collection metrics are returned.
-   * @default "NONE"
-   */
-  readonly returnItemCollectionMetrics?: "SIZE" | "NONE";
-
-  /**
-   * Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Update condition fails.
-   * @default "NONE"
-   */
-  readonly returnValuesOnConditionCheckFailure?: "ALL_OLD" | "NONE";
-
-  /**
-   * Use ReturnValues to get the item attributes if the Update operation succeeds.
-   * @default "NONE"
-   */
-  readonly returnValues?: "ALL_OLD" | "NONE";
-}
-
-/**
- * Result for `DynamodbTable.updateItem`.
- */
-export interface DynamodbTableUpdateItemResult {
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * Information about item collections, if any, that were affected by the operation.
-   */
-  readonly itemCollectionMetrics?: Json;
-
-  /**
-   * The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-   */
-  readonly attributes?: Json;
-}
-
-/**
- * Options for `DynamodbTable.deleteItem`.
- */
-export interface DynamodbTableDeleteItemOptions {
-  /**
-   * The primary key of the item to be deleted.
-   */
-  readonly key: Json;
-
-  /**
-   * A condition that must be satisfied in order for an operation to succeed.
-   */
-  readonly conditionExpression?: string;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-
-  /**
-   * Determines whether item collection metrics are returned.
-   * @default "NONE"
-   */
-  readonly returnItemCollectionMetrics?: "SIZE" | "NONE";
-
-  /**
-   * Whether to return the item attributes as they appeared before they were deleted.
-   * @default "NONE"
-   */
-  readonly returnValues?: "NONE" | "ALL_OLD";
-
-  /**
-   * Whether to return the item attributes if the condition fails.
-   * @default "NONE"
-   */
-  readonly returnValuesOnConditionCheckFailure?: "ALL_OLD" | "NONE";
-}
-
-/**
- * Result for `DynamodbTable.deleteItem`.
- */
-export interface DynamodbTableDeleteItemResult {
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * Information about item collections, if any, that were affected by the operation.
-   */
-  readonly itemCollectionMetrics?: Json;
-
-  /**
-   * The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-   */
-  readonly attributes?: Json;
-}
-
-/**
- * Options for `DynamodbTable.getItem`.
- */
-export interface DynamodbTableGetItemOptions {
-  /**
-   * The primary key of the item to be retrieved.
-   */
-  readonly key: Json;
-
-  /**
-   * Determines the read consistency model: If set to true, then the operation uses strongly consistent reads; otherwise, the operation uses eventually consistent reads.
-   *
-   * @default false
-   */
-  readonly consistentRead?: boolean;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * A string that identifies one or more attributes to retrieve from the table.
-   */
-  readonly projectionExpression?: string;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   *
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-}
-
-/**
- * Result for `DynamodbTable.getItem`.
- *
- */
-export interface DynamodbTableGetItemResult {
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * A map of attribute names to `AttributeValue` objects, as specified by `ProjectionExpression`.
-   */
-  readonly item?: Json;
-}
-
-/**
- * Options for `DynamodbTable.scan`.
- */
-export interface DynamodbTableScanOptions {
-  /**
-   * Determines the read consistency model: If set to true, then the operation uses strongly consistent reads; otherwise, the operation uses eventually consistent reads.
-   *
-   * @default false
-   */
-  readonly consistentRead?: boolean;
-
-  /**
-   * The primary key of the first item that this operation will evaluate.
-   *
-   */
-  readonly exclusiveStartKey?: Json;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   *
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   *
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * A string that contains conditions that DynamoDB applies after the Query operation, but before the data is returned to you.
-   *
-   */
-  readonly filterExpression?: string;
-
-  /**
-   * The name of an index to query.
-   *
-   */
-  readonly indexName?: string;
-
-  /**
-   * The maximum number of items to evaluate (not necessarily the number of matching items).
-   *
-   * @minimum 1
-   */
-  readonly limit?: number;
-
-  /**
-   * A string that identifies one or more attributes to retrieve from the table.
-   *
-   */
-  readonly projectionExpression?: string;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   *
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-
-  /**
-   * For a parallel Scan request, Segment identifies an individual segment to be scanned by an application worker.
-   *
-   * @minimum 0
-   * @maximum 999999
-   * @default 0
-   */
-  readonly segment?: number;
-
-  /**
-   * The attributes to be returned in the result.
-   *
-   */
-  readonly select?:
-    | "ALL_ATTRIBUTES"
-    | "ALL_PROJECTED_ATTRIBUTES"
-    | "SPECIFIC_ATTRIBUTES"
-    | "COUNT";
-
-  /**
-   * For a parallel Scan request, TotalSegments represents the total number of segments into which the Scan operation will be divided.
-   *
-   * @minimum 1
-   * @maximum 1000000
-   * @default 1
-   */
-  readonly totalSegments?: number;
-}
-
-/**
- * Result for `DynamodbTable.scan`.
- */
-export interface DynamodbTableScanResult {
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * The number of items in the response.
-   */
-  readonly count: number;
-
-  /**
-   * An array of item attributes that match the scan criteria.
-   */
-  readonly items: Array<Json>;
-
-  /**
-   * The primary key of the item where the operation stopped, inclusive of the previous result set.
-   */
-  readonly lastEvaluatedKey?: Json;
-
-  /**
-   * The number of items evaluated, before any ScanFilter is applied.
-   */
-  readonly scannedCount: number;
-}
-
-/**
- * Options for `DynamodbTable.query`.
- */
-export interface DynamodbTableQueryOptions {
-  /**
-   * Determines the read consistency model: If set to true, then the operation uses strongly consistent reads; otherwise, the operation uses eventually consistent reads.
-   *
-   * @default false
-   */
-  readonly consistentRead?: boolean;
-
-  /**
-   * The primary key of the first item that this operation will evaluate.
-   *
-   */
-  readonly exclusiveStartKey?: Json;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   *
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   *
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * A string that contains conditions that DynamoDB applies after the Query operation, but before the data is returned to you.
-   *
-   */
-  readonly filterExpression?: string;
-
-  /**
-   * The name of an index to query.
-   *
-   */
-  readonly indexName?: string;
-
-  /**
-   * The condition that specifies the key values for items to be retrieved by the Query action.
-   *
-   */
-  readonly keyConditionExpression: string;
-
-  /**
-   * The maximum number of items to evaluate (not necessarily the number of matching items).
-   *
-   * @minimum 1
-   */
-  readonly limit?: number;
-
-  /**
-   * A string that identifies one or more attributes to retrieve from the table.
-   *
-   */
-  readonly projectionExpression?: string;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   *
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-
-  /**
-   * Specifies the order for index traversal.
-   *
-   * @default true
-   */
-  readonly scanIndexForward?: boolean;
-
-  /**
-   * The attributes to be returned in the result.
-   *
-   */
-  readonly select?:
-    | "ALL_ATTRIBUTES"
-    | "ALL_PROJECTED_ATTRIBUTES"
-    | "SPECIFIC_ATTRIBUTES"
-    | "COUNT";
-}
-
-/**
- * Result for `DynamodbTable.query`.
- *
- */
-export interface DynamodbTableQueryResult {
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * The number of items in the response.
-   */
-  readonly count: number;
-
-  /**
-   * An array of item attributes that match the scan criteria.
-   */
-  readonly items: Array<Json>;
-
-  /**
-   * The primary key of the item where the operation stopped, inclusive of the previous result set.
-   */
-  readonly lastEvaluatedKey?: Json;
-
-  /**
-   * The number of items evaluated, before any QueryFilter is applied.
-   */
-  readonly scannedCount: number;
-}
-
-/**
- * Options for transact write item's update operation.
- */
-export interface DynamodbTransactWriteItemPutOptions {
-  /**
-   * The values of the item to be put.
-   */
-  readonly item: Json;
-
-  /**
-   * A condition that must be satisfied in order for the operation to succeed.
-   * @default undefined
-   */
-  readonly conditionExpression?: string;
-}
-
-/**
- * Options for transact write item's update operation.
- */
-export interface DynamodbTransactWriteItemUpdateOptions {
-  /**
-   * The primary key of the item to be updated.
-   */
-  readonly key: Json;
-
-  /**
-   * An expression that defines one or more attributes to be updated.
-   */
-  readonly updateExpression?: string;
-
-  /**
-   * A condition that must be satisfied in order for an operation to succeed.
-   */
-  readonly conditionExpression?: string;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   * @default "NONE"
-   */
-  readonly returnValuesOnConditionCheckFailure?: "ALL_OLD" | "NONE";
-}
-
-/**
- * Options for transact write item's delete operation.
- */
-export interface DynamodbTransactWriteItemDeleteOptions {
-  /**
-   * The primary key of the item to be deleted.
-   */
-  readonly key: Json;
-
-  /**
-   * A condition that must be satisfied in order for an operation to succeed.
-   */
-  readonly conditionExpression?: string;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   * @default "NONE"
-   */
-  readonly returnValuesOnConditionCheckFailure?: "ALL_OLD" | "NONE";
-}
-
-/**
- * Options for transact write item's condition check operation.
- */
-export interface DynamodbTransactWriteItemConditionCheckOptions {
-  /**
-   * The primary key of the item to be checked.
-   */
-  readonly key: Json;
-
-  /**
-   * A condition that must be satisfied in order for an operation to succeed.
-   */
-  readonly conditionExpression?: string;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * One or more values that can be substituted in an expression.
-   */
-  readonly expressionAttributeValues?: Json;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   * @default "NONE"
-   */
-  readonly returnValuesOnConditionCheckFailure?: "ALL_OLD" | "NONE";
-}
-
-/**
- * Options for `DynamodbTable.batchGetItem` request item.
- */
-export interface DynamodbTableBatchGetItemRequestItem {
-  /**
-   * The primary key attribute values that define the items and the attributes associated with the items.
-   */
-  readonly keys: Json[];
-
-  /**
-   * The consistency of a read operation.
-   * @default false
-   */
-  readonly consistentRead?: boolean;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * A string that identifies one or more attributes to retrieve from the table.
-   */
-  readonly projectionExpression?: string;
-}
-
-/**
- * Options for `DynamodbTable.batchGetItem`.
- */
-export interface DynamodbTableBatchGetItemOptions {
-  /**
-   * Describes one or more items to retrieve from that table.
-   */
-  readonly requestItem: DynamodbTableBatchGetItemRequestItem;
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   *
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-}
-
-/**
- * Result for `DynamodbTable.batchGetItem`.
- */
-export interface DynamodbTableBatchGetItemResult {
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * The list of items that are returned, with the attributes requested.
-   */
-  readonly responses?: Json[];
-
-  /**
-   * A list of keys that were not processed.
-   */
-  readonly unprocessedKeys?: DynamodbTableBatchGetItemRequestItem;
-}
-
-/**
- * Options for `DynamodbTable.batchWriteItem`'s delete request.
- */
-export interface DynamodbTableBatchWriteItemDeleteRequestOptions {
-  /**
-   * The primary key of the item to be deleted.
-   */
-  readonly key: Json;
-}
-
-/**
- * Options for `DynamodbTable.batchWriteItem`'s put request.
- */
-export interface DynamodbTableBatchWriteItemPutRequestOptions {
-  /**
-   * The values of the item to be put.
-   */
-  readonly item: Json;
-}
-
-/**
- * Options for `DynamodbTable.batchWriteItem` request item.
- */
-export interface DynamodbTableBatchWriteItemRequestItem {
-  /**
-   * A request to perform a delete operation.
-   */
-  readonly deleteRequest?: DynamodbTableBatchWriteItemDeleteRequestOptions;
-
-  /**
-   * A request to perform a put operation.
-   */
-  readonly putRequest?: DynamodbTableBatchWriteItemPutRequestOptions;
-}
-
-/**
- * Options for `DynamodbTable.batchWriteItem`.
- */
-export interface DynamodbTableBatchWriteItemOptions {
-  /**
-   * A list of operations to be performed (`DeleteRequest` or `PutRequest`).
-   */
-  readonly requestItems: DynamodbTableBatchWriteItemRequestItem[];
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   *
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-
-  /**
-   * Determines whether item collection metrics are returned.
-   *
-   * @default "NONE"
-   */
-  readonly returnItemCollectionMetrics?: "SIZE" | "NONE";
-}
-
-/**
- * Result for `DynamodbTable.batchWriteItem`.
- */
-export interface DynamodbTableBatchWriteItemResult {
-  /**
-   * The unprocessed items from the operation.
-   */
-  readonly unprocessedItems?: DynamodbTableBatchWriteItemRequestItem[];
-
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * Information about item collections, if any, that were affected by the operation.
-   */
-  readonly itemCollectionMetrics?: Json;
-}
-
-/**
- * Dynamodb transact write operation
- */
-export interface DynamodbTransactWriteItem {
-  /**
-   * A request to perform a put operation.
-   */
-  readonly put?: DynamodbTransactWriteItemPutOptions;
-
-  /**
-   * A request to perform a update operation.
-   */
-  readonly update?: DynamodbTransactWriteItemUpdateOptions;
-
-  /**
-   * A request to perform a delete operation.
-   */
-  readonly delete?: DynamodbTransactWriteItemDeleteOptions;
-
-  /**
-   * A request to perform a condition check operation.
-   */
-  readonly conditionCheck?: DynamodbTransactWriteItemConditionCheckOptions;
-}
-
-/**
- * Options for `DynamodbTable.transactWriteItems`.
- */
-export interface DynamodbTransactWriteItemsOptions {
-  /**
-   * The write transact items.
-   */
-  readonly transactItems: DynamodbTransactWriteItem[];
-}
-
-/**
- * Result for `DynamodbTable.transactWriteItems`.
- */
-export interface DynamodbTableTransactWriteItemsResult {
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-
-  /**
-   * Information about item collections, if any, that were affected by the operation.
-   */
-  readonly itemCollectionMetrics?: Json;
-
-  /**
-   * The attribute values as they appeared before the operation, but only if `ReturnValues` is specified as `"ALL_OLD"` in the request.
-   */
-  readonly attributes?: Json;
-}
-
-/**
- * Options for `DynamodbTable.transactGetItems`'s get operation.
- */
-export interface DynamodbTransactGetItemGetOptions {
-  /**
-   * The primary key of the item to be retrieved.
-   */
-  readonly key: Json;
-
-  /**
-   * One or more substitution tokens for attribute names in an expression.
-   * @default undefined
-   */
-  readonly expressionAttributeNames?: Json;
-
-  /**
-   * A string that identifies one or more attributes to retrieve from the table.
-   * @default undefined
-   */
-  readonly projectionExpression?: string;
-}
-
-/**
- * Dynamodb transact get operation.
- */
-export interface DynamodbTransactGetItem {
-  /**
-   * A request to perform a get operation.
-   */
-  readonly get?: DynamodbTransactGetItemGetOptions;
-}
-
-/**
- * Options for `DynamodbTable.transactGetItems`.
- */
-export interface DynamodbTransactGetItemsOptions {
-  /**
-   * An ordered array of up to 100 `DynamodbTransactGetItem` objects, each of which contains a `DynamodbTransactGetItem` structure.
-   */
-  readonly transactItems: DynamodbTransactGetItem[];
-
-  /**
-   * Determines the level of detail about either provisioned or on-demand throughput consumption.
-   * @default "NONE"
-   */
-  readonly returnConsumedCapacity?: "INDEXES" | "TOTAL" | "NONE";
-}
-
-/**
- * Details of the requested item.
- */
-export interface DynamodbTableTransactGetItemsResponseItem {
-  /**
-   * The values of the item.
-   */
-  readonly item: Json;
-}
-
-/**
- * Result for `DynamodbTable.transactGetItems`.
- */
-export interface DynamodbTableTransactGetItemsResult {
-  /**
-   * An ordered array of up to 100 `DynamodbTableTransactGetItemsResponseItem` objects.
-   */
-  readonly responses: DynamodbTableTransactGetItemsResponseItem[];
-
-  /**
-   * The capacity units consumed by the operation.
-   */
-  readonly consumedCapacity?: Json;
-}
-
-/**
- * Inflight interface for `DynamodbTable`.
- */
-export interface IDynamodbTableClient {
-  /**
-   * Put an item into the table.
-   * @param options dynamodb PutItem options.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_PutItem.html
-   */
-  putItem(
-    options: DynamodbTablePutItemOptions
-  ): Promise<DynamodbTablePutItemResult>;
-
-  /**
-   * Edit an existing item's attributes, or add a new item to the table if it does not already exist.
-   * @param options dynamodb UpdateItem options.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_UpdateItem.html
-   */
-  updateItem(
-    options: DynamodbTableUpdateItemOptions
-  ): Promise<DynamodbTableUpdateItemResult>;
-
-  /**
-   * Delete an item from the table.
-   * @param options dynamodb DeleteItem options.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_DeleteItem.html
-   */
-  deleteItem(
-    options: DynamodbTableDeleteItemOptions
-  ): Promise<DynamodbTableDeleteItemResult>;
-
-  /**
-   * Get an item from the table.
-   * @param options options for the getItem operation.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_GetItem.html
-   */
-  getItem(
-    options: DynamodbTableGetItemOptions
-  ): Promise<DynamodbTableGetItemResult>;
-
-  /**
-   * Return one or more items and item attributes by accessing every item in a table or a secondary index.
-   * @param options options for the scan operation.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html
-   */
-  scan(options?: DynamodbTableScanOptions): Promise<DynamodbTableScanResult>;
-
-  /**
-   * Return all items with a given partition key value.
-   * @param options options for the query operation.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html
-   */
-  query(options: DynamodbTableQueryOptions): Promise<DynamodbTableQueryResult>;
-
-  /**
-   * Perform a synchronous read operation that groups up to 100 item retrievals.
-   * @param options options for the query operation.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactGetItems.html
-   */
-  transactGetItems(
-    options: DynamodbTransactGetItemsOptions
-  ): Promise<DynamodbTableTransactGetItemsResult>;
-
-  /**
-   * Perform a synchronous write operation that groups up to 100 action requests.
-   * @param options options for the transact write items operation.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactWriteItems.html
-   */
-  transactWriteItems(
-    options: DynamodbTransactWriteItemsOptions
-  ): Promise<DynamodbTableTransactWriteItemsResult>;
-
-  /**
-   * Return the attributes of one or more items.
-   * @param options options for the batch get item operation.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchGetItem.html
-   */
-  batchGetItem(
-    options: DynamodbTableBatchGetItemOptions
-  ): Promise<DynamodbTableBatchGetItemResult>;
-
-  /**
-   * Put or delete multiple items.
-   * @param options options for the batch write item operation.
-   * @inflight
-   * @see https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html
-   */
-  batchWriteItem(
-    options: DynamodbTableBatchWriteItemOptions
-  ): Promise<DynamodbTableBatchWriteItemResult>;
-}
-
-/**
- * List of inflight operations available for `DynamodbTable`.
- * @internal
- */
-export enum DynamodbTableInflightMethods {
-  /** `DynamodbTable.putItem` */
-  PUT_ITEM = "putItem",
-  /** `DynamodbTable.updateItem` */
-  UPDATE_ITEM = "updateItem",
-  /** `DynamodbTable.deleteItem` */
-  DELETE_ITEM = "deleteItem",
-  /** `DynamodbTable.getItem` */
-  GET_ITEM = "getItem",
-  /** `DynamodbTable.scan` */
-  SCAN = "scan",
-  /** `DynamodbTable.query` */
-  QUERY = "query",
-  /** `DynamodbTable.transactGetItems` */
-  TRANSACT_GET_ITEMS = "transactGetItems",
-  /** `DynamodbTable.transactWriteItems` */
-  TRANSACT_WRITE_ITEMS = "transactWriteItems",
-  /** `DynamodbTable.batchGetItem` */
-  BATCH_GET_ITEM = "batchGetItem",
-  /** `DynamodbTable.batchWriteItem` */
-  BATCH_WRITE_ITEM = "batchWriteItem",
-}
-
-/**
- * Base class for `DynamodbTable` Client.
- */
-export abstract class DynamodbTableClientBase implements IDynamodbTableClient {
-  /**
-   * @param tableName the table name.
-   */
-  constructor(protected tableName: string) {}
-
-  /**
-   * Dynamodb table client.
-   * @internal
-   */
-  public abstract _rawClient(): Promise<DynamoDBClient>;
-
-  public async putItem(
-    options: DynamodbTablePutItemOptions
-  ): Promise<DynamodbTablePutItemResult> {
-    const client = await this._rawClient();
-    const response = await client.send(
-      new PutItemCommand({
-        TableName: this.tableName,
-        Item: marshall(options.item),
-        ConditionExpression: options?.conditionExpression,
-        ExpressionAttributeNames: options?.expressionAttributeNames as
-          | Record<string, string>
-          | undefined,
-        ExpressionAttributeValues: options?.expressionAttributeValues
-          ? marshall(options?.expressionAttributeValues)
-          : undefined,
-        ReturnConsumedCapacity: options?.returnConsumedCapacity,
-        ReturnItemCollectionMetrics: options?.returnItemCollectionMetrics,
-        ReturnValuesOnConditionCheckFailure:
-          options?.returnValuesOnConditionCheckFailure,
-      })
-    );
-    return {
-      attributes: response.Attributes
-        ? (unmarshall(response.Attributes) as Json)
-        : undefined,
-      consumedCapacity: response.ConsumedCapacity as Json | undefined,
-      itemCollectionMetrics: response.ItemCollectionMetrics as Json | undefined,
-    };
-  }
-
-  public async updateItem(
-    options: DynamodbTableUpdateItemOptions
-  ): Promise<DynamodbTableUpdateItemResult> {
-    const client = await this._rawClient();
-    const result = await client.send(
-      new UpdateItemCommand({
-        TableName: this.tableName,
-        Key: marshall(options.key),
-        UpdateExpression: options?.updateExpression,
-        ExpressionAttributeValues: options?.expressionAttributeValues
-          ? marshall(options?.expressionAttributeValues)
-          : undefined,
-        ExpressionAttributeNames: options?.expressionAttributeNames as
-          | Record<string, string>
-          | undefined,
-        ConditionExpression: options?.conditionExpression,
-        ReturnConsumedCapacity: options?.returnConsumedCapacity,
-        ReturnItemCollectionMetrics: options?.returnItemCollectionMetrics,
-        ReturnValues: options?.returnValues,
-        ReturnValuesOnConditionCheckFailure:
-          options?.returnValuesOnConditionCheckFailure,
-      })
-    );
-    return {
-      attributes: result.Attributes
-        ? (unmarshall(result.Attributes) as Json)
-        : undefined,
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      itemCollectionMetrics: result.ItemCollectionMetrics as Json | undefined,
-    };
-  }
-
-  public async deleteItem(
-    options: DynamodbTableDeleteItemOptions
-  ): Promise<DynamodbTableDeleteItemResult> {
-    const client = await this._rawClient();
-    const result = await client.send(
-      new DeleteItemCommand({
-        TableName: this.tableName,
-        Key: marshall(options.key),
-        ConditionExpression: options?.conditionExpression,
-        ExpressionAttributeNames: options?.expressionAttributeNames as
-          | Record<string, string>
-          | undefined,
-        ExpressionAttributeValues: options?.expressionAttributeValues
-          ? marshall(options?.expressionAttributeValues)
-          : undefined,
-        ReturnConsumedCapacity: options?.returnConsumedCapacity,
-        ReturnItemCollectionMetrics: options?.returnItemCollectionMetrics,
-        ReturnValues: options?.returnValues,
-        ReturnValuesOnConditionCheckFailure:
-          options?.returnValuesOnConditionCheckFailure,
-      })
-    );
-    return {
-      attributes: result.Attributes
-        ? (unmarshall(result.Attributes) as Json)
-        : undefined,
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      itemCollectionMetrics: result.ItemCollectionMetrics as Json | undefined,
-    };
-  }
-
-  public async getItem(
-    options: DynamodbTableGetItemOptions
-  ): Promise<DynamodbTableGetItemResult> {
-    const client = await this._rawClient();
-    const result = await client.send(
-      new GetItemCommand({
-        TableName: this.tableName,
-        Key: marshall(options.key),
-        ConsistentRead: options.consistentRead,
-        ReturnConsumedCapacity: options.returnConsumedCapacity,
-        ProjectionExpression: options.projectionExpression,
-        ExpressionAttributeNames: options.expressionAttributeNames as
-          | Record<string, string>
-          | undefined,
-      })
-    );
-    return {
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      item: result.Item ? (unmarshall(result.Item) as Json) : undefined,
-    };
-  }
-
-  public async scan(
-    options?: DynamodbTableScanOptions
-  ): Promise<DynamodbTableScanResult> {
-    const client = await this._rawClient();
-    const result = await client.send(
-      new ScanCommand({
-        TableName: this.tableName,
-        ConsistentRead: options?.consistentRead,
-        ExclusiveStartKey: options?.exclusiveStartKey
-          ? marshall(options.exclusiveStartKey)
-          : undefined,
-        ExpressionAttributeNames: options?.expressionAttributeNames as any,
-        ExpressionAttributeValues: options?.expressionAttributeValues
-          ? marshall(options.expressionAttributeValues)
-          : undefined,
-        FilterExpression: options?.filterExpression,
-        IndexName: options?.indexName,
-        Limit: options?.limit,
-        ProjectionExpression: options?.projectionExpression,
-        ReturnConsumedCapacity: options?.returnConsumedCapacity,
-        Segment: options?.segment,
-        Select: options?.select,
-        TotalSegments: options?.totalSegments,
-      })
-    );
-    return {
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      count: result.Count!,
-      items: result.Items!.map((item) => unmarshall(item) as Json),
-      lastEvaluatedKey: result.LastEvaluatedKey
-        ? (unmarshall(result.LastEvaluatedKey) as Json)
-        : undefined,
-      scannedCount: result.ScannedCount!,
-    };
-  }
-
-  public async query(
-    options: DynamodbTableQueryOptions
-  ): Promise<DynamodbTableQueryResult> {
-    const client = await this._rawClient();
-    const result = await client.send(
-      new QueryCommand({
-        TableName: this.tableName,
-        ConsistentRead: options.consistentRead,
-        ExclusiveStartKey: options.exclusiveStartKey
-          ? marshall(options.exclusiveStartKey)
-          : undefined,
-        ExpressionAttributeNames: options.expressionAttributeNames as any,
-        ExpressionAttributeValues: options.expressionAttributeValues
-          ? marshall(options.expressionAttributeValues)
-          : undefined,
-        FilterExpression: options.filterExpression,
-        IndexName: options.indexName,
-        KeyConditionExpression: options.keyConditionExpression,
-        Limit: options.limit,
-        ProjectionExpression: options.projectionExpression,
-        ReturnConsumedCapacity: options.returnConsumedCapacity,
-        ScanIndexForward: options.scanIndexForward,
-        Select: options.select,
-      })
-    );
-    return {
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      count: result.Count!,
-      items: result.Items!.map((item) => unmarshall(item) as Json),
-      lastEvaluatedKey: result.LastEvaluatedKey
-        ? (unmarshall(result.LastEvaluatedKey) as Json)
-        : undefined,
-      scannedCount: result.ScannedCount!,
-    };
-  }
-
-  public async transactGetItems(
-    options: DynamodbTransactGetItemsOptions
-  ): Promise<DynamodbTableTransactGetItemsResult> {
-    const client = await this._rawClient();
-
-    const items = options.transactItems.map<TransactGetItem>((item) => {
-      if (item.get) {
-        return {
-          Get: {
-            TableName: this.tableName,
-            Key: marshall(item.get.key),
-            ProjectionExpression: item.get.projectionExpression,
-            ExpressionAttributeNames: item.get.expressionAttributeNames as
-              | Record<string, string>
-              | undefined,
-          },
-        };
-      } else {
-        throw Error("A get transact item must define `get`.");
-      }
-    });
-
-    const result = await client.send(
-      new TransactGetItemsCommand({
-        TransactItems: items,
-        ReturnConsumedCapacity: options.returnConsumedCapacity,
-      })
-    );
-
-    return {
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      responses:
-        result.Responses?.map((item) => ({
-          item: unmarshall(item.Item!) as Json,
-        })) ?? [],
-    };
-  }
-
-  public async transactWriteItems(
-    options: DynamodbTransactWriteItemsOptions
-  ): Promise<DynamodbTableTransactWriteItemsResult> {
-    const client = await this._rawClient();
-
-    const items = options.transactItems.map<TransactWriteItem>((item) => {
-      if (item.put) {
-        return {
-          Put: {
-            TableName: this.tableName,
-            Item: marshall(item.put.item),
-            ConditionExpression: item.put.conditionExpression,
-          },
-        };
-      } else if (item.update) {
-        return {
-          Update: {
-            TableName: this.tableName,
-            Key: marshall(item.update.key),
-            ConditionExpression: item.update.conditionExpression,
-            UpdateExpression: item.update.updateExpression,
-            ExpressionAttributeNames: item.update.expressionAttributeNames as
-              | Record<string, string>
-              | undefined,
-            ExpressionAttributeValues: item.update.expressionAttributeValues
-              ? marshall(item.update.expressionAttributeValues)
-              : undefined,
-            ReturnValuesOnConditionCheckFailure:
-              item.update.returnValuesOnConditionCheckFailure,
-          },
-        };
-      } else if (item.delete) {
-        return {
-          Delete: {
-            TableName: this.tableName,
-            Key: marshall(item.delete.key),
-            ConditionExpression: item.delete.conditionExpression,
-            ExpressionAttributeNames: item.delete.expressionAttributeNames as
-              | Record<string, string>
-              | undefined,
-            ExpressionAttributeValues: item.delete.expressionAttributeValues
-              ? marshall(item.delete.expressionAttributeValues)
-              : undefined,
-            ReturnValuesOnConditionCheckFailure:
-              item.delete.returnValuesOnConditionCheckFailure,
-          },
-        };
-      } else if (item.conditionCheck) {
-        return {
-          ConditionCheck: {
-            TableName: this.tableName,
-            Key: marshall(item.conditionCheck.key),
-            ConditionExpression: item.conditionCheck.conditionExpression,
-            ExpressionAttributeNames: item.conditionCheck
-              .expressionAttributeNames as Record<string, string> | undefined,
-            ExpressionAttributeValues: item.conditionCheck
-              .expressionAttributeValues
-              ? marshall(item.conditionCheck.expressionAttributeValues)
-              : undefined,
-            ReturnValuesOnConditionCheckFailure:
-              item.conditionCheck.returnValuesOnConditionCheckFailure,
-          },
-        };
-      } else {
-        throw Error(
-          "A write transact item must define either `put`, `update`, `delete` or `conditionCheck`."
-        );
-      }
-    });
-
-    const result = await client.send(
-      new TransactWriteItemsCommand({
-        TransactItems: items,
-      })
-    );
-
-    return {
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      itemCollectionMetrics: result.ItemCollectionMetrics as Json | undefined,
-    };
-  }
-
-  public async batchGetItem(
-    options: DynamodbTableBatchGetItemOptions
-  ): Promise<DynamodbTableBatchGetItemResult> {
-    const client = await this._rawClient();
-    const result = await client.send(
-      new BatchGetItemCommand({
-        RequestItems: {
-          [this.tableName]: {
-            Keys: options.requestItem.keys.map((key) => marshall(key)),
-            ConsistentRead: options.requestItem.consistentRead,
-            ExpressionAttributeNames: options.requestItem
-              .expressionAttributeNames as Record<string, string> | undefined,
-            ProjectionExpression: options.requestItem.projectionExpression,
-          },
-        },
-        ReturnConsumedCapacity: options.returnConsumedCapacity,
-      })
-    );
-    const unprocessedKeys = result.UnprocessedKeys?.[this.tableName];
-    return {
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      responses: result.Responses
-        ? result.Responses[this.tableName].map(
-            (item) => unmarshall(item) as Json
-          )
-        : undefined,
-      unprocessedKeys: unprocessedKeys
-        ? {
-            keys: unprocessedKeys.Keys!.map((key) => unmarshall(key) as Json),
-            consistentRead: unprocessedKeys.ConsistentRead,
-            expressionAttributeNames:
-              unprocessedKeys.ExpressionAttributeNames as Json | undefined,
-            projectionExpression: unprocessedKeys.ProjectionExpression,
-          }
-        : undefined,
-    };
-  }
-
-  public async batchWriteItem(
-    options: DynamodbTableBatchWriteItemOptions
-  ): Promise<DynamodbTableBatchWriteItemResult> {
-    const client = await this._rawClient();
-    const result = await client.send(
-      new BatchWriteItemCommand({
-        RequestItems: {
-          [this.tableName]: options.requestItems.map((item) => {
-            if (item.deleteRequest) {
-              return {
-                DeleteRequest: {
-                  Key: marshall(item.deleteRequest.key),
-                },
-              };
-            } else if (item.putRequest) {
-              return {
-                PutRequest: {
-                  Item: marshall(item.putRequest.item),
-                },
-              };
-            } else {
-              throw Error(
-                "A batch write item must define either `deleteRequest` or `putRequest`."
-              );
-            }
-          }),
-        },
-        ReturnConsumedCapacity: options.returnConsumedCapacity,
-        ReturnItemCollectionMetrics: options.returnItemCollectionMetrics,
-      })
-    );
-    return {
-      consumedCapacity: result.ConsumedCapacity as Json | undefined,
-      itemCollectionMetrics: result.ItemCollectionMetrics as Json | undefined,
-      unprocessedItems: result.UnprocessedItems
-        ? result.UnprocessedItems[
-            this.tableName
-          ]?.map<DynamodbTableBatchWriteItemRequestItem>((item) => {
-            if (item.PutRequest) {
-              return {
-                putRequest: {
-                  item: unmarshall(item.PutRequest.Item!) as Json,
-                },
-              };
-            } else if (item.DeleteRequest) {
-              return {
-                deleteRequest: {
-                  key: unmarshall(item.DeleteRequest.Key!) as Json,
-                },
-              };
-            } else {
-              throw Error("Invalid batch write item.");
-            }
-          })
-        : undefined,
-    };
-  }
-}
diff --git a/libs/wingsdk/src/ex/index.ts b/libs/wingsdk/src/ex/index.ts
index 87a8aa97135..0000b8b54e5 100644
--- a/libs/wingsdk/src/ex/index.ts
+++ b/libs/wingsdk/src/ex/index.ts
@@ -1,4 +1,2 @@
-export * from "./dynamodb-table";
-export * from "./react-app";
 export * from "./redis";
 export * from "./table";
diff --git a/libs/wingsdk/src/ex/react-app.md b/libs/wingsdk/src/ex/react-app.md
deleted file mode 100644
index da1dcbfd265..00000000000
--- a/libs/wingsdk/src/ex/react-app.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-title: React App
-id: react-app
-description: A built-in resource for creating deployable websites using the React framework.
-keywords: [Website, React, deployment, build]
-sidebar_position: 1
----
-
-The `ex.ReactApp` resource represents a website, built using React, that can be both hosted in the cloud or to run on a development hot-reload server in the sim target.
-
-## Usage
-
-### Initialization
-
-Using the default arguments:
-
-```ts
-bring ex;
-bring util;
-
-let website = new ex.ReactApp(projectPath: "./client");
-```
-
-or customizing them:
-
-```ts
-bring ex;
-bring util;
-
-let website = new ex.ReactApp(
-  projectPath: "./client",
-  useBuildCommand: true // `false` by default. Will run the build command if true, and the start command if not
-  buildDir: "/dist" // default is "/build"
-  startCommand: "pnpm start" // default is "npm start"
-  buildCommand: "pnpm build" // default is "npm build"
-  localPort: 4000 // default is 3001
- );
-```
-
-When `ReactApp` is compiled to the `sim` target, by default it runs the start command (default: `npm start`) inside `projectPath` to serve your app in development mode on a local port.
-
-If the `useBuildCommand` environment variable is set OR if `ReactApp` is compiled to any other target, it will run the build command (default: `npm build`) inside of the `projectPath` to build the React app for production to `buildDir` and serve the app.
-
-### Using Wing variables within react code
-
-`ex.ReactApp` allows you to pass preflight string values from Wing to the React app using `addEnvironment` method:
-
-```ts
-bring cloud;
-bring util;
-bring ex;
-
-let api = new cloud.Api();
-let website = new ex.ReactApp(projectPath: "./client");
-
-website.addEnvironment("apiUrl", api.url);
-website.addEnvironment("another", "some string variable");
-
-```
-
-Then in the React app use `window.wingEnv`:
-(accessible after adding `<script src="./wing.js"></script>` to the index file)
-
-```ts
-const { apiUrl } = window.wingEnv;
-const users = await fetch(apiUrl + "/users");
-```
-
-Currently, we can only pass preflight string variables to the React app environment.
-
-## Target-specific details
-
-### Simulator (`sim`)
-
-sim implementations of `ex.ReactApp` is using either the [Website resource](../01-cloud/website.md) (when `useBuildCommand` is `true`) or starts React development server when `false`.
-
-### AWS (`tf-aws` and `awscdk`)
-
-AWS implementations of `ex.ReactApp` uses the [Website resource](../01-cloud/website.md).
-
-### Azure (`tf-azure`)
-
-🚧 Not supported yet (tracking issue: [#4220](https://github.com/winglang/wing/issues/4220))
-
-### GCP (`tf-gcp`)
-
-🚧 Not supported yet (tracking issue: [#4221](https://github.com/winglang/wing/issues/4221))
diff --git a/libs/wingsdk/src/ex/react-app.ts b/libs/wingsdk/src/ex/react-app.ts
deleted file mode 100644
index 071487614d0..00000000000
--- a/libs/wingsdk/src/ex/react-app.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { existsSync } from "fs";
-import { isAbsolute, join, resolve } from "path";
-import { Construct } from "constructs";
-import { IWebsite, WebsiteDomainOptions } from "../cloud/website";
-import { fqnForType } from "../constants";
-import { App } from "../core";
-import { AbstractMemberError } from "../core/errors";
-import { Resource, Node } from "../std";
-
-const DEFAULT_BUILD_FOLDER = "/build";
-export const DEFAULT_REACT_APP_BUILD_COMMAND = "npm run build";
-const DEFAULT_PORT = 3001;
-/**
- * The file that contains the wing environment variables. Will be written into the project files.
- */
-export const WING_JS = "wing.js";
-
-/**
- * Global identifier for `ReactApp`.
- */
-export const REACT_APP_FQN = fqnForType("ex.ReactApp");
-
-/**
- * Options for `ReactApp`.
- */
-export interface ReactAppProps extends WebsiteDomainOptions, ReactAppOptions {}
-
-/**
- * Basic options for `ReactApp`.
- */
-export interface ReactAppOptions {
-  /**
-   * The path to the React app root folder- can be absolute or relative to the wing folder
-   */
-  readonly projectPath: string;
-  /**
-   * The path to the React app build folder- relative to the `projectPath`
-   * @default "/build"
-   */
-  readonly buildDir?: string;
-  /**
-   * A command for starting React app locally
-   * @default "npm run start"
-   */
-  readonly startCommand?: string;
-  /**
-   * A command for building the React app
-   * @default "npm run build"
-   */
-  readonly buildCommand?: string;
-  /**
-   * In sim, if `true` - will use the start command, and if `false` - the build command
-   * @default false
-   */
-  readonly useBuildCommand?: boolean;
-  /**
-   * A port to start a local build of the React app on.
-   * @default 3001
-   */
-  readonly localPort?: number;
-}
-
-/**
- * A cloud deployable React App.
- *
- * @inflight `@winglang/sdk.ex.IReactAppClient`
- * @abstract
- */
-export class ReactApp extends Resource {
-  /**
-   * @internal
-   */
-  protected readonly _buildPath!: string;
-  /**
-   * @internal
-   */
-  protected readonly _localPort!: string | number;
-  /**
-   * @internal
-   */
-  protected readonly _projectPath!: string;
-  /**
-   * @internal
-   */
-  protected readonly _useBuildCommand!: boolean;
-  /**
-   * @internal
-   * @abstract
-   */
-  protected get _websiteHost(): IWebsite {
-    throw new AbstractMemberError();
-  }
-
-  /**
-   * @internal
-   */
-  protected readonly _hostProps?: WebsiteDomainOptions;
-  /**
-   * @internal
-   */
-  protected readonly _environmentVariables: Map<string, string> = new Map();
-
-  constructor(scope: Construct, id: string, props: ReactAppProps) {
-    if (new.target === ReactApp) {
-      return Resource._newFromFactory(REACT_APP_FQN, scope, id, props);
-    }
-
-    const buildDir = props.buildDir ?? DEFAULT_BUILD_FOLDER;
-
-    super(scope, id);
-
-    Node.of(this).title = "React App";
-    Node.of(this).description = "A deployable React App";
-
-    this._projectPath = this._parsePath(scope, props.projectPath);
-    this._hostProps = { domain: props.domain };
-    this._buildPath = join(this._projectPath, buildDir);
-    this._useBuildCommand = props.useBuildCommand ?? false;
-    this._localPort = props.localPort ?? DEFAULT_PORT;
-
-    if (!existsSync(this._projectPath)) {
-      throw new Error(`non existent directory '${this._projectPath}'`);
-    }
-  }
-
-  /**
-   * Website's url
-   */
-  public get url(): string {
-    return this._websiteHost.url;
-  }
-
-  /**
-   * @internal
-   */
-  private _parsePath(scope: Construct, path: string) {
-    return isAbsolute(path) ? path : resolve(App.of(scope).entrypointDir, path);
-  }
-
-  /**
-   * Adding a key-value pair that can be accessible later via the `window.wingEnv` object in the react code
-   * @param key the key to add
-   * @param value the value to add
-   */
-  public addEnvironment(key: string, value: string) {
-    this._environmentVariables.set(key, value);
-  }
-}
-
-/**
- * Inflight methods and members of `ex.ReactApp`.
- */
-export interface IReactAppClient {}
diff --git a/libs/wingsdk/src/ex/redis.ts b/libs/wingsdk/src/ex/redis.ts
index 691c80f97fb..f2ea92a646b 100644
--- a/libs/wingsdk/src/ex/redis.ts
+++ b/libs/wingsdk/src/ex/redis.ts
@@ -1,9 +1,11 @@
 import { Construct } from "constructs";
 import { fqnForType } from "../constants";
+import { LiftMap } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Node, Resource } from "../std";
 
 /**
- * Global identifier for `Bucket`.
+ * Global identifier for `Redis`.
  */
 export const REDIS_FQN = fqnForType("ex.Redis");
 
@@ -14,6 +16,9 @@ export const REDIS_FQN = fqnForType("ex.Redis");
  * @abstract
  */
 export class Redis extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IRedisClient;
+
   constructor(scope: Construct, id: string) {
     if (new.target === Redis) {
       return Resource._newFromFactory(REDIS_FQN, scope, id);
@@ -24,6 +29,11 @@ export class Redis extends Resource {
     Node.of(this).title = "Redis";
     Node.of(this).description = "A Redis server";
   }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {};
+  }
 }
 
 /**
diff --git a/libs/wingsdk/src/ex/table.ts b/libs/wingsdk/src/ex/table.ts
index 025b937be67..326c7da5a47 100644
--- a/libs/wingsdk/src/ex/table.ts
+++ b/libs/wingsdk/src/ex/table.ts
@@ -1,6 +1,8 @@
 import { Construct } from "constructs";
 import { fqnForType } from "../constants";
+import { LiftMap } from "../core";
 import { AbstractMemberError } from "../core/errors";
+import { INFLIGHT_SYMBOL } from "../core/types";
 import { Json, Node, Resource } from "../std";
 
 /**
@@ -57,6 +59,8 @@ export interface TableProps {
  * @abstract
  */
 export class Table extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: ITableClient;
   /**
    * Table name
    */
@@ -96,6 +100,11 @@ export class Table extends Resource {
     this.columns = props.columns;
   }
 
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {};
+  }
+
   /**
    * Add a row to the table that is created when the app is deployed.
    * @abstract
diff --git a/libs/wingsdk/src/expect/assert.ts b/libs/wingsdk/src/expect/assert.ts
deleted file mode 100644
index 5893c319fad..00000000000
--- a/libs/wingsdk/src/expect/assert.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import nodeAssert from "node:assert/strict";
-import { InflightClient } from "../core";
-
-/**
- * The Util class provides methods for making assertions in tests,
- * such as comparing two strings for equality with rich error messages.
- * @inflight
- */
-export class Util {
-  /**
-   * @internal
-   */
-  public static _toInflightType(): string {
-    return InflightClient.forType(__filename, this.name);
-  }
-
-  /**
-   * Compares two values for equality.
-   * @param expected The expected value.
-   * @param actual The value to test.
-   * @throws Will throw an error if the actual value does not match the expected value.
-   * @returns void
-   */
-  public static equal(actual: unknown, expected: unknown): void {
-    nodeAssert.deepStrictEqual(actual, expected);
-  }
-
-  /**
-   * Compares two values for inequality.
-   * @param expected The expected value.
-   * @param actual The value to test.
-   * @throws Will throw an error if the actual value matches the expected value.
-   * @returns void
-   */
-  public static notEqual(actual: unknown, expected: unknown): void {
-    nodeAssert.notDeepStrictEqual(actual, expected);
-  }
-
-  /**
-   * Checks if a value is nil.
-   * @param actual The value to test.
-   * @throws Will throw an error if the actual value is not nil.
-   * @returns void
-   */
-  public static nil(actual: unknown): void {
-    nodeAssert.ok(
-      actual === null || actual === undefined,
-      `Expected "${actual}" to be nil`
-    );
-  }
-
-  /**
-   * Checks if a value is not nil.
-   * @param actual The value to test.
-   * @throws Will throw an error if the actual value is nil.
-   * @returns void
-   */
-  public static notNil(actual: unknown): void {
-    nodeAssert.ok(
-      actual !== null && actual !== undefined,
-      `Expected "${actual}" to be not nil`
-    );
-  }
-
-  private constructor() {}
-}
diff --git a/libs/wingsdk/src/expect/expect.ts b/libs/wingsdk/src/expect/expect.ts
new file mode 100644
index 00000000000..d7432ed033e
--- /dev/null
+++ b/libs/wingsdk/src/expect/expect.ts
@@ -0,0 +1,122 @@
+import nodeAssert, { AssertionError } from "node:assert/strict";
+import { InflightClient } from "../core";
+import { Regex } from "../std";
+
+/**
+ * The Util class provides methods for making assertions in tests,
+ * such as comparing two strings for equality with rich error messages.
+ * @inflight
+ */
+export class Util {
+  /**
+   * @internal
+   */
+  public static _toInflightType(): string {
+    return InflightClient.forType(__filename, this.name);
+  }
+
+  /**
+   * Compares two values for equality.
+   * @param expected The expected value.
+   * @param actual The value to test.
+   * @throws Will throw an error if the actual value does not match the expected value.
+   * @returns void
+   */
+  public static equal(actual: unknown, expected: unknown): void {
+    nodeAssert.deepStrictEqual(actual, expected);
+  }
+
+  /**
+   * Compares two values for inequality.
+   * @param expected The expected value.
+   * @param actual The value to test.
+   * @throws Will throw an error if the actual value matches the expected value.
+   * @returns void
+   */
+  public static notEqual(actual: unknown, expected: unknown): void {
+    nodeAssert.notDeepStrictEqual(actual, expected);
+  }
+
+  /**
+   * Checks if a value is nil.
+   * @param actual The value to test.
+   * @throws Will throw an error if the actual value is not nil.
+   * @returns void
+   */
+  public static nil(actual: unknown): void {
+    nodeAssert.ok(
+      actual === null || actual === undefined,
+      `Expected "${actual}" to be nil`
+    );
+  }
+
+  /**
+   * Checks if a value is not nil.
+   * @param actual The value to test.
+   * @throws Will throw an error if the actual value is nil.
+   * @returns void
+   */
+  public static notNil(actual: unknown): void {
+    nodeAssert.ok(
+      actual !== null && actual !== undefined,
+      `Expected "${actual}" to be not nil`
+    );
+  }
+
+  /**
+   * Checks if a string matches a regular expression pattern.
+   * @param actual The string to test.
+   * @param expected The regular expression pattern to match against.
+   * @throws Will throw an error if the actual value does not match the expected regular expression pattern.
+   * @returns void
+   */
+  public static match(actual: string, expected: string): void {
+    const regex = Regex.compile(expected);
+    const matches = regex.test(actual);
+    if (!matches) {
+      throw new AssertionError({
+        message: `The input did not match the regular expression ${expected}`,
+      });
+    }
+  }
+
+  /**
+   * Checks if a string does not match a regular expression pattern.
+   * @param actual The string to test.
+   * @param expected The regular expression pattern to check against.
+   * @throws Will throw an error if the actual value matches the expected regular expression pattern.
+   * @returns void
+   */
+  public static doesNotMatch(actual: string, expected: string): void {
+    const regex = Regex.compile(expected);
+    const matches = regex.test(actual);
+    if (matches) {
+      throw new AssertionError({
+        message: `The input should not match the regular expression ${expected}`,
+      });
+    }
+  }
+
+  /**
+   * Marks a test as failed.
+   * @param message An optional message to include with the failure.
+   * @throws Always throws an error with the provided message.
+   * @returns void
+   */
+  public static fail(message?: string): void {
+    nodeAssert.fail(message);
+  }
+
+  /**
+   * Asserts that a condition is truthy.
+   * @param condition The condition to test.
+   * @param message An optional message to include if the condition is falsy.
+   * @throws Will throw an error if the condition is falsy.
+   * @returns void
+   */
+  public static ok(condition: boolean, message?: string): void {
+    nodeAssert.ok(condition, message);
+  }
+
+  private constructor() {}
+}
diff --git a/libs/wingsdk/src/expect/index.ts b/libs/wingsdk/src/expect/index.ts
index 997f6591a88..ca16728fac1 100644
--- a/libs/wingsdk/src/expect/index.ts
+++ b/libs/wingsdk/src/expect/index.ts
@@ -1 +1 @@
-export * from "./assert";
+export * from "./expect";
diff --git a/libs/wingsdk/src/fs/fs.ts b/libs/wingsdk/src/fs/fs.ts
index 36a1ea3aa5b..be0f46c4edc 100644
--- a/libs/wingsdk/src/fs/fs.ts
+++ b/libs/wingsdk/src/fs/fs.ts
@@ -1,6 +1,8 @@
+import * as crypto from "crypto";
 import * as fs from "fs";
 import * as os from "os";
 import * as nodePath from "path";
+import * as glob from "glob";
 import * as yaml from "yaml";
 import { InflightClient } from "../core";
 import { normalPath } from "../shared/misc";
@@ -124,6 +126,63 @@ export interface Metadata {
   readonly created: Datetime;
 }
 
+/**
+ * Options for `glob`, based on https://www.npmjs.com/package/glob
+ */
+export interface GlobOptions {
+  /**
+   * The current working directory in which to search.
+   *
+   * @default process.cwd()
+   */
+  readonly cwd?: string;
+
+  /**
+   * Include `.dot` files in normal matches and globstar matches. Note that an explicit dot in a
+   * portion of the pattern will always match dot files.
+   *
+   * @default false
+   */
+  readonly dot?: boolean;
+
+  /**
+   * Do not match directories, only files. (Note: to match only directories, put a `/` at the end of
+   * the pattern.)
+   *
+   * @default false
+   */
+  readonly nodir?: boolean;
+
+  /**
+   * An array of glob patterns to exclude from matches. To ignore all children within a directory,
+   * as well as the entry itself, append '/**' to the ignore pattern.
+   * @default []
+   */
+  readonly ignore?: string[];
+
+  /**
+   * Follow symlinked directories when expanding `**` patterns. This can result in a lot of
+   * duplicate references in the presence of cyclic links, and make performance quite bad.
+   * @default false
+   */
+  readonly follow?: boolean;
+
+  /**
+   * Set to `true` to always receive absolute paths for matched files. Set to `false` to always
+   * receive relative paths for matched files.
+   * @default false
+   */
+  readonly absolute?: boolean;
+
+  /**
+   * Specify a number to limit the depth of the directory traversal to this many levels below the
+   * cwd.
+   *
+   * @default - no limit
+   */
+  readonly maxDepth?: number;
+}
+
 /**
  * The fs class is used for interacting with the file system.
  * All file paths must be POSIX file paths (/ instead of \),
@@ -364,6 +423,21 @@ export class Util {
     fs.writeFileSync(filepath, contents.join("---\n"));
   }
 
+  /**
+   * Appends new data to the end of an existing file
+   * @param filepath The file path that needs to be appended.
+   * @param data The text to be appended to the file.
+   * @param options The `encoding` can be set to specify the character encoding. And the `flag` can be set to specify the attributes.
+   * If a flag is not provided, it defaults to `"w"`.
+   */
+  public static appendFile(
+    filepath: string,
+    data: string,
+    options?: WriteFileOptions
+  ): void {
+    fs.appendFileSync(filepath, data, options);
+  }
+
   /**
    * Remove files and directories (modeled on the standard POSIX `rm`utility). Returns `undefined`.
    * @param path The path to the file or directory you want to remove.
@@ -446,6 +520,37 @@ export class Util {
     fs.symlinkSync(target, path, type);
   }
 
+  /**
+   * Match files using the patterns the shell uses.
+   *
+   * Built with the great `glob` package, based on https://www.npmjs.com/package/glob
+
+   * @param pattern The pattern to match.
+   * @param options Glob options.
+   * @returns List of matching files.
+   */
+  public static glob(pattern: string, options: GlobOptions = {}): string[] {
+    return glob.sync(pattern, options);
+  }
+
+  /**
+   * Calculate an MD5 content hash of all the files that match a glob pattern.
+   *
+   * @param dir The root directory.
+   * @param globPattern The glob pattern to match (defaults to all files and subdirectories).
+   * @returns An md5 hash of the file contents.
+   */
+  public static md5(dir: string, globPattern: string = "**/*") {
+    const hash = crypto.createHash("md5");
+    const files = this.glob(globPattern, { nodir: true, cwd: dir });
+    for (const f of files) {
+      const data = fs.readFileSync(this.join(dir, f));
+      hash.update(data);
+    }
+
+    return hash.digest("hex");
+  }
+
   /**
    * @internal
    */
diff --git a/libs/wingsdk/src/helpers.ts b/libs/wingsdk/src/helpers.ts
new file mode 100644
index 00000000000..a54598218d8
--- /dev/null
+++ b/libs/wingsdk/src/helpers.ts
@@ -0,0 +1,168 @@
+// Code in this file will be automatically included in all inflight code bundles,
+// so avoid importing anything heavy here.
+import { notDeepStrictEqual } from "node:assert";
+import * as path from "node:path";
+import type { Construct } from "constructs";
+import type { Node } from "./std/node";
+// since we moved from node:18 to node:20 the deepStrictEqual doesn't work as expected.
+// https://github.com/winglang/wing/issues/4444
+// therefore we're using a local version of the comparison from node 18.
+import { deepStrictEqual } from "./util/equality";
+
+export function eq(a: any, b: any): boolean {
+  try {
+    return deepStrictEqual(a, b);
+  } catch {
+    return false;
+  }
+}
+
+export function neq(a: any, b: any): boolean {
+  try {
+    notDeepStrictEqual(a, b);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function assert(condition: any, message: string): asserts condition {
+  if (!condition) {
+    throw new Error("assertion failed: " + message);
+  }
+}
+
+export function range(start: number, end: number, inclusive: boolean) {
+  function* iterator() {
+    let i = start;
+    let limit = inclusive ? (end < start ? end - 1 : end + 1) : end;
+    while (i < limit) yield i++;
+    while (i > limit) yield i--;
+  }
+  return iterator();
+}
+
+export function nodeof(construct: Construct): Node {
+  // Should only be used preflight, avoid bundling
+  const Node = eval("require('./std/node').Node");
+  return Node.of(construct);
+}
+
+export function normalPath(p: string): string {
+  return p.replace(/\\+/g, "/");
+}
+
+export function unwrap<T>(value: T): T | never {
+  if (value != null) {
+    return value;
+  }
+  throw new Error("Unexpected nil");
+}
+
+export function lookup(obj: any, index: string | number): any {
+  checkIndex(index);
+
+  if (typeof index === "number") {
+    index = checkArrayAccess(obj, index);
+    return obj[index];
+  }
+
+  if (typeof obj !== "object") {
+    throw new TypeError(
+      `Lookup failed, value is not an object (found "${typeof obj}")`
+    );
+  }
+
+  if (!(index in obj)) {
+    throw new RangeError(`Key "${index}" not found`);
+  }
+
+  return obj[index];
+}
+
+export function assign(
+  obj: any,
+  index: string | number,
+  kind: "=" | "+=" | "-=",
+  value: any
+) {
+  checkIndex(index);
+
+  if (typeof index === "number") {
+    index = checkArrayAccess(obj, index);
+  }
+
+  if (typeof index === "string" && typeof obj !== "object") {
+    throw new TypeError(
+      `Assignment failed, value is not an object (found \"${typeof obj}\")`
+    );
+  }
+
+  switch (kind) {
+    case "=":
+      obj[index] = value;
+      break;
+    case "+=":
+      obj[index] += value;
+      break;
+    case "-=":
+      obj[index] -= value;
+      break;
+    default:
+      throw new Error(`Invalid assignment kind: ${kind}`);
+  }
+}
+
+function checkIndex(index: string | number) {
+  if (typeof index !== "string" && typeof index !== "number") {
+    throw new TypeError(
+      `Index must be a string or number (found "${typeof index}")`
+    );
+  }
+}
+
+function checkArrayAccess(obj: any, index: number): number {
+  if (!Array.isArray(obj) && !Buffer.isBuffer(obj) && typeof obj !== "string") {
+    throw new TypeError(
+      "Index is a number but collection is not an array or string"
+    );
+  }
+  if (index < 0 && index >= -obj.length) {
+    index = obj.length + index;
+  }
+  if (index < 0 || index >= obj.length) {
+    throw new RangeError(
+      `Index ${index} out of bounds for array of length ${obj.length}`
+    );
+  }
+  return index;
+}
+
+export function createExternRequire(dirname: string) {
+  return (externPath: string) => {
+    // using eval to always avoid bundling
+    const jiti: typeof import("jiti").default = eval("require('jiti')");
+    const esbuild: typeof import("esbuild") = eval("require('esbuild')");
+
+    const newRequire = jiti(dirname, {
+      sourceMaps: true,
+      interopDefault: true,
+      transform(opts) {
+        return esbuild.transformSync(opts.source, {
+          format: "cjs",
+          target: "node20",
+          sourcemap: "inline",
+          loader: opts.ts ? "ts" : "js",
+        });
+      },
+    });
+    return newRequire(externPath);
+  };
+}
+
+export function resolveDirname(
+  outdir: string,
+  relativeSourceDir: string
+): string {
+  return normalPath(path.resolve(outdir, relativeSourceDir));
+}
diff --git a/libs/wingsdk/src/http/http.ts b/libs/wingsdk/src/http/http.ts
index be98fb3343b..c70e8b9a76b 100644
--- a/libs/wingsdk/src/http/http.ts
+++ b/libs/wingsdk/src/http/http.ts
@@ -44,6 +44,11 @@ export enum RequestCache {
  * The redirect read-only property that contains the mode for how redirects are handled.
  */
 export enum RequestRedirect {
+  /**
+   * Do not follow redirects automatically. The `Location` response header includes the redirect
+   * target.
+   */
+  MANUAL = "manual",
   /**
    * Follow all redirects incurred when fetching a resource.
    */
@@ -108,16 +113,17 @@ export interface RequestOptions {
   readonly body?: string;
   /**
    * The cache mode you want to use for the request.
+   * @default RequestCache.DEFAULT
    */
   readonly cache?: RequestCache;
   /**
-   * The redirect mode to use: follow, error. The default is follow.
-   * @default follow
+   * An enum specifying the redirect mode to use: follow, error or manual. The default is follow.
+   * @default RequestRedirect.FOLLOW
    */
   readonly redirect?: RequestRedirect;
   /**
    * A string specifying "no-referrer", client, or a URL. The default is "about:client".
-   * @default  about:client
+   * @default about:client
    */
   readonly referrer?: string;
 }
diff --git a/libs/wingsdk/src/index.ts b/libs/wingsdk/src/index.ts
index 72e26eeb4fb..bd6e8035e84 100644
--- a/libs/wingsdk/src/index.ts
+++ b/libs/wingsdk/src/index.ts
@@ -4,10 +4,10 @@ export * as core from "./core";
 export * as ex from "./ex";
 export * as expect from "./expect";
 export * as fs from "./fs";
+export * as helpers from "./helpers";
 export * as http from "./http";
 export * as math from "./math";
 export * as platform from "./platform";
-export * as regex from "./regex";
 export * as aws from "./shared-aws";
 export * as simulator from "./simulator";
 export * as std from "./std";
diff --git a/libs/wingsdk/src/math/math.ts b/libs/wingsdk/src/math/math.ts
index 0f0340addff..c0fae29b71a 100644
--- a/libs/wingsdk/src/math/math.ts
+++ b/libs/wingsdk/src/math/math.ts
@@ -241,6 +241,38 @@ export class Util {
     return (radians * 180) / Math.PI;
   }
 
+  /**
+   * Returns the natural logarithm (base e) of a number.
+   * @param value The input number.
+   */
+  public static log(value: number): number {
+    return Math.log(value);
+  }
+
+  /**
+   * Returns the base-2 logarithm of a number.
+   * @param value The input number.
+   */
+  public static log2(value: number): number {
+    return Math.log2(value);
+  }
+
+  /**
+   * Returns the base-10 logarithm of a number.
+   * @param value The input number.
+   */
+  public static log10(value: number): number {
+    return Math.log10(value);
+  }
+
+  /**
+   * Returns 1 or -1, indicating the sign of the number passed as an argument, 0 for 0.
+   * @param value The input number.
+   */
+  public static sign(value: number): number {
+    return Math.sign(value);
+  }
+
   /**
    * Returns the sine of a number in radians.
    * @param value A number representing an angle in radians.
@@ -380,5 +412,16 @@ export class Util {
     return Math.random() * (max || 1);
   }
 
+  /**
+   * Convert a value to a new number base
+   *
+   * @param value The number to be converted
+   * @param base The base of the new value
+   * @returns A string representation of the new number
+   */
+  public static toRadix(value: number, base: number): string {
+    return value.toString(base);
+  }
+
   private constructor() {}
 }
diff --git a/libs/wingsdk/src/platform/index.ts b/libs/wingsdk/src/platform/index.ts
index 6754d5a6a78..df2c4427753 100644
--- a/libs/wingsdk/src/platform/index.ts
+++ b/libs/wingsdk/src/platform/index.ts
@@ -1,2 +1,4 @@
+export * from "./parameter-registrar";
 export * from "./platform";
 export * from "./platform-manager";
+export * from "./util";
diff --git a/libs/wingsdk/src/platform/parameter-registrar.ts b/libs/wingsdk/src/platform/parameter-registrar.ts
new file mode 100644
index 00000000000..967687f061f
--- /dev/null
+++ b/libs/wingsdk/src/platform/parameter-registrar.ts
@@ -0,0 +1,195 @@
+import Ajv from "ajv";
+import { Construct } from "constructs";
+import {
+  loadPlatformSpecificValues,
+  extractFieldsFromSchema,
+  filterParametersBySchema,
+} from "./util";
+import { Json, Node } from "../std";
+
+/**
+ * Options for reading parameters
+ */
+export interface ReadParameterOptions {
+  /** Schema to limit the read to */
+  readonly schema?: any;
+}
+
+/**
+ * Parameter Registrar
+ *
+ * This class is used to register and lookup parameter values.
+ */
+export class ParameterRegistrar extends Construct {
+  /** Cache for parameter lookups */
+  private parameterValueByPath: { [key: string]: any } = {};
+  /** List of all registered parameter schemas */
+  private parameterSchemas: any[] = [];
+
+  /** @internal */
+  public readonly _rawParameters: { [key: string]: any } =
+    loadPlatformSpecificValues();
+
+  constructor(scope: Construct, id: string) {
+    super(scope, id);
+    Node.of(this).hidden = true;
+  }
+
+  /**
+   * Retrieve a parameter value by its path
+   *
+   * @param path the path of the parameter
+   * @returns the value of the parameter
+   */
+  public value(path: string): any {
+    if (this.parameterValueByPath[path] === undefined) {
+      // attempt to read the value from the raw parameters, then cache it
+      this.parameterValueByPath[path] = resolveValueFromPath(
+        this._rawParameters,
+        path
+      );
+    }
+
+    return this.parameterValueByPath[path];
+  }
+
+  /**
+   * Read parameters
+   *
+   * @param options options for reading parameters
+   * @returns the schema as a string
+   */
+  public read(options?: ReadParameterOptions): Json {
+    if (options?.schema) {
+      this.addSchema(options.schema);
+      const fields = extractFieldsFromSchema(
+        options.schema._rawSchema // If a JsonSchema object is passed in, extract raw schema from it
+          ? options.schema._rawSchema
+          : options.schema
+      );
+      return filterParametersBySchema(fields, this._rawParameters);
+    }
+    return this._rawParameters as Json;
+  }
+
+  /**
+   * Add parameter schema to registrar
+   *
+   * @param schema schema to add to the registrar
+   */
+  public addSchema(schema: any) {
+    // If a JsonSchema object is passed in, extract the raw schema from it
+    const schemaToAdd = schema._rawSchema ? schema._rawSchema : schema;
+    if (!this.parameterSchemas.includes(schemaToAdd)) {
+      this.parameterSchemas.push(schemaToAdd);
+    }
+  }
+
+  /**
+   * Helper method to add a parameter schema at a given path.
+   * This method will nest the schema under the given path, making it easier to nest schemas.
+   *
+   * @param schema the schema to add
+   * @param path the path to nest the schema under
+   * @param recursiveRequire whether or not to require all the nested properties
+   */
+  public addSchemaAtPath(schema: any, path: string, recursiveRequire = false) {
+    this.addSchema(this._nestSchemaUnderPath(schema, path, recursiveRequire));
+  }
+
+  /**
+   * This is a helper method to nest a schema under a path.
+   *
+   * I.E. if you have a json schema that looks like this:
+   * { type: "object", properties: { foo: { type: "string" } } }
+   *
+   * And we want to nest it under the path "bar/baz", then this method will return:
+   * { type: "object", properties: { bar: { type: "object", properties: { baz: { type: "object", properties: { foo: { type: "string" } } } } } } }
+   *
+   * making it easier to nest schemas under paths, without writing out the object boilerplate.
+   *
+   * @internal
+   */
+  public _nestSchemaUnderPath(
+    schema: any,
+    path: string,
+    recursiveRequire = false
+  ): any {
+    const parts = path.split("/");
+
+    if (parts.length === 0 || path === "") {
+      // base case just return the schema
+      return schema;
+    }
+
+    const currentKey = parts[0];
+
+    // Create and return the schema
+    return {
+      type: "object",
+      properties: {
+        // recurse for the next part of the path
+        [currentKey]: this._nestSchemaUnderPath(
+          schema,
+          parts.slice(1).join("/"),
+          recursiveRequire
+        ),
+      },
+      required: recursiveRequire ? [currentKey] : [],
+    };
+  }
+
+  /**
+   * @internal
+   */
+  public _preSynthesize() {
+    if (this.parameterSchemas.length === 0) {
+      return;
+    }
+
+    const platformParameterSchema = {
+      allOf: [...this.parameterSchemas],
+    };
+
+    const ajv = new Ajv({ allErrors: true });
+    const validator = ajv.compile(platformParameterSchema);
+    const valid = validator(this._rawParameters);
+
+    if (!valid) {
+      throw new Error(
+        `Parameter validation errors:\n- ${validator.errors
+          ?.map((error: any) => error.message)
+          .join("\n- ")}
+
+(hint: make sure to use --values to provide the required parameters file)
+        `
+      );
+    }
+  }
+}
+
+/**
+ * Retrieves a value from an object using a given path
+ *
+ * @param rawParameters the object to retrieve the value from
+ * @param path the path to the value (I.E. "foo/bar/baz")
+ * @internal
+ */
+export function resolveValueFromPath(
+  rawParameters: { [key: string]: any },
+  path: string
+): any {
+  if (!rawParameters) {
+    return undefined;
+  }
+
+  const pathParts = path.split("/");
+
+  if (pathParts.length === 1) {
+    return rawParameters[pathParts[0]];
+  }
+
+  // recurse
+  const nextPath = pathParts.slice(1).join("/");
+  return resolveValueFromPath(rawParameters[pathParts[0]], nextPath);
+}
diff --git a/libs/wingsdk/src/platform/platform-manager.ts b/libs/wingsdk/src/platform/platform-manager.ts
index ff87af7dc6a..86ea182df1c 100644
--- a/libs/wingsdk/src/platform/platform-manager.ts
+++ b/libs/wingsdk/src/platform/platform-manager.ts
@@ -1,12 +1,13 @@
-import { readFileSync } from "fs";
+import { readFileSync, writeFileSync } from "fs";
 import { basename, dirname, join } from "path";
 import { cwd } from "process";
 import * as vm from "vm";
 import { IPlatform } from "./platform";
+import { scanDirForPlatformFile } from "./util";
 import { App, AppProps, SynthHooks } from "../core";
+import { SECRET_SYMBOL } from "../core/types";
 
 interface PlatformManagerOptions {
-  readonly appProps: AppProps;
   /**
    * Either a builtin platform name or a path to a custom platform
    */
@@ -15,16 +16,52 @@ interface PlatformManagerOptions {
 
 const BUILTIN_PLATFORMS = ["tf-aws", "tf-azure", "tf-gcp", "sim"];
 
+/** @internal */
+export const SECRETS_FILE_NAME = "secrets.json";
+
 /** @internal */
 export class PlatformManager {
   private readonly platformPaths: string[];
-  private readonly appProps: AppProps;
-  private readonly platformInstances: IPlatform[] = [];
+  private platformInstances: IPlatform[] = [];
 
   constructor(options: PlatformManagerOptions) {
-    this.appProps = options.appProps;
     this.platformPaths = options.platformPaths ?? [];
-    this.appProps;
+    this.retrieveImplicitPlatforms();
+    this.createPlatformInstances();
+  }
+
+  /**
+   * Retrieve all implicit platform declarations.
+   *
+   * These are platforms that are not explicitly declared in the cli options
+   * but are implicitly available to the app.
+   *
+   * We look for platforms in the following locations:
+   * - The source directory
+   * - Any imported namespaces (provided by the wingc compiler output)
+   *
+   * To determine if a directory contains a platform, we check if it contains a file ending in "wplatform.js"
+   * TODO: Support platforms defined in Wing (platform.w) https://github.com/winglang/wing/issues/4937
+   */
+  private retrieveImplicitPlatforms() {
+    const importedNamespaces = process.env.WING_IMPORTED_NAMESPACES?.split(";");
+    const sourceDir = process.env.WING_SOURCE_DIR!;
+
+    if (sourceDir) {
+      const sourceDirPlatformFile = scanDirForPlatformFile(sourceDir);
+      if (sourceDirPlatformFile) {
+        this.platformPaths.push(...sourceDirPlatformFile);
+      }
+    }
+
+    if (importedNamespaces) {
+      importedNamespaces.forEach((namespaceDir) => {
+        const namespaceDirPlatformFile = scanDirForPlatformFile(namespaceDir);
+        if (namespaceDirPlatformFile) {
+          this.platformPaths.push(...namespaceDirPlatformFile);
+        }
+      });
+    }
   }
 
   private loadPlatformPath(platformPath: string) {
@@ -60,17 +97,16 @@ export class PlatformManager {
   }
 
   private createPlatformInstances() {
+    this.platformInstances = [];
     this.platformPaths.forEach((platformPath) => {
       this.loadPlatformPath(platformPath);
     });
   }
 
-  // This method is called from preflight.js in order to return an App instance
-  // that can be synthesized, so need to ignore the "declared but never read"
-  // @ts-ignore-next-line
-  private createApp(appProps: AppProps): App {
+  // This method is called from preflight.cjs in order to return an App instance
+  // that can be synthesized
+  public createApp(appProps: AppProps): App {
     this.createPlatformInstances();
-
     let appCall = this.platformInstances[0].newApp;
 
     if (!appCall) {
@@ -79,33 +115,46 @@ export class PlatformManager {
       );
     }
 
-    let synthHooks: SynthHooks = {
-      preSynthesize: [],
-      postSynthesize: [],
-      validate: [],
-    };
+    let hooks = collectHooks(this.platformInstances);
 
-    let newInstanceOverrides: any[] = [];
+    const app = appCall!({
+      ...appProps,
+      synthHooks: hooks.synthHooks,
+      newInstanceOverrides: hooks.newInstanceOverrides,
+    }) as App;
 
-    this.platformInstances.forEach((instance) => {
-      if (instance.preSynth) {
-        synthHooks.preSynthesize!.push(instance.preSynth);
+    let secretNames = [];
+    for (const c of app.node.findAll()) {
+      if ((c as any)[SECRET_SYMBOL]) {
+        const secret = c as any;
+        secretNames.push(secret.name);
       }
+    }
 
-      if (instance.postSynth) {
-        synthHooks.postSynthesize!.push(instance.postSynth);
-      }
+    if (secretNames.length > 0) {
+      writeFileSync(
+        join(app.outdir, SECRETS_FILE_NAME),
+        JSON.stringify(secretNames)
+      );
+    }
 
-      if (instance.validate) {
-        synthHooks.validate!.push(instance.validate);
-      }
+    let registrar = app.parameters;
 
-      if (instance.newInstance) {
-        newInstanceOverrides.push(instance.newInstance);
-      }
+    hooks.parameterSchemas.forEach((schema) => {
+      registrar.addSchema(schema);
     });
 
-    return appCall!({ ...appProps, synthHooks, newInstanceOverrides }) as App;
+    return app;
+  }
+
+  public async storeSecrets(secrets: Record<string, string>): Promise<void> {
+    const hooks = collectHooks(this.platformInstances);
+    if (!hooks.storeSecretsHook) {
+      throw new Error(
+        `Cannot find a platform or platform extension that supports storing secrets`
+      );
+    }
+    await hooks.storeSecretsHook(secrets);
   }
 }
 
@@ -183,9 +232,62 @@ export function _loadCustomPlatform(customPlatformPath: string): any {
     script.runInContext(context);
     return new (platformModule.exports as any).Platform();
   } catch (error) {
+    if (process.env.DEBUG) {
+      console.error(error);
+    }
+    const hint = customPlatformPath.includes(".")
+      ? "Ensure the path to the platform is correct"
+      : `Ensure you have installed the platform provider by running 'npm install ${customPlatformPath}'`;
     console.error(
-      "An error occurred while loading the custom platform:",
-      error
+      `An error occurred while loading the custom platform: ${customPlatformPath}\n\n(hint: ${hint})`
     );
   }
 }
+
+interface CollectHooksResult {
+  synthHooks: SynthHooks;
+  newInstanceOverrides: any[];
+  parameterSchemas: any[];
+  storeSecretsHook?: any;
+}
+
+function collectHooks(platformInstances: IPlatform[]) {
+  let result: CollectHooksResult = {
+    synthHooks: {
+      preSynthesize: [],
+      postSynthesize: [],
+      validate: [],
+    },
+    newInstanceOverrides: [],
+    parameterSchemas: [],
+    storeSecretsHook: undefined,
+  };
+
+  platformInstances.forEach((instance) => {
+    if (instance.parameters) {
+      result.parameterSchemas.push(instance.parameters);
+    }
+
+    if (instance.preSynth) {
+      result.synthHooks.preSynthesize!.push(instance.preSynth.bind(instance));
+    }
+
+    if (instance.postSynth) {
+      result.synthHooks.postSynthesize!.push(instance.postSynth.bind(instance));
+    }
+
+    if (instance.validate) {
+      result.synthHooks.validate!.push(instance.validate.bind(instance));
+    }
+
+    if (instance.newInstance) {
+      result.newInstanceOverrides.push(instance.newInstance.bind(instance));
+    }
+
+    if (instance.storeSecrets) {
+      result.storeSecretsHook = instance.storeSecrets.bind(instance);
+    }
+  });
+
+  return result;
+}
diff --git a/libs/wingsdk/src/platform/platform.ts b/libs/wingsdk/src/platform/platform.ts
index f0c98c5a4de..3d08bf1388e 100644
--- a/libs/wingsdk/src/platform/platform.ts
+++ b/libs/wingsdk/src/platform/platform.ts
@@ -12,6 +12,11 @@ export interface IPlatform {
    */
   readonly target: string;
 
+  /**
+   * The schema for the parameters the platform accepts
+   */
+  readonly parameters?: any;
+
   /**
    * Hooks for overriding newInstance calls
    *
@@ -49,4 +54,9 @@ export interface IPlatform {
    * @param config generated config
    */
   validate?(config: any): any;
+
+  /**
+   * Hook for creating and storing secrets
+   */
+  storeSecrets?(secrets: { [name: string]: string }): Promise<void>;
 }
diff --git a/libs/wingsdk/src/platform/util.ts b/libs/wingsdk/src/platform/util.ts
new file mode 100644
index 00000000000..a76c969f2f7
--- /dev/null
+++ b/libs/wingsdk/src/platform/util.ts
@@ -0,0 +1,159 @@
+import { existsSync, readFileSync, readdirSync } from "fs";
+import * as path from "path";
+import * as toml from "toml";
+import * as yaml from "yaml";
+
+/**
+ * Creates a JSON object from a comma-separated list of values.
+ * Where the key is the path and the value is the value.
+ *
+ * I.E. "foo/bar=123,foo/baz=456" would result in:
+ * {
+ * "foo": {
+ *  "bar": "123",
+ *  "baz": "456"
+ *  }
+ * }
+ *
+ * @param values a comma-separated list of values
+ * @returns a JSON object with all values
+ */
+export function parseValuesObjectFromString(values: string) {
+  const result: any = {}; // Adjusted type for nested structures
+
+  const valuesList = values.split(",");
+  valuesList.forEach((v) => {
+    const [paramPath, value] = v.split("=");
+    const pathParts = paramPath.split("/");
+    let tempObject = result; // Start with the result object
+
+    pathParts.forEach((part, index) => {
+      // If we're at the last part, assign the value
+      if (index === pathParts.length - 1) {
+        tempObject[part] = value;
+      } else {
+        // Otherwise, initialize the part if it doesn't exist, or use the existing object
+        if (!tempObject[part]) tempObject[part] = {};
+        tempObject = tempObject[part];
+      }
+    });
+  });
+
+  return result;
+}
+
+/**
+ * Extracts all fields from a JSON schema.
+ *
+ * @param schema the schema to extract fields from
+ * @returns a set of all fields in the schema
+ */
+export function extractFieldsFromSchema(schema: any): Set<string> {
+  const fields = new Set<string>();
+
+  if (schema.properties) {
+    for (const key of Object.keys(schema.properties)) {
+      fields.add(key);
+    }
+  }
+
+  return fields;
+}
+
+export function filterParametersBySchema(
+  fields: Set<string>,
+  parameters: any
+): any {
+  const filtered: any = {};
+
+  for (const field of fields) {
+    if (parameters.hasOwnProperty(field)) {
+      filtered[field] = parameters[field];
+    }
+  }
+
+  return filtered;
+}
+
+/**
+ * Loads platform-specific values that were passed in via CLI arguments and
+ * from a values file. CLI arguments take precedence over values file.
+ *
+ * I.E. if the cli provided values such as --value "foo/bar=123" and the values file
+ * contained:
+ *
+ * ```yaml
+ * foo:
+ *  bar: 456
+ *  baz: 789
+ * ```
+ *
+ * The resulting values object would be:
+ * {
+ *  "foo": {
+ *    "bar": "123",
+ *    "baz": "789"
+ *  }
+ * }
+ *
+ * @returns a JSON object with all platform-specific values
+ */
+export function loadPlatformSpecificValues() {
+  const cliValues = parseValuesObjectFromString(process.env.WING_VALUES ?? "");
+
+  if (
+    process.env.WING_VALUES_FILE === undefined ||
+    process.env.WING_VALUES_FILE === ""
+  ) {
+    return cliValues;
+  }
+
+  const file = path.isAbsolute(process.env.WING_VALUES_FILE)
+    ? process.env.WING_VALUES_FILE
+    : path.join(process.cwd(), process.env.WING_VALUES_FILE);
+  if (!existsSync(file)) {
+    return cliValues;
+  }
+  const data = readFileSync(file, "utf-8");
+
+  const fileExtension = path.extname(file);
+  const fileValues = (() => {
+    switch (fileExtension) {
+      case ".yaml":
+      case ".yml":
+        return yaml.parse(data);
+      case ".json":
+        return JSON.parse(data);
+      case ".toml":
+        return toml.parse(data);
+      default:
+        throw new Error(
+          `Unsupported file extension: ${fileExtension} (expected .yml, .json, or .toml)`
+        );
+    }
+  })();
+  return { ...fileValues, ...cliValues };
+}
+
+/**
+ * Scans a directory for any platform files.
+ *
+ * @param dir the directory to scan
+ * @returns the path to any platform files
+ */
+export function scanDirForPlatformFile(dir: string): string[] {
+  const result: string[] = [];
+
+  if (!existsSync(dir)) {
+    return result;
+  }
+
+  const files = readdirSync(dir);
+  for (const file of files) {
+    if (file === "wplatform.js" || file.endsWith(".wplatform.js")) {
+      result.push(path.join(dir, file));
+    }
+  }
+
+  return result;
+}
diff --git a/libs/wingsdk/src/regex/index.ts b/libs/wingsdk/src/regex/index.ts
deleted file mode 100644
index b37fc67da44..00000000000
--- a/libs/wingsdk/src/regex/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./regex";
diff --git a/libs/wingsdk/src/regex/regex.ts b/libs/wingsdk/src/regex/regex.ts
deleted file mode 100644
index da8227cc074..00000000000
--- a/libs/wingsdk/src/regex/regex.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { InflightClient } from "../core";
-
-/**
- * Regex utilities and functions
- */
-export class Util {
-  /**
-   * Check if a regex pattern is matched by a given string
-   * @param pattern - regex pattern
-   * @param text - given input string
-   * @returns true if it matches the pattern, false otherwise
-   */
-  public static match(pattern: string, text: string): boolean {
-    const regex = new RegExp(pattern);
-    if (text.match(regex) === null) {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * @internal
-   */
-  public static _toInflightType(): string {
-    return InflightClient.forType(__filename, this.name);
-  }
-  private constructor() {}
-}
diff --git a/libs/wingsdk/src/shared-aws/api-util.ts b/libs/wingsdk/src/shared-aws/api-util.ts
new file mode 100644
index 00000000000..41aa3735588
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/api-util.ts
@@ -0,0 +1,83 @@
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
+import { cloud } from "..";
+import {
+  ApiRequest,
+  ApiResponse,
+  DEFAULT_RESPONSE_STATUS,
+  parseHttpMethod,
+  sanitizeParamLikeObject,
+} from "../cloud";
+
+export async function apigwFunctionHandler(
+  request: APIGatewayProxyEvent,
+  handlerFunction: (
+    request: cloud.ApiRequest
+  ) => Promise<void | cloud.ApiResponse>,
+  headers?: Record<string, string>
+) {
+  const apiRequest = mapApigatewayEventToCloudApiRequest(request);
+  const apiResponse = (await handlerFunction(apiRequest)) ?? {};
+  return mapCloudApiResponseToApigatewayResponse(apiResponse, headers);
+}
+
+/**
+ * Map a Cloud API response to an API Gateway response
+ * @param resp Cloud API response
+ * @returns API Gateway response
+ */
+function mapCloudApiResponseToApigatewayResponse(
+  resp: ApiResponse,
+  corsHeaders?: Record<string, string>
+): APIGatewayProxyResult {
+  return {
+    statusCode: resp.status ?? DEFAULT_RESPONSE_STATUS,
+    body: resp.body ?? "",
+    headers: {
+      "Content-Type": "application/json",
+      ...corsHeaders,
+      ...resp.headers,
+    },
+  };
+}
+
+/**
+ * Map an API Gateway event to a Cloud API request
+ * @param request API Gateway event
+ * @returns Cloud API request
+ */
+function mapApigatewayEventToCloudApiRequest(
+  request: APIGatewayProxyEvent
+): ApiRequest {
+  const query = {
+    ...request.queryStringParameters,
+    ...request.multiValueQueryStringParameters,
+  };
+
+  return {
+    path: request.path,
+    body: parseBody(request),
+    headers: request.headers as Record<string, string>,
+    method: parseHttpMethod(request.httpMethod),
+    query: sanitizeParamLikeObject(query),
+    vars: sanitizeParamLikeObject(request.pathParameters ?? {}),
+  };
+}
+
+/**
+ * Parse body to JSON or empty string
+ * @param body body
+ * @returns JSON body
+ */
+function parseBody(request: APIGatewayProxyEvent): string {
+  if (!request.body) return "";
+
+  const contentType = Object.entries(request.headers).find(
+    ([key, _]) => key.toLowerCase() === "content-type"
+  )?.[1];
+  if (contentType === "application/x-www-form-urlencoded") {
+    return JSON.stringify(
+      Object.fromEntries(new URLSearchParams(request.body))
+    );
+  }
+  return request.body;
+}
diff --git a/libs/wingsdk/src/shared-aws/api.default.ts b/libs/wingsdk/src/shared-aws/api.default.ts
new file mode 100644
index 00000000000..7fb665057e2
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/api.default.ts
@@ -0,0 +1,157 @@
+import * as cloud from "../cloud";
+
+/**
+ * `createApiDefaultResponse` is a function that defines the default response when a request occurs.
+ * It is used to handle all requests that do not match any defined routes in the API Gateway.
+ * The response is a mock integration type, which means it returns a mocked response without
+ * forwarding the request to any backend. The response status code is set to 204 for OPTIONS
+ * and 404 for any other HTTP method. The Content-Type header is set to `application/json`.
+ * @param paths The user defined api endpoint paths. Used for creating a base path to the default response
+ * @param corsOptions cors options to apply to the default path
+ * @internal
+ */
+export const createApiDefaultResponse = (
+  paths: string[],
+  corsOptions?: cloud.ApiCorsOptions
+) => {
+  const defaultKey =
+    // the longest a sequence of parameters starts form the root
+    paths.reduce((result: string, key: string) => {
+      // matches single sequence of parameters starts form the root
+      let matched = key.match(/^(\/{[A-Za-z0-9\-_]+})*/g)?.[0] ?? "";
+      return matched.length > result.length ? matched : result;
+    }, "") + "/{proxy+}";
+
+  if (corsOptions) {
+    return {
+      [defaultKey]: {
+        "x-amazon-apigateway-any-method": {
+          produces: ["application/json"],
+          "x-amazon-apigateway-integration": {
+            type: "mock",
+            requestTemplates: {
+              "application/json": `
+                #if ($context.httpMethod == "OPTIONS")
+                    {"statusCode": 204}
+                #else
+                    {"statusCode": 404}
+                #end
+              `,
+            },
+            passthroughBehavior: "never",
+            responses: {
+              default: {
+                statusCode: "404",
+                responseParameters: {
+                  "method.response.header.Content-Type": "'application/json'",
+                },
+                responseTemplates: {
+                  "application/json":
+                    '{"statusCode": 404, "message": "Error: Resource not found"}',
+                },
+              },
+              "204": {
+                statusCode: "204",
+                responseParameters: {
+                  "method.response.header.Content-Type": "'application/json'",
+                  "method.response.header.Access-Control-Allow-Origin": `'${corsOptions.allowOrigin}'`,
+                  "method.response.header.Access-Control-Allow-Methods": `'${corsOptions.allowMethods}'`,
+                  "method.response.header.Access-Control-Allow-Headers": `'${corsOptions.allowHeaders}'`,
+                },
+                responseTemplates: {
+                  "application/json": "{}",
+                },
+              },
+              "404": {
+                statusCode: "404",
+                responseParameters: {
+                  "method.response.header.Content-Type": "'application/json'",
+                },
+                responseTemplates: {
+                  "application/json":
+                    '{"statusCode": 404, "message": "Error: Resource not found"}',
+                },
+              },
+            },
+          },
+          responses: {
+            204: {
+              description: "204 response",
+              headers: {
+                "Content-Type": {
+                  type: "string",
+                },
+                "Access-Control-Allow-Origin": {
+                  type: "string",
+                },
+                "Access-Control-Allow-Methods": {
+                  type: "string",
+                },
+                "Access-Control-Allow-Headers": {
+                  type: "string",
+                },
+              },
+            },
+            404: {
+              description: "404 response",
+              headers: {
+                "Content-Type": {
+                  type: "string",
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+  } else {
+    return {
+      [defaultKey]: {
+        "x-amazon-apigateway-any-method": {
+          produces: ["application/json"],
+          "x-amazon-apigateway-integration": {
+            type: "mock",
+            requestTemplates: {
+              "application/json": `
+                {"statusCode": 404}
+              `,
+            },
+            passthroughBehavior: "never",
+            responses: {
+              default: {
+                statusCode: "404",
+                responseParameters: {
+                  "method.response.header.Content-Type": "'application/json'",
+                },
+                responseTemplates: {
+                  "application/json":
+                    '{"statusCode": 404, "message": "Error: Resource not found"}',
+                },
+              },
+              "404": {
+                statusCode: "404",
+                responseParameters: {
+                  "method.response.header.Content-Type": "'application/json'",
+                },
+                responseTemplates: {
+                  "application/json":
+                    '{"statusCode": 404, "message": "Error: Resource not found"}',
+                },
+              },
+            },
+          },
+          responses: {
+            404: {
+              description: "404 response",
+              headers: {
+                "Content-Type": {
+                  type: "string",
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+  }
+};
diff --git a/libs/wingsdk/src/shared-aws/api.onrequest.inflight.ts b/libs/wingsdk/src/shared-aws/api.onrequest.inflight.ts
deleted file mode 100644
index 3e42f414d23..00000000000
--- a/libs/wingsdk/src/shared-aws/api.onrequest.inflight.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import type { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
-import {
-  ApiRequest,
-  ApiResponse,
-  IApiEndpointHandlerClient,
-  parseHttpMethod,
-  sanitizeParamLikeObject,
-} from "../cloud/api";
-
-export class ApiOnRequestHandlerClient {
-  private readonly handler: IApiEndpointHandlerClient;
-  private readonly corsHeaders?: Record<string, string>;
-  constructor({
-    handler,
-    args,
-  }: {
-    handler: IApiEndpointHandlerClient;
-    args?: {
-      corsHeaders?: Record<string, string>;
-    };
-  }) {
-    this.handler = handler;
-    this.corsHeaders = args?.corsHeaders;
-  }
-  public async handle(
-    request: APIGatewayProxyEvent
-  ): Promise<APIGatewayProxyResult> {
-    const apiRequest: ApiRequest = mapApigatewayEventToCloudApiRequest(request);
-    const apiResponse: ApiResponse = await this.handler.handle(apiRequest);
-    const apiGatewayResponse: APIGatewayProxyResult =
-      mapCloudApiResponseToApigatewayResponse(apiResponse, this.corsHeaders);
-    return apiGatewayResponse;
-  }
-}
-
-/**
- * Map a Cloud API response to an API Gateway response
- * @param resp Cloud API response
- * @returns API Gateway response
- */
-function mapCloudApiResponseToApigatewayResponse(
-  resp: ApiResponse,
-  corsHeaders?: Record<string, string>
-): APIGatewayProxyResult {
-  return {
-    statusCode: resp.status,
-    body: resp.body ?? "",
-    headers: {
-      "Content-Type": "application/json",
-      ...corsHeaders,
-      ...resp.headers,
-    },
-  };
-}
-
-/**
- * Map an API Gateway event to a Cloud API request
- * @param request API Gateway event
- * @returns Cloud API request
- */
-function mapApigatewayEventToCloudApiRequest(
-  request: APIGatewayProxyEvent
-): ApiRequest {
-  const query = {
-    ...request.queryStringParameters,
-    ...request.multiValueQueryStringParameters,
-  };
-
-  return {
-    path: request.path,
-    body: parseBody(request),
-    headers: request.headers as Record<string, string>,
-    method: parseHttpMethod(request.httpMethod),
-    query: sanitizeParamLikeObject(query),
-    vars: sanitizeParamLikeObject(request.pathParameters ?? {}),
-  };
-}
-
-/**
- * Parse body to JSON or empty string
- * @param body body
- * @returns JSON body
- */
-function parseBody(request: APIGatewayProxyEvent): string {
-  if (!request.body) return "";
-
-  const contentType = Object.entries(request.headers).find(
-    ([key, _]) => key.toLowerCase() === "content-type"
-  )?.[1];
-  if (contentType === "application/x-www-form-urlencoded") {
-    return JSON.stringify(
-      Object.fromEntries(new URLSearchParams(request.body))
-    );
-  }
-  return request.body;
-}
diff --git a/libs/wingsdk/src/shared-aws/api.ts b/libs/wingsdk/src/shared-aws/api.ts
index 71f8c22ebc8..d52297fb92c 100644
--- a/libs/wingsdk/src/shared-aws/api.ts
+++ b/libs/wingsdk/src/shared-aws/api.ts
@@ -1,4 +1,12 @@
+import type { APIGatewayProxyEvent } from "aws-lambda";
 import { cloud } from "..";
+import { lift } from "../core";
+
+/**
+ * The stage name for the API, used in its url.
+ * @see https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html
+ */
+export const STAGE_NAME = "prod";
 
 /**
  * A shared interface for AWS api.
@@ -62,3 +70,34 @@ export class Api {
     );
   }
 }
+
+/**
+ * A helper class for working with AWS api endpoint handlers.
+ */
+export class ApiEndpointHandler {
+  /**
+   * Returns a `cloud.Function` handler for handling requests from a `cloud.Api`.
+   * @param handler The `onRequest` handler.
+   * @param headers HTTP response headers to add to all responses (used by CORS)
+   * @returns The `cloud.Function` handler.
+   */
+  public static toFunctionHandler(
+    handler: cloud.IApiEndpointHandler,
+    headers?: Record<string, string>
+  ): cloud.IFunctionHandler {
+    return lift({
+      handler,
+      headers: headers ?? {},
+    }).inflight(async (ctx, request) => {
+      const {
+        apigwFunctionHandler,
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+      } = require("@winglang/sdk/lib/shared-aws/api-util.js");
+      return apigwFunctionHandler(
+        request as unknown as APIGatewayProxyEvent,
+        ctx.handler,
+        ctx.headers
+      ) as unknown as string;
+    });
+  }
+}
diff --git a/libs/wingsdk/src/shared-aws/bucket.inflight.ts b/libs/wingsdk/src/shared-aws/bucket.inflight.ts
index 264ee2ab267..f997f7e7049 100644
--- a/libs/wingsdk/src/shared-aws/bucket.inflight.ts
+++ b/libs/wingsdk/src/shared-aws/bucket.inflight.ts
@@ -6,6 +6,7 @@ import {
   DeleteObjectCommand,
   GetBucketLocationCommand,
   GetObjectCommand,
+  GetObjectCommandInput,
   GetObjectOutput,
   GetPublicAccessBlockCommand,
   GetPublicAccessBlockCommandOutput,
@@ -16,24 +17,44 @@ import {
   NoSuchKey,
   PutObjectCommand,
   S3Client,
+  HeadBucketCommand,
 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import mime from "mime-types";
+import { IAwsBucketClient } from "./bucket";
 import {
-  IBucketClient,
   ObjectMetadata,
   BucketPutOptions,
   BucketDeleteOptions,
   BucketSignedUrlOptions,
+  BucketSignedUrlAction,
+  BucketGetOptions,
+  BucketTryGetOptions,
 } from "../cloud";
 import { Datetime, Json } from "../std";
 
-export class BucketClient implements IBucketClient {
+export class BucketClient implements IAwsBucketClient {
   constructor(
     private readonly bucketName: string,
     private readonly s3Client: S3Client = new S3Client({})
   ) {}
 
+  public async bucketRegion(): Promise<string> {
+    const res = await this.s3Client.send(
+      new HeadBucketCommand({
+        Bucket: this.bucketName,
+      })
+    );
+
+    if (!res.BucketRegion) {
+      throw new Error(
+        `Failed to get region of the bucket (bucket=${this.bucketName}).`
+      );
+    }
+
+    return res.BucketRegion;
+  }
+
   /**
    * Check if an object exists in the bucket
    *
@@ -49,7 +70,7 @@ export class BucketClient implements IBucketClient {
       await this.s3Client.send(command);
       return true;
     } catch (error) {
-      if ((error as Error).name === "NotFound") {
+      if (error instanceof NotFound) {
         return false;
       }
       throw error;
@@ -92,17 +113,31 @@ export class BucketClient implements IBucketClient {
   /**
    * See https://github.com/aws/aws-sdk-js-v3/issues/1877
    */
-  private async getObjectContent(key: string): Promise<string | undefined> {
-    const command = new GetObjectCommand({
+  private async getObjectContent(
+    key: string,
+    options?: BucketGetOptions
+  ): Promise<string | undefined> {
+    const getObjectParams: GetObjectCommandInput = {
       Bucket: this.bucketName,
       Key: key,
-    });
+    };
+
+    // Conditionally add the `Range` parameter
+    if (options?.startByte !== undefined || options?.endByte !== undefined) {
+      const startByte = options?.startByte ?? 0;
+      const endByte = options?.endByte ?? "";
+      getObjectParams.Range = `bytes=${startByte}-${endByte}`;
+    }
+
+    const command = new GetObjectCommand(getObjectParams);
 
     try {
       const resp: GetObjectOutput = await this.s3Client.send(command);
       const objectContent = resp.Body as Readable;
       try {
-        return await consumers.text(objectContent);
+        return new TextDecoder("utf8", { fatal: true }).decode(
+          await consumers.buffer(objectContent)
+        );
       } catch (e) {
         throw new Error(
           `Object content could not be read as text (key=${key}): ${
@@ -124,8 +159,8 @@ export class BucketClient implements IBucketClient {
    * @param key Key of the object
    * @returns content of the object
    */
-  public async get(key: string): Promise<string> {
-    const objectContent = await this.getObjectContent(key);
+  public async get(key: string, options?: BucketGetOptions): Promise<string> {
+    const objectContent = await this.getObjectContent(key, options);
     if (objectContent !== undefined) {
       return objectContent;
     }
@@ -138,8 +173,11 @@ export class BucketClient implements IBucketClient {
    * @param key Key of the object
    * @returns content of the object
    */
-  public async tryGet(key: string): Promise<string | undefined> {
-    return this.getObjectContent(key);
+  public async tryGet(
+    key: string,
+    options?: BucketTryGetOptions
+  ): Promise<string | undefined> {
+    return this.getObjectContent(key, options);
   }
 
   /**
@@ -187,12 +225,11 @@ export class BucketClient implements IBucketClient {
 
     try {
       await this.s3Client.send(command);
-    } catch (e: any) {
-      if (!mustExist && e instanceof NoSuchKey) {
+    } catch (error) {
+      if (!mustExist && error instanceof NoSuchKey) {
         return;
       }
-
-      throw new Error(`Unable to delete "${key}": ${e.message}`);
+      throw new Error(`Failed to delete object (key=${key}).`);
     }
   }
 
@@ -245,7 +282,6 @@ export class BucketClient implements IBucketClient {
   /**
    * Copy an object to a new location in the bucket. If the destination object
    * already exists, it will be overwritten.
-   *
    * @param srcKey The key of the source object you wish to copy.
    * @param dstKey The key of the destination object after copying.
    */
@@ -284,6 +320,25 @@ export class BucketClient implements IBucketClient {
     }
   }
 
+  /**
+   * Move an object to a new location in the bucket. If the destination object
+   * already exists, it will be overwritten. Returns once the renaming is finished.
+   * @param srcKey The key of the source object you wish to rename.
+   * @param dstKey The key of the destination object after renaming.
+   * @throws if `srcKey` object doesn't exist or if it matches `dstKey`.
+   * @inflight
+   */
+  public async rename(srcKey: string, dstKey: string): Promise<void> {
+    if (srcKey === dstKey) {
+      throw new Error(
+        `Renaming an object to its current name is not a valid operation (srcKey=${srcKey}, dstKey=${dstKey}).`
+      );
+    }
+
+    await this.copy(srcKey, dstKey);
+    await this.delete(srcKey);
+  }
+
   /**
    * Checks if the bucket is public
    * @returns true if the bucket is public and false otherwise
@@ -326,37 +381,50 @@ export class BucketClient implements IBucketClient {
   }
 
   /**
-   * Returns a signed url to the given file.
-   * @Throws if object does not exist.
+   * Returns a presigned URL for the specified key in the bucket.
+   * @param key The key of the object in the bucket.
+   * @param opts The options including the action and the duration for the signed URL.
+   * @returns The presigned URL string.
    * @inflight
-   * @param key The key to reach
-   *    @param duration Time until expires
    */
-
   public async signedUrl(
     key: string,
-    options?: BucketSignedUrlOptions
+    opts?: BucketSignedUrlOptions
   ): Promise<string> {
-    if (!(await this.exists(key))) {
-      throw new Error(
-        `Cannot provide signed url for a non-existent key (key=${key})`
-      );
+    let s3Command: GetObjectCommand | PutObjectCommand;
+
+    // Set default action to DOWNLOAD if not provided
+    const action = opts?.action ?? BucketSignedUrlAction.DOWNLOAD;
+
+    // Set the S3 command
+    switch (action) {
+      case BucketSignedUrlAction.DOWNLOAD:
+        if (!(await this.exists(key))) {
+          throw new Error(
+            `Cannot provide signed url for a non-existent key (key=${key})`
+          );
+        }
+        s3Command = new GetObjectCommand({
+          Bucket: this.bucketName,
+          Key: key,
+        });
+        break;
+      case BucketSignedUrlAction.UPLOAD:
+        s3Command = new PutObjectCommand({
+          Bucket: this.bucketName,
+          Key: key,
+        });
+        break;
+      default:
+        throw new Error(`Invalid action: ${opts?.action}`);
     }
-    const expiryTimeInSeconds: number = options?.duration?.seconds || 86400;
-    const command: GetObjectCommand = new GetObjectCommand({
-      Bucket: this.bucketName,
-      Key: key,
+
+    // Generate the presigned URL
+    const signedUrl = await getSignedUrl(this.s3Client, s3Command, {
+      expiresIn: opts?.duration?.seconds ?? 900,
     });
-    try {
-      const signedUrl: string = await getSignedUrl(this.s3Client, command, {
-        expiresIn: expiryTimeInSeconds,
-      });
-      return signedUrl;
-    } catch (error) {
-      throw new Error(
-        `Unable to generate signed url for key ${key} : ${error as Error}`
-      );
-    }
+
+    return signedUrl;
   }
 
   /**
diff --git a/libs/wingsdk/src/shared-aws/bucket.ts b/libs/wingsdk/src/shared-aws/bucket.ts
index 8cfba98dec4..e713aaf5a91 100644
--- a/libs/wingsdk/src/shared-aws/bucket.ts
+++ b/libs/wingsdk/src/shared-aws/bucket.ts
@@ -1,4 +1,10 @@
-import { cloud } from "..";
+import { Construct } from "constructs";
+import { AwsInflightHost } from "./inflight-host";
+import { calculateBucketPermissions } from "./permissions";
+import { cloud, ui } from "..";
+import { InflightClient, LiftMap, lift } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
+import { IInflightHost, Node, Resource } from "../std";
 
 /**
  * A shared interface for AWS buckets.
@@ -37,3 +43,168 @@ export class Bucket {
     );
   }
 }
+
+/**
+ * A few inflight methods that can be used with an AWS bucket.
+ */
+export interface IAwsBucketClient extends cloud.IBucketClient {
+  /**
+   * Get the region of the bucket.
+   * @inflight
+   */
+  bucketRegion(): Promise<string>;
+}
+
+/**
+ * A reference to an external S3 bucket.
+ * @inflight `@winglang/sdk.aws.IAwsBucketClient`
+ */
+export class BucketRef extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IAwsBucketClient;
+
+  /**
+   * The Name of this bucket.
+   */
+  public readonly bucketName: string;
+
+  /**
+   * The ARN of this bucket.
+   */
+  public readonly bucketArn: string;
+
+  constructor(scope: Construct, id: string, bucketName: string) {
+    super(scope, id);
+
+    this.bucketName = bucketName;
+    this.bucketArn = `arn:aws:s3:::${bucketName}`;
+
+    this.addUserInterface();
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    if (AwsInflightHost.isAwsInflightHost(host)) {
+      host.addPolicyStatements(
+        ...calculateBucketPermissions(this.bucketArn, ops)
+      );
+    }
+
+    // The bucket name needs to be passed through an environment variable since
+    // it may not be resolved until deployment time.
+    host.addEnvironment(this.envName(), this.bucketName);
+
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return InflightClient.for(__dirname, __filename, "BucketClient", [
+      `process.env["${this.envName()}"]`,
+    ]);
+  }
+
+  private envName(): string {
+    return `BUCKET_NAME_${this.node.addr.slice(-8)}`;
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.BucketInflightMethods.DELETE]: [],
+      [cloud.BucketInflightMethods.GET]: [],
+      [cloud.BucketInflightMethods.GET_JSON]: [],
+      [cloud.BucketInflightMethods.LIST]: [],
+      [cloud.BucketInflightMethods.PUT]: [],
+      [cloud.BucketInflightMethods.PUT_JSON]: [],
+      [cloud.BucketInflightMethods.PUBLIC_URL]: [],
+      [cloud.BucketInflightMethods.EXISTS]: [],
+      [cloud.BucketInflightMethods.TRY_GET]: [],
+      [cloud.BucketInflightMethods.TRY_GET_JSON]: [],
+      [cloud.BucketInflightMethods.TRY_DELETE]: [],
+      [cloud.BucketInflightMethods.SIGNED_URL]: [],
+      [cloud.BucketInflightMethods.METADATA]: [],
+      [cloud.BucketInflightMethods.COPY]: [],
+      [cloud.BucketInflightMethods.RENAME]: [],
+      bucketRegion: [],
+    };
+  }
+
+  private addUserInterface() {
+    Node.of(this).color = "amber";
+
+    const awsConsoleHandler = lift({
+      bucket: this,
+      bucketName: this.bucketName,
+    }).inflight(async (ctx) => {
+      try {
+        const region = await ctx.bucket.bucketRegion();
+        return (
+          "https://" +
+          region +
+          ".console.aws.amazon.com/s3/buckets/" +
+          ctx.bucketName +
+          "?region=" +
+          region
+        );
+      } catch (e: any) {
+        return e.message;
+      }
+    });
+
+    new ui.Field(this, "AwsConsoleField", "AWS Console", awsConsoleHandler, {
+      link: true,
+    });
+
+    new ui.ValueField(this, "BucketNameField", "Bucket Name", this.bucketName);
+    new ui.ValueField(this, "BucketArnField", "Bucket ARN", this.bucketArn);
+    new ui.FileBrowser(this, "FileBrowser", "File Browser", {
+      put: lift({ bucket: this }).inflight(
+        async (ctx, fileName, fileContent) => {
+          await ctx.bucket.put(fileName, fileContent);
+        }
+      ),
+      get: lift({ bucket: this }).inflight(async (ctx, fileName) => {
+        return ctx.bucket.get(fileName);
+      }),
+      delete: lift({ bucket: this }).inflight(async (ctx, fileName) => {
+        await ctx.bucket.delete(fileName);
+      }),
+      list: lift({ bucket: this }).inflight(async (ctx) => {
+        return ctx.bucket.list();
+      }),
+    });
+  }
+}
+
+/**
+ * Utility class to work with bucket event handlers.
+ */
+export class BucketEventHandler {
+  /**
+   * Converts a `cloud.IBucketEventHandler` to a `cloud.ITopicOnMessageHandler`.
+   * @param handler the handler to convert
+   * @param eventType the event type
+   * @returns the on message handler.
+   */
+  public static toTopicOnMessageHandler(
+    handler: cloud.IBucketEventHandler,
+    eventType: cloud.BucketEventType
+  ): cloud.ITopicOnMessageHandler {
+    return lift({ handler, eventType }).inflight(async (ctx, event) => {
+      try {
+        const message = JSON.parse(event);
+        if (message?.Event === "s3:TestEvent") {
+          // aws sends a test event to the topic before of the actual one, we're ignoring it for now
+          return;
+        }
+        return await ctx.handler(
+          message.Records[0].s3.object.key,
+          ctx.eventType
+        );
+      } catch (error) {
+        console.warn("Error parsing the notification event message: ", error);
+        console.warn("Event: ", event);
+      }
+    });
+  }
+}
diff --git a/libs/wingsdk/src/shared-aws/domain.ts b/libs/wingsdk/src/shared-aws/domain.ts
index 3fd02fe9bd1..dbe90b0a8be 100644
--- a/libs/wingsdk/src/shared-aws/domain.ts
+++ b/libs/wingsdk/src/shared-aws/domain.ts
@@ -1,10 +1,11 @@
 import { Construct } from "constructs";
 import * as cloud from "../cloud";
+import { App } from "../core";
 import { NotImplementedError } from "../core/errors";
-import { getPlatformSpecificValues } from "../util/platform-specific";
 
 /**
  * AWS implementation of `cloud.Domain`.
+ * @inflight `@winglang/sdk.cloud.IDomainClient`
  */
 export class Domain extends cloud.Domain {
   /** @internal */
@@ -17,15 +18,44 @@ export class Domain extends cloud.Domain {
   constructor(scope: Construct, id: string, props: cloud.DomainProps) {
     super(scope, id, props);
 
-    const values = getPlatformSpecificValues(
-      this,
-      "iamCertificate||acmCertificateArn",
-      "hostedZoneId"
+    const parameters = App.of(scope).parameters;
+
+    // Domain requires parameters from the user, so we need to add the parameter schemas to the registrar
+    let schema = {
+      type: "object",
+      oneOf: [
+        {
+          required: ["iamCertificate"],
+        },
+        {
+          required: ["acmCertificateArn"],
+        },
+      ],
+      required: ["hostedZoneId"],
+      properties: {
+        iamCertificate: {
+          type: "string",
+        },
+        acmCertificateArn: {
+          type: "string",
+        },
+        hostedZoneId: {
+          type: "string",
+        },
+      },
+    };
+
+    parameters.addSchemaAtPath(schema, this.node.path, true);
+
+    const iamCertificate = parameters.value(`${this.node.path}/iamCertificate`);
+    const acmCertificateArn = parameters.value(
+      `${this.node.path}/acmCertificateArn`
     );
+    const hostedZoneId = parameters.value(`${this.node.path}/hostedZoneId`);
 
-    this._iamCertificate = values.iamCertificate;
-    this._hostedZoneId = values.hostedZoneId;
-    this._acmCertificateArn = values.acmCertificateArn;
+    this._iamCertificate = iamCertificate;
+    this._hostedZoneId = hostedZoneId;
+    this._acmCertificateArn = acmCertificateArn;
   }
 
   /**
diff --git a/libs/wingsdk/src/shared-aws/dynamodb-table.inflight.ts b/libs/wingsdk/src/shared-aws/dynamodb-table.inflight.ts
deleted file mode 100644
index d24375cc496..00000000000
--- a/libs/wingsdk/src/shared-aws/dynamodb-table.inflight.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
-import { DynamodbTableClientBase } from "../ex/dynamodb-table";
-
-export class DynamodbTableClient extends DynamodbTableClientBase {
-  constructor(
-    tableName: string,
-    private readonly _client = new DynamoDBClient({})
-  ) {
-    super(tableName);
-  }
-
-  public async _rawClient(): Promise<DynamoDBClient> {
-    return this._client;
-  }
-}
diff --git a/libs/wingsdk/src/shared-aws/dynamodb-table.ts b/libs/wingsdk/src/shared-aws/dynamodb-table.ts
deleted file mode 100644
index 3cc7b3902c3..00000000000
--- a/libs/wingsdk/src/shared-aws/dynamodb-table.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ex } from "..";
-import { NameOptions } from "../shared/resource-names";
-
-/**
- * Table names must be between 3 and 255 characters.
- * You can use alphanumeric characters, dot (.), dash (-), and underscores (_).
- */
-export const NAME_OPTS: NameOptions = {
-  maxLen: 255,
-  disallowedRegex: /[^a-zA-Z0-9\_\.\-]+/g,
-};
-
-/**
- * A shared interface for AWS Dynamodb.
- */
-export interface IAwsDynamodbTable {
-  /**
-   * AWS Dynamodb arn
-   */
-  readonly dynamoTableArn: string;
-
-  /**
-   * AWS Dynamodb name
-   */
-  readonly dynamoTableName: string;
-}
-
-/**
- * A helper class for working with AWS DynamodbTables.
- */
-export class DynamodbTable {
-  /**
-   * If the table is an AWS Dynamodb, return a helper interface for
-   * working with it.
-   * @param dynamodb The ex.DynamodbTable.
-   */
-  public static from(
-    dynamodb: ex.DynamodbTable
-  ): IAwsDynamodbTable | undefined {
-    if (this.isAwsDynamodb(dynamodb)) {
-      return dynamodb;
-    }
-    return undefined;
-  }
-
-  private static isAwsDynamodb(obj: any): obj is IAwsDynamodbTable {
-    return (
-      typeof obj.dynamoTableArn === "string" &&
-      typeof obj.dynamoTableName === "string"
-    );
-  }
-}
diff --git a/libs/wingsdk/src/shared-aws/endpoint.inflight.ts b/libs/wingsdk/src/shared-aws/endpoint.inflight.ts
new file mode 100644
index 00000000000..f1953159d98
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/endpoint.inflight.ts
@@ -0,0 +1,5 @@
+import { IEndpointClient } from "../cloud";
+
+export class EndpointClient implements IEndpointClient {
+  public constructor(public readonly url: string) {}
+}
diff --git a/libs/wingsdk/src/shared-aws/function-util.ts b/libs/wingsdk/src/shared-aws/function-util.ts
new file mode 100644
index 00000000000..c4237e3f263
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/function-util.ts
@@ -0,0 +1,34 @@
+import * as cloud from "../cloud";
+
+export function makeAwsLambdaHandler(
+  handler: cloud.IFunctionHandler
+): string[] {
+  const inflightClient = handler._toInflight();
+  const lines = new Array<string>();
+  const client = "$handler";
+
+  lines.push('"use strict";');
+  lines.push(`var ${client} = undefined;`);
+  lines.push("exports.handler = async function(event, context) {");
+  lines.push("  try {");
+  lines.push("    if (globalThis.$awsLambdaContext === undefined) {");
+  lines.push("      globalThis.$awsLambdaContext = context;");
+  lines.push(`      ${client} = ${client} ?? (${inflightClient});`);
+  lines.push("    } else {");
+  lines.push("      throw new Error(");
+  lines.push("        'An AWS Lambda context object was already defined.'");
+  lines.push("      );");
+  lines.push("    }");
+
+  // important: we're calling handle() within a try block, but there's no catch block
+  // because we want to let the error propagate to the AWS Lambda runtime
+  lines.push(
+    `    return await ${client}.handle(event === null ? undefined : event);`
+  );
+  lines.push("  } finally {");
+  lines.push("    globalThis.$awsLambdaContext = undefined;");
+  lines.push("  }");
+  lines.push("};");
+
+  return lines;
+}
diff --git a/libs/wingsdk/src/shared-aws/function.inflight.ts b/libs/wingsdk/src/shared-aws/function.inflight.ts
index a6dd52738ed..c53424b7b1e 100644
--- a/libs/wingsdk/src/shared-aws/function.inflight.ts
+++ b/libs/wingsdk/src/shared-aws/function.inflight.ts
@@ -5,10 +5,21 @@ import {
   LogType,
 } from "@aws-sdk/client-lambda";
 import { fromUtf8, toUtf8 } from "@smithy/util-utf8";
+import { ILambdaContext } from "./function";
 import { IFunctionClient } from "../cloud";
-import { Trace, TraceType } from "../std";
+import { LogLevel, Trace, TraceType } from "../std";
 
 export class FunctionClient implements IFunctionClient {
+  public static async context(): Promise<ILambdaContext | undefined> {
+    const obj = (globalThis as any).$awsLambdaContext;
+    if (!obj) {
+      return undefined;
+    }
+    // workaround for the fact that JSII doesn't allow methods to start with "get"
+    obj.remainingTimeInMillis = obj.getRemainingTimeInMillis;
+    return obj;
+  }
+
   constructor(
     private readonly functionArn: string,
     private readonly constructPath: string,
@@ -16,33 +27,47 @@ export class FunctionClient implements IFunctionClient {
   ) {}
 
   /**
-   * Invoke the function, passing the given payload as an argument.
-   *  @returns the function returned payload only
+   * Invokes the function with a payload and waits for the result.
+   *  @returns the function response payload.
    */
-  public async invoke(payload: string): Promise<string> {
+  public async invoke(payload?: string): Promise<string | undefined> {
     const command = new InvokeCommand({
       FunctionName: this.functionArn,
-      Payload: fromUtf8(JSON.stringify(payload)),
+      // If payload is undefined, pass json `null` as the payload to the function
+      // to ensure the received event will be `null` (which will be converted to `undefined` in the function code)
+      // If the Payload is undefined, the resulting event will instead be `{}`
+      Payload: fromUtf8(
+        payload !== undefined ? JSON.stringify(payload) : "null"
+      ),
     });
     const response = await this.lambdaClient.send(command);
+    return parseCommandOutput(response, this.functionArn);
+  }
 
-    const value = parseCommandOutput(response, this.functionArn);
+  /**
+   * Kicks off the execution of the function with a payload and returns immediately while the function is running.
+   * @returns immediately once the event has been handed off to AWS Lambda.
+   */
+  public async invokeAsync(payload: string): Promise<void> {
+    const command = new InvokeCommand({
+      FunctionName: this.functionArn,
+      Payload: fromUtf8(JSON.stringify(payload)),
+      InvocationType: "Event",
+    });
+    const response = await this.lambdaClient.send(command);
 
-    if (!value) {
-      return "";
-    }
-    if (typeof value !== "string") {
+    if (response.StatusCode !== 202) {
+      console.error("Error: " + response.FunctionError);
+      console.error(response.Payload ? toUtf8(response.Payload) : "");
       throw new Error(
-        `function returned value of type ${typeof value}, not string`
+        `Failed to enqueue event. Received status code: ${response.StatusCode}`
       );
     }
-    return value;
   }
 
   /**
-   * Invoke the function, passing the given payload as an argument.
-   *
-   * @returns the function returned payload and logs
+   * Invokes the function synchronously, passing the given payload as an argument.
+   * @returns the function response payload with execution logs included.
    */
   public async invokeWithLogs(payload: string): Promise<[string, Trace[]]> {
     const command = new InvokeCommand({
@@ -72,7 +97,7 @@ export class FunctionClient implements IFunctionClient {
 function parseCommandOutput(
   payload: InvokeCommandOutput,
   functionArn: string
-): any | undefined {
+): string | undefined {
   if (payload.FunctionError) {
     let errorText = toUtf8(payload.Payload!);
     let errorData;
@@ -81,26 +106,33 @@ function parseCommandOutput(
     } catch (_) {}
 
     if (errorData && "errorMessage" in errorData) {
-      const newError = new Error(
-        `Invoke failed with message: "${
-          errorData.errorMessage
-        }"\nLogs: ${cloudwatchLogsPath(functionArn)}`
+      let errorMessage = `Invoke failed with message: "${
+        errorData.errorMessage
+      }"\nLogs: ${cloudwatchLogsPath(functionArn)}`;
+      errorMessage = errorMessage.replace(
+        "Task timed out after",
+        "Function timed out after"
       );
+
+      const newError = new Error();
+      newError.message = errorMessage;
       newError.name = errorData.errorType;
       newError.stack = errorData.trace?.join("\n");
       throw newError;
     }
+
     throw new Error(
       `Invoke failed with message: "${
         payload.FunctionError
       }"\nLogs: ${cloudwatchLogsPath(functionArn)}\nFull Error: "${errorText}"`
     );
+  }
+
+  if (!payload.Payload) {
+    return undefined;
   } else {
-    if (!payload.Payload) {
-      return undefined;
-    } else {
-      return JSON.parse(toUtf8(payload.Payload));
-    }
+    const returnObject = JSON.parse(toUtf8(payload.Payload));
+    return returnObject === null ? undefined : returnObject;
   }
 }
 
@@ -134,6 +166,7 @@ export function parseLogs(logs: string, sourcePath: string) {
         sourceType: "@winglang/sdk.cloud.Function",
         sourcePath,
         type: TraceType.LOG,
+        level: LogLevel.INFO,
       };
       traces.push(trace);
     }
diff --git a/libs/wingsdk/src/shared-aws/function.ts b/libs/wingsdk/src/shared-aws/function.ts
index 5e36e26e09d..b603eebf6f7 100644
--- a/libs/wingsdk/src/shared-aws/function.ts
+++ b/libs/wingsdk/src/shared-aws/function.ts
@@ -1,10 +1,26 @@
-import { PolicyStatement } from "./types";
-import { IInflightHost } from "../std";
+import { Construct } from "constructs";
+import { AwsInflightHost, IAwsInflightHost } from "./inflight-host";
+import { isValidArn } from "./util";
+import { FunctionInflightMethods, IFunctionClient } from "../cloud";
+import { InflightClient, lift, LiftMap } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
+import { IInflightHost, Node, Resource } from "../std";
+import * as ui from "../ui";
+
+export const externalLibraries = [
+  "@aws-sdk/client-sso",
+  "@aws-sdk/client-sso-oidc",
+  "@aws-sdk/credential-provider-ini",
+  "@aws-sdk/credential-provider-process",
+  "@aws-sdk/credential-provider-sso",
+  "@aws-sdk/credential-provider-web-identity",
+  "@aws-sdk/token-providers",
+];
 
 /**
  * A shared interface for AWS functions.
  */
-export interface IAwsFunction {
+export interface IAwsFunction extends IAwsInflightHost {
   /**
    * AWS Function arn
    */
@@ -14,22 +30,31 @@ export interface IAwsFunction {
    * AWS Function name
    */
   readonly functionName: string;
-
-  /**
-   * Add an environment variable to the function.
-   */
-  addEnvironment(key: string, value: string): void;
-
-  /**
-   * Add policy statements to the function's IAM role.
-   */
-  addPolicyStatements(...policies: PolicyStatement[]): void;
 }
 
 /**
  * A helper class for working with AWS functions.
  */
 export class Function {
+  /** @internal */
+  public static _toInflightType(): string {
+    return InflightClient.forType(
+      __filename.replace("function", "function.inflight"),
+      "FunctionClient"
+    );
+  }
+
+  /**
+   * Returns the current Lambda invocation context, if the host is an AWS Lambda.
+   * @see https://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html
+   * @inflight
+   * @returns The current Lambda invocation context.
+   */
+  public static async context(): Promise<ILambdaContext | undefined> {
+    // The implementation of this method is in function.inflight.ts
+    throw new Error("Not implemented");
+  }
+
   /**
    * If the inflight host is an AWS Lambda, return a helper interface for
    * working with it.
@@ -44,10 +69,153 @@ export class Function {
 
   private static isAwsFunction(obj: any): obj is IAwsFunction {
     return (
-      typeof obj.addPolicyStatements === "function" &&
-      typeof obj.addEnvironment === "function" &&
       typeof obj.functionArn === "string" &&
       typeof obj.functionName === "string"
     );
   }
 }
+
+/**
+ * The AWS Lambda context object.
+ * @inflight
+ */
+export interface ILambdaContext {
+  /**
+   * The name of the Lambda function.
+   */
+  readonly functionName: string;
+
+  /**
+   * The version of the function.
+   */
+  readonly functionVersion: string;
+
+  /**
+   * The Amazon Resource Name (ARN) that's used to invoke the function.
+   * Indicates if the invoker specified a version number or alias.
+   */
+  readonly invokedFunctionArn: string;
+
+  /**
+   * The amount of memory that's allocated for the function.
+   */
+  readonly memoryLimitInMB: string;
+
+  /**
+   * The identifier of the invocation request.
+   */
+  readonly awsRequestId: string;
+
+  /**
+   * The log group for the function.
+   */
+  readonly logGroupName: string;
+
+  /**
+   * The log stream for the function instance.
+   */
+  readonly logStreamName: string;
+
+  /**
+   * Returns the number of milliseconds left before the execution times out.
+   */
+  remainingTimeInMillis(): number;
+}
+
+/**
+ * A reference to an external Lambda function.
+ *
+ * @inflight `@winglang/sdk.cloud.IFunctionClient`
+ */
+export class FunctionRef extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IFunctionClient;
+
+  /**
+   * The ARN of this function.
+   */
+  public readonly functionArn: string;
+
+  constructor(scope: Construct, id: string, functionArn: string) {
+    super(scope, id);
+
+    if (!isValidArn(functionArn, "lambda")) {
+      throw new Error(`"${functionArn}" is not a valid Amazon Lambda ARN`);
+    }
+
+    this.functionArn = functionArn;
+
+    this.addUserInterface();
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    if (AwsInflightHost.isAwsInflightHost(host)) {
+      if (
+        ops.includes(FunctionInflightMethods.INVOKE) ||
+        ops.includes(FunctionInflightMethods.INVOKE_ASYNC)
+      ) {
+        host.addPolicyStatements({
+          actions: ["lambda:InvokeFunction"],
+          resources: [this.functionArn],
+        });
+      }
+    }
+
+    host.addEnvironment(this.envName(), this.functionArn);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return InflightClient.for(__dirname, __filename, "FunctionClient", [
+      `process.env["${this.envName()}"]`,
+    ]);
+  }
+
+  private envName(): string {
+    return `FUNCTION_NAME_${this.node.addr.slice(-8)}`;
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      [FunctionInflightMethods.INVOKE]: [],
+      [FunctionInflightMethods.INVOKE_ASYNC]: [],
+    };
+  }
+
+  private addUserInterface() {
+    Node.of(this).color = "pink";
+
+    const functionArn = this.functionArn;
+
+    const awsConsoleHandler = lift({ functionArn }).inflight(async (ctx) => {
+      try {
+        const parts = ctx.functionArn.split(":");
+        const region = parts[3];
+        const name = parts[6];
+        return (
+          "https://" +
+          region +
+          ".console.aws.amazon.com/lambda/home?region=" +
+          region +
+          "#/functions/" +
+          name
+        );
+      } catch (e: any) {
+        return e.message;
+      }
+    });
+
+    new ui.Field(this, "AwsConsoleField", "AWS Console", awsConsoleHandler, {
+      link: true,
+    });
+
+    new ui.ValueField(
+      this,
+      "FunctionArnField",
+      "Function ARN",
+      this.functionArn
+    );
+  }
+}
diff --git a/libs/wingsdk/src/shared-aws/index.ts b/libs/wingsdk/src/shared-aws/index.ts
index 65341721d30..63f86da9f2d 100644
--- a/libs/wingsdk/src/shared-aws/index.ts
+++ b/libs/wingsdk/src/shared-aws/index.ts
@@ -2,10 +2,10 @@ export * from "./api";
 export * from "./bucket";
 export * from "./counter";
 export * from "./domain";
-export * from "./dynamodb-table";
 export * from "./function";
+export * from "./inflight-host";
 export * from "./queue";
-export * from "./react-app";
+export * from "./secret";
 export * from "./table";
 export * from "./topic";
 export * from "./types";
diff --git a/libs/wingsdk/src/shared-aws/inflight-host.ts b/libs/wingsdk/src/shared-aws/inflight-host.ts
new file mode 100644
index 00000000000..00090df5a79
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/inflight-host.ts
@@ -0,0 +1,51 @@
+import { PolicyStatement } from "./types";
+import { IInflightHost } from "../std";
+
+/**
+ * Represents an inflight host on AWS.
+ */
+export class AwsInflightHost {
+  /**
+   * Returns `true` if `obj` implements `IAwsInflightHost`.
+   */
+  public static isAwsInflightHost(obj: any): obj is IAwsInflightHost {
+    return (
+      typeof obj.addPolicyStatements === "function" &&
+      typeof obj.addNetwork === "function"
+    );
+  }
+
+  private constructor() {}
+}
+
+/**
+ * Represents an `IInflightHost` on AWS.
+ */
+export interface IAwsInflightHost extends IInflightHost {
+  /**
+   * Add policy statements to the function's IAM role.
+   */
+  addPolicyStatements(...policies: PolicyStatement[]): void;
+
+  /**
+   * Adds the host to the specified network.
+   * @param config The network configuration.
+   */
+  addNetwork(config: NetworkConfig): void;
+}
+
+/**
+ * Function network configuration used to hold data on subnets and security groups that should be
+ * used when a function is deployed within a VPC.
+ */
+export interface NetworkConfig {
+  /**
+   * List of subnets to attach on function
+   **/
+  readonly subnetIds: string[];
+
+  /**
+   * List of security groups to place function in
+   **/
+  readonly securityGroupIds: string[];
+}
diff --git a/libs/wingsdk/src/shared-aws/permissions.ts b/libs/wingsdk/src/shared-aws/permissions.ts
index f4f6f88eef8..feefae3cd10 100644
--- a/libs/wingsdk/src/shared-aws/permissions.ts
+++ b/libs/wingsdk/src/shared-aws/permissions.ts
@@ -1,6 +1,5 @@
 import { PolicyStatement } from "./types";
 import * as cloud from "../cloud";
-import * as ex from "../ex";
 
 export function calculateTopicPermissions(
   arn: string,
@@ -24,6 +23,12 @@ export function calculateQueuePermissions(
 ): PolicyStatement[] {
   const policies: PolicyStatement[] = [];
 
+  // this is always needed in order to resolve URL from ARN/name
+  policies.push({
+    actions: ["sqs:GetQueueUrl"],
+    resources: [arn],
+  });
+
   if (ops.includes(cloud.QueueInflightMethods.PUSH)) {
     policies.push({
       actions: ["sqs:SendMessage"],
@@ -55,82 +60,6 @@ export function calculateQueuePermissions(
   return policies;
 }
 
-export function calculateDynamodbTablePermissions(
-  arn: string,
-  ops: string[]
-): PolicyStatement[] {
-  const policies: PolicyStatement[] = [];
-
-  if (
-    ops.includes(ex.DynamodbTableInflightMethods.PUT_ITEM) ||
-    ops.includes(ex.DynamodbTableInflightMethods.TRANSACT_WRITE_ITEMS)
-  ) {
-    policies.push({
-      actions: ["dynamodb:PutItem"],
-      resources: [arn],
-    });
-  }
-  if (
-    ops.includes(ex.DynamodbTableInflightMethods.UPDATE_ITEM) ||
-    ops.includes(ex.DynamodbTableInflightMethods.TRANSACT_WRITE_ITEMS)
-  ) {
-    policies.push({
-      actions: ["dynamodb:UpdateItem"],
-      resources: [arn],
-    });
-  }
-  if (
-    ops.includes(ex.DynamodbTableInflightMethods.DELETE_ITEM) ||
-    ops.includes(ex.DynamodbTableInflightMethods.TRANSACT_WRITE_ITEMS)
-  ) {
-    policies.push({
-      actions: ["dynamodb:DeleteItem"],
-      resources: [arn],
-    });
-  }
-  if (
-    ops.includes(ex.DynamodbTableInflightMethods.GET_ITEM) ||
-    ops.includes(ex.DynamodbTableInflightMethods.TRANSACT_GET_ITEMS)
-  ) {
-    policies.push({
-      actions: ["dynamodb:GetItem"],
-      resources: [arn],
-    });
-  }
-  if (ops.includes(ex.DynamodbTableInflightMethods.SCAN)) {
-    policies.push({
-      actions: ["dynamodb:Scan"],
-      resources: [arn],
-    });
-  }
-  if (ops.includes(ex.DynamodbTableInflightMethods.QUERY)) {
-    policies.push({
-      actions: ["dynamodb:Query"],
-      resources: [arn],
-    });
-  }
-  if (ops.includes(ex.DynamodbTableInflightMethods.TRANSACT_WRITE_ITEMS)) {
-    policies.push({
-      actions: ["dynamodb:ConditionCheckItem"],
-      resources: [arn],
-    });
-  }
-  if (ops.includes(ex.DynamodbTableInflightMethods.BATCH_GET_ITEM)) {
-    policies.push({
-      actions: ["dynamodb:BatchGetItem"],
-      resources: [arn],
-    });
-  }
-  if (ops.includes(ex.DynamodbTableInflightMethods.BATCH_WRITE_ITEM)) {
-    policies.push({
-      actions: ["dynamodb:BatchWriteItem"],
-      resources: [arn],
-    });
-  }
-
-  return policies;
-}
-
 export function calculateCounterPermissions(
   arn: string,
   ops: string[]
@@ -184,7 +113,8 @@ export function calculateBucketPermissions(
   // putting an object
   if (
     ops.includes(cloud.BucketInflightMethods.PUT) ||
-    ops.includes(cloud.BucketInflightMethods.PUT_JSON)
+    ops.includes(cloud.BucketInflightMethods.PUT_JSON) ||
+    ops.includes(cloud.BucketInflightMethods.SIGNED_URL)
   ) {
     actions.push("s3:PutObject*", "s3:Abort*");
   }
@@ -213,7 +143,8 @@ export function calculateBucketPermissions(
   // deleting an object
   if (
     ops.includes(cloud.BucketInflightMethods.TRY_DELETE) ||
-    ops.includes(cloud.BucketInflightMethods.DELETE)
+    ops.includes(cloud.BucketInflightMethods.DELETE) ||
+    ops.includes(cloud.BucketInflightMethods.RENAME)
   ) {
     actions.push(
       "s3:DeleteObject*",
@@ -223,7 +154,10 @@ export function calculateBucketPermissions(
   }
 
   // copying an object
-  if (ops.includes(cloud.BucketInflightMethods.COPY)) {
+  if (
+    ops.includes(cloud.BucketInflightMethods.COPY) ||
+    ops.includes(cloud.BucketInflightMethods.RENAME)
+  ) {
     actions.push("s3:CopyObject");
   }
   if (actions.length === 0) {
diff --git a/libs/wingsdk/src/shared-aws/queue.inflight.ts b/libs/wingsdk/src/shared-aws/queue.inflight.ts
index 243dc3aa772..60d5026db38 100644
--- a/libs/wingsdk/src/shared-aws/queue.inflight.ts
+++ b/libs/wingsdk/src/shared-aws/queue.inflight.ts
@@ -6,12 +6,15 @@ import {
   ReceiveMessageCommand,
   InvalidMessageContents,
   DeleteMessageCommand,
+  GetQueueUrlCommand,
 } from "@aws-sdk/client-sqs";
-import { IQueueClient } from "../cloud";
+import { IAwsQueueClient } from "./queue";
+
+export class QueueClient implements IAwsQueueClient {
+  private _queueUrl?: string;
 
-export class QueueClient implements IQueueClient {
   constructor(
-    private readonly queueUrl: string,
+    private readonly _queueUrlOrArn: string,
     private readonly client: SQSClient = new SQSClient({})
   ) {}
 
@@ -19,10 +22,11 @@ export class QueueClient implements IQueueClient {
     if (messages.includes("")) {
       throw new Error("Empty messages are not allowed");
     }
+
     const messagePromises = messages.map(async (message) => {
       try {
         const command = new SendMessageCommand({
-          QueueUrl: this.queueUrl,
+          QueueUrl: await this.queueUrl(),
           MessageBody: message,
         });
         await this.client.send(command);
@@ -41,16 +45,46 @@ export class QueueClient implements IQueueClient {
     await Promise.all(messagePromises);
   }
 
+  public async queueUrl(): Promise<string> {
+    if (!this._queueUrl) {
+      // if we have the queue name instead of the url, then we need to resolve it first
+      if (this._queueUrlOrArn.startsWith("https://")) {
+        this._queueUrl = this._queueUrlOrArn;
+      } else {
+        // extract the queue name from its ARN
+        const arnParts = this._queueUrlOrArn.split(":");
+        const queueName = arnParts[arnParts.length - 1].split("/").pop();
+        if (!queueName) {
+          throw new Error(
+            `Unable to extract queue name from ARN: ${this._queueUrlOrArn}`
+          );
+        }
+
+        const command = new GetQueueUrlCommand({ QueueName: queueName });
+        const data = await this.client.send(command);
+        if (!data.QueueUrl) {
+          throw new Error(
+            `Unable to resolve queue URL from SQS queue ARN: ${this._queueUrlOrArn}`
+          );
+        }
+
+        this._queueUrl = data.QueueUrl;
+      }
+    }
+
+    return this._queueUrl;
+  }
+
   public async purge(): Promise<void> {
     const command = new PurgeQueueCommand({
-      QueueUrl: this.queueUrl,
+      QueueUrl: await this.queueUrl(),
     });
     await this.client.send(command);
   }
 
   public async approxSize(): Promise<number> {
     const command = new GetQueueAttributesCommand({
-      QueueUrl: this.queueUrl,
+      QueueUrl: await this.queueUrl(),
       AttributeNames: ["ApproximateNumberOfMessages"],
     });
     const data = await this.client.send(command);
@@ -59,7 +93,7 @@ export class QueueClient implements IQueueClient {
 
   public async pop(): Promise<string | undefined> {
     const receiveCommand = new ReceiveMessageCommand({
-      QueueUrl: this.queueUrl,
+      QueueUrl: await this.queueUrl(),
       MaxNumberOfMessages: 1,
     });
     const data = await this.client.send(receiveCommand);
@@ -71,7 +105,7 @@ export class QueueClient implements IQueueClient {
 
     if (message.ReceiptHandle) {
       const deleteCommand = new DeleteMessageCommand({
-        QueueUrl: this.queueUrl,
+        QueueUrl: await this.queueUrl(),
         ReceiptHandle: message.ReceiptHandle,
       });
       await this.client.send(deleteCommand);
diff --git a/libs/wingsdk/src/shared-aws/queue.setconsumer.inflight.ts b/libs/wingsdk/src/shared-aws/queue.setconsumer.inflight.ts
deleted file mode 100644
index 2a192a76149..00000000000
--- a/libs/wingsdk/src/shared-aws/queue.setconsumer.inflight.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type {
-  IFunctionHandlerClient,
-  IQueueSetConsumerHandlerClient,
-} from "../cloud";
-
-export class QueueSetConsumerHandlerClient
-  implements IQueueSetConsumerHandlerClient
-{
-  private readonly handler: IFunctionHandlerClient;
-  constructor({ handler }: { handler: IFunctionHandlerClient }) {
-    this.handler = handler;
-  }
-  public async handle(event: any) {
-    for (const record of event.Records ?? []) {
-      await this.handler.handle(record.body);
-    }
-  }
-}
diff --git a/libs/wingsdk/src/shared-aws/queue.ts b/libs/wingsdk/src/shared-aws/queue.ts
index 047cae96dd5..6450b502a79 100644
--- a/libs/wingsdk/src/shared-aws/queue.ts
+++ b/libs/wingsdk/src/shared-aws/queue.ts
@@ -1,4 +1,11 @@
-import { cloud } from "..";
+import { Construct } from "constructs";
+import { AwsInflightHost } from "./inflight-host";
+import { calculateQueuePermissions } from "./permissions";
+import { isValidArn } from "./util";
+import { cloud, ui } from "..";
+import { InflightClient, lift, LiftMap } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
+import { IInflightHost, Node, Resource } from "../std";
 
 /**
  * A shared interface for AWS queues.
@@ -44,3 +51,144 @@ export class Queue {
     );
   }
 }
+
+/**
+ * The inflight API for AWS queues.
+ */
+export interface IAwsQueueClient extends cloud.IQueueClient {
+  /**
+   * Get the queue URL.
+   * @inflight
+   */
+  queueUrl(): Promise<string>;
+}
+
+/**
+ * A reference to an external SQS queue.
+ *
+ * @inflight `@winglang/sdk.aws.IAwsQueueClient`
+ */
+export class QueueRef extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IAwsQueueClient;
+
+  /**
+   * The ARN of this queue.
+   */
+  public readonly queueArn: string;
+
+  constructor(scope: Construct, id: string, queueArn: string) {
+    super(scope, id);
+
+    if (!isValidArn(queueArn, "sqs")) {
+      throw new Error(`"${queueArn}" is not a valid Amazon SQS ARN`);
+    }
+
+    this.queueArn = queueArn;
+
+    this.addUserInterface();
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    // if this is an AWS function, add the necessary IAM permissions
+    if (AwsInflightHost.isAwsInflightHost(host)) {
+      host.addPolicyStatements(
+        ...calculateQueuePermissions(this.queueArn, ops)
+      );
+    }
+
+    host.addEnvironment(this.envName(), this.queueArn);
+
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return InflightClient.for(__dirname, __filename, "QueueClient", [
+      `process.env["${this.envName()}"]`,
+    ]);
+  }
+
+  private envName(): string {
+    return `QUEUE_ARN_${this.node.addr.slice(-8)}`;
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      ["queueUrl"]: [], // AWS-specific
+      [cloud.QueueInflightMethods.PUSH]: [],
+      [cloud.QueueInflightMethods.PURGE]: [],
+      [cloud.QueueInflightMethods.APPROX_SIZE]: [],
+      [cloud.QueueInflightMethods.POP]: [],
+    };
+  }
+
+  private addUserInterface() {
+    Node.of(this).color = "pink";
+
+    const queueUrlHandler = lift({ queue: this }).inflight(async (ctx) => {
+      try {
+        return await ctx.queue.queueUrl();
+      } catch (e: any) {
+        return e.message;
+      }
+    });
+
+    new ui.Field(this, "QueueUrlField", "SQS Queue URL", queueUrlHandler, {
+      link: true,
+    });
+
+    const awsConsoleHandler = lift({ queue: this }).inflight(async (ctx) => {
+      try {
+        const url = await ctx.queue.queueUrl();
+        const x = new URL(url);
+        const region = x.hostname.split(".")[1];
+        return (
+          "https://" +
+          region +
+          ".console.aws.amazon.com/sqs/v3/home?region=" +
+          region +
+          "#/queues/" +
+          encodeURIComponent(url)
+        );
+      } catch (e: any) {
+        return e.message;
+      }
+    });
+
+    new ui.Field(this, "AwsConsoleField", "AWS Console", awsConsoleHandler, {
+      link: true,
+    });
+
+    new ui.ValueField(this, "QueueArnField", "SQS Queue ARN", this.queueArn);
+  }
+}
+
+/**
+ * Utility class for working with the queue consumer handler.
+ */
+export class QueueSetConsumerHandler {
+  /**
+   * Converts a queue consumer handler to a function handler.
+   * @param handler The queue consumer handler.
+   * @returns The function handler.
+   */
+  public static toFunctionHandler(
+    handler: cloud.IQueueSetConsumerHandler
+  ): cloud.IFunctionHandler {
+    return lift({ handler }).inflight(async (ctx, event) => {
+      const batchItemFailures = [];
+      for (const record of (event as any).Records ?? []) {
+        try {
+          await ctx.handler(record.body);
+        } catch (error) {
+          batchItemFailures.push({
+            itemIdentifier: record.messageId,
+          });
+        }
+      }
+      return { batchItemFailures } as any;
+    });
+  }
+}
diff --git a/libs/wingsdk/src/shared-aws/react-app.inflight.ts b/libs/wingsdk/src/shared-aws/react-app.inflight.ts
deleted file mode 100644
index 90737c8f466..00000000000
--- a/libs/wingsdk/src/shared-aws/react-app.inflight.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { IReactAppClient } from "../ex";
-
-export class ReactAppClient implements IReactAppClient {
-  public constructor() {}
-}
diff --git a/libs/wingsdk/src/shared-aws/react-app.ts b/libs/wingsdk/src/shared-aws/react-app.ts
deleted file mode 100644
index fbe1ddaf7be..00000000000
--- a/libs/wingsdk/src/shared-aws/react-app.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Domain } from "./domain";
-import { ex } from "..";
-import { ReactAppOptions } from "../ex";
-
-/**
- * Options for AWS `ReactApp`.
- */
-export interface AwsReactAppProps extends ReactAppOptions {
-  /**
-   * The website's custom domain object.
-   * @default - undefined
-   */
-  readonly domain?: Domain;
-}
-
-/**
- * A shared interface for AWS react app.
- */
-export interface IAwsReactApp {
-  /**
-   * AWS Bucket arn
-   */
-  readonly bucketArn: string;
-
-  /**
-   * AWS Bucket name
-   */
-  readonly bucketName: string;
-}
-
-/**
- * A helper class for working with AWS react apps.
- */
-export class ReactApp {
-  /**
-   * If the bucket is an AWS Bucket, return a helper interface for
-   * working with it.
-   * @param react The ex.ReactApp.
-   */
-  public static from(react: ex.ReactApp): IAwsReactApp | undefined {
-    if (this.isAwsReactApp(react)) {
-      return react;
-    }
-    return undefined;
-  }
-
-  private static isAwsReactApp(obj: any): obj is IAwsReactApp {
-    return (
-      typeof obj.bucketArn === "string" && typeof obj.bucketName === "string"
-    );
-  }
-}
diff --git a/libs/wingsdk/src/shared-aws/schedule.ontick.inflight.ts b/libs/wingsdk/src/shared-aws/schedule.ontick.inflight.ts
deleted file mode 100644
index 1c5860e6aab..00000000000
--- a/libs/wingsdk/src/shared-aws/schedule.ontick.inflight.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type {
-  IFunctionHandlerClient,
-  IScheduleOnTickHandlerClient,
-} from "../cloud";
-
-export class ScheduleOnTickHandlerClient
-  implements IScheduleOnTickHandlerClient
-{
-  private readonly handler: IFunctionHandlerClient;
-  constructor({ handler }: { handler: IFunctionHandlerClient }) {
-    this.handler = handler;
-  }
-  public async handle() {
-    await this.handler.handle("");
-  }
-}
diff --git a/libs/wingsdk/src/shared-aws/schedule.ts b/libs/wingsdk/src/shared-aws/schedule.ts
new file mode 100644
index 00000000000..d2c81f30aca
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/schedule.ts
@@ -0,0 +1,86 @@
+import * as cloud from "../cloud";
+import { lift } from "../core";
+
+/**
+ * Convert Unix cron to AWS cron
+ */
+export const convertUnixCronToAWSCron = (cron: string) => {
+  const minute = cron.split(" ")[0];
+  const hour = cron.split(" ")[1];
+  let dayOfMonth = cron.split(" ")[2];
+  const month = cron.split(" ")[3];
+  let dayOfWeek = cron.split(" ")[4];
+
+  /*
+   * The implementation of cron on AWS does not allow [day of month] and [day of week]
+   * to have the character '*' at the same time.
+   * Therefore, [day of week] will be replaced by '?'.
+   */
+  if (cron && dayOfMonth == "*" && dayOfWeek == "*") {
+    dayOfWeek = "?";
+  }
+
+  if (cron && dayOfMonth !== "*" && dayOfWeek !== "*") {
+    throw new Error(
+      "Cannot restrict both 'day-of-month' and 'day-of-week' in a cron expression, at least one must be '*'"
+    );
+  }
+
+  if (dayOfWeek !== "*" && dayOfWeek !== "?") {
+    dayOfMonth = "?";
+    if (/\d/.test(dayOfWeek)) {
+      dayOfWeek = convertDayOfWeekFromUnixToAWS(dayOfWeek);
+    }
+  }
+
+  /*
+   * The schedule cron string is Unix cron format: [minute] [hour] [day of month] [month] [day of week]
+   * AWS EventBridge Schedule uses a 6 field format which includes year: [minute] [hour] [day of month] [month] [day of week] [year]
+   * https://docs.aws.amazon.com/scheduler/latest/UserGuide/schedule-types.html#cron-based
+   *
+   * We append * to the cron string for year field.
+   */
+  return (
+    minute +
+    " " +
+    hour +
+    " " +
+    dayOfMonth +
+    " " +
+    month +
+    " " +
+    dayOfWeek +
+    " *"
+  );
+};
+
+const convertDayOfWeekFromUnixToAWS = (dayOfWeek: string): string => {
+  const numbers = dayOfWeek.match(/\d+/g);
+
+  if (numbers) {
+    for (const number of numbers) {
+      dayOfWeek = dayOfWeek.replace(number, (parseInt(number) - 1).toString());
+    }
+  }
+
+  return dayOfWeek;
+};
+
+/**
+ * Utility class for working with the schedule tick handler.
+ */
+export class ScheduleOnTickHandler {
+  /**
+   * Converts a schedule tick handler to a function handler.
+   * @param handler The schedule tick handler.
+   * @returns The function handler.
+   */
+  public static toFunctionHandler(
+    handler: cloud.IScheduleOnTickHandler
+  ): cloud.IFunctionHandler {
+    return lift({ handler }).inflight(async (ctx) => {
+      await ctx.handler();
+      return undefined;
+    });
+  }
+}
diff --git a/libs/wingsdk/src/shared-aws/secret.inflight.ts b/libs/wingsdk/src/shared-aws/secret.inflight.ts
index e25cba3c050..012a386422e 100644
--- a/libs/wingsdk/src/shared-aws/secret.inflight.ts
+++ b/libs/wingsdk/src/shared-aws/secret.inflight.ts
@@ -23,7 +23,9 @@ export class SecretClient implements ISecretClient {
     });
     const getSecretValue = await this.client.send(command);
     if (!getSecretValue.SecretString) {
-      throw new Error("Secret has no secret string");
+      throw new Error(
+        `No value for secret found\n(hint: try running the 'wing secrets -t TARGET' to store secret)`
+      );
     }
 
     this.secretValue = getSecretValue.SecretString;
diff --git a/libs/wingsdk/src/shared-aws/secret.ts b/libs/wingsdk/src/shared-aws/secret.ts
new file mode 100644
index 00000000000..a35fc87622f
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/secret.ts
@@ -0,0 +1,61 @@
+import { Construct } from "constructs";
+import { AwsInflightHost } from "./inflight-host";
+import { calculateSecretPermissions } from "./permissions";
+import { isValidArn } from "./util";
+import { cloud } from "..";
+import { ISecretClient } from "../cloud";
+import { InflightClient, LiftMap } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
+import { IInflightHost, Resource } from "../std";
+
+/**
+ * A reference to an existing secret.
+ *
+ * @inflight `@winglang/sdk.cloud.ISecretClient`
+ */
+export class SecretRef extends Resource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: ISecretClient;
+  /** The ARN of the secret */
+  public readonly secretArn: string;
+
+  constructor(scope: Construct, id: string, secretArn: string) {
+    super(scope, id);
+
+    if (!isValidArn(secretArn, "secretsmanager")) {
+      throw new Error(`"${secretArn}" is not a valid secretsmanager arn`);
+    }
+
+    this.secretArn = secretArn;
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    if (AwsInflightHost.isAwsInflightHost(host)) {
+      host.addPolicyStatements(
+        ...calculateSecretPermissions(this.secretArn, ops)
+      );
+    }
+
+    host.addEnvironment(this.envName(), this.secretArn);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return InflightClient.for(__dirname, __filename, "SecretClient", [
+      `process.env["${this.envName()}"]`,
+    ]);
+  }
+
+  private envName(): string {
+    return `SECRET_ARN_${this.node.addr.slice(-8)}`;
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.SecretInflightMethods.VALUE]: [],
+      [cloud.SecretInflightMethods.VALUE_JSON]: [],
+    };
+  }
+}
diff --git a/libs/wingsdk/src/shared-aws/topic.inflight.ts b/libs/wingsdk/src/shared-aws/topic.inflight.ts
index a4e741abd05..bba4cdc1dd5 100644
--- a/libs/wingsdk/src/shared-aws/topic.inflight.ts
+++ b/libs/wingsdk/src/shared-aws/topic.inflight.ts
@@ -1,5 +1,18 @@
-import { SNSClient, PublishCommand } from "@aws-sdk/client-sns";
+import {
+  SNSClient,
+  PublishBatchCommand,
+  PublishBatchRequestEntry,
+  InvalidBatchEntryIdException,
+} from "@aws-sdk/client-sns";
 import { ITopicClient } from "../cloud";
+import { Util } from "../util/util";
+
+/**
+ * Topics in AWS can receive up to 10 messages at a time
+ * using the PublishBatchCommand, this constant is used
+ * to generate batches respecting the limits.
+ */
+const CHUNK_SIZE = 10;
 
 export class TopicClient implements ITopicClient {
   constructor(
@@ -7,11 +20,49 @@ export class TopicClient implements ITopicClient {
     private readonly client: SNSClient = new SNSClient({})
   ) {}
 
-  public async publish(message: string): Promise<void> {
-    const command = new PublishCommand({
-      Message: message,
-      TopicArn: this.topicArn,
-    });
-    await this.client.send(command);
+  public async publish(...messages: string[]): Promise<void> {
+    if (messages.includes("")) {
+      throw new Error("Empty messages are not allowed");
+    }
+
+    let batchMessages: Array<PublishBatchRequestEntry[]> = [];
+    for (let i = 0; i < messages.length; i += CHUNK_SIZE) {
+      const chunk = messages.slice(i, i + CHUNK_SIZE);
+      batchMessages.push(this.processBatchMessages(chunk, i));
+    }
+
+    for (const batch of batchMessages) {
+      try {
+        const command = new PublishBatchCommand({
+          TopicArn: this.topicArn,
+          PublishBatchRequestEntries: batch,
+        });
+        await this.client.send(command);
+      } catch (e) {
+        if (e instanceof InvalidBatchEntryIdException) {
+          throw new Error(
+            `The Id of a batch entry in a batch request doesn't abide by the specification. (message=${messages}): ${
+              (e as Error).stack
+            })}`
+          );
+        }
+        throw new Error((e as Error).stack);
+      }
+    }
+  }
+
+  private processBatchMessages(
+    messages: string[],
+    idx: number
+  ): PublishBatchRequestEntry[] {
+    let batchMessages: Array<PublishBatchRequestEntry> = [];
+    let index = idx;
+    for (const message of messages) {
+      batchMessages.push({
+        Id: Util.sha256(`${message}-${++index}`),
+        Message: message,
+      });
+    }
+    return batchMessages;
   }
 }
diff --git a/libs/wingsdk/src/shared-aws/topic.onmessage.inflight.ts b/libs/wingsdk/src/shared-aws/topic.onmessage.inflight.ts
deleted file mode 100644
index 6283225b47d..00000000000
--- a/libs/wingsdk/src/shared-aws/topic.onmessage.inflight.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type {
-  IFunctionHandlerClient,
-  ITopicOnMessageHandlerClient,
-} from "../cloud";
-
-export class TopicOnMessageHandlerClient
-  implements ITopicOnMessageHandlerClient
-{
-  private readonly handler: IFunctionHandlerClient;
-  constructor({ handler }: { handler: IFunctionHandlerClient }) {
-    this.handler = handler;
-  }
-  public async handle(event: any) {
-    for (const record of event.Records ?? []) {
-      await this.handler.handle(record.Sns.Message);
-    }
-  }
-}
diff --git a/libs/wingsdk/src/shared-aws/topic.ts b/libs/wingsdk/src/shared-aws/topic.ts
index e306b8b47c6..3c0c9594a16 100644
--- a/libs/wingsdk/src/shared-aws/topic.ts
+++ b/libs/wingsdk/src/shared-aws/topic.ts
@@ -1,4 +1,5 @@
 import { cloud } from "..";
+import { lift } from "../core";
 
 /**
  * A shared interface for AWS topics.
@@ -37,3 +38,24 @@ export class Topic {
     );
   }
 }
+
+/**
+ * A helper class for working with AWS topic on message handlers.
+ */
+export class TopicOnMessageHandler {
+  /**
+   * Returns a `cloud.Function` handler for handling messages from a `cloud.Topic`.
+   * @param handler The `onMessage` handler.
+   * @returns The `cloud.Function` handler.
+   */
+  public static toFunctionHandler(
+    handler: cloud.ITopicOnMessageHandler
+  ): cloud.IFunctionHandler {
+    return lift({ handler }).inflight(async (ctx, event) => {
+      for (const record of (event as any).Records ?? []) {
+        await ctx.handler(record.Sns.Message);
+        return undefined;
+      }
+    });
+  }
+}
diff --git a/libs/wingsdk/src/shared-aws/util.ts b/libs/wingsdk/src/shared-aws/util.ts
new file mode 100644
index 00000000000..8c669b357f1
--- /dev/null
+++ b/libs/wingsdk/src/shared-aws/util.ts
@@ -0,0 +1,27 @@
+export function isValidArn(arn: string, service: string) {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { Token } = require("cdktf");
+
+  // if the ARN is an unresolved token, we can't validate it so assume it's valid
+  if (Token.isUnresolved(arn)) {
+    return true;
+  }
+
+  // ARN format: arn:partition:service:region:account-id:resource-type?:resource
+  // e.g. arn:aws:lambda:us-east-1:111111111111:function:Function-11111111
+  // or,  arn:aws:sqs:us-east-1:111111111111:Queue-11111111
+  const parts = arn.split(":");
+  if (parts.length < 6 || parts.length > 7) {
+    return false;
+  }
+
+  if (parts[0] !== "arn") {
+    return false;
+  }
+
+  if (parts[2] !== service) {
+    return false;
+  }
+
+  return true;
+}
diff --git a/libs/wingsdk/src/target-tf-azure/bucket.inflight.ts b/libs/wingsdk/src/shared-azure/bucket.inflight.ts
similarity index 87%
rename from libs/wingsdk/src/target-tf-azure/bucket.inflight.ts
rename to libs/wingsdk/src/shared-azure/bucket.inflight.ts
index 9ff787cac2b..f55a9fa5523 100644
--- a/libs/wingsdk/src/target-tf-azure/bucket.inflight.ts
+++ b/libs/wingsdk/src/shared-azure/bucket.inflight.ts
@@ -11,6 +11,8 @@ import {
   BucketPutOptions,
   BucketDeleteOptions,
   BucketSignedUrlOptions,
+  BucketGetOptions,
+  BucketTryGetOptions,
 } from "../cloud";
 import { Datetime, Json } from "../std";
 
@@ -89,25 +91,28 @@ export class BucketClient implements IBucketClient {
    * @param key Key of the object
    * @returns string content of the object as string
    */
-  public async get(key: string): Promise<string> {
+  public async get(key: string, options?: BucketGetOptions): Promise<string> {
     const blobClient = this.containerClient.getBlobClient(key);
 
     let downloadResponse: BlobDownloadResponseParsed;
     try {
-      downloadResponse = await blobClient.download();
+      const start = options?.startByte !== undefined ? options.startByte : 0;
+      const length =
+        options?.endByte !== undefined
+          ? options.endByte - start + 1
+          : undefined;
+      downloadResponse = await blobClient.download(start, length);
     } catch (e) {
-      throw new Error(
-        `Object does not exist (key=${key}): ${(e as Error).stack}`
-      );
+      throw new Error(`Object does not exist (key=${key}).`);
     }
     if (downloadResponse.readableStreamBody === undefined) {
       return "";
     }
 
     try {
-      return (
+      return new TextDecoder("utf8", { fatal: true }).decode(
         await this.streamToBuffer(downloadResponse.readableStreamBody)
-      ).toString();
+      );
     } catch (e) {
       throw new Error(
         `Object contents could not be read as text (key=${key}): ${
@@ -123,9 +128,12 @@ export class BucketClient implements IBucketClient {
    * @param key Key of the object
    * @returns string content of the object as string
    */
-  public async tryGet(key: string): Promise<string | undefined> {
+  public async tryGet(
+    key: string,
+    options?: BucketTryGetOptions
+  ): Promise<string | undefined> {
     if (await this.exists(key)) {
-      return this.get(key);
+      return this.get(key, options);
     }
 
     return undefined;
@@ -180,7 +188,7 @@ export class BucketClient implements IBucketClient {
           return;
         }
       }
-      throw Error(`unable to delete "${key}": ${error.details.message}`);
+      throw Error(`Failed to delete object (key=${key}).`);
     }
   }
 
@@ -284,6 +292,19 @@ export class BucketClient implements IBucketClient {
     }
   }
 
+  /**
+   * Move object within the container
+   *
+   * @param srcKey The key of the source object you wish to rename.
+   * @param dstKey The key of the destination object after rename.
+   * @throws if `srcKey` object doesn't exist or if it matches `dstKey`.
+   */
+  public async rename(srcKey: string, dstKey: string): Promise<void> {
+    return Promise.reject(
+      `rename is not implemented: (srcKey=${srcKey}, dstKey=${dstKey})`
+    );
+  }
+
   /**
    * Required helper function for node js only.
    *
diff --git a/libs/wingsdk/src/shared-azure/counter.inflight.ts b/libs/wingsdk/src/shared-azure/counter.inflight.ts
new file mode 100644
index 00000000000..3705d5803db
--- /dev/null
+++ b/libs/wingsdk/src/shared-azure/counter.inflight.ts
@@ -0,0 +1,74 @@
+import { TableClient, AzureNamedKeyCredential } from "@azure/data-tables";
+import type { ICounterClient } from "../cloud";
+
+const COUNTER_ID = "counter";
+const PARTITION_KEY = "partitionKey";
+
+export class CounterClient implements ICounterClient {
+  private client: TableClient;
+
+  constructor(
+    private readonly storageAccountName: string,
+    private readonly storageTableName: string,
+    private readonly accountKeyVariable: string,
+    private readonly initial: number = 0
+  ) {
+    if (!process.env[this.accountKeyVariable]) {
+      throw new Error("missing storage account key");
+    }
+
+    const credentials = new AzureNamedKeyCredential(
+      this.storageAccountName,
+      process.env[this.accountKeyVariable] as string
+    );
+
+    this.client = new TableClient(
+      `https://${this.storageAccountName}.table.core.windows.net`,
+      this.storageTableName,
+      credentials
+    );
+  }
+
+  public async inc(
+    amount: number = 1,
+    key: string = COUNTER_ID
+  ): Promise<number> {
+    const entity = await this._getEntity(key);
+    const currentValue = (entity?.counterValue as number) ?? this.initial;
+    const newValue = currentValue + amount;
+    await this._upsertEntity(key, newValue);
+    return currentValue;
+  }
+
+  public async dec(amount = 1, key: string = COUNTER_ID): Promise<number> {
+    return this.inc(-1 * amount, key);
+  }
+
+  public async peek(key: string = COUNTER_ID): Promise<number> {
+    const entity = await this._getEntity(key);
+    return (entity?.counterValue as number) ?? this.initial;
+  }
+
+  public async set(value: number, key: string = COUNTER_ID): Promise<void> {
+    await this._upsertEntity(key, value);
+  }
+
+  private async _getEntity(
+    key: string
+  ): Promise<Record<string, unknown> | undefined> {
+    try {
+      return await this.client.getEntity(PARTITION_KEY, key);
+    } catch (error) {
+      return undefined;
+    }
+  }
+
+  private async _upsertEntity(key: string, value: number): Promise<void> {
+    const entity = {
+      partitionKey: PARTITION_KEY,
+      rowKey: key,
+      counterValue: value,
+    };
+    await this.client.upsertEntity(entity);
+  }
+}
diff --git a/libs/wingsdk/src/shared-azure/function.inflight.ts b/libs/wingsdk/src/shared-azure/function.inflight.ts
index 8a6d0102037..de670a274d1 100644
--- a/libs/wingsdk/src/shared-azure/function.inflight.ts
+++ b/libs/wingsdk/src/shared-azure/function.inflight.ts
@@ -9,7 +9,7 @@ export class FunctionClient implements IFunctionClient {
    * Invoke the function, passing the given payload as an argument.
    *  @returns the function returned payload only
    */
-  public async invoke(payload: string): Promise<string> {
+  public async invoke(payload?: string): Promise<string | undefined> {
     try {
       const res = await http.post(
         `https://${this.functionName}.azurewebsites.net/api/${this.functionName}`,
@@ -18,7 +18,7 @@ export class FunctionClient implements IFunctionClient {
       if (!res.ok) {
         throw new Error(res.body || "Invocation Error");
       }
-      return res.body ?? "";
+      return res.body || undefined;
     } catch (error) {
       throw new Error(
         `Error while invoking the function ${this.functionName}:\n${
@@ -28,12 +28,23 @@ export class FunctionClient implements IFunctionClient {
     }
   }
 
+  /**
+   * Invokes the function asynchronously, passing the given payload as an argument.
+   * @returns immediately once the event has been handed off to AWS Lambda.
+   */
+  public async invokeAsync(payload: string): Promise<void> {
+    payload;
+    throw new Error("invokeAsync is not implemented");
+  }
+
   /**
    * Invoke the function, passing the given payload as an argument.
    *
    * @returns the function returned payload and logs
    */
-  public async invokeWithLogs(payload: string): Promise<[string, Trace[]]> {
+  public async invokeWithLogs(
+    payload?: string
+  ): Promise<[string | undefined, Trace[]]> {
     console.error("Test invocation on tf-azure doesn't include logs yet");
     //TODO: add traces to tf-azure tests- https://github.com/winglang/wing/issues/4574
     return [await this.invoke(payload), []];
diff --git a/libs/wingsdk/src/shared-gcp/bucket.inflight.ts b/libs/wingsdk/src/shared-gcp/bucket.inflight.ts
index 1f5ec10a84c..5d39d158dd0 100644
--- a/libs/wingsdk/src/shared-gcp/bucket.inflight.ts
+++ b/libs/wingsdk/src/shared-gcp/bucket.inflight.ts
@@ -1,11 +1,16 @@
 import { Storage, Bucket } from "@google-cloud/storage";
+import mime from "mime-types";
 import {
   BucketDeleteOptions,
+  BucketSignedUrlOptions,
+  BucketSignedUrlAction,
+  BucketPutOptions,
   IBucketClient,
   ObjectMetadata,
-  BucketSignedUrlOptions,
+  BucketGetOptions,
+  BucketTryGetOptions,
 } from "../cloud";
-import { Json } from "../std";
+import { Datetime, Json } from "../std";
 
 export class BucketClient implements IBucketClient {
   private bucketName: string;
@@ -22,14 +27,44 @@ export class BucketClient implements IBucketClient {
     this.bucket = this.storage.bucket(this.bucketName);
   }
 
-  public async metadata(_key: string): Promise<ObjectMetadata> {
-    throw new Error("Method not implemented.");
+  public async metadata(key: string): Promise<ObjectMetadata> {
+    try {
+      const [metadata] = await this.bucket.file(key).getMetadata();
+      return {
+        contentType: metadata.contentType,
+        lastModified: Datetime.fromIso(metadata.updated),
+        size: Number(metadata.size),
+      };
+    } catch (error) {
+      throw new Error(`Object does not exist (key=${key}).`);
+    }
   }
 
   public async copy(srcKey: string, dstKey: string): Promise<void> {
-    return Promise.reject(
-      `copy is not implemented: (srcKey=${srcKey}, dstKey=${dstKey})`
-    );
+    try {
+      const srcFile = this.bucket.file(srcKey);
+      await srcFile.copy(this.bucket.file(dstKey));
+    } catch (error) {
+      throw new Error(`Source object does not exist (srcKey=${srcKey}).`);
+    }
+  }
+
+  /**
+   * Move object within the bucket
+   *
+   * @param srcKey The key of the source object you wish to rename.
+   * @param dstKey The key of the destination object after rename.
+   * @throws if `srcKey` object doesn't exist or if it matches `dstKey`.
+   */
+  public async rename(srcKey: string, dstKey: string): Promise<void> {
+    if (srcKey === dstKey) {
+      throw new Error(
+        `Renaming an object to its current name is not a valid operation (srcKey=${srcKey}, dstKey=${dstKey}).`
+      );
+    }
+
+    await this.copy(srcKey, dstKey);
+    await this.delete(srcKey);
   }
 
   // check if bucket is public or not from bucket metadata
@@ -53,39 +88,70 @@ export class BucketClient implements IBucketClient {
     }
   }
 
-  public async put(key: string, body: string): Promise<void> {
-    try {
-      await this.bucket.file(key).save(body);
-    } catch (error) {
-      throw new Error(`Failed to put object. (key=${key})`);
-    }
+  /**
+   * Put object into bucket with given body contents
+   *
+   * @param key Key of the object
+   * @param body string contents of the object
+   */
+  public async put(
+    key: string,
+    body: string,
+    opts?: BucketPutOptions
+  ): Promise<void> {
+    const options = {
+      contentType:
+        (opts?.contentType ?? mime.lookup(key)) || "application/octet-stream",
+    };
+    await this.bucket.file(key).save(body, options);
   }
 
+  /**
+   * Put Json object into bucket with given body contents
+   *
+   * @param key Key of the object
+   * @param body Json object
+   */
   public async putJson(key: string, body: Json): Promise<void> {
-    try {
-      await this.put(key, JSON.stringify(body, null, 2));
-    } catch (error) {
-      throw new Error(`Failed to put JSON object. (key=${key})`);
-    }
+    await this.put(key, JSON.stringify(body, null, 2), {
+      contentType: "application/json",
+    });
   }
 
-  public async get(key: string): Promise<string> {
+  public async get(key: string, options?: BucketGetOptions): Promise<string> {
+    const body = await this.bucket
+      .file(key)
+      .download({ start: options?.startByte, end: options?.endByte })
+      .catch((e) => {
+        throw new Error(
+          `Failed to get object (key=${key}): ${(e as Error).stack})}`
+        );
+      });
+
     try {
-      const body = await this.bucket.file(key).download();
-      return body.toString();
-    } catch (error) {
-      throw new Error(`Failed to get object. (key=${key})`);
+      return new TextDecoder("utf8", { fatal: true }).decode(body[0]);
+    } catch (e) {
+      throw new Error(
+        `Object content could not be read as text (key=${key}): ${
+          (e as Error).stack
+        })}`
+      );
     }
   }
 
-  public async tryGet(key: string): Promise<string | undefined> {
+  public async tryGet(
+    key: string,
+    options?: BucketTryGetOptions
+  ): Promise<string | undefined> {
     try {
       if (await this.exists(key)) {
-        return await this.get(key);
+        return await this.get(key, options);
       }
       return undefined;
     } catch (error) {
-      throw new Error(`Failed to tryGet object. (key=${key})`);
+      throw new Error(
+        `Failed to tryGet object. (key=${key}) ${(error as Error).stack}`
+      );
     }
   }
 
@@ -117,29 +183,29 @@ export class BucketClient implements IBucketClient {
     key: string,
     opts: BucketDeleteOptions = {}
   ): Promise<void> {
-    const mustExist = opts.mustExist === undefined ? true : opts.mustExist;
+    const mustExist = opts?.mustExist ?? false;
+
+    if (mustExist && !(await this.exists(key))) {
+      throw new Error(`Object does not exist (key=${key}).`);
+    }
+
     try {
-      if (mustExist && !(await this.exists(key))) {
-        throw new Error(
-          `Cannot delete object that does not exist. (key=${key})`
-        );
-      }
       await this.bucket.file(key).delete();
-    } catch (error) {
-      throw new Error(`Failed to delete object. (key=${key})`);
+    } catch (error: any) {
+      if (!mustExist && error.code === 404) {
+        return;
+      }
+      throw new Error(`Failed to delete object (key=${key}).`);
     }
   }
 
   public async tryDelete(key: string): Promise<boolean> {
-    try {
-      if (await this.exists(key)) {
-        await this.delete(key);
-        return true;
-      }
-      return false;
-    } catch (error) {
-      throw new Error(`Failed to tryDelete object. (key=${key})`);
+    if (await this.exists(key)) {
+      await this.delete(key);
+      return true;
     }
+
+    return false;
   }
 
   public async list(prefix?: string): Promise<string[]> {
@@ -152,30 +218,60 @@ export class BucketClient implements IBucketClient {
   }
 
   public async publicUrl(key: string): Promise<string> {
-    try {
-      if (!(await this.exists(key))) {
-        throw new Error(
-          `Cannot provide public URL for a non-existent object. (key=${key})`
-        );
-      }
-      if ((await this.isPublic()) === false) {
-        throw new Error(
-          `Cannot provide public URL for a non-public bucket. (bucket=${this.bucketName})`
-        );
-      }
-      return `https://storage.googleapis.com/${this.bucketName}/${key}`;
-    } catch (error) {
-      throw new Error(`Failed to get public URL. (key=${key})`);
+    if (!(await this.isPublic())) {
+      throw new Error("Cannot provide public url for a non-public bucket");
+    }
+
+    if (!(await this.exists(key))) {
+      throw new Error(
+        `Cannot provide public url for a non-existent key (key=${key})`
+      );
     }
-  }
 
-  // TODO: implement signedUrl
-  // https://github.com/winglang/wing/issues/4599
+    return `https://storage.googleapis.com/${this.bucketName}/${key}`;
+  }
 
+  /**
+   * Returns a presigned URL for the specified key in the bucket.
+   * @param key The key of the object in the bucket.
+   * @param opts The options including the action and the duration for the signed URL.
+   * @returns The presigned URL string.
+   * @inflight
+   */
   public async signedUrl(
-    _key: string,
-    _options?: BucketSignedUrlOptions
+    key: string,
+    opts: BucketSignedUrlOptions
   ): Promise<string> {
-    throw new Error("Method not implemented.");
+    const gcsFile = this.bucket.file(key);
+    let gcsAction: "read" | "write" | "delete" | "resumable";
+
+    // Set default action to DOWNLOAD if not provided
+    const action = opts?.action ?? BucketSignedUrlAction.DOWNLOAD;
+
+    // Set the GCS action
+    switch (action) {
+      case BucketSignedUrlAction.DOWNLOAD:
+        if (!(await this.exists(key))) {
+          throw new Error(
+            `Cannot provide signed url for a non-existent key (key=${key})`
+          );
+        }
+        gcsAction = "read";
+        break;
+      case BucketSignedUrlAction.UPLOAD:
+        gcsAction = "write";
+        break;
+      default:
+        throw new Error(`Invalid action: ${opts?.action}`);
+    }
+
+    // Generate the presigned URL
+    const [signedUrl] = await gcsFile.getSignedUrl({
+      version: "v4",
+      action: gcsAction,
+      expires: Date.now() + (opts?.duration?.seconds ?? 900) * 1000,
+    });
+
+    return signedUrl;
   }
 }
diff --git a/libs/wingsdk/src/shared-gcp/counter.inflight.ts b/libs/wingsdk/src/shared-gcp/counter.inflight.ts
new file mode 100644
index 00000000000..3482d05bad3
--- /dev/null
+++ b/libs/wingsdk/src/shared-gcp/counter.inflight.ts
@@ -0,0 +1,87 @@
+import { Datastore } from "@google-cloud/datastore";
+import type { ICounterClient } from "../cloud";
+
+const DEFAULT_COUNTER_KEY = "counter";
+const COUNTER_ENTITY_KIND = "Counter";
+
+export class CounterClient implements ICounterClient {
+  private readonly client: Datastore;
+
+  constructor(
+    private readonly databaseName: string,
+    private readonly initial: number = 0
+  ) {
+    this.client = new Datastore({ databaseId: this.databaseName });
+  }
+
+  public async inc(
+    amount: number = 1,
+    key: string = DEFAULT_COUNTER_KEY
+  ): Promise<number> {
+    const currentValue = await this._getCounterValue(key);
+    const newValue = currentValue + amount;
+
+    await this._updateCounter(key, newValue);
+
+    // Return the previous value before the increment
+    return currentValue;
+  }
+
+  public async dec(
+    amount: number = 1,
+    key: string = DEFAULT_COUNTER_KEY
+  ): Promise<number> {
+    const currentValue = await this._getCounterValue(key);
+    const newValue = currentValue - amount;
+
+    await this._updateCounter(key, newValue);
+
+    // Return the previous value before the decrement
+    return currentValue;
+  }
+
+  public async set(
+    value: number,
+    key: string = DEFAULT_COUNTER_KEY
+  ): Promise<void> {
+    await this._updateCounter(key, value);
+  }
+
+  public async peek(key: string = DEFAULT_COUNTER_KEY): Promise<number> {
+    return this._getCounterValue(key);
+  }
+
+  private async _getCounterValue(key: string): Promise<number> {
+    const counterKey = this.client.key([COUNTER_ENTITY_KIND, key]);
+
+    // Fetch the counter from the datastore
+    const [existingCounter] = await this.client.get(counterKey);
+
+    // If the counter exists, return its current count
+    // Else, initialize it with the `initial` value
+    if (existingCounter) {
+      return existingCounter.count;
+    } else {
+      await this._initCounter(key);
+      return this.initial;
+    }
+  }
+
+  private async _initCounter(key: string): Promise<void> {
+    const counterEntity = {
+      key: this.client.key([COUNTER_ENTITY_KIND, key]),
+      data: { count: this.initial },
+    };
+
+    await this.client.insert(counterEntity);
+  }
+
+  private async _updateCounter(key: string, newValue: number): Promise<void> {
+    const counterEntity = {
+      key: this.client.key([COUNTER_ENTITY_KIND, key]),
+      data: { count: newValue },
+    };
+
+    await this.client.save(counterEntity);
+  }
+}
diff --git a/libs/wingsdk/src/shared-gcp/function.inflight.ts b/libs/wingsdk/src/shared-gcp/function.inflight.ts
index 84665f9fe55..99ca9085f4f 100644
--- a/libs/wingsdk/src/shared-gcp/function.inflight.ts
+++ b/libs/wingsdk/src/shared-gcp/function.inflight.ts
@@ -44,7 +44,7 @@ export class FunctionClient implements IFunctionClient {
    * Invoke the function, passing the given payload as an argument.
    *  @returns the function returned payload only
    */
-  public async invoke(payload: string): Promise<string> {
+  public async invoke(payload?: string): Promise<string | undefined> {
     try {
       const auth = new GoogleAuth();
       const client = await auth.getIdTokenClient(this.functionURL);
@@ -65,7 +65,7 @@ export class FunctionClient implements IFunctionClient {
           },
         },
       });
-      return (res.data as string) ?? "";
+      return res.data as string | undefined;
     } catch (error) {
       throw new Error(
         `Error while invoking the function ${this.functionName}:\n${
@@ -75,6 +75,10 @@ export class FunctionClient implements IFunctionClient {
     }
   }
 
+  public async invokeAsync(_payload?: string): Promise<void> {
+    throw new Error("invokeAsync not implemented");
+  }
+
   /**
    * Invoke the function, passing the given payload as an argument.
    *
diff --git a/libs/wingsdk/src/shared-tf/app.ts b/libs/wingsdk/src/shared-tf/app.ts
index 8a248261640..3bd80469de0 100644
--- a/libs/wingsdk/src/shared-tf/app.ts
+++ b/libs/wingsdk/src/shared-tf/app.ts
@@ -15,7 +15,6 @@ import {
   App,
   AppProps,
   Connections,
-  SynthHooks,
   preSynthesizeAllConstructs,
 } from "../core";
 import { registerTokenResolver } from "../core/tokens";
@@ -33,7 +32,6 @@ export abstract class CdktfApp extends App {
    */
   public readonly terraformManifestPath: string;
   public readonly outdir: string;
-  public readonly isTestEnvironment: boolean;
 
   private readonly cdktfApp: cdktf.App;
   private readonly cdktfStack: cdktf.TerraformStack;
@@ -41,8 +39,6 @@ export abstract class CdktfApp extends App {
   private synthed: boolean;
   private synthedOutput: string | undefined;
 
-  protected synthHooks?: SynthHooks;
-
   constructor(props: AppProps) {
     const outdir = props.outdir ?? ".";
     const cdktfOutdir = join(outdir, ".tmp.cdktf.out");
@@ -61,9 +57,8 @@ export abstract class CdktfApp extends App {
     });
 
     this.outdir = outdir;
-    this.isTestEnvironment = props.isTestEnvironment ?? false;
     registerTokenResolver(new CdkTfTokens());
-    this.synthHooks = props.synthHooks;
+    this._synthHooks = props.synthHooks;
 
     // HACK: monkey patch the `new` method on the cdktf app (which is the root of the tree) so that
     // we can intercept the creation of resources and replace them with our own.
@@ -105,8 +100,8 @@ export abstract class CdktfApp extends App {
     // call preSynthesize() on every construct in the tree
     preSynthesizeAllConstructs(this);
 
-    if (this.synthHooks?.preSynthesize) {
-      this.synthHooks.preSynthesize.forEach((hook) => hook(this));
+    if (this._synthHooks?.preSynthesize) {
+      this._synthHooks.preSynthesize.forEach((hook) => hook(this));
     }
 
     // synthesize Terraform files in `outdir/.tmp.cdktf.out/stacks/root`
@@ -134,8 +129,8 @@ export abstract class CdktfApp extends App {
     const tfConfig = this.cdktfStack.toTerraform();
     const cleaned = cleanTerraformConfig(tfConfig);
 
-    if (this.synthHooks?.postSynthesize) {
-      this.synthHooks.postSynthesize.forEach((hook) => {
+    if (this._synthHooks?.postSynthesize) {
+      this._synthHooks.postSynthesize.forEach((hook) => {
         writeFileSync(
           resolve(`${this.outdir}/main.tf.json`),
           JSON.stringify(hook(tfConfig), null, 2)
@@ -143,8 +138,8 @@ export abstract class CdktfApp extends App {
       });
     }
 
-    if (this.synthHooks?.validate) {
-      this.synthHooks.validate.forEach((hook) => hook(tfConfig));
+    if (this._synthHooks?.validate) {
+      this._synthHooks.validate.forEach((hook) => hook(tfConfig));
     }
 
     this.synthed = true;
diff --git a/libs/wingsdk/src/shared/bundling.ts b/libs/wingsdk/src/shared/bundling.ts
index c2bbcdeafba..e7efaa50a65 100644
--- a/libs/wingsdk/src/shared/bundling.ts
+++ b/libs/wingsdk/src/shared/bundling.ts
@@ -1,15 +1,29 @@
 import * as crypto from "crypto";
-import { mkdirSync, writeFileSync } from "fs";
-import { join, relative, resolve } from "path";
-import { buildSync } from "esbuild-wasm";
+import { mkdirSync, realpathSync, statSync, writeFileSync } from "fs";
+import { stat } from "fs/promises";
+import { posix, resolve } from "path";
+import { decode, encode } from "vlq";
 import { normalPath } from "./misc";
 
 const SDK_PATH = normalPath(resolve(__dirname, "..", ".."));
 
+// TODO: refactor Bundle into a dedicated class with methods to check if the bundling is
+// finished, invalidated, etc.
+
 export interface Bundle {
-  entrypointPath: string;
   directory: string;
   hash: string;
+  outfilePath: string;
+  sourcemapPath: string;
+  /**
+   * A list of files that were used to create the bundle (directly or indirectly).
+   * If none of the listed files have been modified since the last bundle, it's *probably* safe to reuse the bundle.
+   *
+   * Note: this isn't fully reliable since there can be edge cases where none of the files have been modified
+   * but a different bundle would be generated by esbuild. See https://github.com/evanw/esbuild/issues/673
+   */
+  inputFiles: string[];
+  time: Date;
 }
 
 /**
@@ -24,22 +38,40 @@ export function createBundle(
   external: string[] = [],
   outputDir?: string
 ): Bundle {
-  const originalEntrypointDir = normalPath(resolve(entrypoint, ".."));
-  const outdir = resolve(outputDir ?? entrypoint + ".bundle");
+  const normalEntrypoint = normalPath(realpathSync(entrypoint));
+  const outdir = outputDir
+    ? normalPath(realpathSync(outputDir))
+    : `${normalEntrypoint}.bundle`;
   mkdirSync(outdir, { recursive: true });
 
-  const outfileName = "index.js";
+  const outfileName = "index.cjs";
   const soucemapFilename = `${outfileName}.map`;
 
-  const outfile = join(outdir, outfileName);
-  const outfileMap = join(outdir, soucemapFilename);
+  const outfile = posix.join(outdir, outfileName);
+  const outfileMap = posix.join(outdir, soucemapFilename);
+
+  const stats = statSync(normalEntrypoint);
 
-  let esbuild = buildSync({
+  // Track what time we started bundling so we can invalidate the bundle if any
+  // of the source files are modified after this time.
+  let startTime = new Date();
+
+  // For unknown reasons, the date created here by JavaScript can sometimes be a
+  // few milliseconds before the last modification date of the entrypoint file.
+  // This can cause the bundle to be invalidated when it shouldn't be. To
+  // prevent this flakiness in unit tests, we check if the modification date of the
+  // entrypoint file and update the start time if it's newer.
+  if (stats.mtime > startTime) {
+    startTime = stats.mtime;
+  }
+
+  // eslint-disable-next-line import/no-extraneous-dependencies,@typescript-eslint/no-require-imports
+  const esbuilder: typeof import("esbuild") = require("esbuild");
+
+  let esbuild = esbuilder.buildSync({
     bundle: true,
-    entryPoints: [normalPath(resolve(entrypoint))],
-    outdir: originalEntrypointDir,
-    sourceRoot: originalEntrypointDir + "/",
-    absWorkingDir: originalEntrypointDir,
+    entryPoints: [normalEntrypoint],
+    outfile,
     // otherwise there are problems with running azure cloud functions:
     // https://stackoverflow.com/questions/70332883/webpack-azure-storage-blob-node-fetch-abortsignal-issue
     keepNames: true,
@@ -51,10 +83,12 @@ export function createBundle(
       "@winglang/sdk": SDK_PATH,
     },
     minify: false,
-    sourcemap: "external",
+    sourcemap: "linked",
     platform: "node",
-    target: "node18",
+    target: "node20",
+    format: "cjs",
     external,
+    metafile: true,
     write: false,
   });
 
@@ -63,39 +97,191 @@ export function createBundle(
     throw new Error(`Failed to bundle function: ${errors}`);
   }
 
-  const output = esbuild.outputFiles[1];
-  let fileContents = new TextDecoder().decode(output.contents);
+  const bundleOutput = esbuild.outputFiles[1];
 
-  // sourcemap hacks for winglang:
-  // source paths in sourcemap are incorrect and need to be fixed
+  // ensure source paths have posix path separators
   const sourcemapData = JSON.parse(
     new TextDecoder().decode(esbuild.outputFiles[0].contents)
   );
-  // unrandomize the sourceRoot
-  sourcemapData.sourceRoot = normalPath(sourcemapData.sourceRoot).replace(
-    /\.\d+\.tmp\/\.wing\//g,
-    "/.wing/"
-  );
+  fixSourcemaps(sourcemapData);
 
-  for (const [idx, source] of Object.entries(sourcemapData.sources)) {
-    if ((source as any).endsWith(".w")) {
-      const absolutePath = `/${source}`;
-      const relativePath = relative(originalEntrypointDir, absolutePath);
-      sourcemapData.sources[idx] = relativePath;
-    }
-  }
-
-  fileContents += `//# sourceMappingURL=${soucemapFilename}`;
-
-  writeFileSync(outfile, fileContents);
+  writeFileSync(outfile, bundleOutput.contents);
   writeFileSync(outfileMap, JSON.stringify(sourcemapData));
 
   // calculate a md5 hash of the contents of asset.path
-  const codeHash = crypto.createHash("md5").update(fileContents).digest("hex");
+  const codeHash = crypto
+    .createHash("md5")
+    .update(bundleOutput.contents)
+    .digest("hex");
+
+  const outKeys = Object.keys(esbuild.metafile?.outputs ?? {});
+  const outKey = outKeys.find((k) => k.endsWith(outfileName));
+  if (!outKey) {
+    throw new Error(`Couldn't find metadata for ${outfileName} from esbuild.`);
+  }
+
+  const inputFiles = Object.keys(esbuild.metafile?.outputs[outKey].inputs);
 
   return {
-    entrypointPath: outfile,
     directory: outdir,
     hash: codeHash,
+    outfilePath: outfile,
+    sourcemapPath: outfileMap,
+    inputFiles,
+    time: startTime,
   };
 }
+
+export interface SourceMap {
+  sourceRoot?: string;
+  sources: string[];
+  sourcesContent: string[];
+  mappings: string;
+}
+
+/**
+ * Takes a bundled sourcemap and does the following fixes:
+ * - Normalizes paths in sources and sourceRoot
+ * - Removes duplicate sources and sourcesContent
+ * - Updates mappings to reflect the new source indices
+ *
+ * The duplicate sources come from esbuild's strange handling of multiple files being bundled that point to the same source (e.g. inflights that point to one .w file)
+ * See https://github.com/evanw/esbuild/issues/933
+ */
+export function fixSourcemaps(sourcemapData: SourceMap): void {
+  // normalize sourceRoot
+  if (sourcemapData.sourceRoot) {
+    sourcemapData.sourceRoot = normalPath(sourcemapData.sourceRoot);
+  }
+
+  // normalize sources and remove duplicates
+  const sourceSet: string[] = [];
+  const newSourceContents: string[] = [];
+  const sourceIndexMap: Record<number, number> = {};
+  let hasSourceDupes = false;
+  sourcemapData.sources.forEach((source, idx) => {
+    const newPath = normalPath(source);
+    sourcemapData.sources[idx] = newPath;
+
+    const existingIndex = sourceSet.indexOf(newPath);
+    if (existingIndex === -1) {
+      sourceSet.push(newPath);
+      newSourceContents.push(sourcemapData.sourcesContent[idx]);
+      sourceIndexMap[idx] = sourceSet.length - 1;
+    } else {
+      hasSourceDupes = true;
+      sourceIndexMap[idx] = existingIndex;
+    }
+  });
+
+  sourcemapData.sources = sourceSet;
+  sourcemapData.sourcesContent = newSourceContents;
+
+  // fast path: No source duplicates so no need to update mappings
+  if (!hasSourceDupes) {
+    return;
+  }
+
+  // update mappings
+  let newMapping = "";
+  let characterIndex = 0;
+  let lastFile = 0;
+  let lastTrueFile = 0;
+  while (characterIndex < sourcemapData.mappings.length) {
+    const char = sourcemapData.mappings[characterIndex];
+    // `;` and `,` are separators between the segments of interest
+    if (char === ";" || char === ",") {
+      newMapping += char;
+      characterIndex++;
+      continue;
+    }
+
+    // get next slice of segment data
+    let segment = "";
+    let nextChar = char;
+    while (nextChar !== undefined && nextChar !== "," && nextChar !== ";") {
+      segment += nextChar;
+      nextChar = sourcemapData.mappings[++characterIndex];
+    }
+    const decoded = decode(segment);
+    if (decoded.length === 1) {
+      newMapping += segment;
+      continue;
+    }
+
+    const sourceRelative = decoded[1];
+    const originalSource = lastTrueFile + sourceRelative;
+    const newSourceIndex = sourceIndexMap[originalSource];
+    lastTrueFile = originalSource;
+
+    const newRelativeValue = newSourceIndex - lastFile;
+    lastFile = newSourceIndex;
+
+    if (newRelativeValue === decoded[1]) {
+      // no change was made, avoid re-encoding
+      newMapping += segment;
+    } else {
+      decoded[1] = newRelativeValue;
+      newMapping += encode(decoded);
+    }
+  }
+
+  sourcemapData.mappings = newMapping;
+}
+
+export async function filesModifiedSince(
+  filePaths: string[],
+  directory: string,
+  dateTime: Date
+): Promise<string[]> {
+  const absolutePaths = filePaths.map((filePath) =>
+    resolve(directory, filePath)
+  );
+
+  try {
+    const statsPromises = absolutePaths.map((filePath) => stat(filePath));
+    const stats = await Promise.all(statsPromises);
+    const changedFiles = new Array<string>();
+
+    for (let i = 0; i < absolutePaths.length; i++) {
+      if (stats[i].mtime > dateTime) {
+        console.error(
+          `File ${absolutePaths[i]} has been modified since the last bundle`,
+          stats[i].mtime,
+          dateTime
+        );
+        changedFiles.push(absolutePaths[i]);
+      }
+    }
+
+    return changedFiles;
+  } catch (error) {
+    console.error("Error checking file modification times:", error);
+    throw error;
+  }
+}
+
+export async function isBundleInvalidated(
+  entrypoint: string,
+  bundle: Bundle,
+  log?: (msg: string) => void
+): Promise<boolean> {
+  const modifiedFiles = await filesModifiedSince(
+    [entrypoint, ...bundle.inputFiles],
+    process.cwd(),
+    bundle.time
+  );
+  if (modifiedFiles.length === 0) {
+    return false;
+  }
+
+  if (process.env.DEBUG) {
+    log?.(
+      `Files modified since last bundling: [${modifiedFiles
+        .map((x) => `"${x}"`)
+        .join(", ")}]`
+    );
+  }
+
+  return true;
+}
diff --git a/libs/wingsdk/src/shared/convert.ts b/libs/wingsdk/src/shared/convert.ts
deleted file mode 100644
index 99d230d52b5..00000000000
--- a/libs/wingsdk/src/shared/convert.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { createHash } from "crypto";
-import { normalPath } from "./misc";
-import { IInflight } from "../std";
-
-/**
- * Transform an inflight to one that is wrapped with another one.
- * The new inflight can have a different signature.
- * This is useful for converting between types like
- * IFunctionHandler and IQueueSetConsumerHandler.
- */
-export function convertBetweenHandlers(
-  baseHandler: IInflight,
-  newHandlerClientPath: string,
-  newHandlerClientClassName: string,
-  args: Record<string, unknown> = {}
-): IInflight {
-  const handlerClient = baseHandler._toInflight();
-  const newCode = `\
-new (require("${normalPath(
-    newHandlerClientPath
-  )}")).${newHandlerClientClassName}({ handler: ${handlerClient}, args: ${JSON.stringify(
-    args
-  )} })`;
-
-  const newHandler = {
-    ...baseHandler,
-    _hash: createHash("md5").update(newCode).digest("hex"),
-    _toInflight() {
-      return newCode;
-    },
-  };
-
-  // TODO Remove this once inflights are no longer resources
-  Object.setPrototypeOf(newHandler, Object.getPrototypeOf(baseHandler));
-
-  return newHandler;
-}
diff --git a/libs/wingsdk/src/shared/log.ts b/libs/wingsdk/src/shared/log.ts
deleted file mode 100644
index 330ee679bc3..00000000000
--- a/libs/wingsdk/src/shared/log.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Emits a log message to the console if the DEBUG environment variable is set.
- * @param args Arguments to pass to console.error.
- */
-export function log(...args: any[]) {
-  if (process.env.DEBUG) {
-    console.error(...args);
-  }
-}
diff --git a/libs/wingsdk/src/shared/misc.ts b/libs/wingsdk/src/shared/misc.ts
index 29ae1b16dca..be6e2975219 100644
--- a/libs/wingsdk/src/shared/misc.ts
+++ b/libs/wingsdk/src/shared/misc.ts
@@ -1,5 +1,9 @@
-import { execFile } from "child_process";
+import { ExecOptions, ExecFileOptions, exec, execFile } from "child_process";
 import { readFileSync } from "fs";
+import { promisify } from "util";
+
+const execPromise = promisify(exec);
+const execFilePromise = promisify(execFile);
 
 export function readJsonSync(file: string) {
   return JSON.parse(readFileSync(file, "utf-8"));
@@ -23,55 +27,29 @@ export function normalPath(path: string) {
 /**
  * Just a helpful wrapper around `execFile` that returns a promise.
  */
-export async function runCommand(cmd: string, args: string[]): Promise<any> {
-  const raw = await new Promise((resolve, reject) => {
-    execFile(cmd, args, (error, stdout, stderr) => {
-      if (error) {
-        console.error(stderr);
-        reject(error);
-      }
-      resolve(stdout);
-    });
-  });
-  return raw;
-}
-
-export interface runDockerImageProps {
-  imageName: string;
-  containerName: string;
-  containerPort: string;
+export async function runCommand(
+  cmd: string,
+  args: string[],
+  options?: ExecFileOptions
+): Promise<any> {
+  const { stdout } = await execFilePromise(cmd, args, options);
+  return stdout;
 }
 
 /**
- * Runs a given docker image and returns the host port for the new container.
+ * Just a helpful wrapper around `exec` that returns a promise.
+ * This will run commands through the shell, while `runCommand` doesn't.
  */
-export async function runDockerImage({
-  imageName,
-  containerName,
-  containerPort,
-}: runDockerImageProps): Promise<{ hostPort: string }> {
-  // Pull docker image
-  try {
-    await runCommand("docker", ["inspect", imageName]);
-  } catch {
-    await runCommand("docker", ["pull", imageName]);
-  }
-  // Run the container and allow docker to assign a host port dynamically
-  await runCommand("docker", [
-    "run",
-    "--detach",
-    "--name",
-    containerName,
-    "-p",
-    containerPort,
-    imageName,
-  ]);
-
-  // Inspect the container to get the host port
-  const out = await runCommand("docker", ["inspect", containerName]);
-  const hostPort =
-    JSON.parse(out)[0].NetworkSettings.Ports[`${containerPort}/tcp`][0]
-      .HostPort;
+export async function shell(
+  cmd: string,
+  args: string[],
+  options?: ExecOptions
+): Promise<any> {
+  const { stdout } = await execPromise(cmd + " " + args.join(" "), options);
+  return stdout;
+}
 
-  return { hostPort };
+export function isPath(s: string) {
+  s = normalPath(s);
+  return s.startsWith("./") || s.startsWith("../") || s.startsWith("/");
 }
diff --git a/libs/wingsdk/src/shared/sandbox.ts b/libs/wingsdk/src/shared/sandbox.ts
index db4509f5390..390cb9dace9 100644
--- a/libs/wingsdk/src/shared/sandbox.ts
+++ b/libs/wingsdk/src/shared/sandbox.ts
@@ -1,148 +1,342 @@
-import { mkdtemp, readFile } from "fs/promises";
-import { tmpdir } from "os";
-import * as path from "path";
-import * as util from "util";
-import * as vm from "vm";
-import { createBundle } from "./bundling";
+import * as cp from "child_process";
+import { writeFileSync } from "fs";
+import { readFile, stat } from "fs/promises";
+import { url as inspectorUrl } from "inspector";
+import { Bundle, createBundle } from "./bundling";
+import { processStream } from "./stream-processor";
+import { LogLevel } from "../std";
 
 export interface SandboxOptions {
   readonly env?: { [key: string]: string };
   readonly context?: { [key: string]: any };
+  /**
+   * How long the sandbox is allowed to run code when `sandbox.call()` is called
+   * before the child process should be stopped (killed), in milliseconds.
+   *
+   * If an invocation returns successfully, the child process continues running
+   * and can be reused for subsequent invocations.
+   */
   readonly timeout?: number;
-  readonly log?: (internal: boolean, level: string, message: string) => void;
+  readonly log?: (internal: boolean, level: LogLevel, message: string) => void;
 }
 
+/**
+ * Shape of the messages sent to the child process.
+ */
+type ProcessRequest = {
+  fn: string;
+  args: any[];
+};
+
+/**
+ * Shape of the messages returned by the child process.
+ */
+type ProcessResponse =
+  | {
+      type: "ok";
+      value: any;
+    }
+  | {
+      type: "error";
+      reason: Error;
+    };
+
 export class Sandbox {
-  private loaded = false; // "true" after first run (module is loaded into context)
-  private entrypoint: string;
+  public static async createBundle(
+    entrypoint: string,
+    log?: (message: string, level: LogLevel) => void
+  ): Promise<Bundle> {
+    let contents = await readFile(entrypoint, "utf-8");
+
+    // log a warning if contents includes __dirname or __filename
+    if (contents.includes("__dirname") || contents.includes("__filename")) {
+      log?.(
+        `Warning: __dirname and __filename cannot be used within bundled cloud functions. There may be unexpected behavior.`,
+        LogLevel.WARNING
+      );
+    }
+
+    let debugShim = "";
+    if (inspectorUrl?.()) {
+      // If we're debugging, we need to make sure the debugger has enough time to attach
+      // to the child process. This gives enough time for the debugger load sourcemaps and set breakpoints.
+      // See https://github.com/microsoft/vscode-js-debug/issues/1510
+      debugShim =
+        "\n  await new Promise((resolve) => setTimeout(resolve, 25));";
+    }
+
+    // wrap contents with a shim that handles the communication with the parent process
+    // we insert this shim before bundling to ensure source maps are generated correctly
+    contents += `
+process.on("uncaughtException", (reason) => {
+  process.send({ type: "error", reason });
+});
+
+process.on("message", async (message) => {${debugShim}
+  const { fn, args } = message;
+  const value = await exports[fn](...args);
+  process.send({ type: "ok", value });
+});
+`;
+
+    const wrappedPath = entrypoint.replace(/\.cjs$/, ".sandbox.cjs");
+
+    writeFileSync(wrappedPath, contents); // async fsPromises.writeFile "flush" option is not available in Node 20
+    const bundle = createBundle(wrappedPath);
+
+    if (process.env.DEBUG) {
+      const fileStats = await stat(entrypoint);
+      log?.(`Bundled code (${fileStats.size} bytes).`, LogLevel.VERBOSE);
+    }
+
+    return bundle;
+  }
+
+  private readonly entrypoint: string;
   private readonly options: SandboxOptions;
-  private readonly context: any = {};
+
+  private child: cp.ChildProcess | undefined;
+  private childPid: number | undefined;
+  private onChildMessage: ((message: ProcessResponse) => void) | undefined;
+  private onChildError: ((error: Error) => void) | undefined;
+  private onChildExit:
+    | ((code: number | null, signal: NodeJS.Signals | null) => void)
+    | undefined;
+
+  private timeout: NodeJS.Timeout | undefined;
+
+  // Tracks whether the sandbox is available to process a new request
+  // When call() is called, it sets this to false, and when it's returning
+  // a response or error, it sets it back to true.
+  private available = true;
+  private cleaningUp = false;
 
   constructor(entrypoint: string, options: SandboxOptions = {}) {
     this.entrypoint = entrypoint;
     this.options = options;
-    this.context = this.createContext();
   }
 
-  private createContext() {
-    const sandboxProcess = {
-      ...process,
-
-      // override process.exit to throw an exception instead of exiting the process
-      exit: (exitCode: number) => {
-        throw new Error("process.exit() was called with exit code " + exitCode);
-      },
-
-      env: this.options.env,
-    };
+  public async cleanup() {
+    this.cleaningUp = true;
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+    } else {
+    }
 
-    const sandboxConsole: any = {};
-    const levels = ["debug", "info", "log", "warn", "error"];
-    for (const level of levels) {
-      sandboxConsole[level] = (...args: any[]) => {
-        const message = util.format(...args);
-        this.options.log?.(false, level, message);
-        // also log to stderr if DEBUG is set
-        if (process.env.DEBUG) {
-          console.error(message);
-        }
-      };
+    if (this.child) {
+      this.debugLog(
+        `Terminating sandbox child process (PID ${this.childPid}).`
+      );
+      this.child.kill("SIGTERM");
+      this.child = undefined;
+      this.available = true;
     }
+  }
+
+  public isAvailable(): boolean {
+    return this.available;
+  }
 
-    const ctx: any = {};
+  public async initialize() {
+    const childEnv = this.options.env ?? {};
+    if (inspectorUrl?.()) {
+      // We're exposing a debugger, let's attempt to ensure the child process automatically attaches
+      childEnv.NODE_OPTIONS =
+        (childEnv.NODE_OPTIONS ?? "") + (process.env.NODE_OPTIONS ?? "");
 
-    // create a copy of all the globals from our current context.
-    for (const k of Object.getOwnPropertyNames(global)) {
-      try {
-        ctx[k] = (global as any)[k];
-      } catch {
-        // ignore unresolvable globals (see https://github.com/winglang/wing/pull/1923)
+      // If the child process is not already configured to attach a debugger, add a flag to do so
+      if (
+        !childEnv.NODE_OPTIONS.includes("--inspect") &&
+        !process.execArgv.includes("--inspect")
+      ) {
+        childEnv.NODE_OPTIONS += " --inspect=0";
       }
-    }
 
-    // append the user's context
-    for (const [k, v] of Object.entries(this.options.context ?? {})) {
-      ctx[k] = v;
+      // VSCode's debugger adds some environment variables that we want to pass to the child process
+      for (const key in process.env) {
+        if (key.startsWith("VSCODE_")) {
+          childEnv[key] = process.env[key]!;
+        }
+      }
     }
 
-    const context = vm.createContext({
-      ...ctx,
-      process: sandboxProcess,
-      console: sandboxConsole,
-      exports: {},
-      require, // to support requiring node.js sdk modules (others will be bundled)
+    // start a Node.js process that runs the inflight code
+    // note: unlike the fork(2) POSIX system call, child_process.fork()
+    // does not clone the current process
+    this.child = cp.fork(this.entrypoint, {
+      env: childEnv,
+      stdio: "pipe",
+      // keep the process detached so in the case of cloud.Service, if the parent process is killed
+      // (e.g. someone presses Ctrl+C while using Wing Console),
+      // we can gracefully call any cleanup code in the child process
+      detached: true,
+      // this option allows complex objects like Error to be sent from the child process to the parent
+      serialization: "advanced",
     });
+    this.childPid = this.child.pid;
 
-    // emit an explicit error when trying to access `__dirname` and `__filename` because we cannot
-    // resolve these when bundling (this is true both for simulator and the cloud since we are
-    // bundling there as well).
-    const forbidGlobal = (name: string) => {
-      Object.defineProperty(context, name, {
-        get: () => {
-          throw new Error(
-            `${name} cannot be used within bundled cloud functions`
-          );
-        },
-      });
+    this.debugLog(`Initialized sandbox (PID ${this.childPid}).`);
+
+    const log = (message: string) => {
+      let level = LogLevel.INFO;
+      if (message.startsWith("info:")) {
+        message = message.slice(5);
+      } else if (message.startsWith("error:")) {
+        message = message.slice(6);
+        level = LogLevel.ERROR;
+      } else if (message.startsWith("warning:")) {
+        message = message.slice(8);
+        level = LogLevel.WARNING;
+      } else if (message.startsWith("verbose:")) {
+        message = message.slice(8);
+        level = LogLevel.VERBOSE;
+      }
+      this.options.log?.(false, level, message);
     };
+    const logError = (message: string) =>
+      this.options.log?.(false, LogLevel.ERROR, message);
 
-    forbidGlobal("__dirname");
-    forbidGlobal("__filename");
+    // pipe stdout and stderr from the child process
+    if (this.child.stdout) {
+      processStream(this.child.stdout, log);
+    }
+    if (this.child.stderr) {
+      processStream(this.child.stderr, logError);
+    }
 
-    return context;
+    this.child.on("message", (message: ProcessResponse) => {
+      this.onChildMessage?.(message);
+    });
+    this.child!.on("error", (error) => {
+      this.onChildError?.(error);
+    });
+    this.child!.on("exit", (code, signal) => {
+      this.onChildExit?.(code, signal);
+    });
   }
 
-  private async loadBundleOnce() {
-    // load bundle into context on first run
-    if (this.loaded) {
-      return;
+  public async call(fn: string, ...args: any[]): Promise<any> {
+    if (!this.available) {
+      throw new SandboxMultipleConcurrentCallsError();
     }
 
-    const workdir = await mkdtemp(path.join(tmpdir(), "wing-bundles-"));
-    const bundle = createBundle(this.entrypoint, [], workdir);
-    this.entrypoint = bundle.entrypointPath;
+    // Prevent multiple calls to the same sandbox running concurrently.
+    this.available = false;
 
-    const code = await readFile(this.entrypoint, "utf-8");
-
-    if (process.env.DEBUG) {
-      const bundleSize = Buffer.byteLength(code, "utf-8");
-      this.options.log?.(true, "log", `Bundled code (${bundleSize} bytes).`);
+    // If this sandbox doesn't have a child process running (because it
+    // just got created, OR because the previous child process was killed due
+    // to timeout or an unexpected error), initialize one.
+    if (!this.child) {
+      await this.initialize();
     }
 
-    // this will add stuff to the "exports" object within our context
-    vm.runInContext(code, this.context, {
-      filename: this.entrypoint,
-    });
-
-    this.loaded = true;
-  }
-
-  public async call(fn: string, ...args: any[]): Promise<any> {
-    await this.loadBundleOnce();
+    // Send the function name and arguments to the child process.
+    // When a message is received, resolve or reject the promise.
+    return new Promise((resolve, reject) => {
+      this.child!.send({ fn, args } as ProcessRequest);
+      this.debugLog(
+        `Sent a message to the sandbox (PID ${this.childPid}): ${JSON.stringify(
+          {
+            fn,
+            args,
+          }
+        )}`
+      );
 
-    return new Promise(($resolve, $reject) => {
-      const cleanup = () => {
-        delete this.context.$resolve;
-        delete this.context.$reject;
+      this.onChildMessage = (message: ProcessResponse) => {
+        this.debugLog(
+          `Received a message from the sandbox (PID ${
+            this.childPid
+          }): ${JSON.stringify(message)}`
+        );
+        this.available = true;
+        if (this.timeout) {
+          clearTimeout(this.timeout);
+        }
+        if (message.type === "ok") {
+          resolve(message.value);
+        } else if (message.type === "error") {
+          reject(message.reason);
+        } else {
+          reject(
+            new Error(
+              `Unexpected message from the sandbox (PID ${this.childPid}): ${message}`
+            )
+          );
+        }
       };
 
-      this.context.$resolve = (value: any) => {
-        cleanup();
-        $resolve(value);
+      // "error" could be emitted for any number of reasons
+      // (e.g. the process couldn't be spawned or killed, or a message couldn't be sent).
+      // Since this is unexpected, we kill the process with SIGKILL to ensure it's dead, and reject the promise.
+      this.onChildError = (error: Error) => {
+        this.debugLog(
+          `Unexpected error from the sandbox (PID ${this.childPid}).`
+        );
+        this.child?.kill("SIGKILL");
+        this.child = undefined;
+        this.available = true;
+        if (this.timeout) {
+          clearTimeout(this.timeout);
+        }
+        if (this.cleaningUp) {
+          resolve(undefined);
+        } else {
+          reject(error);
+        }
       };
 
-      this.context.$reject = (reason?: any) => {
-        cleanup();
-        $reject(reason);
+      // "exit" could be emitted if the user code called process.exit(), or if we killed the process
+      // due to a timeout or unexpected error. In any case, we reject the promise.
+      this.onChildExit = (code: number | null, signal: unknown) => {
+        this.debugLog(`Sandbox (PID ${this.childPid}) stopped.`);
+        this.child = undefined;
+        this.available = true;
+        if (this.timeout) {
+          clearTimeout(this.timeout);
+        }
+        if (this.cleaningUp) {
+          resolve(undefined);
+        } else {
+          reject(
+            new Error(`Process exited with code ${code}, signal ${signal}`)
+          );
+        }
       };
 
-      const code = `exports.${fn}(${args.join(
-        ","
-      )}).then($resolve).catch($reject);`;
-      vm.runInContext(code, this.context, {
-        filename: this.entrypoint,
-        timeout: this.options.timeout,
-      });
+      if (this.options.timeout && !inspectorUrl?.()) {
+        this.timeout = setTimeout(() => {
+          this.debugLog(
+            `Killing sandbox (PID ${this.childPid}) after timeout.`
+          );
+          this.child?.kill("SIGTERM");
+          this.child = undefined;
+          this.available = true;
+          if (this.cleaningUp) {
+            resolve(undefined);
+          } else {
+            reject(new SandboxTimeoutError(this.options.timeout ?? 0));
+          }
+        }, this.options.timeout);
+      }
     });
   }
+
+  private debugLog(message: string) {
+    if (process.env.DEBUG) {
+      this.options.log?.(true, LogLevel.VERBOSE, message);
+    }
+  }
+}
+
+export class SandboxTimeoutError extends Error {
+  constructor(public readonly timeout: number) {
+    super("Timed out after " + timeout + "ms.");
+  }
+}
+
+export class SandboxMultipleConcurrentCallsError extends Error {
+  constructor() {
+    super("Cannot process multiple requests in parallel.");
+  }
 }
diff --git a/libs/wingsdk/src/shared/stream-processor.ts b/libs/wingsdk/src/shared/stream-processor.ts
new file mode 100644
index 00000000000..d65c34096d5
--- /dev/null
+++ b/libs/wingsdk/src/shared/stream-processor.ts
@@ -0,0 +1,47 @@
+import { Readable } from "stream";
+import { StringDecoder } from "string_decoder";
+
+/**
+ * Processes a stream, invoking a callback function for each line of data.
+ *
+ * @param stream - The readable stream to process.
+ * @param callback - The function to invoke for each line of data.
+ */
+export function processStream(
+  stream: Readable,
+  callback: (message: string) => void
+) {
+  let remainder = "";
+  // StringDecoder to handle potentially incomplete multi-byte characters
+  const decoder = new StringDecoder();
+
+  stream.on("data", (data) => {
+    remainder = processStreamData(data, remainder, decoder, callback);
+  });
+
+  // Handle any remaining data when the streams are closed
+  stream.on("end", () => {
+    if (remainder) callback(remainder + decoder.end());
+  });
+
+  stream.on("error", (error) => {
+    console.error(`Error occurred: ${error.message}`);
+  });
+}
+
+function processStreamData(
+  data: Buffer,
+  remainder: string,
+  decoder: StringDecoder,
+  log: (message: string) => void
+): string {
+  let str = decoder.write(data);
+  let lines = (remainder + str).split("\n");
+
+  // Process all lines except the last one, which might be incomplete
+  for (let i = 0; i < lines.length - 1; i++) {
+    log(lines[i]);
+  }
+
+  return lines.pop() ?? ""; // Return the last (potentially incomplete) line
+}
diff --git a/libs/wingsdk/src/simulator/client.ts b/libs/wingsdk/src/simulator/client.ts
index b79dc650b03..e22e00ad05b 100644
--- a/libs/wingsdk/src/simulator/client.ts
+++ b/libs/wingsdk/src/simulator/client.ts
@@ -1,53 +1,53 @@
+import * as http from "http";
+import { deserialize } from "./serialization";
 import type {
   SimulatorServerRequest,
   SimulatorServerResponse,
 } from "./simulator";
-import { Datetime } from "../std/datetime";
-
-// TODO: more robust serialization scheme
-
-export function serializeValue(input: any): string {
-  return JSON.stringify(input, (_key, value) => {
-    if (value instanceof Datetime) {
-      return {
-        $kind: "datetime",
-        day: value.dayOfMonth,
-        hour: value.hours,
-        min: value.min,
-        month: value.month,
-        sec: value.sec,
-        year: value.year,
-        ms: value.ms,
-        tz: value.timezone,
-      };
-    }
-    return value;
-  });
+
+interface HttpRequestOptions extends http.RequestOptions {
+  body?: string;
 }
 
-export function deserializeValue(input: string): any {
-  return JSON.parse(input, (_key, value) => {
-    // assumption: Wing APIs don't distinguish between null and undefined, so we can swap them
-    if (value === null) {
-      return undefined;
-    }
-    if (value.$kind === "datetime") {
-      return Datetime.fromComponents({
-        day: value.day,
-        hour: value.hour,
-        min: value.min,
-        month: value.month,
-        sec: value.sec,
-        year: value.year,
-        ms: value.ms,
-        tz: value.tz,
+function makeHttpRequest(options: HttpRequestOptions): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const req = http.request(options, (res) => {
+      let data = "";
+
+      res.on("data", (chunk) => {
+        data += chunk;
+      });
+
+      res.on("end", () => {
+        resolve(data);
       });
+    });
+
+    req.on("error", (e) => {
+      reject(e);
+    });
+
+    if (options.body !== undefined) {
+      req.write(options.body);
     }
-    return value;
+
+    req.end();
   });
 }
 
-export function makeSimulatorClient(url: string, handle: string) {
+/**
+ * Creates a proxy object that forwards method calls to the simulator server.
+ *
+ * @param url The URL of the simulator server
+ * @param handle The handle for the resource we're calling methods on or getting properties from
+ * @param caller The handle of the resource that is making the calls
+ * @returns A proxy object that forwards calls to the simulator server
+ */
+export function makeSimulatorClient(
+  url: string,
+  handle: string,
+  caller: string
+) {
   let proxy: any;
   let hasThenMethod = true; // assume that the object has a "then" method until proven otherwise
 
@@ -57,29 +57,20 @@ export function makeSimulatorClient(url: string, handle: string) {
     }
 
     return async function (...args: any[]) {
-      const body: SimulatorServerRequest = { handle, method, args };
-      let resp;
-      try {
-        // import undici dynamically to reduce the time it takes to load Wing SDK
-        // undici is used instead of the built-in fetch so that we can customize the
-        // keep-alive and headers timeouts to be 15 minutes instead of the default 5 seconds
-        const { fetch, Agent } = await import("undici");
-        resp = await fetch(url + "/v1/call", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(body),
-          dispatcher: new Agent({
-            keepAliveTimeout: 15 * 60 * 1000,
-            keepAliveMaxTimeout: 15 * 60 * 1000,
-            headersTimeout: 15 * 60 * 1000,
-            bodyTimeout: 15 * 60 * 1000,
-          }),
-        });
-      } catch (e) {
-        throw e;
-      }
+      const body: SimulatorServerRequest = { caller, handle, method, args };
+      const parsedUrl = new URL(url);
+      const resp = await makeHttpRequest({
+        hostname: parsedUrl.hostname,
+        port: parsedUrl.port,
+        path: "/v1/call",
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(body),
+      });
 
-      let parsed: SimulatorServerResponse = deserializeValue(await resp.text());
+      let parsed: SimulatorServerResponse = deserialize(resp);
 
       if (parsed.error) {
         // objects with "then" methods are special-cased by the JS runtime
@@ -91,7 +82,9 @@ export function makeSimulatorClient(url: string, handle: string) {
         // [0]: https://stackoverflow.com/questions/55262996/does-awaiting-a-non-promise-have-any-detectable-effect
         if (
           method === "then" &&
-          parsed.error?.message?.startsWith("Method then not found on resource")
+          parsed.error?.message?.startsWith(
+            'Method "then" not found on resource'
+          )
         ) {
           hasThenMethod = false;
           // args[0] is the onFulfilled callback passed to the then method.
@@ -102,8 +95,13 @@ export function makeSimulatorClient(url: string, handle: string) {
 
         let err = new Error();
         err.message = parsed.error?.message;
-        err.stack = parsed.error?.stack;
         err.name = parsed.error?.name;
+
+        if (parsed.error?.stack) {
+          // combine the stack trace from the server with the stack trace from the client
+          err.stack = `${parsed.error.stack}\n${err.stack}`;
+        }
+
         throw err;
       }
 
diff --git a/libs/wingsdk/src/simulator/graph.ts b/libs/wingsdk/src/simulator/graph.ts
new file mode 100644
index 00000000000..c3749c5e8eb
--- /dev/null
+++ b/libs/wingsdk/src/simulator/graph.ts
@@ -0,0 +1,111 @@
+import { PolicyStatement } from "./simulator";
+import { resolveTokens } from "./tokens";
+
+export interface Definition {
+  path: string;
+  deps?: string[];
+  props?: Record<string, any>;
+  policy?: PolicyStatement[];
+}
+
+class Node<T extends Definition> {
+  public readonly dependencies = new Set<string>();
+  public readonly dependents = new Set<string>();
+  constructor(public readonly def: T) {}
+
+  public get path() {
+    return this.def.path;
+  }
+}
+
+export class Graph<T extends Definition> {
+  private byPath: Record<string, Node<T>> = {};
+
+  constructor(resources: T[] = []) {
+    for (const resource of resources) {
+      this.byPath[resource.path] = new Node(resource);
+    }
+
+    // build the dependency graph
+    for (const resource of resources) {
+      const consumer = resource.path;
+
+      // add explicit dependencies
+      for (const dep of resource.deps ?? []) {
+        this.recordDependency(consumer, dep);
+      }
+
+      // add implicit dependencies (e.g. from tokens in props)
+      const implicitDeps: string[] = [];
+
+      // collect all tokens from the props object (recursive) the "resolver" here is just a dummy
+      // function that collects all tokens and returns a dummy value (we don't care about the
+      // result).
+      resolveTokens(resource.props ?? {}, (token) => {
+        implicitDeps.push(token.path);
+        return "[T]"; // <-- we don't really use the result, just need to return something
+      });
+
+      // do the same for resource.policy
+      resolveTokens(resource.policy ?? {}, (token) => {
+        implicitDeps.push(token.path);
+        return "[T]";
+      });
+
+      // now add all implicit dependencies
+      for (const dep of implicitDeps) {
+        this.recordDependency(consumer, dep);
+      }
+    }
+  }
+
+  public get nodes(): Node<T>[] {
+    return Object.values(this.byPath);
+  }
+
+  public tryFind(path: string): Node<T> | undefined {
+    const node = this.byPath[path];
+    if (!node) {
+      return undefined;
+    }
+
+    return node;
+  }
+
+  private recordDependency(consumer: string, producer: string) {
+    this.tryFind(consumer)?.dependencies.add(producer);
+    this.tryFind(producer)?.dependents.add(consumer);
+
+    // check for cyclic dependencies
+    this.detectCycles(consumer);
+    this.detectCycles(producer);
+  }
+
+  private detectCycles(root: string) {
+    const visited = new Set<string>();
+    const stack = new Set<string>();
+
+    const visit = (path: string) => {
+      if (stack.has(path)) {
+        throw new Error(
+          `cyclic dependency detected: ${[...stack, path].join(" -> ")}`
+        );
+      }
+
+      if (visited.has(path)) {
+        return;
+      }
+
+      visited.add(path);
+      stack.add(path);
+
+      for (const dep of this.tryFind(path)?.dependencies ?? []) {
+        visit(dep);
+      }
+
+      stack.delete(path);
+    };
+
+    visit(root);
+  }
+}
diff --git a/libs/wingsdk/src/simulator/index.ts b/libs/wingsdk/src/simulator/index.ts
index b78ccbbdf55..830bf6c0ea7 100644
--- a/libs/wingsdk/src/simulator/index.ts
+++ b/libs/wingsdk/src/simulator/index.ts
@@ -1,4 +1,3 @@
 export * from "./client";
 export * from "./simulator";
-export * from "./testing";
 export * from "./tree";
diff --git a/libs/wingsdk/src/simulator/serialization.ts b/libs/wingsdk/src/simulator/serialization.ts
new file mode 100644
index 00000000000..80f31899425
--- /dev/null
+++ b/libs/wingsdk/src/simulator/serialization.ts
@@ -0,0 +1,44 @@
+// TODO: more robust serialization scheme
+
+import { Datetime } from "../std/datetime";
+
+export function serialize(input: any): string {
+  return JSON.stringify(input, (_key, value) => {
+    if (value instanceof Datetime) {
+      return {
+        $kind: "datetime",
+        day: value.dayOfMonth,
+        hour: value.hours,
+        min: value.min,
+        month: value.month,
+        sec: value.sec,
+        year: value.year,
+        ms: value.ms,
+        tz: value.timezone,
+      };
+    }
+    return value;
+  });
+}
+
+export function deserialize(input: string): any {
+  return JSON.parse(input, (_key, value) => {
+    // assumption: Wing APIs don't distinguish between null and undefined, so we can swap them
+    if (value === null) {
+      return undefined;
+    }
+    if (value.$kind === "datetime") {
+      return Datetime.fromComponents({
+        day: value.day,
+        hour: value.hour,
+        min: value.min,
+        month: value.month,
+        sec: value.sec,
+        year: value.year,
+        ms: value.ms,
+        tz: value.tz,
+      });
+    }
+    return value;
+  });
+}
diff --git a/libs/wingsdk/src/simulator/simulator.ts b/libs/wingsdk/src/simulator/simulator.ts
index 5a6c6aee7d5..d3177d06cc9 100644
--- a/libs/wingsdk/src/simulator/simulator.ts
+++ b/libs/wingsdk/src/simulator/simulator.ts
@@ -1,23 +1,28 @@
 import { existsSync } from "fs";
+import { mkdir, rm } from "fs/promises";
 import type { Server, IncomingMessage, ServerResponse } from "http";
-import { join } from "path";
-import {
-  deserializeValue,
-  makeSimulatorClient,
-  serializeValue,
-} from "./client";
+import { join, resolve } from "path";
+import { makeSimulatorClient } from "./client";
+import { Graph } from "./graph";
+import { deserialize, serialize } from "./serialization";
+import { resolveTokens } from "./tokens";
 import { Tree } from "./tree";
+import { exists } from "./util";
 import { SDK_VERSION } from "../constants";
-import { ConstructTree, TREE_FILE_PATH } from "../core";
+import { TREE_FILE_PATH } from "../core";
 import { readJsonSync } from "../shared/misc";
-import { CONNECTIONS_FILE_PATH, Trace, TraceType } from "../std";
-import {
-  SIMULATOR_TOKEN_REGEX,
-  SIMULATOR_TOKEN_REGEX_FULL,
-} from "../target-sim/tokens";
+import { CONNECTIONS_FILE_PATH, LogLevel, Trace, TraceType } from "../std";
+import { POLICY_FQN } from "../target-sim";
+import { PolicySchema } from "../target-sim/schema-resources";
 
-const START_ATTEMPT_COUNT = 10;
 const LOCALHOST_ADDRESS = "127.0.0.1";
+const HANDLE_ATTRIBUTE = "handle";
+
+/**
+ * If an API call is made to a resource with name as the caller, any permissions
+ * checking will be skipped. Used by unit tests and the Wing Console.
+ */
+const ADMIN_PERMISSION = "admin";
 
 /**
  * Props for `Simulator`.
@@ -28,6 +33,13 @@ export interface SimulatorProps {
    */
   readonly simfile: string;
 
+  /**
+   * Path to a state directory where the simulator can store state between
+   * simulation runs.
+   * @default - a directory named ".state" inside the simulator output directory
+   */
+  readonly stateDir?: string;
+
   /**
    * The factory that produces resource simulations.
    *
@@ -76,24 +88,34 @@ export interface IWithTraceProps {
  */
 export interface ISimulatorContext {
   /**
-   * This directory where the compilation output is
+   * The directory where the compilation output is
    */
   readonly simdir: string;
 
+  /**
+   * The directory for the resource's state.
+   */
+  readonly statedir: string;
+
   /**
    * The path of the resource that is being simulated.
    */
   readonly resourcePath: string;
 
+  /**
+   * The handle of the resource that is being simulated.
+   */
+  readonly resourceHandle: string;
+
   /**
    * The url that the simulator server is listening on.
    */
   readonly serverUrl: string;
 
   /**
-   * Find a resource simulation by its handle. Throws if the handle isn't valid.
+   * Obtain a client given a resource's handle.
    */
-  findInstance(handle: string): ISimulatorResourceInstance;
+  getClient(handle: string, asAdmin?: boolean): unknown;
 
   /**
    * Add a trace. Traces are breadcrumbs of information about resource
@@ -150,81 +172,95 @@ export interface ITraceSubscriber {
  */
 type RunningState = "starting" | "running" | "stopping" | "stopped";
 
+interface Model {
+  simdir: string;
+  tree: Tree;
+  connections: ConnectionData[];
+  schema: WingSimulatorSchema;
+  graph: Graph<BaseResourceSchema>;
+}
+
+interface ResourceState {
+  props: Record<string, any>;
+  attrs: Record<string, any>;
+  policy: PolicyStatement[];
+}
+
 /**
  * A simulator that can be used to test your application locally.
  */
 export class Simulator {
   // fields that are same between simulation runs / reloads
-  private _config: WingSimulatorSchema;
-  private readonly simdir: string;
+  private readonly statedir: string;
 
   // fields that change between simulation runs / reloads
   private _running: RunningState;
   private readonly _handles: HandleManager;
   private _traces: Array<Trace>;
   private readonly _traceSubscribers: Array<ITraceSubscriber>;
-  private _tree: Tree;
-  private _connections: ConnectionData[];
   private _serverUrl: string | undefined;
   private _server: Server | undefined;
+  private _model: Model;
+  private _policyRegistry: PolicyRegistry;
+
+  // keeps the actual resolved state (props and attrs) of all started resources. this state is
+  // merged in when calling `getResourceConfig()`.
+  private state: Record<string, ResourceState> = {};
 
   constructor(props: SimulatorProps) {
-    this.simdir = props.simfile;
-    const { config, treeData, connectionData } = this._loadApp(props.simfile);
-    this._config = config;
-    this._tree = new Tree(treeData);
-    this._connections = connectionData;
+    const simdir = resolve(props.simfile);
+    this.statedir = props.stateDir ?? join(simdir, ".state");
+    this._model = this._loadApp(simdir);
 
     this._running = "stopped";
     this._handles = new HandleManager();
+    this._policyRegistry = new PolicyRegistry();
     this._traces = new Array();
     this._traceSubscribers = new Array();
   }
 
-  private _loadApp(simdir: string): {
-    config: any;
-    treeData: ConstructTree;
-    connectionData: ConnectionData[];
-  } {
-    const simJson = join(this.simdir, "simulator.json");
+  private _loadApp(simdir: string): Model {
+    const simJson = join(simdir, "simulator.json");
     if (!existsSync(simJson)) {
       throw new Error(
         `Invalid Wing app (${simdir}) - simulator.json not found.`
       );
     }
 
-    const config: WingSimulatorSchema = readJsonSync(simJson);
+    const schema = readJsonSync(simJson) as WingSimulatorSchema;
 
-    const foundVersion = config.sdkVersion ?? "unknown";
+    const foundVersion = schema.sdkVersion ?? "unknown";
     const expectedVersion = SDK_VERSION;
     if (foundVersion !== expectedVersion) {
       console.error(
         `WARNING: The simulator directory (${simdir}) was generated with Wing SDK v${foundVersion} but it is being simulated with Wing SDK v${expectedVersion}.`
       );
     }
-    if (config.resources === undefined) {
+    if (schema.resources === undefined) {
       throw new Error(
         `Incompatible .wsim file. The simulator directory (${simdir}) was generated with Wing SDK v${foundVersion} but it is being simulated with Wing SDK v${expectedVersion}.`
       );
     }
 
-    const treeJson = join(this.simdir, TREE_FILE_PATH);
+    const treeJson = join(simdir, TREE_FILE_PATH);
     if (!existsSync(treeJson)) {
       throw new Error(
         `Invalid Wing app (${simdir}) - ${TREE_FILE_PATH} not found.`
       );
     }
-    const treeData = readJsonSync(treeJson);
 
-    const connectionJson = join(this.simdir, CONNECTIONS_FILE_PATH);
+    const tree = new Tree(readJsonSync(treeJson));
+
+    const connectionJson = join(simdir, CONNECTIONS_FILE_PATH);
     if (!existsSync(connectionJson)) {
       throw new Error(
         `Invalid Wing app (${simdir}) - ${CONNECTIONS_FILE_PATH} not found.`
       );
     }
-    const connectionData = readJsonSync(connectionJson).connections;
+    const connections = readJsonSync(connectionJson).connections;
+    const graph = new Graph(Object.values(schema.resources));
 
-    return { config, treeData, connectionData };
+    return { schema, tree, connections, simdir, graph };
   }
 
   /**
@@ -238,39 +274,90 @@ export class Simulator {
     }
     this._running = "starting";
 
-    // create a copy of the resource list to be used as an init queue.
-    const initQueue: (BaseResourceSchema & { _attempts?: number })[] = [
-      ...this._config.resources,
-    ];
-
     await this.startServer();
 
-    while (true) {
-      const next = initQueue.shift();
-      if (!next) {
-        break;
-      }
+    try {
+      await this.startResources();
+    } catch (err: any) {
+      this.stopServer();
+      this._running = "stopped";
+      throw err;
+    }
+  }
 
-      // we couldn't start this resource yet, so decrement the retry counter and put it back in
-      // the init queue.
-      if (!(await this.tryStartResource(next))) {
-        // we couldn't start this resource yet, so decrement the attempt counter
-        next._attempts = next._attempts ?? START_ATTEMPT_COUNT;
-        next._attempts--;
-
-        // if we've tried too many times, give up (might be a dependency cycle or a bad reference)
-        if (next._attempts === 0) {
-          throw new Error(
-            `Could not start resource ${next.path} after ${START_ATTEMPT_COUNT} attempts. This could be due to a dependency cycle or an invalid attribute reference.`
-          );
+  private async startResources() {
+    const retries: Record<string, number> = {};
+    const queue = this._model.graph.nodes.map((n) => n.path);
+    const failed = [];
+    while (queue.length > 0) {
+      const top = queue.shift()!;
+      try {
+        await this.startResource(top);
+      } catch (e: any) {
+        if (e instanceof UnresolvedTokenError) {
+          retries[top] = (retries[top] ?? 0) + 1;
+
+          if (retries[top] < 10) {
+            queue.push(top);
+            continue;
+          } else {
+            failed.push(top);
+          }
         }
 
-        // put back in the queue for another round
-        initQueue.push(next);
+        this.addSimulatorTrace(top, { message: e.message }, LogLevel.ERROR);
       }
     }
 
+    // mark as "running" so that we can stop the simulation if needed
     this._running = "running";
+
+    // since some resources failed to start, we are going to stop all resources that were started
+    if (failed.length > 0) {
+      await this.stop();
+
+      throw new Error(
+        `Failed to start resources: ${failed.map((r) => `"${r}"`).join(", ")}`
+      );
+    }
+  }
+
+  /**
+   * Updates the running simulation with a new version of the app. This will create/update/delete
+   * resources as necessary to get to the desired state.
+   * @param simDir The path to the new version of the app
+   */
+  public async update(simDir: string) {
+    const newModel = this._loadApp(simDir);
+
+    const plan = await this.planUpdate(
+      this._model.schema.resources,
+      newModel.schema.resources
+    );
+
+    this.addTrace({
+      type: TraceType.SIMULATOR,
+      data: {
+        message: `Update: ${plan.added.length} added, ${plan.updated.length} updated, ${plan.deleted.length} deleted`,
+        update: plan,
+      },
+      sourcePath: "root",
+      sourceType: "Simulator",
+      level: LogLevel.VERBOSE,
+      timestamp: new Date().toISOString(),
+    });
+
+    // stop all *deleted* and *updated* resources
+    for (const c of [...plan.deleted, ...plan.updated]) {
+      await this.stopResource(c); // <-- this also stops all dependent resources if needed
+    }
+
+    // now update the internal model to the new version
+    this._model = newModel;
+
+    // start all *added* and *updated* resources (the updated model basically includes only these)
+    // this will also start all dependencies as needed and not touch any resource that is already started
+    await this.startResources();
   }
 
   /**
@@ -290,48 +377,85 @@ export class Simulator {
     }
     this._running = "stopping";
 
-    for (const resourceConfig of this._config.resources.slice().reverse()) {
-      const handle = resourceConfig.attrs?.handle;
-      if (!handle) {
-        throw new Error(
-          `Resource ${resourceConfig.path} could not be cleaned up, no handle for it was found.`
-        );
-      }
-      try {
-        const resource = this._handles.deallocate(resourceConfig.attrs!.handle);
-        await resource.cleanup();
-      } catch (err) {
-        console.warn(err);
-      }
-
-      let event: Trace = {
-        type: TraceType.RESOURCE,
-        data: { message: `${resourceConfig.type} deleted.` },
-        sourcePath: resourceConfig.path,
-        sourceType: resourceConfig.type,
-        timestamp: new Date().toISOString(),
-      };
-      this._addTrace(event);
+    // just call "stopResource" for all resources. it will stop all dependents as well.
+    for (const node of this._model.graph.nodes) {
+      await this.stopResource(node.path);
     }
 
-    this._server!.close();
-    this._server!.closeAllConnections();
+    this.stopServer();
 
     this._handles.reset();
     this._running = "stopped";
   }
 
+  private isStarted(path: string): boolean {
+    return path in this.state;
+  }
+
+  private async stopResource(path: string) {
+    if (!this.isStarted(path)) {
+      return; // resource is already stopped
+    }
+
+    // first, stop all dependent resources
+    for (const consumer of this._model.graph.tryFind(path)?.dependents ?? []) {
+      await this.stopResource(consumer);
+    }
+
+    const handle = this.tryGetResourceHandle(path);
+    if (!handle) {
+      throw new Error(
+        `Resource ${path} could not be cleaned up, no handle for it was found.`
+      );
+    }
+
+    try {
+      const resource = this._handles.find(handle);
+      await this.ensureStateDirExists(path);
+      await resource.save(this.getResourceStateDir(path));
+      await resource.cleanup();
+      this._handles.deallocate(handle);
+    } catch (err) {
+      console.warn(err);
+    }
+
+    // remove the resource's policy from the policy registry
+    this._policyRegistry.deregister(path);
+
+    this.addSimulatorTrace(
+      path,
+      { message: `${path} stopped` },
+      LogLevel.VERBOSE
+    );
+
+    delete this.state[path]; // delete the state of the resource
+  }
+
+  private addSimulatorTrace(path: string, data: any, level: LogLevel) {
+    const resourceConfig = this.getResourceConfig(path);
+    this.addTrace({
+      type: TraceType.SIMULATOR,
+      level,
+      data: data,
+      sourcePath: resourceConfig.path,
+      sourceType: resourceConfig.type,
+      timestamp: new Date().toISOString(),
+    });
+  }
+
   /**
    * Stop the simulation, reload the simulation tree from the latest version of
    * the app file, and restart the simulation.
    */
-  public async reload(): Promise<void> {
+  public async reload(resetState: boolean): Promise<void> {
     await this.stop();
 
-    const { config, treeData, connectionData } = this._loadApp(this.simdir);
-    this._config = config;
-    this._tree = new Tree(treeData);
-    this._connections = connectionData;
+    if (resetState) {
+      await rm(this.statedir, { recursive: true });
+      this._traces = [];
+    }
+
+    this._model = this._loadApp(this._model.simdir);
 
     await this.start();
   }
@@ -340,7 +464,7 @@ export class Simulator {
    * Get a list of all resource paths.
    */
   public listResources(): string[] {
-    return this._config.resources.map((config) => config.path).sort();
+    return this._model.graph.nodes.map((x) => x.path).sort();
   }
 
   /**
@@ -367,12 +491,40 @@ export class Simulator {
    * @returns The resource or undefined if not found
    */
   public tryGetResource(path: string): any | undefined {
-    const handle: string = this.tryGetResourceConfig(path)?.attrs.handle;
-    if (!handle) {
-      return undefined;
+    const handle = this.tryGetResourceHandle(path);
+    if (handle) {
+      return makeSimulatorClient(this.url, handle, ADMIN_PERMISSION);
+    }
+
+    // backwards compatibility trick: if a unit test requests a resource with a path like "foo/bar"
+    // which is not found, but a resource "foo/bar/Resource" exists and its
+    // type is @winglang/sdk.sim.Resource, then we will return that client instead
+    const childPath = `${path}/Resource`;
+    const childConfig = this.tryGetResourceConfig(childPath);
+    if (childConfig?.type === "@winglang/sdk.sim.Resource") {
+      const childHandle = this.tryGetResourceHandle(childPath);
+      if (childHandle) {
+        const client = makeSimulatorClient(
+          this.url,
+          childHandle,
+          ADMIN_PERMISSION
+        );
+
+        const get = (_target: any, method: string, _receiver: any) => {
+          return async function (...args: any[]) {
+            return client.call(method, args);
+          };
+        };
+
+        return new Proxy({}, { get });
+      }
     }
 
-    return makeSimulatorClient(this.url, handle);
+    return undefined;
+  }
+
+  private tryGetResourceHandle(path: string): string | undefined {
+    return this.tryGetResourceConfig(path)?.attrs[HANDLE_ATTRIBUTE];
   }
 
   /**
@@ -384,7 +536,20 @@ export class Simulator {
     if (path.startsWith("/")) {
       path = `root${path}`;
     }
-    return this._config.resources.find((r) => r.path === path);
+
+    const def = this._model.graph.tryFind(path)?.def;
+    if (!def) {
+      return undefined;
+    }
+
+    const state = this.state[path];
+
+    return {
+      ...def,
+
+      // merge the actual state (props and attrs) over the desired state in `def`
+      ...state,
+    };
   }
 
   /**
@@ -400,6 +565,24 @@ export class Simulator {
     return config;
   }
 
+  /**
+   * Obtain a resource's state directory path.
+   * @param path The resource path
+   * @returns The resource state directory path
+   */
+  public getResourceStateDir(path: string): string {
+    const config = this.getResourceConfig(path);
+    return join(this.statedir, config.addr);
+  }
+
+  private async ensureStateDirExists(path: string) {
+    const statedir = this.getResourceStateDir(path);
+    const statedirExists = await exists(statedir);
+    if (!statedirExists) {
+      await mkdir(statedir, { recursive: true });
+    }
+  }
+
   /**
    * Obtain a resource's visual interaction components.
    * @returns An array of UIComponent objects
@@ -413,7 +596,11 @@ export class Simulator {
   }
 
   private typeInfo(fqn: string): TypeSchema {
-    return this._config.types[fqn];
+    const schema = this._model.schema.types[fqn];
+    if (!schema) {
+      throw new Error(`Unknown simulator type ${fqn}`);
+    }
+    return schema;
   }
 
   /**
@@ -428,24 +615,65 @@ export class Simulator {
    * Obtain information about the application's construct tree.
    */
   public tree(): Tree {
-    return this._tree;
+    return this._model.tree;
   }
 
   /**
    * Obtain information about the application's connections.
    */
   public connections(): ConnectionData[] {
-    return structuredClone(this._connections);
+    return structuredClone(this._model.connections);
+  }
+
+  private checkPermission(
+    callerHandle: string,
+    calleeHandle: string,
+    method: string
+  ): { granted: boolean; reason?: string } {
+    if (callerHandle === ADMIN_PERMISSION) {
+      return { granted: true };
+    }
+
+    if (method === "then") {
+      // Always grant permissions for the "then" method so that an error isn't thrown
+      // if `await client` is called on a Proxy object. In JavaScript, `await x` will
+      // implicitly call `x.then()`.
+      return { granted: true };
+    }
+
+    const callerPath = this._handles.tryFindPath(callerHandle);
+    if (!callerPath) {
+      return {
+        granted: false,
+        reason: `(Permission checking) No caller resource with handle "${callerHandle}" found.`,
+      };
+    }
+
+    const calleePath = this._handles.tryFindPath(calleeHandle);
+    if (!calleePath) {
+      return {
+        granted: false,
+        reason: `(Permission checking) No callee resource with handle "${calleeHandle}" found.`,
+      };
+    }
+
+    if (
+      this._policyRegistry.checkPermission(callerHandle, calleeHandle, method)
+    ) {
+      return { granted: true };
+    }
+
+    return {
+      granted: false,
+      reason: `Resource "${callerPath}" does not have permission to perform operation "${method}" on resource "${calleePath}".`,
+    };
   }
 
   /**
    * Start a server that allows any resource to be accessed via HTTP.
    */
   private async startServer(): Promise<void> {
-    const requestListener = async (
-      req: IncomingMessage,
-      res: ServerResponse
-    ) => {
+    const requestListener = (req: IncomingMessage, res: ServerResponse) => {
       if (!req.url?.startsWith("/v1/call")) {
         res.writeHead(404);
         res.end();
@@ -457,18 +685,33 @@ export class Simulator {
         body += chunk;
       });
       req.on("end", () => {
-        const request: SimulatorServerRequest = deserializeValue(body);
-        const { handle, method, args } = request;
+        const request: SimulatorServerRequest = deserialize(body);
+        const { caller, handle, method, args } = request;
         const resource = this._handles.tryFind(handle);
 
+        // Check if the caller has permission to call the method on the resource
+        const grant = this.checkPermission(caller, handle, method);
+        if (!grant.granted) {
+          res.writeHead(403, { "Content-Type": "application/json" });
+          res.end(
+            serialize({
+              error: {
+                message: grant.reason,
+              },
+            }),
+            "utf-8"
+          );
+          return;
+        }
+
         // If we weren't able to find a resource with the given handle, it could actually
         // be OK if the resource is still starting up or has already been cleaned up.
         // In that case, we return a 500 error with a message that explains what happened.
         if (!resource) {
+          res.writeHead(500, { "Content-Type": "application/json" });
           if (this._running === "starting") {
-            res.writeHead(500, { "Content-Type": "application/json" });
             res.end(
-              serializeValue({
+              serialize({
                 error: {
                   message: `Resource ${handle} not found. It may not have been initialized yet.`,
                 },
@@ -477,9 +720,8 @@ export class Simulator {
             );
             return;
           } else if (this._running === "stopping") {
-            res.writeHead(500, { "Content-Type": "application/json" });
             res.end(
-              serializeValue({
+              serialize({
                 error: {
                   message: `Resource ${handle} not found. It may have been cleaned up already.`,
                 },
@@ -488,17 +730,26 @@ export class Simulator {
             );
             return;
           } else {
-            throw new Error(`Internal error - resource ${handle} not found.`);
+            res.end(
+              serialize({
+                error: {
+                  message: `Internal error - resource ${handle} not found.`,
+                },
+              }),
+              "utf-8"
+            );
+            return;
           }
         }
 
         const methodExists = (resource as any)[method] !== undefined;
         if (!methodExists) {
+          const resourcePath = this._handles.tryFindPath(handle);
           res.writeHead(500, { "Content-Type": "application/json" });
           res.end(
-            serializeValue({
+            serialize({
               error: {
-                message: `Method ${method} not found on resource ${handle}.`,
+                message: `Method "${method}" not found on resource ${handle} (${resourcePath}).`,
               },
             }),
             "utf-8"
@@ -510,14 +761,14 @@ export class Simulator {
           [method](...args)
           .then((result: any) => {
             res.writeHead(200, { "Content-Type": "application/json" });
-            res.end(serializeValue({ result }), "utf-8");
+            res.end(serialize({ result }), "utf-8");
           })
           .catch((err: any) => {
             res.writeHead(500, { "Content-Type": "application/json" });
             res.end(
-              serializeValue({
+              serialize({
                 error: {
-                  message: err.message ?? err,
+                  message: err?.message ?? `${err}`,
                   stack: err.stack,
                   name: err.name,
                 },
@@ -529,22 +780,29 @@ export class Simulator {
     };
 
     // only import "http" when this method is called to reduce the time it takes to load Wing SDK
-    const http = await import("http");
+    const http = await import("node:http");
 
     // start the server, and wait for it to be listening
     const server = http.createServer(requestListener);
-    await new Promise<void>((resolve) => {
-      server!.listen(0, LOCALHOST_ADDRESS, () => {
+    await new Promise<void>((ok) => {
+      server.listen(0, LOCALHOST_ADDRESS, () => {
         const addr = server.address();
         if (addr && typeof addr === "object" && (addr as any).port) {
           this._serverUrl = `http://${addr.address}:${addr.port}`;
         }
         this._server = server;
-        resolve();
+        ok();
       });
     });
   }
 
+  /**
+   * Stop the simulator server.
+   */
+  private stopServer() {
+    this._server!.close();
+  }
+
   /**
    * The URL that the simulator server is listening on.
    */
@@ -555,92 +813,125 @@ export class Simulator {
     return this._serverUrl;
   }
 
-  private async tryStartResource(
-    resourceConfig: BaseResourceSchema
-  ): Promise<boolean> {
-    const context = this.createContext(resourceConfig);
-
-    const { resolved, value: resolvedProps } = this.tryResolveTokens(
-      resourceConfig.props
-    );
-    if (!resolved) {
-      this._addTrace({
-        type: TraceType.RESOURCE,
-        data: { message: `${resourceConfig.path} is waiting on a dependency` },
-        sourcePath: resourceConfig.path,
-        sourceType: resourceConfig.type,
-        timestamp: new Date().toISOString(),
-      });
+  private async startResource(path: string): Promise<void> {
+    if (this.isStarted(path)) {
+      return; // already started
+    }
 
-      // this means the resource has a dependency that hasn't been started yet (hopefully). return
-      // it to the init queue.
-      return false;
+    // first lets make sure all my dependencies have been started (depth-first)
+    for (const d of this._model.graph.tryFind(path)?.dependencies ?? []) {
+      await this.startResource(d);
     }
 
-    // update the resource's config with the resolved props
-    const config = this.getResourceConfig(resourceConfig.path);
-    (config.props as any) = resolvedProps;
+    const resourceConfig = this.getResourceConfig(path);
+
+    const resolvedProps = this.resolveTokens(path, resourceConfig.props);
+    const resolvedPolicy: PolicyStatement[] =
+      this.resolveTokens(path, resourceConfig.policy) ?? [];
 
     // look up the location of the code for the type
     const typeInfo = this.typeInfo(resourceConfig.type);
 
+    // set up a state directory for the resource
+    await mkdir(this.getResourceStateDir(resourceConfig.path), {
+      recursive: true,
+    });
+
+    // initialize the resource state object without attrs for now
+    this.state[path] = {
+      props: resolvedProps,
+      attrs: {},
+      policy: resolvedPolicy,
+    };
+
     // create the resource based on its type
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const ResourceType = require(typeInfo.sourcePath)[typeInfo.className];
-    const resourceObject = new ResourceType(resolvedProps, context);
-
-    // go ahead and initialize the resource
-    const attrs = await resourceObject.init();
+    const resourceObject = new ResourceType(resolvedProps);
 
     // allocate a handle for the resource so others can find it
-    const handle = this._handles.allocate(resourceObject);
+    const handle = this._handles.allocate(path, resourceObject);
 
-    // update the resource configuration with new attrs returned after initialization
-    context.setResourceAttributes(resourceConfig.path, { ...attrs, handle });
+    // if the resource is a policy, add it to the policy registry
+    if (resourceConfig.type === POLICY_FQN) {
+      const policy = resolvedProps as PolicySchema;
+      this._policyRegistry.register(resourceConfig.path, policy);
+    } else {
+      // otherwise, add the resource's inline policy to the policy registry
+      const policy = {
+        statements: resolvedPolicy,
+        principal: handle,
+      };
+      this._policyRegistry.register(resourceConfig.path, policy);
+    }
 
-    // trace the resource creation
-    this._addTrace({
-      type: TraceType.RESOURCE,
-      data: { message: `${resourceConfig.type} created.` },
-      sourcePath: resourceConfig.path,
-      sourceType: resourceConfig.type,
-      timestamp: new Date().toISOString(),
-    });
+    // initialize the resource with the simulator context
+    const context = this.createContext(resourceConfig, handle);
+    const attrs = await resourceObject.init(context);
+
+    // save the current state
+    await resourceObject.save();
 
-    return true;
+    // merge the attributes
+    this.state[path].attrs = {
+      ...this.state[path].attrs,
+      ...attrs,
+      [HANDLE_ATTRIBUTE]: handle,
+    };
+
+    // trace the resource creation
+    this.addSimulatorTrace(
+      path,
+      {
+        message: `${resourceConfig.path} started`,
+      },
+      LogLevel.VERBOSE
+    );
   }
 
-  private createContext(resourceConfig: BaseResourceSchema): ISimulatorContext {
+  private createContext(
+    resourceConfig: BaseResourceSchema,
+    resourceHandle: string
+  ): ISimulatorContext {
     return {
-      simdir: this.simdir,
+      simdir: this._model.simdir,
+      statedir: join(this.statedir, resourceConfig.addr),
       resourcePath: resourceConfig.path,
+      resourceHandle: resourceHandle,
       serverUrl: this.url,
-      findInstance: (handle: string) => {
-        return this._handles.find(handle);
+      getClient: (calleeHandle: string, asAdmin: boolean) => {
+        const callerHandle = asAdmin ? ADMIN_PERMISSION : resourceHandle;
+        return makeSimulatorClient(this.url, calleeHandle, callerHandle);
       },
       addTrace: (trace: Trace) => {
-        this._addTrace(trace);
+        this.addTrace(trace);
       },
       withTrace: async (props: IWithTraceProps) => {
         // TODO: log start time and end time of activity?
         try {
           let result = await props.activity();
-          this._addTrace({
+          this.addTrace({
             data: {
               message: props.message,
               status: "success",
               result: JSON.stringify(result),
             },
             type: TraceType.RESOURCE,
+            level: LogLevel.VERBOSE,
             sourcePath: resourceConfig.path,
             sourceType: resourceConfig.type,
             timestamp: new Date().toISOString(),
           });
           return result;
-        } catch (err) {
-          this._addTrace({
-            data: { message: props.message, status: "failure", error: err },
+        } catch (err: any) {
+          this.addTrace({
+            data: {
+              message: `Error: ${err.message} (${props.message})`,
+              error: err,
+              status: "failure",
+            },
             type: TraceType.RESOURCE,
+            level: LogLevel.VERBOSE,
             sourcePath: resourceConfig.path,
             sourceType: resourceConfig.type,
             timestamp: new Date().toISOString(),
@@ -652,17 +943,25 @@ export class Simulator {
         return [...this._traces];
       },
       setResourceAttributes: (path: string, attrs: Record<string, any>) => {
-        const config = this.getResourceConfig(path);
-        const prev = config.attrs;
-        (config as any).attrs = { ...prev, ...attrs };
+        for (const [key, value] of Object.entries(attrs)) {
+          this.addSimulatorTrace(
+            path,
+            {
+              message: `${path}.${key} = ${value}`,
+            },
+            LogLevel.VERBOSE
+          );
+        }
+
+        this.state[path].attrs = { ...this.state[path].attrs, ...attrs };
       },
       resourceAttributes: (path: string) => {
-        return this.getResourceConfig(path).attrs;
+        return this.state[path].attrs;
       },
     };
   }
 
-  private _addTrace(event: Trace) {
+  private addTrace(event: Trace) {
     event = Object.freeze(event);
     for (const sub of this._traceSubscribers) {
       sub.callback(event);
@@ -670,40 +969,6 @@ export class Simulator {
     this._traces.push(event);
   }
 
-  private tryResolveToken(s: string): { resolved: boolean; value: any } {
-    const ref = s.slice(2, -1);
-    const [_, path, rest] = ref.split("#");
-    const config = this.getResourceConfig(path);
-    if (rest.startsWith("attrs.")) {
-      const attrName = rest.slice(6);
-      const attr = config?.attrs[attrName];
-
-      // we couldn't find the attribute. this doesn't mean it doesn't exist, it's just likely
-      // that this resource haven't been started yet. so return `undefined`, which will cause
-      // this resource to go back to the init queue.
-      if (!attr) {
-        return { resolved: false, value: undefined };
-      }
-      return { resolved: true, value: attr };
-    } else if (rest.startsWith("props.")) {
-      if (!config.props) {
-        throw new Error(
-          `Tried to resolve token "${s}" but resource ${path} has no props defined.`
-        );
-      }
-      const propPath = rest.slice(6);
-      const value = config.props[propPath];
-      if (value === undefined) {
-        throw new Error(
-          `Tried to resolve token "${s}" but resource ${path} has no prop "${propPath}".`
-        );
-      }
-      return { resolved: true, value };
-    } else {
-      throw new Error(`Invalid token reference: "${ref}"`);
-    }
-  }
-
   /**
    * Return an object with all tokens in it resolved to their appropriate values.
    *
@@ -718,82 +983,118 @@ export class Simulator {
    * @returns `undefined` if the token could not be resolved (e.g. needs a dependency), otherwise
    * the resolved value.
    */
-  private tryResolveTokens(obj: any): { resolved: boolean; value: any } {
-    if (typeof obj === "string") {
-      // there are two cases - a token can be the entire string, or it can be part of the string.
-      // first, check if the entire string is a token
-      if (SIMULATOR_TOKEN_REGEX_FULL.test(obj)) {
-        const { resolved, value } = this.tryResolveToken(obj);
-        if (!resolved) {
-          return { resolved: false, value: undefined };
-        }
-        return { resolved: true, value };
+  private resolveTokens(resolver: string, obj: any): any {
+    return resolveTokens(obj, (token) => {
+      const target = this._model.graph.tryFind(token.path);
+      if (!target) {
+        throw new Error(
+          `Could not resolve token "${token}" because the resource at path "${token.path}" does not exist.`
+        );
       }
 
-      // otherwise, check if the string contains tokens inside it. if so, we need to resolve them
-      // and then check if the result is a string
-      const globalRegex = new RegExp(SIMULATOR_TOKEN_REGEX.source, "g");
-      const matches = obj.matchAll(globalRegex);
-      const replacements = [];
-      for (const match of matches) {
-        const { resolved, value } = this.tryResolveToken(match[0]);
-        if (!resolved) {
-          return { resolved: false, value: undefined };
-        }
-        if (typeof value !== "string") {
-          throw new Error(
-            `Expected token "${
-              match[0]
-            }" to resolve to a string, but it resolved to ${typeof value}.`
+      const r = this.getResourceConfig(target.path);
+
+      if (token.attr) {
+        const value = r.attrs[token.attr];
+        if (value === undefined) {
+          throw new UnresolvedTokenError(
+            `Unable to resolve attribute '${token.attr}' for resource "${target.path}" referenced by "${resolver}"`
           );
         }
-        replacements.push({ match, value });
+        return value;
       }
 
-      // replace all the tokens in reverse order, and return the result
-      // if a token returns another token (god forbid), do not resolve it again
-      let result = obj;
-      for (const { match, value } of replacements.reverse()) {
-        if (match.index === undefined) {
-          throw new Error(`unexpected error: match.index is undefined`);
-        }
-        result =
-          result.slice(0, match.index) +
-          value +
-          result.slice(match.index + match[0].length);
+      if (token.prop) {
+        return r.props[token.prop];
       }
-      return { resolved: true, value: result };
-    }
 
-    if (Array.isArray(obj)) {
-      const result = [];
-      for (const x of obj) {
-        const { resolved, value } = this.tryResolveTokens(x);
-        if (!resolved) {
-          return { resolved: false, value: undefined };
-        }
-        result.push(value);
+      throw new Error(`Invalid token: ${token}`);
+    });
+  }
+
+  /**
+   * Given the "current" set of resources and a "next" set of resources, calculate the diff and
+   * determine which resources need to be added, updated or deleted.
+   *
+   * Note that dependencies are not considered here but they are implicitly handled by the
+   * `startResource` and `stopResource` methods. So, for example, when a resource is updated,
+   * all of it's dependents will be stopped and started again.
+   */
+  private async planUpdate(
+    current: Record<string, BaseResourceSchema>,
+    next: Record<string, BaseResourceSchema>
+  ) {
+    // Make sure we're working on a copy of "current"
+    current = { ...current };
+
+    const added: string[] = [];
+    const updated: string[] = [];
+    const deleted: string[] = [];
+
+    for (const [path, nextConfig] of Object.entries(next)) {
+      const currConfig = current[path];
+
+      // if the resource is not in "current", it means it was added
+      if (!currConfig) {
+        added.push(nextConfig.path);
+        continue;
       }
 
-      return { resolved: true, value: result };
+      // the resource is already in "current", if it's different from "next", it means it was updated
+      if (await this.shouldReplace(path, currConfig, nextConfig)) {
+        updated.push(nextConfig.path);
+      }
+
+      // remove it from "current" so we know what's left to be deleted
+      delete current[path];
     }
 
-    if (typeof obj === "object") {
-      const ret: any = {};
-      for (const [key, v] of Object.entries(obj)) {
-        const { resolved, value } = this.tryResolveTokens(v);
-        if (!resolved) {
-          return { resolved: false, value: undefined };
-        }
-        ret[key] = value;
-      }
-      return { resolved: true, value: ret };
+    // everything left in "current" is to be deleted
+    for (const config of Object.values(current)) {
+      deleted.push(config.path);
     }
 
-    return { resolved: true, value: obj };
+    return { added, updated, deleted };
+  }
+
+  private async shouldReplace(
+    path: string,
+    oldConfig: BaseResourceSchema,
+    newConfig: BaseResourceSchema
+  ) {
+    const state = (r: BaseResourceSchema) =>
+      JSON.stringify({
+        props: r.props,
+        type: r.type,
+        policyStatements: r.policy,
+      });
+
+    const invalidated = state(oldConfig) !== state(newConfig);
+
+    // consult the resource's "plan()" method if it has one
+    const instance = this.tryGetResource(path) as ISimulatorResourceInstance;
+    const plan = instance ? await instance.plan(invalidated) : UpdatePlan.AUTO;
+
+    switch (plan) {
+      case UpdatePlan.SKIP:
+        return false;
+
+      case UpdatePlan.REPLACE:
+        return true;
+
+      case UpdatePlan.AUTO:
+        // Replace the resource if the new configuration is different from the current configuration
+        //
+        // Note: we're comparing the unresolved configurations, either of which may contain tokens.
+        // So even if the configurations may look the same, it's possible that a replacement
+        // is still necessary.
+        return invalidated;
+    }
   }
 }
 
+class UnresolvedTokenError extends Error {}
+
 /**
  * A factory that can turn resource descriptions into (inflight) resource simulations.
  */
@@ -810,16 +1111,19 @@ export interface ISimulatorFactory {
 
 class HandleManager {
   private readonly handles: Map<string, ISimulatorResourceInstance>;
+  private readonly paths: Map<string, string>; // handle -> path
   private nextHandle: number;
 
   public constructor() {
     this.handles = new Map();
+    this.paths = new Map();
     this.nextHandle = 0;
   }
 
-  public allocate(resource: ISimulatorResourceInstance): string {
+  public allocate(path: string, resource: ISimulatorResourceInstance): string {
     const handle = `sim-${this.nextHandle++}`;
     this.handles.set(handle, resource);
+    this.paths.set(handle, path);
     return handle;
   }
 
@@ -835,17 +1139,23 @@ class HandleManager {
     return this.handles.get(handle);
   }
 
+  public tryFindPath(handle: string): string | undefined {
+    return this.paths.get(handle);
+  }
+
   public deallocate(handle: string): ISimulatorResourceInstance {
     const instance = this.handles.get(handle);
     if (!instance) {
       throw new Error(`No resource found with handle "${handle}".`);
     }
     this.handles.delete(handle);
+    this.paths.delete(handle);
     return instance;
   }
 
   public reset(): void {
     this.handles.clear();
+    this.paths.clear();
     this.nextHandle = 0;
   }
 }
@@ -858,19 +1168,54 @@ export interface ISimulatorResourceInstance {
    * Perform any async initialization required by the resource. Return a map of
    * the resource's runtime attributes.
    */
-  init(): Promise<Record<string, any>>;
+  init(ctx: ISimulatorContext): Promise<Record<string, any>>;
 
   /**
    * Stop the resource and clean up any physical resources it may have created
    * (files, ports, etc).
    */
   cleanup(): Promise<void>;
+
+  /**
+   * Save the resource's state into the state directory.
+   */
+  save(statedir: string): Promise<void>;
+
+  /**
+   * Determines the update plan for applying a new configuration for this resource.
+   *
+   * If this is not implemented, the default behavior is to automatically replace the resource if
+   * the new configuration is different from the current configuration.
+   *
+   * @param invalidated Whether the new configuration is different from the current configuration.
+   */
+  plan(invalidated: boolean): Promise<UpdatePlan>;
+}
+
+/**
+ * Determines how updates are performed on this resource.
+ */
+export enum UpdatePlan {
+  /**
+   * Does nothing. This resource is already in the desired state.
+   */
+  SKIP = "SKIP",
+
+  /**
+   * Deletes the resource and creates a new instance with the new configuration.
+   */
+  REPLACE = "REPLACE",
+
+  /**
+   * Auto detect changes in new configuration and replace the resource.
+   */
+  AUTO = "AUTO",
 }
 
 /** Schema for simulator.json */
 export interface WingSimulatorSchema {
-  /** The list of resources. */
-  readonly resources: BaseResourceSchema[];
+  /** The resources, indexed by their construct path. */
+  readonly resources: Record<string, BaseResourceSchema>;
   /** The map of types. */
   readonly types: { [fqn: string]: TypeSchema };
   /** The version of the Wing SDK used to synthesize the .wsim file. */
@@ -885,31 +1230,61 @@ export interface TypeSchema {
   readonly className: string;
 }
 
-/** Schema for individual resources */
-export interface BaseResourceSchema {
-  /** The resource path from the app's construct tree. */
-  readonly path: string;
+/**
+ * Schema for individual resources.
+ * Only contains fields that need to be returned by `toSimulator()`.
+ */
+export interface ToSimulatorOutput {
   /** The type of the resource. */
   readonly type: string;
   /** The resource-specific properties needed to create this resource. */
   readonly props: { [key: string]: any };
+  /** A list of inline policy statements that define permissions for this resource. */
+  readonly policy?: PolicyStatement[];
+}
+
+/** Schema for individual resources */
+export interface BaseResourceSchema extends ToSimulatorOutput {
+  /** The resource path from the app's construct tree. */
+  readonly path: string;
+  /** An opaque tree-unique address of the resource, calculated as a SHA-1 hash of the resource path. */
+  readonly addr: string;
   /** The resource-specific attributes that are set after the resource is created. */
   readonly attrs: Record<string, any>;
-  // TODO: model dependencies
+  /** Resources that should be deployed before this resource. */
+  readonly deps?: string[];
 }
 
 /** Schema for resource attributes */
 export interface BaseResourceAttributes {
   /** The resource's simulator-unique id. */
-  readonly handle: string;
+  readonly [HANDLE_ATTRIBUTE]: string;
+}
+
+/** A policy statement that defines a permission for a resource. */
+export interface PolicyStatement {
+  /** The operation that can be performed. */
+  readonly operation: string;
+  /** The resource the operation can be performed on. */
+  readonly resourceHandle: string;
 }
 
 /** Schema for `.connections` in connections.json */
 export interface ConnectionData {
   /** The path of the source construct. */
   readonly source: string;
+  /**
+   * An operation that the source object supports.
+   * @default - no operation
+   */
+  readonly sourceOp?: string;
   /** The path of the target construct. */
   readonly target: string;
+  /**
+   * An operation that the target object supports.
+   * @default - no operation
+   */
+  readonly targetOp?: string;
   /** A name for the connection. */
   readonly name: string;
 }
@@ -919,7 +1294,9 @@ export interface ConnectionData {
  * Subject to breaking changes.
  */
 export interface SimulatorServerRequest {
-  /** The resource handle (an ID unique among resources in the simulation). */
+  /** The handle of the resource making the request. */
+  readonly caller: string;
+  /** The target resource handle (an ID unique among resources in the simulation). */
   readonly handle: string;
   /** The method to call on the resource. */
   readonly method: string;
@@ -937,3 +1314,42 @@ export interface SimulatorServerResponse {
   /** The error that occurred during the method call. */
   readonly error?: any;
 }
+
+class PolicyRegistry {
+  private readonly policies: Record<string, PolicySchema>;
+
+  constructor() {
+    this.policies = {};
+  }
+
+  public register(id: string, policy: PolicySchema) {
+    if (this.policies[id]) {
+      throw new Error(`Policy with id ${id} already registered.`);
+    }
+    this.policies[id] = policy;
+  }
+
+  public deregister(id: string) {
+    delete this.policies[id];
+  }
+
+  public checkPermission(
+    caller: string,
+    callee: string,
+    method: string
+  ): boolean {
+    for (const policy of Object.values(this.policies)) {
+      if (policy.principal === caller) {
+        for (const statement of policy.statements) {
+          if (
+            statement.resourceHandle === callee &&
+            statement.operation === method
+          ) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+}
diff --git a/libs/wingsdk/src/simulator/testing.ts b/libs/wingsdk/src/simulator/testing.ts
deleted file mode 100644
index cdebedaa1ef..00000000000
--- a/libs/wingsdk/src/simulator/testing.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { createHash } from "crypto";
-import { InflightBindings, liftObject } from "../core";
-import { IInflight, IInflightHost, Resource } from "../std";
-
-/**
- * Test utilities.
- * TODO: move this to `test/` - it should not be under `src/`
- */
-export class Testing {
-  /**
-   * Make an `IFunctionHandler`, `IQueueSetConsumerHandler` or any other handler
-   * on the fly. The resource will have a single method named "handle".
-   *
-   * The JavaScript code passed to the handler must be in the form of
-   * `async handle(event) { ... }`, and all references to resources must be
-   * made through `this.<resource>`.
-   *
-   * @param code The code of the handler.
-   * @param bindings The bindings of the handler.
-   */
-  public static makeHandler(
-    code: string,
-    bindings: InflightBindings = {}
-  ): IInflight {
-    const clients: Record<string, string> = {};
-
-    for (const [k, v] of Object.entries(bindings)) {
-      clients[k] = liftObject(v.obj);
-    }
-
-    const inflightCode = `\
-new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  ${code}
-};
-})())({
-${Object.entries(clients)
-  .map(([name, client]) => `${name}: ${client}`)
-  .join(",\n")}
-})`;
-
-    return {
-      _hash: createHash("md5").update(inflightCode).digest("hex"),
-      _toInflight: () => inflightCode,
-      _registerOnLift: (host: IInflightHost, _ops: string[]) => {
-        for (const v of Object.values(bindings)) {
-          Resource._registerOnLiftObject(v.obj, host, v.ops);
-        }
-      },
-      onLift: () => {},
-      _supportedOps: () => [],
-    };
-  }
-}
diff --git a/libs/wingsdk/src/simulator/tokens.ts b/libs/wingsdk/src/simulator/tokens.ts
new file mode 100644
index 00000000000..b2ef9023e7f
--- /dev/null
+++ b/libs/wingsdk/src/simulator/tokens.ts
@@ -0,0 +1,113 @@
+import {
+  SIMULATOR_TOKEN_REGEX,
+  SIMULATOR_TOKEN_REGEX_FULL,
+} from "../target-sim/tokens";
+
+type Token = {
+  path: string;
+  attr?: string;
+  prop?: string;
+};
+
+export function parseToken(s: string): Token {
+  const ref = s.slice(2, -1);
+  const parts = ref.split("#");
+  if (parts.length !== 3) {
+    throw new Error(`Invalid token reference: ${s}`);
+  }
+
+  const [_, path, rest] = parts;
+
+  if (rest.startsWith("attrs.")) {
+    const attrName = rest.slice(6);
+    return { path, attr: attrName };
+  } else if (rest.startsWith("props.")) {
+    const propPath = rest.slice(6);
+    return { path, prop: propPath };
+  } else {
+    throw new Error(`Invalid token reference: ${s}`);
+  }
+}
+
+type TokenResolver = (token: Token) => string;
+
+/**
+ * Return an object with all tokens in it resolved to their appropriate values.
+ *
+ * A token can be a string like "${app/my_bucket#attrs.handle}". This token would be resolved to
+ * the "handle" attribute of the resource at path "app/my_bucket". If that attribute does not
+ * exist at the time of resolution (for example, if my_bucket is not being simulated yet), an
+ * error will be thrown.
+ *
+ * Tokens can also be nested, like "${app/my_bucket#attrs.handle}/foo/bar".
+ *
+ * @param obj The object to resolve tokens in.
+ * @returns The resolved token or throws an error if the token cannot be resolved.
+ */
+export function resolveTokens(obj: any, resolver: TokenResolver): any {
+  if (obj === undefined) {
+    return obj;
+  }
+
+  if (typeof obj === "string") {
+    // there are two cases - a token can be the entire string, or it can be part of the string.
+    // first, check if the entire string is a token
+    if (SIMULATOR_TOKEN_REGEX_FULL.test(obj)) {
+      return resolver(parseToken(obj));
+    }
+
+    // otherwise, check if the string contains tokens inside it. if so, we need to resolve them
+    // and then check if the result is a string
+    const globalRegex = new RegExp(SIMULATOR_TOKEN_REGEX.source, "g");
+    const matches = obj.matchAll(globalRegex);
+    const replacements = [];
+    for (const match of matches) {
+      const value = resolveTokens(match[0], resolver);
+
+      if (typeof value !== "string") {
+        throw new Error(
+          `Expected token "${
+            match[0]
+          }" to resolve to a string, but it resolved to ${typeof value}.`
+        );
+      }
+
+      replacements.push({ match, value });
+    }
+
+    // replace all the tokens in reverse order, and return the result
+    // if a token returns another token (god forbid), do not resolve it again
+    let result = obj;
+    for (const { match, value } of replacements.reverse()) {
+      if (match.index === undefined) {
+        throw new Error(`unexpected error: match.index is undefined`);
+      }
+      result =
+        result.slice(0, match.index) +
+        value +
+        result.slice(match.index + match[0].length);
+    }
+
+    return result;
+  }
+
+  if (Array.isArray(obj)) {
+    const result = [];
+    for (const x of obj) {
+      const value = resolveTokens(x, resolver);
+      result.push(value);
+    }
+
+    return result;
+  }
+
+  if (typeof obj === "object") {
+    const ret: any = {};
+    for (const [key, v] of Object.entries(obj)) {
+      ret[key] = resolveTokens(v, resolver);
+    }
+    return ret;
+  }
+
+  return obj;
+}
diff --git a/libs/wingsdk/src/simulator/util.ts b/libs/wingsdk/src/simulator/util.ts
new file mode 100644
index 00000000000..99bf23b244c
--- /dev/null
+++ b/libs/wingsdk/src/simulator/util.ts
@@ -0,0 +1,19 @@
+import { access, constants } from "node:fs";
+import { promisify } from "node:util";
+
+/**
+ * Check if a file exists for a specific path
+ * @param filePath
+ * @Returns Return `true` if the file exists, `false` otherwise.
+ */
+export async function exists(filePath: string): Promise<boolean> {
+  try {
+    await promisify(access)(
+      filePath,
+      constants.F_OK | constants.R_OK | constants.W_OK //eslint-disable-line no-bitwise
+    );
+    return true;
+  } catch (er) {
+    return false;
+  }
+}
diff --git a/libs/wingsdk/src/std/array.ts b/libs/wingsdk/src/std/array.ts
index e4c33286b83..c65097dee4f 100644
--- a/libs/wingsdk/src/std/array.ts
+++ b/libs/wingsdk/src/std/array.ts
@@ -42,7 +42,7 @@ export class Array {
   /**
    * Get the value at the given index, returning nil if the index is out of bounds.
    *
-   * @macro ($self$.at($args$))
+   * @macro $self$.at($args$)
    *
    * @param index index of the value to get
    * @returns the value at the given index, or undefined if the index is out of bounds
@@ -125,6 +125,21 @@ export class Array {
     searchElement;
     throw new Error("Macro");
   }
+
+  /**
+   * Returns a shallow copy of a portion of the array.
+   *
+   * @macro $self$.slice($args$)
+   *
+   * @param start the beginning index of the slice, inclusive.
+   * @param end the ending index of the slice, exclusive.
+   * @returns a new array containing the sliced elements.
+   */
+  public slice(start?: number, end?: number): Array {
+    start;
+    end;
+    throw new Error("Macro");
+  }
 }
 
 /**
@@ -236,12 +251,15 @@ export class MutArray {
   }
 
   /**
-   * Add value to end of array
-   * @param value value to add
+   * Add values to end of array
+   *
+   * @macro $self$.push($args$)
+   *
+   * @param values values to add
    */
-  public push(value: T1): void {
-    value;
-    throw new Error("Abstract");
+  public push(...values: T1[]): void {
+    values;
+    throw new Error("Macro");
   }
 
   /**
@@ -308,4 +326,19 @@ export class MutArray {
     value;
     throw new Error("Macro");
   }
+
+  /**
+   * Returns a shallow copy of a portion of the array.
+   *
+   * @macro $self$.slice($args$)
+   *
+   * @param start the beginning index of the slice, inclusive.
+   * @param end the ending index of the slice, exclusive.
+   * @returns a new array containing the sliced elements.
+   */
+  public slice(start?: number, end?: number): MutArray {
+    start;
+    end;
+    throw new Error("Macro");
+  }
 }
diff --git a/libs/wingsdk/src/std/bool.ts b/libs/wingsdk/src/std/bool.ts
index d5af712c398..74b9468c872 100644
--- a/libs/wingsdk/src/std/bool.ts
+++ b/libs/wingsdk/src/std/bool.ts
@@ -15,7 +15,7 @@ export class Boolean {
    */
   public static fromJson(json: Json, options?: JsonValidationOptions): boolean {
     const schema = JsonSchema._createJsonSchema({
-      id: "bool",
+      $id: "bool",
       type: "boolean",
     } as any);
     schema.validate(json, options);
diff --git a/libs/wingsdk/src/std/datetime.ts b/libs/wingsdk/src/std/datetime.ts
index 49d43f132b5..92cf5bf82ff 100644
--- a/libs/wingsdk/src/std/datetime.ts
+++ b/libs/wingsdk/src/std/datetime.ts
@@ -1,4 +1,6 @@
+import { ILiftable } from "./resource";
 import { InflightClient } from "../core/inflight";
+import { normalPath } from "../shared/misc";
 
 /**
  * Interface that is used for setting Datetime date
@@ -42,7 +44,7 @@ export interface DatetimeComponents {
  * Represents a local or UTC date object
  * @wingType datetime
  */
-export class Datetime {
+export class Datetime implements ILiftable {
   /**
    * @internal
    */
@@ -114,6 +116,13 @@ export class Datetime {
     this._timezoneOffset = timezoneOffset;
   }
 
+  /** @internal */
+  public _toInflight(): string {
+    return `(require("${normalPath(
+      __filename
+    )}").Datetime.fromIso("${this.toIso()}"))`;
+  }
+
   /**
    * Return a timestamp of non-leap year seconds since epoch
    *
diff --git a/libs/wingsdk/src/std/duration.ts b/libs/wingsdk/src/std/duration.ts
index 749050f93ec..dbf6e32ece4 100644
--- a/libs/wingsdk/src/std/duration.ts
+++ b/libs/wingsdk/src/std/duration.ts
@@ -1,10 +1,12 @@
+import { ILiftable } from "./resource";
 import { InflightClient } from "../core";
+import { normalPath } from "../shared/misc";
 
 /**
  * Represents a length of time.
  * @wingType duration
  */
-export class Duration {
+export class Duration implements ILiftable {
   /**
    * @internal
    */
@@ -146,4 +148,11 @@ export class Duration {
   public get years() {
     return this.days / 365;
   }
+
+  /** @internal */
+  public _toInflight(): string {
+    return `(new (require("${normalPath(__filename)}").Duration)(${
+      this.seconds
+    }))`;
+  }
 }
diff --git a/libs/wingsdk/src/std/index.ts b/libs/wingsdk/src/std/index.ts
index 047718ff152..d5f77f4e326 100644
--- a/libs/wingsdk/src/std/index.ts
+++ b/libs/wingsdk/src/std/index.ts
@@ -8,7 +8,7 @@ export * from "./json_schema";
 export * from "./map";
 export * from "./node";
 export * from "./number";
-export * from "./range";
+export * from "./regex";
 export * from "./resource";
 export * from "./set";
 export * from "./string";
diff --git a/libs/wingsdk/src/std/json.ts b/libs/wingsdk/src/std/json.ts
index 2cf60ebd942..26a08e70a5a 100644
--- a/libs/wingsdk/src/std/json.ts
+++ b/libs/wingsdk/src/std/json.ts
@@ -40,7 +40,7 @@ export class Json {
   /**
    * Returns the keys from the Json.
    *
-   * @macro (Object.keys($args$))
+   * @macro Object.keys($args$)
    *
    * @param json map to get the keys from
    * @returns the keys as Array<String>
@@ -53,7 +53,7 @@ export class Json {
   /**
    * Returns the values from the Json.
    *
-   * @macro (Object.values($args$))
+   * @macro Object.values($args$)
    *
    * @param json map to get the values from
    * @returns the values as Array<Json>
@@ -76,7 +76,7 @@ export class Json {
   /**
    * Deletes a key in a given Json
    *
-   * @macro ((args) => { delete (args[0])[args[1]]; })([$args$])
+   * @macro ((json, key) => { delete json[key]; })($args$)
    *
    * @param json to delete key from
    * @param key the key to delete
@@ -90,7 +90,7 @@ export class Json {
   /**
    * Formats Json as string
    *
-   * @macro ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([$args$])
+   * @macro ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })($args$)
    *
    * @param json to format as string
    * @returns string representation of the Json
@@ -120,7 +120,7 @@ export class Json {
   /**
    * Creates a mutable deep copy of the Json.
    *
-   * @macro (JSON.parse(JSON.stringify($args$)))
+   * @macro JSON.parse(JSON.stringify($args$))
    *
    * @param json to copy
    * @returns the mutable copy of the Json
@@ -133,7 +133,7 @@ export class Json {
   /**
    * Parse a string into a Json
    *
-   * @macro (JSON.parse($args$))
+   * @macro JSON.parse($args$)
    *
    * @param str to parse as Json
    * @returns Json representation of the string
@@ -155,24 +155,20 @@ export class Json {
     str;
     throw new Error("Macro");
   }
-
+  private constructor() {}
   /**
    * Checks if a Json object has a given key
    *
-   * @macro ((args) => { return args[0].hasOwnProperty(args[1]); })([$args$])
+   * @macro ((obj, key) => { return obj.hasOwnProperty(key); })($self$,$args$)
    *
-   * @param json The json object to inspect
    * @param key The key to check
    * @returns Boolean value corresponding to whether the key exists
    */
-  public static has(json: Json, key: string): boolean {
-    json;
+  public has(key: string): boolean {
     key;
     throw new Error("Macro");
   }
 
-  private constructor() {}
-
   /**
    * Returns the value associated with the specified Json key
    *
@@ -338,7 +334,7 @@ export class MutJson {
   /**
    * Adds or updates an element in MutJson with a specific key and value
    *
-   * @macro ((obj, args) => { obj[args[0]] = args[1]; })($self$, [$args$])
+   * @macro ((obj, key, value) => { obj[key] = value; })($self$, $args$)
    *
    * @param key The key of the element to add
    * @param value The value of the element to add
@@ -352,7 +348,7 @@ export class MutJson {
   /**
    * Set element in MutJson Array with a specific key and value
    *
-   * @macro ((obj, args) => { obj[args[0]] = args[1]; })($self$, [$args$])
+   * @macro ((obj, idx, value) => { obj[idx] = value; })($self$, $args$)
    *
    * @param value The value of the element to set
    */
@@ -453,4 +449,31 @@ export class MutJson {
   public tryAsBool(): boolean | undefined {
     throw new Error("Macro");
   }
+
+  /**
+   * Removes the specified element from a map.
+   *
+   * @macro (delete ($self$)[$args$])
+   *
+   * @param key The key
+   * @returns true if the given key is no longer present
+   */
+
+  public delete(key: string): boolean {
+    key;
+    throw new Error("Macro");
+  }
+
+  /**
+   * Checks if a Json object has a given key
+   *
+   * @macro ((obj, key) => { return obj.hasOwnProperty(key); })($self$,$args$)
+   *
+   * @param key The key to check
+   * @returns Boolean value corresponding to whether the key exists
+   */
+  public has(key: string): boolean {
+    key;
+    throw new Error("Macro");
+  }
 }
diff --git a/libs/wingsdk/src/std/json_schema.ts b/libs/wingsdk/src/std/json_schema.ts
index cbcbd4b4db5..b2084ef1bc8 100644
--- a/libs/wingsdk/src/std/json_schema.ts
+++ b/libs/wingsdk/src/std/json_schema.ts
@@ -1,6 +1,10 @@
-import { Validator } from "jsonschema";
+import Ajv from "ajv";
 import { Json, JsonValidationOptions } from "./json";
 import { InflightClient } from "../core";
+import {
+  extractFieldsFromSchema,
+  filterParametersBySchema,
+} from "../platform/util";
 
 /**
  * Struct Schema
@@ -25,12 +29,13 @@ export class JsonSchema {
     return new JsonSchema(schema);
   }
 
-  private jsonSchema: any;
-  private validator: Validator;
+  /** @internal */
+  public _rawSchema: any;
+  private validator: Ajv;
 
   constructor(schema: Json) {
-    this.jsonSchema = schema;
-    this.validator = new Validator();
+    this._rawSchema = schema;
+    this.validator = new Ajv({ allErrors: true, allowUnionTypes: true });
   }
 
   /**
@@ -43,14 +48,16 @@ export class JsonSchema {
     if (options?.unsafe) {
       return; // skip validation
     }
-
-    const result = this.validator.validate(obj, this.jsonSchema);
-    if (result.errors.length > 0) {
+    const validator = this.validator.compile(this._rawSchema);
+    const valid = validator(obj);
+    if (!valid) {
+      const schemaId = this._rawSchema.$id.replace("/", "");
       throw new Error(
-        `unable to parse ${this.jsonSchema.id.replace(
-          "/",
-          ""
-        )}:\n- ${result.errors.join("\n- ")}`
+        `unable to parse ${schemaId}:\n- ${validator.errors
+          ?.map(
+            (error: any) => schemaId + error.instancePath + " " + error.message
+          )
+          .join("\n- ")}`
       );
     }
   }
@@ -61,13 +68,16 @@ export class JsonSchema {
    * @returns the schema as a string
    */
   public asStr(): String {
-    return JSON.stringify(this.jsonSchema);
+    return JSON.stringify(this._rawSchema);
   }
 
   /** @internal */
   public _fromJson(obj: Json, validateOptions?: JsonValidationOptions) {
     this.validate(obj, validateOptions);
-    return obj;
+    const fields = extractFieldsFromSchema(this._rawSchema);
+    // Filter rawParameters based on the schema
+    const filteredParameters = filterParametersBySchema(fields, obj);
+    return filteredParameters;
   }
 
   /** @internal */
@@ -90,6 +100,6 @@ export class JsonSchema {
 
   /** @internal */
   public _toInflightType() {
-    return JsonSchema._toInflightType(this.jsonSchema);
+    return JsonSchema._toInflightType(this._rawSchema);
   }
 }
diff --git a/libs/wingsdk/src/std/map.ts b/libs/wingsdk/src/std/map.ts
index 5f7f21b9f13..956d2f71c90 100644
--- a/libs/wingsdk/src/std/map.ts
+++ b/libs/wingsdk/src/std/map.ts
@@ -6,6 +6,18 @@ import { Array } from "./array";
 import { T1 } from "./generics";
 import { InflightClient } from "../core";
 
+/**
+ * Array entry representation
+ *
+ * @typeparam T1
+ */
+export interface ArrayEntry {
+  /** The entry key */
+  readonly key: string;
+  /** The entry value */
+  readonly value: T1;
+}
+
 /**
  * Immutable Map
  *
@@ -42,7 +54,7 @@ export class Map {
    * @macro ((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })($self$, $args$)
    *
    * @param key The key of the element to return.
-   * @returns The element associated with the specified key, or undefined if the key can't be found
+   * @returns The element associated with the specified key, or throw an error if the key can't be found
    */
   public get(key: string): T1 {
     key;
@@ -107,6 +119,17 @@ export class Map {
   public values(): Array {
     throw new Error("Macro");
   }
+
+  /**
+   * Returns the entries from the map.
+   *
+   * @macro Object.entries($self$).map(([key, value]) => ({ key, value }))
+   *
+   * @returns the entries as Array<ArrayEntry>
+   */
+  public entries(): ArrayEntry[] {
+    throw new Error("Macro");
+  }
 }
 
 /**
@@ -178,7 +201,7 @@ export class MutMap {
    * @macro ((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })($self$, $args$)
    *
    * @param key The key of the element to return.
-   * @returns The element associated with the specified key, or undefined if the key can't be found
+   * @returns The element associated with the specified key, or throw an error if the key can't be found
    */
   public get(key: string): T1 {
     key;
@@ -247,4 +270,15 @@ export class MutMap {
   public values(): Array {
     throw new Error("Macro");
   }
+
+  /**
+   * Returns the entries from the map.
+   *
+   * @macro Object.entries($self$).map(([key, value]) => ({ key, value }))
+   *
+   * @returns the entries as Array<ArrayEntry>
+   */
+  public entries(): ArrayEntry[] {
+    throw new Error("Macro");
+  }
 }
diff --git a/libs/wingsdk/src/std/node.ts b/libs/wingsdk/src/std/node.ts
index cb0d3cfa583..8c3284d9ae1 100644
--- a/libs/wingsdk/src/std/node.ts
+++ b/libs/wingsdk/src/std/node.ts
@@ -6,7 +6,8 @@ import {
   MetadataOptions,
   IValidation,
 } from "constructs";
-import { Connections } from "../core";
+import { Connections } from "../core/connections";
+import { ParameterRegistrar } from "../platform";
 
 const NODE_SYMBOL = Symbol.for("@winglang/sdk.std.Node");
 export const APP_SYMBOL = Symbol.for("@winglang/sdk.std.Node/app");
@@ -62,6 +63,40 @@ export class Node {
    */
   public hidden?: boolean;
 
+  /**
+   * The color of the construct for display purposes.
+   * Supported colors are:
+   * - orange
+   * - sky
+   * - emerald
+   * - lime
+   * - pink
+   * - amber
+   * - cyan
+   * - purple
+   * - red
+   * - violet
+   * - slate
+   */
+  public color?: string;
+
+  /**
+   * The icon of the construct for display purposes.
+   * Supported icons are from Heroicons:
+   * - https://heroicons.com/
+   * e.g.
+   * - "academic-cap"
+   */
+  public icon?: string;
+
+  /**
+   * Whether the node is expanded or collapsed by default in the UI.
+   * By default, nodes are collapsed. Set this to `true` if you want the node to be expanded by default.
+   *
+   * @default false
+   */
+  public expanded?: boolean;
+
   private readonly _constructsNode: ConstructsNode;
   private readonly _connections: Connections;
   private _app: IApp | undefined;
@@ -77,7 +112,10 @@ export class Node {
    * metadata describing how one construct is related to another construct.
    */
   public addConnection(props: AddConnectionProps) {
-    this._connections.add(props);
+    this._connections.add({
+      source: props.source ?? this.construct,
+      ...props,
+    });
   }
 
   // ---- constructs 10.x APIs ----
@@ -396,14 +434,27 @@ export class Node {
 export interface AddConnectionProps {
   /**
    * The source of the connection.
+   * @default this
    */
-  readonly source: IConstruct;
+  readonly source?: IConstruct;
+
+  /**
+   * An operation that the source construct supports.
+   * @default - no operation
+   */
+  readonly sourceOp?: string;
 
   /**
    * The target of the connection.
    */
   readonly target: IConstruct;
 
+  /**
+   * An operation that the target construct supports.
+   * @default - no operation
+   */
+  readonly targetOp?: string;
+
   /**
    * A name for the connection.
    */
@@ -435,6 +486,11 @@ export interface IApp extends IConstruct {
    */
   readonly entrypointDir: string;
 
+  /**
+   * The application's parameter registrar
+   */
+  readonly parameters: ParameterRegistrar;
+
   /**
    * Generate a unique ID for the given scope and prefix. The newly generated ID is
    * guaranteed to be unique within the given scope.
diff --git a/libs/wingsdk/src/std/number.ts b/libs/wingsdk/src/std/number.ts
index dd02ebc6bfc..f30a0b235f3 100644
--- a/libs/wingsdk/src/std/number.ts
+++ b/libs/wingsdk/src/std/number.ts
@@ -15,7 +15,7 @@ export class Number {
    */
   public static fromJson(json: Json, options?: JsonValidationOptions): number {
     const schema = JsonSchema._createJsonSchema({
-      id: "num",
+      $id: "num",
       type: "number",
     } as any);
     schema.validate(json, options);
diff --git a/libs/wingsdk/src/std/range.ts b/libs/wingsdk/src/std/range.ts
deleted file mode 100644
index 1125d833ef8..00000000000
--- a/libs/wingsdk/src/std/range.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { InflightClient } from "../core";
-
-/**
- * Range
- */
-export class Range {
-  /**
-   * Generate a range of numbers.
-   *
-   * @param start lower bound of the range.
-   * @param end upper bound of the range.
-   * @param inclusive if true, the upper bound value is included.
-   * @returns a iterator.
-   */
-  public static of(
-    start: number,
-    end: number,
-    inclusive: boolean = false
-  ): Array<number> {
-    function* iterator(s: number, e: number, i: boolean) {
-      let x = s;
-      let limit = i ? (e < s ? e - 1 : e + 1) : e;
-      while (x < limit) yield x++;
-      while (x > limit) yield x--;
-    }
-
-    return Array.from(iterator(start, end, inclusive));
-  }
-
-  /**
-   * @internal
-   */
-  public static _toInflightType(): string {
-    return InflightClient.forType(__filename, this.name);
-  }
-
-  private constructor() {}
-}
diff --git a/libs/wingsdk/src/std/regex.ts b/libs/wingsdk/src/std/regex.ts
new file mode 100644
index 00000000000..15613303451
--- /dev/null
+++ b/libs/wingsdk/src/std/regex.ts
@@ -0,0 +1,156 @@
+import { ILiftable } from "./resource";
+import { InflightClient } from "../core";
+import { normalPath } from "../shared/misc";
+
+/**
+ * Represents a compiled regular expression pattern.
+ * @wingType regex
+ */
+export class Regex implements ILiftable {
+  /**
+   * @internal
+   */
+  public static _toInflightType(): string {
+    return InflightClient.forType(__filename, this.name);
+  }
+
+  /**
+   * Compiles the provided regex pattern into a `Regex` object.
+   * @param pattern The regex pattern to compile.
+   * @returns A new `Regex` object representing the compiled pattern.
+   */
+  public static compile(pattern: string): Regex {
+    return new Regex(pattern);
+  }
+
+  /** @internal */
+  private readonly _regex: RegExp;
+
+  /**
+   * Constructs a new `Regex` object with the specified pattern.
+   * @param pattern The regular expression pattern.
+   */
+  private constructor(pattern: string) {
+    this._regex = new RegExp(pattern);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return `(new (require("${normalPath(__filename)}").Regex)(${this._regex}))`;
+  }
+
+  /**
+   * Checks if the regular expression matches the provided text.
+   * @param text The text to check against.
+   * @returns `true` if there is a match, otherwise `false`.
+   */
+  public test(text: string): boolean {
+    return this._regex.test(text);
+  }
+
+  /**
+   * Finds the first occurrence of the pattern within the text.
+   * @param text The text to search within.
+   * @returns The first match if found, otherwise `undefined`.
+   */
+  public find(text: string): string | undefined {
+    const result = text.match(this._regex);
+    return result ? result[0] : undefined;
+  }
+
+  /**
+   * Finds the start and end index of the first match within the text.
+   * @param text The text to search within.
+   * @returns An array containing the start and end index of the match if found, otherwise `undefined`.
+   */
+  public findIndex(text: string): number[] | undefined {
+    const result = this._regex.exec(text);
+    return result ? [result.index, result.index + result[0].length] : undefined;
+  }
+
+  /**
+   * Finds the first match and its submatches.
+   * @param text The text to search within.
+   * @returns An array containing the match and all submatches.
+   */
+  public findSubmatch(text: string): string[] | undefined {
+    const result = text.match(this._regex);
+    if (result) {
+      return [result[0], ...result.slice(1)];
+    }
+    return undefined;
+  }
+
+  /**
+   * Finds the start and end index of the match and all submatches.
+   * @param text The text to search within.
+   * @returns An array containing arrays of start and end indices for the match and all submatches.
+   */
+  public findSubmatchIndex(text: string): number[][] | undefined {
+    const result = this._regex.exec(text);
+    if (!result) {
+      return undefined;
+    }
+
+    // Initialize the array with the match's start and end indices
+    const indices = [[result.index, result.index + result[0].length]];
+
+    // Add submatch indices
+    result.slice(1).forEach((submatch) => {
+      const start = text.indexOf(submatch, indices[indices.length - 1][0]);
+      const end = start + submatch.length;
+      indices.push([start, end]);
+    });
+
+    return indices;
+  }
+
+  /**
+   * Finds all non-overlapping occurrences of the pattern within the text.
+   * Returns an empty array if no matches are found.
+   * @param text The text to search within.
+   * @returns An array containing all matches found.
+   */
+  public findAll(text: string): string[] {
+    const globalRegex = this.getGlobalRegex();
+    return [...text.matchAll(globalRegex)].map((match) => match[0]);
+  }
+
+  /**
+   * Finds the start and end index of all matches within the text.
+   * Indices are zero-based.
+   * @param text The text to search within.
+   * @returns An array containing arrays of start and end indices for each match found.
+   */
+  public findAllIndex(text: string): number[][] {
+    const matches: number[][] = [];
+    const globalRegex = this.getGlobalRegex();
+
+    for (const match of text.matchAll(globalRegex)) {
+      if (match.index !== undefined) {
+        matches.push([match.index, match.index + match[0].length]);
+      }
+    }
+
+    return matches;
+  }
+
+  /**
+   * Replaces all occurrences of the match with a replacement string.
+   * @param text The text to search and replace within.
+   * @param replacement The replacement string.
+   * @returns The resulting text after all replacements.
+   */
+  public replaceAll(text: string, replacement: string): string {
+    const globalRegex = this.getGlobalRegex();
+    return text.replace(globalRegex, replacement);
+  }
+
+  /**
+   * Helper method to get the global version of a regex.
+   * @returns The current regex if it's already global, otherwise a new global regex.
+   */
+  private getGlobalRegex(): RegExp {
+    return this._regex.global ? this._regex : new RegExp(this._regex, "g");
+  }
+}
diff --git a/libs/wingsdk/src/std/resource.ts b/libs/wingsdk/src/std/resource.ts
index b1cd5e4d9f5..bd28fed4286 100644
--- a/libs/wingsdk/src/std/resource.ts
+++ b/libs/wingsdk/src/std/resource.ts
@@ -1,9 +1,6 @@
 import { Construct, IConstruct } from "constructs";
-import { Duration } from "./duration";
-import { App } from "../core";
-import { NotImplementedError, AbstractMemberError } from "../core/errors";
-import { getTokenResolver } from "../core/tokens";
-import { log } from "../shared/log";
+import { App, LiftMap } from "../core";
+import { AbstractMemberError } from "../core/errors";
 import { Node } from "../std";
 
 /**
@@ -29,12 +26,34 @@ export interface IInflightHost extends IResource {
  * @link https://www.winglang.io/docs/concepts/inflights
  * @skipDocs
  */
-export interface IInflight extends ILiftable {
+export interface IInflight extends IHostedLiftable {
   /**
-   * Tracks the content hash
+   * An opaque identifier for this inflight code. This can be used for determining
+   * whether two inflight closures are same by identity, but should not be used
+   * for any other purpose since it may not be stable across compilations.
+   *
+   * Comparing inflight closures for value equality (i.e. whether they will bundle
+   * into the same JavaScript code) isn't possible since the exact code is only
+   * resolved after all preflight code has finished running and preflight values that
+   * are referenced by the inflight closure have settled on their values.
+   *
+   * Consider e.g.
+   *
+   * ```
+   * let arr = MutArray<str>["hello"];
+   *
+   * new cloud.Function(inflight () => {
+   *   for x in arr {
+   *     log(x);
+   *   }
+   * });
+   *
+   * arr.push("world");
+   * ```
+   *
    * @internal
    */
-  _hash: string;
+  _id: number;
 }
 
 /**
@@ -42,25 +61,6 @@ export interface IInflight extends ILiftable {
  * @skipDocs
  */
 export interface ILiftable {
-  /**
-   * A hook called by the Wing compiler once for each inflight host that needs to
-   * use this object inflight. The list of requested inflight methods
-   * needed by the inflight host are given by `ops`.
-   *
-   * This method is commonly used for adding permissions, environment variables, or
-   * other capabilities to the inflight host.
-   */
-  onLift(host: IInflightHost, ops: string[]): void;
-
-  /**
-   * Register that the resource needs to be lifted to the host for the given
-   * operations. This means that the resource's `onLift` method will be called
-   * during pre-synthesis.
-   *
-   * @internal
-   */
-  _registerOnLift(host: IInflightHost, ops: string[]): void;
-
   /**
    * Return a code snippet that can be used to reference this resource inflight.
    *
@@ -70,22 +70,44 @@ export interface ILiftable {
    * @internal
    */
   _toInflight(): string;
+}
 
+/**
+ * A liftable object that needs to be registered on the host as part of
+ * the lifting process.
+ * This is generally used so the host can set up permissions
+ * to access the lifted object inflight.
+ */
+export interface IHostedLiftable extends ILiftable {
   /**
-   * Return a list of all inflight operations that are supported by this resource.
-   *
-   * If this method doesn't exist, the resource is assumed to not support any inflight operations.
-   *
+   * Compiler-generated data that describes the dependencies of this object on other
+   * objects. This is used to determine which permissions need to be granted to the
+   * inflight host.
    * @internal
    */
-  _supportedOps(): string[];
+  _liftMap?: LiftMap;
+
+  /**
+   * A hook called by the Wing compiler once for each inflight host that needs to
+   * use this object inflight. The list of requested inflight methods
+   * needed by the inflight host are given by `ops`.
+   *
+   * This method is commonly used for adding permissions, environment variables, or
+   * other capabilities to the inflight host.
+   */
+  onLift(host: IInflightHost, ops: string[]): void;
+}
+
+function hasLiftMap(x: any): x is { _liftMap: LiftMap } {
+  return x != null && typeof x._liftMap === "object";
 }
 
 /**
  * Abstract interface for `Resource`.
  * @skipDocs
+ * @noinflight
  */
-export interface IResource extends IConstruct, ILiftable {
+export interface IResource extends IConstruct, IHostedLiftable {
   /**
    * A hook for performing operations after the tree of resources has been
    * created, but before they are synthesized.
@@ -100,105 +122,30 @@ export interface IResource extends IConstruct, ILiftable {
 /**
  * Shared behavior between all Wing SDK resources.
  * @skipDocs
+ * @noinflight
  */
 export abstract class Resource extends Construct implements IResource {
   /**
-   * Register that the resource type needs to be lifted to the host for the given
-   * operations. A type being lifted to a host means that that type's static members
-   * will be lifted to the host.
+   * A hook called by the Wing compiler once for each inflight host that needs to
+   * use this type inflight. The list of requested inflight methods
+   * needed by the inflight host are given by `ops`.
    *
-   * @internal
+   * This method is commonly used for adding permissions, environment variables, or
+   * other capabilities to the inflight host.
    */
-  public static _registerOnLift(host: IInflightHost, ops: string[]): void {
-    // Do nothing by default
+  public static onLiftType(host: IInflightHost, ops: string[]): void {
     host;
     ops;
   }
 
   /**
-   * Register a lifting between an object (either data or resource) and a host.
+   * Generates an asynchronous JavaScript statement which can be used to create an inflight client
+   * for a resource.
    *
-   * - Primitives and Duration objects are ignored.
-   * - Arrays, sets and maps and structs (Objects) are recursively bound.
-   * - Resources are bound to the host by calling their onLift() method.
-   *
-   * @param obj The object to lift.
-   * @param host The host to lift to
-   * @param ops The set of operations that may access the object (use "?" to indicate that we don't
-   * know the operation)
-   *
-   * @internal
+   * NOTE: This statement must be executed within an async context.
    */
-  public static _registerOnLiftObject(
-    obj: any,
-    host: IInflightHost,
-    ops: string[] = []
-  ): void {
-    const tokens = getTokenResolver(obj);
-    if (tokens) {
-      return tokens.onLiftValue(host, obj);
-    }
-
-    switch (typeof obj) {
-      case "string":
-      case "boolean":
-      case "number":
-      case "undefined":
-        return;
-
-      case "object":
-        if (Array.isArray(obj)) {
-          obj.forEach((item) => this._registerOnLiftObject(item, host));
-          return;
-        }
-
-        if (obj instanceof Duration) {
-          return;
-        }
-
-        if (obj instanceof Set) {
-          return Array.from(obj).forEach((item) =>
-            this._registerOnLiftObject(item, host)
-          );
-        }
-
-        if (obj instanceof Map) {
-          Array.from(obj.values()).forEach((item) =>
-            this._registerOnLiftObject(item, host)
-          );
-          return;
-        }
-
-        // structs are just plain objects
-        if (obj.constructor.name === "Object") {
-          Object.values(obj).forEach((item) =>
-            this._registerOnLiftObject(item, host, ops)
-          );
-          return;
-        }
-
-        // if the object is a resource, register a lifting between it and the host.
-        if (typeof obj._addOnLift === "function") {
-          // Explicitly register the resource's `$inflight_init` op, which is a special op that can be used to makes sure
-          // the host can instantiate a client for this resource.
-          obj._addOnLift(host, [...ops, "$inflight_init"]);
-          return;
-        }
-
-        break;
-
-      case "function":
-        // If the object is actually a resource type, call the type's _registerTypeOnLift() static method
-        if (isLiftableType(obj)) {
-          obj._registerOnLift(host, ops);
-          return;
-        }
-        break;
-    }
-
-    throw new Error(
-      `unable to serialize immutable data object of type ${obj.constructor?.name}`
-    );
+  public static toInflight(obj: IResource) {
+    return obj._toInflight();
   }
 
   /**
@@ -227,15 +174,6 @@ export abstract class Resource extends Construct implements IResource {
     return App.of(scope).newAbstract(fqn, scope, id, ...props);
   }
 
-  private readonly onLiftMap: Map<IInflightHost, Set<string>> = new Map();
-
-  /**
-   * @internal
-   * */
-  public _supportedOps(): string[] {
-    return [];
-  }
-
   /**
    * Return a code snippet that can be used to reference this resource inflight.
    *
@@ -256,68 +194,10 @@ export abstract class Resource extends Construct implements IResource {
    * actually bound.
    */
   public onLift(host: IInflightHost, ops: string[]): void {
-    // Do nothing by default
     host;
     ops;
   }
 
-  /**
-   * Register that the resource needs to be bound to the host for the given
-   * operations. This means that the resource's `onLift` method will be called
-   * during pre-synthesis.
-   *
-   * @internal
-   */
-  public _registerOnLift(_host: IInflightHost, _ops: string[]) {
-    return;
-  }
-
-  /**
-   * Adds a binding between this resource and the host.
-   * @param host The host to bind to
-   * @param ops The operations that may access this resource
-   * @returns `true` if a new bind was added or `false` if there was already a bind
-   */ // @ts-ignore
-  private _addOnLift(host: IInflightHost, ops: string[]) {
-    log(
-      `Registering a binding for a resource (${this.node.path}) to a host (${
-        host.node.path
-      }) with ops: ${JSON.stringify(ops)}`
-    );
-
-    // Register the binding between this resource and the host
-    if (!this.onLiftMap.has(host)) {
-      this.onLiftMap.set(host, new Set());
-    }
-
-    const opsForHost = this.onLiftMap.get(host)!;
-
-    // For each operation, check if the host supports it. If it does, register the binding.
-    const supportedOps = [...(this._supportedOps() ?? []), "$inflight_init"];
-    for (const op of ops) {
-      if (!supportedOps.includes(op)) {
-        throw new NotImplementedError(
-          `Resource ${this.node.path} does not support inflight operation ${op} (requested by ${host.node.path}).\nIt might not be implemented yet.`
-        );
-      }
-
-      if (!opsForHost.has(op)) {
-        // first add the operation to the set of operations for the host so that we can avoid
-        // infinite recursion.
-        opsForHost.add(op);
-
-        this._registerOnLift(host, [op]);
-
-        // add connection metadata
-        Node.of(this).addConnection({
-          source: host,
-          target: this,
-          name: op.endsWith("()") ? op : `${op}()`,
-        });
-      }
-    }
-  }
-
   /**
    * A hook for performing operations after the tree of resources has been
    * created, but before they are synthesized.
@@ -327,40 +207,84 @@ export abstract class Resource extends Construct implements IResource {
    * @internal
    */
   public _preSynthesize(): void {
-    // Perform the live bindings between resources and hosts
-    // By aggregating the binding operations, we can avoid performing
-    // multiple bindings for the same resource-host pairs.
-    for (const [host, ops] of this.onLiftMap.entries()) {
-      this.onLift(host, Array.from(ops));
+    if (hasLiftMap(this) && !(this instanceof AutoIdResource)) {
+      addConnectionsFromLiftMap(this, this._liftMap);
+    }
+  }
+}
+
+function addConnectionsFromLiftMap(
+  construct: IConstruct,
+  liftData: LiftMap,
+  baseOp?: string
+) {
+  for (const [op, liftEntries] of Object.entries(liftData)) {
+    for (const [dep, depOps] of liftEntries) {
+      if (Construct.isConstruct(dep) && !(dep instanceof AutoIdResource)) {
+        // case 1: dep is an ordinary resource
+        for (const depOp of depOps) {
+          Node.of(construct).addConnection({
+            source: construct,
+            sourceOp: baseOp ?? op,
+            target: dep,
+            targetOp: depOp,
+            name: "call",
+          });
+        }
+      } else if (hasLiftMap(dep)) {
+        // case 2: dep is an inflight
+        addConnectionsFromLiftMap(construct, dep._liftMap, baseOp ?? op);
+      }
     }
   }
 }
 
 /**
- * Annotations about what resources an inflight operation may access.
- *
- * The following example says that the operation may call "put" on a resource
- * at "this.inner", or it may call "get" on a resource passed as an argument named
- * "other".
- * @example
- * { "this.inner": { ops: ["put"] }, "other": { ops: ["get"] } }
- *
- * @internal
+ * A resource that has an automatically generated id.
+ * Used by the Wing compiler to generate unique ids for auto generated resources
+ * from inflight function closures.
+ * @noinflight
  */
-export interface OperationAnnotation {
-  [resource: string]: {
-    ops: string[];
-  };
+export abstract class AutoIdResource extends Resource {
+  constructor(scope: Construct, idPrefix: string = "") {
+    const id = App.of(scope).makeId(scope, idPrefix ? `${idPrefix}_` : "");
+    super(scope, id);
+  }
 }
 
-function isLiftable(t: any): t is ILiftable {
-  return (
-    t !== undefined &&
-    typeof t.onLift === "function" &&
-    typeof t._registerOnLift === "function"
-  );
+/**
+ * Annotations about preflight data and desired inflight operations.
+ */
+export interface LiftAnnotation {
+  /**
+   * Preflight object to lift
+   */
+  readonly obj: any;
+
+  /**
+   * Name of the object in the inflight context.
+   * Required if the object provided is not an identifier.
+   * @default "obj" If the object is a simple identifier, it will be used as the alias
+   */
+  readonly alias?: string;
+
+  /**
+   * Operations to lift on the object.
+   * @default * All possible operations will be available
+   */
+  readonly ops?: string[];
 }
 
-function isLiftableType(t: any): t is ILiftable {
-  return typeof t._registerOnLift === "function" && isLiftable(t.prototype);
+/** Options for the `@inflight` intrinsic */
+export interface ImportInflightOptions {
+  /**
+   * Name of exported function
+   * @default "default"
+   * */
+  readonly export?: string;
+  /**
+   * Mapping of available symbols to a lift declaration
+   * @default * All possible operations will be available
+   */
+  readonly lifts?: LiftAnnotation[];
 }
diff --git a/libs/wingsdk/src/std/string.ts b/libs/wingsdk/src/std/string.ts
index f0d77b13ee4..82cff5cfe1e 100644
--- a/libs/wingsdk/src/std/string.ts
+++ b/libs/wingsdk/src/std/string.ts
@@ -26,7 +26,7 @@ export class String {
    */
   public static fromJson(json: Json, options?: JsonValidationOptions): string {
     const schema = JsonSchema._createJsonSchema({
-      id: "string",
+      $id: "string",
       type: "string",
     } as any);
     schema.validate(json, options);
diff --git a/libs/wingsdk/src/std/struct.ts b/libs/wingsdk/src/std/struct.ts
index 237d6001f68..532cb2b9a83 100644
--- a/libs/wingsdk/src/std/struct.ts
+++ b/libs/wingsdk/src/std/struct.ts
@@ -19,7 +19,7 @@ export class Struct {
   /**
    * Converts a Json to a Struct
    *
-   * @macro ((json, validateOptions) => ($self$._fromJson(json, validateOptions)))($args$)
+   * @macro $self$._fromJson($args$)
    */
   public static fromJson(json: Json, options?: JsonValidationOptions): T1 {
     json;
@@ -30,7 +30,7 @@ export class Struct {
   /**
    * Converts a Json to a Struct, returning nil if the Json is not valid
    *
-   * @macro ((json) => ($self$._tryFromJson(json)))($args$)
+   * @macro $self$._tryFromJson($args$)
    */
   public static tryFromJson(json: Json): T1 | undefined {
     json;
@@ -40,7 +40,7 @@ export class Struct {
   /**
    * Parse a Json string into a Struct
    *
-   * @macro ((json) => ($self$._fromJson(JSON.parse(json))))($args$)
+   * @macro $self$._fromJson(JSON.parse($args$))
    */
   public static parseJson(json: string): T1 {
     json;
@@ -50,7 +50,7 @@ export class Struct {
   /**
    * Parse a Json string into a Struct, returning nil if the Json is not valid
    *
-   * @macro ((json) => ($self$._tryParseJson(json)))($args$)
+   * @macro $self$._tryParseJson($args$)
    */
   public static tryParseJson(json: string | undefined): T1 | undefined {
     json;
@@ -59,7 +59,7 @@ export class Struct {
 
   /**
    * Retrieve the schema for this struct
-   * @macro ($self$)
+   * @macro $self$
    */
   public static schema(): JsonSchema {
     throw new Error("Macro");
diff --git a/libs/wingsdk/src/std/test-runner.ts b/libs/wingsdk/src/std/test-runner.ts
index 44f18427b82..49410dc0c49 100644
--- a/libs/wingsdk/src/std/test-runner.ts
+++ b/libs/wingsdk/src/std/test-runner.ts
@@ -1,7 +1,9 @@
 import { Construct } from "constructs";
 import { Resource } from "./resource";
 import { Test } from "./test";
+import { Function, FunctionProps, IFunctionHandler } from "../cloud";
 import { fqnForType } from "../constants";
+import { App, LiftMap } from "../core";
 import { Node } from "../std";
 
 /**
@@ -23,6 +25,47 @@ export interface TestRunnerProps {}
  * @abstract
  */
 export class TestRunner extends Resource {
+  /**
+   * Instantiate one or more copies of a tree inside of an app based
+   * on how many isolated environments are needed for testing.
+   * @internal
+   */
+  public static _createTree(app: App, Root: any) {
+    if (app.isTestEnvironment) {
+      app._testRunner = new TestRunner(app, "cloud.TestRunner");
+    }
+
+    if (Root) {
+      // mark the root type so that we can find it later through
+      // Node.of(root).root
+      Node._markRoot(Root);
+
+      if (app.isTestEnvironment) {
+        new Root(app, "env0");
+        const tests = app._testRunner!.findTests();
+        for (let i = 1; i < tests.length; i++) {
+          new Root(app, "env" + i);
+        }
+      } else {
+        new Root(app, "Default");
+      }
+    }
+  }
+
+  /**
+   * List of isolated environment names where we've already created a cloud.Function
+   * for a unit test. We keep track of these so that we don't synthesize
+   * multiple test functions into the same isolated environment.
+   */
+  private _synthedEnvs: Set<string> = new Set();
+
+  /**
+   * List of test paths that we have already created a cloud.Function for.
+   * We keep track of these so that we don't create identical test functions in multiple
+   * isolated environments.
+   */
+  private _synthedTests: Set<string> = new Set();
+
   constructor(scope: Construct, id: string, props: TestRunnerProps = {}) {
     if (new.target === TestRunner) {
       return Resource._newFromFactory(TEST_RUNNER_FQN, scope, id, props);
@@ -39,11 +82,38 @@ export class TestRunner extends Resource {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      TestRunnerInflightMethods.LIST_TESTS,
-      TestRunnerInflightMethods.RUN_TEST,
-    ];
+  public _addTestFunction(
+    scope: Construct,
+    id: string,
+    inflight: IFunctionHandler,
+    props: FunctionProps
+  ): Function | undefined {
+    // searching exactly for `env${number}`
+    const testEnv = scope.node.path.match(/env[0-9]+/)?.at(0)!;
+    // searching for the rest of the path that appears after `env${number}`- this would be the test path
+    const testPath =
+      scope.node.path
+        .match(/env[\d]+\/.+/)
+        ?.at(0)!
+        .replace(`${testEnv}/`, "") +
+      "/" +
+      id;
+
+    if (!this._synthedEnvs.has(testEnv) && !this._synthedTests.has(testPath)) {
+      this._synthedEnvs.add(testEnv);
+      this._synthedTests.add(testPath);
+      return new Function(scope, id, inflight, props);
+    }
+
+    return undefined;
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      [TestRunnerInflightMethods.LIST_TESTS]: [],
+      [TestRunnerInflightMethods.RUN_TEST]: [],
+    };
   }
 
   /**
@@ -99,6 +169,21 @@ export interface TestResult {
    */
   readonly unsupported?: boolean;
 
+  /**
+   * Unsupported resource tested
+   */
+  readonly unsupportedResource?: string;
+
+  /**
+   * Unsupported method used in test
+   */
+  readonly unsupportedOperation?: string;
+
+  /**
+   * Place for extra test runner arguments that can be added through platforms
+   */
+  readonly args?: Record<string, unknown>;
+
   /**
    * The error message if the test failed.
    */
@@ -135,6 +220,11 @@ export interface Trace {
    */
   readonly type: TraceType;
 
+  /**
+   * The log level of the event.
+   */
+  readonly level: LogLevel;
+
   /**
    * The timestamp of the event, in ISO 8601 format.
    * @example 2020-01-01T00:00:00.000Z
@@ -142,11 +232,40 @@ export interface Trace {
   readonly timestamp: string;
 }
 
+/**
+ * Log level
+ */
+export enum LogLevel {
+  /**
+   * Mostly used for debugging
+   */
+  VERBOSE = "verbose",
+
+  /**
+   * Information that is useful to developers
+   */
+  INFO = "info",
+
+  /**
+   * Warnings that are not errors, but may require attention
+   */
+  WARNING = "warning",
+
+  /**
+   * Errors that should be addressed
+   */
+  ERROR = "error",
+}
+
 /**
  * The type of a trace.
  * @skipDocs
  */
 export enum TraceType {
+  /**
+   * A trace representing simulator activity.
+   */
+  SIMULATOR = "simulator",
   /**
    * A trace representing a resource activity.
    */
diff --git a/libs/wingsdk/src/std/test.ts b/libs/wingsdk/src/std/test.ts
index 2f8e493be0c..d4314646313 100644
--- a/libs/wingsdk/src/std/test.ts
+++ b/libs/wingsdk/src/std/test.ts
@@ -1,9 +1,8 @@
 import { Construct } from "constructs";
-import { Resource } from "./resource";
 import { Function, FunctionProps } from "../cloud/function";
 import { fqnForType } from "../constants";
-import { App } from "../core";
-import { Node, IInflight } from "../std";
+import { App, LiftMap } from "../core";
+import { Node, IInflight, Resource } from "../std";
 
 /**
  * Global identifier for `Test`.
@@ -18,10 +17,16 @@ export const TEST_FQN = fqnForType("std.Test");
  */
 export interface TestProps extends FunctionProps {}
 
+/**
+ * Inflight interface for `Test`.
+ * @skipDocs
+ */
+export interface ITestClient {}
+
 /**
  * A unit test.
  *
- * @inflight `@winglang/sdk.cloud.ITestClient`
+ * @inflight `@winglang/sdk.std.ITestClient`
  * @skipDocs
  */
 export class Test extends Resource {
@@ -43,14 +48,20 @@ export class Test extends Resource {
     Node.of(this).title = "Test";
     Node.of(this).description = "A cloud unit test.";
 
-    if (App.of(this).isTestEnvironment || App.of(this)._target === "sim") {
-      this._fn = new Function(this, "Handler", inflight, props);
+    this._fn = App.of(this)?._testRunner?._addTestFunction(
+      this,
+      "Handler",
+      inflight,
+      props
+    );
+    if (!this._fn) {
+      Node.of(this).hidden = true;
     }
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [];
+  public get _liftMap(): LiftMap {
+    return {};
   }
 
   /** @internal */
diff --git a/libs/wingsdk/src/target-sim/api.inflight.ts b/libs/wingsdk/src/target-sim/api.inflight.ts
index 1d34b97c0fd..5f5b55af5b2 100644
--- a/libs/wingsdk/src/target-sim/api.inflight.ts
+++ b/libs/wingsdk/src/target-sim/api.inflight.ts
@@ -1,17 +1,21 @@
+import * as fs from "fs";
 import { Server } from "http";
-import { AddressInfo } from "net";
+import { AddressInfo, Socket } from "net";
+import { join } from "path";
 import express from "express";
 import { IEventPublisher } from "./event-mapping";
 import {
   ApiAttributes,
-  ApiRoute,
   ApiSchema,
+  ApiRoute,
   EventSubscription,
 } from "./schema-resources";
+import { exists } from "./util";
 import {
   API_FQN,
   ApiRequest,
   ApiResponse,
+  DEFAULT_RESPONSE_STATUS,
   IApiClient,
   IFunctionClient,
   parseHttpMethod,
@@ -20,24 +24,41 @@ import {
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
-import { TraceType } from "../std";
+import { LogLevel, TraceType } from "../std";
 
 const LOCALHOST_ADDRESS = "127.0.0.1";
 
+const STATE_FILENAME = "state.json";
+
+/**
+ * Contents of the state file for this resource.
+ */
+interface StateFileContents {
+  /**
+   * The last port used by the API server on a previous simulator run.
+   */
+  readonly lastPort?: number;
+}
+
+interface ApiRouteWithFunctionHandle extends ApiRoute {
+  functionHandle: string;
+  expressLayer: any;
+}
+
 export class Api
   implements IApiClient, ISimulatorResourceInstance, IEventPublisher
 {
-  private readonly routes: ApiRoute[];
-  private readonly context: ISimulatorContext;
+  private readonly routes: ApiRouteWithFunctionHandle[];
+  private _context: ISimulatorContext | undefined;
   private readonly app: express.Application;
   private server: Server | undefined;
   private url: string | undefined;
+  private port: number | undefined;
 
-  constructor(props: ApiSchema["props"], context: ISimulatorContext) {
-    props;
+  constructor(props: ApiSchema) {
     this.routes = [];
-    this.context = context;
     const { corsHeaders } = props;
 
     // Set up an express server that handles the routes.
@@ -73,20 +94,148 @@ export class Api
     }
   }
 
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<ApiAttributes> {
+    this._context = context;
+    // Check for a previous state file to see if there was a port that was previously being used
+    // if so, try to use it out of convenience
+    let lastPort: number | undefined;
+    const state: StateFileContents = await this.loadState();
+    if (state.lastPort) {
+      const portAvailable = await isPortAvailable(state.lastPort);
+      if (portAvailable) {
+        lastPort = state.lastPort;
+      }
+    }
+
+    // `server.address()` returns `null` until the server is listening
+    // on a port. We use a promise to wait for the server to start
+    // listening before returning the URL.
+    const addrInfo: AddressInfo = await new Promise((resolve, reject) => {
+      this.server = this.app.listen(lastPort ?? 0, LOCALHOST_ADDRESS, () => {
+        const addr = this.server?.address();
+        if (addr && typeof addr === "object" && (addr as AddressInfo).port) {
+          resolve(addr);
+        } else {
+          reject(new Error("No address found"));
+        }
+      });
+    });
+    this.port = addrInfo.port;
+    this.url = `http://${addrInfo.address}:${addrInfo.port}`;
+
+    this.addTrace(`Server listening on ${this.url}`, LogLevel.VERBOSE);
+
+    return {
+      url: this.url,
+    };
+  }
+
+  public async cleanup(): Promise<void> {
+    this.addTrace(`Closing server on ${this.url}`, LogLevel.VERBOSE);
+
+    return new Promise((resolve, reject) => {
+      this.server?.close((err) => {
+        if (err) {
+          return reject(err);
+        }
+
+        this.server?.closeAllConnections();
+        return resolve();
+      });
+    });
+  }
+
+  public async save(): Promise<void> {
+    await this.saveState({ lastPort: this.port });
+  }
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
+  private async loadState(): Promise<StateFileContents> {
+    const stateFileExists = await exists(
+      join(this.context.statedir, STATE_FILENAME)
+    );
+    if (stateFileExists) {
+      const stateFileContents = await fs.promises.readFile(
+        join(this.context.statedir, STATE_FILENAME),
+        "utf-8"
+      );
+      return JSON.parse(stateFileContents);
+    } else {
+      return {};
+    }
+  }
+
+  private async saveState(state: StateFileContents): Promise<void> {
+    fs.writeFileSync(
+      join(this.context.statedir, STATE_FILENAME),
+      JSON.stringify(state)
+    );
+  }
+
   public async addEventSubscription(
     subscriber: string,
     subscriptionProps: EventSubscription
   ): Promise<void> {
     const routes = (subscriptionProps as any).routes as ApiRoute[];
-    routes.forEach((r) => {
+    for (const route of routes) {
       const s = {
         functionHandle: subscriber,
-        method: r.method,
-        path: r.path,
+        method: route.method,
+        pathPattern: route.pathPattern,
       };
-      this.routes.push(s);
       this.populateRoute(s, subscriber);
-    });
+
+      // Keep track of the internal express function so we can remove it later
+      // Each layer object in express looks something like this:
+      //
+      // Layer {
+      //   handle: [Function: bound dispatch],
+      //   name: 'bound dispatch',
+      //   params: undefined,
+      //   path: undefined,
+      //   keys: [ [Object] ],
+      //   regexp: /^\/foo\/(?:([^\/]+?))\/?$/i { fast_star: false, fast_slash: false },
+      //   route: Route { path: '/foo/:bar', stack: [Array], methods: [Object] }
+      // }
+      const expressRouteHandle =
+        this.app._router.stack[this.app._router.stack.length - 1];
+      this.routes.push({
+        ...s,
+        expressLayer: expressRouteHandle,
+      });
+    }
+  }
+
+  public async removeEventSubscription(subscriber: string): Promise<void> {
+    const index = this.routes.findIndex((s) => s.functionHandle === subscriber);
+    if (index === -1) {
+      this.addTrace(
+        `Internal error: No route found for subscriber ${subscriber}.`,
+        LogLevel.WARNING
+      );
+      return;
+    }
+    const layer = this.routes[index].expressLayer;
+    const layerIndex = this.app._router.stack.indexOf(layer);
+    if (layerIndex === -1) {
+      this.addTrace(
+        `Internal error: No express layer found for route ${this.routes[index].pathPattern}.`,
+        LogLevel.WARNING
+      );
+      return;
+    }
+    this.app._router.stack.splice(layerIndex, 1);
+    this.routes.splice(index, 1);
   }
 
   private populateRoute(route: ApiRoute, functionHandle: string): void {
@@ -100,92 +249,58 @@ export class Api
       | "patch"
       | "connect";
 
-    const fnClient = this.context.findInstance(
-      functionHandle
-    ) as IFunctionClient & ISimulatorResourceInstance;
-    if (!fnClient) {
-      throw new Error("No function client found!");
-    }
-
+    const fnClient = this.context.getClient(functionHandle) as IFunctionClient;
     this.app[method](
-      transformRoutePath(route.path),
-      async (
-        req: express.Request,
-        res: express.Response,
-        next: express.NextFunction
-      ) => {
-        this.addTrace(
-          `Processing "${route.method} ${route.path}" params=${JSON.stringify(
-            req.params
-          )}).`
-        );
-
-        const apiRequest = transformRequest(req);
-
-        try {
-          const response = await fnClient.invoke(
-            // TODO: clean up once cloud.Function is typed as `inflight (Json): Json`
-            apiRequest as unknown as string
+      transformRoutePath(route.pathPattern),
+      asyncMiddleware(
+        async (
+          req: express.Request,
+          res: express.Response,
+          next: express.NextFunction
+        ) => {
+          this.addTrace(
+            `Processing "${route.method} ${
+              route.pathPattern
+            }" params=${JSON.stringify(req.params)}).`,
+            LogLevel.VERBOSE
           );
 
-          // TODO: clean up once cloud.Function is typed as `inflight (Json): Json`
-          if (!isApiResponse(response)) {
-            throw new Error(
-              `Expected an ApiResponse struct, found ${JSON.stringify(
-                response
-              )}`
+          const apiRequest = transformRequest(req);
+
+          try {
+            const responseString = await fnClient.invoke(
+              JSON.stringify(apiRequest)
             );
-          }
+            const response: ApiResponse = JSON.parse(responseString ?? "{}");
 
-          res.status(response.status);
-          for (const [key, value] of Object.entries(response.headers ?? {})) {
-            res.set(key, value);
-          }
-          if (response.body !== undefined) {
-            res.send(response.body);
-          } else {
-            res.end();
+            const status = response.status ?? DEFAULT_RESPONSE_STATUS;
+            res.status(status);
+            for (const [key, value] of Object.entries(
+              response?.headers ?? {}
+            )) {
+              res.set(key, value);
+            }
+            if (response?.body !== undefined) {
+              res.send(response.body);
+            } else {
+              res.end();
+            }
+            this.addTrace(
+              `${route.method} ${route.pathPattern} - ${status}.`,
+              LogLevel.VERBOSE
+            );
+          } catch (err) {
+            return next(err);
           }
-          this.addTrace(`${route.method} ${route.path} - ${response.status}.`);
-        } catch (err) {
-          return next(err);
         }
-      }
+      )
     );
   }
 
-  public async init(): Promise<ApiAttributes> {
-    // `server.address()` returns `null` until the server is listening
-    // on a port. We use a promise to wait for the server to start
-    // listening before returning the URL.
-    const addrInfo: AddressInfo = await new Promise((resolve, reject) => {
-      this.server = this.app.listen(0, LOCALHOST_ADDRESS, () => {
-        const addr = this.server?.address();
-        if (addr && typeof addr === "object" && (addr as AddressInfo).port) {
-          resolve(addr);
-        } else {
-          reject(new Error("No address found"));
-        }
-      });
-    });
-    this.url = `http://${addrInfo.address}:${addrInfo.port}`;
-
-    this.addTrace(`Server listening on ${this.url}`);
-
-    return {
-      url: this.url,
-    };
-  }
-
-  public async cleanup(): Promise<void> {
-    this.addTrace(`Closing server on ${this.url}`);
-    this.server?.close();
-    this.server?.closeAllConnections();
-  }
-
-  private addTrace(message: string): void {
+  private addTrace(message: string, level: LogLevel): void {
     this.context.addTrace({
       type: TraceType.RESOURCE,
+      level,
       data: {
         message,
       },
@@ -196,12 +311,6 @@ export class Api
   }
 }
 
-function isApiResponse(response: unknown): response is ApiResponse {
-  return (
-    (response as any).status && typeof (response as any).status === "number"
-  );
-}
-
 function transformRequest(req: express.Request): ApiRequest {
   return {
     headers: sanitizeParamLikeObject(req.headers),
@@ -217,3 +326,44 @@ function transformRoutePath(route: string): string {
   // route validation is done in the preflight file
   return route.replace(/{/g, ":").replace(/}/g, "");
 }
+
+// express v4 doesn't natively handle async request handlers, so we need to
+// wrap them in a middleware function
+function asyncMiddleware(
+  fn: (
+    req: express.Request,
+    res: express.Response,
+    next: express.NextFunction
+  ) => Promise<any>
+) {
+  return (
+    req: express.Request,
+    res: express.Response,
+    next: express.NextFunction
+  ) => {
+    Promise.resolve(fn(req, res, next)).catch(next);
+  };
+}
+
+async function isPortAvailable(port: number): Promise<boolean> {
+  return new Promise((resolve, _reject) => {
+    const s = new Socket();
+    s.once("error", (err) => {
+      s.destroy();
+      if ((err as any).code !== "ECONNREFUSED") {
+        resolve(false);
+      } else {
+        // connection refused means the port is not used
+        resolve(true);
+      }
+    });
+
+    s.once("connect", () => {
+      s.destroy();
+      // connection successful means the port is used
+      resolve(false);
+    });
+
+    s.connect(port, LOCALHOST_ADDRESS);
+  });
+}
diff --git a/libs/wingsdk/src/target-sim/api.ts b/libs/wingsdk/src/target-sim/api.ts
index c0e6e12145b..22d6d07f44f 100644
--- a/libs/wingsdk/src/target-sim/api.ts
+++ b/libs/wingsdk/src/target-sim/api.ts
@@ -1,13 +1,15 @@
 import { Construct } from "constructs";
 import { App } from "./app";
 import { EventMapping } from "./event-mapping";
-import { Function } from "./function";
+import { Policy } from "./policy";
 import { ISimulatorResource } from "./resource";
-import { ApiSchema, ApiRoute } from "./schema-resources";
+import { ApiRoute, ApiSchema } from "./schema-resources";
 import { simulatorAttrToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
+import { Function } from "../cloud";
 import * as cloud from "../cloud";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { lift } from "../core";
+import { ToSimulatorOutput } from "../simulator/simulator";
 import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
 
 /**
@@ -21,41 +23,70 @@ export class Api extends cloud.Api implements ISimulatorResource {
     { func: Function; mapping: EventMapping }
   > = {};
 
+  private readonly endpoint: cloud.Endpoint;
+  private readonly policy: Policy;
+
   constructor(scope: Construct, id: string, props: cloud.ApiProps = {}) {
     super(scope, id, props);
+
+    this.endpoint = new cloud.Endpoint(
+      this,
+      "Endpoint",
+      simulatorAttrToken(this, "url"),
+      { label: `Api ${this.node.path}` }
+    );
+
+    Node.of(this.endpoint).hidden = true;
+
+    this.policy = new Policy(this, "Policy", { principal: this });
   }
 
-  public get url(): string {
-    return simulatorAttrToken(this, "url");
+  protected get _endpoint(): cloud.Endpoint {
+    return this.endpoint;
   }
 
   private createOrGetFunction(
     inflight: cloud.IApiEndpointHandler,
     props: cloud.FunctionProps,
-    path: string,
+    pathPattern: string,
     method: cloud.HttpMethod
   ): Function {
-    let handler = this.handlers[inflight._hash];
+    let handler = this.handlers[inflight._id];
 
     if (handler) {
       const routes = (handler.mapping.eventProps.subscriptionProps as any)
         .routes as ApiRoute[];
       routes.push({
-        path,
+        pathPattern,
         method,
       });
 
       return handler.func;
     }
 
+    const functionHandler = lift({ handler: inflight }).inflight(
+      async (ctx, event) => {
+        if (!event) {
+          throw new Error("invalid API request event");
+        }
+        let req = JSON.parse(event) as cloud.ApiRequest;
+        const response = await ctx.handler(req);
+        if (!response) {
+          return undefined;
+        } else {
+          return JSON.stringify(response);
+        }
+      }
+    );
+
     const fn = new Function(
       this,
       App.of(this).makeId(this, "OnRequestHandler"),
-      inflight,
+      functionHandler,
       props
     ) as Function;
     Node.of(fn).sourceModule = SDK_SOURCE_MODULE;
-    Node.of(fn).title = `${method.toUpperCase()} ${path}`;
+    Node.of(fn).title = `${method.toUpperCase()} ${pathPattern}`;
 
     const eventMapping = new EventMapping(
       this,
@@ -66,14 +97,14 @@ export class Api extends cloud.Api implements ISimulatorResource {
         subscriptionProps: {
           routes: [
             {
-              path,
+              pathPattern,
               method,
             },
           ],
         },
       }
     );
-    this.handlers[inflight._hash] = {
+    this.handlers[inflight._id] = {
       func: fn,
       mapping: eventMapping,
     };
@@ -94,9 +125,12 @@ export class Api extends cloud.Api implements ISimulatorResource {
     const fn = this.createOrGetFunction(inflight, props, path, method);
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.ApiInflightMethods.REQUEST,
       target: fn,
-      name: `${method.toLowerCase()}()`,
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
+      name: `${method.toLowerCase()} ${path}`,
     });
+    this.policy.addStatement(fn, cloud.FunctionInflightMethods.INVOKE);
   }
 
   /**
@@ -211,21 +245,19 @@ export class Api extends cloud.Api implements ISimulatorResource {
     this.addEndpoint(path, cloud.HttpMethod.CONNECT, inflight, props);
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: ApiSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: ApiSchema = {
+      openApiSpec: this._getOpenApiSpec(),
+      corsHeaders: cloud.Api.renderCorsHeaders(this.corsOptions),
+    };
+    return {
       type: cloud.API_FQN,
-      path: this.node.path,
-      props: {
-        openApiSpec: this._getOpenApiSpec(),
-        corsHeaders: this._generateCorsHeaders(this.corsOptions),
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-sim/app.ts b/libs/wingsdk/src/target-sim/app.ts
index dc48a1c40a1..9299aaf7186 100644
--- a/libs/wingsdk/src/target-sim/app.ts
+++ b/libs/wingsdk/src/target-sim/app.ts
@@ -1,17 +1,19 @@
 import * as fs from "fs";
 import * as path from "path";
+import { IConstruct } from "constructs";
 import { Api } from "./api";
 import { Bucket } from "./bucket";
+import { SIM_CONTAINER_FQN } from "./container";
 import { Counter } from "./counter";
 import { Domain } from "./domain";
-import { DynamodbTable } from "./dynamodb-table";
+import { Endpoint } from "./endpoint";
 import { EVENT_MAPPING_FQN } from "./event-mapping";
 import { Function } from "./function";
 import { OnDeploy } from "./on-deploy";
+import { POLICY_FQN, Policy } from "./policy";
 import { Queue } from "./queue";
-import { ReactApp } from "./react-app";
 import { Redis } from "./redis";
-import { isSimulatorResource } from "./resource";
+import { SIM_RESOURCE_FQN, isSimulatorResource } from "./resource";
 import { Schedule } from "./schedule";
 import { Secret } from "./secret";
 import { Service } from "./service";
@@ -26,6 +28,7 @@ import {
   BUCKET_FQN,
   COUNTER_FQN,
   DOMAIN_FQN,
+  ENDPOINT_FQN,
   FUNCTION_FQN,
   ON_DEPLOY_FQN,
   QUEUE_FQN,
@@ -39,8 +42,13 @@ import { SDK_VERSION } from "../constants";
 import * as core from "../core";
 import { preSynthesizeAllConstructs } from "../core/app";
 import { registerTokenResolver } from "../core/tokens";
-import { TABLE_FQN, REDIS_FQN, DYNAMODB_TABLE_FQN, REACT_APP_FQN } from "../ex";
-import { TypeSchema, WingSimulatorSchema } from "../simulator/simulator";
+import { REDIS_FQN, TABLE_FQN } from "../ex";
+import {
+  BaseResourceSchema,
+  TypeSchema,
+  WingSimulatorSchema,
+} from "../simulator";
+import { resolveTokens } from "../simulator/tokens";
 import { TEST_RUNNER_FQN } from "../std";
 
 /**
@@ -51,19 +59,20 @@ export const SIMULATOR_FILE_PATH = "simulator.json";
 const SIMULATOR_CLASS_DATA = {
   [API_FQN]: "Api",
   [BUCKET_FQN]: "Bucket",
-  [COUNTER_FQN]: "Counter",
   [DOMAIN_FQN]: "Domain",
-  [DYNAMODB_TABLE_FQN]: "DynamodbTable",
+  [ENDPOINT_FQN]: "Endpoint",
   [EVENT_MAPPING_FQN]: "EventMapping",
   [FUNCTION_FQN]: "Function",
   [ON_DEPLOY_FQN]: "OnDeploy",
+  [POLICY_FQN]: "Policy",
   [QUEUE_FQN]: "Queue",
-  [REACT_APP_FQN]: "ReactApp",
   [REDIS_FQN]: "Redis",
   [SCHEDULE_FQN]: "Schedule",
   [SECRET_FQN]: "Secret",
   [SERVICE_FQN]: "Service",
   [STATE_FQN]: "State",
+  [SIM_CONTAINER_FQN]: "Container",
+  [SIM_RESOURCE_FQN]: "Resource",
   [TABLE_FQN]: "Table",
   [TEST_RUNNER_FQN]: "TestRunner",
   [TOPIC_FQN]: "Topic",
@@ -76,27 +85,17 @@ const SIMULATOR_CLASS_DATA = {
  */
 export class App extends core.App {
   public readonly outdir: string;
-  public readonly isTestEnvironment: boolean;
-
   public readonly _target = "sim";
 
-  /**
-   * The test runner for this app.
-   */
-  protected readonly testRunner: TestRunner;
-
   private synthed = false;
 
   constructor(props: core.AppProps) {
     // doesn't allow customize the root id- as used hardcoded in the code
     super(undefined as any, "root", props);
     this.outdir = props.outdir ?? ".";
-    this.isTestEnvironment = props.isTestEnvironment ?? false;
     registerTokenResolver(new SimTokens());
 
-    this.testRunner = new TestRunner(this, "cloud.TestRunner");
-
-    this.synthRoots(props, this.testRunner);
+    TestRunner._createTree(this, props.rootConstruct);
   }
 
   /** @internal */
@@ -108,14 +107,11 @@ export class App extends core.App {
       case BUCKET_FQN:
         return require.resolve("./bucket.inflight");
 
-      case COUNTER_FQN:
-        return require.resolve("./counter.inflight");
-
       case DOMAIN_FQN:
         return require.resolve("./domain.inflight");
 
-      case DYNAMODB_TABLE_FQN:
-        return require.resolve("./dynamodb-table.inflight");
+      case ENDPOINT_FQN:
+        return require.resolve("./endpoint.inflight");
 
       case EVENT_MAPPING_FQN:
         return require.resolve("./event-mapping.inflight");
@@ -126,12 +122,12 @@ export class App extends core.App {
       case ON_DEPLOY_FQN:
         return require.resolve("./on-deploy.inflight");
 
+      case POLICY_FQN:
+        return require.resolve("./policy.inflight");
+
       case QUEUE_FQN:
         return require.resolve("./queue.inflight");
 
-      case REACT_APP_FQN:
-        return require.resolve("./react-app.inflight");
-
       case REDIS_FQN:
         return require.resolve("./redis.inflight");
 
@@ -158,6 +154,12 @@ export class App extends core.App {
 
       case WEBSITE_FQN:
         return require.resolve("./website.inflight");
+
+      case SIM_CONTAINER_FQN:
+        return require.resolve("./container.inflight");
+
+      case SIM_RESOURCE_FQN:
+        return require.resolve("./resource.inflight");
     }
 
     return undefined;
@@ -177,8 +179,8 @@ export class App extends core.App {
       case DOMAIN_FQN:
         return Domain;
 
-      case DYNAMODB_TABLE_FQN:
-        return DynamodbTable;
+      case ENDPOINT_FQN:
+        return Endpoint;
 
       // EVENT_MAPPING_FQN skipped - it's not a multi-target construct
 
@@ -188,12 +190,12 @@ export class App extends core.App {
       case ON_DEPLOY_FQN:
         return OnDeploy;
 
+      case POLICY_FQN:
+        return Policy;
+
       case QUEUE_FQN:
         return Queue;
 
-      case REACT_APP_FQN:
-        return ReactApp;
-
       case REDIS_FQN:
         return Redis;
 
@@ -220,6 +222,10 @@ export class App extends core.App {
 
       case WEBSITE_FQN:
         return Website;
+
+      // SIM_CONTAINER_FQN skipped - it's not a multi-target construct
+
+      // SIM_RESOURCE_FQN skipped - it's not a multi-target construct
     }
 
     return undefined;
@@ -239,8 +245,14 @@ export class App extends core.App {
     // call preSynthesize() on every construct in the tree
     preSynthesizeAllConstructs(this);
 
+    if (this._synthHooks?.preSynthesize) {
+      this._synthHooks.preSynthesize.forEach((hook) => hook(this));
+    }
+
     // write simulator.json file into workdir
-    this.synthSimulatorFile(this.outdir);
+    const spec = this.synthSimulatorFile(this.outdir);
+
+    this.addTokenConnections(spec);
 
     // write tree.json file into workdir
     core.synthesizeTree(this, this.outdir);
@@ -250,14 +262,56 @@ export class App extends core.App {
 
     this.synthed = true;
 
+    if (this._synthHooks?.postSynthesize) {
+      this._synthHooks.postSynthesize.forEach((hook) => hook(this));
+    }
+
     return this.outdir;
   }
 
+  /**
+   * Scans the app spec for token references and adds connections to reflect
+   * this relationship.
+   *
+   * @param spec The simulator spec
+   */
+  private addTokenConnections(spec: WingSimulatorSchema) {
+    const map: Record<string, IConstruct> = {};
+    for (const c of this.node.findAll()) {
+      map[c.node.path] = c;
+    }
+
+    for (const [from, resource] of Object.entries(spec.resources)) {
+      resolveTokens(resource.props, (to) => {
+        // skip references to the "handle" of the target resource because it would be reflected by
+        // the connections created by inflight method calls.
+        if (to.attr !== "handle") {
+          core.Connections.of(this).add({
+            source: map[from],
+            target: map[to.path],
+            targetOp: to.attr,
+            name: "<ref>",
+          });
+        }
+        return "<TOKEN>"; // <-- not used
+      });
+    }
+  }
+
   private synthSimulatorFile(outdir: string) {
-    const resources = new core.DependencyGraph(this.node)
-      .topology()
-      .filter(isSimulatorResource)
-      .map((res) => res.toSimulator());
+    const resources: Record<string, BaseResourceSchema> = {};
+    for (const r of new core.DependencyGraph(this.node).topology()) {
+      if (isSimulatorResource(r)) {
+        const deps = r.node.dependencies.map((d) => d.node.path);
+        resources[r.node.path] = {
+          ...r.toSimulator(),
+          path: r.node.path,
+          addr: r.node.addr,
+          deps: deps.length === 0 ? undefined : deps,
+          attrs: undefined as any,
+        };
+      }
+    }
 
     const types: { [fqn: string]: TypeSchema } = {};
     for (const [fqn, className] of Object.entries(SIMULATOR_CLASS_DATA)) {
@@ -283,5 +337,7 @@ export class App extends core.App {
       JSON.stringify(contents, undefined, 2),
       { encoding: "utf8" }
     );
+
+    return contents;
   }
 }
diff --git a/libs/wingsdk/src/target-sim/bucket.inflight.ts b/libs/wingsdk/src/target-sim/bucket.inflight.ts
index 50250ceb5fa..884bbcf3938 100644
--- a/libs/wingsdk/src/target-sim/bucket.inflight.ts
+++ b/libs/wingsdk/src/target-sim/bucket.inflight.ts
@@ -1,10 +1,10 @@
 import * as crypto from "crypto";
 import * as fs from "fs";
-import * as os from "os";
 import { dirname, join } from "path";
 import * as url from "url";
 import mime from "mime-types";
 import { BucketAttributes, BucketSchema } from "./schema-resources";
+import { exists } from "./util";
 import {
   ITopicClient,
   BucketSignedUrlOptions,
@@ -13,36 +13,70 @@ import {
   ObjectMetadata,
   BucketPutOptions,
   BucketDeleteOptions,
+  BucketGetOptions,
+  BucketTryGetOptions,
+  BUCKET_FQN,
 } from "../cloud";
+import { deserialize, serialize } from "../simulator/serialization";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
-import { Datetime, Json } from "../std";
+import { Datetime, Json, LogLevel, TraceType } from "../std";
+
+export const METADATA_FILENAME = "metadata.json";
 
 export class Bucket implements IBucketClient, ISimulatorResourceInstance {
-  private readonly objectKeys: Set<string>;
-  private readonly _fileDir: string;
-  private readonly context: ISimulatorContext;
+  private _fileDir!: string;
+  private _context: ISimulatorContext | undefined;
   private readonly initialObjects: Record<string, string>;
   private readonly _public: boolean;
   private readonly topicHandlers: Partial<Record<BucketEventType, string>>;
-  private readonly _metadata: Record<string, ObjectMetadata> = {};
+  private _metadata: Map<string, ObjectMetadata>;
 
-  public constructor(props: BucketSchema["props"], context: ISimulatorContext) {
-    this.objectKeys = new Set();
-    this._fileDir = fs.mkdtempSync(join(os.tmpdir(), "wing-sim-"));
-    this.context = context;
+  public constructor(props: BucketSchema) {
     this.initialObjects = props.initialObjects ?? {};
     this._public = props.public ?? false;
     this.topicHandlers = props.topics;
+    this._metadata = new Map();
   }
 
-  public get fileDir(): string {
-    return this._fileDir;
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
   }
 
-  public async init(): Promise<BucketAttributes> {
+  public async init(context: ISimulatorContext): Promise<BucketAttributes> {
+    this._context = context;
+    this._fileDir = join(context.statedir, "files");
+
+    const fileDirExists = await exists(this._fileDir);
+    if (!fileDirExists) {
+      await fs.promises.mkdir(this._fileDir, { recursive: true });
+    }
+
+    const metadataFileExists = await exists(
+      join(this.context.statedir, METADATA_FILENAME)
+    );
+    if (metadataFileExists) {
+      const metadataContents = await fs.promises.readFile(
+        join(this.context.statedir, METADATA_FILENAME),
+        "utf-8"
+      );
+      try {
+        const metadata = deserialize(metadataContents);
+        this._metadata = new Map(metadata);
+      } catch (e) {
+        this.addTrace(
+          `Failed to deserialize metadata: ${(e as Error).stack}`,
+          LogLevel.ERROR
+        );
+      }
+    }
+
     for (const [key, value] of Object.entries(this.initialObjects)) {
       await this.context.withTrace({
         message: `Adding object from preflight (key=${key}).`,
@@ -51,11 +85,23 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
         },
       });
     }
+
     return {};
   }
 
-  public async cleanup(): Promise<void> {
-    await fs.promises.rm(this._fileDir, { recursive: true, force: true });
+  public async cleanup(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
+  public async save(): Promise<void> {
+    // no need to save individual files, since they are already persisted in the state dir
+    // during the bucket's lifecycle
+    fs.writeFileSync(
+      join(this.context.statedir, METADATA_FILENAME),
+      serialize(Array.from(this._metadata.entries())) // metadata contains Datetime values, so we need to serialize it
+    );
   }
 
   private async notifyListeners(
@@ -66,9 +112,9 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
       return;
     }
 
-    const topicClient = this.context.findInstance(
+    const topicClient = this.context.getClient(
       this.topicHandlers[actionType]!
-    ) as ITopicClient & ISimulatorResourceInstance;
+    ) as ITopicClient;
 
     return topicClient.publish(key);
   }
@@ -77,7 +123,7 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
     return this.context.withTrace({
       message: `Exists (key=${key}).`,
       activity: async () => {
-        return this.objectKeys.has(key);
+        return this._metadata.has(key);
       },
     });
   }
@@ -108,26 +154,57 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
     });
   }
 
-  public async get(key: string): Promise<string> {
+  public async get(key: string, options?: BucketGetOptions): Promise<string> {
     return this.context.withTrace({
       message: `Get (key=${key}).`,
       activity: async () => {
         const hash = this.hashKey(key);
         const filename = join(this._fileDir, hash);
+        let buffer;
+        try {
+          const file = await fs.promises.open(filename, "r");
+          const stat = await file.stat();
+
+          let start = 0;
+          if (options?.startByte !== undefined) {
+            start = options.startByte;
+          }
+
+          let length = stat.size;
+          if (options?.endByte !== undefined) {
+            length = options.endByte + 1;
+          }
+
+          buffer = Buffer.alloc(length - start);
+          await file.read(buffer, 0, length - start, start);
+          await file.close();
+        } catch (e) {
+          buffer = undefined;
+        }
+
+        if (!buffer) {
+          throw new Error(`Object does not exist (key=${key}).`);
+        }
+
         try {
-          return await fs.promises.readFile(filename, "utf8");
+          return new TextDecoder("utf8", { fatal: true }).decode(buffer);
         } catch (e) {
           throw new Error(
-            `Object does not exist (key=${key}): ${(e as Error).stack}`
+            `Object content could not be read as text (key=${key}): ${
+              (e as Error).stack
+            })}`
           );
         }
       },
     });
   }
 
-  public async tryGet(key: string): Promise<string | undefined> {
+  public async tryGet(
+    key: string,
+    options?: BucketTryGetOptions
+  ): Promise<string | undefined> {
     if (await this.exists(key)) {
-      return this.get(key);
+      return this.get(key, options);
     }
 
     return undefined;
@@ -158,18 +235,18 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
       activity: async () => {
         const mustExist = opts?.mustExist ?? false;
 
-        if (!this.objectKeys.has(key) && mustExist) {
+        if (!this._metadata.has(key) && mustExist) {
           throw new Error(`Object does not exist (key=${key}).`);
         }
 
-        if (!this.objectKeys.has(key)) {
+        if (!this._metadata.has(key)) {
           return;
         }
 
         const hash = this.hashKey(key);
         const filename = join(this._fileDir, hash);
         await fs.promises.unlink(filename);
-        this.objectKeys.delete(key);
+        this._metadata.delete(key);
         await this.notifyListeners(BucketEventType.DELETE, key);
       },
     });
@@ -188,7 +265,7 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
     return this.context.withTrace({
       message: `List (prefix=${prefix ?? "null"}).`,
       activity: async () => {
-        return Array.from(this.objectKeys.values()).filter((key) => {
+        return Array.from(this._metadata.keys()).filter((key) => {
           if (prefix) {
             return key.startsWith(prefix);
           } else {
@@ -208,7 +285,7 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
       activity: async () => {
         const filePath = join(this._fileDir, key);
 
-        if (!this.objectKeys.has(key)) {
+        if (!this._metadata.has(key)) {
           throw new Error(
             `Cannot provide public url for an non-existent key (key=${key})`
           );
@@ -240,13 +317,10 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
     return this.context.withTrace({
       message: `Metadata (key=${key}).`,
       activity: async () => {
-        if (!this.objectKeys.has(key)) {
+        if (!this._metadata.has(key)) {
           throw new Error(`Object does not exist (key=${key}).`);
         }
-        if (!this._metadata[key]) {
-          throw new Error(`Metadata does not exist for object (key=${key}).`);
-        }
-        return this._metadata[key];
+        return this._metadata.get(key)!;
       },
     });
   }
@@ -255,7 +329,7 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
     return this.context.withTrace({
       message: `Copy (srcKey=${srcKey} to dstKey=${dstKey}).`,
       activity: async () => {
-        if (!this.objectKeys.has(srcKey)) {
+        if (!this._metadata.has(srcKey)) {
           throw new Error(`Source object does not exist (srcKey=${srcKey}).`);
         }
 
@@ -269,12 +343,23 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
     });
   }
 
+  public async rename(srcKey: string, dstKey: string): Promise<void> {
+    if (srcKey === dstKey) {
+      throw new Error(
+        `Renaming an object to its current name is not a valid operation (srcKey=${srcKey}, dstKey=${dstKey}).`
+      );
+    }
+
+    await this.copy(srcKey, dstKey);
+    await this.delete(srcKey);
+  }
+
   private async addFile(
     key: string,
     value: string,
     contentType?: string
   ): Promise<void> {
-    const actionType: BucketEventType = this.objectKeys.has(key)
+    const actionType: BucketEventType = this._metadata.has(key)
       ? BucketEventType.UPDATE
       : BucketEventType.CREATE;
 
@@ -289,17 +374,27 @@ export class Bucket implements IBucketClient, ISimulatorResourceInstance {
     const determinedContentType =
       (contentType ?? mime.lookup(key)) || "application/octet-stream";
 
-    this._metadata[key] = {
+    this._metadata.set(key, {
       size: filestat.size,
       lastModified: Datetime.fromDate(filestat.mtime),
       contentType: determinedContentType,
-    };
+    });
 
-    this.objectKeys.add(key);
     await this.notifyListeners(actionType, key);
   }
 
   private hashKey(key: string): string {
-    return crypto.createHash("sha512").update(key).digest("hex");
+    return crypto.createHash("sha512").update(key).digest("hex").slice(-32);
+  }
+
+  private addTrace(message: string, level: LogLevel): void {
+    this.context.addTrace({
+      data: { message },
+      level,
+      type: TraceType.RESOURCE,
+      sourcePath: this.context.resourcePath,
+      sourceType: BUCKET_FQN,
+      timestamp: new Date().toISOString(),
+    });
   }
 }
diff --git a/libs/wingsdk/src/target-sim/bucket.onevent.inflight.ts b/libs/wingsdk/src/target-sim/bucket.onevent.inflight.ts
deleted file mode 100644
index be91b91100c..00000000000
--- a/libs/wingsdk/src/target-sim/bucket.onevent.inflight.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { BucketEventType, IBucketEventHandlerClient } from "../cloud";
-
-export class BucketEventHandlerClient implements IBucketEventHandlerClient {
-  private readonly handler: IBucketEventHandlerClient;
-  private readonly eventType: BucketEventType;
-  constructor({
-    handler,
-    args,
-  }: {
-    handler: IBucketEventHandlerClient;
-    args: { eventType: BucketEventType };
-  }) {
-    this.handler = handler;
-    this.eventType = args.eventType;
-  }
-  public async handle(event: string) {
-    return this.handler.handle(event, this.eventType);
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/bucket.ts b/libs/wingsdk/src/target-sim/bucket.ts
index e117037d2a9..499c0a6a01d 100644
--- a/libs/wingsdk/src/target-sim/bucket.ts
+++ b/libs/wingsdk/src/target-sim/bucket.ts
@@ -1,11 +1,12 @@
-import { join } from "path";
 import { Construct } from "constructs";
+import { Policy } from "./policy";
 import { ISimulatorResource } from "./resource";
 import { BucketSchema } from "./schema-resources";
 import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { LiftMap, lift } from "../core";
+import { ToSimulatorOutput } from "../simulator/simulator";
 import { IInflightHost } from "../std";
 
 /**
@@ -16,30 +17,35 @@ import { IInflightHost } from "../std";
 export class Bucket extends cloud.Bucket implements ISimulatorResource {
   private readonly public: boolean;
   private readonly initialObjects: Record<string, string> = {};
+  private readonly policy: Policy;
+
   constructor(scope: Construct, id: string, props: cloud.BucketProps = {}) {
     super(scope, id, props);
 
     this.public = props.public ?? false;
+    this.policy = new Policy(this, "Policy", { principal: this });
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.BucketInflightMethods.DELETE,
-      cloud.BucketInflightMethods.GET,
-      cloud.BucketInflightMethods.GET_JSON,
-      cloud.BucketInflightMethods.LIST,
-      cloud.BucketInflightMethods.PUT,
-      cloud.BucketInflightMethods.PUT_JSON,
-      cloud.BucketInflightMethods.PUBLIC_URL,
-      cloud.BucketInflightMethods.EXISTS,
-      cloud.BucketInflightMethods.TRY_GET,
-      cloud.BucketInflightMethods.TRY_GET_JSON,
-      cloud.BucketInflightMethods.TRY_DELETE,
-      cloud.BucketInflightMethods.METADATA,
-      cloud.BucketInflightMethods.COPY,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.BucketInflightMethods.DELETE]: [],
+      [cloud.BucketInflightMethods.GET]: [],
+      [cloud.BucketInflightMethods.GET_JSON]: [],
+      [cloud.BucketInflightMethods.LIST]: [],
+      [cloud.BucketInflightMethods.PUT]: [],
+      [cloud.BucketInflightMethods.PUT_JSON]: [],
+      [cloud.BucketInflightMethods.PUBLIC_URL]: [],
+      [cloud.BucketInflightMethods.EXISTS]: [],
+      [cloud.BucketInflightMethods.TRY_GET]: [],
+      [cloud.BucketInflightMethods.TRY_GET_JSON]: [],
+      [cloud.BucketInflightMethods.TRY_DELETE]: [],
+      [cloud.BucketInflightMethods.METADATA]: [],
+      [cloud.BucketInflightMethods.COPY]: [],
+      [cloud.BucketInflightMethods.RENAME]: [],
+    };
   }
+
   /**
    * Iterates over the topics and supply their sim handler
    * @returns an object of Bucket event types (keys) and their topic handlers (values)
@@ -58,26 +64,67 @@ export class Bucket extends cloud.Bucket implements ISimulatorResource {
     this.initialObjects[key] = body;
   }
 
-  protected eventHandlerLocation(): string {
-    return join(__dirname, "bucket.onevent.inflight.js");
+  protected createTopicHandler(
+    eventType: cloud.BucketEventType,
+    inflight: cloud.IBucketEventHandler
+  ): cloud.ITopicOnMessageHandler {
+    return BucketEventHandler.toTopicOnMessageHandler(inflight, eventType);
+  }
+
+  public onCreate(
+    fn: cloud.IBucketEventHandler,
+    opts?: cloud.BucketOnCreateOptions | undefined
+  ): void {
+    super.onCreate(fn, opts);
+    const topic = this.getTopic(cloud.BucketEventType.CREATE);
+    this.policy.addStatement(topic, cloud.TopicInflightMethods.PUBLISH);
+  }
+
+  public onDelete(
+    fn: cloud.IBucketEventHandler,
+    opts?: cloud.BucketOnDeleteOptions | undefined
+  ): void {
+    super.onDelete(fn, opts);
+    const topic = this.getTopic(cloud.BucketEventType.DELETE);
+    this.policy.addStatement(topic, cloud.TopicInflightMethods.PUBLISH);
+  }
+
+  public onUpdate(
+    fn: cloud.IBucketEventHandler,
+    opts?: cloud.BucketOnUpdateOptions | undefined
+  ): void {
+    super.onUpdate(fn, opts);
+    const topic = this.getTopic(cloud.BucketEventType.UPDATE);
+    this.policy.addStatement(topic, cloud.TopicInflightMethods.PUBLISH);
+  }
+
+  public onEvent(
+    fn: cloud.IBucketEventHandler,
+    opts?: cloud.BucketOnEventOptions
+  ): void {
+    super.onEvent(fn, opts);
+    const createTopic = this.getTopic(cloud.BucketEventType.CREATE);
+    this.policy.addStatement(createTopic, cloud.TopicInflightMethods.PUBLISH);
+    const deleteTopic = this.getTopic(cloud.BucketEventType.DELETE);
+    this.policy.addStatement(deleteTopic, cloud.TopicInflightMethods.PUBLISH);
+    const updateTopic = this.getTopic(cloud.BucketEventType.UPDATE);
+    this.policy.addStatement(updateTopic, cloud.TopicInflightMethods.PUBLISH);
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: BucketSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: BucketSchema = {
+      public: this.public,
+      initialObjects: this.initialObjects,
+      topics: this.convertTopicsToHandles(),
+    };
+    return {
       type: cloud.BUCKET_FQN,
-      path: this.node.path,
-      props: {
-        public: this.public,
-        initialObjects: this.initialObjects,
-        topics: this.convertTopicsToHandles(),
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
@@ -86,3 +133,23 @@ export class Bucket extends cloud.Bucket implements ISimulatorResource {
     return makeSimulatorJsClient(__filename, this);
   }
 }
+
+/**
+ * Utility class to work with bucket event handlers.
+ */
+export class BucketEventHandler {
+  /**
+   * Converts a `cloud.IBucketEventHandler` to a `cloud.ITopicOnMessageHandler`.
+   * @param handler the handler to convert
+   * @param eventType the event type
+   * @returns the on message handler.
+   */
+  public static toTopicOnMessageHandler(
+    handler: cloud.IBucketEventHandler,
+    eventType: cloud.BucketEventType
+  ): cloud.ITopicOnMessageHandler {
+    return lift({ handler, eventType }).inflight(async (ctx, event) => {
+      return ctx.handler(event, ctx.eventType);
+    });
+  }
+}
diff --git a/libs/wingsdk/src/target-sim/container.inflight.ts b/libs/wingsdk/src/target-sim/container.inflight.ts
new file mode 100644
index 00000000000..480607b3e3e
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/container.inflight.ts
@@ -0,0 +1,508 @@
+import { spawn } from "child_process";
+import * as fs from "fs/promises";
+import { join } from "path";
+import { IContainerClient, HOST_PORT_ATTR } from "./container";
+import { ContainerAttributes, ContainerSchema } from "./schema-resources";
+import { exists } from "./util";
+import { Util as Fs } from "../fs";
+import { isPath } from "../shared/misc";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator/simulator";
+import { Duration, LogLevel, TraceType } from "../std";
+import { Util } from "../util";
+
+const STATE_FILENAME = "state.json";
+
+/**
+ * Contents of the state file for this resource.
+ */
+interface StateFileContents {
+  /**
+   * A mapping of volume paths to the Wing-managed volume names, which will be reused
+   * across simulator runs.
+   */
+  readonly managedVolumes?: Record<string, string>;
+}
+
+export class Container implements IContainerClient, ISimulatorResourceInstance {
+  private readonly imageTag: string;
+  private readonly containerName: string;
+  private _context: ISimulatorContext | undefined;
+  private managedVolumes: Record<string, string>;
+  private child: DockerProcess | undefined;
+
+  public constructor(private readonly props: ContainerSchema) {
+    this.imageTag = props.imageTag;
+    this.containerName = `wing-${Util.ulid()}`.toLocaleLowerCase();
+    this.managedVolumes = {};
+  }
+
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<ContainerAttributes> {
+    try {
+      return await this.start(context);
+    } catch (e: any) {
+      this.addTrace(
+        `Failed to start container: ${e.message}`,
+        TraceType.RESOURCE,
+        LogLevel.ERROR
+      );
+
+      return {};
+    }
+  }
+
+  public async start(context: ISimulatorContext): Promise<ContainerAttributes> {
+    this._context = context;
+
+    // Check for a previous state file to see if there was a port that was previously being used
+    // if so, try to use it out of convenience
+    const state: StateFileContents = await this.loadState();
+    if (state.managedVolumes) {
+      this.managedVolumes = state.managedVolumes;
+    }
+
+    await this.prepareImage();
+
+    // start the new container
+    const dockerRun: string[] = [];
+    dockerRun.push("-i");
+    dockerRun.push("--rm");
+    dockerRun.push("--name", this.containerName);
+
+    if (this.props.network) {
+      dockerRun.push(`--network=${this.props.network}`);
+    }
+
+    if (this.props.containerPort) {
+      dockerRun.push("-p", this.props.containerPort.toString());
+    }
+
+    const envFile = await this.createEnvFile();
+    if (envFile) {
+      dockerRun.push("--env-file", envFile);
+    }
+
+    for (const volume of this.props.volumes ?? []) {
+      dockerRun.push("-v");
+
+      // if the user specified an anonymous volume
+      if (volume.startsWith("/") && !volume.includes(":")) {
+        // check if we have a managed volume for this path from a previous run
+        if (this.managedVolumes[volume]) {
+          const volumeName = this.managedVolumes[volume];
+          dockerRun.push(`${volumeName}:${volume}`);
+        } else {
+          const volumeName = `wing-volume-${Util.ulid()}`;
+          dockerRun.push(`${volumeName}:${volume}`);
+          this.managedVolumes[volume] = volumeName;
+        }
+      } else {
+        dockerRun.push(volume);
+      }
+    }
+
+    if (this.props.entrypoint) {
+      dockerRun.push("--entrypoint");
+      dockerRun.push(this.props.entrypoint);
+    }
+
+    dockerRun.push(this.imageTag);
+
+    for (const a of this.props.args ?? []) {
+      dockerRun.push(a);
+    }
+
+    this.addTrace(
+      `Starting container from ${this.imageTag}`,
+      TraceType.RESOURCE,
+      LogLevel.VERBOSE
+    );
+
+    this.child = this.dockerSpawn("run", dockerRun, {
+      logLevel: LogLevel.INFO,
+    });
+
+    this.addTrace(
+      `Waiting for container to ${
+        this.props.containerPort
+          ? `listen to ${this.props.containerPort}`
+          : "start"
+      }`,
+      TraceType.RESOURCE,
+      LogLevel.VERBOSE
+    );
+
+    let hostPort: string | undefined;
+    await waitUntil(async () => {
+      if (!this.child?.running) {
+        throw new Error(`Container ${this.imageTag} stopped unexpectedly`);
+      }
+
+      const container = await this.tryInspect(this.containerName);
+
+      // if we are waiting for a port, check if the container is listening to it
+      if (this.props.containerPort) {
+        // when using the host network, the host port is the same as the container port
+        if (this.props.network === "host") {
+          hostPort = this.props.containerPort.toString();
+          return (
+            container?.[0]?.Config?.ExposedPorts?.[`${hostPort}/tcp`] !==
+            undefined
+          );
+        }
+
+        hostPort =
+          container?.[0]?.NetworkSettings?.Ports?.[
+            `${this.props.containerPort}/tcp`
+          ]?.[0]?.HostPort;
+
+        return hostPort !== undefined;
+      }
+
+      // if we are not waiting for a port, just check if the container is running
+      return container?.[0]?.State?.Running;
+    });
+
+    this.addTrace(
+      `Container ${this.imageTag} started`,
+      TraceType.RESOURCE,
+      LogLevel.VERBOSE
+    );
+
+    return {
+      [HOST_PORT_ATTR]: hostPort,
+    };
+  }
+
+  /**
+   * Builds or pulls the docker image used by this container.
+   */
+  private async prepareImage() {
+    // if this image is already here, we don't need to do anything
+    if (await this.tryInspect(this.imageTag)) {
+      this.addTrace(
+        `Image ${this.imageTag} found, No need to build or pull.`,
+        TraceType.RESOURCE,
+        LogLevel.VERBOSE
+      );
+
+      return;
+    }
+
+    // if this a reference to a local directory, build the image from a docker file
+    if (isPath(this.props.image)) {
+      this.addTrace(
+        `Building ${this.imageTag} from ${this.props.image}...`,
+        TraceType.RESOURCE,
+        LogLevel.VERBOSE
+      );
+      await this.docker("build", ["-t", this.imageTag, this.props.image], {
+        logLevel: LogLevel.VERBOSE,
+      });
+    } else {
+      this.addTrace(
+        `Pulling ${this.imageTag}...`,
+        TraceType.RESOURCE,
+        LogLevel.VERBOSE
+      );
+      await this.docker("pull", [this.imageTag], {
+        logLevel: LogLevel.VERBOSE,
+      });
+    }
+  }
+
+  private async createEnvFile() {
+    const env = this.props.env ?? {};
+    if (Object.keys(env).length === 0) {
+      return undefined;
+    }
+
+    const envFile = join(Fs.mkdtemp(), "env.json");
+    const envLines = [];
+    for (const k of Object.keys(env)) {
+      envLines.push(`${k}=${env[k]}`);
+    }
+
+    await fs.writeFile(envFile, envLines.join("\n"));
+    return envFile;
+  }
+
+  private async tryInspect(name: string): Promise<any | undefined> {
+    try {
+      return JSON.parse(
+        await this.docker("inspect", [name], {
+          quiet: true,
+        })
+      );
+    } catch {
+      return undefined;
+    }
+  }
+
+  public async cleanup(): Promise<void> {
+    this.addTrace(
+      `Stopping container ${this.containerName}`,
+      TraceType.RESOURCE,
+      LogLevel.VERBOSE
+    );
+
+    await this.child?.kill();
+  }
+
+  public async save(): Promise<void> {
+    await this.saveState({ managedVolumes: this.managedVolumes });
+  }
+
+  private async loadState(): Promise<StateFileContents> {
+    const stateFileExists = await exists(
+      join(this.context.statedir, STATE_FILENAME)
+    );
+    if (stateFileExists) {
+      const stateFileContents = await fs.readFile(
+        join(this.context.statedir, STATE_FILENAME),
+        "utf-8"
+      );
+      return JSON.parse(stateFileContents);
+    } else {
+      return {};
+    }
+  }
+
+  private async docker(
+    command: string,
+    args: string[],
+    options: DockerOptions = {}
+  ): Promise<string> {
+    const child = this.dockerSpawn(command, args, options);
+    return child.join();
+  }
+
+  private dockerSpawn(
+    command: string,
+    args: string[],
+    options: DockerOptions = {}
+  ): DockerProcess {
+    let quiet = options.quiet ?? false;
+    const level = options.logLevel ?? LogLevel.INFO;
+    const logErrors = !quiet;
+
+    // can be used to hide container logs (used in our end to end tests). yes, ugly bit pragmatic.
+    // otherwise, test output will include lots of non deterministic stuff and that's really hard to
+    // snapshot.
+    if (process.env.WING_HIDE_CONTAINER_LOGS) {
+      quiet = true;
+    }
+
+    const commandDesc = `docker ${command}`;
+
+    this.addTrace(
+      `$ ${commandDesc} ${args.join(" ")}`,
+      TraceType.RESOURCE,
+      LogLevel.VERBOSE
+    );
+
+    const child = spawn("docker", [command, ...args], {
+      cwd: this.props.cwd,
+      stdio: "pipe",
+    });
+
+    let started = true;
+
+    child.once("exit", () => {
+      started = false;
+    });
+
+    const stdout: Buffer[] = [];
+    const allOutput: Buffer[] = [];
+    child.stdout.on("data", (data) => {
+      stdout.push(data);
+      allOutput.push(data);
+    });
+
+    child.stderr.on("data", (data) => {
+      allOutput.push(data);
+    });
+
+    if (!quiet) {
+      child.stdout.on("data", (data) =>
+        this.addTrace(data.toString(), TraceType.LOG, level)
+      );
+
+      child.stderr.on("data", (data) =>
+        this.addTrace(data.toString(), TraceType.LOG, level)
+      );
+    }
+
+    child.once("error", (err) => {
+      started = false;
+
+      if (logErrors) {
+        this.addTrace(err.stack ?? err.message, TraceType.LOG, LogLevel.ERROR);
+      }
+    });
+
+    const self = this;
+
+    return {
+      get running() {
+        return started;
+      },
+      async kill() {
+        return new Promise((resolve, reject) => {
+          if (!started) {
+            return resolve();
+          }
+
+          self.addTrace(
+            "Sending SIGTERM to container",
+            TraceType.RESOURCE,
+            LogLevel.VERBOSE
+          );
+
+          child.kill("SIGTERM");
+
+          // if the process doesn't exit in 2 seconds, kill it
+          const timeout = setTimeout(() => {
+            self.addTrace(
+              `Timeout waiting for container ${self._context?.resourcePath} to shutdown, removing forcefully`,
+              TraceType.RESOURCE,
+              LogLevel.WARNING
+            );
+
+            self
+              .docker("rm", ["-f", self.containerName], { quiet: true })
+              .catch(() => {});
+          }, 2000);
+
+          child.once("error", (err) => {
+            self.addTrace(
+              `Error when shutting down container: ${err.stack ?? err.message}`,
+              TraceType.RESOURCE,
+              LogLevel.ERROR
+            );
+
+            clearTimeout(timeout);
+            reject(err);
+          });
+
+          child.once("exit", () => {
+            self.addTrace(
+              "Container shutdown successfully",
+              TraceType.RESOURCE,
+              LogLevel.VERBOSE
+            );
+            clearTimeout(timeout);
+            resolve();
+          });
+        });
+      },
+      async join() {
+        return new Promise((ok, ko) => {
+          if (!started) {
+            return ok(stdout.join(""));
+          }
+
+          child.once("error", ko);
+          child.once("exit", (code) => {
+            if (code === 0) {
+              return ok(stdout.join(""));
+            } else {
+              const message = `Command "${commandDesc}" exited with non-zero code ${code}`;
+              if (logErrors) {
+                self.addTrace(
+                  `${message}}\n${allOutput.join("")}`,
+                  TraceType.RESOURCE,
+                  LogLevel.VERBOSE
+                );
+              }
+
+              return ko(new Error(`${message} (see verbose logs)`));
+            }
+          });
+        });
+      },
+    };
+  }
+
+  private async saveState(state: StateFileContents): Promise<void> {
+    await fs.writeFile(
+      join(this.context.statedir, STATE_FILENAME),
+      JSON.stringify(state)
+    );
+  }
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
+  private addTrace(message: string, type: TraceType, level: LogLevel) {
+    this.context.addTrace({
+      data: { message: message.trim() },
+      sourcePath: this.context.resourcePath,
+      sourceType: "container",
+      timestamp: new Date().toISOString(),
+      type,
+      level,
+    });
+  }
+}
+
+async function waitUntil(predicate: () => Promise<boolean>) {
+  const timeout = Duration.fromSeconds(30);
+  const interval = Duration.fromSeconds(0.1);
+  let elapsed = 0;
+  while (elapsed < timeout.seconds) {
+    if (await predicate()) {
+      return true;
+    }
+    elapsed += interval.seconds;
+    await Util.sleep(interval);
+  }
+
+  throw new Error("Timeout elapsed");
+}
+
+/**
+ * Represents the docker child process.
+ */
+interface DockerProcess {
+  /**
+   * Whether the process is running or not.
+   */
+  readonly running: boolean;
+
+  /**
+   * Waits for the process to exit and returns the output.
+   * @returns The output of the process.
+   */
+  join: () => Promise<string>;
+
+  /**
+   * Kills the process.
+   */
+  kill: () => Promise<void>;
+}
+
+interface DockerOptions {
+  /**
+   * Can be used to surpress all logging from the command.
+   * @default false
+   */
+  readonly quiet?: boolean;
+
+  /**
+   * The log level to use for container output (both STDOUT and STDERR will use the same log level).
+   * @default LogLevel.INFO
+   */
+  readonly logLevel?: LogLevel;
+}
diff --git a/libs/wingsdk/src/target-sim/container.md b/libs/wingsdk/src/target-sim/container.md
new file mode 100644
index 00000000000..2a760221713
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/container.md
@@ -0,0 +1,77 @@
+---
+title: Container
+id: container
+description: Runs a container in the Wing Simulator
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    docker,
+    container,
+    docker compose,
+    simulator
+  ]
+---
+
+The `sim.Container` resource allows running containers in the Wing Simulator:
+
+```js
+bring sim;
+bring http;
+
+let c = new sim.Container(
+  name: "http-echo",
+  image: "hashicorp/http-echo",
+  containerPort: 5678,
+  args: ["-text=bang"],
+);
+
+test "send request" {
+  http.get("http://localhost:{c.hostPort}");
+}
+```
+
+There is also support for building containers from a local directory with a `Dockerfile`:
+
+```js
+new sim.Container(
+  name: "my-service",
+  image: "./my-service",
+  containerPort: 8080,
+);
+```
+
+### Retaining state
+
+When the Wing Console is closed, all containers are stopped and removed.
+To retain the state of a container across console restarts, you can mount an anonymous volume:
+
+```js
+new sim.Container(
+  name: "my-service",
+  image: "./my-service",
+  containerPort: 8080,
+  volumes: ["/var/data"],
+);
+```
+
+Wing will automatically name each unnamed volume in `volumes`, and reuse the named
+volumes across console restarts.
+
+## API
+
+* `name` - a name for the container.
+* `image` - a name of a public Docker image to pull and run or a path to a local directory with a
+  `Dockerfile`.
+* `containerPort` - a TCP port to expose from the container (optional).
+* `env` - environment variables to set in the container.
+* `args` - container entrypoint arguments
+* `sourcePattern` - a glob pattern to use to match the files for calculating the source hash when
+  determining if a rebuild is needed. By default this is all the files in the docker build context
+  directory (and below).
+* `sourceHash` - An explicit source hash that represents the container source. if not set, and
+  `sourcePattern` is set, the hash will be calculated based on the content of the source files.
+
diff --git a/libs/wingsdk/src/target-sim/container.ts b/libs/wingsdk/src/target-sim/container.ts
new file mode 100644
index 00000000000..0cbbbcb1e01
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/container.ts
@@ -0,0 +1,166 @@
+import { Construct } from "constructs";
+import { ISimulatorResource } from "./resource";
+import { ContainerSchema } from "./schema-resources";
+import { simulatorAttrToken } from "./tokens";
+import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
+import { fqnForType } from "../constants";
+import { App, LiftMap } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
+import { Util as fs } from "../fs";
+import { isPath } from "../shared/misc";
+import { ToSimulatorOutput } from "../simulator";
+import { IInflightHost, Resource } from "../std";
+
+export const SIM_CONTAINER_FQN = fqnForType("sim.Container");
+export const HOST_PORT_ATTR = "host_port";
+
+/**
+ * Initialization properties for `sim.Container`.
+ */
+export interface ContainerProps {
+  /**
+   * A name for the container.
+   */
+  readonly name: string;
+
+  /**
+   * A name of a public Docker image to pull and run or a path to a local directory with a `Dockerfile`.
+   */
+  readonly image: string;
+
+  /**
+   * Internal container port to expose.
+   * @default - no port exposed
+   */
+  readonly containerPort?: number;
+
+  /**
+   * Environment variables to set in the container.
+   * @default {}
+   */
+  readonly env?: Record<string, string>;
+
+  /**
+   * Volume mount points.
+   * @default []
+   * @example ['/host:/container']
+   */
+  readonly volumes?: string[];
+
+  /**
+   * Container arguments
+   * @default []
+   */
+  readonly args?: string[];
+
+  /**
+   * Docker network to use for the container - such as 'host', 'bridge', etc.
+   * @link https://docs.docker.com/network.
+   * @default - default docker network
+   * @example 'host'
+   */
+  readonly network?: string;
+
+  /**
+   * Container entrypoint
+   * @default - default image entrypoint
+   */
+  readonly entrypoint?: string;
+
+  /**
+   * A glob of local files to consider as input sources for the container, relative to the build
+   * context directory.
+   *
+   * @default - all files
+   */
+  readonly sourcePattern?: string;
+
+  /**
+   * An explicit source hash that represents the container source. if not set, and `sourcePattern`
+   * is set, the hash will be calculated based on the content of the source files.
+   * @default - calculated based on the source files
+   */
+  readonly sourceHash?: string;
+}
+
+/**
+ * Represents a container running in the Wing Simulator.
+ *
+ * @inflight `@winglang/sdk.sim.IContainerClient`
+ */
+export class Container extends Resource implements ISimulatorResource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IContainerClient;
+
+  private readonly imageTag: string;
+
+  /**
+   * A token that resolves to the host port of this container.
+   */
+  public readonly hostPort?: string;
+
+  constructor(
+    scope: Construct,
+    id: string,
+    private readonly props: ContainerProps
+  ) {
+    super(scope, id);
+
+    // determine image tag - if the image is a path, we use a source hash (either explicitly
+    // provided or calculated based on the source files). if the image is a name, we use the name
+    if (isPath(props.image)) {
+      const hash = props.sourceHash ?? fs.md5(props.image, props.sourcePattern);
+      this.imageTag = `${props.name}:${hash}`;
+    } else {
+      this.imageTag = props.image;
+    }
+
+    if (props.containerPort) {
+      this.hostPort = simulatorAttrToken(this, HOST_PORT_ATTR);
+    }
+  }
+
+  public toSimulator(): ToSimulatorOutput {
+    const props: ContainerSchema = {
+      image: this.props.image,
+      imageTag: this.imageTag,
+      containerPort: this.props.containerPort,
+      env: this.props.env,
+      volumes: this.props.volumes,
+      args: this.props.args,
+      cwd: App.of(this).entrypointDir,
+      network: this.props.network,
+      entrypoint: this.props.entrypoint,
+    };
+    return {
+      type: SIM_CONTAINER_FQN,
+      props,
+    };
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    bindSimulatorResource(__filename, this, host, ops);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {};
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return makeSimulatorJsClient(__filename, this);
+  }
+}
+
+/**
+ * List of inflight operations available for `sim.Container`.
+ * @internal
+ */
+export enum ContainerInflightMethods {}
+
+/**
+ * Inflight interface for `Redis`.
+ */
+export interface IContainerClient {}
diff --git a/libs/wingsdk/src/target-sim/counter.inflight.ts b/libs/wingsdk/src/target-sim/counter.inflight.ts
index 00fec84f860..52669fb6154 100644
--- a/libs/wingsdk/src/target-sim/counter.inflight.ts
+++ b/libs/wingsdk/src/target-sim/counter.inflight.ts
@@ -1,83 +1,65 @@
-import { CounterAttributes, CounterSchema } from "./schema-resources";
+import * as fs from "fs";
+import { join } from "path";
+import { CounterBackendProps } from "./counter";
+import { IResource, IResourceContext } from "./resource";
+import { exists } from "./util";
 import { ICounterClient } from "../cloud";
-import {
-  ISimulatorContext,
-  ISimulatorResourceInstance,
-} from "../simulator/simulator";
 
-export class Counter implements ICounterClient, ISimulatorResourceInstance {
+const VALUES_FILENAME = "values.json";
+
+export class CounterBackend implements ICounterClient, IResource {
   private values: Map<string, number>;
   private initial: number;
-  private readonly context: ISimulatorContext;
+  private ctx: IResourceContext;
 
-  public constructor(
-    props: CounterSchema["props"],
-    context: ISimulatorContext
-  ) {
+  public constructor(ctx: IResourceContext, props: CounterBackendProps) {
+    this.ctx = ctx;
     this.initial = props.initial ?? 0;
     this.values = new Map().set("default", this.initial);
-    this.context = context;
   }
 
-  public async init(): Promise<CounterAttributes> {
-    return {};
+  public async onStart(): Promise<void> {
+    // Load the values from disk
+    const valuesFile = join(await this.ctx.statedir(), VALUES_FILENAME);
+    const valueFilesExists = await exists(valuesFile);
+    if (valueFilesExists) {
+      const valuesContents = await fs.promises.readFile(valuesFile, "utf-8");
+      const values = JSON.parse(valuesContents);
+      this.values = new Map(values);
+    }
   }
 
-  public async cleanup(): Promise<void> {}
+  public async onStop(): Promise<void> {
+    // Save the values to disk
+    fs.writeFileSync(
+      join(await this.ctx.statedir(), VALUES_FILENAME),
+      JSON.stringify(Array.from(this.values.entries()))
+    );
+  }
 
   public async inc(
     amount: number = 1,
     key: string = "default"
   ): Promise<number> {
-    return this.context.withTrace({
-      message: `Inc (amount=${amount}${
-        key != "default" ? ", key: " + key : ""
-      }).`,
-      activity: async () => {
-        const prev = this.values.get(key) ?? this.initial;
-        this.values.set(key, prev + amount);
-        return prev;
-      },
-    });
+    const prev = this.values.get(key) ?? this.initial;
+    this.values.set(key, prev + amount);
+    return prev;
   }
 
   public async dec(
     amount: number = 1,
     key: string = "default"
   ): Promise<number> {
-    key;
-    return this.context.withTrace({
-      message: `Dec (amount=${amount}${
-        key != "default" ? ", key: " + key : ""
-      }).`,
-      activity: async () => {
-        const prev = this.values.get(key) ?? this.initial;
-        this.values.set(key, prev - amount);
-        return prev;
-      },
-    });
+    const prev = this.values.get(key) ?? this.initial;
+    this.values.set(key, prev - amount);
+    return prev;
   }
 
   public async peek(key: string = "default"): Promise<number> {
-    return this.context.withTrace({
-      message: `Peek (value=${this.values.get(key) ?? this.initial}${
-        key != "default" ? ", key: " + key : ""
-      }).`,
-      activity: async () => {
-        return this.values.get(key) ?? this.initial;
-      },
-    });
+    return this.values.get(key) ?? this.initial;
   }
 
   public async set(value: number, key: string = "default"): Promise<void> {
-    key;
-    return this.context.withTrace({
-      message: `Set (value=${value}${
-        key != "default" ? ", key: " + key : ""
-      }).`,
-      activity: async () => {
-        this.values.set(key, value);
-      },
-    });
+    this.values.set(key, value);
   }
 }
diff --git a/libs/wingsdk/src/target-sim/counter.ts b/libs/wingsdk/src/target-sim/counter.ts
index 8246607fa31..4def55cae82 100644
--- a/libs/wingsdk/src/target-sim/counter.ts
+++ b/libs/wingsdk/src/target-sim/counter.ts
@@ -1,53 +1,71 @@
 import { Construct } from "constructs";
-import { ISimulatorResource } from "./resource";
-import { CounterSchema } from "./schema-resources";
-import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
+import { Resource } from "./resource";
+import { bindSimulatorResource, makeSimulatorJsClientV2 } from "./util";
 import * as cloud from "../cloud";
-import { BaseResourceSchema } from "../simulator/simulator";
-import { IInflightHost } from "../std";
+import { LiftMap, lift } from "../core";
+import { Node, IInflightHost } from "../std";
 
 /**
  * Simulator implementation of `cloud.Counter`.
  *
  * @inflight `@winglang/sdk.cloud.ICounterClient`
  */
-export class Counter extends cloud.Counter implements ISimulatorResource {
+export class Counter extends cloud.Counter {
   public readonly initial: number;
+  private readonly backend: Resource;
+
   constructor(scope: Construct, id: string, props: cloud.CounterProps = {}) {
     super(scope, id, props);
 
     this.initial = props.initial ?? 0;
-  }
 
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.CounterInflightMethods.INC,
-      cloud.CounterInflightMethods.DEC,
-      cloud.CounterInflightMethods.PEEK,
-      cloud.CounterInflightMethods.SET,
-    ];
+    const factory = lift({
+      initial: this.initial,
+    }).inflight(async (ctx, simContext) => {
+      // TODO: make CounterBackend liftable so we can add it to the list of captures
+      const CounterBackend =
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+      const backend = new CounterBackend(simContext, { initial: ctx.initial });
+      await backend.onStart();
+      return backend;
+    });
+
+    this.backend = new Resource(this, "Resource", factory);
+    Node.of(this.backend).hidden = true;
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: CounterSchema = {
-      type: cloud.COUNTER_FQN,
-      path: this.node.path,
-      props: {
-        initial: this.initial,
-      },
-      attrs: {} as any,
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.CounterInflightMethods.INC]: [[this.backend, ["call"]]],
+      [cloud.CounterInflightMethods.DEC]: [[this.backend, ["call"]]],
+      [cloud.CounterInflightMethods.PEEK]: [[this.backend, ["call"]]],
+      [cloud.CounterInflightMethods.SET]: [[this.backend, ["call"]]],
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this.backend, host, ops);
     super.onLift(host, ops);
   }
 
   /** @internal */
   public _toInflight(): string {
-    return makeSimulatorJsClient(__filename, this);
+    return makeSimulatorJsClientV2(__filename, this.backend);
   }
 }
+
+/**
+ * Props for CounterBackend
+ * @internal
+ */
+export interface CounterBackendProps {
+  readonly initial: number;
+}
+
+/**
+ * Runtime attributes for CounterBackend
+ * @internal
+ */
+export interface CounterAttributes {}
diff --git a/libs/wingsdk/src/target-sim/domain.inflight.ts b/libs/wingsdk/src/target-sim/domain.inflight.ts
index f233a7a8970..06e476e39e1 100644
--- a/libs/wingsdk/src/target-sim/domain.inflight.ts
+++ b/libs/wingsdk/src/target-sim/domain.inflight.ts
@@ -1,12 +1,22 @@
 import { DomainSchema } from "./schema-resources";
 import { IDomainClient } from "../cloud";
-import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
 
 export class Domain implements IDomainClient, ISimulatorResourceInstance {
-  constructor(_props: DomainSchema["props"], _context: ISimulatorContext) {}
-  public async init(): Promise<Record<string, any>> {
+  constructor(_props: DomainSchema) {}
+  public async init(_context: ISimulatorContext): Promise<Record<string, any>> {
     return {};
   }
 
   public async cleanup(): Promise<void> {}
+
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
 }
diff --git a/libs/wingsdk/src/target-sim/domain.ts b/libs/wingsdk/src/target-sim/domain.ts
index 5477f9c1972..922882dd0d4 100644
--- a/libs/wingsdk/src/target-sim/domain.ts
+++ b/libs/wingsdk/src/target-sim/domain.ts
@@ -1,7 +1,8 @@
 import { Construct } from "constructs";
+import { DomainSchema } from "./schema-resources";
 import { makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
-import { BaseResourceSchema } from "../simulator";
+import { ToSimulatorOutput } from "../simulator";
 
 /**
  * Simulator implementation of `cloud.Domain`
@@ -18,12 +19,11 @@ export class Domain extends cloud.Domain {
     return makeSimulatorJsClient(__filename, this);
   }
 
-  public toSimulator(): BaseResourceSchema {
+  public toSimulator(): ToSimulatorOutput {
+    const props: DomainSchema = {};
     return {
       type: cloud.DOMAIN_FQN,
-      path: this.node.path,
-      props: {},
-      attrs: {},
+      props,
     };
   }
 }
diff --git a/libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts b/libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts
deleted file mode 100644
index 79e7448aba3..00000000000
--- a/libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import {
-  CreateTableCommand,
-  DynamoDBClient,
-  KeyType,
-  KeySchemaElement,
-} from "@aws-sdk/client-dynamodb";
-import { v4 as uuidv4 } from "uuid";
-import {
-  DynamodbTableAttributes,
-  DynamodbTableSchema,
-} from "./schema-resources";
-import { DynamodbTableClientBase } from "../ex";
-import { runCommand, runDockerImage } from "../shared/misc";
-import {
-  ISimulatorContext,
-  ISimulatorResourceInstance,
-} from "../simulator/simulator";
-
-const MAX_CREATE_TABLE_COMMAND_ATTEMPTS = 50;
-
-export class DynamodbTable
-  extends DynamodbTableClientBase
-  implements ISimulatorResourceInstance
-{
-  private containerName: string;
-  private readonly WING_DYNAMODB_IMAGE =
-    process.env.WING_DYNAMODB_IMAGE ?? "amazon/dynamodb-local:2.0.0";
-  private readonly context: ISimulatorContext;
-  private client?: DynamoDBClient;
-
-  public constructor(
-    private props: DynamodbTableSchema["props"],
-    context: ISimulatorContext
-  ) {
-    super(props.name);
-
-    this.context = context;
-    this.containerName = `wing-sim-dynamodb-${this.context.resourcePath.replace(
-      /\//g,
-      "."
-    )}-${uuidv4()}`;
-  }
-
-  public async init(): Promise<DynamodbTableAttributes> {
-    try {
-      const { hostPort } = await runDockerImage({
-        imageName: this.WING_DYNAMODB_IMAGE,
-        containerName: this.containerName,
-        containerPort: "8000",
-      });
-
-      // dynamodb url based on host port
-      this.client = new DynamoDBClient({
-        region: "local",
-        credentials: {
-          accessKeyId: "x",
-          secretAccessKey: "y",
-        },
-        endpoint: `http://0.0.0.0:${hostPort}`,
-      });
-
-      await this.createTable();
-
-      return {};
-    } catch (e) {
-      throw Error(`Error setting up Dynamodb resource simulation (${e})
-      - Make sure you have docker installed and running`);
-    }
-  }
-
-  public async cleanup(): Promise<void> {
-    // disconnect from the dynamodb server
-    this.client?.destroy();
-    // stop the dynamodb container
-    await runCommand("docker", ["rm", "-f", `${this.containerName}`]);
-  }
-
-  public async _rawClient(): Promise<DynamoDBClient> {
-    if (this.client) {
-      return this.client;
-    }
-
-    throw new Error("Dynamodb server not initialized");
-  }
-
-  private async createTable() {
-    const keySchema: KeySchemaElement[] = [
-      {
-        AttributeName: this.props.hashKey,
-        KeyType: KeyType.HASH,
-      },
-    ];
-    if (this.props.rangeKey) {
-      keySchema.push({
-        AttributeName: this.props.rangeKey,
-        KeyType: KeyType.RANGE,
-      });
-    }
-
-    const createTableCommand = new CreateTableCommand({
-      TableName: this.tableName,
-      AttributeDefinitions: Object.entries(this.props.attributeDefinitions).map(
-        ([k, v]) => ({ AttributeName: k, AttributeType: v })
-      ),
-      KeySchema: keySchema,
-      BillingMode: "PAY_PER_REQUEST",
-    });
-
-    // dynamodb server process might take some time to start
-    let attemptNumber = 0;
-    while (true) {
-      try {
-        await this.client!.send(createTableCommand);
-        break;
-      } catch (err) {
-        if (++attemptNumber >= MAX_CREATE_TABLE_COMMAND_ATTEMPTS) {
-          throw err;
-        }
-        await this.sleep(50);
-      }
-    }
-  }
-
-  private async sleep(ms: number) {
-    return new Promise((r) => setTimeout(r, ms));
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/dynamodb-table.ts b/libs/wingsdk/src/target-sim/dynamodb-table.ts
deleted file mode 100644
index 9d74a3a0e36..00000000000
--- a/libs/wingsdk/src/target-sim/dynamodb-table.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Construct } from "constructs";
-import { ISimulatorResource } from "./resource";
-import { DynamodbTableSchema } from "./schema-resources";
-import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
-import * as ex from "../ex";
-import { BaseResourceSchema } from "../simulator/simulator";
-import { IInflightHost } from "../std";
-
-/**
- * Simulator implementation of `ex.DynamodbTable`.
- *
- * @inflight `@winglang/sdk.ex.IDynamodbTableClient`
- */
-export class DynamodbTable
-  extends ex.DynamodbTable
-  implements ISimulatorResource
-{
-  private readonly props: ex.DynamodbTableProps;
-
-  constructor(scope: Construct, id: string, props: ex.DynamodbTableProps) {
-    super(scope, id, props);
-
-    this.props = props;
-  }
-
-  public toSimulator(): BaseResourceSchema {
-    const schema: DynamodbTableSchema = {
-      type: ex.DYNAMODB_TABLE_FQN,
-      path: this.node.path,
-      props: {
-        name: this.name,
-        attributeDefinitions: this.props.attributeDefinitions,
-        hashKey: this.props.hashKey,
-        rangeKey: this.props.rangeKey,
-      },
-      attrs: {} as any,
-    };
-    return schema;
-  }
-
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      ex.DynamodbTableInflightMethods.PUT_ITEM,
-      ex.DynamodbTableInflightMethods.UPDATE_ITEM,
-      ex.DynamodbTableInflightMethods.DELETE_ITEM,
-      ex.DynamodbTableInflightMethods.GET_ITEM,
-      ex.DynamodbTableInflightMethods.SCAN,
-      ex.DynamodbTableInflightMethods.QUERY,
-      ex.DynamodbTableInflightMethods.TRANSACT_GET_ITEMS,
-      ex.DynamodbTableInflightMethods.TRANSACT_WRITE_ITEMS,
-      ex.DynamodbTableInflightMethods.BATCH_GET_ITEM,
-      ex.DynamodbTableInflightMethods.BATCH_WRITE_ITEM,
-    ];
-  }
-
-  public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
-    super.onLift(host, ops);
-  }
-
-  /** @internal */
-  public _toInflight(): string {
-    return makeSimulatorJsClient(__filename, this);
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/endpoint.inflight.ts b/libs/wingsdk/src/target-sim/endpoint.inflight.ts
new file mode 100644
index 00000000000..3ae3fa7c5f9
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/endpoint.inflight.ts
@@ -0,0 +1,133 @@
+import { writeFileSync } from "fs";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { connect, ConnectResponse } from "@winglang/wingtunnels";
+import { EndpointAttributes, EndpointSchema } from "./schema-resources";
+import { exists } from "./util";
+import { IEndpointClient } from "../cloud";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
+
+const STATE_FILENAME = "state.json";
+
+/**
+ * Contents of the state file for this resource.
+ */
+interface StateFileContents {
+  /**
+   * The last subdomain used by the tunnel on a previous simulator run.
+   */
+  readonly subdomain?: string;
+}
+
+export type EndpointExposeStatus = "connected" | "disconnected" | "connecting";
+
+export class Endpoint implements IEndpointClient, ISimulatorResourceInstance {
+  private connectResponse?: ConnectResponse;
+  private lastSubdomain?: string;
+  private status: EndpointExposeStatus = "disconnected";
+  private _context: ISimulatorContext | undefined;
+
+  constructor(private readonly _props: EndpointSchema) {}
+
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<EndpointAttributes> {
+    this._context = context;
+    const state: StateFileContents = await this.loadState();
+    if (state.subdomain) {
+      await this.connect(state.subdomain);
+    }
+
+    return {
+      inputUrl: this._props.inputUrl,
+      url: this.connectResponse?.url ?? this._props.url,
+      label: this._props.label,
+      browserSupport: this._props.browserSupport,
+    };
+  }
+
+  public async cleanup(): Promise<void> {
+    this.connectResponse?.close();
+  }
+
+  public async save(): Promise<void> {
+    return this.saveState({
+      ...(this.lastSubdomain && { subdomain: this.lastSubdomain }),
+    });
+  }
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
+  public async expose(): Promise<void> {
+    if (this.status === "connecting" || this.status === "connected") {
+      throw new Error("Can only expose when status is disconnected.");
+    }
+    return this.connect();
+  }
+
+  public async hide(): Promise<void> {
+    this.connectResponse?.close();
+    this.connectResponse = undefined;
+    this.lastSubdomain = undefined;
+    this.status = "disconnected";
+  }
+
+  public async exposeStatus(): Promise<EndpointExposeStatus> {
+    return this.status;
+  }
+
+  private async loadState(): Promise<StateFileContents> {
+    const stateFileExists = await exists(
+      join(this.context.statedir, STATE_FILENAME)
+    );
+    if (stateFileExists) {
+      const stateFileContents = await readFile(
+        join(this.context.statedir, STATE_FILENAME),
+        "utf-8"
+      );
+      return JSON.parse(stateFileContents);
+    } else {
+      return {};
+    }
+  }
+
+  private async saveState(state: StateFileContents): Promise<void> {
+    writeFileSync(
+      join(this.context.statedir, STATE_FILENAME),
+      JSON.stringify(state)
+    );
+  }
+
+  private async connect(subdomain?: string) {
+    try {
+      await this.context.withTrace({
+        message: `Creating tunnel for endpoint. ${
+          subdomain ? `Using subdomain: ${subdomain}` : ""
+        }`,
+        activity: async () => {
+          this.status = "connecting";
+          this.connectResponse = await connect(this._props.inputUrl, {
+            subdomain,
+          });
+          this.lastSubdomain = new URL(this.connectResponse.url).hostname.split(
+            "."
+          )[0];
+          this.status = "connected";
+        },
+      });
+    } catch {
+      this.status = "disconnected";
+    }
+  }
+}
diff --git a/libs/wingsdk/src/target-sim/endpoint.ts b/libs/wingsdk/src/target-sim/endpoint.ts
new file mode 100644
index 00000000000..f1525cfdcd6
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/endpoint.ts
@@ -0,0 +1,41 @@
+import { Construct } from "constructs";
+import { EndpointSchema } from "./schema-resources";
+import { makeSimulatorJsClient } from "./util";
+import * as cloud from "../cloud";
+import { ToSimulatorOutput } from "../simulator";
+
+/**
+ * Simulator implementation of `cloud.Endpoint`
+ */
+export class Endpoint extends cloud.Endpoint {
+  private readonly _inputUrl: string;
+  constructor(
+    scope: Construct,
+    id: string,
+    url: string,
+    props: cloud.EndpointProps = {}
+  ) {
+    super(scope, id, url, props);
+    this._inputUrl = url;
+  }
+
+  /**
+   * @internal
+   */
+  public _toInflight(): string {
+    return makeSimulatorJsClient(__filename, this);
+  }
+
+  public toSimulator(): ToSimulatorOutput {
+    const props: EndpointSchema = {
+      inputUrl: this._inputUrl,
+      url: this.url,
+      label: this.label,
+      browserSupport: this.browserSupport,
+    };
+    return {
+      type: cloud.ENDPOINT_FQN,
+      props,
+    };
+  }
+}
diff --git a/libs/wingsdk/src/target-sim/event-mapping.inflight.ts b/libs/wingsdk/src/target-sim/event-mapping.inflight.ts
index 1491cc45ec3..50bb7b3680b 100644
--- a/libs/wingsdk/src/target-sim/event-mapping.inflight.ts
+++ b/libs/wingsdk/src/target-sim/event-mapping.inflight.ts
@@ -3,31 +3,53 @@ import {
   EventMappingAttributes,
   EventMappingSchema,
   EventSubscription,
-  FunctionHandle,
-  PublisherHandle,
+  ResourceHandle,
 } from "./schema-resources";
 import { ISimulatorContext } from "../simulator";
-import { ISimulatorResourceInstance } from "../simulator/simulator";
+import { ISimulatorResourceInstance, UpdatePlan } from "../simulator/simulator";
 
 export class EventMapping implements ISimulatorResourceInstance {
-  private readonly publisher: PublisherHandle;
-  private readonly subscriber: FunctionHandle;
+  private readonly publisher: ResourceHandle;
+  private readonly subscriber: ResourceHandle;
   private readonly eventSubscription: EventSubscription;
-  private readonly context: ISimulatorContext;
+  private _context: ISimulatorContext | undefined;
 
-  constructor(props: EventMappingSchema["props"], context: ISimulatorContext) {
+  constructor(props: EventMappingSchema) {
     this.publisher = props.publisher;
     this.subscriber = props.subscriber;
     this.eventSubscription = props.subscriptionProps;
+  }
 
-    this.context = context;
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
   }
 
-  public async init(): Promise<EventMappingAttributes> {
-    const client = this.context.findInstance(this.publisher) as IEventPublisher;
+  public async init(
+    context: ISimulatorContext
+  ): Promise<EventMappingAttributes> {
+    this._context = context;
+    const client = this.context.getClient(
+      this.publisher,
+      true
+    ) as IEventPublisher;
     await client.addEventSubscription(this.subscriber, this.eventSubscription);
     return {};
   }
 
-  public async cleanup(): Promise<void> {}
+  public async cleanup(): Promise<void> {
+    const client = this.context.getClient(
+      this.publisher,
+      true
+    ) as IEventPublisher;
+    await client.removeEventSubscription(this.subscriber);
+  }
+
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
 }
diff --git a/libs/wingsdk/src/target-sim/event-mapping.ts b/libs/wingsdk/src/target-sim/event-mapping.ts
index f386051e45d..49cc22e9cd4 100644
--- a/libs/wingsdk/src/target-sim/event-mapping.ts
+++ b/libs/wingsdk/src/target-sim/event-mapping.ts
@@ -3,14 +3,15 @@ import { ISimulatorResource } from "./resource";
 import {
   EventMappingSchema,
   EventSubscription,
-  FunctionHandle,
+  ResourceHandle,
 } from "./schema-resources";
 import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import { fqnForType } from "../constants";
+import { LiftMap } from "../core";
 import {
-  BaseResourceSchema,
   ISimulatorResourceInstance,
+  ToSimulatorOutput,
 } from "../simulator/simulator";
 import { IInflightHost, IResource, Node, Resource } from "../std";
 
@@ -24,9 +25,16 @@ export interface IEventPublisher extends ISimulatorResourceInstance {
    * @param subscriptionProps additional subscription properties
    */
   addEventSubscription: (
-    subscriber: FunctionHandle,
+    subscriber: ResourceHandle,
     subscriptionProps: EventSubscription
   ) => Promise<void>;
+
+  /**
+   * Removes event subscription from the publisher client.
+   * @param subscriber the subscriber function
+   * @param subscriptionProps additional subscription properties
+   */
+  removeEventSubscription: (subscriber: ResourceHandle) => Promise<void>;
 }
 
 export const EVENT_MAPPING_FQN = fqnForType("sim.EventMapping");
@@ -56,30 +64,28 @@ export class EventMapping extends Resource implements ISimulatorResource {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [];
+  public get _liftMap(): LiftMap {
+    return {};
   }
 
   public get eventProps(): EventMappingProps {
     return this._eventProps;
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: EventMappingSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: EventMappingSchema = {
+      subscriber: simulatorHandleToken(this.eventProps.subscriber),
+      publisher: simulatorHandleToken(this.eventProps.publisher),
+      subscriptionProps: this.eventProps.subscriptionProps,
+    };
+    return {
       type: EVENT_MAPPING_FQN,
-      path: this.node.path,
-      props: {
-        subscriber: simulatorHandleToken(this.eventProps.subscriber),
-        publisher: simulatorHandleToken(this.eventProps.publisher),
-        subscriptionProps: this.eventProps.subscriptionProps,
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-sim/function.inflight.ts b/libs/wingsdk/src/target-sim/function.inflight.ts
index a6289af1a3c..fc151f150ca 100644
--- a/libs/wingsdk/src/target-sim/function.inflight.ts
+++ b/libs/wingsdk/src/target-sim/function.inflight.ts
@@ -1,60 +1,210 @@
 import * as path from "path";
 import { FunctionAttributes, FunctionSchema } from "./schema-resources";
 import { FUNCTION_FQN, IFunctionClient } from "../cloud";
-import { Sandbox } from "../shared/sandbox";
+import { Bundle, isBundleInvalidated } from "../shared/bundling";
+import { Sandbox, SandboxTimeoutError } from "../shared/sandbox";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
-import { TraceType } from "../std";
+import { LogLevel, TraceType } from "../std";
 
 export class Function implements IFunctionClient, ISimulatorResourceInstance {
-  private readonly filename: string;
+  private readonly sourceCodeFile: string;
+  private originalFile!: string;
+  private bundle: Bundle | undefined;
   private readonly env: Record<string, string>;
-  private readonly context: ISimulatorContext;
+  private _context: ISimulatorContext | undefined;
   private readonly timeout: number;
+  private readonly maxWorkers: number;
+  private readonly workers = new Array<Sandbox>();
+  private createBundlePromise!: Promise<void>;
 
-  constructor(props: FunctionSchema["props"], context: ISimulatorContext) {
+  constructor(props: FunctionSchema) {
+    this.sourceCodeFile = props.sourceCodeFile;
     if (props.sourceCodeLanguage !== "javascript") {
       throw new Error("Only JavaScript is supported");
     }
-    this.filename = path.resolve(context.simdir, props.sourceCodeFile);
     this.env = props.environmentVariables ?? {};
-    this.context = context;
     this.timeout = props.timeout;
+    this.maxWorkers = props.concurrency;
   }
 
-  public async init(): Promise<FunctionAttributes> {
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<FunctionAttributes> {
+    this._context = context;
+    this.originalFile = path.resolve(context.simdir, this.sourceCodeFile);
+    this.createBundlePromise = this.createBundle();
     return {};
   }
 
   public async cleanup(): Promise<void> {
-    return;
+    // We wait for the bundle to be created since there's no way to otherwise cancel the work.
+    // If the simulator runs for a short time (and cloud.Function is created and then deleted)
+    // and the bundling code is allowed to run after the simulator has stopped, it might fail
+    // and throw an error to the user because the files the simulator was using may no longer be there there.
+    await this.createBundlePromise;
+    await Promise.allSettled(this.workers.map((w) => w.cleanup()));
+  }
+
+  public async save(): Promise<void> {}
+
+  public async plan(invalidated: boolean): Promise<UpdatePlan> {
+    // If our function config changed, always replace
+    if (invalidated) {
+      return UpdatePlan.REPLACE;
+    }
+
+    // Make sure that we don't have an ongoing bundle operation
+    await this.ensureBundled();
+
+    // Check if any of the bundled files have changed since the last bundling
+    const bundleInvalidated = await isBundleInvalidated(
+      this.originalFile,
+      this.bundle!,
+      (msg) => this.addTrace(msg, TraceType.SIMULATOR, LogLevel.VERBOSE)
+    );
+    if (bundleInvalidated) {
+      return UpdatePlan.REPLACE;
+    }
+
+    return UpdatePlan.SKIP;
   }
 
   public async invoke(payload: string): Promise<string> {
     return this.context.withTrace({
       message: `Invoke (payload=${JSON.stringify(payload)}).`,
       activity: async () => {
-        const sb = new Sandbox(this.filename, {
-          env: {
-            ...this.env,
-            WING_SIMULATOR_URL: this.context.serverUrl,
-          },
-          timeout: this.timeout,
-          log: (internal, _level, message) => {
+        const worker = await this.findAvailableWorker();
+        if (!worker) {
+          throw new Error(
+            "Too many requests, the function has reached its concurrency limit."
+          );
+        }
+        try {
+          return await worker.call("handler", payload);
+        } catch (err) {
+          if (err instanceof SandboxTimeoutError) {
+            throw new Error(
+              `Function timed out (it was configured with a timeout of ${this.timeout}ms).`
+            );
+          } else {
+            throw err;
+          }
+        }
+      },
+    });
+  }
+
+  public async invokeAsync(payload: string): Promise<void> {
+    await this.context.withTrace({
+      message: `InvokeAsync (payload=${JSON.stringify(payload)}).`,
+      activity: async () => {
+        const worker = await this.findAvailableWorker();
+        if (!worker) {
+          throw new Error(
+            "Too many requests, the function has reached its concurrency limit."
+          );
+        }
+        process.nextTick(() => {
+          void worker.call("handler", payload).catch((e) => {
+            // If the call fails, we log the error and continue since we've already
+            // handed control back to the caller.
             this.context.addTrace({
-              data: { message },
-              type: internal ? TraceType.RESOURCE : TraceType.LOG,
+              data: {
+                message: `InvokeAsync (payload=${JSON.stringify(
+                  payload
+                )}) failure.`,
+                status: "failure",
+                error: e,
+              },
+              type: TraceType.LOG,
+              level: LogLevel.ERROR,
               sourcePath: this.context.resourcePath,
               sourceType: FUNCTION_FQN,
               timestamp: new Date().toISOString(),
             });
-          },
+          });
         });
+      },
+    });
+  }
 
-        return sb.call("handler", JSON.stringify(payload));
+  private async createBundle(): Promise<void> {
+    this.bundle = await Sandbox.createBundle(
+      this.originalFile,
+      (msg, level) => {
+        this.addTrace(msg, TraceType.RESOURCE, level);
+      }
+    );
+  }
+
+  private async ensureBundled(): Promise<void> {
+    await this.createBundlePromise;
+    if (!this.bundle) {
+      throw new Error("Bundle not created");
+    }
+  }
+
+  // Used internally by cloud.Queue to apply backpressure
+  public async hasAvailableWorkers(): Promise<boolean> {
+    return (
+      this.workers.length < this.maxWorkers ||
+      this.workers.some((w) => w.isAvailable())
+    );
+  }
+
+  private async findAvailableWorker(): Promise<Sandbox | undefined> {
+    const worker = this.workers.find((w) => w.isAvailable());
+    if (worker) {
+      return worker;
+    }
+
+    if (this.workers.length < this.maxWorkers) {
+      const newWorker = await this.initWorker();
+      this.workers.push(newWorker);
+      return newWorker;
+    }
+
+    return undefined;
+  }
+
+  private async initWorker(): Promise<Sandbox> {
+    // ensure inflight code is bundled before we create any workers
+    await this.ensureBundled();
+
+    return new Sandbox(this.bundle!.outfilePath, {
+      env: {
+        ...this.env,
+        WING_SIMULATOR_CALLER: this.context.resourceHandle,
+        WING_SIMULATOR_URL: this.context.serverUrl,
       },
+      timeout: this.timeout,
+      log: (internal, level, message) => {
+        this.addTrace(
+          message,
+          internal ? TraceType.SIMULATOR : TraceType.LOG,
+          level
+        );
+      },
+    });
+  }
+
+  private addTrace(message: string, type: TraceType, level: LogLevel) {
+    this.context.addTrace({
+      data: { message },
+      type,
+      level,
+      sourcePath: this.context.resourcePath,
+      sourceType: FUNCTION_FQN,
+      timestamp: new Date().toISOString(),
     });
   }
 }
diff --git a/libs/wingsdk/src/target-sim/function.ts b/libs/wingsdk/src/target-sim/function.ts
index 06c4b11e96e..721ae0bc6f3 100644
--- a/libs/wingsdk/src/target-sim/function.ts
+++ b/libs/wingsdk/src/target-sim/function.ts
@@ -1,12 +1,13 @@
 import { relative } from "path";
 import { Construct } from "constructs";
-import { ISimulatorResource } from "./resource";
+import { ISimulatorInflightHost, ISimulatorResource } from "./resource";
 import { FunctionSchema } from "./schema-resources";
+import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
-import { App } from "../core";
-import { BaseResourceSchema } from "../simulator/simulator";
-import { IInflightHost } from "../std";
+import { App, LiftMap } from "../core";
+import { PolicyStatement, ToSimulatorOutput } from "../simulator/simulator";
+import { IInflightHost, IResource } from "../std";
 import { Duration } from "../std/duration";
 
 export const ENV_WING_SIM_INFLIGHT_RESOURCE_PATH =
@@ -19,8 +20,14 @@ export const ENV_WING_SIM_INFLIGHT_RESOURCE_TYPE =
  *
  * @inflight `@winglang/sdk.cloud.IFunctionClient`
  */
-export class Function extends cloud.Function implements ISimulatorResource {
+export class Function
+  extends cloud.Function
+  implements ISimulatorResource, ISimulatorInflightHost
+{
   private readonly timeout: Duration;
+  private readonly concurrency: number;
+  private readonly permissions: Array<[IResource, string]> = [];
+
   constructor(
     scope: Construct,
     id: string,
@@ -31,31 +38,50 @@ export class Function extends cloud.Function implements ISimulatorResource {
 
     // props.memory is unused since we are not simulating it
     this.timeout = props.timeout ?? Duration.fromMinutes(1);
+    this.concurrency = props.concurrency ?? 100;
+  }
+
+  public addPermission(resource: IResource, op: string): void {
+    this.permissions.push([resource, op]);
   }
 
-  public toSimulator(): BaseResourceSchema {
+  public toSimulator(): ToSimulatorOutput {
     const outdir = App.of(this).outdir;
-    const schema: FunctionSchema = {
+
+    const policy: Array<PolicyStatement> = [];
+    for (const [resource, operation] of this.permissions) {
+      policy.push({
+        operation,
+        resourceHandle: simulatorHandleToken(resource),
+      });
+    }
+
+    const props: FunctionSchema = {
+      sourceCodeFile: relative(outdir, this.entrypoint),
+      sourceCodeLanguage: "javascript",
+      environmentVariables: this.env,
+      timeout: this.timeout.seconds * 1000,
+      concurrency: this.concurrency,
+    };
+    return {
       type: cloud.FUNCTION_FQN,
-      path: this.node.path,
-      props: {
-        sourceCodeFile: relative(outdir, this.entrypoint),
-        sourceCodeLanguage: "javascript",
-        environmentVariables: this.env,
-        timeout: this.timeout.seconds * 1000,
-      },
-      attrs: {} as any,
+      props,
+      policy,
     };
-    return schema;
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [cloud.FunctionInflightMethods.INVOKE];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.FunctionInflightMethods.INVOKE]: [[this.handler, ["handle"]]],
+      [cloud.FunctionInflightMethods.INVOKE_ASYNC]: [
+        [this.handler, ["handle"]],
+      ],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
@@ -64,3 +90,10 @@ export class Function extends cloud.Function implements ISimulatorResource {
     return makeSimulatorJsClient(__filename, this);
   }
 }
+
+/**
+ * Simulator-specific inflight methods for `cloud.Function`.
+ */
+export enum FunctionInflightMethods {
+  HAS_AVAILABLE_WORKERS = "hasAvailableWorkers",
+}
diff --git a/libs/wingsdk/src/target-sim/index.ts b/libs/wingsdk/src/target-sim/index.ts
index 15e8b993d26..7b8fd8ebf68 100644
--- a/libs/wingsdk/src/target-sim/index.ts
+++ b/libs/wingsdk/src/target-sim/index.ts
@@ -1,4 +1,5 @@
 // only include here types that we want to expose in userland
-
+export * from "./container";
+export * from "./policy";
 export * from "./resource";
 export * from "./state";
diff --git a/libs/wingsdk/src/target-sim/on-deploy.inflight.ts b/libs/wingsdk/src/target-sim/on-deploy.inflight.ts
index 181e89453f8..1d2b7bc0098 100644
--- a/libs/wingsdk/src/target-sim/on-deploy.inflight.ts
+++ b/libs/wingsdk/src/target-sim/on-deploy.inflight.ts
@@ -3,32 +3,36 @@ import { IFunctionClient, IOnDeployClient } from "../cloud";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
 
 export class OnDeploy implements IOnDeployClient, ISimulatorResourceInstance {
   private functionHandle: string;
-  private readonly context: ISimulatorContext;
 
-  public constructor(
-    props: OnDeploySchema["props"],
-    context: ISimulatorContext
-  ) {
+  public constructor(props: OnDeploySchema) {
     this.functionHandle = props.functionHandle;
-    this.context = context;
   }
 
-  public async init(): Promise<OnDeployAttributes> {
-    const functionClient = this.context.findInstance(
-      this.functionHandle
-    ) as IFunctionClient & ISimulatorResourceInstance;
-    await this.context.withTrace({
+  public async init(context: ISimulatorContext): Promise<OnDeployAttributes> {
+    const functionClient = context.getClient(
+      this.functionHandle,
+      true
+    ) as IFunctionClient;
+    await context.withTrace({
       message: "OnDeploy invoked.",
       activity: async () => {
-        return functionClient.invoke("");
+        return functionClient.invoke();
       },
     });
     return {};
   }
 
   public async cleanup(): Promise<void> {}
+
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    // OnDeploy runs on every deployment, so always replace
+    return UpdatePlan.REPLACE;
+  }
 }
diff --git a/libs/wingsdk/src/target-sim/on-deploy.ts b/libs/wingsdk/src/target-sim/on-deploy.ts
index c29b4000b89..e66ab099303 100644
--- a/libs/wingsdk/src/target-sim/on-deploy.ts
+++ b/libs/wingsdk/src/target-sim/on-deploy.ts
@@ -3,8 +3,8 @@ import { 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 { ToSimulatorOutput } from "../simulator";
+import { IInflight, IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
 
 export class OnDeploy extends cloud.OnDeploy {
   private readonly fn: cloud.Function;
@@ -16,7 +16,7 @@ export class OnDeploy extends cloud.OnDeploy {
   ) {
     super(scope, id, handler, props);
 
-    this.fn = new cloud.Function(this, "Function", handler, props);
+    this.fn = new cloud.Function(this, "Function", handler as IInflight, props);
     Node.of(this.fn).sourceModule = SDK_SOURCE_MODULE;
 
     this.node.addDependency(this.fn);
@@ -30,20 +30,18 @@ export class OnDeploy extends cloud.OnDeploy {
     }
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: OnDeploySchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: OnDeploySchema = {
+      functionHandle: simulatorHandleToken(this.fn),
+    };
+    return {
       type: cloud.ON_DEPLOY_FQN,
-      path: this.node.path,
-      props: {
-        functionHandle: simulatorHandleToken(this.fn),
-      },
-      attrs: {},
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-sim/platform.ts b/libs/wingsdk/src/target-sim/platform.ts
index 076d917f24e..112fcd8c869 100644
--- a/libs/wingsdk/src/target-sim/platform.ts
+++ b/libs/wingsdk/src/target-sim/platform.ts
@@ -1,3 +1,5 @@
+import fs from "fs";
+import { join } from "path";
 import { App } from "./app";
 import { IPlatform } from "../platform";
 
@@ -11,4 +13,34 @@ export class Platform implements IPlatform {
   public newApp(appProps: any): any {
     return new App(appProps);
   }
+
+  public async storeSecrets(secrets: Record<string, string>): Promise<void> {
+    let existingSecretsContent = "";
+    const envFile = join(process.env.WING_SOURCE_DIR!, ".env");
+
+    try {
+      existingSecretsContent = fs.readFileSync(envFile, "utf8");
+    } catch (error) {}
+
+    const existingSecrets = existingSecretsContent
+      .split("\n")
+      .filter((line) => line.trim() !== "")
+      .reduce((s, line) => {
+        const [key, value] = line.split("=", 2);
+        s[key] = value;
+        return s;
+      }, {} as { [key: string]: string });
+
+    for (const key in secrets) {
+      existingSecrets[key] = secrets[key];
+    }
+
+    const updatedContent = Object.entries(existingSecrets)
+      .map(([key, value]) => `${key}=${value}`)
+      .join("\n");
+
+    fs.writeFileSync(envFile, updatedContent);
+
+    console.log(`${Object.keys(secrets).length} secret(s) stored in .env`);
+  }
 }
diff --git a/libs/wingsdk/src/target-sim/policy.inflight.ts b/libs/wingsdk/src/target-sim/policy.inflight.ts
new file mode 100644
index 00000000000..b197a29e75d
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/policy.inflight.ts
@@ -0,0 +1,22 @@
+import { IPolicyClient } from "./policy";
+import { PolicySchema } from "./schema-resources";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
+
+export class Policy implements IPolicyClient, ISimulatorResourceInstance {
+  constructor(_props: PolicySchema) {}
+  public async init(_context: ISimulatorContext): Promise<Record<string, any>> {
+    return {};
+  }
+
+  public async cleanup(): Promise<void> {}
+
+  public async save(): Promise<void> {}
+
+  public async plan(): Promise<UpdatePlan> {
+    return UpdatePlan.AUTO;
+  }
+}
diff --git a/libs/wingsdk/src/target-sim/policy.ts b/libs/wingsdk/src/target-sim/policy.ts
new file mode 100644
index 00000000000..2faea63f415
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/policy.ts
@@ -0,0 +1,78 @@
+import { Construct } from "constructs";
+import { ISimulatorResource } from "./resource";
+import { PolicySchema } from "./schema-resources";
+import { simulatorHandleToken } from "./tokens";
+import { fqnForType } from "../constants";
+import { LiftMap } from "../core";
+import { PolicyStatement, ToSimulatorOutput } from "../simulator";
+import { IResource, Node, Resource } from "../std";
+
+export const POLICY_FQN = fqnForType("sim.Policy");
+
+/**
+ * Options for `sim.Policy`.
+ */
+export interface PolicyProps {
+  /**
+   * The resource to which the policy is attached.
+   */
+  readonly principal: IResource;
+}
+
+/**
+ * Implementation of `sim.Policy`.
+ *
+ * @inflight `@winglang/sdk.sim.IPolicyClient`
+ */
+export class Policy extends Resource implements ISimulatorResource {
+  private readonly statements: Map<IResource, Set<string>> = new Map();
+  private readonly principal: IResource;
+
+  constructor(scope: Construct, id: string, props: PolicyProps) {
+    super(scope, id);
+    this.principal = props.principal;
+    Node.of(this).hidden = true;
+    Node.of(this).title = "Policy";
+    Node.of(this).description = "A simulated resource policy";
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {};
+  }
+
+  /**
+   * Adds a statement to the policy.
+   */
+  public addStatement(resource: IResource, op: string): void {
+    if (!this.statements.has(resource)) {
+      this.statements.set(resource, new Set());
+    }
+    this.statements.get(resource)!.add(op);
+  }
+
+  public toSimulator(): ToSimulatorOutput {
+    const statements: Array<PolicyStatement> = [];
+    for (const [resource, ops] of this.statements.entries()) {
+      for (const op of ops) {
+        statements.push({
+          resourceHandle: simulatorHandleToken(resource),
+          operation: op,
+        });
+      }
+    }
+    const props: PolicySchema = {
+      principal: simulatorHandleToken(this.principal),
+      statements,
+    };
+    return {
+      type: POLICY_FQN,
+      props,
+    };
+  }
+}
+
+/**
+ * Inflight interface for `Policy`.
+ */
+export interface IPolicyClient {}
diff --git a/libs/wingsdk/src/target-sim/queue.inflight.ts b/libs/wingsdk/src/target-sim/queue.inflight.ts
index 9e716d77880..843df17a26c 100644
--- a/libs/wingsdk/src/target-sim/queue.inflight.ts
+++ b/libs/wingsdk/src/target-sim/queue.inflight.ts
@@ -1,45 +1,69 @@
 import { IEventPublisher } from "./event-mapping";
+import type { Function as FunctionClient } from "./function.inflight";
 import {
   QueueAttributes,
   QueueSchema,
   QueueSubscriber,
   EventSubscription,
-  FunctionHandle,
+  DeadLetterQueueSchema,
+  ResourceHandle,
 } from "./schema-resources";
-import { IFunctionClient, IQueueClient, QUEUE_FQN } from "../cloud";
+import {
+  DEFAULT_DELIVERY_ATTEMPTS,
+  IFunctionClient,
+  IQueueClient,
+  QUEUE_FQN,
+} from "../cloud";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
-import { TraceType } from "../std";
+import { LogLevel, TraceType } from "../std";
 
 export class Queue
   implements IQueueClient, ISimulatorResourceInstance, IEventPublisher
 {
   private readonly messages = new Array<QueueMessage>();
   private readonly subscribers = new Array<QueueSubscriber>();
-  private readonly intervalId: NodeJS.Timeout;
-  private readonly context: ISimulatorContext;
-  private readonly timeout: number;
+  private readonly processLoop: LoopController;
+  private _context: ISimulatorContext | undefined;
+  private readonly timeoutSeconds: number;
   private readonly retentionPeriod: number;
+  private readonly dlq?: DeadLetterQueueSchema;
 
-  constructor(props: QueueSchema["props"], context: ISimulatorContext) {
-    this.timeout = props.timeout;
+  constructor(props: QueueSchema) {
+    this.timeoutSeconds = props.timeout;
     this.retentionPeriod = props.retentionPeriod;
-    this.intervalId = setInterval(() => this.processMessages(), 100); // every 0.1 seconds
-    this.context = context;
+    this.dlq = props.dlq;
+    this.processLoop = runEvery(100, async () => this.processMessages()); // every 0.1 seconds
   }
 
-  public async init(): Promise<QueueAttributes> {
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<QueueAttributes> {
+    this._context = context;
+    await this.processLoop.start();
     return {};
   }
 
   public async cleanup(): Promise<void> {
-    clearInterval(this.intervalId);
+    await this.processLoop.stop();
+  }
+
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
   }
 
   public async addEventSubscription(
-    subscriber: FunctionHandle,
+    subscriber: ResourceHandle,
     subscriptionProps: EventSubscription
   ): Promise<void> {
     const s = {
@@ -49,6 +73,17 @@ export class Queue
     this.subscribers.push(s);
   }
 
+  public async removeEventSubscription(
+    subscriber: ResourceHandle
+  ): Promise<void> {
+    const index = this.subscribers.findIndex(
+      (s) => s.functionHandle === subscriber
+    );
+    if (index >= 0) {
+      this.subscribers.splice(index, 1);
+    }
+  }
+
   // TODO: enforce maximum queue message size?
   public async push(...messages: string[]): Promise<void> {
     return this.context.withTrace({
@@ -58,7 +93,13 @@ export class Queue
           throw new Error("Empty messages are not allowed");
         }
         for (const message of messages) {
-          this.messages.push(new QueueMessage(this.retentionPeriod, message));
+          this.messages.push(
+            new QueueMessage(
+              this.retentionPeriod,
+              DEFAULT_DELIVERY_ATTEMPTS,
+              message
+            )
+          );
         }
       },
     });
@@ -96,20 +137,21 @@ export class Queue
     });
   }
 
-  private processMessages() {
+  private async processMessages() {
     let processedMessages = false;
     do {
       processedMessages = false;
       // Remove messages that have expired
       const currentTime = new Date();
-      this.messages.forEach(async (message, index) => {
+      for (let index = this.messages.length - 1; index >= 0; index--) {
+        const message = this.messages[index];
         if (message.retentionTimeout < currentTime) {
           await this.context.withTrace({
             activity: async () => this.messages.splice(index, 1),
             message: `Removing expired message (message=${message.payload}).`,
           });
         }
-      });
+      }
       // Randomize the order of subscribers to avoid user code making
       // assumptions on the order that subscribers process messages.
       for (const subscriber of new RandomArrayIterator(this.subscribers)) {
@@ -129,14 +171,25 @@ export class Queue
           continue;
         }
 
-        const fnClient = this.context.findInstance(
-          subscriber.functionHandle!
-        ) as IFunctionClient & ISimulatorResourceInstance;
+        const fnClient = this.context.getClient(
+          subscriber.functionHandle
+        ) as IFunctionClient;
         if (!fnClient) {
           throw new Error("No function client found");
         }
+
+        // If the function we picked is at capacity, keep the messages in the queue
+        const hasWorkers = await (
+          fnClient as FunctionClient
+        ).hasAvailableWorkers();
+        if (!hasWorkers) {
+          this.messages.push(...messages);
+          continue;
+        }
+
         this.context.addTrace({
           type: TraceType.RESOURCE,
+          level: LogLevel.VERBOSE,
           data: {
             message: `Sending messages (messages=${JSON.stringify(
               messagesPayload
@@ -146,9 +199,52 @@ export class Queue
           sourceType: QUEUE_FQN,
           timestamp: new Date().toISOString(),
         });
+
+        // we don't use invokeAsync here because we want to wait for the function to finish
+        // and requeue the messages if it fails
         void fnClient
-          .invoke(JSON.stringify({ messages: messagesPayload }))
+          .invoke(JSON.stringify({ messages: messages }))
+          .then((result) => {
+            if (this.dlq && result) {
+              const errorList = JSON.parse(result);
+              let retriesMessages = [];
+              for (const msg of errorList) {
+                if (
+                  msg.remainingDeliveryAttempts < this.dlq.maxDeliveryAttempts
+                ) {
+                  msg.remainingDeliveryAttempts++;
+                  retriesMessages.push(msg);
+                } else {
+                  let dlq = this.context.getClient(
+                    this.dlq.dlqHandler
+                  ) as IQueueClient;
+
+                  void dlq.push(msg.payload).catch((err) => {
+                    this.context.addTrace({
+                      type: TraceType.RESOURCE,
+                      level: LogLevel.ERROR,
+                      data: {
+                        message: `Pushing messages to the dead-letter queue generates an error -> ${err}`,
+                      },
+                      sourcePath: this.context.resourcePath,
+                      sourceType: QUEUE_FQN,
+                      timestamp: new Date().toISOString(),
+                    });
+                  });
+                }
+              }
+              this.messages.push(...retriesMessages);
+            }
+          })
           .catch((err) => {
+            // If the function is at a concurrency limit, pretend we just didn't call it
+            if (
+              err.message ===
+              "Too many requests, the function has reached its concurrency limit."
+            ) {
+              this.messages.push(...messages);
+              return;
+            }
             // If the function returns an error, put the message back on the queue after timeout period
             this.context.addTrace({
               data: {
@@ -157,28 +253,17 @@ export class Queue
               sourcePath: this.context.resourcePath,
               sourceType: QUEUE_FQN,
               type: TraceType.RESOURCE,
+              level: LogLevel.ERROR,
               timestamp: new Date().toISOString(),
             });
-            void this.pushMessagesBackToQueue(messages).catch((requeueErr) => {
-              this.context.addTrace({
-                data: {
-                  message: `Error pushing ${messagesPayload.length} messages back to queue: ${requeueErr.message}`,
-                },
-                sourcePath: this.context.resourcePath,
-                sourceType: QUEUE_FQN,
-                type: TraceType.RESOURCE,
-                timestamp: new Date().toISOString(),
-              });
-            });
+            this.pushMessagesBackToQueue(messages);
           });
         processedMessages = true;
       }
     } while (processedMessages);
   }
 
-  public async pushMessagesBackToQueue(
-    messages: Array<QueueMessage>
-  ): Promise<void> {
+  public pushMessagesBackToQueue(messages: Array<QueueMessage>): void {
     setTimeout(() => {
       // Don't push back messages with retention timeouts that have expired
       const retainedMessages = messages.filter(
@@ -192,21 +277,28 @@ export class Queue
         sourcePath: this.context.resourcePath,
         sourceType: QUEUE_FQN,
         type: TraceType.RESOURCE,
+        level: LogLevel.WARNING,
         timestamp: new Date().toISOString(),
       });
-    }, this.timeout * 1000);
+    }, this.timeoutSeconds * 1000);
   }
 }
 
 class QueueMessage {
   public readonly retentionTimeout: Date;
   public readonly payload: string;
+  public remainingDeliveryAttempts: number;
 
-  constructor(retentionPeriod: number, message: string) {
+  constructor(
+    retentionPeriod: number,
+    remainingDeliveryAttempts: number,
+    message: string
+  ) {
     const currentTime = new Date();
     currentTime.setSeconds(retentionPeriod + currentTime.getSeconds());
     this.retentionTimeout = currentTime;
     this.payload = message;
+    this.remainingDeliveryAttempts = remainingDeliveryAttempts;
   }
 }
 
@@ -235,3 +327,58 @@ class RandomArrayIterator<T = any> implements Iterable<T> {
     return this;
   }
 }
+
+interface LoopController {
+  stop(): Promise<void>;
+  start(): Promise<void>;
+}
+
+/**
+ * Runs an asynchronous function every `interval` milliseconds.
+ * If the function takes longer than `interval` to run, it will be run again immediately.
+ * Otherwise, it will wait until `interval` milliseconds have passed before running again.
+ * @param interval The interval in milliseconds
+ * @param fn The function to run
+ * @returns A controller that can be used to stop the loop
+ */
+function runEvery(interval: number, fn: () => Promise<void>): LoopController {
+  let keepRunning = true;
+  let resolveStopPromise: (value?: unknown) => void;
+  let stopCalled = false; // in case it is called multiple times
+  let stopPromise = new Promise((resolve) => {
+    resolveStopPromise = resolve;
+  });
+
+  async function loop() {
+    while (keepRunning) {
+      const startTime = Date.now();
+      try {
+        await fn();
+      } catch (err) {
+        console.error(err);
+        keepRunning = false;
+      }
+      const endTime = Date.now();
+      const elapsedTime = endTime - startTime;
+      await new Promise((resolve) =>
+        setTimeout(resolve, Math.max(interval - elapsedTime, 0))
+      );
+    }
+    resolveStopPromise(); // resolve the promise when the loop exits
+  }
+
+  const controller = {
+    async stop() {
+      if (!stopCalled) {
+        stopCalled = true;
+        keepRunning = false;
+        await stopPromise; // wait for the loop to finish
+      }
+    },
+    async start() {
+      void loop();
+    },
+  };
+
+  return controller;
+}
diff --git a/libs/wingsdk/src/target-sim/queue.setconsumer.inflight.ts b/libs/wingsdk/src/target-sim/queue.setconsumer.inflight.ts
deleted file mode 100644
index cc0e3728899..00000000000
--- a/libs/wingsdk/src/target-sim/queue.setconsumer.inflight.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type {
-  IFunctionHandlerClient,
-  IQueueSetConsumerHandlerClient,
-} from "../cloud";
-
-export class QueueSetConsumerHandlerClient
-  implements IQueueSetConsumerHandlerClient
-{
-  private readonly handler: IFunctionHandlerClient;
-  constructor({ handler }: { handler: IFunctionHandlerClient }) {
-    this.handler = handler;
-  }
-  public async handle(event: string) {
-    let parsed = JSON.parse(event);
-    if (!parsed.messages) throw new Error('No "messages" field in event.');
-    for (const $message of parsed.messages) {
-      await this.handler.handle($message);
-    }
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/queue.ts b/libs/wingsdk/src/target-sim/queue.ts
index e17e1165eb7..650473372cb 100644
--- a/libs/wingsdk/src/target-sim/queue.ts
+++ b/libs/wingsdk/src/target-sim/queue.ts
@@ -1,14 +1,16 @@
-import { join } from "path";
 import { Construct } from "constructs";
 import { App } from "./app";
 import { EventMapping } from "./event-mapping";
-import { Function } from "./function";
+import { FunctionInflightMethods as SimFunctionInflightMethods } from "./function";
+import { Policy } from "./policy";
 import { ISimulatorResource } from "./resource";
 import { QueueSchema } from "./schema-resources";
+import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
-import { convertBetweenHandlers } from "../shared/convert";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { lift, LiftMap } from "../core";
+import { NotImplementedError } from "../core/errors";
+import { ToSimulatorOutput } from "../simulator";
 import { Duration, IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
 
 /**
@@ -19,9 +21,23 @@ import { Duration, IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
 export class Queue extends cloud.Queue implements ISimulatorResource {
   private readonly timeout: Duration;
   private readonly retentionPeriod: Duration;
+  private readonly dlq?: cloud.DeadLetterQueueProps;
+  private readonly policy: Policy;
+
   constructor(scope: Construct, id: string, props: cloud.QueueProps = {}) {
     super(scope, id, props);
 
+    if (props.timeout) {
+      throw new NotImplementedError(
+        "Queue.timeout is not supported on the sim platform yet.",
+        {
+          issue: "https://github.com/winglang/wing/issues/1980",
+          resource: this.constructor.name,
+          operation: "timeout",
+        }
+      );
+    }
+
     this.timeout = props.timeout ?? Duration.fromSeconds(30);
     this.retentionPeriod = props.retentionPeriod ?? Duration.fromHours(1);
 
@@ -30,91 +46,99 @@ export class Queue extends cloud.Queue implements ISimulatorResource {
         "Retention period must be greater than or equal to timeout"
       );
     }
+
+    this.policy = new Policy(this, "Policy", { principal: this });
+
+    if (props.dlq && props.dlq.queue) {
+      this.dlq = props.dlq;
+
+      this.policy.addStatement(this.dlq.queue, cloud.QueueInflightMethods.PUSH);
+
+      Node.of(this).addConnection({
+        source: this,
+        sourceOp: cloud.QueueInflightMethods.POP,
+        target: this.dlq.queue,
+        targetOp: cloud.QueueInflightMethods.PUSH,
+        name: "dead-letter queue",
+      });
+    }
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.QueueInflightMethods.PUSH,
-      cloud.QueueInflightMethods.PURGE,
-      cloud.QueueInflightMethods.APPROX_SIZE,
-      cloud.QueueInflightMethods.POP,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.QueueInflightMethods.PUSH]: [],
+      [cloud.QueueInflightMethods.PURGE]: [],
+      [cloud.QueueInflightMethods.APPROX_SIZE]: [],
+      [cloud.QueueInflightMethods.POP]: [],
+    };
   }
 
   public setConsumer(
     inflight: cloud.IQueueSetConsumerHandler,
     props: cloud.QueueSetConsumerOptions = {}
   ): cloud.Function {
-    /**
-     * The inflight function the user provided (via the `inflight` parameter) needs
-     * to be wrapped in some extra logic to handle batching.
-     * `convertBetweenHandlers` creates a dummy resource that provides the
-     * wrapper code. In Wing psuedocode, this looks like:
-     *
-     * resource Handler impl cloud.IFunctionHandler {
-     *   init(handler: cloud.IQueueSetConsumerHandler) {
-     *     this.handler = handler;
-     *   }
-     *   inflight handle(event: string) {
-     *     for (const message of JSON.parse(event).messages) {
-     *       this.handler.handle(message);
-     *     }
-     *   }
-     * }
-     *
-     * TODO: can we optimize this and create one less construct in the
-     * user's tree by creating a single `Handler` resource that subclasses from
-     * `cloud.Function` and overrides the `invoke` inflight method with the
-     * wrapper code directly?
-     */
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(__dirname, "queue.setconsumer.inflight.js"),
-      "QueueSetConsumerHandlerClient"
-    );
-
-    const fn = new Function(
+    const functionHandler = QueueSetConsumerHandler.toFunctionHandler(inflight);
+    const fn = new cloud.Function(
       this,
-      App.of(this).makeId(this, "SetConsumer"),
+      App.of(this).makeId(this, "Consumer"),
       functionHandler,
       props
     );
-    Node.of(fn).sourceModule = SDK_SOURCE_MODULE;
-    Node.of(fn).title = "setConsumer()";
-
-    new EventMapping(this, App.of(this).makeId(this, "QueueEventMapping"), {
-      subscriber: fn,
-      publisher: this,
-      subscriptionProps: {
-        batchSize: props.batchSize ?? 1,
-      },
-    });
+    const fnNode = Node.of(fn);
+    fnNode.sourceModule = SDK_SOURCE_MODULE;
+    fnNode.title = "Consumer";
+
+    const mapping = new EventMapping(
+      this,
+      App.of(this).makeId(this, "QueueEventMapping"),
+      {
+        subscriber: fn,
+        publisher: this,
+        subscriptionProps: {
+          batchSize: props.batchSize ?? 1,
+        },
+      }
+    );
+
+    this.policy.addStatement(fn, cloud.FunctionInflightMethods.INVOKE);
+    this.policy.addStatement(
+      fn,
+      SimFunctionInflightMethods.HAS_AVAILABLE_WORKERS
+    );
+    mapping.node.addDependency(this.policy);
 
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.QueueInflightMethods.PUSH,
       target: fn,
-      name: "setConsumer()",
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
+      name: "consumer",
     });
 
     return fn;
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: QueueSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: QueueSchema = {
+      timeout: this.timeout.seconds,
+      retentionPeriod: this.retentionPeriod.seconds,
+      dlq: this.dlq
+        ? {
+            dlqHandler: simulatorHandleToken(this.dlq.queue),
+            maxDeliveryAttempts:
+              this.dlq.maxDeliveryAttempts ?? cloud.DEFAULT_DELIVERY_ATTEMPTS,
+          }
+        : undefined,
+    };
+    return {
       type: cloud.QUEUE_FQN,
-      path: this.node.path,
-      props: {
-        timeout: this.timeout.seconds,
-        retentionPeriod: this.retentionPeriod.seconds,
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
@@ -123,3 +147,34 @@ export class Queue extends cloud.Queue implements ISimulatorResource {
     return makeSimulatorJsClient(__filename, this);
   }
 }
+
+/**
+ * Utility class to work with queue set consumer handlers.
+ */
+export class QueueSetConsumerHandler {
+  /**
+   * Converts from a `cloud.IQueueSetConsumerHandler` to a `cloud.IFunctionHandler`.
+   * @param handler The handler to convert.
+   * @returns The function handler.
+   */
+  public static toFunctionHandler(
+    handler: cloud.IQueueSetConsumerHandler
+  ): cloud.IFunctionHandler {
+    return lift({ handler }).inflight(async (ctx, event) => {
+      const batchItemFailures = [];
+      let parsed = JSON.parse(event ?? "{}");
+      if (!parsed.messages) throw new Error('No "messages" field in event.');
+      for (const $message of parsed.messages) {
+        try {
+          await ctx.handler($message.payload);
+        } catch (error) {
+          // TODO: an error from user code is getting dropped - bad! https://github.com/winglang/wing/issues/6445
+          batchItemFailures.push($message);
+        }
+      }
+      return batchItemFailures.length > 0
+        ? JSON.stringify(batchItemFailures)
+        : undefined;
+    });
+  }
+}
diff --git a/libs/wingsdk/src/target-sim/react-app.inflight.ts b/libs/wingsdk/src/target-sim/react-app.inflight.ts
deleted file mode 100644
index 27ab846fdfa..00000000000
--- a/libs/wingsdk/src/target-sim/react-app.inflight.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { ChildProcess, ExecOptions, exec } from "child_process";
-import { writeFileSync } from "fs";
-import { join } from "path";
-import { promisify } from "util";
-import { ReactAppAttributes, ReactAppSchema } from "./schema-resources";
-import { IReactAppClient, REACT_APP_FQN, WING_JS } from "../ex";
-import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator";
-import { TraceType } from "../std";
-
-export class ReactApp implements IReactAppClient, ISimulatorResourceInstance {
-  private readonly context: ISimulatorContext;
-  private readonly startCommand: string;
-  private readonly path: string;
-  private readonly environmentVariables: Record<string, string>;
-  private readonly useBuildCommand: boolean;
-  private childProcess?: ChildProcess;
-  private url: string;
-
-  constructor(props: ReactAppSchema["props"], context: ISimulatorContext) {
-    this.context = context;
-    this.path = props.path;
-    this.startCommand = props.startCommand;
-    this.environmentVariables = props.environmentVariables;
-    this.useBuildCommand = props.useBuildCommand;
-    this.url = props.url;
-  }
-
-  public async init(): Promise<ReactAppAttributes> {
-    this.addTrace(`Executing start command: ${this.startCommand}`);
-
-    writeFileSync(
-      join(`${this.path}`, `/public/${WING_JS}`),
-      `// This file is generated by wing
-window.wingEnv = ${JSON.stringify(this.environmentVariables, null, 2)};`
-    );
-
-    const options: ExecOptions = {
-      cwd: this.path,
-      maxBuffer: 10 * 1024 * 1024,
-      windowsHide: true,
-    };
-
-    if (this.useBuildCommand) {
-      // when we build before deployment, the waiting is necessary
-      const { stderr, stdout } = await promisify(exec)(
-        this.startCommand,
-        options
-      );
-
-      if (stderr) {
-        throw new Error(stderr);
-      }
-      if (stdout) {
-        this.addTrace(stdout);
-      }
-    } else {
-      // react usually offer hot reloading-
-      // we're waiting for execution ending since it's ending only when manually terminating the process
-      this.childProcess = exec(
-        this.startCommand,
-        options,
-        (_, stdout, stderr) => {
-          if (stderr) {
-            throw new Error(stderr);
-          }
-          if (stdout) {
-            this.addTrace(stdout);
-          }
-        }
-      );
-    }
-
-    return {
-      url: this.url,
-    };
-  }
-
-  public async cleanup(): Promise<void> {
-    this.childProcess?.kill("SIGINT");
-  }
-
-  private addTrace(message: string): void {
-    this.context.addTrace({
-      type: TraceType.RESOURCE,
-      data: {
-        message,
-      },
-      sourcePath: this.context.resourcePath,
-      sourceType: REACT_APP_FQN,
-      timestamp: new Date().toISOString(),
-    });
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/react-app.ts b/libs/wingsdk/src/target-sim/react-app.ts
deleted file mode 100644
index d6f8e684d20..00000000000
--- a/libs/wingsdk/src/target-sim/react-app.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Construct } from "constructs";
-import { ISimulatorResource } from "./resource";
-import { ReactAppSchema } from "./schema-resources";
-import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
-import * as cloud from "../cloud";
-import * as core from "../core";
-import * as ex from "../ex";
-import { BaseResourceSchema } from "../simulator";
-import { IInflightHost } from "../std";
-
-const DEFAULT_START_COMMAND = "npm run start";
-export class ReactApp extends ex.ReactApp implements ISimulatorResource {
-  private _host?: cloud.IWebsite;
-  private readonly _startCommand: string;
-  constructor(scope: Construct, id: string, props: ex.ReactAppProps) {
-    super(scope, id, props);
-
-    this._startCommand = this._useBuildCommand
-      ? props.buildCommand ?? ex.DEFAULT_REACT_APP_BUILD_COMMAND
-      : `PORT=${this._localPort} ${
-          props.startCommand ?? DEFAULT_START_COMMAND
-        }`;
-
-    if (this._useBuildCommand) {
-      // In the future we can create an host (proxy like) for the development one if needed
-      this._host = new cloud.Website(this, `${this.node.id}-host`, {
-        ...this._hostProps,
-        path: this._buildPath,
-      });
-
-      this.node.addDependency(this._websiteHost);
-      core.Connections.of(this).add({
-        source: this,
-        target: this._websiteHost as cloud.Website,
-        name: `host`,
-      });
-    }
-  }
-
-  protected get _websiteHost(): cloud.IWebsite {
-    return this._host ?? { url: `http://localhost:${this._localPort}` };
-  }
-
-  public toSimulator(): BaseResourceSchema {
-    const schema: ReactAppSchema = {
-      type: ex.REACT_APP_FQN,
-      path: this.node.path,
-      props: {
-        path: this._projectPath,
-        startCommand: this._startCommand,
-        environmentVariables: Object.fromEntries(
-          this._environmentVariables.entries()
-        ),
-        useBuildCommand: this._useBuildCommand,
-        url: this.url,
-      },
-      attrs: {},
-    };
-    return schema;
-  }
-
-  public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
-    super.onLift(host, ops);
-  }
-
-  /** @internal */
-  public _toInflight(): string {
-    return makeSimulatorJsClient(__filename, this);
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/redis.inflight.ts b/libs/wingsdk/src/target-sim/redis.inflight.ts
index 843fe762e3c..3c0a8fa2054 100644
--- a/libs/wingsdk/src/target-sim/redis.inflight.ts
+++ b/libs/wingsdk/src/target-sim/redis.inflight.ts
@@ -1,51 +1,32 @@
-import { execSync } from "node:child_process";
 import IoRedis from "ioredis";
-import { v4 as uuidv4 } from "uuid";
 import { RedisAttributes, RedisSchema } from "./schema-resources";
 import { RedisClientBase } from "../ex";
-import { runDockerImage } from "../shared/misc";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
 
 export class Redis
   extends RedisClientBase
   implements ISimulatorResourceInstance
 {
-  private containerName: string;
-  private readonly WING_REDIS_IMAGE =
-    process.env.WING_REDIS_IMAGE ??
-    // Redis version 7.0.9
-    "redis@sha256:e50c7e23f79ae81351beacb20e004720d4bed657415e68c2b1a2b5557c075ce0";
-  private readonly context: ISimulatorContext;
-
-  private connection_url?: string = undefined;
+  private connectionUrl?: string = undefined;
   private connection?: IoRedis;
   private isCleanedUp = false;
 
-  public constructor(_props: RedisSchema["props"], context: ISimulatorContext) {
+  public constructor(private readonly props: RedisSchema) {
     super();
-    this.context = context;
-    this.containerName = `wing-sim-redis-${this.context.resourcePath.replace(
-      /\//g,
-      "."
-    )}-${uuidv4()}`;
   }
 
-  public async init(): Promise<RedisAttributes> {
+  public async init(_context: ISimulatorContext): Promise<RedisAttributes> {
     try {
       if (this.isCleanedUp) {
         return {};
       }
 
-      const { hostPort } = await runDockerImage({
-        imageName: this.WING_REDIS_IMAGE,
-        containerName: this.containerName,
-        containerPort: "6379",
-      });
       // redis url based on host port
-      this.connection_url = `redis://0.0.0.0:${hostPort}`;
+      this.connectionUrl = `redis://0.0.0.0:${this.props.port}`;
 
       return {};
     } catch (e) {
@@ -57,9 +38,14 @@ export class Redis
   public async cleanup(): Promise<void> {
     this.isCleanedUp = true;
     // disconnect from the redis server
+    await this.connection?.quit();
     this.connection?.disconnect();
-    // stop the redis container
-    execSync(`docker rm -f ${this.containerName}`);
+  }
+
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
   }
 
   public async rawClient(): Promise<any> {
@@ -67,8 +53,8 @@ export class Redis
       return this.connection;
     }
 
-    if (this.connection_url) {
-      this.connection = new IoRedis(this.connection_url);
+    if (this.connectionUrl) {
+      this.connection = new IoRedis(this.connectionUrl);
       return this.connection;
     }
 
@@ -76,8 +62,8 @@ export class Redis
   }
 
   public async url(): Promise<string> {
-    if (this.connection_url != undefined) {
-      return this.connection_url;
+    if (this.connectionUrl != undefined) {
+      return this.connectionUrl;
     } else {
       throw new Error("Redis server not initialized");
     }
diff --git a/libs/wingsdk/src/target-sim/redis.ts b/libs/wingsdk/src/target-sim/redis.ts
index b605baa5af6..883b7b2dbb3 100644
--- a/libs/wingsdk/src/target-sim/redis.ts
+++ b/libs/wingsdk/src/target-sim/redis.ts
@@ -1,9 +1,11 @@
 import { Construct } from "constructs";
+import { Container } from "./container";
 import { ISimulatorResource } from "./resource";
 import { RedisSchema } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
+import { LiftMap } from "../core";
 import * as ex from "../ex";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { ToSimulatorOutput } from "../simulator";
 import { IInflightHost } from "../std";
 
 /**
@@ -12,37 +14,56 @@ import { IInflightHost } from "../std";
  * @inflight `@winglang/sdk.redis.IRedisClient`
  */
 export class Redis extends ex.Redis implements ISimulatorResource {
+  private readonly WING_REDIS_IMAGE =
+    process.env.WING_REDIS_IMAGE ??
+    // Redis version 7.0.9
+    "redis@sha256:e50c7e23f79ae81351beacb20e004720d4bed657415e68c2b1a2b5557c075ce0";
+
+  private readonly hostPort: string;
+
   constructor(scope: Construct, id: string) {
     super(scope, id);
+
+    const c = new Container(this, "Container", {
+      name: "redis",
+      image: this.WING_REDIS_IMAGE,
+      containerPort: 6379,
+    });
+
+    if (!c.hostPort) {
+      throw new Error("Failed to get host port for the redis container");
+    }
+
+    this.hostPort = c.hostPort;
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: RedisSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: RedisSchema = {
+      port: this.hostPort,
+    };
+    return {
       type: ex.REDIS_FQN,
-      path: this.node.path,
-      props: {},
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      ex.RedisInflightMethods.URL,
-      ex.RedisInflightMethods.SET,
-      ex.RedisInflightMethods.GET,
-      ex.RedisInflightMethods.HSET,
-      ex.RedisInflightMethods.HGET,
-      ex.RedisInflightMethods.SADD,
-      ex.RedisInflightMethods.SMEMBERS,
-      ex.RedisInflightMethods.DEL,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [ex.RedisInflightMethods.URL]: [],
+      [ex.RedisInflightMethods.SET]: [],
+      [ex.RedisInflightMethods.GET]: [],
+      [ex.RedisInflightMethods.HSET]: [],
+      [ex.RedisInflightMethods.HGET]: [],
+      [ex.RedisInflightMethods.SADD]: [],
+      [ex.RedisInflightMethods.SMEMBERS]: [],
+      [ex.RedisInflightMethods.DEL]: [],
+    };
   }
 
   /** @internal */
diff --git a/libs/wingsdk/src/target-sim/resource.inflight.ts b/libs/wingsdk/src/target-sim/resource.inflight.ts
new file mode 100644
index 00000000000..b208c5ba78c
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/resource.inflight.ts
@@ -0,0 +1,219 @@
+import * as path from "path";
+import { IResourceClient, SIM_RESOURCE_FQN } from "./resource";
+import { SimResourceAttributes, SimResourceSchema } from "./schema-resources";
+import { Bundle, isBundleInvalidated } from "../shared/bundling";
+import {
+  SandboxMultipleConcurrentCallsError,
+  Sandbox,
+  SandboxTimeoutError,
+} from "../shared/sandbox";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
+import { Json, LogLevel, TraceType } from "../std";
+
+export class Resource implements IResourceClient, ISimulatorResourceInstance {
+  private _context: ISimulatorContext | undefined;
+  private readonly sourceCodeFile: string;
+  private resolvedSourceCodeFile!: string;
+  private sandbox: Sandbox | undefined;
+  private bundle: Bundle | undefined;
+  private readonly timeout = 30_000;
+
+  constructor(props: SimResourceSchema) {
+    this.sourceCodeFile = props.sourceCodeFile;
+  }
+
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  private async createBundle(): Promise<void> {
+    this.bundle = await Sandbox.createBundle(
+      this.resolvedSourceCodeFile,
+      (msg, level) => {
+        this.addTrace(msg, TraceType.RESOURCE, level);
+      }
+    );
+  }
+
+  public async init(
+    context: ISimulatorContext
+  ): Promise<SimResourceAttributes> {
+    this._context = context;
+    this.resolvedSourceCodeFile = path.resolve(
+      context.simdir,
+      this.sourceCodeFile
+    );
+    await this.createBundle();
+    this.sandbox = new Sandbox(this.bundle!.outfilePath, {
+      env: {
+        WING_SIMULATOR_URL: this.context.serverUrl,
+        WING_SIMULATOR_CALLER: this.context.resourceHandle,
+      },
+      log: (internal, level, message) => {
+        this.addTrace(
+          message,
+          internal ? TraceType.SIMULATOR : TraceType.LOG,
+          level
+        );
+      },
+      // A resource needs to respond to method calls in a timely manner since
+      // the simulator server will wait for a response before responding to
+      // the caller. The default timeout is 30 seconds.
+      timeout: this.timeout,
+    });
+
+    // We're communicating with the sandbox via IPC. It's not possible to pass
+    // an IResourceContext object directly because methods like `resolveToken`
+    // are not serializable. So instead, a fake ctx object is created within the
+    // inflight wrapper code - see `resource.ts`.
+    try {
+      const attrs: Record<string, string> = await this.sandbox.call(
+        "start",
+        this.context.statedir
+      );
+      return attrs;
+    } catch (err) {
+      this.context.addTrace({
+        data: {
+          message: "Error initializing resource",
+          status: "failure",
+          error: err,
+        },
+        type: TraceType.LOG,
+        level: LogLevel.ERROR,
+        sourcePath: this.context.resourcePath,
+        sourceType: SIM_RESOURCE_FQN,
+        timestamp: new Date().toISOString(),
+      });
+      return {};
+    }
+  }
+
+  public async cleanup(): Promise<void> {
+    try {
+      // TODO: set a timeout for the stop call
+      while (true) {
+        try {
+          return await this.sandbox!.call("stop");
+        } catch (err) {
+          if (err instanceof SandboxMultipleConcurrentCallsError) {
+            // If the sandbox is busy, wait and try again
+            this.addTrace(
+              "Sandbox is busy, waiting and retrying...",
+              TraceType.SIMULATOR,
+              LogLevel.VERBOSE
+            );
+            await new Promise((resolve) => setTimeout(resolve, 100));
+          } else {
+            throw err;
+          }
+        }
+      }
+    } catch (err) {
+      this.context.addTrace({
+        data: {
+          message: "Error calling onStop",
+          status: "failure",
+          error: err,
+        },
+        type: TraceType.LOG,
+        level: LogLevel.ERROR,
+        sourcePath: this.context.resourcePath,
+        sourceType: SIM_RESOURCE_FQN,
+        timestamp: new Date().toISOString(),
+      });
+    } finally {
+      await this.sandbox!.cleanup();
+    }
+  }
+
+  public async save(): Promise<void> {}
+
+  public async plan(invalidated: boolean): Promise<UpdatePlan> {
+    // TODO: support customizing update plans
+    if (invalidated) {
+      return UpdatePlan.REPLACE;
+    }
+
+    // Check if any of the bundled files have changed since the last bundling
+    const bundleInvalidated = await isBundleInvalidated(
+      this.resolvedSourceCodeFile,
+      this.bundle!,
+      (msg) => this.addTrace(msg, TraceType.SIMULATOR, LogLevel.VERBOSE)
+    );
+    if (bundleInvalidated) {
+      return UpdatePlan.REPLACE;
+    }
+
+    return UpdatePlan.SKIP;
+  }
+
+  public async call(method: string, args: Array<Json> = []): Promise<Json> {
+    return this.context.withTrace({
+      activity: async () => {
+        // TODO: If requests take a long time for a resource to process,
+        // we may end up passing requests to the sandbox after they have
+        // timed out. We should consider adding a timeout to the call method
+        // here or track the request's response deadline in some way.
+        while (true) {
+          try {
+            return await this.sandbox!.call("call", method, ...args);
+          } catch (err) {
+            if (err instanceof SandboxMultipleConcurrentCallsError) {
+              // If the sandbox is busy, wait and try again
+              this.addTrace(
+                "Sandbox is busy, waiting and retrying...",
+                TraceType.SIMULATOR,
+                LogLevel.VERBOSE
+              );
+              await new Promise((resolve) => setTimeout(resolve, 100));
+            } else if (err instanceof SandboxTimeoutError) {
+              throw new Error(
+                `Call to resource "${this.context.resourcePath}" timed out after ${this.timeout}ms`
+              );
+            } else {
+              throw err;
+            }
+          }
+        }
+      },
+      message: this.formatCallMessage(method, args),
+    });
+  }
+
+  private formatCallMessage(method: string, args: Array<Json>): string {
+    let message = method.toString();
+    message += "(";
+    for (let i = 0; i < args.length; i++) {
+      let arg = args![i];
+      if (arg === null || arg === undefined) {
+        message += "nil";
+      } else {
+        message += JSON.stringify(args![i]);
+      }
+      if (i < args!.length - 1) {
+        message += ", ";
+      }
+    }
+    message += ")";
+    return message;
+  }
+
+  private addTrace(message: string, type: TraceType, level?: LogLevel) {
+    this.context.addTrace({
+      data: { message, level },
+      type,
+      level: level ?? LogLevel.INFO,
+      sourcePath: this.context.resourcePath,
+      sourceType: SIM_RESOURCE_FQN,
+      timestamp: new Date().toISOString(),
+    });
+  }
+}
diff --git a/libs/wingsdk/src/target-sim/resource.md b/libs/wingsdk/src/target-sim/resource.md
new file mode 100644
index 00000000000..9973650afba
--- /dev/null
+++ b/libs/wingsdk/src/target-sim/resource.md
@@ -0,0 +1,192 @@
+---
+title: Resource
+id: resource
+description: Model a simulated resource with a lifecycle.
+keywords:
+  [
+    Wing reference,
+    Wing language,
+    language,
+    Wing standard library,
+    Wing programming language,
+    Resource,
+    Simulator
+  ]
+---
+
+The `sim.Resource` class models a simulated resource with a lifecycle.
+It's can be used to represent any cloud service where API calls are made over HTTP
+to interact with the service at runtime.
+
+## Usage
+
+As an example, suppose we want to simulate a service that stores a number, like the one in `cloud.Counter`, which has two methods: `inc` and `peek`.
+
+First, we'll define an inflight class that represents the service's backend:
+
+```js
+bring sim;
+
+// a resource backend must implement IResource
+inflight class CounterBackend impl sim.IResource {
+  var counter: num;
+
+  new(ctx: sim.IResourceContext) {
+    // startup code
+    this.counter = 0;
+  }
+
+  pub onStop() {
+    // shutdown code
+  }
+
+  pub inc(n: num?): num {
+    let p = this.counter;
+    this.counter += (n ?? 1);
+    return p;
+  }
+
+  pub peek(): num {
+    return this.counter;
+  }
+}
+```
+
+Each `CounterBackend` object that's created will have its own state.
+It will be initialized by the simulator with its constructor (the `new()` method), and shut down using its `onStop` method.
+
+From the perspective of `CounterBackend`, its `inc` and `peek` methods are always called serially, even if requests are made concurrently from other resources.
+
+Next, we have to define a preflight class which represents the service's frontend:
+
+```js
+class Counter {
+  backend: sim.Resource;
+
+  new() {
+    // this is a "backend factory". it returns an inflight class that implements the
+    // resource.
+    let factory = inflight (ctx): sim.IResource => {
+      return new CounterBackend(ctx);
+    };
+
+    this.backend = new sim.Resource(factory);
+  }
+
+  pub inflight inc(n: num?): num {
+    let response = this.backend.call("inc", [Json (n ?? 1)]);
+    return num.fromJson(response);
+  }
+
+  pub inflight peek(): num {
+    let response = this.backend.call("peek");
+    return num.fromJson(response);
+  }
+}
+```
+
+The `Counter` class is a simple wrapper around the `CounterBackend` class. It provides a way to interact with the resource using the `inc` and `peek` methods.
+
+`sim.Resource` has an inflight method named `call` that takes the name of a method to call and an array of arguments, and returns the serialized response from the resource.
+The arguments are serialized and sent to the resource over HTTP, which will process the request and returns a serialized response.
+
+> Note: Since the `call` method makes networked requests, it's important that the resource implementation provided by the inflight class responds in a timely manner.
+> If the resource takes over 30 seconds to respond, `call` will throw an error, and the simulator will terminate the resource.
+
+The `Counter` class can be used like this:
+
+```js
+let c = new Counter();
+
+new cloud.Function(inflight () => {
+  log("counter is {c.peek()}");
+  c.inc();
+  log("counter is now {c.peek()}");
+});
+```
+
+### Serializability
+
+Methods that are called on a `sim.Resource` instance must be serializable, meaning
+all of their arguments and return values must be serializable.
+
+The following types are serializable:
+
+- `num`
+- `str`
+- `bool`
+- `Json`
+- `Array`
+- `Map`
+- `T?` where `T` is a serializable type
+- enums
+- structs that contain only serializable types
+
+The `call` function on `sim.Resource` only supports arguments that are valid `Json` values.
+To convert a value to `Json`, use the `Json` constructor:
+
+```js
+let x: num = 5;
+let y: str = "a";
+this.backend.call("myMethod", Json [x, y]);
+```
+
+Return values can be converted back from `Json` using an appropriate `fromJson` method.
+
+```js
+let response = this.backend.call("myMethod");
+let result: num = num.fromJson(response);
+```
+
+> Note: some types are missing `fromJson` methods. To work around this, you may use `unsafeCast()` to cast the value into the desired type.
+>
+> ```js
+> let response = this.backend.call("myOtherMethod");
+> let result: MyEnum = unsafeCast(response);
+> ```
+
+### Late-bound Tokens
+
+Consider a use case where there is an attribute of a simulated service that only gets resolved during initialization (e.g. the exposed port of a container).
+In order to create such resources, we need a way to obtain a lazy token that gets resolved during simulator initialization.
+
+Use the preflight method `resource.createToken(key)` to obtain a token that can be used to reference the value of the attribute at runtime.
+
+During resource simulation, you must call `ctx.resolveToken(key, value)` during a resource's constructor method to set the runtime value.
+
+```js playground
+inflight class MyResourceBackend impl sim.IResource {
+  new(ctx: sim.IResourceContext) {
+    ctx.resolveToken("startTime", "2023-10-16T20:47:39.511Z");
+  }
+
+  pub onStop() {}
+}
+
+class MyResource {
+  backend: sim.Resource;
+  pub startTime: str;
+
+  new() {
+    this.backend = new sim.Resource(inflight () => {
+      return new MyResourceBackend();
+    });
+    this.startTime = this.backend.createToken("startTime");
+  }
+}
+
+let r = new MyResource();
+
+new cloud.Function(inflight () => {
+  let time = util.env("START_TIME");
+  log("start time is {time}");
+}, env: {
+  START_TIME: r.startTime, // lazy token can be used in preflight configuration
+});
+
+// ...or you can use it directly inflight, where the value is automatically resolved
+
+new cloud.Function(inflight () => {
+  log("start time is {r.startTime}");
+});
+```
diff --git a/libs/wingsdk/src/target-sim/resource.ts b/libs/wingsdk/src/target-sim/resource.ts
index d3dfd03d7de..b321b246f25 100644
--- a/libs/wingsdk/src/target-sim/resource.ts
+++ b/libs/wingsdk/src/target-sim/resource.ts
@@ -1,15 +1,317 @@
-import { BaseResourceSchema } from "../simulator/simulator";
-import { IResource } from "../std";
+import { mkdirSync, writeFileSync } from "fs";
+import { join, relative } from "path";
+import { Construct } from "constructs";
+import { SimResourceSchema } from "./schema-resources";
+import { simulatorAttrToken, simulatorHandleToken } from "./tokens";
+import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
+import { App, LiftMap, Lifting } from "../core";
+import { CaseConventions, ResourceNames } from "../shared/resource-names";
+import { PolicyStatement, ToSimulatorOutput } from "../simulator";
+import {
+  IInflight,
+  IInflightHost,
+  IResource as IStdResource,
+  Resource as StdResource,
+  Node,
+  Json,
+  LogLevel,
+} from "../std";
 
 /**
- * Interfaces shared by all polycon implementations (preflight classes)
- * targeting the simulator.
+ * Contract that a resource backend must implement.
+ * @inflight
  */
-export interface ISimulatorResource extends IResource {
+export interface IResource {
+  /**
+   * Runs when the resource is stopped.
+   */
+  onStop(): Promise<void>;
+}
+
+// TODO: make statedir a property once Wing supports properties on interfaces
+
+/**
+ * Context for implementing a simulator resource.
+ * @inflight
+ */
+export interface IResourceContext {
+  /**
+   * The directory for the resource's state.
+   */
+  statedir(): Promise<string>;
+
+  /**
+   * Resolves a token value. All tokens must be resolved during the
+   * constructor of the resource.
+   *
+   * @param name The name of the token.
+   * @param value The value of the token.
+   * @inflight
+   */
+  resolveToken(name: string, value: string): Promise<void>;
+
+  /**
+   * Log a message at the current point in time. Defaults to `info` level.
+   *
+   * @param message The message to log.
+   * @param level The severity of the message.
+   * @inflight
+   */
+  log(message: string, level: LogLevel | undefined): Promise<void>;
+}
+
+/**
+ * Global identifier for `sim.Resource`.
+ */
+export const SIM_RESOURCE_FQN = "@winglang/sdk.sim.Resource";
+
+/**
+ * A backend for a simulated resource.
+ * @inflight `@winglang/sdk.sim.IResourceClient`
+ */
+export class Resource
+  extends StdResource
+  implements
+    IStdResource,
+    ISimulatorResource,
+    IInflightHost,
+    ISimulatorInflightHost
+{
+  private readonly permissions: Array<[IStdResource, string]> = [];
+  private readonly _env: Record<string, string> = {};
+  private readonly factory: IResourceFactory;
+  private readonly entrypoint: string;
+
+  constructor(scope: Construct, id: string, factory: IResourceFactory) {
+    super(scope, id);
+
+    Node.of(this).title = "Resource";
+    Node.of(this).description = "A simulated resource";
+    Node.of(this).color = "emerald";
+
+    const assetName = ResourceNames.generateName(this, {
+      disallowedRegex: /[><:"/\\|?*\s]/g, // avoid characters that may cause path issues
+      case: CaseConventions.LOWERCASE,
+      sep: "_",
+    });
+
+    const workdir = App.of(this).workdir;
+    mkdirSync(workdir, { recursive: true });
+    const entrypoint = join(workdir, `${assetName}.cjs`);
+    this.entrypoint = entrypoint;
+
+    if (process.env.WING_TARGET) {
+      this.addEnvironment("WING_TARGET", process.env.WING_TARGET);
+    }
+
+    this.factory = factory;
+  }
+
+  public addPermission(resource: IStdResource, op: string): void {
+    this.permissions.push([resource, op]);
+  }
+
+  /** @internal */
+  public get _liftMap(): LiftMap {
+    return {
+      [ResourceInflightMethods.CALL]: [],
+    };
+  }
+
+  /**
+   * Obtain a token that can be used to reference an attribute of this
+   * resource that is only resolved once the resource is started in the simulator.
+   *
+   * If the token is used in inflight code or in the configuration of a simulated
+   * resource (e.g. as an environment variable), the relevant resource will
+   * automatically take a dependency on the resource the token belongs to.
+   *
+   * @param name The name of the token.
+   * @returns A string token.
+   */
+  public createToken(name: string): string {
+    return simulatorAttrToken(this, name);
+  }
+
+  /** @internal */
+  public _preSynthesize(): void {
+    super._preSynthesize();
+    const onStopMethod = "onStop";
+    const inflightClient = this.factory._toInflight();
+    const code = `\
+        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = ${inflightClient};
+          const noop = { ${onStopMethod}: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === '${onStopMethod}') {
+            throw Error('Cannot call "${onStopMethod}"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.${onStopMethod}();
+          $klass = undefined;
+        };
+        `;
+
+    writeFileSync(this.entrypoint, code);
+
+    // indicates that we are calling the inflight constructor and the
+    // inflight "handle" method on the handler resource.
+    Lifting.lift(this.factory, this, ["handle"]);
+  }
+
+  /**
+   * Add an environment variable to make available to the inflight code.
+   */
+  public addEnvironment(name: string, value: string) {
+    if (this._env[name] !== undefined && this._env[name] !== value) {
+      throw new Error(
+        `Environment variable "${name}" already set with a different value.`
+      );
+    }
+    this._env[name] = value;
+  }
+
+  public toSimulator(): ToSimulatorOutput {
+    const policy: Array<PolicyStatement> = [];
+    for (const [resource, operation] of this.permissions) {
+      policy.push({
+        operation,
+        resourceHandle: simulatorHandleToken(resource),
+      });
+    }
+    const props: SimResourceSchema = {
+      environmentVariables: this._env,
+      sourceCodeFile: relative(App.of(this).outdir, this.entrypoint),
+      sourceCodeLanguage: "javascript",
+    };
+    return {
+      type: SIM_RESOURCE_FQN,
+      props,
+      policy,
+    };
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    bindSimulatorResource(__filename, this, host, ops);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return makeSimulatorJsClient(__filename, this);
+  }
+}
+
+/**
+ * Inflight interface for `sim.Resource`.
+ */
+export interface IResourceClient {
+  /**
+   * Call a method on the resource.
+   * @inflight
+   */
+  call(method: string, args?: Array<Json>): Promise<Json>;
+}
+
+/**
+ * List of inflight operations available for `Resource`.
+ * @internal
+ */
+export enum ResourceInflightMethods {
+  CALL = "call",
+}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to the
+ * `sim.Resource` constructor.
+ * @inflight `@winglang/sdk.sim.IResourceFactoryClient`
+ */
+export interface IResourceFactory extends IInflight {}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to the
+ * `sim.Resource` constructor.
+ */
+export interface IResourceFactoryClient {
+  /**
+   * Function that will be called to initialize the simulator resource.
+   *
+   * To implement a shutdown sequence, return an object that implements the `IResource` inflight interface with an `onStop()` method.
+   *
+   * @inflight
+   */
+  handle(context: IResourceContext): Promise<IResource | undefined>;
+}
+
+/**
+ * Interfaces shared by all preflight classes that host inflight code.
+ */
+export interface ISimulatorInflightHost extends IInflightHost {
+  /**
+   * Add a simulated permission to this inflight host.
+   * @param resource The resource to add
+   * @param op The action to add
+   */
+  addPermission(resource: IStdResource, op: string): void;
+}
+
+export function isSimulatorInflightHost(
+  obj: any
+): obj is ISimulatorInflightHost {
+  return (
+    typeof obj == "object" &&
+    typeof (obj as ISimulatorInflightHost).addPermission === "function"
+  );
+}
+
+/**
+ * Interfaces shared by all preflight classes targeting the simulator.
+ */
+export interface ISimulatorResource extends IStdResource {
   /**
    * Convert this resource to a resource schema for the simulator.
    */
-  toSimulator(): BaseResourceSchema;
+  toSimulator(): ToSimulatorOutput;
 }
 
 export function isSimulatorResource(obj: any): obj is ISimulatorResource {
diff --git a/libs/wingsdk/src/target-sim/schedule.inflight.ts b/libs/wingsdk/src/target-sim/schedule.inflight.ts
index 777e379a431..01717f9e766 100644
--- a/libs/wingsdk/src/target-sim/schedule.inflight.ts
+++ b/libs/wingsdk/src/target-sim/schedule.inflight.ts
@@ -7,23 +7,33 @@ import {
   ScheduleTask,
 } from "./schema-resources";
 import { IFunctionClient, IScheduleClient, SCHEDULE_FQN } from "../cloud";
-import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator";
-import { TraceType } from "../std";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
+import { LogLevel, TraceType } from "../std";
 
 export class Schedule
   implements IScheduleClient, ISimulatorResourceInstance, IEventPublisher
 {
-  private readonly context: ISimulatorContext;
+  private _context: ISimulatorContext | undefined;
   private tasks = new Array<ScheduleTask>();
   private interval: CronExpression;
   private intervalTimeout?: NodeJS.Timeout;
 
-  constructor(props: ScheduleSchema["props"], context: ISimulatorContext) {
-    this.context = context;
+  constructor(props: ScheduleSchema) {
     this.interval = parseExpression(props.cronExpression, { utc: true });
     this.scheduleFunction();
   }
 
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
   // Calculate the delay for the next execution
   private nextDelay(interval: CronExpression) {
     return interval.next().toDate().getTime() - Date.now();
@@ -37,7 +47,8 @@ export class Schedule
     }, this.nextDelay(this.interval));
   }
 
-  public async init(): Promise<ScheduleAttributes> {
+  public async init(context: ISimulatorContext): Promise<ScheduleAttributes> {
+    this._context = context;
     return {};
   }
 
@@ -45,6 +56,12 @@ export class Schedule
     clearTimeout(this.intervalTimeout);
   }
 
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
   public async addEventSubscription(
     subscriber: string,
     subscriptionProps: EventSubscription
@@ -56,17 +73,25 @@ export class Schedule
     this.tasks.push(task);
   }
 
+  public async removeEventSubscription(subscriber: string): Promise<void> {
+    const index = this.tasks.findIndex((s) => s.functionHandle === subscriber);
+    if (index >= 0) {
+      this.tasks.splice(index, 1);
+    }
+  }
+
   private runTasks() {
     for (const task of this.tasks) {
-      const fnClient = this.context.findInstance(
-        task.functionHandle!
-      ) as IFunctionClient & ISimulatorResourceInstance;
+      const fnClient = this.context.getClient(
+        task.functionHandle
+      ) as IFunctionClient;
       if (!fnClient) {
         throw new Error("No function client found for task.");
       }
 
       this.context.addTrace({
         type: TraceType.RESOURCE,
+        level: LogLevel.VERBOSE,
         data: {
           message: `Running task with function handle: ${task.functionHandle}.`,
         },
@@ -75,7 +100,7 @@ export class Schedule
         timestamp: new Date().toISOString(),
       });
 
-      void fnClient.invoke("").catch((err) => {
+      void fnClient.invoke().catch((err) => {
         this.context.addTrace({
           data: {
             message: `Schedule error: ${err}`,
@@ -84,6 +109,7 @@ export class Schedule
           sourceType: SCHEDULE_FQN,
           timestamp: new Date().toISOString(),
           type: TraceType.RESOURCE,
+          level: LogLevel.ERROR,
         });
       });
     }
diff --git a/libs/wingsdk/src/target-sim/schedule.ontick.inflight.ts b/libs/wingsdk/src/target-sim/schedule.ontick.inflight.ts
deleted file mode 100644
index 5acd284cc48..00000000000
--- a/libs/wingsdk/src/target-sim/schedule.ontick.inflight.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type {
-  IFunctionHandlerClient,
-  IScheduleOnTickHandlerClient,
-} from "../cloud";
-
-export class ScheduleOnTickHandlerClient
-  implements IScheduleOnTickHandlerClient
-{
-  private readonly handler: IFunctionHandlerClient;
-  constructor({ handler }: { handler: IFunctionHandlerClient }) {
-    this.handler = handler;
-  }
-
-  public async handle() {
-    return this.handler.handle("");
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/schedule.ts b/libs/wingsdk/src/target-sim/schedule.ts
index f4e4ed54c9b..20d90270633 100644
--- a/libs/wingsdk/src/target-sim/schedule.ts
+++ b/libs/wingsdk/src/target-sim/schedule.ts
@@ -1,8 +1,7 @@
-import { join } from "path";
 import { Construct } from "constructs";
 import { App } from "./app";
 import { EventMapping } from "./event-mapping";
-import { Function } from "./function";
+import { Policy } from "./policy";
 import { ISimulatorResource } from "./resource";
 import { ScheduleSchema } from "./schema-resources";
 import {
@@ -10,9 +9,10 @@ import {
   makeSimulatorJsClient,
   convertDurationToCronExpression,
 } from "./util";
+import { Function } from "../cloud";
 import * as cloud from "../cloud";
-import { convertBetweenHandlers } from "../shared/convert";
-import { BaseResourceSchema } from "../simulator";
+import { lift } from "../core";
+import { ToSimulatorOutput } from "../simulator";
 import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
 
 /**
@@ -22,24 +22,21 @@ import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
  */
 export class Schedule extends cloud.Schedule implements ISimulatorResource {
   private readonly cronExpression: string;
+  private readonly policy: Policy;
 
   constructor(scope: Construct, id: string, props: cloud.ScheduleProps = {}) {
     super(scope, id, props);
     const { rate, cron } = props;
 
     this.cronExpression = cron ?? convertDurationToCronExpression(rate!);
+    this.policy = new Policy(this, "Policy", { principal: this });
   }
 
   public onTick(
     inflight: cloud.IScheduleOnTickHandler,
     props: cloud.ScheduleOnTickOptions = {}
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(__dirname, "schedule.ontick.inflight.js"),
-      "ScheduleOnTickHandlerClient"
-    );
-
+    const functionHandler = ScheduleOnTickHandler.toFunctionHandler(inflight);
     const fn = new Function(
       this,
       App.of(this).makeId(this, "OnTick"),
@@ -47,7 +44,7 @@ export class Schedule extends cloud.Schedule implements ISimulatorResource {
       props
     );
     Node.of(fn).sourceModule = SDK_SOURCE_MODULE;
-    Node.of(fn).title = "onTick()";
+    Node.of(fn).title = "Tick";
 
     new EventMapping(this, App.of(this).makeId(this, "OnTickMapping"), {
       subscriber: fn,
@@ -57,23 +54,24 @@ export class Schedule extends cloud.Schedule implements ISimulatorResource {
 
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.ScheduleInflightMethods.TICK,
       target: fn,
-      name: "onTick()",
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
+      name: "tick",
     });
+    this.policy.addStatement(fn, cloud.FunctionInflightMethods.INVOKE);
 
     return fn;
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: ScheduleSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: ScheduleSchema = {
+      cronExpression: this.cronExpression,
+    };
+    return {
       type: cloud.SCHEDULE_FQN,
-      path: this.node.path,
-      props: {
-        cronExpression: this.cronExpression,
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   /** @internal */
@@ -82,7 +80,26 @@ export class Schedule extends cloud.Schedule implements ISimulatorResource {
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 }
+
+/**
+ * Utility class to work with schedule on tick handlers.
+ */
+export class ScheduleOnTickHandler {
+  /**
+   * Converts a `cloud.IScheduleOnTickHandler` to a `cloud.IFunctionHandler`.
+   * @param handler the handler to convert
+   * @returns the function handler
+   */
+  public static toFunctionHandler(
+    handler: cloud.IScheduleOnTickHandler
+  ): cloud.IFunctionHandler {
+    return lift({ handler }).inflight(async (ctx) => {
+      await ctx.handler();
+      return undefined;
+    });
+  }
+}
diff --git a/libs/wingsdk/src/target-sim/schema-resources.ts b/libs/wingsdk/src/target-sim/schema-resources.ts
index 64d26a4b352..366aa0f262c 100644
--- a/libs/wingsdk/src/target-sim/schema-resources.ts
+++ b/libs/wingsdk/src/target-sim/schema-resources.ts
@@ -1,51 +1,14 @@
-import { EVENT_MAPPING_FQN } from "./event-mapping";
-import { STATE_FQN } from "./state";
-import {
-  API_FQN,
-  BUCKET_FQN,
-  COUNTER_FQN,
-  CorsHeaders,
-  DOMAIN_FQN,
-  FUNCTION_FQN,
-  HttpMethod,
-  ON_DEPLOY_FQN,
-  OpenApiSpec,
-  QUEUE_FQN,
-  SCHEDULE_FQN,
-  SECRET_FQN,
-  SERVICE_FQN,
-  TOPIC_FQN,
-  WEBSITE_FQN,
-} from "../cloud";
-import {
-  ColumnType,
-  DYNAMODB_TABLE_FQN,
-  REACT_APP_FQN,
-  REDIS_FQN,
-  TABLE_FQN,
-} from "../ex";
-import {
-  BaseResourceAttributes,
-  BaseResourceSchema,
-} from "../simulator/simulator";
-import { Json, TEST_RUNNER_FQN } from "../std";
-
-export type FunctionHandle = string;
-export type PublisherHandle = string;
-
-/** Schema for cloud.Api */
-export interface ApiSchema extends BaseResourceSchema {
-  readonly type: typeof API_FQN;
-  readonly props: {
-    openApiSpec: OpenApiSpec;
-    corsHeaders?: CorsHeaders;
-  };
-  readonly attrs: ApiAttributes & BaseResourceAttributes;
-}
+import { CorsHeaders, HttpMethod, OpenApiSpec } from "../cloud/api";
+import { ColumnType } from "../ex";
+import { PolicyStatement } from "../simulator/simulator";
+import { Json } from "../std";
 
-export interface ApiEventSubscription extends EventSubscription {
-  /** Subscribed routes */
-  readonly routes: ApiRoute[];
+export type ResourceHandle = string;
+
+/** Properties for cloud.Api */
+export interface ApiSchema {
+  readonly openApiSpec: OpenApiSpec;
+  readonly corsHeaders?: CorsHeaders;
 }
 
 /** Runtime attributes for cloud.Api */
@@ -56,193 +19,175 @@ export interface ApiAttributes {
 
 /** Schema for cloud.Api.props.routes */
 export interface ApiRoute {
-  /** The path to handle. */
-  readonly path: string;
+  /** The HTTP path pattern to handle. */
+  readonly pathPattern: string;
   /** The HTTP method to handle. */
   readonly method: HttpMethod;
 }
 
-/** Schema for cloud.Function */
-export interface FunctionSchema extends BaseResourceSchema {
-  readonly type: typeof FUNCTION_FQN;
-  readonly props: {
-    /** The path to a file containing source code to be run when invoked. */
-    readonly sourceCodeFile: string;
-    /** The language of the function's source code. */
-    readonly sourceCodeLanguage: string;
-    /** A map of environment variables to run the function with. */
-    readonly environmentVariables: Record<string, string>;
-    /** The maximum amount of time the function can run, in milliseconds. */
-    readonly timeout: number;
-  };
+/** Schema for an Api event subscription */
+export interface ApiEventSubscription extends EventSubscription {
+  /** Subscribed routes */
+  readonly routes: ApiRoute[];
+}
+
+/** Properties for cloud.Function */
+export interface FunctionSchema {
+  /** The path to a file containing source code to be run when invoked. */
+  readonly sourceCodeFile: string;
+  /** The language of the function's source code. */
+  readonly sourceCodeLanguage: string;
+  /** A map of environment variables to run the function with. */
+  readonly environmentVariables: Record<string, string>;
+  /** The maximum amount of time the function can run, in milliseconds. */
+  readonly timeout: number;
+  /** The maximum number of concurrent invocations that can run at one time. */
+  readonly concurrency: number;
 }
 
 /** Runtime attributes for cloud.Function */
 export interface FunctionAttributes {}
 
+export interface DeadLetterQueueSchema {
+  /** Dead-letter queue handler token */
+  dlqHandler: string;
+  /** Number of time a message will be processed */
+  maxDeliveryAttempts: number;
+}
+
 /** Schema for cloud.Queue */
-export interface QueueSchema extends BaseResourceSchema {
-  readonly type: typeof QUEUE_FQN;
-  readonly props: {
-    /** How long a queue's consumers have to process a message, in seconds */
-    readonly timeout: number;
-    /** How long a queue retains a message, in seconds */
-    readonly retentionPeriod: number;
-  };
+export interface QueueSchema {
+  /** How long a queue's consumers have to process a message, in seconds */
+  readonly timeout: number;
+  /** How long a queue retains a message, in seconds */
+  readonly retentionPeriod: number;
+  /** Dead-letter queue options */
+  readonly dlq?: DeadLetterQueueSchema;
+}
+
+/** Runtime attributes for cloud.Queue */
+export interface QueueAttributes {}
+
+/** Schema for a Queue event subscription */
+export interface QueueSubscriber extends EventSubscription {
+  /** Function that should be called. */
+  readonly functionHandle: ResourceHandle;
+  /** Maximum number of messages that will be batched together to the subscriber. */
+  readonly batchSize: number;
 }
 
-/** Schema for cloud.Service */
-export interface ServiceSchema extends BaseResourceSchema {
-  readonly type: typeof SERVICE_FQN;
-  readonly props: {
-    /** The source code of the service */
-    readonly sourceCodeFile: string;
-    /** Whether the service should start when sim starts */
-    readonly autoStart: boolean;
-    /** A map of environment variables to run the function with. */
-    readonly environmentVariables: Record<string, string>;
-  };
+/** Properties for cloud.Service */
+export interface ServiceSchema {
+  /** The source code of the service */
+  readonly sourceCodeFile: string;
+  /** A map of environment variables to run the function with. */
+  readonly environmentVariables: Record<string, string>;
+  /** Whether to auto-start the service. */
+  readonly autoStart: boolean;
 }
 
 /** Runtime attributes for cloud.Service */
 export interface ServiceAttributes {}
 
+/** Properties for cloud.Schedule */
+export interface ScheduleSchema {
+  /** The cron expression that defines when the schedule should run. */
+  readonly cronExpression: string;
+}
+
 /** Runtime attributes for cloud.Schedule */
 export interface ScheduleAttributes {}
 
-/** Schema for cloud.Schedule */
-export interface ScheduleSchema extends BaseResourceSchema {
-  readonly type: typeof SCHEDULE_FQN;
-  readonly props: {
-    /** The cron expression that defines when the schedule should run. */
-    readonly cronExpression: string;
-  };
-}
-
-/** Schema for cloud.Queue.props.subscribers */
+/** Schema for a Schedule event subscription */
 export interface ScheduleTask extends EventSubscription {
-  /** Function that should be called. */
-  readonly functionHandle: FunctionHandle;
+  /** The function that should be called. */
+  readonly functionHandle: ResourceHandle;
 }
 
+/** Base schema for an event subscription. */
 export interface EventSubscription {}
 
-/** Schema for sim.EventMapping */
-export interface EventMappingSchema extends BaseResourceSchema {
-  readonly type: typeof EVENT_MAPPING_FQN;
-  readonly props: {
-    /** Function handle to call for subscriber */
-    subscriber: FunctionHandle;
-    /** Publisher handle of the event */
-    publisher: PublisherHandle;
-    /** Additional properties of event subscription */
-    subscriptionProps: EventSubscription;
-  };
+/** Properties for sim.EventMapping */
+export interface EventMappingSchema {
+  /** Function handle to call for subscriber */
+  readonly subscriber: ResourceHandle;
+  /** Publisher handle of the event */
+  readonly publisher: ResourceHandle;
+  /** Additional properties of event subscription. The specific schema will depend on who the publisher is. */
+  readonly subscriptionProps: EventSubscription;
 }
 
 /** Runtime attributes for cloud.EventMapping */
 export interface EventMappingAttributes {}
 
-/** Runtime attributes for cloud.Queue */
-export interface QueueAttributes {}
-
-/** Schema for cloud.Queue.props.subscribers */
-export interface QueueSubscriber extends EventSubscription {
-  /** Function that should be called. */
-  readonly functionHandle: FunctionHandle;
-  /** Maximum number of messages that will be batched together to the subscriber. */
-  readonly batchSize: number;
-}
-
-/** Schema for cloud.Topic */
-export interface TopicSchema extends BaseResourceSchema {
-  readonly type: typeof TOPIC_FQN;
-  readonly props: {};
-}
+/** Properties for cloud.Topic */
+export interface TopicSchema {}
 
 /** Runtime attributes for cloud.Topic */
 export interface TopicAttributes {}
 
+/** Schema for a Topic event subscription */
 export interface TopicSubscriber extends EventSubscription {
   /** Function that should be called */
-  readonly functionHandle: FunctionHandle;
+  readonly functionHandle: ResourceHandle;
+}
+
+/** Properties for cloud.Table */
+export interface TableSchema {
+  readonly name: string;
+  readonly columns: { [key: string]: ColumnType };
+  readonly primaryKey: string;
+  readonly initialRows: Record<string, Json>;
 }
 
 /** Runtime attributes for cloud.Table */
 export interface TableAttributes {}
 
-/** Schema for cloud.Table */
-export interface TableSchema extends BaseResourceSchema {
-  readonly type: typeof TABLE_FQN;
-  readonly props: {
-    readonly name: string;
-    readonly columns: { [key: string]: ColumnType };
-    readonly primaryKey: string;
-    readonly initialRows: Record<string, Json>;
-  };
-}
-
-/** Schema for cloud.Bucket */
-export interface BucketSchema extends BaseResourceSchema {
-  readonly type: typeof BUCKET_FQN;
-  readonly props: {
-    /** Whether the bucket should be publicly accessible. */
-    readonly public: boolean;
-    /** The initial objects uploaded to the bucket. */
-    readonly initialObjects: Record<string, string>;
-    /** Event notification topics- the record has BucketEventType as a key and a topic handle as a value  */
-    readonly topics: Record<string, string>;
-  };
+/** Properties for cloud.Bucket */
+export interface BucketSchema {
+  /** Whether the bucket should be publicly accessible. */
+  readonly public: boolean;
+  /** The initial objects uploaded to the bucket. */
+  readonly initialObjects: Record<string, string>;
+  /** Event notification topics- the record has BucketEventType as a key and a topic handle as a value  */
+  readonly topics: Record<string, string>;
 }
 
 /** Runtime attributes for cloud.Bucket */
 export interface BucketAttributes {}
 
-/** Schema for cloud.Counter */
-export interface CounterSchema extends BaseResourceSchema {
-  readonly type: typeof COUNTER_FQN;
-  readonly props: {
-    /** The initial value of the counter. */
-    readonly initial: number;
-  };
-}
-
-/** Runtime attributes for cloud.Counter */
-export interface CounterAttributes {}
-
-/** Schema for cloud.TestRunner */
-export interface TestRunnerSchema extends BaseResourceSchema {
-  readonly type: typeof TEST_RUNNER_FQN;
-  readonly props: {
-    /** A map from test functions to their handles. */
-    readonly tests: Record<string, FunctionHandle>;
-  };
+/** Properties for cloud.TestRunner */
+export interface TestRunnerSchema {
+  /** A map from test functions to their handles. */
+  readonly tests: Record<string, ResourceHandle>;
 }
 
 /** Runtime attributes for cloud.TestRunner */
 export interface TestRunnerAttributes {}
 
-/** Schema for redis.Redis */
-export interface RedisSchema extends BaseResourceSchema {
-  readonly type: typeof REDIS_FQN;
-  readonly props: {};
+/** Properties for redis.Redis */
+export interface RedisSchema {
+  /** The port to run the Redis server on. */
+  readonly port: string;
 }
+
+/** Runtime attributes for ex.Redis */
+export interface RedisAttributes {}
+
 /**
  * Custom routes created in preflight.
  * Each contains the data to send to the user and a contentType header.
  */
 export type FileRoutes = Record<string, { data: string; contentType: string }>;
 
-/** Schema for cloud.Website */
-export interface WebsiteSchema extends BaseResourceSchema {
-  readonly type: typeof WEBSITE_FQN;
-  readonly props: {
-    /** Path to the directory where all static files are hosted from */
-    staticFilesPath: string;
-    /** Map of "files" contains dynamic content inserted from preflight */
-    fileRoutes: FileRoutes;
-  };
-  readonly attrs: WebsiteAttributes & BaseResourceAttributes;
+/** Properties for cloud.Website */
+export interface WebsiteSchema {
+  /** Path to the directory where all static files are hosted from */
+  readonly staticFilesPath: string;
+  /** Map of "files" contains dynamic content inserted from preflight */
+  readonly fileRoutes: FileRoutes;
+  /** Name of the error document for the website. */
+  readonly errorDocument?: string;
 }
 
 /** Runtime attributes for cloud.Website */
@@ -251,77 +196,98 @@ export interface WebsiteAttributes {
   readonly url: string;
 }
 
-export interface ReactAppSchema extends BaseResourceSchema {
-  readonly type: typeof REACT_APP_FQN;
-  readonly props: {
-    path: string;
-    startCommand: string;
-    environmentVariables: Record<string, string>;
-    useBuildCommand: boolean;
-    url: string;
-  };
-}
-export interface ReactAppAttributes {
-  url: string;
-}
-
-export interface RedisAttributes {}
-
-/** Schema for cloud.Secret */
-export interface SecretSchema extends BaseResourceSchema {
-  readonly type: typeof SECRET_FQN;
-  readonly props: {
-    /** The name of the secret */
-    readonly name: string;
-  };
+/** Properties for cloud.Secret */
+export interface SecretSchema {
+  /** The name of the secret */
+  readonly name: string;
 }
 
 /** Runtime attributes for cloud.Secret */
 export interface SecretAttributes {}
 
-/** Schema for cloud.OnDeploy */
-export interface OnDeploySchema extends BaseResourceSchema {
-  readonly type: typeof ON_DEPLOY_FQN;
-  readonly props: {
-    /** The function to run on deploy. */
-    readonly functionHandle: FunctionHandle;
-  };
+/** Properties for cloud.OnDeploy */
+export interface OnDeploySchema {
+  /** The function to run on deploy. */
+  readonly functionHandle: ResourceHandle;
 }
 
 /** Runtime attributes for cloud.OnDeploy */
 export interface OnDeployAttributes {}
 
-/** Runtime attributes for ex.DynamodbTable */
-export interface DynamodbTableAttributes {}
-
-/** Schema for ex.DynamodbTable */
-export interface DynamodbTableSchema extends BaseResourceSchema {
-  readonly type: typeof DYNAMODB_TABLE_FQN;
-  readonly props: {
-    readonly name: string;
-    /**
-     * Table attribute definitions. e.g. { "myKey": "S", "myOtherKey": "S" }.
-     */
-    readonly attributeDefinitions: Json;
-    /**
-     * Hash key for this table.
-     */
-    readonly hashKey: string;
-    /**
-     * Range key for this table.
-     */
-    readonly rangeKey?: string;
-  };
+/** Properties for sim.State */
+export interface StateSchema {}
+
+/** Runtime attributes for sim.State */
+export interface StateAttributes {}
+
+/** Properties for cloud.Domain */
+export interface DomainSchema {}
+
+/** Runtime attributes for cloud.Domain */
+export interface DomainAttributes {}
+
+/** Properties for cloud.Endpoint */
+export interface EndpointSchema {
+  /** The input URL of the Endpoint. */
+  readonly inputUrl: string;
+  /** The output URL of the Endpoint. */
+  readonly url: string;
+  /** The Label of the Endpoint. */
+  readonly label: string | undefined;
+  /** Browser support of the Endpoint. */
+  readonly browserSupport: boolean | undefined;
+}
+
+/** Runtime attributes for cloud.Endpoint */
+export interface EndpointAttributes {
+  /** The input URL of the Endpoint. */
+  readonly inputUrl: string;
+  /** The output URL of the Endpoint. */
+  readonly url: string;
+  /** The Label of the Endpoint. */
+  readonly label: string | undefined;
+  /** Browser support of the Endpoint. */
+  readonly browserSupport: boolean | undefined;
+}
+
+/** Properties for sim.Container */
+export interface ContainerSchema {
+  readonly imageTag: string;
+  readonly image: string;
+  readonly containerPort?: number;
+  readonly env?: Record<string, string>;
+  readonly volumes?: string[];
+  readonly args?: string[];
+  readonly cwd: string;
+  readonly network?: string;
+  readonly entrypoint?: string;
+}
+
+/** Runtime attributes for sim.Container */
+export interface ContainerAttributes {}
+
+/** Properties for sim.Policy */
+export interface PolicySchema {
+  /** The resource which the policy is attached to. */
+  readonly principal: ResourceHandle;
+  /** The statements in the policy. */
+  readonly statements: PolicyStatement[];
 }
 
-/** Schema for simulator.State */
-export interface StateSchema extends BaseResourceSchema {
-  readonly type: typeof STATE_FQN;
-  readonly props: {};
+/** Runtime attributes for sim.Policy */
+export interface PolicyAttributes {}
+
+/** Properties for sim.Resource */
+export interface SimResourceSchema {
+  /** The environment variables available to the resource. */
+  readonly environmentVariables: Record<string, string>;
+  /** The path to a file containing the resource's source code. */
+  readonly sourceCodeFile: string;
+  /** The language of the resource's source code. */
+  readonly sourceCodeLanguage: string;
 }
 
-/** Schema for cloud.Domain */
-export interface DomainSchema extends BaseResourceSchema {
-  readonly type: typeof DOMAIN_FQN;
-  readonly props: {};
+/** Runtime attributes for sim.Resource */
+export interface SimResourceAttributes {
+  [key: string]: string;
 }
diff --git a/libs/wingsdk/src/target-sim/secret.inflight.ts b/libs/wingsdk/src/target-sim/secret.inflight.ts
index eda95bb08a7..97d1b41bb85 100644
--- a/libs/wingsdk/src/target-sim/secret.inflight.ts
+++ b/libs/wingsdk/src/target-sim/secret.inflight.ts
@@ -1,56 +1,61 @@
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
 import { SecretAttributes, SecretSchema } from "./schema-resources";
 import { ISecretClient, SECRET_FQN } from "../cloud";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
-import { Json, TraceType } from "../std";
+import { Json, LogLevel, TraceType } from "../std";
 
 export class Secret implements ISecretClient, ISimulatorResourceInstance {
-  private readonly context: ISimulatorContext;
-  private readonly secretsFile: string;
+  private _context: ISimulatorContext | undefined;
   private readonly name: string;
 
-  constructor(props: SecretSchema["props"], context: ISimulatorContext) {
-    this.context = context;
+  constructor(props: SecretSchema) {
+    this.name = props.name;
+  }
 
-    this.secretsFile = path.join(os.homedir(), ".wing", "secrets.json");
-    if (!fs.existsSync(this.secretsFile)) {
-      throw new Error(
-        `No secrets file found at ${this.secretsFile} while looking for secret ${props.name}`
-      );
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
     }
-
-    this.name = props.name;
+    return this._context;
   }
 
-  public async init(): Promise<SecretAttributes> {
+  public async init(context: ISimulatorContext): Promise<SecretAttributes> {
+    this._context = context;
     return {};
   }
 
   public async cleanup(): Promise<void> {}
 
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
   public async value(): Promise<string> {
     this.context.addTrace({
       data: {
         message: "Get value",
       },
+      level: LogLevel.VERBOSE,
       sourcePath: this.context.resourcePath,
       sourceType: SECRET_FQN,
       type: TraceType.RESOURCE,
       timestamp: new Date().toISOString(),
     });
 
-    const secrets = JSON.parse(fs.readFileSync(this.secretsFile, "utf-8"));
+    const secretValue = process.env[this.name];
 
-    if (!secrets[this.name]) {
-      throw new Error(`No secret value for secret ${this.name}`);
+    if (!secretValue) {
+      throw new Error(
+        `No value for secret ${this.name}\n(hint: try running the "wing secrets -t TARGET" to store secret)`
+      );
     }
 
-    return secrets[this.name];
+    return secretValue;
   }
 
   public async valueJson(): Promise<Json> {
diff --git a/libs/wingsdk/src/target-sim/secret.ts b/libs/wingsdk/src/target-sim/secret.ts
index d9b2ac80327..8aac98c5d76 100644
--- a/libs/wingsdk/src/target-sim/secret.ts
+++ b/libs/wingsdk/src/target-sim/secret.ts
@@ -3,8 +3,9 @@ import { ISimulatorResource } from "./resource";
 import { SecretSchema } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
+import { LiftMap } from "../core";
 import { ResourceNames } from "../shared/resource-names";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { ToSimulatorOutput } from "../simulator";
 import { IInflightHost } from "../std";
 
 /**
@@ -13,17 +14,16 @@ import { IInflightHost } from "../std";
  * @inflight `@winglang/sdk.cloud.ISecretClient`
  */
 export class Secret extends cloud.Secret implements ISimulatorResource {
-  private readonly name: string;
   constructor(scope: Construct, id: string, props: cloud.SecretProps = {}) {
     super(scope, id, props);
 
-    this.name =
+    this._name =
       props.name ??
       ResourceNames.generateName(this, { disallowedRegex: /[^\w]/g });
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
@@ -33,22 +33,20 @@ export class Secret extends cloud.Secret implements ISimulatorResource {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.SecretInflightMethods.VALUE,
-      cloud.SecretInflightMethods.VALUE_JSON,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.SecretInflightMethods.VALUE]: [],
+      [cloud.SecretInflightMethods.VALUE_JSON]: [],
+    };
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: SecretSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: SecretSchema = {
+      name: this.name!,
+    };
+    return {
       type: cloud.SECRET_FQN,
-      path: this.node.path,
-      props: {
-        name: this.name,
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 }
diff --git a/libs/wingsdk/src/target-sim/service.inflight.ts b/libs/wingsdk/src/target-sim/service.inflight.ts
index 6e0a5379abf..b964cf5b4af 100644
--- a/libs/wingsdk/src/target-sim/service.inflight.ts
+++ b/libs/wingsdk/src/target-sim/service.inflight.ts
@@ -1,46 +1,59 @@
 import { resolve } from "path";
 import { ServiceAttributes, ServiceSchema } from "./schema-resources";
-import {
-  IServiceClient,
-  IServiceStopHandlerClient,
-  SERVICE_FQN,
-} from "../cloud";
+import { IServiceClient, SERVICE_FQN } from "../cloud";
+import { Bundle, isBundleInvalidated } from "../shared/bundling";
 import { Sandbox } from "../shared/sandbox";
-import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator";
-import { TraceType } from "../std";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
+import { LogLevel, TraceType } from "../std";
 
 export class Service implements IServiceClient, ISimulatorResourceInstance {
-  private readonly context: ISimulatorContext;
-  private readonly entrypoint: string;
+  private _context: ISimulatorContext | undefined;
+  private readonly sourceCodeFile: string;
   private readonly autoStart: boolean;
-  private readonly sandbox: Sandbox;
+  private resolvedSourceCodeFile!: string;
+  private sandbox: Sandbox | undefined;
+  private bundle: Bundle | undefined;
   private running: boolean = false;
-  private onStop?: IServiceStopHandlerClient;
+  private environmentVariables: Record<string, string>;
+  private createBundlePromise!: Promise<void>;
 
-  constructor(props: ServiceSchema["props"], context: ISimulatorContext) {
-    this.context = context;
-    this.entrypoint = resolve(context.simdir, props.sourceCodeFile);
+  constructor(props: ServiceSchema) {
+    this.sourceCodeFile = props.sourceCodeFile;
     this.autoStart = props.autoStart;
-    this.sandbox = new Sandbox(this.entrypoint, {
-      env: {
-        ...props.environmentVariables,
-        WING_SIMULATOR_URL: this.context.serverUrl,
-      },
-      log: (internal, _level, message) => {
-        this.context.addTrace({
-          data: { message },
-          type: internal ? TraceType.RESOURCE : TraceType.LOG,
-          sourcePath: this.context.resourcePath,
-          sourceType: SERVICE_FQN,
-          timestamp: new Date().toISOString(),
-        });
-      },
-    });
+    this.environmentVariables = props.environmentVariables ?? {};
+  }
+
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
 
-    props;
+  private async ensureBundled(): Promise<void> {
+    await this.createBundlePromise;
+    if (!this.bundle) {
+      throw new Error("Bundle not created");
+    }
+  }
+
+  private async createBundle(): Promise<void> {
+    this.bundle = await Sandbox.createBundle(
+      this.resolvedSourceCodeFile,
+      (msg, level) => {
+        this.addTrace(msg, TraceType.RESOURCE, level);
+      }
+    );
   }
 
-  public async init(): Promise<ServiceAttributes> {
+  public async init(context: ISimulatorContext): Promise<ServiceAttributes> {
+    this._context = context;
+    this.resolvedSourceCodeFile = resolve(context.simdir, this.sourceCodeFile);
+    this.createBundlePromise = this.createBundle();
     if (this.autoStart) {
       await this.start();
     }
@@ -48,40 +61,109 @@ export class Service implements IServiceClient, ISimulatorResourceInstance {
   }
 
   public async cleanup(): Promise<void> {
+    await this.createBundlePromise;
     await this.stop();
   }
 
+  public async save(): Promise<void> {}
+
+  public async plan(invalidated: boolean): Promise<UpdatePlan> {
+    if (invalidated) {
+      return UpdatePlan.REPLACE;
+    }
+
+    // Make sure that we don't have an ongoing bundle operation
+    await this.ensureBundled();
+
+    // Check if any of the bundled files have changed since the last bundling
+    const bundleInvalidated = await isBundleInvalidated(
+      this.resolvedSourceCodeFile,
+      this.bundle!,
+      (msg) => this.addTrace(msg, TraceType.SIMULATOR, LogLevel.VERBOSE)
+    );
+    if (bundleInvalidated) {
+      return UpdatePlan.REPLACE;
+    }
+
+    return UpdatePlan.SKIP;
+  }
+
   public async start(): Promise<void> {
     // Do nothing if service is already running.
     if (this.running) {
       return;
     }
 
-    this.onStop = await this.sandbox.call("handle");
-    this.running = true;
+    await this.createBundlePromise;
+
+    if (!this.bundle) {
+      this.addTrace(
+        "Failed to start service: bundle is not created",
+        TraceType.RESOURCE,
+        LogLevel.ERROR
+      );
+      return;
+    }
+
+    this.sandbox = new Sandbox(this.bundle.outfilePath, {
+      env: {
+        ...this.environmentVariables,
+        WING_SIMULATOR_URL: this.context.serverUrl,
+        WING_SIMULATOR_CALLER: this.context.resourceHandle,
+      },
+      log: (internal, level, message) => {
+        this.addTrace(
+          message,
+          internal ? TraceType.SIMULATOR : TraceType.LOG,
+          level
+        );
+      },
+    });
+
+    try {
+      await this.sandbox.call("start");
+      this.running = true;
+    } catch (e: any) {
+      this.addTrace(
+        `Failed to start service: ${e.message}`,
+        TraceType.RESOURCE,
+        LogLevel.ERROR
+      );
+    }
   }
 
   public async stop(): Promise<void> {
     // Do nothing if service is already stopped.
-    if (!this.running) {
+    if (!this.running || !this.sandbox) {
       return;
     }
 
-    if (this.onStop) {
-      // wing has a quirk where it will return either a function or an object that implements
-      // "handle", depending on whether the closure is defined in an inflight context or preflight
-      // context. so we need to handle both options here. (in wing this is handled by the compiler).
-      if (typeof this.onStop === "function") {
-        await (this.onStop as any)();
-      } else {
-        await this.onStop.handle();
-      }
+    try {
+      this.running = false;
+      await this.createBundlePromise;
+      await this.sandbox.call("stop");
+      await this.sandbox.cleanup();
+    } catch (e: any) {
+      this.addTrace(
+        `Failed to stop service: ${e.message} ${e.stack}`,
+        TraceType.RESOURCE,
+        LogLevel.ERROR
+      );
     }
-
-    this.running = false;
   }
 
   public async started(): Promise<boolean> {
     return this.running;
   }
+
+  private addTrace(message: string, type: TraceType, level: LogLevel) {
+    this.context.addTrace({
+      data: { message },
+      type,
+      sourcePath: this.context.resourcePath,
+      sourceType: SERVICE_FQN,
+      timestamp: new Date().toISOString(),
+      level,
+    });
+  }
 }
diff --git a/libs/wingsdk/src/target-sim/service.ts b/libs/wingsdk/src/target-sim/service.ts
index ffbb17be2bc..ba837749d42 100644
--- a/libs/wingsdk/src/target-sim/service.ts
+++ b/libs/wingsdk/src/target-sim/service.ts
@@ -1,14 +1,19 @@
 import { relative } from "path";
 import { Construct } from "constructs";
-import { ISimulatorResource } from "./resource";
+import { ISimulatorInflightHost, ISimulatorResource } from "./resource";
 import { ServiceSchema } from "./schema-resources";
+import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
-import { App } from "../core";
-import { BaseResourceSchema } from "../simulator";
-import { IInflightHost } from "../std";
+import { App, LiftMap } from "../core";
+import { PolicyStatement, ToSimulatorOutput } from "../simulator";
+import { IInflightHost, IResource } from "../std";
 
-export class Service extends cloud.Service implements ISimulatorResource {
+export class Service
+  extends cloud.Service
+  implements ISimulatorResource, ISimulatorInflightHost
+{
+  private readonly permissions: Array<[IResource, string]> = [];
   private readonly autoStart: boolean;
 
   constructor(
@@ -21,31 +26,41 @@ export class Service extends cloud.Service implements ISimulatorResource {
     this.autoStart = props.autoStart ?? true;
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: ServiceSchema = {
+  public addPermission(resource: IResource, op: string): void {
+    this.permissions.push([resource, op]);
+  }
+
+  public toSimulator(): ToSimulatorOutput {
+    const policy: Array<PolicyStatement> = [];
+    for (const [resource, operation] of this.permissions) {
+      policy.push({
+        operation,
+        resourceHandle: simulatorHandleToken(resource),
+      });
+    }
+    const props: ServiceSchema = {
+      environmentVariables: this.env,
+      sourceCodeFile: relative(App.of(this).outdir, this.entrypoint),
+      autoStart: this.autoStart,
+    };
+    return {
       type: cloud.SERVICE_FQN,
-      path: this.node.path,
-      props: {
-        environmentVariables: this.env,
-        sourceCodeFile: relative(App.of(this).outdir, this.entrypoint),
-        autoStart: this.autoStart,
-      },
-      attrs: {} as any,
+      props,
+      policy,
     };
-    return schema;
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.ServiceInflightMethods.START,
-      cloud.ServiceInflightMethods.STOP,
-      cloud.ServiceInflightMethods.STARTED,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.ServiceInflightMethods.START]: [],
+      [cloud.ServiceInflightMethods.STOP]: [],
+      [cloud.ServiceInflightMethods.STARTED]: [],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-sim/state.inflight.ts b/libs/wingsdk/src/target-sim/state.inflight.ts
index 97820a012ba..bd1bb13167f 100644
--- a/libs/wingsdk/src/target-sim/state.inflight.ts
+++ b/libs/wingsdk/src/target-sim/state.inflight.ts
@@ -1,19 +1,36 @@
 import { StateSchema } from "./schema-resources";
 import { IStateClient } from "./state";
-import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
 import { Json } from "../std";
 
 export class State implements IStateClient, ISimulatorResourceInstance {
-  constructor(
-    _props: StateSchema["props"],
-    private readonly context: ISimulatorContext
-  ) {}
-  public async init(): Promise<Record<string, any>> {
+  private _context: ISimulatorContext | undefined;
+  constructor(_props: StateSchema) {}
+
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<Record<string, any>> {
+    this._context = context;
     return {};
   }
 
   public async cleanup(): Promise<void> {}
 
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
   public async set(key: string, value: any): Promise<void> {
     this.context.setResourceAttributes(this.context.resourcePath, {
       [key]: value,
diff --git a/libs/wingsdk/src/target-sim/state.ts b/libs/wingsdk/src/target-sim/state.ts
index 03fb0f1a934..bad1716627f 100644
--- a/libs/wingsdk/src/target-sim/state.ts
+++ b/libs/wingsdk/src/target-sim/state.ts
@@ -1,8 +1,11 @@
 import { ISimulatorResource } from "./resource";
+import { StateSchema } from "./schema-resources";
 import { simulatorAttrToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import { fqnForType } from "../constants";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { LiftMap } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
+import { ToSimulatorOutput } from "../simulator";
 import { IInflightHost, Json, Resource } from "../std";
 
 /**
@@ -25,6 +28,9 @@ export const STATE_FQN = fqnForType("sim.State");
  * @inflight `@winglang/sdk.sim.IStateClient`
  */
 export class State extends Resource implements ISimulatorResource {
+  /** @internal */
+  public [INFLIGHT_SYMBOL]?: IStateClient;
+
   /**
    * Returns a token that can be used to retrieve the value of the state after the simulation has
    * run.
@@ -35,12 +41,12 @@ export class State extends Resource implements ISimulatorResource {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      StateInflightMethods.GET,
-      StateInflightMethods.SET,
-      StateInflightMethods.TRY_GET,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [StateInflightMethods.GET]: [],
+      [StateInflightMethods.SET]: [],
+      [StateInflightMethods.TRY_GET]: [],
+    };
   }
 
   /** @internal */
@@ -49,16 +55,15 @@ export class State extends Resource implements ISimulatorResource {
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
-  public toSimulator(): BaseResourceSchema {
+  public toSimulator(): ToSimulatorOutput {
+    const props: StateSchema = {};
     return {
       type: STATE_FQN,
-      path: this.node.path,
-      props: {},
-      attrs: {},
+      props,
     };
   }
 }
@@ -71,12 +76,14 @@ export interface IStateClient {
    * Sets the state of runtime a runtime object.
    * @param key The object's key
    * @param value The object's value
+   * @inflight
    */
   set(key: string, value: Json): Promise<void>;
 
   /**
    * Gets the runtime state of this object. Throws if there is no value for the given key.
    * @param key The object's key
+   * @inflight
    */
   get(key: string): Promise<Json>;
 
@@ -85,6 +92,7 @@ export interface IStateClient {
    * returns `nil`.
    *
    * @param key The object's key
+   * @inflight
    */
   tryGet(key: string): Promise<Json | undefined>;
 }
diff --git a/libs/wingsdk/src/target-sim/table.inflight.ts b/libs/wingsdk/src/target-sim/table.inflight.ts
index 62e454cb508..d29e2c5a621 100644
--- a/libs/wingsdk/src/target-sim/table.inflight.ts
+++ b/libs/wingsdk/src/target-sim/table.inflight.ts
@@ -4,6 +4,7 @@ import { validateRow } from "../shared/table-utils";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
 import { Json } from "../std";
 
@@ -12,19 +13,26 @@ export class Table implements ITableClient, ISimulatorResourceInstance {
   private columns: { [key: string]: ColumnType };
   private primaryKey: string;
   private table: Map<string, any>;
-  private readonly context: ISimulatorContext;
+  private _context: ISimulatorContext | undefined;
   private readonly initialRows: Record<string, Json>;
 
-  public constructor(props: TableSchema["props"], context: ISimulatorContext) {
+  public constructor(props: TableSchema) {
     this.name = props.name;
     this.columns = props.columns;
     this.primaryKey = props.primaryKey;
     this.table = new Map<string, any>();
-    this.context = context;
     this.initialRows = props.initialRows ?? {};
   }
 
-  public async init(): Promise<TableAttributes> {
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<TableAttributes> {
+    this._context = context;
     for (const [key, row] of Object.entries(this.initialRows)) {
       await this.context.withTrace({
         message: `Adding initial row (key=${key}).`,
@@ -38,6 +46,12 @@ export class Table implements ITableClient, ISimulatorResourceInstance {
 
   public async cleanup(): Promise<void> {}
 
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
   public async insert(key: string, row: Json): Promise<void> {
     validateRow(row, this.columns);
     const anyRow = row as any;
diff --git a/libs/wingsdk/src/target-sim/table.ts b/libs/wingsdk/src/target-sim/table.ts
index 53dee20ebb7..d303a40d5d0 100644
--- a/libs/wingsdk/src/target-sim/table.ts
+++ b/libs/wingsdk/src/target-sim/table.ts
@@ -2,8 +2,9 @@ import { Construct } from "constructs";
 import { ISimulatorResource } from "./resource";
 import { TableSchema } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
+import { LiftMap } from "../core";
 import * as ex from "../ex";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { ToSimulatorOutput } from "../simulator/simulator";
 import { Json, IInflightHost } from "../std";
 
 /**
@@ -21,36 +22,34 @@ export class Table extends ex.Table implements ISimulatorResource {
     this.initialRows[key] = { ...row, [this.primaryKey]: key } as Json;
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: TableSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: TableSchema = {
+      name: this.name,
+      columns: this.columns,
+      primaryKey: this.primaryKey,
+      initialRows: this.initialRows,
+    };
+    return {
       type: ex.TABLE_FQN,
-      path: this.node.path,
-      props: {
-        name: this.name,
-        columns: this.columns,
-        primaryKey: this.primaryKey,
-        initialRows: this.initialRows,
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      ex.TableInflightMethods.INSERT,
-      ex.TableInflightMethods.UPSERT,
-      ex.TableInflightMethods.UPDATE,
-      ex.TableInflightMethods.DELETE,
-      ex.TableInflightMethods.GET,
-      ex.TableInflightMethods.TRYGET,
-      ex.TableInflightMethods.LIST,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [ex.TableInflightMethods.INSERT]: [],
+      [ex.TableInflightMethods.UPSERT]: [],
+      [ex.TableInflightMethods.UPDATE]: [],
+      [ex.TableInflightMethods.DELETE]: [],
+      [ex.TableInflightMethods.GET]: [],
+      [ex.TableInflightMethods.TRYGET]: [],
+      [ex.TableInflightMethods.LIST]: [],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-sim/test-runner.inflight.ts b/libs/wingsdk/src/target-sim/test-runner.inflight.ts
index 5ab5e06d0e3..0f50b359320 100644
--- a/libs/wingsdk/src/target-sim/test-runner.inflight.ts
+++ b/libs/wingsdk/src/target-sim/test-runner.inflight.ts
@@ -1,21 +1,32 @@
 import { TestRunnerAttributes, TestRunnerSchema } from "./schema-resources";
 import { IFunctionClient } from "../cloud";
-import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator";
-import { ITestRunnerClient, TestResult } from "../std";
+import {
+  ISimulatorContext,
+  ISimulatorResourceInstance,
+  UpdatePlan,
+} from "../simulator";
+import { ITestRunnerClient, TestResult, TraceType } from "../std";
 
 export class TestRunner
   implements ITestRunnerClient, ISimulatorResourceInstance
 {
   // A map from test paths to their corresponding function handles.
   private readonly tests: Map<string, string>;
-  private readonly context: ISimulatorContext;
+  private _context: ISimulatorContext | undefined;
 
-  constructor(props: TestRunnerSchema["props"], context: ISimulatorContext) {
+  constructor(props: TestRunnerSchema) {
     this.tests = new Map(Object.entries(props.tests));
-    this.context = context;
   }
 
-  public async init(): Promise<TestRunnerAttributes> {
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<TestRunnerAttributes> {
+    this._context = context;
     return {};
   }
 
@@ -23,6 +34,12 @@ export class TestRunner
     return;
   }
 
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
   public async listTests(): Promise<string[]> {
     return Array.from(this.tests.keys());
   }
@@ -32,28 +49,33 @@ export class TestRunner
     if (!functionHandle) {
       throw new Error(`No test found at path "${path}"`);
     }
-    const fnClient = this.context.findInstance(
-      functionHandle
-    ) as IFunctionClient & ISimulatorResourceInstance;
-    if (!fnClient) {
-      throw new Error(`No function client found for test path "${path}"`);
-    }
+    const fnClient = this.context.getClient(
+      functionHandle,
+      true
+    ) as IFunctionClient;
     let pass = false;
     let error: string | undefined;
     const previousTraces = this.context.listTraces().length;
     try {
-      await fnClient.invoke("");
+      await fnClient.invoke();
       pass = true;
     } catch (e: any) {
       error = e.stack;
     }
     // only return traces that were added after the test was run
     const newTraces = this.context.listTraces().slice(previousTraces);
+
+    // as well as any log trace prior to that- https://github.com/winglang/wing/issues/4995
+    const logTraces = this.context
+      .listTraces()
+      .slice(0, previousTraces)
+      .filter((trace) => trace.type === TraceType.LOG);
+
     return {
       path,
       pass,
       error,
-      traces: newTraces,
+      traces: [...logTraces, ...newTraces],
     };
   }
 }
diff --git a/libs/wingsdk/src/target-sim/test-runner.ts b/libs/wingsdk/src/target-sim/test-runner.ts
index 98244f55a6f..c384ba7d661 100644
--- a/libs/wingsdk/src/target-sim/test-runner.ts
+++ b/libs/wingsdk/src/target-sim/test-runner.ts
@@ -3,7 +3,7 @@ import { ISimulatorResource } from "./resource";
 import { TestRunnerSchema } from "./schema-resources";
 import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { ToSimulatorOutput } from "../simulator/simulator";
 import * as std from "../std";
 import { IInflightHost } from "../std";
 
@@ -17,21 +17,19 @@ export class TestRunner extends std.TestRunner implements ISimulatorResource {
     super(scope, id, props);
   }
 
-  public toSimulator(): BaseResourceSchema {
+  public toSimulator(): ToSimulatorOutput {
     const tests = this.getTestFunctionHandles();
-    const schema: TestRunnerSchema = {
+    const props: TestRunnerSchema = {
+      tests,
+    };
+    return {
       type: std.TEST_RUNNER_FQN,
-      path: this.node.path,
-      props: {
-        tests,
-      },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource("test-runner", this, host);
+    bindSimulatorResource("test-runner", this, host, ops);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-sim/topic.inflight.ts b/libs/wingsdk/src/target-sim/topic.inflight.ts
index 2b5be07bc1a..23cd548e696 100644
--- a/libs/wingsdk/src/target-sim/topic.inflight.ts
+++ b/libs/wingsdk/src/target-sim/topic.inflight.ts
@@ -4,44 +4,52 @@ import {
   TopicSchema,
   TopicSubscriber,
   EventSubscription,
-  FunctionHandle,
+  ResourceHandle,
 } from "./schema-resources";
 import { IFunctionClient, ITopicClient, TOPIC_FQN } from "../cloud";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
-import { TraceType } from "../std";
+import { LogLevel, TraceType } from "../std";
 
 export class Topic
   implements ITopicClient, ISimulatorResourceInstance, IEventPublisher
 {
   private readonly subscribers = new Array<TopicSubscriber>();
-  private readonly context: ISimulatorContext;
+  private _context: ISimulatorContext | undefined;
 
-  constructor(props: TopicSchema["props"], context: ISimulatorContext) {
-    this.context = context;
-    props;
+  constructor(_props: TopicSchema) {}
+
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
   }
 
-  public async init(): Promise<TopicAttributes> {
+  public async init(context: ISimulatorContext): Promise<TopicAttributes> {
+    this._context = context;
     return {};
   }
 
   public async cleanup(): Promise<void> {}
 
-  private async publishMessage(message: string) {
-    for (const subscriber of this.subscribers) {
-      const fnClient = this.context.findInstance(
-        subscriber.functionHandle!
-      ) as IFunctionClient & ISimulatorResourceInstance;
+  public async save(): Promise<void> {}
 
-      if (!fnClient) {
-        throw new Error("No function client found!");
-      }
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
 
+  private async publishMessage(message: string) {
+    for (const subscriber of this.subscribers) {
+      const fnClient = this.context.getClient(
+        subscriber.functionHandle
+      ) as IFunctionClient;
       this.context.addTrace({
         type: TraceType.RESOURCE,
+        level: LogLevel.VERBOSE,
         data: {
           message: `Sending message (message=${message}, subscriber=${subscriber.functionHandle}).`,
         },
@@ -50,26 +58,12 @@ export class Topic
         timestamp: new Date().toISOString(),
       });
 
-      // we are not awaiting `fnClient.invoke` so that if the function sleeps,
-      // performs IO, etc. it does not block the other subscribers
-      process.nextTick(() => {
-        fnClient.invoke(message).catch((err) => {
-          this.context.addTrace({
-            data: {
-              message: `Subscriber error: ${err}`,
-            },
-            sourcePath: this.context.resourcePath,
-            sourceType: TOPIC_FQN,
-            type: TraceType.RESOURCE,
-            timestamp: new Date().toISOString(),
-          });
-        });
-      });
+      await fnClient.invokeAsync(message);
     }
   }
 
   public async addEventSubscription(
-    subscriber: FunctionHandle,
+    subscriber: ResourceHandle,
     subscriptionProps: EventSubscription
   ): Promise<void> {
     let s = {
@@ -79,17 +73,29 @@ export class Topic
     this.subscribers.push(s);
   }
 
-  public async publish(message: string): Promise<void> {
-    this.context.addTrace({
-      data: {
-        message: `Publish (message=${message}).`,
+  public async removeEventSubscription(subscriber: string): Promise<void> {
+    const index = this.subscribers.findIndex(
+      (s) => s.functionHandle === subscriber
+    );
+    if (index >= 0) {
+      this.subscribers.splice(index, 1);
+    }
+  }
+
+  public publish(...messages: string[]): Promise<void> {
+    return this.context.withTrace({
+      message: `Publish (messages=${messages}).`,
+      activity: async () => {
+        if (messages.includes("")) {
+          throw new Error("Empty messages are not allowed");
+        }
+        let publishAll: Array<Promise<void>> = [];
+        for (const message of messages) {
+          publishAll.push(this.publishMessage(message));
+        }
+
+        return Promise.all(publishAll);
       },
-      sourcePath: this.context.resourcePath,
-      sourceType: TOPIC_FQN,
-      type: TraceType.RESOURCE,
-      timestamp: new Date().toISOString(),
     });
-
-    return this.publishMessage(message);
   }
 }
diff --git a/libs/wingsdk/src/target-sim/topic.onmessage.inflight.ts b/libs/wingsdk/src/target-sim/topic.onmessage.inflight.ts
deleted file mode 100644
index a4c9e528bed..00000000000
--- a/libs/wingsdk/src/target-sim/topic.onmessage.inflight.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type {
-  IFunctionHandlerClient,
-  ITopicOnMessageHandlerClient,
-} from "../cloud";
-
-export class TopicOnMessageHandlerClient
-  implements ITopicOnMessageHandlerClient
-{
-  private readonly handler: IFunctionHandlerClient;
-  constructor({ handler }: { handler: IFunctionHandlerClient }) {
-    this.handler = handler;
-  }
-  public async handle(event: string) {
-    await this.handler.handle(event);
-  }
-}
diff --git a/libs/wingsdk/src/target-sim/topic.ts b/libs/wingsdk/src/target-sim/topic.ts
index d1dcc291f0f..db2e153327e 100644
--- a/libs/wingsdk/src/target-sim/topic.ts
+++ b/libs/wingsdk/src/target-sim/topic.ts
@@ -1,14 +1,14 @@
-import { join } from "path";
 import { Construct } from "constructs";
 import { App } from "./app";
 import { EventMapping } from "./event-mapping";
-import { Function } from "./function";
+import { Policy } from "./policy";
 import { ISimulatorResource } from "./resource";
 import { TopicSchema } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
+import { Function } from "../cloud";
 import * as cloud from "../cloud";
-import { convertBetweenHandlers } from "../shared/convert";
-import { BaseResourceSchema } from "../simulator/simulator";
+import { lift, LiftMap } from "../core";
+import { ToSimulatorOutput } from "../simulator";
 import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
 
 /**
@@ -17,20 +17,17 @@ import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
  * @inflight `@winglang/sdk.cloud.ITopicClient`
  */
 export class Topic extends cloud.Topic implements ISimulatorResource {
+  public readonly policy: Policy;
   constructor(scope: Construct, id: string, props: cloud.TopicProps = {}) {
     super(scope, id, props);
+    this.policy = new Policy(this, "Policy", { principal: this });
   }
 
   public onMessage(
     inflight: cloud.ITopicOnMessageHandler,
     props: cloud.TopicOnMessageOptions = {}
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(__dirname, "topic.onmessage.inflight.js"),
-      "TopicOnMessageHandlerClient"
-    );
-
+    const functionHandler = TopicOnMessageHandler.toFunctionHandler(inflight);
     const fn = new Function(
       this,
       App.of(this).makeId(this, "OnMessage"),
@@ -38,7 +35,7 @@ export class Topic extends cloud.Topic implements ISimulatorResource {
       props
     );
     Node.of(fn).sourceModule = SDK_SOURCE_MODULE;
-    Node.of(fn).title = "onMessage()";
+    Node.of(fn).title = "Subscriber";
 
     new EventMapping(this, App.of(this).makeId(this, "TopicEventMapping"), {
       subscriber: fn,
@@ -48,15 +45,52 @@ export class Topic extends cloud.Topic implements ISimulatorResource {
 
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.TopicInflightMethods.PUBLISH,
       target: fn,
-      name: "onMessage()",
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
+      name: "subscriber",
     });
 
+    this.policy.addStatement(fn, cloud.FunctionInflightMethods.INVOKE_ASYNC);
+
     return fn;
   }
 
+  public subscribeQueue(queue: cloud.Queue): void {
+    const fn = new Function(
+      this,
+      App.of(this).makeId(this, "subscribeQueue"),
+      lift({ queue })
+        .grant({ queue: ["push"] })
+        .inflight(async (ctx, event) => {
+          await ctx.queue.push(event as string);
+          return undefined;
+        }),
+      {}
+    );
+    Node.of(fn).sourceModule = SDK_SOURCE_MODULE;
+    Node.of(fn).title = "QueueSubscriber";
+    Node.of(fn).hidden = true;
+
+    new EventMapping(this, App.of(this).makeId(this, "TopicEventMapping"), {
+      subscriber: fn,
+      publisher: this,
+      subscriptionProps: {},
+    });
+
+    Node.of(this).addConnection({
+      source: this,
+      sourceOp: cloud.TopicInflightMethods.PUBLISH,
+      target: fn,
+      targetOp: cloud.FunctionInflightMethods.INVOKE_ASYNC,
+      name: "push",
+    });
+
+    this.policy.addStatement(fn, cloud.FunctionInflightMethods.INVOKE_ASYNC);
+  }
+
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
@@ -66,17 +100,37 @@ export class Topic extends cloud.Topic implements ISimulatorResource {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [cloud.TopicInflightMethods.PUBLISH];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.QueueInflightMethods.PUSH]: [],
+      [cloud.TopicInflightMethods.PUBLISH]: [],
+    };
   }
 
-  public toSimulator(): BaseResourceSchema {
-    const schema: TopicSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: TopicSchema = {};
+    return {
       type: cloud.TOPIC_FQN,
-      path: this.node.path,
-      props: {},
-      attrs: {} as any,
+      props,
     };
-    return schema;
+  }
+}
+
+/**
+ * Utility class to work with topic message handlers.
+ */
+export class TopicOnMessageHandler {
+  /**
+   * Converts a `cloud.ITopicOnMessageHandler` to a `cloud.IFunctionHandler`
+   * @param handler the handler to convert
+   * @returns the function handler
+   */
+  public static toFunctionHandler(
+    handler: cloud.ITopicOnMessageHandler
+  ): cloud.IFunctionHandler {
+    return lift({ handler }).inflight(async (ctx, event) => {
+      await ctx.handler(event as string);
+      return undefined;
+    });
   }
 }
diff --git a/libs/wingsdk/src/target-sim/util.ts b/libs/wingsdk/src/target-sim/util.ts
index 71a78a6cbc4..2ed0e3e8682 100644
--- a/libs/wingsdk/src/target-sim/util.ts
+++ b/libs/wingsdk/src/target-sim/util.ts
@@ -2,6 +2,7 @@ import { access, constants } from "fs";
 import { basename } from "path";
 import { promisify } from "util";
 import { IConstruct } from "constructs";
+import { isSimulatorInflightHost } from "./resource";
 import { simulatorHandleToken } from "./tokens";
 import { Duration, IInflightHost, Resource } from "../std";
 
@@ -31,13 +32,23 @@ function makeEnvVarName(type: string, resource: IConstruct): string {
 export function bindSimulatorResource(
   filename: string,
   resource: Resource,
-  host: IInflightHost
+  host: IInflightHost,
+  ops: string[]
 ) {
+  // Check if host implements ISimulatorInflightHost
+  if (!isSimulatorInflightHost(host)) {
+    throw new Error(
+      "Host resource must implement sim.ISimulatorInflightHost to bind simulator resources"
+    );
+  }
   const type = basename(filename).split(".")[0];
   const env = makeEnvVarName(type, resource);
   const handle = simulatorHandleToken(resource);
   host.addEnvironment(env, handle);
   host.node.addDependency(resource);
+  for (const op of ops) {
+    host.addPermission(resource, op);
+  }
 }
 
 export function makeSimulatorJsClient(filename: string, resource: Resource) {
@@ -52,7 +63,39 @@ export function makeSimulatorJsClient(filename: string, resource: Resource) {
   if (!simulatorUrl) {
     throw new Error("Missing environment variable: WING_SIMULATOR_URL");
   }
-  return require("@winglang/sdk/lib/simulator/client").makeSimulatorClient(simulatorUrl, handle);
+  const caller = process.env.WING_SIMULATOR_CALLER;
+  if (!caller) {
+    throw new Error("Missing environment variable: WING_SIMULATOR_CALLER");
+  }
+  return require("@winglang/sdk/lib/simulator/client").makeSimulatorClient(simulatorUrl, handle, caller);
+})()`;
+}
+
+export function makeSimulatorJsClientV2(filename: string, resource: Resource) {
+  const type = basename(filename).split(".")[0];
+  const env = makeEnvVarName(type, resource);
+  return `(function() {
+  let handle = process.env.${env};
+  if (!handle) {
+    throw new Error("Missing environment variable: ${env}");
+  }
+  const simulatorUrl = process.env.WING_SIMULATOR_URL;
+  if (!simulatorUrl) {
+    throw new Error("Missing environment variable: WING_SIMULATOR_URL");
+  }
+  const caller = process.env.WING_SIMULATOR_CALLER;
+  if (!caller) {
+    throw new Error("Missing environment variable: WING_SIMULATOR_CALLER");
+  }
+  const backend = require("@winglang/sdk/lib/simulator/client").makeSimulatorClient(simulatorUrl, handle, caller);
+  const client = new Proxy(backend, {
+    get: function(target, prop, receiver) {
+      return async function(...args) {
+        return backend.call(prop, args);
+      };
+    },
+  });
+  return client;
 })()`;
 }
 
@@ -75,9 +118,7 @@ export function convertDurationToCronExpression(dur: Duration): string {
   // for now we just use * for day, month, and year
   const dayInMonth = "*";
   const month = "*";
-  // if day of month is "*", day of week should be "?"
-  // https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html
-  const dayOfWeek = "?";
+  const dayOfWeek = "*";
 
   // Generate cron string based on the duration
   const cronString = `${minute} ${hour} ${dayInMonth} ${month} ${dayOfWeek}`;
diff --git a/libs/wingsdk/src/target-sim/website.inflight.ts b/libs/wingsdk/src/target-sim/website.inflight.ts
index b986ba1a804..c5f5df5b665 100644
--- a/libs/wingsdk/src/target-sim/website.inflight.ts
+++ b/libs/wingsdk/src/target-sim/website.inflight.ts
@@ -1,31 +1,40 @@
 import { Server } from "http";
 import { AddressInfo } from "net";
+import { join } from "path";
 import express from "express";
 import { ApiAttributes, WebsiteSchema, FileRoutes } from "./schema-resources";
 import { IWebsiteClient, WEBSITE_FQN } from "../cloud";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
+  UpdatePlan,
 } from "../simulator/simulator";
-import { TraceType } from "../std";
+import { LogLevel, TraceType } from "../std";
 
 const LOCALHOST_ADDRESS = "127.0.0.1";
 
 export class Website implements IWebsiteClient, ISimulatorResourceInstance {
-  private readonly context: ISimulatorContext;
+  private _context: ISimulatorContext | undefined;
   private readonly app: express.Application;
   private server?: Server;
   private url?: string;
 
-  constructor(props: WebsiteSchema["props"], context: ISimulatorContext) {
-    this.context = context;
-
+  constructor(props: WebsiteSchema) {
     // Set up an express server that handles the routes.
     this.app = express();
 
     // Use static directory
     this.app.use(express.static(props.staticFilesPath));
+
     this.initiateFileRoutes(props.fileRoutes);
+
+    if (props.errorDocument) {
+      let errorDocument = props.errorDocument;
+
+      this.app.get("*", function (_, res) {
+        return res.sendFile(join(props.staticFilesPath, errorDocument));
+      });
+    }
   }
 
   private initiateFileRoutes(routes: FileRoutes) {
@@ -37,7 +46,15 @@ export class Website implements IWebsiteClient, ISimulatorResourceInstance {
     }
   }
 
-  public async init(): Promise<ApiAttributes> {
+  private get context(): ISimulatorContext {
+    if (!this._context) {
+      throw new Error("Cannot access context during class construction");
+    }
+    return this._context;
+  }
+
+  public async init(context: ISimulatorContext): Promise<ApiAttributes> {
+    this._context = context;
     // `server.address()` returns `null` until the server is listening
     // on a port. We use a promise to wait for the server to start
     // listening before returning the URL.
@@ -53,7 +70,7 @@ export class Website implements IWebsiteClient, ISimulatorResourceInstance {
     });
     this.url = `http://${addrInfo.address}:${addrInfo.port}`;
 
-    this.addTrace(`Website Server listening on ${this.url}`);
+    this.addTrace(`Website server listening on ${this.url}`, LogLevel.INFO);
 
     return {
       url: this.url,
@@ -61,12 +78,18 @@ export class Website implements IWebsiteClient, ISimulatorResourceInstance {
   }
 
   public async cleanup(): Promise<void> {
-    this.addTrace(`Closing server on ${this.url}`);
+    this.addTrace(`Closing server on ${this.url}`, LogLevel.VERBOSE);
     this.server?.close();
     this.server?.closeAllConnections();
   }
 
-  private addTrace(message: string): void {
+  public async save(): Promise<void> {}
+
+  public async plan() {
+    return UpdatePlan.AUTO;
+  }
+
+  private addTrace(message: string, level: LogLevel): void {
     this.context.addTrace({
       type: TraceType.RESOURCE,
       data: {
@@ -75,6 +98,7 @@ export class Website implements IWebsiteClient, ISimulatorResourceInstance {
       sourcePath: this.context.resourcePath,
       sourceType: WEBSITE_FQN,
       timestamp: new Date().toISOString(),
+      level,
     });
   }
 }
diff --git a/libs/wingsdk/src/target-sim/website.ts b/libs/wingsdk/src/target-sim/website.ts
index 22f15ec290d..8c77f45134f 100644
--- a/libs/wingsdk/src/target-sim/website.ts
+++ b/libs/wingsdk/src/target-sim/website.ts
@@ -4,22 +4,34 @@ import { WebsiteSchema, FileRoutes } from "./schema-resources";
 import { simulatorAttrToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
-import { BaseResourceSchema } from "../simulator/simulator";
-import { IInflightHost } from "../std";
+import { ToSimulatorOutput } from "../simulator";
+import { IInflightHost, Node } from "../std";
 
 /**
  * A static website.
  */
 export class Website extends cloud.Website implements ISimulatorResource {
   private fileRoutes: FileRoutes = {};
+  private readonly endpoint: cloud.Endpoint;
+  private readonly errorDocument?: string;
 
   constructor(scope: Construct, id: string, props: cloud.WebsiteProps) {
     super(scope, id, props);
+
+    this.endpoint = new cloud.Endpoint(
+      this,
+      "Endpoint",
+      simulatorAttrToken(this, "url"),
+      { label: `Website ${this.node.path}`, browserSupport: true }
+    );
+
+    Node.of(this.endpoint).hidden = true;
+
+    this.errorDocument = props.errorDocument;
   }
 
-  /** The url of the website */
-  public get url(): string {
-    return simulatorAttrToken(this, "url");
+  protected get _endpoint(): cloud.Endpoint {
+    return this.endpoint;
   }
 
   /** Adds a file to the website during deployment */
@@ -37,18 +49,20 @@ export class Website extends cloud.Website implements ISimulatorResource {
   }
 
   /** Returns sim schema */
-  public toSimulator(): BaseResourceSchema {
-    const schema: WebsiteSchema = {
+  public toSimulator(): ToSimulatorOutput {
+    const props: WebsiteSchema = {
+      staticFilesPath: this.path,
+      fileRoutes: this.fileRoutes,
+      errorDocument: this.errorDocument,
+    };
+    return {
       type: cloud.WEBSITE_FQN,
-      path: this.node.path,
-      props: { staticFilesPath: this.path, fileRoutes: this.fileRoutes },
-      attrs: {} as any,
+      props,
     };
-    return schema;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    bindSimulatorResource(__filename, this, host);
+    bindSimulatorResource(__filename, this, host, ops);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-tf-aws/api.cors.ts b/libs/wingsdk/src/target-tf-aws/api.cors.ts
deleted file mode 100644
index e5a0fdad487..00000000000
--- a/libs/wingsdk/src/target-tf-aws/api.cors.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import * as cloud from "../cloud";
-
-/**
- * DEFAULT_RESPONSE is a constant that defines the default response when a request occurs.
- * It is used to handle all requests that do not match any defined routes in the API Gateway.
- * The response is a mock integration type, which means it returns a mocked response without
- * forwarding the request to any backend. The response status code is set to 200 for OPTIONS
- * and 404 for any other method. The Content-Type header is set to 'application/json'.
- * @internal
- */
-export const API_CORS_DEFAULT_RESPONSE = (
-  corsOptions?: cloud.ApiCorsOptions
-) => {
-  if (corsOptions) {
-    return {
-      "/{proxy+}": {
-        "x-amazon-apigateway-any-method": {
-          produces: ["application/json"],
-          "x-amazon-apigateway-integration": {
-            type: "mock",
-            requestTemplates: {
-              "application/json": `
-                #if ($context.httpMethod == "OPTIONS")
-                    {"statusCode": 204}
-                #else
-                    {"statusCode": 404}
-                #end
-              `,
-            },
-            passthroughBehavior: "never",
-            responses: {
-              default: {
-                statusCode: "404",
-                responseParameters: {
-                  "method.response.header.Content-Type": "'application/json'",
-                },
-                responseTemplates: {
-                  "application/json":
-                    '{"statusCode": 404, "message": "Error: Resource not found"}',
-                },
-              },
-              "204": {
-                statusCode: "204",
-                responseParameters: {
-                  "method.response.header.Content-Type": "'application/json'",
-                  "method.response.header.Access-Control-Allow-Origin": `'${corsOptions.allowOrigin}'`,
-                  "method.response.header.Access-Control-Allow-Methods": `'${corsOptions.allowMethods}'`,
-                  "method.response.header.Access-Control-Allow-Headers": `'${corsOptions.allowHeaders}'`,
-                },
-                responseTemplates: {
-                  "application/json": "{}",
-                },
-              },
-              "404": {
-                statusCode: "404",
-                responseParameters: {
-                  "method.response.header.Content-Type": "'application/json'",
-                },
-                responseTemplates: {
-                  "application/json":
-                    '{"statusCode": 404, "message": "Error: Resource not found"}',
-                },
-              },
-            },
-          },
-          responses: {
-            204: {
-              description: "204 response",
-              headers: {
-                "Content-Type": {
-                  type: "string",
-                },
-                "Access-Control-Allow-Origin": {
-                  type: "string",
-                },
-                "Access-Control-Allow-Methods": {
-                  type: "string",
-                },
-                "Access-Control-Allow-Headers": {
-                  type: "string",
-                },
-              },
-            },
-            404: {
-              description: "404 response",
-              headers: {
-                "Content-Type": {
-                  type: "string",
-                },
-              },
-            },
-          },
-        },
-      },
-    };
-  } else {
-    return {
-      "/{proxy+}": {
-        "x-amazon-apigateway-any-method": {
-          produces: ["application/json"],
-          "x-amazon-apigateway-integration": {
-            type: "mock",
-            requestTemplates: {
-              "application/json": `
-                {"statusCode": 404}
-              `,
-            },
-            passthroughBehavior: "never",
-            responses: {
-              default: {
-                statusCode: "404",
-                responseParameters: {
-                  "method.response.header.Content-Type": "'application/json'",
-                },
-                responseTemplates: {
-                  "application/json":
-                    '{"statusCode": 404, "message": "Error: Resource not found"}',
-                },
-              },
-              "404": {
-                statusCode: "404",
-                responseParameters: {
-                  "method.response.header.Content-Type": "'application/json'",
-                },
-                responseTemplates: {
-                  "application/json":
-                    '{"statusCode": 404, "message": "Error: Resource not found"}',
-                },
-              },
-            },
-          },
-          responses: {
-            404: {
-              description: "404 response",
-              headers: {
-                "Content-Type": {
-                  type: "string",
-                },
-              },
-            },
-          },
-        },
-      },
-    };
-  }
-};
diff --git a/libs/wingsdk/src/target-tf-aws/api.ts b/libs/wingsdk/src/target-tf-aws/api.ts
index e051364ad89..bdf0cd10f9e 100644
--- a/libs/wingsdk/src/target-tf-aws/api.ts
+++ b/libs/wingsdk/src/target-tf-aws/api.ts
@@ -1,33 +1,27 @@
 import { createHash } from "crypto";
-import { join } from "path";
-
 import { Fn, Lazy } from "cdktf";
 import { Construct } from "constructs";
-import { API_CORS_DEFAULT_RESPONSE } from "./api.cors";
 import { App } from "./app";
 import { Function } from "./function";
 import { core } from "..";
 import { ApiGatewayDeployment } from "../.gen/providers/aws/api-gateway-deployment";
 import { ApiGatewayRestApi } from "../.gen/providers/aws/api-gateway-rest-api";
 import { ApiGatewayStage } from "../.gen/providers/aws/api-gateway-stage";
+import { DataAwsVpcEndpointService } from "../.gen/providers/aws/data-aws-vpc-endpoint-service";
 import { LambdaPermission } from "../.gen/providers/aws/lambda-permission";
+import { SecurityGroup } from "../.gen/providers/aws/security-group";
+import { VpcEndpoint } from "../.gen/providers/aws/vpc-endpoint";
 import * as cloud from "../cloud";
 import { OpenApiSpec } from "../cloud";
-import { convertBetweenHandlers } from "../shared/convert";
 import {
   CaseConventions,
   NameOptions,
   ResourceNames,
 } from "../shared/resource-names";
-import { IAwsApi } from "../shared-aws";
+import { ApiEndpointHandler, IAwsApi, STAGE_NAME } from "../shared-aws";
+import { createApiDefaultResponse } from "../shared-aws/api.default";
 import { IInflightHost, Node } from "../std";
 
-/**
- * The stage name for the API, used in its url.
- * @see https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html
- */
-const STAGE_NAME = "prod";
-
 /**
  * RestApi names are alphanumeric characters, hyphens (-) and underscores (_).
  */
@@ -41,6 +35,7 @@ const NAME_OPTS: NameOptions = {
 export class Api extends cloud.Api implements IAwsApi {
   private readonly api: WingRestApi;
   private readonly handlers: Record<string, Function> = {};
+  private readonly endpoint: cloud.Endpoint;
 
   constructor(scope: Construct, id: string, props: cloud.ApiProps = {}) {
     super(scope, id, props);
@@ -48,10 +43,16 @@ export class Api extends cloud.Api implements IAwsApi {
       getApiSpec: this._getOpenApiSpec.bind(this),
       cors: this.corsOptions,
     });
+
+    this.endpoint = new cloud.Endpoint(this, "Endpoint", this.api.url, {
+      label: `Api ${this.node.path}`,
+    });
+
+    Node.of(this.endpoint).hidden = true;
   }
 
-  public get url(): string {
-    return this.api.url;
+  protected get _endpoint(): cloud.Endpoint {
+    return this.endpoint;
   }
 
   /**
@@ -66,23 +67,22 @@ export class Api extends cloud.Api implements IAwsApi {
     method: string,
     path: string,
     inflight: cloud.IApiEndpointHandler,
-    props?: cloud.ApiGetOptions
+    props?: cloud.ApiEndpointOptions
   ): void {
     const lowerMethod = method.toLowerCase();
     const upperMethod = method.toUpperCase();
 
-    if (props) {
-      console.warn(`Api.${lowerMethod} does not support props yet`);
-    }
     this._validatePath(path);
 
-    const fn = this.addHandler(inflight, method, path);
+    const fn = this.addHandler(inflight, method, path, props);
     const apiSpecEndpoint = this.api.addEndpoint(path, upperMethod, fn);
     this._addToSpec(path, upperMethod, apiSpecEndpoint, this.corsOptions);
 
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.ApiInflightMethods.REQUEST,
       target: fn,
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
       name: `${lowerMethod}()`,
     });
   }
@@ -201,9 +201,10 @@ export class Api extends cloud.Api implements IAwsApi {
   private addHandler(
     inflight: cloud.IApiEndpointHandler,
     method: string,
-    path: string
+    path: string,
+    props?: cloud.ApiEndpointOptions
   ): Function {
-    let fn = this.addInflightHandler(inflight, method, path);
+    let fn = this.addInflightHandler(inflight, method, path, props);
     if (!(fn instanceof Function)) {
       throw new Error("Api only supports creating tfaws.Function right now");
     }
@@ -219,29 +220,24 @@ export class Api extends cloud.Api implements IAwsApi {
   private addInflightHandler(
     inflight: cloud.IApiEndpointHandler,
     method: string,
-    path: string
+    path: string,
+    props?: cloud.ApiEndpointOptions
   ): Function {
-    let handler = this.handlers[inflight._hash];
+    let handler = this.handlers[inflight._id];
     if (!handler) {
-      const newInflight = convertBetweenHandlers(
+      const newInflight = ApiEndpointHandler.toFunctionHandler(
         inflight,
-        join(
-          __dirname.replace("target-tf-aws", "shared-aws"),
-          "api.onrequest.inflight.js"
-        ),
-        "ApiOnRequestHandlerClient",
-        {
-          corsHeaders: this._generateCorsHeaders(this.corsOptions)
-            ?.defaultResponse,
-        }
+        cloud.Api.renderCorsHeaders(this.corsOptions)?.defaultResponse
       );
-      const prefix = `${method.toLowerCase()}${path.replace(/\//g, "_")}_}`;
+      const prefix = `${method.toLowerCase()}${path.replace(/\//g, "_")}`;
       handler = new Function(
         this,
         App.of(this).makeId(this, prefix),
-        newInflight
+        newInflight,
+        props
       );
-      this.handlers[inflight._hash] = handler;
+      Node.of(handler).hidden = true;
+      this.handlers[inflight._id] = handler;
     }
 
     return handler;
@@ -249,12 +245,7 @@ export class Api extends cloud.Api implements IAwsApi {
 
   /** @internal */
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("apis can only be bound by tfaws.Function for now");
-    }
-
     host.addEnvironment(this.urlEnvName(), this.url);
-
     super.onLift(host, ops);
   }
 
@@ -302,14 +293,19 @@ export class Api extends cloud.Api implements IAwsApi {
 }
 
 /**
- * Encapsulates the API Gateway REST API as a abstraction for Terraform.
+ * Encapsulates the API Gateway REST API as an abstraction for Terraform.
  */
 class WingRestApi extends Construct {
+  private readonly id: string;
+  private readonly region: string;
+  private readonly accountId: string;
   public readonly url: string;
   public readonly api: ApiGatewayRestApi;
   public readonly stage: ApiGatewayStage;
   public readonly deployment: ApiGatewayDeployment;
-  private readonly region: string;
+  public readonly privateVpc: boolean = false;
+  public readonly securityGroup?: SecurityGroup;
+  public readonly vpcEndpoint?: VpcEndpoint;
 
   constructor(
     scope: Construct,
@@ -320,52 +316,174 @@ class WingRestApi extends Construct {
     }
   ) {
     super(scope, id);
-    this.region = (App.of(this) as App).region;
+    const app = App.of(this) as App;
+    this.id = id;
+    this.region = app.region;
+    this.accountId = app.accountId;
+
+    // Check for PRIVATE API Gateway configuration
+    let privateApiGateway = app.parameters.value("tf-aws/vpc_api_gateway");
+    if (privateApiGateway === true) {
+      this.privateVpc = true;
+      const vpcResources = this._initVpcResources(app);
+      this.securityGroup = vpcResources.securityGroup;
+      this.vpcEndpoint = vpcResources.vpcEndpoint;
+    }
+
+    // Create the API Gateway and configure it
+    this.api = this._initApiGatewayRestApi(id, props);
+    this.deployment = this._initApiGatewayDeployment();
+    this.stage = this._initApiGatewayStage();
 
-    const defaultResponse = API_CORS_DEFAULT_RESPONSE(props.cors);
+    // Construct the URL for the deployed API Gateway stage
+    this.url = this._constructInvokeUrl();
+  }
 
-    this.api = new ApiGatewayRestApi(this, `${id}`, {
+  private _initVpcResources(app: App): {
+    securityGroup: SecurityGroup;
+    vpcEndpoint: VpcEndpoint;
+  } {
+    const vpcId: string = app.vpc.id;
+    const subnetIds: string[] = [...app.subnets.private.map((s) => s.id)];
+
+    const securityGroup = new SecurityGroup(this, `${this.id}SecurityGroup`, {
+      vpcId: vpcId,
+      ingress: [
+        {
+          cidrBlocks: ["0.0.0.0/0"],
+          fromPort: 0,
+          toPort: 0,
+          protocol: "-1",
+        },
+      ],
+    });
+
+    const service = new DataAwsVpcEndpointService(
+      this,
+      `${this.id}ServiceLookup`,
+      {
+        service: "execute-api",
+      }
+    );
+
+    const vpcEndpoint = new VpcEndpoint(this, `${this.id}-vpc-endpoint`, {
+      vpcId: vpcId,
+      serviceName: service.serviceName,
+      privateDnsEnabled: true,
+      vpcEndpointType: "Interface",
+      subnetIds: subnetIds,
+      securityGroupIds: [securityGroup.id],
+    });
+
+    return { securityGroup, vpcEndpoint };
+  }
+
+  private _initApiGatewayRestApi(
+    id: string,
+    props: {
+      getApiSpec: () => OpenApiSpec;
+      cors?: cloud.ApiCorsOptions;
+    }
+  ): ApiGatewayRestApi {
+    /**
+     * Configures the default response for requests to undefined routes (`/{proxy+}`).
+     * - If CORS options are defined, `defaultResponse` sets up CORS-compliant mock responses:
+     *   - 204 (No Content) for OPTIONS requests.
+     *   - 404 (Not Found) for other HTTP methods.
+     * - If CORS options are undefined, `defaultResponse` set up a mock 404 response for any HTTP method.
+     */
+
+    /**
+     * BASIC API Gateway properties
+     */
+    let apiProps: any = {
       name: ResourceNames.generateName(this, NAME_OPTS),
+      lifecycle: { createBeforeDestroy: true },
+
       // Lazy generation of the api spec because routes can be added after the API is created
       body: Lazy.stringValue({
         produce: () => {
-          const injectGreedy404Handler = (openApiSpec: OpenApiSpec) => {
-            openApiSpec.paths = {
-              ...openApiSpec.paths,
-              ...defaultResponse,
-            };
-            return openApiSpec;
-          };
-          return JSON.stringify(injectGreedy404Handler(props.getApiSpec()));
+          // Retrieves the API specification.
+          const apiSpec = props.getApiSpec();
+          const defaultResponse = createApiDefaultResponse(
+            Object.keys(apiSpec.paths),
+            props.cors
+          );
+
+          // Merges the specification with `defaultResponse` to handle requests to undefined routes (`/{proxy+}`).
+          // This integration ensures comprehensive route handling:
+          // - Predefined paths are maintained as specified.
+          // - Requests to paths not explicitly defined are managed by `defaultResponse`.
+          return JSON.stringify({
+            ...apiSpec,
+            paths: { ...apiSpec.paths, ...defaultResponse },
+          });
         },
       }),
-      lifecycle: {
-        createBeforeDestroy: true,
-      },
-    });
+    };
+
+    /**
+     * PRIVATE API Gateway properties
+     */
+    if (this.privateVpc && this.vpcEndpoint) {
+      apiProps.endpointConfiguration = {
+        types: ["PRIVATE"],
+        vpcEndpointIds: [this.vpcEndpoint.id],
+      };
+
+      // This policy will explicitly deny all requests that don't come from the VPC endpoint
+      // which means only requests that come from the same vpc on the same private subnet and security group
+      // will be allowed to access the API Gateway
+      apiProps.policy = JSON.stringify({
+        Version: "2012-10-17",
+        Statement: [
+          {
+            Effect: "Allow",
+            Principal: "*",
+            Action: "execute-api:Invoke",
+            Resource: ["*"],
+          },
+          {
+            Effect: "Deny",
+            Principal: "*",
+            Action: "execute-api:Invoke",
+            Resource: ["*"],
+            Condition: {
+              StringNotEquals: {
+                "aws:sourceVpce": this.vpcEndpoint.id,
+              },
+            },
+          },
+        ],
+      });
+    }
+
+    return new ApiGatewayRestApi(this, id, apiProps);
+  }
 
-    this.deployment = new ApiGatewayDeployment(this, "deployment", {
+  private _initApiGatewayDeployment(): ApiGatewayDeployment {
+    return new ApiGatewayDeployment(this, "deployment", {
       restApiId: this.api.id,
-      lifecycle: {
-        createBeforeDestroy: true,
-      },
-      triggers: {
-        // Trigger redeployment when the api spec changes
-        redeployment: Fn.sha256(this.api.body),
-      },
+      lifecycle: { createBeforeDestroy: true },
+      // Trigger redeployment when the api spec changes
+      triggers: { redeployment: Fn.sha256(this.api.body) },
     });
+  }
 
-    this.stage = new ApiGatewayStage(this, "stage", {
+  private _initApiGatewayStage(): ApiGatewayStage {
+    return new ApiGatewayStage(this, "stage", {
       restApiId: this.api.id,
       stageName: STAGE_NAME,
       deploymentId: this.deployment.id,
     });
+  }
 
-    // Intentionally not using `this.stage.invokeUrl`, it looks like it's shared with
-    // the `invokeUrl` from the api deployment, which gets recreated on every deployment.
-    // When this `invokeUrl` is referenced somewhere else in the stack, it can cause cyclic dependencies
-    // in Terraform. Hence, we're creating our own url here.
-    this.url = `https://${this.api.id}.execute-api.${this.region}.amazonaws.com/${this.stage.stageName}`;
+  // Intentionally not using `this.stage.invokeUrl`, it looks like it's shared with
+  // the `invokeUrl` from the api deployment, which gets recreated on every deployment.
+  // When this `invokeUrl` is referenced somewhere else in the stack, it can cause cyclic dependencies
+  // in Terraform. Hence, we're creating our own url here.
+  private _constructInvokeUrl(): string {
+    return `https://${this.api.id}.execute-api.${this.region}.amazonaws.com/${this.stage.stageName}`;
   }
 
   /**
@@ -376,8 +494,8 @@ class WingRestApi extends Construct {
    * @returns OpenApi spec extension for the endpoint
    */
   public addEndpoint(path: string, method: string, handler: Function) {
-    const endpointExtension = this.createApiSpecExtension(handler);
-    this.addHandlerPermissions(path, method, handler);
+    const endpointExtension = this._createApiSpecExtension(handler);
+    this._addHandlerPermissions(path, method, handler);
     return endpointExtension;
   }
 
@@ -386,10 +504,18 @@ class WingRestApi extends Construct {
    * @param handler Lambda function to handle the endpoint
    * @returns OpenApi extension object for the endpoint and handler
    */
-  private createApiSpecExtension(handler: Function) {
+  private _createApiSpecExtension(handler: Function) {
+    // The ARN of the Lambda function is constructed by hand so that it can be calculated
+    // during preflight, instead of being resolved at deploy time.
+    //
+    // By doing this, the API Gateway does not need to take a dependency on its Lambda functions,
+    // making it possible to write Lambda functions that reference the
+    // API Gateway's URL in their inflight code.
+    const functionArn = `arn:aws:lambda:${this.region}:${this.accountId}:function:${handler.name}`;
+
     const extension = {
       "x-amazon-apigateway-integration": {
-        uri: `arn:aws:apigateway:${this.region}:lambda:path/2015-03-31/functions/${handler.functionArn}/invocations`,
+        uri: `arn:aws:apigateway:${this.region}:lambda:path/2015-03-31/functions/${functionArn}/invocations`,
         type: "aws_proxy",
         httpMethod: "POST",
         responses: {
@@ -411,7 +537,7 @@ class WingRestApi extends Construct {
    * @param method Method of the endpoint
    * @param handler Lambda function to handle the endpoint
    */
-  private addHandlerPermissions = (
+  private _addHandlerPermissions = (
     path: string,
     method: string,
     handler: Function
@@ -423,7 +549,7 @@ class WingRestApi extends Construct {
       action: "lambda:InvokeFunction",
       functionName: handler.functionName,
       principal: "apigateway.amazonaws.com",
-      sourceArn: `${this.api.executionArn}/*/${method}${Api._toOpenApiPath(
+      sourceArn: `${this.api.executionArn}/*/${method}${Api.renderOpenApiPath(
         path
       )}`,
     });
diff --git a/libs/wingsdk/src/target-tf-aws/app.ts b/libs/wingsdk/src/target-tf-aws/app.ts
index d2011a38faf..81224e29525 100644
--- a/libs/wingsdk/src/target-tf-aws/app.ts
+++ b/libs/wingsdk/src/target-tf-aws/app.ts
@@ -1,11 +1,10 @@
 import { Api } from "./api";
 import { BUCKET_PREFIX_OPTS, Bucket } from "./bucket";
 import { Counter } from "./counter";
-import { DynamodbTable } from "./dynamodb-table";
+import { Endpoint } from "./endpoint";
 import { Function } from "./function";
 import { OnDeploy } from "./on-deploy";
 import { Queue } from "./queue";
-import { ReactApp } from "./react-app";
 import { Redis } from "./redis";
 import { Schedule } from "./schedule";
 import { Secret } from "./secret";
@@ -15,6 +14,8 @@ import { Topic } from "./topic";
 import { Website } from "./website";
 import { DataAwsCallerIdentity } from "../.gen/providers/aws/data-aws-caller-identity";
 import { DataAwsRegion } from "../.gen/providers/aws/data-aws-region";
+import { DataAwsSubnet } from "../.gen/providers/aws/data-aws-subnet";
+import { DataAwsVpc } from "../.gen/providers/aws/data-aws-vpc";
 import { Eip } from "../.gen/providers/aws/eip";
 import { InternetGateway } from "../.gen/providers/aws/internet-gateway";
 import { NatGateway } from "../.gen/providers/aws/nat-gateway";
@@ -29,6 +30,7 @@ import {
   BUCKET_FQN,
   COUNTER_FQN,
   DOMAIN_FQN,
+  ENDPOINT_FQN,
   FUNCTION_FQN,
   ON_DEPLOY_FQN,
   QUEUE_FQN,
@@ -38,7 +40,7 @@ import {
   WEBSITE_FQN,
 } from "../cloud";
 import { AppProps } from "../core";
-import { TABLE_FQN, REDIS_FQN, REACT_APP_FQN, DYNAMODB_TABLE_FQN } from "../ex";
+import { TABLE_FQN, REDIS_FQN } from "../ex";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
 import { Domain } from "../shared-aws/domain";
 import { CdktfApp } from "../shared-tf/app";
@@ -49,29 +51,26 @@ import { TEST_RUNNER_FQN } from "../std";
  * for AWS resources.
  */
 export class App extends CdktfApp {
-  /**
-   * The test runner for this app.
-   */
-  protected readonly testRunner: TestRunner;
-
   public readonly _target = "tf-aws";
 
   private awsRegionProvider?: DataAwsRegion;
   private awsAccountIdProvider?: DataAwsCallerIdentity;
-  private _vpc?: Vpc;
+  private _vpc?: Vpc | DataAwsVpc;
   private _codeBucket?: S3Bucket;
 
   /** Subnets shared across app */
-  public subnets: { [key: string]: Subnet };
+  public subnets: { [key: string]: (Subnet | DataAwsSubnet)[] };
 
   constructor(props: AppProps) {
     super(props);
     new AwsProvider(this, "aws", {});
 
-    this.testRunner = new TestRunner(this, "cloud.TestRunner");
-    this.subnets = {};
+    this.subnets = {
+      private: [],
+      public: [],
+    };
 
-    this.synthRoots(props, this.testRunner);
+    TestRunner._createTree(this, props.rootConstruct);
   }
 
   protected typeForFqn(fqn: string): any {
@@ -121,11 +120,8 @@ export class App extends CdktfApp {
       case DOMAIN_FQN:
         return Domain;
 
-      case REACT_APP_FQN:
-        return ReactApp;
-
-      case DYNAMODB_TABLE_FQN:
-        return DynamodbTable;
+      case ENDPOINT_FQN:
+        return Endpoint;
     }
 
     return undefined;
@@ -165,16 +161,57 @@ export class App extends CdktfApp {
   /**
    * Returns the VPC for this app. Will create a new VPC if one does not exist.
    */
-  public get vpc(): Vpc {
+  public get vpc(): Vpc | DataAwsVpc {
     if (this._vpc) {
       return this._vpc;
     }
 
+    return this.parameters.value(`${this._target}/vpc`) === "existing"
+      ? this.importExistingVpc()
+      : this.createDefaultVpc();
+  }
+
+  private importExistingVpc(): DataAwsVpc {
+    const vpcId = this.parameters.value(`${this._target}/vpc_id`);
+    const privateSubnetIds = this.parameters.value(
+      `${this._target}/private_subnet_ids`
+    );
+    const publicSubnetIds = this.parameters.value(
+      `${this._target}/public_subnet_ids`
+    );
+
+    this._vpc = new DataAwsVpc(this, "ExistingVpc", {
+      id: vpcId,
+    });
+
+    for (const subnetId of privateSubnetIds) {
+      this.subnets.private.push(
+        new DataAwsSubnet(this, `PrivateSubnet${subnetId.slice(-8)}`, {
+          vpcId: vpcId,
+          id: subnetId,
+        })
+      );
+    }
+
+    if (publicSubnetIds) {
+      for (const subnetId of publicSubnetIds) {
+        this.subnets.public.push(
+          new DataAwsSubnet(this, `PublicSubnet${subnetId.slice(-8)}`, {
+            vpcId: vpcId,
+            id: subnetId,
+          })
+        );
+      }
+    }
+
+    return this._vpc;
+  }
+
+  private createDefaultVpc(): Vpc {
     const VPC_NAME_OPTS: NameOptions = {
       maxLen: 32,
       disallowedRegex: /[^a-zA-Z0-9-]/,
     };
-
     const identifier = ResourceNames.generateName(this, VPC_NAME_OPTS);
 
     // create the app wide VPC
@@ -216,6 +253,15 @@ export class App extends CdktfApp {
       },
     });
 
+    const privateSubnet2 = new Subnet(this, "PrivateSubnet2", {
+      vpcId: this._vpc.id,
+      cidrBlock: "10.0.8.0/22", // 10.0.8.0 - 10.0.11.255
+      availabilityZone: `${this.region}b`,
+      tags: {
+        Name: `${identifier}-private-subnet-2`,
+      },
+    });
+
     // Create the internet gateway
     const internetGateway = new InternetGateway(this, "InternetGateway", {
       vpcId: this._vpc.id,
@@ -263,6 +309,20 @@ export class App extends CdktfApp {
       },
     });
 
+    const privateRouteTable2 = new RouteTable(this, "PrivateRouteTable2", {
+      vpcId: this._vpc.id,
+      route: [
+        {
+          // This will route all traffic to the NAT gateway
+          cidrBlock: "0.0.0.0/0",
+          natGatewayId: nat.id,
+        },
+      ],
+      tags: {
+        Name: `${identifier}-private-route-table-2`,
+      },
+    });
+
     // Associate route tables with subnets
     new RouteTableAssociation(this, "PublicRouteTableAssociation", {
       subnetId: publicSubnet.id,
@@ -274,8 +334,14 @@ export class App extends CdktfApp {
       routeTableId: privateRouteTable.id,
     });
 
-    this.subnets.public = publicSubnet;
-    this.subnets.private = privateSubnet;
+    new RouteTableAssociation(this, "PrivateRouteTableAssociation2", {
+      subnetId: privateSubnet2.id,
+      routeTableId: privateRouteTable2.id,
+    });
+
+    this.subnets.public.push(publicSubnet);
+    this.subnets.private.push(privateSubnet);
+    this.subnets.private.push(privateSubnet2);
     return this._vpc;
   }
 }
diff --git a/libs/wingsdk/src/target-tf-aws/bucket.onevent.inflight.ts b/libs/wingsdk/src/target-tf-aws/bucket.onevent.inflight.ts
deleted file mode 100644
index ea837192260..00000000000
--- a/libs/wingsdk/src/target-tf-aws/bucket.onevent.inflight.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { BucketEventType, IBucketEventHandlerClient } from "../cloud";
-
-export class BucketEventHandlerClient implements IBucketEventHandlerClient {
-  private readonly handler: IBucketEventHandlerClient;
-  private readonly eventType: BucketEventType;
-  constructor({
-    handler,
-    args,
-  }: {
-    handler: IBucketEventHandlerClient;
-    args: { eventType: BucketEventType };
-  }) {
-    this.handler = handler;
-    this.eventType = args.eventType;
-  }
-
-  public async handle(event: string) {
-    try {
-      const message = JSON.parse(event);
-      if (message?.Event === "s3:TestEvent") {
-        // aws sends a test event to the topic before of the actual one, we're ignoring it for now
-        return;
-      }
-      return await this.handler.handle(
-        message.Records[0].s3.object.key,
-        this.eventType
-      );
-    } catch (error) {
-      console.warn("Error parsing the notification event message: ", error);
-      console.warn("Event: ", event);
-    }
-  }
-}
diff --git a/libs/wingsdk/src/target-tf-aws/bucket.ts b/libs/wingsdk/src/target-tf-aws/bucket.ts
index 5386882cd94..7c275b68af0 100644
--- a/libs/wingsdk/src/target-tf-aws/bucket.ts
+++ b/libs/wingsdk/src/target-tf-aws/bucket.ts
@@ -1,8 +1,6 @@
-import { join } from "path";
 import { ITerraformDependable } from "cdktf";
 import { Construct } from "constructs";
 import { App } from "./app";
-import { Function as AWSFunction } from "./function";
 import { Topic as AWSTopic } from "./topic";
 import { S3Bucket } from "../.gen/providers/aws/s3-bucket";
 import {
@@ -20,7 +18,8 @@ import {
   NameOptions,
   ResourceNames,
 } from "../shared/resource-names";
-import { IAwsBucket } from "../shared-aws/bucket";
+import { AwsInflightHost } from "../shared-aws";
+import { BucketEventHandler, IAwsBucket } from "../shared-aws/bucket";
 import { calculateBucketPermissions } from "../shared-aws/permissions";
 import { IInflightHost } from "../std";
 
@@ -49,7 +48,7 @@ export const BUCKET_PREFIX_OPTS: NameOptions = {
 /**
  * AWS implementation of `cloud.Bucket`.
  *
- * @inflight `@winglang/sdk.cloud.IBucketClient`
+ * @inflight `@winglang/sdk.aws.IAwsBucketClient`
  */
 export class Bucket extends cloud.Bucket implements IAwsBucket {
   private readonly bucket: S3Bucket;
@@ -74,27 +73,31 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.BucketInflightMethods.DELETE,
-      cloud.BucketInflightMethods.GET,
-      cloud.BucketInflightMethods.GET_JSON,
-      cloud.BucketInflightMethods.LIST,
-      cloud.BucketInflightMethods.PUT,
-      cloud.BucketInflightMethods.PUT_JSON,
-      cloud.BucketInflightMethods.PUBLIC_URL,
-      cloud.BucketInflightMethods.EXISTS,
-      cloud.BucketInflightMethods.TRY_GET,
-      cloud.BucketInflightMethods.TRY_GET_JSON,
-      cloud.BucketInflightMethods.TRY_DELETE,
-      cloud.BucketInflightMethods.SIGNED_URL,
-      cloud.BucketInflightMethods.METADATA,
-      cloud.BucketInflightMethods.COPY,
-    ];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.BucketInflightMethods.DELETE]: [],
+      [cloud.BucketInflightMethods.GET]: [],
+      [cloud.BucketInflightMethods.GET_JSON]: [],
+      [cloud.BucketInflightMethods.LIST]: [],
+      [cloud.BucketInflightMethods.PUT]: [],
+      [cloud.BucketInflightMethods.PUT_JSON]: [],
+      [cloud.BucketInflightMethods.PUBLIC_URL]: [],
+      [cloud.BucketInflightMethods.EXISTS]: [],
+      [cloud.BucketInflightMethods.TRY_GET]: [],
+      [cloud.BucketInflightMethods.TRY_GET_JSON]: [],
+      [cloud.BucketInflightMethods.TRY_DELETE]: [],
+      [cloud.BucketInflightMethods.SIGNED_URL]: [],
+      [cloud.BucketInflightMethods.METADATA]: [],
+      [cloud.BucketInflightMethods.COPY]: [],
+      [cloud.BucketInflightMethods.RENAME]: [],
+    };
   }
 
-  protected eventHandlerLocation(): string {
-    return join(__dirname, "bucket.onevent.inflight.js");
+  protected createTopicHandler(
+    eventType: cloud.BucketEventType,
+    inflight: cloud.IBucketEventHandler
+  ): cloud.ITopicOnMessageHandler {
+    return BucketEventHandler.toTopicOnMessageHandler(inflight, eventType);
   }
 
   protected createTopic(actionType: cloud.BucketEventType): cloud.Topic {
@@ -130,8 +133,8 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof AWSFunction)) {
-      throw new Error("buckets can only be bound by tfaws.Function for now");
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
     host.addPolicyStatements(
@@ -141,7 +144,6 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
     // The bucket name needs to be passed through an environment variable since
     // it may not be resolved until deployment time.
     host.addEnvironment(this.envName(), this.bucket.bucket);
-
     super.onLift(host, ops);
   }
 
@@ -164,7 +166,7 @@ export class Bucket extends cloud.Bucket implements IAwsBucket {
   }
 
   public get bucketName(): string {
-    return this.bucket.bucketDomainName;
+    return this.bucket.bucket;
   }
 }
 
diff --git a/libs/wingsdk/src/target-tf-aws/counter.ts b/libs/wingsdk/src/target-tf-aws/counter.ts
index 1f6bbe0b7de..d755f88cb2f 100644
--- a/libs/wingsdk/src/target-tf-aws/counter.ts
+++ b/libs/wingsdk/src/target-tf-aws/counter.ts
@@ -1,9 +1,9 @@
 import { Construct } from "constructs";
-import { Function } from "./function";
 import { DynamodbTable } from "../.gen/providers/aws/dynamodb-table";
 import * as cloud from "../cloud";
 import * as core from "../core";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
+import { AwsInflightHost } from "../shared-aws";
 import { COUNTER_HASH_KEY } from "../shared-aws/commons";
 import { IAwsCounter } from "../shared-aws/counter";
 import { calculateCounterPermissions } from "../shared-aws/permissions";
@@ -39,18 +39,18 @@ export class Counter extends cloud.Counter implements IAwsCounter {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.CounterInflightMethods.INC,
-      cloud.CounterInflightMethods.DEC,
-      cloud.CounterInflightMethods.PEEK,
-      cloud.CounterInflightMethods.SET,
-    ];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.CounterInflightMethods.INC]: [],
+      [cloud.CounterInflightMethods.DEC]: [],
+      [cloud.CounterInflightMethods.PEEK]: [],
+      [cloud.CounterInflightMethods.SET]: [],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("counters can only be bound by tfaws.Function for now");
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
     host.addPolicyStatements(
diff --git a/libs/wingsdk/src/target-tf-aws/dynamodb-table.ts b/libs/wingsdk/src/target-tf-aws/dynamodb-table.ts
deleted file mode 100644
index e24add1b97d..00000000000
--- a/libs/wingsdk/src/target-tf-aws/dynamodb-table.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Construct } from "constructs";
-import { Function } from "./function";
-import { DynamodbTable as AwsDynamodbTable } from "../.gen/providers/aws/dynamodb-table";
-import * as core from "../core";
-import * as ex from "../ex";
-import { ResourceNames } from "../shared/resource-names";
-import { IAwsDynamodbTable, NAME_OPTS } from "../shared-aws/dynamodb-table";
-import { calculateDynamodbTablePermissions } from "../shared-aws/permissions";
-import { IInflightHost } from "../std";
-
-/**
- * AWS implementation of `ex.DynamodbTable`.
- *
- * @inflight `@winglang/sdk.ex.IDynamodbTableClient`
- */
-export class DynamodbTable
-  extends ex.DynamodbTable
-  implements IAwsDynamodbTable
-{
-  private readonly table: AwsDynamodbTable;
-
-  constructor(scope: Construct, id: string, props: ex.DynamodbTableProps) {
-    super(scope, id, props);
-
-    this.table = new AwsDynamodbTable(this, "Default", {
-      name: ResourceNames.generateName(this, {
-        prefix: this.name,
-        ...NAME_OPTS,
-      }),
-      attribute: Object.entries(props.attributeDefinitions).map(([k, v]) => ({
-        name: k,
-        type: v,
-      })),
-      hashKey: props.hashKey,
-      rangeKey: props.rangeKey,
-      billingMode: "PAY_PER_REQUEST",
-    });
-  }
-
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      ex.DynamodbTableInflightMethods.PUT_ITEM,
-      ex.DynamodbTableInflightMethods.UPDATE_ITEM,
-      ex.DynamodbTableInflightMethods.DELETE_ITEM,
-      ex.DynamodbTableInflightMethods.GET_ITEM,
-      ex.DynamodbTableInflightMethods.SCAN,
-      ex.DynamodbTableInflightMethods.QUERY,
-      ex.DynamodbTableInflightMethods.TRANSACT_GET_ITEMS,
-      ex.DynamodbTableInflightMethods.TRANSACT_WRITE_ITEMS,
-      ex.DynamodbTableInflightMethods.BATCH_GET_ITEM,
-      ex.DynamodbTableInflightMethods.BATCH_WRITE_ITEM,
-    ];
-  }
-
-  public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error(
-        "Dynamodb tables can only be bound by tfaws.Function for now"
-      );
-    }
-
-    host.addPolicyStatements(
-      ...calculateDynamodbTablePermissions(this.table.arn, ops)
-    );
-
-    host.addEnvironment(this.envName(), this.table.name);
-
-    super.onLift(host, ops);
-  }
-
-  /** @internal */
-  public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-tf-aws", "shared-aws"),
-      __filename,
-      "DynamodbTableClient",
-      [`process.env["${this.envName()}"]`]
-    );
-  }
-
-  private envName(): string {
-    return `DYNAMODB_TABLE_NAME_${this.node.addr.slice(-8)}`;
-  }
-
-  public get dynamoTableArn(): string {
-    return this.table.arn;
-  }
-
-  public get dynamoTableName(): string {
-    return this.table.name;
-  }
-}
diff --git a/libs/wingsdk/src/target-tf-aws/endpoint.ts b/libs/wingsdk/src/target-tf-aws/endpoint.ts
new file mode 100644
index 00000000000..a3fee097973
--- /dev/null
+++ b/libs/wingsdk/src/target-tf-aws/endpoint.ts
@@ -0,0 +1,48 @@
+import { TerraformOutput } from "cdktf";
+import { Construct } from "constructs";
+import { core } from "..";
+import * as cloud from "../cloud";
+import { CaseConventions, ResourceNames } from "../shared/resource-names";
+import { IInflightHost } from "../std";
+
+/**
+ * AWS implementation of `cloud.Endpoint`.
+ */
+export class Endpoint extends cloud.Endpoint {
+  constructor(
+    scope: Construct,
+    id: string,
+    url: string,
+    props: cloud.EndpointProps = {}
+  ) {
+    super(scope, id, url, props);
+
+    new TerraformOutput(this, "Url", {
+      value: this.url,
+    });
+  }
+
+  /** @internal */
+  public onLift(host: IInflightHost, ops: string[]): void {
+    host.addEnvironment(this.urlEnvName(), this.url);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return core.InflightClient.for(
+      __dirname.replace("target-tf-aws", "shared-aws"),
+      __filename,
+      "EndpointClient",
+      [`process.env["${this.urlEnvName()}"]`]
+    );
+  }
+
+  private urlEnvName(): string {
+    return ResourceNames.generateName(this, {
+      disallowedRegex: /[^a-zA-Z0-9_]/,
+      sep: "_",
+      case: CaseConventions.UPPERCASE,
+    });
+  }
+}
diff --git a/libs/wingsdk/src/target-tf-aws/function.ts b/libs/wingsdk/src/target-tf-aws/function.ts
index feae4365107..5a68c137b9a 100644
--- a/libs/wingsdk/src/target-tf-aws/function.ts
+++ b/libs/wingsdk/src/target-tf-aws/function.ts
@@ -1,4 +1,3 @@
-import { resolve } from "path";
 import { AssetType, Lazy, TerraformAsset } from "cdktf";
 import { Construct } from "constructs";
 import { App } from "./app";
@@ -9,12 +8,22 @@ import { IamRolePolicyAttachment } from "../.gen/providers/aws/iam-role-policy-a
 import { LambdaFunction } from "../.gen/providers/aws/lambda-function";
 import { LambdaPermission } from "../.gen/providers/aws/lambda-permission";
 import { S3Object } from "../.gen/providers/aws/s3-object";
+import { SecurityGroup } from "../.gen/providers/aws/security-group";
 import * as cloud from "../cloud";
 import * as core from "../core";
+import { NotImplementedError } from "../core/errors";
 import { createBundle } from "../shared/bundling";
 import { DEFAULT_MEMORY_SIZE } from "../shared/function";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
-import { IAwsFunction, PolicyStatement } from "../shared-aws";
+import {
+  AwsInflightHost,
+  Effect,
+  IAwsFunction,
+  NetworkConfig,
+  PolicyStatement,
+  externalLibraries,
+} from "../shared-aws";
+import { makeAwsLambdaHandler } from "../shared-aws/function-util";
 import { IInflightHost, Resource } from "../std";
 import { Duration } from "../std/duration";
 
@@ -27,18 +36,6 @@ const FUNCTION_NAME_OPTS: NameOptions = {
   disallowedRegex: /[^a-zA-Z0-9\_\-]+/g,
 };
 
-/**
- * Function network configuration
- * used to hold data on subnets and security groups
- * that should be used when a function is deployed within a VPC.
- */
-export interface FunctionNetworkConfig {
-  /** List of subnets to attach on function */
-  readonly subnetIds: string[];
-  /** List of security groups to place function in */
-  readonly securityGroupIds: string[];
-}
-
 /**
  * Options for granting invoke permissions to the current function
  */
@@ -59,6 +56,7 @@ export class Function extends cloud.Function implements IAwsFunction {
   private readonly role: IamRole;
   private policyStatements?: any[];
   private subnets?: Set<string>;
+  private vpcPermissionsAdded = false;
   private securityGroups?: Set<string>;
 
   /**
@@ -71,6 +69,12 @@ export class Function extends cloud.Function implements IAwsFunction {
   /** Permissions  */
   public permissions!: LambdaPermission;
 
+  /** Name of the AWS Lambda function in the account/region */
+  public readonly name: string;
+
+  private assetPath: string | undefined; // posix path
+  private bundleHash: string | undefined;
+
   constructor(
     scope: Construct,
     id: string,
@@ -79,14 +83,11 @@ export class Function extends cloud.Function implements IAwsFunction {
   ) {
     super(scope, id, inflight, props);
 
-    // bundled code is guaranteed to be in a fresh directory
-    const bundle = createBundle(this.entrypoint);
-
-    // Create Lambda executable
-    const asset = new TerraformAsset(this, "Asset", {
-      path: resolve(bundle.directory),
-      type: AssetType.ARCHIVE,
-    });
+    if (props.concurrency != null) {
+      throw new NotImplementedError(
+        "Function concurrency isn't implemented yet on the current target."
+      );
+    }
 
     // Create unique S3 bucket for hosting Lambda code
     const app = App.of(this) as App;
@@ -96,13 +97,28 @@ export class Function extends cloud.Function implements IAwsFunction {
     // - whenever code changes, the object name changes
     // - even if two functions have the same code, they get different names
     //   (separation of concerns)
-    const objectKey = `asset.${this.node.addr}.${bundle.hash}.zip`;
+    let bundleHashToken = Lazy.stringValue({
+      produce: () => {
+        if (!this.bundleHash) {
+          throw new Error("bundleHash was not set");
+        }
+        return this.bundleHash;
+      },
+    });
+    const objectKey = `asset.${this.node.addr}.${bundleHashToken}.zip`;
 
     // Upload Lambda zip file to newly created S3 bucket
     const lambdaArchive = new S3Object(this, "S3Object", {
       bucket: bucket.bucket,
       key: objectKey,
-      source: asset.path, // returns a posix path
+      source: Lazy.stringValue({
+        produce: () => {
+          if (!this.assetPath) {
+            throw new Error("assetPath was not set");
+          }
+          return this.assetPath;
+        },
+      }),
     });
 
     // Create Lambda role
@@ -127,27 +143,15 @@ export class Function extends cloud.Function implements IAwsFunction {
       role: this.role.name,
       policy: Lazy.stringValue({
         produce: () => {
-          // If there are subnets to attach then the role needs to be able to
-          // create network interfaces
-          if ((this.subnets?.size ?? 0) !== 0) {
-            this.policyStatements?.push({
-              Effect: "Allow",
-              Action: [
-                "ec2:CreateNetworkInterface",
-                "ec2:DescribeNetworkInterfaces",
-                "ec2:DeleteNetworkInterface",
-                "ec2:DescribeSubnets",
-                "ec2:DescribeSecurityGroups",
-              ],
-              Resource: "*",
-            });
-          }
-          if ((this.policyStatements ?? []).length !== 0) {
+          this.policyStatements = this.policyStatements ?? [];
+
+          if (this.policyStatements.length !== 0) {
             return JSON.stringify({
               Version: "2012-10-17",
               Statement: this.policyStatements,
             });
           }
+
           // policy must contain at least one statement, so include a no-op statement
           return JSON.stringify({
             Version: "2012-10-17",
@@ -170,7 +174,7 @@ export class Function extends cloud.Function implements IAwsFunction {
       role: this.role.name,
     });
 
-    const name = ResourceNames.generateName(this, FUNCTION_NAME_OPTS);
+    this.name = ResourceNames.generateName(this, FUNCTION_NAME_OPTS);
 
     // validate memory size
     if (props.memory && (props.memory < 128 || props.memory > 10240)) {
@@ -181,7 +185,7 @@ export class Function extends cloud.Function implements IAwsFunction {
 
     if (!props.logRetentionDays || props.logRetentionDays >= 0) {
       new CloudwatchLogGroup(this, "CloudwatchLogGroup", {
-        name: `/aws/lambda/${name}`,
+        name: `/aws/lambda/${this.name}`,
         retentionInDays: props.logRetentionDays ?? 30,
       });
     } else {
@@ -190,11 +194,11 @@ export class Function extends cloud.Function implements IAwsFunction {
 
     // Create Lambda function
     this.function = new LambdaFunction(this, "Default", {
-      functionName: name,
+      functionName: this.name,
       s3Bucket: bucket.bucket,
       s3Key: lambdaArchive.key,
       handler: "index.handler",
-      runtime: "nodejs18.x",
+      runtime: "nodejs20.x",
       role: this.role.arn,
       publish: true,
       vpcConfig: {
@@ -228,24 +232,70 @@ export class Function extends cloud.Function implements IAwsFunction {
       architectures: ["arm64"],
     });
 
+    if (app.parameters.value("tf-aws/vpc_lambda") === true) {
+      const sg = new SecurityGroup(this, `${id}SecurityGroup`, {
+        vpcId: app.vpc.id,
+        egress: [
+          {
+            cidrBlocks: ["0.0.0.0/0"],
+            fromPort: 0,
+            toPort: 0,
+            protocol: "-1",
+          },
+        ],
+      });
+      this.addNetwork({
+        subnetIds: [...app.subnets.private.map((s) => s.id)],
+        securityGroupIds: [sg.id],
+      });
+    }
+
     this.qualifiedArn = this.function.qualifiedArn;
     this.invokeArn = this.function.invokeArn;
 
     // terraform rejects templates with zero environment variables
-    this.addEnvironment("WING_FUNCTION_NAME", name);
+    this.addEnvironment("WING_FUNCTION_NAME", this.name);
+  }
+
+  /** @internal */
+  public _preSynthesize(): void {
+    super._preSynthesize();
+
+    // write the entrypoint next to the partial inflight code emitted by the compiler, so that
+    // `require` resolves naturally.
+
+    const bundle = createBundle(this.entrypoint, externalLibraries);
+
+    // would prefer to create TerraformAsset in the constructor, but using a CDKTF token for
+    // the "path" argument isn't supported
+    const asset = new TerraformAsset(this, "Asset", {
+      path: bundle.directory,
+      type: AssetType.ARCHIVE,
+    });
+
+    this.bundleHash = bundle.hash;
+    this.assetPath = asset.path;
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [cloud.FunctionInflightMethods.INVOKE];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.FunctionInflightMethods.INVOKE]: [[this.handler, ["handle"]]],
+      [cloud.FunctionInflightMethods.INVOKE_ASYNC]: [
+        [this.handler, ["handle"]],
+      ],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("functions can only be bound by tfaws.Function for now");
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
-    if (ops.includes(cloud.FunctionInflightMethods.INVOKE)) {
+    if (
+      ops.includes(cloud.FunctionInflightMethods.INVOKE) ||
+      ops.includes(cloud.FunctionInflightMethods.INVOKE_ASYNC)
+    ) {
       host.addPolicyStatements({
         actions: ["lambda:InvokeFunction"],
         resources: [`${this.function.arn}`],
@@ -272,13 +322,29 @@ export class Function extends cloud.Function implements IAwsFunction {
   /**
    * Add VPC configurations to lambda function
    */
-  public addNetworkConfig(vpcConfig: FunctionNetworkConfig) {
+  public addNetwork(vpcConfig: NetworkConfig) {
     if (!this.subnets || !this.securityGroups) {
       this.subnets = new Set();
       this.securityGroups = new Set();
     }
     vpcConfig.subnetIds.forEach((subnet) => this.subnets!.add(subnet));
     vpcConfig.securityGroupIds.forEach((sg) => this.securityGroups!.add(sg));
+
+    if (!this.vpcPermissionsAdded) {
+      this.addPolicyStatements({
+        effect: Effect.ALLOW,
+        actions: [
+          "ec2:CreateNetworkInterface",
+          "ec2:DescribeNetworkInterfaces",
+          "ec2:DeleteNetworkInterface",
+          "ec2:DescribeSubnets",
+          "ec2:DescribeSecurityGroups",
+        ],
+        resources: ["*"],
+      });
+
+      this.vpcPermissionsAdded = true;
+    }
   }
 
   /**
@@ -339,4 +405,11 @@ export class Function extends cloud.Function implements IAwsFunction {
   public get functionName(): string {
     return this.function.functionName;
   }
+
+  /**
+   * @internal
+   */
+  protected _getCodeLines(handler: cloud.IFunctionHandler): string[] {
+    return makeAwsLambdaHandler(handler);
+  }
 }
diff --git a/libs/wingsdk/src/target-tf-aws/index.ts b/libs/wingsdk/src/target-tf-aws/index.ts
index 7d5dcb94271..ab682552639 100644
--- a/libs/wingsdk/src/target-tf-aws/index.ts
+++ b/libs/wingsdk/src/target-tf-aws/index.ts
@@ -2,7 +2,6 @@ export * from "./api";
 export * from "./app";
 export * from "./bucket";
 export * from "./counter";
-export * from "./dynamodb-table";
 export * from "./function";
 export * from "./queue";
 export * from "./schedule";
diff --git a/libs/wingsdk/src/target-tf-aws/on-deploy.ts b/libs/wingsdk/src/target-tf-aws/on-deploy.ts
index e0221218983..165a883d933 100644
--- a/libs/wingsdk/src/target-tf-aws/on-deploy.ts
+++ b/libs/wingsdk/src/target-tf-aws/on-deploy.ts
@@ -4,6 +4,7 @@ import { Function as AwsFunction } from "./function";
 import { DataAwsLambdaInvocation } from "../.gen/providers/aws/data-aws-lambda-invocation";
 import * as cloud from "../cloud";
 import * as core from "../core";
+import { IInflight } from "../std";
 
 /**
  * AWS implementation of `cloud.OnDeploy`.
@@ -19,7 +20,7 @@ export class OnDeploy extends cloud.OnDeploy {
   ) {
     super(scope, id, handler, props);
 
-    let fn = new cloud.Function(this, "Function", handler, props);
+    let fn = new cloud.Function(this, "Function", handler as IInflight, props);
     const awsFn = fn as AwsFunction;
 
     // add all of the children of the construct to the dependencies
diff --git a/libs/wingsdk/src/target-tf-aws/platform.ts b/libs/wingsdk/src/target-tf-aws/platform.ts
index 6f57b065345..73de80e437f 100644
--- a/libs/wingsdk/src/target-tf-aws/platform.ts
+++ b/libs/wingsdk/src/target-tf-aws/platform.ts
@@ -8,7 +8,107 @@ export class Platform implements IPlatform {
   /** Platform model */
   public readonly target = "tf-aws";
 
+  public readonly parameters = {
+    $id: "tf-aws-parameters",
+    type: "object",
+    properties: {
+      "tf-aws": {
+        type: "object",
+        properties: {
+          vpc: {
+            type: "string",
+            description:
+              "Determine whether to create a new VPC or use an existing one",
+            enum: ["new", "existing"],
+          },
+          vpc_id: {
+            description: "If using an existing VPC, provide the VPC ID",
+            type: "string",
+          },
+          private_subnet_ids: {
+            description:
+              "If using an existing VPC, provide the private subnet ID",
+            type: "array",
+            items: {
+              type: "string",
+            },
+          },
+          public_subnet_ids: {
+            description:
+              "If using an existing VPC, provide the public subnet ID",
+            type: "array",
+            items: {
+              type: "string",
+            },
+          },
+          vpc_api_gateway: {
+            description: "Whether Api gateways should be deployed in a VPC",
+            type: "boolean",
+          },
+          vpc_lambda: {
+            description: "Whether Lambda functions should be deployed in a VPC",
+            type: "boolean",
+          },
+        },
+        allOf: [
+          {
+            $comment:
+              "if vpc is existing, then we need to require the vpc_id, private_subnet_ids",
+            if: { properties: { vpc: { const: "existing" } } },
+            then: {
+              required: ["vpc_id", "private_subnet_ids"],
+            },
+          },
+        ],
+      },
+    },
+  };
+
   public newApp?(appProps: any): any {
     return new App(appProps);
   }
+
+  public async storeSecrets(secrets: Record<string, string>): Promise<void> {
+    const {
+      SecretsManagerClient,
+      GetSecretValueCommand,
+      CreateSecretCommand,
+      UpdateSecretCommand,
+    } = await import("@aws-sdk/client-secrets-manager");
+
+    console.log("Storing secrets in AWS Secrets Manager");
+    const client = new SecretsManagerClient({});
+
+    for (const [name, value] of Object.entries(secrets)) {
+      try {
+        // Attempt to retrieve the secret to check if it exists
+        await client.send(new GetSecretValueCommand({ SecretId: name }));
+        console.log(`Secret ${name} exists, updating it.`);
+        await client.send(
+          new UpdateSecretCommand({
+            SecretId: name,
+            SecretString: value,
+          })
+        );
+      } catch (error: any) {
+        if (error.name === "ResourceNotFoundException") {
+          // If the secret does not exist, create it
+          console.log(`Secret ${name} does not exist, creating it.`);
+          await client.send(
+            new CreateSecretCommand({
+              Name: name,
+              SecretString: value,
+            })
+          );
+        } else {
+          console.error(`Failed to store secret ${name}:`, error);
+          throw error;
+        }
+      }
+    }
+
+    console.log(
+      `${Object.keys(secrets).length} secret(s) stored AWS Secrets Manager`
+    );
+  }
 }
diff --git a/libs/wingsdk/src/target-tf-aws/queue.ts b/libs/wingsdk/src/target-tf-aws/queue.ts
index 988ee0ac540..e1e3bbd6006 100644
--- a/libs/wingsdk/src/target-tf-aws/queue.ts
+++ b/libs/wingsdk/src/target-tf-aws/queue.ts
@@ -1,4 +1,3 @@
-import { join } from "path";
 import { Construct } from "constructs";
 import { App } from "./app";
 import { Function } from "./function";
@@ -6,10 +5,13 @@ import { LambdaEventSourceMapping } from "../.gen/providers/aws/lambda-event-sou
 import { SqsQueue } from "../.gen/providers/aws/sqs-queue";
 import * as cloud from "../cloud";
 import * as core from "../core";
-import { convertBetweenHandlers } from "../shared/convert";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
-import { IAwsQueue } from "../shared-aws";
+import { AwsInflightHost, IAwsQueue } from "../shared-aws";
 import { calculateQueuePermissions } from "../shared-aws/permissions";
+import {
+  Queue as AwsQueue,
+  QueueSetConsumerHandler,
+} from "../shared-aws/queue";
 import { Duration, IInflightHost, Node } from "../std";
 
 /**
@@ -24,7 +26,7 @@ const NAME_OPTS: NameOptions = {
 /**
  * AWS implementation of `cloud.Queue`.
  *
- * @inflight `@winglang/sdk.cloud.IQueueClient`
+ * @inflight `@winglang/sdk.aws.IAwsQueueClient`
  */
 export class Queue extends cloud.Queue implements IAwsQueue {
   private readonly queue: SqsQueue;
@@ -32,40 +34,49 @@ export class Queue extends cloud.Queue implements IAwsQueue {
   constructor(scope: Construct, id: string, props: cloud.QueueProps = {}) {
     super(scope, id, props);
 
-    this.queue = new SqsQueue(this, "Default", {
-      visibilityTimeoutSeconds: props.timeout
-        ? props.timeout.seconds
-        : Duration.fromSeconds(30).seconds,
-      messageRetentionSeconds: props.retentionPeriod
-        ? props.retentionPeriod.seconds
-        : Duration.fromHours(1).seconds,
-      name: ResourceNames.generateName(this, NAME_OPTS),
-    });
+    const queueOpt = props.dlq
+      ? {
+          visibilityTimeoutSeconds: props.timeout
+            ? props.timeout.seconds
+            : Duration.fromSeconds(30).seconds,
+          messageRetentionSeconds: props.retentionPeriod
+            ? props.retentionPeriod.seconds
+            : Duration.fromHours(1).seconds,
+          name: ResourceNames.generateName(this, NAME_OPTS),
+          redrivePolicy: JSON.stringify({
+            deadLetterTargetArn: AwsQueue.from(props.dlq.queue)?.queueArn,
+            maxReceiveCount:
+              props.dlq.maxDeliveryAttempts ?? cloud.DEFAULT_DELIVERY_ATTEMPTS,
+          }),
+        }
+      : {
+          visibilityTimeoutSeconds: props.timeout
+            ? props.timeout.seconds
+            : Duration.fromSeconds(30).seconds,
+          messageRetentionSeconds: props.retentionPeriod
+            ? props.retentionPeriod.seconds
+            : Duration.fromHours(1).seconds,
+          name: ResourceNames.generateName(this, NAME_OPTS),
+        };
+
+    this.queue = new SqsQueue(this, "Default", queueOpt);
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.QueueInflightMethods.PUSH,
-      cloud.QueueInflightMethods.PURGE,
-      cloud.QueueInflightMethods.APPROX_SIZE,
-      cloud.QueueInflightMethods.POP,
-    ];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.QueueInflightMethods.PUSH]: [],
+      [cloud.QueueInflightMethods.PURGE]: [],
+      [cloud.QueueInflightMethods.APPROX_SIZE]: [],
+      [cloud.QueueInflightMethods.POP]: [],
+    };
   }
 
   public setConsumer(
     inflight: cloud.IQueueSetConsumerHandler,
     props: cloud.QueueSetConsumerOptions = {}
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(
-        __dirname.replace("target-tf-aws", "shared-aws"),
-        "queue.setconsumer.inflight.js"
-      ),
-      "QueueSetConsumerHandlerClient"
-    );
-
+    const functionHandler = QueueSetConsumerHandler.toFunctionHandler(inflight);
     const fn = new Function(
       // ok since we're not a tree root
       this.node.scope!,
@@ -79,9 +90,8 @@ export class Queue extends cloud.Queue implements IAwsQueue {
       }
     );
 
-    // TODO: remove this constraint by adding generic permission APIs to cloud.Function
-    if (!(fn instanceof Function)) {
-      throw new Error("Queue only supports creating tfaws.Function right now");
+    if (!AwsInflightHost.isAwsInflightHost(fn)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
     fn.addPolicyStatements({
@@ -99,24 +109,27 @@ export class Queue extends cloud.Queue implements IAwsQueue {
       functionName: fn.functionName,
       eventSourceArn: this.queue.arn,
       batchSize: props.batchSize ?? 1,
+      functionResponseTypes: ["ReportBatchItemFailures"], // It allows the function to return the messages that failed to the queue
     });
 
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.QueueInflightMethods.PUSH,
       target: fn,
-      name: "setConsumer()",
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
+      name: "consumer",
     });
 
     return fn;
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("queues can only be bound by tfaws.Function for now");
-    }
-
     const env = this.envName();
 
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
+    }
+
     host.addPolicyStatements(...calculateQueuePermissions(this.queue.arn, ops));
 
     // The queue url needs to be passed through an environment variable since
diff --git a/libs/wingsdk/src/target-tf-aws/react-app.ts b/libs/wingsdk/src/target-tf-aws/react-app.ts
deleted file mode 100644
index 6b2432f2f3f..00000000000
--- a/libs/wingsdk/src/target-tf-aws/react-app.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { execSync } from "child_process";
-import { existsSync, unlinkSync } from "fs";
-import { join } from "path";
-import { Construct } from "constructs";
-import { Website } from "./website";
-import { core } from "..";
-
-import * as cloud from "../cloud";
-import { Connections } from "../core";
-import * as ex from "../ex";
-import * as aws from "../shared-aws";
-
-/**
- * AWS implementation of `ex.ReactApp`.
- *
- * @inflight `@winglang/sdk.cloud.IReactAppClient`
- */
-export class ReactApp extends ex.ReactApp implements aws.IAwsReactApp {
-  private _host: cloud.Website;
-  constructor(scope: Construct, id: string, props: aws.AwsReactAppProps) {
-    super(scope, id, props);
-    this._host = this._createWebsiteHost(
-      props.buildCommand ?? ex.DEFAULT_REACT_APP_BUILD_COMMAND
-    );
-  }
-
-  protected get _websiteHost(): cloud.Website {
-    return this._host;
-  }
-
-  private _createWebsiteHost(command: string): cloud.Website {
-    execSync(command, {
-      cwd: this._projectPath,
-      maxBuffer: 10 * 1024 * 1024,
-    });
-
-    if (existsSync(join(this._buildPath, ex.WING_JS))) {
-      unlinkSync(join(this._buildPath, ex.WING_JS));
-    }
-
-    const host: cloud.Website = new cloud.Website(
-      this,
-      `${this.node.id}-host`,
-      {
-        ...this._hostProps,
-        path: this._buildPath,
-      }
-    );
-
-    this.node.addDependency(host);
-    Connections.of(this).add({
-      source: this,
-      target: host,
-      name: `host`,
-    });
-
-    return host;
-  }
-
-  public _preSynthesize(): void {
-    const env = Object.fromEntries(this._environmentVariables.entries());
-    const content = `// This file is generated by wing\nwindow.wingEnv = ${JSON.stringify(
-      env,
-      null,
-      2
-    )};`;
-    this._websiteHost.addFile(ex.WING_JS, content, {
-      contentType: "text/javascript",
-    });
-  }
-
-  /** @internal */
-  public _toInflight(): string {
-    return core.InflightClient.for(
-      __dirname.replace("target-tf-aws", "shared-aws"),
-      __filename,
-      "ReactAppClient",
-      []
-    );
-  }
-
-  public get bucketArn(): string {
-    return (this._host as Website).bucket.arn;
-  }
-
-  public get bucketName(): string {
-    return (this._host as Website).bucket.bucketDomainName;
-  }
-}
diff --git a/libs/wingsdk/src/target-tf-aws/redis.ts b/libs/wingsdk/src/target-tf-aws/redis.ts
index 8361129fab6..2790f311d9d 100644
--- a/libs/wingsdk/src/target-tf-aws/redis.ts
+++ b/libs/wingsdk/src/target-tf-aws/redis.ts
@@ -1,6 +1,6 @@
 import { Construct } from "constructs";
 import { App } from "./app";
-import { Function } from "./function";
+import { DataAwsSubnet } from "../.gen/providers/aws/data-aws-subnet";
 import { ElasticacheCluster } from "../.gen/providers/aws/elasticache-cluster";
 import { ElasticacheSubnetGroup } from "../.gen/providers/aws/elasticache-subnet-group";
 import { SecurityGroup } from "../.gen/providers/aws/security-group";
@@ -12,6 +12,7 @@ import {
   NameOptions,
   ResourceNames,
 } from "../shared/resource-names";
+import { AwsInflightHost } from "../shared-aws";
 import { IInflightHost } from "../std";
 
 const ELASTICACHE_NAME_OPTS: NameOptions = {
@@ -23,8 +24,8 @@ const ELASTICACHE_NAME_OPTS: NameOptions = {
 export class Redis extends ex.Redis {
   private readonly clusterId: string;
   private readonly clusterArn: string;
-  private readonly securityGroup: SecurityGroup;
-  private readonly subnet: Subnet;
+  private readonly securityGroups: SecurityGroup[];
+  private readonly subnets: (Subnet | DataAwsSubnet)[];
 
   constructor(scope: Construct, id: string) {
     super(scope, id);
@@ -47,34 +48,38 @@ export class Redis extends ex.Redis {
 
     const app = App.of(this) as App;
     const vpc = app.vpc;
-    this.subnet = app.subnets.private;
+    this.subnets = app.subnets.private;
+    this.securityGroups = [];
     const clusterName = ResourceNames.generateName(this, ELASTICACHE_NAME_OPTS);
-
-    this.securityGroup = new SecurityGroup(this, "securityGroup", {
-      vpcId: vpc.id,
-      name: `${this.node.addr.slice(-8)}-securityGroup`,
-      ingress: [
-        {
-          cidrBlocks: [this.subnet.cidrBlock],
-          fromPort: REDIS_PORT,
-          toPort: REDIS_PORT,
-          protocol: "tcp",
-          selfAttribute: true,
-        },
-      ],
-      egress: [
-        {
-          cidrBlocks: ["0.0.0.0/0"],
-          fromPort: 0,
-          toPort: 0,
-          protocol: "-1",
-        },
-      ],
-    });
+    for (const subnet of this.subnets) {
+      this.securityGroups.push(
+        new SecurityGroup(this, `${subnet.id.slice(-8)}securityGroup`, {
+          vpcId: vpc.id,
+          name: `${this.node.addr.slice(-8)}-securityGroup`,
+          ingress: [
+            {
+              cidrBlocks: [subnet.cidrBlock],
+              fromPort: REDIS_PORT,
+              toPort: REDIS_PORT,
+              protocol: "tcp",
+              selfAttribute: true,
+            },
+          ],
+          egress: [
+            {
+              cidrBlocks: ["0.0.0.0/0"],
+              fromPort: 0,
+              toPort: 0,
+              protocol: "-1",
+            },
+          ],
+        })
+      );
+    }
 
     const subnetGroup = new ElasticacheSubnetGroup(this, "RedisSubnetGroup", {
       name: `${clusterName}-subnetGroup`,
-      subnetIds: [this.subnet.id],
+      subnetIds: [...this.subnets.map((s) => s.id)],
     });
 
     const cluster = new ElasticacheCluster(this, "RedisCluster", {
@@ -83,9 +88,9 @@ export class Redis extends ex.Redis {
       engineVersion,
       nodeType,
       parameterGroupName,
-      availabilityZone: this.subnet.availabilityZone,
+      availabilityZone: this.subnets[0].availabilityZone,
       subnetGroupName: subnetGroup.name,
-      securityGroupIds: [this.securityGroup.id],
+      securityGroupIds: [...this.securityGroups.map((s) => s.id)],
       numCacheNodes: 1, // This number will always be 1 for Redis
     });
 
@@ -94,25 +99,26 @@ export class Redis extends ex.Redis {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      ex.RedisInflightMethods.URL,
-      ex.RedisInflightMethods.SET,
-      ex.RedisInflightMethods.GET,
-      ex.RedisInflightMethods.HSET,
-      ex.RedisInflightMethods.HGET,
-      ex.RedisInflightMethods.SADD,
-      ex.RedisInflightMethods.SMEMBERS,
-      ex.RedisInflightMethods.DEL,
-    ];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [ex.RedisInflightMethods.URL]: [],
+      [ex.RedisInflightMethods.SET]: [],
+      [ex.RedisInflightMethods.GET]: [],
+      [ex.RedisInflightMethods.HSET]: [],
+      [ex.RedisInflightMethods.HGET]: [],
+      [ex.RedisInflightMethods.SADD]: [],
+      [ex.RedisInflightMethods.SMEMBERS]: [],
+      [ex.RedisInflightMethods.DEL]: [],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("redis can only be bound by tfaws.Function for now");
+    const env = this.envName();
+
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
-    const env = this.envName();
     // Ops do not matter here since the client connects directly to the cluster.
     // The only thing that we need to use AWS API for is to get the cluster endpoint
     // from the cluster ID.
@@ -122,9 +128,10 @@ export class Redis extends ex.Redis {
     });
 
     host.addEnvironment(env, this.clusterId);
-    host.addNetworkConfig({
-      securityGroupIds: [this.securityGroup.id],
-      subnetIds: [this.subnet.id],
+
+    host.addNetwork({
+      securityGroupIds: [...this.securityGroups.map((s) => s.id)],
+      subnetIds: [...this.subnets.map((s) => s.id)],
     });
 
     super.onLift(host, ops);
diff --git a/libs/wingsdk/src/target-tf-aws/schedule.ts b/libs/wingsdk/src/target-tf-aws/schedule.ts
index 69604d5ed65..2a09b2aaed2 100644
--- a/libs/wingsdk/src/target-tf-aws/schedule.ts
+++ b/libs/wingsdk/src/target-tf-aws/schedule.ts
@@ -1,4 +1,3 @@
-import { join } from "path";
 import { Construct } from "constructs";
 import { App } from "./app";
 import { Function } from "./function";
@@ -6,7 +5,10 @@ import { CloudwatchEventRule } from "../.gen/providers/aws/cloudwatch-event-rule
 import { CloudwatchEventTarget } from "../.gen/providers/aws/cloudwatch-event-target";
 import * as cloud from "../cloud";
 import * as core from "../core";
-import { convertBetweenHandlers } from "../shared/convert";
+import {
+  ScheduleOnTickHandler,
+  convertUnixCronToAWSCron,
+} from "../shared-aws/schedule";
 import { Node } from "../std";
 
 /**
@@ -24,21 +26,13 @@ export class Schedule extends cloud.Schedule {
 
     const { rate, cron } = props;
 
-    /*
-     * The schedule cron string is Unix cron format: [minute] [hour] [day of month] [month] [day of week]
-     * AWS EventBridge Schedule uses a 6 field format which includes year: [minute] [hour] [day of month] [month] [day of week] [year]
-     * https://docs.aws.amazon.com/scheduler/latest/UserGuide/schedule-types.html#cron-based
-     *
-     * We append * to the cron string for year field.
-     */
     this.scheduleExpression = rate
       ? rate.minutes === 1
         ? `rate(${rate.minutes} minute)`
         : `rate(${rate.minutes} minutes)`
-      : `cron(${cron} *)`;
+      : `cron(${convertUnixCronToAWSCron(cron!)})`;
 
     this.rule = new CloudwatchEventRule(this, "Schedule", {
-      isEnabled: true,
       scheduleExpression: this.scheduleExpression,
     });
   }
@@ -47,16 +41,8 @@ export class Schedule extends cloud.Schedule {
     inflight: cloud.IScheduleOnTickHandler,
     props: cloud.ScheduleOnTickOptions = {}
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(
-        __dirname.replace("target-tf-aws", "shared-aws"),
-        "schedule.ontick.inflight.js"
-      ),
-      "ScheduleOnTickHandlerClient"
-    );
-
-    let fn = this.handlers[inflight._hash];
+    const functionHandler = ScheduleOnTickHandler.toFunctionHandler(inflight);
+    let fn = this.handlers[inflight._id];
     if (fn) {
       return fn;
     }
@@ -67,7 +53,7 @@ export class Schedule extends cloud.Schedule {
       functionHandler,
       props
     );
-    this.handlers[inflight._hash] = fn;
+    this.handlers[inflight._id] = fn;
 
     // TODO: remove this constraint by adding generic permission APIs to cloud.Function
     if (!(fn instanceof Function)) {
@@ -89,8 +75,10 @@ export class Schedule extends cloud.Schedule {
 
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.ScheduleInflightMethods.TICK,
       target: fn,
-      name: "onTick()",
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
+      name: "tick",
     });
 
     return fn;
diff --git a/libs/wingsdk/src/target-tf-aws/secret.ts b/libs/wingsdk/src/target-tf-aws/secret.ts
index b8535b1e99d..eee4848d999 100644
--- a/libs/wingsdk/src/target-tf-aws/secret.ts
+++ b/libs/wingsdk/src/target-tf-aws/secret.ts
@@ -1,11 +1,11 @@
 import { TerraformOutput } from "cdktf";
 import { Construct } from "constructs";
-import { Function } from "./function";
 import { DataAwsSecretsmanagerSecret } from "../.gen/providers/aws/data-aws-secretsmanager-secret";
 import { SecretsmanagerSecret } from "../.gen/providers/aws/secretsmanager-secret";
 import * as cloud from "../cloud";
 import * as core from "../core";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
+import { AwsInflightHost } from "../shared-aws";
 import { calculateSecretPermissions } from "../shared-aws/permissions";
 import { IInflightHost } from "../std";
 
@@ -32,9 +32,10 @@ export class Secret extends cloud.Secret {
         name: props.name,
       });
     } else {
-      this.secret = new SecretsmanagerSecret(this, "Default", {
-        name: ResourceNames.generateName(this, NAME_OPTS),
-      });
+      (this._name = ResourceNames.generateName(this, NAME_OPTS)),
+        (this.secret = new SecretsmanagerSecret(this, "Default", {
+          name: this._name,
+        }));
 
       new TerraformOutput(this, "SecretArn", {
         value: this.secret.arn,
@@ -43,16 +44,16 @@ export class Secret extends cloud.Secret {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.SecretInflightMethods.VALUE,
-      cloud.SecretInflightMethods.VALUE_JSON,
-    ];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.SecretInflightMethods.VALUE]: [],
+      [cloud.SecretInflightMethods.VALUE_JSON]: [],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("secrets can only be bound by tfaws.Function for now");
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
     host.addPolicyStatements(
diff --git a/libs/wingsdk/src/target-tf-aws/table.ts b/libs/wingsdk/src/target-tf-aws/table.ts
index 010ce6c5d93..d266a2b442f 100644
--- a/libs/wingsdk/src/target-tf-aws/table.ts
+++ b/libs/wingsdk/src/target-tf-aws/table.ts
@@ -1,11 +1,12 @@
 import { marshall } from "@aws-sdk/util-dynamodb";
 import { Construct } from "constructs";
-import { Function } from "./function";
+import { App } from "./app";
 import { DynamodbTable } from "../.gen/providers/aws/dynamodb-table";
 import { DynamodbTableItem } from "../.gen/providers/aws/dynamodb-table-item";
 import * as core from "../core";
 import * as ex from "../ex";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
+import { AwsInflightHost } from "../shared-aws";
 import { IAwsTable } from "../shared-aws/table";
 import { Json, IInflightHost } from "../std";
 
@@ -29,6 +30,8 @@ export class Table extends ex.Table implements IAwsTable {
   constructor(scope: Construct, id: string, props: ex.TableProps = {}) {
     super(scope, id, props);
 
+    const isTestEnvironment = App.of(scope).isTestEnvironment;
+
     this.table = new DynamodbTable(this, "Default", {
       name: ResourceNames.generateName(this, {
         prefix: this.name,
@@ -37,6 +40,7 @@ export class Table extends ex.Table implements IAwsTable {
       attribute: [{ name: this.primaryKey, type: "S" }],
       hashKey: this.primaryKey,
       billingMode: "PAY_PER_REQUEST",
+      pointInTimeRecovery: isTestEnvironment ? undefined : { enabled: true },
     });
   }
 
@@ -53,8 +57,8 @@ export class Table extends ex.Table implements IAwsTable {
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("tables can only be bound by tfaws.Function for now");
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
     if (
@@ -119,16 +123,16 @@ export class Table extends ex.Table implements IAwsTable {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      ex.TableInflightMethods.INSERT,
-      ex.TableInflightMethods.UPSERT,
-      ex.TableInflightMethods.UPDATE,
-      ex.TableInflightMethods.DELETE,
-      ex.TableInflightMethods.GET,
-      ex.TableInflightMethods.TRYGET,
-      ex.TableInflightMethods.LIST,
-    ];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [ex.TableInflightMethods.INSERT]: [],
+      [ex.TableInflightMethods.UPSERT]: [],
+      [ex.TableInflightMethods.UPDATE]: [],
+      [ex.TableInflightMethods.DELETE]: [],
+      [ex.TableInflightMethods.GET]: [],
+      [ex.TableInflightMethods.TRYGET]: [],
+      [ex.TableInflightMethods.LIST]: [],
+    };
   }
 
   private envName(): string {
diff --git a/libs/wingsdk/src/target-tf-aws/test-runner.ts b/libs/wingsdk/src/target-tf-aws/test-runner.ts
index ff16d966d13..5083d1e4a3e 100644
--- a/libs/wingsdk/src/target-tf-aws/test-runner.ts
+++ b/libs/wingsdk/src/target-tf-aws/test-runner.ts
@@ -31,10 +31,6 @@ export class TestRunner extends std.TestRunner {
   }
 
   public onLift(host: std.IInflightHost, ops: string[]): void {
-    if (!(host instanceof AwsFunction)) {
-      throw new Error("TestRunner can only be bound by tfaws.Function for now");
-    }
-
     // Collect all of the test functions and their ARNs, and pass them to the
     // test engine so they can be invoked inflight.
     // TODO: are we going to run into AWS's 4KB environment variable limit here?
diff --git a/libs/wingsdk/src/target-tf-aws/topic.ts b/libs/wingsdk/src/target-tf-aws/topic.ts
index b669c4f87b3..793d6ccc63b 100644
--- a/libs/wingsdk/src/target-tf-aws/topic.ts
+++ b/libs/wingsdk/src/target-tf-aws/topic.ts
@@ -1,16 +1,17 @@
-import { join } from "path";
 import { Construct } from "constructs";
 import { App } from "./app";
 import { Function } from "./function";
+import { Queue } from "./queue";
 import { SnsTopic } from "../.gen/providers/aws/sns-topic";
 import { SnsTopicPolicy } from "../.gen/providers/aws/sns-topic-policy";
 import { SnsTopicSubscription } from "../.gen/providers/aws/sns-topic-subscription";
+import { SqsQueuePolicy } from "../.gen/providers/aws/sqs-queue-policy";
 import * as cloud from "../cloud";
 import * as core from "../core";
-import { convertBetweenHandlers } from "../shared/convert";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
+import { AwsInflightHost } from "../shared-aws";
 import { calculateTopicPermissions } from "../shared-aws/permissions";
-import { IAwsTopic } from "../shared-aws/topic";
+import { IAwsTopic, TopicOnMessageHandler } from "../shared-aws/topic";
 import { IInflightHost, Node, Resource } from "../std";
 
 /**
@@ -48,16 +49,8 @@ export class Topic extends cloud.Topic implements IAwsTopic {
     inflight: cloud.ITopicOnMessageHandler,
     props: cloud.TopicOnMessageOptions = {}
   ): cloud.Function {
-    const functionHandler = convertBetweenHandlers(
-      inflight,
-      join(
-        __dirname.replace("target-tf-aws", "shared-aws"),
-        "topic.onmessage.inflight.js"
-      ),
-      "TopicOnMessageHandlerClient"
-    );
-
-    let fn = this.handlers[inflight._hash];
+    const functionHandler = TopicOnMessageHandler.toFunctionHandler(inflight);
+    let fn = this.handlers[inflight._id];
     if (fn) {
       return fn;
     }
@@ -69,7 +62,7 @@ export class Topic extends cloud.Topic implements IAwsTopic {
       functionHandler,
       props
     );
-    this.handlers[inflight._hash] = fn;
+    this.handlers[inflight._id] = fn;
 
     // TODO: remove this constraint by adding generic permission APIs to cloud.Function
     if (!(fn instanceof Function)) {
@@ -80,7 +73,7 @@ export class Topic extends cloud.Topic implements IAwsTopic {
       this,
       App.of(this).makeId(this, "TopicSubscription"),
       {
-        topicArn: this.topic.arn,
+        topicArn: this.topicArn,
         protocol: "lambda",
         endpoint: fn.functionArn,
       }
@@ -90,13 +83,56 @@ export class Topic extends cloud.Topic implements IAwsTopic {
 
     Node.of(this).addConnection({
       source: this,
+      sourceOp: cloud.TopicInflightMethods.PUBLISH,
       target: fn,
-      name: "onMessage()",
+      targetOp: cloud.FunctionInflightMethods.INVOKE_ASYNC,
+      name: "subscriber",
     });
 
     return fn;
   }
 
+  public subscribeQueue(queue: cloud.Queue): void {
+    if (!(queue instanceof Queue)) {
+      throw new Error(
+        "'subscribeQueue' allows only tfaws.Queue to be subscribed to the Topic"
+      );
+    }
+
+    new SnsTopicSubscription(
+      this,
+      App.of(this).makeId(this, "TopicSubscription"),
+      {
+        topicArn: this.topicArn,
+        protocol: "sqs",
+        endpoint: queue.queueArn,
+        rawMessageDelivery: true,
+      }
+    );
+
+    new SqsQueuePolicy(this, `SqsQueuePolicy-${queue.node.addr}`, {
+      queueUrl: queue.queueUrl,
+      policy: JSON.stringify({
+        Version: "2012-10-17",
+        Statement: [
+          {
+            Effect: "Allow",
+            Principal: {
+              Service: "sns.amazonaws.com",
+            },
+            Action: "sqs:SendMessage",
+            Resource: `${queue.queueArn}`,
+            Condition: {
+              ArnEquals: {
+                "aws:SourceArn": `${this.topicArn}`,
+              },
+            },
+          },
+        ],
+      }),
+    });
+  }
+
   /**
    * Grants the given identity permissions to publish this topic.
    * @param source the resource that will publish to the topic
@@ -135,8 +171,8 @@ export class Topic extends cloud.Topic implements IAwsTopic {
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
-    if (!(host instanceof Function)) {
-      throw new Error("topics can only be bound by tfaws.Function for now");
+    if (!AwsInflightHost.isAwsInflightHost(host)) {
+      throw new Error("Host is expected to implement `IAwsInfightHost`");
     }
 
     host.addPolicyStatements(...calculateTopicPermissions(this.topic.arn, ops));
@@ -156,8 +192,10 @@ export class Topic extends cloud.Topic implements IAwsTopic {
     );
   }
   /** @internal */
-  public _supportedOps(): string[] {
-    return [cloud.TopicInflightMethods.PUBLISH];
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.TopicInflightMethods.PUBLISH]: [],
+    };
   }
 
   private envName(): string {
diff --git a/libs/wingsdk/src/target-tf-aws/website.ts b/libs/wingsdk/src/target-tf-aws/website.ts
index fbe307a098e..1c7b367e230 100644
--- a/libs/wingsdk/src/target-tf-aws/website.ts
+++ b/libs/wingsdk/src/target-tf-aws/website.ts
@@ -18,6 +18,7 @@ import * as cloud from "../cloud";
 import { normalPath } from "../shared/misc";
 import { NameOptions, ResourceNames } from "../shared/resource-names";
 import * as aws from "../shared-aws";
+import { Node } from "../std";
 
 const INDEX_FILE = "index.html";
 
@@ -29,6 +30,7 @@ const INDEX_FILE = "index.html";
 export class Website extends cloud.Website implements aws.IAwsWebsite {
   public readonly bucket: S3Bucket;
   private readonly _url: string;
+  private readonly endpoint: cloud.Endpoint;
 
   constructor(scope: Construct, id: string, props: aws.AwsWebsiteProps) {
     super(scope, id, props);
@@ -38,6 +40,9 @@ export class Website extends cloud.Website implements aws.IAwsWebsite {
     new S3BucketWebsiteConfiguration(this, "BucketWebsiteConfiguration", {
       bucket: this.bucket.bucket,
       indexDocument: { suffix: INDEX_FILE },
+      errorDocument: props.errorDocument
+        ? { key: props.errorDocument }
+        : undefined,
     });
 
     this.uploadFiles(this.path);
@@ -72,6 +77,20 @@ export class Website extends cloud.Website implements aws.IAwsWebsite {
         },
       ],
       defaultRootObject: INDEX_FILE,
+      customErrorResponse: props.errorDocument
+        ? [
+            {
+              errorCode: 404,
+              responseCode: 200,
+              responsePagePath: `/${props.errorDocument}`,
+            },
+            {
+              errorCode: 403,
+              responseCode: 200,
+              responsePagePath: `/${props.errorDocument}`,
+            },
+          ]
+        : undefined,
       defaultCacheBehavior: {
         allowedMethods: ["GET", "HEAD"],
         cachedMethods: ["GET", "HEAD"],
@@ -153,10 +172,17 @@ export class Website extends cloud.Website implements aws.IAwsWebsite {
     }
 
     this._url = `https://${distribution.domainName}`;
+
+    this.endpoint = new cloud.Endpoint(this, "Endpoint", this._url, {
+      label: `Website ${this.node.path}`,
+      browserSupport: true,
+    });
+
+    Node.of(this.endpoint).hidden = true;
   }
 
-  public get url(): string {
-    return this._url;
+  protected get _endpoint(): cloud.Endpoint {
+    return this.endpoint;
   }
 
   public addFile(
diff --git a/libs/wingsdk/src/target-tf-azure/app.ts b/libs/wingsdk/src/target-tf-azure/app.ts
index d6ca7640686..a77ed1e7df1 100644
--- a/libs/wingsdk/src/target-tf-azure/app.ts
+++ b/libs/wingsdk/src/target-tf-azure/app.ts
@@ -1,4 +1,5 @@
 import { Bucket } from "./bucket";
+import { Counter } from "./counter";
 import { Function } from "./function";
 import { APP_AZURE_TF_SYMBOL } from "./internal";
 import { TestRunner } from "./test-runner";
@@ -8,7 +9,7 @@ import { AzurermProvider } from "../.gen/providers/azurerm/provider";
 import { ResourceGroup } from "../.gen/providers/azurerm/resource-group";
 import { ServicePlan } from "../.gen/providers/azurerm/service-plan";
 import { StorageAccount } from "../.gen/providers/azurerm/storage-account";
-import { BUCKET_FQN, FUNCTION_FQN } from "../cloud";
+import { BUCKET_FQN, FUNCTION_FQN, COUNTER_FQN } from "../cloud";
 import { AppProps } from "../core";
 import {
   CaseConventions,
@@ -80,13 +81,11 @@ export class App extends CdktfApp {
   private _servicePlan?: ServicePlan;
   private _applicationInsights?: ApplicationInsights;
   private _logAnalyticsWorkspace?: LogAnalyticsWorkspace;
-  protected readonly testRunner: TestRunner;
 
   constructor(props: AzureAppProps) {
     super(props);
     this.location = props.location ?? process.env.AZURE_LOCATION;
-    this.testRunner = new TestRunner(this, "cloud.TestRunner");
-    this.synthRoots(props, this.testRunner);
+    TestRunner._createTree(this, props.rootConstruct);
     // Using env variable for location is work around until we are
     // able to implement https://github.com/winglang/wing/issues/493 (policy as infrastructure)
     if (this.location === undefined) {
@@ -109,21 +108,6 @@ export class App extends CdktfApp {
     });
   }
 
-  protected synthRoots(props: AppProps, testRunner: TestRunner): void {
-    if (props.rootConstruct) {
-      const Root = props.rootConstruct;
-      if (this.isTestEnvironment) {
-        new Root(this, "env0");
-        const tests = testRunner.findTests();
-        for (let i = 1; i < tests.length; i++) {
-          new Root(this, "env" + i);
-        }
-      } else {
-        new Root(this, "Default");
-      }
-    }
-  }
-
   public get logAnalyticsWorkspace() {
     if (!this._logAnalyticsWorkspace) {
       this._logAnalyticsWorkspace = new LogAnalyticsWorkspace(
@@ -216,6 +200,9 @@ export class App extends CdktfApp {
 
       case BUCKET_FQN:
         return Bucket;
+
+      case COUNTER_FQN:
+        return Counter;
     }
 
     return undefined;
diff --git a/libs/wingsdk/src/target-tf-azure/bucket.ts b/libs/wingsdk/src/target-tf-azure/bucket.ts
index 569ffdf78b8..a27b1dec85c 100644
--- a/libs/wingsdk/src/target-tf-azure/bucket.ts
+++ b/libs/wingsdk/src/target-tf-azure/bucket.ts
@@ -99,9 +99,20 @@ export class Bucket extends cloud.Bucket {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
+  public get _liftMap(): core.LiftMap {
     // TODO: After fixing the tests we realized that nothing is working-https://github.com/winglang/wing/issues/5123
-    return [];
+    return {
+      // [cloud.BucketInflightMethods.DELETE]: [],
+      // [cloud.BucketInflightMethods.GET]: [],
+      // [cloud.BucketInflightMethods.GET_JSON]: [],
+      // [cloud.BucketInflightMethods.LIST]: [],
+      // [cloud.BucketInflightMethods.PUT]: [],
+      // [cloud.BucketInflightMethods.PUT_JSON]: [],
+      // [cloud.BucketInflightMethods.EXISTS]: [],
+      // [cloud.BucketInflightMethods.TRY_GET]: [],
+      // [cloud.BucketInflightMethods.TRY_GET_JSON]: [],
+      // [cloud.BucketInflightMethods.TRY_DELETE]: [],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
@@ -109,7 +120,7 @@ export class Bucket extends cloud.Bucket {
       throw new Error("buckets can only be bound by tfazure.Function for now");
     }
 
-    // TODO: investigate customized roles over builtin for finer grained access control
+    // TODO: investigate customized roles over builtin for finer grained access control: https://github.com/winglang/wing/issues/5598
     if (
       ops.includes(cloud.BucketInflightMethods.DELETE) ||
       ops.includes(cloud.BucketInflightMethods.TRY_DELETE) ||
@@ -148,7 +159,11 @@ export class Bucket extends cloud.Bucket {
     opts;
     throw new NotImplementedError(
       "onCreate method isn't implemented yet on the current target.",
-      "https://github.com/winglang/wing/issues/1954"
+      {
+        issue: "https://github.com/winglang/wing/issues/1954",
+        resource: this.constructor.name,
+        operation: cloud.BucketEventType.CREATE,
+      }
     );
   }
 
@@ -160,7 +175,11 @@ export class Bucket extends cloud.Bucket {
     opts;
     throw new NotImplementedError(
       "onDelete method isn't implemented yet on the current target.",
-      "https://github.com/winglang/wing/issues/1954"
+      {
+        issue: "https://github.com/winglang/wing/issues/1954",
+        resource: this.constructor.name,
+        operation: cloud.BucketEventType.DELETE,
+      }
     );
   }
 
@@ -172,7 +191,11 @@ export class Bucket extends cloud.Bucket {
     opts;
     throw new NotImplementedError(
       "onUpdate method isn't implemented yet on the current target.",
-      "https://github.com/winglang/wing/issues/1954"
+      {
+        issue: "https://github.com/winglang/wing/issues/1954",
+        resource: this.constructor.name,
+        operation: cloud.BucketEventType.UPDATE,
+      }
     );
   }
 
@@ -184,16 +207,25 @@ export class Bucket extends cloud.Bucket {
     opts;
     throw new NotImplementedError(
       "onEvent method isn't implemented yet on the current target.",
-      "https://github.com/winglang/wing/issues/1954"
+      {
+        issue: "https://github.com/winglang/wing/issues/1954",
+        resource: this.constructor.name,
+        operation: "onEvent",
+      }
     );
   }
 
   /** @internal */
   public _toInflight(): string {
-    return core.InflightClient.for(__dirname, __filename, "BucketClient", [
-      `process.env["${this.envName()}"]`,
-      `process.env["${this.envStorageAccountName()}"]`,
-    ]);
+    return core.InflightClient.for(
+      __dirname.replace("target-tf-azure", "shared-azure"),
+      __filename,
+      "BucketClient",
+      [
+        `process.env["${this.envName()}"]`,
+        `process.env["${this.envStorageAccountName()}"]`,
+      ]
+    );
   }
 
   private envName(): string {
diff --git a/libs/wingsdk/src/target-tf-azure/counter.ts b/libs/wingsdk/src/target-tf-azure/counter.ts
new file mode 100644
index 00000000000..e4c13c00f02
--- /dev/null
+++ b/libs/wingsdk/src/target-tf-azure/counter.ts
@@ -0,0 +1,134 @@
+import { Construct } from "constructs";
+import { App } from "./app";
+import { Function } from "./function";
+import { StorageAccount } from "../.gen/providers/azurerm/storage-account";
+import { StorageTable } from "../.gen/providers/azurerm/storage-table";
+
+import * as cloud from "../cloud";
+import * as core from "../core";
+import {
+  CaseConventions,
+  NameOptions,
+  ResourceNames,
+} from "../shared/resource-names";
+import { IInflightHost } from "../std";
+
+/**
+ * - Table names must be unique within an account.
+ * - Table names may contain only alphanumeric characters.
+ * - Table names cannot begin with a numeric character.
+ * - Table names are case-insensitive.
+ * - Table names must be from 3 to 63 characters long.
+ * - Some table names are reserved, including "tables".
+ *   Attempting to create a table with a reserved table name returns error code 404 (Bad Request).
+ *
+ * @see https://learn.microsoft.com/en-us/rest/api/storageservices/understanding-the-table-service-data-model#table-names
+ */
+const TABLE_NAME_OPTS: NameOptions = {
+  maxLen: 63,
+  case: CaseConventions.LOWERCASE,
+  disallowedRegex: /(^[^a-z])|([^a-z0-9])/g,
+  sep: "x",
+};
+
+/**
+ * Azure bult-in storage account permissions.
+ */
+export enum StorageAccountPermissions {
+  /** Read only permission */
+  READ = "Storage Table Data Reader",
+  /** Read write permission */
+  READ_WRITE = "Storage Table Data Contributor",
+}
+
+/**
+ * Azure implementation of `cloud.Counter`.
+ *
+ * @inflight `@winglang/sdk.cloud.ICounterClient`
+ */
+export class Counter extends cloud.Counter {
+  private readonly storageAccount: StorageAccount;
+  public readonly storageTable: StorageTable;
+
+  constructor(scope: Construct, id: string, props: cloud.CounterProps = {}) {
+    super(scope, id, props);
+
+    const app = App.of(this) as App;
+    this.storageAccount = app.storageAccount;
+
+    const storageTableName = ResourceNames.generateName(this, TABLE_NAME_OPTS);
+
+    this.storageTable = new StorageTable(this, "CounterTable", {
+      name: storageTableName,
+      storageAccountName: this.storageAccount.name,
+    });
+  }
+
+  /** @internal */
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.CounterInflightMethods.INC]: [],
+      [cloud.CounterInflightMethods.DEC]: [],
+      [cloud.CounterInflightMethods.SET]: [],
+      [cloud.CounterInflightMethods.PEEK]: [],
+    };
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    if (!(host instanceof Function)) {
+      throw new Error("counters can only be bound by tfazure.Function for now");
+    }
+
+    // TODO: investigate customized roles over builtin for finer grained access control: https://github.com/winglang/wing/issues/5598
+    if (ops.includes(cloud.CounterInflightMethods.PEEK)) {
+      host.addPermission(this.storageAccount, {
+        scope: this.storageAccount.id,
+        roleDefinitionName: StorageAccountPermissions.READ,
+      });
+    } else if (
+      ops.includes(cloud.CounterInflightMethods.INC) ||
+      ops.includes(cloud.CounterInflightMethods.DEC) ||
+      ops.includes(cloud.CounterInflightMethods.SET)
+    ) {
+      host.addPermission(this.storageAccount, {
+        scope: this.storageAccount.id,
+        roleDefinitionName: StorageAccountPermissions.READ_WRITE,
+      });
+    }
+
+    host.addEnvironment(
+      this.envAccountKeyVariable(),
+      this.storageAccount.primaryAccessKey
+    );
+    host.addEnvironment(this.envStorageAccountName(), this.storageAccount.name);
+    host.addEnvironment(this.envStorageTableName(), this.storageTable.name);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return core.InflightClient.for(
+      __dirname.replace("target-tf-azure", "shared-azure"),
+      __filename,
+      "CounterClient",
+      [
+        `process.env["${this.envStorageAccountName()}"]`,
+        `process.env["${this.envStorageTableName()}"]`,
+        `"${this.envAccountKeyVariable()}"`,
+        `${this.initial}`,
+      ]
+    );
+  }
+
+  private envStorageAccountName(): string {
+    return `STORAGE_ACCOUNT_${this.storageTable.node.addr.slice(-8)}`;
+  }
+
+  private envAccountKeyVariable(): string {
+    return `STORAGE_ACCOUNT_KEY_${this.storageTable.node.addr.slice(-8)}`;
+  }
+
+  private envStorageTableName(): string {
+    return `TABLE_NAME_${this.storageTable.node.addr.slice(-8)}`;
+  }
+}
diff --git a/libs/wingsdk/src/target-tf-azure/function.ts b/libs/wingsdk/src/target-tf-azure/function.ts
index 38404ed077a..db0284cb2ab 100644
--- a/libs/wingsdk/src/target-tf-azure/function.ts
+++ b/libs/wingsdk/src/target-tf-azure/function.ts
@@ -12,6 +12,7 @@ import { ServicePlan } from "../.gen/providers/azurerm/service-plan";
 import { StorageAccount } from "../.gen/providers/azurerm/storage-account";
 import { StorageBlob } from "../.gen/providers/azurerm/storage-blob";
 import * as cloud from "../cloud";
+import { LiftMap } from "../core";
 import { NotImplementedError } from "../core/errors";
 import { createBundle } from "../shared/bundling";
 import {
@@ -54,6 +55,8 @@ export class Function extends cloud.Function {
   private readonly resourceGroup: ResourceGroup;
   private readonly applicationInsights: ApplicationInsights;
   private permissions: Map<string, ScopedRoleAssignment> = new Map();
+  private readonly functionName: string;
+  private assetPath: string | undefined;
 
   constructor(
     scope: Construct,
@@ -69,93 +72,60 @@ export class Function extends cloud.Function {
     this.servicePlan = app.servicePlan;
     this.applicationInsights = app.applicationInsights;
 
-    const functionName = ResourceNames.generateName(this, FUNCTION_NAME_OPTS);
+    this.functionName = ResourceNames.generateName(this, FUNCTION_NAME_OPTS);
     const functionIdentityType = "SystemAssigned";
     const functionRuntime = "node";
-    const functionNodeVersion = "18"; // support fetch
+    const functionNodeVersion = "20"; // support fetch
 
     // Create Bucket to store function code
     const functionCodeBucket = new Bucket(this, "FunctionBucket");
 
-    const bundle = createBundle(this.entrypoint);
-    const codeDir = bundle.directory;
-
-    // Package up code in azure expected format
-    const outDir = `${codeDir}/${functionName}`;
-
-    // Move index.js to function name directory. Every Azure function in a function app
-    // must be in its own folder containing an index.js and function.json files
-    fs.mkdirSync(`${codeDir}/${functionName}`);
-    fs.renameSync(bundle.entrypointPath, `${outDir}/index.js`);
+    if (props.concurrency != null) {
+      throw new NotImplementedError(
+        "Function concurrency isn't implemented yet on the current target."
+      );
+    }
 
     // throw an error if props.memory is defined for an Azure function
     if (props.memory) {
-      throw new NotImplementedError("memory is an invalid parameter on Azure");
+      throw new NotImplementedError("memory is an invalid parameter on Azure", {
+        resource: this.constructor.name,
+        operation: "memory",
+      });
     }
 
-    // As per documentation "a function must have exactly one trigger" so for now
-    // by default a function will support http get requests
-    // when we lift other resources like queues or topics this function.json will need to
-    // be overwritten with the correct trigger
-    // https://learn.microsoft.com/en-us/azure/azure-functions/functions-triggers-bindings?tabs=csharp
-    fs.writeFileSync(
-      `${outDir}/function.json`,
-      JSON.stringify({
-        bindings: [
-          {
-            authLevel: "anonymous", // TODO: this auth level will be changed with https://github.com/winglang/wing/issues/4497
-            type: "httpTrigger",
-            direction: "in",
-            name: "req",
-            methods: ["get", "post"],
-          },
-          {
-            type: "http",
-            direction: "out",
-            name: "res",
-          },
-        ],
-      })
-    );
     // TODO: will be uncommented when fixing https://github.com/winglang/wing/issues/4494
     // const timeout = props.timeout ?? Duration.fromMinutes(1);
     if (props.timeout) {
       throw new NotImplementedError(
         "Function.timeout is not implemented yet on tf-azure target.",
-        "https://github.com/winglang/wing/issues/4494"
+        {
+          issue: "https://github.com/winglang/wing/issues/4494",
+          resource: this.constructor.name,
+          operation: "timeout",
+        }
       );
     }
-    // Write host.json file to set function timeout (must be set in root of function app)
-    // https://learn.microsoft.com/en-us/azure/azure-functions/functions-host-json
-    // this means that timeout is set for all functions in the function app
-    fs.writeFileSync(
-      `${codeDir}/host.json`,
-      JSON.stringify({
-        version: "2.0",
-        //TODO: need to read the documentation and parse the number in the right way,
-        // while not surpassing the limits, since it will be resulted in a hard to detect error
-        functionTimeout: `00:01:00`,
-      })
-    );
-
-    // Create zip asset from function code
-    const asset = new TerraformAsset(this, "Asset", {
-      path: `${codeDir}`,
-      type: AssetType.ARCHIVE,
-    });
 
     // Upload zip asset to storage account
     const functionCodeBlob = new StorageBlob(this, "CodeBlob", {
-      name: `${functionName}.zip`,
+      name: `${this.functionName}.zip`,
       storageAccountName: this.storageAccount.name,
       storageContainerName: functionCodeBucket.storageContainer.name,
       type: "Block",
-      source: asset.path,
+      source: Lazy.stringValue({
+        produce: () => {
+          if (!this.assetPath) {
+            throw new Error("assetPath was not set");
+          }
+          return this.assetPath;
+        },
+      }),
     });
 
     // Create the function
     this.function = new LinuxFunctionApp(this, "Function", {
-      name: functionName,
+      name: this.functionName,
       resourceGroupName: this.resourceGroup.name,
       location: this.resourceGroup.location,
       servicePlanId: this.servicePlan.id,
@@ -210,6 +180,68 @@ export class Function extends cloud.Function {
     );
   }
 
+  /** @internal */
+  public _preSynthesize(): void {
+    super._preSynthesize();
+
+    const bundle = createBundle(this.entrypoint);
+    const codeDir = bundle.directory;
+
+    // Package up code in azure expected format
+    const outDir = `${codeDir}/${this.functionName}`;
+
+    // Move index.js to function name directory. Every Azure function in a function app
+    // must be in its own folder containing an index.js and function.json files
+    fs.mkdirSync(`${codeDir}/${this.functionName}`);
+    fs.renameSync(bundle.outfilePath, `${outDir}/index.js`);
+
+    // As per documentation "a function must have exactly one trigger" so for now
+    // by default a function will support http get requests
+    // when we lift other resources like queues or topics this function.json will need to
+    // be overwritten with the correct trigger
+    // https://learn.microsoft.com/en-us/azure/azure-functions/functions-triggers-bindings?tabs=csharp
+    fs.writeFileSync(
+      `${outDir}/function.json`,
+      JSON.stringify({
+        bindings: [
+          {
+            authLevel: "anonymous", // TODO: this auth level will be changed with https://github.com/winglang/wing/issues/4497
+            type: "httpTrigger",
+            direction: "in",
+            name: "req",
+            methods: ["get", "post"],
+          },
+          {
+            type: "http",
+            direction: "out",
+            name: "res",
+          },
+        ],
+      })
+    );
+
+    // Write host.json file to set function timeout (must be set in root of function app)
+    // https://learn.microsoft.com/en-us/azure/azure-functions/functions-host-json
+    // this means that timeout is set for all functions in the function app
+    fs.writeFileSync(
+      `${codeDir}/host.json`,
+      JSON.stringify({
+        version: "2.0",
+        //TODO: need to read the documentation and parse the number in the right way,
+        // while not surpassing the limits, since it will be resulted in a hard to detect error
+        functionTimeout: `00:01:00`,
+      })
+    );
+
+    // Create zip asset from function code
+    const asset = new TerraformAsset(this, "Asset", {
+      path: `${codeDir}`,
+      type: AssetType.ARCHIVE,
+    });
+
+    this.assetPath = asset.path;
+  }
+
   /**
    * Function name, used for invocation
    */
@@ -251,17 +283,23 @@ export class Function extends cloud.Function {
     lines.push('"use strict";');
     lines.push("module.exports = async function(context, req) {");
     lines.push(
-      `  const body = await (${inflightClient}).handle(context.req.body ?? "");`
+      `try {  
+        const body = await (${inflightClient}).handle(context.req.body);
+        context.res = { body };
+     } catch (error) {
+        context.res = { body: error.message, status: 500 };
+    }`
     );
-    lines.push(`  context.res = { body };`);
     lines.push(`};`);
 
     return lines;
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [cloud.FunctionInflightMethods.INVOKE];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.FunctionInflightMethods.INVOKE]: [[this.handler, ["handle"]]],
+    };
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
diff --git a/libs/wingsdk/src/target-tf-gcp/app.ts b/libs/wingsdk/src/target-tf-gcp/app.ts
index bb3125e2059..3d69fc82752 100644
--- a/libs/wingsdk/src/target-tf-gcp/app.ts
+++ b/libs/wingsdk/src/target-tf-gcp/app.ts
@@ -1,10 +1,12 @@
 import { Bucket } from "./bucket";
+import { Counter } from "./counter";
 import { Function } from "./function";
+import { Schedule } from "./schedule";
 import { Table } from "./table";
 import { TestRunner } from "./test-runner";
 import { GoogleProvider } from "../.gen/providers/google/provider";
 import { RandomProvider } from "../.gen/providers/random/provider";
-import { BUCKET_FQN, FUNCTION_FQN } from "../cloud";
+import { BUCKET_FQN, COUNTER_FQN, FUNCTION_FQN, SCHEDULE_FQN } from "../cloud";
 import { AppProps as CdktfAppProps } from "../core";
 import { TABLE_FQN } from "../ex";
 import { CdktfApp } from "../shared-tf/app";
@@ -29,7 +31,7 @@ export interface AppProps extends CdktfAppProps {
    * The Google Cloud zone, used for all resources.
    * @see https://cloud.google.com/functions/docs/locations
    */
-  readonly zone: string;
+  readonly zone?: string;
 }
 
 /**
@@ -53,7 +55,6 @@ export class App extends CdktfApp {
   public readonly zone: string;
 
   public readonly _target = "tf-gcp";
-  protected readonly testRunner: TestRunner;
 
   constructor(props: AppProps) {
     super(props);
@@ -80,23 +81,7 @@ export class App extends CdktfApp {
     });
     new RandomProvider(this, "random");
 
-    this.testRunner = new TestRunner(this, "cloud.TestRunner");
-    this.synthRoots(props, this.testRunner);
-  }
-
-  protected synthRoots(props: AppProps, testRunner: TestRunner): void {
-    if (props.rootConstruct) {
-      const Root = props.rootConstruct;
-      if (this.isTestEnvironment) {
-        new Root(this, "env0");
-        const tests = testRunner.findTests();
-        for (let i = 1; i < tests.length; i++) {
-          new Root(this, "env" + i);
-        }
-      } else {
-        new Root(this, "Default");
-      }
-    }
+    TestRunner._createTree(this, props.rootConstruct);
   }
 
   protected typeForFqn(fqn: string): any {
@@ -109,6 +94,10 @@ export class App extends CdktfApp {
         return Function;
       case TABLE_FQN:
         return Table;
+      case COUNTER_FQN:
+        return Counter;
+      case SCHEDULE_FQN:
+        return Schedule;
     }
 
     return undefined;
diff --git a/libs/wingsdk/src/target-tf-gcp/bucket.ts b/libs/wingsdk/src/target-tf-gcp/bucket.ts
index b4a53521e2e..a0d7f3e6968 100644
--- a/libs/wingsdk/src/target-tf-gcp/bucket.ts
+++ b/libs/wingsdk/src/target-tf-gcp/bucket.ts
@@ -1,13 +1,14 @@
 import { Construct } from "constructs";
 import { App } from "./app";
 import { Function as GCPFunction } from "./function";
-import { RoleType } from "./permissions";
+import { calculateBucketPermissions } from "./permissions";
+import { ProjectService } from "../.gen/providers/google/project-service";
 import { StorageBucket } from "../.gen/providers/google/storage-bucket";
 import { StorageBucketIamMember } from "../.gen/providers/google/storage-bucket-iam-member";
 import { StorageBucketObject } from "../.gen/providers/google/storage-bucket-object";
 import { Id } from "../.gen/providers/random/id";
 import * as cloud from "../cloud";
-import { InflightClient } from "../core";
+import { InflightClient, LiftMap } from "../core";
 import { NotImplementedError } from "../core/errors";
 import {
   CaseConventions,
@@ -61,6 +62,18 @@ export class Bucket extends cloud.Bucket {
 
     const isTestEnvironment = App.of(scope).isTestEnvironment;
 
+    // Enable `IAM Service Account Credentials API` for the project
+    // This is disabled by default, but required for generating presigned URLs
+    const iamServiceAccountCredentialsApi = new ProjectService(
+      this,
+      "IamServiceAccountCredentialsApi",
+      {
+        service: "iamcredentials.googleapis.com",
+        disableDependentServices: false,
+        disableOnDestroy: false,
+      }
+    );
+
     this.bucket = new StorageBucket(this, "Default", {
       name: bucketName + "-" + randomId.hex,
       location: (App.of(this) as App).region,
@@ -68,33 +81,38 @@ export class Bucket extends cloud.Bucket {
       uniformBucketLevelAccess: true,
       publicAccessPrevention: props.public ? "inherited" : "enforced",
       forceDestroy: !!isTestEnvironment,
+      dependsOn: [iamServiceAccountCredentialsApi],
     });
 
     if (props.public) {
       // https://cloud.google.com/storage/docs/access-control/making-data-public#terraform
       new StorageBucketIamMember(this, "PublicAccessIamMember", {
         bucket: this.bucket.name,
-        role: RoleType.STORAGE_READ,
+        role: "roles/storage.objectViewer",
         member: "allUsers",
       });
     }
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [
-      cloud.BucketInflightMethods.DELETE,
-      cloud.BucketInflightMethods.GET,
-      cloud.BucketInflightMethods.GET_JSON,
-      cloud.BucketInflightMethods.LIST,
-      cloud.BucketInflightMethods.PUT,
-      cloud.BucketInflightMethods.PUT_JSON,
-      cloud.BucketInflightMethods.PUBLIC_URL,
-      cloud.BucketInflightMethods.EXISTS,
-      cloud.BucketInflightMethods.TRY_GET,
-      cloud.BucketInflightMethods.TRY_GET_JSON,
-      cloud.BucketInflightMethods.TRY_DELETE,
-    ];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.BucketInflightMethods.DELETE]: [],
+      [cloud.BucketInflightMethods.GET]: [],
+      [cloud.BucketInflightMethods.GET_JSON]: [],
+      [cloud.BucketInflightMethods.LIST]: [],
+      [cloud.BucketInflightMethods.PUT]: [],
+      [cloud.BucketInflightMethods.PUT_JSON]: [],
+      [cloud.BucketInflightMethods.PUBLIC_URL]: [],
+      [cloud.BucketInflightMethods.EXISTS]: [],
+      [cloud.BucketInflightMethods.TRY_GET]: [],
+      [cloud.BucketInflightMethods.TRY_GET_JSON]: [],
+      [cloud.BucketInflightMethods.TRY_DELETE]: [],
+      [cloud.BucketInflightMethods.METADATA]: [],
+      [cloud.BucketInflightMethods.COPY]: [],
+      [cloud.BucketInflightMethods.RENAME]: [],
+      [cloud.BucketInflightMethods.SIGNED_URL]: [],
+    };
   }
 
   public addObject(key: string, body: string): void {
@@ -115,7 +133,11 @@ export class Bucket extends cloud.Bucket {
     fn;
     opts;
     throw new NotImplementedError(
-      "onCreate method isn't implemented yet on the current target."
+      "onCreate method isn't implemented yet on the current target.",
+      {
+        resource: this.constructor.name,
+        operation: cloud.BucketEventType.CREATE,
+      }
     );
   }
 
@@ -129,7 +151,11 @@ export class Bucket extends cloud.Bucket {
     fn;
     opts;
     throw new NotImplementedError(
-      "onDelete method isn't implemented yet on the current target."
+      "onDelete method isn't implemented yet on the current target.",
+      {
+        resource: this.constructor.name,
+        operation: cloud.BucketEventType.DELETE,
+      }
     );
   }
 
@@ -143,7 +169,11 @@ export class Bucket extends cloud.Bucket {
     fn;
     opts;
     throw new NotImplementedError(
-      "onUpdate method isn't implemented yet on the current target."
+      "onUpdate method isn't implemented yet on the current target.",
+      {
+        resource: this.constructor.name,
+        operation: cloud.BucketEventType.UPDATE,
+      }
     );
   }
 
@@ -157,7 +187,8 @@ export class Bucket extends cloud.Bucket {
     fn;
     opts;
     throw new NotImplementedError(
-      "onEvent method isn't implemented yet on the current target."
+      "onEvent method isn't implemented yet on the current target.",
+      { resource: this.constructor.name, operation: "onEvent" }
     );
   }
 
@@ -165,27 +196,11 @@ export class Bucket extends cloud.Bucket {
     if (!(host instanceof GCPFunction)) {
       throw new Error("buckets can only be bound by tfgcp.Function for now");
     }
-    if (
-      ops.includes(cloud.BucketInflightMethods.GET) ||
-      ops.includes(cloud.BucketInflightMethods.GET_JSON) ||
-      ops.includes(cloud.BucketInflightMethods.LIST) ||
-      ops.includes(cloud.BucketInflightMethods.EXISTS) ||
-      ops.includes(cloud.BucketInflightMethods.PUBLIC_URL) ||
-      // ops.includes(cloud.BucketInflightMethods.SIGNED_URL) ||
-      ops.includes(cloud.BucketInflightMethods.TRY_GET) ||
-      ops.includes(cloud.BucketInflightMethods.TRY_GET_JSON)
-    ) {
-      host.addPermission(this, RoleType.STORAGE_READ);
-    } else if (
-      ops.includes(cloud.BucketInflightMethods.DELETE) ||
-      ops.includes(cloud.BucketInflightMethods.PUT) ||
-      ops.includes(cloud.BucketInflightMethods.PUT_JSON) ||
-      ops.includes(cloud.BucketInflightMethods.TRY_DELETE)
-    ) {
-      host.addPermission(this, RoleType.STORAGE_READ_WRITE);
-    }
-    host.addEnvironment(this.envName(), this.bucket.name);
 
+    const permissions = calculateBucketPermissions(ops);
+    host.addPermissions(permissions);
+
+    host.addEnvironment(this.envName(), this.bucket.name);
     super.onLift(host, ops);
   }
 
diff --git a/libs/wingsdk/src/target-tf-gcp/counter.ts b/libs/wingsdk/src/target-tf-gcp/counter.ts
new file mode 100644
index 00000000000..2abd137632c
--- /dev/null
+++ b/libs/wingsdk/src/target-tf-gcp/counter.ts
@@ -0,0 +1,95 @@
+import { Construct } from "constructs";
+import { App } from "./app";
+import { Function as GCPFunction } from "./function";
+import { calculateCounterPermissions } from "./permissions";
+import { FirestoreDatabase } from "../.gen/providers/google/firestore-database";
+import { ProjectService } from "../.gen/providers/google/project-service";
+import * as cloud from "../cloud";
+import * as core from "../core";
+import {
+  CaseConventions,
+  NameOptions,
+  ResourceNames,
+} from "../shared/resource-names";
+import { IInflightHost } from "../std";
+
+/**
+ * Valid database IDs include `(default)` and IDs that conform to the following:
+ * - Includes only letters, numbers, and hyphen (-) characters.
+ * - The first character must be a letter.
+ * - The last character must be a letter or number.
+ * - Minimum of 4 characters.
+ * - Maximum of 63 characters.
+ */
+const NAME_OPTS: NameOptions = {
+  maxLen: 63,
+  case: CaseConventions.LOWERCASE,
+  disallowedRegex: /[^a-zA-Z0-9\-]+/g,
+  prefix: "wing-counter-",
+};
+
+/**
+ * GCP implementation of `cloud.Counter`.
+ *
+ * @inflight `@winglang/sdk.cloud.ICounterClient`
+ */
+export class Counter extends cloud.Counter {
+  private readonly database: FirestoreDatabase;
+
+  constructor(scope: Construct, id: string, props: cloud.CounterProps = {}) {
+    super(scope, id, props);
+
+    const cloudFirestoreApi = new ProjectService(this, "CloudFirestoreAPI", {
+      service: "firestore.googleapis.com",
+      disableOnDestroy: false,
+    });
+
+    this.database = new FirestoreDatabase(this, "Default", {
+      name: ResourceNames.generateName(this, NAME_OPTS),
+      locationId: (App.of(this) as App).region,
+      type: "DATASTORE_MODE",
+      concurrencyMode: "OPTIMISTIC",
+      appEngineIntegrationMode: "DISABLED",
+      pointInTimeRecoveryEnablement: "POINT_IN_TIME_RECOVERY_DISABLED",
+      deleteProtectionState: "DELETE_PROTECTION_DISABLED",
+      deletionPolicy: "DELETE",
+      dependsOn: [cloudFirestoreApi],
+    });
+  }
+
+  /** @internal */
+  public get _liftMap(): core.LiftMap {
+    return {
+      [cloud.CounterInflightMethods.PEEK]: [],
+      [cloud.CounterInflightMethods.INC]: [],
+      [cloud.CounterInflightMethods.DEC]: [],
+      [cloud.CounterInflightMethods.SET]: [],
+    };
+  }
+
+  public onLift(host: IInflightHost, ops: string[]): void {
+    if (!(host instanceof GCPFunction)) {
+      throw new Error("counters can only be bound by tfgcp.Function for now");
+    }
+
+    const permissions = calculateCounterPermissions(ops);
+    host.addPermissions(permissions);
+
+    host.addEnvironment(this.envName(), this.database.name);
+    super.onLift(host, ops);
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return core.InflightClient.for(
+      __dirname.replace("target-tf-gcp", "shared-gcp"),
+      __filename,
+      "CounterClient",
+      [`process.env["${this.envName()}"]`, `${this.initial}`]
+    );
+  }
+
+  private envName(): string {
+    return `FIRESTORE_DATABASE_NAME_${this.node.addr.slice(-8)}`;
+  }
+}
diff --git a/libs/wingsdk/src/target-tf-gcp/function.ts b/libs/wingsdk/src/target-tf-gcp/function.ts
index d55bf262bb8..30aa60c8a76 100644
--- a/libs/wingsdk/src/target-tf-gcp/function.ts
+++ b/libs/wingsdk/src/target-tf-gcp/function.ts
@@ -1,19 +1,19 @@
 import { writeFileSync } from "fs";
-import { join, resolve } from "path";
-import { AssetType, Lazy, TerraformAsset } from "cdktf";
+import { join, basename } from "path";
+import { AssetType, Lazy, TerraformAsset, Fn } from "cdktf";
 import { Construct } from "constructs";
 import { App } from "./app";
 import { Bucket } from "./bucket";
-import {
-  RoleType,
-  addBucketPermission,
-  addFunctionPermission,
-} from "./permissions";
 import { core } from "..";
 import { CloudfunctionsFunction } from "../.gen/providers/google/cloudfunctions-function";
+import { CloudfunctionsFunctionIamMember } from "../.gen/providers/google/cloudfunctions-function-iam-member";
+import { ProjectIamCustomRole } from "../.gen/providers/google/project-iam-custom-role";
+import { ProjectIamMember } from "../.gen/providers/google/project-iam-member";
 import { ServiceAccount } from "../.gen/providers/google/service-account";
 import { StorageBucketObject } from "../.gen/providers/google/storage-bucket-object";
 import * as cloud from "../cloud";
+import { LiftMap } from "../core";
+import { NotImplementedError } from "../core/errors";
 import { createBundle } from "../shared/bundling";
 import { DEFAULT_MEMORY_SIZE } from "../shared/function";
 import {
@@ -21,7 +21,7 @@ import {
   NameOptions,
   ResourceNames,
 } from "../shared/resource-names";
-import { IInflightHost, IResource } from "../std";
+import { IInflightHost } from "../std";
 
 const FUNCTION_NAME_OPTS: NameOptions = {
   maxLen: 32,
@@ -29,16 +29,57 @@ const FUNCTION_NAME_OPTS: NameOptions = {
   case: CaseConventions.LOWERCASE,
 };
 
+/**
+ * Interface for GCP Cloud Function
+ */
+export interface IGcpFunction {
+  /**
+   * GCP Function Name
+   */
+  readonly name: string;
+  /**
+   * GCP HTTPS Trigger URL
+   */
+  readonly httpsTriggerUrl: string;
+}
+
 /**
  * GCP implementation of `cloud.Function`.
  *
  * @inflight `@winglang/sdk.cloud.IFunctionClient`
  */
-
 export class Function extends cloud.Function {
+  /**
+   * Attempts to cast an IInflightHost to an IGcpFunction if it is one.
+   * @param host The IInflightHost instance to check and cast.
+   * @returns An IGcpFunction if the host is a GCP function, undefined otherwise.
+   */
+  public static from(host: IInflightHost): IGcpFunction | undefined {
+    if (this.isGcpFunction(host)) {
+      return host;
+    }
+    return undefined;
+  }
+
+  /**
+   * Checks if the given object is an instance of IGcpFunction.
+   * @param obj The object to check.
+   * @returns true if the object is an IGcpFunction, false otherwise.
+   */
+  private static isGcpFunction(obj: any): obj is IGcpFunction {
+    return (
+      typeof obj.name === "string" && typeof obj.httpsTriggerUrl === "string"
+    );
+  }
+
   private readonly function: CloudfunctionsFunction;
   private readonly functionServiceAccount: ServiceAccount;
-  private permissions: Set<string> = new Set();
+  private readonly functionCustomRole: ProjectIamCustomRole;
+  private readonly permissions: Set<string> = new Set([
+    "cloudfunctions.functions.get",
+  ]);
+
+  private assetPath: string | undefined; // posix path
 
   constructor(
     scope: Construct,
@@ -51,32 +92,11 @@ export class Function extends cloud.Function {
     // app is a property of the `cloud.Function` class
     const app = App.of(this) as App;
 
-    // bundled code is guaranteed to be in a fresh directory
-    const bundle = createBundle(this.entrypoint, [
-      "@google-cloud/functions-framework",
-    ]);
-
-    const packageJson = join(bundle.directory, "package.json");
-
-    writeFileSync(
-      packageJson,
-      JSON.stringify(
-        {
-          main: "index.js",
-          dependencies: {
-            "@google-cloud/functions-framework": "^3.0.0",
-          },
-        },
-        null,
-        2
-      )
-    );
-
-    // Create Cloud Function executable
-    const asset = new TerraformAsset(this, "Asset", {
-      path: resolve(bundle.directory),
-      type: AssetType.ARCHIVE,
-    });
+    if (props.concurrency != null) {
+      throw new NotImplementedError(
+        "Function concurrency isn't implemented yet on the current target."
+      );
+    }
 
     // memory limits must be between 128 and 8192 MB
     if (props?.memory && (props.memory < 128 || props.memory > 8192)) {
@@ -105,13 +125,21 @@ export class Function extends cloud.Function {
       {
         name: "objects",
         bucket: FunctionBucket.bucket.name,
-        source: asset.path,
+        source: Lazy.stringValue({
+          produce: () => {
+            if (!this.assetPath) {
+              throw new Error("assetPath was not set");
+            }
+            return this.assetPath;
+          },
+        }),
       }
     );
+
     // Step 1: Create Custom Service Account
     this.functionServiceAccount = new ServiceAccount(
       this,
-      `serviceAccount${this.node.addr.substring(-8)}`,
+      `ServiceAccount${this.node.addr.substring(-8)}`,
       {
         accountId: ResourceNames.generateName(this, FUNCTION_NAME_OPTS),
         displayName: `Custom Service Account for Cloud Function ${this.node.addr.substring(
@@ -119,18 +147,37 @@ export class Function extends cloud.Function {
         )}`,
       }
     );
-    // create the cloud function
+    // Step 2: Create Custom Role
+    this.functionCustomRole = new ProjectIamCustomRole(
+      this,
+      `CustomRole${this.node.addr.substring(-8)}`,
+      {
+        roleId: `cloudfunctions.custom${this.node.addr.substring(-8)}`,
+        title: `Custom Role for Cloud Function ${this.node.addr.substring(-8)}`,
+        permissions: Lazy.listValue({
+          produce: () => Array.from(this.permissions),
+        }),
+      }
+    );
+    // Step 3: Grant Custom Role to Custom Service Account on the Project
+    new ProjectIamMember(this, "ProjectIamMember", {
+      project: app.projectId,
+      role: `projects/${app.projectId}/roles/${this.functionCustomRole.roleId}`,
+      member: `serviceAccount:${this.functionServiceAccount.email}`,
+    });
+    // Step 4: Create the Cloud Function with Custom Service Account
     this.function = new CloudfunctionsFunction(this, "DefaultFunction", {
       name: ResourceNames.generateName(this, FUNCTION_NAME_OPTS),
       description: "This function was created by Wing",
       project: app.projectId,
       region: app.region,
-      runtime: "nodejs18",
+      runtime: "nodejs20",
       availableMemoryMb: props.memory ?? DEFAULT_MEMORY_SIZE,
       sourceArchiveBucket: FunctionBucket.bucket.name,
       sourceArchiveObject: FunctionObjectBucket.name,
       entryPoint: "handler",
       triggerHttp: true,
+      httpsTriggerSecurityLevel: "SECURE_ALWAYS",
       // It takes around 1 minutes to the function invocation permissions to be established -
       // therefore, the timeout is higher than in other targets
       timeout: props.timeout?.seconds ?? 120,
@@ -172,6 +219,41 @@ export class Function extends cloud.Function {
     return lines;
   }
 
+  /** @internal */
+  public _preSynthesize(): void {
+    super._preSynthesize();
+
+    // bundled code is guaranteed to be in a fresh directory
+    const bundle = createBundle(this.entrypoint, [
+      "@google-cloud/functions-framework",
+      "@google-cloud/datastore",
+    ]);
+
+    const packageJson = join(bundle.directory, "package.json");
+
+    writeFileSync(
+      packageJson,
+      JSON.stringify(
+        {
+          main: basename(bundle.outfilePath),
+          dependencies: {
+            "@google-cloud/functions-framework": "^3.0.0",
+            "@google-cloud/datastore": "8.4.0",
+          },
+        },
+        null,
+        2
+      )
+    );
+
+    const asset = new TerraformAsset(this, "Asset", {
+      path: bundle.directory,
+      type: AssetType.ARCHIVE,
+    });
+
+    this.assetPath = asset.path;
+  }
+
   public get functionName(): string {
     return this.function.name;
   }
@@ -189,8 +271,10 @@ export class Function extends cloud.Function {
   }
 
   /** @internal */
-  public _supportedOps(): string[] {
-    return [cloud.FunctionInflightMethods.INVOKE];
+  public get _liftMap(): LiftMap {
+    return {
+      [cloud.FunctionInflightMethods.INVOKE]: [[this.handler, ["handle"]]],
+    };
   }
 
   /** @internal */
@@ -207,23 +291,10 @@ export class Function extends cloud.Function {
     );
   }
 
-  public addPermission(scopedResource: IResource, permission: RoleType): void {
-    const uniqueId = scopedResource.node.addr.substring(-8);
-
-    if (this.permissions.has(`${uniqueId}_${permission}`)) {
-      return; // already exists
-    }
-    if (scopedResource instanceof Bucket) {
-      addBucketPermission(this, scopedResource, permission);
-    } else if (scopedResource instanceof Function) {
-      addFunctionPermission(this, scopedResource, permission);
-    } else {
-      throw new Error(
-        `Unsupported resource type ${scopedResource.constructor.name}`
-      );
-    }
-
-    this.permissions.add(`${uniqueId}_${permission}`);
+  public addPermissions(permissions: string[]): void {
+    permissions.forEach((permission) => {
+      this.permissions.add(permission);
+    });
   }
 
   public onLift(host: IInflightHost, ops: string[]): void {
@@ -234,7 +305,7 @@ export class Function extends cloud.Function {
     }
 
     if (ops.includes(cloud.FunctionInflightMethods.INVOKE)) {
-      host.addPermission(this, RoleType.FUNCTION_INVOKER);
+      host.addPermissions(["cloudfunctions.functions.invoke"]);
     }
 
     const { region, projectId } = App.of(this) as App;
@@ -245,6 +316,28 @@ export class Function extends cloud.Function {
     super.onLift(host, ops);
   }
 
+  /**
+   * Grants the given service account permission to invoke this function.
+   * @param serviceAccount The service account to grant invoke permissions to.
+   * @internal
+   */
+  public _addPermissionToInvoke(serviceAccount: ServiceAccount): void {
+    const hash = Fn.sha256(serviceAccount.email).slice(-8);
+
+    new CloudfunctionsFunctionIamMember(this, `invoker-permission-${hash}`, {
+      project: this.function.project,
+      region: this.function.region,
+      cloudFunction: this.function.name,
+      role: "roles/cloudfunctions.invoker",
+      member: `serviceAccount:${serviceAccount.email}`,
+    });
+  }
+
+  /** @internal */
+  public _getHttpsTriggerUrl(): string {
+    return this.function.httpsTriggerUrl;
+  }
+
   private envName(): string {
     return `FUNCTION_NAME_${this.node.addr.slice(-8)}`;
   }
diff --git a/libs/wingsdk/src/target-tf-gcp/permissions.ts b/libs/wingsdk/src/target-tf-gcp/permissions.ts
index 55b21732b04..3a5aa902a4e 100644
--- a/libs/wingsdk/src/target-tf-gcp/permissions.ts
+++ b/libs/wingsdk/src/target-tf-gcp/permissions.ts
@@ -1,57 +1,91 @@
-import { Construct } from "constructs";
-import { Bucket } from "./bucket";
-import { Function } from "./function";
-import { CloudfunctionsFunctionIamMember } from "../.gen/providers/google/cloudfunctions-function-iam-member";
-import { StorageBucketIamMember } from "../.gen/providers/google/storage-bucket-iam-member";
-
-export enum RoleType {
-  STORAGE_READ = "roles/storage.objectViewer",
-  STORAGE_READ_WRITE = "roles/storage.objectUser",
-  FUNCTION_INVOKER = "roles/cloudfunctions.invoker",
-  FUNCTION_VIEWER = "roles/cloudfunctions.viewer",
-}
+import * as cloud from "../cloud";
 
-export function addFunctionPermission(
-  host: Function,
-  scopedResource: Function,
-  permission: RoleType
-) {
-  new CloudfunctionsFunctionIamMember(
-    host,
-    createMemberPermissionId(host, scopedResource, permission),
-    {
-      project: scopedResource.project,
-      region: scopedResource.region,
-      cloudFunction: scopedResource.functionName,
-      role: permission,
-      member: `serviceAccount:${host.serviceAccountEmail}`,
-    }
-  );
-}
+export function calculateBucketPermissions(ops: string[]): string[] {
+  const permissions: string[] = [];
+
+  if (
+    ops.includes(cloud.BucketInflightMethods.GET) ||
+    ops.includes(cloud.BucketInflightMethods.GET_JSON) ||
+    ops.includes(cloud.BucketInflightMethods.TRY_GET) ||
+    ops.includes(cloud.BucketInflightMethods.TRY_GET_JSON) ||
+    ops.includes(cloud.BucketInflightMethods.TRY_DELETE) ||
+    ops.includes(cloud.BucketInflightMethods.EXISTS) ||
+    ops.includes(cloud.BucketInflightMethods.METADATA) ||
+    ops.includes(cloud.BucketInflightMethods.PUBLIC_URL) ||
+    ops.includes(cloud.BucketInflightMethods.COPY) ||
+    ops.includes(cloud.BucketInflightMethods.RENAME) ||
+    ops.includes(cloud.BucketInflightMethods.SIGNED_URL)
+  ) {
+    permissions.push("storage.objects.get");
+  }
+
+  if (
+    ops.includes(cloud.BucketInflightMethods.PUT) ||
+    ops.includes(cloud.BucketInflightMethods.PUT_JSON) ||
+    ops.includes(cloud.BucketInflightMethods.COPY) ||
+    ops.includes(cloud.BucketInflightMethods.RENAME) ||
+    ops.includes(cloud.BucketInflightMethods.SIGNED_URL)
+  ) {
+    permissions.push("storage.objects.create");
+  }
+
+  if (
+    ops.includes(cloud.BucketInflightMethods.DELETE) ||
+    ops.includes(cloud.BucketInflightMethods.TRY_DELETE) ||
+    ops.includes(cloud.BucketInflightMethods.PUT) ||
+    ops.includes(cloud.BucketInflightMethods.PUT_JSON) ||
+    ops.includes(cloud.BucketInflightMethods.COPY) ||
+    ops.includes(cloud.BucketInflightMethods.RENAME) ||
+    ops.includes(cloud.BucketInflightMethods.SIGNED_URL)
+  ) {
+    permissions.push("storage.objects.delete");
+  }
+
+  if (
+    ops.includes(cloud.BucketInflightMethods.LIST) ||
+    ops.includes(cloud.BucketInflightMethods.SIGNED_URL)
+  ) {
+    permissions.push("storage.objects.list");
+  }
 
-function createMemberPermissionId(
-  host: Function,
-  resource: Construct,
-  permission: string
-): string {
-  return `MemberPermission-${permission.replace(
-    /[.\\\/]/g,
-    "-"
-  )}-${resource.node.addr.slice(-8)}-${host.node.addr.slice(-8)}`;
+  if (ops.includes(cloud.BucketInflightMethods.PUBLIC_URL)) {
+    permissions.push("storage.buckets.get");
+  }
+
+  if (ops.includes(cloud.BucketInflightMethods.SIGNED_URL)) {
+    permissions.push("iam.serviceAccounts.signBlob");
+  }
+
+  return permissions;
 }
 
-export function addBucketPermission(
-  host: Function,
-  bucket: Bucket,
-  permission: RoleType
-) {
-  new StorageBucketIamMember(
-    host,
-    createMemberPermissionId(host, bucket, permission),
-    {
-      bucket: bucket.bucket.name,
-      role: permission,
-      member: `serviceAccount:${host.serviceAccountEmail}`,
-    }
-  );
+export function calculateCounterPermissions(ops: string[]): string[] {
+  const permissions: string[] = [];
+
+  if (
+    ops.includes(cloud.CounterInflightMethods.PEEK) ||
+    ops.includes(cloud.CounterInflightMethods.INC) ||
+    ops.includes(cloud.CounterInflightMethods.DEC)
+  ) {
+    permissions.push("datastore.entities.get");
+  }
+
+  if (
+    ops.includes(cloud.CounterInflightMethods.PEEK) ||
+    ops.includes(cloud.CounterInflightMethods.INC) ||
+    ops.includes(cloud.CounterInflightMethods.DEC) ||
+    ops.includes(cloud.CounterInflightMethods.SET)
+  ) {
+    permissions.push("datastore.entities.create");
+  }
+
+  if (
+    ops.includes(cloud.CounterInflightMethods.INC) ||
+    ops.includes(cloud.CounterInflightMethods.DEC) ||
+    ops.includes(cloud.CounterInflightMethods.SET)
+  ) {
+    permissions.push("datastore.entities.update");
+  }
+
+  return permissions;
 }
diff --git a/libs/wingsdk/src/target-tf-gcp/schedule.ts b/libs/wingsdk/src/target-tf-gcp/schedule.ts
new file mode 100644
index 00000000000..7a9609605de
--- /dev/null
+++ b/libs/wingsdk/src/target-tf-gcp/schedule.ts
@@ -0,0 +1,111 @@
+import { Construct } from "constructs";
+import { App } from "./app";
+import { Function } from "./function";
+import { CloudSchedulerJob } from "../.gen/providers/google/cloud-scheduler-job";
+import { ServiceAccount } from "../.gen/providers/google/service-account";
+import * as cloud from "../cloud";
+import * as core from "../core";
+import { Node } from "../std";
+
+/**
+ * GCP implementation of `cloud.Schedule`.
+ *
+ * @inflight `@winglang/sdk.cloud.IScheduleClient`
+ */
+export class Schedule extends cloud.Schedule {
+  private readonly scheduleExpression: string;
+  // private readonly scheduler: CloudSchedulerJob;
+  private readonly handlers: Record<string, Function> = {};
+
+  constructor(scope: Construct, id: string, props: cloud.ScheduleProps = {}) {
+    super(scope, id, props);
+
+    const { rate, cron } = props;
+
+    /*
+     * A schedule is defined using the unix-cron string format (* * * * *) which
+     * is a set of five fields in a line, indicating when the job should be executed.
+     * https://cloud.google.com/scheduler/docs/configuring/cron-job-schedules
+     */
+    this.scheduleExpression = (
+      rate ? `*/${rate.minutes} * * * *` : cron
+    ) as string;
+  }
+
+  public onTick(
+    inflight: cloud.IScheduleOnTickHandler,
+    props: cloud.ScheduleOnTickOptions = {}
+  ): cloud.Function {
+    const uniqueId = this.node.addr.substring(0, 8);
+
+    const functionHandler = core.lift({ inflight }).inflight(async (ctx) => {
+      await ctx.inflight();
+    });
+
+    let cronFunction = this.handlers[inflight._id];
+    if (cronFunction) {
+      return cronFunction;
+    }
+
+    cronFunction = new Function(
+      this,
+      App.of(this).makeId(this, "OnTick"),
+      functionHandler,
+      props
+    );
+    this.handlers[inflight._id] = cronFunction;
+
+    // create scheduler service account
+    const schedulerServiceAccount = new ServiceAccount(
+      this,
+      "SchedulerServiceAccount",
+      {
+        accountId: `scheduler-${uniqueId}-sa`,
+        displayName: `Service Account for scheduler-${uniqueId}`,
+      }
+    );
+
+    // allow scheduler service account to invoke cron function
+    cronFunction._addPermissionToInvoke(schedulerServiceAccount);
+
+    // create scheduler
+    new CloudSchedulerJob(this, "Scheduler", {
+      name: `scheduler-${uniqueId}`,
+      description: `Trigger ${cronFunction.functionName}`,
+      schedule: this.scheduleExpression,
+      timeZone: "Etc/UTC",
+      attemptDeadline: "300s",
+      httpTarget: {
+        httpMethod: "GET",
+        uri: cronFunction._getHttpsTriggerUrl(),
+        oidcToken: {
+          serviceAccountEmail: schedulerServiceAccount.email,
+        },
+      },
+    });
+
+    Node.of(this).addConnection({
+      source: this,
+      sourceOp: cloud.ScheduleInflightMethods.TICK,
+      target: cronFunction,
+      targetOp: cloud.FunctionInflightMethods.INVOKE,
+      name: "tick",
+    });
+
+    return cronFunction;
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    return core.InflightClient.for(
+      __dirname.replace("target-tf-gcp", "shared-gcp"),
+      __filename,
+      "ScheduleClient",
+      [`process.env["${this.envName()}"]`]
+    );
+  }
+
+  private envName(): string {
+    return `SCHEDULE_EVENT_${this.node.addr.slice(-8)}`;
+  }
+}
diff --git a/libs/wingsdk/src/target-tf-gcp/table.ts b/libs/wingsdk/src/target-tf-gcp/table.ts
index 58d6d3a28ab..4887e3a0273 100644
--- a/libs/wingsdk/src/target-tf-gcp/table.ts
+++ b/libs/wingsdk/src/target-tf-gcp/table.ts
@@ -44,7 +44,8 @@ export class Table extends ex.Table {
 
     if (props.initialRows) {
       throw new NotImplementedError(
-        `Property initialRows is not supported for the GCP target`
+        `Property initialRows is not supported for the GCP target`,
+        { resource: this.constructor.name, operation: "initialRows" }
       );
     }
 
@@ -88,14 +89,10 @@ export class Table extends ex.Table {
     new BigtableTable(this, "Default", tableConfig);
   }
 
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [];
-  }
-
   public addRow(_key: string, _row: Json): void {
     throw new NotImplementedError(
-      "Method is not supported as a preflight for the GCP target."
+      "Method is not supported as a preflight for the GCP target.",
+      { resource: this.constructor.name, operation: "addRow" }
     );
   }
 
diff --git a/libs/wingsdk/src/ui/base.ts b/libs/wingsdk/src/ui/base.ts
index abbb72782d6..a3cb816348c 100644
--- a/libs/wingsdk/src/ui/base.ts
+++ b/libs/wingsdk/src/ui/base.ts
@@ -10,6 +10,7 @@ export const VISUAL_COMPONENT_SYMBOL = Symbol.for(
 /**
  * A visual component is used to customize the view of other classes in the Wing Console.
  * This is a base class for all other visual components.
+ * @noinflight
  */
 export abstract class VisualComponent extends Resource {
   /**
diff --git a/libs/wingsdk/src/ui/button.ts b/libs/wingsdk/src/ui/button.ts
index a54f769a925..2d03f8fbbf6 100644
--- a/libs/wingsdk/src/ui/button.ts
+++ b/libs/wingsdk/src/ui/button.ts
@@ -12,6 +12,7 @@ export const BUTTON_FQN = fqnForType("ui.Button");
 
 /**
  * A button can be used to perform an action.
+ * @noinflight
  */
 export class Button extends VisualComponent {
   /**
@@ -50,11 +51,6 @@ export class Button extends VisualComponent {
     };
   }
 
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [];
-  }
-
   /** @internal */
   public _toInflight(): string {
     throw new Error("Method not implemented.");
diff --git a/libs/wingsdk/src/ui/colors.ts b/libs/wingsdk/src/ui/colors.ts
new file mode 100644
index 00000000000..bbee25ec467
--- /dev/null
+++ b/libs/wingsdk/src/ui/colors.ts
@@ -0,0 +1,28 @@
+export type Colors =
+  | "orange"
+  | "sky"
+  | "emerald"
+  | "lime"
+  | "pink"
+  | "amber"
+  | "cyan"
+  | "purple"
+  | "red"
+  | "violet"
+  | "slate";
+
+export const isOfTypeColors = (keyInput?: string): keyInput is Colors => {
+  return [
+    "orange",
+    "sky",
+    "emerald",
+    "lime",
+    "pink",
+    "amber",
+    "cyan",
+    "purple",
+    "red",
+    "violet",
+    "slate",
+  ].includes(keyInput || "");
+};
diff --git a/libs/wingsdk/src/ui/field.ts b/libs/wingsdk/src/ui/field.ts
index 6be822a9d5e..143b5f46e0b 100644
--- a/libs/wingsdk/src/ui/field.ts
+++ b/libs/wingsdk/src/ui/field.ts
@@ -2,7 +2,7 @@ import { Construct } from "constructs";
 import { VisualComponent } from "./base";
 import { Function } from "../cloud";
 import { fqnForType } from "../constants";
-import { App, UIComponent } from "../core";
+import { App, UIComponent, lift } from "../core";
 import { Duration, IInflight } from "../std";
 
 /**
@@ -19,10 +19,18 @@ export interface FieldProps {
    * @default - no automatic refresh
    */
   readonly refreshRate?: Duration;
+
+  /**
+   * Indicates that this field is a link.
+   *
+   * @default false
+   */
+  readonly link?: boolean;
 }
 
 /**
  * A field can be used to display a value.
+ * @noinflight
  */
 export class Field extends VisualComponent {
   /**
@@ -49,6 +57,7 @@ export class Field extends VisualComponent {
   private readonly fn: Function;
   private readonly label: string;
   private readonly refreshRate: number | undefined;
+  private readonly link: boolean | undefined;
 
   constructor(
     scope: Construct,
@@ -62,6 +71,7 @@ export class Field extends VisualComponent {
     this.label = label;
     this.refreshRate = props.refreshRate?.seconds;
     this.fn = new Function(this, "Handler", handler);
+    this.link = props.link;
   }
 
   /** @internal */
@@ -71,14 +81,10 @@ export class Field extends VisualComponent {
       label: this.label,
       handler: this.fn.node.path,
       refreshRate: this.refreshRate,
+      link: this.link,
     };
   }
 
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [];
-  }
-
   /** @internal */
   public _toInflight(): string {
     throw new Error("Method not implemented.");
@@ -103,3 +109,17 @@ export interface IFieldHandlerClient {
    */
   handle(): Promise<string>;
 }
+
+/**
+ * A value field can be used to display a string value.
+ * @noinflight
+ */
+export class ValueField extends Field {
+  constructor(scope: Construct, id: string, label: string, value: string) {
+    const handler = lift({ value }).inflight(async (ctx) => {
+      return ctx.value;
+    });
+
+    super(scope, id, label, handler);
+  }
+}
diff --git a/libs/wingsdk/src/ui/file-browser.ts b/libs/wingsdk/src/ui/file-browser.ts
new file mode 100644
index 00000000000..f17de508742
--- /dev/null
+++ b/libs/wingsdk/src/ui/file-browser.ts
@@ -0,0 +1,236 @@
+import { Construct } from "constructs";
+import { VisualComponent } from "./base";
+import { Function } from "../cloud";
+import { fqnForType } from "../constants";
+import { App, UIComponent, lift } from "../core";
+import { INFLIGHT_SYMBOL } from "../core/types";
+import { IInflight } from "../std";
+
+/**
+ * Global identifier for `FileBrowser`.
+ */
+export const FILE_BROWSER_FQN = fqnForType("ui.FileBrowser");
+
+/**
+ * File browser handlers.
+ */
+export interface FileBrowserHandlers {
+  /**
+   * Handler for putting a file.
+   */
+  readonly put: IFileBrowserPutHandler;
+  /**
+   * Handler for deleting a file.
+   */
+  readonly delete: IFileBrowserDeleteHandler;
+  /**
+   * Handler for getting a file.
+   */
+  readonly get: IFileBrowserGetHandler;
+  /**
+   * Handler for listing files.
+   */
+  readonly list: IFileBrowserListHandler;
+}
+
+/**
+ * A file browser can be used to browse files.
+ * @noinflight
+ */
+export class FileBrowser extends VisualComponent {
+  /**
+   * Creates a new ui.FileBrowser instance through the app.
+   * @internal
+   */
+  public static _newFileBrowser(
+    scope: Construct,
+    id: string,
+    label: string,
+    handlers: FileBrowserHandlers
+  ): FileBrowser {
+    return App.of(scope).newAbstract(
+      FILE_BROWSER_FQN,
+      scope,
+      id,
+      label,
+      handlers
+    );
+  }
+
+  private readonly getFn: Function;
+  private readonly putFn: Function;
+  private readonly deleteFn: Function;
+  private readonly listFn: Function;
+  private readonly label: string;
+
+  constructor(
+    scope: Construct,
+    id: string,
+    label: string,
+    handlers: FileBrowserHandlers
+  ) {
+    super(scope, id);
+    this.label = label;
+
+    const getHandler = lift({ handler: handlers.get }).inflight(
+      async (ctx, payload) => {
+        try {
+          const fileName = JSON.parse(payload).fileName;
+          return await ctx.handler(fileName);
+        } catch (e) {
+          throw new Error(
+            "Invalid payload for file browser get handler client"
+          );
+        }
+      }
+    );
+
+    const putHandler = lift({ handler: handlers.put }).inflight(
+      async (ctx, payload) => {
+        try {
+          const { fileName, fileContent } = JSON.parse(payload);
+          return await ctx.handler(fileName, fileContent);
+        } catch (e) {
+          throw new Error(
+            "Invalid payload for file browser put handler client"
+          );
+        }
+      }
+    );
+
+    const deleteHandler = lift({ handler: handlers.delete }).inflight(
+      async (ctx, payload) => {
+        try {
+          const fileName = JSON.parse(payload).fileName;
+          return await ctx.handler(fileName);
+        } catch (e) {
+          throw new Error(
+            "Invalid payload for file browser delete handler client"
+          );
+        }
+      }
+    );
+
+    const listHandler = lift({ handler: handlers.list }).inflight(
+      async (ctx) => {
+        try {
+          return await ctx.handler();
+        } catch (e) {
+          throw new Error(
+            "Invalid payload for file browser list handler client"
+          );
+        }
+      }
+    );
+
+    this.getFn = new Function(this, "get", getHandler);
+    this.putFn = new Function(this, "put", putHandler);
+    this.deleteFn = new Function(this, "delete", deleteHandler);
+    this.listFn = new Function(this, "list", listHandler);
+  }
+
+  /** @internal */
+  public _toUIComponent(): UIComponent {
+    return {
+      kind: "file-browser",
+      label: this.label,
+      putHandler: this.putFn.node.path,
+      deleteHandler: this.deleteFn.node.path,
+      getHandler: this.getFn.node.path,
+      listHandler: this.listFn.node.path,
+    };
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    throw new Error("Method not implemented.");
+  }
+}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to
+ * `IFileBrowser`.
+ *
+ * @inflight `@winglang/sdk.ui.IFileBrowserPutHandlerClient`
+ */
+export interface IFileBrowserPutHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IFileBrowserPutHandlerClient["handle"];
+}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to
+ * `IFileBrowser`.
+ *
+ * @inflight `@winglang/sdk.ui.IFileBrowserGetHandlerClient`
+ */
+export interface IFileBrowserGetHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IFileBrowserGetHandlerClient["handle"];
+}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to
+ * `IFileBrowser`.
+ *
+ * @inflight `@winglang/sdk.ui.IFileBrowserListHandlerClient`
+ */
+export interface IFileBrowserListHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IFileBrowserListHandlerClient["handle"];
+}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to
+ * `IFileBrowser`.
+ *
+ * @inflight `@winglang/sdk.ui.IFileBrowserDeleteHandlerClient`
+ */
+export interface IFileBrowserDeleteHandler extends IInflight {
+  /** @internal */
+  [INFLIGHT_SYMBOL]?: IFileBrowserDeleteHandlerClient["handle"];
+}
+
+/**
+ * Inflight client for `IFileBrowserVoidHandler`.
+ */
+export interface IFileBrowserPutHandlerClient {
+  /**
+   * Function that performs an action.
+   * @inflight
+   */
+  handle(fileName: string, fileContent: string): Promise<void>;
+}
+
+/**
+ * Inflight client for `IFileBrowserGetHandler`.
+ */
+export interface IFileBrowserGetHandlerClient {
+  /**
+   * Function that performs an action.
+   * @inflight
+   */
+  handle(fileName: string): Promise<string>;
+}
+
+/**
+ * Inflight client for `IFileBrowserDeleteHandler`.
+ */
+export interface IFileBrowserDeleteHandlerClient {
+  /**
+   * Function that performs an action.
+   * @inflight
+   */
+  handle(fileName: string): Promise<void>;
+}
+
+/**
+ * Inflight client for `IFileBrowserListHandler`.
+ */
+export interface IFileBrowserListHandlerClient {
+  /**
+   * Function that performs an action.
+   * @inflight
+   */
+  handle(): Promise<string[]>;
+}
diff --git a/libs/wingsdk/src/ui/http-client.ts b/libs/wingsdk/src/ui/http-client.ts
new file mode 100644
index 00000000000..f299b6472de
--- /dev/null
+++ b/libs/wingsdk/src/ui/http-client.ts
@@ -0,0 +1,113 @@
+import { Construct } from "constructs";
+import { VisualComponent } from "./base";
+import { Function } from "../cloud";
+import { fqnForType } from "../constants";
+import { App, UIComponent } from "../core";
+import { IInflight } from "../std";
+
+/**
+ * Global identifier for `HttpClient`.
+ */
+export const API_FQN = fqnForType("ui.HttpClient");
+
+/**
+ * An HttpClient can be used to make HTTP requests.
+ * @noinflight
+ */
+export class HttpClient extends VisualComponent {
+  /**
+   * Creates a new ui.HttpClient instance through the app.
+   * @internal
+   */
+  public static _newHttpClient(
+    scope: Construct,
+    id: string,
+    label: string,
+    getUrlHandler: IHttpClientGetUrlHandler,
+    getApiSpecHandler: IHttpClientGetApiSpecHandler
+  ): HttpClient {
+    return App.of(scope).newAbstract(
+      API_FQN,
+      scope,
+      id,
+      label,
+      getUrlHandler,
+      getApiSpecHandler
+    );
+  }
+
+  private readonly getUrlfn: Function;
+  private readonly getApiSpecfn: Function;
+  private readonly label: string;
+
+  constructor(
+    scope: Construct,
+    id: string,
+    label: string,
+    getUrlHandler: IHttpClientGetUrlHandler,
+    getApiSpecHandler: IHttpClientGetApiSpecHandler
+  ) {
+    super(scope, id);
+
+    this.label = label;
+    this.getUrlfn = new Function(this, "GetUrlHandler", getUrlHandler);
+    this.getApiSpecfn = new Function(
+      this,
+      "GetApiSpecHandler",
+      getApiSpecHandler
+    );
+  }
+
+  /** @internal */
+  public _toUIComponent(): UIComponent {
+    return {
+      kind: "http-client",
+      label: this.label,
+      getUrlHandler: this.getUrlfn.node.path,
+      getApiSpecHandler: this.getApiSpecfn.node.path,
+    };
+  }
+
+  /** @internal */
+  public _toInflight(): string {
+    throw new Error("Method not implemented.");
+  }
+}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to
+ * `IHttpClient`.
+ *
+ * @inflight `@winglang/sdk.ui.IHttpClientGetUrlHandlerClient`
+ */
+export interface IHttpClientGetUrlHandler extends IInflight {}
+
+/**
+ * A resource with an inflight "handle" method that can be passed to
+ * `IHttpClient`.
+ *
+ * @inflight `@winglang/sdk.ui.IHttpClientGetApiSpecHandlerClient`
+ */
+export interface IHttpClientGetApiSpecHandler extends IInflight {}
+
+/**
+ * Inflight client for `IHttpClientGetUrlHandler`.
+ */
+export interface IHttpClientGetUrlHandlerClient {
+  /**
+   * Function that returns the URL to make a request to.
+   * @inflight
+   */
+  handle(): Promise<string>;
+}
+
+/**
+ * Inflight client for `IHttpClientGetApiSpecHandler`.
+ */
+export interface IHttpClientGetApiSpecHandlerClient {
+  /**
+   * Function that returns the OpenAPI spec.
+   * @inflight
+   */
+  handle(): Promise<string>;
+}
diff --git a/libs/wingsdk/src/ui/index.ts b/libs/wingsdk/src/ui/index.ts
index 2c2913c3902..559dec6685f 100644
--- a/libs/wingsdk/src/ui/index.ts
+++ b/libs/wingsdk/src/ui/index.ts
@@ -1,4 +1,7 @@
 export * from "./base";
 export * from "./button";
+export * from "./colors";
 export * from "./field";
+export * from "./file-browser";
+export * from "./http-client";
 export * from "./section";
diff --git a/libs/wingsdk/src/ui/section.ts b/libs/wingsdk/src/ui/section.ts
index 9cd4043e087..c8c16c66e93 100644
--- a/libs/wingsdk/src/ui/section.ts
+++ b/libs/wingsdk/src/ui/section.ts
@@ -23,6 +23,7 @@ export interface SectionProps {
 
 /**
  * A section can be used to group other visual components.
+ * @noinflight
  */
 export class Section extends VisualComponent {
   /**
@@ -94,11 +95,6 @@ export class Section extends VisualComponent {
     };
   }
 
-  /** @internal */
-  public _supportedOps(): string[] {
-    return [];
-  }
-
   /** @internal */
   public _toInflight(): string {
     throw new Error("Method not implemented.");
diff --git a/libs/wingsdk/src/util/child-process.ts b/libs/wingsdk/src/util/child-process.ts
new file mode 100644
index 00000000000..a1db5d2c62c
--- /dev/null
+++ b/libs/wingsdk/src/util/child-process.ts
@@ -0,0 +1,124 @@
+import { spawn } from "child_process";
+import { Output, SpawnOptions, Stdio } from "./util";
+import { InflightClient } from "../core";
+
+/**
+ * Handle to a running child process.
+ */
+export class ChildProcess {
+  /**
+   * @internal
+   */
+  public static _toInflightType(): string {
+    return InflightClient.forType(__filename, this.name);
+  }
+
+  /**
+   * The underlying native child process object representing the spawned process.
+   */
+  private readonly child: ReturnType<typeof spawn>;
+  /**
+   * The child's OS-assigned process ID.
+   */
+  public readonly pid: number | undefined;
+  /**
+   * The accumulated standard output from the child process.
+   */
+  private stdout: string = "";
+  /**
+   * The accumulated standard error from the child process.
+   */
+  private stderr: string = "";
+  /**
+   * The exit status of the child process. Null if the process has not yet finished.
+   */
+  private exitStatus: number | null = null;
+
+  constructor(program: string, args: string[], opts?: SpawnOptions) {
+    const spawnOpts = {
+      cwd: opts?.cwd,
+      env: opts?.inheritEnv
+        ? { ...process.env, ...opts.env }
+        : { ...opts?.env },
+      stdio: [
+        opts?.stdin ?? Stdio.PIPED,
+        opts?.stdout ?? Stdio.PIPED,
+        opts?.stderr ?? Stdio.PIPED,
+      ],
+    };
+
+    // Spawn the child process with the provided options
+    this.child = spawn(program, args, spawnOpts);
+    this.pid = this.child.pid;
+
+    this.child.on("exit", (code) => {
+      this.exitStatus = code;
+    });
+  }
+
+  /**
+   * Kill the process.
+   * @param signal - the signal to send to the process (defaults to SIGTERM)
+   */
+  public kill(signal: number = 15): void {
+    this.child.kill(signal);
+  }
+
+  /**
+   * Wait for the process to finish and return its output.
+   * Calling this method multiple times will return the same output.
+   */
+  public async wait(): Promise<Output> {
+    if (this.exitStatus !== null) {
+      return {
+        stdout: this.stdout,
+        stderr: this.stderr,
+        status: this.exitStatus,
+      };
+    }
+
+    return new Promise((resolve, reject) => {
+      const cleanup = () => {
+        this.child.off("exit", onExit);
+        this.child.off("error", onError);
+        if (this.child.stdout) {
+          this.child.stdout.off("data", onDataStdout);
+        }
+        if (this.child.stderr) {
+          this.child.stderr.off("data", onDataStderr);
+        }
+      };
+
+      const onExit = (code: number | null, signal: string | null) => {
+        cleanup();
+        if (code !== null) {
+          resolve({ stdout: this.stdout, stderr: this.stderr, status: code });
+        } else {
+          reject(new Error(`Process terminated by signal ${signal}`));
+        }
+      };
+
+      const onError = (error: Error) => {
+        cleanup();
+        reject(error);
+      };
+
+      const onDataStdout = (data: Buffer) => {
+        this.stdout += data.toString();
+      };
+
+      const onDataStderr = (data: Buffer) => {
+        this.stderr += data.toString();
+      };
+
+      this.child.on("exit", onExit);
+      this.child.on("error", onError);
+      if (this.child.stdout) {
+        this.child.stdout.on("data", onDataStdout);
+      }
+      if (this.child.stderr) {
+        this.child.stderr.on("data", onDataStderr);
+      }
+    });
+  }
+}
diff --git a/libs/wingsdk/src/util/enhanced-error.ts b/libs/wingsdk/src/util/enhanced-error.ts
index 3f63f59e9eb..42783fc5db1 100644
--- a/libs/wingsdk/src/util/enhanced-error.ts
+++ b/libs/wingsdk/src/util/enhanced-error.ts
@@ -1,7 +1,8 @@
 import { stat } from "node:fs/promises";
-import { relative, resolve, sep, join } from "node:path";
+import { join, dirname } from "node:path/posix";
 import type Chalk from "chalk";
 import type StackTracey from "stacktracey";
+import { normalPath } from "../shared/misc";
 
 export interface PrettyPrintErrorOptions {
   /**
@@ -15,6 +16,11 @@ export interface PrettyPrintErrorOptions {
    * If provided, ANSI color and format will be used.
    */
   chalk?: typeof Chalk;
+
+  /**
+   * If true, will force reload all sources.
+   */
+  resetCache?: boolean;
 }
 
 /**
@@ -35,6 +41,10 @@ export async function prettyPrintError(
   const fBold = (s: string) => (chalk ? chalk.bold(s) : s);
   const fDim = (s: string) => (chalk ? chalk.dim(s) : s);
 
+  if (options?.resetCache) {
+    StackTracey.resetCache();
+  }
+
   let st: StackTracey | undefined;
   let originalMessage = "";
   if (typeof error === "string") {
@@ -63,35 +73,54 @@ export async function prettyPrintError(
     originalMessage = error.message;
   }
 
-  const message = fBold(fRed("runtime error: ")) + fRed(originalMessage);
-
-  st = await st.clean().withSourcesAsync();
-
-  let traceWithSources = st.items.filter((item) => !item.native);
+  const message = fBold(fRed("Error: ")) + fRed(originalMessage);
+
+  st = await st
+    .clean()
+    .filter((item) => !item.native)
+    // strip node internals
+    .filter((item) => !item.file.startsWith("node:"))
+    // strip wingsdk
+    .filter(
+      (item) =>
+        !normalPath(item.file).includes("/libs/wingsdk/src/") &&
+        !normalPath(item.file).includes("/@winglang/sdk/")
+    )
+    // special: remove the handler wrapper (See `cloud.Function` entrypoint for where this comes from)
+    .filter(
+      (item) => !normalPath(item.file).match(/\.wing\/\w+(\.sandbox)?\.cjs$/)
+    )
+    .withSourcesAsync();
+
+  let traceWithSources = st.items;
 
   if (traceWithSources.length === 0) {
     return message;
   }
 
   let interestingRoot = options?.sourceEntrypoint;
+  if (interestingRoot !== undefined) {
+    interestingRoot = normalPath(interestingRoot);
+  }
+
   if (
     interestingRoot !== undefined &&
     (await stat(interestingRoot)
       .then((s) => !s.isDirectory())
       .catch(() => true))
   ) {
-    interestingRoot = resolve(interestingRoot, "..");
+    interestingRoot = dirname(interestingRoot);
   }
 
   if (interestingRoot !== undefined) {
-    interestingRoot = interestingRoot + sep;
+    interestingRoot = join(interestingRoot, "/");
   }
 
   if (interestingRoot !== undefined) {
     traceWithSources = traceWithSources.filter((item) =>
       (item.sourceFile?.path ?? item.file).startsWith(interestingRoot!)
     );
-    const targetDir = join(interestingRoot, "target") + sep;
+    const targetDir = join(interestingRoot, "target", "/");
     traceWithSources = traceWithSources.filter(
       (item) => !(item.sourceFile?.path ?? item.file).startsWith(targetDir)
     );
@@ -121,9 +150,8 @@ export async function prettyPrintError(
     // print line and its surrounding lines
     output.push(
       " ".repeat(maxDigits + 1) +
-        `--> ${relative(
-          process.cwd(),
-          sourceFile.path
+        `--> ${normalPath(
+          firstGoodItem.fileRelative
         )}:${originLine}:${originColumn}`
     );
 
@@ -171,16 +199,28 @@ function printItem(item: StackTracey.Entry) {
   // These are typically useless
   // TODO These can possibly be removed when sourcemaps support "names" mappings
   if (
+    item.calleeShort === "$Root" ||
     item.calleeShort === "new $Root" ||
     item.calleeShort.includes("<anonymous>")
   ) {
     calleeShort = "";
   }
 
+  if (item.callee.match(/\$Closure\d+\.handle$/)) {
+    // inflight closures use "handle" as a way to represent calling the inflight itself
+    calleeShort = "";
+  }
+
+  if (item.fileName.endsWith(".w") && calleeShort.startsWith("async ")) {
+    // In userland wing traces, async = inflight and is currently redundant to mention
+    calleeShort = calleeShort.replace("async ", "");
+  }
+
   const file = item.file;
   const line = item.line;
   const column = item.column;
-  return `at ${calleeShort}(${file}:${line}:${column})`;
+
+  return `at ${calleeShort}${file}:${line}:${column}`;
 }
 
 export function rewriteCommonError(error: Error): Error {
diff --git a/libs/wingsdk/src/util/equality.ts b/libs/wingsdk/src/util/equality.ts
new file mode 100644
index 00000000000..d67e5e4d881
--- /dev/null
+++ b/libs/wingsdk/src/util/equality.ts
@@ -0,0 +1,475 @@
+// taken from node 18 https://github.com/nodejs/node/blob/v18.x/lib/internal/util/comparisons.js
+
+import {
+  isAnyArrayBuffer,
+  isArrayBufferView,
+  isDate,
+  isMap,
+  isRegExp,
+  isSet,
+  isNativeError,
+  isBoxedPrimitive,
+  isNumberObject,
+  isStringObject,
+  isBooleanObject,
+  isSymbolObject,
+  isFloat32Array,
+  isFloat64Array,
+} from "util/types";
+
+const kNoIterator = 0;
+const kIsArray = 1;
+const kIsSet = 2;
+const kIsMap = 3;
+
+export function deepStrictEqual(val1: any, val2: any, memos?: any) {
+  // All identical values are equivalent, as determined by ===.
+  if (val1 === val2) {
+    if (val1 !== 0) return true;
+    return Object.is(val1, val2);
+  }
+
+  // Check more closely if val1 and val2 are equal.
+  if (typeof val1 !== "object") {
+    return typeof val1 === "number" && Number.isNaN(val1) && Number.isNaN(val2);
+  }
+  if (typeof val2 !== "object" || val1 === null || val2 === null) {
+    return false;
+  }
+  if (Object.getPrototypeOf(val1) !== Object.getPrototypeOf(val2)) {
+    return false;
+  }
+
+  const val1Tag = val1.toString();
+  const val2Tag = val2.toString();
+
+  if (val1Tag !== val2Tag) {
+    return false;
+  }
+
+  if (Array.isArray(val1)) {
+    // Check for sparse arrays and general fast path
+    if (!Array.isArray(val2) || val1.length !== val2.length) {
+      return false;
+    }
+    const keys1 = getOwnNonIndexProperties(val1); // 179
+    const keys2 = getOwnNonIndexProperties(val2);
+    if (keys1.length !== keys2.length) {
+      return false;
+    }
+    return keyCheck(val1, val2, memos, kIsArray, keys1);
+  } else if (val1Tag === "[object Object]") {
+    return keyCheck(val1, val2, memos, kNoIterator);
+  } else if (isDate(val1)) {
+    if (!isDate(val2) || val1.getTime() !== val2.getTime()) {
+      return false;
+    }
+  } else if (isRegExp(val1)) {
+    if (!isRegExp(val2) || !areSimilarRegExps(val1, val2)) {
+      return false;
+    }
+  } else if (isNativeError(val1) || val1 instanceof Error) {
+    // Do not compare the stack as it might differ even though the error itself
+    // is otherwise identical.
+    if (
+      (!isNativeError(val2) && !(val2 instanceof Error)) ||
+      val1.message !== val2.message ||
+      val1.name !== val2.name
+    ) {
+      return false;
+    }
+  } else if (isArrayBufferView(val1)) {
+    if (!areSimilarTypedArrays(val1, val2)) {
+      return false;
+    }
+
+    if (
+      !areSimilarTypedArrays(val1, val2) &&
+      !isFloat32Array(val1) &&
+      !isFloat64Array(val1)
+    ) {
+      return false;
+    }
+    // Buffer.compare returns true, so val1.length === val2.length. If they both
+    // only contain numeric keys, we don't need to exam further than checking
+    // the symbols.
+    const keys1 = getOwnNonIndexProperties(val1);
+    const keys2 = getOwnNonIndexProperties(val2);
+    if (keys1.length !== keys2.length) {
+      return false;
+    }
+    return keyCheck(val1, val2, memos, kNoIterator, keys1);
+  } else if (isSet(val1)) {
+    if (!isSet(val2) || val1.size !== val2.size) {
+      return false;
+    }
+    return keyCheck(val1, val2, memos, kIsSet);
+  } else if (isMap(val1)) {
+    if (!isMap(val2) || val1.size !== val2.size) {
+      return false;
+    }
+    return keyCheck(val1, val2, memos, kIsMap);
+  } else if (isAnyArrayBuffer(val1)) {
+    if (!isAnyArrayBuffer(val2) || !areEqualArrayBuffers(val1, val2)) {
+      return false;
+    }
+  } else if (isBoxedPrimitive(val1)) {
+    if (!isEqualBoxedPrimitive(val1, val2)) {
+      return false;
+    }
+  } else if (
+    Array.isArray(val2) ||
+    isArrayBufferView(val2) ||
+    isSet(val2) ||
+    isMap(val2) ||
+    isDate(val2) ||
+    isRegExp(val2) ||
+    isAnyArrayBuffer(val2) ||
+    isBoxedPrimitive(val2) ||
+    isNativeError(val2) ||
+    val2 instanceof Error
+  ) {
+    return false;
+  }
+  return keyCheck(val1, val2, memos, kNoIterator);
+}
+
+function keyCheck(
+  val1: any,
+  val2: any,
+  memos: any,
+  iterationType: number,
+  aKeys?: Array<any>
+) {
+  // For all remaining Object pairs, including Array, objects and Maps,
+  // equivalence is determined by having:
+  // a) The same number of owned enumerable properties
+  // b) The same set of keys/indexes (although not necessarily the same order)
+  // c) Equivalent values for every corresponding key/index
+  // d) For Sets and Maps, equal contents
+  // Note: this accounts for both named and indexed properties on Arrays.
+  if (arguments.length === 4) {
+    aKeys = Object.keys(val1);
+    const bKeys = Object.keys(val2);
+
+    // The pair must have the same number of owned properties.
+    if (aKeys.length !== bKeys.length) {
+      return false;
+    }
+  }
+
+  // Cheap key test
+  let i = 0;
+  for (; i < aKeys!.length; i++) {
+    if (!val2.propertyIsEnumerable(aKeys![i])) {
+      return false;
+    }
+  }
+
+  if (arguments.length === 4) {
+    const symbolKeysA = Object.getOwnPropertySymbols(val1);
+    if (symbolKeysA.length !== 0) {
+      let count = 0;
+      for (i = 0; i < symbolKeysA.length; i++) {
+        const key = symbolKeysA[i];
+        if (val1.propertyIsEnumerable(key)) {
+          if (!val2.propertyIsEnumerable(val2, key)) {
+            return false;
+          }
+          aKeys!.push(aKeys, key);
+          count++;
+        } else if (val2.propertyIsEnumerable(val2, key)) {
+          return false;
+        }
+      }
+      const symbolKeysB = Object.getOwnPropertySymbols(val2);
+      if (
+        symbolKeysA.length !== symbolKeysB.length &&
+        getEnumerables(val2, symbolKeysB).length !== count
+      ) {
+        return false;
+      }
+    } else {
+      const symbolKeysB = Object.getOwnPropertySymbols(val2);
+      if (
+        symbolKeysB.length !== 0 &&
+        getEnumerables(val2, symbolKeysB).length !== 0
+      ) {
+        return false;
+      }
+    }
+  }
+
+  if (
+    aKeys!.length === 0 &&
+    (iterationType === kNoIterator ||
+      (iterationType === kIsArray && val1.length === 0) ||
+      val1.size === 0)
+  ) {
+    return true;
+  }
+
+  // Use memos to handle cycles.
+  if (memos === undefined) {
+    memos = {
+      val1: new Map(),
+      val2: new Map(),
+      position: 0,
+    };
+  } else {
+    // We prevent up to two map.has(x) calls by directly retrieving the value
+    // and checking for undefined. The map can only contain numbers, so it is
+    // safe to check for undefined only.
+    const val2MemoA = memos.val1.get(val1);
+    if (val2MemoA !== undefined) {
+      const val2MemoB = memos.val2.get(val2);
+      if (val2MemoB !== undefined) {
+        return val2MemoA === val2MemoB;
+      }
+    }
+    memos.position++;
+  }
+
+  memos.val1.set(val1, memos.position);
+  memos.val2.set(val2, memos.position);
+
+  const areEq = objEquiv(val1, val2, aKeys, memos, iterationType);
+
+  memos.val1.delete(val1);
+  memos.val2.delete(val2);
+
+  return areEq;
+}
+
+function objEquiv(
+  a: any,
+  b: any,
+  keys: any,
+  memos: any,
+  iterationType: Number
+) {
+  // Sets and maps don't have their entries accessible via normal object
+  // properties.
+  let i = 0;
+
+  if (iterationType === kIsSet) {
+    if (!setEquiv(a, b, memos)) {
+      return false;
+    }
+  } else if (iterationType === kIsMap) {
+    if (!mapEquiv(a, b, memos)) {
+      return false;
+    }
+  } else if (iterationType === kIsArray) {
+    for (; i < a.length; i++) {
+      if (a.hasOwnProperty(i)) {
+        if (!b.hasOwnProperty(i) || !deepStrictEqual(a[i], b[i], memos)) {
+          return false;
+        }
+      } else if (b.hasOwnProperty(i)) {
+        return false;
+      } else {
+        // Array is sparse.
+        const keysA = Object.keys(a);
+        for (; i < keysA.length; i++) {
+          const key = keysA[i];
+          if (
+            !b.hasOwnProperty(key) ||
+            !deepStrictEqual(a[key], b[key], memos)
+          ) {
+            return false;
+          }
+        }
+        if (keysA.length !== Object.keys(b).length) {
+          return false;
+        }
+        return true;
+      }
+    }
+  }
+
+  // The pair must have equivalent values for every corresponding key.
+  // Possibly expensive deep test:
+  for (i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    if (!deepStrictEqual(a[key], b[key], memos)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function setEquiv(a: any, b: any, memo: any) {
+  // This is a lazily initiated Set of entries which have to be compared
+  // pairwise.
+  let set = null;
+  for (const val of a) {
+    // Note: Checking for the objects first improves the performance for object
+    // heavy sets but it is a minor slow down for primitives. As they are fast
+    // to check this improves the worst case scenario instead.
+    if (typeof val === "object" && val !== null) {
+      if (set === null) {
+        set = new Set();
+      }
+      // If the specified value doesn't exist in the second set it's a non-null
+      // object (or non strict only: a not matching primitive) we'll need to go
+      // hunting for something that's deep-(strict-)equal to it. To make this
+      // O(n log n) complexity we have to copy these values in a new set first.
+      set.add(val);
+    } else if (!b.has(val)) {
+      return false;
+    }
+  }
+
+  if (set !== null) {
+    for (const val of b) {
+      // We have to check if a primitive value is already
+      // matching and only if it's not, go hunting for it.
+      if (typeof val === "object" && val !== null) {
+        if (!setHasEqualElement(set, val, memo)) return false;
+      }
+    }
+    return set.size === 0;
+  }
+
+  return true;
+}
+
+function setHasEqualElement(set: any, val1: any, memo: any) {
+  // Go looking.
+  for (const val2 of set) {
+    if (deepStrictEqual(val1, val2, memo)) {
+      // Remove the matching element to make sure we do not check that again.
+      set.delete(val2);
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function mapEquiv(a: any, b: any, memo: any) {
+  let set = null;
+
+  for (const { 0: key, 1: item1 } of a) {
+    if (typeof key === "object" && key !== null) {
+      if (set === null) {
+        set = new Set();
+      }
+      set.add(key);
+    } else {
+      // By directly retrieving the value we prevent another b.has(key) check in
+      // almost all possible cases.
+      const item2 = b.get(key);
+      if (
+        (item2 === undefined && !b.has(key)) ||
+        !deepStrictEqual(item1, item2, memo)
+      ) {
+        return false;
+      }
+    }
+  }
+
+  if (set !== null) {
+    for (const { 0: key, 1: item } of b) {
+      if (typeof key === "object" && key !== null) {
+        if (!mapHasEqualEntry(set, a, key, item, memo)) return false;
+      }
+    }
+    return set.size === 0;
+  }
+
+  return true;
+}
+
+function mapHasEqualEntry(
+  set: Set<any>,
+  map: Map<any, any>,
+  key1: any,
+  item1: any,
+  memo: any
+) {
+  // To be able to handle cases like:
+  //   Map([[{}, 'a'], [{}, 'b']]) vs Map([[{}, 'b'], [{}, 'a']])
+  // ... we need to consider *all* matching keys, not just the first we find.
+  for (const key2 of set) {
+    if (
+      deepStrictEqual(key1, key2, memo) &&
+      deepStrictEqual(item1, map.get(key2), memo)
+    ) {
+      set.delete(key2);
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function isEqualBoxedPrimitive(val1: any, val2: any) {
+  if (isNumberObject(val1)) {
+    return isNumberObject(val2) && Object.is(val1.valueOf(), val2.valueOf());
+  }
+  if (isStringObject(val1)) {
+    return isStringObject(val2) && val1.valueOf() === val2.valueOf();
+  }
+  if (isBooleanObject(val1)) {
+    return isBooleanObject(val2) && val1.valueOf() === val2.valueOf();
+  }
+  if (isSymbolObject(val1)) {
+    return isSymbolObject(val2) && val1.valueOf() === val2.valueOf();
+  }
+  throw new Error(`Unknown boxed type ${val1}`);
+}
+
+function areEqualArrayBuffers(buf1: ArrayBufferLike, buf2: ArrayBufferLike) {
+  return (
+    buf1.byteLength === buf2.byteLength &&
+    Buffer.compare(new Uint8Array(buf1), new Uint8Array(buf2)) === 0
+  );
+}
+
+function areSimilarTypedArrays(a: ArrayBufferView, b: ArrayBufferView) {
+  if (a.byteLength !== b.byteLength) {
+    return false;
+  }
+  return (
+    Buffer.compare(
+      new Uint8Array(a.buffer, a.byteOffset, a.byteLength),
+      new Uint8Array(b.buffer, b.byteOffset, b.byteLength)
+    ) === 0
+  );
+}
+
+function isNonIndex(key: any) {
+  if (key.length === 0 || key.length > 10) return true;
+  for (var i = 0; i < key.length; i++) {
+    var code = key.charCodeAt(i);
+    if (code < 48 || code > 57) return true;
+  }
+  // The maximum size for an array is 2 ** 32 -1.
+  return key.length === 10 && key >= Math.pow(2, 32);
+}
+const getOwnNonIndexProperties = (val1: any) => {
+  if (!val1?.getOwnPropertySymbols) {
+    return [];
+  }
+  return (
+    Object.keys(val1)
+      .filter(isNonIndex)
+      .concat(
+        val1
+          ?.getOwnPropertySymbols(val1)
+          .filter(Object.prototype.propertyIsEnumerable.bind(val1))
+      ) ?? []
+  );
+};
+
+function getEnumerables(val: Object, keys: Array<any>) {
+  return keys.filter((k) => val.propertyIsEnumerable(k));
+}
+
+function areSimilarRegExps(a: RegExp, b: RegExp) {
+  return (
+    a.source === b.source && a.flags === b.flags && a.lastIndex === b.lastIndex
+  );
+}
diff --git a/libs/wingsdk/src/util/index.ts b/libs/wingsdk/src/util/index.ts
index 181e76f24ee..756145d9cba 100644
--- a/libs/wingsdk/src/util/index.ts
+++ b/libs/wingsdk/src/util/index.ts
@@ -1 +1,2 @@
+export * from "./child-process";
 export * from "./util";
diff --git a/libs/wingsdk/src/util/platform-specific.ts b/libs/wingsdk/src/util/platform-specific.ts
deleted file mode 100644
index fd059a66cf7..00000000000
--- a/libs/wingsdk/src/util/platform-specific.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { readFileSync } from "fs";
-import { Construct } from "constructs";
-import { parse } from "yaml";
-
-/**
- * @param path the node path of the resource
- * @param args The arguments that should be obtained, if one argument can be
- * substituted for another, the arguments should be concatenated with "||"
- * as the separator ("iamCertificate||acmCertificateArn")
- */
-export const getPlatformSpecificValues = (
-  scope: Construct,
-  ...args: string[]
-): { [key: string]: string | undefined } => {
-  const wingValues = process.env.WING_VALUES;
-  const wingValuesFile = process.env.WING_VALUES_FILE;
-
-  let argLst: string[] = [];
-  for (const x of args) {
-    if (x.indexOf("||") === -1) {
-      argLst.push(x);
-    } else {
-      argLst.push(...x.split("||"));
-    }
-  }
-
-  let result: { [key: string]: string | undefined } = {};
-  if (wingValues) {
-    for (const argument of argLst) {
-      result[`${argument}`] = getPlatformSpecificValue(
-        scope.node.path,
-        argument,
-        wingValues
-      );
-    }
-  } else if (wingValuesFile) {
-    result = getPlatformSpecificValuesFromFile(scope.node.path, wingValuesFile);
-  }
-
-  let errors: Array<String> = new Array<String>();
-  for (const x of args) {
-    const error = checkMissingValues(scope.node.path, x, result);
-    if (error) {
-      errors.push(error);
-    }
-  }
-
-  if (errors.length > 0) {
-    errors[0] = "\n" + errors[0];
-    errors.push(
-      "\nThese are required properties of platform-specific types. You can set these values"
-    );
-    errors.push(`either through '-v | --value' switches or '--values' file.`);
-    throw new Error(errors.join("\n"));
-  }
-
-  return result;
-};
-
-const getPlatformSpecificValue = (
-  path: string,
-  argument: string,
-  wingValues: string
-): string | undefined => {
-  if (wingValues) {
-    const valuesList = wingValues.split(",");
-    for (const v of valuesList) {
-      const x = v.split("=");
-
-      const lastDotIndex = x[0].lastIndexOf(".");
-      const pathPart = x[0].substring(0, lastDotIndex);
-      const argumentPart = x[0].substring(lastDotIndex + 1);
-
-      if (pathPart === path && argumentPart === argument) {
-        return x[1];
-      }
-    }
-  }
-
-  return;
-};
-
-const getPlatformSpecificValuesFromFile = (path: string, file: string) => {
-  const data = readFileSync(file);
-  const yamlObj = parse(data.toString());
-  return yamlObj[`${path}`];
-};
-
-const checkMissingValues = (
-  path: string,
-  values: string,
-  lst: { [key: string]: string | undefined }
-): string | undefined => {
-  if (values.indexOf("||") === -1) {
-    return lst[`${values}`]
-      ? undefined
-      : `  - '${values}' is missing from ${path}`;
-  }
-
-  const listValues = values.split("||");
-  let valueExists = false;
-  let strValuesError = "";
-  for (let i = 0; i < listValues.length; i++) {
-    if (lst[`${listValues[i]}`]) {
-      valueExists = true;
-    }
-
-    if (i === 0) {
-      strValuesError = `'${listValues[i]}'`;
-    } else {
-      strValuesError += ` or '${listValues[i]}'`;
-    }
-  }
-
-  return valueExists
-    ? undefined
-    : `  - ${strValuesError} is missing from ${path}`;
-};
diff --git a/libs/wingsdk/src/util/util.ts b/libs/wingsdk/src/util/util.ts
index 8d7d4121a2e..61bc84c903f 100644
--- a/libs/wingsdk/src/util/util.ts
+++ b/libs/wingsdk/src/util/util.ts
@@ -1,9 +1,110 @@
+import { exec, execFile } from "child_process";
 import { createHash } from "crypto";
+import { promisify } from "util";
 import { nanoid, customAlphabet } from "nanoid";
+import { ulid } from "ulid";
 import { v4 } from "uuid";
+import { ChildProcess } from "./child-process";
 import { InflightClient } from "../core";
 import { Duration, IInflight } from "../std";
 
+const execPromise = promisify(exec);
+const execFilePromise = promisify(execFile);
+
+/**
+ * Describes what to do with a standard I/O stream for a child process.
+ */
+export enum Stdio {
+  /**
+   * The child inherits from the corresponding parent descriptor.
+   */
+  INHERIT = "inherit",
+  /**
+   * A new pipe should be arranged to connect the parent and child processes.
+   */
+  PIPED = "pipe",
+  /**
+   * This stream will be ignored. This is the equivalent of attaching the stream to /dev/null.
+   */
+  NULL = "ignore",
+}
+
+/**
+ * Output of a finished process.
+ */
+export interface Output {
+  /**
+   * The standard output of a finished process.
+   */
+  readonly stdout: string;
+  /**
+   * The standard error of a finished process.
+   */
+  readonly stderr: string;
+  /**
+   * A process's exit status.
+   */
+  readonly status: number;
+}
+
+/**
+ * Base command options.
+ */
+export interface CommandOptions {
+  /**
+   * Path to a directory to run the command in.
+   * @default - the default working directory of the host
+   */
+  readonly cwd?: string;
+  /**
+   * Environment variables.
+   * @default - no environment variables
+   */
+  readonly env?: { [key: string]: string };
+  /**
+   * Whether to inherit environment variables from the host's environment.
+   * @default false
+   */
+  readonly inheritEnv?: boolean;
+}
+
+/**
+ * Additional options for `util.exec()`
+ */
+export interface ExecOptions extends CommandOptions {}
+
+/**
+ * Additional options for `util.shell()`
+ */
+export interface ShellOptions extends CommandOptions {
+  /**
+   * Whether to throw an error on command execution failure.
+   * @default true
+   */
+  readonly throw?: boolean;
+}
+
+/**
+ * Additional options for `util.spawn()`
+ */
+export interface SpawnOptions extends CommandOptions {
+  /**
+   * Configuration for the process's standard input stream.
+   * @default - Stdio.INHERIT
+   */
+  readonly stdin?: Stdio;
+  /**
+   * Configuration for the process's standard output stream.
+   * @default - Stdio.INHERIT
+   */
+  readonly stdout?: Stdio;
+  /**
+   * Configuration for the process's standard error stream.
+   * @default - Stdio.INHERIT
+   */
+  readonly stderr?: Stdio;
+}
+
 /**
  * Properties for `util.waitUntil`.
  */
@@ -18,6 +119,11 @@ export interface WaitUntilProps {
    * @default 0.1s
    */
   readonly interval?: Duration;
+  /**
+   * Whether to throw an error if the timeout elapses.
+   * @default true
+   */
+  readonly throws?: boolean;
 }
 
 /**
@@ -53,10 +159,122 @@ export interface NanoidOptions {
   readonly alphabet?: string;
 }
 
+/**
+ * Options to generate universally unique lexicographically sortable identifiers.
+ */
+export interface UlidOptions {
+  /**
+   * You can also input a seed time which will consistently give you the same string for the time component. This is useful for migrating to ulid.
+   * @default Date.now()
+   */
+  readonly seed?: number;
+}
+
 /**
  * Utility functions.
  */
 export class Util {
+  /**
+   * Executes a command in the shell and returns its standard output.
+   * @param command The command string to execute in the shell.
+   * @param opts `ShellOptions`, such as the working directory and environment variables.
+   * @returns The standard output of the shell command.
+   * @throws An error if the shell command execution fails or returns a non-zero exit code.
+   */
+  public static async shell(
+    command: string,
+    opts?: ShellOptions
+  ): Promise<String> {
+    const shellOpts = {
+      windowsHide: true,
+      cwd: opts?.cwd,
+      env:
+        opts?.inheritEnv === true
+          ? { ...process.env, ...opts?.env }
+          : { ...opts?.env },
+    };
+
+    const createErrorMessage = (error: any): string => {
+      if (error.stderr) {
+        return `Error executing command "${command}". Exited with error: ${error.stderr}`;
+      }
+      return `Error executing command "${command}". Exited with error code: ${error.code}`;
+    };
+
+    try {
+      const { stdout } = await execPromise(command, shellOpts);
+      return stdout.toString();
+    } catch (error: any) {
+      const errorMessage = createErrorMessage(error);
+
+      if (opts?.throw !== false) {
+        throw new Error(errorMessage);
+      }
+
+      return errorMessage;
+    }
+  }
+
+  /**
+   * Execute a program with the given arguments, wait for it to finish, and
+   * return its outputs.
+   * @param program The program to execute.
+   * @param args An array of arguments to pass to the program.
+   * @param opts `ExecOptions`, such as the working directory and environment variables.
+   * @returns A struct containing `stdout`, `stderr` and exit `status` of the executed program.
+   */
+  public static async exec(
+    program: string,
+    args: Array<string>,
+    opts?: ExecOptions
+  ): Promise<Output> {
+    const execOpts = {
+      windowsHide: true,
+      shell: false,
+      cwd: opts?.cwd,
+      env:
+        opts?.inheritEnv === true
+          ? { ...process.env, ...opts?.env }
+          : { ...opts?.env },
+    };
+
+    try {
+      const { stdout, stderr } = await execFilePromise(program, args, execOpts);
+      return {
+        stdout: stdout.toString(),
+        stderr: stderr.toString(),
+        status: 0,
+      };
+    } catch (error: any) {
+      if (error.code === "ENOENT") {
+        throw new Error(`Program not found: ${error.message}`);
+      } else {
+        return {
+          stdout: error.stdout.toString(),
+          stderr: error.stderr.toString(),
+          status: error.code,
+        };
+      }
+    }
+  }
+
+  /**
+   * Execute a program with the given arguments, and return a `ChildProcess`
+   * object that can be used to interact with the process while it is running.
+   * @param program - The program to execute.
+   * @param args - An array of arguments to pass to the program.
+   * @param opts - Spawn options including working directory, environment variables, and stdio configurations.
+   * @returns The `ChildProcess` instance associated with the spawned process.
+   * @inflight
+   */
+  public static spawn(
+    program: string,
+    args: Array<string>,
+    opts?: SpawnOptions
+  ): ChildProcess {
+    return new ChildProcess(program, args, opts);
+  }
+
   /**
    * Returns the value of an environment variable. Throws if not found or empty.
    * @param name The name of the environment variable.
@@ -78,6 +296,15 @@ export class Util {
     return process.env[name];
   }
 
+  /**
+   * Sets the given name and value as an environment variable.
+   * @param name The name of the environment variable.
+   * @param value The value of the environment variable.
+   */
+  public static setEnv(name: string, value: string) {
+    process.env[name] = value;
+  }
+
   /**
    * Converts a string from UTF-8 to base64.
    * @param stringToEncode The name of the UTF-8 string to encode.
@@ -111,6 +338,11 @@ export class Util {
 
   /**
    * Run a predicate repeatedly, waiting until it returns true or until the timeout elapses.
+   * If the timeout elapses, the function throws an error.
+   *
+   * Alternatively, you can pass `throws: false` to suppress the error, and instead return a boolean
+   * indicating whether the predicate returned true within the timeout.
+   *
    * @param predicate The function that will be evaluated.
    * @param props Timeout and interval values, default to one 1m timeout and 0.1sec interval.
    * @throws Will throw if the given predicate throws.
@@ -134,6 +366,9 @@ export class Util {
       elapsed += interval.seconds;
       await this.sleep(interval);
     }
+    if (props.throws !== false) {
+      throw new Error("Timeout elapsed");
+    }
     return false;
   }
 
@@ -165,6 +400,25 @@ export class Util {
     return nano ? nano(size) : nanoid(size);
   }
 
+  /**
+   * Generates universally unique lexicographically sortable identifier.
+   # @link https://github.com/ulid/javascript
+   * @param options - Optional options object for generating the ID.
+   */
+  public static ulid(options?: UlidOptions): string {
+    const seed = options?.seed;
+    return ulid(seed);
+  }
+
+  /**
+   * Returns a string identifying the operating system platform.
+   * @returns The operating system platform
+   * @example "linux", "darwin", "win32"
+   */
+  public static os(): string {
+    return process.platform;
+  }
+
   /**
    * @internal
    */
diff --git a/libs/wingsdk/test/core/__snapshots__/connections.test.ts.snap b/libs/wingsdk/test/core/__snapshots__/connections.test.ts.snap
index cf98b35fcb7..1a7c3e15a81 100644
--- a/libs/wingsdk/test/core/__snapshots__/connections.test.ts.snap
+++ b/libs/wingsdk/test/core/__snapshots__/connections.test.ts.snap
@@ -2,20 +2,22 @@
 
 exports[`create a bucket 1`] = `
 {
-  ".wing/my_function_c85c4e0e.js": "\\"use strict\\";
+  ".wing/my_function_c85c4e0e.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() { return 'hello'; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => "hello"
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
@@ -28,17 +30,9 @@ return class Handler {
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_bucket": {
+        "addr": "c8220a82a4ad9c25a4f236946f350d2ac081dd7bbc",
         "path": "root/my_bucket",
         "props": {
           "initialObjects": {},
@@ -47,18 +41,29 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Bucket",
       },
-      {
-        "attrs": {},
+      "root/my_bucket/Policy": {
+        "addr": "c8b5ba55132964ee19331fb9f46241560e67fed76b",
+        "path": "root/my_bucket/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_bucket#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+      "root/my_function": {
+        "addr": "c85c4e0e66bf385ab6b159bab34fb32dd81aad0a1d",
         "path": "root/my_function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/my_function_c85c4e0e.js",
+          "sourceCodeFile": ".wing/my_function_c85c4e0e.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -69,14 +74,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -109,14 +114,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -125,10 +122,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -142,23 +151,25 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_bucket": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_bucket/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud object store",
@@ -170,7 +181,7 @@ return class Handler {
         "my_function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -182,8 +193,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -191,3 +203,16 @@ return class Handler {
   },
 }
 `;
+
+exports[`source can be omitted from \`nodeof(x).addConnection()\` 1`] = `
+{
+  "connections": [
+    {
+      "name": "my_connection",
+      "source": "root/B1",
+      "target": "root/B2",
+    },
+  ],
+  "version": "connections-0.1",
+}
+`;
diff --git a/libs/wingsdk/test/core/app.test.ts b/libs/wingsdk/test/core/app.test.ts
index 3be251a7184..de56ccb6316 100644
--- a/libs/wingsdk/test/core/app.test.ts
+++ b/libs/wingsdk/test/core/app.test.ts
@@ -36,22 +36,6 @@ test("newAbstract() throws if there is no implementation", () => {
   );
 });
 
-describe("appForTarget", () => {
-  const map = {
-    sim: SimApp,
-    "tf-aws": TfAwsApp,
-    "tf-azure": TfAzureApp,
-    "tf-gcp": TfGcpApp,
-  };
-
-  for (const [target, app] of Object.entries(map)) {
-    test(`returns the app for the target "${target}"`, () => {
-      const appActual = App.for(target);
-      expect(appActual.constructor).equal(app.constructor);
-    });
-  }
-});
-
 class MyApp extends App {
   public outdir: string = "outdir";
   public isTestEnvironment: boolean = true;
diff --git a/libs/wingsdk/test/core/connections.test.ts b/libs/wingsdk/test/core/connections.test.ts
index 1a0c673617c..633b5d2b742 100644
--- a/libs/wingsdk/test/core/connections.test.ts
+++ b/libs/wingsdk/test/core/connections.test.ts
@@ -1,14 +1,19 @@
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Connections } from "../../src/core";
-import { Testing } from "../../src/simulator";
+import {
+  CONNECTIONS_FILE_PATH,
+  Connections,
+  inflight,
+  lift,
+} from "../../src/core";
+import { Node } from "../../src/std";
 import { SimApp } from "../sim-app";
 
 test("create a bucket", async () => {
   // GIVEN
   const app = new SimApp();
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const handler = Testing.makeHandler("async handle() { return 'hello'; }");
+  const handler = inflight(async () => "hello");
   const fn = new cloud.Function(app, "my_function", handler);
 
   // WHEN
@@ -23,3 +28,38 @@ test("create a bucket", async () => {
   // THEN
   expect(app.snapshot()).toMatchSnapshot();
 });
+
+test("implict connections based on tokens", async () => {
+  const app = new SimApp();
+
+  const api = new cloud.Api(app, "Api");
+
+  new cloud.Function(
+    app,
+    "Function",
+    lift({ url: api.url }).inflight(async (ctx) => {
+      console.log(ctx.url);
+      return undefined;
+    })
+  );
+
+  expect(app.snapshot()[CONNECTIONS_FILE_PATH].connections).containSubset([
+    {
+      name: "<ref>",
+      source: "root/Function",
+      target: "root/Api",
+      targetOp: "url",
+    },
+  ]);
+});
+
+test("source can be omitted from `nodeof(x).addConnection()`", async () => {
+  const app = new SimApp();
+
+  const b1 = new cloud.Bucket(app, "B1");
+  const b2 = new cloud.Bucket(app, "B2");
+
+  Node.of(b1).addConnection({ target: b2, name: "my_connection" });
+
+  expect(app.snapshot()[CONNECTIONS_FILE_PATH]).toMatchSnapshot();
+});
diff --git a/libs/wingsdk/test/core/lifting.test.ts b/libs/wingsdk/test/core/lifting.test.ts
new file mode 100644
index 00000000000..d98ec447a90
--- /dev/null
+++ b/libs/wingsdk/test/core/lifting.test.ts
@@ -0,0 +1,248 @@
+import { Construct } from "constructs";
+import { describe, expect, test } from "vitest";
+import {
+  LiftMapNormalized,
+  collectLifts,
+  mergeLiftDeps,
+} from "../../src/core/lifting";
+
+test("mergeLiftDeps", () => {
+  // first argument empty
+  expectMergeDeps(
+    {},
+    {
+      op1: new Map([["obj1", new Set(["m1", "m2"])]]),
+    },
+    {
+      op1: new Map([["obj1", new Set(["m1", "m2"])]]),
+    }
+  );
+
+  // second argument empty
+  expectMergeDeps(
+    {
+      op1: new Map([["obj1", new Set(["m1", "m2"])]]),
+    },
+    {},
+    {
+      op1: new Map([["obj1", new Set(["m1", "m2"])]]),
+    }
+  );
+
+  // both arguments empty
+  expectMergeDeps({}, {}, {});
+
+  // merging transitive operations of an object
+  expectMergeDeps(
+    {
+      op1: new Map([["obj1", new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([["obj1", new Set(["m2"])]]),
+    },
+    {
+      op1: new Map([["obj1", new Set(["m1", "m2"])]]),
+    }
+  );
+
+  // merging with multiple objects
+  expectMergeDeps(
+    {
+      op1: new Map([["obj1", new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([["obj2", new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([
+        ["obj1", new Set(["m1"])],
+        ["obj2", new Set(["m1"])],
+      ]),
+    }
+  );
+
+  // merging with multiple primary ops
+  expectMergeDeps(
+    {
+      op1: new Map([["obj1", new Set(["m1"])]]),
+    },
+    {
+      op2: new Map([["obj1", new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([["obj1", new Set(["m1"])]]),
+      op2: new Map([["obj1", new Set(["m1"])]]),
+    }
+  );
+
+  // merging with variables referring to the same object
+  const obj1 = "obj";
+  const obj2 = "obj";
+  expectMergeDeps(
+    {
+      op1: new Map([[obj1, new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([[obj2, new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([["obj", new Set(["m1"])]]),
+    }
+  );
+
+  // merging with variables referring to the same object
+  const c1 = new Construct(undefined as any, "c1");
+  const c2 = c1;
+  expectMergeDeps(
+    {
+      op1: new Map([[c1, new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([[c2, new Set(["m1"])]]),
+    },
+    {
+      op1: new Map([[c1, new Set(["m1"])]]),
+    }
+  );
+});
+
+describe("collectLifts", () => {
+  test("object without _liftMap", () => {
+    class Foo {}
+    const lifts = collectLifts(new Foo(), []);
+    expect(lifts).toEqual(new Map([[expect.any(Foo), new Set([])]]));
+  });
+
+  test("object with single op, but no onLift method", () => {
+    class Foo {
+      public get _liftMap() {
+        return {
+          op1: [],
+        };
+      }
+    }
+    const lifts = collectLifts(new Foo(), ["op1"]);
+    expect(lifts).toEqual(new Map([[expect.any(Foo), new Set(["op1"])]]));
+  });
+
+  test("object with single op and onLift method", () => {
+    class Foo {
+      public get _liftMap() {
+        return {
+          op1: [],
+        };
+      }
+      public onLift() {}
+    }
+    const lifts = collectLifts(new Foo(), ["op1"]);
+    expect(lifts).toEqual(new Map([[expect.any(Foo), new Set(["op1"])]]));
+  });
+
+  test("object lifting simple primitives", () => {
+    class Foo {
+      public get _liftMap() {
+        return {
+          op1: [
+            ["hello", []],
+            [123, []],
+            [true, []],
+          ],
+        };
+      }
+    }
+    const lifts = collectLifts(new Foo(), ["op1"]);
+    expect(lifts).toEqual(
+      new Map([
+        [expect.any(Foo), new Set(["op1"])],
+        ["hello", new Set()],
+        [123, new Set()],
+        [true, new Set()],
+      ])
+    );
+  });
+
+  test("object lifting transitive object", () => {
+    class Bucket {
+      public get _liftMap() {
+        return {
+          list: [],
+        };
+      }
+      public onLift() {}
+    }
+
+    class Foo {
+      public get _liftMap() {
+        return {
+          op1: [[new Bucket(), ["list"]]],
+        };
+      }
+      public onLift() {}
+    }
+    const lifts = collectLifts(new Foo(), ["op1"]);
+    expect(lifts).toEqual(
+      new Map([
+        [expect.any(Foo), new Set(["op1"])],
+        [expect.any(Bucket), new Set(["list"])],
+      ])
+    );
+  });
+
+  test("object lifting shared object through two transitive objects", () => {
+    class Bucket {
+      public get _liftMap() {
+        return {
+          list: [],
+        };
+      }
+      public onLift() {}
+    }
+    class MyBucket {
+      private bucket: Bucket;
+      constructor(bucket: Bucket) {
+        this.bucket = bucket;
+      }
+      public get _liftMap() {
+        return {
+          list: [[this.bucket, ["list"]]],
+        };
+      }
+    }
+
+    class Foo {
+      private m1: MyBucket;
+      private m2: MyBucket;
+      constructor() {
+        const bucket = new Bucket();
+        this.m1 = new MyBucket(bucket);
+        this.m2 = new MyBucket(bucket);
+      }
+      public get _liftMap() {
+        return {
+          handle: [
+            [this.m1, ["list"]],
+            [this.m2, ["list"]],
+          ],
+        };
+      }
+    }
+    const lifts = collectLifts(new Foo(), ["handle"]);
+    expect(lifts).toEqual(
+      new Map([
+        [expect.any(Bucket), new Set(["list"])],
+        [expect.any(MyBucket), new Set(["list"])],
+        [expect.any(MyBucket), new Set(["list"])],
+        [expect.any(Foo), new Set(["handle"])],
+      ])
+    );
+  });
+});
+
+function expectMergeDeps(
+  deps1: LiftMapNormalized,
+  deps2: LiftMapNormalized,
+  expected: LiftMapNormalized
+) {
+  const result = mergeLiftDeps(deps1, deps2);
+  expect(result).toEqual(expected);
+}
diff --git a/libs/wingsdk/test/core/resource.test.ts b/libs/wingsdk/test/core/resource.test.ts
index 0cca3954c37..e49b194d71a 100644
--- a/libs/wingsdk/test/core/resource.test.ts
+++ b/libs/wingsdk/test/core/resource.test.ts
@@ -1,17 +1,23 @@
 import { Construct } from "constructs";
 import { describe, test, expect } from "vitest";
+import { Lifting } from "../../src/core";
 import { Resource } from "../../src/std";
 import { SimApp } from "../sim-app";
 
-describe("resource _addOnLift", () => {
-  const inflightOps = ["op1", "op2"];
+describe("resource onLift", () => {
   class Example extends Resource {
-    public _supportedOps() {
-      return inflightOps;
+    public get _liftMap() {
+      return {
+        op1: [],
+        op2: [],
+      };
     }
     public _toInflight() {
       return "inflight";
     }
+    public addEnvironment() {
+      // noop
+    }
   }
   class ExampleAbstract extends Resource {
     constructor(scope: Construct, id: string) {
@@ -20,14 +26,14 @@ describe("resource _addOnLift", () => {
       }
       super(scope, id);
     }
+    public get _liftMap() {
+      return {};
+    }
   }
   test("adding supported ops to host should succeed", () => {
     const app = new SimApp();
     const example = new Example(app, "example");
-    expect(
-      // @ts-expect-error - accessing private method
-      example._addOnLift(new Example(app, "host"), ["op1"])
-    ).toBeUndefined();
+    expect(example.onLift(new Example(app, "host"), ["op1"])).toBeUndefined();
   });
 
   test("adding non supported op to host should cause an error", () => {
@@ -35,10 +41,9 @@ describe("resource _addOnLift", () => {
     const example = new Example(app, "example");
 
     expect(() =>
-      // @ts-expect-error - accessing private method
-      example._addOnLift(new Example(app, "host"), ["nonExistentOp"])
+      Lifting.lift(example, new Example(app, "host"), ["nonExistentOp"])
     ).toThrow(
-      `Resource root/example does not support inflight operation nonExistentOp (requested by root/host).\nIt might not be implemented yet.`
+      `Resource root/example does not support inflight operation nonExistentOp.\nIt might not be implemented yet.`
     );
   });
 
diff --git a/libs/wingsdk/test/core/to-inflight-type.test.ts b/libs/wingsdk/test/core/to-inflight-type.test.ts
index da26596a30a..ae2ec59a7c3 100644
--- a/libs/wingsdk/test/core/to-inflight-type.test.ts
+++ b/libs/wingsdk/test/core/to-inflight-type.test.ts
@@ -13,8 +13,10 @@ const skip = [
   "std.TestRunner",
   "std.TestRunnerInflightMethods",
   "std.TraceType",
+  "std.LogLevel",
   "std.TEST_RUNNER_FQN",
   "std.Resource",
+  "std.AutoIdResource",
   "std.APP_SYMBOL",
   "std.CONNECTIONS_FILE_PATH",
   "std.SDK_SOURCE_MODULE",
@@ -22,6 +24,7 @@ const skip = [
   "util.RequestCache", // an enum
   "util.RequestRedirect", // an enum
   "util.HttpMethod", // an enum
+  "util.Stdio", // an enum
 ];
 
 // checks that the class `className` in module `module` has a `_toInflightType()` method and that it
diff --git a/libs/wingsdk/test/expect/assertions.test.ts b/libs/wingsdk/test/expect/assertions.test.ts
index 37cffc53338..ec13bbeb8ae 100644
--- a/libs/wingsdk/test/expect/assertions.test.ts
+++ b/libs/wingsdk/test/expect/assertions.test.ts
@@ -2,9 +2,9 @@
 // to a bug in `v8-to-istanbul` that causes it to
 // exit with a non-zero code when trying to generate
 // coverage reports. See https://github.com/istanbuljs/v8-to-istanbul/issues/198
+import { AssertionError } from "node:assert/strict";
 import { test, describe, expect } from "vitest";
 import { Util as Assert } from "../../src/expect";
-import { Range } from "../../src/std/range";
 
 describe("equal string", () => {
   test("is equal", () => {
@@ -184,10 +184,59 @@ describe("is not nil", () => {
   });
 });
 
-describe("range", () => {
-  test("works", () => {
+describe("match", () => {
+  test("is match", () => {
     expect(() => {
-      Assert.equal(Range.of(1, 5), [1, 2, 3, 4]);
+      Assert.match("abc", "abc");
     }).not.toThrow();
   });
+
+  test("is not match", () => {
+    expect(() => {
+      Assert.match("abc", "def");
+    }).toThrow(
+      new AssertionError({
+        message: "The input did not match the regular expression def",
+      })
+    );
+  });
+});
+
+describe("does not match", () => {
+  test("is match", () => {
+    expect(() => {
+      Assert.doesNotMatch("abc", "abc");
+    }).toThrow(
+      new AssertionError({
+        message: "The input should not match the regular expression abc",
+      })
+    );
+  });
+
+  test("is not match", () => {
+    expect(() => {
+      Assert.doesNotMatch("abc", "def");
+    }).not.toThrow();
+  });
+});
+describe("fail", () => {
+  test("fail", () => {
+    expect(() => {
+      Assert.fail("fail");
+    }).toThrow();
+  });
+});
+
+describe("ok", () => {
+  test("is true", () => {
+    expect(() => {
+      Assert.ok(true);
+    }).not.toThrow();
+  });
+
+  test("is false", () => {
+    expect(() => {
+      Assert.ok(false);
+    }).toThrow();
+  });
 });
diff --git a/libs/wingsdk/test/fs/fs.test.ts b/libs/wingsdk/test/fs/fs.test.ts
index 9ea5c1c8064..97e8db5168b 100644
--- a/libs/wingsdk/test/fs/fs.test.ts
+++ b/libs/wingsdk/test/fs/fs.test.ts
@@ -30,6 +30,11 @@ test("write, read and remove file", async () => {
   const text = fs.readFile(filename);
   expect(text).toEqual(text);
 
+  fs.appendFile(filename, data);
+
+  const text2 = fs.readFile(filename);
+  expect(text2).toEqual(data + data);
+
   fs.remove(filename);
   const exist2 = fs.exists(filename);
   expect(exist2).toEqual(false);
diff --git a/libs/wingsdk/test/global.setup.ts b/libs/wingsdk/test/global.setup.ts
index 0a70374e866..270e39e504c 100644
--- a/libs/wingsdk/test/global.setup.ts
+++ b/libs/wingsdk/test/global.setup.ts
@@ -1,11 +1,16 @@
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 import fs from "fs/promises";
 import path from "path";
 
 export async function setup() {
-  // compile src/**/*.on*.inflight.ts to .js because these are going to be
+  // compile src/**/*.ts to .js because these are going to be
   // injected into our javascript vm and cannot be resolved via vitest
-  execSync("pnpm tsc -p tsconfig.test.json", { stdio: "inherit" });
+  const tscPath = path.join(__dirname, "..", "node_modules", ".bin", "tsc");
+  const tsconfigPath = path.join(__dirname, "..", "tsconfig.test.json");
+  execFileSync(tscPath, ["-p", tsconfigPath], {
+    stdio: "inherit",
+  });
+
   return () => {};
 }
 
@@ -16,7 +21,7 @@ export async function teardown() {
   if (process.env.WING_SDK_VITEST_SKIP_TEARDOWN) {
     return;
   }
-  const files = await findFilesWithExtension(["src"], [".d.ts", ".js"]);
+  const files = await findFilesWithExtension(["src"], [".js"]);
   for (const file of files) {
     try {
       await fs.unlink(file);
@@ -48,6 +53,8 @@ async function findFilesWithExtension(
       const files = await fs.readdir(dir);
 
       for (const file of files) {
+        if (file.startsWith(".")) continue;
+
         // Resolve the full path of the file
         const filePath = path.resolve(dir, file);
 
diff --git a/libs/wingsdk/test/misc.test.ts b/libs/wingsdk/test/misc.test.ts
new file mode 100644
index 00000000000..43ae07e8029
--- /dev/null
+++ b/libs/wingsdk/test/misc.test.ts
@@ -0,0 +1,10 @@
+import { expect, test } from "vitest";
+import { isPath } from "../src/shared/misc";
+
+test("isPath", () => {
+  expect(isPath("foo")).toBeFalsy();
+  expect(isPath("./hello")).toBeTruthy();
+  expect(isPath("../hello")).toBeTruthy();
+  expect(isPath(".././../hello")).toBeTruthy();
+  expect(isPath("/hello/world")).toBeTruthy();
+});
diff --git a/libs/wingsdk/test/shared-aws/api.onrequest.inflight.test.ts b/libs/wingsdk/test/shared-aws/api.onrequest.inflight.test.ts
index 108e3fcbd0f..1bc84d441b5 100644
--- a/libs/wingsdk/test/shared-aws/api.onrequest.inflight.test.ts
+++ b/libs/wingsdk/test/shared-aws/api.onrequest.inflight.test.ts
@@ -1,11 +1,14 @@
 import { APIGatewayProxyEvent } from "aws-lambda";
 import { test, expect, beforeEach, describe, vi } from "vitest";
 import { ApiResponse } from "../../src/cloud";
-import { ApiOnRequestHandlerClient } from "../../src/shared-aws/api.onrequest.inflight";
+import { apigwFunctionHandler } from "../../src/shared-aws/api-util";
 
 beforeEach(() => {
   vi.restoreAllMocks();
 });
+
+const makeRequest = async (event: APIGatewayProxyEvent): Promise<any> => {};
+
 describe("ApiResponseMapper", () => {
   test("map'cloud.ApiResponse' response to 'APIGatewayProxyResult", async () => {
     // GIVEN
@@ -15,23 +18,17 @@ describe("ApiResponseMapper", () => {
       path: "/",
       httpMethod: "GET",
     };
-
     const handlerResponse: ApiResponse = {
       status: 200,
       body: JSON.stringify({ key: "value" }),
       headers: { "header-1": "value-1" },
     };
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: async () => {
-          return handlerResponse;
-        },
-      },
-    });
 
     // WHEN
-    const response = await requestHandlerClient.handle(
-      apiRequestEvent as APIGatewayProxyEvent
+    const response = await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      async () => handlerResponse,
+      {}
     );
 
     // THEN
@@ -59,17 +56,11 @@ describe("ApiResponseMapper", () => {
       status: 200,
       body: JSON.stringify({ key: "value" }),
     };
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: async () => {
-          return handlerResponse;
-        },
-      },
-    });
 
     // WHEN
-    const response = await requestHandlerClient.handle(
-      apiRequestEvent as APIGatewayProxyEvent
+    const response = await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      async () => handlerResponse
     );
 
     // THEN
@@ -95,17 +86,11 @@ describe("ApiResponseMapper", () => {
     const handlerResponse = {
       status: 200,
     };
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: async () => {
-          return handlerResponse;
-        },
-      },
-    });
 
     // WHEN
-    const response = await requestHandlerClient.handle(
-      apiRequestEvent as APIGatewayProxyEvent
+    const response = await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      async () => handlerResponse
     );
 
     // THEN
@@ -135,17 +120,11 @@ describe("ApiResponseMapper", () => {
         "Content-Type": "application/octet-stream",
       },
     };
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: async () => {
-          return handlerResponse;
-        },
-      },
-    });
 
     // WHEN
-    const response = await requestHandlerClient.handle(
-      apiRequestEvent as APIGatewayProxyEvent
+    const response = await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      async () => handlerResponse
     );
 
     // THEN
@@ -171,22 +150,14 @@ describe("ApiResponseMapper", () => {
       status: 200,
       body: JSON.stringify({ key: "value" }),
     };
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: async () => {
-          return handlerResponse;
-        },
-      },
-      args: {
-        corsHeaders: {
-          "Access-Control-Allow-Origin": "*",
-        },
-      },
-    });
 
     // WHEN
-    const response = await requestHandlerClient.handle(
-      apiRequestEvent as APIGatewayProxyEvent
+    const response = await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      async () => handlerResponse,
+      {
+        "Access-Control-Allow-Origin": "*",
+      }
     );
 
     // THEN
@@ -226,14 +197,12 @@ describe("ApiRequest", () => {
     const handlerMock = vi.fn().mockResolvedValue({
       status: 200,
     });
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: handlerMock,
-      },
-    });
 
     // WHEN
-    await requestHandlerClient.handle(apiRequestEvent as APIGatewayProxyEvent);
+    await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      handlerMock
+    );
 
     // THEN
     expect(handlerMock).toHaveBeenCalledWith({
@@ -257,14 +226,12 @@ describe("ApiRequest", () => {
     const handlerMock = vi.fn().mockResolvedValue({
       status: 200,
     });
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: handlerMock,
-      },
-    });
 
     // WHEN
-    await requestHandlerClient.handle(apiRequestEvent as APIGatewayProxyEvent);
+    await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      handlerMock
+    );
 
     // THEN
     expect(handlerMock).toHaveBeenCalledWith({
@@ -287,14 +254,12 @@ describe("ApiRequest", () => {
     const handlerMock = vi.fn().mockResolvedValue({
       status: 200,
     });
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: handlerMock,
-      },
-    });
 
     // WHEN
-    await requestHandlerClient.handle(apiRequestEvent as APIGatewayProxyEvent);
+    await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      handlerMock
+    );
 
     // THEN
     expect(handlerMock).toHaveBeenCalledWith({
@@ -321,14 +286,12 @@ describe("ApiRequest", () => {
     const handlerMock = vi.fn().mockResolvedValue({
       status: 200,
     });
-    const requestHandlerClient = new ApiOnRequestHandlerClient({
-      handler: {
-        handle: handlerMock,
-      },
-    });
 
     // WHEN
-    await requestHandlerClient.handle(apiRequestEvent as APIGatewayProxyEvent);
+    await apigwFunctionHandler(
+      apiRequestEvent as APIGatewayProxyEvent,
+      handlerMock
+    );
 
     // THEN
     expect(handlerMock).toHaveBeenCalledWith({
diff --git a/libs/wingsdk/test/shared-aws/bucket.inflight.test.ts b/libs/wingsdk/test/shared-aws/bucket.inflight.test.ts
index ea638072694..4d08184b67e 100644
--- a/libs/wingsdk/test/shared-aws/bucket.inflight.test.ts
+++ b/libs/wingsdk/test/shared-aws/bucket.inflight.test.ts
@@ -211,12 +211,10 @@ test("delete non-existent object from the bucket with mustExist option", async (
   const BUCKET_NAME = "BUCKET_NAME";
   const KEY = "KEY";
 
-  s3Mock
-    .on(DeleteObjectCommand, { Bucket: BUCKET_NAME, Key: KEY })
-    .resolves({});
   s3Mock
     .on(HeadObjectCommand, { Bucket: BUCKET_NAME, Key: KEY })
-    .rejects({ name: "NotFound" });
+    .rejects(new NotFound({ message: "Object not found", $metadata: {} }));
+
   // WHEN
   const client = new BucketClient(BUCKET_NAME);
 
@@ -256,7 +254,7 @@ test("Given a non public bucket when reaching to a key public url it should thro
   );
 });
 
-test("Given a public bucket when reaching to a non existent key, public url it should throw an error", async () => {
+test("Given a public bucket when reaching to a non-existent key, public url it should throw an error", async () => {
   // GIVEN
   let error;
   const BUCKET_NAME = "BUCKET_NAME";
@@ -270,20 +268,18 @@ test("Given a public bucket when reaching to a non existent key, public url it s
       IgnorePublicAcls: false,
     },
   });
-  s3Mock
-    .on(GetBucketLocationCommand, { Bucket: BUCKET_NAME })
-    .resolves({ LocationConstraint: "us-east-2" });
   s3Mock
     .on(HeadObjectCommand, { Bucket: BUCKET_NAME, Key: KEY })
-    .rejects({ name: "NotFound" });
+    .rejects(new NotFound({ message: "Object not found", $metadata: {} }));
 
-  //WHEN
+  // WHEN
   const client = new BucketClient(BUCKET_NAME);
   try {
     await client.publicUrl(KEY);
   } catch (err) {
     error = err;
   }
+
   // THEN
   expect(error?.message).toBe(
     "Cannot provide public url for a non-existent key (key=KEY)"
@@ -357,7 +353,7 @@ test("check that an object doesn't exist in the bucket", async () => {
 
   s3Mock
     .on(HeadObjectCommand, { Bucket: BUCKET_NAME, Key: KEY })
-    .rejects({ name: "NotFound" });
+    .rejects(new NotFound({ message: "Object not found", $metadata: {} }));
 
   // WHEN
   const client = new BucketClient(BUCKET_NAME);
@@ -548,12 +544,10 @@ test("tryDelete a non-existent object from the bucket", async () => {
   // GIVEN
   const BUCKET_NAME = "BUCKET_NAME";
   const KEY = "KEY";
-  s3Mock
-    .on(DeleteObjectCommand, { Bucket: BUCKET_NAME, Key: KEY })
-    .resolves({});
+
   s3Mock
     .on(HeadObjectCommand, { Bucket: BUCKET_NAME, Key: KEY })
-    .rejects({ name: "NotFound" });
+    .rejects(new NotFound({ message: "Object not found", $metadata: {} }));
 
   // WHEN
   const client = new BucketClient(BUCKET_NAME);
@@ -563,7 +557,7 @@ test("tryDelete a non-existent object from the bucket", async () => {
   expect(objectTryDelete).toEqual(false);
 });
 
-test("Given a bucket when reaching to a non existent key, signed url it should throw an error", async () => {
+test("Given a bucket when reaching to a non-existent key, signed url it should throw an error", async () => {
   // GIVEN
   let error;
   const BUCKET_NAME = "BUCKET_NAME";
@@ -571,22 +565,25 @@ test("Given a bucket when reaching to a non existent key, signed url it should t
 
   s3Mock
     .on(HeadObjectCommand, { Bucket: BUCKET_NAME, Key: KEY })
-    .rejects({ name: "NotFound" });
+    .rejects(new NotFound({ message: "Object not found", $metadata: {} }));
 
-  //WHEN
+  // WHEN
   const client = new BucketClient(BUCKET_NAME);
   try {
     await client.signedUrl(KEY);
   } catch (err) {
     error = err;
   }
+
   // THEN
   expect(error?.message).toBe(
     `Cannot provide signed url for a non-existent key (key=${KEY})`
   );
 });
 
-test("Given a bucket, when giving one of its keys, we should get its signed url", async () => {
+// Skipped due to issue with mocking getSignedUrl:
+// https://github.com/m-radzikowski/aws-sdk-client-mock/issues/62
+test.skip("Given a bucket, when giving one of its keys, we should get its signed url", async () => {
   // GIVEN
 
   const BUCKET_NAME = "BUCKET_NAME";
@@ -689,7 +686,6 @@ test("copy objects within the bucket", async () => {
   const BUCKET_NAME = "BUCKET_NAME";
   const SRC_KEY = "SRC/KEY";
   const DST_KEY = "DST/KEY";
-
   s3Mock
     .on(CopyObjectCommand, {
       Bucket: BUCKET_NAME,
@@ -713,7 +709,6 @@ test("copy a non-existent object within the bucket", async () => {
   const BUCKET_NAME = "BUCKET_NAME";
   const SRC_KEY = "SRC/KEY";
   const DST_KEY = "DST/KEY";
-
   s3Mock
     .on(CopyObjectCommand, {
       Bucket: BUCKET_NAME,
@@ -730,3 +725,63 @@ test("copy a non-existent object within the bucket", async () => {
     `Source object does not exist (srcKey=${SRC_KEY}).`
   );
 });
+
+test("rename valid object in the bucket", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+  const DST_KEY = "DST/KEY";
+  s3Mock
+    .resolves({})
+    .on(CopyObjectCommand, {
+      Bucket: BUCKET_NAME,
+      CopySource: `${BUCKET_NAME}/${SRC_KEY}`,
+      Key: DST_KEY,
+    })
+    .resolves({})
+    .on(DeleteObjectCommand, { Bucket: BUCKET_NAME, Key: SRC_KEY })
+    .resolves({});
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME);
+  const response = await client.rename(SRC_KEY, DST_KEY);
+
+  // THEN
+  expect(response).toEqual(undefined);
+});
+
+test("renaming an object to its current name should throw an error", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME);
+
+  // THEN
+  await expect(() => client.rename(SRC_KEY, SRC_KEY)).rejects.toThrowError(
+    `Renaming an object to its current name is not a valid operation (srcKey=${SRC_KEY}, dstKey=${SRC_KEY}).`
+  );
+});
+
+test("rename non-existent object within the bucket", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+  const DST_KEY = "DST/KEY";
+  s3Mock
+    .on(CopyObjectCommand, {
+      Bucket: BUCKET_NAME,
+      CopySource: `${BUCKET_NAME}/${SRC_KEY}`,
+      Key: DST_KEY,
+    })
+    .rejects(new NotFound({ message: "NotFound error", $metadata: {} }));
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME);
+
+  // THEN
+  await expect(() => client.rename(SRC_KEY, DST_KEY)).rejects.toThrowError(
+    `Source object does not exist (srcKey=${SRC_KEY}).`
+  );
+});
diff --git a/libs/wingsdk/test/shared-aws/dynamodb-table.inflight.test.ts b/libs/wingsdk/test/shared-aws/dynamodb-table.inflight.test.ts
deleted file mode 100644
index 5bc9f3a002b..00000000000
--- a/libs/wingsdk/test/shared-aws/dynamodb-table.inflight.test.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import {
-  PutItemCommandInput,
-  UpdateItemCommandInput,
-  DynamoDBClient,
-  PutItemCommand,
-  UpdateItemCommand,
-  PutItemCommandOutput,
-  UpdateItemCommandOutput,
-  DeleteItemCommandInput,
-  DeleteItemCommandOutput,
-  DeleteItemCommand,
-  GetItemCommandInput,
-  GetItemCommandOutput,
-  GetItemCommand,
-} from "@aws-sdk/client-dynamodb";
-import "aws-sdk-client-mock-jest";
-import { mockClient } from "aws-sdk-client-mock";
-import { test, expect, describe, beforeEach } from "vitest";
-import { DynamodbTableClient } from "../../src/shared-aws/dynamodb-table.inflight";
-
-const MOCK_TABLE_NAME = "MyBeautifulTable";
-const dynamoMock = mockClient(DynamoDBClient);
-
-describe("inflight table tests", () => {
-  let client: DynamodbTableClient,
-    row: { id: string; somenumber: number },
-    key: string;
-  beforeEach(() => {
-    key = "test";
-    row = { id: key, somenumber: 1 };
-    client = new DynamodbTableClient(MOCK_TABLE_NAME);
-    dynamoMock.reset();
-  });
-
-  test("putItem", async () => {
-    // GIVEN
-    const expectedRequest: PutItemCommandInput = {
-      TableName: MOCK_TABLE_NAME,
-      Item: {
-        id: { S: key },
-        somenumber: { N: String(row.somenumber) },
-      },
-    };
-    const mockResponse: PutItemCommandOutput = {
-      $metadata: {},
-    };
-    dynamoMock.on(PutItemCommand, expectedRequest).resolves(mockResponse);
-    // WHEN
-    const response = await client.putItem({ item: row as any });
-    // THEN
-    expect(response.attributes).toEqual(undefined);
-    expect(dynamoMock).toHaveReceivedCommandWith(
-      PutItemCommand,
-      expectedRequest
-    );
-  });
-
-  test("updateItem", async () => {
-    // GIVEN
-    const expectedRequest: UpdateItemCommandInput = {
-      TableName: MOCK_TABLE_NAME,
-      Key: { id: { S: key } },
-      UpdateExpression: `SET somenumber = :somenumber`,
-      ExpressionAttributeValues: {
-        ":somenumber": { N: `${row.somenumber}` },
-      },
-    };
-    const mockResponse: UpdateItemCommandOutput = {
-      $metadata: {},
-      Attributes: {
-        id: { S: key },
-      },
-    };
-    dynamoMock.on(UpdateItemCommand, expectedRequest).resolves(mockResponse);
-    // WHEN
-    const response = await client.updateItem({
-      key: { id: key } as any,
-      updateExpression: `SET somenumber = :somenumber`,
-      expressionAttributeValues: {
-        ":somenumber": row.somenumber,
-      } as any,
-      returnValues: "ALL_OLD",
-    });
-    // THEN
-    expect(response.attributes).toEqual({ id: key });
-    expect(dynamoMock).toHaveReceivedCommandWith(
-      UpdateItemCommand,
-      expectedRequest
-    );
-  });
-
-  test("deleteItem", async () => {
-    // GIVEN
-    const expectedRequest: DeleteItemCommandInput = {
-      TableName: MOCK_TABLE_NAME,
-      Key: { id: { S: row.id } },
-    };
-    const mockResponse: DeleteItemCommandOutput = {
-      $metadata: {},
-    };
-    dynamoMock.on(DeleteItemCommand, expectedRequest).resolves(mockResponse);
-    // WHEN
-    await client.deleteItem({ key: { id: row.id } as any });
-    // THEN
-    expect(dynamoMock).toHaveReceivedCommandWith(
-      DeleteItemCommand,
-      expectedRequest
-    );
-  });
-
-  test("getItem on an empty table", async () => {
-    // GIVEN
-    const expectedRequest: GetItemCommandInput = {
-      TableName: MOCK_TABLE_NAME,
-      Key: { id: { S: key } },
-    };
-    const mockResponse: GetItemCommandOutput = {
-      $metadata: {},
-    };
-    dynamoMock.on(GetItemCommand, expectedRequest).resolves(mockResponse);
-    // WHEN
-    const response = await client.getItem({ key: { id: key } as any });
-    // THEN
-    expect(response.item).toBeUndefined();
-    expect(dynamoMock).toHaveReceivedCommandWith(
-      GetItemCommand,
-      expectedRequest
-    );
-  });
-
-  test("getItem", async () => {
-    // GIVEN
-    const expectedRequest: GetItemCommandInput = {
-      TableName: MOCK_TABLE_NAME,
-      Key: {
-        id: { S: key },
-      },
-    };
-    const mockResponse: GetItemCommandOutput = {
-      $metadata: {},
-      Item: {
-        id: { S: `${key}` },
-        somenumber: { N: `${row.somenumber}` },
-      },
-    };
-    dynamoMock.on(GetItemCommand, expectedRequest).resolves(mockResponse);
-    // WHEN
-    const response = await client.getItem({ key: { id: key } as any });
-    // THEN
-    expect(response.item).toEqual({ id: key, somenumber: row.somenumber });
-    expect(dynamoMock).toHaveReceivedCommandWith(
-      GetItemCommand,
-      expectedRequest
-    );
-  });
-});
diff --git a/libs/wingsdk/test/shared-aws/function.inflight.test.ts b/libs/wingsdk/test/shared-aws/function.inflight.test.ts
index e6ea59cc8fd..1c676cd29f6 100644
--- a/libs/wingsdk/test/shared-aws/function.inflight.test.ts
+++ b/libs/wingsdk/test/shared-aws/function.inflight.test.ts
@@ -78,6 +78,7 @@ test("parse logs", () => {
       timestamp: "2023-08-04T16:40:47.309Z",
       sourceType: "@winglang/sdk.cloud.Function",
       sourcePath: "fake-source",
+      level: "info",
       type: "log",
     },
     {
@@ -85,6 +86,7 @@ test("parse logs", () => {
       timestamp: "2023-08-04T16:40:50.691Z",
       sourceType: "@winglang/sdk.cloud.Function",
       sourcePath: "fake-source",
+      level: "info",
       type: "log",
     },
   ]);
diff --git a/libs/wingsdk/test/shared-aws/queue.inflight.test.ts b/libs/wingsdk/test/shared-aws/queue.inflight.test.ts
index 085dbc4665d..e2c783d3ab6 100644
--- a/libs/wingsdk/test/shared-aws/queue.inflight.test.ts
+++ b/libs/wingsdk/test/shared-aws/queue.inflight.test.ts
@@ -7,12 +7,14 @@ import {
   InvalidMessageContents,
   DeleteMessageCommand,
   ReceiveMessageCommandOutput,
+  GetQueueUrlCommand,
 } from "@aws-sdk/client-sqs";
 import { mockClient } from "aws-sdk-client-mock";
 import { test, expect, beforeEach } from "vitest";
 import { QueueClient } from "../../src/shared-aws/queue.inflight";
 import "aws-sdk-client-mock-jest";
 
+const QUEUE_URL = "https://my-queue-url";
 const sqsMock = mockClient(SQSClient);
 
 beforeEach(() => {
@@ -21,7 +23,6 @@ beforeEach(() => {
 
 test("push - happy path", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const MESSAGE = "MESSAGE";
   const RESPONSE = {
     MessageId: "MESSAGE_ID",
@@ -37,11 +38,11 @@ test("push - happy path", async () => {
 
   // THEN
   expect(response).toEqual(undefined);
+  expect(sqsMock).toHaveReceivedCommandTimes(SendMessageCommand, 1);
 });
 
 test("push batch - happy path", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const MESSAGES = ["MESSAGE1", "MESSAGE2", "MESSAGE3"];
   const RESPONSE = {
     MessageId: "MESSAGE_ID",
@@ -72,7 +73,6 @@ test("push batch - happy path", async () => {
 
 test("push - sad path invalid message", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const MESSAGE = "INVALID_MESSAGE";
 
   sqsMock
@@ -95,7 +95,6 @@ test("push - sad path invalid message", async () => {
 
 test("push - sad path empty message", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const MESSAGE = "";
 
   // WHEN
@@ -113,7 +112,6 @@ test("push - sad path empty message", async () => {
 
 test("push - sad path unknown error", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const MESSAGE = "MESSAGE";
 
   sqsMock
@@ -131,7 +129,6 @@ test("push - sad path unknown error", async () => {
 
 test("purge - happy path", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const RESPONSE = {};
 
   sqsMock.on(PurgeQueueCommand, { QueueUrl: QUEUE_URL }).resolves(RESPONSE);
@@ -147,7 +144,6 @@ test("purge - happy path", async () => {
 test("approxSize - happy path", async () => {
   // GIVEN
   const QUEUE_SIZE = 3;
-  const QUEUE_URL = "QUEUE_URL";
   const GET_QUEUE_ATTRIBUTES_RESPONSE = {
     Attributes: { ApproximateNumberOfMessages: QUEUE_SIZE.toString() },
   };
@@ -166,7 +162,6 @@ test("approxSize - happy path", async () => {
 
 test("pop - happy path", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const MESSAGE = "MESSAGE";
   const ONE_MSG_RESPONSE: ReceiveMessageCommandOutput = {
     Messages: [
@@ -198,7 +193,6 @@ test("pop - happy path", async () => {
 
 test("pop - happy path w/o message receipt", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const MESSAGE = "MESSAGE";
   const ONE_MSG_RESPONSE: ReceiveMessageCommandOutput = {
     Messages: [
@@ -230,7 +224,6 @@ test("pop - happy path w/o message receipt", async () => {
 
 test("pop - happy path w/ no message in the queue", async () => {
   // GIVEN
-  const QUEUE_URL = "QUEUE_URL";
   const NO_MSG_RESPONSE = {};
 
   sqsMock
@@ -248,3 +241,25 @@ test("pop - happy path w/ no message in the queue", async () => {
   expect(sqsMock).toHaveReceivedCommandTimes(ReceiveMessageCommand, 2);
   expect(sqsMock).toHaveReceivedCommandTimes(DeleteMessageCommand, 0);
 });
+
+test("if a queue name is provided, the url is resolved", async () => {
+  const queueName = "MyQueueName";
+
+  // GIVEN
+  sqsMock.on(GetQueueUrlCommand, { QueueName: queueName }).resolves({
+    QueueUrl: "https://my-queue-url",
+  });
+
+  sqsMock
+    .on(SendMessageCommand, {
+      QueueUrl: "https://my-queue-url",
+      MessageBody: "test",
+    })
+    .resolves({});
+
+  const client = new QueueClient(queueName);
+  await client.push("test");
+
+  expect(sqsMock).toHaveReceivedCommandTimes(GetQueueUrlCommand, 1);
+  expect(sqsMock).toHaveReceivedCommandTimes(SendMessageCommand, 1);
+});
diff --git a/libs/wingsdk/test/shared-aws/topic.inflight.test.ts b/libs/wingsdk/test/shared-aws/topic.inflight.test.ts
index f4a911dd92d..29872d19821 100644
--- a/libs/wingsdk/test/shared-aws/topic.inflight.test.ts
+++ b/libs/wingsdk/test/shared-aws/topic.inflight.test.ts
@@ -1,8 +1,9 @@
-import { SNSClient, PublishCommand } from "@aws-sdk/client-sns";
+import { SNSClient, PublishBatchCommand } from "@aws-sdk/client-sns";
 import { mockClient } from "aws-sdk-client-mock";
 import "aws-sdk-client-mock-jest";
-import { test, expect, beforeEach, vi } from "vitest";
+import { test, expect, beforeEach } from "vitest";
 import { TopicClient } from "../../src/shared-aws/topic.inflight";
+import { Util } from "../../src/util";
 
 const snsMock = mockClient(SNSClient);
 
@@ -14,16 +15,53 @@ test("publish - happy path", async () => {
   // GIVEN
   const TOPIC_ARN = "SOME:TOPIC_ARN:that-is/fake";
   const MESSAGE = "SOME MESSAGE";
-  snsMock.on(PublishCommand).resolves({ $metadata: { httpStatusCode: 200 } });
+  snsMock
+    .on(PublishBatchCommand)
+    .resolves({ $metadata: { httpStatusCode: 200 } });
 
   // WHEN
   const client = new TopicClient(TOPIC_ARN);
   await client.publish(MESSAGE);
 
   // THEN
-  expect(snsMock).toHaveReceivedCommandTimes(PublishCommand, 1);
-  expect(snsMock).toHaveReceivedCommandWith(PublishCommand, {
-    Message: MESSAGE,
+  expect(snsMock).toHaveReceivedCommandTimes(PublishBatchCommand, 1);
+  expect(snsMock).toHaveReceivedCommandWith(PublishBatchCommand, {
     TopicArn: TOPIC_ARN,
+    PublishBatchRequestEntries: [
+      {
+        Id: Util.sha256(`${MESSAGE}-1`),
+        Message: MESSAGE,
+      },
+    ],
+  });
+});
+
+test("publish multiple messages", async () => {
+  // GIVEN
+  const TOPIC_ARN = "SOME:TOPIC_ARN:that-is/fake";
+  const FIRST_MESSAGE = "FIRST MESSAGE";
+  const SECOND_MESSAGE = "SECOND MESSAGE";
+  snsMock
+    .on(PublishBatchCommand)
+    .resolves({ $metadata: { httpStatusCode: 200 } });
+
+  // WHEN
+  const client = new TopicClient(TOPIC_ARN);
+  await client.publish(FIRST_MESSAGE, SECOND_MESSAGE);
+
+  // THEN
+  expect(snsMock).toHaveReceivedCommandTimes(PublishBatchCommand, 1);
+  expect(snsMock).toHaveReceivedCommandWith(PublishBatchCommand, {
+    TopicArn: TOPIC_ARN,
+    PublishBatchRequestEntries: [
+      {
+        Id: Util.sha256(`${FIRST_MESSAGE}-1`),
+        Message: FIRST_MESSAGE,
+      },
+      {
+        Id: Util.sha256(`${SECOND_MESSAGE}-2`),
+        Message: SECOND_MESSAGE,
+      },
+    ],
   });
 });
diff --git a/libs/wingsdk/test/target-tf-azure/bucket.inflight.test.ts b/libs/wingsdk/test/shared-azure/bucket.inflight.test.ts
similarity index 99%
rename from libs/wingsdk/test/target-tf-azure/bucket.inflight.test.ts
rename to libs/wingsdk/test/shared-azure/bucket.inflight.test.ts
index a73860db85d..78b05f5dfa8 100644
--- a/libs/wingsdk/test/target-tf-azure/bucket.inflight.test.ts
+++ b/libs/wingsdk/test/shared-azure/bucket.inflight.test.ts
@@ -18,8 +18,8 @@ import {
   ContainerListBlobsOptions,
 } from "@azure/storage-blob";
 import { test, expect, beforeEach, vi } from "vitest";
+import { BucketClient } from "../../src/shared-azure/bucket.inflight";
 import { Datetime } from "../../src/std";
-import { BucketClient } from "../../src/target-tf-azure/bucket.inflight";
 
 vi.mock("@azure/storage-blob");
 
diff --git a/libs/wingsdk/test/shared-azure/counter.inflight.test.ts b/libs/wingsdk/test/shared-azure/counter.inflight.test.ts
new file mode 100644
index 00000000000..d9e3fe01b55
--- /dev/null
+++ b/libs/wingsdk/test/shared-azure/counter.inflight.test.ts
@@ -0,0 +1,266 @@
+import * as azureDataTables from "@azure/data-tables";
+import { test, expect, vi, describe } from "vitest";
+import { CounterClient } from "../../src/shared-azure/counter.inflight";
+
+// @ts-expect-error - un-matching spy argument types
+vi.spyOn(azureDataTables, "TableClient").mockImplementation(() => {
+  const counter = {};
+  return {
+    getEntity: vi.fn((partitionKey, rowKey) => {
+      return Promise.resolve({
+        partitionKey,
+        rowKey,
+        counterValue: counter[rowKey],
+      });
+    }),
+    upsertEntity: vi.fn(
+      (entity: {
+        partitionKey: string;
+        rowKey: string;
+        counterValue: string;
+      }) => {
+        counter[entity.rowKey] = entity.counterValue;
+        return Promise.resolve();
+      }
+    ),
+  };
+});
+
+vi.stubEnv("dummyKey", "value");
+
+describe("no initial value", async () => {
+  test("increment- no key", async () => {
+    const client = new CounterClient("dummyAccount", "dummyTable", "dummyKey");
+
+    expect(await client.inc()).toBe(0);
+    expect(await client.inc(2)).toBe(1);
+    expect(await client.inc(-1)).toBe(3);
+    expect(await client.inc(0)).toBe(2);
+  });
+
+  test("increment- with a key", async () => {
+    const client = new CounterClient("dummyAccount", "dummyTable", "dummyKey");
+
+    expect(await client.inc(2, "testKey")).toBe(0);
+    expect(await client.inc(-1, "testKey")).toBe(2);
+    expect(await client.inc(0, "testKey")).toBe(1);
+  });
+
+  test("decrement - no key", async () => {
+    const client = new CounterClient("dummyAccount", "dummyTable", "dummyKey");
+
+    expect(await client.dec()).toBe(0);
+    expect(await client.dec(2)).toBe(-1);
+    expect(await client.dec(-1)).toBe(-3);
+    expect(await client.dec(0)).toBe(-2);
+  });
+
+  test("decrement - with a key", async () => {
+    const client = new CounterClient("dummyAccount", "dummyTable", "dummyKey");
+
+    expect(await client.dec(2, "testKey")).toBe(0);
+    expect(await client.dec(-1, "testKey")).toBe(-2);
+    expect(await client.dec(0, "testKey")).toBe(-1);
+  });
+
+  test("peeking", async () => {
+    const client = new CounterClient("dummyAccount", "dummyTable", "dummyKey");
+
+    expect(await client.peek()).toBe(0);
+    expect(await client.peek("testKey")).toBe(0);
+
+    await client.dec(2, "testKey");
+    await client.inc(2);
+
+    expect(await client.peek()).toBe(2);
+    expect(await client.peek("testKey")).toBe(-2);
+  });
+
+  test("setting", async () => {
+    const client = new CounterClient("dummyAccount", "dummyTable", "dummyKey");
+
+    expect(await client.set(150)).toBe(undefined);
+    expect(await client.peek()).toBe(150);
+
+    expect(await client.set(-15, "testKey")).toBe(undefined);
+    expect(await client.peek("testKey")).toBe(-15);
+  });
+});
+
+describe("positive initial value", async () => {
+  test("increment- no key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      10
+    );
+
+    expect(await client.inc()).toBe(10);
+    expect(await client.inc(2)).toBe(11);
+    expect(await client.inc(-10)).toBe(13);
+    expect(await client.inc(0)).toBe(3);
+  });
+
+  test("increment- with a key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      10
+    );
+
+    expect(await client.inc(2, "testKey")).toBe(10);
+    expect(await client.inc(-1, "testKey")).toBe(12);
+    expect(await client.inc(0, "testKey")).toBe(11);
+  });
+
+  test("decrement - no key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      10
+    );
+
+    expect(await client.dec()).toBe(10);
+    expect(await client.dec(2)).toBe(9);
+    expect(await client.dec(-1)).toBe(7);
+    expect(await client.dec(0)).toBe(8);
+  });
+
+  test("decrement - with a key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      10
+    );
+
+    expect(await client.dec(2, "testKey")).toBe(10);
+    expect(await client.dec(-1, "testKey")).toBe(8);
+    expect(await client.dec(0, "testKey")).toBe(9);
+  });
+
+  test("peeking", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      10
+    );
+
+    expect(await client.peek()).toBe(10);
+    expect(await client.peek("testKey")).toBe(10);
+
+    await client.dec(20, "testKey");
+    await client.inc(20);
+
+    expect(await client.peek()).toBe(30);
+    expect(await client.peek("testKey")).toBe(-10);
+  });
+
+  test("setting", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      10
+    );
+
+    expect(await client.set(150)).toBe(undefined);
+    expect(await client.peek()).toBe(150);
+
+    expect(await client.set(-15, "testKey")).toBe(undefined);
+    expect(await client.peek("testKey")).toBe(-15);
+  });
+});
+
+describe("negative initial value", async () => {
+  test("increment- no key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      -5
+    );
+
+    expect(await client.inc()).toBe(-5);
+    expect(await client.inc(2)).toBe(-4);
+    expect(await client.inc(-1)).toBe(-2);
+    expect(await client.inc(0)).toBe(-3);
+  });
+
+  test("increment- with a key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      -5
+    );
+
+    expect(await client.inc(2, "testKey")).toBe(-5);
+    expect(await client.inc(-1, "testKey")).toBe(-3);
+    expect(await client.inc(0, "testKey")).toBe(-4);
+  });
+
+  test("decrement - no key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      -5
+    );
+
+    expect(await client.dec()).toBe(-5);
+    expect(await client.dec(2)).toBe(-6);
+    expect(await client.dec(-1)).toBe(-8);
+    expect(await client.dec(0)).toBe(-7);
+  });
+
+  test("decrement - with a key", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      -5
+    );
+
+    expect(await client.dec(2, "testKey")).toBe(-5);
+    expect(await client.dec(-1, "testKey")).toBe(-7);
+    expect(await client.dec(0, "testKey")).toBe(-6);
+  });
+
+  test("peeking", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      -5
+    );
+
+    expect(await client.peek()).toBe(-5);
+    expect(await client.peek("testKey")).toBe(-5);
+
+    await client.dec(2, "testKey");
+    await client.inc(20);
+
+    expect(await client.peek()).toBe(15);
+    expect(await client.peek("testKey")).toBe(-7);
+  });
+
+  test("setting", async () => {
+    const client = new CounterClient(
+      "dummyAccount",
+      "dummyTable",
+      "dummyKey",
+      -5
+    );
+
+    expect(await client.set(150)).toBe(undefined);
+    expect(await client.peek()).toBe(150);
+
+    expect(await client.set(-15, "testKey")).toBe(undefined);
+    expect(await client.peek("testKey")).toBe(-15);
+  });
+});
diff --git a/libs/wingsdk/test/target-tf-azure/function.inflight.test.ts b/libs/wingsdk/test/shared-azure/function.inflight.test.ts
similarity index 100%
rename from libs/wingsdk/test/target-tf-azure/function.inflight.test.ts
rename to libs/wingsdk/test/shared-azure/function.inflight.test.ts
diff --git a/libs/wingsdk/test/shared-gcp/bucket.inflight.test.ts b/libs/wingsdk/test/shared-gcp/bucket.inflight.test.ts
index acce814de57..082baa23e2f 100644
--- a/libs/wingsdk/test/shared-gcp/bucket.inflight.test.ts
+++ b/libs/wingsdk/test/shared-gcp/bucket.inflight.test.ts
@@ -1,6 +1,7 @@
 import { MockStorage } from "mock-gcs";
 import { vi, test, beforeEach, expect } from "vitest";
 import { BucketClient } from "../../src/shared-gcp/bucket.inflight";
+import { Datetime } from "../../src/std";
 
 vi.mock("@google-cloud/storage", () => {
   return {
@@ -64,9 +65,8 @@ test("get a non-existent object from the bucket", async () => {
   const storage = new MockStorage();
 
   const client = new BucketClient(BUCKET_NAME, storage as any);
-
   await expect(() => client.get(NON_EXISTENT_KEY)).rejects.toThrowError(
-    `Failed to get object. (key=${NON_EXISTENT_KEY})`
+    /Failed to get object \(key=NON_EXISTENT_KEY\)/
   );
 });
 
@@ -124,7 +124,7 @@ test("delete object from the bucket with mustExist option", async () => {
 
   await expect(() =>
     client.delete(NON_EXISTENT_KEY, { mustExist: true })
-  ).rejects.toThrowError(`Failed to delete object. (key=${NON_EXISTENT_KEY})`);
+  ).rejects.toThrowError(`Object does not exist (key=${NON_EXISTENT_KEY}).`);
 });
 
 test("delete a non-existent object from the bucket with mustExist option", async () => {
@@ -137,7 +137,7 @@ test("delete a non-existent object from the bucket with mustExist option", async
 
   await expect(() =>
     client.delete(NON_EXISTENT_KEY, { mustExist: true })
-  ).rejects.toThrowError(`Failed to delete object. (key=${NON_EXISTENT_KEY})`);
+  ).rejects.toThrowError(`Object does not exist (key=${NON_EXISTENT_KEY}).`);
 });
 
 test("Given a non public bucket when reaching to a key public url it should throw an error", async () => {
@@ -151,7 +151,7 @@ test("Given a non public bucket when reaching to a key public url it should thro
   await client.put(KEY, VALUE);
 
   await expect(() => client.publicUrl(KEY)).rejects.toThrowError(
-    `Failed to get public URL. (key=${KEY})`
+    `Failed to check if bucket is public. (bucket=${BUCKET_NAME})`
   );
 });
 
@@ -164,7 +164,7 @@ test("Given a public bucket when reaching to a non existent key, public url it s
   const client = new BucketClient(BUCKET_NAME, storage as any);
 
   await expect(() => client.publicUrl(KEY)).rejects.toThrowError(
-    `Failed to get public URL. (key=${KEY})`
+    `Failed to check if bucket is public. (bucket=${BUCKET_NAME})`
   );
 });
 
@@ -310,5 +310,151 @@ test("tryDelete a non-existent object from the bucket", async () => {
   expect(res).toBe(false);
 });
 
+test("get object's metadata from bucket", async () => {
+  // GIVEN
+  const BUCKET_NAME = "my-bucket";
+  const KEY = "my-object";
+  const VALUE = "hello world";
+  const mockStorage = new MockStorage();
+  await mockStorage
+    .bucket(BUCKET_NAME)
+    .file(KEY)
+    .save(VALUE, {
+      metadata: {
+        acl: [
+          {
+            entity: "user-example@example.com",
+            role: "OWNER",
+          },
+        ],
+        cacheControl: "public, max-age=3600",
+        contentDisposition: "attachment; filename=my-object.txt",
+        contentEncoding: "gzip",
+        contentLanguage: "en",
+        contentType: "text/plain",
+        crc32c: "abcd1234",
+        customTime: "2023-10-22T18:55:00Z",
+        etag: "Cj0KEQjwvb76BRCtAhIDAQAB",
+        generation: 1,
+        id: "my-bucket/my-object/1666563700000000",
+        kind: "storage#object",
+        md5Hash: "1B2M2Y8AsgTpgAmY7PhCfg==",
+        mediaLink: "https://storage.googleapis.com/my-bucket/my-object",
+        metageneration: 1,
+        name: "my-object",
+        owner: {
+          entity: "user-example@example.com",
+          entityId: "12345678901234567890",
+        },
+        selfLink:
+          "https://www.googleapis.com/storage/v1/b/my-bucket/o/my-object",
+        size: 11,
+        storageClass: "STANDARD",
+        timeCreated: "2023-10-22T18:55:00Z",
+        updated: "2023-10-22T18:55:00Z",
+      },
+    });
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME, mockStorage as any);
+  const response = await client.metadata(KEY);
+
+  // THEN
+  expect(response).toEqual({
+    size: 11,
+    lastModified: Datetime.fromIso("2023-10-22T18:55:00Z"),
+    contentType: "text/plain",
+  });
+});
+
+test("copy non-existing object", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+  const mockStorage = new MockStorage();
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME, mockStorage as any);
+
+  // THEN
+  await expect(client.copy(SRC_KEY, SRC_KEY)).rejects.toThrowError(
+    `Source object does not exist (srcKey=${SRC_KEY})`
+  );
+});
+
+test("copy objects within the bucket", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+  const DST_KEY = "DST/KEY";
+  const SRC_VALUE = "hello world";
+  const mockStorage = new MockStorage();
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME, mockStorage as any);
+  await client.put(SRC_KEY, SRC_VALUE);
+  const response1 = await client.copy(SRC_KEY, SRC_KEY);
+  // THEN
+  expect(response1).toEqual(undefined);
+  expect(await client.get(SRC_KEY)).toBe(SRC_VALUE);
+  expect(await client.exists(DST_KEY)).toBe(false);
+
+  // WHEN
+  const response2 = await client.copy(SRC_KEY, DST_KEY);
+  // THEN
+  expect(response2).toEqual(undefined);
+  expect(await client.get(DST_KEY)).toBe(SRC_VALUE);
+});
+
+test("rename valid object in the bucket", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+  const SRC_VALUE = "hello world";
+  const DST_KEY = "DST/KEY";
+  const mockStorage = new MockStorage();
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME, mockStorage as any);
+  await client.put(SRC_KEY, SRC_VALUE);
+  const response = await client.rename(SRC_KEY, DST_KEY);
+
+  // THEN
+  expect(response).toEqual(undefined);
+  expect(await client.get(DST_KEY)).toBe(SRC_VALUE);
+  expect(await client.exists(SRC_KEY)).toBe(false);
+});
+
+test("renaming an object to its current name should throw an error", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+  const mockStorage = new MockStorage();
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME, mockStorage as any);
+
+  // THEN
+  await expect(() => client.rename(SRC_KEY, SRC_KEY)).rejects.toThrowError(
+    `Renaming an object to its current name is not a valid operation (srcKey=${SRC_KEY}, dstKey=${SRC_KEY}).`
+  );
+});
+
+test("rename non-existent object within the bucket", async () => {
+  // GIVEN
+  const BUCKET_NAME = "BUCKET_NAME";
+  const SRC_KEY = "SRC/KEY";
+  const DST_KEY = "DST/KEY";
+  const mockStorage = new MockStorage();
+
+  // WHEN
+  const client = new BucketClient(BUCKET_NAME, mockStorage as any);
+
+  // THEN
+  await expect(() => client.rename(SRC_KEY, DST_KEY)).rejects.toThrowError(
+    `Source object does not exist (srcKey=${SRC_KEY}).`
+  );
+});
+
 // TODO: implement signedUrl related tests
 // https://github.com/winglang/wing/issues/4599
diff --git a/libs/wingsdk/test/shared/bundling.test.ts b/libs/wingsdk/test/shared/bundling.test.ts
new file mode 100644
index 00000000000..41e5f18b0ed
--- /dev/null
+++ b/libs/wingsdk/test/shared/bundling.test.ts
@@ -0,0 +1,72 @@
+import { describe, it, expect } from "vitest";
+import { encode, decode } from "vlq";
+import { fixSourcemaps } from "../../src/shared/bundling";
+
+describe("fixSourcemaps", () => {
+  it("should fix sourcemaps", () => {
+    // THEN
+    const mappings = [
+      [0, 0, 0, 0],
+      [0, 1, 1, 0],
+      [0, 2, 2, 0],
+      [0, -1, 3, 0],
+      [0, -1, 4, 0],
+    ];
+    const originalMapping = mappings.map((m) => encode(m)).join(";");
+
+    const sourcemapData = {
+      sources: ["a/aa", "b", "a/aa", "c"],
+      sourcesContent: ["1", "2", "1", "3"],
+      mappings: originalMapping,
+    };
+
+    // WHEN
+    fixSourcemaps(sourcemapData);
+
+    // THEN
+    expect(sourcemapData.sources).toHaveLength(3);
+    expect(sourcemapData.sourcesContent).toHaveLength(3);
+    expect(sourcemapData.mappings).not.toEqual(originalMapping);
+
+    expect(sourcemapData.sources).toMatchInlineSnapshot(`
+      [
+        "a/aa",
+        "b",
+        "c",
+      ]
+    `);
+    expect(sourcemapData.sourcesContent).toMatchInlineSnapshot(`
+      [
+        "1",
+        "2",
+        "3",
+      ]
+    `);
+
+    const decoded = sourcemapData.mappings.split(";").map(decode);
+    expect(decoded).toHaveLength(5);
+    // first 2 mappings are unchanged
+    expect(decoded[0]).toEqual(mappings[0]);
+    expect(decoded[1]).toEqual(mappings[1]);
+    // This mapping pointed to [3] which is now at [2], so now it needs to point to [2]
+    // AKA Shifted by 1
+    expect(decoded[2]).toEqual([
+      mappings[2][0],
+      mappings[2][1] - 1,
+      mappings[2][2],
+      mappings[2][3],
+    ]);
+    expect(decoded[3]).toEqual([
+      mappings[3][0],
+      mappings[3][1] - 1,
+      mappings[3][2],
+      mappings[3][3],
+    ]);
+    expect(decoded[4]).toEqual([
+      mappings[4][0],
+      mappings[4][1] + 2,
+      mappings[4][2],
+      mappings[4][3],
+    ]);
+  });
+});
diff --git a/libs/wingsdk/test/sim-app.ts b/libs/wingsdk/test/sim-app.ts
index 0cd8b66b155..ea9a8a63e28 100644
--- a/libs/wingsdk/test/sim-app.ts
+++ b/libs/wingsdk/test/sim-app.ts
@@ -1,10 +1,24 @@
 import * as fs from "fs";
 import { join } from "path";
+import { onTestFailed } from "vitest";
 import { directorySnapshot, mkdtemp } from "./util";
-import { Function, IFunctionClient } from "../src/cloud";
-import { Simulator, Testing } from "../src/simulator";
+import { Function, IFunctionClient, IFunctionHandler } from "../src/cloud";
+import { Simulator } from "../src/simulator";
 import { App } from "../src/target-sim/app";
 
+/**
+ * @see AppProps
+ */
+export interface SimAppProps {
+  /**
+   * The output directory for the synthesized app.
+   * @default - a fresh temporary directory
+   */
+  readonly outdir?: string;
+  readonly isTestEnvironment?: boolean;
+  readonly rootConstruct?: any;
+}
+
 /**
  * A simulated app.
  *
@@ -16,14 +30,26 @@ export class SimApp extends App {
   private _synthesized: boolean = false;
   private functionIndex: number = 0;
 
-  constructor() {
-    super({ outdir: mkdtemp(), entrypointDir: __dirname });
+  constructor(props: SimAppProps = {}) {
+    const { isTestEnvironment, rootConstruct, outdir } = props;
+    super({
+      outdir: outdir ?? mkdtemp(),
+      entrypointDir: __dirname,
+      isTestEnvironment,
+      rootConstruct,
+    });
 
     // symlink the node_modules so we can test imports and stuffs
-    fs.symlinkSync(
-      join(__dirname, "..", "node_modules"),
-      join(this.outdir, "node_modules")
-    );
+    try {
+      fs.symlinkSync(
+        join(__dirname, "..", "node_modules"),
+        join(this.outdir, "node_modules")
+      );
+    } catch (e) {
+      if (e.code !== "EEXIST") {
+        throw e;
+      }
+    }
   }
 
   /**
@@ -32,20 +58,15 @@ export class SimApp extends App {
    * @returns An "invoker" function which can be used to invoke the function after the simulator had
    * started.
    */
-  public newCloudFunction(code: string) {
+  public newCloudFunction(handler: IFunctionHandler) {
     const id = `Function.${this.functionIndex++}`;
-    new Function(
-      this,
-      id,
-      Testing.makeHandler(`async handle() {
-          ${code}
-        }`)
-    );
+
+    new Function(this, id, handler);
 
     // returns an "invoker" for this function
     return async (s: Simulator) => {
       const fn = s.getResource("/" + id) as IFunctionClient;
-      return fn.invoke("");
+      return fn.invoke();
     };
   }
 
@@ -54,28 +75,20 @@ export class SimApp extends App {
    *
    * @returns A started `Simulator` instance. No need to call `start()` again.
    */
-  public async startSimulator(): Promise<Simulator> {
+  public async startSimulator(stateDir?: string): Promise<Simulator> {
     this.synthIfNeeded();
     const simfile = this.synth();
-    const s = new Simulator({ simfile });
+    const s = new Simulator({ simfile, stateDir });
     await s.start();
-    return s;
-  }
 
-  /**
-   * Executes a code block with a simulator, will stop the simulator after the
-   * code block is done.
-   *
-   * @param cb code block closure to execute with the simulator
-   * @internal
-   */
-  public async _withSimulator(cb: (s: Simulator) => Promise<void>) {
-    const s = await this.startSimulator();
-    try {
-      await cb(s);
-    } finally {
-      await s.stop();
-    }
+    // When tests fail, we still want to make sure the simulator is stopped
+    onTestFailed(async () => {
+      if ((s as any)._running === "running") {
+        await s.stop();
+      }
+    });
+
+    return s;
   }
 
   /**
diff --git a/libs/wingsdk/test/simulator/__snapshots__/simulator.test.ts.snap b/libs/wingsdk/test/simulator/__snapshots__/simulator.test.ts.snap
index b6f1bf56039..7ed3672252a 100644
--- a/libs/wingsdk/test/simulator/__snapshots__/simulator.test.ts.snap
+++ b/libs/wingsdk/test/simulator/__snapshots__/simulator.test.ts.snap
@@ -4,40 +4,14 @@ exports[`provides raw tree data 1`] = `
 {
   "tree": {
     "children": {
-      "cloud.TestRunner": {
-        "constructInfo": {
-          "fqn": "constructs.Construct",
-          "version": "10.2.70",
-        },
-        "display": {
-          "description": "A suite of APIs for running tests and collecting results.",
-          "hidden": true,
-          "title": "TestRunner",
-        },
-        "id": "cloud.TestRunner",
-        "path": "root/cloud.TestRunner",
-      },
       "test": {
-        "children": {
-          "Handler": {
-            "constructInfo": {
-              "fqn": "constructs.Construct",
-              "version": "10.2.70",
-            },
-            "display": {
-              "description": "A cloud function (FaaS)",
-              "title": "Function",
-            },
-            "id": "Handler",
-            "path": "root/test/Handler",
-          },
-        },
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.2.70",
+          "version": "10.3.0",
         },
         "display": {
           "description": "A cloud unit test.",
+          "hidden": true,
           "title": "Test",
         },
         "id": "test",
@@ -46,8 +20,9 @@ exports[`provides raw tree data 1`] = `
     },
     "constructInfo": {
       "fqn": "constructs.Construct",
-      "version": "10.2.70",
+      "version": "10.3.0",
     },
+    "display": {},
     "id": "root",
     "path": "root",
   },
@@ -66,6 +41,7 @@ exports[`run all tests > single test 1`] = `
         "data": {
           "message": "hi",
         },
+        "level": "info",
         "sourcePath": "root/test/Handler",
         "sourceType": "@winglang/sdk.cloud.Function",
         "timestamp": "<TIMESTAMP>",
@@ -73,9 +49,10 @@ exports[`run all tests > single test 1`] = `
       },
       {
         "data": {
-          "message": "Invoke (payload=\\"\\").",
+          "message": "Invoke (payload=undefined).",
           "status": "success",
         },
+        "level": "verbose",
         "sourcePath": "root/test/Handler",
         "sourceType": "@winglang/sdk.cloud.Function",
         "timestamp": "<TIMESTAMP>",
@@ -96,6 +73,7 @@ exports[`run single test > happy path 1`] = `
       "data": {
         "message": "hi",
       },
+      "level": "info",
       "sourcePath": "root/test/Handler",
       "sourceType": "@winglang/sdk.cloud.Function",
       "timestamp": "<TIMESTAMP>",
@@ -103,9 +81,10 @@ exports[`run single test > happy path 1`] = `
     },
     {
       "data": {
-        "message": "Invoke (payload=\\"\\").",
+        "message": "Invoke (payload=undefined).",
         "status": "success",
       },
+      "level": "verbose",
       "sourcePath": "root/test/Handler",
       "sourceType": "@winglang/sdk.cloud.Function",
       "timestamp": "<TIMESTAMP>",
@@ -117,17 +96,7 @@ exports[`run single test > happy path 1`] = `
 
 exports[`run single test > test failure 1`] = `
 {
-  "error": "Error: test failed
-<sanitized>
-<sanitized>
-<sanitized>
-    at Script.runInContext (node:vm:<sanitized>)
-    at Object.runInContext (node:vm:<sanitized>)
-<sanitized>
-    at new Promise (<anonymous>)
-<sanitized>
-<sanitized>
-<sanitized>",
+  "error": "Error: test failed",
   "pass": false,
   "path": "root/test",
   "traces": [
@@ -135,6 +104,7 @@ exports[`run single test > test failure 1`] = `
       "data": {
         "message": "I am about to fail",
       },
+      "level": "info",
       "sourcePath": "root/test/Handler",
       "sourceType": "@winglang/sdk.cloud.Function",
       "timestamp": "<TIMESTAMP>",
@@ -143,9 +113,10 @@ exports[`run single test > test failure 1`] = `
     {
       "data": {
         "error": {},
-        "message": "Invoke (payload=\\"\\").",
+        "message": "Error: test failed (Invoke (payload=undefined).)",
         "status": "failure",
       },
+      "level": "verbose",
       "sourcePath": "root/test/Handler",
       "sourceType": "@winglang/sdk.cloud.Function",
       "timestamp": "<TIMESTAMP>",
diff --git a/libs/wingsdk/test/simulator/cleanup.test.ts b/libs/wingsdk/test/simulator/cleanup.test.ts
new file mode 100644
index 00000000000..2a72ac2f9c2
--- /dev/null
+++ b/libs/wingsdk/test/simulator/cleanup.test.ts
@@ -0,0 +1,100 @@
+import * as cp from "child_process";
+import { expect, test } from "vitest";
+import { Service } from "../../src/cloud";
+import { inflight } from "../../src/core";
+import { SimApp } from "../sim-app";
+
+const script = (simdir: string) => `
+const { simulator } = require("./src");
+
+async function main() {
+  const sim = new simulator.Simulator({ simfile: "${simdir}" });
+  sim.onTrace({
+    callback: (trace) => {
+      console.log(trace.data.message);
+    },
+  });
+  console.log("Starting simulator");
+  await sim.start();
+  console.log("Simulator started");
+
+  process.on("SIGTERM", async () => {
+    console.log("SIGTERM received, stopping simulator...");
+    await sim.stop();
+    process.exit(1);
+  });
+}
+
+main();
+`;
+
+const code = inflight(async () => {
+  console.log("start!");
+  const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+  return async () => {
+    console.log("stopping...");
+    await sleep(1000);
+    console.log("stopped!");
+  };
+});
+
+// This test validates that if a process running the simulator is killed
+// and that process has code set up for gracefully shutting down the simulator,
+// then the simulator will be stopped correctly (including child processes
+// like services).
+test("simulator cleanup", async () => {
+  // Synthesize configuration for the simulator to use in the test
+  const app = new SimApp({ isTestEnvironment: true });
+  new Service(app, "Service", code);
+  const simdir = app.synth();
+
+  // Start the simulator in a child process
+  const child = cp.spawn(process.argv0, ["-e", script(simdir)], {
+    stdio: ["pipe", "pipe", "pipe"],
+  });
+
+  child.stdout?.on("data", (data) => {
+    console.error(data.toString());
+  });
+  child.stderr?.on("data", (data) => {
+    console.error(data.toString());
+  });
+
+  let stopped = false;
+
+  const stoppedPromise = new Promise((resolve) => {
+    child.stdout?.on("data", (data) => {
+      if (data.toString().includes("stopped!")) {
+        stopped = true;
+        resolve(undefined);
+      }
+    });
+    child.stderr?.on("data", (data) => {
+      if (data.toString().includes("stopped!")) {
+        stopped = true;
+        resolve(undefined);
+      }
+    });
+  });
+
+  // Wait for the "Simulator started" message, then kill the child process
+  await new Promise((resolve) => {
+    child.stdout?.on("data", (data) => {
+      if (data.toString().includes("Simulator started")) {
+        child.kill("SIGTERM");
+        resolve(undefined);
+      }
+    });
+    child.stderr?.on("data", (data) => {
+      if (data.toString().includes("Simulator started")) {
+        child.kill("SIGTERM");
+        resolve(undefined);
+      }
+    });
+  });
+
+  // Wait for the "stopped!" message from cloud.Service (running in a grandchild process)
+  await stoppedPromise;
+
+  expect(stopped).toBe(true);
+});
diff --git a/libs/wingsdk/test/simulator/graph.test.ts b/libs/wingsdk/test/simulator/graph.test.ts
new file mode 100644
index 00000000000..8a9a033b232
--- /dev/null
+++ b/libs/wingsdk/test/simulator/graph.test.ts
@@ -0,0 +1,100 @@
+import { test, expect, describe } from "vitest";
+import { Graph } from "../../src/simulator/graph";
+
+test("empty", () => {
+  const graph = new Graph([]);
+  expect(graph.nodes.length).toBe(0);
+});
+
+test("two disconnected nodes", () => {
+  const graph = new Graph([{ path: "a" }, { path: "b" }]);
+
+  expect(graph.nodes.length).toBe(2);
+
+  const a = graph.tryFind("a")!;
+  expect(a.def).toStrictEqual({ path: "a" });
+  expect(Array.from(a.dependencies)).toStrictEqual([]);
+  expect(Array.from(a.dependents)).toStrictEqual([]);
+
+  const b = graph.tryFind("b")!;
+  expect(b.def).toStrictEqual({ path: "b" });
+  expect(Array.from(b.dependencies)).toStrictEqual([]);
+  expect(Array.from(b.dependents)).toStrictEqual([]);
+});
+
+test("explicit deps", () => {
+  const graph = new Graph([{ path: "a", deps: ["b"] }, { path: "b" }]);
+
+  const a = graph.tryFind("a")!;
+  expect(a.dependencies.size).toBe(1);
+  expect(Array.from(a.dependencies)).toStrictEqual(["b"]);
+
+  const b = graph.tryFind("b")!;
+  expect(b.dependents.size).toBe(1);
+  expect(Array.from(b.dependents)).toStrictEqual(["a"]);
+});
+
+test("implicit deps", () => {
+  const graph = new Graph([
+    {
+      path: "a",
+      props: {
+        foo: "${wsim#b#attrs.bar}",
+        another: "i depend on: ${wsim#c/d/e#attrs.xxx}",
+      },
+    },
+    { path: "b", props: { hello: ["bang", "${wsim#c/d/e#attrs.aaa}"] } },
+    { path: "c/d/e" },
+    { path: "d", props: { a: "${wsim#a#attrs.aaa}" }, deps: ["b"] },
+  ]);
+
+  const a = graph.tryFind("a")!;
+  expect(Array.from(a.dependencies)).toStrictEqual(["b", "c/d/e"]);
+  expect(Array.from(a.dependents)).toStrictEqual(["d"]);
+
+  const b = graph.tryFind("b")!;
+  expect(Array.from(b.dependencies)).toStrictEqual(["c/d/e"]);
+  expect(Array.from(b.dependents)).toStrictEqual(["a", "d"]);
+
+  const c = graph.tryFind("c/d/e")!;
+  expect(Array.from(c.dependencies)).toStrictEqual([]);
+  expect(Array.from(c.dependents)).toStrictEqual(["a", "b"]);
+
+  const d = graph.tryFind("d")!;
+  expect(Array.from(d.dependencies)).toStrictEqual(["b", "a"]);
+  expect(Array.from(d.dependents)).toStrictEqual([]);
+});
+
+test("tryFind returns undefined if node does not exist", () => {
+  const graph = new Graph([]);
+  expect(graph.tryFind("a")).toBe(undefined);
+});
+
+test("fails on a direct cyclic dependency", () => {
+  expect(() => {
+    new Graph([
+      { path: "a", deps: ["b"] },
+      { path: "b", deps: ["a"] },
+    ]);
+  }).toThrowError(/cyclic dependency detected: b -> a/);
+});
+
+test("fails on an indirect cyclic dependency", () => {
+  expect(() => {
+    new Graph([
+      { path: "a", deps: ["b"] },
+      { path: "b", deps: ["c"] },
+      { path: "c", deps: ["a"] },
+    ]);
+  }).toThrowError(/cyclic dependency detected: c -> a/);
+});
+
+test("cyclic deps introduced by token", () => {
+  expect(() => {
+    new Graph([
+      { path: "a", props: { foo: "${wsim#b#attrs.bar}" } },
+      { path: "b", props: { bar: "${wsim#c#attrs.baz}" } },
+      { path: "c", props: { baz: "${wsim#a#attrs.foo}" } },
+    ]);
+  }).toThrowError(/cyclic dependency detected: c -> a -> b -> c/);
+});
diff --git a/libs/wingsdk/test/simulator/on-trace.test.ts b/libs/wingsdk/test/simulator/on-trace.test.ts
index 7e9b650da6e..cee2e130f88 100644
--- a/libs/wingsdk/test/simulator/on-trace.test.ts
+++ b/libs/wingsdk/test/simulator/on-trace.test.ts
@@ -27,5 +27,5 @@ test("onTrace", async () => {
   await s.stop();
 
   // THEN
-  expect(numTraces).toEqual(5); // create resources, put operation, delete resources
+  expect(numTraces).toBeGreaterThanOrEqual(3); // create resources, put operation, delete resources
 });
diff --git a/libs/wingsdk/test/simulator/reload.test.ts b/libs/wingsdk/test/simulator/reload.test.ts
index 165514cb66c..7b34ecb2fd2 100644
--- a/libs/wingsdk/test/simulator/reload.test.ts
+++ b/libs/wingsdk/test/simulator/reload.test.ts
@@ -1,5 +1,5 @@
 import { test, expect } from "vitest";
-import { Bucket } from "../../src/cloud";
+import { Bucket, IBucketClient } from "../../src/cloud";
 import * as testing from "../../src/simulator";
 import { Node } from "../../src/std";
 import { App } from "../../src/target-sim/app";
@@ -29,9 +29,27 @@ test("reloading the simulator updates the state of the tree", async () => {
   app2.synth();
 
   // Reload the simulator
-  await s.reload();
+  await s.reload(false);
   expect(s.getResourceConfig("/my_bucket").props.public).toEqual(true);
   expect(s.tree().rawData().tree.children?.my_bucket.display?.hidden).toEqual(
     true
   );
 });
+
+test("traces are cleared when reloading the simulator with reset state set to true", async () => {
+  let workdir = mkdtemp();
+
+  // Create a .wsim file
+  const app = new App({ outdir: workdir, entrypointDir: __dirname });
+  new Bucket(app, "my_bucket", { public: false });
+  const simfile = app.synth();
+  // Start the simulator
+  const s = new testing.Simulator({ simfile });
+  await s.start();
+  const client = s.getResource("/my_bucket") as IBucketClient;
+  await client.put("traces.txt", "Hello world!");
+  expect(s.listTraces().filter((t) => t.type === "resource").length).toEqual(1);
+  // Reload the simulator and reset state
+  await s.reload(true);
+  expect(s.listTraces().filter((t) => t.type === "resource").length).toEqual(0);
+});
diff --git a/libs/wingsdk/test/simulator/simulator.test.ts b/libs/wingsdk/test/simulator/simulator.test.ts
index cb640dab694..b1c8b29ff99 100644
--- a/libs/wingsdk/test/simulator/simulator.test.ts
+++ b/libs/wingsdk/test/simulator/simulator.test.ts
@@ -1,14 +1,33 @@
+import * as fs from "fs";
+import * as inspector from "inspector";
 import { Construct } from "constructs";
 import { test, expect, describe } from "vitest";
-import { Bucket } from "../../src/cloud";
-import { InflightBindings } from "../../src/core";
-import { Testing } from "../../src/simulator";
-import { ITestRunnerClient, Test, TestResult } from "../../src/std";
+import {
+  Api,
+  Bucket,
+  Function,
+  IBucketClient,
+  IFunctionClient,
+  IFunctionHandler,
+  OnDeploy,
+  Service,
+} from "../../src/cloud";
+import { inflight, lift } from "../../src/core";
+import { Simulator } from "../../src/simulator";
+import { ITestRunnerClient, Test, TestResult, TraceType } from "../../src/std";
+import { State } from "../../src/target-sim";
 import { SimApp } from "../sim-app";
+import { mkdtemp } from "../util";
+
+const NOOP = inflight(async () => {});
+const NOOP2 = inflight(async () => {
+  console.log("noop2");
+});
+const OK_200 = inflight(async () => ({ status: 200 }));
 
 describe("run single test", () => {
   test("test not found", async () => {
-    const app = new SimApp();
+    const app = new SimApp({ isTestEnvironment: true });
     const sim = await app.startSimulator();
     const testRunner = sim.getResource(
       "/cloud.TestRunner"
@@ -20,8 +39,12 @@ describe("run single test", () => {
   });
 
   test("happy path", async () => {
-    const app = new SimApp();
-    makeTest(app, "test", ["console.log('hi');"]);
+    const app = new SimApp({ isTestEnvironment: true });
+    makeTest(
+      app,
+      "test",
+      inflight(async () => console.log("hi"))
+    );
     app.synth();
     const sim = await app.startSimulator();
     const testRunner = sim.getResource(
@@ -33,11 +56,15 @@ describe("run single test", () => {
   });
 
   test("test failure", async () => {
-    const app = new SimApp();
-    makeTest(app, "test", [
-      "console.log('I am about to fail');",
-      "throw new Error('test failed');",
-    ]);
+    const app = new SimApp({ isTestEnvironment: true });
+    makeTest(
+      app,
+      "test",
+      inflight(async () => {
+        console.log("I am about to fail");
+        throw new Error("test failed");
+      })
+    );
 
     const sim = await app.startSimulator();
     const testRunner = sim.getResource(
@@ -49,7 +76,7 @@ describe("run single test", () => {
   });
 
   test("not a function", async () => {
-    const app = new SimApp();
+    const app = new SimApp({ isTestEnvironment: true });
     new Bucket(app, "test");
 
     const sim = await app.startSimulator();
@@ -65,7 +92,7 @@ describe("run single test", () => {
 
 describe("run all tests", () => {
   test("no tests", async () => {
-    const app = new SimApp();
+    const app = new SimApp({ isTestEnvironment: true });
     const sim = await app.startSimulator();
     const testRunner = sim.getResource(
       "/cloud.TestRunner"
@@ -76,8 +103,12 @@ describe("run all tests", () => {
   });
 
   test("single test", async () => {
-    const app = new SimApp();
-    makeTest(app, "test", ["console.log('hi');"]);
+    const app = new SimApp({ isTestEnvironment: true });
+    makeTest(
+      app,
+      "test",
+      inflight(async () => console.log("hi"))
+    );
 
     const sim = await app.startSimulator();
     const testRunner = sim.getResource(
@@ -89,11 +120,68 @@ describe("run all tests", () => {
   });
 
   test("multiple tests", async () => {
-    const app = new SimApp();
-    makeTest(app, "test", ["console.log('hi');"]);
-    makeTest(app, "test:bla", ["console.log('hi');"]);
-    makeTest(app, "test:blue", ["console.log('hi');"]);
-    new Bucket(app, "mytestbucket");
+    class Root extends Construct {
+      constructor(scope: Construct, id: string) {
+        super(scope, id);
+        makeTest(
+          this,
+          "test",
+          inflight(async () => console.log("hi"))
+        );
+        makeTest(
+          this,
+          "test:bla",
+          inflight(async () => console.log("hi"))
+        );
+        makeTest(
+          this,
+          "test:blue",
+          inflight(async () => console.log("hi"))
+        );
+      }
+    }
+    const app = new SimApp({ isTestEnvironment: true, rootConstruct: Root });
+
+    const sim = await app.startSimulator();
+    const testRunner = sim.getResource(
+      "/cloud.TestRunner"
+    ) as ITestRunnerClient;
+    const results = await runAllTests(testRunner);
+    await sim.stop();
+    expect(results.length).toEqual(3);
+    expect(results.map((r) => r.path).sort()).toStrictEqual([
+      "root/env0/test",
+      "root/env1/test:bla",
+      "root/env2/test:blue",
+    ]);
+  });
+
+  test("tests with same name in different scopes", async () => {
+    class ConstructWithTest extends Construct {
+      constructor(scope: Construct, id: string) {
+        super(scope, id);
+        makeTest(
+          this,
+          "test",
+          inflight(async () => console.log("hi"))
+        );
+      }
+    }
+
+    class Root extends Construct {
+      constructor(scope: Construct, id: string) {
+        super(scope, id);
+
+        makeTest(
+          this,
+          "test",
+          inflight(async () => console.log("hi"))
+        );
+        new ConstructWithTest(this, "scope1");
+        new ConstructWithTest(this, "scope2");
+      }
+    }
+    const app = new SimApp({ isTestEnvironment: true, rootConstruct: Root });
 
     const sim = await app.startSimulator();
     const testRunner = sim.getResource(
@@ -103,9 +191,9 @@ describe("run all tests", () => {
     await sim.stop();
     expect(results.length).toEqual(3);
     expect(results.map((r) => r.path).sort()).toStrictEqual([
-      "root/test",
-      "root/test:bla",
-      "root/test:blue",
+      "root/env0/test",
+      "root/env1/scope1/test",
+      "root/env2/scope2/test",
     ]);
   });
 });
@@ -126,14 +214,18 @@ test("calling an invalid method returns an error to the client", async () => {
   const sim = await app.startSimulator();
   const bucketClient = sim.getResource("/test");
   await expect(bucketClient.invalidMethod()).rejects.toThrowError(
-    /Method invalidMethod not found on resource/
+    /Method "invalidMethod" not found on resource/
   );
   await sim.stop();
 });
 
 test("provides raw tree data", async () => {
   const app = new SimApp();
-  makeTest(app, "test", ["console.log('hi');"]);
+  makeTest(
+    app,
+    "test",
+    inflight(async () => console.log("hi"))
+  );
   const sim = await app.startSimulator();
   const treeData = sim.tree().rawData();
   await sim.stop();
@@ -141,57 +233,671 @@ test("provides raw tree data", async () => {
   expect(treeData).toMatchSnapshot();
 });
 
-function makeTest(
-  scope: Construct,
-  id: string,
-  code: string[],
-  bindings: InflightBindings = {}
-) {
-  const handler = Testing.makeHandler(
-    `async handle() { ${code.join("\n")} }`,
-    bindings
-  );
-  return new Test(scope, id, handler, bindings);
-}
+test("unable to resolve token during initialization", async () => {
+  const app = new SimApp();
+  const state = new State(app, "State");
+  const bucket = new Bucket(app, "Bucket");
+  bucket.addObject("url.txt", state.token("my_token"));
 
-function removePathsFromTraceLine(line?: string) {
-  if (!line) {
-    return undefined;
+  let error;
+  try {
+    await app.startSimulator();
+  } catch (e) {
+    error = e;
   }
+  expect(error).toBeDefined();
+  expect(error.message).toMatch(
+    /Failed to start resources: \"root\/Bucket\", "root\/Bucket\/Policy\"/
+  );
+});
 
-  // replace any paths in the log line with "foo/bar.ts" instead of "/Users/eladb/code/wing2/libs/wingsdk/src/target-sim/foo/bar.ts"
-  if (line.includes("/")) {
-    return "<sanitized>";
-  }
+describe("in-place updates", () => {
+  test("no change", async () => {
+    const stateDir = mkdtemp();
 
-  return line;
-}
+    const app = new SimApp();
+    new Bucket(app, "Bucket1");
 
-function removeLineNumbers(line?: string) {
-  if (!line) {
-    return undefined;
-  }
+    const sim = await app.startSimulator(stateDir);
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+    ]);
+
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+    ]);
+
+    const app2 = new SimApp();
+    new Bucket(app2, "Bucket1");
+
+    const app2Dir = app2.synth();
+
+    await sim.update(app2Dir);
+    expect(updateTrace(sim)).toStrictEqual({
+      added: [],
+      deleted: [],
+      updated: [],
+    });
+
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "Update: 0 added, 0 updated, 0 deleted",
+    ]);
+
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+    ]);
+    await sim.stop();
+  });
+
+  test("add", async () => {
+    const stateDir = mkdtemp();
+
+    const app = new SimApp();
+
+    new Bucket(app, "Bucket1");
+    const sim = await app.startSimulator(stateDir);
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+    ]);
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+    ]);
+
+    const app2 = new SimApp();
+    new Bucket(app2, "Bucket1");
+    new Bucket(app2, "Bucket2");
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+    expect(updateTrace(sim)).toStrictEqual({
+      added: ["root/Bucket2", "root/Bucket2/Policy"],
+      deleted: [],
+      updated: [],
+    });
+
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+      "root/Bucket2",
+      "root/Bucket2/Policy",
+    ]);
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "Update: 2 added, 0 updated, 0 deleted",
+      "root/Bucket2 started",
+      "root/Bucket2/Policy started",
+    ]);
 
-  return line.replace(/:\d+:\d+/g, ":<sanitized>");
+    await sim.stop();
+  });
+
+  test("delete", async () => {
+    const stateDir = mkdtemp();
+
+    const app = new SimApp();
+    new Bucket(app, "Bucket1");
+    new Bucket(app, "Bucket2");
+    const sim = await app.startSimulator(stateDir);
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+      "root/Bucket2",
+      "root/Bucket2/Policy",
+    ]);
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "root/Bucket2 started",
+      "root/Bucket2/Policy started",
+    ]);
+
+    const app2 = new SimApp();
+    new Bucket(app2, "Bucket1");
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+    expect(updateTrace(sim)).toStrictEqual({
+      added: [],
+      deleted: ["root/Bucket2", "root/Bucket2/Policy"],
+      updated: [],
+    });
+
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+    ]);
+
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "root/Bucket2 started",
+      "root/Bucket2/Policy started",
+      "Update: 0 added, 0 updated, 2 deleted",
+      "root/Bucket2/Policy stopped",
+      "root/Bucket2 stopped",
+    ]);
+
+    await sim.stop();
+  });
+
+  test("update", async () => {
+    const stateDir = mkdtemp();
+
+    const app = new SimApp();
+    new Bucket(app, "Bucket1");
+    const sim = await app.startSimulator(stateDir);
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+    ]);
+    expect(sim.getResourceConfig("root/Bucket1").props.public).toBeFalsy();
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+    ]);
+
+    const app2 = new SimApp();
+    new Bucket(app2, "Bucket1", { public: true });
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+    expect(updateTrace(sim)).toStrictEqual({
+      added: [],
+      deleted: [],
+      updated: ["root/Bucket1"],
+    });
+
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+    ]);
+
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "Update: 0 added, 1 updated, 0 deleted",
+      "root/Bucket1/Policy stopped",
+      "root/Bucket1 stopped",
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+    ]);
+
+    expect(sim.getResourceConfig("root/Bucket1").props.public).toBeTruthy();
+
+    await sim.stop();
+  });
+
+  test("add resource that depends on an existing resource", async () => {
+    const stateDir = mkdtemp();
+
+    const app = new SimApp();
+    new Bucket(app, "Bucket1");
+
+    const sim = await app.startSimulator(stateDir);
+
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+    ]);
+
+    expect(sim.listResources()).toEqual([
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+    ]);
+    expect(sim.getResourceConfig("root/Bucket1").props.public).toBeFalsy();
+
+    const app2 = new SimApp();
+    const bucket1 = new Bucket(app2, "Bucket1");
+    const api = new Api(app2, "Api");
+    bucket1.addObject("url.txt", api.url);
+
+    const handler = inflight(async () => process.env.API_URL);
+    new Function(app2, "Function", handler, {
+      env: { API_URL: api.url },
+    });
+
+    const app2Dir = app2.synth();
+
+    await sim.update(app2Dir);
+    expect(updateTrace(sim)).toStrictEqual({
+      added: [
+        "root/Api",
+        "root/Api/Endpoint",
+        "root/Api/Policy",
+        "root/Function",
+      ],
+      deleted: [],
+      updated: ["root/Bucket1"],
+    });
+
+    expect(simTraces(sim)).toStrictEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "Update: 4 added, 1 updated, 0 deleted",
+      "root/Bucket1/Policy stopped",
+      "root/Bucket1 stopped",
+      "root/Api started",
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "root/Api/Endpoint started",
+      "root/Api/Policy started",
+      "root/Function started",
+    ]);
+
+    expect(sim.listResources()).toEqual([
+      "root/Api",
+      "root/Api/Endpoint",
+      "root/Api/Policy",
+      "root/Bucket1",
+      "root/Bucket1/Policy",
+      "root/Function",
+    ]);
+
+    const bucketClient = sim.getResource("root/Bucket1") as IBucketClient;
+    const urlFromBucket = await bucketClient.get("url.txt");
+    expect(urlFromBucket.startsWith("http://127.0.0")).toBeTruthy();
+
+    const functionClient = sim.getResource("root/Function") as IFunctionClient;
+    const ret = await functionClient.invoke();
+    expect(ret).toEqual(urlFromBucket);
+  });
+
+  test("retained resource is not removed", async () => {
+    const app = new SimApp();
+    const api1 = new Api(app, "Api");
+    const bucket1 = new Bucket(app, "Bucket");
+    bucket1.addObject("url.txt", api1.url);
+
+    const stateDir = mkdtemp();
+    const sim = await app.startSimulator(stateDir);
+
+    const urlBeforeUpdate = await sim.getResource("root/Bucket").get("url.txt");
+
+    // remove the state directory otherwise Api reuses the port
+    fs.rmdirSync(sim.getResourceStateDir("/Api"), { recursive: true });
+
+    const app2 = new SimApp();
+    const api2 = new Api(app2, "Api");
+    const bucket2 = new Bucket(app2, "Bucket", { public: true }); // <-- causing the update to be updated because we are deleting the state dirtectory, so we want the file to be uploaded again.
+    bucket2.addObject("url.txt", api2.url);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(updateTrace(sim)).toStrictEqual({
+      added: [],
+      deleted: [],
+      updated: ["root/Bucket"],
+    });
+
+    const urlAfterUpdate = await sim.getResource("root/Bucket").get("url.txt");
+    expect(urlBeforeUpdate).toStrictEqual(urlAfterUpdate);
+  });
+
+  test("dependent resource is replaced when a dependency is replaced", async () => {
+    const app = new SimApp();
+    const myApi = new Api(app, "Api1");
+    const myBucket = new Bucket(app, "Bucket1");
+
+    // BUCKET depends on API
+    myBucket.addObject("url.txt", myApi.url);
+
+    const stateDir = mkdtemp();
+    const sim = await app.startSimulator(stateDir);
+
+    expect(simTraces(sim)).toEqual([
+      "root/Api1 started",
+      "root/Api1/Endpoint started",
+      "root/Api1/Policy started",
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+    ]);
+
+    // now lets change some configuration of Api1. we expect the bucket to be replaced as well
+
+    const app2 = new SimApp();
+    const myApi2 = new Api(app2, "Api1", { cors: true });
+    const myBucket2 = new Bucket(app2, "Bucket1");
+    myBucket2.addObject("url.txt", myApi2.url);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(updateTrace(sim)).toStrictEqual({
+      added: [],
+      deleted: [],
+      updated: ["root/Api1"], // TODO: shouldn't Bucket also be listed here?
+    });
+
+    expect(simTraces(sim)).toEqual([
+      "root/Api1 started",
+      "root/Api1/Endpoint started",
+      "root/Api1/Policy started",
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "Update: 0 added, 1 updated, 0 deleted",
+      "root/Api1/Endpoint stopped",
+      "root/Api1/Policy stopped",
+      "root/Bucket1/Policy stopped",
+      "root/Bucket1 stopped",
+      "root/Api1 stopped",
+      "root/Api1 started",
+      "root/Api1/Endpoint started",
+      "root/Api1/Policy started",
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+    ]);
+
+    await sim.stop();
+  });
+
+  test("token value is changed across an update", async () => {
+    const app = new SimApp();
+    const stateKey = "my_value";
+
+    const myState = new State(app, "State");
+
+    new Service(
+      app,
+      "Service",
+      lift({ myState, stateKey })
+        .grant({ myState: ["set"] })
+        .inflight(async (ctx) => {
+          await ctx.myState.set(`${ctx.stateKey}`, "bang" as any);
+        }),
+      { env: { VER: "1" } }
+    );
+
+    new Function(
+      app,
+      "Function",
+      inflight(async (ctx) => process.env.MY_VALUE),
+      {
+        env: { MY_VALUE: myState.token(stateKey) },
+      }
+    );
+
+    const sim = await app.startSimulator();
+
+    const fn = sim.getResource("root/Function") as IFunctionClient;
+    const result = await fn.invoke();
+    expect(result).toEqual("bang");
+
+    // okay, now we are ready to update
+    const app2 = new SimApp();
+
+    const myState2 = new State(app2, "State");
+
+    new Service(
+      app2,
+      "Service",
+      lift({ myState: myState2, stateKey })
+        .grant({ myState: ["set"] })
+        .inflight(async (ctx) => {
+          await ctx.myState.set(`${ctx.stateKey}`, "bing" as any);
+        }),
+      { env: { VER: "2" } }
+    );
+
+    new Function(
+      app2,
+      "Function",
+      inflight(async (ctx) => process.env.MY_VALUE),
+      {
+        env: { MY_VALUE: myState.token(stateKey) },
+      }
+    );
+
+    await sim.update(app2.synth());
+
+    expect(simTraces(sim)).toEqual([
+      "root/State started",
+      "root/State.my_value = bang",
+      "root/Service started",
+      "root/Function started",
+      "Update: 0 added, 1 updated, 0 deleted",
+      "root/Service stopped",
+      "root/State.my_value = bing",
+      "root/Service started",
+    ]);
+  });
+
+  test("Construct dependencies are taken into account", async () => {
+    const app = new SimApp();
+
+    const bucket = new Bucket(app, "Bucket1");
+
+    new OnDeploy(app, "OnDeploy", NOOP, {
+      executeAfter: [bucket],
+    });
+
+    const sim = await app.startSimulator();
+
+    const app2 = new SimApp();
+    const bucket2 = new Bucket(app2, "Bucket1", { public: true });
+    new OnDeploy(app2, "OnDeploy", NOOP, {
+      executeAfter: [bucket2],
+    });
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(simTraces(sim)).toEqual([
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "root/OnDeploy/Function started",
+      "root/OnDeploy started",
+      "Update: 0 added, 2 updated, 0 deleted",
+      "root/Bucket1/Policy stopped",
+      "root/OnDeploy stopped",
+      "root/Bucket1 stopped",
+      "root/Bucket1 started",
+      "root/Bucket1/Policy started",
+      "root/OnDeploy started",
+    ]);
+  });
+
+  test("cloud.Function is not replaced if its inflight code does not change", async () => {
+    const app = new SimApp();
+    new Function(app, "Function", NOOP);
+
+    const sim = await app.startSimulator();
+
+    const app2 = new SimApp();
+    new Function(app2, "Function", NOOP);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(simTraces(sim)).toEqual([
+      "root/Function started",
+      "Update: 0 added, 0 updated, 0 deleted",
+    ]);
+  });
+
+  test("cloud.Function is replaced if its inflight code changes", async () => {
+    const outdir = mkdtemp();
+    console.log("outdir", outdir);
+
+    const app = new SimApp({ outdir });
+    new Function(app, "Function", NOOP);
+
+    const sim = await app.startSimulator();
+
+    // cloud.Function bundles its code in the background. Because of this, it's
+    // possible that the code later in this test that synthesizes a version of
+    // the app with new inflight code could run before the simulator's bundling starts,
+    // in which case no Function replacement would be necessary.
+    //
+    // Since we want to test the case where the Function is replaced, we need to
+    // make sure that the bundling finishes before we synthesize the new app.
+    // So we invoke the function to block until the bundling finishes.
+    const fn = sim.getResource("/Function") as IFunctionClient;
+    await fn.invoke();
+
+    const app2 = new SimApp({ outdir });
+    new Function(app2, "Function", NOOP2);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(simTraces(sim)).toEqual([
+      "root/Function started",
+      "Update: 0 added, 1 updated, 0 deleted",
+      "root/Function stopped",
+      "root/Function started",
+    ]);
+  });
+
+  test("cloud.Service is not replaced if its inflight code does not change", async () => {
+    const app = new SimApp();
+    new Service(app, "Service", NOOP);
+
+    const sim = await app.startSimulator();
+
+    const app2 = new SimApp();
+    new Service(app2, "Service", NOOP);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(simTraces(sim)).toEqual([
+      "root/Service started",
+      "Update: 0 added, 0 updated, 0 deleted",
+    ]);
+  });
+
+  test("cloud.Service is replaced if its inflight code changes", async () => {
+    const outdir = mkdtemp();
+
+    const app = new SimApp({ outdir });
+    new Service(app, "Service", NOOP);
+
+    const sim = await app.startSimulator();
+
+    const app2 = new SimApp({ outdir });
+    new Service(app2, "Service", NOOP2);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(simTraces(sim)).toEqual([
+      "root/Service started",
+      "Update: 0 added, 1 updated, 0 deleted",
+      "root/Service stopped",
+      "root/Service started",
+    ]);
+  });
+
+  test("cloud.OnDeploy is always replaced", async () => {
+    const app = new SimApp();
+    new OnDeploy(app, "OnDeploy", NOOP);
+
+    const sim = await app.startSimulator();
+
+    const app2 = new SimApp();
+    new OnDeploy(app2, "OnDeploy", NOOP);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    expect(simTraces(sim)).toEqual([
+      "root/OnDeploy/Function started",
+      "root/OnDeploy started",
+      "Update: 0 added, 1 updated, 0 deleted",
+      "root/OnDeploy stopped",
+      "root/OnDeploy started",
+    ]);
+  });
+
+  test("cloud.Api routes are updated", async () => {
+    const app = new SimApp();
+    const api = new Api(app, "Api");
+    api.get("/hello", OK_200);
+
+    const sim = await app.startSimulator();
+    const apiUrl = sim.getResourceConfig("/Api").attrs.url as string;
+    const response1 = await fetch(`${apiUrl}/hello`, { method: "GET" });
+    expect(response1.status).toEqual(200);
+
+    const app2 = new SimApp();
+    const api2 = new Api(app2, "Api");
+    api2.get("/world", OK_200);
+
+    const app2Dir = app2.synth();
+    await sim.update(app2Dir);
+
+    // /hello route should be removed
+    const response2 = await fetch(`${apiUrl}/hello`, { method: "GET" });
+    expect(response2.status).toEqual(404);
+
+    // /world route should be added
+    const response3 = await fetch(`${apiUrl}/world`, { method: "GET" });
+    expect(response3.status).toEqual(200);
+
+    expect(simTraces(sim)).toEqual([
+      "root/Api started",
+      "root/Api/Endpoint started",
+      "root/Api/OnRequestHandler0 started",
+      "root/Api/Policy started",
+      "root/Api/ApiEventMapping0 started",
+      "Update: 0 added, 2 updated, 0 deleted",
+      "root/Api/Endpoint stopped",
+      "root/Api/Policy stopped",
+      "root/Api/ApiEventMapping0 stopped",
+      "root/Api stopped",
+      "root/Api started",
+      "root/Api/Endpoint started",
+      "root/Api/Policy started",
+      "root/Api/ApiEventMapping0 started",
+    ]);
+  });
+});
+
+test("debugging inspector inherited by sandbox", async () => {
+  const app = new SimApp();
+  const handler = inflight(async () => {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    if (require("inspector").url() === undefined) {
+      throw new Error("inspector not available");
+    }
+  });
+  new OnDeploy(app, "OnDeploy", handler);
+
+  inspector.open(0);
+  const sim = await app.startSimulator();
+  await sim.stop();
+
+  expect(
+    sim
+      .listTraces()
+      .some((t) => t.data.message.startsWith("Debugger listening on "))
+  );
+});
+
+test("tryGetResource returns undefined if the resource not found", async () => {
+  const app = new SimApp();
+  const sim = await app.startSimulator();
+  expect(sim.tryGetResource("bang")).toBeUndefined();
+  expect(sim.tryGetResourceConfig("bing")).toBeUndefined();
+});
+
+function makeTest(scope: Construct, id: string, handler: IFunctionHandler) {
+  return new Test(scope, id, handler);
 }
 
 function sanitizeResult(result: TestResult): TestResult {
   let error: string | undefined;
   if (result.error) {
-    let lines = result.error
-      .split("\n")
-      .map(removePathsFromTraceLine)
-      .map(removeLineNumbers);
-
-    // remove all lines after "at Simulator.runTest" since they are platform-dependent
-    let lastLine = lines.findIndex((line) =>
-      line?.includes("Simulator.runTest")
-    );
-    if (lastLine !== -1) {
-      lines = lines.slice(0, lastLine + 1);
-    }
-
-    error = lines.join("\n");
+    error = result.error.split("\n")[0];
   }
 
   return {
@@ -212,3 +918,16 @@ async function runAllTests(runner: ITestRunnerClient): Promise<TestResult[]> {
   }
   return results;
 }
+
+function simTraces(s: Simulator) {
+  return s
+    .listTraces()
+    .filter((t) => t.type === TraceType.SIMULATOR)
+    .map((t) => t.data.message);
+}
+
+function updateTrace(s: Simulator) {
+  return s
+    .listTraces()
+    .find((t) => t.type === TraceType.SIMULATOR && t.data.update)?.data.update;
+}
diff --git a/libs/wingsdk/test/simulator/tokens.test.ts b/libs/wingsdk/test/simulator/tokens.test.ts
new file mode 100644
index 00000000000..f1c03f3ff2b
--- /dev/null
+++ b/libs/wingsdk/test/simulator/tokens.test.ts
@@ -0,0 +1,138 @@
+import { test, describe, expect } from "vitest";
+import { parseToken, resolveTokens } from "../../src/simulator/tokens";
+
+describe("parseToken", () => {
+  test("parses path", () => {
+    expect(parseToken("${wsim#foo#attrs.bar}")?.path).toBe("foo");
+    expect(parseToken("${wsim#foo/jang/bang#props.bar}")?.path).toBe(
+      "foo/jang/bang"
+    );
+  });
+
+  test("parses attribute", () => {
+    const result = parseToken("${wsim#foo/lang#attrs.bar}");
+    expect(result?.path).toBe("foo/lang");
+    expect(result?.attr).toBe("bar");
+    expect(result?.prop).toBeUndefined();
+  });
+
+  test("parses property", () => {
+    const result = parseToken("${wsim#foo#props.bar}");
+    expect(result?.path).toBe("foo");
+    expect(result?.prop).toBe("bar");
+    expect(result?.attr).toBeUndefined();
+  });
+
+  test("invalid tokens", () => {
+    expect(() => parseToken("${foo#baz}")).toThrow(/Invalid token reference/);
+    expect(() => parseToken("${wsim#foo#baz}")).toThrow(
+      /Invalid token reference/
+    );
+  });
+});
+
+describe("tryResolveTokens", () => {
+  test("undefined", () => {
+    expect(resolveTokens(undefined, () => "foo")).toBeUndefined();
+  });
+
+  test("terminal token", () => {
+    expect(
+      resolveTokens("${wsim#foo/bar#attrs.bar}", (token) => {
+        expect(token.path).toBe("foo/bar");
+        expect(token.attr).toBe("bar");
+        expect(token.prop).toBeUndefined();
+        return "resolved_token";
+      })
+    ).toBe("resolved_token");
+
+    expect(
+      resolveTokens("${wsim#foo/bar#props.bar}", (token) => {
+        expect(token.path).toBe("foo/bar");
+        expect(token.prop).toBe("bar");
+        expect(token.attr).toBeUndefined();
+        return "resolved_token_2";
+      })
+    ).toBe("resolved_token_2");
+  });
+
+  test("nested token inside a string", () => {
+    expect(
+      resolveTokens(
+        "hello, I am a ${wsim#foo/bar#attrs.tttt} inside a ${wsim#bing/bang#props.vvv}",
+        (token) => {
+          if (token.path === "foo/bar" && token.attr === "tttt") {
+            return "cool nested token";
+          }
+
+          if (token.path === "bing/bang" && token.prop === "vvv") {
+            return "cool string";
+          }
+
+          expect.fail(`unexpected token: ${JSON.stringify(token)}`);
+        }
+      )
+    ).toBe("hello, I am a cool nested token inside a cool string");
+  });
+
+  test("tokens within an array", () => {
+    const result = resolveTokens(
+      [
+        "bla",
+        "${wsim#foo/bar#attrs.tttt}",
+        "blabla",
+        "nested nested ${wsim#bing/bang#props.vvv} nested",
+      ],
+      (token) => {
+        if (token.path === "foo/bar" && token.attr === "tttt") {
+          return "T1";
+        }
+
+        if (token.path === "bing/bang" && token.prop === "vvv") {
+          return "T2";
+        }
+
+        expect.fail(`unexpected token: ${JSON.stringify(token)}`);
+      }
+    );
+
+    expect(result).toEqual(["bla", "T1", "blabla", "nested nested T2 nested"]);
+  });
+
+  test("tokens within an object", () => {
+    const result = resolveTokens(
+      {
+        key1: "bla",
+        key2: "${wsim#foo/bar#attrs.tttt}",
+        key3: {
+          bang: ["nested nested ${wsim#bing/bang#props.vvv} nested"],
+          bing: {
+            jone: "${wsim#foo/bar#attrs.tttt}",
+          },
+        },
+      },
+      (token) => {
+        if (token.path === "foo/bar" && token.attr === "tttt") {
+          return "T1";
+        }
+
+        if (token.path === "bing/bang" && token.prop === "vvv") {
+          return "T2";
+        }
+
+        expect.fail(`unexpected token: ${JSON.stringify(token)}`);
+      }
+    );
+
+    expect(result).toEqual({
+      key1: "bla",
+      key2: "T1",
+      key3: {
+        bang: ["nested nested T2 nested"],
+        bing: {
+          jone: "T1",
+        },
+      },
+    });
+  });
+});
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/api.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/api.test.ts.snap
index e56ec3cbf5a..259bcdf577a 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/api.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/api.test.ts.snap
@@ -2,59 +2,78 @@
 
 exports[`api allows duplicates routes with different methods 1`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.body, headers: req.headers }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.body,
+  headers: req.headers
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "post()",
+        "name": "post /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -87,8 +106,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -97,18 +120,55 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
               {
                 "method": "POST",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -119,14 +179,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -159,14 +219,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -175,10 +227,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -192,25 +256,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -218,10 +269,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -231,10 +295,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -246,8 +323,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -258,72 +336,91 @@ return class Handler {
 
 exports[`api handler can read the request params 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{\\"foo\\":\\"bar\\",\\"bar\\":\\"baz\\"},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{\\"foo\\":\\"bar\\",\\"bar\\":\\"baz\\"},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api handler can read the request params 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: JSON.stringify(req.query), headers: { \\"Content-Type\\": \\"application/json\\" } }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: JSON.stringify(req.query),
+  headers: { "Content-Type": "application/json" }
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -346,8 +443,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -356,14 +457,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -374,14 +512,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -414,14 +552,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -430,10 +560,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -447,25 +589,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -473,10 +602,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -486,10 +628,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -501,8 +656,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -513,72 +669,90 @@ return class Handler {
 
 exports[`api handler can read the request path 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api handler can read the request path 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.path }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.path
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -601,8 +775,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -611,14 +789,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -629,14 +844,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -669,14 +884,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -685,10 +892,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -702,25 +921,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -728,10 +934,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -741,10 +960,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -756,8 +988,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -768,72 +1001,91 @@ return class Handler {
 
 exports[`api handler can set response headers 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"foo\\":\\"bar\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"foo\\":\\"bar\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api handler can set response headers 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.headers, headers: { \\"x-wingnuts\\": \\"cloudy\\" } }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.headers,
+  headers: { "x-wingnuts": "cloudy" }
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -856,8 +1108,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -866,14 +1122,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -884,14 +1177,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -924,14 +1217,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -940,10 +1225,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -957,25 +1254,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -983,10 +1267,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -996,10 +1293,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -1011,8 +1321,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1023,72 +1334,91 @@ return class Handler {
 
 exports[`api response returns Content-Type header from inflight 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api response returns Content-Type header from inflight 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.headers, headers: { \\"Content-Type\\": \\"application/octet-stream; charset=utf-8\\" } }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+    body: req.headers,
+    headers: { "Content-Type": "application/octet-stream; charset=utf-8" }
+  })
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -1111,8 +1441,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -1121,14 +1455,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1139,14 +1510,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1179,14 +1550,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1195,10 +1558,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1212,25 +1587,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -1238,10 +1600,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -1251,10 +1626,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -1266,8 +1654,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1278,72 +1667,91 @@ return class Handler {
 
 exports[`api response returns default Content-Type header 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api response returns default Content-Type header 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.body, headers: req.headers }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.body,
+  headers: req.headers
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -1366,8 +1774,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -1376,14 +1788,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1394,14 +1843,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1434,14 +1883,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1450,10 +1891,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1467,25 +1920,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -1493,10 +1933,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -1506,10 +1959,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -1521,8 +1987,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1533,120 +2000,150 @@ return class Handler {
 
 exports[`api supports every method type 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "Processing \\"POST /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"POST\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "POST /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"POST\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "POST /hello - 200.",
-  "Processing \\"PUT /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"PUT\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "PUT /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"PUT\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "PUT /hello - 200.",
-  "Processing \\"DELETE /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"DELETE\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "DELETE /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"DELETE\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "DELETE /hello - 200.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"close\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"HEAD\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"close\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"HEAD\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "Processing \\"OPTIONS /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"OPTIONS\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "OPTIONS /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"OPTIONS\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "OPTIONS /hello - 200.",
-  "Processing \\"PATCH /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"PATCH\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "PATCH /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"PATCH\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "PATCH /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api supports every method type 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.method }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.method
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "post()",
+        "name": "post /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "put()",
+        "name": "put /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "delete()",
+        "name": "delete /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "head()",
+        "name": "head /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "options()",
+        "name": "options /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "patch()",
+        "name": "patch /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -1729,8 +2226,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -1739,38 +2240,75 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
               {
                 "method": "POST",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
               {
                 "method": "PUT",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
               {
                 "method": "DELETE",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
               {
                 "method": "HEAD",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
               {
                 "method": "OPTIONS",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
               {
                 "method": "PATCH",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1781,14 +2319,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1821,14 +2359,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1837,10 +2367,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1854,25 +2396,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -1880,10 +2409,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -1893,10 +2435,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -1908,8 +2463,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1920,72 +2476,90 @@ return class Handler {
 
 exports[`api with 'name' & 'age' parameter 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /:name/:age\\" params={\\"name\\":\\"akhil\\",\\"age\\":\\"23\\"}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/akhil/23\\",\\"query\\":{},\\"vars\\":{\\"name\\":\\"akhil\\",\\"age\\":\\"23\\"}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /:name/:age" params={"name":"akhil","age":"23"}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/akhil/23\\",\\"query\\":{},\\"vars\\":{\\"name\\":\\"akhil\\",\\"age\\":\\"23\\"}}").",
   "GET /:name/:age - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api with 'name' & 'age' parameter 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.vars ?? {} }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.vars ?? {}
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /:name/:age",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -2025,8 +2599,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -2035,14 +2613,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/:name/:age",
+                "pathPattern": "/:name/:age",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2053,14 +2668,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2093,14 +2708,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2109,10 +2716,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -2126,25 +2745,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -2152,10 +2758,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -2165,10 +2784,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -2180,8 +2812,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -2192,72 +2825,90 @@ return class Handler {
 
 exports[`api with 'name' parameter 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /:name\\" params={\\"name\\":\\"akhil\\"}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/akhil\\",\\"query\\":{},\\"vars\\":{\\"name\\":\\"akhil\\"}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /:name" params={"name":"akhil"}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/akhil\\",\\"query\\":{},\\"vars\\":{\\"name\\":\\"akhil\\"}}").",
   "GET /:name - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api with 'name' parameter 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.vars ?? {} }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.vars ?? {}
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /:name",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -2289,8 +2940,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -2299,14 +2954,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/:name",
+                "pathPattern": "/:name",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2317,14 +3009,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2357,14 +3049,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2373,10 +3057,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -2390,25 +3086,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -2416,10 +3099,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -2429,10 +3125,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -2444,8 +3153,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -2456,54 +3166,78 @@ return class Handler {
 
 exports[`api with multiple GET routes and one lambda 1`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.body, headers: req.headers }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.body,
+  headers: req.headers
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello/foo",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
-    ],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "get /hello/bat",
+        "source": "root/my_api",
+        "sourceOp": "request",
+        "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
-      {
-        "attrs": {},
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -2538,8 +3272,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -2548,18 +3286,55 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello/foo",
+                "pathPattern": "/hello/foo",
               },
               {
                 "method": "GET",
-                "path": "/hello/bat",
+                "pathPattern": "/hello/bat",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2570,14 +3345,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2610,14 +3385,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2626,10 +3393,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -2643,25 +3422,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -2669,10 +3435,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -2682,10 +3461,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -2697,8 +3489,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -2709,99 +3502,146 @@ return class Handler {
 
 exports[`api with multiple methods on same route 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/OnRequestHandler1 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "root/my_api/ApiEventMapping1 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "Processing \\"POST /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"POST\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "POST /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"0\\"},\\"body\\":\\"\\",\\"method\\":\\"POST\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "POST /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
+  "root/my_api/ApiEventMapping1 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
+  "root/my_api/OnRequestHandler1 stopped",
 ]
 `;
 
 exports[`api with multiple methods on same route 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: \\"boom\\" }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx) => ({
+  body: ctx.body
+})
+  const $ctx = {
+  body: "boom"
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
-  ".wing/onrequesthandler1_c84819d7.js": "\\"use strict\\";
+  ".wing/onrequesthandler1_c84819d7.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: \\"bang\\" }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx) => ({
+  body: ctx.body
+})
+  const $ctx = {
+  body: "bang"
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "post()",
+        "name": "post /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler1",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -2834,8 +3674,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -2844,26 +3688,19 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler1",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler1_c84819d7.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping1": {
+        "addr": "c874047faffbf7bc1cdc78bb5f3f942cf01cd31844",
+        "deps": [
+          "root/my_api/OnRequestHandler1",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping1",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -2872,14 +3709,68 @@ return class Handler {
             "routes": [
               {
                 "method": "POST",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/OnRequestHandler1": {
+        "addr": "c84819d7712e30f38cf7731fcfbe96cbc39c7e75d3",
+        "path": "root/my_api/OnRequestHandler1",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler1_c84819d7.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler1#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2890,14 +3781,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2930,14 +3821,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2946,10 +3829,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -2963,25 +3858,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -2992,7 +3874,7 @@ return class Handler {
             "ApiEventMapping1": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -3000,10 +3882,23 @@ return class Handler {
               "id": "ApiEventMapping1",
               "path": "root/my_api/ApiEventMapping1",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -3016,7 +3911,7 @@ return class Handler {
             "OnRequestHandler1": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -3026,10 +3921,23 @@ return class Handler {
               "id": "OnRequestHandler1",
               "path": "root/my_api/OnRequestHandler1",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -3041,8 +3949,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -3053,99 +3962,146 @@ return class Handler {
 
 exports[`api with multiple routes 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello/world\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello/world\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/OnRequestHandler1 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "root/my_api/ApiEventMapping1 started",
+  "Processing "GET /hello/world" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello/world\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello/world - 200.",
-  "Processing \\"GET /hello/wingnuts\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello/wingnuts\\",\\"query\\":{},\\"vars\\":{}}).",
+  "Processing "GET /hello/wingnuts" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello/wingnuts\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello/wingnuts - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
+  "root/my_api/ApiEventMapping1 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
+  "root/my_api/OnRequestHandler1 stopped",
 ]
 `;
 
 exports[`api with multiple routes 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: \\"boom\\" }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx) => ({
+  body: ctx.body
+})
+  const $ctx = {
+  body: "boom"
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
-  ".wing/onrequesthandler1_c84819d7.js": "\\"use strict\\";
+  ".wing/onrequesthandler1_c84819d7.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: \\"bang\\" }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx) => ({
+  body: ctx.body
+})
+  const $ctx = {
+  body: "bang"
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello/world",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
       },
       {
-        "name": "get()",
+        "name": "get /hello/wingnuts",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler1",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -3180,8 +4136,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -3190,26 +4150,19 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello/world",
+                "pathPattern": "/hello/world",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler1",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler1_c84819d7.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping1": {
+        "addr": "c874047faffbf7bc1cdc78bb5f3f942cf01cd31844",
+        "deps": [
+          "root/my_api/OnRequestHandler1",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping1",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -3218,14 +4171,68 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello/wingnuts",
+                "pathPattern": "/hello/wingnuts",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/OnRequestHandler1": {
+        "addr": "c84819d7712e30f38cf7731fcfbe96cbc39c7e75d3",
+        "path": "root/my_api/OnRequestHandler1",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler1_c84819d7.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler1#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -3236,14 +4243,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -3276,14 +4283,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -3292,10 +4291,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -3305,29 +4316,16 @@ return class Handler {
         "sourcePath": "<ABSOLUTE PATH>/test-runner.inflight.js",
       },
     },
-  },
-  "tree.json": {
-    "tree": {
-      "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
+  },
+  "tree.json": {
+    "tree": {
+      "children": {
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -3338,7 +4336,7 @@ return class Handler {
             "ApiEventMapping1": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -3346,10 +4344,23 @@ return class Handler {
               "id": "ApiEventMapping1",
               "path": "root/my_api/ApiEventMapping1",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -3362,7 +4373,7 @@ return class Handler {
             "OnRequestHandler1": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -3372,10 +4383,23 @@ return class Handler {
               "id": "OnRequestHandler1",
               "path": "root/my_api/OnRequestHandler1",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -3387,8 +4411,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -3399,72 +4424,90 @@ return class Handler {
 
 exports[`api with one GET route 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "GET /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api with one GET route 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: \\"boom\\" }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx) => ({
+  body: ctx.body
+})
+  const $ctx = {
+  body: "boom"
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -3487,8 +4530,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -3497,14 +4544,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -3515,14 +4599,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -3555,14 +4639,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -3571,10 +4647,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -3588,25 +4676,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -3614,10 +4689,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -3627,10 +4715,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -3642,8 +4743,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -3654,72 +4756,90 @@ return class Handler {
 
 exports[`api with one GET route with request params 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"GET /users/:name\\" params={\\"name\\":\\"tsuf\\"}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/users/tsuf\\",\\"query\\":{},\\"vars\\":{\\"name\\":\\"tsuf\\"}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "GET /users/:name" params={"name":"tsuf"}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\"},\\"body\\":\\"\\",\\"method\\":\\"GET\\",\\"path\\":\\"/users/tsuf\\",\\"query\\":{},\\"vars\\":{\\"name\\":\\"tsuf\\"}}").",
   "GET /users/:name - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api with one GET route with request params 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.vars ?? {} }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.vars ?? {}
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "get()",
+        "name": "get /users/:name",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -3751,8 +4871,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -3761,14 +4885,51 @@ return class Handler {
             "routes": [
               {
                 "method": "GET",
-                "path": "/users/:name",
+                "pathPattern": "/users/:name",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -3779,14 +4940,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -3819,14 +4980,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -3835,10 +4988,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -3852,25 +5017,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -3878,10 +5030,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -3891,10 +5056,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -3906,8 +5084,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -3918,72 +5097,91 @@ return class Handler {
 
 exports[`api with one POST route, with body 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
   "Server listening on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Processing \\"POST /hello\\" params={}).",
-  "Invoke (payload={\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"content-type\\":\\"application/json\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"undici\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"25\\"},\\"body\\":\\"{\\\\\\"message\\\\\\":\\\\\\"hello world\\\\\\"}\\",\\"method\\":\\"POST\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}).",
+  "root/my_api started",
+  "root/my_api/Endpoint started",
+  "root/my_api/OnRequestHandler0 started",
+  "root/my_api/Policy started",
+  "root/my_api/ApiEventMapping0 started",
+  "Processing "POST /hello" params={}).",
+  "Invoke (payload="{\\"headers\\":{\\"host\\":\\"127.0.0.1:<port>\\",\\"connection\\":\\"keep-alive\\",\\"content-type\\":\\"application/json\\",\\"accept\\":\\"*/*\\",\\"accept-language\\":\\"*\\",\\"sec-fetch-mode\\":\\"cors\\",\\"user-agent\\":\\"node\\",\\"accept-encoding\\":\\"gzip, deflate\\",\\"content-length\\":\\"25\\"},\\"body\\":\\"{\\\\\\"message\\\\\\":\\\\\\"hello world\\\\\\"}\\",\\"method\\":\\"POST\\",\\"path\\":\\"/hello\\",\\"query\\":{},\\"vars\\":{}}").",
   "POST /hello - 200.",
-  "@winglang/sdk.sim.EventMapping deleted.",
+  "root/my_api/Endpoint stopped",
+  "root/my_api/Policy stopped",
+  "root/my_api/ApiEventMapping0 stopped",
+  "root/my_api/OnRequestHandler0 stopped",
   "Closing server on http://127.0.0.1:<port>",
-  "@winglang/sdk.cloud.Api deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_api stopped",
 ]
 `;
 
 exports[`api with one POST route, with body 2`] = `
 {
-  ".wing/onrequesthandler0_c82d41b2.js": "\\"use strict\\";
+  ".wing/onrequesthandler0_c82d41b2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(req) { return { status: 200, body: req.body, headers: req.headers }; }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            if (!event) {
+                throw new Error("invalid API request event");
+            }
+            let req = JSON.parse(event);
+            const response = await ctx.handler(req);
+            if (!response) {
+                return undefined;
+            }
+            else {
+                return JSON.stringify(response);
+            }
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, req) => ({
+  body: req.body,
+  headers: req.headers
+})
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "post()",
+        "name": "post /hello",
         "source": "root/my_api",
+        "sourceOp": "request",
         "target": "root/my_api/OnRequestHandler0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_api/OnRequestHandler0",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -4006,8 +5204,12 @@ return class Handler {
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-      {
-        "attrs": {},
+      "root/my_api/ApiEventMapping0": {
+        "addr": "c8a199e7bc539eb442a47653fe0f2b1f0bf50aa6d1",
+        "deps": [
+          "root/my_api/OnRequestHandler0",
+          "root/my_api",
+        ],
         "path": "root/my_api/ApiEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_api#attrs.handle}",
@@ -4016,14 +5218,51 @@ return class Handler {
             "routes": [
               {
                 "method": "POST",
-                "path": "/hello",
+                "pathPattern": "/hello",
               },
             ],
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/OnRequestHandler0": {
+        "addr": "c82d41b2501ac42e07e4565202a5b87a180a01c6a2",
+        "path": "root/my_api/OnRequestHandler0",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/onrequesthandler0_c82d41b2.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_api/OnRequestHandler0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -4034,14 +5273,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -4074,14 +5313,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -4090,10 +5321,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -4107,25 +5350,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
           "children": {
             "ApiEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -4133,10 +5363,23 @@ return class Handler {
               "id": "ApiEventMapping0",
               "path": "root/my_api/ApiEventMapping0",
             },
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
             "OnRequestHandler0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -4146,10 +5389,23 @@ return class Handler {
               "id": "OnRequestHandler0",
               "path": "root/my_api/OnRequestHandler0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -4161,8 +5417,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -4174,21 +5431,20 @@ return class Handler {
 exports[`create an api 1`] = `
 {
   "connections.json": {
-    "connections": [],
+    "connections": [
+      {
+        "name": "<ref>",
+        "source": "root/my_api/Endpoint",
+        "target": "root/my_api",
+        "targetOp": "url",
+      },
+    ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_api": {
+        "addr": "c8f2ecf2132465e146aa80cb01f4e5ab1968f4314a",
         "path": "root/my_api",
         "props": {
           "openApiSpec": {
@@ -4198,7 +5454,26 @@ exports[`create an api 1`] = `
         },
         "type": "@winglang/sdk.cloud.Api",
       },
-    ],
+      "root/my_api/Endpoint": {
+        "addr": "c85bd2f9eb401f27bec4d0ad16222c2876bcfe640a",
+        "path": "root/my_api/Endpoint",
+        "props": {
+          "inputUrl": "\${wsim#root/my_api#attrs.url}",
+          "label": "Api root/my_api",
+          "url": "\${wsim#root/my_api#attrs.url}",
+        },
+        "type": "@winglang/sdk.cloud.Endpoint",
+      },
+      "root/my_api/Policy": {
+        "addr": "c8d2997625976ba9bc7be90fefe7930aebab104a2a",
+        "path": "root/my_api/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_api#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -4209,14 +5484,14 @@ exports[`create an api 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -4249,14 +5524,6 @@ exports[`create an api 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -4265,10 +5532,22 @@ exports[`create an api 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -4282,23 +5561,38 @@ exports[`create an api 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_api": {
+          "children": {
+            "Endpoint": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "Api root/my_api",
+                "hidden": true,
+                "title": "Endpoint",
+              },
+              "id": "Endpoint",
+              "path": "root/my_api/Endpoint",
+            },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_api/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A REST API endpoint",
@@ -4310,8 +5604,9 @@ exports[`create an api 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/bucket.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/bucket.test.ts.snap
index 30e6f4661ae..22cceb4f71c 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/bucket.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/bucket.test.ts.snap
@@ -2,61 +2,72 @@
 
 exports[`bucket on event creates 3 topics, and sends the right event and key in the event handlers 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.cloud.Bucket created.",
-  "@winglang/sdk.cloud.Bucket created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Publish (message=a).",
+  "root/my_bucket/OnCreate started",
+  "root/my_bucket/OnUpdate started",
+  "root/my_bucket/OnDelete started",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
+  "root/log_bucket started",
+  "root/my_bucket/OnCreate/OnMessage0 started",
+  "root/my_bucket/OnCreate/Policy started",
+  "root/my_bucket/OnCreate/TopicEventMapping0 started",
+  "root/my_bucket/OnUpdate/OnMessage0 started",
+  "root/my_bucket/OnUpdate/Policy started",
+  "root/my_bucket/OnUpdate/TopicEventMapping0 started",
+  "root/my_bucket/OnDelete/OnMessage0 started",
+  "root/my_bucket/OnDelete/Policy started",
+  "root/my_bucket/OnDelete/TopicEventMapping0 started",
+  "root/log_bucket/Policy started",
   "Sending message (message=a, subscriber=sim-6).",
+  "InvokeAsync (payload="a").",
+  "Publish (messages=a).",
   "Put (key=a).",
   "Put (key=a).",
-  "Invoke (payload=\\"a\\").",
+  "I am done",
   "Get (key=a).",
-  "Publish (message=a).",
-  "Sending message (message=a, subscriber=sim-8).",
+  "Sending message (message=a, subscriber=sim-9).",
+  "InvokeAsync (payload="a").",
+  "Publish (messages=a).",
   "Put (key=a).",
   "Put (key=a).",
-  "Invoke (payload=\\"a\\").",
+  "I am done",
   "Get (key=a).",
-  "Publish (message=a).",
-  "Sending message (message=a, subscriber=sim-10).",
+  "Sending message (message=a, subscriber=sim-12).",
+  "InvokeAsync (payload="a").",
+  "Publish (messages=a).",
   "Delete (key=a).",
   "Put (key=a).",
-  "Invoke (payload=\\"a\\").",
+  "I am done",
   "Get (key=a).",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
+  "root/my_bucket/OnCreate/Policy stopped",
+  "root/my_bucket/OnCreate/TopicEventMapping0 stopped",
+  "root/my_bucket/OnCreate stopped",
+  "root/my_bucket/OnUpdate/Policy stopped",
+  "root/my_bucket/OnUpdate/TopicEventMapping0 stopped",
+  "root/my_bucket/OnUpdate stopped",
+  "root/my_bucket/OnDelete/Policy stopped",
+  "root/my_bucket/OnDelete/TopicEventMapping0 stopped",
+  "root/my_bucket/OnDelete stopped",
+  "root/my_bucket/OnCreate/OnMessage0 stopped",
+  "root/my_bucket/OnUpdate/OnMessage0 stopped",
+  "root/my_bucket/OnDelete/OnMessage0 stopped",
+  "root/log_bucket/Policy stopped",
+  "root/log_bucket stopped",
 ]
 `;
 
 exports[`can add file in preflight 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
   "Adding object from preflight (key=test.txt).",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Get (key=test.txt).",
   "Get (key=test.txt).",
   "List (prefix=null).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
@@ -67,17 +78,9 @@ exports[`can add file in preflight 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_bucket": {
+        "addr": "c8220a82a4ad9c25a4f236946f350d2ac081dd7bbc",
         "path": "root/my_bucket",
         "props": {
           "initialObjects": {
@@ -88,7 +91,16 @@ exports[`can add file in preflight 2`] = `
         },
         "type": "@winglang/sdk.cloud.Bucket",
       },
-    ],
+      "root/my_bucket/Policy": {
+        "addr": "c8b5ba55132964ee19331fb9f46241560e67fed76b",
+        "path": "root/my_bucket/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_bucket#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -99,14 +111,14 @@ exports[`can add file in preflight 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -139,14 +151,6 @@ exports[`can add file in preflight 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -155,10 +159,22 @@ exports[`can add file in preflight 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -172,23 +188,25 @@ exports[`can add file in preflight 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_bucket": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_bucket/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud object store",
@@ -200,8 +218,9 @@ exports[`can add file in preflight 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -212,14 +231,14 @@ exports[`can add file in preflight 2`] = `
 
 exports[`can add object in preflight 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
   "Adding object from preflight (key=greeting.txt).",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Get (key=greeting.txt).",
   "Get (key=greeting.txt).",
   "List (prefix=null).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
@@ -230,17 +249,9 @@ exports[`can add object in preflight 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_bucket": {
+        "addr": "c8220a82a4ad9c25a4f236946f350d2ac081dd7bbc",
         "path": "root/my_bucket",
         "props": {
           "initialObjects": {
@@ -251,7 +262,16 @@ exports[`can add object in preflight 2`] = `
         },
         "type": "@winglang/sdk.cloud.Bucket",
       },
-    ],
+      "root/my_bucket/Policy": {
+        "addr": "c8b5ba55132964ee19331fb9f46241560e67fed76b",
+        "path": "root/my_bucket/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_bucket#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -262,14 +282,14 @@ exports[`can add object in preflight 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -302,14 +322,6 @@ exports[`can add object in preflight 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -318,10 +330,22 @@ exports[`can add object in preflight 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -335,23 +359,25 @@ exports[`can add object in preflight 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_bucket": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_bucket/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud object store",
@@ -363,8 +389,9 @@ exports[`can add object in preflight 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -380,17 +407,9 @@ exports[`create a bucket 1`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_bucket": {
+        "addr": "c8220a82a4ad9c25a4f236946f350d2ac081dd7bbc",
         "path": "root/my_bucket",
         "props": {
           "initialObjects": {},
@@ -399,7 +418,16 @@ exports[`create a bucket 1`] = `
         },
         "type": "@winglang/sdk.cloud.Bucket",
       },
-    ],
+      "root/my_bucket/Policy": {
+        "addr": "c8b5ba55132964ee19331fb9f46241560e67fed76b",
+        "path": "root/my_bucket/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_bucket#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -410,14 +438,14 @@ exports[`create a bucket 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -450,14 +478,6 @@ exports[`create a bucket 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -466,10 +486,22 @@ exports[`create a bucket 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -483,23 +515,25 @@ exports[`create a bucket 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_bucket": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_bucket/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud object store",
@@ -511,8 +545,9 @@ exports[`create a bucket 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -523,11 +558,11 @@ exports[`create a bucket 1`] = `
 
 exports[`get invalid object throws an error 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
-  "Get (key=unknown.txt).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
+  "Error: Object does not exist (key=unknown.txt). (Get (key=unknown.txt).)",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
@@ -538,17 +573,9 @@ exports[`get invalid object throws an error 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_bucket": {
+        "addr": "c8220a82a4ad9c25a4f236946f350d2ac081dd7bbc",
         "path": "root/my_bucket",
         "props": {
           "initialObjects": {},
@@ -557,7 +584,16 @@ exports[`get invalid object throws an error 2`] = `
         },
         "type": "@winglang/sdk.cloud.Bucket",
       },
-    ],
+      "root/my_bucket/Policy": {
+        "addr": "c8b5ba55132964ee19331fb9f46241560e67fed76b",
+        "path": "root/my_bucket/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_bucket#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -568,14 +604,14 @@ exports[`get invalid object throws an error 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -608,14 +644,6 @@ exports[`get invalid object throws an error 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -624,10 +652,22 @@ exports[`get invalid object throws an error 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -641,23 +681,25 @@ exports[`get invalid object throws an error 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_bucket": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_bucket/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud object store",
@@ -669,8 +711,9 @@ exports[`get invalid object throws an error 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -681,23 +724,23 @@ exports[`get invalid object throws an error 2`] = `
 
 exports[`list respects prefixes 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put (key=path/dir1/file1.txt).",
   "Put (key=path/dir2/file2.txt).",
   "List (prefix=null).",
   "List (prefix=path).",
   "List (prefix=path/dir1).",
   "List (prefix=path/dir2).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`objects can have keys that look like directories 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put (key=foo).",
   "Put (key=foo/).",
   "Put (key=foo/bar).",
@@ -709,123 +752,127 @@ exports[`objects can have keys that look like directories 1`] = `
   "List (prefix=foo/bar).",
   "List (prefix=foo/bar/).",
   "List (prefix=foo/bar/baz).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`put and get metadata of objects from bucket 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put (key=file1.main.w).",
   "Put (key=file2.txt).",
   "Put (key=file3.txt).",
   "Metadata (key=file1.main.w).",
   "Metadata (key=file2.txt).",
   "Metadata (key=file3.txt).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`put and get object from bucket 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put (key=greeting.txt).",
   "Get (key=greeting.txt).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`put multiple json objects and list all from bucket 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put Json (key=greeting1.json).",
   "Put Json (key=greeting2.json).",
   "Put Json (key=greeting3.json).",
   "List (prefix=null).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`put multiple objects and list all from bucket 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put (key=greeting1.txt).",
   "Put (key=greeting2.txt).",
   "Put (key=greeting3.txt).",
   "List (prefix=null).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`remove object from a bucket 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put (key=unknown.txt).",
   "Delete (key=unknown.txt).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`remove object from a bucket with mustExist as option 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Bucket created.",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
   "Put (key=unknown.txt).",
   "Delete (key=unknown.txt).",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
 ]
 `;
 
 exports[`removing a key will call onDelete method 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.cloud.Bucket created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
+  "root/my_bucket/OnDelete started",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
+  "root/my_bucket/OnDelete/OnMessage0 started",
+  "root/my_bucket/OnDelete/Policy started",
+  "root/my_bucket/OnDelete/TopicEventMapping0 started",
   "Put (key=unknown.txt).",
-  "Publish (message=unknown.txt).",
   "Sending message (message=unknown.txt, subscriber=sim-3).",
+  "InvokeAsync (payload="unknown.txt").",
+  "Publish (messages=unknown.txt).",
   "Delete (key=unknown.txt).",
   "Received unknown.txt",
-  "Invoke (payload=\\"unknown.txt\\").",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
+  "root/my_bucket/OnDelete/Policy stopped",
+  "root/my_bucket/OnDelete/TopicEventMapping0 stopped",
+  "root/my_bucket/OnDelete stopped",
+  "root/my_bucket/OnDelete/OnMessage0 stopped",
 ]
 `;
 
 exports[`update an object in bucket 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.cloud.Bucket created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Publish (message=greeting.txt).",
-  "Sending message (message=greeting.txt, subscriber=sim-3).",
-  "Put (key=greeting.txt).",
-  "Invoke (payload=\\"greeting.txt\\").",
-  "Subscriber error: TypeError: this.handler.handle is not a function",
-  "Put (key=greeting.txt).",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.cloud.Bucket deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_bucket/OnCreate started",
+  "root/my_bucket started",
+  "root/my_bucket/Policy started",
+  "root/my_bucket/OnCreate/OnMessage0 started",
+  "root/my_bucket/OnCreate/Policy started",
+  "root/my_bucket/OnCreate/TopicEventMapping0 started",
+  "Sending message (message=1.txt, subscriber=sim-3).",
+  "InvokeAsync (payload="1.txt").",
+  "Publish (messages=1.txt).",
+  "Put (key=1.txt).",
+  "Put (key=1.txt).",
+  "I am done",
+  "root/my_bucket/Policy stopped",
+  "root/my_bucket stopped",
+  "root/my_bucket/OnCreate/Policy stopped",
+  "root/my_bucket/OnCreate/TopicEventMapping0 stopped",
+  "root/my_bucket/OnCreate stopped",
+  "root/my_bucket/OnCreate/OnMessage0 stopped",
 ]
 `;
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/counter.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/counter.test.ts.snap
index 521b957bd65..292707d8f0e 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/counter.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/counter.test.ts.snap
@@ -2,29 +2,124 @@
 
 exports[`create a counter 1`] = `
 {
+  ".wing/resource_c81f10c5.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 123
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
+    "connections": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "inc",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
       },
       {
-        "attrs": {},
-        "path": "root/my_counter",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "dec",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "peek",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "set",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_counter/Resource": {
+        "addr": "c81f10c55a36e5ca9846b94e2177596099ff6376ac",
+        "path": "root/my_counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 123,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81f10c5.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -35,14 +130,14 @@ exports[`create a counter 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -75,14 +170,6 @@ exports[`create a counter 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -91,10 +178,22 @@ exports[`create a counter 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -108,23 +207,26 @@ exports[`create a counter 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_counter": {
+          "children": {
+            "Resource": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "color": "emerald",
+                "description": "A simulated resource",
+                "hidden": true,
+                "title": "Resource",
+              },
+              "id": "Resource",
+              "path": "root/my_counter/Resource",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed atomic counter",
@@ -136,8 +238,9 @@ exports[`create a counter 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -148,42 +251,135 @@ exports[`create a counter 1`] = `
 
 exports[`dec 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Counter created.",
-  "Dec (amount=1).",
-  "Dec (amount=1).",
-  "Dec (amount=10).",
-  "Dec (amount=10).",
-  "@winglang/sdk.cloud.Counter deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_counter/Resource started",
+  "dec()",
+  "dec()",
+  "dec(10)",
+  "dec(10)",
+  "root/my_counter/Resource stopped",
 ]
 `;
 
 exports[`dec 2`] = `
 {
+  ".wing/resource_c81f10c5.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 123
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
+    "connections": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "inc",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
       },
       {
-        "attrs": {},
-        "path": "root/my_counter",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "dec",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "peek",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "set",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_counter/Resource": {
+        "addr": "c81f10c55a36e5ca9846b94e2177596099ff6376ac",
+        "path": "root/my_counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 123,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81f10c5.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -194,14 +390,14 @@ exports[`dec 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -234,14 +430,6 @@ exports[`dec 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -250,10 +438,22 @@ exports[`dec 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -267,23 +467,26 @@ exports[`dec 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_counter": {
+          "children": {
+            "Resource": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "color": "emerald",
+                "description": "A simulated resource",
+                "hidden": true,
+                "title": "Resource",
+              },
+              "id": "Resource",
+              "path": "root/my_counter/Resource",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed atomic counter",
@@ -295,8 +498,9 @@ exports[`dec 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -307,42 +511,135 @@ exports[`dec 2`] = `
 
 exports[`inc 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Counter created.",
-  "Inc (amount=1).",
-  "Inc (amount=1).",
-  "Inc (amount=10).",
-  "Inc (amount=10).",
-  "@winglang/sdk.cloud.Counter deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_counter/Resource started",
+  "inc()",
+  "inc()",
+  "inc(10)",
+  "inc(10)",
+  "root/my_counter/Resource stopped",
 ]
 `;
 
 exports[`inc 2`] = `
 {
+  ".wing/resource_c81f10c5.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 123
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
+    "connections": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "inc",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "dec",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
       },
       {
-        "attrs": {},
-        "path": "root/my_counter",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "peek",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "set",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_counter/Resource": {
+        "addr": "c81f10c55a36e5ca9846b94e2177596099ff6376ac",
+        "path": "root/my_counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 123,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81f10c5.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -353,14 +650,14 @@ exports[`inc 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -393,14 +690,6 @@ exports[`inc 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -409,10 +698,22 @@ exports[`inc 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -426,23 +727,26 @@ exports[`inc 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_counter": {
+          "children": {
+            "Resource": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "color": "emerald",
+                "description": "A simulated resource",
+                "hidden": true,
+                "title": "Resource",
+              },
+              "id": "Resource",
+              "path": "root/my_counter/Resource",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed atomic counter",
@@ -454,8 +758,9 @@ exports[`inc 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -466,42 +771,135 @@ exports[`inc 2`] = `
 
 exports[`key dec 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Counter created.",
-  "Dec (amount=1, key: my-key).",
-  "Dec (amount=1, key: my-key).",
-  "Dec (amount=10, key: my-key).",
-  "Dec (amount=10, key: my-key).",
-  "@winglang/sdk.cloud.Counter deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_counter/Resource started",
+  "dec(1, "my-key")",
+  "dec(nil, "my-key")",
+  "dec(10, "my-key")",
+  "dec(10, "my-key")",
+  "root/my_counter/Resource stopped",
 ]
 `;
 
 exports[`key dec 2`] = `
 {
+  ".wing/resource_c81f10c5.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 0
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
+    "connections": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "inc",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "dec",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
       },
       {
-        "attrs": {},
-        "path": "root/my_counter",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "peek",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "set",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_counter/Resource": {
+        "addr": "c81f10c55a36e5ca9846b94e2177596099ff6376ac",
+        "path": "root/my_counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 0,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81f10c5.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -512,14 +910,14 @@ exports[`key dec 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -552,14 +950,6 @@ exports[`key dec 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -568,10 +958,22 @@ exports[`key dec 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -585,23 +987,26 @@ exports[`key dec 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_counter": {
+          "children": {
+            "Resource": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "color": "emerald",
+                "description": "A simulated resource",
+                "hidden": true,
+                "title": "Resource",
+              },
+              "id": "Resource",
+              "path": "root/my_counter/Resource",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed atomic counter",
@@ -613,8 +1018,9 @@ exports[`key dec 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -625,42 +1031,135 @@ exports[`key dec 2`] = `
 
 exports[`key inc 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Counter created.",
-  "Inc (amount=1, key: my-key).",
-  "Inc (amount=1, key: my-key).",
-  "Inc (amount=10, key: my-key).",
-  "Inc (amount=10, key: my-key).",
-  "@winglang/sdk.cloud.Counter deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_counter/Resource started",
+  "inc(1, "my-key")",
+  "inc(nil, "my-key")",
+  "inc(10, "my-key")",
+  "inc(10, "my-key")",
+  "root/my_counter/Resource stopped",
 ]
 `;
 
 exports[`key inc 2`] = `
 {
+  ".wing/resource_c81f10c5.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 0
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
+    "connections": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "inc",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "dec",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
       },
       {
-        "attrs": {},
-        "path": "root/my_counter",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "peek",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "set",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_counter/Resource": {
+        "addr": "c81f10c55a36e5ca9846b94e2177596099ff6376ac",
+        "path": "root/my_counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 0,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81f10c5.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -671,14 +1170,14 @@ exports[`key inc 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -711,14 +1210,6 @@ exports[`key inc 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -727,10 +1218,22 @@ exports[`key inc 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -744,23 +1247,26 @@ exports[`key inc 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_counter": {
+          "children": {
+            "Resource": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "color": "emerald",
+                "description": "A simulated resource",
+                "hidden": true,
+                "title": "Resource",
+              },
+              "id": "Resource",
+              "path": "root/my_counter/Resource",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed atomic counter",
@@ -772,8 +1278,9 @@ exports[`key inc 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -784,40 +1291,133 @@ exports[`key inc 2`] = `
 
 exports[`key set to new value 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Counter created.",
-  "Set (value=5, key: my-key).",
-  "Peek (value=5, key: my-key).",
-  "@winglang/sdk.cloud.Counter deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_counter/Resource started",
+  "set(5, "my-key")",
+  "peek("my-key")",
+  "root/my_counter/Resource stopped",
 ]
 `;
 
 exports[`key set to new value 2`] = `
 {
+  ".wing/resource_c81f10c5.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 0
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
+    "connections": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "inc",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
       },
       {
-        "attrs": {},
-        "path": "root/my_counter",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "dec",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "peek",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "set",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_counter/Resource": {
+        "addr": "c81f10c55a36e5ca9846b94e2177596099ff6376ac",
+        "path": "root/my_counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 0,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81f10c5.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -828,14 +1428,14 @@ exports[`key set to new value 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -868,14 +1468,6 @@ exports[`key set to new value 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -884,10 +1476,22 @@ exports[`key set to new value 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -901,23 +1505,26 @@ exports[`key set to new value 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_counter": {
+          "children": {
+            "Resource": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "color": "emerald",
+                "description": "A simulated resource",
+                "hidden": true,
+                "title": "Resource",
+              },
+              "id": "Resource",
+              "path": "root/my_counter/Resource",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed atomic counter",
@@ -929,8 +1536,9 @@ exports[`key set to new value 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -941,40 +1549,133 @@ exports[`key set to new value 2`] = `
 
 exports[`set to new value 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Counter created.",
-  "Set (value=5).",
-  "Peek (value=5).",
-  "@winglang/sdk.cloud.Counter deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_counter/Resource started",
+  "set(5)",
+  "peek()",
+  "root/my_counter/Resource stopped",
 ]
 `;
 
 exports[`set to new value 2`] = `
 {
+  ".wing/resource_c81f10c5.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 123
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
+    "connections": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "inc",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "dec",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "peek",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
       },
       {
-        "attrs": {},
-        "path": "root/my_counter",
+        "name": "call",
+        "source": "root/my_counter",
+        "sourceOp": "set",
+        "target": "root/my_counter/Resource",
+        "targetOp": "call",
+      },
+    ],
+    "version": "connections-0.1",
+  },
+  "simulator.json": {
+    "resources": {
+      "root/my_counter/Resource": {
+        "addr": "c81f10c55a36e5ca9846b94e2177596099ff6376ac",
+        "path": "root/my_counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 123,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81f10c5.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -985,14 +1686,14 @@ exports[`set to new value 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1025,14 +1726,6 @@ exports[`set to new value 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1041,10 +1734,22 @@ exports[`set to new value 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1058,23 +1763,26 @@ exports[`set to new value 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_counter": {
+          "children": {
+            "Resource": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "color": "emerald",
+                "description": "A simulated resource",
+                "hidden": true,
+                "title": "Resource",
+              },
+              "id": "Resource",
+              "path": "root/my_counter/Resource",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed atomic counter",
@@ -1086,8 +1794,9 @@ exports[`set to new value 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/dynamodb-table.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/dynamodb-table.test.ts.snap
index 56f63384935..85bed0f3d53 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/dynamodb-table.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/dynamodb-table.test.ts.snap
@@ -9,14 +9,7 @@ exports[`create a table 1`] = `
   "simulator.json": {
     "resources": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
+        "addr": "c80d8c0710fc41df32eaa9895ae0bbd6cfd22762c2",
         "attrs": {},
         "path": "root/create_table",
         "props": {
@@ -24,10 +17,23 @@ exports[`create a table 1`] = `
             "id": "S",
           },
           "hashKey": "id",
+          "hostPort": "\${wsim#root/create_table/Container#attrs.host_port}",
           "name": "new_table",
         },
         "type": "@winglang/sdk.ex.DynamodbTable",
       },
+      {
+        "addr": "c82d9c21ab6a376c9bcdf5239702cd3d3a582b5e50",
+        "attrs": {},
+        "path": "root/create_table/Container",
+        "props": {
+          "containerPort": 8000,
+          "cwd": "<ABSOLUTE PATH>/test",
+          "image": "amazon/dynamodb-local:2.0.0",
+          "imageTag": "amazon/dynamodb-local:2.0.0",
+        },
+        "type": "@winglang/sdk.sim.Container",
+      },
     ],
     "sdkVersion": "0.0.0",
     "types": {
@@ -47,6 +53,10 @@ exports[`create a table 1`] = `
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -95,6 +105,10 @@ exports[`create a table 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
@@ -112,23 +126,21 @@ exports[`create a table 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "create_table": {
+          "children": {
+            "Container": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {},
+              "id": "Container",
+              "path": "root/create_table/Container",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A DynamoDb Table",
@@ -140,7 +152,7 @@ exports[`create a table 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
       "id": "root",
       "path": "root",
@@ -152,10 +164,15 @@ exports[`create a table 1`] = `
 
 exports[`get item 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.DynamodbTable created.",
-  "@winglang/sdk.ex.DynamodbTable deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "image amazon/dynamodb-local:<port>.0.0 already exists",
+  "starting container from image amazon/dynamodb-local:<port>.0.0",
+  "docker run --detach --rm --name wing-container-<container> -p 8000 amazon/dynamodb-local:<port>.0.0",
+  "containerName=wing-container-<container>",
+  "root/get_table/Container started",
+  "root/get_table started",
+  "root/get_table stopped",
+  "Stopping container wing-container-<container>",
+  "root/get_table/Container stopped",
 ]
 `;
 
@@ -168,14 +185,7 @@ exports[`get item 2`] = `
   "simulator.json": {
     "resources": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
+        "addr": "c8b976f0619d4aad0e4bb55cbda7b8975704b8b11a",
         "attrs": {},
         "path": "root/get_table",
         "props": {
@@ -183,10 +193,23 @@ exports[`get item 2`] = `
             "id": "S",
           },
           "hashKey": "id",
+          "hostPort": "\${wsim#root/get_table/Container#attrs.host_port}",
           "name": "my_get_table",
         },
         "type": "@winglang/sdk.ex.DynamodbTable",
       },
+      {
+        "addr": "c8b10674f74fa0a89c85159f18ee72997a19272e1a",
+        "attrs": {},
+        "path": "root/get_table/Container",
+        "props": {
+          "containerPort": 8000,
+          "cwd": "<ABSOLUTE PATH>/test",
+          "image": "amazon/dynamodb-local:2.0.0",
+          "imageTag": "amazon/dynamodb-local:2.0.0",
+        },
+        "type": "@winglang/sdk.sim.Container",
+      },
     ],
     "sdkVersion": "0.0.0",
     "types": {
@@ -206,6 +229,10 @@ exports[`get item 2`] = `
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -254,6 +281,10 @@ exports[`get item 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
@@ -271,23 +302,21 @@ exports[`get item 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "get_table": {
+          "children": {
+            "Container": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {},
+              "id": "Container",
+              "path": "root/get_table/Container",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A DynamoDb Table",
@@ -299,7 +328,7 @@ exports[`get item 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
       "id": "root",
       "path": "root",
@@ -311,10 +340,15 @@ exports[`get item 2`] = `
 
 exports[`put item 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.DynamodbTable created.",
-  "@winglang/sdk.ex.DynamodbTable deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "image amazon/dynamodb-local:<port>.0.0 already exists",
+  "starting container from image amazon/dynamodb-local:<port>.0.0",
+  "docker run --detach --rm --name wing-container-<container> -p 8000 amazon/dynamodb-local:<port>.0.0",
+  "containerName=wing-container-<container>",
+  "root/put_table/Container started",
+  "root/put_table started",
+  "root/put_table stopped",
+  "Stopping container wing-container-<container>",
+  "root/put_table/Container stopped",
 ]
 `;
 
@@ -327,14 +361,7 @@ exports[`put item 2`] = `
   "simulator.json": {
     "resources": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
+        "addr": "c8fa1029e0255990ff9eb3bf212931386890380f82",
         "attrs": {},
         "path": "root/put_table",
         "props": {
@@ -342,10 +369,23 @@ exports[`put item 2`] = `
             "id": "S",
           },
           "hashKey": "id",
+          "hostPort": "\${wsim#root/put_table/Container#attrs.host_port}",
           "name": "my_insert_table",
         },
         "type": "@winglang/sdk.ex.DynamodbTable",
       },
+      {
+        "addr": "c8934f0d9367e400f390b6380b526e9c5ceaa3833e",
+        "attrs": {},
+        "path": "root/put_table/Container",
+        "props": {
+          "containerPort": 8000,
+          "cwd": "<ABSOLUTE PATH>/test",
+          "image": "amazon/dynamodb-local:2.0.0",
+          "imageTag": "amazon/dynamodb-local:2.0.0",
+        },
+        "type": "@winglang/sdk.sim.Container",
+      },
     ],
     "sdkVersion": "0.0.0",
     "types": {
@@ -365,6 +405,10 @@ exports[`put item 2`] = `
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -413,6 +457,10 @@ exports[`put item 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
@@ -430,23 +478,21 @@ exports[`put item 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "put_table": {
+          "children": {
+            "Container": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {},
+              "id": "Container",
+              "path": "root/put_table/Container",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A DynamoDb Table",
@@ -458,7 +504,7 @@ exports[`put item 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
       "id": "root",
       "path": "root",
@@ -470,10 +516,15 @@ exports[`put item 2`] = `
 
 exports[`update item 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.DynamodbTable created.",
-  "@winglang/sdk.ex.DynamodbTable deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "image amazon/dynamodb-local:<port>.0.0 already exists",
+  "starting container from image amazon/dynamodb-local:<port>.0.0",
+  "docker run --detach --rm --name wing-container-<container> -p 8000 amazon/dynamodb-local:<port>.0.0",
+  "containerName=wing-container-<container>",
+  "root/update_table/Container started",
+  "root/update_table started",
+  "root/update_table stopped",
+  "Stopping container wing-container-<container>",
+  "root/update_table/Container stopped",
 ]
 `;
 
@@ -486,14 +537,7 @@ exports[`update item 2`] = `
   "simulator.json": {
     "resources": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
+        "addr": "c8f403ebb1894f2ea172e92af9090b7c8a25806934",
         "attrs": {},
         "path": "root/update_table",
         "props": {
@@ -501,10 +545,23 @@ exports[`update item 2`] = `
             "id": "S",
           },
           "hashKey": "id",
+          "hostPort": "\${wsim#root/update_table/Container#attrs.host_port}",
           "name": "my_update_table",
         },
         "type": "@winglang/sdk.ex.DynamodbTable",
       },
+      {
+        "addr": "c87d51114bd971aa78d45b09d1581b2d2490f8d31a",
+        "attrs": {},
+        "path": "root/update_table/Container",
+        "props": {
+          "containerPort": 8000,
+          "cwd": "<ABSOLUTE PATH>/test",
+          "image": "amazon/dynamodb-local:2.0.0",
+          "imageTag": "amazon/dynamodb-local:2.0.0",
+        },
+        "type": "@winglang/sdk.sim.Container",
+      },
     ],
     "sdkVersion": "0.0.0",
     "types": {
@@ -524,6 +581,10 @@ exports[`update item 2`] = `
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -572,6 +633,10 @@ exports[`update item 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
@@ -589,23 +654,21 @@ exports[`update item 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "update_table": {
+          "children": {
+            "Container": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {},
+              "id": "Container",
+              "path": "root/update_table/Container",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A DynamoDb Table",
@@ -617,7 +680,7 @@ exports[`update item 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
       "id": "root",
       "path": "root",
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/file-counter.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/file-counter.test.ts.snap
index cd61e38d3a7..bb61606ada2 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/file-counter.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/file-counter.test.ts.snap
@@ -2,140 +2,342 @@
 
 exports[`can create sequential files in a bucket 1`] = `
 {
-  ".wing/setconsumer0_c8e82e9f.js": "\\"use strict\\";
+  ".wing/consumer0_c8a319bc.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/queue.setconsumer.inflight.js\\")).QueueSetConsumerHandlerClient({ handler: new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(event) {
-          let next = await this.counter.inc();
-          let key = \\"file-\\" + next + \\".txt\\";
-          await this.bucket.put(key, event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            const batchItemFailures = [];
+            let parsed = JSON.parse(event !== null && event !== void 0 ? event : "{}");
+            if (!parsed.messages)
+                throw new Error('No "messages" field in event.');
+            for (const $message of parsed.messages) {
+                try {
+                    await ctx.handler($message.payload);
+                }
+                catch (error) {
+                    // TODO: an error from user code is getting dropped - bad! https://github.com/winglang/wing/issues/6445
+                    batchItemFailures.push($message);
+                }
+            }
+            return batchItemFailures.length > 0
+                ? JSON.stringify(batchItemFailures)
+                : undefined;
         }
-};
-})())({
-counter: (function() {
-  let handle = process.env.COUNTER_HANDLE_4ecd8d46;
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, event) => {
+            let next = await ctx.counter.inc();
+            let key = "file-" + next + ".txt";
+            await ctx.bucket.put(key, event);
+          }
+  const $ctx = {
+  counter: (function() {
+  let handle = process.env.COUNTER_HANDLE_87e2e6cc;
   if (!handle) {
-    throw new Error(\\"Missing environment variable: COUNTER_HANDLE_4ecd8d46\\");
+    throw new Error("Missing environment variable: COUNTER_HANDLE_87e2e6cc");
   }
   const simulatorUrl = process.env.WING_SIMULATOR_URL;
   if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
+    throw new Error("Missing environment variable: WING_SIMULATOR_URL");
+  }
+  const caller = process.env.WING_SIMULATOR_CALLER;
+  if (!caller) {
+    throw new Error("Missing environment variable: WING_SIMULATOR_CALLER");
   }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
+  const backend = require("@winglang/sdk/lib/simulator/client").makeSimulatorClient(simulatorUrl, handle, caller);
+  const client = new Proxy(backend, {
+    get: function(target, prop, receiver) {
+      return async function(...args) {
+        return backend.call(prop, args);
+      };
+    },
+  });
+  return client;
 })(),
 bucket: (function() {
   let handle = process.env.BUCKET_HANDLE_5f2a41c8;
   if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_5f2a41c8\\");
+    throw new Error("Missing environment variable: BUCKET_HANDLE_5f2a41c8");
   }
   const simulatorUrl = process.env.WING_SIMULATOR_URL;
   if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
+    throw new Error("Missing environment variable: WING_SIMULATOR_URL");
+  }
+  const caller = process.env.WING_SIMULATOR_CALLER;
+  if (!caller) {
+    throw new Error("Missing environment variable: WING_SIMULATOR_CALLER");
   }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
+  return require("@winglang/sdk/lib/simulator/client").makeSimulatorClient(simulatorUrl, handle, caller);
 })()
-}), args: {} })).handle(event);
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
+  ".wing/resource_c81e2103.cjs": "        "use strict";
+        let $klass;
+        exports.start = async function(statedir) {
+          if ($klass) {
+            throw Error('resource already started');
+          }
+          const attrs = {};
+          const ctx = {};
+          ctx.statedir = async () => statedir;
+          ctx.resolveToken = async (name, value) => attrs[name] = value;
+          ctx.log = async (message, level) => {
+            if (!level) level = 'info';
+            console.log(level + ':' + message);
+          };
+          const client = (await (async () => {
+  const $func = async (ctx, simContext) => {
+            // TODO: make CounterBackend liftable so we can add it to the list of captures
+            const CounterBackend = 
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require("@winglang/sdk/lib/target-sim/counter.inflight").CounterBackend;
+            const backend = new CounterBackend(simContext, { initial: ctx.initial });
+            await backend.onStart();
+            return backend;
+        }
+  const $ctx = {
+  initial: 1000
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+          const noop = { onStop: () => {} };
+          const klass = (await client.handle(ctx)) ?? noop;
+          ctx.resolveToken = () => {
+            throw Error('cannot resolve attributes outside of onStop method');
+          };
+          $klass = klass;
+          return attrs;
+        };
+
+        exports.call = async function(propName, ...args) {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          if (propName === 'onStop') {
+            throw Error('Cannot call "onStop"');
+          }
+          const prop = $klass[propName];
+          if (!prop) {
+            throw Error('Method or property "' + propName + '" not found');
+          }
+          if (typeof prop !== 'function') {
+            if (args.length > 0) {
+              throw Error('Property "' + propName + '" is not a function');
+            }
+            return prop;
+          }
+          return await prop.call($klass, ...args);
+        };
+
+        exports.stop = async function() {
+          if (!$klass) {
+            throw Error('Resource is not running (it may have crashed or stopped)');
+          }
+          await $klass.onStop();
+          $klass = undefined;
+        };
+        ",
   "connections.json": {
     "connections": [
       {
-        "name": "inc()",
-        "source": "root/HelloWorld/Queue/SetConsumer0",
-        "target": "root/HelloWorld/Counter",
+        "name": "consumer",
+        "source": "root/HelloWorld/Queue",
+        "sourceOp": "push",
+        "target": "root/HelloWorld/Queue/Consumer0",
+        "targetOp": "invoke",
+      },
+      {
+        "name": "call",
+        "source": "root/HelloWorld/Counter",
+        "sourceOp": "inc",
+        "target": "root/HelloWorld/Counter/Resource",
+        "targetOp": "call",
       },
       {
-        "name": "$inflight_init()",
-        "source": "root/HelloWorld/Queue/SetConsumer0",
+        "name": "call",
+        "source": "root/HelloWorld/Counter",
+        "sourceOp": "dec",
+        "target": "root/HelloWorld/Counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/HelloWorld/Counter",
+        "sourceOp": "peek",
+        "target": "root/HelloWorld/Counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/HelloWorld/Counter",
+        "sourceOp": "set",
+        "target": "root/HelloWorld/Counter/Resource",
+        "targetOp": "call",
+      },
+      {
+        "name": "call",
+        "source": "root/HelloWorld/Queue/Consumer0",
+        "sourceOp": "invoke",
         "target": "root/HelloWorld/Counter",
+        "targetOp": "inc",
       },
       {
-        "name": "put()",
-        "source": "root/HelloWorld/Queue/SetConsumer0",
+        "name": "call",
+        "source": "root/HelloWorld/Queue/Consumer0",
+        "sourceOp": "invoke",
         "target": "root/HelloWorld/Bucket",
+        "targetOp": "put",
       },
       {
-        "name": "$inflight_init()",
-        "source": "root/HelloWorld/Queue/SetConsumer0",
-        "target": "root/HelloWorld/Bucket",
+        "name": "call",
+        "source": "root/HelloWorld/Queue/Consumer0",
+        "sourceOp": "invokeAsync",
+        "target": "root/HelloWorld/Counter",
+        "targetOp": "inc",
       },
       {
-        "name": "setConsumer()",
-        "source": "root/HelloWorld/Queue",
-        "target": "root/HelloWorld/Queue/SetConsumer0",
+        "name": "call",
+        "source": "root/HelloWorld/Queue/Consumer0",
+        "sourceOp": "invokeAsync",
+        "target": "root/HelloWorld/Bucket",
+        "targetOp": "put",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/HelloWorld/Bucket": {
+        "addr": "c80e3625bbefd53d8c61fbb978711d410b5f2a41c8",
+        "path": "root/HelloWorld/Bucket",
+        "props": {
+          "initialObjects": {},
+          "public": false,
+          "topics": {},
+        },
+        "type": "@winglang/sdk.cloud.Bucket",
+      },
+      "root/HelloWorld/Bucket/Policy": {
+        "addr": "c86eb36bbe6e764a632afaaea5db2d4bd693c92624",
+        "path": "root/HelloWorld/Bucket/Policy",
         "props": {
-          "tests": {},
+          "principal": "\${wsim#root/HelloWorld/Bucket#attrs.handle}",
+          "statements": [],
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.sim.Policy",
       },
-      {
-        "attrs": {},
-        "path": "root/HelloWorld/Counter",
+      "root/HelloWorld/Counter/Resource": {
+        "addr": "c81e2103dbfc2359abccf4774cbfa2f49287e2e6cc",
+        "path": "root/HelloWorld/Counter/Resource",
+        "policy": [],
         "props": {
-          "initial": 1000,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/resource_c81e2103.cjs",
+          "sourceCodeLanguage": "javascript",
         },
-        "type": "@winglang/sdk.cloud.Counter",
+        "type": "@winglang/sdk.sim.Resource",
       },
-      {
-        "attrs": {},
-        "path": "root/HelloWorld/Bucket",
+      "root/HelloWorld/Queue": {
+        "addr": "c8de0494647ac0bdaec85a77e2a164cfbcfecc5ca1",
+        "path": "root/HelloWorld/Queue",
         "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
+          "retentionPeriod": 3600,
+          "timeout": 30,
         },
-        "type": "@winglang/sdk.cloud.Bucket",
+        "type": "@winglang/sdk.cloud.Queue",
       },
-      {
-        "attrs": {},
-        "path": "root/HelloWorld/Queue/SetConsumer0",
+      "root/HelloWorld/Queue/Consumer0": {
+        "addr": "c8a319bcb354a5e6d231ddfa543d3b95df95586b71",
+        "deps": [
+          "root/HelloWorld/Counter/Resource",
+          "root/HelloWorld/Bucket",
+        ],
+        "path": "root/HelloWorld/Queue/Consumer0",
+        "policy": [
+          {
+            "operation": "inc",
+            "resourceHandle": "\${wsim#root/HelloWorld/Counter/Resource#attrs.handle}",
+          },
+          {
+            "operation": "put",
+            "resourceHandle": "\${wsim#root/HelloWorld/Bucket#attrs.handle}",
+          },
+          {
+            "operation": "call",
+            "resourceHandle": "\${wsim#root/HelloWorld/Counter/Resource#attrs.handle}",
+          },
+        ],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {
             "BUCKET_HANDLE_5f2a41c8": "\${wsim#root/HelloWorld/Bucket#attrs.handle}",
-            "COUNTER_HANDLE_4ecd8d46": "\${wsim#root/HelloWorld/Counter#attrs.handle}",
+            "COUNTER_HANDLE_87e2e6cc": "\${wsim#root/HelloWorld/Counter/Resource#attrs.handle}",
+            "RESOURCE_HANDLE_87e2e6cc": "\${wsim#root/HelloWorld/Counter/Resource#attrs.handle}",
           },
-          "sourceCodeFile": ".wing/setconsumer0_c8e82e9f.js",
+          "sourceCodeFile": ".wing/consumer0_c8a319bc.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/HelloWorld/Queue",
+      "root/HelloWorld/Queue/Policy": {
+        "addr": "c86b009930462795eeb90e647a56dbfc5356d9ea80",
+        "path": "root/HelloWorld/Queue/Policy",
         "props": {
-          "retentionPeriod": 3600,
-          "timeout": 30,
+          "principal": "\${wsim#root/HelloWorld/Queue#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/HelloWorld/Queue/Consumer0#attrs.handle}",
+            },
+            {
+              "operation": "hasAvailableWorkers",
+              "resourceHandle": "\${wsim#root/HelloWorld/Queue/Consumer0#attrs.handle}",
+            },
+          ],
         },
-        "type": "@winglang/sdk.cloud.Queue",
-      },
-      {
-        "attrs": {},
+        "type": "@winglang/sdk.sim.Policy",
+      },
+      "root/HelloWorld/Queue/QueueEventMapping0": {
+        "addr": "c80de7940bef4e6ad61443a5ed07362f300a117b29",
+        "deps": [
+          "root/HelloWorld/Queue/Consumer0",
+          "root/HelloWorld/Queue",
+          "root/HelloWorld/Queue/Policy",
+        ],
         "path": "root/HelloWorld/Queue/QueueEventMapping0",
         "props": {
           "publisher": "\${wsim#root/HelloWorld/Queue#attrs.handle}",
-          "subscriber": "\${wsim#root/HelloWorld/Queue/SetConsumer0#attrs.handle}",
+          "subscriber": "\${wsim#root/HelloWorld/Queue/Consumer0#attrs.handle}",
           "subscriptionProps": {
             "batchSize": 1,
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -146,14 +348,14 @@ bucket: (function() {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -186,14 +388,6 @@ bucket: (function() {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -202,10 +396,22 @@ bucket: (function() {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -222,9 +428,24 @@ bucket: (function() {
         "HelloWorld": {
           "children": {
             "Bucket": {
+              "children": {
+                "Policy": {
+                  "constructInfo": {
+                    "fqn": "constructs.Construct",
+                    "version": "10.3.0",
+                  },
+                  "display": {
+                    "description": "A simulated resource policy",
+                    "hidden": true,
+                    "title": "Policy",
+                  },
+                  "id": "Policy",
+                  "path": "root/HelloWorld/Bucket/Policy",
+                },
+              },
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud object store",
@@ -234,9 +455,25 @@ bucket: (function() {
               "path": "root/HelloWorld/Bucket",
             },
             "Counter": {
+              "children": {
+                "Resource": {
+                  "constructInfo": {
+                    "fqn": "constructs.Construct",
+                    "version": "10.3.0",
+                  },
+                  "display": {
+                    "color": "emerald",
+                    "description": "A simulated resource",
+                    "hidden": true,
+                    "title": "Resource",
+                  },
+                  "id": "Resource",
+                  "path": "root/HelloWorld/Counter/Resource",
+                },
+              },
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A distributed atomic counter",
@@ -247,34 +484,47 @@ bucket: (function() {
             },
             "Queue": {
               "children": {
-                "QueueEventMapping0": {
+                "Consumer0": {
+                  "constructInfo": {
+                    "fqn": "constructs.Construct",
+                    "version": "10.3.0",
+                  },
+                  "display": {
+                    "description": "A cloud function (FaaS)",
+                    "sourceModule": "@winglang/sdk",
+                    "title": "Consumer",
+                  },
+                  "id": "Consumer0",
+                  "path": "root/HelloWorld/Queue/Consumer0",
+                },
+                "Policy": {
                   "constructInfo": {
                     "fqn": "constructs.Construct",
-                    "version": "10.2.70",
+                    "version": "10.3.0",
                   },
                   "display": {
+                    "description": "A simulated resource policy",
                     "hidden": true,
+                    "title": "Policy",
                   },
-                  "id": "QueueEventMapping0",
-                  "path": "root/HelloWorld/Queue/QueueEventMapping0",
+                  "id": "Policy",
+                  "path": "root/HelloWorld/Queue/Policy",
                 },
-                "SetConsumer0": {
+                "QueueEventMapping0": {
                   "constructInfo": {
                     "fqn": "constructs.Construct",
-                    "version": "10.2.70",
+                    "version": "10.3.0",
                   },
                   "display": {
-                    "description": "A cloud function (FaaS)",
-                    "sourceModule": "@winglang/sdk",
-                    "title": "setConsumer()",
+                    "hidden": true,
                   },
-                  "id": "SetConsumer0",
-                  "path": "root/HelloWorld/Queue/SetConsumer0",
+                  "id": "QueueEventMapping0",
+                  "path": "root/HelloWorld/Queue/QueueEventMapping0",
                 },
               },
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A distributed message queue",
@@ -286,29 +536,18 @@ bucket: (function() {
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
+          "display": {},
           "id": "HelloWorld",
           "path": "root/HelloWorld",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/function.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/function.test.ts.snap
index a9b4d055d1b..eb5500f3161 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/function.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/function.test.ts.snap
@@ -2,62 +2,57 @@
 
 exports[`create a function 1`] = `
 {
-  ".wing/my_function_c85c4e0e.js": "\\"use strict\\";
+  ".wing/my_function_c85c4e0e.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  
-async handle(event) {
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (_, event) => {
   event = JSON.parse(event);
   let msg;
   if (event.name[0] !== event.name[0].toUpperCase()) {
-    throw new Error(\\"Name must start with uppercase letter\\");
+    throw new Error("Name must start with uppercase letter");
   }
   if (process.env.PIG_LATIN) {
-    msg = \\"Ellohay, \\" + event.name + \\"!\\";
+    msg = "Ellohay, " + event.name + "!";
   } else {
-    msg = \\"Hello, \\" + event.name + \\"!\\";
+    msg = "Hello, " + event.name + "!";
   }
   return JSON.stringify({ msg });
 }
-};
-})())({
-
-})).handle(event);
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_function": {
+        "addr": "c85c4e0e66bf385ab6b159bab34fb32dd81aad0a1d",
         "path": "root/my_function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {
             "ENV_VAR1": "true",
           },
-          "sourceCodeFile": ".wing/my_function_c85c4e0e.js",
+          "sourceCodeFile": ".wing/my_function_c85c4e0e.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -68,14 +63,14 @@ async handle(event) {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -108,14 +103,6 @@ async handle(event) {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -124,10 +111,22 @@ async handle(event) {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -141,23 +140,10 @@ async handle(event) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -169,8 +155,9 @@ async handle(event) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -181,70 +168,63 @@ async handle(event) {
 
 exports[`invoke function fails 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "Invoke (payload=\\"{\\\\\\"name\\\\\\":\\\\\\"alice\\\\\\"}\\").",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_function started",
+  "Error: Name must start with uppercase letter (Invoke (payload="{\\"name\\":\\"alice\\"}").)",
+  "root/my_function stopped",
 ]
 `;
 
 exports[`invoke function fails 2`] = `
 {
-  ".wing/my_function_c85c4e0e.js": "\\"use strict\\";
+  ".wing/my_function_c85c4e0e.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  
-async handle(event) {
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (_, event) => {
   event = JSON.parse(event);
   let msg;
   if (event.name[0] !== event.name[0].toUpperCase()) {
-    throw new Error(\\"Name must start with uppercase letter\\");
+    throw new Error("Name must start with uppercase letter");
   }
   if (process.env.PIG_LATIN) {
-    msg = \\"Ellohay, \\" + event.name + \\"!\\";
+    msg = "Ellohay, " + event.name + "!";
   } else {
-    msg = \\"Hello, \\" + event.name + \\"!\\";
+    msg = "Hello, " + event.name + "!";
   }
   return JSON.stringify({ msg });
 }
-};
-})())({
-
-})).handle(event);
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_function": {
+        "addr": "c85c4e0e66bf385ab6b159bab34fb32dd81aad0a1d",
         "path": "root/my_function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/my_function_c85c4e0e.js",
+          "sourceCodeFile": ".wing/my_function_c85c4e0e.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -255,14 +235,14 @@ async handle(event) {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -295,14 +275,6 @@ async handle(event) {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -311,10 +283,22 @@ async handle(event) {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -328,23 +312,10 @@ async handle(event) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -356,8 +327,9 @@ async handle(event) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -368,70 +340,63 @@ async handle(event) {
 
 exports[`invoke function succeeds 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "Invoke (payload=\\"{\\\\\\"name\\\\\\":\\\\\\"Alice\\\\\\"}\\").",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_function started",
+  "Invoke (payload="{\\"name\\":\\"Alice\\"}").",
+  "root/my_function stopped",
 ]
 `;
 
 exports[`invoke function succeeds 2`] = `
 {
-  ".wing/my_function_c85c4e0e.js": "\\"use strict\\";
+  ".wing/my_function_c85c4e0e.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  
-async handle(event) {
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (_, event) => {
   event = JSON.parse(event);
   let msg;
   if (event.name[0] !== event.name[0].toUpperCase()) {
-    throw new Error(\\"Name must start with uppercase letter\\");
+    throw new Error("Name must start with uppercase letter");
   }
   if (process.env.PIG_LATIN) {
-    msg = \\"Ellohay, \\" + event.name + \\"!\\";
+    msg = "Ellohay, " + event.name + "!";
   } else {
-    msg = \\"Hello, \\" + event.name + \\"!\\";
+    msg = "Hello, " + event.name + "!";
   }
   return JSON.stringify({ msg });
 }
-};
-})())({
-
-})).handle(event);
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_function": {
+        "addr": "c85c4e0e66bf385ab6b159bab34fb32dd81aad0a1d",
         "path": "root/my_function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/my_function_c85c4e0e.js",
+          "sourceCodeFile": ".wing/my_function_c85c4e0e.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -442,14 +407,14 @@ async handle(event) {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -482,14 +447,6 @@ async handle(event) {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -498,10 +455,22 @@ async handle(event) {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -515,23 +484,10 @@ async handle(event) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -543,8 +499,9 @@ async handle(event) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -555,72 +512,65 @@ async handle(event) {
 
 exports[`invoke function with environment variables 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "Invoke (payload=\\"{\\\\\\"name\\\\\\":\\\\\\"Alice\\\\\\"}\\").",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_function started",
+  "Invoke (payload="{\\"name\\":\\"Alice\\"}").",
+  "root/my_function stopped",
 ]
 `;
 
 exports[`invoke function with environment variables 2`] = `
 {
-  ".wing/my_function_c85c4e0e.js": "\\"use strict\\";
+  ".wing/my_function_c85c4e0e.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  
-async handle(event) {
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (_, event) => {
   event = JSON.parse(event);
   let msg;
   if (event.name[0] !== event.name[0].toUpperCase()) {
-    throw new Error(\\"Name must start with uppercase letter\\");
+    throw new Error("Name must start with uppercase letter");
   }
   if (process.env.PIG_LATIN) {
-    msg = \\"Ellohay, \\" + event.name + \\"!\\";
+    msg = "Ellohay, " + event.name + "!";
   } else {
-    msg = \\"Hello, \\" + event.name + \\"!\\";
+    msg = "Hello, " + event.name + "!";
   }
   return JSON.stringify({ msg });
 }
-};
-})())({
-
-})).handle(event);
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_function": {
+        "addr": "c85c4e0e66bf385ab6b159bab34fb32dd81aad0a1d",
         "path": "root/my_function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {
             "PIG_LATIN": "true",
           },
-          "sourceCodeFile": ".wing/my_function_c85c4e0e.js",
+          "sourceCodeFile": ".wing/my_function_c85c4e0e.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -631,14 +581,14 @@ async handle(event) {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -671,14 +621,6 @@ async handle(event) {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -687,10 +629,22 @@ async handle(event) {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -704,23 +658,10 @@ async handle(event) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -732,8 +673,9 @@ async handle(event) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -744,60 +686,53 @@ async handle(event) {
 
 exports[`invoke function with process.exit(1) 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "Invoke (payload=\\"{}\\").",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_function started",
+  "Error: Process exited with code 1, signal null (Invoke (payload="{}").)",
+  "root/my_function stopped",
 ]
 `;
 
 exports[`invoke function with process.exit(1) 2`] = `
 {
-  ".wing/my_function_c85c4e0e.js": "\\"use strict\\";
+  ".wing/my_function_c85c4e0e.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  
-async handle() {
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => {
   process.exit(1);
 }
-};
-})())({
-
-})).handle(event);
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_function": {
+        "addr": "c85c4e0e66bf385ab6b159bab34fb32dd81aad0a1d",
         "path": "root/my_function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/my_function_c85c4e0e.js",
+          "sourceCodeFile": ".wing/my_function_c85c4e0e.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -808,14 +743,14 @@ async handle() {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -848,14 +783,6 @@ async handle() {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -864,10 +791,22 @@ async handle() {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -881,23 +820,10 @@ async handle() {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -909,8 +835,9 @@ async handle() {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -921,145 +848,147 @@ async handle() {
 
 exports[`runtime environment tests 1`] = `
 {
-  ".wing/function.0_c8d5fca2.js": "\\"use strict\\";
+  ".wing/function.0_c8d5fca2.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => {
+      const query = "q=URLUtils.searchParams&topic=api";
+      const p = new URLSearchParams(query);
+      const value = p.get("topic");
+      if (!value) {
+        throw new Error("URLSearchParams failed");
+      }
+      return value;
     }
-  }
-  async handle() {
-          
-    const query = \\"q=URLUtils.searchParams&topic=api\\";
-    const p = new URLSearchParams(query);
-    return p.get(\\"topic\\");
+  const $ctx = {
   
-        }
-};
-})())({
-
-})).handle(event);
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
-  ".wing/function.1_c89ed254.js": "\\"use strict\\";
+  ".wing/function.1_c89ed254.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() {
-          
-    return typeof fetch;
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => typeof fetch
+  const $ctx = {
   
-        }
-};
-})())({
-
-})).handle(event);
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
-  ".wing/function.2_c8cd6c39.js": "\\"use strict\\";
+  ".wing/function.2_c8cd6c39.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => {
+      const c = require("crypto");
+      return typeof c.createHash;
     }
-  }
-  async handle() {
-          
-    const c = require(\\"crypto\\");
-    return typeof c.createHash;
+  const $ctx = {
   
-        }
-};
-})())({
-
-})).handle(event);
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
-  ".wing/function.3_c8badafa.js": "\\"use strict\\";
+  ".wing/function.3_c8badafa.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => {
+      const { nanoid } = require("nanoid");
+      return nanoid();
     }
-  }
-  async handle() {
-          
-    const { nanoid } = await import(\\"nanoid\\");
-    return nanoid();
+  const $ctx = {
   
-        }
-};
-})())({
-
-})).handle(event);
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function.0": {
+        "addr": "c8d5fca2ff1b96bd65cc21384259b53ae9f3d4971c",
         "path": "root/Function.0",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function.0_c8d5fca2.js",
+          "sourceCodeFile": ".wing/function.0_c8d5fca2.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
+      "root/Function.1": {
+        "addr": "c89ed254f66166d83153cc0a4952a15be63d47b0d2",
         "path": "root/Function.1",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function.1_c89ed254.js",
+          "sourceCodeFile": ".wing/function.1_c89ed254.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
+      "root/Function.2": {
+        "addr": "c8cd6c39da22910102d0cfeb2cb96f2160fa79e517",
         "path": "root/Function.2",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function.2_c8cd6c39.js",
+          "sourceCodeFile": ".wing/function.2_c8cd6c39.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
+      "root/Function.3": {
+        "addr": "c8badafa75a67ff66740e0c5fbbb392ab574b52b3c",
         "path": "root/Function.3",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function.3_c8badafa.js",
+          "sourceCodeFile": ".wing/function.3_c8badafa.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1070,14 +999,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1110,14 +1039,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1126,10 +1047,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1146,7 +1079,7 @@ return class Handler {
         "Function.0": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1158,7 +1091,7 @@ return class Handler {
         "Function.1": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1170,7 +1103,7 @@ return class Handler {
         "Function.2": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1182,7 +1115,7 @@ return class Handler {
         "Function.3": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1191,24 +1124,12 @@ return class Handler {
           "id": "Function.3",
           "path": "root/Function.3",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/immutable-capture.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/immutable-capture.test.ts.snap
index 3d57ddb102e..be36938ae6d 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/immutable-capture.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/immutable-capture.test.ts.snap
@@ -2,52 +2,63 @@
 
 exports[`array 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_capture.length === 2);
+    assert(ctx.my_capture[0] === "hello");
+    assert(ctx.my_capture[1] === "dude");
+    return void 0;
   }
-  async handle() {
-if (!(this.my_capture.length === 2)) { throw new Error(\`assertion failed: \\"this.my_capture.length === 2\\"\`); }
-if (!(this.my_capture[0] === \\"hello\\")) { throw new Error(\`assertion failed: \\"this.my_capture[0] === \\\\\\"hello\\\\\\"\\"\`); }
-if (!(this.my_capture[1] === \\"dude\\")) { throw new Error(\`assertion failed: \\"this.my_capture[1] === \\\\\\"dude\\\\\\"\\"\`); }
-
+  const $ctx = {
+  my_capture: ["hello","dude"]
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_capture: [\\"hello\\",\\"dude\\"]
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -58,14 +69,14 @@ my_capture: [\\"hello\\",\\"dude\\"]
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -98,14 +109,6 @@ my_capture: [\\"hello\\",\\"dude\\"]
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -114,10 +117,22 @@ my_capture: [\\"hello\\",\\"dude\\"]
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -134,7 +149,7 @@ my_capture: [\\"hello\\",\\"dude\\"]
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -143,24 +158,12 @@ my_capture: [\\"hello\\",\\"dude\\"]
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -169,111 +172,65 @@ my_capture: [\\"hello\\",\\"dude\\"]
 }
 `;
 
-exports[`array of buckets 1`] = `
+exports[`array of durations 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_array.length === 2);
+    assert(ctx.my_array[0].minutes === 10);
+    assert(ctx.my_array[1].minutes === 20);
+    return void 0;
   }
-  async handle() {
-await this.my_buckets[0].put(\\"hello.txt\\", \\"world\\");
-const objects = await this.my_buckets[0].list();
-if (!(objects.length === 1)) { throw new Error(\`assertion failed: \\"objects.length === 1\\"\`); }
-if (!(objects[0] === \\"hello.txt\\")) { throw new Error(\`assertion failed: \\"objects[0] === \\\\\\"hello.txt\\\\\\"\\"\`); }
-await this.my_buckets[1].put(\\"foo\\", \\"bar\\");
-if (!(await this.my_buckets[1].get(\\"foo\\") === \\"bar\\")) { throw new Error(\`assertion failed: \\"await this.my_buckets[1].get(\\\\\\"foo\\\\\\") === \\\\\\"bar\\\\\\"\\"\`); }
-
+  const $ctx = {
+  my_array: [(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(600)),(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(1200))]
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_buckets: [(function() {
-  let handle = process.env.BUCKET_HANDLE_4fecd6d0;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_4fecd6d0\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})(),(function() {
-  let handle = process.env.BUCKET_HANDLE_300e8055;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_300e8055\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})()]
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
-    "connections": [
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B1",
-      },
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B2",
-      },
-    ],
+    "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/B1",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
-        "path": "root/B2",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
-          "environmentVariables": {
-            "BUCKET_HANDLE_300e8055": "\${wsim#root/B2#attrs.handle}",
-            "BUCKET_HANDLE_4fecd6d0": "\${wsim#root/B1#attrs.handle}",
-          },
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -284,14 +241,14 @@ my_buckets: [(function() {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -324,14 +281,6 @@ my_buckets: [(function() {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -340,10 +289,22 @@ my_buckets: [(function() {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -357,34 +318,10 @@ my_buckets: [(function() {
   "tree.json": {
     "tree": {
       "children": {
-        "B1": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B1",
-          "path": "root/B1",
-        },
-        "B2": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B2",
-          "path": "root/B2",
-        },
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -393,24 +330,12 @@ my_buckets: [(function() {
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -419,54 +344,64 @@ my_buckets: [(function() {
 }
 `;
 
-exports[`array of durations 1`] = `
+exports[`array of maps 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_array[0].get("foo") === 1);
+    assert(ctx.my_array[1].get("bar") === 4);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_array.length === 2)) { throw new Error(\`assertion failed: \\"this.my_array.length === 2\\"\`); }
-if (!(this.my_array[0].minutes === 10)) { throw new Error(\`assertion failed: \\"this.my_array[0].minutes === 10\\"\`); }
-if (!(this.my_array[1].minutes === 20)) { throw new Error(\`assertion failed: \\"this.my_array[1].minutes === 20\\"\`); }
-
+  const $ctx = {
+  my_array: [new Map([["foo",1],["bar",2]]),new Map([["foo",3],["bar",4]])]
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_array: [{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.16666666666666666,},{\\"seconds\\": 1200,\\"minutes\\": 20,\\"hours\\": 0.3333333333333333,}]
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -477,14 +412,14 @@ my_array: [{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666666666
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -517,14 +452,6 @@ my_array: [{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666666666
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -533,10 +460,22 @@ my_array: [{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666666666
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -553,7 +492,7 @@ my_array: [{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666666666
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -562,24 +501,12 @@ my_array: [{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666666666
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -588,53 +515,63 @@ my_array: [{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666666666
 }
 `;
 
-exports[`array of maps 1`] = `
+exports[`boolean 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_capture === false);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_array[0].get('foo') === 1)) { throw new Error(\`assertion failed: \\"this.my_array[0].get('foo') === 1\\"\`); }
-if (!(this.my_array[1].get('bar') === 4)) { throw new Error(\`assertion failed: \\"this.my_array[1].get('bar') === 4\\"\`); }
-
+  const $ctx = {
+  my_capture: false
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_array: [new Map([[\\"foo\\",1],[\\"bar\\",2]]),new Map([[\\"foo\\",3],[\\"bar\\",4]])]
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -645,14 +582,14 @@ my_array: [new Map([[\\"foo\\",1],[\\"bar\\",2]]),new Map([[\\"foo\\",3],[\\"bar
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -685,14 +622,6 @@ my_array: [new Map([[\\"foo\\",1],[\\"bar\\",2]]),new Map([[\\"foo\\",3],[\\"bar
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -701,10 +630,22 @@ my_array: [new Map([[\\"foo\\",1],[\\"bar\\",2]]),new Map([[\\"foo\\",3],[\\"bar
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -721,7 +662,7 @@ my_array: [new Map([[\\"foo\\",1],[\\"bar\\",2]]),new Map([[\\"foo\\",3],[\\"bar
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -730,24 +671,12 @@ my_array: [new Map([[\\"foo\\",1],[\\"bar\\",2]]),new Map([[\\"foo\\",3],[\\"bar
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -756,52 +685,65 @@ my_array: [new Map([[\\"foo\\",1],[\\"bar\\",2]]),new Map([[\\"foo\\",3],[\\"bar
 }
 `;
 
-exports[`boolean 1`] = `
+exports[`duration 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_capture.minutes === 120);
+    assert(ctx.my_capture.seconds === 7200);
+    assert(ctx.my_capture.hours === 2);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_capture === false)) { throw new Error(\`assertion failed: \\"this.my_capture === false\\"\`); }
-
+  const $ctx = {
+  my_capture: (new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(7200))
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_capture: false
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -812,14 +754,14 @@ my_capture: false
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -852,14 +794,6 @@ my_capture: false
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -868,10 +802,22 @@ my_capture: false
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -888,7 +834,7 @@ my_capture: false
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -897,24 +843,12 @@ my_capture: false
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -923,54 +857,67 @@ my_capture: false
 }
 `;
 
-exports[`duration 1`] = `
+exports[`map 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_capture.has("foo"));
+    assert(ctx.my_capture.has("bar"));
+    assert(ctx.my_capture.size === 2);
+    assert(ctx.my_capture.get("foo") === 123);
+    assert(ctx.my_capture.get("bar") === 456);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_capture.minutes === 120)) { throw new Error(\`assertion failed: \\"this.my_capture.minutes === 120\\"\`); }
-if (!(this.my_capture.seconds === 7200)) { throw new Error(\`assertion failed: \\"this.my_capture.seconds === 7200\\"\`); }
-if (!(this.my_capture.hours === 2)) { throw new Error(\`assertion failed: \\"this.my_capture.hours === 2\\"\`); }
-
+  const $ctx = {
+  my_capture: new Map([["foo",123],["bar",456]])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_capture: {\\"seconds\\": 7200,\\"minutes\\": 120,\\"hours\\": 2,}
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -981,14 +928,14 @@ my_capture: {\\"seconds\\": 7200,\\"minutes\\": 120,\\"hours\\": 2,}
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1021,14 +968,6 @@ my_capture: {\\"seconds\\": 7200,\\"minutes\\": 120,\\"hours\\": 2,}
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1037,10 +976,22 @@ my_capture: {\\"seconds\\": 7200,\\"minutes\\": 120,\\"hours\\": 2,}
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1057,7 +1008,7 @@ my_capture: {\\"seconds\\": 7200,\\"minutes\\": 120,\\"hours\\": 2,}
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1066,24 +1017,12 @@ my_capture: {\\"seconds\\": 7200,\\"minutes\\": 120,\\"hours\\": 2,}
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1092,56 +1031,69 @@ my_capture: {\\"seconds\\": 7200,\\"minutes\\": 120,\\"hours\\": 2,}
 }
 `;
 
-exports[`map 1`] = `
+exports[`map of arrays 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_map.has("foo"));
+    assert(ctx.my_map.has("bar"));
+    assert(ctx.my_map.size === 2);
+    assert(ctx.my_map.get("foo")?.[0] === 1);
+    assert(ctx.my_map.get("foo")?.[1] === 2);
+    assert(ctx.my_map.get("bar")?.[0] === 3);
+    assert(ctx.my_map.get("bar")?.[1] === 4);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_capture.has(\\"foo\\"))) { throw new Error(\`assertion failed: \\"this.my_capture.has(\\\\\\"foo\\\\\\")\\"\`); }
-if (!(this.my_capture.has(\\"bar\\"))) { throw new Error(\`assertion failed: \\"this.my_capture.has(\\\\\\"bar\\\\\\")\\"\`); }
-if (!(this.my_capture.size === 2)) { throw new Error(\`assertion failed: \\"this.my_capture.size === 2\\"\`); }
-if (!(this.my_capture.get(\\"foo\\") === 123)) { throw new Error(\`assertion failed: \\"this.my_capture.get(\\\\\\"foo\\\\\\") === 123\\"\`); }
-if (!(this.my_capture.get(\\"bar\\") === 456)) { throw new Error(\`assertion failed: \\"this.my_capture.get(\\\\\\"bar\\\\\\") === 456\\"\`); }
-
+  const $ctx = {
+  my_map: new Map([["foo",[1,2]],["bar",[3,4]]])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_capture: new Map([[\\"foo\\",123],[\\"bar\\",456]])
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1152,14 +1104,14 @@ my_capture: new Map([[\\"foo\\",123],[\\"bar\\",456]])
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1192,14 +1144,6 @@ my_capture: new Map([[\\"foo\\",123],[\\"bar\\",456]])
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1208,10 +1152,22 @@ my_capture: new Map([[\\"foo\\",123],[\\"bar\\",456]])
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1228,7 +1184,7 @@ my_capture: new Map([[\\"foo\\",123],[\\"bar\\",456]])
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1237,24 +1193,12 @@ my_capture: new Map([[\\"foo\\",123],[\\"bar\\",456]])
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1263,58 +1207,66 @@ my_capture: new Map([[\\"foo\\",123],[\\"bar\\",456]])
 }
 `;
 
-exports[`map of arrays 1`] = `
+exports[`map of arrays of durations 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_map.get("foo")?.[0].minutes === 10);
+    assert(ctx.my_map.get("foo")?.[1].seconds === 20 * 60);
+    assert(ctx.my_map.get("bar")?.[0].minutes === 30);
+    assert(ctx.my_map.get("bar")?.[1].seconds === 40 * 60);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_map.has(\\"foo\\"))) { throw new Error(\`assertion failed: \\"this.my_map.has(\\\\\\"foo\\\\\\")\\"\`); }
-if (!(this.my_map.has(\\"bar\\"))) { throw new Error(\`assertion failed: \\"this.my_map.has(\\\\\\"bar\\\\\\")\\"\`); }
-if (!(this.my_map.size === 2)) { throw new Error(\`assertion failed: \\"this.my_map.size === 2\\"\`); }
-if (!(this.my_map.get(\\"foo\\")[0] === 1)) { throw new Error(\`assertion failed: \\"this.my_map.get(\\\\\\"foo\\\\\\")[0] === 1\\"\`); }
-if (!(this.my_map.get(\\"foo\\")[1] === 2)) { throw new Error(\`assertion failed: \\"this.my_map.get(\\\\\\"foo\\\\\\")[1] === 2\\"\`); }
-if (!(this.my_map.get(\\"bar\\")[0] === 3)) { throw new Error(\`assertion failed: \\"this.my_map.get(\\\\\\"bar\\\\\\")[0] === 3\\"\`); }
-if (!(this.my_map.get(\\"bar\\")[1] === 4)) { throw new Error(\`assertion failed: \\"this.my_map.get(\\\\\\"bar\\\\\\")[1] === 4\\"\`); }
-
+  const $ctx = {
+  my_map: new Map([["foo",[(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(600)),(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(1200))]],["bar",[(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(1800)),(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(2400))]]])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_map: new Map([[\\"foo\\",[1,2]],[\\"bar\\",[3,4]]])
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1325,14 +1277,14 @@ my_map: new Map([[\\"foo\\",[1,2]],[\\"bar\\",[3,4]]])
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1365,14 +1317,6 @@ my_map: new Map([[\\"foo\\",[1,2]],[\\"bar\\",[3,4]]])
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1381,10 +1325,22 @@ my_map: new Map([[\\"foo\\",[1,2]],[\\"bar\\",[3,4]]])
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1401,7 +1357,7 @@ my_map: new Map([[\\"foo\\",[1,2]],[\\"bar\\",[3,4]]])
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1410,24 +1366,12 @@ my_map: new Map([[\\"foo\\",[1,2]],[\\"bar\\",[3,4]]])
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1436,55 +1380,63 @@ my_map: new Map([[\\"foo\\",[1,2]],[\\"bar\\",[3,4]]])
 }
 `;
 
-exports[`map of arrays of durations 1`] = `
+exports[`number 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_capture + 20 === 143);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_map.get('foo')[0].minutes === 10)) { throw new Error(\`assertion failed: \\"this.my_map.get('foo')[0].minutes === 10\\"\`); }
-if (!(this.my_map.get('foo')[1].seconds === 20 * 60)) { throw new Error(\`assertion failed: \\"this.my_map.get('foo')[1].seconds === 20 * 60\\"\`); }
-if (!(this.my_map.get('bar')[0].minutes === 30)) { throw new Error(\`assertion failed: \\"this.my_map.get('bar')[0].minutes === 30\\"\`); }
-if (!(this.my_map.get('bar')[1].seconds === 40 * 60)) { throw new Error(\`assertion failed: \\"this.my_map.get('bar')[1].seconds === 40 * 60\\"\`); }
-
+  const $ctx = {
+  my_capture: 123
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_map: new Map([[\\"foo\\",[{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.16666666666666666,},{\\"seconds\\": 1200,\\"minutes\\": 20,\\"hours\\": 0.3333333333333333,}]],[\\"bar\\",[{\\"seconds\\": 1800,\\"minutes\\": 30,\\"hours\\": 0.5,},{\\"seconds\\": 2400,\\"minutes\\": 40,\\"hours\\": 0.6666666666666666,}]]])
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1495,14 +1447,14 @@ my_map: new Map([[\\"foo\\",[{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\":
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1535,14 +1487,6 @@ my_map: new Map([[\\"foo\\",[{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\":
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1551,10 +1495,22 @@ my_map: new Map([[\\"foo\\",[{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\":
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1571,7 +1527,7 @@ my_map: new Map([[\\"foo\\",[{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\":
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -1580,24 +1536,12 @@ my_map: new Map([[\\"foo\\",[{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\":
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1606,108 +1550,66 @@ my_map: new Map([[\\"foo\\",[{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\":
 }
 `;
 
-exports[`map of buckets 1`] = `
+exports[`set 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+      assert(ctx.my_capture.has("boom"));
+      assert(ctx.my_capture.has("bam"));
+      assert(ctx.my_capture.has("bang"));
+      assert(ctx.my_capture.size === 3);
+      return void 0;
     }
-  }
-  async handle() {
-const foo = this.my_map.get(\\"foo\\");
-await foo.put(\\"hello.txt\\", \\"world\\");
-if (!(await foo.get(\\"hello.txt\\") === \\"world\\")) { throw new Error(\`assertion failed: \\"await foo.get(\\\\\\"hello.txt\\\\\\") === \\\\\\"world\\\\\\"\\"\`); }
-
+  const $ctx = {
+  my_capture: new Set(["boom","bam","bang"])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_map: new Map([[\\"foo\\",(function() {
-  let handle = process.env.BUCKET_HANDLE_4fecd6d0;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_4fecd6d0\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})()],[\\"bar\\",(function() {
-  let handle = process.env.BUCKET_HANDLE_300e8055;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_300e8055\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})()]])
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
-    "connections": [
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B1",
-      },
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B2",
-      },
-    ],
+    "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/B1",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
-        "path": "root/B2",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
-          "environmentVariables": {
-            "BUCKET_HANDLE_300e8055": "\${wsim#root/B2#attrs.handle}",
-            "BUCKET_HANDLE_4fecd6d0": "\${wsim#root/B1#attrs.handle}",
-          },
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1718,14 +1620,14 @@ my_map: new Map([[\\"foo\\",(function() {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1758,14 +1660,6 @@ my_map: new Map([[\\"foo\\",(function() {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1774,10 +1668,22 @@ my_map: new Map([[\\"foo\\",(function() {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1791,397 +1697,24 @@ my_map: new Map([[\\"foo\\",(function() {
   "tree.json": {
     "tree": {
       "children": {
-        "B1": {
+        "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
+            "description": "A cloud function (FaaS)",
+            "title": "Function",
           },
-          "id": "B1",
-          "path": "root/B1",
-        },
-        "B2": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B2",
-          "path": "root/B2",
-        },
-        "Function": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud function (FaaS)",
-            "title": "Function",
-          },
-          "id": "Function",
-          "path": "root/Function",
-        },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
-      },
-      "constructInfo": {
-        "fqn": "constructs.Construct",
-        "version": "10.2.70",
-      },
-      "id": "root",
-      "path": "root",
-    },
-    "version": "tree-0.1",
-  },
-}
-`;
-
-exports[`number 1`] = `
-{
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
-exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() {
-if (!(this.my_capture + 20 === 143)) { throw new Error(\`assertion failed: \\"this.my_capture + 20 === 143\\"\`); }
-
-}
-};
-})())({
-my_capture: 123
-})).handle(event);
-};",
-  "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/Function",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-    ],
-    "sdkVersion": "0.0.0",
-    "types": {
-      "@winglang/sdk.cloud.Api": {
-        "className": "Api",
-        "sourcePath": "<ABSOLUTE PATH>/api.inflight.js",
-      },
-      "@winglang/sdk.cloud.Bucket": {
-        "className": "Bucket",
-        "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
-      },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
-      "@winglang/sdk.cloud.Domain": {
-        "className": "Domain",
-        "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
-      },
-      "@winglang/sdk.cloud.Function": {
-        "className": "Function",
-        "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
-      },
-      "@winglang/sdk.cloud.OnDeploy": {
-        "className": "OnDeploy",
-        "sourcePath": "<ABSOLUTE PATH>/on-deploy.inflight.js",
-      },
-      "@winglang/sdk.cloud.Queue": {
-        "className": "Queue",
-        "sourcePath": "<ABSOLUTE PATH>/queue.inflight.js",
-      },
-      "@winglang/sdk.cloud.Schedule": {
-        "className": "Schedule",
-        "sourcePath": "<ABSOLUTE PATH>/schedule.inflight.js",
-      },
-      "@winglang/sdk.cloud.Secret": {
-        "className": "Secret",
-        "sourcePath": "<ABSOLUTE PATH>/secret.inflight.js",
-      },
-      "@winglang/sdk.cloud.Service": {
-        "className": "Service",
-        "sourcePath": "<ABSOLUTE PATH>/service.inflight.js",
-      },
-      "@winglang/sdk.cloud.Topic": {
-        "className": "Topic",
-        "sourcePath": "<ABSOLUTE PATH>/topic.inflight.js",
-      },
-      "@winglang/sdk.cloud.Website": {
-        "className": "Website",
-        "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
-      },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
-      "@winglang/sdk.ex.Redis": {
-        "className": "Redis",
-        "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
-      },
-      "@winglang/sdk.ex.Table": {
-        "className": "Table",
-        "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
-      },
-      "@winglang/sdk.sim.EventMapping": {
-        "className": "EventMapping",
-        "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
-      },
-      "@winglang/sdk.sim.State": {
-        "className": "State",
-        "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
-      },
-      "@winglang/sdk.std.TestRunner": {
-        "className": "TestRunner",
-        "sourcePath": "<ABSOLUTE PATH>/test-runner.inflight.js",
-      },
-    },
-  },
-  "tree.json": {
-    "tree": {
-      "children": {
-        "Function": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud function (FaaS)",
-            "title": "Function",
-          },
-          "id": "Function",
-          "path": "root/Function",
-        },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
-      },
-      "constructInfo": {
-        "fqn": "constructs.Construct",
-        "version": "10.2.70",
-      },
-      "id": "root",
-      "path": "root",
-    },
-    "version": "tree-0.1",
-  },
-}
-`;
-
-exports[`set 1`] = `
-{
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
-exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() {
-if (!(this.my_capture.has(\\"boom\\"))) { throw new Error(\`assertion failed: \\"this.my_capture.has(\\\\\\"boom\\\\\\")\\"\`); }
-if (!(this.my_capture.has(\\"bam\\"))) { throw new Error(\`assertion failed: \\"this.my_capture.has(\\\\\\"bam\\\\\\")\\"\`); }
-if (!(this.my_capture.has(\\"bang\\"))) { throw new Error(\`assertion failed: \\"this.my_capture.has(\\\\\\"bang\\\\\\")\\"\`); }
-if (!(this.my_capture.size === 3)) { throw new Error(\`assertion failed: \\"this.my_capture.size === 3\\"\`); }
-
-}
-};
-})())({
-my_capture: new Set([\\"boom\\",\\"bam\\",\\"bang\\"])
-})).handle(event);
-};",
-  "connections.json": {
-    "connections": [],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/Function",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-    ],
-    "sdkVersion": "0.0.0",
-    "types": {
-      "@winglang/sdk.cloud.Api": {
-        "className": "Api",
-        "sourcePath": "<ABSOLUTE PATH>/api.inflight.js",
-      },
-      "@winglang/sdk.cloud.Bucket": {
-        "className": "Bucket",
-        "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
-      },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
-      "@winglang/sdk.cloud.Domain": {
-        "className": "Domain",
-        "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
-      },
-      "@winglang/sdk.cloud.Function": {
-        "className": "Function",
-        "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
-      },
-      "@winglang/sdk.cloud.OnDeploy": {
-        "className": "OnDeploy",
-        "sourcePath": "<ABSOLUTE PATH>/on-deploy.inflight.js",
-      },
-      "@winglang/sdk.cloud.Queue": {
-        "className": "Queue",
-        "sourcePath": "<ABSOLUTE PATH>/queue.inflight.js",
-      },
-      "@winglang/sdk.cloud.Schedule": {
-        "className": "Schedule",
-        "sourcePath": "<ABSOLUTE PATH>/schedule.inflight.js",
-      },
-      "@winglang/sdk.cloud.Secret": {
-        "className": "Secret",
-        "sourcePath": "<ABSOLUTE PATH>/secret.inflight.js",
-      },
-      "@winglang/sdk.cloud.Service": {
-        "className": "Service",
-        "sourcePath": "<ABSOLUTE PATH>/service.inflight.js",
-      },
-      "@winglang/sdk.cloud.Topic": {
-        "className": "Topic",
-        "sourcePath": "<ABSOLUTE PATH>/topic.inflight.js",
-      },
-      "@winglang/sdk.cloud.Website": {
-        "className": "Website",
-        "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
-      },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
-      "@winglang/sdk.ex.Redis": {
-        "className": "Redis",
-        "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
-      },
-      "@winglang/sdk.ex.Table": {
-        "className": "Table",
-        "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
-      },
-      "@winglang/sdk.sim.EventMapping": {
-        "className": "EventMapping",
-        "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
-      },
-      "@winglang/sdk.sim.State": {
-        "className": "State",
-        "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
-      },
-      "@winglang/sdk.std.TestRunner": {
-        "className": "TestRunner",
-        "sourcePath": "<ABSOLUTE PATH>/test-runner.inflight.js",
-      },
-    },
-  },
-  "tree.json": {
-    "tree": {
-      "children": {
-        "Function": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud function (FaaS)",
-            "title": "Function",
-          },
-          "id": "Function",
-          "path": "root/Function",
-        },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
+          "id": "Function",
+          "path": "root/Function",
         },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -2192,52 +1725,63 @@ my_capture: new Set([\\"boom\\",\\"bam\\",\\"bang\\"])
 
 exports[`set of durations 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(Array.from(ctx.my_set)[0].minutes === 10);
+    assert(Array.from(ctx.my_set)[0].hours === 0.16666666666666666);
+    assert(Array.from(ctx.my_set)[1].seconds === 1200);
+    return void 0;
   }
-  async handle() {
-if (!(Array.from(this.my_set)[0].minutes === 10)) { throw new Error(\`assertion failed: \\"Array.from(this.my_set)[0].minutes === 10\\"\`); }
-if (!(Array.from(this.my_set)[0].hours === 0.16666666666666666)) { throw new Error(\`assertion failed: \\"Array.from(this.my_set)[0].hours === 0.16666666666666666\\"\`); }
-if (!(Array.from(this.my_set)[1].seconds === 1200)) { throw new Error(\`assertion failed: \\"Array.from(this.my_set)[1].seconds === 1200\\"\`); }
-
+  const $ctx = {
+  my_set: new Set([(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(600)),(new (require("[REDACTED]/wingsdk/src/std/duration.js").Duration)(1200))])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_set: new Set([{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.16666666666666666,},{\\"seconds\\": 1200,\\"minutes\\": 20,\\"hours\\": 0.3333333333333333,}])
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2248,14 +1792,14 @@ my_set: new Set([{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2288,14 +1832,6 @@ my_set: new Set([{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2304,10 +1840,22 @@ my_set: new Set([{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -2324,7 +1872,7 @@ my_set: new Set([{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -2333,24 +1881,12 @@ my_set: new Set([{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -2361,51 +1897,62 @@ my_set: new Set([{\\"seconds\\": 600,\\"minutes\\": 10,\\"hours\\": 0.1666666666
 
 exports[`string 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_capture.length === 11);
+    assert(ctx.my_capture === "bam bam bam");
+    return void 0;
   }
-  async handle() {
-if (!(this.my_capture.length === 11)) { throw new Error(\`assertion failed: \\"this.my_capture.length === 11\\"\`); }
-if (!(this.my_capture === \\"bam bam bam\\")) { throw new Error(\`assertion failed: \\"this.my_capture === \\\\\\"bam bam bam\\\\\\"\\"\`); }
-
+  const $ctx = {
+  my_capture: "bam bam bam"
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_capture: \\"bam bam bam\\"
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2416,14 +1963,14 @@ my_capture: \\"bam bam bam\\"
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2456,14 +2003,6 @@ my_capture: \\"bam bam bam\\"
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2472,10 +2011,22 @@ my_capture: \\"bam bam bam\\"
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -2492,7 +2043,7 @@ my_capture: \\"bam bam bam\\"
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -2501,24 +2052,12 @@ my_capture: \\"bam bam bam\\"
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -2529,53 +2068,64 @@ my_capture: \\"bam bam bam\\"
 
 exports[`struct 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_capture.hello === "dude");
+    assert(ctx.my_capture.world === "cup");
+    assert(ctx.my_capture.foo === "bar");
+    assert(Object.keys(ctx.my_capture).length === 3);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_capture.hello === \\"dude\\")) { throw new Error(\`assertion failed: \\"this.my_capture.hello === \\\\\\"dude\\\\\\"\\"\`); }
-if (!(this.my_capture.world === \\"cup\\")) { throw new Error(\`assertion failed: \\"this.my_capture.world === \\\\\\"cup\\\\\\"\\"\`); }
-if (!(this.my_capture.foo === \\"bar\\")) { throw new Error(\`assertion failed: \\"this.my_capture.foo === \\\\\\"bar\\\\\\"\\"\`); }
-if (!(Object.keys(this.my_capture).length === 3)) { throw new Error(\`assertion failed: \\"Object.keys(this.my_capture).length === 3\\"\`); }
-
+  const $ctx = {
+  my_capture: {"hello": "dude","world": "cup","foo": "bar",}
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_capture: {\\"hello\\": \\"dude\\",\\"world\\": \\"cup\\",\\"foo\\": \\"bar\\",}
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2586,14 +2136,14 @@ my_capture: {\\"hello\\": \\"dude\\",\\"world\\": \\"cup\\",\\"foo\\": \\"bar\\"
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2626,14 +2176,6 @@ my_capture: {\\"hello\\": \\"dude\\",\\"world\\": \\"cup\\",\\"foo\\": \\"bar\\"
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2642,10 +2184,22 @@ my_capture: {\\"hello\\": \\"dude\\",\\"world\\": \\"cup\\",\\"foo\\": \\"bar\\"
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -2662,7 +2216,7 @@ my_capture: {\\"hello\\": \\"dude\\",\\"world\\": \\"cup\\",\\"foo\\": \\"bar\\"
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -2671,24 +2225,12 @@ my_capture: {\\"hello\\": \\"dude\\",\\"world\\": \\"cup\\",\\"foo\\": \\"bar\\"
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -2699,53 +2241,64 @@ my_capture: {\\"hello\\": \\"dude\\",\\"world\\": \\"cup\\",\\"foo\\": \\"bar\\"
 
 exports[`struct of maps 1`] = `
 {
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
+  ".wing/function_c8e6b4af.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return void 0;
+      }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (ctx, assert) => {
+    assert(ctx.my_struct.foo.get("foo") === 1);
+    assert(ctx.my_struct.foo.get("bar") === 2);
+    assert(ctx.my_struct.bar.get("foo") === 3);
+    assert(ctx.my_struct.bar.get("bar") === 4);
+    return void 0;
   }
-  async handle() {
-if (!(this.my_struct.foo.get('foo') === 1)) { throw new Error(\`assertion failed: \\"this.my_struct.foo.get('foo') === 1\\"\`); }
-if (!(this.my_struct.foo.get('bar') === 2)) { throw new Error(\`assertion failed: \\"this.my_struct.foo.get('bar') === 2\\"\`); }
-if (!(this.my_struct.bar.get('foo') === 3)) { throw new Error(\`assertion failed: \\"this.my_struct.bar.get('foo') === 3\\"\`); }
-if (!(this.my_struct.bar.get('bar') === 4)) { throw new Error(\`assertion failed: \\"this.my_struct.bar.get('bar') === 4\\"\`); }
-
+  const $ctx = {
+  my_struct: {"foo": new Map([["foo",1],["bar",2]]),"bar": new Map([["foo",3],["bar",4]]),}
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_struct: {\\"foo\\": new Map([[\\"foo\\",1],[\\"bar\\",2]]),\\"bar\\": new Map([[\\"foo\\",3],[\\"bar\\",4]]),}
-})).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/Function": {
+        "addr": "c8e6b4af896782ab4057ebb2193266e56b0b6dfeb0",
         "path": "root/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
+          "sourceCodeFile": ".wing/function_c8e6b4af.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -2756,14 +2309,14 @@ my_struct: {\\"foo\\": new Map([[\\"foo\\",1],[\\"bar\\",2]]),\\"bar\\": new Map
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -2796,14 +2349,6 @@ my_struct: {\\"foo\\": new Map([[\\"foo\\",1],[\\"bar\\",2]]),\\"bar\\": new Map
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -2812,315 +2357,21 @@ my_struct: {\\"foo\\": new Map([[\\"foo\\",1],[\\"bar\\",2]]),\\"bar\\": new Map
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
-      "@winglang/sdk.sim.State": {
-        "className": "State",
-        "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
-      },
-      "@winglang/sdk.std.TestRunner": {
-        "className": "TestRunner",
-        "sourcePath": "<ABSOLUTE PATH>/test-runner.inflight.js",
-      },
-    },
-  },
-  "tree.json": {
-    "tree": {
-      "children": {
-        "Function": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud function (FaaS)",
-            "title": "Function",
-          },
-          "id": "Function",
-          "path": "root/Function",
-        },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
-      },
-      "constructInfo": {
-        "fqn": "constructs.Construct",
-        "version": "10.2.70",
-      },
-      "id": "root",
-      "path": "root",
-    },
-    "version": "tree-0.1",
-  },
-}
-`;
-
-exports[`struct with resources 1`] = `
-{
-  ".wing/function_c8e6b4af.js": "\\"use strict\\";
-exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() {
-const b = this.my_struct.bucky;
-await b.put(\\"hello.txt\\", \\"world\\");
-if (!(await b.get(\\"hello.txt\\") === \\"world\\")) { throw new Error(\`assertion failed: \\"await b.get(\\\\\\"hello.txt\\\\\\") === \\\\\\"world\\\\\\"\\"\`); }
-const boom = this.my_struct.arry.boom[1];
-if (!((await boom.list()).length === 0)) { throw new Error(\`assertion failed: \\"(await boom.list()).length === 0\\"\`); }
-const bar = this.my_struct.mapy.get(\\"bar\\");
-await bar.put(\\"foo\\", \\"bar\\");
-if (!(await bar.get(\\"foo\\") === \\"bar\\")) { throw new Error(\`assertion failed: \\"await bar.get(\\\\\\"foo\\\\\\") === \\\\\\"bar\\\\\\"\\"\`); }
-
-}
-};
-})())({
-my_struct: {\\"bucky\\": (function() {
-  let handle = process.env.BUCKET_HANDLE_4fecd6d0;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_4fecd6d0\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})(),\\"mapy\\": new Map([[\\"foo\\",(function() {
-  let handle = process.env.BUCKET_HANDLE_300e8055;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_300e8055\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})()],[\\"bar\\",(function() {
-  let handle = process.env.BUCKET_HANDLE_0120daf4;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_0120daf4\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})()]]),\\"arry\\": {\\"boom\\": [(function() {
-  let handle = process.env.BUCKET_HANDLE_ea7944ef;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_ea7944ef\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})(),(function() {
-  let handle = process.env.BUCKET_HANDLE_1d7ab674;
-  if (!handle) {
-    throw new Error(\\"Missing environment variable: BUCKET_HANDLE_1d7ab674\\");
-  }
-  const simulatorUrl = process.env.WING_SIMULATOR_URL;
-  if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
-  }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})()],},}
-})).handle(event);
-};",
-  "connections.json": {
-    "connections": [
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B1",
-      },
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B2",
-      },
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B3",
-      },
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B4",
-      },
-      {
-        "name": "$inflight_init()",
-        "source": "root/Function",
-        "target": "root/B5",
-      },
-    ],
-    "version": "connections-0.1",
-  },
-  "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/B1",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
-        "path": "root/B2",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
-        "path": "root/B3",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
-        "path": "root/B4",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
-        "path": "root/B5",
-        "props": {
-          "initialObjects": {},
-          "public": false,
-          "topics": {},
-        },
-        "type": "@winglang/sdk.cloud.Bucket",
-      },
-      {
-        "attrs": {},
-        "path": "root/Function",
-        "props": {
-          "environmentVariables": {
-            "BUCKET_HANDLE_0120daf4": "\${wsim#root/B3#attrs.handle}",
-            "BUCKET_HANDLE_1d7ab674": "\${wsim#root/B5#attrs.handle}",
-            "BUCKET_HANDLE_300e8055": "\${wsim#root/B2#attrs.handle}",
-            "BUCKET_HANDLE_4fecd6d0": "\${wsim#root/B1#attrs.handle}",
-            "BUCKET_HANDLE_ea7944ef": "\${wsim#root/B4#attrs.handle}",
-          },
-          "sourceCodeFile": ".wing/function_c8e6b4af.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-    ],
-    "sdkVersion": "0.0.0",
-    "types": {
-      "@winglang/sdk.cloud.Api": {
-        "className": "Api",
-        "sourcePath": "<ABSOLUTE PATH>/api.inflight.js",
-      },
-      "@winglang/sdk.cloud.Bucket": {
-        "className": "Bucket",
-        "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
-      },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
-      "@winglang/sdk.cloud.Domain": {
-        "className": "Domain",
-        "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
-      },
-      "@winglang/sdk.cloud.Function": {
-        "className": "Function",
-        "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
-      },
-      "@winglang/sdk.cloud.OnDeploy": {
-        "className": "OnDeploy",
-        "sourcePath": "<ABSOLUTE PATH>/on-deploy.inflight.js",
-      },
-      "@winglang/sdk.cloud.Queue": {
-        "className": "Queue",
-        "sourcePath": "<ABSOLUTE PATH>/queue.inflight.js",
-      },
-      "@winglang/sdk.cloud.Schedule": {
-        "className": "Schedule",
-        "sourcePath": "<ABSOLUTE PATH>/schedule.inflight.js",
-      },
-      "@winglang/sdk.cloud.Secret": {
-        "className": "Secret",
-        "sourcePath": "<ABSOLUTE PATH>/secret.inflight.js",
-      },
-      "@winglang/sdk.cloud.Service": {
-        "className": "Service",
-        "sourcePath": "<ABSOLUTE PATH>/service.inflight.js",
-      },
-      "@winglang/sdk.cloud.Topic": {
-        "className": "Topic",
-        "sourcePath": "<ABSOLUTE PATH>/topic.inflight.js",
-      },
-      "@winglang/sdk.cloud.Website": {
-        "className": "Website",
-        "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
-      },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
       },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
-      "@winglang/sdk.ex.Redis": {
-        "className": "Redis",
-        "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
-      },
-      "@winglang/sdk.ex.Table": {
-        "className": "Table",
-        "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
-      },
-      "@winglang/sdk.sim.EventMapping": {
-        "className": "EventMapping",
-        "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
       },
       "@winglang/sdk.sim.State": {
         "className": "State",
@@ -3135,70 +2386,10 @@ my_struct: {\\"bucky\\": (function() {
   "tree.json": {
     "tree": {
       "children": {
-        "B1": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B1",
-          "path": "root/B1",
-        },
-        "B2": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B2",
-          "path": "root/B2",
-        },
-        "B3": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B3",
-          "path": "root/B3",
-        },
-        "B4": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B4",
-          "path": "root/B4",
-        },
-        "B5": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud object store",
-            "title": "Bucket",
-          },
-          "id": "B5",
-          "path": "root/B5",
-        },
         "Function": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud function (FaaS)",
@@ -3207,24 +2398,12 @@ my_struct: {\\"bucky\\": (function() {
           "id": "Function",
           "path": "root/Function",
         },
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/on-deploy.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/on-deploy.test.ts.snap
index 2482282b40a..4a279b8552a 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/on-deploy.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/on-deploy.test.ts.snap
@@ -2,55 +2,54 @@
 
 exports[`create an OnDeploy 1`] = `
 {
-  ".wing/function_c83fbf14.js": "\\"use strict\\";
+  ".wing/function_c83fbf14.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() { console.log(\\"super duper success\\"); }
-};
-})())({
-
-})).handle(event);
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => console.log("super duper success")
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_on_deploy": {
+        "addr": "c8e2618b976544550a8396a3817f0bad07099f7050",
+        "deps": [
+          "root/my_on_deploy/Function",
+        ],
+        "path": "root/my_on_deploy",
         "props": {
-          "tests": {},
+          "functionHandle": "\${wsim#root/my_on_deploy/Function#attrs.handle}",
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.cloud.OnDeploy",
       },
-      {
-        "attrs": {},
+      "root/my_on_deploy/Function": {
+        "addr": "c83fbf14da06343c694e42a8758f43bcb1f1c2c389",
         "path": "root/my_on_deploy/Function",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/function_c83fbf14.js",
+          "sourceCodeFile": ".wing/function_c83fbf14.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/my_on_deploy",
-        "props": {
-          "functionHandle": "\${wsim#root/my_on_deploy/Function#attrs.handle}",
-        },
-        "type": "@winglang/sdk.cloud.OnDeploy",
-      },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -61,14 +60,14 @@ return class Handler {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -101,14 +100,6 @@ return class Handler {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -117,10 +108,22 @@ return class Handler {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -134,25 +137,12 @@ return class Handler {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_on_deploy": {
           "children": {
             "Function": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -165,7 +155,7 @@ return class Handler {
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "Run code during the app's deployment.",
@@ -177,8 +167,9 @@ return class Handler {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -189,14 +180,12 @@ return class Handler {
 
 exports[`create an OnDeploy 2`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
+  "root/my_on_deploy/Function started",
   "super duper success",
-  "Invoke (payload=\\"\\").",
+  "Invoke (payload=undefined).",
   "OnDeploy invoked.",
-  "@winglang/sdk.cloud.OnDeploy created.",
-  "@winglang/sdk.cloud.OnDeploy deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_on_deploy started",
+  "root/my_on_deploy stopped",
+  "root/my_on_deploy/Function stopped",
 ]
 `;
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/queue.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/queue.test.ts.snap
index a8518dca6ef..21df1d0e50b 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/queue.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/queue.test.ts.snap
@@ -1,23 +1,15 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`create a queue 2`] = `
+exports[`create a queue 1`] = `
 {
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_queue": {
+        "addr": "c8dee4ef24593d08aa22e8845be36d0ee754fcf4cd",
         "path": "root/my_queue",
         "props": {
           "retentionPeriod": 3600,
@@ -25,7 +17,16 @@ exports[`create a queue 2`] = `
         },
         "type": "@winglang/sdk.cloud.Queue",
       },
-    ],
+      "root/my_queue/Policy": {
+        "addr": "c88a4c68047871c2d322479c886423828e8119d85c",
+        "path": "root/my_queue/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_queue#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -36,14 +37,14 @@ exports[`create a queue 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -76,14 +77,6 @@ exports[`create a queue 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -92,10 +85,22 @@ exports[`create a queue 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -109,23 +114,25 @@ exports[`create a queue 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_queue": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_queue/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed message queue",
@@ -137,8 +144,9 @@ exports[`create a queue 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -149,26 +157,25 @@ exports[`create a queue 2`] = `
 
 exports[`messages are not requeued if the function fails before timeout 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
   "@winglang/sdk.cloud.Function created.",
   "@winglang/sdk.cloud.Queue created.",
   "@winglang/sdk.sim.EventMapping created.",
   "Push (messages=BAD MESSAGE).",
-  "Sending messages (messages=[\\"BAD MESSAGE\\"], subscriber=sim-1).",
+  "Sending messages (messages=[\\"BAD MESSAGE\\"], subscriber=sim-0).",
   "Invoke (payload=\\"{\\\\\\"messages\\\\\\":[\\\\\\"BAD MESSAGE\\\\\\"]}\\").",
   "Subscriber error - returning 1 messages to queue: ERROR",
   "@winglang/sdk.sim.EventMapping deleted.",
   "@winglang/sdk.cloud.Queue deleted.",
   "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
 ]
 `;
 
 exports[`messages are not requeued if the function fails before timeout 2`] = `
 {
   ".wing/setconsumer0_c8e33b9b.js": "\\"use strict\\";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/queue.setconsumer.inflight.js\\")).QueueSetConsumerHandlerClient({ handler: new ((function(){
+  $handler = $handler ?? (new (require(\\"[REDACTED]/wingsdk/src/target-sim/queue.setconsumer.inflight.js\\")).QueueSetConsumerHandlerClient({ handler: new ((function(){
 return class Handler {
   constructor(clients) {
     for (const [name, client] of Object.entries(clients)) {
@@ -184,7 +191,8 @@ async handle(message) {
 };
 })())({
 
-}), args: {} })).handle(event);
+}), args: {} }));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
@@ -199,14 +207,7 @@ async handle(message) {
   "simulator.json": {
     "resources": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
+        "addr": "c8e33b9b91c909e579b9d3d703146eb66c2a657ffc",
         "attrs": {},
         "path": "root/my_queue/SetConsumer0",
         "props": {
@@ -218,6 +219,7 @@ async handle(message) {
         "type": "@winglang/sdk.cloud.Function",
       },
       {
+        "addr": "c8dee4ef24593d08aa22e8845be36d0ee754fcf4cd",
         "attrs": {},
         "path": "root/my_queue",
         "props": {
@@ -227,6 +229,7 @@ async handle(message) {
         "type": "@winglang/sdk.cloud.Queue",
       },
       {
+        "addr": "c8f9f7d56097ba3d2e0e82988718175a5d841f855e",
         "attrs": {},
         "path": "root/my_queue/QueueEventMapping0",
         "props": {
@@ -257,6 +260,10 @@ async handle(message) {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -322,25 +329,12 @@ async handle(message) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_queue": {
           "children": {
             "QueueEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -351,7 +345,7 @@ async handle(message) {
             "SetConsumer0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -364,7 +358,7 @@ async handle(message) {
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed message queue",
@@ -376,7 +370,7 @@ async handle(message) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
       "id": "root",
       "path": "root",
@@ -388,18 +382,16 @@ async handle(message) {
 
 exports[`messages are requeued if the function fails after timeout 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
   "@winglang/sdk.cloud.Function created.",
   "@winglang/sdk.cloud.Queue created.",
   "@winglang/sdk.sim.EventMapping created.",
   "Push (messages=BAD MESSAGE).",
-  "Sending messages (messages=[\\"BAD MESSAGE\\"], subscriber=sim-1).",
+  "Sending messages (messages=[\\"BAD MESSAGE\\"], subscriber=sim-0).",
   "Invoke (payload=\\"{\\\\\\"messages\\\\\\":[\\\\\\"BAD MESSAGE\\\\\\"]}\\").",
   "Subscriber error - returning 1 messages to queue: ERROR",
   "@winglang/sdk.sim.EventMapping deleted.",
   "@winglang/sdk.cloud.Queue deleted.",
   "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
   "1 messages pushed back to queue after visibility timeout.",
 ]
 `;
@@ -407,8 +399,9 @@ exports[`messages are requeued if the function fails after timeout 1`] = `
 exports[`messages are requeued if the function fails after timeout 2`] = `
 {
   ".wing/setconsumer0_c8e33b9b.js": "\\"use strict\\";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/queue.setconsumer.inflight.js\\")).QueueSetConsumerHandlerClient({ handler: new ((function(){
+  $handler = $handler ?? (new (require(\\"[REDACTED]/wingsdk/src/target-sim/queue.setconsumer.inflight.js\\")).QueueSetConsumerHandlerClient({ handler: new ((function(){
 return class Handler {
   constructor(clients) {
     for (const [name, client] of Object.entries(clients)) {
@@ -424,7 +417,8 @@ async handle(message) {
 };
 })())({
 
-}), args: {} })).handle(event);
+}), args: {} }));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
@@ -439,14 +433,7 @@ async handle(message) {
   "simulator.json": {
     "resources": [
       {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
+        "addr": "c8e33b9b91c909e579b9d3d703146eb66c2a657ffc",
         "attrs": {},
         "path": "root/my_queue/SetConsumer0",
         "props": {
@@ -458,6 +445,7 @@ async handle(message) {
         "type": "@winglang/sdk.cloud.Function",
       },
       {
+        "addr": "c8dee4ef24593d08aa22e8845be36d0ee754fcf4cd",
         "attrs": {},
         "path": "root/my_queue",
         "props": {
@@ -467,6 +455,7 @@ async handle(message) {
         "type": "@winglang/sdk.cloud.Queue",
       },
       {
+        "addr": "c8f9f7d56097ba3d2e0e82988718175a5d841f855e",
         "attrs": {},
         "path": "root/my_queue/QueueEventMapping0",
         "props": {
@@ -497,6 +486,10 @@ async handle(message) {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -562,25 +555,12 @@ async handle(message) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_queue": {
           "children": {
             "QueueEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -591,7 +571,7 @@ async handle(message) {
             "SetConsumer0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -604,7 +584,7 @@ async handle(message) {
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed message queue",
@@ -616,7 +596,7 @@ async handle(message) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
       "id": "root",
       "path": "root",
@@ -628,11 +608,11 @@ async handle(message) {
 
 exports[`push rejects empty message 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Queue created.",
-  "Push (messages=).",
-  "@winglang/sdk.cloud.Queue deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_queue started",
+  "root/my_queue/Policy started",
+  "Error: Empty messages are not allowed (Push (messages=).)",
+  "root/my_queue/Policy stopped",
+  "root/my_queue stopped",
 ]
 `;
 
@@ -643,17 +623,9 @@ exports[`push rejects empty message 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_queue": {
+        "addr": "c8dee4ef24593d08aa22e8845be36d0ee754fcf4cd",
         "path": "root/my_queue",
         "props": {
           "retentionPeriod": 3600,
@@ -661,7 +633,16 @@ exports[`push rejects empty message 2`] = `
         },
         "type": "@winglang/sdk.cloud.Queue",
       },
-    ],
+      "root/my_queue/Policy": {
+        "addr": "c88a4c68047871c2d322479c886423828e8119d85c",
+        "path": "root/my_queue/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_queue#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -672,14 +653,14 @@ exports[`push rejects empty message 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -712,14 +693,6 @@ exports[`push rejects empty message 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -728,10 +701,22 @@ exports[`push rejects empty message 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -745,23 +730,25 @@ exports[`push rejects empty message 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_queue": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_queue/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed message queue",
@@ -773,8 +760,9 @@ exports[`push rejects empty message 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -785,15 +773,15 @@ exports[`push rejects empty message 2`] = `
 
 exports[`queue batch size of 2, purge the queue 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Queue created.",
+  "root/my_queue started",
+  "root/my_queue/Policy started",
   "Push (messages=A).",
   "Push (messages=B).",
   "ApproxSize ().",
   "Purge ().",
   "ApproxSize ().",
-  "@winglang/sdk.cloud.Queue deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_queue/Policy stopped",
+  "root/my_queue stopped",
 ]
 `;
 
@@ -804,17 +792,9 @@ exports[`queue batch size of 2, purge the queue 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_queue": {
+        "addr": "c8dee4ef24593d08aa22e8845be36d0ee754fcf4cd",
         "path": "root/my_queue",
         "props": {
           "retentionPeriod": 3600,
@@ -822,7 +802,16 @@ exports[`queue batch size of 2, purge the queue 2`] = `
         },
         "type": "@winglang/sdk.cloud.Queue",
       },
-    ],
+      "root/my_queue/Policy": {
+        "addr": "c88a4c68047871c2d322479c886423828e8119d85c",
+        "path": "root/my_queue/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_queue#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -833,14 +822,14 @@ exports[`queue batch size of 2, purge the queue 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -873,14 +862,6 @@ exports[`queue batch size of 2, purge the queue 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -889,10 +870,22 @@ exports[`queue batch size of 2, purge the queue 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -906,23 +899,25 @@ exports[`queue batch size of 2, purge the queue 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_queue": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_queue/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed message queue",
@@ -934,8 +929,9 @@ exports[`queue batch size of 2, purge the queue 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -946,142 +942,213 @@ exports[`queue batch size of 2, purge the queue 2`] = `
 
 exports[`queue with one subscriber, batch size of 5 1`] = `
 {
-  ".wing/function_c8ab799f.js": "\\"use strict\\";
+  ".wing/consumer0_c87f5b09.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            const batchItemFailures = [];
+            let parsed = JSON.parse(event !== null && event !== void 0 ? event : "{}");
+            if (!parsed.messages)
+                throw new Error('No "messages" field in event.');
+            for (const $message of parsed.messages) {
+                try {
+                    await ctx.handler($message.payload);
+                }
+                catch (error) {
+                    // TODO: an error from user code is getting dropped - bad! https://github.com/winglang/wing/issues/6445
+                    batchItemFailures.push($message);
+                }
+            }
+            return batchItemFailures.length > 0
+                ? JSON.stringify(batchItemFailures)
+                : undefined;
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, message) => {
+  if (message === "BAD MESSAGE") {
+    throw new Error("ERROR");
   }
-  async handle() {
-  await this.queue.push(\\"A\\");
-  await this.queue.push(\\"B\\");
-  await this.queue.push(\\"C\\");
-  await this.queue.push(\\"D\\");
-  await this.queue.push(\\"E\\");
-  await this.queue.push(\\"F\\");
 }
-};
-})())({
-queue: (function() {
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
+};",
+  ".wing/function_c8ab799f.cjs": ""use strict";
+var $handler = undefined;
+exports.handler = async function(event) {
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+    await ctx.queue.push("A");
+    await ctx.queue.push("B");
+    await ctx.queue.push("C");
+    await ctx.queue.push("D");
+    await ctx.queue.push("E");
+    await ctx.queue.push("F");
+  }
+  const $ctx = {
+  queue: (function() {
   let handle = process.env.QUEUE_HANDLE_54fcf4cd;
   if (!handle) {
-    throw new Error(\\"Missing environment variable: QUEUE_HANDLE_54fcf4cd\\");
+    throw new Error("Missing environment variable: QUEUE_HANDLE_54fcf4cd");
   }
   const simulatorUrl = process.env.WING_SIMULATOR_URL;
   if (!simulatorUrl) {
-    throw new Error(\\"Missing environment variable: WING_SIMULATOR_URL\\");
+    throw new Error("Missing environment variable: WING_SIMULATOR_URL");
   }
-  return require(\\"@winglang/sdk/lib/simulator/client\\").makeSimulatorClient(simulatorUrl, handle);
-})()
-})).handle(event);
-};",
-  ".wing/setconsumer0_c8e33b9b.js": "\\"use strict\\";
-exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/queue.setconsumer.inflight.js\\")).QueueSetConsumerHandlerClient({ handler: new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  
-async handle(message) {
-  if (message === \\"BAD MESSAGE\\") {
-    throw new Error(\\"ERROR\\");
+  const caller = process.env.WING_SIMULATOR_CALLER;
+  if (!caller) {
+    throw new Error("Missing environment variable: WING_SIMULATOR_CALLER");
   }
+  return require("@winglang/sdk/lib/simulator/client").makeSimulatorClient(simulatorUrl, handle, caller);
+})()
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-
-}), args: {} })).handle(event);
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "setConsumer()",
+        "name": "consumer",
         "source": "root/my_queue",
-        "target": "root/my_queue/SetConsumer0",
+        "sourceOp": "push",
+        "target": "root/my_queue/Consumer0",
+        "targetOp": "invoke",
       },
       {
-        "name": "push()",
+        "name": "call",
         "source": "root/my_queue_messages/Function",
+        "sourceOp": "invoke",
         "target": "root/my_queue",
+        "targetOp": "push",
       },
       {
-        "name": "$inflight_init()",
+        "name": "call",
         "source": "root/my_queue_messages/Function",
+        "sourceOp": "invokeAsync",
         "target": "root/my_queue",
+        "targetOp": "push",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_queue": {
+        "addr": "c8dee4ef24593d08aa22e8845be36d0ee754fcf4cd",
+        "path": "root/my_queue",
         "props": {
-          "tests": {},
+          "retentionPeriod": 3600,
+          "timeout": 30,
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.cloud.Queue",
       },
-      {
-        "attrs": {},
-        "path": "root/my_queue/SetConsumer0",
+      "root/my_queue/Consumer0": {
+        "addr": "c87f5b093f4d7a68e031a80df92e521a0631f02a44",
+        "path": "root/my_queue/Consumer0",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/setconsumer0_c8e33b9b.js",
+          "sourceCodeFile": ".wing/consumer0_c87f5b09.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/my_queue",
+      "root/my_queue/Policy": {
+        "addr": "c88a4c68047871c2d322479c886423828e8119d85c",
+        "path": "root/my_queue/Policy",
         "props": {
-          "retentionPeriod": 3600,
-          "timeout": 30,
+          "principal": "\${wsim#root/my_queue#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_queue/Consumer0#attrs.handle}",
+            },
+            {
+              "operation": "hasAvailableWorkers",
+              "resourceHandle": "\${wsim#root/my_queue/Consumer0#attrs.handle}",
+            },
+          ],
         },
-        "type": "@winglang/sdk.cloud.Queue",
-      },
-      {
-        "attrs": {},
+        "type": "@winglang/sdk.sim.Policy",
+      },
+      "root/my_queue/QueueEventMapping0": {
+        "addr": "c8f9f7d56097ba3d2e0e82988718175a5d841f855e",
+        "deps": [
+          "root/my_queue/Consumer0",
+          "root/my_queue",
+          "root/my_queue/Policy",
+        ],
         "path": "root/my_queue/QueueEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_queue#attrs.handle}",
-          "subscriber": "\${wsim#root/my_queue/SetConsumer0#attrs.handle}",
+          "subscriber": "\${wsim#root/my_queue/Consumer0#attrs.handle}",
           "subscriptionProps": {
             "batchSize": 5,
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-      {
-        "attrs": {},
+      "root/my_queue_messages": {
+        "addr": "c8e2354407fd3536187725c2b37c5327f47bb841e9",
+        "deps": [
+          "root/my_queue_messages/Function",
+        ],
+        "path": "root/my_queue_messages",
+        "props": {
+          "functionHandle": "\${wsim#root/my_queue_messages/Function#attrs.handle}",
+        },
+        "type": "@winglang/sdk.cloud.OnDeploy",
+      },
+      "root/my_queue_messages/Function": {
+        "addr": "c8ab799f6c9c9a3cd279909012c4f322ab902f5e19",
+        "deps": [
+          "root/my_queue",
+        ],
         "path": "root/my_queue_messages/Function",
+        "policy": [
+          {
+            "operation": "push",
+            "resourceHandle": "\${wsim#root/my_queue#attrs.handle}",
+          },
+        ],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {
             "QUEUE_HANDLE_54fcf4cd": "\${wsim#root/my_queue#attrs.handle}",
           },
-          "sourceCodeFile": ".wing/function_c8ab799f.js",
+          "sourceCodeFile": ".wing/function_c8ab799f.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/my_queue_messages",
-        "props": {
-          "functionHandle": "\${wsim#root/my_queue_messages/Function#attrs.handle}",
-        },
-        "type": "@winglang/sdk.cloud.OnDeploy",
-      },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1092,14 +1159,14 @@ async handle(message) {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1132,14 +1199,6 @@ async handle(message) {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1148,10 +1207,22 @@ async handle(message) {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1165,49 +1236,49 @@ async handle(message) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_queue": {
           "children": {
-            "QueueEventMapping0": {
+            "Consumer0": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A cloud function (FaaS)",
+                "sourceModule": "@winglang/sdk",
+                "title": "Consumer",
+              },
+              "id": "Consumer0",
+              "path": "root/my_queue/Consumer0",
+            },
+            "Policy": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
+                "description": "A simulated resource policy",
                 "hidden": true,
+                "title": "Policy",
               },
-              "id": "QueueEventMapping0",
-              "path": "root/my_queue/QueueEventMapping0",
+              "id": "Policy",
+              "path": "root/my_queue/Policy",
             },
-            "SetConsumer0": {
+            "QueueEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
-                "description": "A cloud function (FaaS)",
-                "sourceModule": "@winglang/sdk",
-                "title": "setConsumer()",
+                "hidden": true,
               },
-              "id": "SetConsumer0",
-              "path": "root/my_queue/SetConsumer0",
+              "id": "QueueEventMapping0",
+              "path": "root/my_queue/QueueEventMapping0",
             },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed message queue",
@@ -1221,7 +1292,7 @@ async handle(message) {
             "Function": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
@@ -1234,7 +1305,7 @@ async handle(message) {
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "Run code during the app's deployment.",
@@ -1246,8 +1317,9 @@ async handle(message) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -1258,79 +1330,127 @@ async handle(message) {
 
 exports[`queue with one subscriber, default batch size of 1 1`] = `
 {
-  ".wing/setconsumer0_c8e33b9b.js": "\\"use strict\\";
+  ".wing/consumer0_c87f5b09.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/queue.setconsumer.inflight.js\\")).QueueSetConsumerHandlerClient({ handler: new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx, event) => {
+            const batchItemFailures = [];
+            let parsed = JSON.parse(event !== null && event !== void 0 ? event : "{}");
+            if (!parsed.messages)
+                throw new Error('No "messages" field in event.');
+            for (const $message of parsed.messages) {
+                try {
+                    await ctx.handler($message.payload);
+                }
+                catch (error) {
+                    // TODO: an error from user code is getting dropped - bad! https://github.com/winglang/wing/issues/6445
+                    batchItemFailures.push($message);
+                }
+            }
+            return batchItemFailures.length > 0
+                ? JSON.stringify(batchItemFailures)
+                : undefined;
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, message) => {
+  if (message === "BAD MESSAGE") {
+    throw new Error("ERROR");
   }
+}
+  const $ctx = {
   
-async handle(message) {
-  if (message === \\"BAD MESSAGE\\") {
-    throw new Error(\\"ERROR\\");
-  }
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-
-}), args: {} })).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "setConsumer()",
+        "name": "consumer",
         "source": "root/my_queue",
-        "target": "root/my_queue/SetConsumer0",
+        "sourceOp": "push",
+        "target": "root/my_queue/Consumer0",
+        "targetOp": "invoke",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_queue": {
+        "addr": "c8dee4ef24593d08aa22e8845be36d0ee754fcf4cd",
+        "path": "root/my_queue",
         "props": {
-          "tests": {},
+          "retentionPeriod": 3600,
+          "timeout": 30,
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.cloud.Queue",
       },
-      {
-        "attrs": {},
-        "path": "root/my_queue/SetConsumer0",
+      "root/my_queue/Consumer0": {
+        "addr": "c87f5b093f4d7a68e031a80df92e521a0631f02a44",
+        "path": "root/my_queue/Consumer0",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/setconsumer0_c8e33b9b.js",
+          "sourceCodeFile": ".wing/consumer0_c87f5b09.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/my_queue",
+      "root/my_queue/Policy": {
+        "addr": "c88a4c68047871c2d322479c886423828e8119d85c",
+        "path": "root/my_queue/Policy",
         "props": {
-          "retentionPeriod": 3600,
-          "timeout": 30,
+          "principal": "\${wsim#root/my_queue#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_queue/Consumer0#attrs.handle}",
+            },
+            {
+              "operation": "hasAvailableWorkers",
+              "resourceHandle": "\${wsim#root/my_queue/Consumer0#attrs.handle}",
+            },
+          ],
         },
-        "type": "@winglang/sdk.cloud.Queue",
-      },
-      {
-        "attrs": {},
+        "type": "@winglang/sdk.sim.Policy",
+      },
+      "root/my_queue/QueueEventMapping0": {
+        "addr": "c8f9f7d56097ba3d2e0e82988718175a5d841f855e",
+        "deps": [
+          "root/my_queue/Consumer0",
+          "root/my_queue",
+          "root/my_queue/Policy",
+        ],
         "path": "root/my_queue/QueueEventMapping0",
         "props": {
           "publisher": "\${wsim#root/my_queue#attrs.handle}",
-          "subscriber": "\${wsim#root/my_queue/SetConsumer0#attrs.handle}",
+          "subscriber": "\${wsim#root/my_queue/Consumer0#attrs.handle}",
           "subscriptionProps": {
             "batchSize": 1,
           },
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1341,14 +1461,14 @@ async handle(message) {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1381,14 +1501,6 @@ async handle(message) {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1397,10 +1509,22 @@ async handle(message) {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1414,49 +1538,49 @@ async handle(message) {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_queue": {
           "children": {
-            "QueueEventMapping0": {
+            "Consumer0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
+                "description": "A cloud function (FaaS)",
+                "sourceModule": "@winglang/sdk",
+                "title": "Consumer",
+              },
+              "id": "Consumer0",
+              "path": "root/my_queue/Consumer0",
+            },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
                 "hidden": true,
+                "title": "Policy",
               },
-              "id": "QueueEventMapping0",
-              "path": "root/my_queue/QueueEventMapping0",
+              "id": "Policy",
+              "path": "root/my_queue/Policy",
             },
-            "SetConsumer0": {
+            "QueueEventMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
-                "description": "A cloud function (FaaS)",
-                "sourceModule": "@winglang/sdk",
-                "title": "setConsumer()",
+                "hidden": true,
               },
-              "id": "SetConsumer0",
-              "path": "root/my_queue/SetConsumer0",
+              "id": "QueueEventMapping0",
+              "path": "root/my_queue/QueueEventMapping0",
             },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A distributed message queue",
@@ -1468,8 +1592,9 @@ async handle(message) {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/redis.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/redis.test.ts.snap
index ba8ffaab499..26d92bb5662 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/redis.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/redis.test.ts.snap
@@ -3,26 +3,38 @@
 exports[`create a Redis resource 1`] = `
 {
   "connections.json": {
-    "connections": [],
+    "connections": [
+      {
+        "name": "<ref>",
+        "source": "root/my_redis",
+        "target": "root/my_redis/Container",
+        "targetOp": "host_port",
+      },
+    ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_redis": {
+        "addr": "c84bd402f6d507613026d171fe74fc8ce07ced29ae",
+        "path": "root/my_redis",
         "props": {
-          "tests": {},
+          "port": "\${wsim#root/my_redis/Container#attrs.host_port}",
         },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
-        "path": "root/my_redis",
-        "props": {},
         "type": "@winglang/sdk.ex.Redis",
       },
-    ],
+      "root/my_redis/Container": {
+        "addr": "c80acc96b1d952059eb0beee72912b94d23302fa03",
+        "path": "root/my_redis/Container",
+        "props": {
+          "containerPort": 6379,
+          "cwd": "<ABSOLUTE PATH>/test",
+          "image": "redis@sha256:e50c7e23f79ae81351beacb20e004720d4bed657415e68c2b1a2b5557c075ce0",
+          "imageTag": "redis@sha256:e50c7e23f79ae81351beacb20e004720d4bed657415e68c2b1a2b5557c075ce0",
+        },
+        "type": "@winglang/sdk.sim.Container",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -33,14 +45,14 @@ exports[`create a Redis resource 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -73,14 +85,6 @@ exports[`create a Redis resource 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -89,10 +93,22 @@ exports[`create a Redis resource 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -106,23 +122,21 @@ exports[`create a Redis resource 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_redis": {
+          "children": {
+            "Container": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {},
+              "id": "Container",
+              "path": "root/my_redis/Container",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A Redis server",
@@ -134,8 +148,9 @@ exports[`create a Redis resource 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/schedule.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/schedule.test.ts.snap
index 3d9c4fd2e4d..123af737016 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/schedule.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/schedule.test.ts.snap
@@ -7,24 +7,25 @@ exports[`create a schedule 1`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_schedule": {
+        "addr": "c8eac5abdbcb1c98c5525dcb3d0e38c0ccdfef4aed",
+        "path": "root/my_schedule",
         "props": {
-          "tests": {},
+          "cronExpression": "*/1 * * * *",
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.cloud.Schedule",
       },
-      {
-        "attrs": {},
-        "path": "root/my_schedule",
+      "root/my_schedule/Policy": {
+        "addr": "c8c7f555c253f79a2cdcd8a13c6772cfd654e2bf0b",
+        "path": "root/my_schedule/Policy",
         "props": {
-          "cronExpression": "*/1 * * * ?",
+          "principal": "\${wsim#root/my_schedule#attrs.handle}",
+          "statements": [],
         },
-        "type": "@winglang/sdk.cloud.Schedule",
+        "type": "@winglang/sdk.sim.Policy",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -35,14 +36,14 @@ exports[`create a schedule 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -75,14 +76,6 @@ exports[`create a schedule 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -91,10 +84,22 @@ exports[`create a schedule 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -108,23 +113,25 @@ exports[`create a schedule 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_schedule": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_schedule/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud schedule to trigger events at regular intervals",
@@ -136,8 +143,9 @@ exports[`create a schedule 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -148,65 +156,80 @@ exports[`create a schedule 1`] = `
 
 exports[`schedule with one task using rate of 3h 1`] = `
 {
-  ".wing/ontick0_c83eddbe.js": "\\"use strict\\";
+  ".wing/ontick0_c83eddbe.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/schedule.ontick.inflight.js\\")).ScheduleOnTickHandlerClient({ handler: new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+            await ctx.handler();
+            return undefined;
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, message) => {
+  console.log("Hello from schedule!");
+}
+  const $ctx = {
   
-async handle(message) {
-console.log(\\"Hello from schedule!\\");
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-
-}), args: {} })).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "onTick()",
+        "name": "tick",
         "source": "root/my_schedule",
+        "sourceOp": "tick",
         "target": "root/my_schedule/OnTick0",
+        "targetOp": "invoke",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_schedule": {
+        "addr": "c8eac5abdbcb1c98c5525dcb3d0e38c0ccdfef4aed",
+        "path": "root/my_schedule",
         "props": {
-          "tests": {},
+          "cronExpression": "* */3 * * *",
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.cloud.Schedule",
       },
-      {
-        "attrs": {},
+      "root/my_schedule/OnTick0": {
+        "addr": "c83eddbe8512d15b84969a611d4b5ca9ce55e1f808",
         "path": "root/my_schedule/OnTick0",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/ontick0_c83eddbe.js",
+          "sourceCodeFile": ".wing/ontick0_c83eddbe.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/my_schedule",
-        "props": {
-          "cronExpression": "* */3 * * ?",
-        },
-        "type": "@winglang/sdk.cloud.Schedule",
-      },
-      {
-        "attrs": {},
+      "root/my_schedule/OnTickMapping0": {
+        "addr": "c863abe75f0d01961369ad52fd7212846989919eaf",
+        "deps": [
+          "root/my_schedule/OnTick0",
+          "root/my_schedule",
+        ],
         "path": "root/my_schedule/OnTickMapping0",
         "props": {
           "publisher": "\${wsim#root/my_schedule#attrs.handle}",
@@ -215,7 +238,21 @@ console.log(\\"Hello from schedule!\\");
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_schedule/Policy": {
+        "addr": "c8c7f555c253f79a2cdcd8a13c6772cfd654e2bf0b",
+        "path": "root/my_schedule/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_schedule#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_schedule/OnTick0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -226,14 +263,14 @@ console.log(\\"Hello from schedule!\\");
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -266,14 +303,6 @@ console.log(\\"Hello from schedule!\\");
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -282,10 +311,22 @@ console.log(\\"Hello from schedule!\\");
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -299,30 +340,17 @@ console.log(\\"Hello from schedule!\\");
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_schedule": {
           "children": {
             "OnTick0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
                 "sourceModule": "@winglang/sdk",
-                "title": "onTick()",
+                "title": "Tick",
               },
               "id": "OnTick0",
               "path": "root/my_schedule/OnTick0",
@@ -330,7 +358,7 @@ console.log(\\"Hello from schedule!\\");
             "OnTickMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -338,10 +366,23 @@ console.log(\\"Hello from schedule!\\");
               "id": "OnTickMapping0",
               "path": "root/my_schedule/OnTickMapping0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_schedule/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud schedule to trigger events at regular intervals",
@@ -353,8 +394,9 @@ console.log(\\"Hello from schedule!\\");
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -365,65 +407,80 @@ console.log(\\"Hello from schedule!\\");
 
 exports[`schedule with one task using rate of 10m 1`] = `
 {
-  ".wing/ontick0_c83eddbe.js": "\\"use strict\\";
+  ".wing/ontick0_c83eddbe.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/schedule.ontick.inflight.js\\")).ScheduleOnTickHandlerClient({ handler: new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+            await ctx.handler();
+            return undefined;
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, message) => {
+  console.log("Hello from schedule!");
+}
+  const $ctx = {
   
-async handle(message) {
-console.log(\\"Hello from schedule!\\");
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-
-}), args: {} })).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "onTick()",
+        "name": "tick",
         "source": "root/my_schedule",
+        "sourceOp": "tick",
         "target": "root/my_schedule/OnTick0",
+        "targetOp": "invoke",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_schedule": {
+        "addr": "c8eac5abdbcb1c98c5525dcb3d0e38c0ccdfef4aed",
+        "path": "root/my_schedule",
         "props": {
-          "tests": {},
+          "cronExpression": "*/10 * * * *",
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.cloud.Schedule",
       },
-      {
-        "attrs": {},
+      "root/my_schedule/OnTick0": {
+        "addr": "c83eddbe8512d15b84969a611d4b5ca9ce55e1f808",
         "path": "root/my_schedule/OnTick0",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/ontick0_c83eddbe.js",
+          "sourceCodeFile": ".wing/ontick0_c83eddbe.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/my_schedule",
-        "props": {
-          "cronExpression": "*/10 * * * ?",
-        },
-        "type": "@winglang/sdk.cloud.Schedule",
-      },
-      {
-        "attrs": {},
+      "root/my_schedule/OnTickMapping0": {
+        "addr": "c863abe75f0d01961369ad52fd7212846989919eaf",
+        "deps": [
+          "root/my_schedule/OnTick0",
+          "root/my_schedule",
+        ],
         "path": "root/my_schedule/OnTickMapping0",
         "props": {
           "publisher": "\${wsim#root/my_schedule#attrs.handle}",
@@ -432,7 +489,21 @@ console.log(\\"Hello from schedule!\\");
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_schedule/Policy": {
+        "addr": "c8c7f555c253f79a2cdcd8a13c6772cfd654e2bf0b",
+        "path": "root/my_schedule/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_schedule#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_schedule/OnTick0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -443,14 +514,14 @@ console.log(\\"Hello from schedule!\\");
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -483,14 +554,6 @@ console.log(\\"Hello from schedule!\\");
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -499,10 +562,22 @@ console.log(\\"Hello from schedule!\\");
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -516,30 +591,17 @@ console.log(\\"Hello from schedule!\\");
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_schedule": {
           "children": {
             "OnTick0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
                 "sourceModule": "@winglang/sdk",
-                "title": "onTick()",
+                "title": "Tick",
               },
               "id": "OnTick0",
               "path": "root/my_schedule/OnTick0",
@@ -547,7 +609,7 @@ console.log(\\"Hello from schedule!\\");
             "OnTickMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -555,10 +617,23 @@ console.log(\\"Hello from schedule!\\");
               "id": "OnTickMapping0",
               "path": "root/my_schedule/OnTickMapping0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_schedule/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud schedule to trigger events at regular intervals",
@@ -570,8 +645,9 @@ console.log(\\"Hello from schedule!\\");
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -582,65 +658,80 @@ console.log(\\"Hello from schedule!\\");
 
 exports[`schedule with one task with cron 1`] = `
 {
-  ".wing/ontick0_c83eddbe.js": "\\"use strict\\";
+  ".wing/ontick0_c83eddbe.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new (require(\\"[REDACTED]/wingsdk/src/target-sim/schedule.ontick.inflight.js\\")).ScheduleOnTickHandlerClient({ handler: new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async (ctx) => {
+            await ctx.handler();
+            return undefined;
+        }
+  const $ctx = {
+  handler: (await (async () => {
+  const $func = async (_, message) => {
+  console.log("Hello from schedule!");
+}
+  const $ctx = {
   
-async handle(message) {
-console.log(\\"Hello from schedule!\\");
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-
-}), args: {} })).handle(event);
+)())
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [
       {
-        "name": "onTick()",
+        "name": "tick",
         "source": "root/my_schedule",
+        "sourceOp": "tick",
         "target": "root/my_schedule/OnTick0",
+        "targetOp": "invoke",
       },
     ],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
+    "resources": {
+      "root/my_schedule": {
+        "addr": "c8eac5abdbcb1c98c5525dcb3d0e38c0ccdfef4aed",
+        "path": "root/my_schedule",
         "props": {
-          "tests": {},
+          "cronExpression": "* * * * *",
         },
-        "type": "@winglang/sdk.std.TestRunner",
+        "type": "@winglang/sdk.cloud.Schedule",
       },
-      {
-        "attrs": {},
+      "root/my_schedule/OnTick0": {
+        "addr": "c83eddbe8512d15b84969a611d4b5ca9ce55e1f808",
         "path": "root/my_schedule/OnTick0",
+        "policy": [],
         "props": {
+          "concurrency": 100,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/ontick0_c83eddbe.js",
+          "sourceCodeFile": ".wing/ontick0_c83eddbe.cjs",
           "sourceCodeLanguage": "javascript",
           "timeout": 60000,
         },
         "type": "@winglang/sdk.cloud.Function",
       },
-      {
-        "attrs": {},
-        "path": "root/my_schedule",
-        "props": {
-          "cronExpression": "* * * * ?",
-        },
-        "type": "@winglang/sdk.cloud.Schedule",
-      },
-      {
-        "attrs": {},
+      "root/my_schedule/OnTickMapping0": {
+        "addr": "c863abe75f0d01961369ad52fd7212846989919eaf",
+        "deps": [
+          "root/my_schedule/OnTick0",
+          "root/my_schedule",
+        ],
         "path": "root/my_schedule/OnTickMapping0",
         "props": {
           "publisher": "\${wsim#root/my_schedule#attrs.handle}",
@@ -649,7 +740,21 @@ console.log(\\"Hello from schedule!\\");
         },
         "type": "@winglang/sdk.sim.EventMapping",
       },
-    ],
+      "root/my_schedule/Policy": {
+        "addr": "c8c7f555c253f79a2cdcd8a13c6772cfd654e2bf0b",
+        "path": "root/my_schedule/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_schedule#attrs.handle}",
+          "statements": [
+            {
+              "operation": "invoke",
+              "resourceHandle": "\${wsim#root/my_schedule/OnTick0#attrs.handle}",
+            },
+          ],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -660,14 +765,14 @@ console.log(\\"Hello from schedule!\\");
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -700,14 +805,6 @@ console.log(\\"Hello from schedule!\\");
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -716,10 +813,22 @@ console.log(\\"Hello from schedule!\\");
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -733,30 +842,17 @@ console.log(\\"Hello from schedule!\\");
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_schedule": {
           "children": {
             "OnTick0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "description": "A cloud function (FaaS)",
                 "sourceModule": "@winglang/sdk",
-                "title": "onTick()",
+                "title": "Tick",
               },
               "id": "OnTick0",
               "path": "root/my_schedule/OnTick0",
@@ -764,7 +860,7 @@ console.log(\\"Hello from schedule!\\");
             "OnTickMapping0": {
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
                 "hidden": true,
@@ -772,10 +868,23 @@ console.log(\\"Hello from schedule!\\");
               "id": "OnTickMapping0",
               "path": "root/my_schedule/OnTickMapping0",
             },
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_schedule/Policy",
+            },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud schedule to trigger events at regular intervals",
@@ -787,8 +896,9 @@ console.log(\\"Hello from schedule!\\");
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/secret.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/secret.test.ts.snap
index 6103d71f622..4829b0fdcdb 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/secret.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/secret.test.ts.snap
@@ -1,30 +1,22 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`create a secret 1`] = `
+exports[`secrets > create a secret 1`] = `
 {
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_secret": {
+        "addr": "c84793b7d2beb23443f2fa7f5d120c2cf330e038e4",
         "path": "root/my_secret",
         "props": {
           "name": "my_secret-c84793b7",
         },
         "type": "@winglang/sdk.cloud.Secret",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -35,14 +27,14 @@ exports[`create a secret 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -75,14 +67,6 @@ exports[`create a secret 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -91,10 +75,22 @@ exports[`create a secret 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -108,23 +104,10 @@ exports[`create a secret 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_secret": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud secret",
@@ -136,8 +119,9 @@ exports[`create a secret 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/service.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/service.test.ts.snap
index 535bb466d1e..fda6469189f 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/service.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/service.test.ts.snap
@@ -2,53 +2,56 @@
 
 exports[`create a service with on start method 1`] = `
 {
-  ".wing/my_service_c815f66e.js": "\\"use strict\\";
-let $obj;
-async function $initOnce() {
-  $obj = $obj || (await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() {
-  console.log(\\"start!\\");
+  ".wing/my_service_c815f66e.cjs": "      "use strict";
+      let $stop;
+      exports.start = async function() {
+        if ($stop) {
+          throw Error('service already started');
+        }
+        const client = await (await (async () => {
+  const $func = async () => {
+  console.log("start!");
 }
-};
-})())({
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)());
+        const noop = () => {};
+        $stop = (await client.handle()) ?? noop;
+      };
 
-})));
-  return $obj;
-};
-exports.handle = async function() {
-  return (await $initOnce()).handle();
-};",
+      exports.stop = async function() {
+        if (!$stop) {
+          throw Error('service not started');
+        }
+        await $stop();
+        $stop = undefined;
+      };
+      ",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_service": {
+        "addr": "c815f66e1cb1ce843a78fc0ecb05e6fc56e3b51516",
         "path": "root/my_service",
+        "policy": [],
         "props": {
           "autoStart": true,
           "environmentVariables": {},
-          "sourceCodeFile": ".wing/my_service_c815f66e.js",
+          "sourceCodeFile": ".wing/my_service_c815f66e.cjs",
         },
         "type": "@winglang/sdk.cloud.Service",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -59,14 +62,14 @@ exports.handle = async function() {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -99,14 +102,6 @@ exports.handle = async function() {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -115,10 +110,22 @@ exports.handle = async function() {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -132,23 +139,10 @@ exports.handle = async function() {
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_service": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud service",
@@ -160,8 +154,9 @@ exports.handle = async function() {
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/table.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/table.test.ts.snap
index 7155ead9a0b..4bbfbbebd96 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/table.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/table.test.ts.snap
@@ -2,12 +2,10 @@
 
 exports[`can add row in preflight 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
   "Adding initial row (key=joe-id).",
-  "@winglang/sdk.ex.Table created.",
+  "root/my_table started",
   "get row joe-id from table my_addrow_table.",
-  "@winglang/sdk.ex.Table deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_table stopped",
 ]
 `;
 
@@ -18,17 +16,9 @@ exports[`can add row in preflight 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_table": {
+        "addr": "c8e507baf046ceb6108a9fe64c08a39ccc39ffe11c",
         "path": "root/my_table",
         "props": {
           "columns": {
@@ -47,7 +37,7 @@ exports[`can add row in preflight 2`] = `
         },
         "type": "@winglang/sdk.ex.Table",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -58,14 +48,14 @@ exports[`can add row in preflight 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -98,14 +88,6 @@ exports[`can add row in preflight 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -114,10 +96,22 @@ exports[`can add row in preflight 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -131,23 +125,10 @@ exports[`can add row in preflight 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_table": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -159,8 +140,9 @@ exports[`can add row in preflight 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -176,17 +158,9 @@ exports[`create a table 1`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_table": {
+        "addr": "c8e507baf046ceb6108a9fe64c08a39ccc39ffe11c",
         "path": "root/my_table",
         "props": {
           "columns": {
@@ -199,7 +173,7 @@ exports[`create a table 1`] = `
         },
         "type": "@winglang/sdk.ex.Table",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -210,14 +184,14 @@ exports[`create a table 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -250,14 +224,6 @@ exports[`create a table 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -266,10 +232,22 @@ exports[`create a table 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -283,23 +261,10 @@ exports[`create a table 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_table": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -311,8 +276,9 @@ exports[`create a table 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -323,13 +289,11 @@ exports[`create a table 1`] = `
 
 exports[`get row 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.Table created.",
+  "root/my_table started",
   "insert row joe-id into the table my_get_table.",
   "get row joe-id from table my_get_table.",
-  "get row NON_EXISTENT_KEY from table my_get_table.",
-  "@winglang/sdk.ex.Table deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "Error: Row does not exist (key=NON_EXISTENT_KEY) (get row NON_EXISTENT_KEY from table my_get_table.)",
+  "root/my_table stopped",
 ]
 `;
 
@@ -340,17 +304,9 @@ exports[`get row 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_table": {
+        "addr": "c8e507baf046ceb6108a9fe64c08a39ccc39ffe11c",
         "path": "root/my_table",
         "props": {
           "columns": {
@@ -363,7 +319,7 @@ exports[`get row 2`] = `
         },
         "type": "@winglang/sdk.ex.Table",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -374,14 +330,14 @@ exports[`get row 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -414,14 +370,6 @@ exports[`get row 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -430,10 +378,22 @@ exports[`get row 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -447,23 +407,10 @@ exports[`get row 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_table": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -475,8 +422,9 @@ exports[`get row 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -487,11 +435,9 @@ exports[`get row 2`] = `
 
 exports[`insert row 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.Table created.",
+  "root/my_table started",
   "insert row joe-id into the table my_insert_table.",
-  "@winglang/sdk.ex.Table deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_table stopped",
 ]
 `;
 
@@ -502,17 +448,9 @@ exports[`insert row 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_table": {
+        "addr": "c8e507baf046ceb6108a9fe64c08a39ccc39ffe11c",
         "path": "root/my_table",
         "props": {
           "columns": {
@@ -525,7 +463,7 @@ exports[`insert row 2`] = `
         },
         "type": "@winglang/sdk.ex.Table",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -536,14 +474,14 @@ exports[`insert row 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -576,14 +514,6 @@ exports[`insert row 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -592,10 +522,22 @@ exports[`insert row 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -609,23 +551,10 @@ exports[`insert row 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_table": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -637,8 +566,9 @@ exports[`insert row 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -649,13 +579,11 @@ exports[`insert row 2`] = `
 
 exports[`list table 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.Table created.",
+  "root/my_table started",
   "insert row joe-id into the table my_list_table.",
   "insert row jane-id into the table my_list_table.",
   "list all rows from table my_list_table.",
-  "@winglang/sdk.ex.Table deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_table stopped",
 ]
 `;
 
@@ -666,17 +594,9 @@ exports[`list table 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_table": {
+        "addr": "c8e507baf046ceb6108a9fe64c08a39ccc39ffe11c",
         "path": "root/my_table",
         "props": {
           "columns": {
@@ -689,7 +609,7 @@ exports[`list table 2`] = `
         },
         "type": "@winglang/sdk.ex.Table",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -700,14 +620,14 @@ exports[`list table 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -740,14 +660,6 @@ exports[`list table 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -756,10 +668,22 @@ exports[`list table 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -773,23 +697,10 @@ exports[`list table 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_table": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -801,8 +712,9 @@ exports[`list table 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -813,12 +725,10 @@ exports[`list table 2`] = `
 
 exports[`tryGet row 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.Table created.",
+  "root/my_table started",
   "insert row joe-id into the table my_get_table.",
   "get row joe-id from table my_get_table.",
-  "@winglang/sdk.ex.Table deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_table stopped",
 ]
 `;
 
@@ -829,17 +739,9 @@ exports[`tryGet row 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_table": {
+        "addr": "c8e507baf046ceb6108a9fe64c08a39ccc39ffe11c",
         "path": "root/my_table",
         "props": {
           "columns": {
@@ -852,7 +754,7 @@ exports[`tryGet row 2`] = `
         },
         "type": "@winglang/sdk.ex.Table",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -863,14 +765,14 @@ exports[`tryGet row 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -903,14 +805,6 @@ exports[`tryGet row 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -919,10 +813,22 @@ exports[`tryGet row 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -936,23 +842,10 @@ exports[`tryGet row 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_table": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -964,8 +857,9 @@ exports[`tryGet row 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -976,15 +870,13 @@ exports[`tryGet row 2`] = `
 
 exports[`update row 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.ex.Table created.",
+  "root/my_table started",
   "insert row joe-id into the table my_update_table.",
   "get row joe-id from table my_update_table.",
   "get row joe-id from table my_update_table.",
   "update row joe-id in table my_update_table.",
   "get row joe-id from table my_update_table.",
-  "@winglang/sdk.ex.Table deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/my_table stopped",
 ]
 `;
 
@@ -995,17 +887,9 @@ exports[`update row 2`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_table": {
+        "addr": "c8e507baf046ceb6108a9fe64c08a39ccc39ffe11c",
         "path": "root/my_table",
         "props": {
           "columns": {
@@ -1018,7 +902,7 @@ exports[`update row 2`] = `
         },
         "type": "@winglang/sdk.ex.Table",
       },
-    ],
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -1029,14 +913,14 @@ exports[`update row 2`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -1069,14 +953,6 @@ exports[`update row 2`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -1085,10 +961,22 @@ exports[`update row 2`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -1102,23 +990,10 @@ exports[`update row 2`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_table": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -1130,8 +1005,9 @@ exports[`update row 2`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/test.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/test.test.ts.snap
index e12bddb30de..55f284251ec 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/test.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/test.test.ts.snap
@@ -2,52 +2,56 @@
 
 exports[`create a test 1`] = `
 {
-  ".wing/handler_c818e9be.js": "\\"use strict\\";
+  ".wing/handler_c86fc180.cjs": ""use strict";
+var $handler = undefined;
 exports.handler = async function(event) {
-  return await (new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
+  $handler = $handler ?? ((await (async () => {
+  const $func = async () => console.log("this test should pass!")
+  const $ctx = {
   
-async handle(event) {
-  console.log(\\"this test should pass!\\");
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-
-})).handle(event);
+)()));
+  return await $handler.handle(event);
 };",
   "connections.json": {
     "connections": [],
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/test:my_test/Handler",
-        "props": {
-          "environmentVariables": {},
-          "sourceCodeFile": ".wing/handler_c818e9be.js",
-          "sourceCodeLanguage": "javascript",
-          "timeout": 60000,
-        },
-        "type": "@winglang/sdk.cloud.Function",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/cloud.TestRunner": {
+        "addr": "c8647dd8d2adabe83cc081ebe0ccbefe4a068ef3bf",
+        "deps": [
+          "root/env0/test:my_test/Handler",
+        ],
         "path": "root/cloud.TestRunner",
         "props": {
           "tests": {
-            "root/test:my_test": "\${wsim#root/test:my_test/Handler#attrs.handle}",
+            "root/env0/test:my_test": "\${wsim#root/env0/test:my_test/Handler#attrs.handle}",
           },
         },
         "type": "@winglang/sdk.std.TestRunner",
       },
-    ],
+      "root/env0/test:my_test/Handler": {
+        "addr": "c86fc1804106bd848769cb0ddbcb872aa1e47943f4",
+        "path": "root/env0/test:my_test/Handler",
+        "policy": [],
+        "props": {
+          "concurrency": 100,
+          "environmentVariables": {},
+          "sourceCodeFile": ".wing/handler_c86fc180.cjs",
+          "sourceCodeLanguage": "javascript",
+          "timeout": 60000,
+        },
+        "type": "@winglang/sdk.cloud.Function",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -58,14 +62,14 @@ async handle(event) {
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -98,14 +102,6 @@ async handle(event) {
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -114,10 +110,22 @@ async handle(event) {
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -134,7 +142,7 @@ async handle(event) {
         "cloud.TestRunner": {
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A suite of APIs for running tests and collecting results.",
@@ -144,37 +152,49 @@ async handle(event) {
           "id": "cloud.TestRunner",
           "path": "root/cloud.TestRunner",
         },
-        "test:my_test": {
+        "env0": {
           "children": {
-            "Handler": {
+            "test:my_test": {
+              "children": {
+                "Handler": {
+                  "constructInfo": {
+                    "fqn": "constructs.Construct",
+                    "version": "10.3.0",
+                  },
+                  "display": {
+                    "description": "A cloud function (FaaS)",
+                    "title": "Function",
+                  },
+                  "id": "Handler",
+                  "path": "root/env0/test:my_test/Handler",
+                },
+              },
               "constructInfo": {
                 "fqn": "constructs.Construct",
-                "version": "10.2.70",
+                "version": "10.3.0",
               },
               "display": {
-                "description": "A cloud function (FaaS)",
-                "title": "Function",
+                "description": "A cloud unit test.",
+                "title": "Test",
               },
-              "id": "Handler",
-              "path": "root/test:my_test/Handler",
+              "id": "test:my_test",
+              "path": "root/env0/test:my_test",
             },
           },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A cloud unit test.",
-            "title": "Test",
+            "version": "10.3.0",
           },
-          "id": "test:my_test",
-          "path": "root/test:my_test",
+          "display": {},
+          "id": "env0",
+          "path": "root/env0",
         },
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/topic-producer.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/topic-producer.test.ts.snap
index 5145ba36b20..169c45a9fed 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/topic-producer.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/topic-producer.test.ts.snap
@@ -2,18 +2,43 @@
 
 exports[`publishing messages to topic 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "@winglang/sdk.cloud.Function created.",
-  "Publish (message=ABC).",
+  "root/TopicTester/MyTopic started",
+  "root/TopicTester/MyTopic/OnMessage0 started",
+  "root/TopicTester/MyTopic/Policy started",
+  "root/TopicTester/MyTopic/TopicEventMapping0 started",
+  "root/TopicTester/Function started",
   "Sending message (message=ABC, subscriber=sim-1).",
-  "Invoke (payload=\\"ABC\\").",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "InvokeAsync (payload="ABC").",
+  "Publish (messages=ABC).",
+  "Invoke (payload="ABC").",
+  "Message received",
+  "root/TopicTester/MyTopic/Policy stopped",
+  "root/TopicTester/MyTopic/TopicEventMapping0 stopped",
+  "root/TopicTester/MyTopic/OnMessage0 stopped",
+  "root/TopicTester/Function stopped",
+  "root/TopicTester/MyTopic stopped",
+]
+`;
+
+exports[`publishing multiple messages to topic 1`] = `
+[
+  "root/TopicTester/MyTopic started",
+  "root/TopicTester/MyTopic/OnMessage0 started",
+  "root/TopicTester/MyTopic/Policy started",
+  "root/TopicTester/MyTopic/TopicEventMapping0 started",
+  "root/TopicTester/Function started",
+  "Sending message (message=A, subscriber=sim-1).",
+  "Sending message (message=B, subscriber=sim-1).",
+  "Sending message (message=C, subscriber=sim-1).",
+  "InvokeAsync (payload="A").",
+  "InvokeAsync (payload="B").",
+  "InvokeAsync (payload="C").",
+  "Publish (messages=A,B,C).",
+  "Invoke (payload="ABC").",
+  "root/TopicTester/MyTopic/Policy stopped",
+  "root/TopicTester/MyTopic/TopicEventMapping0 stopped",
+  "root/TopicTester/MyTopic/OnMessage0 stopped",
+  "root/TopicTester/Function stopped",
+  "root/TopicTester/MyTopic stopped",
 ]
 `;
diff --git a/libs/wingsdk/test/target-sim/__snapshots__/topic.test.ts.snap b/libs/wingsdk/test/target-sim/__snapshots__/topic.test.ts.snap
index 86d27e19f82..fcbbe9a5510 100644
--- a/libs/wingsdk/test/target-sim/__snapshots__/topic.test.ts.snap
+++ b/libs/wingsdk/test/target-sim/__snapshots__/topic.test.ts.snap
@@ -7,22 +7,23 @@ exports[`create a topic 1`] = `
     "version": "connections-0.1",
   },
   "simulator.json": {
-    "resources": [
-      {
-        "attrs": {},
-        "path": "root/cloud.TestRunner",
-        "props": {
-          "tests": {},
-        },
-        "type": "@winglang/sdk.std.TestRunner",
-      },
-      {
-        "attrs": {},
+    "resources": {
+      "root/my_topic": {
+        "addr": "c81b9a117401b1959f70a55462f9df8add290b0fda",
         "path": "root/my_topic",
         "props": {},
         "type": "@winglang/sdk.cloud.Topic",
       },
-    ],
+      "root/my_topic/Policy": {
+        "addr": "c8635ef174eab9aa010e5bed09a712307a6b70e731",
+        "path": "root/my_topic/Policy",
+        "props": {
+          "principal": "\${wsim#root/my_topic#attrs.handle}",
+          "statements": [],
+        },
+        "type": "@winglang/sdk.sim.Policy",
+      },
+    },
     "sdkVersion": "0.0.0",
     "types": {
       "@winglang/sdk.cloud.Api": {
@@ -33,14 +34,14 @@ exports[`create a topic 1`] = `
         "className": "Bucket",
         "sourcePath": "<ABSOLUTE PATH>/bucket.inflight.js",
       },
-      "@winglang/sdk.cloud.Counter": {
-        "className": "Counter",
-        "sourcePath": "<ABSOLUTE PATH>/counter.inflight.js",
-      },
       "@winglang/sdk.cloud.Domain": {
         "className": "Domain",
         "sourcePath": "<ABSOLUTE PATH>/domain.inflight.js",
       },
+      "@winglang/sdk.cloud.Endpoint": {
+        "className": "Endpoint",
+        "sourcePath": "<ABSOLUTE PATH>/endpoint.inflight.js",
+      },
       "@winglang/sdk.cloud.Function": {
         "className": "Function",
         "sourcePath": "<ABSOLUTE PATH>/function.inflight.js",
@@ -73,14 +74,6 @@ exports[`create a topic 1`] = `
         "className": "Website",
         "sourcePath": "<ABSOLUTE PATH>/website.inflight.js",
       },
-      "@winglang/sdk.ex.DynamodbTable": {
-        "className": "DynamodbTable",
-        "sourcePath": "<ABSOLUTE PATH>/dynamodb-table.inflight.js",
-      },
-      "@winglang/sdk.ex.ReactApp": {
-        "className": "ReactApp",
-        "sourcePath": "<ABSOLUTE PATH>/react-app.inflight.js",
-      },
       "@winglang/sdk.ex.Redis": {
         "className": "Redis",
         "sourcePath": "<ABSOLUTE PATH>/redis.inflight.js",
@@ -89,10 +82,22 @@ exports[`create a topic 1`] = `
         "className": "Table",
         "sourcePath": "<ABSOLUTE PATH>/table.inflight.js",
       },
+      "@winglang/sdk.sim.Container": {
+        "className": "Container",
+        "sourcePath": "<ABSOLUTE PATH>/container.inflight.js",
+      },
       "@winglang/sdk.sim.EventMapping": {
         "className": "EventMapping",
         "sourcePath": "<ABSOLUTE PATH>/event-mapping.inflight.js",
       },
+      "@winglang/sdk.sim.Policy": {
+        "className": "Policy",
+        "sourcePath": "<ABSOLUTE PATH>/policy.inflight.js",
+      },
+      "@winglang/sdk.sim.Resource": {
+        "className": "Resource",
+        "sourcePath": "<ABSOLUTE PATH>/resource.inflight.js",
+      },
       "@winglang/sdk.sim.State": {
         "className": "State",
         "sourcePath": "<ABSOLUTE PATH>/state.inflight.js",
@@ -106,23 +111,25 @@ exports[`create a topic 1`] = `
   "tree.json": {
     "tree": {
       "children": {
-        "cloud.TestRunner": {
-          "constructInfo": {
-            "fqn": "constructs.Construct",
-            "version": "10.2.70",
-          },
-          "display": {
-            "description": "A suite of APIs for running tests and collecting results.",
-            "hidden": true,
-            "title": "TestRunner",
-          },
-          "id": "cloud.TestRunner",
-          "path": "root/cloud.TestRunner",
-        },
         "my_topic": {
+          "children": {
+            "Policy": {
+              "constructInfo": {
+                "fqn": "constructs.Construct",
+                "version": "10.3.0",
+              },
+              "display": {
+                "description": "A simulated resource policy",
+                "hidden": true,
+                "title": "Policy",
+              },
+              "id": "Policy",
+              "path": "root/my_topic/Policy",
+            },
+          },
           "constructInfo": {
             "fqn": "constructs.Construct",
-            "version": "10.2.70",
+            "version": "10.3.0",
           },
           "display": {
             "description": "A pub/sub notification topic",
@@ -134,8 +141,9 @@ exports[`create a topic 1`] = `
       },
       "constructInfo": {
         "fqn": "constructs.Construct",
-        "version": "10.2.70",
+        "version": "10.3.0",
       },
+      "display": {},
       "id": "root",
       "path": "root",
     },
@@ -143,44 +151,3 @@ exports[`create a topic 1`] = `
   },
 }
 `;
-
-exports[`topic publishes messages as they are received 1`] = `
-[
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Publish (message=Alpha).",
-  "Sending message (message=Alpha, subscriber=sim-1).",
-  "Publish (message=Beta).",
-  "Sending message (message=Beta, subscriber=sim-1).",
-  "Received Alpha",
-  "Invoke (payload=\\"Alpha\\").",
-  "Received Beta",
-  "Invoke (payload=\\"Beta\\").",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
-]
-`;
-
-exports[`topic publishes messages to multiple subscribers 1`] = `
-[
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.cloud.Topic created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.sim.EventMapping created.",
-  "Publish (message=Alpha).",
-  "Sending message (message=Alpha, subscriber=sim-1).",
-  "Sending message (message=Alpha, subscriber=sim-4).",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.sim.EventMapping deleted.",
-  "@winglang/sdk.cloud.Topic deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
-]
-`;
diff --git a/libs/wingsdk/test/target-sim/api.test.ts b/libs/wingsdk/test/target-sim/api.test.ts
index 39d2dfa6435..128c674b144 100644
--- a/libs/wingsdk/test/target-sim/api.test.ts
+++ b/libs/wingsdk/test/target-sim/api.test.ts
@@ -1,29 +1,61 @@
-import { test, expect } from "vitest";
+import { createServer } from "net";
+import { test, expect, describe } from "vitest";
 import { listMessages } from "./util";
 import * as cloud from "../../src/cloud";
-import { Simulator, Testing } from "../../src/simulator";
+import { inflight, lift } from "../../src/core";
+import { Simulator } from "../../src/simulator";
 import { ApiAttributes } from "../../src/target-sim/schema-resources";
 import { SimApp } from "../sim-app";
 
 // Handler that responds to a request with a fixed string
 const INFLIGHT_CODE = (body: string) =>
-  `async handle(req) { return { status: 200, body: "${body}" }; }`;
+  lift({ body }).inflight(async (ctx) => ({
+    body: ctx.body,
+  }));
+
 // Handler that responds to a request with the request body
-const INFLIGHT_CODE_ECHO_BODY = `async handle(req) { return { status: 200, body: req.body, headers: req.headers }; }`;
+const INFLIGHT_CODE_ECHO_BODY = inflight(async (_, req) => ({
+  body: req.body,
+  headers: req.headers,
+}));
+
 // Handler that responds to a request with the request method
-const INFLIGHT_CODE_ECHO_METHOD = `async handle(req) { return { status: 200, body: req.method }; }`;
+const INFLIGHT_CODE_ECHO_METHOD = inflight(async (_, req) => ({
+  body: req.method,
+}));
+
 // Handler that responds to a request with the request path
-const INFLIGHT_CODE_ECHO_PATH = `async handle(req) { return { status: 200, body: req.path }; }`;
+const INFLIGHT_CODE_ECHO_PATH = inflight(async (_, req) => ({
+  body: req.path,
+}));
+
 // Handler that responds to a request with the request query params
-const INFLIGHT_CODE_ECHO_QUERY = `async handle(req) { return { status: 200, body: JSON.stringify(req.query), headers: { "Content-Type": "application/json" } }; }`;
+const INFLIGHT_CODE_ECHO_QUERY = inflight(async (_, req) => ({
+  body: JSON.stringify(req.query),
+  headers: { "Content-Type": "application/json" },
+}));
+
 // Handler that responds to a request with the request params
-const INFLIGHT_CODE_ECHO_PARAMS = `async handle(req) { return { status: 200, body: req.vars ?? {} }; }`;
+const INFLIGHT_CODE_ECHO_PARAMS = inflight(async (_, req) => ({
+  body: req.vars ?? {},
+}));
+
 // Handler that responds to a request with extra response headers
-const INFLIGHT_CODE_WITH_RESPONSE_HEADER = `async handle(req) { return { status: 200, body: req.headers, headers: { "x-wingnuts": "cloudy" } }; }`;
+const INFLIGHT_CODE_WITH_RESPONSE_HEADER = inflight(async (_, req) => ({
+  body: req.headers,
+  headers: { "x-wingnuts": "cloudy" },
+}));
+
 // Handler that reseponds to a request with Content-Type different from default `application/json`
-const INFLIGHT_CODE_WITH_CONTENTTYPE_RESPONSE_HEADER = `async handle(req) { return { status: 200, body: req.headers, headers: { "Content-Type": "application/octet-stream; charset=utf-8" } }; }`;
+const INFLIGHT_CODE_WITH_CONTENTTYPE_RESPONSE_HEADER = inflight(
+  async (_, req) => ({
+    body: req.headers,
+    headers: { "Content-Type": "application/octet-stream; charset=utf-8" },
+  })
+);
+
 // Handler that responds to a request without a response body
-const INFLIGHT_CODE_NO_BODY = `async handle(req) { return { status: 200 }; }`;
+const INFLIGHT_CODE_NO_BODY = inflight(async () => ({ status: 200 }));
 
 test("create an api", async () => {
   // GIVEN
@@ -38,6 +70,8 @@ test("create an api", async () => {
       url: expect.any(String),
     },
     path: "root/my_api",
+    addr: expect.any(String),
+    policy: [],
     props: {
       openApiSpec: {
         openapi: expect.any(String),
@@ -58,8 +92,8 @@ test("api with one GET route", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE(RESPONSE));
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE(RESPONSE));
 
   // WHEN
   const s = await app.startSimulator();
@@ -82,8 +116,8 @@ test("api with one GET route with request params", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_PARAMS);
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE_ECHO_PARAMS);
 
   // WHEN
   const s = await app.startSimulator();
@@ -106,8 +140,8 @@ test("api with 'name' parameter", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_PARAMS);
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE_ECHO_PARAMS);
 
   // WHEN
   const s = await app.startSimulator();
@@ -130,8 +164,7 @@ test("api with 'name' & 'age' parameter", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_PARAMS);
-  api.get(ROUTE, inflight);
+  api.get(ROUTE, INFLIGHT_CODE_ECHO_PARAMS);
 
   // WHEN
   const s = await app.startSimulator();
@@ -152,11 +185,10 @@ test("api doesn't allow duplicated routes", () => {
   // GIVEN
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
-  api.get("/hello", inflight);
+  api.get("/hello", INFLIGHT_CODE_ECHO_BODY);
 
   // THEN
-  expect(() => api.get("/hello", inflight)).toThrowError(
+  expect(() => api.get("/hello", INFLIGHT_CODE_ECHO_BODY)).toThrowError(
     "Endpoint for path '/hello' and method 'GET' already exists"
   );
 });
@@ -165,11 +197,11 @@ test("api allows duplicates routes with different methods", () => {
   // GIVEN
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
-  api.get("/hello", inflight);
+
+  api.get("/hello", INFLIGHT_CODE_ECHO_BODY);
 
   // WHEN
-  api.post("/hello", inflight);
+  api.post("/hello", INFLIGHT_CODE_ECHO_BODY);
 
   // THEN
   expect(app.snapshot()).toMatchSnapshot();
@@ -180,14 +212,14 @@ test("api doesn't allow ambiguous routes", () => {
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
   const path = "/api/hello/:name";
-  const inflightGet = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
-  api.get(path, inflightGet);
+
+  api.get(path, INFLIGHT_CODE_ECHO_BODY);
 
   // WHEN
   const ambiguousPath = "/api/:name/hello";
 
   // THEN
-  expect(() => api.get(ambiguousPath, inflightGet)).toThrowError(
+  expect(() => api.get(ambiguousPath, INFLIGHT_CODE_ECHO_BODY)).toThrowError(
     `Endpoint for path '${ambiguousPath}' and method 'GET' is ambiguous - it conflicts with existing endpoint for path '${path}'`
   );
 });
@@ -197,14 +229,14 @@ test("api doesn't allow ambiguous routes containing only variables", () => {
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
   const path = "/:age";
-  const inflightGet = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
-  api.get(path, inflightGet);
+
+  api.get(path, INFLIGHT_CODE_ECHO_BODY);
 
   // WHEN
   const ambiguousPath = "/:name";
 
   // THEN
-  expect(() => api.get(ambiguousPath, inflightGet)).toThrowError(
+  expect(() => api.get(ambiguousPath, INFLIGHT_CODE_ECHO_BODY)).toThrowError(
     `Endpoint for path '${ambiguousPath}' and method 'GET' is ambiguous - it conflicts with existing endpoint for path '${path}'`
   );
 });
@@ -214,14 +246,13 @@ test("api doesn't allow ambiguous routes containing different number of varaible
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
   const path = "/:param/:something";
-  const inflightGet = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
-  api.get(path, inflightGet);
+  api.get(path, INFLIGHT_CODE_ECHO_BODY);
 
   // WHEN
   const ambiguousPath = "/path/:something";
 
   // THEN
-  expect(() => api.get(ambiguousPath, inflightGet)).toThrowError(
+  expect(() => api.get(ambiguousPath, INFLIGHT_CODE_ECHO_BODY)).toThrowError(
     `Endpoint for path '${ambiguousPath}' and method 'GET' is ambiguous - it conflicts with existing endpoint for path '${path}'`
   );
 });
@@ -230,10 +261,9 @@ test("api with multiple GET routes and one lambda", () => {
   // GIVEN
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
 
-  api.get("/hello/foo", inflight);
-  api.get("/hello/bat", inflight);
+  api.get("/hello/foo", INFLIGHT_CODE_ECHO_BODY);
+  api.get("/hello/bat", INFLIGHT_CODE_ECHO_BODY);
 
   expect(app.snapshot()).toMatchSnapshot();
 });
@@ -256,9 +286,9 @@ test("api supports every method type", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_METHOD);
+
   METHODS.forEach((method) => {
-    api[method.toLowerCase()](ROUTE, inflight);
+    api[method.toLowerCase()](ROUTE, INFLIGHT_CODE_ECHO_METHOD);
   });
 
   // WHEN
@@ -293,10 +323,8 @@ test("api with multiple methods on same route", async () => {
   const POST_RESPONSE = "bang";
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflightGet = Testing.makeHandler(INFLIGHT_CODE(GET_RESPONSE));
-  const inflightPost = Testing.makeHandler(INFLIGHT_CODE(POST_RESPONSE));
-  api.get(ROUTE, inflightGet);
-  api.post(ROUTE, inflightPost);
+  api.get(ROUTE, INFLIGHT_CODE(GET_RESPONSE));
+  api.post(ROUTE, INFLIGHT_CODE(POST_RESPONSE));
 
   // WHEN
   const s = await app.startSimulator();
@@ -325,10 +353,8 @@ test("api with multiple routes", async () => {
   const RESPONSE2 = "bang";
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight1 = Testing.makeHandler(INFLIGHT_CODE(RESPONSE1));
-  const inflight2 = Testing.makeHandler(INFLIGHT_CODE(RESPONSE2));
-  api.get(ROUTE1, inflight1);
-  api.get(ROUTE2, inflight2);
+  api.get(ROUTE1, INFLIGHT_CODE(RESPONSE1));
+  api.get(ROUTE2, INFLIGHT_CODE(RESPONSE2));
 
   // WHEN
   const s = await app.startSimulator();
@@ -356,8 +382,7 @@ test("api with one POST route, with body", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
-  api.post(ROUTE, inflight);
+  api.post(ROUTE, INFLIGHT_CODE_ECHO_BODY);
 
   // WHEN
   const s = await app.startSimulator();
@@ -386,8 +411,8 @@ test("api handler can read the request path", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_PATH);
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE_ECHO_PATH);
 
   // WHEN
   const s = await app.startSimulator();
@@ -410,8 +435,8 @@ test("api handler can read the request params", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_QUERY);
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE_ECHO_QUERY);
 
   // WHEN
   const s = await app.startSimulator();
@@ -438,8 +463,7 @@ test("api handler can set response headers", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_WITH_RESPONSE_HEADER);
-  api.get(ROUTE, inflight);
+  api.get(ROUTE, INFLIGHT_CODE_WITH_RESPONSE_HEADER);
 
   // WHEN
   const s = await app.startSimulator();
@@ -466,14 +490,16 @@ test("api url can be used as environment variable", async () => {
   // GIVEN
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const handler = Testing.makeHandler(
-    `async handle(req) { return process.env["API_URL"]; }`
+  new cloud.Function(
+    app,
+    "my_function",
+    inflight(async () => process.env.API_URL),
+    {
+      env: {
+        API_URL: api.url,
+      },
+    }
   );
-  new cloud.Function(app, "my_function", handler, {
-    env: {
-      API_URL: api.url,
-    },
-  });
 
   // WHEN
   const simfile = app.synth();
@@ -485,13 +511,13 @@ test("api url can be used as environment variable", async () => {
     s.getResourceConfig("/my_function").props.environmentVariables.API_URL;
 
   const fnClient = s.getResource("/my_function") as cloud.IFunctionClient;
-  const response = await fnClient.invoke("");
+  const response = await fnClient.invoke();
 
   // THEN
   await s.stop();
   expect(fnEnvironmentValue).toEqual("${wsim#root/my_api#attrs.url}");
   expect(fnEnvironmentValueAfterStart).toEqual(expect.stringMatching(/^http/));
-  expect(response.startsWith("http://")).toEqual(true);
+  expect(response?.startsWith("http://")).toEqual(true);
 });
 
 test("api response returns Content-Type header from inflight", async () => {
@@ -500,10 +526,7 @@ test("api response returns Content-Type header from inflight", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(
-    INFLIGHT_CODE_WITH_CONTENTTYPE_RESPONSE_HEADER
-  );
-  api.get(ROUTE, inflight);
+  api.get(ROUTE, INFLIGHT_CODE_WITH_CONTENTTYPE_RESPONSE_HEADER);
 
   // WHEN
   const s = await app.startSimulator();
@@ -530,8 +553,8 @@ test("api response returns default Content-Type header", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api");
-  const inflight = Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY);
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE_ECHO_BODY);
 
   // WHEN
   const s = await app.startSimulator();
@@ -566,7 +589,7 @@ test("request & response body are strings", async () => {
   // GIVEN
   const app = new SimApp();
   const api = new cloud.Api(app, "Api");
-  api.post("/test", Testing.makeHandler(INFLIGHT_CODE_ECHO_BODY));
+  api.post("/test", INFLIGHT_CODE_ECHO_BODY);
 
   // WHEN
   const s = await app.startSimulator();
@@ -588,7 +611,7 @@ test("no response body", async () => {
   // GIVEN
   const app = new SimApp();
   const api = new cloud.Api(app, "Api");
-  api.post("/test", Testing.makeHandler(INFLIGHT_CODE_NO_BODY));
+  api.post("/test", INFLIGHT_CODE_NO_BODY);
 
   // WHEN
   const s = await app.startSimulator();
@@ -611,7 +634,7 @@ test("404 handler", async () => {
   // GIVEN
   const app = new SimApp();
   const api = new cloud.Api(app, "Api");
-  api.post("/test", Testing.makeHandler(INFLIGHT_CODE(RESPONSE)));
+  api.post("/test", INFLIGHT_CODE(RESPONSE));
 
   // WHEN
   const s = await app.startSimulator();
@@ -638,8 +661,8 @@ test("api with CORS defaults", async () => {
 
   const app = new SimApp();
   const api = new cloud.Api(app, "my_api", { cors: true });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE(RESPONSE));
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE(RESPONSE));
 
   // WHEN
   const s = await app.startSimulator();
@@ -666,13 +689,13 @@ test("api with custom CORS settings", async () => {
   const api = new cloud.Api(app, "my_api", {
     cors: true,
     corsOptions: {
-      allowOrigin: ["https://example.com"],
+      allowOrigin: "https://example.com",
       allowCredentials: true,
       exposeHeaders: ["x-wingnuts"],
     },
   });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE(RESPONSE));
-  api.get(ROUTE, inflight);
+
+  api.get(ROUTE, INFLIGHT_CODE(RESPONSE));
 
   // WHEN
   const s = await app.startSimulator();
@@ -721,3 +744,103 @@ test("api with CORS settings responds to OPTIONS request", async () => {
   );
   expect(response.headers.get("access-control-max-age")).toEqual("300");
 });
+
+test("api reuses ports between simulator runs", async () => {
+  // GIVEN
+  const app = new SimApp();
+  new cloud.Api(app, "my_api");
+
+  // WHEN
+  const s = await app.startSimulator();
+  const apiUrl1 = getApiUrl(s, "/my_api");
+  await s.stop();
+  await s.start();
+  const apiUrl2 = getApiUrl(s, "/my_api");
+
+  // THEN
+  expect(apiUrl1).toEqual(apiUrl2);
+});
+
+test("api does not use a port that is already taken", async () => {
+  const app = new SimApp();
+  new cloud.Api(app, "my_api");
+
+  // start the simulator, allocating a random port for the API
+  const s = await app.startSimulator();
+  const apiUrl1 = getApiUrl(s, "/my_api");
+  await s.stop();
+
+  // start a server on the same port
+  const port = new URL(apiUrl1).port;
+  const server = createServer();
+  server.listen(port);
+
+  // wait for the server to start
+  await new Promise((resolve) => server.on("listening", resolve));
+
+  // start the simulator again, expecting a different port
+  await s.start();
+  const apiUrl2 = getApiUrl(s, "/my_api");
+
+  expect(apiUrl1).not.toEqual(apiUrl2);
+
+  // clean up the server
+  server.close();
+});
+
+describe("sibling paths are found", () => {
+  test("none parametrized paths are not siblings", () => {
+    const app = new SimApp();
+    const api = new cloud.Api(app, "my_api");
+
+    try {
+      api.get("/abc", INFLIGHT_CODE_NO_BODY);
+      api.get("/def", INFLIGHT_CODE_NO_BODY);
+      expect(true).toBeTruthy();
+    } catch (e) {
+      expect(false).toBeTruthy();
+    }
+  });
+  test("root parameterized paths are siblings", () => {
+    const app = new SimApp();
+    const api = new cloud.Api(app, "my_api");
+
+    try {
+      api.get("/:username/a", INFLIGHT_CODE_NO_BODY);
+      api.get("/:id/b", INFLIGHT_CODE_NO_BODY);
+      expect(false).toBeTruthy();
+    } catch (e) {
+      expect(e.message).toBe(
+        "Endpoint for path '/:id/b' and method 'GET' conflicts with existing sibling endpoint for path '/:username/a'- try to match the parameter names to avoid this error."
+      );
+    }
+  });
+
+  test("paths with different param name at the same index are siblings", () => {
+    const app = new SimApp();
+    const api = new cloud.Api(app, "my_api");
+
+    try {
+      api.get("/something/:username", INFLIGHT_CODE_NO_BODY);
+      api.get("/something_else/:id", INFLIGHT_CODE_NO_BODY);
+      expect(false).toBeTruthy();
+    } catch (e) {
+      expect(e.message).toBe(
+        "Endpoint for path '/something_else/:id' and method 'GET' conflicts with existing sibling endpoint for path '/something/:username'- try to match the parameter names to avoid this error."
+      );
+    }
+  });
+
+  test("paths with the same param name at the same index are siblings", () => {
+    const app = new SimApp();
+    const api = new cloud.Api(app, "my_api");
+
+    try {
+      api.get("/something/:username", INFLIGHT_CODE_NO_BODY);
+      api.get("/something_else/:username", INFLIGHT_CODE_NO_BODY);
+      expect(true).toBeTruthy();
+    } catch (e) {
+      expect(false).toBeTruthy();
+    }
+  });
+});
diff --git a/libs/wingsdk/test/target-sim/app.test.ts b/libs/wingsdk/test/target-sim/app.test.ts
index 56ddaa08969..bdcff1b4910 100644
--- a/libs/wingsdk/test/target-sim/app.test.ts
+++ b/libs/wingsdk/test/target-sim/app.test.ts
@@ -1,11 +1,19 @@
 import { basename, join } from "path";
+import { Construct } from "constructs";
 import { test, expect } from "vitest";
 import { simulatorJsonOf } from "./util";
 import { Bucket } from "../../src/cloud";
+import { inflight } from "../../src/core";
+import { Test } from "../../src/std";
 import { App } from "../../src/target-sim/app";
+import { SimApp } from "../sim-app";
 import { mkdtemp } from "../util";
 
-test("app name can be customized", async () => {
+const TEST_CODE = inflight(async () => {
+  console.log("this test should pass!");
+});
+
+test("app name can be customized", () => {
   // GIVEN
   const APP_NAME = "my-app";
 
@@ -19,3 +27,56 @@ test("app name can be customized", async () => {
   expect(basename(simfile)).toEqual(`${APP_NAME}.wsim`);
   expect(JSON.stringify(simulatorJsonOf(simfile))).toContain("my_bucket");
 });
+
+test("tests do not synthesize functions when test mode is off", async () => {
+  // GIVEN
+  class Root extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      new Bucket(this, "my_bucket");
+      new Test(this, "test:my_test1", TEST_CODE);
+      new Test(this, "test:my_test2", TEST_CODE);
+    }
+  }
+  const app = new SimApp({ isTestEnvironment: false, rootConstruct: Root });
+
+  // WHEN
+  const s = await app.startSimulator();
+  const resources = s.listResources();
+  await s.stop();
+
+  // THEN
+  expect(resources.sort()).toEqual([
+    "root/Default/my_bucket",
+    "root/Default/my_bucket/Policy",
+  ]);
+});
+
+test("tests are synthesized into individual environments when test mode is on", async () => {
+  // GIVEN
+  class Root extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      new Bucket(this, "my_bucket");
+      new Test(this, "test:my_test1", TEST_CODE);
+      new Test(this, "test:my_test2", TEST_CODE);
+    }
+  }
+  const app = new SimApp({ isTestEnvironment: true, rootConstruct: Root });
+
+  // WHEN
+  const s = await app.startSimulator();
+  const resources = s.listResources();
+  await s.stop();
+
+  // THEN
+  expect(resources.sort()).toEqual([
+    "root/cloud.TestRunner",
+    "root/env0/my_bucket",
+    "root/env0/my_bucket/Policy",
+    "root/env0/test:my_test1/Handler",
+    "root/env1/my_bucket",
+    "root/env1/my_bucket/Policy",
+    "root/env1/test:my_test2/Handler",
+  ]);
+});
diff --git a/libs/wingsdk/test/target-sim/binding.test.ts b/libs/wingsdk/test/target-sim/binding.test.ts
index 166c5de6acf..401c058c6f5 100644
--- a/libs/wingsdk/test/target-sim/binding.test.ts
+++ b/libs/wingsdk/test/target-sim/binding.test.ts
@@ -1,13 +1,14 @@
 import { test, expect } from "vitest";
-import { Function } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { Bucket, Function } from "../../src/cloud";
+import { Lifting, inflight } from "../../src/core";
 import { SimApp } from "../sim-app";
 
-test.skip("binding throws if a method is unsupported", () => {
+test("binding throws if a method is unsupported", () => {
   const app = new SimApp();
-  const handler = Testing.makeHandler("async handle() {}");
+  const bucket = new Bucket(app, "Bucket");
+  const handler = inflight(async () => {});
   const host = new Function(app, "Function", handler);
-  expect(() => (handler as any)._addOnLift(host, ["foo", "bar"])).toThrow(
-    /Resource root\/Handler does not support inflight operation foo \(requested by root\/Function\)/
+  expect(() => Lifting.lift(bucket, host, ["foo", "bar"])).toThrow(
+    /Resource root\/Bucket does not support inflight operation foo/
   );
 });
diff --git a/libs/wingsdk/test/target-sim/bucket.test.ts b/libs/wingsdk/test/target-sim/bucket.test.ts
index 4cd70858f74..9c3f8a93105 100644
--- a/libs/wingsdk/test/target-sim/bucket.test.ts
+++ b/libs/wingsdk/test/target-sim/bucket.test.ts
@@ -1,12 +1,14 @@
 import * as fs from "fs";
-import { resolve } from "path";
-import { vi, test, expect } from "vitest";
+import { resolve, join } from "path";
+import { test, expect } from "vitest";
 import { listMessages, treeJsonOf, waitUntilTraceCount } from "./util";
 import * as cloud from "../../src/cloud";
 import { BucketEventType } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight, lift } from "../../src/core";
 import { Node } from "../../src/std";
+import { METADATA_FILENAME } from "../../src/target-sim/bucket.inflight";
 import { SimApp } from "../sim-app";
+import { mkdtemp } from "../util";
 
 test("create a bucket", async () => {
   // GIVEN
@@ -20,6 +22,8 @@ test("create a bucket", async () => {
       handle: expect.any(String),
     },
     path: "root/my_bucket",
+    addr: expect.any(String),
+    policy: [],
     props: {
       public: false,
       initialObjects: {},
@@ -36,22 +40,26 @@ test("update an object in bucket", async () => {
   // GIVEN
   const app = new SimApp();
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const testInflight = Testing.makeHandler("null");
+  const testInflight = inflight(async () => console.log("I am done"));
   bucket.onCreate(testInflight);
 
   const s = await app.startSimulator();
   const client = s.getResource("/my_bucket") as cloud.IBucketClient;
-
-  const KEY = "greeting.txt";
-  const VALUE = JSON.stringify({ msg: "Hello world!" });
+  const KEY = "1.txt";
 
   // WHEN
-  await client.put(KEY, VALUE);
-  await client.put(KEY, JSON.stringify({ msg: "another msg" }));
+  await client.put(KEY, JSON.stringify({ msg: "Hello world 1!" }));
+  await client.put(KEY, JSON.stringify({ msg: "Hello world 2!" }));
+  await waitUntilTraceCount(s, 1, (trace) =>
+    trace.data.message.includes(`I am done`)
+  );
 
   // THEN
   await s.stop();
   expect(listMessages(s)).toMatchSnapshot();
+  // The bucket notification topic should only publish one message, since the
+  // second put() call counts as an update, not a create.
+  expect(listMessages(s).filter((m) => m.includes(`Publish`))).toHaveLength(1);
 });
 
 test("bucket on event creates 3 topics, and sends the right event and key in the event handlers", async () => {
@@ -59,15 +67,12 @@ test("bucket on event creates 3 topics, and sends the right event and key in the
   const app = new SimApp();
   const bucket = new cloud.Bucket(app, "my_bucket");
   const logBucket = new cloud.Bucket(app, "log_bucket");
-  const testInflight = Testing.makeHandler(
-    `async handle(key, event) { await this.bucket.put(key, event); }`,
-    {
-      bucket: {
-        obj: logBucket,
-        ops: [cloud.BucketInflightMethods.PUT],
-      },
-    }
-  );
+  const testInflight = lift({ bucket: logBucket })
+    .grant({ bucket: [cloud.BucketInflightMethods.PUT] })
+    .inflight(async (ctx, key, event) => {
+      await ctx.bucket.put(key, event);
+      console.log("I am done");
+    });
 
   bucket.onEvent(testInflight);
 
@@ -79,17 +84,17 @@ test("bucket on event creates 3 topics, and sends the right event and key in the
   await client.put("a", "1");
   // wait for the subscriber to finish
   await waitUntilTraceCount(s, 1, (trace) =>
-    trace.data.message.startsWith("Invoke")
+    trace.data.message.includes("I am done")
   );
   expect(await logClient.get("a")).toBe(BucketEventType.CREATE);
   await client.put("a", "2");
   await waitUntilTraceCount(s, 2, (trace) =>
-    trace.data.message.startsWith("Invoke")
+    trace.data.message.startsWith("I am done")
   );
   expect(await logClient.get("a")).toBe(BucketEventType.UPDATE);
   await client.delete("a");
   await waitUntilTraceCount(s, 3, (trace) =>
-    trace.data.message.startsWith("Invoke")
+    trace.data.message.startsWith("I am done")
   );
   expect(await logClient.get("a")).toBe(BucketEventType.DELETE);
   await s.stop();
@@ -367,9 +372,9 @@ test("removing a key will call onDelete method", async () => {
   const app = new SimApp();
 
   const bucket = new cloud.Bucket(app, bucketName);
-  const testInflight = Testing.makeHandler(
-    `async handle(key) { console.log("Received " + key); }`
-  );
+  const testInflight = inflight(async (_, key) => {
+    console.log("Received " + key);
+  });
   bucket.onDelete(testInflight);
 
   const s = await app.startSimulator();
@@ -380,7 +385,7 @@ test("removing a key will call onDelete method", async () => {
   await client.put(fileName, JSON.stringify({ msg: "Hello world!" }));
   const response = await client.delete(fileName);
   await waitUntilTraceCount(s, 1, (trace) =>
-    trace.data.message.startsWith("Invoke")
+    trace.data.message.startsWith("Received unknown.txt")
   );
 
   // THEN
@@ -770,6 +775,169 @@ test("copy non-existent object within the bucket", async () => {
   await s.stop();
 });
 
+test("rename valid object within the bucket", async () => {
+  // GIVEN
+  const app = new SimApp();
+  new cloud.Bucket(app, "my_bucket");
+
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_bucket") as cloud.IBucketClient;
+
+  let SRC_KEY = "original.txt";
+  let SRC_VALUE = "Hello, Wing!";
+  let DST_KEY = "renamed.txt";
+
+  // WHEN
+  await client.put(SRC_KEY, SRC_VALUE);
+
+  await client.rename(SRC_KEY, DST_KEY);
+  const srcFileExists = await client.exists(SRC_KEY);
+  const dstFileExists = await client.exists(DST_KEY);
+  const dstFileValue = await client.get(DST_KEY);
+
+  // THEN
+  await s.stop();
+  expect(srcFileExists).toBe(false);
+  expect(dstFileExists).toBe(true);
+  expect(dstFileValue).toEqual(SRC_VALUE);
+});
+
+test("rename valid object with overwrite within the bucket", async () => {
+  // GIVEN
+  const app = new SimApp();
+  new cloud.Bucket(app, "my_bucket");
+
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_bucket") as cloud.IBucketClient;
+
+  let SRC_KEY = "original.txt";
+  let SRC_VALUE = "Hello, Wing!";
+  let DST_KEY = "to-overwrite.txt";
+  let DST_VALUE = "Hello, World!";
+
+  // WHEN
+  await client.put(SRC_KEY, SRC_VALUE);
+  await client.put(DST_KEY, DST_VALUE);
+
+  await client.rename(SRC_KEY, DST_KEY);
+  const srcFileExists = await client.exists(SRC_KEY);
+  const dstFileExists = await client.exists(DST_KEY);
+  const dstFileValue = await client.get(DST_KEY);
+
+  // THEN
+  await s.stop();
+  expect(srcFileExists).toBe(false);
+  expect(dstFileExists).toBe(true);
+  expect(dstFileValue).toEqual(SRC_VALUE);
+});
+
+test("rename invalid object within the bucket", async () => {
+  // GIVEN
+  const app = new SimApp();
+  new cloud.Bucket(app, "my_bucket");
+
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_bucket") as cloud.IBucketClient;
+
+  let SRC_KEY = "original.txt";
+  let SRC_VALUE = "Hello, Wing!";
+
+  // WHEN
+  await client.put(SRC_KEY, SRC_VALUE);
+
+  // THEN
+  await expect(() => client.rename(SRC_KEY, SRC_KEY)).rejects.toThrowError(
+    `Renaming an object to its current name is not a valid operation (srcKey=${SRC_KEY}, dstKey=${SRC_KEY}).`
+  );
+  await s.stop();
+});
+
+test("rename non-existent object within the bucket", async () => {
+  // GIVEN
+  const app = new SimApp();
+  new cloud.Bucket(app, "my_bucket");
+
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_bucket") as cloud.IBucketClient;
+
+  let SRC_KEY = "original.txt";
+  let SRC_VALUE = "Hello, Wing!";
+  let DST_KEY = "renamed.txt";
+
+  // THEN
+  await expect(() => client.rename(SRC_KEY, DST_KEY)).rejects.toThrowError(
+    /Source object does not exist/
+  );
+  await s.stop();
+});
+
+test("bucket is stateful across simulations", async () => {
+  // GIVEN
+  const app = new SimApp();
+  const bucket = new cloud.Bucket(app, "my_bucket");
+
+  // addObject means that each deployment, object ("a", "1") will be set on the bucket
+  // even if a different object with the same key is added in-flight
+  bucket.addObject("a", "1");
+
+  // WHEN
+  const stateDir = mkdtemp();
+  const s = await app.startSimulator(stateDir);
+
+  const client = s.getResource("/my_bucket") as cloud.IBucketClient;
+  await client.put("a", "2"); // override contents of file "a" inflight
+  await client.put("b", "2");
+  const metadata1 = await client.metadata("a");
+  const metadata2 = await client.metadata("b");
+  await s.stop();
+
+  // restart the simulator, re-initializing all resources
+  // this will reset "a" to its original value
+
+  await s.start();
+  const client2 = s.getResource("/my_bucket") as cloud.IBucketClient;
+  const dataA = await client2.get("a");
+  const dataB = await client2.get("b");
+  const metadata3 = await client2.metadata("a");
+  const metadata4 = await client2.metadata("b");
+
+  // THEN
+  await s.stop();
+  expect(dataA).toEqual("1");
+  expect(dataB).toEqual("2"); // "b" will be remembered
+  expect(metadata1).not.toEqual(metadata3);
+  expect(metadata2).toEqual(metadata4);
+});
+
+test("bucket ignores corrupted state file", async () => {
+  // GIVEN
+  const app = new SimApp();
+  new cloud.Bucket(app, "my_bucket");
+
+  // run simulator one time
+  const stateDir = mkdtemp();
+  const s = await app.startSimulator(stateDir);
+  const client = s.getResource("/my_bucket") as cloud.IBucketClient;
+  await client.put("a", "1");
+  await s.stop();
+
+  // WHEN
+  // corrupt the state file
+  const metadata = join(s.getResourceStateDir("/my_bucket"), METADATA_FILENAME);
+  fs.writeFileSync(metadata, "corrupted");
+
+  // restart the simulator
+  await s.start();
+  const client2 = s.getResource("/my_bucket") as cloud.IBucketClient;
+  await client2.put("b", "2");
+  const files = await client2.list();
+  await s.stop();
+
+  // THEN
+  // we lost all metadata, but the bucket is still functional
+  expect(files).toEqual(["b"]);
+});
+
 // Deceided to seperate this feature in a different release,(see https://github.com/winglang/wing/issues/4143)
 
 // test("Given a bucket when reaching to a non existent key, signed url it should throw an error", async () => {
diff --git a/libs/wingsdk/test/target-sim/container.test.ts b/libs/wingsdk/test/target-sim/container.test.ts
new file mode 100644
index 00000000000..b7f108fbc7d
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/container.test.ts
@@ -0,0 +1,177 @@
+import { cpSync, writeFileSync, readdirSync } from "fs";
+import { join, basename } from "path";
+import { test, expect } from "vitest";
+import { Function, IFunctionClient, IFunctionHandler } from "../../src/cloud";
+import { lift } from "../../src/core";
+import { Container } from "../../src/target-sim/container";
+import { SimApp } from "../sim-app";
+import { mkdtemp } from "../util";
+
+test("simple container from registry", async () => {
+  const app = new SimApp();
+
+  const c = new Container(app, "Container", {
+    name: "http-echo",
+    image: "hashicorp/http-echo",
+    containerPort: 5678,
+    args: ["-text=bang"],
+  });
+
+  new Function(app, "Function", httpGet(c));
+
+  const sim = await app.startSimulator();
+  sim.onTrace({ callback: (trace) => console.log(">", trace.data.message) });
+
+  const fn = sim.getResource("root/Function") as IFunctionClient;
+  const response = await fn.invoke();
+  expect(response).toStrictEqual("bang\n");
+
+  await sim.stop();
+});
+
+test("simple container from a dockerfile", async () => {
+  const app = new SimApp();
+
+  const c = new Container(app, "Container", {
+    name: "my-app",
+    image: join(__dirname, "my-docker-image"),
+    containerPort: 3000,
+  });
+
+  new Function(app, "Function", httpGet(c));
+
+  const sim = await app.startSimulator();
+  sim.onTrace({ callback: (trace) => console.log(">", trace.data.message) });
+
+  const fn = sim.getResource("root/Function") as IFunctionClient;
+  const response = await fn.invoke();
+  expect(response).toStrictEqual("Hello, Wingnuts!");
+
+  await sim.stop();
+});
+
+test("no port, no urls", async () => {
+  const app = new SimApp();
+  const c = new Container(app, "Container", {
+    name: "my-app",
+    image: "bla",
+  });
+  expect(c.hostPort).toBeUndefined();
+});
+
+test("no public url", async () => {
+  const app = new SimApp();
+  const c = new Container(app, "Container", {
+    name: "my-app",
+    image: "bla",
+  });
+  expect(c.hostPort).toBeUndefined();
+});
+
+test("rebuild only if content had changes", async () => {
+  const workdir = mkdtemp();
+  cpSync(join(__dirname, "my-docker-image"), workdir, { recursive: true });
+
+  class MyApp extends SimApp {
+    constructor() {
+      super();
+
+      const c = new Container(this, "Container", {
+        name: "my-app",
+        image: workdir,
+        containerPort: 3000,
+      });
+    }
+
+    public async cycle() {
+      const sim = await this.startSimulator();
+      await sim.stop();
+      return sim.listTraces().map((t) => t.data.message);
+    }
+  }
+
+  const app1 = new MyApp();
+  const r1 = await app1.cycle();
+
+  const app2 = new MyApp();
+  const r2 = await app2.cycle();
+
+  expect(r2[1]).toBe(
+    "Image my-app:a9ae83b54b1ec21faa1a3255f05c095c found, No need to build or pull."
+  );
+
+  // add a file to the workdir and see that we are rebuilding
+  writeFileSync(
+    join(workdir, "new-file"),
+    `${new Date().toISOString()}-${Math.random() * 9999}`
+  );
+
+  const app3 = new MyApp();
+  const r3 = await app3.cycle();
+  expect(r3[1]).toContain("Building ");
+});
+
+test("simple container with a volume", async () => {
+  const app = new SimApp();
+
+  const c = new Container(app, "Container", {
+    name: "my-app",
+    image: join(__dirname, "my-docker-image.volume"),
+    containerPort: 3000,
+    volumes: [`${__dirname}:/tmp`],
+  });
+
+  new Function(app, "Function", httpGet(c));
+
+  const sim = await app.startSimulator();
+  sim.onTrace({ callback: (trace) => console.log(">", trace.data.message) });
+
+  const fn = sim.getResource("root/Function") as IFunctionClient;
+  const response = await fn.invoke();
+  expect(response).contains(basename(__filename));
+
+  await sim.stop();
+});
+
+test("anonymous volume can be reused across restarts", async () => {
+  const app = new SimApp();
+
+  const c = new Container(app, "Container", {
+    name: "my-app",
+    image: join(__dirname, "my-docker-image.mounted-volume"),
+    containerPort: 3000,
+    volumes: ["/tmp"],
+  });
+
+  new Function(app, "Function", httpGet(c));
+
+  const sim = await app.startSimulator();
+  sim.onTrace({
+    callback: (trace) =>
+      console.log(">", trace.data?.error?.stack ?? trace.data.message),
+  });
+
+  const fn = sim.getResource("root/Function") as IFunctionClient;
+  const response = await fn.invoke();
+  expect(response?.split("\n").filter((s) => s.endsWith(".txt"))).toEqual([
+    "hello.txt",
+  ]);
+
+  await sim.stop();
+  await sim.start();
+
+  const fn2 = sim.getResource("root/Function") as IFunctionClient;
+  const response2 = await fn2.invoke();
+  expect(response2?.split("\n").filter((s) => s.endsWith(".txt"))).toEqual([
+    "hello.txt",
+    "world.txt",
+  ]);
+});
+
+function httpGet(c: Container): IFunctionHandler {
+  return lift({ hostPort: c.hostPort }).inflight(async (ctx) => {
+    const url = "http://localhost:" + ctx.hostPort;
+    const res = await fetch(url);
+    return res.text();
+  });
+}
diff --git a/libs/wingsdk/test/target-sim/counter.test.ts b/libs/wingsdk/test/target-sim/counter.test.ts
index 7ad24dedc82..87cf8bb83b2 100644
--- a/libs/wingsdk/test/target-sim/counter.test.ts
+++ b/libs/wingsdk/test/target-sim/counter.test.ts
@@ -4,6 +4,7 @@ import * as cloud from "../../src/cloud";
 import { ICounterClient } from "../../src/cloud";
 import { Node } from "../../src/std";
 import { SimApp } from "../sim-app";
+import { mkdtemp } from "../util";
 
 test("create a counter", async () => {
   // GIVEN
@@ -15,16 +16,6 @@ test("create a counter", async () => {
   expect(c.initial).toBe(123);
 
   const s = await app.startSimulator();
-  expect(s.getResourceConfig("/my_counter")).toEqual({
-    attrs: {
-      handle: expect.any(String),
-    },
-    path: "root/my_counter",
-    props: {
-      initial: 123,
-    },
-    type: cloud.COUNTER_FQN,
-  });
   await s.stop();
 
   expect(app.snapshot()).toMatchSnapshot();
@@ -274,3 +265,32 @@ test("counter has display title and description properties", async () => {
     },
   });
 });
+
+test("counter is stateful across simulations", async () => {
+  // GIVEN
+  const app = new SimApp();
+  const counter = new cloud.Counter(app, "my_counter", { initial: 5 });
+
+  // WHEN
+  const stateDir = mkdtemp();
+  const s = await app.startSimulator(stateDir);
+
+  const client = s.getResource("/my_counter") as cloud.ICounterClient;
+  const value1 = await client.peek();
+  const value2 = await client.inc(1, "key");
+  await s.stop();
+
+  // restart the simulator
+
+  await s.start();
+  const client2 = s.getResource("/my_counter") as cloud.ICounterClient;
+  const value3 = await client2.peek();
+  const value4 = await client2.peek("key");
+
+  // THEN
+  await s.stop();
+  expect(value1).toEqual(5);
+  expect(value2).toEqual(5);
+  expect(value3).toEqual(5);
+  expect(value4).toEqual(6); // value from previous simulation
+});
diff --git a/libs/wingsdk/test/target-sim/dynamodb-table.test.ts b/libs/wingsdk/test/target-sim/dynamodb-table.test.ts
deleted file mode 100644
index 2e6e6715bd3..00000000000
--- a/libs/wingsdk/test/target-sim/dynamodb-table.test.ts
+++ /dev/null
@@ -1,530 +0,0 @@
-import { test, expect } from "vitest";
-import { listMessages } from "./util";
-import * as ex from "../../src/ex";
-import { SimApp } from "../sim-app";
-
-test("create a table", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "create_table", {
-    name: "new_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-
-  const s = await app.startSimulator();
-  expect(s.getResourceConfig("/create_table")).toEqual({
-    attrs: {
-      handle: expect.any(String),
-    },
-    path: "root/create_table",
-    props: {
-      name: "new_table",
-      attributeDefinitions: {
-        id: "S",
-      },
-      hashKey: "id",
-    },
-    type: ex.DYNAMODB_TABLE_FQN,
-  });
-  await s.stop();
-
-  expect(app.snapshot()).toMatchSnapshot();
-});
-
-test("put item", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "put_table", {
-    name: "my_insert_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource("/put_table") as ex.IDynamodbTableClient;
-
-  const expectedValue = { id: "1", name: "Joe Doe", age: 50 };
-  await client.putItem({ item: expectedValue as any });
-  const result = await client.getItem({ key: { id: "1" } as any });
-  expect(result.item).toEqual(expectedValue);
-
-  expect(s.getResourceConfig("/put_table")).toEqual({
-    attrs: {
-      handle: expect.any(String),
-    },
-    path: "root/put_table",
-    props: {
-      name: "my_insert_table",
-      attributeDefinitions: {
-        id: "S",
-      },
-      hashKey: "id",
-    },
-    type: ex.DYNAMODB_TABLE_FQN,
-  });
-  await s.stop();
-
-  expect(listMessages(s)).toMatchSnapshot();
-  expect(app.snapshot()).toMatchSnapshot();
-});
-
-test("get item", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "get_table", {
-    name: "my_get_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource("/get_table") as ex.IDynamodbTableClient;
-
-  const expectedValue = { id: "1", name: "Joe Doe", age: 50 };
-  await client.putItem({ item: expectedValue as any });
-  const joe = await client.getItem({ key: { id: "1" } as any });
-  expect(joe.item).toEqual(expectedValue);
-
-  expect(s.getResourceConfig("/get_table")).toEqual({
-    attrs: {
-      handle: expect.any(String),
-    },
-    path: "root/get_table",
-    props: {
-      name: "my_get_table",
-      attributeDefinitions: {
-        id: "S",
-      },
-      hashKey: "id",
-    },
-    type: ex.DYNAMODB_TABLE_FQN,
-  });
-  await s.stop();
-
-  expect(listMessages(s)).toMatchSnapshot();
-  expect(app.snapshot()).toMatchSnapshot();
-});
-
-test("update item", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "update_table", {
-    name: "my_update_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource("/update_table") as ex.IDynamodbTableClient;
-
-  const expectedValue = { id: "1", name: "Joe Doe", age: 50 };
-  await client.putItem({ item: expectedValue as any });
-  let joe = await client.getItem({ key: { id: "1" } as any });
-  expect(joe.item).toEqual(expectedValue);
-  await client.updateItem({
-    key: { id: "1" } as any,
-    updateExpression: "set age = :age",
-    expressionAttributeValues: { ":age": 51 } as any,
-  });
-  joe = await client.getItem({ key: { id: "1" } as any });
-  expect(joe.item).toEqual({ id: "1", name: "Joe Doe", age: 51 });
-
-  expect(s.getResourceConfig("/update_table")).toEqual({
-    attrs: {
-      handle: expect.any(String),
-    },
-    path: "root/update_table",
-    props: {
-      name: "my_update_table",
-      attributeDefinitions: {
-        id: "S",
-      },
-      hashKey: "id",
-    },
-    type: ex.DYNAMODB_TABLE_FQN,
-  });
-  await s.stop();
-
-  expect(listMessages(s)).toMatchSnapshot();
-  expect(app.snapshot()).toMatchSnapshot();
-});
-
-test("inserting the same id twice", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "put_twice_table", {
-    name: "my_insert_twice_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource("/put_twice_table") as ex.IDynamodbTableClient;
-
-  await client.putItem({ item: { id: "1", name: "Joe Doe" } as any });
-  let joe = await client.getItem({ key: { id: "1" } as any });
-  expect(joe.item).toEqual({ id: "1", name: "Joe Doe" });
-
-  await client.putItem({ item: { id: "1", name: "Joe Doe II" } as any });
-  joe = await client.getItem({ key: { id: "1" } as any });
-  expect(joe.item).toEqual({ id: "1", name: "Joe Doe II" });
-
-  await expect(() =>
-    client.putItem({
-      item: { id: "1", name: "Joe Doe III" } as any,
-      conditionExpression: "attribute_not_exists(id)",
-    })
-  ).rejects.toThrow(/The conditional request failed/);
-
-  await s.stop();
-});
-
-test("update non-existent item", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "update_non_existing_table", {
-    name: "my_update_non_existent_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource(
-    "/update_non_existing_table"
-  ) as ex.IDynamodbTableClient;
-
-  await client.updateItem({
-    key: { id: "1" } as any,
-    updateExpression: "set age = :age",
-    expressionAttributeValues: { ":age": 50 } as any,
-  });
-  const joe = await client.getItem({ key: { id: "1" } as any });
-  expect(joe.item).toEqual({ id: "1", age: 50 });
-
-  await s.stop();
-});
-
-test("delete item", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "delete_table", {
-    name: "my_delete_non_existent_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource("/delete_table") as ex.IDynamodbTableClient;
-
-  await client.putItem({ item: { id: "1", age: 50 } as any });
-  await client.deleteItem({ key: { id: "1" } as any });
-  let joe = await client.getItem({ key: { id: "1" } as any });
-  expect(joe.item).toBeUndefined();
-
-  // will not throw
-  await client.deleteItem({ key: { id: "1" } as any });
-
-  await s.stop();
-});
-
-test("scan", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "scan_table", {
-    name: "scan_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource("/scan_table") as ex.IDynamodbTableClient;
-
-  await client.putItem({ item: { id: "1", age: 50 } as any });
-  await client.putItem({ item: { id: "2", loc: "US" } as any });
-  const result = await client.scan();
-  expect(result.items).toEqual([
-    { id: "1", age: 50 },
-    { id: "2", loc: "US" },
-  ]);
-
-  await s.stop();
-});
-
-test("query", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "query_table", {
-    name: "query_table",
-    attributeDefinitions: { id: "S", age: "N" } as any,
-    hashKey: "id",
-    rangeKey: "age",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource("/query_table") as ex.IDynamodbTableClient;
-
-  await client.putItem({ item: { id: "1", age: 2 } as any });
-  await client.putItem({ item: { id: "1", age: 1 } as any });
-  await client.putItem({ item: { id: "2", age: 3 } as any });
-  await client.putItem({ item: { id: "2", age: 1 } as any });
-  {
-    const result = await client.query({
-      keyConditionExpression: "id = :id",
-      expressionAttributeValues: { ":id": "1" } as any,
-    });
-    expect(result.items).toEqual([
-      { id: "1", age: 1 },
-      { id: "1", age: 2 },
-    ]);
-  }
-  {
-    const result = await client.query({
-      keyConditionExpression: "id = :id",
-      expressionAttributeValues: { ":id": "2" } as any,
-    });
-    expect(result.items).toEqual([
-      { id: "2", age: 1 },
-      { id: "2", age: 3 },
-    ]);
-  }
-
-  await s.stop();
-});
-
-test("transact get items", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "transact_get_items_table", {
-    name: "transact_get_items_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource(
-    "/transact_get_items_table"
-  ) as ex.IDynamodbTableClient;
-
-  // WHEN
-  await client.batchWriteItem({
-    requestItems: [
-      {
-        putRequest: {
-          item: {
-            id: "1",
-            age: 50,
-          } as any,
-        },
-      },
-      {
-        putRequest: {
-          item: {
-            id: "2",
-            age: 80,
-          } as any,
-        },
-      },
-    ],
-  });
-
-  // THEN
-  const { responses } = await client.transactGetItems({
-    transactItems: [
-      {
-        get: {
-          key: {
-            id: "1",
-          } as any,
-        },
-      },
-      {
-        get: {
-          key: {
-            id: "2",
-          } as any,
-        },
-      },
-    ],
-  });
-  expect(responses).toEqual([
-    { item: { id: "1", age: 50 } },
-    { item: { id: "2", age: 80 } },
-  ]);
-
-  await s.stop();
-});
-
-test("transact write items", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "transact_write_items_table", {
-    name: "transact_write_items_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource(
-    "/transact_write_items_table"
-  ) as ex.IDynamodbTableClient;
-
-  await client.putItem({ item: { id: "1", age: 50 } as any });
-  await client.putItem({ item: { id: "2", age: 80 } as any });
-  await client.transactWriteItems({
-    transactItems: [
-      {
-        put: {
-          item: {
-            id: "3",
-            age: 30,
-          } as any,
-        },
-      },
-      {
-        update: {
-          key: { id: "1" } as any,
-          updateExpression: "set age = :age",
-          expressionAttributeValues: { ":age": 51 } as any,
-        },
-      },
-      {
-        delete: {
-          key: { id: "2" } as any,
-        },
-      },
-    ],
-  });
-
-  let item1 = await client.getItem({ key: { id: "1" } as any });
-  expect(item1.item).toEqual({ id: "1", age: 51 });
-
-  let item2 = await client.getItem({ key: { id: "2" } as any });
-  expect(item2.item).toBeUndefined();
-
-  let item3 = await client.getItem({ key: { id: "3" } as any });
-  expect(item3.item).toEqual({ id: "3", age: 30 });
-
-  await s.stop();
-});
-
-test("batch get item", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "batch_get_item_table", {
-    name: "batch_get_item_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource(
-    "/batch_get_item_table"
-  ) as ex.IDynamodbTableClient;
-
-  await client.putItem({ item: { id: "1", age: 50 } as any });
-  await client.putItem({ item: { id: "2", age: 80 } as any });
-
-  const { responses } = await client.batchGetItem({
-    requestItem: {
-      keys: [
-        {
-          id: "1",
-        } as any,
-        {
-          id: "2",
-        } as any,
-      ],
-    },
-  });
-  expect(responses).toEqual([
-    { id: "1", age: 50 },
-    { id: "2", age: 80 },
-  ]);
-
-  await s.stop();
-});
-
-test("batch write item", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const t = new ex.DynamodbTable(app, "batch_write_item_table", {
-    name: "batch_write_item_table",
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-  });
-  const s = await app.startSimulator();
-  const client = s.getResource(
-    "/batch_write_item_table"
-  ) as ex.IDynamodbTableClient;
-
-  // WHEN
-  await client.batchWriteItem({
-    requestItems: [
-      {
-        putRequest: {
-          item: {
-            id: "1",
-            age: 50,
-          } as any,
-        },
-      },
-      {
-        putRequest: {
-          item: {
-            id: "2",
-            age: 80,
-          } as any,
-        },
-      },
-    ],
-  });
-
-  // THEN
-  {
-    const { responses } = await client.batchGetItem({
-      requestItem: {
-        keys: [
-          {
-            id: "1",
-          } as any,
-          {
-            id: "2",
-          } as any,
-        ],
-      },
-    });
-    expect(responses).toEqual([
-      { id: "1", age: 50 },
-      { id: "2", age: 80 },
-    ]);
-  }
-
-  // WHEN
-  await client.batchWriteItem({
-    requestItems: [
-      {
-        deleteRequest: {
-          key: {
-            id: "1",
-          } as any,
-        },
-      },
-      {
-        deleteRequest: {
-          key: {
-            id: "2",
-          } as any,
-        },
-      },
-    ],
-  });
-
-  // THEN
-  {
-    const { responses } = await client.batchGetItem({
-      requestItem: {
-        keys: [
-          {
-            id: "1",
-          } as any,
-          {
-            id: "2",
-          } as any,
-        ],
-      },
-    });
-    expect(responses).toEqual([]);
-  }
-
-  await s.stop();
-});
diff --git a/libs/wingsdk/test/target-sim/file-counter.test.ts b/libs/wingsdk/test/target-sim/file-counter.test.ts
index 0893e35b0cf..8c79c9e9871 100644
--- a/libs/wingsdk/test/target-sim/file-counter.test.ts
+++ b/libs/wingsdk/test/target-sim/file-counter.test.ts
@@ -2,12 +2,13 @@ import { Construct } from "constructs";
 import { test, expect } from "vitest";
 import { waitUntilTraceCount } from "./util";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { lift } from "../../src/core";
 import { IResource, Trace } from "../../src/std";
 import { SimApp } from "../sim-app";
 
 test(
   "can create sequential files in a bucket",
+  { timeout: 20_000 },
   async () => {
     // GIVEN
     class HelloWorld extends Construct {
@@ -19,26 +20,22 @@ test(
         const counter = new cloud.Counter(this, "Counter", {
           initial: 1000,
         });
+
         const bucket = new cloud.Bucket(this, "Bucket");
         const queue = new cloud.Queue(this, "Queue");
-        const processor = Testing.makeHandler(
-          `async handle(event) {
-          let next = await this.counter.inc();
-          let key = "file-" + next + ".txt";
-          await this.bucket.put(key, event);
-        }`,
-          {
-            counter: {
-              obj: counter,
-              ops: [cloud.CounterInflightMethods.INC],
-            },
-            bucket: {
-              obj: bucket,
-              ops: [cloud.BucketInflightMethods.PUT],
-            },
-          }
+
+        this.processor = queue.setConsumer(
+          lift({ counter, bucket })
+            .grant({
+              counter: [cloud.CounterInflightMethods.INC],
+              bucket: [cloud.BucketInflightMethods.PUT],
+            })
+            .inflight(async (ctx, event) => {
+              let next = await ctx.counter.inc();
+              let key = "file-" + next + ".txt";
+              await ctx.bucket.put(key, event);
+            })
         );
-        this.processor = queue.setConsumer(processor);
       }
     }
 
@@ -66,6 +63,5 @@ test(
     await s.stop();
 
     expect(app.snapshot()).toMatchSnapshot();
-  },
-  { timeout: 20000 }
+  }
 );
diff --git a/libs/wingsdk/test/target-sim/function.test.ts b/libs/wingsdk/test/target-sim/function.test.ts
index acdec114223..5a0dc50a1b2 100644
--- a/libs/wingsdk/test/target-sim/function.test.ts
+++ b/libs/wingsdk/test/target-sim/function.test.ts
@@ -1,14 +1,13 @@
 import { test, expect } from "vitest";
 import { listMessages, treeJsonOf } from "./util";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { Node } from "../../src/std";
 import { SimApp } from "../sim-app";
 
-const INFLIGHT_CODE = `
-async handle(event) {
+const INFLIGHT_CODE = inflight(async (_, event) => {
   event = JSON.parse(event);
-  let msg;
+  let msg: string;
   if (event.name[0] !== event.name[0].toUpperCase()) {
     throw new Error("Name must start with uppercase letter");
   }
@@ -18,18 +17,16 @@ async handle(event) {
     msg = "Hello, " + event.name + "!";
   }
   return JSON.stringify({ msg });
-}`;
+});
 
-const INFLIGHT_PANIC = `
-async handle() {
+const INFLIGHT_PANIC = inflight(async () => {
   process.exit(1);
-}`;
+});
 
 test("create a function", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "my_function", handler, {
+  new cloud.Function(app, "my_function", INFLIGHT_CODE, {
     env: {
       ENV_VAR1: "true",
     },
@@ -42,12 +39,15 @@ test("create a function", async () => {
       handle: expect.any(String),
     },
     path: "root/my_function",
+    addr: expect.any(String),
+    policy: [],
     props: {
       sourceCodeFile: expect.any(String),
       sourceCodeLanguage: "javascript",
       environmentVariables: {
         ENV_VAR1: "true",
       },
+      concurrency: 100,
       timeout: 60000,
     },
     type: cloud.FUNCTION_FQN,
@@ -60,8 +60,7 @@ test("create a function", async () => {
 test("invoke function succeeds", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "my_function", handler);
+  new cloud.Function(app, "my_function", INFLIGHT_CODE);
 
   const s = await app.startSimulator();
 
@@ -79,11 +78,41 @@ test("invoke function succeeds", async () => {
   expect(app.snapshot()).toMatchSnapshot();
 });
 
+test("async invoke function cleanup while running", async () => {
+  // GIVEN
+  const app = new SimApp();
+
+  new cloud.Function(
+    app,
+    "my_function",
+    inflight(async (_, event) => {
+      // sleep forever
+      await new Promise(() => {});
+      return undefined;
+    })
+  );
+
+  const s = await app.startSimulator();
+
+  const client = s.getResource("/my_function") as cloud.IFunctionClient;
+
+  // WHEN
+  await client.invokeAsync();
+
+  // THEN
+  await s.stop();
+
+  // wait for a small time to let the child process fail to exit
+  await new Promise((resolve) => setTimeout(resolve, 150));
+
+  expect(s.listTraces().every((t) => t.data.error === undefined)).toBe(true);
+}, 10000);
+
 test("invoke function with environment variables", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "my_function", handler, {
+
+  new cloud.Function(app, "my_function", INFLIGHT_CODE, {
     env: {
       PIG_LATIN: "true",
     },
@@ -112,8 +141,7 @@ test("invoke function with environment variables", async () => {
 test("invoke function fails", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "my_function", handler);
+  new cloud.Function(app, "my_function", INFLIGHT_CODE);
   const s = await app.startSimulator();
 
   const client = s.getResource("/my_function") as cloud.IFunctionClient;
@@ -128,7 +156,7 @@ test("invoke function fails", async () => {
   await s.stop();
 
   expect(listMessages(s)).toMatchSnapshot();
-  expect(s.listTraces()[2].data.error).toMatchObject({
+  expect(s.listTraces()[1].data.error).toMatchObject({
     message: "Name must start with uppercase letter",
   });
   expect(app.snapshot()).toMatchSnapshot();
@@ -137,8 +165,7 @@ test("invoke function fails", async () => {
 test("function has no display hidden property", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "my_function", handler);
+  new cloud.Function(app, "my_function", INFLIGHT_CODE);
 
   const treeJson = treeJsonOf(app.synth());
   const func = app.node.tryFindChild("my_function") as cloud.Function;
@@ -158,8 +185,7 @@ test("function has no display hidden property", async () => {
 test("function has display title and description properties", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.Function(app, "my_function", handler);
+  new cloud.Function(app, "my_function", INFLIGHT_CODE);
 
   // WHEN
   const treeJson = treeJsonOf(app.synth());
@@ -181,20 +207,19 @@ test("function has display title and description properties", async () => {
 test("invoke function with process.exit(1)", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_PANIC);
-  new cloud.Function(app, "my_function", handler);
+  new cloud.Function(app, "my_function", INFLIGHT_PANIC);
   const s = await app.startSimulator();
   const client = s.getResource("/my_function") as cloud.IFunctionClient;
   // WHEN
   const PAYLOAD = {};
   await expect(client.invoke(JSON.stringify(PAYLOAD))).rejects.toThrow(
-    "process.exit() was called with exit code 1"
+    "Process exited with code 1, signal null"
   );
   // THEN
   await s.stop();
   expect(listMessages(s)).toMatchSnapshot();
-  expect(s.listTraces()[2].data.error).toMatchObject({
-    message: "process.exit() was called with exit code 1",
+  expect(s.listTraces()[1].data.error).toMatchObject({
+    message: "Process exited with code 1, signal null",
   });
   expect(app.snapshot()).toMatchSnapshot();
 });
@@ -202,27 +227,37 @@ test("invoke function with process.exit(1)", async () => {
 test("runtime environment tests", async () => {
   const app = new SimApp();
 
-  const urlSearchParamsFn = app.newCloudFunction(`
-    const query = "q=URLUtils.searchParams&topic=api";
-    const p = new URLSearchParams(query);
-    return p.get("topic");
-  `);
+  const urlSearchParamsFn = app.newCloudFunction(
+    inflight(async () => {
+      const query = "q=URLUtils.searchParams&topic=api";
+      const p = new URLSearchParams(query);
+      const value = p.get("topic");
+      if (!value) {
+        throw new Error("URLSearchParams failed");
+      }
+      return value;
+    })
+  );
 
   // check that fetch is a function (we can't really make network calls here)
-  const fetchFn = app.newCloudFunction(`
-    return typeof fetch;
-  `);
+  const fetchFn = app.newCloudFunction(inflight(async () => typeof fetch));
 
-  const cryptoFn = app.newCloudFunction(`
-    const c = require("crypto");
-    return typeof c.createHash;
-  `);
+  const cryptoFn = app.newCloudFunction(
+    inflight(async () => {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const c = require("crypto");
+      return typeof c.createHash;
+    })
+  );
 
   // check that we can import ESM modules
-  const esmModulesFn = app.newCloudFunction(`
-    const { nanoid } = await import("nanoid");
-    return nanoid();
-  `);
+  const esmModulesFn = app.newCloudFunction(
+    inflight(async () => {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const { nanoid } = require("nanoid");
+      return nanoid();
+    })
+  );
 
   // THEN
   const s = await app.startSimulator();
@@ -237,16 +272,23 @@ test("runtime environment tests", async () => {
 
 test("__dirname and __filename cannot be used within inflight code", async () => {
   const app = new SimApp();
-  const dirnameInvoker = app.newCloudFunction(`__dirname`);
-  const filenameInvoker = app.newCloudFunction(`__filename`);
+  const dirnameInvoker = app.newCloudFunction(inflight(async () => __dirname));
+  const filenameInvoker = app.newCloudFunction(
+    inflight(async () => __filename)
+  );
 
   const s = await app.startSimulator();
 
-  await expect(dirnameInvoker(s)).rejects.toThrow(
-    "__dirname cannot be used within bundled cloud functions"
-  );
+  await dirnameInvoker(s);
+  await filenameInvoker(s);
 
-  await expect(filenameInvoker(s)).rejects.toThrow(
-    "__filename cannot be used within bundled cloud functions"
-  );
+  await s.stop();
+
+  expect(
+    listMessages(s).filter((m) =>
+      m.includes(
+        "Warning: __dirname and __filename cannot be used within bundled cloud functions."
+      )
+    )
+  ).toHaveLength(2);
 });
diff --git a/libs/wingsdk/test/target-sim/immutable-capture.test.ts b/libs/wingsdk/test/target-sim/immutable-capture.test.ts
index 398ae04e34c..f727080d125 100644
--- a/libs/wingsdk/test/target-sim/immutable-capture.test.ts
+++ b/libs/wingsdk/test/target-sim/immutable-capture.test.ts
@@ -1,339 +1,288 @@
 import { Construct } from "constructs";
 import { test, expect } from "vitest";
-import { Bucket } from "../../src/cloud";
 import { Function, IFunctionClient } from "../../src/cloud/function";
-import { InflightBindings } from "../../src/core/inflight";
-import { Testing } from "../../src/simulator";
-import { Duration } from "../../src/std";
+import { lift } from "../../src/core/inflight";
+import { INFLIGHT_SYMBOL } from "../../src/core/types";
+import { Duration, IInflight } from "../../src/std";
 import { SimApp } from "../sim-app";
 
-interface CaptureTest {
-  bindings: InflightBindings;
-  inflightCode?: string[];
-  whenInflightExpression?: string;
-  thenResolvesTo?: any;
+interface ITestHandler extends IInflight {
+  [INFLIGHT_SYMBOL]?: ITestHandlerClient["handle"];
 }
 
-captureTest("array", () => ({
-  bindings: { my_capture: { obj: ["hello", "dude"] } },
-  inflightCode: [
-    `assert(this.my_capture.length === 2)`,
-    `assert(this.my_capture[0] === "hello")`,
-    `assert(this.my_capture[1] === "dude")`,
-  ],
-}));
+interface ITestHandlerClient {
+  handle(assert: (cond: boolean) => void): Promise<void>;
+}
 
-captureTest("string", () => ({
-  bindings: { my_capture: { obj: "bam bam bam" } },
-  inflightCode: [
-    `assert(this.my_capture.length === 11)`,
-    `assert(this.my_capture === "bam bam bam")`,
-  ],
-}));
+captureTest("array", () =>
+  lift({ my_capture: ["hello", "dude"] }).inflight(async (ctx, assert) => {
+    assert(ctx.my_capture.length === 2);
+    assert(ctx.my_capture[0] === "hello");
+    assert(ctx.my_capture[1] === "dude");
+    return undefined;
+  })
+);
 
-captureTest("number", () => ({
-  bindings: { my_capture: { obj: 123 } },
-  inflightCode: [`assert(this.my_capture + 20 === 143)`],
-}));
+captureTest("string", () =>
+  lift({ my_capture: "bam bam bam" }).inflight(async (ctx, assert) => {
+    assert(ctx.my_capture.length === 11);
+    assert(ctx.my_capture === "bam bam bam");
+    return undefined;
+  })
+);
 
-captureTest("boolean", () => ({
-  bindings: { my_capture: { obj: false } },
-  inflightCode: [`assert(this.my_capture === false)`],
-}));
+captureTest("number", () =>
+  lift({ my_capture: 123 }).inflight(async (ctx, assert) => {
+    assert(ctx.my_capture + 20 === 143);
+    return undefined;
+  })
+);
 
-captureTest("struct", () => ({
-  bindings: {
-    my_capture: { obj: { hello: "dude", world: "cup", foo: "bar" } },
-  },
-  inflightCode: [
-    `assert(this.my_capture.hello === "dude")`,
-    `assert(this.my_capture.world === "cup")`,
-    `assert(this.my_capture.foo === "bar")`,
-    `assert(Object.keys(this.my_capture).length === 3)`,
-  ],
-}));
+captureTest("boolean", () =>
+  lift({ my_capture: false }).inflight(async (ctx, assert) => {
+    assert(ctx.my_capture === false);
+    return undefined;
+  })
+);
 
-captureTest("set", () => ({
-  bindings: {
-    my_capture: { obj: new Set(["boom", "bam", "bang"]) },
-  },
-  inflightCode: [
-    `assert(this.my_capture.has("boom"))`,
-    `assert(this.my_capture.has("bam"))`,
-    `assert(this.my_capture.has("bang"))`,
-    `assert(this.my_capture.size === 3)`,
-  ],
-}));
+captureTest("struct", () =>
+  lift({
+    my_capture: { hello: "dude", world: "cup", foo: "bar" },
+  }).inflight(async (ctx, assert) => {
+    assert(ctx.my_capture.hello === "dude");
+    assert(ctx.my_capture.world === "cup");
+    assert(ctx.my_capture.foo === "bar");
+    assert(Object.keys(ctx.my_capture).length === 3);
+    return undefined;
+  })
+);
 
-captureTest("duration", () => ({
-  bindings: { my_capture: { obj: Duration.fromHours(2) } },
-  inflightCode: [
-    `assert(this.my_capture.minutes === 120)`,
-    `assert(this.my_capture.seconds === 7200)`,
-    `assert(this.my_capture.hours === 2)`,
-  ],
-}));
+captureTest("set", () =>
+  lift({ my_capture: new Set(["boom", "bam", "bang"]) }).inflight(
+    async (ctx, assert) => {
+      assert(ctx.my_capture.has("boom"));
+      assert(ctx.my_capture.has("bam"));
+      assert(ctx.my_capture.has("bang"));
+      assert(ctx.my_capture.size === 3);
+      return undefined;
+    }
+  )
+);
 
-captureTest("map", () => ({
-  bindings: {
-    my_capture: {
-      obj: Object.freeze(
-        new Map([
-          ["foo", 123],
-          ["bar", 456],
-        ])
-      ),
-    },
-  },
-  inflightCode: [
-    `assert(this.my_capture.has("foo"))`,
-    `assert(this.my_capture.has("bar"))`,
-    `assert(this.my_capture.size === 2)`,
-    `assert(this.my_capture.get("foo") === 123)`,
-    `assert(this.my_capture.get("bar") === 456)`,
-  ],
-}));
+captureTest("duration", () =>
+  lift({ my_capture: Duration.fromHours(2) }).inflight(async (ctx, assert) => {
+    assert(ctx.my_capture.minutes === 120);
+    assert(ctx.my_capture.seconds === 7200);
+    assert(ctx.my_capture.hours === 2);
+    return undefined;
+  })
+);
 
-captureTest("array of durations", () => ({
-  bindings: {
-    my_array: {
-      obj: [Duration.fromMinutes(10), Duration.fromMinutes(20)],
-    },
-  },
-  inflightCode: [
-    `assert(this.my_array.length === 2)`,
-    `assert(this.my_array[0].minutes === 10)`,
-    `assert(this.my_array[1].minutes === 20)`,
-  ],
-}));
+captureTest("map", () =>
+  lift({
+    my_capture: new Map([
+      ["foo", 123],
+      ["bar", 456],
+    ]),
+  }).inflight(async (ctx, assert) => {
+    assert(ctx.my_capture.has("foo"));
+    assert(ctx.my_capture.has("bar"));
+    assert(ctx.my_capture.size === 2);
+    assert(ctx.my_capture.get("foo") === 123);
+    assert(ctx.my_capture.get("bar") === 456);
+    return undefined;
+  })
+);
 
-captureTest("map of arrays", () => ({
-  bindings: {
-    my_map: {
-      obj: Object.freeze(
-        new Map([
-          ["foo", [1, 2]],
-          ["bar", [3, 4]],
-        ])
-      ),
-    },
-  },
-  inflightCode: [
-    `assert(this.my_map.has("foo"))`,
-    `assert(this.my_map.has("bar"))`,
-    `assert(this.my_map.size === 2)`,
-    `assert(this.my_map.get("foo")[0] === 1)`,
-    `assert(this.my_map.get("foo")[1] === 2)`,
-    `assert(this.my_map.get("bar")[0] === 3)`,
-    `assert(this.my_map.get("bar")[1] === 4)`,
-  ],
-}));
+captureTest("array of durations", () =>
+  lift({
+    my_array: [Duration.fromMinutes(10), Duration.fromMinutes(20)],
+  }).inflight(async (ctx, assert) => {
+    assert(ctx.my_array.length === 2);
+    assert(ctx.my_array[0].minutes === 10);
+    assert(ctx.my_array[1].minutes === 20);
+    return undefined;
+  })
+);
+
+captureTest("map of arrays", () =>
+  lift({
+    my_map: new Map([
+      ["foo", [1, 2]],
+      ["bar", [3, 4]],
+    ]),
+  }).inflight(async (ctx, assert) => {
+    assert(ctx.my_map.has("foo"));
+    assert(ctx.my_map.has("bar"));
+    assert(ctx.my_map.size === 2);
+    assert(ctx.my_map.get("foo")?.[0] === 1);
+    assert(ctx.my_map.get("foo")?.[1] === 2);
+    assert(ctx.my_map.get("bar")?.[0] === 3);
+    assert(ctx.my_map.get("bar")?.[1] === 4);
+    return undefined;
+  })
+);
 
 // array of maps
-captureTest("array of maps", () => ({
-  bindings: {
-    my_array: {
-      obj: [
-        Object.freeze(
-          new Map([
-            ["foo", 1],
-            ["bar", 2],
-          ])
-        ),
-        Object.freeze(
-          new Map([
-            ["foo", 3],
-            ["bar", 4],
-          ])
-        ),
-      ],
-    },
-  },
-  inflightCode: [
-    `assert(this.my_array[0].get('foo') === 1)`,
-    `assert(this.my_array[1].get('bar') === 4)`,
-  ],
-}));
+captureTest("array of maps", () =>
+  lift({
+    my_array: [
+      new Map([
+        ["foo", 1],
+        ["bar", 2],
+      ]),
+      new Map([
+        ["foo", 3],
+        ["bar", 4],
+      ]),
+    ],
+  }).inflight(async (ctx, assert) => {
+    assert(ctx.my_array[0].get("foo") === 1);
+    assert(ctx.my_array[1].get("bar") === 4);
+    return undefined;
+  })
+);
 
 // set of durations
-captureTest("set of durations", () => ({
-  bindings: {
-    my_set: {
-      obj: new Set([Duration.fromMinutes(10), Duration.fromMinutes(20)]),
-    },
-  },
-  inflightCode: [
-    `assert(Array.from(this.my_set)[0].minutes === 10)`,
-    `assert(Array.from(this.my_set)[0].hours === 0.16666666666666666)`,
-    `assert(Array.from(this.my_set)[1].seconds === 1200)`,
-  ],
-}));
+captureTest("set of durations", () =>
+  lift({
+    my_set: new Set([Duration.fromMinutes(10), Duration.fromMinutes(20)]),
+  }).inflight(async (ctx, assert) => {
+    assert(Array.from(ctx.my_set)[0].minutes === 10);
+    assert(Array.from(ctx.my_set)[0].hours === 0.16666666666666666);
+    assert(Array.from(ctx.my_set)[1].seconds === 1200);
+    return undefined;
+  })
+);
 
 // map of arrays of durations
-captureTest("map of arrays of durations", () => ({
-  bindings: {
-    my_map: {
-      obj: Object.freeze(
-        new Map([
-          ["foo", [Duration.fromMinutes(10), Duration.fromMinutes(20)]],
-          ["bar", [Duration.fromMinutes(30), Duration.fromMinutes(40)]],
-        ])
-      ),
-    },
-  },
-  inflightCode: [
-    `assert(this.my_map.get('foo')[0].minutes === 10)`,
-    `assert(this.my_map.get('foo')[1].seconds === 20 * 60)`,
-    `assert(this.my_map.get('bar')[0].minutes === 30)`,
-    `assert(this.my_map.get('bar')[1].seconds === 40 * 60)`,
-  ],
-}));
+captureTest("map of arrays of durations", () =>
+  lift({
+    my_map: new Map([
+      ["foo", [Duration.fromMinutes(10), Duration.fromMinutes(20)]],
+      ["bar", [Duration.fromMinutes(30), Duration.fromMinutes(40)]],
+    ]),
+  }).inflight(async (ctx, assert) => {
+    assert(ctx.my_map.get("foo")?.[0].minutes === 10);
+    assert(ctx.my_map.get("foo")?.[1].seconds === 20 * 60);
+    assert(ctx.my_map.get("bar")?.[0].minutes === 30);
+    assert(ctx.my_map.get("bar")?.[1].seconds === 40 * 60);
+    return undefined;
+  })
+);
 
 // struct of maps
-captureTest("struct of maps", () => ({
-  bindings: {
+captureTest("struct of maps", () =>
+  lift({
     my_struct: {
-      obj: {
-        foo: Object.freeze(
-          new Map([
-            ["foo", 1],
-            ["bar", 2],
-          ])
-        ),
-        bar: Object.freeze(
-          new Map([
-            ["foo", 3],
-            ["bar", 4],
-          ])
-        ),
-      },
+      foo: new Map([
+        ["foo", 1],
+        ["bar", 2],
+      ]),
+      bar: new Map([
+        ["foo", 3],
+        ["bar", 4],
+      ]),
     },
-  },
-  inflightCode: [
-    `assert(this.my_struct.foo.get('foo') === 1)`,
-    `assert(this.my_struct.foo.get('bar') === 2)`,
-    `assert(this.my_struct.bar.get('foo') === 3)`,
-    `assert(this.my_struct.bar.get('bar') === 4)`,
-  ],
-}));
+  }).inflight(async (ctx, assert) => {
+    assert(ctx.my_struct.foo.get("foo") === 1);
+    assert(ctx.my_struct.foo.get("bar") === 2);
+    assert(ctx.my_struct.bar.get("foo") === 3);
+    assert(ctx.my_struct.bar.get("bar") === 4);
+    return undefined;
+  })
+);
 
-// array of buckets
-captureTest("array of buckets", (scope) => ({
-  bindings: {
-    my_buckets: {
-      obj: [new Bucket(scope, "B1"), new Bucket(scope, "B2")],
-    },
-  },
-  inflightCode: [
-    `await this.my_buckets[0].put("hello.txt", "world");`,
-    `const objects = await this.my_buckets[0].list();`,
-    `assert(objects.length === 1)`,
-    `assert(objects[0] === "hello.txt")`,
-    `await this.my_buckets[1].put("foo", "bar");`,
-    `assert(await this.my_buckets[1].get("foo") === "bar")`,
-  ],
-}));
+// capturing collections of buckets isn't supported yet
 
-// map of buckets
-captureTest("map of buckets", (scope) => ({
-  bindings: {
-    my_map: {
-      obj: Object.freeze(
-        new Map([
-          ["foo", new Bucket(scope, "B1")],
-          ["bar", new Bucket(scope, "B2")],
-        ])
-      ),
-    },
-  },
-  inflightCode: [
-    `const foo = this.my_map.get("foo");`,
-    `await foo.put("hello.txt", "world");`,
-    `assert(await foo.get("hello.txt") === "world")`,
-  ],
-}));
+// // array of buckets
+// captureTest("array of buckets", (scope) => ({
+//   bindings: {
+//     my_buckets: {
+//       obj: [new Bucket(scope, "B1"), new Bucket(scope, "B2")],
+//     },
+//   },
+//   inflightCode: [
+//     `await this.my_buckets[0].put("hello.txt", "world");`,
+//     `const objects = await this.my_buckets[0].list();`,
+//     `assert(objects.length === 1)`,
+//     `assert(objects[0] === "hello.txt")`,
+//     `await this.my_buckets[1].put("foo", "bar");`,
+//     `assert(await this.my_buckets[1].get("foo") === "bar")`,
+//   ],
+// }));
 
-// struct with resources
-captureTest("struct with resources", (scope) => ({
-  bindings: {
-    my_struct: {
-      obj: {
-        bucky: new Bucket(scope, "B1"),
-        mapy: Object.freeze(
-          new Map([
-            ["foo", new Bucket(scope, "B2")],
-            ["bar", new Bucket(scope, "B3")],
-          ])
-        ),
-        arry: {
-          boom: [new Bucket(scope, "B4"), new Bucket(scope, "B5")],
-        },
-      },
-    },
-  },
-  inflightCode: [
-    `const b = this.my_struct.bucky;`,
-    `await b.put("hello.txt", "world");`,
-    `assert(await b.get("hello.txt") === "world")`,
-    `const boom = this.my_struct.arry.boom[1];`,
-    `assert((await boom.list()).length === 0)`,
-    `const bar = this.my_struct.mapy.get("bar");`,
-    `await bar.put("foo", "bar");`,
-    `assert(await bar.get("foo") === "bar")`,
-  ],
-}));
+// // map of buckets
+// captureTest("map of buckets", (scope) => ({
+//   bindings: {
+//     my_map: {
+//       obj: Object.freeze(
+//         new Map([
+//           ["foo", new Bucket(scope, "B1")],
+//           ["bar", new Bucket(scope, "B2")],
+//         ])
+//       ),
+//     },
+//   },
+//   inflightCode: [
+//     `const foo = this.my_map.get("foo");`,
+//     `await foo.put("hello.txt", "world");`,
+//     `assert(await foo.get("hello.txt") === "world")`,
+//   ],
+// }));
+
+// // struct with resources
+// captureTest("struct with resources", (scope) => ({
+//   bindings: {
+//     my_struct: {
+//       obj: {
+//         bucky: new Bucket(scope, "B1"),
+//         mapy: Object.freeze(
+//           new Map([
+//             ["foo", new Bucket(scope, "B2")],
+//             ["bar", new Bucket(scope, "B3")],
+//           ])
+//         ),
+//         arry: {
+//           boom: [new Bucket(scope, "B4"), new Bucket(scope, "B5")],
+//         },
+//       },
+//     },
+//   },
+//   inflightCode: [
+//     `const b = this.my_struct.bucky;`,
+//     `await b.put("hello.txt", "world");`,
+//     `assert(await b.get("hello.txt") === "world")`,
+//     `const boom = this.my_struct.arry.boom[1];`,
+//     `assert((await boom.list()).length === 0)`,
+//     `const bar = this.my_struct.mapy.get("bar");`,
+//     `await bar.put("foo", "bar");`,
+//     `assert(await bar.get("foo") === "bar")`,
+//   ],
+// }));
 
 // -----------------------------
 
-function captureTest(name: string, t: (scope: Construct) => CaptureTest) {
+function captureTest(name: string, t: (scope: Construct) => ITestHandler) {
   test(name, async () => {
     const app = new SimApp();
 
-    const options = t(app);
-
-    const renderInflightCode = () => {
-      const lines: string[] = [];
-      for (const line of options.inflightCode ?? []) {
-        const re = /^assert\((.*)\)$/;
-        const match = re.exec(line);
-        if (match) {
-          lines.push(
-            `if (!(${
-              match[1]
-            })) { throw new Error(\`assertion failed: ${JSON.stringify(
-              match[1]
-            )}\`); }`
-          );
-        } else {
-          lines.push(line);
-        }
-      }
-
-      return lines;
-    };
+    const handler = t(app);
 
     new Function(
       app,
       "Function",
-      Testing.makeHandler(
-        [
-          "async handle() {",
-          ...renderInflightCode(),
-          options.whenInflightExpression
-            ? `return JSON.stringify(${options.whenInflightExpression});`
-            : "",
-          "}",
-        ].join("\n"),
-        options.bindings
-      )
+      lift({ handler }).inflight(async (ctx) => {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const baseAssert = require("assert");
+        await ctx.handler(baseAssert);
+        return undefined;
+      })
     );
 
     const sim = await app.startSimulator();
     const fn = sim.getResource("root/Function") as IFunctionClient;
-    const ret = await fn.invoke("");
-    if (options.thenResolvesTo) {
-      expect(JSON.parse(ret)).toStrictEqual(options.thenResolvesTo);
-    }
+    await fn.invoke();
     expect(app.snapshot()).toMatchSnapshot();
   });
 }
diff --git a/libs/wingsdk/test/target-sim/my-docker-image.mounted-volume/Dockerfile b/libs/wingsdk/test/target-sim/my-docker-image.mounted-volume/Dockerfile
new file mode 100644
index 00000000000..686c128323e
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/my-docker-image.mounted-volume/Dockerfile
@@ -0,0 +1,4 @@
+FROM node:20.8.0-alpine
+EXPOSE 3000
+ADD index.js /app/index.js
+ENTRYPOINT [ "/app/index.js" ]
\ No newline at end of file
diff --git a/libs/wingsdk/test/target-sim/my-docker-image.mounted-volume/index.js b/libs/wingsdk/test/target-sim/my-docker-image.mounted-volume/index.js
new file mode 100755
index 00000000000..90e267d07e5
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/my-docker-image.mounted-volume/index.js
@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+const http = require("http");
+const fs = require("fs");
+
+process.on("SIGINT", () => {
+  console.info("Interrupted");
+  process.exit(0);
+});
+
+const server = http.createServer((req, res) => {
+  console.log(`request received: ${req.method} ${req.url}`);
+  res.end(fs.readdirSync("/tmp").join("\n"));
+});
+
+if (!fs.existsSync("/tmp/hello.txt")) {
+  // on the first run, create a file
+  fs.writeFileSync("/tmp/hello.txt", "Hello, World!", "utf8");
+} else {
+  // on the second run, create a different file
+  fs.writeFileSync("/tmp/world.txt", "Hello, World!", "utf8");
+}
+
+console.log("listening on port 3000");
+server.listen(3000);
diff --git a/libs/wingsdk/test/target-sim/my-docker-image.volume/Dockerfile b/libs/wingsdk/test/target-sim/my-docker-image.volume/Dockerfile
new file mode 100644
index 00000000000..686c128323e
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/my-docker-image.volume/Dockerfile
@@ -0,0 +1,4 @@
+FROM node:20.8.0-alpine
+EXPOSE 3000
+ADD index.js /app/index.js
+ENTRYPOINT [ "/app/index.js" ]
\ No newline at end of file
diff --git a/libs/wingsdk/test/target-sim/my-docker-image.volume/index.js b/libs/wingsdk/test/target-sim/my-docker-image.volume/index.js
new file mode 100755
index 00000000000..1c43b365a3e
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/my-docker-image.volume/index.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+const http = require("http");
+const fs = require("fs");
+
+process.on("SIGINT", () => {
+  console.info("Interrupted");
+  process.exit(0);
+});
+
+const server = http.createServer((req, res) => {
+  console.log(`request received: ${req.method} ${req.url}`);
+  res.end(fs.readdirSync("/tmp").join("\n"));
+});
+
+console.log("listening on port 3000");
+server.listen(3000);
diff --git a/libs/wingsdk/test/target-sim/my-docker-image/Dockerfile b/libs/wingsdk/test/target-sim/my-docker-image/Dockerfile
new file mode 100644
index 00000000000..686c128323e
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/my-docker-image/Dockerfile
@@ -0,0 +1,4 @@
+FROM node:20.8.0-alpine
+EXPOSE 3000
+ADD index.js /app/index.js
+ENTRYPOINT [ "/app/index.js" ]
\ No newline at end of file
diff --git a/libs/wingsdk/test/target-sim/my-docker-image/index.js b/libs/wingsdk/test/target-sim/my-docker-image/index.js
new file mode 100755
index 00000000000..55e56a40950
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/my-docker-image/index.js
@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+const http = require('http');
+
+process.on('SIGINT', () => {
+  console.info("Interrupted")
+  process.exit(0)
+});
+
+const server = http.createServer((req, res) => {
+  console.log(`request received: ${req.method} ${req.url}`);
+  res.end('Hello, Wingnuts!');
+});
+
+console.log('listening on port 3000');
+server.listen(3000);
\ No newline at end of file
diff --git a/libs/wingsdk/test/target-sim/on-deploy.test.ts b/libs/wingsdk/test/target-sim/on-deploy.test.ts
index 4bcf93a7c13..ee70b066897 100644
--- a/libs/wingsdk/test/target-sim/on-deploy.test.ts
+++ b/libs/wingsdk/test/target-sim/on-deploy.test.ts
@@ -1,16 +1,15 @@
 import { test, expect } from "vitest";
 import { listMessages } from "./util";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { SimApp } from "../sim-app";
 
-const INFLIGHT_CODE = `async handle() { console.log("super duper success"); }`;
+const INFLIGHT_CODE = inflight(async () => console.log("super duper success"));
 
 test("create an OnDeploy", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.OnDeploy(app, "my_on_deploy", handler);
+  new cloud.OnDeploy(app, "my_on_deploy", INFLIGHT_CODE);
   const s = await app.startSimulator();
 
   // THEN
@@ -18,7 +17,10 @@ test("create an OnDeploy", async () => {
     attrs: {
       handle: expect.any(String),
     },
+    deps: ["root/my_on_deploy/Function"],
     path: "root/my_on_deploy",
+    addr: expect.any(String),
+    policy: [],
     props: {
       functionHandle: expect.any(String),
     },
diff --git a/libs/wingsdk/test/target-sim/queue-consumer.test.ts b/libs/wingsdk/test/target-sim/queue-consumer.test.ts
index 6744e222df2..6a6c049df95 100644
--- a/libs/wingsdk/test/target-sim/queue-consumer.test.ts
+++ b/libs/wingsdk/test/target-sim/queue-consumer.test.ts
@@ -2,7 +2,7 @@ import { Construct } from "constructs";
 import { test, expect } from "vitest";
 import { waitUntilTrace } from "./util";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight, lift } from "../../src/core";
 import { TraceType } from "../../src/std";
 import { SimApp } from "../sim-app";
 
@@ -14,23 +14,19 @@ test("pushing messages through a queue", async () => {
       super(scope, id);
 
       const queue = new cloud.Queue(this, "Queue");
-      const pusher = Testing.makeHandler(
-        `async handle(event) {
+      const pusher = lift({ queue })
+        .grant({ queue: ["push"] })
+        .inflight(async (ctx, event) => {
           console.log("Hello, world!");
-          await this.queue.push(event);
-        }`,
-        {
-          queue: {
-            obj: queue,
-            ops: [cloud.QueueInflightMethods.PUSH],
-          },
-        }
-      );
+          await ctx.queue.push(event);
+        });
+
       new cloud.Function(this, "Function", pusher);
 
-      const processor = Testing.makeHandler(`async handle(event) {
-          console.log("Received " + event);
-        }`);
+      const processor = inflight(async (_, event) =>
+        console.log("Received " + event)
+      );
+
       const consumer = queue.setConsumer(processor);
       this.consumerPath = consumer.node.path;
     }
@@ -61,6 +57,7 @@ test("pushing messages through a queue", async () => {
       sourcePath: "root/HelloWorld/Function",
       sourceType: "@winglang/sdk.cloud.Function",
       timestamp: expect.any(String),
+      level: "info",
       type: "log",
     },
     {
@@ -68,6 +65,7 @@ test("pushing messages through a queue", async () => {
       sourcePath: helloWorld.consumerPath,
       sourceType: "@winglang/sdk.cloud.Function",
       timestamp: expect.any(String),
+      level: "info",
       type: "log",
     },
   ]);
diff --git a/libs/wingsdk/test/target-sim/queue.test.ts b/libs/wingsdk/test/target-sim/queue.test.ts
index 886df9a905c..788bee2610d 100644
--- a/libs/wingsdk/test/target-sim/queue.test.ts
+++ b/libs/wingsdk/test/target-sim/queue.test.ts
@@ -6,30 +6,15 @@ import {
   waitUntilTraceCount,
 } from "./util";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+
+import { inflight, lift } from "../../src/core";
 import { Duration, Node } from "../../src/std";
 import { SimApp } from "../sim-app";
 
-const INFLIGHT_CODE = `
-async handle(message) {
+const INFLIGHT_CODE = inflight(async (_, message) => {
   if (message === "BAD MESSAGE") {
     throw new Error("ERROR");
   }
-}`;
-
-test("try to create a queue with invalid retention period", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const retentionPeriod = Duration.fromSeconds(5);
-  const timeout = Duration.fromSeconds(10);
-
-  // THEN
-  expect(() => {
-    new cloud.Queue(app, "my_queue", {
-      retentionPeriod,
-      timeout,
-    });
-  }).toThrowError("Retention period must be greater than or equal to timeout");
 });
 
 test("create a queue", async () => {
@@ -39,30 +24,43 @@ test("create a queue", async () => {
   const s = await app.startSimulator();
 
   // THEN
+  expect(s.getResourceConfig("/my_queue")).toEqual({
+    attrs: {
+      handle: expect.any(String),
+    },
+    path: "root/my_queue",
+    addr: expect.any(String),
+    policy: [],
+    props: {
+      retentionPeriod: 3600,
+      timeout: 30,
+    },
+    type: cloud.QUEUE_FQN,
+  });
+
   await s.stop();
-  expect(s.getResourceConfig("/my_queue")).toMatchInlineSnapshot(`
-    {
-      "attrs": {
-        "handle": "sim-1",
-      },
-      "path": "root/my_queue",
-      "props": {
-        "retentionPeriod": 3600,
-        "timeout": 30,
-      },
-      "type": "@winglang/sdk.cloud.Queue",
-    }
-  `);
 
   expect(app.snapshot()).toMatchSnapshot();
 });
 
+test("try to create a queue with invalid retention period", async () => {
+  // GIVEN
+  const app = new SimApp();
+  const retentionPeriod = Duration.fromSeconds(5);
+
+  // THEN
+  expect(() => {
+    new cloud.Queue(app, "my_queue", {
+      retentionPeriod,
+    });
+  }).toThrowError("Retention period must be greater than or equal to timeout");
+});
+
 test("queue with one subscriber, default batch size of 1", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
   const queue = new cloud.Queue(app, "my_queue");
-  queue.setConsumer(handler);
+  queue.setConsumer(INFLIGHT_CODE);
   const s = await app.startSimulator();
 
   const queueClient = s.getResource("/my_queue") as cloud.IQueueClient;
@@ -115,27 +113,20 @@ test("queue with one subscriber, batch size of 5", async () => {
   const app = new SimApp();
 
   const queue = new cloud.Queue(app, "my_queue");
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  const consumer = queue.setConsumer(handler, { batchSize: 5 });
+  const consumer = queue.setConsumer(INFLIGHT_CODE, { batchSize: 5 });
 
   // initialize the queue with some messages
-  const onDeployHandler = Testing.makeHandler(
-    `\
-async handle() {
-  await this.queue.push("A");
-  await this.queue.push("B");
-  await this.queue.push("C");
-  await this.queue.push("D");
-  await this.queue.push("E");
-  await this.queue.push("F");
-}`,
-    {
-      queue: {
-        obj: queue,
-        ops: [cloud.QueueInflightMethods.PUSH],
-      },
-    }
-  );
+  const onDeployHandler = lift({ queue })
+    .grant({ queue: ["push"] })
+    .inflight(async (ctx) => {
+      await ctx.queue.push("A");
+      await ctx.queue.push("B");
+      await ctx.queue.push("C");
+      await ctx.queue.push("D");
+      await ctx.queue.push("E");
+      await ctx.queue.push("F");
+    });
+
   new cloud.OnDeploy(app, "my_queue_messages", onDeployHandler);
 
   const s = await app.startSimulator();
@@ -158,18 +149,18 @@ async handle() {
         trace.sourcePath === consumer.node.path &&
         trace.data.message.startsWith("Invoke")
     );
-  expect(invokeMessages.length).toEqual(2); // queue messages are processed in two batches based on batch size
+  expect(invokeMessages.length).toBeGreaterThanOrEqual(2); // queue messages are processed in multiple batches based on batch size
   expect(app.snapshot()).toMatchSnapshot();
 });
 
-test("messages are requeued if the function fails after timeout", async () => {
+// waiting for this: https://github.com/winglang/wing/issues/1980 to be resolved
+test.skip("messages are requeued if the function fails after timeout", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
   const queue = new cloud.Queue(app, "my_queue", {
     timeout: Duration.fromSeconds(1),
   });
-  queue.setConsumer(handler);
+  queue.setConsumer(INFLIGHT_CODE);
   const s = await app.startSimulator();
 
   // WHEN
@@ -196,14 +187,13 @@ test("messages are requeued if the function fails after timeout", async () => {
   ).toContain(REQUEUE_MSG);
 });
 
-test("messages are not requeued if the function fails before timeout", async () => {
+test.skip("messages are not requeued if the function fails before timeout", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
   const queue = new cloud.Queue(app, "my_queue", {
     timeout: Duration.fromSeconds(30),
   });
-  queue.setConsumer(handler);
+  queue.setConsumer(INFLIGHT_CODE);
   const s = await app.startSimulator();
 
   // WHEN
@@ -231,42 +221,41 @@ test("messages are not requeued if the function fails before timeout", async ()
     [
       "@winglang/sdk.cloud.Queue created.",
       "Push (messages=BAD MESSAGE).",
-      "Sending messages (messages=[\\"BAD MESSAGE\\"], subscriber=sim-1).",
+      "Sending messages (messages=[\\"BAD MESSAGE\\"], subscriber=sim-0).",
       "Subscriber error - returning 1 messages to queue: ERROR",
       "@winglang/sdk.cloud.Queue deleted.",
     ]
   `);
 });
 
-// TODO: this test is commented out because it is flaky
-// test("messages are not requeued if the function fails after retention timeout", async () => {
-//   // GIVEN
-//   const app = new SimApp();
-//   const handler = Testing.makeHandler(INFLIGHT_CODE);
-//   const queue = new cloud.Queue(app, "my_queue", {
-//     retentionPeriod: Duration.fromSeconds(1),
-//     timeout: Duration.fromMilliseconds(100),
-//   });
-//   queue.setConsumer(handler);
-//   const s = await app.startSimulator();
-
-//   // WHEN
-//   const queueClient = s.getResource("/my_queue") as cloud.IQueueClient;
-//   void queueClient.push("BAD MESSAGE");
-//   await waitUntilTrace(
-//     s,
-//     (trace) =>
-//       trace.data.message ==
-//       "1 messages pushed back to queue after visibility timeout."
-//   );
-
-//   // THEN
-//   await s.stop();
-//   expect(listMessages(s)).toContain(
-//     "1 messages pushed back to queue after visibility timeout."
-//   );
-//   expect(app.snapshot()).toMatchSnapshot();
-// });
+// TODO: this test is skipped because it is flaky
+test.skip("messages are not requeued if the function fails after retention timeout", async () => {
+  // GIVEN
+  const app = new SimApp();
+  const queue = new cloud.Queue(app, "my_queue", {
+    retentionPeriod: Duration.fromSeconds(1),
+    timeout: Duration.fromMilliseconds(100),
+  });
+  queue.setConsumer(INFLIGHT_CODE);
+  const s = await app.startSimulator();
+
+  // WHEN
+  const queueClient = s.getResource("/my_queue") as cloud.IQueueClient;
+  void queueClient.push("BAD MESSAGE");
+  await waitUntilTrace(
+    s,
+    (trace) =>
+      trace.data.message ==
+      "1 messages pushed back to queue after visibility timeout."
+  );
+
+  // THEN
+  await s.stop();
+  expect(listMessages(s)).toContain(
+    "1 messages pushed back to queue after visibility timeout."
+  );
+  expect(app.snapshot()).toMatchSnapshot();
+});
 
 test("queue has no display hidden property", async () => {
   // GIVEN
diff --git a/libs/wingsdk/test/target-sim/react-app.test.ts b/libs/wingsdk/test/target-sim/react-app.test.ts
deleted file mode 100644
index 77f1c7743e6..00000000000
--- a/libs/wingsdk/test/target-sim/react-app.test.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import child_process from "child_process";
-import { readFileSync, unlinkSync, existsSync, mkdirSync } from "fs";
-import { resolve } from "path";
-import {
-  test,
-  expect,
-  afterAll,
-  vi,
-  describe,
-  SpyInstance,
-  afterEach,
-  beforeAll,
-} from "vitest";
-import * as ex from "../../src/ex";
-import { Simulator } from "../../src/simulator";
-import { ApiAttributes } from "../../src/target-sim/schema-resources";
-import { SimApp } from "../sim-app";
-
-function getWebsiteUrl(s: Simulator, path: string): string {
-  const apiAttrs = s.getResourceConfig(path).attrs as ApiAttributes;
-  return apiAttrs.url;
-}
-
-function expectFirstArgToBe(fn: SpyInstance, firstArg: any) {
-  const lastCall = fn.mock.lastCall;
-  if (!lastCall) {
-    throw new Error("function wasn't called");
-  }
-  expect(lastCall[0]).toBe(firstArg);
-}
-
-describe("Testing ReactApp", () => {
-  const execMock = vi.spyOn(child_process, "exec");
-
-  beforeAll(() => {
-    mkdirSync(resolve(__dirname, `../test-files/react-website/public/`), {
-      recursive: true,
-    });
-  });
-
-  afterAll(() => {
-    execMock.mockReset();
-  });
-
-  afterEach(() => {
-    const wingFile = resolve(
-      __dirname,
-      `../test-files/react-website/public/${ex.WING_JS}`
-    );
-    if (existsSync(wingFile)) {
-      unlinkSync(wingFile);
-    }
-  });
-
-  test("website builds and serves static files", async () => {
-    // GIVEN
-    const app = new SimApp();
-    new ex.ReactApp(app, "website", {
-      projectPath: resolve(__dirname, "../test-files/react-website"),
-      useBuildCommand: true,
-    });
-
-    // WHEN
-    const s = await app.startSimulator();
-    const websiteUrl = getWebsiteUrl(s, "/website");
-
-    const indexPage = await fetch(websiteUrl);
-
-    // THEN
-    await s.stop();
-    expect(await indexPage.text()).toEqual(
-      readFileSync(
-        resolve(__dirname, "../test-files/react-website/build/index.html"),
-        {
-          encoding: "utf-8",
-        }
-      )
-    );
-    expect(
-      readFileSync(
-        resolve(__dirname, `../test-files/react-website/public/${ex.WING_JS}`),
-        {
-          encoding: "utf-8",
-        }
-      )
-    ).toEqual(`// This file is generated by wing
-window.wingEnv = {};`);
-
-    expectFirstArgToBe(execMock, "npm run build");
-  });
-
-  test("adding an env var to the website ", async () => {
-    // GIVEN
-    const app = new SimApp();
-    const website = new ex.ReactApp(app, "website", {
-      projectPath: resolve(__dirname, "../test-files/react-website"),
-      useBuildCommand: true,
-    });
-
-    website.addEnvironment("key", "value");
-
-    // WHEN
-    const s = await app.startSimulator();
-    const websiteUrl = getWebsiteUrl(s, "/website");
-
-    const indexPage = await fetch(websiteUrl);
-
-    // THEN
-    await s.stop();
-    expect(await indexPage.text()).toEqual(
-      readFileSync(
-        resolve(__dirname, "../test-files/react-website/build/index.html"),
-        {
-          encoding: "utf-8",
-        }
-      )
-    );
-    expect(
-      readFileSync(
-        resolve(__dirname, `../test-files/react-website/public/${ex.WING_JS}`),
-        {
-          encoding: "utf-8",
-        }
-      )
-    ).toEqual(`// This file is generated by wing
-window.wingEnv = {
-  "key": "value"
-};`);
-
-    expectFirstArgToBe(execMock, "npm run build");
-  });
-
-  test("running React App on dev mode", async () => {
-    // GIVEN
-    const app = new SimApp();
-    new ex.ReactApp(app, "website", {
-      projectPath: resolve(__dirname, "../test-files/react-website"),
-    });
-
-    // WHEN
-    const s = await app.startSimulator();
-
-    // THEN
-    await s.stop();
-
-    expectFirstArgToBe(execMock, "PORT=3001 npm run start");
-  });
-
-  test("running React App on dev mode on custom port", async () => {
-    // GIVEN
-    const app = new SimApp();
-    new ex.ReactApp(app, "website", {
-      projectPath: resolve(__dirname, "../test-files/react-website"),
-      useBuildCommand: false,
-      localPort: 4032,
-    });
-
-    // WHEN
-    const s = await app.startSimulator();
-
-    // THEN
-    await s.stop();
-
-    expectFirstArgToBe(execMock, "PORT=4032 npm run start");
-  });
-
-  test("running React App on dev mode with custom command", async () => {
-    // GIVEN
-    const CUSTOM_COMMAND = "echo 'custom command'";
-    const app = new SimApp();
-    new ex.ReactApp(app, "website", {
-      projectPath: resolve(__dirname, "../test-files/react-website"),
-      startCommand: CUSTOM_COMMAND,
-      useBuildCommand: false,
-    });
-
-    // WHEN
-    const s = await app.startSimulator();
-
-    // THEN
-    await s.stop();
-
-    expectFirstArgToBe(execMock, `PORT=3001 ${CUSTOM_COMMAND}`);
-  });
-
-  test("running React App with custom command", async () => {
-    // GIVEN
-    const CUSTOM_COMMAND = "echo 'custom command'";
-    const app = new SimApp();
-    new ex.ReactApp(app, "website", {
-      projectPath: resolve(__dirname, "../test-files/react-website"),
-      buildCommand: CUSTOM_COMMAND,
-      useBuildCommand: true,
-    });
-
-    // WHEN
-    const s = await app.startSimulator();
-    const websiteUrl = getWebsiteUrl(s, "/website");
-
-    const indexPage = await fetch(websiteUrl);
-
-    // THEN
-    await s.stop();
-    expect(await indexPage.text()).toEqual(
-      readFileSync(
-        resolve(__dirname, "../test-files/react-website/build/index.html"),
-        {
-          encoding: "utf-8",
-        }
-      )
-    );
-    expect(
-      readFileSync(
-        resolve(__dirname, `../test-files/react-website/public/${ex.WING_JS}`),
-        {
-          encoding: "utf-8",
-        }
-      )
-    ).toEqual(`// This file is generated by wing
-window.wingEnv = {};`);
-
-    expectFirstArgToBe(execMock, CUSTOM_COMMAND);
-  });
-});
diff --git a/libs/wingsdk/test/target-sim/redis.test.ts b/libs/wingsdk/test/target-sim/redis.test.ts
index 5c92840495c..e4bf2e9c0d5 100644
--- a/libs/wingsdk/test/target-sim/redis.test.ts
+++ b/libs/wingsdk/test/target-sim/redis.test.ts
@@ -1,23 +1,29 @@
-import { Redis as IoRedis } from "ioredis";
 import { test, expect } from "vitest";
-import * as ex from "../../src/ex";
+import { Redis, IRedisClient, REDIS_FQN } from "../../src/ex";
 import { SimApp } from "../sim-app";
 
 test("create a Redis resource", async () => {
   // GIVEN
   const app = new SimApp();
-  new ex.Redis(app, "my_redis");
+  new Redis(app, "my_redis");
+
+  // WHEN
+  const s = await app.startSimulator();
+  const redisResource = s.getResourceConfig("/my_redis");
+  await s.stop();
 
   // THEN
-  await app._withSimulator(async (s) => {
-    expect(s.getResourceConfig("/my_redis")).toEqual({
-      attrs: {
-        handle: expect.any(String),
-      },
-      path: "root/my_redis",
-      props: {},
-      type: ex.REDIS_FQN,
-    });
+  expect(redisResource).toEqual({
+    attrs: {
+      handle: expect.any(String),
+    },
+    path: "root/my_redis",
+    addr: expect.any(String),
+    policy: [],
+    props: {
+      port: expect.any(String),
+    },
+    type: REDIS_FQN,
   });
   expect(app.snapshot()).toMatchSnapshot();
 });
@@ -25,96 +31,107 @@ test("create a Redis resource", async () => {
 test("can set and get a value", async () => {
   // GIVEN
   const app = new SimApp();
-  new ex.Redis(app, "my_redis");
+  new Redis(app, "my_redis");
   const key = "wing";
   const expectedValue = "does redis";
 
+  // WHEN
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_redis") as IRedisClient;
+  await client.set(key, expectedValue);
+  const value = await client.get(key);
+  await s.stop();
+
   // THEN
-  await app._withSimulator(async (s) => {
-    const client = s.getResource("/my_redis") as ex.IRedisClient;
-    await client.set(key, expectedValue);
-    const value = await client.get(key);
-    expect(value).toEqual(expectedValue);
-  });
+  expect(value).toEqual(expectedValue);
 });
 
 test("can hset and hget values", async () => {
   // GIVEN
   const app = new SimApp();
-  new ex.Redis(app, "my_redis");
+  new Redis(app, "my_redis");
   const key = "wing";
   const field = "secret_message";
   const expectedValue = "does redis";
 
+  // WHEN
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_redis") as IRedisClient;
+  await client.hset(key, field, expectedValue);
+  const value = await client.hget(key, field);
+  await s.stop();
+
   // THEN
-  await app._withSimulator(async (s) => {
-    const client = s.getResource("/my_redis") as ex.IRedisClient;
-    await client.hset(key, field, expectedValue);
-    const value = await client.hget(key, field);
-    expect(value).toEqual(expectedValue);
-  });
+  expect(value).toEqual(expectedValue);
 });
 
 test("can sadd and smembers values", async () => {
   // GIVEN
   const app = new SimApp();
-  new ex.Redis(app, "my_redis");
+  new Redis(app, "my_redis");
   const key = "wing";
   const expectedValues = ["a", "b", "c"];
 
+  // WHEN
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_redis") as IRedisClient;
+  await client.sadd(key, "a");
+  await client.sadd(key, "b");
+  await client.sadd(key, "c");
+  const value = await client.smembers(key);
+  await s.stop();
+
   // THEN
-  await app._withSimulator(async (s) => {
-    const client = s.getResource("/my_redis") as ex.IRedisClient;
-    await client.sadd(key, "a");
-    await client.sadd(key, "b");
-    await client.sadd(key, "c");
-    const value = await client.smembers(key);
-    expect(value.sort()).toEqual(expectedValues);
-  });
+  expect(value.sort()).toEqual(expectedValues);
 });
 
 test("can del a value", async () => {
   // GIVEN
   const app = new SimApp();
-  const r = new ex.Redis(app, "my_redis");
+  new Redis(app, "my_redis");
   const key = "wing";
   const expectedValue = "does redis";
 
+  // WHEN
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_redis") as IRedisClient;
+  await client.set(key, expectedValue);
+  const recordsDeleted = await client.del(key);
+  const value = await client.get(key);
+  await s.stop();
+
   // THEN
-  await app._withSimulator(async (s) => {
-    const client = s.getResource("/my_redis") as ex.IRedisClient;
-    await client.set(key, expectedValue);
-    const recordsDeleted = await client.del(key);
-    const value = await client.get(key);
-    expect(recordsDeleted).toEqual(1);
-    expect(value).toBeUndefined();
-  });
+  expect(recordsDeleted).toEqual(1);
+  expect(value).toBeUndefined();
 });
 
 test("return empty array when smembers on a non-existent key", async () => {
   // GIVEN
   const app = new SimApp();
-  new ex.Redis(app, "my_redis");
+  new Redis(app, "my_redis");
   const key = "wing";
 
   // THEN
-  await app._withSimulator(async (s) => {
-    const client = s.getResource("/my_redis") as ex.IRedisClient;
-    const value = await client.smembers(key);
-    expect(value).toEqual([]);
-  });
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_redis") as IRedisClient;
+  const value = await client.smembers(key);
+  await s.stop();
+
+  expect(value).toEqual([]);
 });
 
 test("get a value that does not exist", async () => {
   // GIVEN
   const app = new SimApp();
-  new ex.Redis(app, "my_redis");
+  new Redis(app, "my_redis");
   const key = "wing";
 
+  // WHEN
+  const s = await app.startSimulator();
+  const client = s.getResource("/my_redis") as IRedisClient;
+  const value = await client.get(key);
+  await s.stop();
+
   // THEN
-  await app._withSimulator(async (s) => {
-    const client = s.getResource("/my_redis") as ex.IRedisClient;
-    const value = await client.get(key);
-    expect(value).toBeUndefined();
-  });
+  expect(value).toBeUndefined();
 });
diff --git a/libs/wingsdk/test/target-sim/schedule.test.ts b/libs/wingsdk/test/target-sim/schedule.test.ts
index de13779e2ce..e2dfd0d99dd 100644
--- a/libs/wingsdk/test/target-sim/schedule.test.ts
+++ b/libs/wingsdk/test/target-sim/schedule.test.ts
@@ -1,18 +1,17 @@
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { Duration } from "../../src/std";
 import { SimApp } from "../sim-app";
 
-const INFLIGHT_CODE = `
-async handle(message) {
-console.log("Hello from schedule!");
-}`;
+const INFLIGHT_CODE = inflight(async (_, message) => {
+  console.log("Hello from schedule!");
+});
 
 test("create a schedule", async () => {
   // GIVEN
   const app = new SimApp();
-  const cron = "*/1 * * * ?";
+  const cron = "*/1 * * * *";
   new cloud.Schedule(app, "my_schedule", { cron });
   const s = await app.startSimulator();
 
@@ -22,6 +21,8 @@ test("create a schedule", async () => {
       handle: expect.any(String),
     },
     path: "root/my_schedule",
+    addr: expect.any(String),
+    policy: [],
     props: {
       cronExpression: cron,
     },
@@ -36,11 +37,10 @@ test("create a schedule", async () => {
 test("schedule with one task with cron", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
   const schedule = new cloud.Schedule(app, "my_schedule", {
-    cron: "* * * * ?",
+    cron: "* * * * *",
   });
-  schedule.onTick(handler);
+  schedule.onTick(INFLIGHT_CODE);
 
   const s = await app.startSimulator();
   // WHEN
@@ -54,51 +54,55 @@ test("schedule with one task with cron", async () => {
 test("schedule with one task using rate of 10m", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
   const schedule = new cloud.Schedule(app, "my_schedule", {
     rate: Duration.fromMinutes(10),
   });
-  const expectedCron = "*/10 * * * ?"; // every 10 minutes cron expression
-  schedule.onTick(handler);
+  const expectedCron = "*/10 * * * *"; // every 10 minutes cron expression
+  schedule.onTick(INFLIGHT_CODE);
   const s = await app.startSimulator();
 
   // THEN
-  await s.stop();
   expect(app.snapshot()).toMatchSnapshot();
   expect(s.getResourceConfig("/my_schedule")).toEqual({
     attrs: {
       handle: expect.any(String),
     },
     path: "root/my_schedule",
+    addr: expect.any(String),
+    policy: [],
     props: {
       cronExpression: expectedCron,
     },
     type: cloud.SCHEDULE_FQN,
   });
+
+  await s.stop();
 });
 
 test("schedule with one task using rate of 3h", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
   const schedule = new cloud.Schedule(app, "my_schedule", {
     rate: Duration.fromHours(3),
   });
-  const expectedCron = "* */3 * * ?"; // every 3 hours cron expression
-  schedule.onTick(handler);
+  const expectedCron = "* */3 * * *"; // every 3 hours cron expression
+  schedule.onTick(INFLIGHT_CODE);
   const s = await app.startSimulator();
 
   // THEN
-  await s.stop();
   expect(app.snapshot()).toMatchSnapshot();
   expect(s.getResourceConfig("/my_schedule")).toEqual({
     attrs: {
       handle: expect.any(String),
     },
     path: "root/my_schedule",
+    addr: expect.any(String),
+    policy: [],
     props: {
       cronExpression: expectedCron,
     },
     type: cloud.SCHEDULE_FQN,
   });
+
+  await s.stop();
 });
diff --git a/libs/wingsdk/test/target-sim/secret.test.ts b/libs/wingsdk/test/target-sim/secret.test.ts
index 8e1d7f02b7a..a0a94ceb83b 100644
--- a/libs/wingsdk/test/target-sim/secret.test.ts
+++ b/libs/wingsdk/test/target-sim/secret.test.ts
@@ -1,63 +1,67 @@
-import * as os from "os";
 import * as path from "path";
 import * as fs from "fs-extra";
-import { test, expect } from "vitest";
+import { test, expect, beforeEach, afterEach, describe } from "vitest";
 import * as cloud from "../../src/cloud";
 import { SimApp } from "../sim-app";
 
-const SECRETS_FILE = path.join(os.homedir(), ".wing", "secrets.json");
+const SECRETS_FILE = path.join(process.cwd(), ".env");
+describe("secrets", () => {
+  beforeEach(() => {
+    fs.createFileSync(SECRETS_FILE);
+  });
 
-test("create a secret", async () => {
-  // GIVEN
-  const app = new SimApp();
-  new cloud.Secret(app, "my_secret");
+  afterEach(() => {
+    fs.removeSync(SECRETS_FILE);
+  });
 
-  await fs.ensureFile(SECRETS_FILE);
+  test("create a secret", async () => {
+    // GIVEN
+    const app = new SimApp();
+    new cloud.Secret(app, "my_secret");
 
-  const s = await app.startSimulator();
+    const s = await app.startSimulator();
 
-  // THEN
-  expect(s.getResourceConfig("/my_secret")).toEqual({
-    attrs: {
-      handle: expect.any(String),
-    },
-    path: "root/my_secret",
-    props: {
-      name: "my_secret-c84793b7",
-    },
-    type: cloud.SECRET_FQN,
-  });
-  await s.stop();
+    // THEN
+    expect(s.getResourceConfig("/my_secret")).toEqual({
+      attrs: {
+        handle: expect.any(String),
+      },
+      path: "root/my_secret",
+      addr: expect.any(String),
+      policy: [],
+      props: {
+        name: "my_secret-c84793b7",
+      },
+      type: cloud.SECRET_FQN,
+    });
+    await s.stop();
 
-  expect(app.snapshot()).toMatchSnapshot();
-});
-
-test("can get the secret value", async () => {
-  // GIVEN
-  const app = new SimApp();
-  new cloud.Secret(app, "my_secret", {
-    name: "wing-sim-test-my-secret",
+    expect(app.snapshot()).toMatchSnapshot();
   });
 
-  await fs.ensureFile(SECRETS_FILE);
-  const secretsContent = await fs.readFile(SECRETS_FILE, "utf-8");
+  test("can get the secret value", async () => {
+    // GIVEN
+    const app = new SimApp();
+    new cloud.Secret(app, "my_secret", {
+      name: "wing-sim-test-my-secret",
+    });
+
+    await fs.writeFile(SECRETS_FILE, "wing-sim-test-my-secret=secret-value");
 
-  const secrets = tryParse(secretsContent) ?? {};
-  await fs.writeFile(
-    SECRETS_FILE,
-    JSON.stringify({
-      ...secrets,
-      "wing-sim-test-my-secret": "secret-value",
-    })
-  );
+    const secretsContent = fs.readFileSync(SECRETS_FILE, "utf-8");
+    secretsContent.split("\n").forEach((line) => {
+      const [key, value] = line.split("=");
+      process.env[key] = value;
+    });
 
-  const s = await app.startSimulator();
-  const secretClient = s.getResource("/my_secret") as cloud.ISecretClient;
+    const s = await app.startSimulator();
+    const secretClient = s.getResource("/my_secret") as cloud.ISecretClient;
 
-  // THEN
-  const secretValue = await secretClient.value();
-  expect(secretValue).toBe("secret-value");
-  await s.stop();
+    // THEN
+    const secretValue = await secretClient.value();
+    expect(secretValue).toBe("secret-value");
+    await s.stop();
+  });
 });
 
 function tryParse(content: string): string | undefined {
diff --git a/libs/wingsdk/test/target-sim/service.test.ts b/libs/wingsdk/test/target-sim/service.test.ts
index b413e301a52..dcc1c8fd0f9 100644
--- a/libs/wingsdk/test/target-sim/service.test.ts
+++ b/libs/wingsdk/test/target-sim/service.test.ts
@@ -1,23 +1,21 @@
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { SimApp } from "../sim-app";
 
-const HANDLER_WITH_START = `\
-async handle() {
+const HANDLER_WITH_START = inflight(async () => {
   console.log("start!");
-}`;
+});
 
-const HANDLER_WITH_START_AND_STOP = `\
-async handle() {
+const HANDLER_WITH_START_AND_STOP = inflight(async () => {
   console.log("start!");
   return () => console.log("stop!");
-}`;
+});
 
 test("create a service with on start method", async () => {
   // GIVEN
   const app = new SimApp();
-  new cloud.Service(app, "my_service", Testing.makeHandler(HANDLER_WITH_START));
+  new cloud.Service(app, "my_service", HANDLER_WITH_START);
 
   // WHEN
   const s = await app.startSimulator();
@@ -28,10 +26,12 @@ test("create a service with on start method", async () => {
       handle: expect.any(String),
     },
     path: "root/my_service",
+    addr: expect.any(String),
+    policy: [],
     props: {
+      autoStart: true,
       sourceCodeFile: expect.any(String),
       environmentVariables: {},
-      autoStart: true,
     },
     type: cloud.SERVICE_FQN,
   });
@@ -43,15 +43,10 @@ test("create a service with on start method", async () => {
 test("create a service with a on stop method", async () => {
   // Given
   const app = new SimApp();
-  new cloud.Service(
-    app,
-    "my_service",
-    Testing.makeHandler(HANDLER_WITH_START_AND_STOP)
-  );
+  new cloud.Service(app, "my_service", HANDLER_WITH_START_AND_STOP);
 
   // WHEN
   const s = await app.startSimulator();
-  await s.stop();
 
   // THEN
   expect(s.getResourceConfig("/my_service")).toEqual({
@@ -59,14 +54,18 @@ test("create a service with a on stop method", async () => {
       handle: expect.any(String),
     },
     path: "root/my_service",
+    addr: expect.any(String),
+    policy: [],
     props: {
+      autoStart: true,
       sourceCodeFile: expect.any(String),
       environmentVariables: {},
-      autoStart: true,
     },
     type: cloud.SERVICE_FQN,
   });
 
+  await s.stop();
+
   expect(
     s
       .listTraces()
@@ -74,25 +73,21 @@ test("create a service with a on stop method", async () => {
       .map((trace) => trace.data.message)
   ).toEqual([
     "start!",
-    "@winglang/sdk.cloud.Service created.",
+    "root/my_service started",
     "stop!",
-    "@winglang/sdk.cloud.Service deleted.",
+    "root/my_service stopped",
   ]);
 });
 
 test("create a service without autostart", async () => {
   // Given
   const app = new SimApp();
-  new cloud.Service(
-    app,
-    "my_service",
-    Testing.makeHandler(HANDLER_WITH_START_AND_STOP),
-    { autoStart: false }
-  );
+  new cloud.Service(app, "my_service", HANDLER_WITH_START_AND_STOP, {
+    autoStart: false,
+  });
 
   // WHEN
   const s = await app.startSimulator();
-  await s.stop();
 
   // THEN
   expect(s.getResourceConfig("/my_service")).toEqual({
@@ -100,37 +95,33 @@ test("create a service without autostart", async () => {
       handle: expect.any(String),
     },
     path: "root/my_service",
+    addr: expect.any(String),
+    policy: [],
     props: {
+      autoStart: false,
       sourceCodeFile: expect.any(String),
       environmentVariables: {},
-      autoStart: false,
     },
     type: cloud.SERVICE_FQN,
   });
 
+  await s.stop();
+
   expect(
     s
       .listTraces()
       .filter((v) => v.sourceType == cloud.SERVICE_FQN)
       .map((trace) => trace.data.message)
-  ).toEqual([
-    "@winglang/sdk.cloud.Service created.", // Service created never started
-    "@winglang/sdk.cloud.Service deleted.",
-  ]);
+  ).toEqual(["root/my_service started", "root/my_service stopped"]);
 });
 
 test("start and stop service", async () => {
   // Given
   const app = new SimApp();
 
-  new cloud.Service(
-    app,
-    "my_service",
-    Testing.makeHandler(HANDLER_WITH_START_AND_STOP),
-    {
-      autoStart: false,
-    }
-  );
+  new cloud.Service(app, "my_service", HANDLER_WITH_START_AND_STOP, {
+    autoStart: false,
+  });
   const s = await app.startSimulator();
   const service = s.getResource("/my_service") as cloud.IServiceClient;
 
@@ -146,26 +137,15 @@ test("start and stop service", async () => {
       .listTraces()
       .filter((v) => v.sourceType == cloud.SERVICE_FQN)
       .map((trace) => trace.data.message)
-  ).toEqual([
-    "@winglang/sdk.cloud.Service created.",
-    "start!",
-    "stop!",
-    "start!",
-    "stop!",
-  ]);
+  ).toEqual(["root/my_service started", "start!", "stop!", "start!", "stop!"]);
 });
 
 test("consecutive start and stop service", async () => {
   // GIVEN
   const app = new SimApp();
-  new cloud.Service(
-    app,
-    "my_service",
-    Testing.makeHandler(HANDLER_WITH_START_AND_STOP),
-    {
-      autoStart: false,
-    }
-  );
+  new cloud.Service(app, "my_service", HANDLER_WITH_START_AND_STOP, {
+    autoStart: false,
+  });
   const s = await app.startSimulator();
   const service = s.getResource("/my_service") as cloud.IServiceClient;
 
@@ -183,5 +163,24 @@ test("consecutive start and stop service", async () => {
       .listTraces()
       .filter((v) => v.sourceType == cloud.SERVICE_FQN)
       .map((trace) => trace.data.message)
-  ).toEqual(["@winglang/sdk.cloud.Service created.", "start!", "stop!"]);
+  ).toEqual(["root/my_service started", "start!", "stop!"]);
+});
+
+test("throws during service start", async () => {
+  // GIVEN
+  const app = new SimApp();
+  new cloud.Service(
+    app,
+    "my_service",
+    inflight(async () => {
+      throw new Error("ThisIsAnError");
+    })
+  );
+
+  const s = await app.startSimulator();
+  const msg = s
+    .listTraces()
+    .find((t) => t.data.message.startsWith("Failed to start service"));
+  expect(msg).toBeTruthy();
+  expect(msg?.data.message).toEqual("Failed to start service: ThisIsAnError");
 });
diff --git a/libs/wingsdk/test/target-sim/state.test.ts b/libs/wingsdk/test/target-sim/state.test.ts
index e50a637cdf4..c9615a46cae 100644
--- a/libs/wingsdk/test/target-sim/state.test.ts
+++ b/libs/wingsdk/test/target-sim/state.test.ts
@@ -1,7 +1,8 @@
 import { test, expect } from "vitest";
 import { cloud } from "../../src";
 import { IFunctionClient, OnDeploy } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight, lift } from "../../src/core";
+import { Json } from "../../src/std";
 import { State } from "../../src/target-sim";
 import { SimApp } from "../sim-app";
 
@@ -17,11 +18,7 @@ test("state can be resolved at any time", async () => {
   const fn = new cloud.Function(
     app,
     "MyFunction",
-    Testing.makeHandler(`
-      async handle(event) {
-        return process.env.MY_KEY;
-      }
-      `),
+    inflight(async () => process.env.MY_KEY),
     {
       env: {
         MY_KEY: token,
@@ -32,20 +29,12 @@ test("state can be resolved at any time", async () => {
   new OnDeploy(
     app,
     "MyOnDeploy",
-    Testing.makeHandler(
-      `
-      async handle() {
-        console.log("setting ${tokenKey}");
-        await this.my_state.set("${tokenKey}", "bang bang");
-      }
-      `,
-      {
-        my_state: {
-          obj: state,
-          ops: ["set"],
-        },
-      }
-    )
+    lift({ my_state: state, tokenKey })
+      .grant({ my_state: ["set"] })
+      .inflight(async (ctx) => {
+        console.log(`setting ${ctx.tokenKey}`);
+        await ctx.my_state.set(`${ctx.tokenKey}`, "bang bang" as any);
+      })
   );
 
   const s = await app.startSimulator();
diff --git a/libs/wingsdk/test/target-sim/stream-processor.test.ts b/libs/wingsdk/test/target-sim/stream-processor.test.ts
new file mode 100644
index 00000000000..de19ce606a4
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/stream-processor.test.ts
@@ -0,0 +1,60 @@
+import { Readable } from "stream";
+import { describe, expect, it, vi } from "vitest";
+import { processStream } from "../../src/shared/stream-processor";
+
+describe("processStream", () => {
+  it("should process data events correctly", () =>
+    new Promise((done) => {
+      const mockData = Buffer.from("Hello\nWorld\n");
+      const mockStream = new Readable();
+      mockStream.push(mockData);
+      mockStream.push(null); // Indicates end of stream
+
+      const mockCallback = vi.fn();
+
+      processStream(mockStream, mockCallback);
+
+      setImmediate(() => {
+        expect(mockCallback).toHaveBeenCalledTimes(2);
+        expect(mockCallback).toHaveBeenNthCalledWith(1, "Hello");
+        expect(mockCallback).toHaveBeenNthCalledWith(2, "World");
+        done(undefined);
+      });
+    }));
+
+  it("should process lines split among multiple chunks", () =>
+    new Promise((done) => {
+      const mockData1 = Buffer.from("Hello ");
+      const mockData2 = Buffer.from("world\n");
+      const mockStream = new Readable();
+      mockStream.push(mockData1);
+      mockStream.push(mockData2);
+      mockStream.push(null); // Indicates end of stream
+
+      const mockCallback = vi.fn();
+
+      processStream(mockStream, mockCallback);
+
+      setImmediate(() => {
+        expect(mockCallback).toHaveBeenCalledTimes(1);
+        expect(mockCallback).toHaveBeenNthCalledWith(1, "Hello world");
+        done(undefined);
+      });
+    }));
+
+  it("should handle error events", () =>
+    new Promise((done) => {
+      const mockStream = new Readable();
+      const mockCallback = vi.fn();
+      const consoleSpy = vi.spyOn(console, "error");
+
+      processStream(mockStream, mockCallback);
+
+      mockStream.emit("error", new Error("Test error"));
+
+      setImmediate(() => {
+        expect(consoleSpy).toHaveBeenCalledWith("Error occurred: Test error");
+        done(undefined);
+      });
+    }));
+});
diff --git a/libs/wingsdk/test/target-sim/table.test.ts b/libs/wingsdk/test/target-sim/table.test.ts
index 5547a309aa8..6eda65e0710 100644
--- a/libs/wingsdk/test/target-sim/table.test.ts
+++ b/libs/wingsdk/test/target-sim/table.test.ts
@@ -21,6 +21,8 @@ test("create a table", async () => {
       handle: expect.any(String),
     },
     path: "root/my_table",
+    addr: expect.any(String),
+    policy: [],
     props: {
       name: "new_table",
       columns: {
@@ -58,6 +60,8 @@ test("insert row", async () => {
       handle: expect.any(String),
     },
     path: "root/my_table",
+    addr: expect.any(String),
+    policy: [],
     props: {
       name: "my_insert_table",
       columns: {
@@ -103,6 +107,8 @@ test("get row", async () => {
       handle: expect.any(String),
     },
     path: "root/my_table",
+    addr: expect.any(String),
+    policy: [],
     props: {
       name: "my_get_table",
       columns: {
@@ -147,6 +153,8 @@ test("tryGet row", async () => {
       handle: expect.any(String),
     },
     path: "root/my_table",
+    addr: expect.any(String),
+    policy: [],
     props: {
       name: "my_get_table",
       columns: {
@@ -190,6 +198,8 @@ test("update row", async () => {
       handle: expect.any(String),
     },
     path: "root/my_table",
+    addr: expect.any(String),
+    policy: [],
     props: {
       name: "my_update_table",
       columns: {
@@ -232,6 +242,8 @@ test("list table", async () => {
       handle: expect.any(String),
     },
     path: "root/my_table",
+    addr: expect.any(String),
+    policy: [],
     props: {
       name: "my_list_table",
       columns: {
@@ -336,6 +348,8 @@ test("can add row in preflight", async () => {
       handle: expect.any(String),
     },
     path: "root/my_table",
+    addr: expect.any(String),
+    policy: [],
     props: {
       name: "my_addrow_table",
       columns: {
diff --git a/libs/wingsdk/test/target-sim/test-runner.test.ts b/libs/wingsdk/test/target-sim/test-runner.test.ts
new file mode 100644
index 00000000000..6417318f50a
--- /dev/null
+++ b/libs/wingsdk/test/target-sim/test-runner.test.ts
@@ -0,0 +1,58 @@
+import { Construct } from "constructs";
+import { describe, expect, test } from "vitest";
+import { inflight } from "../../src/core";
+import { Test } from "../../src/std";
+import { SimApp } from "../sim-app";
+
+const NOOP = inflight(async () => {});
+
+describe("Single test", () => {
+  class Root extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      new Test(this, "test:first test", NOOP, {});
+    }
+  }
+
+  test("No function handlers should exist in a non test environment", () => {
+    const app = new SimApp({
+      isTestEnvironment: false,
+      rootConstruct: Root,
+    });
+
+    //@ts-expect-error
+    const testList = app._testRunner?.getTestFunctionHandles() ?? {};
+    expect(Object.keys(testList)).toEqual([]);
+  });
+
+  test("A single function handler should exist in a test environment", () => {
+    const app = new SimApp({ isTestEnvironment: true, rootConstruct: Root });
+
+    //@ts-expect-error
+    const testList = app._testRunner?.getTestFunctionHandles() ?? {};
+    expect(Object.keys(testList)).toEqual(["root/env0/test:first test"]);
+  });
+});
+
+describe("Multiple tests", () => {
+  class Root extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      new Test(this, "test:first test", NOOP, {});
+      new Test(this, "test:second test", NOOP, {});
+      new Test(this, "test:third test", NOOP, {});
+    }
+  }
+
+  test("Multiple function handlers should exist in a test environment", () => {
+    const app = new SimApp({ isTestEnvironment: true, rootConstruct: Root });
+
+    //@ts-expect-error
+    const testList = app._testRunner?.getTestFunctionHandles() ?? {};
+    expect(Object.keys(testList)).toEqual([
+      "root/env0/test:first test",
+      "root/env1/test:second test",
+      "root/env2/test:third test",
+    ]);
+  });
+});
diff --git a/libs/wingsdk/test/target-sim/test.test.ts b/libs/wingsdk/test/target-sim/test.test.ts
index 26f5ff1b9e0..d5825de5688 100644
--- a/libs/wingsdk/test/target-sim/test.test.ts
+++ b/libs/wingsdk/test/target-sim/test.test.ts
@@ -1,33 +1,40 @@
+import { Construct } from "constructs";
 import { test, expect } from "vitest";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { Test } from "../../src/std";
 import { SimApp } from "../sim-app";
 
-const INFLIGHT_CODE = `
-async handle(event) {
-  console.log("this test should pass!");
-}`;
+const INFLIGHT_CODE = inflight(async () =>
+  console.log("this test should pass!")
+);
 
 test("create a test", async () => {
   // GIVEN
-  const app = new SimApp();
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new Test(app, "test:my_test", handler);
+  class Root extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      new Test(this, "test:my_test", INFLIGHT_CODE);
+    }
+  }
+  const app = new SimApp({ isTestEnvironment: true, rootConstruct: Root });
 
   // THEN
   const s = await app.startSimulator();
 
   // for now, it just creates a cloud.Function
-  expect(s.getResourceConfig("/test:my_test/Handler")).toEqual({
+  expect(s.getResourceConfig("/env0/test:my_test/Handler")).toEqual({
     attrs: {
       handle: expect.any(String),
     },
-    path: "root/test:my_test/Handler",
+    path: "root/env0/test:my_test/Handler",
+    addr: expect.any(String),
+    policy: [],
     props: {
       environmentVariables: {},
       sourceCodeFile: expect.any(String),
       sourceCodeLanguage: "javascript",
       timeout: 60000,
+      concurrency: 100,
     },
     type: "@winglang/sdk.cloud.Function",
   });
diff --git a/libs/wingsdk/test/target-sim/topic-producer.test.ts b/libs/wingsdk/test/target-sim/topic-producer.test.ts
index 168ee5e95e7..f97a156ba5b 100644
--- a/libs/wingsdk/test/target-sim/topic-producer.test.ts
+++ b/libs/wingsdk/test/target-sim/topic-producer.test.ts
@@ -1,8 +1,8 @@
 import { Construct } from "constructs";
 import { test, expect } from "vitest";
-import { listMessages } from "./util";
+import { listMessages, waitUntilTraceCount } from "./util";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight, lift } from "../../src/core";
 import { SimApp } from "../sim-app";
 
 test("publishing messages to topic", async () => {
@@ -12,22 +12,20 @@ test("publishing messages to topic", async () => {
       super(scope, id);
 
       const topic = new cloud.Topic(this, "MyTopic");
-      const publisher = Testing.makeHandler(
-        `async handle(event) {
-            await this.topic.publish(event);
-        }`,
-        {
-          topic: {
-            obj: topic,
-            ops: [cloud.TopicInflightMethods.PUBLISH],
-          },
-        }
-      );
+
+      const publisher = lift({ topic })
+        .grant({ topic: [cloud.TopicInflightMethods.PUBLISH] })
+        .inflight(async (ctx, event) => {
+          await ctx.topic.publish(event);
+        });
+
       new cloud.Function(this, "Function", publisher);
 
-      const processor = Testing.makeHandler(`async handle(event) {
-          if (event.message === "") throw new Error("No message recieved");
-      }`);
+      const processor = inflight(async (_, event) => {
+        if (event.message === "") throw new Error("No message recieved");
+        console.log("Message received");
+      });
+
       topic.onMessage(processor);
     }
   }
@@ -44,6 +42,55 @@ test("publishing messages to topic", async () => {
   // WHEN
   await publisher.invoke("ABC");
 
+  await waitUntilTraceCount(s, 1, (trace) =>
+    trace.data.message.includes("Message received")
+  );
+
+  // THEN
+  await s.stop();
+
+  expect(listMessages(s)).toMatchSnapshot();
+});
+
+test("publishing multiple messages to topic", async () => {
+  // GIVEN
+  class TopicTest extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+
+      const topic = new cloud.Topic(this, "MyTopic");
+      const publisher = lift({ topic })
+        .grant({ topic: [cloud.TopicInflightMethods.PUBLISH] })
+        .inflight(async (ctx, event) => {
+          await ctx.topic.publish(...event.split(""));
+        });
+
+      new cloud.Function(this, "Function", publisher);
+
+      const processor = inflight(async (_, event) => {
+        if (event.message === "") throw new Error("No message recieved");
+      });
+
+      topic.onMessage(processor);
+    }
+  }
+
+  const app = new SimApp();
+  new TopicTest(app, "TopicTester");
+
+  const s = await app.startSimulator();
+
+  const publisher = s.getResource(
+    "/TopicTester/Function"
+  ) as cloud.IFunctionClient;
+
+  // WHEN
+  await publisher.invoke("ABC");
+
+  await waitUntilTraceCount(s, 1, (trace) =>
+    trace.data.message.includes("A", "B", "C")
+  );
+
   // THEN
   await s.stop();
 
diff --git a/libs/wingsdk/test/target-sim/topic.test.ts b/libs/wingsdk/test/target-sim/topic.test.ts
index 12f7b81b303..6533dcafd8c 100644
--- a/libs/wingsdk/test/target-sim/topic.test.ts
+++ b/libs/wingsdk/test/target-sim/topic.test.ts
@@ -1,6 +1,7 @@
 import { test, expect } from "vitest";
-import { listMessages, treeJsonOf, waitUntilTraceCount } from "./util";
+import { treeJsonOf, waitUntilTrace } from "./util";
 import * as cloud from "../../src/cloud";
+import { inflight } from "../../src/core";
 import { Testing } from "../../src/simulator";
 import { Node } from "../../src/std";
 import { SimApp } from "../sim-app";
@@ -17,6 +18,8 @@ test("create a topic", async () => {
       handle: expect.any(String),
     },
     path: "root/my_topic",
+    addr: expect.any(String),
+    policy: [],
     props: {},
     type: cloud.TOPIC_FQN,
   });
@@ -25,40 +28,14 @@ test("create a topic", async () => {
   expect(app.snapshot()).toMatchSnapshot();
 });
 
-test("topic publishes messages as they are received", async () => {
-  // GIVEN
-  const app = new SimApp();
-  const handler = Testing.makeHandler(
-    `async handle(message) { console.log("Received " + message); }`
-  );
-  const topic = new cloud.Topic(app, "my_topic");
-  topic.onMessage(handler);
-
-  const s = await app.startSimulator();
-  const topicClient = s.getResource("/my_topic") as cloud.ITopicClient;
-
-  // WHEN
-  await topicClient.publish("Alpha");
-  await topicClient.publish("Beta");
-  await waitUntilTraceCount(s, 2, (trace) =>
-    trace.data.message.startsWith("Invoke")
-  );
-
-  // THEN
-  await s.stop();
-  expect(listMessages(s)).toMatchSnapshot();
-});
-
 test("topic publishes messages to multiple subscribers", async () => {
   // GIVEN
   const app = new SimApp();
-  const handler = Testing.makeHandler(
-    "Handler1",
-    `async handle(message) { console.log("Received " + message); }`
+  const handler = inflight(async (_, message) =>
+    console.log("Received " + message)
   );
-  const otherHandler = Testing.makeHandler(
-    "Handler2",
-    `async handle(message) { console.log("Also received " + message); }`
+  const otherHandler = inflight(async (_, message) =>
+    console.log("Also received " + message)
   );
   const topic = new cloud.Topic(app, "my_topic");
   topic.onMessage(handler);
@@ -71,8 +48,13 @@ test("topic publishes messages to multiple subscribers", async () => {
   await topicClient.publish("Alpha");
 
   // THEN
+  await waitUntilTrace(s, (trace) =>
+    trace.data.message.startsWith("Received Alpha")
+  );
+  await waitUntilTrace(s, (trace) =>
+    trace.data.message.startsWith("Also received Alpha")
+  );
   await s.stop();
-  expect(listMessages(s)).toMatchSnapshot();
 });
 
 test("topic has no display hidden property", async () => {
diff --git a/libs/wingsdk/test/target-sim/util.ts b/libs/wingsdk/test/target-sim/util.ts
index 938cd0f5a62..07aab70729f 100644
--- a/libs/wingsdk/test/target-sim/util.ts
+++ b/libs/wingsdk/test/target-sim/util.ts
@@ -29,10 +29,14 @@ export interface IScopeCallback {
   (scope: Construct): void;
 }
 
-export function listMessages(s: Simulator) {
+export function listMessages(s: Simulator): string[] {
   const message = s.listTraces().map((trace) => trace.data.message);
   // Redact any messages containing port numbers
-  return message.map((m) => m.replace(/:\d+/, ":<port>"));
+  return message.map((m) =>
+    m
+      .replace(/wing-container-\w+/g, "wing-container-<container>")
+      .replace(/:\d+/, ":<port>")
+  );
 }
 
 export async function sleep(ms: number) {
diff --git a/libs/wingsdk/test/target-sim/utils.test.ts b/libs/wingsdk/test/target-sim/utils.test.ts
index cd5824ed67a..0ea5c3ea185 100644
--- a/libs/wingsdk/test/target-sim/utils.test.ts
+++ b/libs/wingsdk/test/target-sim/utils.test.ts
@@ -6,7 +6,7 @@ describe("convertDurationToCronExpression", () => {
   test("converts a duration from minutes", () => {
     // GIVEN
     const dur = Duration.fromMinutes(10);
-    const expectedCron = "*/10 * * * ?";
+    const expectedCron = "*/10 * * * *";
 
     // WHEN
     const cron = convertDurationToCronExpression(dur);
@@ -17,7 +17,7 @@ describe("convertDurationToCronExpression", () => {
 
   test("converts a duration from hours", () => {
     const dur = Duration.fromHours(2);
-    const expectedCron = "* */2 * * ?";
+    const expectedCron = "* */2 * * *";
 
     // WHEN
     const cron = convertDurationToCronExpression(dur);
@@ -29,7 +29,7 @@ describe("convertDurationToCronExpression", () => {
   test("converts durations with fractional hours", () => {
     // GIVEN
     const dur = Duration.fromHours(2.5);
-    const expectedCron = "*/30 */2 * * ?";
+    const expectedCron = "*/30 */2 * * *";
 
     // WHEN
     const cron = convertDurationToCronExpression(dur);
diff --git a/libs/wingsdk/test/target-sim/website.test.ts b/libs/wingsdk/test/target-sim/website.test.ts
index 7f7d41ce754..5ce4f8e3644 100644
--- a/libs/wingsdk/test/target-sim/website.test.ts
+++ b/libs/wingsdk/test/target-sim/website.test.ts
@@ -109,6 +109,8 @@ test("api.url is resolved in website config", async () => {
       url: expect.any(String),
     },
     path: "root/website",
+    addr: expect.any(String),
+    policy: [],
     props: {
       fileRoutes: {
         "config.json": {
@@ -144,6 +146,8 @@ test("multiple tokens are resolved in website config", async () => {
       url: expect.any(String),
     },
     path: "root/website",
+    addr: expect.any(String),
+    policy: [],
     props: {
       fileRoutes: {
         "config.json": {
@@ -172,3 +176,26 @@ test("addJson throws an error for no json path", async () => {
     website.addJson(jsonPath, Object(jsonConfig));
   }).toThrowError('key must have a .json suffix. (current: "not a json Path")');
 });
+
+test("custom error page", async () => {
+  // GIVEN
+  const app = new SimApp();
+  const website = new cloud.Website(app, "website", {
+    path: resolve(__dirname, "../test-files/website"),
+    errorDocument: "b.html",
+  });
+
+  // WHEN
+  const s = await app.startSimulator();
+  const websiteUrl = getWebsiteUrl(s, "/website");
+
+  const errorPage = await fetch(`${websiteUrl}/page123`);
+
+  // THEN
+  await s.stop();
+  expect(await errorPage.text()).toEqual(
+    readFileSync(resolve(__dirname, "../test-files/website/b.html"), {
+      encoding: "utf-8",
+    })
+  );
+});
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/api.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/api.test.ts.snap
index b9ab0bec7af..bd2955e9683 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/api.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/api.test.ts.snap
@@ -46,7 +46,7 @@ exports[`api configured for cors 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get__0_28A24394.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations",
         },
       },
     },
@@ -86,10 +86,10 @@ exports[`api configured for cors 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                #if ($context.httpMethod == \\"OPTIONS\\")
-                    {\\"statusCode\\": 204}
+                #if ($context.httpMethod == "OPTIONS")
+                    {"statusCode": 204}
                 #else
-                    {\\"statusCode\\": 404}
+                    {"statusCode": 404}
                 #end
               ",
           },
@@ -111,7 +111,7 @@ exports[`api configured for cors 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -120,7 +120,7 @@ exports[`api configured for cors 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -133,6 +133,243 @@ exports[`api configured for cors 1`] = `
 }
 `;
 
+exports[`api will be private when vpc_api_gateway is true 1`] = `
+{
+  "data": {
+    "aws_caller_identity": {
+      "account": {},
+    },
+    "aws_region": {
+      "Region": {},
+    },
+    "aws_vpc_endpoint_service": {
+      "Api_api_apiServiceLookup_C62CF75C": {
+        "service": "execute-api",
+      },
+    },
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://\${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.\${data.aws_region.Region.name}.amazonaws.com/\${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}",
+    },
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "lifecycle": {
+          "create_before_destroy": true,
+        },
+        "rest_api_id": "\${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "\${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}",
+        },
+      },
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "body": "{"paths":{"/{proxy+}":{"x-amazon-apigateway-any-method":{"produces":["application/json"],"x-amazon-apigateway-integration":{"type":"mock","requestTemplates":{"application/json":"\\n                {\\"statusCode\\": 404}\\n              "},"passthroughBehavior":"never","responses":{"404":{"statusCode":"404","responseParameters":{"method.response.header.Content-Type":"'application/json'"},"responseTemplates":{"application/json":"{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}"}},"default":{"statusCode":"404","responseParameters":{"method.response.header.Content-Type":"'application/json'"},"responseTemplates":{"application/json":"{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}"}}}},"responses":{"404":{"description":"404 response","headers":{"Content-Type":{"type":"string"}}}}}}},"openapi":"3.0.3"}",
+        "endpoint_configuration": {
+          "types": [
+            "PRIVATE",
+          ],
+          "vpc_endpoint_ids": [
+            "\${aws_vpc_endpoint.Api_api_api-vpc-endpoint_F7BB1063.id}",
+          ],
+        },
+        "lifecycle": {
+          "create_before_destroy": true,
+        },
+        "name": "api-c8f613f0",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":"execute-api:Invoke","Resource":["*"]},{"Effect":"Deny","Principal":"*","Action":"execute-api:Invoke","Resource":["*"],"Condition":{"StringNotEquals":{"aws:sourceVpce":"\${aws_vpc_endpoint.Api_api_api-vpc-endpoint_F7BB1063.id}"}}}]}",
+      },
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "deployment_id": "\${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "\${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod",
+      },
+    },
+    "aws_eip": {
+      "EIP": {},
+    },
+    "aws_internet_gateway": {
+      "InternetGateway": {
+        "tags": {
+          "Name": "Default-c82bf964-internet-gateway",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_nat_gateway": {
+      "NATGateway": {
+        "allocation_id": "\${aws_eip.EIP.id}",
+        "subnet_id": "\${aws_subnet.PublicSubnet.id}",
+        "tags": {
+          "Name": "Default-c82bf964-nat-gateway",
+        },
+      },
+    },
+    "aws_route_table": {
+      "PrivateRouteTable": {
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": null,
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": "\${aws_nat_gateway.NATGateway.id}",
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null,
+          },
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-private-route-table-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PrivateRouteTable2": {
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": null,
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": "\${aws_nat_gateway.NATGateway.id}",
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null,
+          },
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-private-route-table-2",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PublicRouteTable": {
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": "\${aws_internet_gateway.InternetGateway.id}",
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": null,
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null,
+          },
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-public-route-table-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_route_table_association": {
+      "PrivateRouteTableAssociation": {
+        "route_table_id": "\${aws_route_table.PrivateRouteTable.id}",
+        "subnet_id": "\${aws_subnet.PrivateSubnet.id}",
+      },
+      "PrivateRouteTableAssociation2": {
+        "route_table_id": "\${aws_route_table.PrivateRouteTable2.id}",
+        "subnet_id": "\${aws_subnet.PrivateSubnet2.id}",
+      },
+      "PublicRouteTableAssociation": {
+        "route_table_id": "\${aws_route_table.PublicRouteTable.id}",
+        "subnet_id": "\${aws_subnet.PublicSubnet.id}",
+      },
+    },
+    "aws_security_group": {
+      "Api_api_apiSecurityGroup_CF67DC80": {
+        "ingress": [
+          {
+            "cidr_blocks": [
+              "0.0.0.0/0",
+            ],
+            "description": null,
+            "from_port": 0,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "-1",
+            "security_groups": null,
+            "self": null,
+            "to_port": 0,
+          },
+        ],
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_subnet": {
+      "PrivateSubnet": {
+        "availability_zone": "\${data.aws_region.Region.name}a",
+        "cidr_block": "10.0.4.0/22",
+        "tags": {
+          "Name": "Default-c82bf964-private-subnet-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PrivateSubnet2": {
+        "availability_zone": "\${data.aws_region.Region.name}b",
+        "cidr_block": "10.0.8.0/22",
+        "tags": {
+          "Name": "Default-c82bf964-private-subnet-2",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PublicSubnet": {
+        "availability_zone": "\${data.aws_region.Region.name}a",
+        "cidr_block": "10.0.0.0/24",
+        "tags": {
+          "Name": "Default-c82bf964-public-subnet-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_vpc": {
+      "VPC": {
+        "cidr_block": "10.0.0.0/16",
+        "enable_dns_hostnames": true,
+        "enable_dns_support": true,
+        "tags": {
+          "Name": "Default-c82bf964-vpc",
+        },
+      },
+    },
+    "aws_vpc_endpoint": {
+      "Api_api_api-vpc-endpoint_F7BB1063": {
+        "private_dns_enabled": true,
+        "security_group_ids": [
+          "\${aws_security_group.Api_api_apiSecurityGroup_CF67DC80.id}",
+        ],
+        "service_name": "\${data.aws_vpc_endpoint_service.Api_api_apiServiceLookup_C62CF75C.service_name}",
+        "subnet_ids": [
+          "\${aws_subnet.PrivateSubnet.id}",
+          "\${aws_subnet.PrivateSubnet2.id}",
+        ],
+        "vpc_endpoint_type": "Interface",
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+  },
+}
+`;
+
 exports[`api with 'name' & 'age' parameter 1`] = `
 {
   "openapi": "3.0.3",
@@ -174,11 +411,11 @@ exports[`api with 'name' & 'age' parameter 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_name_age_0_89726BCD.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_-name_-age0-c8483afe/invocations",
         },
       },
     },
-    "/{proxy+}": {
+    "/{name}/{age}/{proxy+}": {
       "x-amazon-apigateway-any-method": {
         "produces": [
           "application/json",
@@ -197,7 +434,7 @@ exports[`api with 'name' & 'age' parameter 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -206,7 +443,7 @@ exports[`api with 'name' & 'age' parameter 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -215,7 +452,7 @@ exports[`api with 'name' & 'age' parameter 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -261,11 +498,11 @@ exports[`api with 'name' parameter 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_name_0_91363CD1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_-name0-c8d13803/invocations",
         },
       },
     },
-    "/{proxy+}": {
+    "/{name}/{proxy+}": {
       "x-amazon-apigateway-any-method": {
         "produces": [
           "application/json",
@@ -284,7 +521,7 @@ exports[`api with 'name' parameter 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -293,7 +530,7 @@ exports[`api with 'name' parameter 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -302,7 +539,7 @@ exports[`api with 'name' parameter 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -339,7 +576,7 @@ exports[`api with CONNECT route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_connect__0_51B16936.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:connect_0-c83420d1/invocations",
         },
       },
     },
@@ -362,7 +599,7 @@ exports[`api with CONNECT route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -371,7 +608,7 @@ exports[`api with CONNECT route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -380,7 +617,7 @@ exports[`api with CONNECT route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -417,7 +654,7 @@ exports[`api with DELETE route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_delete__0_114F7202.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:delete_0-c85ab39c/invocations",
         },
       },
     },
@@ -440,7 +677,7 @@ exports[`api with DELETE route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -449,7 +686,7 @@ exports[`api with DELETE route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -458,7 +695,7 @@ exports[`api with DELETE route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -495,7 +732,7 @@ exports[`api with GET route at root 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get__0_28A24394.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations",
         },
       },
     },
@@ -518,7 +755,7 @@ exports[`api with GET route at root 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -527,7 +764,7 @@ exports[`api with GET route at root 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -536,7 +773,7 @@ exports[`api with GET route at root 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -573,7 +810,7 @@ exports[`api with GET routes with common prefix 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_bat0-c8a08a1c/invocations",
         },
       },
     },
@@ -597,7 +834,7 @@ exports[`api with GET routes with common prefix 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_foo0-c82c3421/invocations",
         },
       },
     },
@@ -620,7 +857,7 @@ exports[`api with GET routes with common prefix 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -629,7 +866,7 @@ exports[`api with GET routes with common prefix 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -638,7 +875,7 @@ exports[`api with GET routes with common prefix 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -675,7 +912,7 @@ exports[`api with GET routes with different prefix 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_foo_bar0-c8d108f9/invocations",
         },
       },
     },
@@ -699,7 +936,7 @@ exports[`api with GET routes with different prefix 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_foo0-c82c3421/invocations",
         },
       },
     },
@@ -722,7 +959,7 @@ exports[`api with GET routes with different prefix 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -731,7 +968,7 @@ exports[`api with GET routes with different prefix 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -740,7 +977,7 @@ exports[`api with GET routes with different prefix 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -777,7 +1014,7 @@ exports[`api with HEAD route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_head__0_C5A391F7.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:head_0-c857e3ff/invocations",
         },
       },
     },
@@ -800,7 +1037,7 @@ exports[`api with HEAD route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -809,7 +1046,7 @@ exports[`api with HEAD route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -818,7 +1055,7 @@ exports[`api with HEAD route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -855,7 +1092,7 @@ exports[`api with OPTIONS route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_options__0_87A882E5.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:options_0-c8aab680/invocations",
         },
       },
     },
@@ -878,7 +1115,7 @@ exports[`api with OPTIONS route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -887,7 +1124,7 @@ exports[`api with OPTIONS route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -896,7 +1133,7 @@ exports[`api with OPTIONS route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -933,7 +1170,7 @@ exports[`api with PATCH route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_patch__0_2A535309.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:patch_0-c8eaba1e/invocations",
         },
       },
     },
@@ -956,7 +1193,7 @@ exports[`api with PATCH route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -965,7 +1202,7 @@ exports[`api with PATCH route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -974,7 +1211,7 @@ exports[`api with PATCH route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1011,7 +1248,7 @@ exports[`api with POST route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_post__0_FC38D853.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:post_0-c8d25f85/invocations",
         },
       },
     },
@@ -1034,7 +1271,7 @@ exports[`api with POST route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -1043,7 +1280,7 @@ exports[`api with POST route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1052,7 +1289,7 @@ exports[`api with POST route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1089,7 +1326,7 @@ exports[`api with PUT route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_put__0_C3CFB295.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:put_0-c80fcd0a/invocations",
         },
       },
     },
@@ -1112,7 +1349,7 @@ exports[`api with PUT route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -1121,7 +1358,7 @@ exports[`api with PUT route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1130,7 +1367,7 @@ exports[`api with PUT route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1167,7 +1404,7 @@ exports[`api with multiple GET route and one lambda 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_foo0-c82c3421/invocations",
         },
       },
     },
@@ -1191,7 +1428,7 @@ exports[`api with multiple GET route and one lambda 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_foo0-c82c3421/invocations",
         },
       },
     },
@@ -1214,7 +1451,7 @@ exports[`api with multiple GET route and one lambda 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -1223,7 +1460,7 @@ exports[`api with multiple GET route and one lambda 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1232,7 +1469,7 @@ exports[`api with multiple GET route and one lambda 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1269,7 +1506,7 @@ exports[`api with multiple methods and multiple lambda 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:post_hello_bat0-c8596849/invocations",
         },
       },
     },
@@ -1293,7 +1530,7 @@ exports[`api with multiple methods and multiple lambda 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_foo0-c82c3421/invocations",
         },
       },
     },
@@ -1316,7 +1553,7 @@ exports[`api with multiple methods and multiple lambda 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -1325,7 +1562,7 @@ exports[`api with multiple methods and multiple lambda 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1334,7 +1571,7 @@ exports[`api with multiple methods and multiple lambda 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1371,7 +1608,7 @@ exports[`api with multiple methods and one lambda 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_foo0-c82c3421/invocations",
         },
       },
     },
@@ -1395,7 +1632,7 @@ exports[`api with multiple methods and one lambda 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_foo_0_2252DDE1.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_foo0-c82c3421/invocations",
         },
       },
     },
@@ -1418,7 +1655,7 @@ exports[`api with multiple methods and one lambda 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -1427,7 +1664,7 @@ exports[`api with multiple methods and one lambda 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1436,7 +1673,7 @@ exports[`api with multiple methods and one lambda 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1473,7 +1710,7 @@ exports[`api with multiple methods on same route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get__0_28A24394.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations",
         },
       },
       "put": {
@@ -1495,7 +1732,7 @@ exports[`api with multiple methods on same route 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get__0_28A24394.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations",
         },
       },
     },
@@ -1518,7 +1755,7 @@ exports[`api with multiple methods on same route 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -1527,7 +1764,7 @@ exports[`api with multiple methods on same route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1536,7 +1773,7 @@ exports[`api with multiple methods on same route 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1582,7 +1819,7 @@ exports[`api with path parameter 1`] = `
             },
           },
           "type": "aws_proxy",
-          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get_hello_world_0_DAB3CC5C.arn}/invocations",
+          "uri": "arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_hello_-world0-c81e38f8/invocations",
         },
       },
     },
@@ -1605,7 +1842,7 @@ exports[`api with path parameter 1`] = `
           "passthroughBehavior": "never",
           "requestTemplates": {
             "application/json": "
-                {\\"statusCode\\": 404}
+                {"statusCode": 404}
               ",
           },
           "responses": {
@@ -1614,7 +1851,7 @@ exports[`api with path parameter 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
@@ -1623,7 +1860,7 @@ exports[`api with path parameter 1`] = `
                 "method.response.header.Content-Type": "'application/json'",
               },
               "responseTemplates": {
-                "application/json": "{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}",
+                "application/json": "{"statusCode": 404, "message": "Error: Resource not found"}",
               },
               "statusCode": "404",
             },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/bucket.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/bucket.test.ts.snap
index c168c164600..2457f05f584 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/bucket.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/bucket.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`bucket is public 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_s3_bucket": {
       "my_bucket": {
@@ -20,7 +15,7 @@ exports[`bucket is public 1`] = `
         "depends_on": [
           "aws_s3_bucket_public_access_block.my_bucket_PublicAccessBlock_538547C0",
         ],
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":\\"*\\",\\"Action\\":[\\"s3:GetObject\\"],\\"Resource\\":[\\"\${aws_s3_bucket.my_bucket.arn}/*\\"]}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["\${aws_s3_bucket.my_bucket.arn}/*"]}]}",
       },
     },
     "aws_s3_bucket_public_access_block": {
@@ -47,64 +42,45 @@ exports[`bucket is public 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
                   "PublicAccessBlock": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "PublicAccessBlock",
                     "path": "root/Default/my_bucket/PublicAccessBlock",
                   },
                   "PublicPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "PublicPolicy",
                     "path": "root/Default/my_bucket/PublicPolicy",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -116,32 +92,36 @@ exports[`bucket is public 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -151,11 +131,6 @@ exports[`bucket is public 2`] = `
 
 exports[`bucket prefix must be lowercase 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_s3_bucket": {
       "The-UncannyBucket": {
@@ -180,15 +155,16 @@ exports[`bucket prefix must be lowercase 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The-Uncanny.Bucket/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -200,63 +176,45 @@ exports[`bucket prefix must be lowercase 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -266,11 +224,6 @@ exports[`bucket prefix must be lowercase 2`] = `
 
 exports[`bucket prefix valid 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_s3_bucket": {
       "the-uncannybucket": {
@@ -293,48 +246,27 @@ exports[`bucket prefix valid 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "the-uncanny.bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/the-uncanny.bucket/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -346,32 +278,36 @@ exports[`bucket prefix valid 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -381,54 +317,49 @@ exports[`bucket prefix valid 2`] = `
 
 exports[`bucket with onCreate method 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "my_bucket_oncreate-OnMessage0_CloudwatchLogGroup_E35B13F5": {
-        "name": "/aws/lambda/oncreate-OnMessage0-c874e955",
+      "my_bucket_OnCreate-OnMessage0_CloudwatchLogGroup_E3DA1BCC": {
+        "name": "/aws/lambda/OnCreate-OnMessage0-c8b6ea23",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+      "my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "my_bucket_oncreate-OnMessage0_IamRolePolicy_CDE0CB68": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
-        "role": "\${aws_iam_role.my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5.name}",
+      "my_bucket_OnCreate-OnMessage0_IamRolePolicy_8D03B4D5": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "my_bucket_oncreate-OnMessage0_IamRolePolicyAttachment_085EB554": {
+      "my_bucket_OnCreate-OnMessage0_IamRolePolicyAttachment_4F57A9D0": {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5.name}",
+        "role": "\${aws_iam_role.my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA.name}",
       },
     },
     "aws_lambda_function": {
-      "my_bucket_oncreate-OnMessage0_773D84E9": {
+      "my_bucket_OnCreate-OnMessage0_8A9D7A6E": {
         "architectures": [
           "arm64",
         ],
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "oncreate-OnMessage0-c874e955",
+            "WING_FUNCTION_NAME": "OnCreate-OnMessage0-c8b6ea23",
           },
         },
-        "function_name": "oncreate-OnMessage0-c874e955",
+        "function_name": "OnCreate-OnMessage0-c8b6ea23",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.my_bucket_oncreate-OnMessage0_S3Object_AF838DF5.key}",
+        "s3_key": "\${aws_s3_object.my_bucket_OnCreate-OnMessage0_S3Object_02866773.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -437,11 +368,11 @@ exports[`bucket with onCreate method 1`] = `
       },
     },
     "aws_lambda_permission": {
-      "my_bucket_oncreate-OnMessage0_InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1_7675EF40": {
+      "my_bucket_OnCreate-OnMessage0_InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8_60C310A7": {
         "action": "lambda:InvokeFunction",
-        "function_name": "\${aws_lambda_function.my_bucket_oncreate-OnMessage0_773D84E9.function_name}",
+        "function_name": "\${aws_lambda_function.my_bucket_OnCreate-OnMessage0_8A9D7A6E.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
+        "source_arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
       },
     },
     "aws_s3_bucket": {
@@ -457,7 +388,7 @@ exports[`bucket with onCreate method 1`] = `
       "my_bucket_S3BucketNotification_DDA29E8F": {
         "bucket": "\${aws_s3_bucket.my_bucket.id}",
         "depends_on": [
-          "aws_sns_topic_policy.my_bucket_oncreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_CE3B77A7",
+          "aws_sns_topic_policy.my_bucket_OnCreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_F8789A85",
         ],
         "topic": [
           {
@@ -465,7 +396,7 @@ exports[`bucket with onCreate method 1`] = `
               "s3:ObjectCreated:Put",
             ],
             "id": "on-oncreate-notification",
-            "topic_arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
+            "topic_arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
           },
         ],
       },
@@ -476,7 +407,7 @@ exports[`bucket with onCreate method 1`] = `
         "depends_on": [
           "aws_s3_bucket_public_access_block.my_bucket_PublicAccessBlock_538547C0",
         ],
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":\\"*\\",\\"Action\\":[\\"s3:GetObject\\"],\\"Resource\\":[\\"\${aws_s3_bucket.my_bucket.arn}/*\\"]}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["\${aws_s3_bucket.my_bucket.arn}/*"]}]}",
       },
     },
     "aws_s3_bucket_public_access_block": {
@@ -489,28 +420,28 @@ exports[`bucket with onCreate method 1`] = `
       },
     },
     "aws_s3_object": {
-      "my_bucket_oncreate-OnMessage0_S3Object_AF838DF5": {
+      "my_bucket_OnCreate-OnMessage0_S3Object_02866773": {
         "bucket": "\${aws_s3_bucket.Code.bucket}",
         "key": "<key>",
         "source": "<source>",
       },
     },
     "aws_sns_topic": {
-      "my_bucket_oncreate_EF5D7ECA": {
-        "name": "oncreate-c8ad674c",
+      "my_bucket_OnCreate_14226F85": {
+        "name": "OnCreate-c88b8dd6",
       },
     },
     "aws_sns_topic_policy": {
-      "my_bucket_oncreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_CE3B77A7": {
-        "arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
-        "policy": "{\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Action\\":\\"sns:Publish\\",\\"Resource\\":\\"\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}\\",\\"Condition\\":{\\"ArnEquals\\":{\\"aws:SourceArn\\":\\"\${aws_s3_bucket.my_bucket.arn}\\"}}}]}",
+      "my_bucket_OnCreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_F8789A85": {
+        "arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
+        "policy": "{"Statement":[{"Effect":"Allow","Principal":{"Service":"s3.amazonaws.com"},"Action":"sns:Publish","Resource":"\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}","Condition":{"ArnEquals":{"aws:SourceArn":"\${aws_s3_bucket.my_bucket.arn}"}}}]}",
       },
     },
     "aws_sns_topic_subscription": {
-      "my_bucket_oncreate_TopicSubscription0_0EC6A2F3": {
-        "endpoint": "\${aws_lambda_function.my_bucket_oncreate-OnMessage0_773D84E9.arn}",
+      "my_bucket_OnCreate_TopicSubscription0_4D6EC9AA": {
+        "endpoint": "\${aws_lambda_function.my_bucket_OnCreate-OnMessage0_8A9D7A6E.arn}",
         "protocol": "lambda",
-        "topic_arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
+        "topic_arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
       },
     },
   },
@@ -528,196 +459,201 @@ exports[`bucket with onCreate method 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
-                  "PublicAccessBlock": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicAccessBlock",
-                    "path": "root/Default/my_bucket/PublicAccessBlock",
-                  },
-                  "PublicPolicy": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicPolicy",
-                    "path": "root/Default/my_bucket/PublicPolicy",
-                  },
-                  "S3BucketNotification": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "S3BucketNotification",
-                    "path": "root/Default/my_bucket/S3BucketNotification",
-                  },
-                  "oncreate": {
+                  "OnCreate": {
                     "children": {
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/oncreate/Default",
+                        "path": "root/Default/my_bucket/OnCreate/Default",
                       },
                       "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
-                        "path": "root/Default/my_bucket/oncreate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
+                        "path": "root/Default/my_bucket/OnCreate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
                       },
                       "TopicSubscription0": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "TopicSubscription0",
-                        "path": "root/Default/my_bucket/oncreate/TopicSubscription0",
+                        "path": "root/Default/my_bucket/OnCreate/TopicSubscription0",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A pub/sub notification topic",
                       "title": "Topic",
                     },
-                    "id": "oncreate",
-                    "path": "root/Default/my_bucket/oncreate",
+                    "id": "OnCreate",
+                    "path": "root/Default/my_bucket/OnCreate",
                   },
-                  "oncreate-OnMessage0": {
+                  "OnCreate-OnMessage0": {
                     "children": {
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/Asset",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/CloudwatchLogGroup",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/Default",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/IamRole",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/IamRolePolicy",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/IamRolePolicyAttachment",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/IamRolePolicyAttachment",
                       },
-                      "InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1": {
+                      "InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
-                        "id": "InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1",
+                        "display": {},
+                        "id": "InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/S3Object",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
                       "title": "Function",
                     },
-                    "id": "oncreate-OnMessage0",
-                    "path": "root/Default/my_bucket/oncreate-OnMessage0",
+                    "id": "OnCreate-OnMessage0",
+                    "path": "root/Default/my_bucket/OnCreate-OnMessage0",
+                  },
+                  "PublicAccessBlock": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicAccessBlock",
+                    "path": "root/Default/my_bucket/PublicAccessBlock",
+                  },
+                  "PublicPolicy": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicPolicy",
+                    "path": "root/Default/my_bucket/PublicPolicy",
+                  },
+                  "S3BucketNotification": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "S3BucketNotification",
+                    "path": "root/Default/my_bucket/S3BucketNotification",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -729,32 +665,36 @@ exports[`bucket with onCreate method 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -764,54 +704,49 @@ exports[`bucket with onCreate method 2`] = `
 
 exports[`bucket with onDelete method 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "my_bucket_ondelete-OnMessage0_CloudwatchLogGroup_420A05F2": {
-        "name": "/aws/lambda/ondelete-OnMessage0-c8772675",
+      "my_bucket_OnDelete-OnMessage0_CloudwatchLogGroup_24024A4B": {
+        "name": "/aws/lambda/OnDelete-OnMessage0-c804d7e9",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+      "my_bucket_OnDelete-OnMessage0_IamRole_F99741C4": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "my_bucket_ondelete-OnMessage0_IamRolePolicy_635C2064": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
-        "role": "\${aws_iam_role.my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC.name}",
+      "my_bucket_OnDelete-OnMessage0_IamRolePolicy_B1B53387": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.my_bucket_OnDelete-OnMessage0_IamRole_F99741C4.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "my_bucket_ondelete-OnMessage0_IamRolePolicyAttachment_C985200D": {
+      "my_bucket_OnDelete-OnMessage0_IamRolePolicyAttachment_221C4BFC": {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC.name}",
+        "role": "\${aws_iam_role.my_bucket_OnDelete-OnMessage0_IamRole_F99741C4.name}",
       },
     },
     "aws_lambda_function": {
-      "my_bucket_ondelete-OnMessage0_9871443D": {
+      "my_bucket_OnDelete-OnMessage0_DB633A4C": {
         "architectures": [
           "arm64",
         ],
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "ondelete-OnMessage0-c8772675",
+            "WING_FUNCTION_NAME": "OnDelete-OnMessage0-c804d7e9",
           },
         },
-        "function_name": "ondelete-OnMessage0-c8772675",
+        "function_name": "OnDelete-OnMessage0-c804d7e9",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.my_bucket_OnDelete-OnMessage0_IamRole_F99741C4.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.my_bucket_ondelete-OnMessage0_S3Object_BB790A1F.key}",
+        "s3_key": "\${aws_s3_object.my_bucket_OnDelete-OnMessage0_S3Object_B50900E0.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -820,11 +755,11 @@ exports[`bucket with onDelete method 1`] = `
       },
     },
     "aws_lambda_permission": {
-      "my_bucket_ondelete-OnMessage0_InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315_E690DB87": {
+      "my_bucket_OnDelete-OnMessage0_InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a_63129B62": {
         "action": "lambda:InvokeFunction",
-        "function_name": "\${aws_lambda_function.my_bucket_ondelete-OnMessage0_9871443D.function_name}",
+        "function_name": "\${aws_lambda_function.my_bucket_OnDelete-OnMessage0_DB633A4C.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
+        "source_arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
       },
     },
     "aws_s3_bucket": {
@@ -840,7 +775,7 @@ exports[`bucket with onDelete method 1`] = `
       "my_bucket_S3BucketNotification_DDA29E8F": {
         "bucket": "\${aws_s3_bucket.my_bucket.id}",
         "depends_on": [
-          "aws_sns_topic_policy.my_bucket_ondelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_1B83A43C",
+          "aws_sns_topic_policy.my_bucket_OnDelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_54A5EE56",
         ],
         "topic": [
           {
@@ -848,7 +783,7 @@ exports[`bucket with onDelete method 1`] = `
               "s3:ObjectRemoved:*",
             ],
             "id": "on-ondelete-notification",
-            "topic_arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
+            "topic_arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
           },
         ],
       },
@@ -859,7 +794,7 @@ exports[`bucket with onDelete method 1`] = `
         "depends_on": [
           "aws_s3_bucket_public_access_block.my_bucket_PublicAccessBlock_538547C0",
         ],
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":\\"*\\",\\"Action\\":[\\"s3:GetObject\\"],\\"Resource\\":[\\"\${aws_s3_bucket.my_bucket.arn}/*\\"]}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["\${aws_s3_bucket.my_bucket.arn}/*"]}]}",
       },
     },
     "aws_s3_bucket_public_access_block": {
@@ -872,28 +807,28 @@ exports[`bucket with onDelete method 1`] = `
       },
     },
     "aws_s3_object": {
-      "my_bucket_ondelete-OnMessage0_S3Object_BB790A1F": {
+      "my_bucket_OnDelete-OnMessage0_S3Object_B50900E0": {
         "bucket": "\${aws_s3_bucket.Code.bucket}",
         "key": "<key>",
         "source": "<source>",
       },
     },
     "aws_sns_topic": {
-      "my_bucket_ondelete_C2E093CB": {
-        "name": "ondelete-c8142b51",
+      "my_bucket_OnDelete_E3DBFE86": {
+        "name": "OnDelete-c818f138",
       },
     },
     "aws_sns_topic_policy": {
-      "my_bucket_ondelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_1B83A43C": {
-        "arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
-        "policy": "{\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Action\\":\\"sns:Publish\\",\\"Resource\\":\\"\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}\\",\\"Condition\\":{\\"ArnEquals\\":{\\"aws:SourceArn\\":\\"\${aws_s3_bucket.my_bucket.arn}\\"}}}]}",
+      "my_bucket_OnDelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_54A5EE56": {
+        "arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
+        "policy": "{"Statement":[{"Effect":"Allow","Principal":{"Service":"s3.amazonaws.com"},"Action":"sns:Publish","Resource":"\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}","Condition":{"ArnEquals":{"aws:SourceArn":"\${aws_s3_bucket.my_bucket.arn}"}}}]}",
       },
     },
     "aws_sns_topic_subscription": {
-      "my_bucket_ondelete_TopicSubscription0_E374967A": {
-        "endpoint": "\${aws_lambda_function.my_bucket_ondelete-OnMessage0_9871443D.arn}",
+      "my_bucket_OnDelete_TopicSubscription0_7974ED63": {
+        "endpoint": "\${aws_lambda_function.my_bucket_OnDelete-OnMessage0_DB633A4C.arn}",
         "protocol": "lambda",
-        "topic_arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
+        "topic_arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
       },
     },
   },
@@ -911,196 +846,201 @@ exports[`bucket with onDelete method 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
-                  "PublicAccessBlock": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicAccessBlock",
-                    "path": "root/Default/my_bucket/PublicAccessBlock",
-                  },
-                  "PublicPolicy": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicPolicy",
-                    "path": "root/Default/my_bucket/PublicPolicy",
-                  },
-                  "S3BucketNotification": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "S3BucketNotification",
-                    "path": "root/Default/my_bucket/S3BucketNotification",
-                  },
-                  "ondelete": {
+                  "OnDelete": {
                     "children": {
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/ondelete/Default",
+                        "path": "root/Default/my_bucket/OnDelete/Default",
                       },
                       "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
-                        "path": "root/Default/my_bucket/ondelete/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
+                        "path": "root/Default/my_bucket/OnDelete/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
                       },
                       "TopicSubscription0": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "TopicSubscription0",
-                        "path": "root/Default/my_bucket/ondelete/TopicSubscription0",
+                        "path": "root/Default/my_bucket/OnDelete/TopicSubscription0",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A pub/sub notification topic",
                       "title": "Topic",
                     },
-                    "id": "ondelete",
-                    "path": "root/Default/my_bucket/ondelete",
+                    "id": "OnDelete",
+                    "path": "root/Default/my_bucket/OnDelete",
                   },
-                  "ondelete-OnMessage0": {
+                  "OnDelete-OnMessage0": {
                     "children": {
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/Asset",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/CloudwatchLogGroup",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/Default",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/IamRole",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/IamRolePolicy",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/IamRolePolicyAttachment",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/IamRolePolicyAttachment",
                       },
-                      "InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315": {
+                      "InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
-                        "id": "InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315",
+                        "display": {},
+                        "id": "InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/S3Object",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
                       "title": "Function",
                     },
-                    "id": "ondelete-OnMessage0",
-                    "path": "root/Default/my_bucket/ondelete-OnMessage0",
+                    "id": "OnDelete-OnMessage0",
+                    "path": "root/Default/my_bucket/OnDelete-OnMessage0",
+                  },
+                  "PublicAccessBlock": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicAccessBlock",
+                    "path": "root/Default/my_bucket/PublicAccessBlock",
+                  },
+                  "PublicPolicy": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicPolicy",
+                    "path": "root/Default/my_bucket/PublicPolicy",
+                  },
+                  "S3BucketNotification": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "S3BucketNotification",
+                    "path": "root/Default/my_bucket/S3BucketNotification",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -1112,32 +1052,36 @@ exports[`bucket with onDelete method 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1147,132 +1091,127 @@ exports[`bucket with onDelete method 2`] = `
 
 exports[`bucket with onEvent method 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "my_bucket_oncreate-OnMessage0_CloudwatchLogGroup_E35B13F5": {
-        "name": "/aws/lambda/oncreate-OnMessage0-c874e955",
+      "my_bucket_OnCreate-OnMessage0_CloudwatchLogGroup_E3DA1BCC": {
+        "name": "/aws/lambda/OnCreate-OnMessage0-c8b6ea23",
         "retention_in_days": 30,
       },
-      "my_bucket_ondelete-OnMessage0_CloudwatchLogGroup_420A05F2": {
-        "name": "/aws/lambda/ondelete-OnMessage0-c8772675",
+      "my_bucket_OnDelete-OnMessage0_CloudwatchLogGroup_24024A4B": {
+        "name": "/aws/lambda/OnDelete-OnMessage0-c804d7e9",
         "retention_in_days": 30,
       },
-      "my_bucket_onupdate-OnMessage0_CloudwatchLogGroup_25463B70": {
-        "name": "/aws/lambda/onupdate-OnMessage0-c8a1be62",
+      "my_bucket_OnUpdate-OnMessage0_CloudwatchLogGroup_CA36F40B": {
+        "name": "/aws/lambda/OnUpdate-OnMessage0-c81076cf",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+      "my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
-      "my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+      "my_bucket_OnDelete-OnMessage0_IamRole_F99741C4": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
-      "my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+      "my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "my_bucket_oncreate-OnMessage0_IamRolePolicy_CDE0CB68": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
-        "role": "\${aws_iam_role.my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5.name}",
+      "my_bucket_OnCreate-OnMessage0_IamRolePolicy_8D03B4D5": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA.name}",
       },
-      "my_bucket_ondelete-OnMessage0_IamRolePolicy_635C2064": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
-        "role": "\${aws_iam_role.my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC.name}",
+      "my_bucket_OnDelete-OnMessage0_IamRolePolicy_B1B53387": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.my_bucket_OnDelete-OnMessage0_IamRole_F99741C4.name}",
       },
-      "my_bucket_onupdate-OnMessage0_IamRolePolicy_27D30DCE": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
-        "role": "\${aws_iam_role.my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE.name}",
+      "my_bucket_OnUpdate-OnMessage0_IamRolePolicy_94D2868B": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "my_bucket_oncreate-OnMessage0_IamRolePolicyAttachment_085EB554": {
+      "my_bucket_OnCreate-OnMessage0_IamRolePolicyAttachment_4F57A9D0": {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5.name}",
+        "role": "\${aws_iam_role.my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA.name}",
       },
-      "my_bucket_ondelete-OnMessage0_IamRolePolicyAttachment_C985200D": {
+      "my_bucket_OnDelete-OnMessage0_IamRolePolicyAttachment_221C4BFC": {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC.name}",
+        "role": "\${aws_iam_role.my_bucket_OnDelete-OnMessage0_IamRole_F99741C4.name}",
       },
-      "my_bucket_onupdate-OnMessage0_IamRolePolicyAttachment_E4288C48": {
+      "my_bucket_OnUpdate-OnMessage0_IamRolePolicyAttachment_5073159D": {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE.name}",
+        "role": "\${aws_iam_role.my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF.name}",
       },
     },
     "aws_lambda_function": {
-      "my_bucket_oncreate-OnMessage0_773D84E9": {
+      "my_bucket_OnCreate-OnMessage0_8A9D7A6E": {
         "architectures": [
           "arm64",
         ],
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "oncreate-OnMessage0-c874e955",
+            "WING_FUNCTION_NAME": "OnCreate-OnMessage0-c8b6ea23",
           },
         },
-        "function_name": "oncreate-OnMessage0-c874e955",
+        "function_name": "OnCreate-OnMessage0-c8b6ea23",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.my_bucket_oncreate-OnMessage0_IamRole_9CAD40D5.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.my_bucket_OnCreate-OnMessage0_IamRole_A815D0BA.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.my_bucket_oncreate-OnMessage0_S3Object_AF838DF5.key}",
+        "s3_key": "\${aws_s3_object.my_bucket_OnCreate-OnMessage0_S3Object_02866773.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
         },
       },
-      "my_bucket_ondelete-OnMessage0_9871443D": {
+      "my_bucket_OnDelete-OnMessage0_DB633A4C": {
         "architectures": [
           "arm64",
         ],
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "ondelete-OnMessage0-c8772675",
+            "WING_FUNCTION_NAME": "OnDelete-OnMessage0-c804d7e9",
           },
         },
-        "function_name": "ondelete-OnMessage0-c8772675",
+        "function_name": "OnDelete-OnMessage0-c804d7e9",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.my_bucket_ondelete-OnMessage0_IamRole_04EA7EBC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.my_bucket_OnDelete-OnMessage0_IamRole_F99741C4.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.my_bucket_ondelete-OnMessage0_S3Object_BB790A1F.key}",
+        "s3_key": "\${aws_s3_object.my_bucket_OnDelete-OnMessage0_S3Object_B50900E0.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
         },
       },
-      "my_bucket_onupdate-OnMessage0_EB805895": {
+      "my_bucket_OnUpdate-OnMessage0_B4C11A28": {
         "architectures": [
           "arm64",
         ],
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "onupdate-OnMessage0-c8a1be62",
+            "WING_FUNCTION_NAME": "OnUpdate-OnMessage0-c81076cf",
           },
         },
-        "function_name": "onupdate-OnMessage0-c8a1be62",
+        "function_name": "OnUpdate-OnMessage0-c81076cf",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.my_bucket_onupdate-OnMessage0_S3Object_CD6EE6AF.key}",
+        "s3_key": "\${aws_s3_object.my_bucket_OnUpdate-OnMessage0_S3Object_1E352BCE.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -1281,23 +1220,23 @@ exports[`bucket with onEvent method 1`] = `
       },
     },
     "aws_lambda_permission": {
-      "my_bucket_oncreate-OnMessage0_InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1_7675EF40": {
+      "my_bucket_OnCreate-OnMessage0_InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8_60C310A7": {
         "action": "lambda:InvokeFunction",
-        "function_name": "\${aws_lambda_function.my_bucket_oncreate-OnMessage0_773D84E9.function_name}",
+        "function_name": "\${aws_lambda_function.my_bucket_OnCreate-OnMessage0_8A9D7A6E.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
+        "source_arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
       },
-      "my_bucket_ondelete-OnMessage0_InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315_E690DB87": {
+      "my_bucket_OnDelete-OnMessage0_InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a_63129B62": {
         "action": "lambda:InvokeFunction",
-        "function_name": "\${aws_lambda_function.my_bucket_ondelete-OnMessage0_9871443D.function_name}",
+        "function_name": "\${aws_lambda_function.my_bucket_OnDelete-OnMessage0_DB633A4C.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
+        "source_arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
       },
-      "my_bucket_onupdate-OnMessage0_InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22_7EE27EAF": {
+      "my_bucket_OnUpdate-OnMessage0_InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229_327F1182": {
         "action": "lambda:InvokeFunction",
-        "function_name": "\${aws_lambda_function.my_bucket_onupdate-OnMessage0_EB805895.function_name}",
+        "function_name": "\${aws_lambda_function.my_bucket_OnUpdate-OnMessage0_B4C11A28.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
+        "source_arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
       },
     },
     "aws_s3_bucket": {
@@ -1313,9 +1252,9 @@ exports[`bucket with onEvent method 1`] = `
       "my_bucket_S3BucketNotification_DDA29E8F": {
         "bucket": "\${aws_s3_bucket.my_bucket.id}",
         "depends_on": [
-          "aws_sns_topic_policy.my_bucket_oncreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_CE3B77A7",
-          "aws_sns_topic_policy.my_bucket_onupdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_C89A58B9",
-          "aws_sns_topic_policy.my_bucket_ondelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_1B83A43C",
+          "aws_sns_topic_policy.my_bucket_OnCreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_F8789A85",
+          "aws_sns_topic_policy.my_bucket_OnUpdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_A302B66A",
+          "aws_sns_topic_policy.my_bucket_OnDelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_54A5EE56",
         ],
         "topic": [
           {
@@ -1323,21 +1262,21 @@ exports[`bucket with onEvent method 1`] = `
               "s3:ObjectCreated:Put",
             ],
             "id": "on-oncreate-notification",
-            "topic_arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
+            "topic_arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
           },
           {
             "events": [
               "s3:ObjectCreated:Post",
             ],
             "id": "on-onupdate-notification",
-            "topic_arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
+            "topic_arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
           },
           {
             "events": [
               "s3:ObjectRemoved:*",
             ],
             "id": "on-ondelete-notification",
-            "topic_arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
+            "topic_arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
           },
         ],
       },
@@ -1348,7 +1287,7 @@ exports[`bucket with onEvent method 1`] = `
         "depends_on": [
           "aws_s3_bucket_public_access_block.my_bucket_PublicAccessBlock_538547C0",
         ],
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":\\"*\\",\\"Action\\":[\\"s3:GetObject\\"],\\"Resource\\":[\\"\${aws_s3_bucket.my_bucket.arn}/*\\"]}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["\${aws_s3_bucket.my_bucket.arn}/*"]}]}",
       },
     },
     "aws_s3_bucket_public_access_block": {
@@ -1361,62 +1300,62 @@ exports[`bucket with onEvent method 1`] = `
       },
     },
     "aws_s3_object": {
-      "my_bucket_oncreate-OnMessage0_S3Object_AF838DF5": {
+      "my_bucket_OnCreate-OnMessage0_S3Object_02866773": {
         "bucket": "\${aws_s3_bucket.Code.bucket}",
         "key": "<key>",
         "source": "<source>",
       },
-      "my_bucket_ondelete-OnMessage0_S3Object_BB790A1F": {
+      "my_bucket_OnDelete-OnMessage0_S3Object_B50900E0": {
         "bucket": "\${aws_s3_bucket.Code.bucket}",
         "key": "<key>",
         "source": "<source>",
       },
-      "my_bucket_onupdate-OnMessage0_S3Object_CD6EE6AF": {
+      "my_bucket_OnUpdate-OnMessage0_S3Object_1E352BCE": {
         "bucket": "\${aws_s3_bucket.Code.bucket}",
         "key": "<key>",
         "source": "<source>",
       },
     },
     "aws_sns_topic": {
-      "my_bucket_oncreate_EF5D7ECA": {
-        "name": "oncreate-c8ad674c",
+      "my_bucket_OnCreate_14226F85": {
+        "name": "OnCreate-c88b8dd6",
       },
-      "my_bucket_ondelete_C2E093CB": {
-        "name": "ondelete-c8142b51",
+      "my_bucket_OnDelete_E3DBFE86": {
+        "name": "OnDelete-c818f138",
       },
-      "my_bucket_onupdate_DF9292B4": {
-        "name": "onupdate-c810a1e9",
+      "my_bucket_OnUpdate_0AC450AE": {
+        "name": "OnUpdate-c84ec846",
       },
     },
     "aws_sns_topic_policy": {
-      "my_bucket_oncreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_CE3B77A7": {
-        "arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
-        "policy": "{\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Action\\":\\"sns:Publish\\",\\"Resource\\":\\"\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}\\",\\"Condition\\":{\\"ArnEquals\\":{\\"aws:SourceArn\\":\\"\${aws_s3_bucket.my_bucket.arn}\\"}}}]}",
+      "my_bucket_OnCreate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_F8789A85": {
+        "arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
+        "policy": "{"Statement":[{"Effect":"Allow","Principal":{"Service":"s3.amazonaws.com"},"Action":"sns:Publish","Resource":"\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}","Condition":{"ArnEquals":{"aws:SourceArn":"\${aws_s3_bucket.my_bucket.arn}"}}}]}",
       },
-      "my_bucket_ondelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_1B83A43C": {
-        "arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
-        "policy": "{\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Action\\":\\"sns:Publish\\",\\"Resource\\":\\"\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}\\",\\"Condition\\":{\\"ArnEquals\\":{\\"aws:SourceArn\\":\\"\${aws_s3_bucket.my_bucket.arn}\\"}}}]}",
+      "my_bucket_OnDelete_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_54A5EE56": {
+        "arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
+        "policy": "{"Statement":[{"Effect":"Allow","Principal":{"Service":"s3.amazonaws.com"},"Action":"sns:Publish","Resource":"\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}","Condition":{"ArnEquals":{"aws:SourceArn":"\${aws_s3_bucket.my_bucket.arn}"}}}]}",
       },
-      "my_bucket_onupdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_C89A58B9": {
-        "arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
-        "policy": "{\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Action\\":\\"sns:Publish\\",\\"Resource\\":\\"\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}\\",\\"Condition\\":{\\"ArnEquals\\":{\\"aws:SourceArn\\":\\"\${aws_s3_bucket.my_bucket.arn}\\"}}}]}",
+      "my_bucket_OnUpdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_A302B66A": {
+        "arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
+        "policy": "{"Statement":[{"Effect":"Allow","Principal":{"Service":"s3.amazonaws.com"},"Action":"sns:Publish","Resource":"\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}","Condition":{"ArnEquals":{"aws:SourceArn":"\${aws_s3_bucket.my_bucket.arn}"}}}]}",
       },
     },
     "aws_sns_topic_subscription": {
-      "my_bucket_oncreate_TopicSubscription0_0EC6A2F3": {
-        "endpoint": "\${aws_lambda_function.my_bucket_oncreate-OnMessage0_773D84E9.arn}",
+      "my_bucket_OnCreate_TopicSubscription0_4D6EC9AA": {
+        "endpoint": "\${aws_lambda_function.my_bucket_OnCreate-OnMessage0_8A9D7A6E.arn}",
         "protocol": "lambda",
-        "topic_arn": "\${aws_sns_topic.my_bucket_oncreate_EF5D7ECA.arn}",
+        "topic_arn": "\${aws_sns_topic.my_bucket_OnCreate_14226F85.arn}",
       },
-      "my_bucket_ondelete_TopicSubscription0_E374967A": {
-        "endpoint": "\${aws_lambda_function.my_bucket_ondelete-OnMessage0_9871443D.arn}",
+      "my_bucket_OnDelete_TopicSubscription0_7974ED63": {
+        "endpoint": "\${aws_lambda_function.my_bucket_OnDelete-OnMessage0_DB633A4C.arn}",
         "protocol": "lambda",
-        "topic_arn": "\${aws_sns_topic.my_bucket_ondelete_C2E093CB.arn}",
+        "topic_arn": "\${aws_sns_topic.my_bucket_OnDelete_E3DBFE86.arn}",
       },
-      "my_bucket_onupdate_TopicSubscription0_0BEAE6F8": {
-        "endpoint": "\${aws_lambda_function.my_bucket_onupdate-OnMessage0_EB805895.arn}",
+      "my_bucket_OnUpdate_TopicSubscription0_56144B6F": {
+        "endpoint": "\${aws_lambda_function.my_bucket_OnUpdate-OnMessage0_B4C11A28.arn}",
         "protocol": "lambda",
-        "topic_arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
+        "topic_arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
       },
     },
   },
@@ -1434,428 +1373,455 @@ exports[`bucket with onEvent method 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
-                  "PublicAccessBlock": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicAccessBlock",
-                    "path": "root/Default/my_bucket/PublicAccessBlock",
-                  },
-                  "PublicPolicy": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicPolicy",
-                    "path": "root/Default/my_bucket/PublicPolicy",
-                  },
-                  "S3BucketNotification": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "S3BucketNotification",
-                    "path": "root/Default/my_bucket/S3BucketNotification",
-                  },
-                  "oncreate": {
+                  "OnCreate": {
                     "children": {
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/oncreate/Default",
+                        "path": "root/Default/my_bucket/OnCreate/Default",
                       },
                       "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
-                        "path": "root/Default/my_bucket/oncreate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
+                        "path": "root/Default/my_bucket/OnCreate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
                       },
                       "TopicSubscription0": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "TopicSubscription0",
-                        "path": "root/Default/my_bucket/oncreate/TopicSubscription0",
+                        "path": "root/Default/my_bucket/OnCreate/TopicSubscription0",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A pub/sub notification topic",
                       "title": "Topic",
                     },
-                    "id": "oncreate",
-                    "path": "root/Default/my_bucket/oncreate",
+                    "id": "OnCreate",
+                    "path": "root/Default/my_bucket/OnCreate",
                   },
-                  "oncreate-OnMessage0": {
+                  "OnCreate-OnMessage0": {
                     "children": {
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/Asset",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/CloudwatchLogGroup",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/Default",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/IamRole",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/IamRolePolicy",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/IamRolePolicyAttachment",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/IamRolePolicyAttachment",
                       },
-                      "InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1": {
+                      "InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
-                        "id": "InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/InvokePermission-c8ad674c480f4e6c0a6bf1a492e393e9ccaed211a1",
+                        "display": {},
+                        "id": "InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/InvokePermission-c88b8dd64481dc3b326d5e0afc3b583852a5c383f8",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
-                        "path": "root/Default/my_bucket/oncreate-OnMessage0/S3Object",
+                        "path": "root/Default/my_bucket/OnCreate-OnMessage0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
                       "title": "Function",
                     },
-                    "id": "oncreate-OnMessage0",
-                    "path": "root/Default/my_bucket/oncreate-OnMessage0",
+                    "id": "OnCreate-OnMessage0",
+                    "path": "root/Default/my_bucket/OnCreate-OnMessage0",
                   },
-                  "ondelete": {
+                  "OnDelete": {
                     "children": {
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/ondelete/Default",
+                        "path": "root/Default/my_bucket/OnDelete/Default",
                       },
                       "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
-                        "path": "root/Default/my_bucket/ondelete/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
+                        "path": "root/Default/my_bucket/OnDelete/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
                       },
                       "TopicSubscription0": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "TopicSubscription0",
-                        "path": "root/Default/my_bucket/ondelete/TopicSubscription0",
+                        "path": "root/Default/my_bucket/OnDelete/TopicSubscription0",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A pub/sub notification topic",
                       "title": "Topic",
                     },
-                    "id": "ondelete",
-                    "path": "root/Default/my_bucket/ondelete",
+                    "id": "OnDelete",
+                    "path": "root/Default/my_bucket/OnDelete",
                   },
-                  "ondelete-OnMessage0": {
+                  "OnDelete-OnMessage0": {
                     "children": {
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/Asset",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/CloudwatchLogGroup",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/Default",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/IamRole",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/IamRolePolicy",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/IamRolePolicyAttachment",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/IamRolePolicyAttachment",
                       },
-                      "InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315": {
+                      "InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
-                        "id": "InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/InvokePermission-c8142b51acc0b500d0402de71ecbd0ecf4977ec315",
+                        "display": {},
+                        "id": "InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/InvokePermission-c818f13827fc0721db2eca69eab078997f6f9a8c7a",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
-                        "path": "root/Default/my_bucket/ondelete-OnMessage0/S3Object",
+                        "path": "root/Default/my_bucket/OnDelete-OnMessage0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
                       "title": "Function",
                     },
-                    "id": "ondelete-OnMessage0",
-                    "path": "root/Default/my_bucket/ondelete-OnMessage0",
+                    "id": "OnDelete-OnMessage0",
+                    "path": "root/Default/my_bucket/OnDelete-OnMessage0",
                   },
-                  "onupdate": {
+                  "OnUpdate": {
                     "children": {
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/onupdate/Default",
+                        "path": "root/Default/my_bucket/OnUpdate/Default",
                       },
                       "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
-                        "path": "root/Default/my_bucket/onupdate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
+                        "path": "root/Default/my_bucket/OnUpdate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
                       },
                       "TopicSubscription0": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "TopicSubscription0",
-                        "path": "root/Default/my_bucket/onupdate/TopicSubscription0",
+                        "path": "root/Default/my_bucket/OnUpdate/TopicSubscription0",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A pub/sub notification topic",
                       "title": "Topic",
                     },
-                    "id": "onupdate",
-                    "path": "root/Default/my_bucket/onupdate",
+                    "id": "OnUpdate",
+                    "path": "root/Default/my_bucket/OnUpdate",
                   },
-                  "onupdate-OnMessage0": {
+                  "OnUpdate-OnMessage0": {
                     "children": {
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/Asset",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/CloudwatchLogGroup",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/Default",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/IamRole",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/IamRolePolicy",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/IamRolePolicyAttachment",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/IamRolePolicyAttachment",
                       },
-                      "InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22": {
+                      "InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
-                        "id": "InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22",
+                        "display": {},
+                        "id": "InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/S3Object",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
                       "title": "Function",
                     },
-                    "id": "onupdate-OnMessage0",
-                    "path": "root/Default/my_bucket/onupdate-OnMessage0",
+                    "id": "OnUpdate-OnMessage0",
+                    "path": "root/Default/my_bucket/OnUpdate-OnMessage0",
+                  },
+                  "PublicAccessBlock": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicAccessBlock",
+                    "path": "root/Default/my_bucket/PublicAccessBlock",
+                  },
+                  "PublicPolicy": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicPolicy",
+                    "path": "root/Default/my_bucket/PublicPolicy",
+                  },
+                  "S3BucketNotification": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "S3BucketNotification",
+                    "path": "root/Default/my_bucket/S3BucketNotification",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -1867,32 +1833,36 @@ exports[`bucket with onEvent method 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1902,54 +1872,49 @@ exports[`bucket with onEvent method 2`] = `
 
 exports[`bucket with onUpdate method 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "my_bucket_onupdate-OnMessage0_CloudwatchLogGroup_25463B70": {
-        "name": "/aws/lambda/onupdate-OnMessage0-c8a1be62",
+      "my_bucket_OnUpdate-OnMessage0_CloudwatchLogGroup_CA36F40B": {
+        "name": "/aws/lambda/OnUpdate-OnMessage0-c81076cf",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+      "my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "my_bucket_onupdate-OnMessage0_IamRolePolicy_27D30DCE": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
-        "role": "\${aws_iam_role.my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE.name}",
+      "my_bucket_OnUpdate-OnMessage0_IamRolePolicy_94D2868B": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "my_bucket_onupdate-OnMessage0_IamRolePolicyAttachment_E4288C48": {
+      "my_bucket_OnUpdate-OnMessage0_IamRolePolicyAttachment_5073159D": {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE.name}",
+        "role": "\${aws_iam_role.my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF.name}",
       },
     },
     "aws_lambda_function": {
-      "my_bucket_onupdate-OnMessage0_EB805895": {
+      "my_bucket_OnUpdate-OnMessage0_B4C11A28": {
         "architectures": [
           "arm64",
         ],
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "onupdate-OnMessage0-c8a1be62",
+            "WING_FUNCTION_NAME": "OnUpdate-OnMessage0-c81076cf",
           },
         },
-        "function_name": "onupdate-OnMessage0-c8a1be62",
+        "function_name": "OnUpdate-OnMessage0-c81076cf",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.my_bucket_onupdate-OnMessage0_IamRole_9C1FBCBE.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.my_bucket_OnUpdate-OnMessage0_IamRole_846F92CF.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.my_bucket_onupdate-OnMessage0_S3Object_CD6EE6AF.key}",
+        "s3_key": "\${aws_s3_object.my_bucket_OnUpdate-OnMessage0_S3Object_1E352BCE.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -1958,11 +1923,11 @@ exports[`bucket with onUpdate method 1`] = `
       },
     },
     "aws_lambda_permission": {
-      "my_bucket_onupdate-OnMessage0_InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22_7EE27EAF": {
+      "my_bucket_OnUpdate-OnMessage0_InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229_327F1182": {
         "action": "lambda:InvokeFunction",
-        "function_name": "\${aws_lambda_function.my_bucket_onupdate-OnMessage0_EB805895.function_name}",
+        "function_name": "\${aws_lambda_function.my_bucket_OnUpdate-OnMessage0_B4C11A28.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
+        "source_arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
       },
     },
     "aws_s3_bucket": {
@@ -1978,7 +1943,7 @@ exports[`bucket with onUpdate method 1`] = `
       "my_bucket_S3BucketNotification_DDA29E8F": {
         "bucket": "\${aws_s3_bucket.my_bucket.id}",
         "depends_on": [
-          "aws_sns_topic_policy.my_bucket_onupdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_C89A58B9",
+          "aws_sns_topic_policy.my_bucket_OnUpdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_A302B66A",
         ],
         "topic": [
           {
@@ -1986,7 +1951,7 @@ exports[`bucket with onUpdate method 1`] = `
               "s3:ObjectCreated:Post",
             ],
             "id": "on-onupdate-notification",
-            "topic_arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
+            "topic_arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
           },
         ],
       },
@@ -1997,7 +1962,7 @@ exports[`bucket with onUpdate method 1`] = `
         "depends_on": [
           "aws_s3_bucket_public_access_block.my_bucket_PublicAccessBlock_538547C0",
         ],
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":\\"*\\",\\"Action\\":[\\"s3:GetObject\\"],\\"Resource\\":[\\"\${aws_s3_bucket.my_bucket.arn}/*\\"]}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["\${aws_s3_bucket.my_bucket.arn}/*"]}]}",
       },
     },
     "aws_s3_bucket_public_access_block": {
@@ -2010,28 +1975,28 @@ exports[`bucket with onUpdate method 1`] = `
       },
     },
     "aws_s3_object": {
-      "my_bucket_onupdate-OnMessage0_S3Object_CD6EE6AF": {
+      "my_bucket_OnUpdate-OnMessage0_S3Object_1E352BCE": {
         "bucket": "\${aws_s3_bucket.Code.bucket}",
         "key": "<key>",
         "source": "<source>",
       },
     },
     "aws_sns_topic": {
-      "my_bucket_onupdate_DF9292B4": {
-        "name": "onupdate-c810a1e9",
+      "my_bucket_OnUpdate_0AC450AE": {
+        "name": "OnUpdate-c84ec846",
       },
     },
     "aws_sns_topic_policy": {
-      "my_bucket_onupdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_C89A58B9": {
-        "arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
-        "policy": "{\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Action\\":\\"sns:Publish\\",\\"Resource\\":\\"\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}\\",\\"Condition\\":{\\"ArnEquals\\":{\\"aws:SourceArn\\":\\"\${aws_s3_bucket.my_bucket.arn}\\"}}}]}",
+      "my_bucket_OnUpdate_PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a_A302B66A": {
+        "arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
+        "policy": "{"Statement":[{"Effect":"Allow","Principal":{"Service":"s3.amazonaws.com"},"Action":"sns:Publish","Resource":"\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}","Condition":{"ArnEquals":{"aws:SourceArn":"\${aws_s3_bucket.my_bucket.arn}"}}}]}",
       },
     },
     "aws_sns_topic_subscription": {
-      "my_bucket_onupdate_TopicSubscription0_0BEAE6F8": {
-        "endpoint": "\${aws_lambda_function.my_bucket_onupdate-OnMessage0_EB805895.arn}",
+      "my_bucket_OnUpdate_TopicSubscription0_56144B6F": {
+        "endpoint": "\${aws_lambda_function.my_bucket_OnUpdate-OnMessage0_B4C11A28.arn}",
         "protocol": "lambda",
-        "topic_arn": "\${aws_sns_topic.my_bucket_onupdate_DF9292B4.arn}",
+        "topic_arn": "\${aws_sns_topic.my_bucket_OnUpdate_0AC450AE.arn}",
       },
     },
   },
@@ -2049,196 +2014,201 @@ exports[`bucket with onUpdate method 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
-                  "PublicAccessBlock": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicAccessBlock",
-                    "path": "root/Default/my_bucket/PublicAccessBlock",
-                  },
-                  "PublicPolicy": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "PublicPolicy",
-                    "path": "root/Default/my_bucket/PublicPolicy",
-                  },
-                  "S3BucketNotification": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "S3BucketNotification",
-                    "path": "root/Default/my_bucket/S3BucketNotification",
-                  },
-                  "onupdate": {
+                  "OnUpdate": {
                     "children": {
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/onupdate/Default",
+                        "path": "root/Default/my_bucket/OnUpdate/Default",
                       },
                       "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
-                        "path": "root/Default/my_bucket/onupdate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
+                        "path": "root/Default/my_bucket/OnUpdate/PublishPermission-c8045fccc85a7ef42d5391d87958e5ce36c53a401a",
                       },
                       "TopicSubscription0": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "TopicSubscription0",
-                        "path": "root/Default/my_bucket/onupdate/TopicSubscription0",
+                        "path": "root/Default/my_bucket/OnUpdate/TopicSubscription0",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A pub/sub notification topic",
                       "title": "Topic",
                     },
-                    "id": "onupdate",
-                    "path": "root/Default/my_bucket/onupdate",
+                    "id": "OnUpdate",
+                    "path": "root/Default/my_bucket/OnUpdate",
                   },
-                  "onupdate-OnMessage0": {
+                  "OnUpdate-OnMessage0": {
                     "children": {
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/Asset",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/CloudwatchLogGroup",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/Default",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/IamRole",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/IamRolePolicy",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/IamRolePolicyAttachment",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/IamRolePolicyAttachment",
                       },
-                      "InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22": {
+                      "InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
-                        "id": "InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/InvokePermission-c810a1e91f70a36a50557a2c23bc28c96365a22f22",
+                        "display": {},
+                        "id": "InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/InvokePermission-c84ec84688efaa3bd78e7099e53e40fb2fe4ca5229",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
-                        "path": "root/Default/my_bucket/onupdate-OnMessage0/S3Object",
+                        "path": "root/Default/my_bucket/OnUpdate-OnMessage0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
                       "title": "Function",
                     },
-                    "id": "onupdate-OnMessage0",
-                    "path": "root/Default/my_bucket/onupdate-OnMessage0",
+                    "id": "OnUpdate-OnMessage0",
+                    "path": "root/Default/my_bucket/OnUpdate-OnMessage0",
+                  },
+                  "PublicAccessBlock": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicAccessBlock",
+                    "path": "root/Default/my_bucket/PublicAccessBlock",
+                  },
+                  "PublicPolicy": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "PublicPolicy",
+                    "path": "root/Default/my_bucket/PublicPolicy",
+                  },
+                  "S3BucketNotification": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "S3BucketNotification",
+                    "path": "root/Default/my_bucket/S3BucketNotification",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -2250,32 +2220,36 @@ exports[`bucket with onUpdate method 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -2285,11 +2259,6 @@ exports[`bucket with onUpdate method 2`] = `
 
 exports[`bucket with two preflight files 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_s3_bucket": {
       "my_bucket": {
@@ -2303,7 +2272,7 @@ exports[`bucket with two preflight files 1`] = `
         "depends_on": [
           "aws_s3_bucket_public_access_block.my_bucket_PublicAccessBlock_538547C0",
         ],
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":\\"*\\",\\"Action\\":[\\"s3:GetObject\\"],\\"Resource\\":[\\"\${aws_s3_bucket.my_bucket.arn}/*\\"]}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["\${aws_s3_bucket.my_bucket.arn}/*"]}]}",
       },
     },
     "aws_s3_bucket_public_access_block": {
@@ -2342,80 +2311,63 @@ exports[`bucket with two preflight files 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
                   "PublicAccessBlock": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "PublicAccessBlock",
                     "path": "root/Default/my_bucket/PublicAccessBlock",
                   },
                   "PublicPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "PublicPolicy",
                     "path": "root/Default/my_bucket/PublicPolicy",
                   },
                   "S3Object-file1.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object-file1.txt",
                     "path": "root/Default/my_bucket/S3Object-file1.txt",
                   },
                   "S3Object-file2.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object-file2.txt",
                     "path": "root/Default/my_bucket/S3Object-file2.txt",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -2427,32 +2379,36 @@ exports[`bucket with two preflight files 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -2462,11 +2418,6 @@ exports[`bucket with two preflight files 2`] = `
 
 exports[`bucket with two preflight objects 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_s3_bucket": {
       "my_bucket": {
@@ -2480,7 +2431,7 @@ exports[`bucket with two preflight objects 1`] = `
         "depends_on": [
           "aws_s3_bucket_public_access_block.my_bucket_PublicAccessBlock_538547C0",
         ],
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Principal\\":\\"*\\",\\"Action\\":[\\"s3:GetObject\\"],\\"Resource\\":[\\"\${aws_s3_bucket.my_bucket.arn}/*\\"]}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["\${aws_s3_bucket.my_bucket.arn}/*"]}]}",
       },
     },
     "aws_s3_bucket_public_access_block": {
@@ -2519,80 +2470,63 @@ exports[`bucket with two preflight objects 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
                   "PublicAccessBlock": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "PublicAccessBlock",
                     "path": "root/Default/my_bucket/PublicAccessBlock",
                   },
                   "PublicPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "PublicPolicy",
                     "path": "root/Default/my_bucket/PublicPolicy",
                   },
                   "S3Object-file1.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object-file1.txt",
                     "path": "root/Default/my_bucket/S3Object-file1.txt",
                   },
                   "S3Object-file2.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object-file2.txt",
                     "path": "root/Default/my_bucket/S3Object-file2.txt",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -2604,32 +2538,36 @@ exports[`bucket with two preflight objects 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -2639,11 +2577,6 @@ exports[`bucket with two preflight objects 2`] = `
 
 exports[`create a bucket 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_s3_bucket": {
       "my_bucket": {
@@ -2666,48 +2599,27 @@ exports[`create a bucket 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -2719,32 +2631,36 @@ exports[`create a bucket 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/captures.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/captures.test.ts.snap
index 82199b7c725..8db78160736 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/captures.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/captures.test.ts.snap
@@ -1,45 +1,42 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`function with a function binding 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (_, event) => {
+    console.log(event);
   }
-  async handle(event) { console.log(event); }
-};
-})())({
-
-})"
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`function with a function binding 2`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx, event) => {
+    console.log("Event: " + event);
+    await ctx.fn1.invoke(JSON.stringify({ hello: "world" }));
   }
-  async handle(event) {
-      console.log(\\"Event: \\" + event);
-      await this.function.invoke(JSON.stringify({ hello: \\"world\\" }));
-    }
-};
-})())({
-function: new (require(\\"[REDACTED]/wingsdk/src/shared-aws/function.inflight\\")).FunctionClient(process.env[\\"FUNCTION_NAME_50735b21\\"], \\"root/Default/Function1\\")
-})"
+  const $ctx = {
+  fn1: new (require("[REDACTED]/wingsdk/src/shared-aws/function.inflight")).FunctionClient(process.env["FUNCTION_NAME_50735b21"], "root/Default/Function1")
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`function with a function binding 3`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function1_CloudwatchLogGroup_2120A680": {
@@ -53,19 +50,19 @@ exports[`function with a function binding 3`] = `
     },
     "aws_iam_role": {
       "Function1_IamRole_8B9BC80D": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
       "Function2_IamRole_62EBED55": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function1_IamRolePolicy_C0724D18": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function1_IamRole_8B9BC80D.name}",
       },
       "Function2_IamRolePolicy_E46C9D6B": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"lambda:InvokeFunction\\"],\\"Resource\\":[\\"\${aws_lambda_function.Function1.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["lambda:InvokeFunction"],"Resource":["\${aws_lambda_function.Function1.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function2_IamRole_62EBED55.name}",
       },
     },
@@ -95,7 +92,7 @@ exports[`function with a function binding 3`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function1_IamRole_8B9BC80D.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function1_S3Object_AFBA38E0.key}",
         "timeout": 60,
@@ -120,7 +117,7 @@ exports[`function with a function binding 3`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function2_IamRole_62EBED55.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function2_S3Object_6F3ED347.key}",
         "timeout": 60,
@@ -152,42 +149,41 @@ exports[`function with a function binding 3`] = `
 `;
 
 exports[`function with a queue binding 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    await ctx.queue.push("info");
   }
-  async handle(event) { await this.queue.push(\\"info\\"); }
-};
-})())({
-queue: new (require(\\"[REDACTED]/wingsdk/src/shared-aws/queue.inflight\\")).QueueClient(process.env[\\"QUEUE_URL_1cfcc997\\"])
-})"
+  const $ctx = {
+  queue: new (require("[REDACTED]/wingsdk/src/shared-aws/queue.inflight")).QueueClient(process.env["QUEUE_URL_1cfcc997"])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`function with a queue binding 2`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (_, event) => {
+    console.log("Received" + event);
   }
-  async handle(event) { console.log(\\"Received\\" + event); }
-};
-})())({
-
-})"
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`function with a queue binding 3`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -201,19 +197,19 @@ exports[`function with a queue binding 3`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
       "Queue-SetConsumer0_IamRole_7F9ED9ED": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:SendMessage\\"],\\"Resource\\":[\\"\${aws_sqs_queue.Queue.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:GetQueueUrl"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"},{"Action":["sqs:SendMessage"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
       "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.Queue.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
@@ -232,6 +228,9 @@ exports[`function with a queue binding 3`] = `
         "batch_size": 1,
         "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
         "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
@@ -251,7 +250,7 @@ exports[`function with a queue binding 3`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -275,7 +274,7 @@ exports[`function with a queue binding 3`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
         "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
@@ -314,27 +313,7 @@ exports[`function with a queue binding 3`] = `
 `;
 
 exports[`function with bucket binding > put operation 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(event) { await this.bucket.put(\\"hello.txt\\", event); }
-};
-})())({
-bucket: new (require(\\"[REDACTED]/wingsdk/src/shared-aws/bucket.inflight\\")).BucketClient(process.env[\\"BUCKET_NAME_1357ca3a\\"])
-})"
-`;
-
-exports[`function with bucket binding > put operation 2`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -344,12 +323,12 @@ exports[`function with bucket binding > put operation 2`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.Bucket.arn}\\",\\"\${aws_s3_bucket.Bucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["s3:PutObject*","s3:Abort*"],"Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -376,7 +355,7 @@ exports[`function with bucket binding > put operation 2`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -408,11 +387,6 @@ exports[`function with bucket binding > put operation 2`] = `
 
 exports[`two functions reusing the same IFunctionHandler 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function1_CloudwatchLogGroup_2120A680": {
@@ -426,19 +400,19 @@ exports[`two functions reusing the same IFunctionHandler 1`] = `
     },
     "aws_iam_role": {
       "Function1_IamRole_8B9BC80D": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
       "Function2_IamRole_62EBED55": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function1_IamRolePolicy_C0724D18": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function1_IamRole_8B9BC80D.name}",
       },
       "Function2_IamRolePolicy_E46C9D6B": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function2_IamRole_62EBED55.name}",
       },
     },
@@ -468,7 +442,7 @@ exports[`two functions reusing the same IFunctionHandler 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function1_IamRole_8B9BC80D.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function1_S3Object_AFBA38E0.key}",
         "timeout": 60,
@@ -492,7 +466,7 @@ exports[`two functions reusing the same IFunctionHandler 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function2_IamRole_62EBED55.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function2_S3Object_6F3ED347.key}",
         "timeout": 60,
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/counter.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/counter.test.ts.snap
index c45de1abd0d..7bdbc856367 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/counter.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/counter.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`counter name valid 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_dynamodb_table": {
       "TheAmazing-Counter_01": {
@@ -38,15 +33,16 @@ exports[`counter name valid 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The.Amazing-Counter_01/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -58,63 +54,45 @@ exports[`counter name valid 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -124,11 +102,6 @@ exports[`counter name valid 2`] = `
 
 exports[`counter with initial value 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_dynamodb_table": {
       "Counter": {
@@ -160,15 +133,16 @@ exports[`counter with initial value 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Counter/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -180,63 +154,45 @@ exports[`counter with initial value 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -246,11 +202,6 @@ exports[`counter with initial value 2`] = `
 
 exports[`dec() policy statement 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -273,12 +224,12 @@ exports[`dec() policy statement 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"dynamodb:UpdateItem\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Counter.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["dynamodb:UpdateItem"],"Resource":["\${aws_dynamodb_table.Counter.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -305,7 +256,7 @@ exports[`dec() policy statement 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -342,8 +293,9 @@ exports[`dec() policy statement 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -352,15 +304,16 @@ exports[`dec() policy statement 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Counter/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -374,63 +327,70 @@ exports[`dec() policy statement 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -439,66 +399,59 @@ exports[`dec() policy statement 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -508,11 +461,6 @@ exports[`dec() policy statement 2`] = `
 
 exports[`default counter behavior 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_dynamodb_table": {
       "Counter": {
@@ -532,30 +480,25 @@ exports[`default counter behavior 1`] = `
 `;
 
 exports[`function with a counter binding 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    const val = await ctx.my_counter.inc(2);
+    console.log(val);
   }
-  async handle(event) {
-  const val = await this.my_counter.inc(2);
-  console.log(val);
+  const $ctx = {
+  my_counter: new (require("[REDACTED]/wingsdk/src/shared-aws/counter.inflight")).CounterClient(process.env["DYNAMODB_TABLE_NAME_6cb5a3a4"], 0)
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_counter: new (require(\\"[REDACTED]/wingsdk/src/shared-aws/counter.inflight\\")).CounterClient(process.env[\\"DYNAMODB_TABLE_NAME_6cb5a3a4\\"], 0)
-})"
+)())"
 `;
 
 exports[`function with a counter binding 2`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -578,12 +521,12 @@ exports[`function with a counter binding 2`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"dynamodb:UpdateItem\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Counter.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["dynamodb:UpdateItem"],"Resource":["\${aws_dynamodb_table.Counter.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -610,7 +553,7 @@ exports[`function with a counter binding 2`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -647,8 +590,9 @@ exports[`function with a counter binding 3`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -657,15 +601,16 @@ exports[`function with a counter binding 3`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Counter/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -679,63 +624,70 @@ exports[`function with a counter binding 3`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -744,66 +696,59 @@ exports[`function with a counter binding 3`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -813,11 +758,6 @@ exports[`function with a counter binding 3`] = `
 
 exports[`inc() policy statement 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -840,12 +780,12 @@ exports[`inc() policy statement 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"dynamodb:UpdateItem\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Counter.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["dynamodb:UpdateItem"],"Resource":["\${aws_dynamodb_table.Counter.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -872,7 +812,7 @@ exports[`inc() policy statement 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -909,8 +849,9 @@ exports[`inc() policy statement 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -919,15 +860,16 @@ exports[`inc() policy statement 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Counter/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -941,63 +883,70 @@ exports[`inc() policy statement 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -1006,66 +955,59 @@ exports[`inc() policy statement 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1075,11 +1017,6 @@ exports[`inc() policy statement 2`] = `
 
 exports[`peek() policy statement 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -1102,12 +1039,12 @@ exports[`peek() policy statement 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"dynamodb:GetItem\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Counter.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["dynamodb:GetItem"],"Resource":["\${aws_dynamodb_table.Counter.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -1134,7 +1071,7 @@ exports[`peek() policy statement 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -1171,8 +1108,9 @@ exports[`peek() policy statement 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -1181,15 +1119,16 @@ exports[`peek() policy statement 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Counter/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -1203,63 +1142,70 @@ exports[`peek() policy statement 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -1268,66 +1214,59 @@ exports[`peek() policy statement 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1337,11 +1276,6 @@ exports[`peek() policy statement 2`] = `
 
 exports[`replace invalid character from counter name 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_dynamodb_table": {
       "TheAmazingCounter01": {
@@ -1373,15 +1307,16 @@ exports[`replace invalid character from counter name 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The*Amazing%Counter@01/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -1393,63 +1328,45 @@ exports[`replace invalid character from counter name 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1459,11 +1376,6 @@ exports[`replace invalid character from counter name 2`] = `
 
 exports[`set() policy statement 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -1486,12 +1398,12 @@ exports[`set() policy statement 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"dynamodb:UpdateItem\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Counter.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["dynamodb:UpdateItem"],"Resource":["\${aws_dynamodb_table.Counter.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -1518,7 +1430,7 @@ exports[`set() policy statement 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -1555,8 +1467,9 @@ exports[`set() policy statement 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -1565,15 +1478,16 @@ exports[`set() policy statement 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Counter/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed atomic counter",
@@ -1587,63 +1501,70 @@ exports[`set() policy statement 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -1652,66 +1573,59 @@ exports[`set() policy statement 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/domain.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/domain.test.ts.snap
index e1b194f7c5c..a3179f13cc1 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/domain.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/domain.test.ts.snap
@@ -1,693 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`cloud.Domain for tf-aws > react website with a domain when passing values from file 1`] = `
-{
-  "data": {
-    "aws_iam_policy_document": {
-      "Website_Website-host_AllowDistributionReadOnly_BEA9DA33": {
-        "statement": [
-          {
-            "actions": [
-              "s3:GetObject",
-            ],
-            "condition": [
-              {
-                "test": "StringEquals",
-                "values": [
-                  "\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.arn}",
-                ],
-                "variable": "AWS:SourceArn",
-              },
-            ],
-            "principals": [
-              {
-                "identifiers": [
-                  "cloudfront.amazonaws.com",
-                ],
-                "type": "Service",
-              },
-            ],
-            "resources": [
-              "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.arn}/*",
-            ],
-          },
-        ],
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "resource": {
-    "aws_cloudfront_distribution": {
-      "Website_Website-host_Distribution_16BBCB7A": {
-        "aliases": [
-          "www.example.com",
-        ],
-        "default_cache_behavior": {
-          "allowed_methods": [
-            "GET",
-            "HEAD",
-          ],
-          "cached_methods": [
-            "GET",
-            "HEAD",
-          ],
-          "compress": true,
-          "default_ttl": 3600,
-          "forwarded_values": {
-            "cookies": {
-              "forward": "none",
-            },
-            "query_string": false,
-          },
-          "max_ttl": 86400,
-          "min_ttl": 0,
-          "target_origin_id": "s3Origin",
-          "viewer_protocol_policy": "redirect-to-https",
-        },
-        "default_root_object": "index.html",
-        "enabled": true,
-        "origin": [
-          {
-            "domain_name": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket_regional_domain_name}",
-            "origin_access_control_id": "\${aws_cloudfront_origin_access_control.Website_Website-host_CloudfrontOac_E7FC4CB7.id}",
-            "origin_id": "s3Origin",
-          },
-        ],
-        "price_class": "PriceClass_100",
-        "restrictions": {
-          "geo_restriction": {
-            "locations": [],
-            "restriction_type": "none",
-          },
-        },
-        "viewer_certificate": {
-          "acm_certificate_arn": "arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-          "cloudfront_default_certificate": true,
-          "ssl_support_method": "sni-only",
-        },
-      },
-    },
-    "aws_cloudfront_origin_access_control": {
-      "Website_Website-host_CloudfrontOac_E7FC4CB7": {
-        "name": "Website--c8d109e4-cloudfront-oac",
-        "origin_access_control_origin_type": "s3",
-        "signing_behavior": "always",
-        "signing_protocol": "sigv4",
-      },
-    },
-    "aws_route53_record": {
-      "Website_Website-host_Route53Record_CC3DD5F0": {
-        "alias": {
-          "evaluate_target_health": false,
-          "name": "\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.domain_name}",
-          "zone_id": "\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.hosted_zone_id}",
-        },
-        "name": "www.example.com",
-        "type": "A",
-        "zone_id": "Z0111111111111111111F",
-      },
-    },
-    "aws_s3_bucket": {
-      "Website_Website-host_WebsiteBucket_0ECE7584": {
-        "bucket_prefix": "website-host-c8d109e4-",
-        "force_destroy": false,
-      },
-    },
-    "aws_s3_bucket_policy": {
-      "Website_Website-host_DistributionS3BucketPolicy_AE0CA9BB": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.id}",
-        "policy": "\${data.aws_iam_policy_document.Website_Website-host_AllowDistributionReadOnly_BEA9DA33.json}",
-      },
-    },
-    "aws_s3_bucket_website_configuration": {
-      "Website_Website-host_BucketWebsiteConfiguration_6A151F57": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
-        "index_document": {
-          "suffix": "index.html",
-        },
-      },
-    },
-    "aws_s3_object": {
-      "Website_Website-host_File--indexhtml_7EB8DC7E": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
-        "content_type": "text/html; charset=utf-8",
-        "depends_on": [
-          "aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584",
-        ],
-        "key": "/index.html",
-        "source": "<source>",
-        "source_hash": "\${filemd5(<source>)}",
-      },
-      "Website_Website-host_File-wingjs_CC553473": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
-        "content": "// This file is generated by wing
-window.wingEnv = {};",
-        "content_type": "text/javascript",
-        "depends_on": [
-          "aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584",
-        ],
-        "key": "wing.js",
-      },
-    },
-  },
-}
-`;
-
-exports[`cloud.Domain for tf-aws > react website with a domain when passing values from file 2`] = `
-{
-  "tree": {
-    "children": {
-      "root": {
-        "children": {
-          "Default": {
-            "children": {
-              "Domain": {
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A cloud domain",
-                  "title": "Domain",
-                },
-                "id": "Domain",
-                "path": "root/Default/Domain",
-              },
-              "Website": {
-                "children": {
-                  "Website-host": {
-                    "children": {
-                      "AllowDistributionReadOnly": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformDataSource",
-                          "version": "0.17.0",
-                        },
-                        "id": "AllowDistributionReadOnly",
-                        "path": "root/Default/Website/Website-host/AllowDistributionReadOnly",
-                      },
-                      "BucketWebsiteConfiguration": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "BucketWebsiteConfiguration",
-                        "path": "root/Default/Website/Website-host/BucketWebsiteConfiguration",
-                      },
-                      "CloudfrontOac": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "CloudfrontOac",
-                        "path": "root/Default/Website/Website-host/CloudfrontOac",
-                      },
-                      "Distribution": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "Distribution",
-                        "path": "root/Default/Website/Website-host/Distribution",
-                      },
-                      "DistributionS3BucketPolicy": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "DistributionS3BucketPolicy",
-                        "path": "root/Default/Website/Website-host/DistributionS3BucketPolicy",
-                      },
-                      "File--index.html": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "File--index.html",
-                        "path": "root/Default/Website/Website-host/File--index.html",
-                      },
-                      "File-wing.js": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "File-wing.js",
-                        "path": "root/Default/Website/Website-host/File-wing.js",
-                      },
-                      "Route53Record": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "Route53Record",
-                        "path": "root/Default/Website/Website-host/Route53Record",
-                      },
-                      "WebsiteBucket": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "WebsiteBucket",
-                        "path": "root/Default/Website/Website-host/WebsiteBucket",
-                      },
-                    },
-                    "constructInfo": {
-                      "fqn": "constructs.Construct",
-                      "version": "10.2.70",
-                    },
-                    "display": {
-                      "description": "A static website",
-                      "title": "Website",
-                    },
-                    "id": "Website-host",
-                    "path": "root/Default/Website/Website-host",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A deployable React App",
-                  "title": "React App",
-                },
-                "id": "Website",
-                "path": "root/Default/Website",
-              },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
-            },
-            "constructInfo": {
-              "fqn": "constructs.Construct",
-              "version": "10.2.70",
-            },
-            "id": "Default",
-            "path": "root/Default",
-          },
-          "backend": {
-            "constructInfo": {
-              "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
-            },
-            "id": "backend",
-            "path": "root/backend",
-          },
-        },
-        "constructInfo": {
-          "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
-        },
-        "id": "root",
-        "path": "root",
-      },
-    },
-    "constructInfo": {
-      "fqn": "cdktf.App",
-      "version": "0.17.0",
-    },
-    "id": "App",
-    "path": "",
-  },
-  "version": "tree-0.1",
-}
-`;
-
-exports[`cloud.Domain for tf-aws > react website with a domain when passing values on the command line 1`] = `
-{
-  "data": {
-    "aws_iam_policy_document": {
-      "Website_Website-host_AllowDistributionReadOnly_BEA9DA33": {
-        "statement": [
-          {
-            "actions": [
-              "s3:GetObject",
-            ],
-            "condition": [
-              {
-                "test": "StringEquals",
-                "values": [
-                  "\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.arn}",
-                ],
-                "variable": "AWS:SourceArn",
-              },
-            ],
-            "principals": [
-              {
-                "identifiers": [
-                  "cloudfront.amazonaws.com",
-                ],
-                "type": "Service",
-              },
-            ],
-            "resources": [
-              "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.arn}/*",
-            ],
-          },
-        ],
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "resource": {
-    "aws_cloudfront_distribution": {
-      "Website_Website-host_Distribution_16BBCB7A": {
-        "aliases": [
-          "www.example.com",
-        ],
-        "default_cache_behavior": {
-          "allowed_methods": [
-            "GET",
-            "HEAD",
-          ],
-          "cached_methods": [
-            "GET",
-            "HEAD",
-          ],
-          "compress": true,
-          "default_ttl": 3600,
-          "forwarded_values": {
-            "cookies": {
-              "forward": "none",
-            },
-            "query_string": false,
-          },
-          "max_ttl": 86400,
-          "min_ttl": 0,
-          "target_origin_id": "s3Origin",
-          "viewer_protocol_policy": "redirect-to-https",
-        },
-        "default_root_object": "index.html",
-        "enabled": true,
-        "origin": [
-          {
-            "domain_name": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket_regional_domain_name}",
-            "origin_access_control_id": "\${aws_cloudfront_origin_access_control.Website_Website-host_CloudfrontOac_E7FC4CB7.id}",
-            "origin_id": "s3Origin",
-          },
-        ],
-        "price_class": "PriceClass_100",
-        "restrictions": {
-          "geo_restriction": {
-            "locations": [],
-            "restriction_type": "none",
-          },
-        },
-        "viewer_certificate": {
-          "acm_certificate_arn": "arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-          "cloudfront_default_certificate": true,
-          "ssl_support_method": "sni-only",
-        },
-      },
-    },
-    "aws_cloudfront_origin_access_control": {
-      "Website_Website-host_CloudfrontOac_E7FC4CB7": {
-        "name": "Website--c8d109e4-cloudfront-oac",
-        "origin_access_control_origin_type": "s3",
-        "signing_behavior": "always",
-        "signing_protocol": "sigv4",
-      },
-    },
-    "aws_route53_record": {
-      "Website_Website-host_Route53Record_CC3DD5F0": {
-        "alias": {
-          "evaluate_target_health": false,
-          "name": "\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.domain_name}",
-          "zone_id": "\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.hosted_zone_id}",
-        },
-        "name": "www.example.com",
-        "type": "A",
-        "zone_id": "Z0111111111111111111F",
-      },
-    },
-    "aws_s3_bucket": {
-      "Website_Website-host_WebsiteBucket_0ECE7584": {
-        "bucket_prefix": "website-host-c8d109e4-",
-        "force_destroy": false,
-      },
-    },
-    "aws_s3_bucket_policy": {
-      "Website_Website-host_DistributionS3BucketPolicy_AE0CA9BB": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.id}",
-        "policy": "\${data.aws_iam_policy_document.Website_Website-host_AllowDistributionReadOnly_BEA9DA33.json}",
-      },
-    },
-    "aws_s3_bucket_website_configuration": {
-      "Website_Website-host_BucketWebsiteConfiguration_6A151F57": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
-        "index_document": {
-          "suffix": "index.html",
-        },
-      },
-    },
-    "aws_s3_object": {
-      "Website_Website-host_File--indexhtml_7EB8DC7E": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
-        "content_type": "text/html; charset=utf-8",
-        "depends_on": [
-          "aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584",
-        ],
-        "key": "/index.html",
-        "source": "<source>",
-        "source_hash": "\${filemd5(<source>)}",
-      },
-      "Website_Website-host_File-wingjs_CC553473": {
-        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
-        "content": "// This file is generated by wing
-window.wingEnv = {};",
-        "content_type": "text/javascript",
-        "depends_on": [
-          "aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584",
-        ],
-        "key": "wing.js",
-      },
-    },
-  },
-}
-`;
-
-exports[`cloud.Domain for tf-aws > react website with a domain when passing values on the command line 2`] = `
-{
-  "tree": {
-    "children": {
-      "root": {
-        "children": {
-          "Default": {
-            "children": {
-              "Domain": {
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A cloud domain",
-                  "title": "Domain",
-                },
-                "id": "Domain",
-                "path": "root/Default/Domain",
-              },
-              "Website": {
-                "children": {
-                  "Website-host": {
-                    "children": {
-                      "AllowDistributionReadOnly": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformDataSource",
-                          "version": "0.17.0",
-                        },
-                        "id": "AllowDistributionReadOnly",
-                        "path": "root/Default/Website/Website-host/AllowDistributionReadOnly",
-                      },
-                      "BucketWebsiteConfiguration": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "BucketWebsiteConfiguration",
-                        "path": "root/Default/Website/Website-host/BucketWebsiteConfiguration",
-                      },
-                      "CloudfrontOac": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "CloudfrontOac",
-                        "path": "root/Default/Website/Website-host/CloudfrontOac",
-                      },
-                      "Distribution": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "Distribution",
-                        "path": "root/Default/Website/Website-host/Distribution",
-                      },
-                      "DistributionS3BucketPolicy": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "DistributionS3BucketPolicy",
-                        "path": "root/Default/Website/Website-host/DistributionS3BucketPolicy",
-                      },
-                      "File--index.html": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "File--index.html",
-                        "path": "root/Default/Website/Website-host/File--index.html",
-                      },
-                      "File-wing.js": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "File-wing.js",
-                        "path": "root/Default/Website/Website-host/File-wing.js",
-                      },
-                      "Route53Record": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "Route53Record",
-                        "path": "root/Default/Website/Website-host/Route53Record",
-                      },
-                      "WebsiteBucket": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "WebsiteBucket",
-                        "path": "root/Default/Website/Website-host/WebsiteBucket",
-                      },
-                    },
-                    "constructInfo": {
-                      "fqn": "constructs.Construct",
-                      "version": "10.2.70",
-                    },
-                    "display": {
-                      "description": "A static website",
-                      "title": "Website",
-                    },
-                    "id": "Website-host",
-                    "path": "root/Default/Website/Website-host",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A deployable React App",
-                  "title": "React App",
-                },
-                "id": "Website",
-                "path": "root/Default/Website",
-              },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
-            },
-            "constructInfo": {
-              "fqn": "constructs.Construct",
-              "version": "10.2.70",
-            },
-            "id": "Default",
-            "path": "root/Default",
-          },
-          "backend": {
-            "constructInfo": {
-              "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
-            },
-            "id": "backend",
-            "path": "root/backend",
-          },
-        },
-        "constructInfo": {
-          "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
-        },
-        "id": "root",
-        "path": "root",
-      },
-    },
-    "constructInfo": {
-      "fqn": "cdktf.App",
-      "version": "0.17.0",
-    },
-    "id": "App",
-    "path": "",
-  },
-  "version": "tree-0.1",
-}
-`;
-
 exports[`cloud.Domain for tf-aws > website with a domain when passing values from file 1`] = `
 {
   "data": {
@@ -724,8 +36,8 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values fro
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}",
     },
   },
   "resource": {
@@ -866,7 +178,7 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values fro
               "Domain": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud domain",
@@ -875,92 +187,137 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values fro
                 "id": "Domain",
                 "path": "root/Default/Domain",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Website": {
                 "children": {
                   "AllowDistributionReadOnly": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "AllowDistributionReadOnly",
                     "path": "root/Default/Website/AllowDistributionReadOnly",
                   },
                   "BucketWebsiteConfiguration": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "BucketWebsiteConfiguration",
                     "path": "root/Default/Website/BucketWebsiteConfiguration",
                   },
                   "CloudfrontOac": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudfrontOac",
                     "path": "root/Default/Website/CloudfrontOac",
                   },
                   "Distribution": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Distribution",
                     "path": "root/Default/Website/Distribution",
                   },
                   "DistributionS3BucketPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DistributionS3BucketPolicy",
                     "path": "root/Default/Website/DistributionS3BucketPolicy",
                   },
+                  "Endpoint": {
+                    "children": {
+                      "Url": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformOutput",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Url",
+                        "path": "root/Default/Website/Endpoint/Url",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "Website root/Default/Website",
+                      "hidden": true,
+                      "title": "Endpoint",
+                    },
+                    "id": "Endpoint",
+                    "path": "root/Default/Website/Endpoint",
+                  },
                   "File--b.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--b.html",
                     "path": "root/Default/Website/File--b.html",
                   },
                   "File--index.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--index.html",
                     "path": "root/Default/Website/File--index.html",
                   },
                   "File--inner-folder--a.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--inner-folder--a.html",
                     "path": "root/Default/Website/File--inner-folder--a.html",
                   },
                   "Route53Record": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Route53Record",
                     "path": "root/Default/Website/Route53Record",
                   },
                   "WebsiteBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "WebsiteBucket",
                     "path": "root/Default/Website/WebsiteBucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A static website",
@@ -972,63 +329,45 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values fro
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1072,8 +411,8 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values on
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}",
     },
   },
   "resource": {
@@ -1214,7 +553,7 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values on
               "Domain": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud domain",
@@ -1223,92 +562,137 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values on
                 "id": "Domain",
                 "path": "root/Default/Domain",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Website": {
                 "children": {
                   "AllowDistributionReadOnly": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "AllowDistributionReadOnly",
                     "path": "root/Default/Website/AllowDistributionReadOnly",
                   },
                   "BucketWebsiteConfiguration": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "BucketWebsiteConfiguration",
                     "path": "root/Default/Website/BucketWebsiteConfiguration",
                   },
                   "CloudfrontOac": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudfrontOac",
                     "path": "root/Default/Website/CloudfrontOac",
                   },
                   "Distribution": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Distribution",
                     "path": "root/Default/Website/Distribution",
                   },
                   "DistributionS3BucketPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DistributionS3BucketPolicy",
                     "path": "root/Default/Website/DistributionS3BucketPolicy",
                   },
+                  "Endpoint": {
+                    "children": {
+                      "Url": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformOutput",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Url",
+                        "path": "root/Default/Website/Endpoint/Url",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "Website root/Default/Website",
+                      "hidden": true,
+                      "title": "Endpoint",
+                    },
+                    "id": "Endpoint",
+                    "path": "root/Default/Website/Endpoint",
+                  },
                   "File--b.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--b.html",
                     "path": "root/Default/Website/File--b.html",
                   },
                   "File--index.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--index.html",
                     "path": "root/Default/Website/File--index.html",
                   },
                   "File--inner-folder--a.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--inner-folder--a.html",
                     "path": "root/Default/Website/File--inner-folder--a.html",
                   },
                   "Route53Record": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Route53Record",
                     "path": "root/Default/Website/Route53Record",
                   },
                   "WebsiteBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "WebsiteBucket",
                     "path": "root/Default/Website/WebsiteBucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A static website",
@@ -1320,63 +704,45 @@ exports[`cloud.Domain for tf-aws > website with a domain when passing values on
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/dynamodb-table.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/dynamodb-table.test.ts.snap
deleted file mode 100644
index 4f6d161efeb..00000000000
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/dynamodb-table.test.ts.snap
+++ /dev/null
@@ -1,306 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`default dynamodb table behavior 1`] = `
-{
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "Table": {
-        "attribute": [
-          {
-            "name": "id",
-            "type": "S",
-          },
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "id",
-        "name": "my-wing-tableTable-c89b2d37",
-      },
-    },
-  },
-}
-`;
-
-exports[`function with a table binding 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle(event) {
-  await this.my_table.putItem({ item: { id: \\"test\\" } });
-  await this.my_table.scan();
-}
-};
-})())({
-my_table: new (require(\\"[REDACTED]/wingsdk/src/shared-aws/dynamodb-table.inflight\\")).DynamodbTableClient(process.env[\\"DYNAMODB_TABLE_NAME_e7245baa\\"])
-})"
-`;
-
-exports[`function with a table binding 2`] = `
-{
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "Function_CloudwatchLogGroup_ABDCF4C4": {
-        "name": "/aws/lambda/Function-c852aba6",
-        "retention_in_days": 30,
-      },
-    },
-    "aws_dynamodb_table": {
-      "Table": {
-        "attribute": [
-          {
-            "name": "id",
-            "type": "S",
-          },
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "id",
-        "name": "my-wing-tableTable-c89b2d37",
-      },
-    },
-    "aws_iam_role": {
-      "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
-      },
-    },
-    "aws_iam_role_policy": {
-      "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"dynamodb:PutItem\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Table.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"dynamodb:Scan\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Table.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
-      },
-    },
-    "aws_iam_role_policy_attachment": {
-      "Function_IamRolePolicyAttachment_CACE1358": {
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
-      },
-    },
-    "aws_lambda_function": {
-      "Function": {
-        "architectures": [
-          "arm64",
-        ],
-        "environment": {
-          "variables": {
-            "DYNAMODB_TABLE_NAME_e7245baa": "\${aws_dynamodb_table.Table.name}",
-            "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "Function-c852aba6",
-          },
-        },
-        "function_name": "Function-c852aba6",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
-        "timeout": 60,
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": [],
-        },
-      },
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "bucket_prefix": "code-c84a50b1-",
-      },
-    },
-    "aws_s3_object": {
-      "Function_S3Object_C62A0C2D": {
-        "bucket": "\${aws_s3_bucket.Code.bucket}",
-        "key": "<key>",
-        "source": "<source>",
-      },
-    },
-  },
-}
-`;
-
-exports[`function with a table binding 3`] = `
-{
-  "tree": {
-    "children": {
-      "root": {
-        "children": {
-          "Default": {
-            "children": {
-              "Code": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
-                },
-                "id": "Code",
-                "path": "root/Default/Code",
-              },
-              "Function": {
-                "children": {
-                  "Asset": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
-                    },
-                    "id": "Asset",
-                    "path": "root/Default/Function/Asset",
-                  },
-                  "CloudwatchLogGroup": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "CloudwatchLogGroup",
-                    "path": "root/Default/Function/CloudwatchLogGroup",
-                  },
-                  "Default": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "Default",
-                    "path": "root/Default/Function/Default",
-                  },
-                  "IamRole": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "IamRole",
-                    "path": "root/Default/Function/IamRole",
-                  },
-                  "IamRolePolicy": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "IamRolePolicy",
-                    "path": "root/Default/Function/IamRolePolicy",
-                  },
-                  "IamRolePolicyAttachment": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "IamRolePolicyAttachment",
-                    "path": "root/Default/Function/IamRolePolicyAttachment",
-                  },
-                  "S3Object": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "S3Object",
-                    "path": "root/Default/Function/S3Object",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A cloud function (FaaS)",
-                  "title": "Function",
-                },
-                "id": "Function",
-                "path": "root/Default/Function",
-              },
-              "Table": {
-                "children": {
-                  "Default": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
-                    },
-                    "id": "Default",
-                    "path": "root/Default/Table/Default",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A DynamoDb Table",
-                  "title": "DynamodbTable",
-                },
-                "id": "Table",
-                "path": "root/Default/Table",
-              },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
-            },
-            "constructInfo": {
-              "fqn": "constructs.Construct",
-              "version": "10.2.70",
-            },
-            "id": "Default",
-            "path": "root/Default",
-          },
-          "backend": {
-            "constructInfo": {
-              "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
-            },
-            "id": "backend",
-            "path": "root/backend",
-          },
-        },
-        "constructInfo": {
-          "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
-        },
-        "id": "root",
-        "path": "root",
-      },
-    },
-    "constructInfo": {
-      "fqn": "cdktf.App",
-      "version": "0.17.0",
-    },
-    "id": "App",
-    "path": "",
-  },
-  "version": "tree-0.1",
-}
-`;
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/function.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/function.test.ts.snap
index 58f63cfd558..979dfb79b63 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/function.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/function.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`basic function 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -16,12 +11,12 @@ exports[`basic function 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -47,7 +42,7 @@ exports[`basic function 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -84,8 +79,9 @@ exports[`basic function 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -94,63 +90,70 @@ exports[`basic function 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -159,66 +162,59 @@ exports[`basic function 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -228,11 +224,6 @@ exports[`basic function 2`] = `
 
 exports[`basic function with custom log retention 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -242,12 +233,12 @@ exports[`basic function with custom log retention 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -273,7 +264,7 @@ exports[`basic function with custom log retention 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -310,8 +301,9 @@ exports[`basic function with custom log retention 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -320,63 +312,70 @@ exports[`basic function with custom log retention 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -385,66 +384,59 @@ exports[`basic function with custom log retention 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -454,11 +446,6 @@ exports[`basic function with custom log retention 2`] = `
 
 exports[`basic function with environment variables 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -468,12 +455,12 @@ exports[`basic function with environment variables 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -501,7 +488,7 @@ exports[`basic function with environment variables 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -538,8 +525,9 @@ exports[`basic function with environment variables 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -548,63 +536,70 @@ exports[`basic function with environment variables 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -613,66 +608,59 @@ exports[`basic function with environment variables 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -682,20 +670,15 @@ exports[`basic function with environment variables 2`] = `
 
 exports[`basic function with infinite log retention 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -721,7 +704,7 @@ exports[`basic function with infinite log retention 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -758,8 +741,9 @@ exports[`basic function with infinite log retention 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -768,55 +752,61 @@ exports[`basic function with infinite log retention 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -825,66 +815,59 @@ exports[`basic function with infinite log retention 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -894,11 +877,6 @@ exports[`basic function with infinite log retention 2`] = `
 
 exports[`basic function with memory size specified 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -908,12 +886,12 @@ exports[`basic function with memory size specified 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -939,7 +917,7 @@ exports[`basic function with memory size specified 1`] = `
         "memory_size": 512,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -976,8 +954,9 @@ exports[`basic function with memory size specified 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -986,63 +965,70 @@ exports[`basic function with memory size specified 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -1051,66 +1037,59 @@ exports[`basic function with memory size specified 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1120,11 +1099,6 @@ exports[`basic function with memory size specified 2`] = `
 
 exports[`basic function with timeout explicitly set 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -1134,12 +1108,12 @@ exports[`basic function with timeout explicitly set 1`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -1165,7 +1139,7 @@ exports[`basic function with timeout explicitly set 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 30,
@@ -1202,8 +1176,9 @@ exports[`basic function with timeout explicitly set 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -1212,63 +1187,70 @@ exports[`basic function with timeout explicitly set 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -1277,66 +1259,59 @@ exports[`basic function with timeout explicitly set 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1346,11 +1321,6 @@ exports[`basic function with timeout explicitly set 2`] = `
 
 exports[`function name valid 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "The-Mighty_Function-01_CloudwatchLogGroup_BC84FFD4": {
@@ -1360,12 +1330,12 @@ exports[`function name valid 1`] = `
     },
     "aws_iam_role": {
       "The-Mighty_Function-01_IamRole_590EA29B": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "The-Mighty_Function-01_IamRolePolicy_506506FA": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.The-Mighty_Function-01_IamRole_590EA29B.name}",
       },
     },
@@ -1391,7 +1361,7 @@ exports[`function name valid 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.The-Mighty_Function-01_IamRole_590EA29B.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.The-Mighty_Function-01_S3Object_4181DCAE.key}",
         "timeout": 60,
@@ -1428,73 +1398,92 @@ exports[`function name valid 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "The-Mighty_Function-01": {
                 "children": {
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/The-Mighty_Function-01/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/The-Mighty_Function-01/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The-Mighty_Function-01/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/The-Mighty_Function-01/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/The-Mighty_Function-01/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/The-Mighty_Function-01/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/The-Mighty_Function-01/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -1506,63 +1495,45 @@ exports[`function name valid 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -1570,13 +1541,247 @@ exports[`function name valid 2`] = `
 }
 `;
 
-exports[`replace invalid character from function name 1`] = `
+exports[`function will be behind a vpc when vpc_lambda is set to true 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+  "data": {
+    "aws_region": {
+      "Region": {},
+    },
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30,
+      },
+    },
+    "aws_eip": {
+      "EIP": {},
+    },
+    "aws_iam_role": {
+      "Function_IamRole_678BE84C": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+    },
+    "aws_iam_role_policy": {
+      "Function_IamRolePolicy_E3B26607": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["ec2:CreateNetworkInterface","ec2:DescribeNetworkInterfaces","ec2:DeleteNetworkInterface","ec2:DescribeSubnets","ec2:DescribeSecurityGroups"],"Resource":["*"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
+      },
+    },
+    "aws_iam_role_policy_attachment": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
+      },
+    },
+    "aws_internet_gateway": {
+      "InternetGateway": {
+        "tags": {
+          "Name": "Default-c82bf964-internet-gateway",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+          },
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [
+            "\${aws_security_group.Function_FunctionSecurityGroup_2DC31536.id}",
+          ],
+          "subnet_ids": [
+            "\${aws_subnet.PrivateSubnet.id}",
+            "\${aws_subnet.PrivateSubnet2.id}",
+          ],
+        },
+      },
+    },
+    "aws_nat_gateway": {
+      "NATGateway": {
+        "allocation_id": "\${aws_eip.EIP.id}",
+        "subnet_id": "\${aws_subnet.PublicSubnet.id}",
+        "tags": {
+          "Name": "Default-c82bf964-nat-gateway",
+        },
+      },
+    },
+    "aws_route_table": {
+      "PrivateRouteTable": {
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": null,
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": "\${aws_nat_gateway.NATGateway.id}",
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null,
+          },
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-private-route-table-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PrivateRouteTable2": {
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": null,
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": "\${aws_nat_gateway.NATGateway.id}",
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null,
+          },
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-private-route-table-2",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PublicRouteTable": {
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": "\${aws_internet_gateway.InternetGateway.id}",
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": null,
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null,
+          },
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-public-route-table-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_route_table_association": {
+      "PrivateRouteTableAssociation": {
+        "route_table_id": "\${aws_route_table.PrivateRouteTable.id}",
+        "subnet_id": "\${aws_subnet.PrivateSubnet.id}",
+      },
+      "PrivateRouteTableAssociation2": {
+        "route_table_id": "\${aws_route_table.PrivateRouteTable2.id}",
+        "subnet_id": "\${aws_subnet.PrivateSubnet2.id}",
+      },
+      "PublicRouteTableAssociation": {
+        "route_table_id": "\${aws_route_table.PublicRouteTable.id}",
+        "subnet_id": "\${aws_subnet.PublicSubnet.id}",
+      },
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "bucket_prefix": "code-c84a50b1-",
+      },
+    },
+    "aws_s3_object": {
+      "Function_S3Object_C62A0C2D": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+    },
+    "aws_security_group": {
+      "Function_FunctionSecurityGroup_2DC31536": {
+        "egress": [
+          {
+            "cidr_blocks": [
+              "0.0.0.0/0",
+            ],
+            "description": null,
+            "from_port": 0,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "-1",
+            "security_groups": null,
+            "self": null,
+            "to_port": 0,
+          },
+        ],
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_subnet": {
+      "PrivateSubnet": {
+        "availability_zone": "\${data.aws_region.Region.name}a",
+        "cidr_block": "10.0.4.0/22",
+        "tags": {
+          "Name": "Default-c82bf964-private-subnet-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PrivateSubnet2": {
+        "availability_zone": "\${data.aws_region.Region.name}b",
+        "cidr_block": "10.0.8.0/22",
+        "tags": {
+          "Name": "Default-c82bf964-private-subnet-2",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+      "PublicSubnet": {
+        "availability_zone": "\${data.aws_region.Region.name}a",
+        "cidr_block": "10.0.0.0/24",
+        "tags": {
+          "Name": "Default-c82bf964-public-subnet-1",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
+    },
+    "aws_vpc": {
+      "VPC": {
+        "cidr_block": "10.0.0.0/16",
+        "enable_dns_hostnames": true,
+        "enable_dns_support": true,
+        "tags": {
+          "Name": "Default-c82bf964-vpc",
+        },
+      },
     },
   },
+}
+`;
+
+exports[`replace invalid character from function name 1`] = `
+{
   "resource": {
     "aws_cloudwatch_log_group": {
       "TheMightyFunction_CloudwatchLogGroup_E141F677": {
@@ -1586,12 +1791,12 @@ exports[`replace invalid character from function name 1`] = `
     },
     "aws_iam_role": {
       "TheMightyFunction_IamRole_5421E649": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "TheMightyFunction_IamRolePolicy_B7246118": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.TheMightyFunction_IamRole_5421E649.name}",
       },
     },
@@ -1617,7 +1822,7 @@ exports[`replace invalid character from function name 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.TheMightyFunction_IamRole_5421E649.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.TheMightyFunction_S3Object_51333814.key}",
         "timeout": 60,
@@ -1654,73 +1859,92 @@ exports[`replace invalid character from function name 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "The%Mighty$Function": {
                 "children": {
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/The%Mighty$Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/The%Mighty$Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The%Mighty$Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/The%Mighty$Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/The%Mighty$Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/The%Mighty$Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/The%Mighty$Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -1732,63 +1956,45 @@ exports[`replace invalid character from function name 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/logger.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/logger.test.ts.snap
index 56a7d3e5764..1b8d6fa9ccc 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/logger.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/logger.test.ts.snap
@@ -1,29 +1,22 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`inflight function uses a logger 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
-  }
-  async handle() {
-      console.log(\\"hello world!\\");
-    }
-};
-})())({
-
-})"
+"(await (async () => {
+  const $func = async () => console.log("hello world!")
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`inflight function uses a logger 2`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -33,12 +26,12 @@ exports[`inflight function uses a logger 2`] = `
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -64,7 +57,7 @@ exports[`inflight function uses a logger 2`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/on-deploy.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/on-deploy.test.ts.snap
index 354026960e6..2452a0ec5c4 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/on-deploy.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/on-deploy.test.ts.snap
@@ -11,11 +11,6 @@ exports[`create an OnDeploy 1`] = `
       },
     },
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "my_on_deploy_Function_CloudwatchLogGroup_A6EB6F36": {
@@ -25,12 +20,12 @@ exports[`create an OnDeploy 1`] = `
     },
     "aws_iam_role": {
       "my_on_deploy_Function_IamRole_76DF13CA": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "my_on_deploy_Function_IamRolePolicy_AA6273E9": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.my_on_deploy_Function_IamRole_76DF13CA.name}",
       },
     },
@@ -56,7 +51,7 @@ exports[`create an OnDeploy 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.my_on_deploy_Function_IamRole_76DF13CA.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.my_on_deploy_Function_S3Object_69D52AC4.key}",
         "timeout": 60,
@@ -93,41 +88,31 @@ exports[`create an OnDeploy 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
               "my_on_deploy": {
                 "children": {
@@ -136,63 +121,70 @@ exports[`create an OnDeploy 2`] = `
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
                         "path": "root/Default/my_on_deploy/Function/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
                         "path": "root/Default/my_on_deploy/Function/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/my_on_deploy/Function/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
                         "path": "root/Default/my_on_deploy/Function/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
                         "path": "root/Default/my_on_deploy/Function/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
                         "path": "root/Default/my_on_deploy/Function/IamRolePolicyAttachment",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
                         "path": "root/Default/my_on_deploy/Function/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
@@ -204,15 +196,16 @@ exports[`create an OnDeploy 2`] = `
                   "Invocation": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Invocation",
                     "path": "root/Default/my_on_deploy/Invocation",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "Run code during the app's deployment.",
@@ -224,32 +217,36 @@ exports[`create an OnDeploy 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -270,11 +267,6 @@ exports[`execute OnDeploy after other resources 1`] = `
       },
     },
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "my_on_deploy_Function_CloudwatchLogGroup_A6EB6F36": {
@@ -284,12 +276,12 @@ exports[`execute OnDeploy after other resources 1`] = `
     },
     "aws_iam_role": {
       "my_on_deploy_Function_IamRole_76DF13CA": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "my_on_deploy_Function_IamRolePolicy_AA6273E9": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.my_on_deploy_Function_IamRole_76DF13CA.name}",
       },
     },
@@ -315,7 +307,7 @@ exports[`execute OnDeploy after other resources 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.my_on_deploy_Function_IamRole_76DF13CA.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.my_on_deploy_Function_S3Object_69D52AC4.key}",
         "timeout": 60,
@@ -356,56 +348,47 @@ exports[`execute OnDeploy after other resources 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -421,63 +404,70 @@ exports[`execute OnDeploy after other resources 2`] = `
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
                         "path": "root/Default/my_on_deploy/Function/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
                         "path": "root/Default/my_on_deploy/Function/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/my_on_deploy/Function/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
                         "path": "root/Default/my_on_deploy/Function/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
                         "path": "root/Default/my_on_deploy/Function/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
                         "path": "root/Default/my_on_deploy/Function/IamRolePolicyAttachment",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
                         "path": "root/Default/my_on_deploy/Function/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
@@ -489,15 +479,16 @@ exports[`execute OnDeploy after other resources 2`] = `
                   "Invocation": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Invocation",
                     "path": "root/Default/my_on_deploy/Invocation",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "Run code during the app's deployment.",
@@ -509,32 +500,36 @@ exports[`execute OnDeploy after other resources 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -553,11 +548,6 @@ exports[`execute OnDeploy before other resources 1`] = `
       },
     },
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "my_on_deploy_Function_CloudwatchLogGroup_A6EB6F36": {
@@ -567,12 +557,12 @@ exports[`execute OnDeploy before other resources 1`] = `
     },
     "aws_iam_role": {
       "my_on_deploy_Function_IamRole_76DF13CA": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "my_on_deploy_Function_IamRolePolicy_AA6273E9": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.my_on_deploy_Function_IamRole_76DF13CA.name}",
       },
     },
@@ -598,7 +588,7 @@ exports[`execute OnDeploy before other resources 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.my_on_deploy_Function_IamRole_76DF13CA.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.my_on_deploy_Function_S3Object_69D52AC4.key}",
         "timeout": 60,
@@ -642,56 +632,47 @@ exports[`execute OnDeploy before other resources 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
               "my_bucket": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -707,63 +688,70 @@ exports[`execute OnDeploy before other resources 2`] = `
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
                         "path": "root/Default/my_on_deploy/Function/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
                         "path": "root/Default/my_on_deploy/Function/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/my_on_deploy/Function/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
                         "path": "root/Default/my_on_deploy/Function/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
                         "path": "root/Default/my_on_deploy/Function/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
                         "path": "root/Default/my_on_deploy/Function/IamRolePolicyAttachment",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
                         "path": "root/Default/my_on_deploy/Function/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
@@ -775,15 +763,16 @@ exports[`execute OnDeploy before other resources 2`] = `
                   "Invocation": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Invocation",
                     "path": "root/Default/my_on_deploy/Invocation",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "Run code during the app's deployment.",
@@ -795,32 +784,36 @@ exports[`execute OnDeploy before other resources 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/queue.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/queue.test.ts.snap
index 6105a69221d..aee851cbec8 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/queue.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/queue.test.ts.snap
@@ -1,12 +1,666 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`default queue behavior 1`] = `
+exports[`QueueRef in an TFAWS app can be used to reference an existing queue 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30,
+      },
+      "QueueRef_AwsConsoleField_Handler_CloudwatchLogGroup_1FAC3ED5": {
+        "name": "/aws/lambda/Handler-c85cfbef",
+        "retention_in_days": 30,
+      },
+      "QueueRef_QueueArnField_Handler_CloudwatchLogGroup_BDFDF613": {
+        "name": "/aws/lambda/Handler-c8c3c90a",
+        "retention_in_days": 30,
+      },
+      "QueueRef_QueueUrlField_Handler_CloudwatchLogGroup_8AB6E3DD": {
+        "name": "/aws/lambda/Handler-c8ec121e",
+        "retention_in_days": 30,
+      },
+    },
+    "aws_iam_role": {
+      "Function_IamRole_678BE84C": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+      "QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+      "QueueRef_QueueArnField_Handler_IamRole_C121BD5E": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+      "QueueRef_QueueUrlField_Handler_IamRole_709A15CB": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+    },
+    "aws_iam_role_policy": {
+      "Function_IamRolePolicy_E3B26607": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:GetQueueUrl"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:SendMessage"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:GetQueueAttributes"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
+      },
+      "QueueRef_AwsConsoleField_Handler_IamRolePolicy_184A5238": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:GetQueueUrl"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:SendMessage"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:PurgeQueue"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:GetQueueAttributes"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:ReceiveMessage","sqs:DeleteMessage"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C.name}",
+      },
+      "QueueRef_QueueArnField_Handler_IamRolePolicy_64EE3F4B": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.QueueRef_QueueArnField_Handler_IamRole_C121BD5E.name}",
+      },
+      "QueueRef_QueueUrlField_Handler_IamRolePolicy_A9F2F773": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:GetQueueUrl"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:SendMessage"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:PurgeQueue"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:GetQueueAttributes"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"},{"Action":["sqs:ReceiveMessage","sqs:DeleteMessage"],"Resource":["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.QueueRef_QueueUrlField_Handler_IamRole_709A15CB.name}",
+      },
+    },
+    "aws_iam_role_policy_attachment": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
+      },
+      "QueueRef_AwsConsoleField_Handler_IamRolePolicyAttachment_1F892467": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C.name}",
+      },
+      "QueueRef_QueueArnField_Handler_IamRolePolicyAttachment_BA9083B2": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.QueueRef_QueueArnField_Handler_IamRole_C121BD5E.name}",
+      },
+      "QueueRef_QueueUrlField_Handler_IamRolePolicyAttachment_9FA1E52D": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.QueueRef_QueueUrlField_Handler_IamRole_709A15CB.name}",
+      },
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "QUEUE_ARN_23984aca": "arn:aws:sqs:us-west-2:123456789012:MyQueue1234",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+          },
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+      "QueueRef_AwsConsoleField_Handler_2D13D4BF": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "QUEUE_ARN_23984aca": "arn:aws:sqs:us-west-2:123456789012:MyQueue1234",
+            "WING_FUNCTION_NAME": "Handler-c85cfbef",
+          },
+        },
+        "function_name": "Handler-c85cfbef",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.QueueRef_AwsConsoleField_Handler_S3Object_C4237D42.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+      "QueueRef_QueueArnField_Handler_0B477E06": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Handler-c8c3c90a",
+          },
+        },
+        "function_name": "Handler-c8c3c90a",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.QueueRef_QueueArnField_Handler_IamRole_C121BD5E.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.QueueRef_QueueArnField_Handler_S3Object_6AD15EC0.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+      "QueueRef_QueueUrlField_Handler_42A4BE81": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "QUEUE_ARN_23984aca": "arn:aws:sqs:us-west-2:123456789012:MyQueue1234",
+            "WING_FUNCTION_NAME": "Handler-c8ec121e",
+          },
+        },
+        "function_name": "Handler-c8ec121e",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.QueueRef_QueueUrlField_Handler_IamRole_709A15CB.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.QueueRef_QueueUrlField_Handler_S3Object_225E3B78.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "bucket_prefix": "code-c84a50b1-",
+      },
+    },
+    "aws_s3_object": {
+      "Function_S3Object_C62A0C2D": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+      "QueueRef_AwsConsoleField_Handler_S3Object_C4237D42": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+      "QueueRef_QueueArnField_Handler_S3Object_6AD15EC0": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+      "QueueRef_QueueUrlField_Handler_S3Object_225E3B78": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
     },
   },
+}
+`;
+
+exports[`QueueRef in an TFAWS app can be used to reference an existing queue 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Code": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "Code",
+                "path": "root/Default/Code",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CloudwatchLogGroup": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudwatchLogGroup",
+                    "path": "root/Default/Function/CloudwatchLogGroup",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/Function/Default",
+                  },
+                  "IamRole": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamRole",
+                    "path": "root/Default/Function/IamRole",
+                  },
+                  "IamRolePolicy": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamRolePolicy",
+                    "path": "root/Default/Function/IamRolePolicy",
+                  },
+                  "IamRolePolicyAttachment": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamRolePolicyAttachment",
+                    "path": "root/Default/Function/IamRolePolicyAttachment",
+                  },
+                  "S3Object": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "S3Object",
+                    "path": "root/Default/Function/S3Object",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "QueueRef": {
+                "children": {
+                  "AwsConsoleField": {
+                    "children": {
+                      "Handler": {
+                        "children": {
+                          "Asset": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformAsset",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Asset",
+                            "path": "root/Default/QueueRef/AwsConsoleField/Handler/Asset",
+                          },
+                          "CloudwatchLogGroup": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "CloudwatchLogGroup",
+                            "path": "root/Default/QueueRef/AwsConsoleField/Handler/CloudwatchLogGroup",
+                          },
+                          "Default": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Default",
+                            "path": "root/Default/QueueRef/AwsConsoleField/Handler/Default",
+                          },
+                          "IamRole": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRole",
+                            "path": "root/Default/QueueRef/AwsConsoleField/Handler/IamRole",
+                          },
+                          "IamRolePolicy": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRolePolicy",
+                            "path": "root/Default/QueueRef/AwsConsoleField/Handler/IamRolePolicy",
+                          },
+                          "IamRolePolicyAttachment": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRolePolicyAttachment",
+                            "path": "root/Default/QueueRef/AwsConsoleField/Handler/IamRolePolicyAttachment",
+                          },
+                          "S3Object": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "S3Object",
+                            "path": "root/Default/QueueRef/AwsConsoleField/Handler/S3Object",
+                          },
+                        },
+                        "constructInfo": {
+                          "fqn": "constructs.Construct",
+                          "version": "10.3.0",
+                        },
+                        "display": {
+                          "description": "A cloud function (FaaS)",
+                          "title": "Function",
+                        },
+                        "id": "Handler",
+                        "path": "root/Default/QueueRef/AwsConsoleField/Handler",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "hidden": true,
+                    },
+                    "id": "AwsConsoleField",
+                    "path": "root/Default/QueueRef/AwsConsoleField",
+                  },
+                  "QueueArnField": {
+                    "children": {
+                      "Handler": {
+                        "children": {
+                          "Asset": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformAsset",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Asset",
+                            "path": "root/Default/QueueRef/QueueArnField/Handler/Asset",
+                          },
+                          "CloudwatchLogGroup": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "CloudwatchLogGroup",
+                            "path": "root/Default/QueueRef/QueueArnField/Handler/CloudwatchLogGroup",
+                          },
+                          "Default": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Default",
+                            "path": "root/Default/QueueRef/QueueArnField/Handler/Default",
+                          },
+                          "IamRole": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRole",
+                            "path": "root/Default/QueueRef/QueueArnField/Handler/IamRole",
+                          },
+                          "IamRolePolicy": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRolePolicy",
+                            "path": "root/Default/QueueRef/QueueArnField/Handler/IamRolePolicy",
+                          },
+                          "IamRolePolicyAttachment": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRolePolicyAttachment",
+                            "path": "root/Default/QueueRef/QueueArnField/Handler/IamRolePolicyAttachment",
+                          },
+                          "S3Object": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "S3Object",
+                            "path": "root/Default/QueueRef/QueueArnField/Handler/S3Object",
+                          },
+                        },
+                        "constructInfo": {
+                          "fqn": "constructs.Construct",
+                          "version": "10.3.0",
+                        },
+                        "display": {
+                          "description": "A cloud function (FaaS)",
+                          "title": "Function",
+                        },
+                        "id": "Handler",
+                        "path": "root/Default/QueueRef/QueueArnField/Handler",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "hidden": true,
+                    },
+                    "id": "QueueArnField",
+                    "path": "root/Default/QueueRef/QueueArnField",
+                  },
+                  "QueueUrlField": {
+                    "children": {
+                      "Handler": {
+                        "children": {
+                          "Asset": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformAsset",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Asset",
+                            "path": "root/Default/QueueRef/QueueUrlField/Handler/Asset",
+                          },
+                          "CloudwatchLogGroup": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "CloudwatchLogGroup",
+                            "path": "root/Default/QueueRef/QueueUrlField/Handler/CloudwatchLogGroup",
+                          },
+                          "Default": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Default",
+                            "path": "root/Default/QueueRef/QueueUrlField/Handler/Default",
+                          },
+                          "IamRole": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRole",
+                            "path": "root/Default/QueueRef/QueueUrlField/Handler/IamRole",
+                          },
+                          "IamRolePolicy": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRolePolicy",
+                            "path": "root/Default/QueueRef/QueueUrlField/Handler/IamRolePolicy",
+                          },
+                          "IamRolePolicyAttachment": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamRolePolicyAttachment",
+                            "path": "root/Default/QueueRef/QueueUrlField/Handler/IamRolePolicyAttachment",
+                          },
+                          "S3Object": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "S3Object",
+                            "path": "root/Default/QueueRef/QueueUrlField/Handler/S3Object",
+                          },
+                        },
+                        "constructInfo": {
+                          "fqn": "constructs.Construct",
+                          "version": "10.3.0",
+                        },
+                        "display": {
+                          "description": "A cloud function (FaaS)",
+                          "title": "Function",
+                        },
+                        "id": "Handler",
+                        "path": "root/Default/QueueRef/QueueUrlField/Handler",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "hidden": true,
+                    },
+                    "id": "QueueUrlField",
+                    "path": "root/Default/QueueRef/QueueUrlField",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "color": "pink",
+                  "ui": [
+                    {
+                      "handler": "root/Default/QueueRef/QueueUrlField/Handler",
+                      "kind": "field",
+                      "label": "SQS Queue URL",
+                      "link": true,
+                    },
+                    {
+                      "handler": "root/Default/QueueRef/AwsConsoleField/Handler",
+                      "kind": "field",
+                      "label": "AWS Console",
+                      "link": true,
+                    },
+                    {
+                      "handler": "root/Default/QueueRef/QueueArnField/Handler",
+                      "kind": "field",
+                      "label": "SQS Queue ARN",
+                    },
+                  ],
+                },
+                "id": "QueueRef",
+                "path": "root/Default/QueueRef",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`default queue behavior 1`] = `
+{
   "resource": {
     "aws_sqs_queue": {
       "Queue": {
@@ -32,15 +686,16 @@ exports[`default queue behavior 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Queue/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed message queue",
@@ -52,63 +707,45 @@ exports[`default queue behavior 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -118,11 +755,6 @@ exports[`default queue behavior 2`] = `
 
 exports[`queue name valid 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_sqs_queue": {
       "The-Incredible_Queue-01": {
@@ -148,15 +780,16 @@ exports[`queue name valid 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The-Incredible_Queue-01/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed message queue",
@@ -168,63 +801,45 @@ exports[`queue name valid 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -232,15 +847,10 @@ exports[`queue name valid 2`] = `
 }
 `;
 
-exports[`queue with a consumer function 1`] = `"new (require(\\"[REDACTED]/wingsdk/src/shared-aws/function.inflight\\")).FunctionClient(process.env[\\"FUNCTION_NAME_fd688af4\\"], \\"root/Default/Queue-SetConsumer0\\")"`;
+exports[`queue with a consumer function 1`] = `"new (require("[REDACTED]/wingsdk/src/shared-aws/function.inflight")).FunctionClient(process.env["FUNCTION_NAME_fd688af4"], "root/Default/Queue-SetConsumer0")"`;
 
 exports[`queue with a consumer function 2`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
@@ -250,12 +860,12 @@ exports[`queue with a consumer function 2`] = `
     },
     "aws_iam_role": {
       "Queue-SetConsumer0_IamRole_7F9ED9ED": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.Queue.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
@@ -270,6 +880,9 @@ exports[`queue with a consumer function 2`] = `
         "batch_size": 1,
         "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
         "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
@@ -288,7 +901,7 @@ exports[`queue with a consumer function 2`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
         "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
@@ -332,33 +945,47 @@ exports[`queue with a consumer function 3`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Queue": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Queue/Default",
                   },
                   "EventSourceMapping": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "EventSourceMapping",
                     "path": "root/Default/Queue/EventSourceMapping",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed message queue",
@@ -372,63 +999,70 @@ exports[`queue with a consumer function 3`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Queue-SetConsumer0/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Queue-SetConsumer0/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Queue-SetConsumer0/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Queue-SetConsumer0/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Queue-SetConsumer0/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Queue-SetConsumer0/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -440,63 +1074,45 @@ exports[`queue with a consumer function 3`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -506,11 +1122,6 @@ exports[`queue with a consumer function 3`] = `
 
 exports[`queue with custom retention 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_sqs_queue": {
       "Queue": {
@@ -536,15 +1147,16 @@ exports[`queue with custom retention 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Queue/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed message queue",
@@ -556,63 +1168,45 @@ exports[`queue with custom retention 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -622,11 +1216,6 @@ exports[`queue with custom retention 2`] = `
 
 exports[`queue with custom timeout 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_sqs_queue": {
       "Queue": {
@@ -652,15 +1241,16 @@ exports[`queue with custom timeout 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Queue/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed message queue",
@@ -672,63 +1262,45 @@ exports[`queue with custom timeout 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -738,11 +1310,6 @@ exports[`queue with custom timeout 2`] = `
 
 exports[`replace invalid character from queue name 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_sqs_queue": {
       "TheIncredibleQueue": {
@@ -768,15 +1335,16 @@ exports[`replace invalid character from queue name 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The*Incredible$Queue/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A distributed message queue",
@@ -788,63 +1356,45 @@ exports[`replace invalid character from queue name 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/react-app.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/react-app.test.ts.snap
index 2e474ee0096..8f417ece5e8 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/react-app.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/react-app.test.ts.snap
@@ -1,5 +1,160 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`Testing ReactApp > custom error page 1`] = `
+{
+  "data": {
+    "aws_iam_policy_document": {
+      "Website_Website-host_AllowDistributionReadOnly_BEA9DA33": {
+        "statement": [
+          {
+            "actions": [
+              "s3:GetObject",
+            ],
+            "condition": [
+              {
+                "test": "StringEquals",
+                "values": [
+                  "\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.arn}",
+                ],
+                "variable": "AWS:SourceArn",
+              },
+            ],
+            "principals": [
+              {
+                "identifiers": [
+                  "cloudfront.amazonaws.com",
+                ],
+                "type": "Service",
+              },
+            ],
+            "resources": [
+              "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.arn}/*",
+            ],
+          },
+        ],
+      },
+    },
+  },
+  "output": {
+    "Website_Website-host_Endpoint_Url_82B41E68": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.domain_name}",
+    },
+  },
+  "resource": {
+    "aws_cloudfront_distribution": {
+      "Website_Website-host_Distribution_16BBCB7A": {
+        "custom_error_response": [
+          {
+            "error_code": 404,
+            "response_code": 200,
+            "response_page_path": "/index.html",
+          },
+          {
+            "error_code": 403,
+            "response_code": 200,
+            "response_page_path": "/index.html",
+          },
+        ],
+        "default_cache_behavior": {
+          "allowed_methods": [
+            "GET",
+            "HEAD",
+          ],
+          "cached_methods": [
+            "GET",
+            "HEAD",
+          ],
+          "compress": true,
+          "default_ttl": 3600,
+          "forwarded_values": {
+            "cookies": {
+              "forward": "none",
+            },
+            "query_string": false,
+          },
+          "max_ttl": 86400,
+          "min_ttl": 0,
+          "target_origin_id": "s3Origin",
+          "viewer_protocol_policy": "redirect-to-https",
+        },
+        "default_root_object": "index.html",
+        "enabled": true,
+        "origin": [
+          {
+            "domain_name": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket_regional_domain_name}",
+            "origin_access_control_id": "\${aws_cloudfront_origin_access_control.Website_Website-host_CloudfrontOac_E7FC4CB7.id}",
+            "origin_id": "s3Origin",
+          },
+        ],
+        "price_class": "PriceClass_100",
+        "restrictions": {
+          "geo_restriction": {
+            "locations": [],
+            "restriction_type": "none",
+          },
+        },
+        "viewer_certificate": {
+          "cloudfront_default_certificate": true,
+        },
+      },
+    },
+    "aws_cloudfront_origin_access_control": {
+      "Website_Website-host_CloudfrontOac_E7FC4CB7": {
+        "name": "Website--c8d109e4-cloudfront-oac",
+        "origin_access_control_origin_type": "s3",
+        "signing_behavior": "always",
+        "signing_protocol": "sigv4",
+      },
+    },
+    "aws_s3_bucket": {
+      "Website_Website-host_WebsiteBucket_0ECE7584": {
+        "bucket_prefix": "website-host-c8d109e4-",
+        "force_destroy": false,
+      },
+    },
+    "aws_s3_bucket_policy": {
+      "Website_Website-host_DistributionS3BucketPolicy_AE0CA9BB": {
+        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.id}",
+        "policy": "\${data.aws_iam_policy_document.Website_Website-host_AllowDistributionReadOnly_BEA9DA33.json}",
+      },
+    },
+    "aws_s3_bucket_website_configuration": {
+      "Website_Website-host_BucketWebsiteConfiguration_6A151F57": {
+        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
+        "error_document": {
+          "key": "index.html",
+        },
+        "index_document": {
+          "suffix": "index.html",
+        },
+      },
+    },
+    "aws_s3_object": {
+      "Website_Website-host_File--indexhtml_7EB8DC7E": {
+        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584",
+        ],
+        "key": "/index.html",
+        "source": "<source>",
+        "source_hash": "\${filemd5(<source>)}",
+      },
+      "Website_Website-host_File-wingjs_CC553473": {
+        "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
+        "content": "// This file is generated by wing
+window.wingEnv = {};",
+        "content_type": "text/javascript",
+        "depends_on": [
+          "aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584",
+        ],
+        "key": "wing.js",
+      },
+    },
+  },
+}
+`;
+
 exports[`Testing ReactApp > default React App behavior 1`] = `
 {
   "data": {
@@ -36,13 +191,25 @@ exports[`Testing ReactApp > default React App behavior 1`] = `
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Website_Website-host_Endpoint_Url_82B41E68": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.domain_name}",
     },
   },
   "resource": {
     "aws_cloudfront_distribution": {
       "Website_Website-host_Distribution_16BBCB7A": {
+        "custom_error_response": [
+          {
+            "error_code": 404,
+            "response_code": 200,
+            "response_page_path": "/index.html",
+          },
+          {
+            "error_code": 403,
+            "response_code": 200,
+            "response_page_path": "/index.html",
+          },
+        ],
         "default_cache_behavior": {
           "allowed_methods": [
             "GET",
@@ -109,6 +276,9 @@ exports[`Testing ReactApp > default React App behavior 1`] = `
     "aws_s3_bucket_website_configuration": {
       "Website_Website-host_BucketWebsiteConfiguration_6A151F57": {
         "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
+        "error_document": {
+          "key": "index.html",
+        },
         "index_document": {
           "suffix": "index.html",
         },
@@ -155,7 +325,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                       "AllowDistributionReadOnly": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformDataSource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "AllowDistributionReadOnly",
                         "path": "root/Default/Website/Website-host/AllowDistributionReadOnly",
@@ -163,7 +333,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                       "BucketWebsiteConfiguration": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "BucketWebsiteConfiguration",
                         "path": "root/Default/Website/Website-host/BucketWebsiteConfiguration",
@@ -171,7 +341,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                       "CloudfrontOac": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "CloudfrontOac",
                         "path": "root/Default/Website/Website-host/CloudfrontOac",
@@ -179,7 +349,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                       "Distribution": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "Distribution",
                         "path": "root/Default/Website/Website-host/Distribution",
@@ -187,15 +357,37 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                       "DistributionS3BucketPolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "DistributionS3BucketPolicy",
                         "path": "root/Default/Website/Website-host/DistributionS3BucketPolicy",
                       },
+                      "Endpoint": {
+                        "children": {
+                          "Url": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformOutput",
+                              "version": "0.20.3",
+                            },
+                            "id": "Url",
+                            "path": "root/Default/Website/Website-host/Endpoint/Url",
+                          },
+                        },
+                        "constructInfo": {
+                          "fqn": "constructs.Construct",
+                          "version": "10.3.0",
+                        },
+                        "display": {
+                          "description": "Website root/Default/Website/Website-host",
+                          "title": "Endpoint",
+                        },
+                        "id": "Endpoint",
+                        "path": "root/Default/Website/Website-host/Endpoint",
+                      },
                       "File--index.html": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "File--index.html",
                         "path": "root/Default/Website/Website-host/File--index.html",
@@ -203,7 +395,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                       "File-wing.js": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "File-wing.js",
                         "path": "root/Default/Website/Website-host/File-wing.js",
@@ -211,7 +403,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                       "WebsiteBucket": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "WebsiteBucket",
                         "path": "root/Default/Website/Website-host/WebsiteBucket",
@@ -219,7 +411,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A static website",
@@ -231,7 +423,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A deployable React App",
@@ -243,38 +435,15 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
             "id": "Default",
             "path": "root/Default",
@@ -282,7 +451,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
             "id": "backend",
             "path": "root/backend",
@@ -290,7 +459,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
         "id": "root",
         "path": "root",
@@ -298,7 +467,7 @@ exports[`Testing ReactApp > default React App behavior 2`] = `
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
     "id": "App",
     "path": "",
@@ -343,13 +512,25 @@ exports[`Testing ReactApp > website with addEnvironment 1`] = `
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Website_Website-host_Endpoint_Url_82B41E68": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Website-host_Distribution_16BBCB7A.domain_name}",
     },
   },
   "resource": {
     "aws_cloudfront_distribution": {
       "Website_Website-host_Distribution_16BBCB7A": {
+        "custom_error_response": [
+          {
+            "error_code": 404,
+            "response_code": 200,
+            "response_page_path": "/index.html",
+          },
+          {
+            "error_code": 403,
+            "response_code": 200,
+            "response_page_path": "/index.html",
+          },
+        ],
         "default_cache_behavior": {
           "allowed_methods": [
             "GET",
@@ -416,6 +597,9 @@ exports[`Testing ReactApp > website with addEnvironment 1`] = `
     "aws_s3_bucket_website_configuration": {
       "Website_Website-host_BucketWebsiteConfiguration_6A151F57": {
         "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
+        "error_document": {
+          "key": "index.html",
+        },
         "index_document": {
           "suffix": "index.html",
         },
@@ -436,7 +620,7 @@ exports[`Testing ReactApp > website with addEnvironment 1`] = `
         "bucket": "\${aws_s3_bucket.Website_Website-host_WebsiteBucket_0ECE7584.bucket}",
         "content": "// This file is generated by wing
 window.wingEnv = {
-  \\"key\\": \\"value\\"
+  "key": "value"
 };",
         "content_type": "text/javascript",
         "depends_on": [
@@ -464,7 +648,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                       "AllowDistributionReadOnly": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformDataSource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "AllowDistributionReadOnly",
                         "path": "root/Default/Website/Website-host/AllowDistributionReadOnly",
@@ -472,7 +656,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                       "BucketWebsiteConfiguration": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "BucketWebsiteConfiguration",
                         "path": "root/Default/Website/Website-host/BucketWebsiteConfiguration",
@@ -480,7 +664,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                       "CloudfrontOac": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "CloudfrontOac",
                         "path": "root/Default/Website/Website-host/CloudfrontOac",
@@ -488,7 +672,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                       "Distribution": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "Distribution",
                         "path": "root/Default/Website/Website-host/Distribution",
@@ -496,15 +680,37 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                       "DistributionS3BucketPolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "DistributionS3BucketPolicy",
                         "path": "root/Default/Website/Website-host/DistributionS3BucketPolicy",
                       },
+                      "Endpoint": {
+                        "children": {
+                          "Url": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformOutput",
+                              "version": "0.20.3",
+                            },
+                            "id": "Url",
+                            "path": "root/Default/Website/Website-host/Endpoint/Url",
+                          },
+                        },
+                        "constructInfo": {
+                          "fqn": "constructs.Construct",
+                          "version": "10.3.0",
+                        },
+                        "display": {
+                          "description": "Website root/Default/Website/Website-host",
+                          "title": "Endpoint",
+                        },
+                        "id": "Endpoint",
+                        "path": "root/Default/Website/Website-host/Endpoint",
+                      },
                       "File--index.html": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "File--index.html",
                         "path": "root/Default/Website/Website-host/File--index.html",
@@ -512,7 +718,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                       "File-wing.js": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "File-wing.js",
                         "path": "root/Default/Website/Website-host/File-wing.js",
@@ -520,7 +726,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                       "WebsiteBucket": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
                         "id": "WebsiteBucket",
                         "path": "root/Default/Website/Website-host/WebsiteBucket",
@@ -528,7 +734,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A static website",
@@ -540,7 +746,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A deployable React App",
@@ -552,38 +758,15 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
             "id": "Default",
             "path": "root/Default",
@@ -591,7 +774,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
             "id": "backend",
             "path": "root/backend",
@@ -599,7 +782,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
         "id": "root",
         "path": "root",
@@ -607,7 +790,7 @@ exports[`Testing ReactApp > website with addEnvironment 2`] = `
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
     "id": "App",
     "path": "",
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/redis.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/redis.test.ts.snap
index 887913d7803..780ed085b14 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/redis.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/redis.test.ts.snap
@@ -7,11 +7,6 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
       "Region": {},
     },
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_eip": {
       "EIP": {},
@@ -26,7 +21,8 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
         "num_cache_nodes": 1,
         "parameter_group_name": "default.redis6.x",
         "security_group_ids": [
-          "\${aws_security_group.Redis_securityGroup_BE4B8855.id}",
+          "\${aws_security_group.Redis_KEN21securityGroup_139152DE.id}",
+          "\${aws_security_group.Redis_KEN24securityGroup_6EFFC29B.id}",
         ],
         "subnet_group_name": "\${aws_elasticache_subnet_group.Redis_RedisSubnetGroup_E7D796E2.name}",
       },
@@ -36,6 +32,7 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
         "name": "redis-c8cdb969-subnetGroup",
         "subnet_ids": [
           "\${aws_subnet.PrivateSubnet.id}",
+          "\${aws_subnet.PrivateSubnet2.id}",
         ],
       },
     },
@@ -66,7 +63,6 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
             "destination_prefix_list_id": null,
             "egress_only_gateway_id": null,
             "gateway_id": null,
-            "instance_id": null,
             "ipv6_cidr_block": null,
             "local_gateway_id": null,
             "nat_gateway_id": "\${aws_nat_gateway.NATGateway.id}",
@@ -81,6 +77,29 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
         },
         "vpc_id": "\${aws_vpc.VPC.id}",
       },
+      "PrivateRouteTable2": {
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": null,
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": "\${aws_nat_gateway.NATGateway.id}",
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null,
+          },
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-private-route-table-2",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
       "PublicRouteTable": {
         "route": [
           {
@@ -90,7 +109,6 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
             "destination_prefix_list_id": null,
             "egress_only_gateway_id": null,
             "gateway_id": "\${aws_internet_gateway.InternetGateway.id}",
-            "instance_id": null,
             "ipv6_cidr_block": null,
             "local_gateway_id": null,
             "nat_gateway_id": null,
@@ -111,13 +129,17 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
         "route_table_id": "\${aws_route_table.PrivateRouteTable.id}",
         "subnet_id": "\${aws_subnet.PrivateSubnet.id}",
       },
+      "PrivateRouteTableAssociation2": {
+        "route_table_id": "\${aws_route_table.PrivateRouteTable2.id}",
+        "subnet_id": "\${aws_subnet.PrivateSubnet2.id}",
+      },
       "PublicRouteTableAssociation": {
         "route_table_id": "\${aws_route_table.PublicRouteTable.id}",
         "subnet_id": "\${aws_subnet.PublicSubnet.id}",
       },
     },
     "aws_security_group": {
-      "Redis_securityGroup_BE4B8855": {
+      "Redis_KEN21securityGroup_139152DE": {
         "egress": [
           {
             "cidr_blocks": [
@@ -151,6 +173,40 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
         "name": "3542402a-securityGroup",
         "vpc_id": "\${aws_vpc.VPC.id}",
       },
+      "Redis_KEN24securityGroup_6EFFC29B": {
+        "egress": [
+          {
+            "cidr_blocks": [
+              "0.0.0.0/0",
+            ],
+            "description": null,
+            "from_port": 0,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "-1",
+            "security_groups": null,
+            "self": null,
+            "to_port": 0,
+          },
+        ],
+        "ingress": [
+          {
+            "cidr_blocks": [
+              "\${aws_subnet.PrivateSubnet2.cidr_block}",
+            ],
+            "description": null,
+            "from_port": 6379,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "tcp",
+            "security_groups": null,
+            "self": true,
+            "to_port": 6379,
+          },
+        ],
+        "name": "3542402a-securityGroup",
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
     },
     "aws_subnet": {
       "PrivateSubnet": {
@@ -161,6 +217,14 @@ exports[`When creating a Redis resource > should create an elasticache cluster a
         },
         "vpc_id": "\${aws_vpc.VPC.id}",
       },
+      "PrivateSubnet2": {
+        "availability_zone": "\${data.aws_region.Region.name}b",
+        "cidr_block": "10.0.8.0/22",
+        "tags": {
+          "Name": "Default-c82bf964-private-subnet-2",
+        },
+        "vpc_id": "\${aws_vpc.VPC.id}",
+      },
       "PublicSubnet": {
         "availability_zone": "\${data.aws_region.Region.name}a",
         "cidr_block": "10.0.0.0/24",
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/schedule.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/schedule.test.ts.snap
index 25ad0654ab8..4ad855ffa6c 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/schedule.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/schedule.test.ts.snap
@@ -1,17 +1,860 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`schedule behavior with cron 1`] = `
+exports[`convert single dayOfWeek from Unix to AWS 1`] = `
+{
+  "resource": {
+    "aws_cloudwatch_event_rule": {
+      "Schedule_15669BF1": {
+        "schedule_expression": "cron(* * ? * 0 *)",
+      },
+    },
+    "aws_cloudwatch_event_target": {
+      "Schedule_ScheduleTarget0_12D341DB": {
+        "arn": "\${aws_lambda_function.Schedule_OnTick0_958638E3.qualified_arn}",
+        "rule": "\${aws_cloudwatch_event_rule.Schedule_15669BF1.name}",
+      },
+    },
+    "aws_cloudwatch_log_group": {
+      "Schedule_OnTick0_CloudwatchLogGroup_A06DC96E": {
+        "name": "/aws/lambda/OnTick0-c8e1d4a8",
+        "retention_in_days": 30,
+      },
+    },
+    "aws_iam_role": {
+      "Schedule_OnTick0_IamRole_478B0576": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+    },
+    "aws_iam_role_policy": {
+      "Schedule_OnTick0_IamRolePolicy_708CFC38": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
+      },
+    },
+    "aws_iam_role_policy_attachment": {
+      "Schedule_OnTick0_IamRolePolicyAttachment_5885D6B3": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
+      },
+    },
+    "aws_lambda_function": {
+      "Schedule_OnTick0_958638E3": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "OnTick0-c8e1d4a8",
+          },
+        },
+        "function_name": "OnTick0-c8e1d4a8",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.Schedule_OnTick0_S3Object_95D0AF10.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+    },
+    "aws_lambda_permission": {
+      "Schedule_OnTick0_InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3_17682171": {
+        "action": "lambda:InvokeFunction",
+        "function_name": "\${aws_lambda_function.Schedule_OnTick0_958638E3.function_name}",
+        "principal": "events.amazonaws.com",
+        "qualifier": "\${aws_lambda_function.Schedule_OnTick0_958638E3.version}",
+        "source_arn": "\${aws_cloudwatch_event_rule.Schedule_15669BF1.arn}",
+      },
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "bucket_prefix": "code-c84a50b1-",
+      },
+    },
+    "aws_s3_object": {
+      "Schedule_OnTick0_S3Object_95D0AF10": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+    },
+  },
+}
+`;
+
+exports[`convert single dayOfWeek from Unix to AWS 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Code": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "Code",
+                "path": "root/Default/Code",
+              },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "Schedule": {
+                "children": {
+                  "OnTick0": {
+                    "children": {
+                      "Asset": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformAsset",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Asset",
+                        "path": "root/Default/Schedule/OnTick0/Asset",
+                      },
+                      "CloudwatchLogGroup": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "CloudwatchLogGroup",
+                        "path": "root/Default/Schedule/OnTick0/CloudwatchLogGroup",
+                      },
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Schedule/OnTick0/Default",
+                      },
+                      "IamRole": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRole",
+                        "path": "root/Default/Schedule/OnTick0/IamRole",
+                      },
+                      "IamRolePolicy": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRolePolicy",
+                        "path": "root/Default/Schedule/OnTick0/IamRolePolicy",
+                      },
+                      "IamRolePolicyAttachment": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRolePolicyAttachment",
+                        "path": "root/Default/Schedule/OnTick0/IamRolePolicyAttachment",
+                      },
+                      "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
+                        "path": "root/Default/Schedule/OnTick0/InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
+                      },
+                      "S3Object": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "S3Object",
+                        "path": "root/Default/Schedule/OnTick0/S3Object",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud function (FaaS)",
+                      "title": "Function",
+                    },
+                    "id": "OnTick0",
+                    "path": "root/Default/Schedule/OnTick0",
+                  },
+                  "Schedule": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Schedule",
+                    "path": "root/Default/Schedule/Schedule",
+                  },
+                  "ScheduleTarget0": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ScheduleTarget0",
+                    "path": "root/Default/Schedule/ScheduleTarget0",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud schedule to trigger events at regular intervals",
+                  "title": "Schedule",
+                },
+                "id": "Schedule",
+                "path": "root/Default/Schedule",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`convert the list of dayOfWeek from Unix to AWS 1`] = `
+{
+  "resource": {
+    "aws_cloudwatch_event_rule": {
+      "Schedule_15669BF1": {
+        "schedule_expression": "cron(* * ? * 0,2,4,6 *)",
+      },
+    },
+    "aws_cloudwatch_event_target": {
+      "Schedule_ScheduleTarget0_12D341DB": {
+        "arn": "\${aws_lambda_function.Schedule_OnTick0_958638E3.qualified_arn}",
+        "rule": "\${aws_cloudwatch_event_rule.Schedule_15669BF1.name}",
+      },
+    },
+    "aws_cloudwatch_log_group": {
+      "Schedule_OnTick0_CloudwatchLogGroup_A06DC96E": {
+        "name": "/aws/lambda/OnTick0-c8e1d4a8",
+        "retention_in_days": 30,
+      },
+    },
+    "aws_iam_role": {
+      "Schedule_OnTick0_IamRole_478B0576": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+    },
+    "aws_iam_role_policy": {
+      "Schedule_OnTick0_IamRolePolicy_708CFC38": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
+      },
+    },
+    "aws_iam_role_policy_attachment": {
+      "Schedule_OnTick0_IamRolePolicyAttachment_5885D6B3": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
+      },
+    },
+    "aws_lambda_function": {
+      "Schedule_OnTick0_958638E3": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "OnTick0-c8e1d4a8",
+          },
+        },
+        "function_name": "OnTick0-c8e1d4a8",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.Schedule_OnTick0_S3Object_95D0AF10.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+    },
+    "aws_lambda_permission": {
+      "Schedule_OnTick0_InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3_17682171": {
+        "action": "lambda:InvokeFunction",
+        "function_name": "\${aws_lambda_function.Schedule_OnTick0_958638E3.function_name}",
+        "principal": "events.amazonaws.com",
+        "qualifier": "\${aws_lambda_function.Schedule_OnTick0_958638E3.version}",
+        "source_arn": "\${aws_cloudwatch_event_rule.Schedule_15669BF1.arn}",
+      },
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "bucket_prefix": "code-c84a50b1-",
+      },
+    },
+    "aws_s3_object": {
+      "Schedule_OnTick0_S3Object_95D0AF10": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+    },
+  },
+}
+`;
+
+exports[`convert the list of dayOfWeek from Unix to AWS 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Code": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "Code",
+                "path": "root/Default/Code",
+              },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "Schedule": {
+                "children": {
+                  "OnTick0": {
+                    "children": {
+                      "Asset": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformAsset",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Asset",
+                        "path": "root/Default/Schedule/OnTick0/Asset",
+                      },
+                      "CloudwatchLogGroup": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "CloudwatchLogGroup",
+                        "path": "root/Default/Schedule/OnTick0/CloudwatchLogGroup",
+                      },
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Schedule/OnTick0/Default",
+                      },
+                      "IamRole": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRole",
+                        "path": "root/Default/Schedule/OnTick0/IamRole",
+                      },
+                      "IamRolePolicy": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRolePolicy",
+                        "path": "root/Default/Schedule/OnTick0/IamRolePolicy",
+                      },
+                      "IamRolePolicyAttachment": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRolePolicyAttachment",
+                        "path": "root/Default/Schedule/OnTick0/IamRolePolicyAttachment",
+                      },
+                      "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
+                        "path": "root/Default/Schedule/OnTick0/InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
+                      },
+                      "S3Object": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "S3Object",
+                        "path": "root/Default/Schedule/OnTick0/S3Object",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud function (FaaS)",
+                      "title": "Function",
+                    },
+                    "id": "OnTick0",
+                    "path": "root/Default/Schedule/OnTick0",
+                  },
+                  "Schedule": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Schedule",
+                    "path": "root/Default/Schedule/Schedule",
+                  },
+                  "ScheduleTarget0": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ScheduleTarget0",
+                    "path": "root/Default/Schedule/ScheduleTarget0",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud schedule to trigger events at regular intervals",
+                  "title": "Schedule",
+                },
+                "id": "Schedule",
+                "path": "root/Default/Schedule",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`convert the range of dayOfWeek from Unix to AWS 1`] = `
+{
+  "resource": {
+    "aws_cloudwatch_event_rule": {
+      "Schedule_15669BF1": {
+        "schedule_expression": "cron(* * ? * 0-6 *)",
+      },
+    },
+    "aws_cloudwatch_event_target": {
+      "Schedule_ScheduleTarget0_12D341DB": {
+        "arn": "\${aws_lambda_function.Schedule_OnTick0_958638E3.qualified_arn}",
+        "rule": "\${aws_cloudwatch_event_rule.Schedule_15669BF1.name}",
+      },
+    },
+    "aws_cloudwatch_log_group": {
+      "Schedule_OnTick0_CloudwatchLogGroup_A06DC96E": {
+        "name": "/aws/lambda/OnTick0-c8e1d4a8",
+        "retention_in_days": 30,
+      },
+    },
+    "aws_iam_role": {
+      "Schedule_OnTick0_IamRole_478B0576": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+    },
+    "aws_iam_role_policy": {
+      "Schedule_OnTick0_IamRolePolicy_708CFC38": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
+      },
+    },
+    "aws_iam_role_policy_attachment": {
+      "Schedule_OnTick0_IamRolePolicyAttachment_5885D6B3": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
+      },
+    },
+    "aws_lambda_function": {
+      "Schedule_OnTick0_958638E3": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "OnTick0-c8e1d4a8",
+          },
+        },
+        "function_name": "OnTick0-c8e1d4a8",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.Schedule_OnTick0_S3Object_95D0AF10.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+    },
+    "aws_lambda_permission": {
+      "Schedule_OnTick0_InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3_17682171": {
+        "action": "lambda:InvokeFunction",
+        "function_name": "\${aws_lambda_function.Schedule_OnTick0_958638E3.function_name}",
+        "principal": "events.amazonaws.com",
+        "qualifier": "\${aws_lambda_function.Schedule_OnTick0_958638E3.version}",
+        "source_arn": "\${aws_cloudwatch_event_rule.Schedule_15669BF1.arn}",
+      },
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "bucket_prefix": "code-c84a50b1-",
+      },
+    },
+    "aws_s3_object": {
+      "Schedule_OnTick0_S3Object_95D0AF10": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+    },
+  },
+}
+`;
+
+exports[`convert the range of dayOfWeek from Unix to AWS 2`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Code": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "Code",
+                "path": "root/Default/Code",
+              },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "Schedule": {
+                "children": {
+                  "OnTick0": {
+                    "children": {
+                      "Asset": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformAsset",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Asset",
+                        "path": "root/Default/Schedule/OnTick0/Asset",
+                      },
+                      "CloudwatchLogGroup": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "CloudwatchLogGroup",
+                        "path": "root/Default/Schedule/OnTick0/CloudwatchLogGroup",
+                      },
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Schedule/OnTick0/Default",
+                      },
+                      "IamRole": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRole",
+                        "path": "root/Default/Schedule/OnTick0/IamRole",
+                      },
+                      "IamRolePolicy": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRolePolicy",
+                        "path": "root/Default/Schedule/OnTick0/IamRolePolicy",
+                      },
+                      "IamRolePolicyAttachment": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamRolePolicyAttachment",
+                        "path": "root/Default/Schedule/OnTick0/IamRolePolicyAttachment",
+                      },
+                      "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
+                        "path": "root/Default/Schedule/OnTick0/InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
+                      },
+                      "S3Object": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "S3Object",
+                        "path": "root/Default/Schedule/OnTick0/S3Object",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud function (FaaS)",
+                      "title": "Function",
+                    },
+                    "id": "OnTick0",
+                    "path": "root/Default/Schedule/OnTick0",
+                  },
+                  "Schedule": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Schedule",
+                    "path": "root/Default/Schedule/Schedule",
+                  },
+                  "ScheduleTarget0": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ScheduleTarget0",
+                    "path": "root/Default/Schedule/ScheduleTarget0",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud schedule to trigger events at regular intervals",
+                  "title": "Schedule",
+                },
+                "id": "Schedule",
+                "path": "root/Default/Schedule",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
     },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
   },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`schedule behavior with cron 1`] = `
+{
   "resource": {
     "aws_cloudwatch_event_rule": {
       "Schedule_15669BF1": {
-        "is_enabled": true,
-        "schedule_expression": "cron(0/1 * ? * * *)",
+        "schedule_expression": "cron(0/1 * * * ? *)",
       },
     },
     "aws_cloudwatch_event_target": {
@@ -28,12 +871,12 @@ exports[`schedule behavior with cron 1`] = `
     },
     "aws_iam_role": {
       "Schedule_OnTick0_IamRole_478B0576": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Schedule_OnTick0_IamRolePolicy_708CFC38": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
       },
     },
@@ -59,7 +902,7 @@ exports[`schedule behavior with cron 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Schedule_OnTick0_S3Object_95D0AF10.key}",
         "timeout": 60,
@@ -105,11 +948,23 @@ exports[`schedule behavior with cron 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Schedule": {
                 "children": {
                   "OnTick0": {
@@ -117,71 +972,79 @@ exports[`schedule behavior with cron 2`] = `
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
                         "path": "root/Default/Schedule/OnTick0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
                         "path": "root/Default/Schedule/OnTick0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/Schedule/OnTick0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
                         "path": "root/Default/Schedule/OnTick0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
                         "path": "root/Default/Schedule/OnTick0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
                         "path": "root/Default/Schedule/OnTick0/IamRolePolicyAttachment",
                       },
                       "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
                         "path": "root/Default/Schedule/OnTick0/InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
                         "path": "root/Default/Schedule/OnTick0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
@@ -193,23 +1056,25 @@ exports[`schedule behavior with cron 2`] = `
                   "Schedule": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Schedule",
                     "path": "root/Default/Schedule/Schedule",
                   },
                   "ScheduleTarget0": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "ScheduleTarget0",
                     "path": "root/Default/Schedule/ScheduleTarget0",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud schedule to trigger events at regular intervals",
@@ -221,63 +1086,45 @@ exports[`schedule behavior with cron 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -287,15 +1134,9 @@ exports[`schedule behavior with cron 2`] = `
 
 exports[`schedule behavior with rate 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_event_rule": {
       "Schedule_15669BF1": {
-        "is_enabled": true,
         "schedule_expression": "rate(2 minutes)",
       },
     },
@@ -313,12 +1154,12 @@ exports[`schedule behavior with rate 1`] = `
     },
     "aws_iam_role": {
       "Schedule_OnTick0_IamRole_478B0576": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Schedule_OnTick0_IamRolePolicy_708CFC38": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
       },
     },
@@ -344,7 +1185,7 @@ exports[`schedule behavior with rate 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Schedule_OnTick0_S3Object_95D0AF10.key}",
         "timeout": 60,
@@ -390,11 +1231,23 @@ exports[`schedule behavior with rate 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Schedule": {
                 "children": {
                   "OnTick0": {
@@ -402,71 +1255,79 @@ exports[`schedule behavior with rate 2`] = `
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
                         "path": "root/Default/Schedule/OnTick0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
                         "path": "root/Default/Schedule/OnTick0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/Schedule/OnTick0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
                         "path": "root/Default/Schedule/OnTick0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
                         "path": "root/Default/Schedule/OnTick0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
                         "path": "root/Default/Schedule/OnTick0/IamRolePolicyAttachment",
                       },
                       "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
                         "path": "root/Default/Schedule/OnTick0/InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
                         "path": "root/Default/Schedule/OnTick0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
@@ -478,23 +1339,25 @@ exports[`schedule behavior with rate 2`] = `
                   "Schedule": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Schedule",
                     "path": "root/Default/Schedule/Schedule",
                   },
                   "ScheduleTarget0": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "ScheduleTarget0",
                     "path": "root/Default/Schedule/ScheduleTarget0",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud schedule to trigger events at regular intervals",
@@ -506,63 +1369,45 @@ exports[`schedule behavior with rate 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -572,16 +1417,10 @@ exports[`schedule behavior with rate 2`] = `
 
 exports[`schedule with two functions 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_event_rule": {
       "Schedule_15669BF1": {
-        "is_enabled": true,
-        "schedule_expression": "cron(0/1 * ? * * *)",
+        "schedule_expression": "cron(0/1 * * * ? *)",
       },
     },
     "aws_cloudwatch_event_target": {
@@ -598,12 +1437,12 @@ exports[`schedule with two functions 1`] = `
     },
     "aws_iam_role": {
       "Schedule_OnTick0_IamRole_478B0576": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Schedule_OnTick0_IamRolePolicy_708CFC38": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.name}",
       },
     },
@@ -629,7 +1468,7 @@ exports[`schedule with two functions 1`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Schedule_OnTick0_IamRole_478B0576.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Schedule_OnTick0_S3Object_95D0AF10.key}",
         "timeout": 60,
@@ -675,11 +1514,23 @@ exports[`schedule with two functions 2`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Schedule": {
                 "children": {
                   "OnTick0": {
@@ -687,71 +1538,79 @@ exports[`schedule with two functions 2`] = `
                       "Asset": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformAsset",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Asset",
                         "path": "root/Default/Schedule/OnTick0/Asset",
                       },
                       "CloudwatchLogGroup": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "CloudwatchLogGroup",
                         "path": "root/Default/Schedule/OnTick0/CloudwatchLogGroup",
                       },
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/Schedule/OnTick0/Default",
                       },
                       "IamRole": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRole",
                         "path": "root/Default/Schedule/OnTick0/IamRole",
                       },
                       "IamRolePolicy": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicy",
                         "path": "root/Default/Schedule/OnTick0/IamRolePolicy",
                       },
                       "IamRolePolicyAttachment": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "IamRolePolicyAttachment",
                         "path": "root/Default/Schedule/OnTick0/IamRolePolicyAttachment",
                       },
                       "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
                         "path": "root/Default/Schedule/OnTick0/InvokePermission-c8b3fc394731d07e61c00e422c6b234372c09bc3b3",
                       },
                       "S3Object": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "S3Object",
                         "path": "root/Default/Schedule/OnTick0/S3Object",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud function (FaaS)",
@@ -763,23 +1622,25 @@ exports[`schedule with two functions 2`] = `
                   "Schedule": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Schedule",
                     "path": "root/Default/Schedule/Schedule",
                   },
                   "ScheduleTarget0": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "ScheduleTarget0",
                     "path": "root/Default/Schedule/ScheduleTarget0",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud schedule to trigger events at regular intervals",
@@ -791,63 +1652,45 @@ exports[`schedule with two functions 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/secret.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/secret.test.ts.snap
index 4e58a414009..0d8e49866e0 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/secret.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/secret.test.ts.snap
@@ -6,9 +6,6 @@ exports[`default secret behavior 1`] = `
     "Secret_SecretArn_C6DFE868": {
       "value": "\${aws_secretsmanager_secret.Secret.arn}",
     },
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
   },
   "resource": {
     "aws_secretsmanager_secret": {
@@ -33,23 +30,25 @@ exports[`default secret behavior 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Secret/Default",
                   },
                   "SecretArn": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "SecretArn",
                     "path": "root/Default/Secret/SecretArn",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud secret",
@@ -61,63 +60,45 @@ exports[`default secret behavior 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -134,10 +115,5 @@ exports[`secret with a name 1`] = `
       },
     },
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
 }
 `;
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/table.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/table.test.ts.snap
index ad4d7b1b61c..4947dc17c3c 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/table.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/table.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`default table behavior 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_dynamodb_table": {
       "Table": {
@@ -19,6 +14,9 @@ exports[`default table behavior 1`] = `
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
         "name": "my-wing-tableTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true,
+        },
       },
     },
   },
@@ -26,29 +24,24 @@ exports[`default table behavior 1`] = `
 `;
 
 exports[`function with a table binding 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    await ctx.my_table.insert("test", { id: "test" });
   }
-  async handle(event) {
-  await this.my_table.insert({ id: \\"test\\" });
+  const $ctx = {
+  my_table: new (require("[REDACTED]/wingsdk/src/shared-aws/table.inflight")).TableClient(process.env["DYNAMODB_TABLE_NAME_e7245baa"], process.env["DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY"], process.env["DYNAMODB_TABLE_NAME_e7245baa_COLUMNS"])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
 }
-};
-})())({
-my_table: new (require(\\"[REDACTED]/wingsdk/src/shared-aws/table.inflight\\")).TableClient(process.env[\\"DYNAMODB_TABLE_NAME_e7245baa\\"], process.env[\\"DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY\\"], process.env[\\"DYNAMODB_TABLE_NAME_e7245baa_COLUMNS\\"])
-})"
+)())"
 `;
 
 exports[`function with a table binding 2`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Function_CloudwatchLogGroup_ABDCF4C4": {
@@ -67,16 +60,19 @@ exports[`function with a table binding 2`] = `
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
         "name": "my-wing-tableTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true,
+        },
       },
     },
     "aws_iam_role": {
       "Function_IamRole_678BE84C": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Function_IamRolePolicy_E3B26607": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"dynamodb:PutItem\\"],\\"Resource\\":[\\"\${aws_dynamodb_table.Table.arn}\\"],\\"Effect\\":\\"Allow\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["dynamodb:PutItem"],"Resource":["\${aws_dynamodb_table.Table.arn}"],"Effect":"Allow"}]}",
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.name}",
       },
     },
@@ -94,7 +90,7 @@ exports[`function with a table binding 2`] = `
         "environment": {
           "variables": {
             "DYNAMODB_TABLE_NAME_e7245baa": "\${aws_dynamodb_table.Table.name}",
-            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\\"name\\":0}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{"name":0}",
             "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "id",
             "NODE_OPTIONS": "--enable-source-maps",
             "WING_FUNCTION_NAME": "Function-c852aba6",
@@ -105,7 +101,7 @@ exports[`function with a table binding 2`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Function_IamRole_678BE84C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
@@ -142,8 +138,9 @@ exports[`function with a table binding 3`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
@@ -152,63 +149,70 @@ exports[`function with a table binding 3`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Function/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Function/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Function/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Function/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Function/IamRolePolicyAttachment",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Function/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -217,20 +221,32 @@ exports[`function with a table binding 3`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Table": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Table/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud NoSQL database table that can be used to store and query data",
@@ -242,63 +258,45 @@ exports[`function with a table binding 3`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/tokens.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/tokens.test.ts.snap
index ff802aa99c3..bde8733cf1e 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/tokens.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/tokens.test.ts.snap
@@ -1,34 +1,38 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`captures tokens 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (ctx) => {
+    console.log(ctx.str, ctx.num, ctx.list);
+    return void 0;
   }
-  async handle(event) {
-    console.log(this.str, this.num, this.list);
-  }
-};
-})())({
-str: JSON.parse(process.env[\\"WING_TOKEN_HTTPS_TFTOKEN_TOKEN_8_EXECUTE_API_TFTOKEN_TOKEN_1_AMAZONAWS_COM_TFTOKEN_TOKEN_9\\"]),
-num: JSON.parse(process.env[\\"WING_TOKEN_8_109562212591388E_298\\"]),
-list: JSON.parse(process.env[\\"WING_TOKEN_TFTOKEN_TOKEN_11\\"])
-})"
+  const $ctx = {
+  str: JSON.parse(process.env["WING_TOKEN_HTTPS_TFTOKEN_TOKEN_8_EXECUTE_API_TFTOKEN_TOKEN_0_AMAZONAWS_COM_TFTOKEN_TOKEN_9"]),
+num: JSON.parse(process.env["WING_TOKEN_8_109562212591388E_298"]),
+list: JSON.parse(process.env["WING_TOKEN_TFTOKEN_TOKEN_11"])
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`captures tokens 2`] = `
 {
   "data": {
+    "aws_caller_identity": {
+      "account": {},
+    },
     "aws_region": {
       "Region": {},
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://\${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.\${data.aws_region.Region.name}.amazonaws.com/\${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}",
     },
   },
   "resource": {
@@ -45,7 +49,7 @@ exports[`captures tokens 2`] = `
     },
     "aws_api_gateway_rest_api": {
       "Api_api_91C07D84": {
-        "body": "{\\"openapi\\":\\"3.0.3\\",\\"paths\\":{\\"/\\":{\\"get\\":{\\"operationId\\":\\"get\\",\\"responses\\":{\\"200\\":{\\"description\\":\\"200 response\\",\\"content\\":{}}},\\"parameters\\":[],\\"x-amazon-apigateway-integration\\":{\\"uri\\":\\"arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/\${aws_lambda_function.Api_get__0_28A24394.arn}/invocations\\",\\"type\\":\\"aws_proxy\\",\\"httpMethod\\":\\"POST\\",\\"responses\\":{\\"default\\":{\\"statusCode\\":\\"200\\"}},\\"passthroughBehavior\\":\\"when_no_match\\",\\"contentHandling\\":\\"CONVERT_TO_TEXT\\"}}},\\"/{proxy+}\\":{\\"x-amazon-apigateway-any-method\\":{\\"produces\\":[\\"application/json\\"],\\"x-amazon-apigateway-integration\\":{\\"type\\":\\"mock\\",\\"requestTemplates\\":{\\"application/json\\":\\"\\\\n                {\\\\\\"statusCode\\\\\\": 404}\\\\n              \\"},\\"passthroughBehavior\\":\\"never\\",\\"responses\\":{\\"404\\":{\\"statusCode\\":\\"404\\",\\"responseParameters\\":{\\"method.response.header.Content-Type\\":\\"'application/json'\\"},\\"responseTemplates\\":{\\"application/json\\":\\"{\\\\\\"statusCode\\\\\\": 404, \\\\\\"message\\\\\\": \\\\\\"Error: Resource not found\\\\\\"}\\"}},\\"default\\":{\\"statusCode\\":\\"404\\",\\"responseParameters\\":{\\"method.response.header.Content-Type\\":\\"'application/json'\\"},\\"responseTemplates\\":{\\"application/json\\":\\"{\\\\\\"statusCode\\\\\\": 404, \\\\\\"message\\\\\\": \\\\\\"Error: Resource not found\\\\\\"}\\"}}}},\\"responses\\":{\\"404\\":{\\"description\\":\\"404 response\\",\\"headers\\":{\\"Content-Type\\":{\\"type\\":\\"string\\"}}}}}}}}",
+        "body": "{"paths":{"/":{"get":{"operationId":"get","responses":{"200":{"description":"200 response","content":{}}},"parameters":[],"x-amazon-apigateway-integration":{"uri":"arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations","type":"aws_proxy","httpMethod":"POST","responses":{"default":{"statusCode":"200"}},"passthroughBehavior":"when_no_match","contentHandling":"CONVERT_TO_TEXT"}}},"/{proxy+}":{"x-amazon-apigateway-any-method":{"produces":["application/json"],"x-amazon-apigateway-integration":{"type":"mock","requestTemplates":{"application/json":"\\n                {\\"statusCode\\": 404}\\n              "},"passthroughBehavior":"never","responses":{"404":{"statusCode":"404","responseParameters":{"method.response.header.Content-Type":"'application/json'"},"responseTemplates":{"application/json":"{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}"}},"default":{"statusCode":"404","responseParameters":{"method.response.header.Content-Type":"'application/json'"},"responseTemplates":{"application/json":"{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}"}}}},"responses":{"404":{"description":"404 response","headers":{"Content-Type":{"type":"string"}}}}}}},"openapi":"3.0.3"}",
         "lifecycle": {
           "create_before_destroy": true,
         },
@@ -60,50 +64,50 @@ exports[`captures tokens 2`] = `
       },
     },
     "aws_cloudwatch_log_group": {
-      "Api_get__0_CloudwatchLogGroup_C65AF1DF": {
-        "name": "/aws/lambda/get__-0-c8a5fd6a",
+      "Api_get_0_CloudwatchLogGroup_196DE719": {
+        "name": "/aws/lambda/get_0-c86d29bb",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "Api_get__0_IamRole_F581BFE8": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+      "Api_get_0_IamRole_2FAC475D": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "Api_get__0_IamRolePolicy_B51E4396": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
-        "role": "\${aws_iam_role.Api_get__0_IamRole_F581BFE8.name}",
+      "Api_get_0_IamRolePolicy_D9FB373B": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "Api_get__0_IamRolePolicyAttachment_1532774B": {
+      "Api_get_0_IamRolePolicyAttachment_AEF1DC01": {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.Api_get__0_IamRole_F581BFE8.name}",
+        "role": "\${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}",
       },
     },
     "aws_lambda_function": {
-      "Api_get__0_28A24394": {
+      "Api_get_0_244A7BA4": {
         "architectures": [
           "arm64",
         ],
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get__-0-c8a5fd6a",
+            "WING_FUNCTION_NAME": "get_0-c86d29bb",
             "WING_TOKEN_8_109562212591388E_298": "\${jsonencode(var.Number)}",
-            "WING_TOKEN_HTTPS_TFTOKEN_TOKEN_8_EXECUTE_API_TFTOKEN_TOKEN_1_AMAZONAWS_COM_TFTOKEN_TOKEN_9": "\${jsonencode(\\"https://\${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.\${data.aws_region.Region.name}.amazonaws.com/\${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}\\")}",
+            "WING_TOKEN_HTTPS_TFTOKEN_TOKEN_8_EXECUTE_API_TFTOKEN_TOKEN_0_AMAZONAWS_COM_TFTOKEN_TOKEN_9": "\${jsonencode("https://\${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.\${data.aws_region.Region.name}.amazonaws.com/\${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}")}",
             "WING_TOKEN_TFTOKEN_TOKEN_11": "\${jsonencode(var.List)}",
           },
         },
-        "function_name": "get__-0-c8a5fd6a",
+        "function_name": "get_0-c86d29bb",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.Api_get__0_IamRole_F581BFE8.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.Api_get_0_IamRole_2FAC475D.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.Api_get__0_S3Object_6181526E.key}",
+        "s3_key": "\${aws_s3_object.Api_get_0_S3Object_D1844823.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -114,7 +118,7 @@ exports[`captures tokens 2`] = `
     "aws_lambda_permission": {
       "Api_api_permission-GET-c2e3ffa8_5BF93889": {
         "action": "lambda:InvokeFunction",
-        "function_name": "\${aws_lambda_function.Api_get__0_28A24394.function_name}",
+        "function_name": "\${aws_lambda_function.Api_get_0_244A7BA4.function_name}",
         "principal": "apigateway.amazonaws.com",
         "source_arn": "\${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/",
         "statement_id": "AllowExecutionFromAPIGateway-GET-c2e3ffa8",
@@ -126,7 +130,7 @@ exports[`captures tokens 2`] = `
       },
     },
     "aws_s3_object": {
-      "Api_get__0_S3Object_6181526E": {
+      "Api_get_0_S3Object_D1844823": {
         "bucket": "\${aws_s3_bucket.Code.bucket}",
         "key": "<key>",
         "source": "<source>",
@@ -149,3 +153,145 @@ exports[`captures tokens 2`] = `
   },
 }
 `;
+
+exports[`captures tokens inside plain objects 1`] = `
+"(await (async () => {
+  const $func = async (ctx) => {
+    console.log(ctx.foo.str, ctx.foo.num);
+  }
+  const $ctx = {
+  foo: {"str": JSON.parse(process.env["WING_TOKEN_HTTPS_TFTOKEN_TOKEN_38_EXECUTE_API_TFTOKEN_TOKEN_30_AMAZONAWS_COM_TFTOKEN_TOKEN_39"]),"num": JSON.parse(process.env["WING_TOKEN_8_109562212591416E_298"]),}
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
+`;
+
+exports[`captures tokens inside plain objects 2`] = `
+{
+  "data": {
+    "aws_caller_identity": {
+      "account": {},
+    },
+    "aws_region": {
+      "Region": {},
+    },
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://\${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.\${data.aws_region.Region.name}.amazonaws.com/\${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}",
+    },
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "lifecycle": {
+          "create_before_destroy": true,
+        },
+        "rest_api_id": "\${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "\${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}",
+        },
+      },
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "body": "{"paths":{"/":{"get":{"operationId":"get","responses":{"200":{"description":"200 response","content":{}}},"parameters":[],"x-amazon-apigateway-integration":{"uri":"arn:aws:apigateway:\${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:\${data.aws_region.Region.name}:\${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations","type":"aws_proxy","httpMethod":"POST","responses":{"default":{"statusCode":"200"}},"passthroughBehavior":"when_no_match","contentHandling":"CONVERT_TO_TEXT"}}},"/{proxy+}":{"x-amazon-apigateway-any-method":{"produces":["application/json"],"x-amazon-apigateway-integration":{"type":"mock","requestTemplates":{"application/json":"\\n                {\\"statusCode\\": 404}\\n              "},"passthroughBehavior":"never","responses":{"404":{"statusCode":"404","responseParameters":{"method.response.header.Content-Type":"'application/json'"},"responseTemplates":{"application/json":"{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}"}},"default":{"statusCode":"404","responseParameters":{"method.response.header.Content-Type":"'application/json'"},"responseTemplates":{"application/json":"{\\"statusCode\\": 404, \\"message\\": \\"Error: Resource not found\\"}"}}}},"responses":{"404":{"description":"404 response","headers":{"Content-Type":{"type":"string"}}}}}}},"openapi":"3.0.3"}",
+        "lifecycle": {
+          "create_before_destroy": true,
+        },
+        "name": "api-c8f613f0",
+      },
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "deployment_id": "\${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "\${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod",
+      },
+    },
+    "aws_cloudwatch_log_group": {
+      "Api_get_0_CloudwatchLogGroup_196DE719": {
+        "name": "/aws/lambda/get_0-c86d29bb",
+        "retention_in_days": 30,
+      },
+    },
+    "aws_iam_role": {
+      "Api_get_0_IamRole_2FAC475D": {
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
+      },
+    },
+    "aws_iam_role_policy": {
+      "Api_get_0_IamRolePolicy_D9FB373B": {
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
+        "role": "\${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}",
+      },
+    },
+    "aws_iam_role_policy_attachment": {
+      "Api_get_0_IamRolePolicyAttachment_AEF1DC01": {
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "\${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}",
+      },
+    },
+    "aws_lambda_function": {
+      "Api_get_0_244A7BA4": {
+        "architectures": [
+          "arm64",
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_0-c86d29bb",
+            "WING_TOKEN_8_109562212591416E_298": "\${jsonencode(var.Number)}",
+            "WING_TOKEN_HTTPS_TFTOKEN_TOKEN_38_EXECUTE_API_TFTOKEN_TOKEN_30_AMAZONAWS_COM_TFTOKEN_TOKEN_39": "\${jsonencode("https://\${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.\${data.aws_region.Region.name}.amazonaws.com/\${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}")}",
+          },
+        },
+        "function_name": "get_0-c86d29bb",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "\${aws_iam_role.Api_get_0_IamRole_2FAC475D.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
+        "s3_key": "\${aws_s3_object.Api_get_0_S3Object_D1844823.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": [],
+        },
+      },
+    },
+    "aws_lambda_permission": {
+      "Api_api_permission-GET-c2e3ffa8_5BF93889": {
+        "action": "lambda:InvokeFunction",
+        "function_name": "\${aws_lambda_function.Api_get_0_244A7BA4.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "\${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-c2e3ffa8",
+      },
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "bucket_prefix": "code-c84a50b1-",
+      },
+    },
+    "aws_s3_object": {
+      "Api_get_0_S3Object_D1844823": {
+        "bucket": "\${aws_s3_bucket.Code.bucket}",
+        "key": "<key>",
+        "source": "<source>",
+      },
+    },
+  },
+  "variable": {
+    "Number": {
+      "default": 123,
+      "type": "Number",
+    },
+  },
+}
+`;
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/topic.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/topic.test.ts.snap
index 91bae4c36ff..8360ba7c65e 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/topic.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/topic.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`default topic behavior 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_sns_topic": {
       "Topic": {
@@ -30,15 +25,16 @@ exports[`default topic behavior 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Topic/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A pub/sub notification topic",
@@ -50,63 +46,45 @@ exports[`default topic behavior 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -116,11 +94,6 @@ exports[`default topic behavior 2`] = `
 
 exports[`replace invalid character from queue name 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_sns_topic": {
       "TheSpectacularTopic": {
@@ -144,15 +117,16 @@ exports[`replace invalid character from queue name 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The%Spectacular@Topic/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A pub/sub notification topic",
@@ -164,63 +138,45 @@ exports[`replace invalid character from queue name 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -230,11 +186,6 @@ exports[`replace invalid character from queue name 2`] = `
 
 exports[`topic name valid 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_sns_topic": {
       "The-Spectacular_Topic-01": {
@@ -258,15 +209,16 @@ exports[`topic name valid 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/The-Spectacular_Topic-01/Default",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A pub/sub notification topic",
@@ -278,63 +230,45 @@ exports[`topic name valid 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -343,27 +277,24 @@ exports[`topic name valid 2`] = `
 `;
 
 exports[`topic with subscriber function 1`] = `
-"new ((function(){
-return class Handler {
-  constructor(clients) {
-    for (const [name, client] of Object.entries(clients)) {
-      this[name] = client;
-    }
+"(await (async () => {
+  const $func = async (_, event) => {
+    console.log("Received: ", event);
   }
-  async handle(event) { console.log(\\"Received: \\", event); }
-};
-})())({
-
-})"
+  const $ctx = {
+  
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
 `;
 
 exports[`topic with subscriber function 2`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "aws_cloudwatch_log_group": {
       "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1": {
@@ -373,12 +304,12 @@ exports[`topic with subscriber function 2`] = `
     },
     "aws_iam_role": {
       "Topic-OnMessage0_IamRole_64DD36FA": {
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
       "Topic-OnMessage0_IamRolePolicy_F5EE09D8": {
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Effect\\":\\"Allow\\",\\"Action\\":\\"none:null\\",\\"Resource\\":\\"*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"none:null","Resource":"*"}]}",
         "role": "\${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}",
       },
     },
@@ -404,7 +335,7 @@ exports[`topic with subscriber function 2`] = `
         "memory_size": 1024,
         "publish": true,
         "role": "\${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
         "s3_key": "\${aws_s3_object.Topic-OnMessage0_S3Object_D41E9C10.key}",
         "timeout": 60,
@@ -461,33 +392,47 @@ exports[`topic with subscriber function 3`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
+              "ParameterRegistrar": {
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "hidden": true,
+                },
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
               "Topic": {
                 "children": {
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Topic/Default",
                   },
                   "TopicSubscription0": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "TopicSubscription0",
                     "path": "root/Default/Topic/TopicSubscription0",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A pub/sub notification topic",
@@ -501,71 +446,79 @@ exports[`topic with subscriber function 3`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Topic-OnMessage0/Asset",
                   },
                   "CloudwatchLogGroup": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudwatchLogGroup",
                     "path": "root/Default/Topic-OnMessage0/CloudwatchLogGroup",
                   },
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/Topic-OnMessage0/Default",
                   },
                   "IamRole": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRole",
                     "path": "root/Default/Topic-OnMessage0/IamRole",
                   },
                   "IamRolePolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicy",
                     "path": "root/Default/Topic-OnMessage0/IamRolePolicy",
                   },
                   "IamRolePolicyAttachment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "IamRolePolicyAttachment",
                     "path": "root/Default/Topic-OnMessage0/IamRolePolicyAttachment",
                   },
                   "InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
                     "path": "root/Default/Topic-OnMessage0/InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
                   },
                   "S3Object": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "S3Object",
                     "path": "root/Default/Topic-OnMessage0/S3Object",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -577,63 +530,45 @@ exports[`topic with subscriber function 3`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/__snapshots__/website.test.ts.snap b/libs/wingsdk/test/target-tf-aws/__snapshots__/website.test.ts.snap
index 1492264d0f4..3f898f2311d 100644
--- a/libs/wingsdk/test/target-tf-aws/__snapshots__/website.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-aws/__snapshots__/website.test.ts.snap
@@ -1,5 +1,170 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`custom error page 1`] = `
+{
+  "data": {
+    "aws_iam_policy_document": {
+      "Website_AllowDistributionReadOnly_24CFF6C0": {
+        "statement": [
+          {
+            "actions": [
+              "s3:GetObject",
+            ],
+            "condition": [
+              {
+                "test": "StringEquals",
+                "values": [
+                  "\${aws_cloudfront_distribution.Website_Distribution_5E840E42.arn}",
+                ],
+                "variable": "AWS:SourceArn",
+              },
+            ],
+            "principals": [
+              {
+                "identifiers": [
+                  "cloudfront.amazonaws.com",
+                ],
+                "type": "Service",
+              },
+            ],
+            "resources": [
+              "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.arn}/*",
+            ],
+          },
+        ],
+      },
+    },
+  },
+  "output": {
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}",
+    },
+  },
+  "resource": {
+    "aws_cloudfront_distribution": {
+      "Website_Distribution_5E840E42": {
+        "custom_error_response": [
+          {
+            "error_code": 404,
+            "response_code": 200,
+            "response_page_path": "/b.html",
+          },
+          {
+            "error_code": 403,
+            "response_code": 200,
+            "response_page_path": "/b.html",
+          },
+        ],
+        "default_cache_behavior": {
+          "allowed_methods": [
+            "GET",
+            "HEAD",
+          ],
+          "cached_methods": [
+            "GET",
+            "HEAD",
+          ],
+          "compress": true,
+          "default_ttl": 3600,
+          "forwarded_values": {
+            "cookies": {
+              "forward": "none",
+            },
+            "query_string": false,
+          },
+          "max_ttl": 86400,
+          "min_ttl": 0,
+          "target_origin_id": "s3Origin",
+          "viewer_protocol_policy": "redirect-to-https",
+        },
+        "default_root_object": "index.html",
+        "enabled": true,
+        "origin": [
+          {
+            "domain_name": "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket_regional_domain_name}",
+            "origin_access_control_id": "\${aws_cloudfront_origin_access_control.Website_CloudfrontOac_756836A4.id}",
+            "origin_id": "s3Origin",
+          },
+        ],
+        "price_class": "PriceClass_100",
+        "restrictions": {
+          "geo_restriction": {
+            "locations": [],
+            "restriction_type": "none",
+          },
+        },
+        "viewer_certificate": {
+          "cloudfront_default_certificate": true,
+        },
+      },
+    },
+    "aws_cloudfront_origin_access_control": {
+      "Website_CloudfrontOac_756836A4": {
+        "name": "Website-c80d509a-cloudfront-oac",
+        "origin_access_control_origin_type": "s3",
+        "signing_behavior": "always",
+        "signing_protocol": "sigv4",
+      },
+    },
+    "aws_s3_bucket": {
+      "Website_WebsiteBucket_3C0321F0": {
+        "bucket_prefix": "website-c80d509a-",
+        "force_destroy": false,
+      },
+    },
+    "aws_s3_bucket_policy": {
+      "Website_DistributionS3BucketPolicy_09AE0BCA": {
+        "bucket": "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.id}",
+        "policy": "\${data.aws_iam_policy_document.Website_AllowDistributionReadOnly_24CFF6C0.json}",
+      },
+    },
+    "aws_s3_bucket_website_configuration": {
+      "Website_BucketWebsiteConfiguration_58F891B4": {
+        "bucket": "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "error_document": {
+          "key": "b.html",
+        },
+        "index_document": {
+          "suffix": "index.html",
+        },
+      },
+    },
+    "aws_s3_object": {
+      "Website_File--bhtml_6ACC0793": {
+        "bucket": "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0",
+        ],
+        "key": "/b.html",
+        "source": "<source>",
+        "source_hash": "\${filemd5(<source>)}",
+      },
+      "Website_File--indexhtml_864F8C36": {
+        "bucket": "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0",
+        ],
+        "key": "/index.html",
+        "source": "<source>",
+        "source_hash": "\${filemd5(<source>)}",
+      },
+      "Website_File--inner-folder--ahtml_7D20A7EF": {
+        "bucket": "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0",
+        ],
+        "key": "/inner-folder/a.html",
+        "source": "<source>",
+        "source_hash": "\${filemd5(<source>)}",
+      },
+    },
+  },
+}
+`;
+
 exports[`default website behavior 1`] = `
 {
   "data": {
@@ -36,8 +201,8 @@ exports[`default website behavior 1`] = `
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}",
     },
   },
   "resource": {
@@ -163,79 +328,112 @@ exports[`default website behavior 2`] = `
                   "AllowDistributionReadOnly": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "AllowDistributionReadOnly",
                     "path": "root/Default/Website/AllowDistributionReadOnly",
                   },
                   "BucketWebsiteConfiguration": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "BucketWebsiteConfiguration",
                     "path": "root/Default/Website/BucketWebsiteConfiguration",
                   },
                   "CloudfrontOac": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudfrontOac",
                     "path": "root/Default/Website/CloudfrontOac",
                   },
                   "Distribution": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Distribution",
                     "path": "root/Default/Website/Distribution",
                   },
                   "DistributionS3BucketPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DistributionS3BucketPolicy",
                     "path": "root/Default/Website/DistributionS3BucketPolicy",
                   },
+                  "Endpoint": {
+                    "children": {
+                      "Url": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformOutput",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Url",
+                        "path": "root/Default/Website/Endpoint/Url",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "Website root/Default/Website",
+                      "hidden": true,
+                      "title": "Endpoint",
+                    },
+                    "id": "Endpoint",
+                    "path": "root/Default/Website/Endpoint",
+                  },
                   "File--b.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--b.html",
                     "path": "root/Default/Website/File--b.html",
                   },
                   "File--index.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--index.html",
                     "path": "root/Default/Website/File--index.html",
                   },
                   "File--inner-folder--a.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--inner-folder--a.html",
                     "path": "root/Default/Website/File--inner-folder--a.html",
                   },
                   "WebsiteBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "WebsiteBucket",
                     "path": "root/Default/Website/WebsiteBucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A static website",
@@ -247,63 +445,45 @@ exports[`default website behavior 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -347,8 +527,8 @@ exports[`website with addFile 1`] = `
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}",
     },
   },
   "resource": {
@@ -483,87 +663,121 @@ exports[`website with addFile 2`] = `
                   "AllowDistributionReadOnly": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "AllowDistributionReadOnly",
                     "path": "root/Default/Website/AllowDistributionReadOnly",
                   },
                   "BucketWebsiteConfiguration": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "BucketWebsiteConfiguration",
                     "path": "root/Default/Website/BucketWebsiteConfiguration",
                   },
                   "CloudfrontOac": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudfrontOac",
                     "path": "root/Default/Website/CloudfrontOac",
                   },
                   "Distribution": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Distribution",
                     "path": "root/Default/Website/Distribution",
                   },
                   "DistributionS3BucketPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DistributionS3BucketPolicy",
                     "path": "root/Default/Website/DistributionS3BucketPolicy",
                   },
+                  "Endpoint": {
+                    "children": {
+                      "Url": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformOutput",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Url",
+                        "path": "root/Default/Website/Endpoint/Url",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "Website root/Default/Website",
+                      "hidden": true,
+                      "title": "Endpoint",
+                    },
+                    "id": "Endpoint",
+                    "path": "root/Default/Website/Endpoint",
+                  },
                   "File--b.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--b.html",
                     "path": "root/Default/Website/File--b.html",
                   },
                   "File--index.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--index.html",
                     "path": "root/Default/Website/File--index.html",
                   },
                   "File--inner-folder--a.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--inner-folder--a.html",
                     "path": "root/Default/Website/File--inner-folder--a.html",
                   },
                   "File-addition.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File-addition.html",
                     "path": "root/Default/Website/File-addition.html",
                   },
                   "WebsiteBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "WebsiteBucket",
                     "path": "root/Default/Website/WebsiteBucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A static website",
@@ -575,63 +789,45 @@ exports[`website with addFile 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -675,8 +871,8 @@ exports[`website with addJson 1`] = `
     },
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://\${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}",
     },
   },
   "resource": {
@@ -786,7 +982,7 @@ exports[`website with addJson 1`] = `
       },
       "Website_File-configjson_1F1498B9": {
         "bucket": "\${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
-        "content": "{\\"version\\":\\"8.31.0\\"}",
+        "content": "{"version":"8.31.0"}",
         "content_type": "application/json",
         "depends_on": [
           "aws_s3_bucket.Website_WebsiteBucket_3C0321F0",
@@ -811,87 +1007,121 @@ exports[`website with addJson 2`] = `
                   "AllowDistributionReadOnly": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformDataSource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "AllowDistributionReadOnly",
                     "path": "root/Default/Website/AllowDistributionReadOnly",
                   },
                   "BucketWebsiteConfiguration": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "BucketWebsiteConfiguration",
                     "path": "root/Default/Website/BucketWebsiteConfiguration",
                   },
                   "CloudfrontOac": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CloudfrontOac",
                     "path": "root/Default/Website/CloudfrontOac",
                   },
                   "Distribution": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Distribution",
                     "path": "root/Default/Website/Distribution",
                   },
                   "DistributionS3BucketPolicy": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DistributionS3BucketPolicy",
                     "path": "root/Default/Website/DistributionS3BucketPolicy",
                   },
+                  "Endpoint": {
+                    "children": {
+                      "Url": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformOutput",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Url",
+                        "path": "root/Default/Website/Endpoint/Url",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "Website root/Default/Website",
+                      "hidden": true,
+                      "title": "Endpoint",
+                    },
+                    "id": "Endpoint",
+                    "path": "root/Default/Website/Endpoint",
+                  },
                   "File--b.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--b.html",
                     "path": "root/Default/Website/File--b.html",
                   },
                   "File--index.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--index.html",
                     "path": "root/Default/Website/File--index.html",
                   },
                   "File--inner-folder--a.html": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File--inner-folder--a.html",
                     "path": "root/Default/Website/File--inner-folder--a.html",
                   },
                   "File-config.json": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "File-config.json",
                     "path": "root/Default/Website/File-config.json",
                   },
                   "WebsiteBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "WebsiteBucket",
                     "path": "root/Default/Website/WebsiteBucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A static website",
@@ -903,63 +1133,45 @@ exports[`website with addJson 2`] = `
               "aws": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "aws",
                 "path": "root/Default/aws",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-aws/api.test.ts b/libs/wingsdk/test/target-tf-aws/api.test.ts
index 6997a0b45b8..6cb372bf3c1 100644
--- a/libs/wingsdk/test/target-tf-aws/api.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/api.test.ts
@@ -1,10 +1,12 @@
 import { test, expect } from "vitest";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import { Api, Function } from "../../src/target-tf-aws";
-import { mkdtemp, tfResourcesOfCount } from "../util";
+import { mkdtemp, tfResourcesOfCount, tfSanitize } from "../util";
+
+const INFLIGHT_CODE = inflight(async () => ({ body: "Hello, world" }));
+const INFLIGHT_CODE_2 = inflight(async () => ({ body: "Hello, Wing!" }));
 
-const INFLIGHT_CODE = `async handle(name) { return "Hello, World"; }`;
 const extractApiSpec = (output: any) => {
   const jsonOutput = JSON.parse(output);
   const api = jsonOutput.resource.aws_api_gateway_rest_api as {
@@ -19,9 +21,7 @@ test("api with GET route at root", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/", inflight);
+  api.get("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -33,15 +33,46 @@ test("api with GET route at root", () => {
   expect(apiSpec).toMatchSnapshot();
 });
 
-test("api with multiple methods on same route", () => {
+test("api will be private when vpc_api_gateway is true", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const parameters = app.parameters;
+  parameters._rawParameters["tf-aws"] = {
+    vpc: "new",
+    vpc_api_gateway: true,
+  };
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
+  // WHEN
+  const output = app.synth();
+
+  // THEN
+  const parsedOutput = JSON.parse(output);
+
+  const apiGatewayKey = Object.keys(
+    parsedOutput.resource.aws_api_gateway_rest_api
+  )[0];
+  expect(tfResourcesOfCount(output, "aws_api_gateway_rest_api")).toEqual(1);
+  expect(tfResourcesOfCount(output, "aws_vpc")).toEqual(1);
+  expect(tfResourcesOfCount(output, "aws_vpc_endpoint")).toEqual(1);
+  expect(
+    parsedOutput.resource.aws_api_gateway_rest_api[apiGatewayKey]
+      .endpoint_configuration.types[0]
+  ).toEqual("PRIVATE");
+  expect(
+    parsedOutput.resource.aws_api_gateway_rest_api[apiGatewayKey]
+      .endpoint_configuration.vpc_endpoint_ids.length
+  ).toEqual(1); // uses vpc endpoint
+  expect(tfSanitize(output)).toMatchSnapshot();
+});
+
+test("api with multiple methods on same route", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const api = new Api(app, "Api");
 
-  api.get("/", inflight);
-  api.put("/", inflight);
+  api.get("/", INFLIGHT_CODE);
+  api.put("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -58,17 +89,14 @@ test("api with GET routes with common prefix", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  const inflight2 = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/hello/foo", inflight);
-  api.get("/hello/bat", inflight2);
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.get("/hello/bat", INFLIGHT_CODE_2);
 
   const output = app.synth();
 
   // THEN
   expect(tfResourcesOfCount(output, "aws_api_gateway_rest_api")).toEqual(1);
-  expect(tfResourcesOfCount(output, "aws_lambda_function")).toEqual(1);
+  expect(tfResourcesOfCount(output, "aws_lambda_function")).toEqual(2);
   expect(extractApiSpec(output)).toMatchSnapshot();
 });
 
@@ -77,17 +105,14 @@ test("api with GET routes with different prefix", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  const inflight2 = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/hello/foo", inflight);
-  api.get("/foo/bar", inflight2);
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.get("/foo/bar", INFLIGHT_CODE_2);
 
   const output = app.synth();
 
   // THEN
   expect(tfResourcesOfCount(output, "aws_api_gateway_rest_api")).toEqual(1);
-  expect(tfResourcesOfCount(output, "aws_lambda_function")).toEqual(1);
+  expect(tfResourcesOfCount(output, "aws_lambda_function")).toEqual(2);
   expect(extractApiSpec(output)).toMatchSnapshot();
 });
 
@@ -96,10 +121,8 @@ test("api with multiple GET route and one lambda", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/hello/foo", inflight);
-  api.get("/hello/bat", inflight);
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.get("/hello/bat", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -115,17 +138,14 @@ test("api with multiple methods and multiple lambda", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  const inflight2 = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/hello/foo", inflight);
-  api.post("/hello/bat", inflight2);
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.post("/hello/bat", INFLIGHT_CODE_2);
 
   const output = app.synth();
 
   // THEN
   expect(tfResourcesOfCount(output, "aws_api_gateway_rest_api")).toEqual(1);
-  expect(tfResourcesOfCount(output, "aws_lambda_function")).toEqual(1);
+  expect(tfResourcesOfCount(output, "aws_lambda_function")).toEqual(2);
   expect(extractApiSpec(output)).toMatchSnapshot();
 });
 
@@ -134,10 +154,8 @@ test("api with multiple methods and one lambda", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/hello/foo", inflight);
-  api.post("/hello/bat", inflight);
+  api.get("/hello/foo", INFLIGHT_CODE);
+  api.post("/hello/bat", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -152,9 +170,7 @@ test("api with path parameter", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/hello/:world", inflight);
+  api.get("/hello/:world", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -169,9 +185,7 @@ test("api with 'name' parameter", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/:name", inflight);
+  api.get("/:name", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -186,9 +200,7 @@ test("api with 'name' & 'age' parameter", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.get("/:name/:age", inflight);
+  api.get("/:name/:age", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -203,9 +215,7 @@ test("api with POST route", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.post("/", inflight);
+  api.post("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -222,9 +232,7 @@ test("api with PUT route", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.put("/", inflight);
+  api.put("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -241,9 +249,7 @@ test("api with PATCH route", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.patch("/", inflight);
+  api.patch("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -260,9 +266,7 @@ test("api with DELETE route", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.delete("/", inflight);
+  api.delete("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -279,9 +283,7 @@ test("api with OPTIONS route", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.options("/", inflight);
+  api.options("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -298,9 +300,7 @@ test("api with HEAD route", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.head("/", inflight);
+  api.head("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -317,9 +317,7 @@ test("api with CONNECT route", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
 
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-
-  api.connect("/", inflight);
+  api.connect("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
@@ -335,8 +333,8 @@ test("api url can be used as environment variable", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api");
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new Function(app, "Fn", handler, {
+
+  new Function(app, "Fn", INFLIGHT_CODE, {
     env: {
       API_URL: api.url,
     },
@@ -357,8 +355,8 @@ test("api configured for cors", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const api = new Api(app, "Api", { cors: true });
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  api.get("/", handler);
+
+  api.get("/", INFLIGHT_CODE);
 
   const output = app.synth();
 
diff --git a/libs/wingsdk/test/target-tf-aws/app.test.ts b/libs/wingsdk/test/target-tf-aws/app.test.ts
index 5b73531b281..3457e9712f5 100644
--- a/libs/wingsdk/test/target-tf-aws/app.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/app.test.ts
@@ -1,16 +1,16 @@
 import { existsSync, readdirSync } from "fs";
 import { test, expect } from "vitest";
 import { Function } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import { mkdtemp } from "../util";
 
 test("artifacts are located in app root level outdir", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler("async handle() {}");
-  new Function(app, "Function", inflight);
-  new Function(app, "Function2", inflight);
+  const handler = inflight(async () => {});
+  new Function(app, "Function", handler);
+  new Function(app, "Function2", handler);
   const expectedCdktfJson = `${app.outdir}/main.tf.json`;
   const expectedAssetsDir = `${app.outdir}/assets`;
   const expectedAssetCount = 2; // 2 functions = 2 assets
diff --git a/libs/wingsdk/test/target-tf-aws/bucket.test.ts b/libs/wingsdk/test/target-tf-aws/bucket.test.ts
index 7b9dba1827f..47d4b8c48b2 100644
--- a/libs/wingsdk/test/target-tf-aws/bucket.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/bucket.test.ts
@@ -1,7 +1,7 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import { Bucket } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import {
   mkdtemp,
@@ -154,8 +154,7 @@ test("bucket with onCreate method", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const bucket = new Bucket(app, "my_bucket", { public: true });
-  const inflightTest = Testing.makeHandler("null");
-  bucket.onCreate(inflightTest);
+  bucket.onCreate(inflight(async () => {}));
   const output = app.synth();
 
   // THEN
@@ -193,8 +192,7 @@ test("bucket with onDelete method", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const bucket = new Bucket(app, "my_bucket", { public: true });
-  const inflightTest = Testing.makeHandler("null");
-  bucket.onDelete(inflightTest);
+  bucket.onDelete(inflight(async () => {}));
   const output = app.synth();
 
   // THEN
@@ -232,8 +230,7 @@ test("bucket with onUpdate method", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const bucket = new Bucket(app, "my_bucket", { public: true });
-  const inflightTest = Testing.makeHandler("null");
-  bucket.onUpdate(inflightTest);
+  bucket.onUpdate(inflight(async () => {}));
   const output = app.synth();
 
   // THEN
@@ -271,8 +268,7 @@ test("bucket with onEvent method", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const bucket = new Bucket(app, "my_bucket", { public: true });
-  const inflightTest = Testing.makeHandler("null");
-  bucket.onEvent(inflightTest);
+  bucket.onEvent(inflight(async () => {}));
   const output = app.synth();
 
   // THEN
diff --git a/libs/wingsdk/test/target-tf-aws/captures.test.ts b/libs/wingsdk/test/target-tf-aws/captures.test.ts
index 675319efa61..1d1b461f83b 100644
--- a/libs/wingsdk/test/target-tf-aws/captures.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/captures.test.ts
@@ -1,6 +1,6 @@
 import { test, expect, describe } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight, lift } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import { mkdtemp, sanitizeCode, tfResourcesOf, tfSanitize } from "../util";
 
@@ -32,21 +32,19 @@ describe("function with bucket binding", () => {
     // GIVEN
     const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
     const bucket = new cloud.Bucket(app, "Bucket");
-    const inflight = Testing.makeHandler(
-      `async handle(event) { await this.bucket.put("hello.txt", event); }`,
-      {
-        bucket: {
-          obj: bucket,
-          ops: [cloud.BucketInflightMethods.PUT],
-        },
-      }
+    new cloud.Function(
+      app,
+      "Function",
+      lift({ bucket })
+        .grant({ bucket: ["put"] })
+        .inflight(async (ctx, event) => {
+          await ctx.bucket.put("hello.txt", event ?? "none");
+          return undefined;
+        })
     );
-    new cloud.Function(app, "Function", inflight);
     const output = app.synth();
 
     // THEN
-    expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
-
     expect(tfResourcesOf(output)).toEqual([
       "aws_cloudwatch_log_group",
       "aws_iam_role",
@@ -63,16 +61,16 @@ describe("function with bucket binding", () => {
     // GIVEN
     const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
     const bucket = new cloud.Bucket(app, "Bucket");
-    const inflight = Testing.makeHandler(
-      `async handle(event) { await this.bucket.put("hello.txt", event); }`,
-      {
-        bucket: {
-          obj: bucket,
-          ops: [cloud.BucketInflightMethods.PUT_JSON],
-        },
-      }
+    new cloud.Function(
+      app,
+      "Function",
+      lift({ bucket })
+        .grant({ bucket: ["putJson"] })
+        .inflight(async (ctx, event) => {
+          await ctx.bucket.putJson("hello.json", event as any);
+          return undefined;
+        })
     );
-    new cloud.Function(app, "Function", inflight);
     const output = JSON.parse(app.synth());
     const hasActions = statementsContain(output, ["s3:PutObject*"], "Allow");
 
@@ -84,16 +82,17 @@ describe("function with bucket binding", () => {
     // GIVEN
     const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
     const bucket = new cloud.Bucket(app, "Bucket");
-    const inflight = Testing.makeHandler(
-      `async handle(event) { await this.bucket.put("hello.txt", event); }`,
-      {
-        bucket: {
-          obj: bucket,
-          ops: [cloud.BucketInflightMethods.GET_JSON],
-        },
-      }
+
+    new cloud.Function(
+      app,
+      "Function",
+      lift({ bucket })
+        .grant({ bucket: ["getJson"] })
+        .inflight(async (ctx) => {
+          await ctx.bucket.getJson("hello.txt");
+          return undefined;
+        })
     );
-    new cloud.Function(app, "Function", inflight);
     const output = JSON.parse(app.synth());
     const hasActions = statementsContain(
       output,
@@ -109,22 +108,16 @@ describe("function with bucket binding", () => {
 test("function with a function binding", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight1 = Testing.makeHandler(
-    `async handle(event) { console.log(event); }`
-  );
+  const inflight1 = inflight(async (_, event) => {
+    console.log(event);
+  });
   const fn1 = new cloud.Function(app, "Function1", inflight1);
-  const inflight2 = Testing.makeHandler(
-    `async handle(event) {
+  const inflight2 = lift({ fn1 })
+    .grant({ fn1: ["invoke"] })
+    .inflight(async (ctx, event) => {
       console.log("Event: " + event);
-      await this.function.invoke(JSON.stringify({ hello: "world" }));
-    }`,
-    {
-      function: {
-        obj: fn1,
-        ops: [cloud.FunctionInflightMethods.INVOKE],
-      },
-    }
-  );
+      await ctx.fn1.invoke(JSON.stringify({ hello: "world" }));
+    });
   new cloud.Function(app, "Function2", inflight2);
   const output = app.synth();
 
@@ -147,12 +140,12 @@ test("function with a function binding", () => {
 test("two functions reusing the same IFunctionHandler", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(
-    `async handle(event) { console.log(event); }`
-  );
+  const handler = inflight(async (_, event) => {
+    console.log(event);
+  });
 
-  new cloud.Function(app, "Function1", inflight);
-  new cloud.Function(app, "Function2", inflight);
+  new cloud.Function(app, "Function1", handler);
+  new cloud.Function(app, "Function2", handler);
 
   // THEN
   const output = app.synth();
@@ -173,21 +166,19 @@ test("function with a queue binding", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const queue = new cloud.Queue(app, "Queue");
-  const pusher = Testing.makeHandler(
-    `async handle(event) { await this.queue.push("info"); }`,
-    {
-      queue: {
-        obj: queue,
-        ops: [cloud.QueueInflightMethods.PUSH],
-      },
-    }
-  );
+  const pusher = lift({ queue })
+    .grant({ queue: ["push"] })
+    .inflight(async (ctx) => {
+      await ctx.queue.push("info");
+    });
+
   new cloud.Function(app, "Function", pusher);
 
-  const processor = Testing.makeHandler(
-    `async handle(event) { console.log("Received" + event); }`
-  );
+  const processor = inflight(async (_, event) => {
+    console.log("Received" + event);
+  });
   queue.setConsumer(processor);
+
   const output = app.synth();
 
   // THEN
diff --git a/libs/wingsdk/test/target-tf-aws/counter.test.ts b/libs/wingsdk/test/target-tf-aws/counter.test.ts
index 5284e5943e8..0e2f5f4de21 100644
--- a/libs/wingsdk/test/target-tf-aws/counter.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/counter.test.ts
@@ -1,7 +1,7 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { lift } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import {
   mkdtemp,
@@ -35,22 +35,19 @@ test("counter with initial value", () => {
 test("function with a counter binding", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-  const val = await this.my_counter.inc(2);
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.INC],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [cloud.CounterInflightMethods.INC] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.inc(2);
+      console.log(val);
+    });
+
+  new cloud.Function(app, "Function", handler);
+
   const output = app.synth();
 
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   expect(tfResourcesOf(output)).toEqual([
     "aws_cloudwatch_log_group", // log group for function
     "aws_dynamodb_table", // table for the counter
@@ -68,19 +65,13 @@ test("function with a counter binding", () => {
 test("inc() policy statement", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-  const val = await this.my_counter.inc(2);
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.INC],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [cloud.CounterInflightMethods.INC] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.inc(2);
+      console.log(val);
+    });
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
   expect(output).toContain("dynamodb:UpdateItem");
@@ -91,19 +82,14 @@ test("inc() policy statement", () => {
 test("dec() policy statement", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-  const val = await this.my_counter.dec(2);
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.DEC],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [cloud.CounterInflightMethods.DEC] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.dec(2);
+      console.log(val);
+    });
+
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
   expect(output).toContain("dynamodb:UpdateItem");
@@ -114,19 +100,13 @@ test("dec() policy statement", () => {
 test("peek() policy statement", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-  const val = await this.my_counter.peek();
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.PEEK],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [cloud.CounterInflightMethods.PEEK] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.peek();
+      console.log(val);
+    });
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
 
   expect(output).toContain("dynamodb:GetItem");
@@ -137,19 +117,13 @@ test("peek() policy statement", () => {
 test("set() policy statement", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const counter = new cloud.Counter(app, "Counter");
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-  const val = await this.my_counter.set();
-  console.log(val);
-}`,
-    {
-      my_counter: {
-        obj: counter,
-        ops: [cloud.CounterInflightMethods.SET],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [cloud.CounterInflightMethods.SET] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.set(1);
+      console.log(val);
+    });
+  new cloud.Function(app, "Function", handler);
   const output = app.synth();
   expect(output).toContain("dynamodb:UpdateItem");
   expect(tfSanitize(output)).toMatchSnapshot();
diff --git a/libs/wingsdk/test/target-tf-aws/domain.test.ts b/libs/wingsdk/test/target-tf-aws/domain.test.ts
index 8b478484ac9..a5db458ab1e 100644
--- a/libs/wingsdk/test/target-tf-aws/domain.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/domain.test.ts
@@ -40,7 +40,7 @@ describe("cloud.Domain for tf-aws", () => {
   test("website with a domain when passing values on the command line", () => {
     // GIVEN
     process.env.WING_VALUES =
-      "root/Default/Domain.hostedZoneId=Z0111111111111111111F,root/Default/Domain.acmCertificateArn=arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
+      "root/Default/Domain/hostedZoneId=Z0111111111111111111F,root/Default/Domain/acmCertificateArn=arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
     const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
     const domain = new cloud.Domain(app, "Domain", {
       domainName: "www.example.com",
@@ -112,85 +112,6 @@ describe("cloud.Domain for tf-aws", () => {
     expect(treeJsonOf(app.outdir)).toMatchSnapshot();
   });
 
-  test("react website with a domain when passing values on the command line", () => {
-    // GIVEN
-    const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-    process.env.WING_VALUES =
-      "root/Default/Domain.hostedZoneId=Z0111111111111111111F,root/Default/Domain.acmCertificateArn=arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
-    const domain = new cloud.Domain(app, "Domain", {
-      domainName: "www.example.com",
-    });
-    // this isn't a React App, but a website with a package json and a build command
-    new ex.ReactApp(app, "Website", {
-      projectPath: "../test-files/react-website",
-      domain: domain,
-    });
-
-    const output = app.synth();
-
-    // THEN
-    expect(tfResourcesOf(output)).toEqual([
-      "aws_cloudfront_distribution",
-      "aws_cloudfront_origin_access_control",
-      "aws_route53_record",
-      "aws_s3_bucket",
-      "aws_s3_bucket_policy",
-      "aws_s3_bucket_website_configuration",
-      "aws_s3_object",
-    ]);
-    const hasCertificate = containCertificate(
-      JSON.parse(output),
-      "arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
-    );
-    expect(hasCertificate).toEqual(true);
-    expect(
-      tfResourcesWithProperty(output, "aws_route53_record", {
-        zone_id: "Z0111111111111111111F",
-      })
-    ).not.toBeUndefined();
-    expect(tfSanitize(output)).toMatchSnapshot();
-    expect(treeJsonOf(app.outdir)).toMatchSnapshot();
-  });
-
-  test("react website with a domain when passing values from file", () => {
-    // GIVEN
-    const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-    process.env.WING_VALUES_FILE = __dirname + "/domain.values.yaml";
-    const domain = new cloud.Domain(app, "Domain", {
-      domainName: "www.example.com",
-    });
-    // this isn't a React App, but a website with a package json and a build command
-    new ex.ReactApp(app, "Website", {
-      projectPath: "../test-files/react-website",
-      domain: domain,
-    });
-
-    const output = app.synth();
-
-    // THEN
-    expect(tfResourcesOf(output)).toEqual([
-      "aws_cloudfront_distribution",
-      "aws_cloudfront_origin_access_control",
-      "aws_route53_record",
-      "aws_s3_bucket",
-      "aws_s3_bucket_policy",
-      "aws_s3_bucket_website_configuration",
-      "aws_s3_object",
-    ]);
-    const hasCertificate = containCertificate(
-      JSON.parse(output),
-      "arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
-    );
-    expect(hasCertificate).toEqual(true);
-    expect(
-      tfResourcesWithProperty(output, "aws_route53_record", {
-        zone_id: "Z0111111111111111111F",
-      })
-    ).not.toBeUndefined();
-    expect(tfSanitize(output)).toMatchSnapshot();
-    expect(treeJsonOf(app.outdir)).toMatchSnapshot();
-  });
-
   test("default domain behavior without hostedZoneId and certificate information", () => {
     expect(() => {
       // GIVEN
@@ -201,11 +122,12 @@ describe("cloud.Domain for tf-aws", () => {
       new cloud.Domain(app, "Domain", {
         domainName: "www.example.com",
       });
-    }).toThrowError(`
-  - 'iamCertificate' or 'acmCertificateArn' is missing from root/Default/Domain
-  - 'hostedZoneId' is missing from root/Default/Domain
-
-These are required properties of platform-specific types. You can set these values
-either through '-v | --value' switches or '--values' file.`);
+      app.synth();
+    }).toThrowError(
+      new RegExp(
+        `Parameter validation errors:\\s*` +
+          `- must have required property 'root' \\s*`.replace(/\s+/g, "\\s*") // Normalize whitespace for comparison
+      )
+    );
   });
 });
diff --git a/libs/wingsdk/test/target-tf-aws/domain.values.yaml b/libs/wingsdk/test/target-tf-aws/domain.values.yaml
index 11fabd74739..e8ab5e18939 100644
--- a/libs/wingsdk/test/target-tf-aws/domain.values.yaml
+++ b/libs/wingsdk/test/target-tf-aws/domain.values.yaml
@@ -1,3 +1,5 @@
-root/Default/Domain:
-  hostedZoneId: Z0111111111111111111F
-  acmCertificateArn: arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee
\ No newline at end of file
+root:
+  Default:
+    Domain:
+      hostedZoneId: Z0111111111111111111F
+      acmCertificateArn: arn:aws:acm:us-east-1:111111111111:certificate/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee
\ No newline at end of file
diff --git a/libs/wingsdk/test/target-tf-aws/dynamodb-table.test.ts b/libs/wingsdk/test/target-tf-aws/dynamodb-table.test.ts
deleted file mode 100644
index 9fea07f0192..00000000000
--- a/libs/wingsdk/test/target-tf-aws/dynamodb-table.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { test, expect } from "vitest";
-import * as cloud from "../../src/cloud";
-import * as ex from "../../src/ex";
-import { Testing } from "../../src/simulator";
-import * as tfaws from "../../src/target-tf-aws";
-import {
-  mkdtemp,
-  sanitizeCode,
-  tfResourcesOf,
-  tfSanitize,
-  treeJsonOf,
-} from "../util";
-
-test("default dynamodb table behavior", () => {
-  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  new ex.DynamodbTable(app, "Table", {
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-    name: "my-wing-table",
-  });
-  const output = app.synth();
-
-  expect(tfResourcesOf(output)).toEqual(["aws_dynamodb_table"]);
-  expect(tfSanitize(output)).toMatchSnapshot();
-});
-
-test("function with a table binding", () => {
-  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const table = new ex.DynamodbTable(app, "Table", {
-    attributeDefinitions: { id: "S" } as any,
-    hashKey: "id",
-    name: "my-wing-table",
-  });
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-  await this.my_table.putItem({ item: { id: "test" } });
-  await this.my_table.scan();
-}`,
-    {
-      my_table: {
-        obj: table,
-        ops: [
-          ex.DynamodbTableInflightMethods.PUT_ITEM,
-          ex.DynamodbTableInflightMethods.SCAN,
-        ],
-      },
-    }
-  );
-  new cloud.Function(app, "Function", inflight);
-  const output = app.synth();
-
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
-  expect(tfResourcesOf(output)).toEqual([
-    "aws_cloudwatch_log_group", // log group for Lambda
-    "aws_dynamodb_table", // main table
-    "aws_iam_role", // role for function
-    "aws_iam_role_policy", // policy for role
-    "aws_iam_role_policy_attachment", // execution policy for role
-    "aws_lambda_function", // processor function
-    "aws_s3_bucket", // S3 bucket for code
-    "aws_s3_object", // S3 object for code
-  ]);
-  expect(tfSanitize(output)).toMatchSnapshot();
-  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
-});
diff --git a/libs/wingsdk/test/target-tf-aws/function.test.ts b/libs/wingsdk/test/target-tf-aws/function.test.ts
index 6b5a7ffa1bf..7aaadb59a3c 100644
--- a/libs/wingsdk/test/target-tf-aws/function.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/function.test.ts
@@ -1,17 +1,25 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import { Function } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { Duration } from "../../src/std";
 import * as tfaws from "../../src/target-tf-aws";
-import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util";
-
-const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`;
+import {
+  mkdtemp,
+  tfResourcesOf,
+  tfResourcesOfCount,
+  tfSanitize,
+  treeJsonOf,
+} from "../util";
+
+const INFLIGHT_CODE = inflight(async (_, name) => {
+  console.log("Hello, " + name);
+});
 
 test("basic function", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  new Function(app, "Function", inflight);
+
+  new Function(app, "Function", INFLIGHT_CODE);
   const output = app.synth();
 
   expect(tfResourcesOf(output)).toEqual([
@@ -36,10 +44,32 @@ test("basic function", () => {
   expect(treeJsonOf(app.outdir)).toMatchSnapshot();
 });
 
+test("function will be behind a vpc when vpc_lambda is set to true", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const parameters = app.parameters;
+  parameters._rawParameters["tf-aws"] = {
+    vpc: "new",
+    vpc_lambda: true,
+  };
+
+  new Function(app, "Function", INFLIGHT_CODE);
+
+  // WHEN
+  const output = app.synth();
+
+  // THEN
+  const tfFunction = JSON.parse(output).resource.aws_lambda_function.Function;
+  expect(tfResourcesOfCount(output, "aws_vpc")).toEqual(1);
+  expect(tfFunction.vpc_config).toBeDefined();
+  expect(tfFunction.vpc_config.security_group_ids.length).toEqual(1);
+  expect(tfFunction.vpc_config.subnet_ids.length).toEqual(2);
+  expect(tfSanitize(output)).toMatchSnapshot();
+});
+
 test("basic function with environment variables", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  new Function(app, "Function", inflight, {
+  new Function(app, "Function", INFLIGHT_CODE, {
     env: {
       FOO: "BAR",
       BOOM: "BAM",
@@ -63,8 +93,7 @@ test("basic function with environment variables", () => {
 
 test("function name valid", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  const func = new Function(app, "The-Mighty_Function-01", inflight);
+  const func = new Function(app, "The-Mighty_Function-01", INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -79,8 +108,7 @@ test("function name valid", () => {
 
 test("replace invalid character from function name", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  const func = new Function(app, "The%Mighty$Function", inflight);
+  const func = new Function(app, "The%Mighty$Function", INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -95,8 +123,7 @@ test("replace invalid character from function name", () => {
 
 test("basic function with timeout explicitly set", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  new Function(app, "Function", inflight, {
+  new Function(app, "Function", INFLIGHT_CODE, {
     timeout: Duration.fromSeconds(30),
   });
   const output = app.synth();
@@ -112,8 +139,7 @@ test("basic function with timeout explicitly set", () => {
 
 test("basic function with memory size specified", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  new Function(app, "Function", inflight, { memory: 512 });
+  new Function(app, "Function", INFLIGHT_CODE, { memory: 512 });
   const output = app.synth();
 
   expect(tfResourcesOf(output)).toEqual([
@@ -131,8 +157,7 @@ test("basic function with memory size specified", () => {
 
 test("basic function with custom log retention", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  new Function(app, "Function", inflight, { logRetentionDays: 7 });
+  new Function(app, "Function", INFLIGHT_CODE, { logRetentionDays: 7 });
   const output = app.synth();
 
   expect(
@@ -150,8 +175,7 @@ test("basic function with custom log retention", () => {
 
 test("basic function with infinite log retention", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  new Function(app, "Function", inflight, { logRetentionDays: -1 });
+  new Function(app, "Function", INFLIGHT_CODE, { logRetentionDays: -1 });
   const output = app.synth();
 
   expect(
@@ -169,10 +193,38 @@ test("asset path is stripped of spaces", () => {
   const some_name = "I have a space in my name";
   const expectedReplacement = "i_have_a_space_in_my_name";
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  const f = new Function(app, some_name, inflight);
+  const f = new Function(app, some_name, INFLIGHT_CODE);
   // WHEN
   app.synth();
   // THEN
-  expect(f.entrypoint).toContain(expectedReplacement);
+  expect((f as any).entrypoint).toContain(expectedReplacement);
+});
+
+test("vpc permissions are added even if there is no policy", () => {
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const f = new tfaws.Function(app, "Function", INFLIGHT_CODE);
+
+  f.addNetwork({
+    securityGroupIds: ["sg-1234567890"],
+    subnetIds: ["subnet-1234567890"],
+  });
+
+  const output = app.synth();
+  const policy =
+    tfSanitize(output).resource.aws_iam_role_policy
+      .Function_IamRolePolicy_E3B26607.policy;
+
+  expect(JSON.parse(policy).Statement).toStrictEqual([
+    {
+      Action: [
+        "ec2:CreateNetworkInterface",
+        "ec2:DescribeNetworkInterfaces",
+        "ec2:DeleteNetworkInterface",
+        "ec2:DescribeSubnets",
+        "ec2:DescribeSecurityGroups",
+      ],
+      Resource: ["*"],
+      Effect: "Allow",
+    },
+  ]);
 });
diff --git a/libs/wingsdk/test/target-tf-aws/logger.test.ts b/libs/wingsdk/test/target-tf-aws/logger.test.ts
index 2702d9958f3..882f9f37db6 100644
--- a/libs/wingsdk/test/target-tf-aws/logger.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/logger.test.ts
@@ -1,19 +1,17 @@
 import { test, expect } from "vitest";
 import { Function } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import { mkdtemp, sanitizeCode, tfResourcesOf, tfSanitize } from "../util";
 
 test("inflight function uses a logger", () => {
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
 
-  const inflight = Testing.makeHandler(`async handle() {
-      console.log("hello world!");
-    }`);
+  const handler = inflight(async () => console.log("hello world!"));
 
-  new Function(app, "Function", inflight);
+  new Function(app, "Function", handler);
 
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
 
   const output = app.synth();
 
diff --git a/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts b/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts
index e80bd5c2ab5..013ec762f96 100644
--- a/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import {
   getTfDataSource,
@@ -11,13 +11,15 @@ import {
   treeJsonOf,
 } from "../util";
 
-const INFLIGHT_CODE = `async handle() { console.log("Hello world!"); }`;
+const INFLIGHT_CODE = inflight(async () => {
+  console.log("Hello world!");
+});
 
 test("create an OnDeploy", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.OnDeploy(app, "my_on_deploy", handler);
+
+  new cloud.OnDeploy(app, "my_on_deploy", INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -30,8 +32,8 @@ test("execute OnDeploy after other resources", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.OnDeploy(app, "my_on_deploy", handler, {
+
+  new cloud.OnDeploy(app, "my_on_deploy", INFLIGHT_CODE, {
     executeAfter: [bucket],
   });
   const output = app.synth();
@@ -50,8 +52,7 @@ test("execute OnDeploy before other resources", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const bucket = new cloud.Bucket(app, "my_bucket");
-  const handler = Testing.makeHandler(INFLIGHT_CODE);
-  new cloud.OnDeploy(app, "my_on_deploy", handler, {
+  new cloud.OnDeploy(app, "my_on_deploy", INFLIGHT_CODE, {
     executeBefore: [bucket],
   });
   const output = app.synth();
diff --git a/libs/wingsdk/test/target-tf-aws/platform.test.ts b/libs/wingsdk/test/target-tf-aws/platform.test.ts
new file mode 100644
index 00000000000..36590137e02
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-aws/platform.test.ts
@@ -0,0 +1,213 @@
+import fs from "fs";
+import path from "path";
+import {
+  SecretsManagerClient,
+  GetSecretValueCommand,
+  CreateSecretCommand,
+  UpdateSecretCommand,
+} from "@aws-sdk/client-secrets-manager";
+import { mockClient } from "aws-sdk-client-mock";
+import { test, expect, describe, beforeEach } from "vitest";
+import { Function } from "../../src/cloud";
+import { inflight } from "../../src/core";
+import { PlatformManager } from "../../src/platform";
+import * as tfaws from "../../src/target-tf-aws/platform";
+import { mkdtemp } from "../util";
+import "aws-sdk-client-mock-jest";
+
+const secretsManagerClientMock = mockClient(SecretsManagerClient);
+
+describe("tf-aws platform parameters", () => {
+  let platformManager;
+  let tempdir;
+  let wingParametersFile;
+
+  beforeEach(() => {
+    platformManager = new PlatformManager({ platformPaths: ["tf-aws"] });
+    tempdir = mkdtemp();
+    wingParametersFile = path.join(tempdir, "wing.json");
+    process.env.WING_VALUES_FILE = wingParametersFile;
+  });
+
+  test("throws if private subnet ids are not an array", () => {
+    // GIVEN
+    const providedParameters = {
+      "tf-aws": {
+        vpc: "existing",
+        vpc_id: "vpc-123",
+        private_subnet_ids: "subnet-123",
+      },
+    };
+    fs.writeFileSync(wingParametersFile, JSON.stringify(providedParameters));
+
+    // WHEN
+    const app = platformManager.createApp({
+      outdir: tempdir,
+      entrypointDir: tempdir,
+    });
+
+    // THEN
+    expect(() => app.synth()).toThrow(/must be array/);
+  });
+
+  test("does not throw if private subnet ids are an array", () => {
+    // GIVEN
+    const providedParameters = {
+      "tf-aws": {
+        vpc: "existing",
+        vpc_id: "vpc-123",
+        private_subnet_ids: ["subnet-123"],
+      },
+    };
+    fs.writeFileSync(wingParametersFile, JSON.stringify(providedParameters));
+
+    // WHEN
+    const app = platformManager.createApp({
+      outdir: tempdir,
+      entrypointDir: tempdir,
+    });
+
+    // THEN
+    expect(() => app.synth()).not.toThrow();
+  });
+
+  test("require private subnet ids, when vpc = existing", () => {
+    // GIVEN
+    const providedParameters = {
+      "tf-aws": {
+        vpc: "existing",
+        vpc_api_gateway: true,
+        vpc_lambda: true,
+      },
+    };
+    fs.writeFileSync(wingParametersFile, JSON.stringify(providedParameters));
+
+    // WHEN
+    const app = platformManager.createApp({
+      outdir: tempdir,
+      entrypointDir: tempdir,
+    });
+    // THEN
+    expect(() => app.synth()).toThrow(
+      /must have required property 'private_subnet_ids'/
+    );
+  });
+
+  test("does not require public subnet ids, when vpc = existing", () => {
+    // GIVEN
+    const providedParameters = {
+      "tf-aws": {
+        vpc: "existing",
+        vpc_id: "vpc-123",
+        private_subnet_ids: ["subnet-123"],
+      },
+    };
+    fs.writeFileSync(wingParametersFile, JSON.stringify(providedParameters));
+
+    // WHEN
+    const app = platformManager.createApp({
+      outdir: tempdir,
+      entrypointDir: tempdir,
+    });
+    // THEN
+    expect(() => app.synth()).not.toThrow();
+  });
+
+  test("all private subnets are used when creating functions", () => {
+    // GIVEN
+    const providedParameters = {
+      "tf-aws": {
+        vpc: "existing",
+        vpc_id: "vpc-123",
+        private_subnet_ids: ["subnet-123", "subnet-456"],
+        vpc_lambda: true,
+      },
+    };
+    fs.writeFileSync(wingParametersFile, JSON.stringify(providedParameters));
+
+    // WHEN
+    const app = platformManager.createApp({
+      outdir: tempdir,
+      entrypointDir: tempdir,
+    });
+
+    new Function(
+      app,
+      "Function",
+      inflight(async () => {
+        return undefined;
+      })
+    );
+
+    // THEN
+    const output = app.synth();
+    const tfFunction = JSON.parse(output).resource.aws_lambda_function.Function;
+    expect(tfFunction.vpc_config.subnet_ids.length).toEqual(2);
+  });
+});
+
+describe("tf-aws platoform storeSecrets", async () => {
+  beforeEach(() => {
+    secretsManagerClientMock.reset();
+    secretsManagerClientMock.on(CreateSecretCommand).callsFake((command) => {
+      return {};
+    });
+
+    secretsManagerClientMock.on(UpdateSecretCommand).callsFake((command) => {
+      return {};
+    });
+  });
+
+  describe("when secret does not exist", () => {
+    beforeEach(() => {
+      secretsManagerClientMock.on(GetSecretValueCommand).rejects({
+        name: "ResourceNotFoundException",
+        message: "Secret does not exist",
+      });
+    });
+
+    test("stores secrets in plain text", async () => {
+      // GIVEN
+      const platform = new tfaws.Platform();
+      const secrets = { secret1: "value1" };
+
+      // WHEN
+      await platform.storeSecrets(secrets);
+
+      // THEN
+      expect(secretsManagerClientMock).toHaveReceivedCommandTimes(
+        CreateSecretCommand,
+        1
+      );
+      expect(secretsManagerClientMock).toHaveReceivedCommandWith(
+        CreateSecretCommand,
+        { SecretString: "value1" }
+      );
+    });
+  });
+
+  describe("when secret exists", () => {
+    beforeEach(() => {
+      secretsManagerClientMock.on(GetSecretValueCommand).resolves({});
+    });
+
+    test("updates existing secrets", async () => {
+      // GIVEN
+      const platform = new tfaws.Platform();
+      const secrets = { secret1: "value1" };
+
+      // WHEN
+      await platform.storeSecrets(secrets);
+
+      // THEN
+      expect(secretsManagerClientMock).toHaveReceivedCommandTimes(
+        UpdateSecretCommand,
+        1
+      );
+      expect(secretsManagerClientMock).toHaveReceivedCommandWith(
+        UpdateSecretCommand,
+        { SecretString: "value1" }
+      );
+    });
+  });
+});
diff --git a/libs/wingsdk/test/target-tf-aws/queue.test.ts b/libs/wingsdk/test/target-tf-aws/queue.test.ts
index 319f9ea1d40..7d421ff898f 100644
--- a/libs/wingsdk/test/target-tf-aws/queue.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/queue.test.ts
@@ -1,9 +1,11 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
-import { Queue } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { Function, IFunctionClient, Queue } from "../../src/cloud";
+import { inflight, lift } from "../../src/core";
+import { QueueRef } from "../../src/shared-aws";
 import * as std from "../../src/std";
 import * as tfaws from "../../src/target-tf-aws";
+import { SimApp } from "../sim-app";
 import {
   mkdtemp,
   sanitizeCode,
@@ -58,10 +60,9 @@ test("queue with a consumer function", () => {
   const queue = new Queue(app, "Queue", {
     timeout: std.Duration.fromSeconds(30),
   });
-  const processor = Testing.makeHandler(`\
-async handle(event) {
-  console.log("Received " + event.name);
-}`);
+  const processor = inflight(async (_, event) => {
+    console.log("Received " + event.name);
+  });
   const processorFn = queue.setConsumer(processor);
   const output = app.synth();
 
@@ -94,7 +95,7 @@ test("queue name valid", () => {
     cdktf.Testing.toHaveResourceWithProperties(output, "aws_sqs_queue", {
       name: `The-Incredible_Queue-01-${queue.node.addr.substring(0, 8)}`,
     })
-  );
+  ).toBeTruthy();
   expect(tfSanitize(output)).toMatchSnapshot();
   expect(treeJsonOf(app.outdir)).toMatchSnapshot();
 });
@@ -110,7 +111,101 @@ test("replace invalid character from queue name", () => {
     cdktf.Testing.toHaveResourceWithProperties(output, "aws_sqs_queue", {
       name: `The-Incredible-Queue-${queue.node.addr.substring(0, 8)}`,
     })
+  ).toBeTruthy();
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("QueueRef fails with an invalid ARN", async () => {
+  const app = new SimApp();
+  expect(() => {
+    new QueueRef(app, "QueueRef", "not-an_arn");
+  }).toThrow(/"not-an_arn" is not a valid Amazon SQS ARN/);
+});
+
+test("QueueRef in a SimApp can be used to reference an existing queue within a simulated app", async () => {
+  const app = new SimApp();
+
+  const queueRef = new QueueRef(
+    app,
+    "QueueRef",
+    "arn:aws:sqs:us-west-2:123456789012:MyQueue1234"
+  );
+
+  // we can't really make a remote call here, so we'll just check that
+  // we have the right inflight client with the right queue name.
+  new Function(
+    app,
+    "Function",
+    lift({ queue: queueRef })
+      .grant({ queue: ["push"] })
+      .inflight(async (ctx) => {
+        const q = ctx.queue as any;
+
+        if (!q.client) {
+          throw new Error("Queue AWS SDK client not found");
+        }
+        if (q.client.constructor.name !== "SQSClient") {
+          throw new Error("Queue AWS SDK client is not an SQSClient");
+        }
+        return q._queueUrlOrArn; // yes, internal stuff
+      })
+  );
+
+  expect(queueRef.queueArn).toStrictEqual(
+    "arn:aws:sqs:us-west-2:123456789012:MyQueue1234"
+  );
+
+  const sim = await app.startSimulator();
+
+  const fn = sim.getResource("root/Function") as IFunctionClient;
+
+  const reply = await fn.invoke();
+  expect(reply).toStrictEqual("arn:aws:sqs:us-west-2:123456789012:MyQueue1234");
+});
+
+test("QueueRef in an TFAWS app can be used to reference an existing queue", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const queue = new QueueRef(
+    app,
+    "QueueRef",
+    "arn:aws:sqs:us-west-2:123456789012:MyQueue1234"
   );
+
+  const handler = lift({ queue })
+    .grant({ queue: ["push", "approxSize"] })
+    .inflight(async () => {});
+
+  new Function(app, "Function", handler);
+
+  const output = app.synth();
+
+  // THEN
+
+  const statements = JSON.parse(
+    JSON.parse(output).resource.aws_iam_role_policy
+      .Function_IamRolePolicy_E3B26607.policy
+  ).Statement;
+
+  expect(statements).toStrictEqual([
+    {
+      Action: ["sqs:GetQueueUrl"],
+      Effect: "Allow",
+      Resource: ["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],
+    },
+    {
+      Action: ["sqs:SendMessage"],
+      Effect: "Allow",
+      Resource: ["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],
+    },
+    {
+      Action: ["sqs:GetQueueAttributes"],
+      Effect: "Allow",
+      Resource: ["arn:aws:sqs:us-west-2:123456789012:MyQueue1234"],
+    },
+  ]);
+
   expect(tfSanitize(output)).toMatchSnapshot();
   expect(treeJsonOf(app.outdir)).toMatchSnapshot();
 });
diff --git a/libs/wingsdk/test/target-tf-aws/react-app.test.ts b/libs/wingsdk/test/target-tf-aws/react-app.test.ts
deleted file mode 100644
index 4bd14e965fc..00000000000
--- a/libs/wingsdk/test/target-tf-aws/react-app.test.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import child_process from "child_process";
-import { resolve } from "path";
-import { test, expect, vi, afterAll, describe } from "vitest";
-import * as ex from "../../src/ex";
-import * as tfaws from "../../src/target-tf-aws";
-import {
-  mkdtemp,
-  tfResourcesOf,
-  tfResourcesOfCount,
-  tfResourcesWithProperty,
-  tfSanitize,
-  treeJsonOf,
-} from "../util";
-
-describe("Testing ReactApp", () => {
-  const execMock = vi.spyOn(child_process, "execSync");
-
-  afterAll(() => {
-    execMock.mockReset();
-  });
-
-  test("default React App behavior", () => {
-    // GIVEN
-    const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-    // this isn't a React App, but a website with a package json and a build command
-    new ex.ReactApp(app, "Website", {
-      projectPath: "../test-files/react-website",
-    });
-
-    const output = app.synth();
-
-    // THEN
-    expect(tfResourcesOf(output)).toEqual([
-      "aws_cloudfront_distribution",
-      "aws_cloudfront_origin_access_control",
-      "aws_s3_bucket",
-      "aws_s3_bucket_policy",
-      "aws_s3_bucket_website_configuration",
-      "aws_s3_object",
-    ]);
-    expect(tfResourcesOfCount(output, "aws_s3_object")).toEqual(2);
-    expect(
-      tfResourcesWithProperty(output, "aws_s3_object", {
-        key: "/index.html",
-      })
-    ).not.toBeUndefined();
-    expect(
-      tfResourcesWithProperty(output, "aws_s3_object", { key: ex.WING_JS })
-        ?.content
-    ).toBe("// This file is generated by wing\nwindow.wingEnv = {};");
-    expect(tfSanitize(output)).toMatchSnapshot();
-    expect(treeJsonOf(app.outdir)).toMatchSnapshot();
-    expect(execMock).toBeCalledWith("npm run build", {
-      cwd: resolve(__dirname, "../test-files/react-website"),
-      maxBuffer: 10485760,
-    });
-  });
-
-  test("React App with invalid path should throw error", () => {
-    // GIVEN
-    expect(() => {
-      const app = new tfaws.App({
-        outdir: mkdtemp(),
-        entrypointDir: __dirname,
-      });
-      new ex.ReactApp(app, "Website", {
-        projectPath: "/absolute/non-existent",
-      });
-      app.synth();
-      // THEN
-    }).toThrowError("non existent directory '/absolute/non-existent'");
-  });
-
-  test("website with addEnvironment", () => {
-    // GIVEN
-    const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-    // this isn't a React App, but a website with a package json and a build command
-    const website = new ex.ReactApp(app, "Website", {
-      projectPath: "../test-files/react-website",
-    });
-
-    website.addEnvironment("key", "value");
-
-    const output = app.synth();
-
-    // THEN
-    expect(tfResourcesOf(output)).toEqual([
-      "aws_cloudfront_distribution",
-      "aws_cloudfront_origin_access_control",
-      "aws_s3_bucket",
-      "aws_s3_bucket_policy",
-      "aws_s3_bucket_website_configuration",
-      "aws_s3_object",
-    ]);
-    expect(tfResourcesOfCount(output, "aws_s3_object")).toEqual(2);
-    expect(
-      tfResourcesWithProperty(output, "aws_s3_object", {
-        key: "/index.html",
-      })
-    ).not.toBeUndefined();
-    expect(tfSanitize(output)).toMatchSnapshot();
-    expect(treeJsonOf(app.outdir)).toMatchSnapshot();
-    expect(
-      tfResourcesWithProperty(output, "aws_s3_object", { key: ex.WING_JS })
-        ?.content
-    ).toBe(`// This file is generated by wing\nwindow.wingEnv = {
-  "key": "value"
-};`);
-
-    expect(execMock).toBeCalledWith("npm run build", {
-      cwd: resolve(__dirname, "../test-files/react-website"),
-      maxBuffer: 10485760,
-    });
-  });
-
-  test("website with useBuildCommand=false still uses build command", () => {
-    // GIVEN
-    const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-    // this isn't a React App, but a website with a package json and a build command
-    const website = new ex.ReactApp(app, "Website", {
-      projectPath: "../test-files/react-website",
-      useBuildCommand: false,
-    });
-
-    // THEN
-
-    expect(execMock).toBeCalledWith("npm run build", {
-      cwd: resolve(__dirname, "../test-files/react-website"),
-      maxBuffer: 10485760,
-    });
-  });
-
-  test("website with custom build path", () => {
-    // GIVEN
-    const CUSTOM_COMMAND = "echo 'custom command'";
-    const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-    // this isn't a React App, but a website with a package json and a build command
-    new ex.ReactApp(app, "Website", {
-      projectPath: "../test-files/react-website",
-      buildCommand: CUSTOM_COMMAND,
-    });
-
-    // THEN
-
-    expect(execMock).toBeCalledWith(CUSTOM_COMMAND, {
-      cwd: resolve(__dirname, "../test-files/react-website"),
-      maxBuffer: 10485760,
-    });
-  });
-});
diff --git a/libs/wingsdk/test/target-tf-aws/redis.inflight.test.ts b/libs/wingsdk/test/target-tf-aws/redis.inflight.test.ts
index 6cb9bc5ca51..45d4ac8ac2b 100644
--- a/libs/wingsdk/test/target-tf-aws/redis.inflight.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/redis.inflight.test.ts
@@ -3,14 +3,13 @@ import {
   DescribeCacheClustersCommand,
 } from "@aws-sdk/client-elasticache";
 import { mockClient } from "aws-sdk-client-mock";
-import { test, vi, beforeEach, expect } from "vitest";
+import { test, expect } from "vitest";
 import { RedisClient } from "../../src/target-tf-aws/redis.inflight";
 
-beforeEach(() => {
-  mockElastiCache.reset();
-  fakeRedisClient.items.clear();
-
-  mockElastiCache.on(DescribeCacheClustersCommand).resolves({
+const getMockClient = () => new RedisClient("fake-cluster", new MockRedis());
+mockClient(ElastiCacheClient)
+  .on(DescribeCacheClustersCommand)
+  .resolves({
     CacheClusters: [
       {
         CacheNodes: [
@@ -23,7 +22,6 @@ beforeEach(() => {
       },
     ],
   });
-});
 
 test("can set and get a value", async () => {
   // GIVEN
@@ -31,7 +29,7 @@ test("can set and get a value", async () => {
   const expectedValue = "does redis";
 
   // WHEN
-  const client = new RedisClient("fake-cluster", fakeRedisClient);
+  const client = getMockClient();
   await client.set(key, expectedValue);
   const value = await client.get(key);
 
@@ -48,7 +46,7 @@ test("can hset and hget values", async () => {
   const expectedValue2 = "world";
 
   // WHEN
-  const client = new RedisClient("fake-cluster", fakeRedisClient);
+  const client = getMockClient();
   await client.hset(key, field1, expectedValue1);
   await client.hset(key, field2, expectedValue2);
   const value1 = await client.hget(key, field1);
@@ -65,7 +63,7 @@ test("can sadd and smembers values", async () => {
   const expectedValues = ["a", "b", "c"];
 
   // WHEN
-  const client = new RedisClient("fake-cluster", fakeRedisClient);
+  const client = getMockClient();
   await client.sadd(key, "a");
   await client.sadd(key, "b");
   await client.sadd(key, "c");
@@ -80,7 +78,7 @@ test("can delete a key", async () => {
   const key = "wing";
 
   // WHEN
-  const client = new RedisClient("fake-cluster", fakeRedisClient);
+  const client = getMockClient();
   await client.set(key, "does redis");
   await client.del(key);
   const value = await client.get(key);
@@ -89,36 +87,50 @@ test("can delete a key", async () => {
   expect(value).toBeUndefined();
 });
 
-const fakeRedisClient = {
-  items: new Map<any, any>(),
-  set: (key: string, value: string) => {
-    fakeRedisClient.items.set(key, value);
-  },
-  get: (key: string) => {
-    return fakeRedisClient.items.get(key);
-  },
-  hset: (key: string, field: string, value: string) => {
-    fakeRedisClient.items.set(`${key}:${field}`, value);
-  },
-  hget: (key: string, field: string) => {
-    return fakeRedisClient.items.get(`${key}:${field}`);
-  },
-  sadd: (key: string, value: string) => {
-    if (!fakeRedisClient.items.has(key)) {
+class MockRedis {
+  public items: Map<string, string | Set<string>> = new Map();
+
+  public set(key: string, value: string) {
+    this.items.set(key, value);
+  }
+
+  public get(key: string) {
+    return this.items.get(key);
+  }
+
+  public hset(key: string, field: string, value: string) {
+    this.items.set(`${key}:${field}`, value);
+  }
+
+  public hget(key: string, field: string) {
+    return this.items.get(`${key}:${field}`);
+  }
+
+  public sadd(key: string, value: string) {
+    if (!this.items.has(key)) {
       const set = new Set<string>();
-      set.add(value);
-      fakeRedisClient.items.set(key, set);
+      this.items.set(key, set);
+    }
+
+    const set = this.items.get(key);
+    if (set === undefined || typeof set === "string") {
+      throw new Error("Not a set");
     }
-    const set = fakeRedisClient.items.get(key);
     set.add(value);
-  },
-  smembers: (key: string) => {
-    const set = fakeRedisClient.items.get(key);
-    return Array.from(set);
-  },
-  del: (key: string) => {
-    fakeRedisClient.items.delete(key);
-  },
-};
-
-const mockElastiCache = mockClient(ElastiCacheClient);
+  }
+
+  public smembers(key: string) {
+    const set = this.items.get(key);
+    if (!set) {
+      return [];
+    } else if (typeof set === "string") {
+      throw new Error("Not a set");
+    } else {
+      return Array.from(set);
+    }
+  }
+
+  public del(key: string) {
+    this.items.delete(key);
+  }
+}
diff --git a/libs/wingsdk/test/target-tf-aws/redis.test.ts b/libs/wingsdk/test/target-tf-aws/redis.test.ts
index 025ce369fd9..2c827c81c45 100644
--- a/libs/wingsdk/test/target-tf-aws/redis.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/redis.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest";
 import { Function } from "../../src/cloud";
+import { inflight } from "../../src/core";
 import * as ex from "../../src/ex";
-import { Testing } from "../../src/simulator";
 import * as tfaws from "../../src/target-tf-aws";
 import {
   mkdtemp,
@@ -11,7 +11,9 @@ import {
   tfSanitize,
 } from "../util";
 
-const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`;
+const INFLIGHT_CODE = inflight(async (_, name) => {
+  console.log("Hello, " + name);
+});
 
 describe("When creating a Redis resource", () => {
   it("should create an elasticache cluster and required vpc networking resources", () => {
@@ -48,8 +50,8 @@ describe("When creating a Redis resource", () => {
 
     // THEN
     expect(tfResourcesOfCount(output, "aws_vpc")).toEqual(1);
-    expect(tfResourcesOfCount(output, "aws_subnet")).toEqual(2);
-    expect(tfResourcesOfCount(output, "aws_route_table")).toEqual(2);
+    expect(tfResourcesOfCount(output, "aws_subnet")).toEqual(3);
+    expect(tfResourcesOfCount(output, "aws_route_table")).toEqual(3);
     expect(tfResourcesOfCount(output, "aws_nat_gateway")).toEqual(1);
     expect(tfResourcesOfCount(output, "aws_internet_gateway")).toEqual(1);
   });
@@ -62,8 +64,7 @@ describe("When creating a Redis resource", () => {
         entrypointDir: __dirname,
       });
       const redisCluster = new ex.Redis(app, "Redis") as ex.Redis;
-      const inflight = Testing.makeHandler(INFLIGHT_CODE);
-      const func = new Function(app, "Function", inflight);
+      const func = new Function(app, "Function", INFLIGHT_CODE);
       redisCluster.onLift(func, ["set", "get"]);
 
       // WHEN
@@ -92,10 +93,10 @@ describe("When creating multiple Redis resources", () => {
     // THEN
     // 2 clusters, 2 security groups, 1 vpc, 2 subnets, 2 route tables, 1 nat gateway, 1 internet gateway
     expect(tfResourcesOfCount(output, "aws_elasticache_cluster")).toEqual(2);
-    expect(tfResourcesOfCount(output, "aws_security_group")).toEqual(2);
+    expect(tfResourcesOfCount(output, "aws_security_group")).toEqual(4);
     expect(tfResourcesOfCount(output, "aws_vpc")).toEqual(1);
-    expect(tfResourcesOfCount(output, "aws_subnet")).toEqual(2);
-    expect(tfResourcesOfCount(output, "aws_route_table")).toEqual(2);
+    expect(tfResourcesOfCount(output, "aws_subnet")).toEqual(3);
+    expect(tfResourcesOfCount(output, "aws_route_table")).toEqual(3);
     expect(tfResourcesOfCount(output, "aws_nat_gateway")).toEqual(1);
     expect(tfResourcesOfCount(output, "aws_internet_gateway")).toEqual(1);
   });
@@ -109,8 +110,7 @@ describe("When creating multiple Redis resources", () => {
       });
       const redisCluster = new ex.Redis(app, "Redis") as ex.Redis;
       const otherCluster = new ex.Redis(app, "OtherRedis") as ex.Redis;
-      const inflight = Testing.makeHandler(INFLIGHT_CODE);
-      const func = new Function(app, "Function", inflight);
+      const func = new Function(app, "Function", INFLIGHT_CODE);
       redisCluster.onLift(func, ["set", "get"]);
       otherCluster.onLift(func, ["set", "get"]);
 
@@ -121,8 +121,8 @@ describe("When creating multiple Redis resources", () => {
       const vpcConfig = JSON.parse(JSON.stringify(lambda.vpc_config));
 
       // THEN
-      expect(vpcConfig.security_group_ids.length).toEqual(2);
-      expect(vpcConfig.subnet_ids.length).toEqual(2);
+      expect(vpcConfig.security_group_ids.length).toEqual(4);
+      expect(vpcConfig.subnet_ids.length).toEqual(4);
     });
   });
 });
diff --git a/libs/wingsdk/test/target-tf-aws/schedule.test.ts b/libs/wingsdk/test/target-tf-aws/schedule.test.ts
index f3c53b36bb2..0eeed539a0c 100644
--- a/libs/wingsdk/test/target-tf-aws/schedule.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/schedule.test.ts
@@ -1,21 +1,22 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as std from "../../src/std";
 import * as tfaws from "../../src/target-tf-aws";
 import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util";
 
-const CODE_LOG_EVENT = `async handle(event) { console.log("Received: ", event); }`;
+const CODE_LOG_EVENT = inflight(async (_, event) => {
+  console.log("Received: ", event);
+});
 
 test("schedule behavior with rate", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const fn = Testing.makeHandler(CODE_LOG_EVENT);
   const schedule = new cloud.Schedule(app, "Schedule", {
     rate: std.Duration.fromMinutes(2),
   });
-  schedule.onTick(fn);
+  schedule.onTick(CODE_LOG_EVENT);
   const output = app.synth();
 
   // THEN
@@ -47,11 +48,11 @@ test("schedule behavior with rate", () => {
 test("schedule behavior with cron", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const fn = Testing.makeHandler(CODE_LOG_EVENT);
+
   const schedule = new cloud.Schedule(app, "Schedule", {
-    cron: "0/1 * ? * *",
+    cron: "0/1 * * * *",
   });
-  schedule.onTick(fn);
+  schedule.onTick(CODE_LOG_EVENT);
   const output = app.synth();
 
   // THEN
@@ -72,7 +73,112 @@ test("schedule behavior with cron", () => {
       output,
       "aws_cloudwatch_event_rule",
       {
-        schedule_expression: "cron(0/1 * ? * * *)",
+        schedule_expression: "cron(0/1 * * * ? *)",
+      }
+    )
+  ).toEqual(true);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("convert single dayOfWeek from Unix to AWS", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const schedule = new cloud.Schedule(app, "Schedule", {
+    cron: "* * * * 1",
+  });
+  schedule.onTick(CODE_LOG_EVENT);
+  const output = app.synth();
+
+  // THEN
+  expect(tfResourcesOf(output)).toEqual([
+    "aws_cloudwatch_event_rule", // main schedule event
+    "aws_cloudwatch_event_target", // schedule target
+    "aws_cloudwatch_log_group", // log group for function
+    "aws_iam_role", // role for function
+    "aws_iam_role_policy", // policy for role
+    "aws_iam_role_policy_attachment", // execution policy for role
+    "aws_lambda_function", // processor function
+    "aws_lambda_permission", // function permission
+    "aws_s3_bucket", // S3 bucket for code
+    "aws_s3_object", // S3 object for code
+  ]);
+  expect(
+    cdktf.Testing.toHaveResourceWithProperties(
+      output,
+      "aws_cloudwatch_event_rule",
+      {
+        schedule_expression: "cron(* * ? * 0 *)",
+      }
+    )
+  ).toEqual(true);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("convert the range of dayOfWeek from Unix to AWS", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const schedule = new cloud.Schedule(app, "Schedule", {
+    cron: "* * * * 1-7",
+  });
+  schedule.onTick(CODE_LOG_EVENT);
+  const output = app.synth();
+
+  // THEN
+  expect(tfResourcesOf(output)).toEqual([
+    "aws_cloudwatch_event_rule", // main schedule event
+    "aws_cloudwatch_event_target", // schedule target
+    "aws_cloudwatch_log_group", // log group for function
+    "aws_iam_role", // role for function
+    "aws_iam_role_policy", // policy for role
+    "aws_iam_role_policy_attachment", // execution policy for role
+    "aws_lambda_function", // processor function
+    "aws_lambda_permission", // function permission
+    "aws_s3_bucket", // S3 bucket for code
+    "aws_s3_object", // S3 object for code
+  ]);
+  expect(
+    cdktf.Testing.toHaveResourceWithProperties(
+      output,
+      "aws_cloudwatch_event_rule",
+      {
+        schedule_expression: "cron(* * ? * 0-6 *)",
+      }
+    )
+  ).toEqual(true);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("convert the list of dayOfWeek from Unix to AWS", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const schedule = new cloud.Schedule(app, "Schedule", {
+    cron: "* * * * 1,3,5,7",
+  });
+  schedule.onTick(CODE_LOG_EVENT);
+  const output = app.synth();
+
+  // THEN
+  expect(tfResourcesOf(output)).toEqual([
+    "aws_cloudwatch_event_rule", // main schedule event
+    "aws_cloudwatch_event_target", // schedule target
+    "aws_cloudwatch_log_group", // log group for function
+    "aws_iam_role", // role for function
+    "aws_iam_role_policy", // policy for role
+    "aws_iam_role_policy_attachment", // execution policy for role
+    "aws_lambda_function", // processor function
+    "aws_lambda_permission", // function permission
+    "aws_s3_bucket", // S3 bucket for code
+    "aws_s3_object", // S3 object for code
+  ]);
+  expect(
+    cdktf.Testing.toHaveResourceWithProperties(
+      output,
+      "aws_cloudwatch_event_rule",
+      {
+        schedule_expression: "cron(* * ? * 0,2,4,6 *)",
       }
     )
   ).toEqual(true);
@@ -83,13 +189,11 @@ test("schedule behavior with cron", () => {
 test("schedule with two functions", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
-  const fn1 = Testing.makeHandler(CODE_LOG_EVENT);
-  const fn2 = Testing.makeHandler(CODE_LOG_EVENT);
   const schedule = new cloud.Schedule(app, "Schedule", {
-    cron: "0/1 * ? * *",
+    cron: "0/1 * * * *",
   });
-  schedule.onTick(fn1);
-  schedule.onTick(fn2);
+  schedule.onTick(CODE_LOG_EVENT);
+  schedule.onTick(CODE_LOG_EVENT);
   const output = app.synth();
 
   // THEN
@@ -118,7 +222,7 @@ test("schedule with rate and cron simultaneously", () => {
     () =>
       new cloud.Schedule(app, "Schedule", {
         rate: std.Duration.fromSeconds(30),
-        cron: "0/1 * ? * *",
+        cron: "0/1 * * * ?",
       })
   ).toThrow("rate and cron cannot be configured simultaneously.");
 });
@@ -131,11 +235,9 @@ test("cron with more than five values", () => {
   expect(
     () =>
       new cloud.Schedule(app, "Schedule", {
-        cron: "0/1 * ? * * *",
+        cron: "0/1 * * * * *",
       })
-  ).toThrow(
-    "cron string must be UNIX cron format [minute] [hour] [day of month] [month] [day of week]"
-  );
+  ).toThrow("cron string must be in UNIX cron format");
 });
 
 test("schedule without rate or cron", () => {
@@ -160,3 +262,18 @@ test("schedule with rate less than 1 minute", () => {
       })
   ).toThrow("rate can not be set to less than 1 minute.");
 });
+
+test("cron with day of month and day of week configured at the same time", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+
+  // THEN
+  expect(
+    () =>
+      new cloud.Schedule(app, "Schedule", {
+        cron: "* * 1 * 1",
+      })
+  ).toThrow(
+    "Cannot restrict both 'day-of-month' and 'day-of-week' in a cron expression, at least one must be '*'"
+  );
+});
diff --git a/libs/wingsdk/test/target-tf-aws/table.test.ts b/libs/wingsdk/test/target-tf-aws/table.test.ts
index f18f228fbc3..609ce231d95 100644
--- a/libs/wingsdk/test/target-tf-aws/table.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/table.test.ts
@@ -1,7 +1,7 @@
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
+import { lift } from "../../src/core";
 import * as ex from "../../src/ex";
-import { Testing } from "../../src/simulator";
 import * as tfaws from "../../src/target-tf-aws";
 import {
   mkdtemp,
@@ -31,18 +31,14 @@ test("function with a table binding", () => {
     primaryKey: "id",
     name: "my-wing-table",
   });
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-  await this.my_table.insert({ id: "test" });
-}`,
-    {
-      my_table: {
-        obj: table,
-        ops: [ex.TableInflightMethods.INSERT],
-      },
-    }
-  );
+  const inflight = lift({ my_table: table })
+    .grant({ my_table: ["insert"] })
+    .inflight(async (ctx) => {
+      await ctx.my_table.insert("test", { id: "test" } as any);
+    });
+
   new cloud.Function(app, "Function", inflight);
+
   const output = app.synth();
 
   expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
diff --git a/libs/wingsdk/test/target-tf-aws/test-runner.test.ts b/libs/wingsdk/test/target-tf-aws/test-runner.test.ts
new file mode 100644
index 00000000000..b99ab46b49e
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-aws/test-runner.test.ts
@@ -0,0 +1,71 @@
+import { Construct } from "constructs";
+import { describe, expect, test } from "vitest";
+import { inflight } from "../../src/core";
+import { Test } from "../../src/std";
+import { App } from "../../src/target-tf-aws/app";
+import { mkdtemp } from "../util";
+
+const NOOP = inflight(async () => {});
+
+describe("Single test", () => {
+  class Root extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      new Test(this, "test:first test", NOOP, {});
+    }
+  }
+
+  test("No function handlers should exist in a non test environment", () => {
+    const app = new App({
+      entrypointDir: __dirname,
+      outdir: mkdtemp(),
+      isTestEnvironment: false,
+      rootConstruct: Root,
+    });
+
+    //@ts-expect-error
+    const testList = app._testRunner?.getTestFunctionArns() ?? new Map();
+    expect([...testList.keys()]).toEqual([]);
+  });
+
+  test("A single function handler should exist in a test environment", () => {
+    const app = new App({
+      entrypointDir: __dirname,
+      outdir: mkdtemp(),
+      isTestEnvironment: true,
+      rootConstruct: Root,
+    });
+
+    //@ts-expect-error
+    const testList = app._testRunner?.getTestFunctionArns() ?? new Map();
+    expect([...testList.keys()]).toEqual(["root/Default/env0/test:first test"]);
+  });
+});
+
+describe("Multiple tests", () => {
+  class Root extends Construct {
+    constructor(scope: Construct, id: string) {
+      super(scope, id);
+      new Test(this, "test:first test", NOOP, {});
+      new Test(this, "test:second test", NOOP, {});
+      new Test(this, "test:third test", NOOP, {});
+    }
+  }
+
+  test("Multiple function handlers should exist in a test environment", () => {
+    const app = new App({
+      entrypointDir: __dirname,
+      outdir: mkdtemp(),
+      isTestEnvironment: true,
+      rootConstruct: Root,
+    });
+
+    //@ts-expect-error
+    const testList = app._testRunner?.getTestFunctionArns() ?? new Map();
+    expect([...testList.keys()]).toEqual([
+      "root/Default/env0/test:first test",
+      "root/Default/env1/test:second test",
+      "root/Default/env2/test:third test",
+    ]);
+  });
+});
diff --git a/libs/wingsdk/test/target-tf-aws/tokens.test.ts b/libs/wingsdk/test/target-tf-aws/tokens.test.ts
index 225a5af707c..252585078cc 100644
--- a/libs/wingsdk/test/target-tf-aws/tokens.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/tokens.test.ts
@@ -1,6 +1,6 @@
 import { TerraformVariable } from "cdktf";
 import { test, expect } from "vitest";
-import { Testing } from "../../src/simulator";
+import { lift } from "../../src/core";
 import * as tfaws from "../../src/target-tf-aws";
 import { Api } from "../../src/target-tf-aws";
 import { mkdtemp, tfSanitize, sanitizeCode } from "../util";
@@ -17,32 +17,44 @@ test("captures tokens", () => {
     type: "List<Number>",
     default: [1, 2, 3],
   });
+  const handler = lift({
+    str: api.url,
+    num: numVar.numberValue,
+    list: listVar.listValue,
+  }).inflight(async (ctx) => {
+    console.log(ctx.str, ctx.num, ctx.list);
+    return undefined;
+  });
+
+  api.get("/", handler);
+
+  const output = app.synth();
+
+  // THEN
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
+  expect(tfSanitize(output)).toMatchSnapshot();
+});
+
+test("captures tokens inside plain objects", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  const api = new Api(app, "Api");
+  const numVar = new TerraformVariable(app, "Number", {
+    type: "Number",
+    default: 123,
+  });
+
+  const handler = lift({
+    foo: { str: api.url, num: numVar.numberValue },
+  }).inflight(async (ctx) => {
+    console.log(ctx.foo.str, ctx.foo.num);
+  });
 
-  const inflight = Testing.makeHandler(
-    `async handle(event) {
-    console.log(this.str, this.num, this.list);
-  }`,
-    {
-      str: {
-        obj: api.url,
-        ops: [],
-      },
-      num: {
-        obj: numVar.numberValue,
-        ops: [],
-      },
-      list: {
-        obj: listVar.listValue,
-        ops: [],
-      },
-    }
-  );
-
-  api.get("/", inflight);
+  api.get("/", handler);
 
   const output = app.synth();
 
   // THEN
-  expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   expect(tfSanitize(output)).toMatchSnapshot();
 });
diff --git a/libs/wingsdk/test/target-tf-aws/topic.test.ts b/libs/wingsdk/test/target-tf-aws/topic.test.ts
index 56015b875e2..324689c1251 100644
--- a/libs/wingsdk/test/target-tf-aws/topic.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/topic.test.ts
@@ -1,7 +1,7 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { Duration } from "../../src/std";
 import * as tfaws from "../../src/target-tf-aws";
 import {
@@ -29,9 +29,9 @@ test("topic with subscriber function", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const topic = new cloud.Topic(app, "Topic");
-  const subscriber = Testing.makeHandler(
-    `async handle(event) { console.log("Received: ", event); }`
-  );
+  const subscriber = inflight(async (_, event) => {
+    console.log("Received: ", event);
+  });
 
   topic.onMessage(subscriber);
   const output = app.synth();
@@ -58,16 +58,14 @@ test("topic with multiple subscribers", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const topic = new cloud.Topic(app, "Topic");
-  const subOne = Testing.makeHandler(
-    `async handle(event) { console.log("Got Event: ", event); }`
-  );
-  const subTwo = Testing.makeHandler(
-    `async handle(event) { console.log("Ohh yea!! ", event); }`
-  );
 
   // WHEN
-  topic.onMessage(subOne);
-  topic.onMessage(subTwo);
+  topic.onMessage(
+    inflight(async (_, event) => console.log("Got Event: ", event))
+  );
+  topic.onMessage(
+    inflight(async (_, event) => console.log("Ohh yea!! ", event))
+  );
 
   const output = app.synth();
 
@@ -122,9 +120,9 @@ test("topic with subscriber function timeout", () => {
   // GIVEN
   const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
   const topic = new cloud.Topic(app, "Topic");
-  const subscriber = Testing.makeHandler(
-    `async handle(event) { console.log("Received: ", event); }`
-  );
+  const subscriber = inflight(async (_, event) => {
+    console.log("Received: ", event);
+  });
 
   topic.onMessage(subscriber, { timeout: Duration.fromSeconds(30) });
   const output = app.synth();
diff --git a/libs/wingsdk/test/target-tf-aws/website.test.ts b/libs/wingsdk/test/target-tf-aws/website.test.ts
index 303e464b82b..e1aef556939 100644
--- a/libs/wingsdk/test/target-tf-aws/website.test.ts
+++ b/libs/wingsdk/test/target-tf-aws/website.test.ts
@@ -3,6 +3,7 @@ import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
 import * as tfaws from "../../src/target-tf-aws";
 import {
+  getTfResource,
   mkdtemp,
   tfResourcesOf,
   tfResourcesOfCount,
@@ -147,3 +148,31 @@ test("website with invalid path should throw error", () => {
     app.synth();
   }).toThrowError('key must have a .json suffix. (current: "txt")');
 });
+
+test("custom error page", () => {
+  // GIVEN
+  const app = new tfaws.App({ outdir: mkdtemp(), entrypointDir: __dirname });
+  new cloud.Website(app, "Website", {
+    path: path.resolve(__dirname, "../test-files/website"),
+    errorDocument: "b.html",
+  });
+  const output = app.synth();
+
+  // THEN
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(
+    getTfResource(output, "aws_cloudfront_distribution", 0)
+      .custom_error_response
+  ).toEqual([
+    {
+      error_code: 404,
+      response_code: 200,
+      response_page_path: "/b.html",
+    },
+    {
+      error_code: 403,
+      response_code: 200,
+      response_page_path: "/b.html",
+    },
+  ]);
+});
diff --git a/libs/wingsdk/test/target-tf-azure/__snapshots__/bucket.test.ts.snap b/libs/wingsdk/test/target-tf-azure/__snapshots__/bucket.test.ts.snap
index 45f1433db5a..2ba9e697c62 100644
--- a/libs/wingsdk/test/target-tf-azure/__snapshots__/bucket.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-azure/__snapshots__/bucket.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`bucket is public 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_resource_group": {
       "ResourceGroup": {
@@ -45,64 +40,45 @@ exports[`bucket is public 2`] = `
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Bucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Bucket",
                     "path": "root/Default/my_bucket/Bucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -114,32 +90,36 @@ exports[`bucket is public 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -149,11 +129,6 @@ exports[`bucket is public 2`] = `
 
 exports[`bucket name valid 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_resource_group": {
       "ResourceGroup": {
@@ -192,16 +167,18 @@ exports[`bucket name valid 2`] = `
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
@@ -210,15 +187,16 @@ exports[`bucket name valid 2`] = `
                   "Bucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Bucket",
                     "path": "root/Default/The-Uncanny-Bucket/Bucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -230,63 +208,45 @@ exports[`bucket name valid 2`] = `
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -296,11 +256,6 @@ exports[`bucket name valid 2`] = `
 
 exports[`bucket with two preflight files 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_resource_group": {
       "ResourceGroup": {
@@ -355,80 +310,63 @@ exports[`bucket with two preflight files 2`] = `
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Blob-file1.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Blob-file1.txt",
                     "path": "root/Default/my_bucket/Blob-file1.txt",
                   },
                   "Blob-file2.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Blob-file2.txt",
                     "path": "root/Default/my_bucket/Blob-file2.txt",
                   },
                   "Bucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Bucket",
                     "path": "root/Default/my_bucket/Bucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -440,32 +378,36 @@ exports[`bucket with two preflight files 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -475,11 +417,6 @@ exports[`bucket with two preflight files 2`] = `
 
 exports[`bucket with two preflight objects 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_resource_group": {
       "ResourceGroup": {
@@ -534,80 +471,63 @@ exports[`bucket with two preflight objects 2`] = `
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Blob-file1.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Blob-file1.txt",
                     "path": "root/Default/my_bucket/Blob-file1.txt",
                   },
                   "Blob-file2.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Blob-file2.txt",
                     "path": "root/Default/my_bucket/Blob-file2.txt",
                   },
                   "Bucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Bucket",
                     "path": "root/Default/my_bucket/Bucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -619,32 +539,36 @@ exports[`bucket with two preflight objects 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -654,11 +578,6 @@ exports[`bucket with two preflight objects 2`] = `
 
 exports[`create a bucket 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_resource_group": {
       "ResourceGroup": {
@@ -697,64 +616,45 @@ exports[`create a bucket 2`] = `
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Bucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Bucket",
                     "path": "root/Default/my_bucket/Bucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -766,32 +666,36 @@ exports[`create a bucket 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -801,11 +705,6 @@ exports[`create a bucket 2`] = `
 
 exports[`create multiple buckets 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_resource_group": {
       "ResourceGroup": {
@@ -849,64 +748,45 @@ exports[`create multiple buckets 2`] = `
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "my_bucket": {
                 "children": {
                   "Bucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Bucket",
                     "path": "root/Default/my_bucket/Bucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -920,15 +800,16 @@ exports[`create multiple buckets 2`] = `
                   "Bucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Bucket",
                     "path": "root/Default/my_bucket2/Bucket",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -940,32 +821,36 @@ exports[`create multiple buckets 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-azure/__snapshots__/counter.test.ts.snap b/libs/wingsdk/test/target-tf-azure/__snapshots__/counter.test.ts.snap
new file mode 100644
index 00000000000..791ed49db60
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-azure/__snapshots__/counter.test.ts.snap
@@ -0,0 +1,1987 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`counter name valid 1`] = `
+{
+  "resource": {
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "wingcounter_CounterTable_785CC80E": {
+        "name": "wingcounterxc83c126d",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`counter name valid 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+              "wingcounter": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/wingcounter/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "wingcounter",
+                "path": "root/Default/wingcounter",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`counter with initial value 1`] = `
+{
+  "resource": {
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "Counter_CounterTable_D17407E5": {
+        "name": "counterxc824ef62",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`counter with initial value 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Counter": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/Counter/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`dec() policy statement 1`] = `
+{
+  "resource": {
+    "azurerm_application_insights": {
+      "ApplicationInsights": {
+        "application_type": "web",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "application-insights",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "workspace_id": "\${azurerm_log_analytics_workspace.LogAnalyticsWorkspace.id}",
+      },
+    },
+    "azurerm_linux_function_app": {
+      "Function_042596DC": {
+        "app_settings": {
+          "FUNCTIONS_WORKER_RUNTIME": "node",
+          "STORAGE_ACCOUNT_0a1532c6": "\${azurerm_storage_account.StorageAccount.name}",
+          "STORAGE_ACCOUNT_KEY_0a1532c6": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+          "TABLE_NAME_0a1532c6": "\${azurerm_storage_table.Counter_CounterTable_D17407E5.name}",
+          "WEBSITE_RUN_FROM_PACKAGE": "https://\${azurerm_storage_account.StorageAccount.name}.blob.core.windows.net/\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}/\${azurerm_storage_blob.Function_CodeBlob_8A9705C9.name}",
+        },
+        "https_only": true,
+        "identity": {
+          "type": "SystemAssigned",
+        },
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "function-c852aba6",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "service_plan_id": "\${azurerm_service_plan.ServicePlan.id}",
+        "site_config": {
+          "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
+          "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
+          "application_stack": {
+            "node_version": "20",
+          },
+        },
+        "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_log_analytics_workspace": {
+      "LogAnalyticsWorkspace": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_role_assignment": {
+      "Function_ReadLambdaCodeAssignment_75049D5E": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Blob Data Reader",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+      "Function_RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_StorageTableDataContributor_3E18F445": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Table Data Contributor",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+    },
+    "azurerm_service_plan": {
+      "ServicePlan": {
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "Default-c82bf964",
+        "os_type": "Linux",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "sku_name": "Y1",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_blob": {
+      "Function_CodeBlob_8A9705C9": {
+        "name": "function-c852aba6.zip",
+        "source": "<source>",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+        "storage_container_name": "\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}",
+        "type": "Block",
+      },
+    },
+    "azurerm_storage_container": {
+      "Function_FunctionBucket_0F705EF9": {
+        "container_access_type": "private",
+        "name": "functionbucket-c8ccf7e8",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "Counter_CounterTable_D17407E5": {
+        "name": "counterxc824ef62",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`dec() policy statement 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "ApplicationInsights": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ApplicationInsights",
+                "path": "root/Default/ApplicationInsights",
+              },
+              "Counter": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/Counter/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CodeBlob": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CodeBlob",
+                    "path": "root/Default/Function/CodeBlob",
+                  },
+                  "Function": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Function",
+                    "path": "root/Default/Function/Function",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Bucket": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Bucket",
+                        "path": "root/Default/Function/FunctionBucket/Bucket",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "ReadLambdaCodeAssignment": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ReadLambdaCodeAssignment",
+                    "path": "root/Default/Function/ReadLambdaCodeAssignment",
+                  },
+                  "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                    "path": "root/Default/Function/RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "LogAnalyticsWorkspace": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "LogAnalyticsWorkspace",
+                "path": "root/Default/LogAnalyticsWorkspace",
+              },
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "ServicePlan": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ServicePlan",
+                "path": "root/Default/ServicePlan",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`default counter behavior 1`] = `
+{
+  "resource": {
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "Counter_CounterTable_D17407E5": {
+        "name": "counterxc824ef62",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`function with a counter binding 1`] = `
+{
+  "resource": {
+    "azurerm_application_insights": {
+      "ApplicationInsights": {
+        "application_type": "web",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "application-insights",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "workspace_id": "\${azurerm_log_analytics_workspace.LogAnalyticsWorkspace.id}",
+      },
+    },
+    "azurerm_linux_function_app": {
+      "Function_042596DC": {
+        "app_settings": {
+          "FUNCTIONS_WORKER_RUNTIME": "node",
+          "STORAGE_ACCOUNT_0a1532c6": "\${azurerm_storage_account.StorageAccount.name}",
+          "STORAGE_ACCOUNT_KEY_0a1532c6": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+          "TABLE_NAME_0a1532c6": "\${azurerm_storage_table.Counter_CounterTable_D17407E5.name}",
+          "WEBSITE_RUN_FROM_PACKAGE": "https://\${azurerm_storage_account.StorageAccount.name}.blob.core.windows.net/\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}/\${azurerm_storage_blob.Function_CodeBlob_8A9705C9.name}",
+        },
+        "https_only": true,
+        "identity": {
+          "type": "SystemAssigned",
+        },
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "function-c852aba6",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "service_plan_id": "\${azurerm_service_plan.ServicePlan.id}",
+        "site_config": {
+          "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
+          "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
+          "application_stack": {
+            "node_version": "20",
+          },
+        },
+        "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_log_analytics_workspace": {
+      "LogAnalyticsWorkspace": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_role_assignment": {
+      "Function_ReadLambdaCodeAssignment_75049D5E": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Blob Data Reader",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+      "Function_RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_StorageTableDataContributor_3E18F445": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Table Data Contributor",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+    },
+    "azurerm_service_plan": {
+      "ServicePlan": {
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "Default-c82bf964",
+        "os_type": "Linux",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "sku_name": "Y1",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_blob": {
+      "Function_CodeBlob_8A9705C9": {
+        "name": "function-c852aba6.zip",
+        "source": "<source>",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+        "storage_container_name": "\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}",
+        "type": "Block",
+      },
+    },
+    "azurerm_storage_container": {
+      "Function_FunctionBucket_0F705EF9": {
+        "container_access_type": "private",
+        "name": "functionbucket-c8ccf7e8",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "Counter_CounterTable_D17407E5": {
+        "name": "counterxc824ef62",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`function with a counter binding 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "ApplicationInsights": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ApplicationInsights",
+                "path": "root/Default/ApplicationInsights",
+              },
+              "Counter": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/Counter/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CodeBlob": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CodeBlob",
+                    "path": "root/Default/Function/CodeBlob",
+                  },
+                  "Function": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Function",
+                    "path": "root/Default/Function/Function",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Bucket": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Bucket",
+                        "path": "root/Default/Function/FunctionBucket/Bucket",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "ReadLambdaCodeAssignment": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ReadLambdaCodeAssignment",
+                    "path": "root/Default/Function/ReadLambdaCodeAssignment",
+                  },
+                  "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                    "path": "root/Default/Function/RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "LogAnalyticsWorkspace": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "LogAnalyticsWorkspace",
+                "path": "root/Default/LogAnalyticsWorkspace",
+              },
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "ServicePlan": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ServicePlan",
+                "path": "root/Default/ServicePlan",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`inc() policy statement 1`] = `
+{
+  "resource": {
+    "azurerm_application_insights": {
+      "ApplicationInsights": {
+        "application_type": "web",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "application-insights",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "workspace_id": "\${azurerm_log_analytics_workspace.LogAnalyticsWorkspace.id}",
+      },
+    },
+    "azurerm_linux_function_app": {
+      "Function_042596DC": {
+        "app_settings": {
+          "FUNCTIONS_WORKER_RUNTIME": "node",
+          "STORAGE_ACCOUNT_0a1532c6": "\${azurerm_storage_account.StorageAccount.name}",
+          "STORAGE_ACCOUNT_KEY_0a1532c6": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+          "TABLE_NAME_0a1532c6": "\${azurerm_storage_table.Counter_CounterTable_D17407E5.name}",
+          "WEBSITE_RUN_FROM_PACKAGE": "https://\${azurerm_storage_account.StorageAccount.name}.blob.core.windows.net/\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}/\${azurerm_storage_blob.Function_CodeBlob_8A9705C9.name}",
+        },
+        "https_only": true,
+        "identity": {
+          "type": "SystemAssigned",
+        },
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "function-c852aba6",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "service_plan_id": "\${azurerm_service_plan.ServicePlan.id}",
+        "site_config": {
+          "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
+          "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
+          "application_stack": {
+            "node_version": "20",
+          },
+        },
+        "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_log_analytics_workspace": {
+      "LogAnalyticsWorkspace": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_role_assignment": {
+      "Function_ReadLambdaCodeAssignment_75049D5E": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Blob Data Reader",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+      "Function_RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_StorageTableDataContributor_3E18F445": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Table Data Contributor",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+    },
+    "azurerm_service_plan": {
+      "ServicePlan": {
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "Default-c82bf964",
+        "os_type": "Linux",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "sku_name": "Y1",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_blob": {
+      "Function_CodeBlob_8A9705C9": {
+        "name": "function-c852aba6.zip",
+        "source": "<source>",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+        "storage_container_name": "\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}",
+        "type": "Block",
+      },
+    },
+    "azurerm_storage_container": {
+      "Function_FunctionBucket_0F705EF9": {
+        "container_access_type": "private",
+        "name": "functionbucket-c8ccf7e8",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "Counter_CounterTable_D17407E5": {
+        "name": "counterxc824ef62",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`inc() policy statement 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "ApplicationInsights": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ApplicationInsights",
+                "path": "root/Default/ApplicationInsights",
+              },
+              "Counter": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/Counter/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CodeBlob": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CodeBlob",
+                    "path": "root/Default/Function/CodeBlob",
+                  },
+                  "Function": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Function",
+                    "path": "root/Default/Function/Function",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Bucket": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Bucket",
+                        "path": "root/Default/Function/FunctionBucket/Bucket",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "ReadLambdaCodeAssignment": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ReadLambdaCodeAssignment",
+                    "path": "root/Default/Function/ReadLambdaCodeAssignment",
+                  },
+                  "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                    "path": "root/Default/Function/RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "LogAnalyticsWorkspace": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "LogAnalyticsWorkspace",
+                "path": "root/Default/LogAnalyticsWorkspace",
+              },
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "ServicePlan": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ServicePlan",
+                "path": "root/Default/ServicePlan",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`peek() policy statement 1`] = `
+{
+  "resource": {
+    "azurerm_application_insights": {
+      "ApplicationInsights": {
+        "application_type": "web",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "application-insights",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "workspace_id": "\${azurerm_log_analytics_workspace.LogAnalyticsWorkspace.id}",
+      },
+    },
+    "azurerm_linux_function_app": {
+      "Function_042596DC": {
+        "app_settings": {
+          "FUNCTIONS_WORKER_RUNTIME": "node",
+          "STORAGE_ACCOUNT_0a1532c6": "\${azurerm_storage_account.StorageAccount.name}",
+          "STORAGE_ACCOUNT_KEY_0a1532c6": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+          "TABLE_NAME_0a1532c6": "\${azurerm_storage_table.Counter_CounterTable_D17407E5.name}",
+          "WEBSITE_RUN_FROM_PACKAGE": "https://\${azurerm_storage_account.StorageAccount.name}.blob.core.windows.net/\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}/\${azurerm_storage_blob.Function_CodeBlob_8A9705C9.name}",
+        },
+        "https_only": true,
+        "identity": {
+          "type": "SystemAssigned",
+        },
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "function-c852aba6",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "service_plan_id": "\${azurerm_service_plan.ServicePlan.id}",
+        "site_config": {
+          "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
+          "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
+          "application_stack": {
+            "node_version": "20",
+          },
+        },
+        "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_log_analytics_workspace": {
+      "LogAnalyticsWorkspace": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_role_assignment": {
+      "Function_ReadLambdaCodeAssignment_75049D5E": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Blob Data Reader",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+      "Function_RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_StorageTableDataReader_6582E97E": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Table Data Reader",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+    },
+    "azurerm_service_plan": {
+      "ServicePlan": {
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "Default-c82bf964",
+        "os_type": "Linux",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "sku_name": "Y1",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_blob": {
+      "Function_CodeBlob_8A9705C9": {
+        "name": "function-c852aba6.zip",
+        "source": "<source>",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+        "storage_container_name": "\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}",
+        "type": "Block",
+      },
+    },
+    "azurerm_storage_container": {
+      "Function_FunctionBucket_0F705EF9": {
+        "container_access_type": "private",
+        "name": "functionbucket-c8ccf7e8",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "Counter_CounterTable_D17407E5": {
+        "name": "counterxc824ef62",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`peek() policy statement 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "ApplicationInsights": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ApplicationInsights",
+                "path": "root/Default/ApplicationInsights",
+              },
+              "Counter": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/Counter/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CodeBlob": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CodeBlob",
+                    "path": "root/Default/Function/CodeBlob",
+                  },
+                  "Function": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Function",
+                    "path": "root/Default/Function/Function",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Bucket": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Bucket",
+                        "path": "root/Default/Function/FunctionBucket/Bucket",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "ReadLambdaCodeAssignment": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ReadLambdaCodeAssignment",
+                    "path": "root/Default/Function/ReadLambdaCodeAssignment",
+                  },
+                  "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Reader": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Reader",
+                    "path": "root/Default/Function/RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Reader",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "LogAnalyticsWorkspace": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "LogAnalyticsWorkspace",
+                "path": "root/Default/LogAnalyticsWorkspace",
+              },
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "ServicePlan": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ServicePlan",
+                "path": "root/Default/ServicePlan",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`replace invalid character from counter name 1`] = `
+{
+  "resource": {
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "TheAmazingCounter01_CounterTable_5DDDAD60": {
+        "name": "thexamazingxcounterx01xc848151b",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`replace invalid character from counter name 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "The*Amazing%Counter@01": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/The*Amazing%Counter@01/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "The*Amazing%Counter@01",
+                "path": "root/Default/The*Amazing%Counter@01",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`set() policy statement 1`] = `
+{
+  "resource": {
+    "azurerm_application_insights": {
+      "ApplicationInsights": {
+        "application_type": "web",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "application-insights",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "workspace_id": "\${azurerm_log_analytics_workspace.LogAnalyticsWorkspace.id}",
+      },
+    },
+    "azurerm_linux_function_app": {
+      "Function_042596DC": {
+        "app_settings": {
+          "FUNCTIONS_WORKER_RUNTIME": "node",
+          "STORAGE_ACCOUNT_0a1532c6": "\${azurerm_storage_account.StorageAccount.name}",
+          "STORAGE_ACCOUNT_KEY_0a1532c6": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+          "TABLE_NAME_0a1532c6": "\${azurerm_storage_table.Counter_CounterTable_D17407E5.name}",
+          "WEBSITE_RUN_FROM_PACKAGE": "https://\${azurerm_storage_account.StorageAccount.name}.blob.core.windows.net/\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}/\${azurerm_storage_blob.Function_CodeBlob_8A9705C9.name}",
+        },
+        "https_only": true,
+        "identity": {
+          "type": "SystemAssigned",
+        },
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "function-c852aba6",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "service_plan_id": "\${azurerm_service_plan.ServicePlan.id}",
+        "site_config": {
+          "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
+          "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
+          "application_stack": {
+            "node_version": "20",
+          },
+        },
+        "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_log_analytics_workspace": {
+      "LogAnalyticsWorkspace": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_resource_group": {
+      "ResourceGroup": {
+        "location": "East US",
+        "name": "Default-c82bf964",
+      },
+    },
+    "azurerm_role_assignment": {
+      "Function_ReadLambdaCodeAssignment_75049D5E": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Blob Data Reader",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+      "Function_RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_StorageTableDataContributor_3E18F445": {
+        "principal_id": "\${azurerm_linux_function_app.Function_042596DC.identity[0].principal_id}",
+        "role_definition_name": "Storage Table Data Contributor",
+        "scope": "\${azurerm_storage_account.StorageAccount.id}",
+      },
+    },
+    "azurerm_service_plan": {
+      "ServicePlan": {
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "Default-c82bf964",
+        "os_type": "Linux",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+        "sku_name": "Y1",
+      },
+    },
+    "azurerm_storage_account": {
+      "StorageAccount": {
+        "account_replication_type": "LRS",
+        "account_tier": "Standard",
+        "location": "\${azurerm_resource_group.ResourceGroup.location}",
+        "name": "defaultc82bf964",
+        "resource_group_name": "\${azurerm_resource_group.ResourceGroup.name}",
+      },
+    },
+    "azurerm_storage_blob": {
+      "Function_CodeBlob_8A9705C9": {
+        "name": "function-c852aba6.zip",
+        "source": "<source>",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+        "storage_container_name": "\${azurerm_storage_container.Function_FunctionBucket_0F705EF9.name}",
+        "type": "Block",
+      },
+    },
+    "azurerm_storage_container": {
+      "Function_FunctionBucket_0F705EF9": {
+        "container_access_type": "private",
+        "name": "functionbucket-c8ccf7e8",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+    "azurerm_storage_table": {
+      "Counter_CounterTable_D17407E5": {
+        "name": "counterxc824ef62",
+        "storage_account_name": "\${azurerm_storage_account.StorageAccount.name}",
+      },
+    },
+  },
+}
+`;
+
+exports[`set() policy statement 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "ApplicationInsights": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ApplicationInsights",
+                "path": "root/Default/ApplicationInsights",
+              },
+              "Counter": {
+                "children": {
+                  "CounterTable": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CounterTable",
+                    "path": "root/Default/Counter/CounterTable",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CodeBlob": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CodeBlob",
+                    "path": "root/Default/Function/CodeBlob",
+                  },
+                  "Function": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Function",
+                    "path": "root/Default/Function/Function",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Bucket": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Bucket",
+                        "path": "root/Default/Function/FunctionBucket/Bucket",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "ReadLambdaCodeAssignment": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ReadLambdaCodeAssignment",
+                    "path": "root/Default/Function/ReadLambdaCodeAssignment",
+                  },
+                  "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                    "path": "root/Default/Function/RoleAssignmentc8e1d35875c13ca650f2fed5dbae08291b89c185ec_Storage Table Data Contributor",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "LogAnalyticsWorkspace": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "LogAnalyticsWorkspace",
+                "path": "root/Default/LogAnalyticsWorkspace",
+              },
+              "ResourceGroup": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ResourceGroup",
+                "path": "root/Default/ResourceGroup",
+              },
+              "ServicePlan": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "ServicePlan",
+                "path": "root/Default/ServicePlan",
+              },
+              "StorageAccount": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformResource",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "StorageAccount",
+                "path": "root/Default/StorageAccount",
+              },
+              "azure": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "azure",
+                "path": "root/Default/azure",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
diff --git a/libs/wingsdk/test/target-tf-azure/__snapshots__/function.test.ts.snap b/libs/wingsdk/test/target-tf-azure/__snapshots__/function.test.ts.snap
index 432e274d4c1..139e32c4013 100644
--- a/libs/wingsdk/test/target-tf-azure/__snapshots__/function.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-azure/__snapshots__/function.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`basic function 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_application_insights": {
       "ApplicationInsights": {
@@ -35,7 +30,7 @@ exports[`basic function 1`] = `
           "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
           "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
           "application_stack": {
-            "node_version": "18",
+            "node_version": "20",
           },
         },
         "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
@@ -111,8 +106,9 @@ exports[`basic function 2`] = `
               "ApplicationInsights": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ApplicationInsights",
                 "path": "root/Default/ApplicationInsights",
               },
@@ -121,24 +117,27 @@ exports[`basic function 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CodeBlob": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CodeBlob",
                     "path": "root/Default/Function/CodeBlob",
                   },
                   "Function": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Function",
                     "path": "root/Default/Function/Function",
                   },
@@ -147,15 +146,16 @@ exports[`basic function 2`] = `
                       "Bucket": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Bucket",
                         "path": "root/Default/Function/FunctionBucket/Bucket",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud object store",
@@ -167,15 +167,16 @@ exports[`basic function 2`] = `
                   "ReadLambdaCodeAssignment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "ReadLambdaCodeAssignment",
                     "path": "root/Default/Function/ReadLambdaCodeAssignment",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -187,95 +188,81 @@ exports[`basic function 2`] = `
               "LogAnalyticsWorkspace": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "LogAnalyticsWorkspace",
                 "path": "root/Default/LogAnalyticsWorkspace",
               },
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "ServicePlan": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ServicePlan",
                 "path": "root/Default/ServicePlan",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -285,11 +272,6 @@ exports[`basic function 2`] = `
 
 exports[`basic function with environment variables 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_application_insights": {
       "ApplicationInsights": {
@@ -320,7 +302,7 @@ exports[`basic function with environment variables 1`] = `
           "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
           "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
           "application_stack": {
-            "node_version": "18",
+            "node_version": "20",
           },
         },
         "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
@@ -396,8 +378,9 @@ exports[`basic function with environment variables 2`] = `
               "ApplicationInsights": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ApplicationInsights",
                 "path": "root/Default/ApplicationInsights",
               },
@@ -406,24 +389,27 @@ exports[`basic function with environment variables 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
                   "CodeBlob": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CodeBlob",
                     "path": "root/Default/Function/CodeBlob",
                   },
                   "Function": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Function",
                     "path": "root/Default/Function/Function",
                   },
@@ -432,15 +418,16 @@ exports[`basic function with environment variables 2`] = `
                       "Bucket": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Bucket",
                         "path": "root/Default/Function/FunctionBucket/Bucket",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud object store",
@@ -452,15 +439,16 @@ exports[`basic function with environment variables 2`] = `
                   "ReadLambdaCodeAssignment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "ReadLambdaCodeAssignment",
                     "path": "root/Default/Function/ReadLambdaCodeAssignment",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -472,95 +460,81 @@ exports[`basic function with environment variables 2`] = `
               "LogAnalyticsWorkspace": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "LogAnalyticsWorkspace",
                 "path": "root/Default/LogAnalyticsWorkspace",
               },
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "ServicePlan": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ServicePlan",
                 "path": "root/Default/ServicePlan",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -570,11 +544,6 @@ exports[`basic function with environment variables 2`] = `
 
 exports[`replace invalid character from function name 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "azurerm_application_insights": {
       "ApplicationInsights": {
@@ -603,7 +572,7 @@ exports[`replace invalid character from function name 1`] = `
           "application_insights_connection_string": "\${azurerm_application_insights.ApplicationInsights.connection_string}",
           "application_insights_key": "\${azurerm_application_insights.ApplicationInsights.instrumentation_key}",
           "application_stack": {
-            "node_version": "18",
+            "node_version": "20",
           },
         },
         "storage_account_access_key": "\${azurerm_storage_account.StorageAccount.primary_access_key}",
@@ -679,97 +648,83 @@ exports[`replace invalid character from function name 2`] = `
               "ApplicationInsights": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ApplicationInsights",
                 "path": "root/Default/ApplicationInsights",
               },
               "LogAnalyticsWorkspace": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "LogAnalyticsWorkspace",
                 "path": "root/Default/LogAnalyticsWorkspace",
               },
               "ResourceGroup": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ResourceGroup",
                 "path": "root/Default/ResourceGroup",
               },
               "ServicePlan": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "ServicePlan",
                 "path": "root/Default/ServicePlan",
               },
               "StorageAccount": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "StorageAccount",
                 "path": "root/Default/StorageAccount",
               },
               "azure": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "azure",
                 "path": "root/Default/azure",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "someFunction01": {
                 "children": {
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/someFunction01/Asset",
                   },
                   "CodeBlob": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "CodeBlob",
                     "path": "root/Default/someFunction01/CodeBlob",
                   },
                   "Function": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Function",
                     "path": "root/Default/someFunction01/Function",
                   },
@@ -778,15 +733,16 @@ exports[`replace invalid character from function name 2`] = `
                       "Bucket": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Bucket",
                         "path": "root/Default/someFunction01/FunctionBucket/Bucket",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud object store",
@@ -798,15 +754,16 @@ exports[`replace invalid character from function name 2`] = `
                   "ReadLambdaCodeAssignment": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "ReadLambdaCodeAssignment",
                     "path": "root/Default/someFunction01/ReadLambdaCodeAssignment",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -818,32 +775,36 @@ exports[`replace invalid character from function name 2`] = `
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-azure/bucket.test.ts b/libs/wingsdk/test/target-tf-azure/bucket.test.ts
index aa200a6eea3..0470adb7526 100644
--- a/libs/wingsdk/test/target-tf-azure/bucket.test.ts
+++ b/libs/wingsdk/test/target-tf-azure/bucket.test.ts
@@ -1,7 +1,7 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import { Bucket } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as tfazure from "../../src/target-tf-azure";
 import {
   mkdtemp,
@@ -154,8 +154,7 @@ test("bucket onEvent is not implemented yet", () => {
   try {
     const app = new tfazure.App({ outdir: mkdtemp(), ...AZURE_APP_OPTS });
     const bucket = new Bucket(app, "my_bucket", { public: true });
-    const testInflight = Testing.makeHandler("null");
-    bucket.onEvent(testInflight);
+    bucket.onEvent(inflight(async () => {}));
     app.synth();
   } catch (err) {
     error = err.message;
diff --git a/libs/wingsdk/test/target-tf-azure/captures.test.ts b/libs/wingsdk/test/target-tf-azure/captures.test.ts
index fbe04671b92..93e94a9c11c 100644
--- a/libs/wingsdk/test/target-tf-azure/captures.test.ts
+++ b/libs/wingsdk/test/target-tf-azure/captures.test.ts
@@ -1,7 +1,6 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
 import * as tfazure from "../../src/target-tf-azure";
 import { mkdtemp, sanitizeCode, tfResourcesOf, tfSanitize } from "../util";
 // TODO: uncomment everything when fixing -https://github.com/winglang/wing/issues/5123
@@ -14,17 +13,9 @@ test("function with a bucket binding requiring read_write", () => {
   //     entrypointDir: __dirname,
   //   });
   //   const bucket = new cloud.Bucket(app, "Bucket");
-  //   const inflight = Testing.makeHandler(
-  //     `async handle(event) { await this.bucket.put("hello.txt", event); }`,
-  //     {
-  //       bucket: {
-  //         obj: bucket,
-  //         ops: [cloud.BucketInflightMethods.PUT],
-  //       },
-  //     }
-  //   );
+  //   const handler = lift({ bucket }).grant({ bucket: ["put"] }).inflight(async (ctx) => { await ctx.bucket.put("hello.txt", event); });
   //   // WHEN
-  //   new cloud.Function(app, "Function", inflight);
+  //   new cloud.Function(app, "Function", handler);
   //   const output = app.synth();
   //   // THEN
   //   expect(
@@ -36,7 +27,7 @@ test("function with a bucket binding requiring read_write", () => {
   //       }
   //     )
   //   ).toEqual(true);
-  //   expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  //   expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   //   expect(tfResourcesOf(output)).toEqual([
   //     "azurerm_application_insights",
   //     "azurerm_linux_function_app",
@@ -59,17 +50,9 @@ test("function with a bucket binding requiring only read", () => {
   //     entrypointDir: __dirname,
   //   });
   //   const bucket = new cloud.Bucket(app, "Bucket");
-  //   const inflight = Testing.makeHandler(
-  //     `async handle(event) { await this.bucket.get("hello.txt"); }`,
-  //     {
-  //       bucket: {
-  //         obj: bucket,
-  //         ops: [cloud.BucketInflightMethods.GET],
-  //       },
-  //     }
-  //   );
+  //   const handler = lift({ bucket }).grant({ bucket: ["get"] }).inflight(async (ctx) => { await ctx.bucket.get("hello.txt"); });
   //   // WHEN
-  //   new cloud.Function(app, "Function", inflight);
+  //   new cloud.Function(app, "Function", handler);
   //   const output = app.synth();
   //   // THEN
   //   expect(
@@ -90,7 +73,7 @@ test("function with a bucket binding requiring only read", () => {
   //       }
   //     )
   //   ).toEqual(false);
-  //   expect(sanitizeCode(inflight._toInflight())).toMatchSnapshot();
+  //   expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
   //   expect(tfResourcesOf(output)).toEqual([
   //     "azurerm_application_insights",
   //     "azurerm_linux_function_app",
diff --git a/libs/wingsdk/test/target-tf-azure/counter.test.ts b/libs/wingsdk/test/target-tf-azure/counter.test.ts
new file mode 100644
index 00000000000..4de33036165
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-azure/counter.test.ts
@@ -0,0 +1,196 @@
+import * as cdktf from "cdktf";
+import { test, expect } from "vitest";
+import * as cloud from "../../src/cloud";
+import { lift } from "../../src/core";
+import * as tfAzure from "../../src/target-tf-azure";
+import { StorageAccountPermissions } from "../../src/target-tf-azure/counter";
+import {
+  mkdtemp,
+  sanitizeCode,
+  tfResourcesOf,
+  tfSanitize,
+  treeJsonOf,
+} from "../util";
+
+const appProps = {
+  location: "East US",
+  entrypointDir: __dirname,
+};
+
+test("default counter behavior", () => {
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  new cloud.Counter(app, "Counter");
+  const output = app.synth();
+
+  expect(tfResourcesOf(output)).toEqual([
+    "azurerm_resource_group",
+    "azurerm_storage_account",
+    "azurerm_storage_table",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+});
+
+test("counter with initial value", () => {
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  new cloud.Counter(app, "Counter", {
+    initial: 9991,
+  });
+  const output = app.synth();
+
+  expect(tfResourcesOf(output)).toEqual([
+    "azurerm_resource_group",
+    "azurerm_storage_account",
+    "azurerm_storage_table",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("function with a counter binding", () => {
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  const counter = new cloud.Counter(app, "Counter");
+  new cloud.Function(
+    app,
+    "Function",
+    lift({ my_counter: counter })
+      .grant({ my_counter: ["inc"] })
+      .inflight(async (ctx) => {
+        const val = await ctx.my_counter.inc(2);
+        console.log(val);
+      })
+  );
+  const output = app.synth();
+
+  expect(tfResourcesOf(output)).toEqual([
+    "azurerm_application_insights",
+    "azurerm_linux_function_app",
+    "azurerm_log_analytics_workspace",
+    "azurerm_resource_group",
+    "azurerm_role_assignment",
+    "azurerm_service_plan",
+    "azurerm_storage_account",
+    "azurerm_storage_blob",
+    "azurerm_storage_container",
+    "azurerm_storage_table",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("inc() policy statement", () => {
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  const counter = new cloud.Counter(app, "Counter");
+  new cloud.Function(
+    app,
+    "Function",
+    lift({ my_counter: counter })
+      .grant({ my_counter: ["inc"] })
+      .inflight(async (ctx) => {
+        const val = await ctx.my_counter.inc(2);
+        console.log(val);
+      })
+  );
+  const output = app.synth();
+
+  expect(output).toContain(StorageAccountPermissions.READ_WRITE);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("dec() policy statement", () => {
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  const counter = new cloud.Counter(app, "Counter");
+  new cloud.Function(
+    app,
+    "Function",
+    lift({ my_counter: counter })
+      .grant({ my_counter: ["dec"] })
+      .inflight(async (ctx) => {
+        const val = await ctx.my_counter.dec(2);
+        console.log(val);
+      })
+  );
+  const output = app.synth();
+
+  expect(output).toContain(StorageAccountPermissions.READ_WRITE);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("peek() policy statement", () => {
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  const counter = new cloud.Counter(app, "Counter");
+  new cloud.Function(
+    app,
+    "Function",
+    lift({ my_counter: counter })
+      .grant({ my_counter: ["peek"] })
+      .inflight(async (ctx) => {
+        const val = await ctx.my_counter.peek();
+        console.log(val);
+      })
+  );
+  const output = app.synth();
+
+  expect(output).toContain(StorageAccountPermissions.READ);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("set() policy statement", () => {
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  const counter = new cloud.Counter(app, "Counter");
+  new cloud.Function(
+    app,
+    "Function",
+    lift({ my_counter: counter })
+      .grant({ my_counter: ["set"] })
+      .inflight(async (ctx) => {
+        const val = await ctx.my_counter.set(12);
+        console.log(val);
+      })
+  );
+  const output = app.synth();
+  expect(output).toContain(StorageAccountPermissions.READ_WRITE);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("counter name valid", () => {
+  // GIVEN
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  const counter = new cloud.Counter(app, "wingcounter");
+  const output = app.synth();
+  // THEN
+  expect(
+    cdktf.Testing.toHaveResourceWithProperties(
+      output,
+      "azurerm_storage_table",
+      {
+        name: `wingcounterx${counter.node.addr.substring(0, 8)}`,
+      }
+    )
+  ).toEqual(true);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("replace invalid character from counter name", () => {
+  // GIVEN
+  const app = new tfAzure.App({ outdir: mkdtemp(), ...appProps });
+  const counter = new cloud.Counter(app, "The*Amazing%Counter@01");
+  const output = app.synth();
+
+  // THEN
+  expect(
+    cdktf.Testing.toHaveResourceWithProperties(
+      output,
+      "azurerm_storage_table",
+      {
+        name: `thexamazingxcounterx01x${counter.node.addr.substring(0, 8)}`,
+      }
+    )
+  ).toEqual(true);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
diff --git a/libs/wingsdk/test/target-tf-azure/function.test.ts b/libs/wingsdk/test/target-tf-azure/function.test.ts
index b44506d2dc9..de9adec9b24 100644
--- a/libs/wingsdk/test/target-tf-azure/function.test.ts
+++ b/libs/wingsdk/test/target-tf-azure/function.test.ts
@@ -1,11 +1,13 @@
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import { Function } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import * as tfazure from "../../src/target-tf-azure";
 import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util";
 
-const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`;
+const INFLIGHT_CODE = inflight(async (_, name) => {
+  console.log("Hello, " + name);
+});
 
 test("basic function", () => {
   // GIVEN
@@ -14,10 +16,9 @@ test("basic function", () => {
     location: "East US",
     entrypointDir: __dirname,
   });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
-  new Function(app, "Function", inflight);
+  new Function(app, "Function", INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
@@ -43,10 +44,9 @@ test("basic function with environment variables", () => {
     location: "East US",
     entrypointDir: __dirname,
   });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
-  new Function(app, "Function", inflight, {
+  new Function(app, "Function", INFLIGHT_CODE, {
     env: {
       FOO: "BAR",
       BOOM: "BAM",
@@ -78,8 +78,8 @@ test("permissions resources are added to function after constructor has been ini
     location: "East US",
     entrypointDir: __dirname,
   });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
-  const func = new tfazure.Function(app, "Function", inflight, {});
+
+  const func = new tfazure.Function(app, "Function", INFLIGHT_CODE, {});
 
   // WHEN
   func.addPermission(func, {
@@ -107,10 +107,9 @@ test("replace invalid character from function name", () => {
     location: "East US",
     entrypointDir: __dirname,
   });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
-  const func = new Function(app, "someFunction01", inflight);
+  const func = new Function(app, "someFunction01", INFLIGHT_CODE);
   const output = app.synth();
 
   // THEN
diff --git a/libs/wingsdk/test/target-tf-gcp/__snapshots__/bucket.test.ts.snap b/libs/wingsdk/test/target-tf-gcp/__snapshots__/bucket.test.ts.snap
index 7deaaa3995c..0857f557e4d 100644
--- a/libs/wingsdk/test/target-tf-gcp/__snapshots__/bucket.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-gcp/__snapshots__/bucket.test.ts.snap
@@ -2,14 +2,19 @@
 
 exports[`bucket is public 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
+    "google_project_service": {
+      "my_bucket_IamServiceAccountCredentialsApi_0618BD85": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_storage_bucket": {
       "my_bucket": {
+        "depends_on": [
+          "google_project_service.my_bucket_IamServiceAccountCredentialsApi_0618BD85",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "my_bucket-\${random_id.my_bucket_Id_50F73A6B.hex}",
@@ -41,34 +46,12 @@ exports[`bucket is public 2`] = `
         "children": {
           "Default": {
             "children": {
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
@@ -77,31 +60,43 @@ exports[`bucket is public 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
+                  "IamServiceAccountCredentialsApi": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamServiceAccountCredentialsApi",
+                    "path": "root/Default/my_bucket/IamServiceAccountCredentialsApi",
+                  },
                   "Id": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Id",
                     "path": "root/Default/my_bucket/Id",
                   },
                   "PublicAccessIamMember": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "PublicAccessIamMember",
                     "path": "root/Default/my_bucket/PublicAccessIamMember",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -113,40 +108,45 @@ exports[`bucket is public 2`] = `
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -156,14 +156,19 @@ exports[`bucket is public 2`] = `
 
 exports[`bucket with two preflight files 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
+    "google_project_service": {
+      "my_bucket_IamServiceAccountCredentialsApi_0618BD85": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_storage_bucket": {
       "my_bucket": {
+        "depends_on": [
+          "google_project_service.my_bucket_IamServiceAccountCredentialsApi_0618BD85",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "my_bucket-\${random_id.my_bucket_Id_50F73A6B.hex}",
@@ -200,34 +205,12 @@ exports[`bucket with two preflight files 2`] = `
         "children": {
           "Default": {
             "children": {
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
@@ -236,39 +219,52 @@ exports[`bucket with two preflight files 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
+                  "IamServiceAccountCredentialsApi": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamServiceAccountCredentialsApi",
+                    "path": "root/Default/my_bucket/IamServiceAccountCredentialsApi",
+                  },
                   "Id": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Id",
                     "path": "root/Default/my_bucket/Id",
                   },
                   "Object-file1.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Object-file1.txt",
                     "path": "root/Default/my_bucket/Object-file1.txt",
                   },
                   "Object-file2.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Object-file2.txt",
                     "path": "root/Default/my_bucket/Object-file2.txt",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -280,40 +276,45 @@ exports[`bucket with two preflight files 2`] = `
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -323,14 +324,19 @@ exports[`bucket with two preflight files 2`] = `
 
 exports[`bucket with two preflight objects 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
+    "google_project_service": {
+      "my_bucket_IamServiceAccountCredentialsApi_0618BD85": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_storage_bucket": {
       "my_bucket": {
+        "depends_on": [
+          "google_project_service.my_bucket_IamServiceAccountCredentialsApi_0618BD85",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "my_bucket-\${random_id.my_bucket_Id_50F73A6B.hex}",
@@ -367,34 +373,12 @@ exports[`bucket with two preflight objects 2`] = `
         "children": {
           "Default": {
             "children": {
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
@@ -403,39 +387,52 @@ exports[`bucket with two preflight objects 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
+                  "IamServiceAccountCredentialsApi": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamServiceAccountCredentialsApi",
+                    "path": "root/Default/my_bucket/IamServiceAccountCredentialsApi",
+                  },
                   "Id": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Id",
                     "path": "root/Default/my_bucket/Id",
                   },
                   "Object-file1.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Object-file1.txt",
                     "path": "root/Default/my_bucket/Object-file1.txt",
                   },
                   "Object-file2.txt": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Object-file2.txt",
                     "path": "root/Default/my_bucket/Object-file2.txt",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -447,40 +444,45 @@ exports[`bucket with two preflight objects 2`] = `
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -490,14 +492,19 @@ exports[`bucket with two preflight objects 2`] = `
 
 exports[`create a bucket 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
+    "google_project_service": {
+      "my_bucket_IamServiceAccountCredentialsApi_0618BD85": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_storage_bucket": {
       "my_bucket": {
+        "depends_on": [
+          "google_project_service.my_bucket_IamServiceAccountCredentialsApi_0618BD85",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "my_bucket-\${random_id.my_bucket_Id_50F73A6B.hex}",
@@ -522,34 +529,12 @@ exports[`create a bucket 2`] = `
         "children": {
           "Default": {
             "children": {
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
@@ -558,23 +543,34 @@ exports[`create a bucket 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket/Default",
                   },
+                  "IamServiceAccountCredentialsApi": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamServiceAccountCredentialsApi",
+                    "path": "root/Default/my_bucket/IamServiceAccountCredentialsApi",
+                  },
                   "Id": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Id",
                     "path": "root/Default/my_bucket/Id",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -586,40 +582,45 @@ exports[`create a bucket 2`] = `
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -629,14 +630,24 @@ exports[`create a bucket 2`] = `
 
 exports[`two buckets 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
+    "google_project_service": {
+      "my_bucket1_IamServiceAccountCredentialsApi_5EA21318": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+      "my_bucket2_IamServiceAccountCredentialsApi_4C3E6B90": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_storage_bucket": {
       "my_bucket1": {
+        "depends_on": [
+          "google_project_service.my_bucket1_IamServiceAccountCredentialsApi_5EA21318",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "my_bucket1-\${random_id.my_bucket1_Id_D79FE240.hex}",
@@ -644,6 +655,9 @@ exports[`two buckets 1`] = `
         "uniform_bucket_level_access": true,
       },
       "my_bucket2": {
+        "depends_on": [
+          "google_project_service.my_bucket2_IamServiceAccountCredentialsApi_4C3E6B90",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "my_bucket2-\${random_id.my_bucket2_Id_0AB96F49.hex}",
@@ -671,34 +685,12 @@ exports[`two buckets 2`] = `
         "children": {
           "Default": {
             "children": {
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
@@ -707,23 +699,34 @@ exports[`two buckets 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket1/Default",
                   },
+                  "IamServiceAccountCredentialsApi": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamServiceAccountCredentialsApi",
+                    "path": "root/Default/my_bucket1/IamServiceAccountCredentialsApi",
+                  },
                   "Id": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Id",
                     "path": "root/Default/my_bucket1/Id",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -737,23 +740,34 @@ exports[`two buckets 2`] = `
                   "Default": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Default",
                     "path": "root/Default/my_bucket2/Default",
                   },
+                  "IamServiceAccountCredentialsApi": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "IamServiceAccountCredentialsApi",
+                    "path": "root/Default/my_bucket2/IamServiceAccountCredentialsApi",
+                  },
                   "Id": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Id",
                     "path": "root/Default/my_bucket2/Id",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud object store",
@@ -765,40 +779,45 @@ exports[`two buckets 2`] = `
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-gcp/__snapshots__/counter.test.ts.snap b/libs/wingsdk/test/target-tf-gcp/__snapshots__/counter.test.ts.snap
new file mode 100644
index 00000000000..d9ac684ad2c
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-gcp/__snapshots__/counter.test.ts.snap
@@ -0,0 +1,1968 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`counter name valid 1`] = `
+{
+  "resource": {
+    "google_firestore_database": {
+      "TheAmazing-Counter_01": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.TheAmazing-Counter_01_CloudFirestoreAPI_8CA93C9B",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-the-amazing-counter-01-c83e5bd8",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_service": {
+      "TheAmazing-Counter_01_CloudFirestoreAPI_8CA93C9B": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+    },
+  },
+}
+`;
+
+exports[`counter name valid 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "The.Amazing-Counter_01": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/The.Amazing-Counter_01/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/The.Amazing-Counter_01/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "The.Amazing-Counter_01",
+                "path": "root/Default/The.Amazing-Counter_01",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`counter with initial value 1`] = `
+{
+  "resource": {
+    "google_firestore_database": {
+      "Counter": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.Counter_CloudFirestoreAPI_2119CDFC",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-counter-c824ef62",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_service": {
+      "Counter_CloudFirestoreAPI_2119CDFC": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+    },
+  },
+}
+`;
+
+exports[`counter with initial value 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Counter": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/Counter/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/Counter/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`dec() IAM permissions 1`] = `
+{
+  "resource": {
+    "google_cloudfunctions_function": {
+      "Function_DefaultFunction_81B206D7": {
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {
+          "FIRESTORE_DATABASE_NAME_6cb5a3a4": "\${google_firestore_database.Counter.name}",
+        },
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "function-c852aba6",
+        "project": "my-project",
+        "region": "us-central1",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
+        "timeout": 120,
+        "trigger_http": true,
+      },
+    },
+    "google_firestore_database": {
+      "Counter": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.Counter_CloudFirestoreAPI_2119CDFC",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-counter-c824ef62",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+          "datastore.entities.get",
+          "datastore.entities.create",
+          "datastore.entities.update",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Counter_CloudFirestoreAPI_2119CDFC": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
+    "google_service_account": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
+        "account_id": "function-c852aba6",
+        "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_storage_bucket": {
+      "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
+        "force_destroy": false,
+        "location": "us-central1",
+        "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true,
+      },
+    },
+    "google_storage_bucket_object": {
+      "Function_FunctionObjectBucket_A7CD2097": {
+        "bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "name": "objects",
+        "source": "<source>",
+      },
+    },
+    "random_id": {
+      "Function_FunctionBucket_Id_216676D0": {
+        "byte_length": 4,
+      },
+    },
+  },
+}
+`;
+
+exports[`dec() IAM permissions 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Counter": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/Counter/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/Counter/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                  "DefaultFunction": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "DefaultFunction",
+                    "path": "root/Default/Function/DefaultFunction",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Function/FunctionBucket/Default",
+                      },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
+                      "Id": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Id",
+                        "path": "root/Default/Function/FunctionBucket/Id",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "FunctionObjectBucket": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "FunctionObjectBucket",
+                    "path": "root/Default/Function/FunctionObjectBucket",
+                  },
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`default counter behavior 1`] = `
+{
+  "resource": {
+    "google_firestore_database": {
+      "Counter": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.Counter_CloudFirestoreAPI_2119CDFC",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-counter-c824ef62",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_service": {
+      "Counter_CloudFirestoreAPI_2119CDFC": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+    },
+  },
+}
+`;
+
+exports[`function with a counter binding 1`] = `
+"(await (async () => {
+  const $func = async (ctx) => {
+    const val = await ctx.my_counter.inc(2);
+    console.log(val);
+  }
+  const $ctx = {
+  my_counter: new (require("[REDACTED]/wingsdk/src/shared-gcp/counter.inflight")).CounterClient(process.env["FIRESTORE_DATABASE_NAME_6cb5a3a4"], 0)
+  };
+  let newFunction = async (...args) => {
+    return $func($ctx, ...args);
+  };
+  newFunction.handle = newFunction;
+  return newFunction;
+}
+)())"
+`;
+
+exports[`function with a counter binding 2`] = `
+{
+  "resource": {
+    "google_cloudfunctions_function": {
+      "Function_DefaultFunction_81B206D7": {
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {
+          "FIRESTORE_DATABASE_NAME_6cb5a3a4": "\${google_firestore_database.Counter.name}",
+        },
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "function-c852aba6",
+        "project": "my-project",
+        "region": "us-central1",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
+        "timeout": 120,
+        "trigger_http": true,
+      },
+    },
+    "google_firestore_database": {
+      "Counter": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.Counter_CloudFirestoreAPI_2119CDFC",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-counter-c824ef62",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+          "datastore.entities.get",
+          "datastore.entities.create",
+          "datastore.entities.update",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Counter_CloudFirestoreAPI_2119CDFC": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
+    "google_service_account": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
+        "account_id": "function-c852aba6",
+        "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_storage_bucket": {
+      "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
+        "force_destroy": false,
+        "location": "us-central1",
+        "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true,
+      },
+    },
+    "google_storage_bucket_object": {
+      "Function_FunctionObjectBucket_A7CD2097": {
+        "bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "name": "objects",
+        "source": "<source>",
+      },
+    },
+    "random_id": {
+      "Function_FunctionBucket_Id_216676D0": {
+        "byte_length": 4,
+      },
+    },
+  },
+}
+`;
+
+exports[`function with a counter binding 3`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Counter": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/Counter/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/Counter/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                  "DefaultFunction": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "DefaultFunction",
+                    "path": "root/Default/Function/DefaultFunction",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Function/FunctionBucket/Default",
+                      },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
+                      "Id": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Id",
+                        "path": "root/Default/Function/FunctionBucket/Id",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "FunctionObjectBucket": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "FunctionObjectBucket",
+                    "path": "root/Default/Function/FunctionObjectBucket",
+                  },
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`inc() IAM permissions 1`] = `
+{
+  "resource": {
+    "google_cloudfunctions_function": {
+      "Function_DefaultFunction_81B206D7": {
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {
+          "FIRESTORE_DATABASE_NAME_6cb5a3a4": "\${google_firestore_database.Counter.name}",
+        },
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "function-c852aba6",
+        "project": "my-project",
+        "region": "us-central1",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
+        "timeout": 120,
+        "trigger_http": true,
+      },
+    },
+    "google_firestore_database": {
+      "Counter": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.Counter_CloudFirestoreAPI_2119CDFC",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-counter-c824ef62",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+          "datastore.entities.get",
+          "datastore.entities.create",
+          "datastore.entities.update",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Counter_CloudFirestoreAPI_2119CDFC": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
+    "google_service_account": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
+        "account_id": "function-c852aba6",
+        "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_storage_bucket": {
+      "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
+        "force_destroy": false,
+        "location": "us-central1",
+        "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true,
+      },
+    },
+    "google_storage_bucket_object": {
+      "Function_FunctionObjectBucket_A7CD2097": {
+        "bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "name": "objects",
+        "source": "<source>",
+      },
+    },
+    "random_id": {
+      "Function_FunctionBucket_Id_216676D0": {
+        "byte_length": 4,
+      },
+    },
+  },
+}
+`;
+
+exports[`inc() IAM permissions 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Counter": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/Counter/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/Counter/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                  "DefaultFunction": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "DefaultFunction",
+                    "path": "root/Default/Function/DefaultFunction",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Function/FunctionBucket/Default",
+                      },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
+                      "Id": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Id",
+                        "path": "root/Default/Function/FunctionBucket/Id",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "FunctionObjectBucket": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "FunctionObjectBucket",
+                    "path": "root/Default/Function/FunctionObjectBucket",
+                  },
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`peek() IAM permissions 1`] = `
+{
+  "resource": {
+    "google_cloudfunctions_function": {
+      "Function_DefaultFunction_81B206D7": {
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {
+          "FIRESTORE_DATABASE_NAME_6cb5a3a4": "\${google_firestore_database.Counter.name}",
+        },
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "function-c852aba6",
+        "project": "my-project",
+        "region": "us-central1",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
+        "timeout": 120,
+        "trigger_http": true,
+      },
+    },
+    "google_firestore_database": {
+      "Counter": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.Counter_CloudFirestoreAPI_2119CDFC",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-counter-c824ef62",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+          "datastore.entities.get",
+          "datastore.entities.create",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Counter_CloudFirestoreAPI_2119CDFC": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
+    "google_service_account": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
+        "account_id": "function-c852aba6",
+        "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_storage_bucket": {
+      "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
+        "force_destroy": false,
+        "location": "us-central1",
+        "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true,
+      },
+    },
+    "google_storage_bucket_object": {
+      "Function_FunctionObjectBucket_A7CD2097": {
+        "bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "name": "objects",
+        "source": "<source>",
+      },
+    },
+    "random_id": {
+      "Function_FunctionBucket_Id_216676D0": {
+        "byte_length": 4,
+      },
+    },
+  },
+}
+`;
+
+exports[`peek() IAM permissions 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Counter": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/Counter/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/Counter/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                  "DefaultFunction": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "DefaultFunction",
+                    "path": "root/Default/Function/DefaultFunction",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Function/FunctionBucket/Default",
+                      },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
+                      "Id": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Id",
+                        "path": "root/Default/Function/FunctionBucket/Id",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "FunctionObjectBucket": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "FunctionObjectBucket",
+                    "path": "root/Default/Function/FunctionObjectBucket",
+                  },
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`replace invalid character from counter name 1`] = `
+{
+  "resource": {
+    "google_firestore_database": {
+      "TheAmazingCounter01": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.TheAmazingCounter01_CloudFirestoreAPI_3EBD30CE",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-the-amazing-counter-01-c848151b",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_service": {
+      "TheAmazingCounter01_CloudFirestoreAPI_3EBD30CE": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+    },
+  },
+}
+`;
+
+exports[`replace invalid character from counter name 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "The*Amazing%Counter@01": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/The*Amazing%Counter@01/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/The*Amazing%Counter@01/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "The*Amazing%Counter@01",
+                "path": "root/Default/The*Amazing%Counter@01",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
+
+exports[`set() IAM permissions 1`] = `
+{
+  "resource": {
+    "google_cloudfunctions_function": {
+      "Function_DefaultFunction_81B206D7": {
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {
+          "FIRESTORE_DATABASE_NAME_6cb5a3a4": "\${google_firestore_database.Counter.name}",
+        },
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "function-c852aba6",
+        "project": "my-project",
+        "region": "us-central1",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
+        "timeout": 120,
+        "trigger_http": true,
+      },
+    },
+    "google_firestore_database": {
+      "Counter": {
+        "app_engine_integration_mode": "DISABLED",
+        "concurrency_mode": "OPTIMISTIC",
+        "delete_protection_state": "DELETE_PROTECTION_DISABLED",
+        "deletion_policy": "DELETE",
+        "depends_on": [
+          "google_project_service.Counter_CloudFirestoreAPI_2119CDFC",
+        ],
+        "location_id": "us-central1",
+        "name": "wing-counter-counter-c824ef62",
+        "point_in_time_recovery_enablement": "POINT_IN_TIME_RECOVERY_DISABLED",
+        "type": "DATASTORE_MODE",
+      },
+    },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+          "datastore.entities.create",
+          "datastore.entities.update",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Counter_CloudFirestoreAPI_2119CDFC": {
+        "disable_on_destroy": false,
+        "service": "firestore.googleapis.com",
+      },
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
+    "google_service_account": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
+        "account_id": "function-c852aba6",
+        "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_storage_bucket": {
+      "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
+        "force_destroy": false,
+        "location": "us-central1",
+        "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true,
+      },
+    },
+    "google_storage_bucket_object": {
+      "Function_FunctionObjectBucket_A7CD2097": {
+        "bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
+        "name": "objects",
+        "source": "<source>",
+      },
+    },
+    "random_id": {
+      "Function_FunctionBucket_Id_216676D0": {
+        "byte_length": 4,
+      },
+    },
+  },
+}
+`;
+
+exports[`set() IAM permissions 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Counter": {
+                "children": {
+                  "CloudFirestoreAPI": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CloudFirestoreAPI",
+                    "path": "root/Default/Counter/CloudFirestoreAPI",
+                  },
+                  "Default": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Default",
+                    "path": "root/Default/Counter/Default",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A distributed atomic counter",
+                  "title": "Counter",
+                },
+                "id": "Counter",
+                "path": "root/Default/Counter",
+              },
+              "Function": {
+                "children": {
+                  "Asset": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformAsset",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Asset",
+                    "path": "root/Default/Function/Asset",
+                  },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                  "DefaultFunction": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "DefaultFunction",
+                    "path": "root/Default/Function/DefaultFunction",
+                  },
+                  "FunctionBucket": {
+                    "children": {
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Function/FunctionBucket/Default",
+                      },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
+                      "Id": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Id",
+                        "path": "root/Default/Function/FunctionBucket/Id",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "FunctionBucket",
+                    "path": "root/Default/Function/FunctionBucket",
+                  },
+                  "FunctionObjectBucket": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "FunctionObjectBucket",
+                    "path": "root/Default/Function/FunctionObjectBucket",
+                  },
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud function (FaaS)",
+                  "title": "Function",
+                },
+                "id": "Function",
+                "path": "root/Default/Function",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
diff --git a/libs/wingsdk/test/target-tf-gcp/__snapshots__/function.test.ts.snap b/libs/wingsdk/test/target-tf-gcp/__snapshots__/function.test.ts.snap
index e688b73bca5..e86b896a57a 100644
--- a/libs/wingsdk/test/target-tf-gcp/__snapshots__/function.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-gcp/__snapshots__/function.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`basic function 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "google_cloudfunctions_function": {
       "Function_DefaultFunction_81B206D7": {
@@ -14,25 +9,52 @@ exports[`basic function 1`] = `
         "description": "This function was created by Wing",
         "entry_point": "handler",
         "environment_variables": {},
+        "https_trigger_security_level": "SECURE_ALWAYS",
         "name": "function-c852aba6",
         "project": "my-project",
         "region": "us-central1",
-        "runtime": "nodejs18",
-        "service_account_email": "\${google_service_account.Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF.email}",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
         "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
         "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
         "timeout": 120,
         "trigger_http": true,
       },
     },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_service_account": {
-      "Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
         "account_id": "function-c852aba6",
         "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
       },
     },
     "google_storage_bucket": {
       "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
@@ -69,16 +91,27 @@ exports[`basic function 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
                   "DefaultFunction": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DefaultFunction",
                     "path": "root/Default/Function/DefaultFunction",
                   },
@@ -87,23 +120,34 @@ exports[`basic function 2`] = `
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/Function/FunctionBucket/Default",
                       },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
                       "Id": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Id",
                         "path": "root/Default/Function/FunctionBucket/Id",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud object store",
@@ -115,23 +159,34 @@ exports[`basic function 2`] = `
                   "FunctionObjectBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "FunctionObjectBucket",
                     "path": "root/Default/Function/FunctionObjectBucket",
                   },
-                  "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
-                    "id": "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
-                    "path": "root/Default/Function/serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -140,74 +195,57 @@ exports[`basic function 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -217,11 +255,6 @@ exports[`basic function 2`] = `
 
 exports[`basic function with environment variables 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "google_cloudfunctions_function": {
       "Function_DefaultFunction_81B206D7": {
@@ -232,25 +265,52 @@ exports[`basic function with environment variables 1`] = `
           "BOOM": "BAM",
           "FOO": "BAR",
         },
+        "https_trigger_security_level": "SECURE_ALWAYS",
         "name": "function-c852aba6",
         "project": "my-project",
         "region": "us-central1",
-        "runtime": "nodejs18",
-        "service_account_email": "\${google_service_account.Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF.email}",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
         "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
         "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
         "timeout": 120,
         "trigger_http": true,
       },
     },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_service_account": {
-      "Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
         "account_id": "function-c852aba6",
         "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
       },
     },
     "google_storage_bucket": {
       "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
@@ -287,16 +347,27 @@ exports[`basic function with environment variables 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
                   "DefaultFunction": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DefaultFunction",
                     "path": "root/Default/Function/DefaultFunction",
                   },
@@ -305,23 +376,34 @@ exports[`basic function with environment variables 2`] = `
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/Function/FunctionBucket/Default",
                       },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
                       "Id": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Id",
                         "path": "root/Default/Function/FunctionBucket/Id",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud object store",
@@ -333,23 +415,34 @@ exports[`basic function with environment variables 2`] = `
                   "FunctionObjectBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "FunctionObjectBucket",
                     "path": "root/Default/Function/FunctionObjectBucket",
                   },
-                  "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
-                    "id": "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
-                    "path": "root/Default/Function/serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -358,74 +451,57 @@ exports[`basic function with environment variables 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -433,15 +509,10 @@ exports[`basic function with environment variables 2`] = `
 }
 `;
 
-exports[`basic function with memory beyond the allowed range 1`] = `"Memory must be between 128 and 8192 MB for GCP Cloud Functions"`;
+exports[`basic function with memory beyond the allowed range 1`] = `[Error: Memory must be between 128 and 8192 MB for GCP Cloud Functions]`;
 
 exports[`basic function with memory size specified 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "google_cloudfunctions_function": {
       "Function_DefaultFunction_81B206D7": {
@@ -449,25 +520,52 @@ exports[`basic function with memory size specified 1`] = `
         "description": "This function was created by Wing",
         "entry_point": "handler",
         "environment_variables": {},
+        "https_trigger_security_level": "SECURE_ALWAYS",
         "name": "function-c852aba6",
         "project": "my-project",
         "region": "us-central1",
-        "runtime": "nodejs18",
-        "service_account_email": "\${google_service_account.Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF.email}",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
         "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
         "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
         "timeout": 120,
         "trigger_http": true,
       },
     },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_service_account": {
-      "Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
         "account_id": "function-c852aba6",
         "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
       },
     },
     "google_storage_bucket": {
       "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
@@ -504,16 +602,27 @@ exports[`basic function with memory size specified 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
                   "DefaultFunction": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DefaultFunction",
                     "path": "root/Default/Function/DefaultFunction",
                   },
@@ -522,23 +631,34 @@ exports[`basic function with memory size specified 2`] = `
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/Function/FunctionBucket/Default",
                       },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
                       "Id": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Id",
                         "path": "root/Default/Function/FunctionBucket/Id",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud object store",
@@ -550,23 +670,34 @@ exports[`basic function with memory size specified 2`] = `
                   "FunctionObjectBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "FunctionObjectBucket",
                     "path": "root/Default/Function/FunctionObjectBucket",
                   },
-                  "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
-                    "id": "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
-                    "path": "root/Default/Function/serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -575,74 +706,57 @@ exports[`basic function with memory size specified 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
@@ -650,15 +764,10 @@ exports[`basic function with memory size specified 2`] = `
 }
 `;
 
-exports[`basic function with timeout beyond the allowed range 1`] = `"Timeout must be between 1 and 540 seconds for GCP Cloud Functions"`;
+exports[`basic function with timeout beyond the allowed range 1`] = `[Error: Timeout must be between 1 and 540 seconds for GCP Cloud Functions]`;
 
 exports[`basic function with timeout explicitly set 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "google_cloudfunctions_function": {
       "Function_DefaultFunction_81B206D7": {
@@ -666,25 +775,52 @@ exports[`basic function with timeout explicitly set 1`] = `
         "description": "This function was created by Wing",
         "entry_point": "handler",
         "environment_variables": {},
+        "https_trigger_security_level": "SECURE_ALWAYS",
         "name": "function-c852aba6",
         "project": "my-project",
         "region": "us-central1",
-        "runtime": "nodejs18",
-        "service_account_email": "\${google_service_account.Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF.email}",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
         "source_archive_bucket": "\${google_storage_bucket.Function_FunctionBucket_CD7D2793.name}",
         "source_archive_object": "\${google_storage_bucket_object.Function_FunctionObjectBucket_A7CD2097.name}",
         "timeout": 30,
         "trigger_http": true,
       },
     },
+    "google_project_iam_custom_role": {
+      "Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+        ],
+        "role_id": "cloudfunctions.customc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+        "title": "Custom Role for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
+      },
+    },
+    "google_project_iam_member": {
+      "Function_ProjectIamMember_F891F2CD": {
+        "member": "serviceAccount:\${google_service_account.Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Function_CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5_22DA7C69.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
     "google_service_account": {
-      "Function_serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_E91676AF": {
+      "Function_ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5_504E4375": {
         "account_id": "function-c852aba6",
         "display_name": "Custom Service Account for Cloud Function c852aba6d7cbe50c86bbedd1463b05db52425574b5",
       },
     },
     "google_storage_bucket": {
       "Function_FunctionBucket_CD7D2793": {
+        "depends_on": [
+          "google_project_service.Function_FunctionBucket_IamServiceAccountCredentialsApi_EC496DEC",
+        ],
         "force_destroy": false,
         "location": "us-central1",
         "name": "functionbucket-\${random_id.Function_FunctionBucket_Id_216676D0.hex}",
@@ -721,16 +857,27 @@ exports[`basic function with timeout explicitly set 2`] = `
                   "Asset": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformAsset",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "Asset",
                     "path": "root/Default/Function/Asset",
                   },
+                  "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/CustomRolec852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                  },
                   "DefaultFunction": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "DefaultFunction",
                     "path": "root/Default/Function/DefaultFunction",
                   },
@@ -739,23 +886,34 @@ exports[`basic function with timeout explicitly set 2`] = `
                       "Default": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Default",
                         "path": "root/Default/Function/FunctionBucket/Default",
                       },
+                      "IamServiceAccountCredentialsApi": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "IamServiceAccountCredentialsApi",
+                        "path": "root/Default/Function/FunctionBucket/IamServiceAccountCredentialsApi",
+                      },
                       "Id": {
                         "constructInfo": {
                           "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
+                          "version": "0.20.3",
                         },
+                        "display": {},
                         "id": "Id",
                         "path": "root/Default/Function/FunctionBucket/Id",
                       },
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.70",
+                      "version": "10.3.0",
                     },
                     "display": {
                       "description": "A cloud object store",
@@ -767,23 +925,34 @@ exports[`basic function with timeout explicitly set 2`] = `
                   "FunctionObjectBucket": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
+                    "display": {},
                     "id": "FunctionObjectBucket",
                     "path": "root/Default/Function/FunctionObjectBucket",
                   },
-                  "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
+                  "ProjectIamMember": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "ProjectIamMember",
+                    "path": "root/Default/Function/ProjectIamMember",
+                  },
+                  "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5": {
                     "constructInfo": {
                       "fqn": "cdktf.TerraformResource",
-                      "version": "0.17.0",
+                      "version": "0.20.3",
                     },
-                    "id": "serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
-                    "path": "root/Default/Function/serviceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "display": {},
+                    "id": "ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
+                    "path": "root/Default/Function/ServiceAccountc852aba6d7cbe50c86bbedd1463b05db52425574b5",
                   },
                 },
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.70",
+                  "version": "10.3.0",
                 },
                 "display": {
                   "description": "A cloud function (FaaS)",
@@ -792,74 +961,57 @@ exports[`basic function with timeout explicitly set 2`] = `
                 "id": "Function",
                 "path": "root/Default/Function",
               },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionIdentifiers": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionIdentifiers",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionIdentifiers",
-                  },
-                },
-                "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.2.70",
-                },
-                "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
-                  "hidden": true,
-                  "title": "TestRunner",
-                },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
-              },
               "google": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "google",
                 "path": "root/Default/google",
               },
               "random": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "random",
                 "path": "root/Default/random",
               },
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.70",
+              "version": "10.3.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/libs/wingsdk/test/target-tf-gcp/__snapshots__/schedule.test.ts.snap b/libs/wingsdk/test/target-tf-gcp/__snapshots__/schedule.test.ts.snap
new file mode 100644
index 00000000000..2ff99b9284c
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-gcp/__snapshots__/schedule.test.ts.snap
@@ -0,0 +1,324 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`create a schedule 1`] = `
+{
+  "resource": {
+    "google_cloud_scheduler_job": {
+      "Schedule_Scheduler_A529D9A8": {
+        "attempt_deadline": "300s",
+        "description": "Trigger \${google_cloudfunctions_function.Schedule_OnTick0_DefaultFunction_0D16428E.name}",
+        "http_target": {
+          "http_method": "GET",
+          "oidc_token": {
+            "service_account_email": "\${google_service_account.Schedule_SchedulerServiceAccount_C23742C8.email}",
+          },
+          "uri": "\${google_cloudfunctions_function.Schedule_OnTick0_DefaultFunction_0D16428E.https_trigger_url}",
+        },
+        "name": "scheduler-c8b3fc39",
+        "schedule": "*/2 * * * *",
+        "time_zone": "Etc/UTC",
+      },
+    },
+    "google_cloudfunctions_function": {
+      "Schedule_OnTick0_DefaultFunction_0D16428E": {
+        "available_memory_mb": 1024,
+        "description": "This function was created by Wing",
+        "entry_point": "handler",
+        "environment_variables": {},
+        "https_trigger_security_level": "SECURE_ALWAYS",
+        "name": "ontick0-c8e1d4a8",
+        "project": "my-project",
+        "region": "us-central1",
+        "runtime": "nodejs20",
+        "service_account_email": "\${google_service_account.Schedule_OnTick0_ServiceAccountc8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a_904F6F8E.email}",
+        "source_archive_bucket": "\${google_storage_bucket.Schedule_OnTick0_FunctionBucket_49CAB579.name}",
+        "source_archive_object": "\${google_storage_bucket_object.Schedule_OnTick0_FunctionObjectBucket_E7CE9CAB.name}",
+        "timeout": 120,
+        "trigger_http": true,
+      },
+    },
+    "google_cloudfunctions_function_iam_member": {
+      "Schedule_OnTick0_invoker-permission-KEN11_7990EE36": {
+        "cloud_function": "\${google_cloudfunctions_function.Schedule_OnTick0_DefaultFunction_0D16428E.name}",
+        "member": "serviceAccount:\${google_service_account.Schedule_SchedulerServiceAccount_C23742C8.email}",
+        "project": "\${google_cloudfunctions_function.Schedule_OnTick0_DefaultFunction_0D16428E.project}",
+        "region": "\${google_cloudfunctions_function.Schedule_OnTick0_DefaultFunction_0D16428E.region}",
+        "role": "roles/cloudfunctions.invoker",
+      },
+    },
+    "google_project_iam_custom_role": {
+      "Schedule_OnTick0_CustomRolec8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a_383A478B": {
+        "permissions": [
+          "cloudfunctions.functions.get",
+        ],
+        "role_id": "cloudfunctions.customc8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a",
+        "title": "Custom Role for Cloud Function c8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a",
+      },
+    },
+    "google_project_iam_member": {
+      "Schedule_OnTick0_ProjectIamMember_5C834109": {
+        "member": "serviceAccount:\${google_service_account.Schedule_OnTick0_ServiceAccountc8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a_904F6F8E.email}",
+        "project": "my-project",
+        "role": "projects/my-project/roles/\${google_project_iam_custom_role.Schedule_OnTick0_CustomRolec8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a_383A478B.role_id}",
+      },
+    },
+    "google_project_service": {
+      "Schedule_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_DF643D92": {
+        "disable_dependent_services": false,
+        "disable_on_destroy": false,
+        "service": "iamcredentials.googleapis.com",
+      },
+    },
+    "google_service_account": {
+      "Schedule_OnTick0_ServiceAccountc8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a_904F6F8E": {
+        "account_id": "ontick0-c8e1d4a8",
+        "display_name": "Custom Service Account for Cloud Function c8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a",
+      },
+      "Schedule_SchedulerServiceAccount_C23742C8": {
+        "account_id": "scheduler-c8b3fc39-sa",
+        "display_name": "Service Account for scheduler-c8b3fc39",
+      },
+    },
+    "google_storage_bucket": {
+      "Schedule_OnTick0_FunctionBucket_49CAB579": {
+        "depends_on": [
+          "google_project_service.Schedule_OnTick0_FunctionBucket_IamServiceAccountCredentialsApi_DF643D92",
+        ],
+        "force_destroy": false,
+        "location": "us-central1",
+        "name": "functionbucket-\${random_id.Schedule_OnTick0_FunctionBucket_Id_79EDFDFF.hex}",
+        "public_access_prevention": "enforced",
+        "uniform_bucket_level_access": true,
+      },
+    },
+    "google_storage_bucket_object": {
+      "Schedule_OnTick0_FunctionObjectBucket_E7CE9CAB": {
+        "bucket": "\${google_storage_bucket.Schedule_OnTick0_FunctionBucket_49CAB579.name}",
+        "name": "objects",
+        "source": "<source>",
+      },
+    },
+    "random_id": {
+      "Schedule_OnTick0_FunctionBucket_Id_79EDFDFF": {
+        "byte_length": 4,
+      },
+    },
+  },
+}
+`;
+
+exports[`create a schedule 2`] = `
+{
+  "tree": {
+    "children": {
+      "root": {
+        "children": {
+          "Default": {
+            "children": {
+              "Schedule": {
+                "children": {
+                  "OnTick0": {
+                    "children": {
+                      "Asset": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformAsset",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Asset",
+                        "path": "root/Default/Schedule/OnTick0/Asset",
+                      },
+                      "CustomRolec8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "CustomRolec8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a",
+                        "path": "root/Default/Schedule/OnTick0/CustomRolec8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a",
+                      },
+                      "DefaultFunction": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "DefaultFunction",
+                        "path": "root/Default/Schedule/OnTick0/DefaultFunction",
+                      },
+                      "FunctionBucket": {
+                        "children": {
+                          "Default": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Default",
+                            "path": "root/Default/Schedule/OnTick0/FunctionBucket/Default",
+                          },
+                          "IamServiceAccountCredentialsApi": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "IamServiceAccountCredentialsApi",
+                            "path": "root/Default/Schedule/OnTick0/FunctionBucket/IamServiceAccountCredentialsApi",
+                          },
+                          "Id": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Id",
+                            "path": "root/Default/Schedule/OnTick0/FunctionBucket/Id",
+                          },
+                        },
+                        "constructInfo": {
+                          "fqn": "constructs.Construct",
+                          "version": "10.3.0",
+                        },
+                        "display": {
+                          "description": "A cloud object store",
+                          "title": "Bucket",
+                        },
+                        "id": "FunctionBucket",
+                        "path": "root/Default/Schedule/OnTick0/FunctionBucket",
+                      },
+                      "FunctionObjectBucket": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "FunctionObjectBucket",
+                        "path": "root/Default/Schedule/OnTick0/FunctionObjectBucket",
+                      },
+                      "ProjectIamMember": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "ProjectIamMember",
+                        "path": "root/Default/Schedule/OnTick0/ProjectIamMember",
+                      },
+                      "ServiceAccountc8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "ServiceAccountc8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a",
+                        "path": "root/Default/Schedule/OnTick0/ServiceAccountc8e1d4a853a6dfc6d497de76ef87d4c5a00da4ae0a",
+                      },
+                      "invoker-permission-KEN.11]}": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "invoker-permission-KEN.11]}",
+                        "path": "root/Default/Schedule/OnTick0/invoker-permission-KEN.11]}",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "constructs.Construct",
+                      "version": "10.3.0",
+                    },
+                    "display": {
+                      "description": "A cloud function (FaaS)",
+                      "title": "Function",
+                    },
+                    "id": "OnTick0",
+                    "path": "root/Default/Schedule/OnTick0",
+                  },
+                  "Scheduler": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "Scheduler",
+                    "path": "root/Default/Schedule/Scheduler",
+                  },
+                  "SchedulerServiceAccount": {
+                    "constructInfo": {
+                      "fqn": "cdktf.TerraformResource",
+                      "version": "0.20.3",
+                    },
+                    "display": {},
+                    "id": "SchedulerServiceAccount",
+                    "path": "root/Default/Schedule/SchedulerServiceAccount",
+                  },
+                },
+                "constructInfo": {
+                  "fqn": "constructs.Construct",
+                  "version": "10.3.0",
+                },
+                "display": {
+                  "description": "A cloud schedule to trigger events at regular intervals",
+                  "title": "Schedule",
+                },
+                "id": "Schedule",
+                "path": "root/Default/Schedule",
+              },
+              "google": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "google",
+                "path": "root/Default/google",
+              },
+              "random": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "random",
+                "path": "root/Default/random",
+              },
+            },
+            "constructInfo": {
+              "fqn": "constructs.Construct",
+              "version": "10.3.0",
+            },
+            "display": {},
+            "id": "Default",
+            "path": "root/Default",
+          },
+          "backend": {
+            "constructInfo": {
+              "fqn": "cdktf.LocalBackend",
+              "version": "0.20.3",
+            },
+            "display": {},
+            "id": "backend",
+            "path": "root/backend",
+          },
+        },
+        "constructInfo": {
+          "fqn": "cdktf.TerraformStack",
+          "version": "0.20.3",
+        },
+        "display": {},
+        "id": "root",
+        "path": "root",
+      },
+    },
+    "constructInfo": {
+      "fqn": "cdktf.App",
+      "version": "0.20.3",
+    },
+    "display": {},
+    "id": "App",
+    "path": "",
+  },
+  "version": "tree-0.1",
+}
+`;
diff --git a/libs/wingsdk/test/target-tf-gcp/__snapshots__/table.test.ts.snap b/libs/wingsdk/test/target-tf-gcp/__snapshots__/table.test.ts.snap
index df6d233befc..82ef1457651 100644
--- a/libs/wingsdk/test/target-tf-gcp/__snapshots__/table.test.ts.snap
+++ b/libs/wingsdk/test/target-tf-gcp/__snapshots__/table.test.ts.snap
@@ -2,11 +2,6 @@
 
 exports[`create a table 1`] = `
 {
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
   "resource": {
     "google_bigtable_instance": {
       "my_table_Instance_531C1B73": {
diff --git a/libs/wingsdk/test/target-tf-gcp/bucket.test.ts b/libs/wingsdk/test/target-tf-gcp/bucket.test.ts
index 98ccfa47817..a27322da34b 100644
--- a/libs/wingsdk/test/target-tf-gcp/bucket.test.ts
+++ b/libs/wingsdk/test/target-tf-gcp/bucket.test.ts
@@ -22,7 +22,11 @@ test("create a bucket", () => {
   const output = app.synth();
 
   // THEN
-  expect(tfResourcesOf(output)).toEqual(["google_storage_bucket", "random_id"]);
+  expect(tfResourcesOf(output)).toEqual([
+    "google_project_service",
+    "google_storage_bucket",
+    "random_id",
+  ]);
   expect(tfSanitize(output)).toMatchSnapshot();
   expect(treeJsonOf(app.outdir)).toMatchSnapshot();
 });
@@ -35,6 +39,7 @@ test("bucket is public", () => {
 
   // THEN
   expect(tfResourcesOf(output)).toEqual([
+    "google_project_service",
     "google_storage_bucket",
     "google_storage_bucket_iam_member",
     "random_id",
@@ -51,7 +56,12 @@ test("two buckets", () => {
   const output = app.synth();
 
   // THEN
-  expect(tfResourcesOf(output)).toEqual(["google_storage_bucket", "random_id"]);
+  expect(tfResourcesOf(output)).toEqual([
+    "google_project_service",
+    "google_storage_bucket",
+    "random_id",
+  ]);
+  expect(tfResourcesOfCount(output, "google_project_service")).toEqual(2);
   expect(tfResourcesOfCount(output, "google_storage_bucket")).toEqual(2);
   expect(tfResourcesOfCount(output, "random_id")).toEqual(2);
   expect(tfSanitize(output)).toMatchSnapshot();
@@ -68,6 +78,7 @@ test("bucket with two preflight objects", () => {
 
   // THEN
   expect(tfResourcesOf(output)).toEqual([
+    "google_project_service",
     "google_storage_bucket",
     "google_storage_bucket_object",
     "random_id",
@@ -87,6 +98,7 @@ test("bucket with two preflight files", () => {
 
   // THEN
   expect(tfResourcesOf(output)).toEqual([
+    "google_project_service",
     "google_storage_bucket",
     "google_storage_bucket_object",
     "random_id",
diff --git a/libs/wingsdk/test/target-tf-gcp/counter.test.ts b/libs/wingsdk/test/target-tf-gcp/counter.test.ts
new file mode 100644
index 00000000000..3f2ffbf2716
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-gcp/counter.test.ts
@@ -0,0 +1,244 @@
+import * as cdktf from "cdktf";
+import { test, expect } from "vitest";
+import { Counter, CounterInflightMethods, Function } from "../../src/cloud";
+import { lift } from "../../src/core";
+import { App } from "../../src/target-tf-gcp";
+import {
+  mkdtemp,
+  sanitizeCode,
+  tfResourcesOf,
+  tfSanitize,
+  treeJsonOf,
+} from "../util";
+
+const GCP_APP_OPTS = {
+  projectId: "my-project",
+  entrypointDir: __dirname,
+  storageLocation: "US",
+  region: "us-central1",
+  zone: "us-central1",
+};
+
+function checkDatastorePermissions(
+  output: string,
+  expectedPermissions: string[]
+) {
+  const outputObject = JSON.parse(output);
+  const customRoleName = Object.keys(
+    outputObject.resource.google_project_iam_custom_role
+  ).find((name) => name.startsWith("Function_CustomRole"));
+  const customRole =
+    outputObject.resource.google_project_iam_custom_role[customRoleName!];
+
+  const datastorePermissions = customRole.permissions.filter((perm) =>
+    perm.startsWith("datastore.entities.")
+  );
+  expect(datastorePermissions).toEqual(
+    expect.arrayContaining(expectedPermissions)
+  );
+  expect(datastorePermissions).toHaveLength(expectedPermissions.length);
+}
+
+test("counter name valid", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const counter = new Counter(app, "The.Amazing-Counter_01");
+  const output = app.synth();
+
+  // THEN
+  expect(
+    cdktf.Testing.toHaveResourceWithProperties(
+      output,
+      "google_firestore_database",
+      {
+        name: `wing-counter-the-amazing-counter-01-${counter.node.addr.substring(
+          0,
+          8
+        )}`,
+      }
+    )
+  ).toEqual(true);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("replace invalid character from counter name", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const counter = new Counter(app, "The*Amazing%Counter@01");
+  const output = app.synth();
+  console.log(output);
+
+  // THEN
+  expect(
+    cdktf.Testing.toHaveResourceWithProperties(
+      output,
+      "google_firestore_database",
+      {
+        name: `wing-counter-the-amazing-counter-01-${counter.node.addr.substring(
+          0,
+          8
+        )}`,
+      }
+    )
+  ).toEqual(true);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("default counter behavior", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  new Counter(app, "Counter");
+  const output = app.synth();
+
+  // THEN
+  expect(tfResourcesOf(output)).toEqual([
+    "google_firestore_database",
+    "google_project_service",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+});
+
+test("counter with initial value", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  new Counter(app, "Counter", {
+    initial: 9991,
+  });
+  const output = app.synth();
+
+  // THEN
+  expect(tfResourcesOf(output)).toEqual([
+    "google_firestore_database",
+    "google_project_service",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("function with a counter binding", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const counter = new Counter(app, "Counter");
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [CounterInflightMethods.INC] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.inc(2);
+      console.log(val);
+    });
+
+  new Function(app, "Function", handler);
+  const output = app.synth();
+
+  // THEN
+  expect(sanitizeCode(handler._toInflight())).toMatchSnapshot();
+  expect(tfResourcesOf(output)).toEqual([
+    "google_cloudfunctions_function",
+    "google_firestore_database",
+    "google_project_iam_custom_role",
+    "google_project_iam_member",
+    "google_project_service",
+    "google_service_account",
+    "google_storage_bucket",
+    "google_storage_bucket_object",
+    "random_id",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("inc() IAM permissions", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const counter = new Counter(app, "Counter");
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [CounterInflightMethods.INC] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.inc(2);
+      console.log(val);
+    });
+
+  new Function(app, "Function", handler);
+  const output = app.synth();
+
+  // THEN
+  checkDatastorePermissions(output, [
+    "datastore.entities.get",
+    "datastore.entities.create",
+    "datastore.entities.update",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("dec() IAM permissions", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const counter = new Counter(app, "Counter");
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [CounterInflightMethods.DEC] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.dec(2);
+      console.log(val);
+    });
+
+  new Function(app, "Function", handler);
+  const output = app.synth();
+
+  // THEN
+  checkDatastorePermissions(output, [
+    "datastore.entities.get",
+    "datastore.entities.create",
+    "datastore.entities.update",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("peek() IAM permissions", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const counter = new Counter(app, "Counter");
+
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [CounterInflightMethods.PEEK] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.peek();
+      console.log(val);
+    });
+
+  new Function(app, "Function", handler);
+  const output = app.synth();
+
+  // THEN
+  checkDatastorePermissions(output, [
+    "datastore.entities.get",
+    "datastore.entities.create",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
+
+test("set() IAM permissions", () => {
+  // GIVEN
+  const app = new App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const counter = new Counter(app, "Counter");
+  const handler = lift({ my_counter: counter })
+    .grant({ my_counter: [CounterInflightMethods.SET] })
+    .inflight(async (ctx) => {
+      const val = await ctx.my_counter.set(1);
+      console.log(val);
+    });
+
+  new Function(app, "Function", handler);
+  const output = app.synth();
+
+  // THEN
+  checkDatastorePermissions(output, [
+    "datastore.entities.create",
+    "datastore.entities.update",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
diff --git a/libs/wingsdk/test/target-tf-gcp/function.test.ts b/libs/wingsdk/test/target-tf-gcp/function.test.ts
index 68fdcf9ca4f..06fa525b8e0 100644
--- a/libs/wingsdk/test/target-tf-gcp/function.test.ts
+++ b/libs/wingsdk/test/target-tf-gcp/function.test.ts
@@ -1,7 +1,9 @@
+import { readdirSync, readFileSync, existsSync } from "fs";
+import { join } from "path";
 import * as cdktf from "cdktf";
 import { test, expect } from "vitest";
 import { Function } from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { Duration } from "../../src/std";
 import * as tfgcp from "../../src/target-tf-gcp";
 import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util";
@@ -13,20 +15,40 @@ const GCP_APP_OPTS = {
   zone: "us-central1",
 };
 
-const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`;
+const INFLIGHT_CODE = inflight(async (_, name) => {
+  console.log("Hello, " + name);
+});
 
 test("basic function", () => {
   // GIVEN
   const app = new tfgcp.App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
-  new Function(app, "Function", inflight);
+  new Function(app, "Function", INFLIGHT_CODE);
   const output = app.synth();
 
+  const functionOutDir = readdirSync(app.workdir, {
+    recursive: true,
+    withFileTypes: true,
+  }).find((d) => d.isDirectory())!;
+  const packageJson = JSON.parse(
+    readFileSync(
+      join(app.workdir, functionOutDir.name, "package.json"),
+      "utf-8"
+    )
+  );
+  const indexFilename = "index.cjs";
+  expect(packageJson.main).toBe(indexFilename);
+  expect(
+    existsSync(join(app.workdir, functionOutDir.name, indexFilename))
+  ).toBeTruthy();
+
   // THEN
   expect(tfResourcesOf(output)).toEqual([
     "google_cloudfunctions_function",
+    "google_project_iam_custom_role",
+    "google_project_iam_member",
+    "google_project_service",
     "google_service_account",
     "google_storage_bucket",
     "google_storage_bucket_object",
@@ -39,10 +61,9 @@ test("basic function", () => {
 test("basic function with environment variables", () => {
   // GIVEN
   const app = new tfgcp.App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
-  new Function(app, "Function", inflight, {
+  new Function(app, "Function", INFLIGHT_CODE, {
     env: {
       FOO: "BAR",
       BOOM: "BAM",
@@ -70,10 +91,9 @@ test("basic function with environment variables", () => {
 test("basic function with timeout explicitly set", () => {
   // GIVEN
   const app = new tfgcp.App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
-  new Function(app, "Function", inflight, {
+  new Function(app, "Function", INFLIGHT_CODE, {
     timeout: Duration.fromSeconds(30),
   });
   const output = app.synth();
@@ -95,11 +115,10 @@ test("basic function with timeout explicitly set", () => {
 test("basic function with timeout beyond the allowed range", () => {
   // GIVEN
   const app = new tfgcp.App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
   expect(() => {
-    new Function(app, "Function", inflight, {
+    new Function(app, "Function", INFLIGHT_CODE, {
       timeout: Duration.fromSeconds(0),
     });
   }).toThrowErrorMatchingSnapshot();
@@ -108,10 +127,9 @@ test("basic function with timeout beyond the allowed range", () => {
 test("basic function with memory size specified", () => {
   // GIVEN
   const app = new tfgcp.App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
-  new Function(app, "Function", inflight, {
+  new Function(app, "Function", INFLIGHT_CODE, {
     memory: 256,
   });
   const output = app.synth();
@@ -133,11 +151,10 @@ test("basic function with memory size specified", () => {
 test("basic function with memory beyond the allowed range", () => {
   // GIVEN
   const app = new tfgcp.App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
-  const inflight = Testing.makeHandler(INFLIGHT_CODE);
 
   // WHEN
   expect(() => {
-    new Function(app, "Function", inflight, {
+    new Function(app, "Function", INFLIGHT_CODE, {
       memory: 64,
     });
   }).toThrowErrorMatchingSnapshot();
diff --git a/libs/wingsdk/test/target-tf-gcp/schedule.test.ts b/libs/wingsdk/test/target-tf-gcp/schedule.test.ts
new file mode 100644
index 00000000000..bf264c94ddf
--- /dev/null
+++ b/libs/wingsdk/test/target-tf-gcp/schedule.test.ts
@@ -0,0 +1,44 @@
+import { test, expect } from "vitest";
+import { Schedule } from "../../src/cloud";
+import { inflight } from "../../src/core";
+import { Duration } from "../../src/std";
+import * as tfgcp from "../../src/target-tf-gcp";
+import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util";
+
+const GCP_APP_OPTS = {
+  projectId: "my-project",
+  entrypointDir: __dirname,
+  storageLocation: "US",
+  region: "us-central1",
+  zone: "us-central1",
+};
+
+const CODE_LOG_EVENT = inflight(async (_, event) =>
+  console.log("Received: ", event)
+);
+
+test("create a schedule", () => {
+  // GIVEN
+  const app = new tfgcp.App({ outdir: mkdtemp(), ...GCP_APP_OPTS });
+  const schedule = new Schedule(app, "Schedule", {
+    rate: Duration.fromMinutes(2),
+  });
+  schedule.onTick(CODE_LOG_EVENT);
+  const output = app.synth();
+
+  // THEN
+  expect(tfResourcesOf(output)).toEqual([
+    "google_cloud_scheduler_job",
+    "google_cloudfunctions_function",
+    "google_cloudfunctions_function_iam_member",
+    "google_project_iam_custom_role",
+    "google_project_iam_member",
+    "google_project_service",
+    "google_service_account",
+    "google_storage_bucket",
+    "google_storage_bucket_object",
+    "random_id",
+  ]);
+  expect(tfSanitize(output)).toMatchSnapshot();
+  expect(treeJsonOf(app.outdir)).toMatchSnapshot();
+});
diff --git a/libs/wingsdk/test/ui/__snapshots__/ui.test.ts.snap b/libs/wingsdk/test/ui/__snapshots__/ui.test.ts.snap
index aeb7778b62a..013056fac0d 100644
--- a/libs/wingsdk/test/ui/__snapshots__/ui.test.ts.snap
+++ b/libs/wingsdk/test/ui/__snapshots__/ui.test.ts.snap
@@ -2,13 +2,11 @@
 
 exports[`can obtain ui components 1`] = `
 [
-  "@winglang/sdk.std.TestRunner created.",
-  "@winglang/sdk.cloud.Function created.",
-  "@winglang/sdk.cloud.Function created.",
-  "Invoke (payload=\\"\\").",
-  "Invoke (payload=\\"\\").",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.cloud.Function deleted.",
-  "@winglang/sdk.std.TestRunner deleted.",
+  "root/MyClass/Button/Handler started",
+  "root/MyClass/Field/Handler started",
+  "Invoke (payload="").",
+  "Invoke (payload="").",
+  "root/MyClass/Button/Handler stopped",
+  "root/MyClass/Field/Handler stopped",
 ]
 `;
diff --git a/libs/wingsdk/test/ui/ui.test.ts b/libs/wingsdk/test/ui/ui.test.ts
index 92970ed39cf..4ec3c0daa6f 100644
--- a/libs/wingsdk/test/ui/ui.test.ts
+++ b/libs/wingsdk/test/ui/ui.test.ts
@@ -1,7 +1,7 @@
 import { Construct } from "constructs";
 import { expect, test } from "vitest";
 import * as cloud from "../../src/cloud";
-import { Testing } from "../../src/simulator";
+import { inflight } from "../../src/core";
 import { Resource } from "../../src/std";
 import * as ui from "../../src/ui";
 import { SimApp } from "../sim-app";
@@ -16,19 +16,18 @@ test("can obtain ui components", async () => {
       super(scope, id);
 
       const section = new ui.Section(this, "Section", { label: "Overview" });
-      const buttonHandler = Testing.makeHandler(
-        `async handle() { return "button worked"; }`
-      );
       const button = new ui.Button(
         this,
         "Button",
         "Button Label",
-        buttonHandler
+        inflight(async () => "button worked")
       );
-      const fieldHandler = Testing.makeHandler(
-        `async handle() { return "field worked"; }`
+      const field = new ui.Field(
+        this,
+        "Field",
+        "Field Label",
+        inflight(async () => "field worked")
       );
-      const field = new ui.Field(this, "Field", "Field Label", fieldHandler);
       section.add(button, field);
     }
   }
diff --git a/libs/wingsdk/test/util.test.ts b/libs/wingsdk/test/util.test.ts
index 348a54f574d..774de6c5e08 100644
--- a/libs/wingsdk/test/util.test.ts
+++ b/libs/wingsdk/test/util.test.ts
@@ -6,3 +6,13 @@ describe("env", () => {
     expect(Util.env("NODE_ENV")).toBe("test");
   });
 });
+
+describe("ulid", () => {
+  test("ulid", () => {
+    expect(Util.ulid()).toMatch(/^[0-9A-Z]{26}$/);
+  });
+
+  test("seed", () => {
+    expect(Util.ulid({ seed: 1200 })).toMatch(/^000000015G[0-9A-Z]{16}$/);
+  });
+});
diff --git a/libs/wingsdk/test/util.ts b/libs/wingsdk/test/util.ts
index 9397e4e860f..ec1c44d3767 100644
--- a/libs/wingsdk/test/util.ts
+++ b/libs/wingsdk/test/util.ts
@@ -130,11 +130,23 @@ export function directorySnapshot(initialRoot: string) {
       if (f === "node_modules") {
         continue;
       }
+      // skip sandbox entrypoints since they are mostly a duplicate of the original
+      if (f.endsWith(".sandbox.cjs")) {
+        continue;
+      }
+      // skip esbuild output
+      if (f.endsWith(".cjs.bundle")) {
+        continue;
+      }
+
       const relpath = join(subdir, f);
       const abspath = join(root, relpath);
       const key = prefix + relpath;
       if (statSync(abspath).isDirectory()) {
-        visit(root, relpath);
+        // ignore .state files
+        if (basename(abspath) !== ".state") {
+          visit(root, relpath);
+        }
       } else {
         switch (extname(f)) {
           case ".json":
@@ -145,6 +157,7 @@ export function directorySnapshot(initialRoot: string) {
             }
             break;
 
+          case ".cjs":
           case ".js":
             const code = readFileSync(abspath, "utf-8");
             snapshot[key] = sanitizeCode(code);
@@ -165,9 +178,15 @@ export function directorySnapshot(initialRoot: string) {
 type DeepWriteable<T> = { -readonly [P in keyof T]: DeepWriteable<T[P]> };
 
 export function sanitizePaths(json: DeepWriteable<WingSimulatorSchema>) {
-  for (const key of Object.keys(json.types)) {
-    const sanitized = `<ABSOLUTE PATH>/${basename(json.types[key].sourcePath)}`;
-    json.types[key].sourcePath = sanitized;
+  // replace all values in the JSON that look like absolute paths with a placeholder of "<ABSOLUTE PATH>"
+  for (const key of Object.keys(json)) {
+    if (typeof json[key] === "string") {
+      if (isAbsolute(json[key]) && key !== "pathPattern") {
+        json[key] = `<ABSOLUTE PATH>/${basename(json[key])}`;
+      }
+    } else if (typeof json[key] === "object") {
+      json[key] = sanitizePaths(json[key]);
+    }
   }
   return json;
 }
@@ -177,7 +196,7 @@ export function sanitizePaths(json: DeepWriteable<WingSimulatorSchema>) {
  */
 export function sanitizeCode(code: string): string {
   function removeAbsolutePaths(text: string) {
-    const regex = /".+\/libs\/wingsdk\/(.+)"/g;
+    const regex = /"[^"]+?\/libs\/wingsdk\/(.+?)"/g;
 
     // replace first group with static text
     return text.replace(regex, '"[REDACTED]/wingsdk/$1"');
diff --git a/libs/wingsdk/test/util/enhanced-error.test.ts b/libs/wingsdk/test/util/enhanced-error.test.ts
index 507f10106a7..4ce7548abe8 100644
--- a/libs/wingsdk/test/util/enhanced-error.test.ts
+++ b/libs/wingsdk/test/util/enhanced-error.test.ts
@@ -6,7 +6,7 @@ describe("prettyPrintError", () => {
     const result = await prettyPrintError("message");
 
     // no stack trace available
-    expect(result).toMatchInlineSnapshot('"runtime error: message"');
+    expect(result).toMatchInlineSnapshot('"Error: message"');
   });
   test("empty message", async () => {
     const result = await prettyPrintError("");
@@ -20,12 +20,12 @@ describe("prettyPrintError", () => {
     const interestingPart = resultLines.slice(0, 7).join("\n");
     expect(resultLines[8]).toMatch(/^at /);
     expect(interestingPart).toMatchInlineSnapshot(`
-      "runtime error: message
+      "Error: message
          --> test/util/enhanced-error.test.ts:17:43
-         |   expect(result).toBe(\\"\\");
+         |   expect(result).toBe("");
          | });
-         | test(\\"error object\\", async () => {
-      17 |   const result = await prettyPrintError(new Error(\\"message\\"));
+         | test("error object", async () => {
+      17 |   const result = await prettyPrintError(new Error("message"));
          |                                         ^"
     `);
   });
@@ -36,13 +36,13 @@ describe("prettyPrintError", () => {
 
     const interestingPart = result.split("\n").slice(0, 8).join("\n");
     expect(interestingPart).toMatchInlineSnapshot(`
-      "runtime error: message
+      "Error: message
       with extra line
          --> test/util/enhanced-error.test.ts:34:7
          | });
-         | test(\\"stack\\", async () => {
+         | test("stack", async () => {
          |   const result = await prettyPrintError(
-      34 |     new Error(\\"message\\\\nwith extra line\\").stack!
+      34 |     new Error("message\\nwith extra line").stack!
          |     ^"
     `);
   });
diff --git a/libs/wingsdk/test/util/equality.test.ts b/libs/wingsdk/test/util/equality.test.ts
new file mode 100644
index 00000000000..f5c1c110116
--- /dev/null
+++ b/libs/wingsdk/test/util/equality.test.ts
@@ -0,0 +1,224 @@
+import { describe, it, expect } from "vitest";
+import { deepStrictEqual } from "../../src/util/equality";
+
+describe("deepStrictEqual", () => {
+  // Primitive types
+  it("should return true for equal numbers", () => {
+    expect(deepStrictEqual(1, 1)).toBe(true);
+  });
+
+  it("should return false for different numbers", () => {
+    expect(deepStrictEqual(1, 2)).toBe(false);
+  });
+
+  it("should return true for equal strings", () => {
+    expect(deepStrictEqual("hello", "hello")).toBe(true);
+  });
+
+  it("should return false for different strings", () => {
+    expect(deepStrictEqual("hello", "world")).toBe(false);
+  });
+
+  it("should return true for equal booleans", () => {
+    expect(deepStrictEqual(true, true)).toBe(true);
+  });
+
+  it("should return false for different booleans", () => {
+    expect(deepStrictEqual(true, false)).toBe(false);
+  });
+
+  it("should return true for equal nulls", () => {
+    expect(deepStrictEqual(null, null)).toBe(true);
+  });
+
+  it("should return false for null and undefined", () => {
+    expect(deepStrictEqual(null, undefined)).toBe(false);
+  });
+
+  it("should return true for equal undefineds", () => {
+    expect(deepStrictEqual(undefined, undefined)).toBe(true);
+  });
+
+  it("should return false for undefined and a number", () => {
+    expect(deepStrictEqual(undefined, 1)).toBe(false);
+  });
+
+  // Object and array types
+  it("should return true for equal arrays", () => {
+    expect(deepStrictEqual([1, 2, 3], [1, 2, 3])).toBe(true);
+  });
+
+  it("should return false for arrays with different elements", () => {
+    expect(deepStrictEqual([1, 2, 3], [1, 2, 4])).toBe(false);
+  });
+
+  it("should return true for equal objects", () => {
+    expect(deepStrictEqual({ a: 1, b: 2 }, { a: 1, b: 2 })).toBe(true);
+  });
+
+  it("should return false for objects with different properties", () => {
+    expect(deepStrictEqual({ a: 1, b: 2 }, { a: 1, b: 3 })).toBe(false);
+  });
+
+  it("should return true for nested objects with same structure and values", () => {
+    expect(deepStrictEqual({ a: { b: 2 } }, { a: { b: 2 } })).toBe(true);
+  });
+
+  it("should return false for nested objects with different values", () => {
+    expect(deepStrictEqual({ a: { b: 2 } }, { a: { b: 3 } })).toBe(false);
+  });
+
+  // Special objects and edge cases
+  it("should return true for equal Date objects", () => {
+    expect(
+      deepStrictEqual(new Date("2020-01-01"), new Date("2020-01-01"))
+    ).toBe(true);
+  });
+
+  it("should return false for different Date objects", () => {
+    expect(
+      deepStrictEqual(new Date("2020-01-01"), new Date("2021-01-01"))
+    ).toBe(false);
+  });
+
+  it("should return true for equal RegExp objects", () => {
+    expect(deepStrictEqual(/abc/i, /abc/i)).toBe(true);
+  });
+
+  it("should return false for different RegExp objects", () => {
+    expect(deepStrictEqual(/abc/i, /abc/)).toBe(false);
+  });
+
+  it("should return false for different types", () => {
+    expect(deepStrictEqual(1, "1")).toBe(false);
+    expect(deepStrictEqual(1, true)).toBe(false);
+    expect(deepStrictEqual({}, [])).toBe(false);
+  });
+
+  // NaN equality
+  it("should return true for NaN compared to NaN", () => {
+    expect(deepStrictEqual(NaN, NaN)).toBe(true);
+  });
+
+  // Symbol comparison
+  it("should return true for equal Symbols", () => {
+    const sym1 = Symbol("foo");
+    const sym2 = Symbol("foo");
+    expect(deepStrictEqual(sym1, sym1)).toBe(true);
+  });
+
+  it("should return false for different Symbols", () => {
+    const sym1 = Symbol("foo");
+    const sym2 = Symbol("foo");
+    expect(deepStrictEqual(sym1, sym2)).toBe(false);
+  });
+
+  // Sets
+  it("should return true for equal Sets", () => {
+    expect(deepStrictEqual(new Set([1, 2, 3]), new Set([1, 2, 3]))).toBe(true);
+  });
+
+  it("should return false for Sets with different elements", () => {
+    expect(deepStrictEqual(new Set([1, 2, 3]), new Set([1, 2, 4]))).toBe(false);
+  });
+
+  // Maps
+  it("should return true for equal Maps", () => {
+    expect(
+      deepStrictEqual(
+        new Map([
+          [1, "a"],
+          [2, "b"],
+        ]),
+        new Map([
+          [1, "a"],
+          [2, "b"],
+        ])
+      )
+    ).toBe(true);
+  });
+
+  it("should return false for Maps with different elements", () => {
+    expect(
+      deepStrictEqual(
+        new Map([
+          [1, "a"],
+          [2, "b"],
+        ]),
+        new Map([
+          [1, "a"],
+          [2, "c"],
+        ])
+      )
+    ).toBe(false);
+  });
+
+  // Nested arrays, maps, and sets
+  it("should return true for nested arrays", () => {
+    expect(deepStrictEqual([1, [2, [3]]], [1, [2, [3]]])).toBe(true);
+  });
+
+  it("should return false for nested arrays with different elements", () => {
+    expect(deepStrictEqual([1, [2, [3]]], [1, [2, [4]]])).toBe(false);
+  });
+
+  it("should return true for nested Sets", () => {
+    expect(
+      deepStrictEqual(
+        new Set([1, new Set([2, new Set([3])])]),
+        new Set([1, new Set([2, new Set([3])])])
+      )
+    ).toBe(true);
+  });
+
+  it("should return false for nested Sets with different elements", () => {
+    expect(
+      deepStrictEqual(
+        new Set([1, new Set([2, new Set([3])])]),
+        new Set([1, new Set([2, new Set([4])])])
+      )
+    ).toBe(false);
+  });
+
+  it("should return true for nested Maps", () => {
+    expect(
+      deepStrictEqual(
+        new Map([[1, new Map([[2, new Map([[3, "value"]])]])]]),
+        new Map([[1, new Map([[2, new Map([[3, "value"]])]])]])
+      )
+    ).toBe(true);
+  });
+
+  it("should return false for nested Maps with different elements", () => {
+    expect(
+      deepStrictEqual(
+        new Map([[1, new Map([[2, new Map([[3, "value"]])]])]]),
+        new Map([[1, new Map([[2, new Map([[3, "different"]])]])]])
+      )
+    ).toBe(false);
+  });
+
+  it("should return true for combinations of nested structures", () => {
+    const obj1 = {
+      a: [new Set([1, new Map([[2, "value"]])])],
+      b: new Date("2020-01-01"),
+    };
+    const obj2 = {
+      a: [new Set([1, new Map([[2, "value"]])])],
+      b: new Date("2020-01-01"),
+    };
+    expect(deepStrictEqual(obj1, obj2)).toBe(true);
+  });
+
+  it("should return false for combinations of nested structures with different values", () => {
+    const obj1 = {
+      a: [new Set([1, new Map([[2, "value"]])])],
+      b: new Date("2020-01-01"),
+    };
+    const obj2 = {
+      a: [new Set([1, new Map([[2, "different"]])])],
+      b: new Date("2020-01-01"),
+    };
+    expect(deepStrictEqual(obj1, obj2)).toBe(false);
+  });
+});
diff --git a/libs/wingsdk/test/util/platform-specific.test.ts b/libs/wingsdk/test/util/platform-specific.test.ts
deleted file mode 100644
index 410a2c0b66c..00000000000
--- a/libs/wingsdk/test/util/platform-specific.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { Construct } from "constructs";
-import { beforeEach, describe, expect, test } from "vitest";
-import { getPlatformSpecificValues } from "../../src/util/platform-specific";
-
-class MyApp extends Construct {
-  constructor() {
-    super(undefined as any, "root");
-  }
-}
-
-class MyResource extends Construct {
-  constructor(scope: Construct, id: string) {
-    super(scope, id);
-  }
-}
-
-describe("getPlatformSpecificValues", () => {
-  beforeEach(() => {
-    delete process.env.WING_VALUES;
-    delete process.env.WING_VALUES_FILE;
-  });
-
-  test("get single value form command", () => {
-    // GIVEN
-    const app = new MyApp();
-    const resource = new MyResource(app, "my-resource");
-    process.env.WING_VALUES = "root/my-resource.number=123";
-    const result = getPlatformSpecificValues(resource, "number");
-    // THEN
-    expect(result).toStrictEqual({ number: "123" });
-  });
-
-  test("get single value from yaml file", () => {
-    // GIVEN
-    const app = new MyApp();
-    const resource = new MyResource(app, "my-resource");
-    process.env.WING_VALUES_FILE = __dirname + "/single-number-value.yaml";
-    const result = getPlatformSpecificValues(resource, "number");
-    // THEN
-    expect(result).toStrictEqual({ number: "123" });
-  });
-
-  test("get single optional value from command", () => {
-    // GIVEN
-    const app = new MyApp();
-    const resource = new MyResource(app, "my-resource");
-    process.env.WING_VALUES = "root/my-resource.number=123";
-    const numberResult = getPlatformSpecificValues(resource, "string||number");
-    process.env.WING_VALUES = "root/my-resource.string=abc";
-    const stringResult = getPlatformSpecificValues(resource, "string||number");
-    // THEN
-    expect(numberResult).toStrictEqual({ string: undefined, number: "123" });
-    expect(stringResult).toStrictEqual({ string: "abc", number: undefined });
-  });
-
-  test("get single optional value from yaml file", () => {
-    // GIVEN
-    const app = new MyApp();
-    const resource = new MyResource(app, "my-resource");
-    process.env.WING_VALUES_FILE = __dirname + "/single-number-value.yaml";
-    const numberResult = getPlatformSpecificValues(resource, "string||number");
-    process.env.WING_VALUES_FILE = __dirname + "/single-string-value.yaml";
-    const stringResult = getPlatformSpecificValues(resource, "string||number");
-    // THEN
-    expect(numberResult).toStrictEqual({ number: "123" });
-    expect(stringResult).toStrictEqual({ string: "abc" });
-  });
-
-  test("get multiple values from command", () => {
-    // GIVEN
-    process.env.WING_VALUES =
-      "root/my-resource.number=123,root/my-resource.string=abc";
-    const app = new MyApp();
-    const resource = new MyResource(app, "my-resource");
-    const result = getPlatformSpecificValues(resource, "number", "string");
-    // THEN
-    expect(result).toStrictEqual({ number: "123", string: "abc" });
-  });
-
-  test("get multiple values from file", () => {
-    // GIVEN
-    process.env.WING_VALUES_FILE = __dirname + "/multiple-values.yaml";
-    const app = new MyApp();
-    const resource = new MyResource(app, "my-resource");
-    const result = getPlatformSpecificValues(resource, "number", "string");
-    // THEN
-    expect(result).toStrictEqual({ number: "123", string: "abc" });
-  });
-
-  test("throw exception if no value is provided", () => {
-    expect(() => {
-      // GIVEN
-      const app = new MyApp();
-      const resource = new MyResource(app, "my-resource");
-      getPlatformSpecificValues(resource, "number", "string||bool");
-    }).toThrowError(`
-  - 'number' is missing from root/my-resource
-  - 'string' or 'bool' is missing from root/my-resource
-
-These are required properties of platform-specific types. You can set these values
-either through '-v | --value' switches or '--values' file.`);
-  });
-});
diff --git a/libs/wingsdk/tsconfig.dev.json b/libs/wingsdk/tsconfig.dev.json
index cdc906da4c0..c05ef28558c 100644
--- a/libs/wingsdk/tsconfig.dev.json
+++ b/libs/wingsdk/tsconfig.dev.json
@@ -31,6 +31,11 @@
     ".projenrc.js",
     "src/**/*.ts",
     "test/**/*.ts",
+    "src/**/*.ts",
+    "test/**/*.ts",
+    "*.ts",
+    "*.mts",
+    "scripts/*.mts",
     ".projenrc.ts",
     "projenrc/**/*.ts"
   ],
diff --git a/libs/wingsdk/tsconfig.test.json b/libs/wingsdk/tsconfig.test.json
index 05fe632f7db..5fdf27ffedf 100644
--- a/libs/wingsdk/tsconfig.test.json
+++ b/libs/wingsdk/tsconfig.test.json
@@ -1,27 +1,12 @@
 {
+  "extends": "./tsconfig.dev.json",
   "compilerOptions": {
-    "alwaysStrict": true,
-    "declaration": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "lib": ["es2019", "dom"],
-    "module": "CommonJS",
-    "noEmitOnError": false,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "resolveJsonModule": true,
-    "strict": true,
-    "strictNullChecks": true,
-    "strictPropertyInitialization": true,
-    "stripInternal": true,
-    "target": "ES2019"
+    "declaration": false,
+    "inlineSources": false,
+    "noEmitOnError": true,
+    "skipLibCheck": true,
+    "isolatedModules": true,
   },
-  "include": ["src/**/*.ts", "src/**/*.on*.inflight.ts"],
-  "exclude": ["node_modules"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/.gen/**"]
 }
diff --git a/libs/wingsdk/turbo.json b/libs/wingsdk/turbo.json
index 2c3212798ad..7072a1a9716 100644
--- a/libs/wingsdk/turbo.json
+++ b/libs/wingsdk/turbo.json
@@ -7,19 +7,19 @@
       "outputs": ["src/.gen/**"]
     },
     "compile": {
-      "dependsOn": ["pre-compile"],
+      "dependsOn": ["^compile", "pre-compile"],
       "outputs": ["lib/**", ".jsii"]
     },
     "post-compile": {
       "dependsOn": ["^compile", "compile"],
-      "inputs": [".jsii", "src/**/*.md"],
+      "inputs": [".jsii", "src/**/*.md", "scripts/**"],
       "outputs": ["../../docs/docs/04-standard-library/*/*.md"]
     },
     "eslint": {
       "dependsOn": ["pre-compile"]
     },
     "test": {
-      "dependsOn": ["pre-compile"]
+      "dependsOn": ["compile"]
     },
     "package": {
       "outputs": ["../../dist/winglang-sdk-*.tgz"]
diff --git a/libs/wingsdk/vitest.config.ts b/libs/wingsdk/vitest.config.mts
similarity index 100%
rename from libs/wingsdk/vitest.config.ts
rename to libs/wingsdk/vitest.config.mts
diff --git a/libs/wingtunnels/.gitignore b/libs/wingtunnels/.gitignore
new file mode 100644
index 00000000000..c3af857904e
--- /dev/null
+++ b/libs/wingtunnels/.gitignore
@@ -0,0 +1 @@
+lib/
diff --git a/libs/wingtunnels/.prettierrc.json b/libs/wingtunnels/.prettierrc.json
new file mode 100644
index 00000000000..84c85a38828
--- /dev/null
+++ b/libs/wingtunnels/.prettierrc.json
@@ -0,0 +1,3 @@
+{
+  "overrides": []
+}
diff --git a/libs/wingtunnels/package.json b/libs/wingtunnels/package.json
new file mode 100644
index 00000000000..94036fc3f14
--- /dev/null
+++ b/libs/wingtunnels/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@winglang/wingtunnels",
+  "version": "0.0.0",
+  "author": {
+    "name": "Wing Cloud",
+    "email": "ping@wing.cloud",
+    "organization": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/winglang/wing.git",
+    "directory": "libs/wingtunnels"
+  },
+  "description": "Tunnels Library for Wing",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org",
+    "tag": "latest"
+  },
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "license": "MIT",
+  "dependencies": {
+    "@types/debug": "^4.1.9",
+    "@types/node": "^20.11.19",
+    "@types/ws": "^8.5.7",
+    "debug": "^4.3.4",
+    "ws": "^8.14.2"
+  },
+  "devDependencies": {
+    "bump-pack": "workspace:^",
+    "typescript": "^5.3.3",
+    "tsup": "^6.7.0",
+    "vitest": "^1.6.0"
+  },
+  "scripts": {
+    "compile": "tsup",
+    "package": "bump-pack -b",
+    "test": "vitest run --update"
+  },
+  "files": [
+    "lib"
+  ],
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/libs/wingtunnels/src/events.ts b/libs/wingtunnels/src/events.ts
new file mode 100644
index 00000000000..110e1486def
--- /dev/null
+++ b/libs/wingtunnels/src/events.ts
@@ -0,0 +1,8 @@
+import { EventEmitter } from "node:events";
+
+export const eventHandler = new EventEmitter();
+
+export enum Events {
+  UrlAssigned = "URL_ASSIGNED",
+  SubdomainInUse = "SUBDOMAIN_IN_USE",
+}
diff --git a/libs/wingtunnels/src/forward-request.ts b/libs/wingtunnels/src/forward-request.ts
new file mode 100644
index 00000000000..37836f5d114
--- /dev/null
+++ b/libs/wingtunnels/src/forward-request.ts
@@ -0,0 +1,105 @@
+import { type WebSocket } from "ws";
+import { request, RequestOptions, IncomingMessage } from "http";
+import { request as httpsRequest } from "https";
+import { ForwardRequestMessage } from "./messages.js";
+import { forwardResponse } from "./forward-response.js";
+import debug from "debug";
+import { format, parse } from "url";
+const log = debug("wing:tunnels");
+
+export interface ForwardRequestMessageProps {
+  ws: WebSocket;
+  port: number;
+  message: ForwardRequestMessage;
+  hostname?: string;
+}
+
+export default async function forwardRequest({ message, ws, port, hostname }: ForwardRequestMessageProps) {
+  const { requestId, path, headers, method, body } = message;
+
+  let requestBody : Buffer | undefined = undefined;
+  if (body) {
+    requestBody = Buffer.from(body, "base64");
+    headers["Content-length"] = requestBody.length.toString();
+  }
+
+  let hs = hostname;
+  let p = path;
+  let h = headers;
+  let requestFn = request;
+
+  // For testing
+  if (hs?.includes("https://")) {
+    hs = hs.replace("https://", "");
+    requestFn = httpsRequest;
+
+    if (hs?.includes("/")) {
+      const parts = hs.split("/");
+      hs = parts[0];
+      p = "/" + parts.slice(1).join("/")
+      if (path !== "/") {
+        p = p + path;
+      }
+    }
+
+    delete h["Via"];
+    delete h["Host"]
+  }
+
+  const url = parse(format({
+    protocol: "http",
+    hostname: hs ?? "localhost",
+    pathname: p,
+    query: message.query,
+  }), true);
+
+  const requestOptions : RequestOptions = {
+    hostname: url.hostname,
+    method,
+    port,
+    path: url.path,
+    headers: h,
+  };
+
+  log("request", requestOptions, body);
+
+  const req = requestFn(requestOptions, (response : IncomingMessage) => {
+    log("response status", response.statusCode);
+    let responseBody : Buffer;
+    response.on('data', (chunk: Buffer) => {
+      if (typeof responseBody === 'undefined') {
+        responseBody = chunk;
+      } else {
+        responseBody = Buffer.concat([responseBody, chunk]);
+      }
+    });
+
+    response.on("error", (err) => {
+      log("response error", err.message);
+    });
+
+    response.on('end', () => {
+      log("response", response.statusCode, response.headers, responseBody);
+      forwardResponse({ ws, message: {
+        action: "FORWARD_RESPONSE",
+        requestId,
+        status: response.statusCode,
+        path,
+        method,
+        headers: response.headers,
+        body: Buffer.isBuffer(responseBody) ? responseBody.toString('base64') : undefined
+      }});
+    })
+  });
+
+  if (requestBody && body) {
+    req.write(requestBody);
+    log("request body write", requestBody)
+  }
+
+  req.on('error', (error : any) => {
+    log("request error", error);
+  });
+
+  req.end();
+}
\ No newline at end of file
diff --git a/libs/wingtunnels/src/forward-response.ts b/libs/wingtunnels/src/forward-response.ts
new file mode 100644
index 00000000000..8e4cb2c6926
--- /dev/null
+++ b/libs/wingtunnels/src/forward-response.ts
@@ -0,0 +1,11 @@
+import { type WebSocket } from "ws";
+import { ForwardResponseMessage } from "./messages.js";
+
+export interface ForwardRequestMessageProps {
+  ws: WebSocket;
+  message: ForwardResponseMessage;
+}
+
+export const forwardResponse = ({ws, message}: ForwardRequestMessageProps) => {
+  ws.send(JSON.stringify(message));
+}
diff --git a/libs/wingtunnels/src/index.ts b/libs/wingtunnels/src/index.ts
new file mode 100644
index 00000000000..32eeefd402f
--- /dev/null
+++ b/libs/wingtunnels/src/index.ts
@@ -0,0 +1,55 @@
+import { WebSocket } from "ws";
+import { initialize } from "./initialize.js";
+import { eventHandler, Events } from "./events.js";
+import { onMessage } from "./onmessage.js";
+import { ErrorMessage, InitializedMessage } from "./messages.js";
+
+const WING_CLOUD_URL = "wss://xhvezvbg16.execute-api.us-east-1.amazonaws.com/prod";
+
+export interface ConnectProps {
+  subdomain?: string;
+}
+
+export interface ConnectResponse {
+  url: string;
+  subdomain: string;
+  close: () => void;
+}
+
+export const connect = (targetUrl: string, props?: ConnectProps): Promise<ConnectResponse> => {
+  return new Promise((resolve, reject) => {
+    try {
+      const url = new URL(targetUrl);
+      const ws = new WebSocket(process.env["WING_TUNNELS_URL"] ?? WING_CLOUD_URL);
+      if (ws.readyState === 1) {
+        initialize({ ws, subdomain: props?.subdomain });
+      } else {
+        ws.on("open", () => {
+          initialize({ ws, subdomain: props?.subdomain });
+        });
+      }
+  
+      ws.on("message", (data) => {
+        const onMessageImpl = onMessage({ ws, port: parseInt(url.port), hostname: url.hostname });
+        onMessageImpl(data);
+      });
+
+      ws.on("error", (error) => {
+        reject(error);
+      });
+  
+      eventHandler.on(Events.UrlAssigned, ({ url, subdomain }: InitializedMessage) => {
+        resolve({ url, subdomain, close: () => {
+          ws.close();
+        } });
+      });
+
+      eventHandler.on(Events.SubdomainInUse, ({ message }: ErrorMessage) => {
+        ws.close();
+        reject(message);
+      });
+    } catch (error) {
+      reject(error);
+    }
+  })
+};
diff --git a/libs/wingtunnels/src/initialize.ts b/libs/wingtunnels/src/initialize.ts
new file mode 100644
index 00000000000..d68d087e4d3
--- /dev/null
+++ b/libs/wingtunnels/src/initialize.ts
@@ -0,0 +1,16 @@
+import { type WebSocket } from "ws";
+import { InitializeMessage } from "./messages.js";
+
+export interface InitializeProps {
+  subdomain: string | undefined;
+  ws: WebSocket;
+}
+
+export const initialize = ({ ws, subdomain }: InitializeProps) => {
+  const message: InitializeMessage = {
+    action: "INITIALIZE",
+    subdomain
+  }
+
+  ws.send(JSON.stringify(message));
+}
diff --git a/libs/wingtunnels/src/messages.ts b/libs/wingtunnels/src/messages.ts
new file mode 100644
index 00000000000..20150e88cc2
--- /dev/null
+++ b/libs/wingtunnels/src/messages.ts
@@ -0,0 +1,39 @@
+export type Action = "INITIALIZE" | "INITIALIZED" | "FORWARD_REQUEST" | "FORWARD_RESPONSE" | "ERROR";
+export type ErrorType = "SUBDOMAIN_IN_USE";
+
+export interface InitializeMessage {
+  action: "INITIALIZE";
+  subdomain: string | undefined;
+}
+
+export interface InitializedMessage {
+  action: "INITIALIZED";
+  subdomain: string;
+  url: string;
+}
+
+export interface ForwardRequestMessage {
+  action: "FORWARD_REQUEST";
+  requestId: string;
+  path: string;
+  method: string;
+  headers: Record<string, string | string[] | undefined>;
+  query: Record<string, string | string[] | undefined>;
+  body: string | undefined;
+}
+
+export interface ForwardResponseMessage {
+  action: "FORWARD_RESPONSE";
+  requestId: string;
+  status: number | undefined;
+  path: string;
+  method: string;
+  headers: Record<string, string | string[] | undefined>;
+  body: string | undefined;
+}
+
+export interface ErrorMessage {
+  action: "ERROR";
+  type: ErrorType;
+  message: string;
+}
diff --git a/libs/wingtunnels/src/onmessage.ts b/libs/wingtunnels/src/onmessage.ts
new file mode 100644
index 00000000000..680413f4d94
--- /dev/null
+++ b/libs/wingtunnels/src/onmessage.ts
@@ -0,0 +1,37 @@
+import { type WebSocket, type RawData } from "ws";
+import { Action, ForwardRequestMessage, InitializedMessage, ErrorMessage } from "./messages.js";
+import { Events, eventHandler } from "./events.js";
+import forwardRequest from "./forward-request.js";
+
+export interface OnMessageProps {
+  ws: WebSocket;
+  port: number;
+  hostname?: string;
+}
+
+export const onMessage = ({ ws, port, hostname }: OnMessageProps) => {
+  return (data: RawData) => {
+    const raw = data.toString("utf8");
+    try {
+      const json = JSON.parse(raw);
+      const action: Action = json.action;
+      if (action === "INITIALIZED") {
+        const msg = json as InitializedMessage;
+        eventHandler.emit(Events.UrlAssigned, msg);
+      } else if (action === "FORWARD_REQUEST") {
+        const msg = json as ForwardRequestMessage;
+        forwardRequest({ message: msg, ws, port, hostname });
+      } else if (action === "ERROR") {
+        const msg = json as ErrorMessage;
+        if (msg.type === "SUBDOMAIN_IN_USE") {
+          eventHandler.emit(Events.SubdomainInUse, msg);
+        } else {
+          console.error("onMessage error", msg.message);
+          ws.close();
+        }
+      }
+    } catch (err: any) {
+      console.error("onMessage failure", raw, err.toString());
+    }
+  }
+}
diff --git a/libs/wingtunnels/test/tunnels.test.ts b/libs/wingtunnels/test/tunnels.test.ts
new file mode 100644
index 00000000000..d0512e46fcc
--- /dev/null
+++ b/libs/wingtunnels/test/tunnels.test.ts
@@ -0,0 +1,59 @@
+import { test, describe, expect } from "vitest";
+import { WebSocketServer, WebSocket } from "ws";
+import { connect } from "../src/index.js";
+import * as http from "http";
+
+describe("wing tunnels", async () => {
+  test("will forward a message", async () => {
+    process.env["WING_TUNNELS_URL"] = "ws://localhost:4567";
+    const wss = new WebSocketServer({ port: 4567 });
+    let _ws: WebSocket | undefined = undefined;
+    const messages = new Promise((resolve) => {
+      wss.on("connection", (ws) => {
+        _ws = ws;
+        ws.on("message", (message) => {
+          const data = JSON.parse(message.toString("utf8"));
+          if (data.action === "INITIALIZE") {
+            expect(data).toStrictEqual({"action":"INITIALIZE"});
+            ws.send(JSON.stringify({
+              url: "https://example.com",
+              subdomain: "example",
+              action: "INITIALIZED"
+            }));
+          } else if (data.action === "FORWARD_RESPONSE") {
+            expect(data.requestId).toBe("123");
+            expect(data.status).toBe(200);
+            resolve(true);
+          } else {
+            throw "Invalid action"
+          }
+        });
+      });
+    });
+
+    const server = http.createServer(function (req, res) {
+      if (req.method == "GET") {
+        res.writeHead(200, {"Content-Type": "text/plain"});
+        res.end("OK");
+      }
+    }).listen(4568);
+
+    const res = await connect("http://localhost:4568");
+    expect(res.url).toBe("https://example.com");
+
+    if (_ws !== undefined) {
+      const ws = _ws as WebSocket;
+      ws.send(JSON.stringify({
+        action: "FORWARD_REQUEST",
+        requestId: "123",
+        path: "/",
+        method: "GET",
+      }));
+    }
+
+    await messages;
+
+    wss.close();
+    server.close();
+  });
+});
\ No newline at end of file
diff --git a/libs/wingtunnels/tsconfig.json b/libs/wingtunnels/tsconfig.json
new file mode 100644
index 00000000000..0761c4952df
--- /dev/null
+++ b/libs/wingtunnels/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "strict": true,
+  },
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts",
+  ],
+  "exclude": []
+}
diff --git a/libs/wingtunnels/tsup.config.ts b/libs/wingtunnels/tsup.config.ts
new file mode 100644
index 00000000000..2c2adf316ca
--- /dev/null
+++ b/libs/wingtunnels/tsup.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  bundle: true,
+  dts: true,
+  format: "cjs",
+  outDir: "lib",
+});
diff --git a/libs/wingtunnels/turbo.json b/libs/wingtunnels/turbo.json
new file mode 100644
index 00000000000..4ed944778fc
--- /dev/null
+++ b/libs/wingtunnels/turbo.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "compile": {
+      "outputs": ["lib/**"]
+    },
+    "test": {
+      "dependsOn": ["compile"]
+    },
+    "package": {
+      "dependsOn": ["compile"],
+      "outputs": ["../../dist/winglang-wingtunnels-*.tgz"]
+    }
+  }
+}
diff --git a/package.json b/package.json
index a1b09646a32..a3d93692d8f 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,10 @@
   "name": "@winglang/monorepo",
   "private": true,
   "devDependencies": {
+    "@winglang/compatibility-spy": "workspace:^",
     "bump-pack": "workspace:^",
     "generate-workspace": "workspace:^",
-    "turbo": "^1.10.14"
+    "turbo": "^1.13.3"
   },
   "scripts": {
     "build": "turbo compile post-compile lint eslint test package",
@@ -19,8 +20,8 @@
     "wing": "turbo compile --filter=winglang --output-logs=errors-only && ./apps/wing/bin/wing"
   },
   "volta": {
-    "node": "18.16.0",
-    "pnpm": "8.6.5"
+    "node": "20.11.1",
+    "pnpm": "8.15.1"
   },
   "pnpm": {
     "overrides": {
@@ -28,9 +29,9 @@
     },
     "patchedDependencies": {
       "wasi-js@1.7.3": "patches/wasi-js@1.7.3.patch",
-      "jsii@5.0.11": "patches/jsii@5.0.11.patch",
-      "esbuild-wasm@0.18.20": "patches/esbuild-wasm@0.18.20.patch",
-      "mime@3.0.0": "patches/mime@3.0.0.patch"
+      "mime@3.0.0": "patches/mime@3.0.0.patch",
+      "protobufjs@7.2.5": "patches/protobufjs@7.2.5.patch",
+      "jsii@5.3.11": "patches/jsii@5.3.11.patch"
     }
   }
 }
diff --git a/patches/esbuild-wasm@0.18.20.patch b/patches/esbuild-wasm@0.18.20.patch
deleted file mode 100644
index cbb3d3d7c71..00000000000
--- a/patches/esbuild-wasm@0.18.20.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/main.js b/lib/main.js
-index 3001b4dca248b9786aa35b5cbd9589f927758c6d..9cd981adcb53de28d68fcf9d0a1e21a12a168f64 100644
---- a/lib/main.js
-+++ b/lib/main.js
-@@ -1940,7 +1940,7 @@ var ensureServiceIsRunning = () => {
-   let [command, args] = esbuildCommandAndArgs();
-   let child = child_process.spawn(command, args.concat(`--service=${"0.18.20"}`, "--ping"), {
-     windowsHide: true,
--    stdio: ["pipe", "pipe", "inherit"],
-+    stdio: ["pipe", "pipe", "pipe"],
-     cwd: defaultWD
-   });
-   let { readFromStdout, afterClose, service } = createChannel({
-@@ -2106,7 +2106,7 @@ error: ${text}`);
-       throw new Error(`Internal error: Expected id ${id} but got id ${id2}`);
-     if (reject) {
-       applyProperties(reject, properties);
--      throw reject;
-+      return fakeBuildError(reject);
-     }
-     return resolve;
-   };
\ No newline at end of file
diff --git a/patches/jsii@5.0.11.patch b/patches/jsii@5.0.11.patch
deleted file mode 100644
index 40c4e819c5e..00000000000
--- a/patches/jsii@5.0.11.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/lib/assembler.js b/lib/assembler.js
-index c1fa48219b514c312d5894c9cbf557ac3d8eeed7..9cf0ce22901558d6219fed5a303ae76954561744 100644
---- a/lib/assembler.js
-+++ b/lib/assembler.js
-@@ -1572,7 +1572,12 @@ class Assembler {
-             return { type: spec.CANONICAL_ANY };
-         }
-         if (type.symbol.name === 'Array') {
--            return { type: _arrayType.call(this) };
-+            // "Array" only refers to the real JS array type if it has a type parameter
-+            // this is a hack so we can export classes named Array
-+            const typeRef = type;
-+            if (typeRef.typeArguments && typeRef.typeArguments.length === 1) {
-+                return { type: _arrayType.call(this) };
-+            }
-         }
-         if (type.symbol.name === '__type' && type.symbol.members) {
-             return { type: _mapType.call(this) };
-@@ -1583,9 +1588,9 @@ class Assembler {
-                 this._diagnostics.push(jsii_diagnostic_1.JsiiDiagnostic.JSII_1002_UNSPECIFIED_PROMISE.create(declaration));
-                 return { type: spec.CANONICAL_ANY };
-             }
--            return {
--                type: this._typeReference(typeRef.typeArguments[0], declaration, purpose),
--            };
-+            // (hacky) allow optionals to be returned from async methods
-+            // see https://github.com/aws/jsii/issues/4035
-+            return this._optionalValue(typeRef.typeArguments[0], declaration, purpose);
-         }
-         const fqn = this._getFQN(type, declaration, purpose, isThisType);
-         if (fqn == null) {
-diff --git a/lib/compiler.js b/lib/compiler.js
-index cb5587e1aa778be23eaba65ceeab8b2d99ce90b1..867d4c5b330a34bdcbe491e816f7b63c941eeb69 100644
---- a/lib/compiler.js
-+++ b/lib/compiler.js
-@@ -17,7 +17,8 @@ const BASE_COMPILER_OPTIONS = {
-     declaration: true,
-     experimentalDecorators: true,
-     incremental: true,
--    lib: ['lib.es2020.d.ts'],
-+    lib: ['lib.es2020.d.ts','lib.dom.d.ts'],
-+    esModuleInterop: true,
-     module: ts.ModuleKind.CommonJS,
-     noEmitOnError: true,
-     noFallthroughCasesInSwitch: true,
\ No newline at end of file
diff --git a/patches/jsii@5.3.11.patch b/patches/jsii@5.3.11.patch
new file mode 100644
index 00000000000..236ab083470
--- /dev/null
+++ b/patches/jsii@5.3.11.patch
@@ -0,0 +1,45 @@
+diff --git a/lib/assembler.js b/lib/assembler.js
+index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766af97ed9c1 100644
+--- a/lib/assembler.js
++++ b/lib/assembler.js
+@@ -1572,7 +1572,12 @@ class Assembler {
+             return { type: spec.CANONICAL_ANY };
+         }
+         if (type.symbol.name === 'Array') {
+-            return { type: _arrayType.call(this) };
++            // "Array" only refers to the real JS array type if it has a type parameter
++            // this is a hack so we can export classes named Array
++            const typeRef = type;
++            if (typeRef.typeArguments && typeRef.typeArguments.length === 1) {
++                return { type: _arrayType.call(this) };
++            }
+         }
+         if (type.symbol.name === '__type' && type.symbol.members) {
+             return { type: _mapType.call(this) };
+@@ -1583,9 +1588,9 @@ class Assembler {
+                 this._diagnostics.push(jsii_diagnostic_1.JsiiDiagnostic.JSII_1002_UNSPECIFIED_PROMISE.create(declaration));
+                 return { type: spec.CANONICAL_ANY };
+             }
+-            return {
+-                type: this._typeReference(typeRef.typeArguments[0], declaration, purpose),
+-            };
++            // (hacky) allow optionals to be returned from async methods
++            // see https://github.com/aws/jsii/issues/4035
++            return this._optionalValue(typeRef.typeArguments[0], declaration, purpose);
+         }
+         const fqn = this._getFQN(type, declaration, purpose, isThisType);
+         if (fqn == null) {
+diff --git a/lib/compiler.js b/lib/compiler.js
+index 242bb9f2049ee58814e641109afa3e0942ae5fe2..447237ff4ca734a95b62e260ec8cfdfc8b10a37a 100644
+--- a/lib/compiler.js
++++ b/lib/compiler.js
+@@ -18,7 +18,8 @@ const BASE_COMPILER_OPTIONS = {
+     declaration: true,
+     experimentalDecorators: true,
+     incremental: true,
+-    lib: ['lib.es2020.d.ts'],
++    lib: ['lib.es2020.d.ts','lib.dom.d.ts'],
++    esModuleInterop: true,
+     module: ts.ModuleKind.CommonJS,
+     noEmitOnError: true,
+     noFallthroughCasesInSwitch: true,
\ No newline at end of file
diff --git a/patches/protobufjs@7.2.5.patch b/patches/protobufjs@7.2.5.patch
new file mode 100644
index 00000000000..536336998c9
--- /dev/null
+++ b/patches/protobufjs@7.2.5.patch
@@ -0,0 +1,12 @@
+diff --git a/package.json b/package.json
+index 37c744ff87811320ade6218fe7e45646b95f2015..69248daedf8196e02596725a4c00c5b7999aa6f4 100644
+--- a/package.json
++++ b/package.json
+@@ -40,7 +40,6 @@
+     "lint:types": "tslint \"**/*.d.ts\" -e \"**/node_modules/**\" -t stylish -c config/tslint.json",
+     "pages": "node scripts/pages",
+     "prepublish": "cd cli && npm install && cd .. && npm run build",
+-    "postinstall": "node scripts/postinstall",
+     "prof": "node bench/prof",
+     "test": "npm run test:sources && npm run test:types",
+     "test:sources": "tape -r ./lib/tape-adapter tests/*.js tests/node/*.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 041ed7ed708..7c82bd5f5af 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: "6.0"
+lockfileVersion: '6.0'
 
 settings:
   autoInstallPeers: true
@@ -8,22 +8,26 @@ overrides:
   mime: ^3.0.0
 
 patchedDependencies:
-  esbuild-wasm@0.18.20:
-    hash: b6w4kbugtl4xi6w24tkr3hfz4y
-    path: patches/esbuild-wasm@0.18.20.patch
-  jsii@5.0.11:
-    hash: zhi5puwzi5jiulxnmqgkd4wl2a
-    path: patches/jsii@5.0.11.patch
+  jsii@5.3.11:
+    hash: ckgthkljzwfnfbd5qz6x7vtvme
+    path: patches/jsii@5.3.11.patch
   mime@3.0.0:
     hash: 2he2uszztbibyal6zfzmv2a2oa
     path: patches/mime@3.0.0.patch
+  protobufjs@7.2.5:
+    hash: plkkb5oxv62w7nyvt6cqmvgk4q
+    path: patches/protobufjs@7.2.5.patch
   wasi-js@1.7.3:
     hash: rmwvp46j2ligfusbdx5dzh4a3q
     path: patches/wasi-js@1.7.3.patch
 
 importers:
+
   .:
     devDependencies:
+      '@winglang/compatibility-spy':
+        specifier: workspace:^
+        version: link:libs/compatibility-spy
       bump-pack:
         specifier: workspace:^
         version: link:tools/bump-pack
@@ -31,14 +35,14 @@ importers:
         specifier: workspace:^
         version: link:tools/generate-workspace
       turbo:
-        specifier: ^1.10.14
-        version: 1.10.15
+        specifier: ^1.13.3
+        version: 1.13.3
 
   apps/jsii-docgen:
     dependencies:
-      "@jsii/spec":
-        specifier: ^1.88.0
-        version: 1.90.0
+      '@jsii/spec':
+        specifier: ^1.94.0
+        version: 1.94.0
       case:
         specifier: ^1.6.3
         version: 1.6.3
@@ -52,8 +56,8 @@ importers:
         specifier: ^6.0.3
         version: 6.0.5(glob@8.1.0)
       jsii-reflect:
-        specifier: ^1.88.0
-        version: 1.90.0
+        specifier: ^1.94.0
+        version: 1.94.0
       semver:
         specifier: ^7.5.4
         version: 7.5.4
@@ -61,30 +65,27 @@ importers:
         specifier: ^16
         version: 16.2.0
     devDependencies:
-      "@types/fs-extra":
+      '@types/fs-extra':
         specifier: ^9.0.13
         version: 9.0.13
-      "@types/jest":
-        specifier: ^27.5.2
-        version: 27.5.2
-      "@types/node":
-        specifier: ^16
-        version: 16.18.58
-      "@types/semver":
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/semver':
         specifier: ^7.5.1
         version: 7.5.3
-      "@types/yargs":
+      '@types/yargs':
         specifier: ^16
         version: 16.0.6
-      "@typescript-eslint/eslint-plugin":
+      '@typescript-eslint/eslint-plugin':
         specifier: ^5
-        version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/parser":
+        version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/parser':
         specifier: ^5
-        version: 5.62.0(eslint@8.51.0)(typescript@4.9.5)
+        version: 5.62.0(eslint@8.51.0)(typescript@5.3.3)
       constructs:
-        specifier: ^10.2.70
-        version: 10.2.70
+        specifier: ^10.3
+        version: 10.3.0
       eslint:
         specifier: ^8
         version: 8.51.0
@@ -103,106 +104,90 @@ importers:
       eslint-plugin-prettier:
         specifier: ^4.2.1
         version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.51.0)(prettier@2.8.8)
-      jest:
-        specifier: ^27.5.1
-        version: 27.5.1(ts-node@10.9.1)
-      jest-junit:
-        specifier: ^15
-        version: 15.0.0
       jsii:
-        specifier: ~5.0.0
-        version: 5.0.21
-      npm-check-updates:
-        specifier: ^16
-        version: 16.14.5
+        specifier: ~5.3.11
+        version: 5.3.11(patch_hash=ckgthkljzwfnfbd5qz6x7vtvme)
       prettier:
         specifier: ^2.8.8
         version: 2.8.8
       projen:
         specifier: ^0.71.163
         version: 0.71.163
-      ts-jest:
-        specifier: ^27.1.5
-        version: 27.1.5(@babel/core@7.23.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5)
-      ts-node:
-        specifier: ^10.9.1
-        version: 10.9.1(@types/node@16.18.58)(typescript@4.9.5)
+      tsx:
+        specifier: ^4.7.0
+        version: 4.7.0
       typescript:
-        specifier: ~4.9.5
-        version: 4.9.5
+        specifier: ~5.3.3
+        version: 5.3.3
+      vitest:
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.0)
 
   apps/jsii-docgen/test/__fixtures__/libraries/construct-library:
-    dependencies:
-      "@aws-cdk/aws-events":
-        specifier: ^1.204.0
+    devDependencies:
+      '@aws-cdk/aws-events':
+        specifier: 1.204.0
         version: 1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/core@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/aws-iam":
-        specifier: ^1.204.0
+      '@aws-cdk/aws-iam':
+        specifier: 1.204.0
         version: 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/aws-kms":
-        specifier: ^1.204.0
+      '@aws-cdk/aws-kms':
+        specifier: 1.204.0
         version: 1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/cx-api@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/aws-s3":
-        specifier: ^1.204.0
+      '@aws-cdk/aws-s3':
+        specifier: 1.204.0
         version: 1.204.0(@aws-cdk/aws-events@1.204.0)(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/aws-kms@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/cx-api@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/cloud-assembly-schema":
-        specifier: ^1.204.0
+      '@aws-cdk/cloud-assembly-schema':
+        specifier: 1.204.0
         version: 1.204.0
-      "@aws-cdk/core":
-        specifier: ^1.204.0
+      '@aws-cdk/core':
+        specifier: 1.204.0
         version: 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      constructs:
-        specifier: ^3.4.344
-        version: 3.4.344
-    devDependencies:
-      "@types/node":
-        specifier: ^18.17.13
-        version: 18.18.4
-      "@types/prettier":
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/prettier':
         specifier: 2.6.0
         version: 2.6.0
+      constructs:
+        specifier: 3.4.344
+        version: 3.4.344
       jsii:
-        specifier: ~5.0.21
-        version: 5.0.21
+        specifier: ~5.3.11
+        version: 5.3.11(patch_hash=ckgthkljzwfnfbd5qz6x7vtvme)
       typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
+        specifier: ^5.3.3
+        version: 5.3.3
 
   apps/vscode-wing:
     devDependencies:
-      "@trpc/client":
-        specifier: ^10.38.1
-        version: 10.40.0(@trpc/server@10.40.0)
-      "@types/node":
-        specifier: ^16
-        version: 16.18.58
-      "@types/node-fetch":
+      '@trpc/client':
+        specifier: ^10.45.2
+        version: 10.45.2(@trpc/server@10.45.2)
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/node-fetch':
         specifier: ^2.6.4
         version: 2.6.6
-      "@types/vscode":
+      '@types/vscode':
         specifier: ^1.70.0
         version: 1.83.0
-      "@types/which":
+      '@types/which':
         specifier: ^3.0.0
         version: 3.0.0
-      "@types/ws":
+      '@types/ws':
         specifier: ^8.5.5
         version: 8.5.6
-      "@typescript-eslint/eslint-plugin":
+      '@typescript-eslint/eslint-plugin':
         specifier: ^5
-        version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/parser":
+        version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/parser':
         specifier: ^5
-        version: 5.62.0(eslint@8.51.0)(typescript@4.9.5)
-      "@vscode/vsce":
+        version: 5.62.0(eslint@8.51.0)(typescript@5.3.3)
+      '@vscode/vsce':
         specifier: ^2.21.0
         version: 2.21.1
-      "@wingconsole/app":
-        specifier: workspace:^
-        version: link:../wing-console/console/app
-      "@wingconsole/server":
-        specifier: workspace:^
-        version: link:../wing-console/console/server
       eslint:
         specifier: ^8
         version: 8.51.0
@@ -224,9 +209,6 @@ importers:
       node-fetch:
         specifier: ^2.6.7
         version: 2.7.0
-      npm-check-updates:
-        specifier: ^16
-        version: 16.14.5
       open:
         specifier: ^8.4.2
         version: 8.4.2
@@ -236,15 +218,15 @@ importers:
       projen:
         specifier: ^0.71.163
         version: 0.71.163
-      ts-node:
-        specifier: ^10.9.1
-        version: 10.9.1(@types/node@16.18.58)(typescript@4.9.5)
       tsup:
-        specifier: ^6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.9.5)
+        specifier: ^8.0.2
+        version: 8.0.2(typescript@5.3.3)
+      tsx:
+        specifier: ^4.7.0
+        version: 4.7.0
       typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
+        specifier: ^5.3.3
+        version: 5.3.3
       vscode-languageclient:
         specifier: ^8.1.0
         version: 8.1.0
@@ -260,22 +242,25 @@ importers:
 
   apps/wing:
     dependencies:
-      "@npmcli/arborist":
+      '@npmcli/arborist':
         specifier: ^7.2.0
         version: 7.2.0
-      "@segment/analytics-node":
+      '@segment/analytics-node':
         specifier: ^1.1.0
         version: 1.1.1
-      "@wingconsole/app":
+      '@supercharge/promise-pool':
+        specifier: ^3.2.0
+        version: 3.2.0
+      '@wingconsole/app':
         specifier: workspace:^
         version: link:../wing-console/console/app
-      "@wingconsole/server":
+      '@wingconsole/server':
         specifier: workspace:^
         version: link:../wing-console/console/server
-      "@winglang/compiler":
+      '@winglang/compiler':
         specifier: workspace:^
         version: link:../../libs/wingcompiler
-      "@winglang/sdk":
+      '@winglang/sdk':
         specifier: workspace:^
         version: link:../../libs/wingsdk
       chalk:
@@ -292,7 +277,7 @@ importers:
         version: 5.0.3
       debug:
         specifier: ^4.3.4
-        version: 4.3.4
+        version: 4.3.4(supports-color@5.5.0)
       dotenv:
         specifier: ^16.3.1
         version: 16.3.1
@@ -302,6 +287,12 @@ importers:
       glob:
         specifier: ^10.3.10
         version: 10.3.10
+      inquirer:
+        specifier: ^8
+        version: 8.2.6
+      lodash.once:
+        specifier: ^4.1.1
+        version: 4.1.1
       nanoid:
         specifier: ^3.3.6
         version: 3.3.6
@@ -327,42 +318,45 @@ importers:
         specifier: ^8.1.0
         version: 8.1.0
     devDependencies:
-      "@types/debug":
+      '@types/debug':
         specifier: ^4.1.8
         version: 4.1.9
-      "@types/node":
-        specifier: ^18.17.13
-        version: 18.18.4
-      "@types/node-persist":
+      '@types/inquirer':
+        specifier: ^9.0.7
+        version: 9.0.7
+      '@types/lodash.once':
+        specifier: ^4.1.9
+        version: 4.1.9
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/node-persist':
         specifier: ^3.1.4
         version: 3.1.4
-      "@types/npm-packlist":
+      '@types/npm-packlist':
         specifier: ^7.0.1
         version: 7.0.1
-      "@types/npmcli__arborist":
+      '@types/npmcli__arborist':
         specifier: ^5.6.2
         version: 5.6.2
-      "@types/semver-utils":
+      '@types/semver-utils':
         specifier: ^1.1.1
         version: 1.1.1
-      "@types/tar":
+      '@types/tar':
         specifier: ^6.1.6
         version: 6.1.6
-      "@types/uuid":
+      '@types/uuid':
         specifier: ^8.3.4
         version: 8.3.4
-      "@typescript-eslint/eslint-plugin":
+      '@typescript-eslint/eslint-plugin':
         specifier: ^6.7.4
-        version: 6.7.4(@typescript-eslint/parser@6.7.4)(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/parser":
+        version: 6.7.4(@typescript-eslint/parser@6.7.4)(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/parser':
         specifier: ^6.7.4
-        version: 6.7.4(eslint@8.51.0)(typescript@4.9.5)
+        version: 6.7.4(eslint@8.51.0)(typescript@5.3.3)
       bump-pack:
         specifier: workspace:^
         version: link:../../tools/bump-pack
-      esbuild:
-        specifier: ^0.17.19
-        version: 0.17.19
       eslint:
         specifier: ^8.50.0
         version: 8.51.0
@@ -382,11 +376,11 @@ importers:
         specifier: ^4.2.1
         version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.51.0)(prettier@2.8.8)
       typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
+        specifier: ^5.3.3
+        version: 5.3.3
       vitest:
-        specifier: ^0.30.1
-        version: 0.30.1
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.0)
 
   apps/wing-api-checker:
     dependencies:
@@ -400,27 +394,24 @@ importers:
         specifier: ^6.0.3
         version: 6.0.5(glob@8.1.0)
       jsii-reflect:
-        specifier: ^1.88.0
-        version: 1.90.0
+        specifier: ^1.94.0
+        version: 1.94.0
       yargs:
         specifier: ^17.7.2
         version: 17.7.2
     devDependencies:
-      "@types/jest":
-        specifier: ^29.5.4
-        version: 29.5.5
-      "@types/node":
-        specifier: ^16
-        version: 16.18.58
-      "@types/yargs":
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/yargs':
         specifier: ^16.0.5
         version: 16.0.6
-      "@typescript-eslint/eslint-plugin":
+      '@typescript-eslint/eslint-plugin':
         specifier: ^5
-        version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/parser":
+        version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/parser':
         specifier: ^5
-        version: 5.62.0(eslint@8.51.0)(typescript@4.9.5)
+        version: 5.62.0(eslint@8.51.0)(typescript@5.3.3)
       eslint:
         specifier: ^8
         version: 8.51.0
@@ -439,15 +430,6 @@ importers:
       eslint-plugin-prettier:
         specifier: ^4.2.1
         version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.51.0)(prettier@2.8.8)
-      jest:
-        specifier: ^29.6.4
-        version: 29.7.0(@types/node@16.18.58)(ts-node@10.9.1)
-      jest-junit:
-        specifier: ^15
-        version: 15.0.0
-      npm-check-updates:
-        specifier: ^16
-        version: 16.14.5
       prettier:
         specifier: ^2.8.8
         version: 2.8.8
@@ -457,85 +439,85 @@ importers:
       standard-version:
         specifier: ^9
         version: 9.5.0
-      ts-jest:
-        specifier: ^29.1.1
-        version: 29.1.1(@babel/core@7.23.3)(jest@29.7.0)(typescript@4.9.5)
-      ts-node:
-        specifier: ^10.9.1
-        version: 10.9.1(@types/node@16.18.58)(typescript@4.9.5)
+      tsx:
+        specifier: ^4.7.0
+        version: 4.7.0
       typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
+        specifier: ^5.3.3
+        version: 5.3.3
 
   apps/wing-console/console/app:
     dependencies:
-      "@segment/analytics-node":
+      '@segment/analytics-node':
         specifier: ^1.1.0
         version: 1.1.1
-      "@wingconsole/server":
+      '@wingconsole/server':
         specifier: workspace:^
         version: link:../server
       cross-spawn:
         specifier: ^7.0.3
         version: 7.0.3
       express:
-        specifier: ^4.18.2
-        version: 4.18.2
+        specifier: ^4.19.2
+        version: 4.19.2
+      open:
+        specifier: ^8.4.2
+        version: 8.4.2
       picocolors:
         specifier: ^1.0.0
         version: 1.0.0
     devDependencies:
-      "@ibm/plex":
+      '@ibm/plex':
         specifier: ^6.3.0
         version: 6.3.0
-      "@playwright/test":
+      '@playwright/test':
         specifier: ^1.37.1
         version: 1.38.1
-      "@tailwindcss/forms":
-        specifier: ^0.5.3
-        version: 0.5.6(tailwindcss@3.3.3)
-      "@types/express":
+      '@tailwindcss/forms':
+        specifier: ^0.5.7
+        version: 0.5.7(tailwindcss@3.4.3)
+      '@types/cross-spawn':
+        specifier: ^6.0.6
+        version: 6.0.6
+      '@types/express':
         specifier: ^4.17.17
         version: 4.17.18
-      "@types/react":
+      '@types/react':
         specifier: ^18.2.21
         version: 18.2.25
-      "@types/react-dom":
+      '@types/react-dom':
         specifier: ^18.2.7
         version: 18.2.11
-      "@vitejs/plugin-react":
-        specifier: ^4.0.4
-        version: 4.1.0(vite@4.4.11)
-      "@vitest/coverage-c8":
-        specifier: ^0.31.4
-        version: 0.31.4(vitest@0.34.6)
-      "@wingconsole/eslint-plugin":
+      '@vitejs/plugin-react':
+        specifier: ^4.2.1
+        version: 4.2.1(vite@4.5.2)
+      '@vitest/coverage-v8':
+        specifier: ^1.6.0
+        version: 1.6.0(vitest@1.6.0)
+      '@wingconsole/eslint-plugin':
         specifier: workspace:^
         version: link:../../tools/eslint-plugin
-      "@wingconsole/tsconfig":
+      '@wingconsole/tsconfig':
         specifier: workspace:^
         version: link:../../tools/tsconfig
-      "@wingconsole/ui":
+      '@wingconsole/ui':
         specifier: workspace:^
         version: link:../ui
       autoprefixer:
         specifier: ^10.4.15
-        version: 10.4.16(postcss@8.4.31)
+        version: 10.4.16(postcss@8.4.38)
       bump-pack:
         specifier: workspace:^
         version: link:../../../../tools/bump-pack
-      conf:
-        specifier: ^11.0.2
-        version: 11.0.2
+      dotenv:
+        specifier: ^16.3.1
+        version: 16.3.1
       eslint:
         specifier: ^8.48.0
         version: 8.51.0
       nanoid:
         specifier: ^4.0.2
         version: 4.0.2
-      open:
-        specifier: ^9.1.0
-        version: 9.1.0
       react:
         specifier: ^18.2.0
         version: 18.2.0
@@ -543,38 +525,41 @@ importers:
         specifier: ^18.2.0
         version: 18.2.0(react@18.2.0)
       tailwindcss:
-        specifier: ^3.3.3
-        version: 3.3.3
+        specifier: ^3.4.3
+        version: 3.4.3
       tsup:
-        specifier: ^6.7.0
-        version: 6.7.0(postcss@8.4.31)(typescript@5.2.2)
+        specifier: ^8.0.2
+        version: 8.0.2(postcss@8.4.38)(typescript@5.2.2)
       tsx:
-        specifier: ^3.12.8
-        version: 3.13.0
+        specifier: ^4.7.0
+        version: 4.7.0
       typescript:
         specifier: ^5.2.2
         version: 5.2.2
       vite:
-        specifier: ^4.4.9
-        version: 4.4.11(@types/node@18.18.4)
+        specifier: ^4.5.2
+        version: 4.5.2
 
   apps/wing-console/console/design-system:
     dependencies:
-      "@headlessui/react":
+      '@headlessui/react':
         specifier: ^1.7.17
         version: 1.7.17(react-dom@18.2.0)(react@18.2.0)
-      "@heroicons/react":
+      '@heroicons/react':
         specifier: ^2.0.18
         version: 2.0.18(react@18.2.0)
-      "@popperjs/core":
+      '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
-      "@tailwindcss/forms":
-        specifier: ^0.5.3
-        version: 0.5.6(tailwindcss@3.3.3)
+      '@tailwindcss/forms':
+        specifier: ^0.5.7
+        version: 0.5.7(tailwindcss@3.4.3)
+      '@tailwindcss/typography':
+        specifier: ^0.5.12
+        version: 0.5.12(tailwindcss@3.4.3)
       classnames:
-        specifier: ^2.3.2
-        version: 2.3.2
+        specifier: ^2.5.1
+        version: 2.5.1
       lodash.uniq:
         specifier: ^4.5.0
         version: 4.5.0
@@ -591,37 +576,37 @@ importers:
         specifier: ^2.3.0
         version: 2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0)(react@18.2.0)
       tailwindcss:
-        specifier: ^3.3.3
-        version: 3.3.3
+        specifier: ^3.4.3
+        version: 3.4.3
     devDependencies:
-      "@babel/core":
-        specifier: ^7.22.11
-        version: 7.23.0
-      "@storybook/react":
+      '@babel/core':
+        specifier: ^7.23.9
+        version: 7.23.9
+      '@storybook/react':
         specifier: ^7.4.0
         version: 7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)
-      "@testing-library/react":
+      '@testing-library/react':
         specifier: ^14.0.0
         version: 14.0.0(react-dom@18.2.0)(react@18.2.0)
-      "@types/lodash.uniq":
+      '@types/lodash.uniq':
         specifier: ^4.5.7
         version: 4.5.7
-      "@types/react":
+      '@types/react':
         specifier: ^18.2.21
         version: 18.2.25
-      "@types/react-dom":
+      '@types/react-dom':
         specifier: ^18.2.7
         version: 18.2.11
-      "@vitejs/plugin-react":
-        specifier: ^4.0.4
-        version: 4.1.0(vite@4.4.11)
-      "@vitest/coverage-c8":
-        specifier: ^0.31.4
-        version: 0.31.4(vitest@0.31.4)
-      "@wingconsole/eslint-plugin":
+      '@vitejs/plugin-react':
+        specifier: ^4.2.1
+        version: 4.2.1(vite@4.5.2)
+      '@vitest/coverage-v8':
+        specifier: ^1.6.0
+        version: 1.6.0(vitest@1.6.0)
+      '@wingconsole/eslint-plugin':
         specifier: workspace:^
         version: link:../../tools/eslint-plugin
-      "@wingconsole/tsconfig":
+      '@wingconsole/tsconfig':
         specifier: workspace:^
         version: link:../../tools/tsconfig
       bump-pack:
@@ -634,27 +619,27 @@ importers:
         specifier: ^9.20.3
         version: 9.20.3
       tsup:
-        specifier: ^7.2.0
-        version: 7.2.0(postcss@8.4.31)(typescript@5.2.2)
+        specifier: ^8.0.2
+        version: 8.0.2(postcss@8.4.38)(typescript@5.2.2)
       typescript:
         specifier: ^5.2.2
         version: 5.2.2
       vite:
-        specifier: ^4.4.9
-        version: 4.4.11(@types/node@18.18.4)
+        specifier: ^4.5.2
+        version: 4.5.2
       vitest:
-        specifier: ^0.31.4
-        version: 0.31.4(happy-dom@9.20.3)
+        specifier: ^1.6.0
+        version: 1.6.0(happy-dom@9.20.3)
       webpack:
         specifier: ^5.88.2
-        version: 5.88.2(esbuild@0.18.20)
+        version: 5.88.2(esbuild@0.19.12)
 
   apps/wing-console/console/server:
     dependencies:
-      "@winglang/compiler":
+      '@winglang/compiler':
         specifier: workspace:^
         version: link:../../../../libs/wingcompiler
-      "@winglang/sdk":
+      '@winglang/sdk':
         specifier: workspace:^
         version: link:../../../../libs/wingsdk
       codespan-wasm:
@@ -662,7 +647,7 @@ importers:
         version: 0.4.0
       debug:
         specifier: ^4.3.4
-        version: 4.3.4
+        version: 4.3.4(supports-color@5.5.0)
       launch-editor:
         specifier: ^2.6.0
         version: 2.6.1
@@ -670,31 +655,31 @@ importers:
         specifier: ^2.1.3
         version: 2.1.3
     devDependencies:
-      "@trpc/server":
-        specifier: ^10.38.1
-        version: 10.40.0
-      "@types/cors":
+      '@trpc/server':
+        specifier: ^10.45.2
+        version: 10.45.2
+      '@types/cors':
         specifier: ^2.8.13
         version: 2.8.14
-      "@types/express":
+      '@types/express':
         specifier: ^4.17.17
         version: 4.17.18
-      "@types/lodash.uniqby":
+      '@types/lodash.uniqby':
         specifier: ^4.7.7
         version: 4.7.7
-      "@types/ws":
+      '@types/ws':
         specifier: ^8.5.5
         version: 8.5.6
-      "@vitest/coverage-c8":
-        specifier: ^0.31.4
-        version: 0.31.4(vitest@0.31.4)
-      "@wingconsole/error-message":
+      '@vitest/coverage-v8':
+        specifier: ^1.6.0
+        version: 1.6.0(vitest@1.6.0)
+      '@wingconsole/error-message':
         specifier: workspace:^
         version: link:../../packages/error-message
-      "@wingconsole/eslint-plugin":
+      '@wingconsole/eslint-plugin':
         specifier: workspace:^
         version: link:../../tools/eslint-plugin
-      "@wingconsole/tsconfig":
+      '@wingconsole/tsconfig':
         specifier: workspace:^
         version: link:../../tools/tsconfig
       bump-pack:
@@ -703,18 +688,18 @@ importers:
       chokidar:
         specifier: ^3.5.3
         version: 3.5.3
-      conf:
-        specifier: ^11.0.2
-        version: 11.0.2
       constructs:
-        specifier: ^10.2.70
-        version: 10.2.70
+        specifier: ^10.3
+        version: 10.3.0
       cors:
         specifier: ^2.8.5
         version: 2.8.5
       emittery:
         specifier: ^1.0.1
         version: 1.0.1
+      env-paths:
+        specifier: ^3.0.0
+        version: 3.0.0
       esbuild-plugin-raw:
         specifier: ^0.1.7
         version: 0.1.7(esbuild@0.15.18)
@@ -722,8 +707,8 @@ importers:
         specifier: ^8.48.0
         version: 8.51.0
       express:
-        specifier: ^4.18.2
-        version: 4.18.2
+        specifier: ^4.19.2
+        version: 4.19.2
       get-port:
         specifier: ^6.1.2
         version: 6.1.2
@@ -740,14 +725,14 @@ importers:
         specifier: ^4.6.8
         version: 4.6.10
       tsup:
-        specifier: ^6.7.0
-        version: 6.7.0(postcss@8.4.31)(typescript@5.2.2)
+        specifier: ^8.0.2
+        version: 8.0.2(postcss@8.4.38)(typescript@5.2.2)
       typescript:
         specifier: ^5.2.2
         version: 5.2.2
       vitest:
-        specifier: ^0.31.4
-        version: 0.31.4(happy-dom@9.20.3)
+        specifier: ^1.6.0
+        version: 1.6.0(happy-dom@9.20.3)
       ws:
         specifier: ^8.13.0
         version: 8.14.2
@@ -757,39 +742,33 @@ importers:
 
   apps/wing-console/console/ui:
     dependencies:
-      "@headlessui/react":
+      '@headlessui/react':
         specifier: ^1.7.17
         version: 1.7.17(react-dom@18.2.0)(react@18.2.0)
-      "@heroicons/react":
+      '@heroicons/react':
         specifier: ^2.0.18
         version: 2.0.18(react@18.2.0)
-      "@popperjs/core":
+      '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
-      "@tanstack/react-query":
+      '@tanstack/react-query':
         specifier: ^4.33.0
         version: 4.36.1(react-dom@18.2.0)(react@18.2.0)
-      "@trpc/client":
-        specifier: ^10.38.1
-        version: 10.40.0(@trpc/server@10.40.0)
-      "@trpc/react-query":
-        specifier: ^10.38.1
-        version: 10.40.0(@tanstack/react-query@4.36.1)(@trpc/client@10.40.0)(@trpc/server@10.40.0)(react-dom@18.2.0)(react@18.2.0)
-      "@trpc/server":
-        specifier: ^10.38.1
-        version: 10.40.0
-      "@wingconsole/design-system":
+      '@trpc/client':
+        specifier: ^10.45.2
+        version: 10.45.2(@trpc/server@10.45.2)
+      '@trpc/react-query':
+        specifier: ^10.45.2
+        version: 10.45.2(@tanstack/react-query@4.36.1)(@trpc/client@10.45.2)(@trpc/server@10.45.2)(react-dom@18.2.0)(react@18.2.0)
+      '@trpc/server':
+        specifier: ^10.45.2
+        version: 10.45.2
+      '@wingconsole/design-system':
         specifier: workspace:^
         version: link:../design-system
       classnames:
-        specifier: ^2.3.2
-        version: 2.3.2
-      d3-selection:
-        specifier: ^3.0.0
-        version: 3.0.0
-      d3-zoom:
-        specifier: ^3.0.0
-        version: 3.0.0
+        specifier: ^2.5.1
+        version: 2.5.1
       elkjs:
         specifier: ^0.8.2
         version: 0.8.2
@@ -817,79 +796,91 @@ importers:
       nanoid:
         specifier: ^4.0.2
         version: 4.0.2
+      react-dom:
+        specifier: ^18.2.0
+        version: 18.2.0(react@18.2.0)
       react-markdown:
         specifier: ^9.0.1
         version: 9.0.1(@types/react@18.2.25)(react@18.2.0)
+      react-use:
+        specifier: ^17.4.2
+        version: 17.4.2(react-dom@18.2.0)(react@18.2.0)
       zod:
         specifier: ^3.22.2
         version: 3.22.4
     devDependencies:
-      "@babel/core":
-        specifier: ^7.22.11
-        version: 7.23.0
-      "@storybook/addon-essentials":
+      '@babel/core':
+        specifier: ^7.23.9
+        version: 7.23.9
+      '@storybook/addon-essentials':
         specifier: ^7.4.0
-        version: 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-interactions":
+        version: 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-interactions':
         specifier: ^7.4.0
-        version: 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-links":
+        version: 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-links':
         specifier: ^7.4.0
         version: 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/blocks":
+      '@storybook/blocks':
         specifier: ^7.4.0
-        version: 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/react":
+        version: 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/react':
         specifier: ^7.4.0
         version: 7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)
-      "@storybook/react-vite":
+      '@storybook/react-vite':
         specifier: ^7.4.0
-        version: 7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)(vite@4.4.11)
-      "@storybook/testing-library":
+        version: 7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)(vite@4.5.2)
+      '@storybook/testing-library':
         specifier: ^0.1.0
         version: 0.1.0
-      "@types/cors":
+      '@types/cors':
         specifier: ^2.8.13
         version: 2.8.14
-      "@types/d3-selection":
+      '@types/d3-selection':
         specifier: ^3.0.6
         version: 3.0.7
-      "@types/d3-zoom":
+      '@types/d3-zoom':
         specifier: ^3.0.4
         version: 3.0.5
-      "@types/lodash.debounce":
+      '@types/lodash.debounce':
         specifier: ^4.0.7
         version: 4.0.7
-      "@types/lodash.throttle":
+      '@types/lodash.throttle':
         specifier: ^4.1.7
         version: 4.1.7
-      "@types/lodash.uniqby":
+      '@types/lodash.uniqby':
         specifier: ^4.7.7
         version: 4.7.7
-      "@types/react":
+      '@types/react':
         specifier: ^18.2.21
         version: 18.2.25
-      "@vitejs/plugin-react-swc":
-        specifier: ^3.3.2
-        version: 3.4.0(vite@4.4.11)
-      "@wingconsole/eslint-plugin":
+      '@types/react-dom':
+        specifier: ^18.2.7
+        version: 18.2.11
+      '@vitejs/plugin-react-swc':
+        specifier: ^3.6.0
+        version: 3.6.0(vite@4.5.2)
+      '@wingconsole/eslint-plugin':
         specifier: workspace:^
         version: link:../../tools/eslint-plugin
-      "@wingconsole/server":
+      '@wingconsole/server':
         specifier: workspace:^
         version: link:../server
-      "@wingconsole/tsconfig":
+      '@wingconsole/tsconfig':
         specifier: workspace:^
         version: link:../../tools/tsconfig
-      "@wingconsole/use-loading":
+      '@wingconsole/use-loading':
         specifier: workspace:^
         version: link:../../packages/use-loading
-      "@wingconsole/use-persistent-state":
+      '@wingconsole/use-persistent-state':
         specifier: workspace:^
         version: link:../../packages/use-persistent-state
+      '@winglang/sdk':
+        specifier: workspace:^
+        version: link:../../../../libs/wingsdk
       autoprefixer:
         specifier: ^10.4.15
-        version: 10.4.16(postcss@8.4.31)
+        version: 10.4.16(postcss@8.4.38)
       bump-pack:
         specifier: workspace:^
         version: link:../../../../tools/bump-pack
@@ -903,30 +894,30 @@ importers:
         specifier: ^7.4.0
         version: 7.4.6
       tailwindcss:
-        specifier: ^3.3.3
-        version: 3.3.3
+        specifier: ^3.4.3
+        version: 3.4.3
       tsup:
-        specifier: ^7.2.0
-        version: 7.2.0(postcss@8.4.31)(typescript@5.2.2)
+        specifier: ^8.0.2
+        version: 8.0.2(postcss@8.4.38)(typescript@5.2.2)
       typescript:
         specifier: ^5.2.2
         version: 5.2.2
       vite:
-        specifier: ^4.4.9
-        version: 4.4.11(@types/node@18.18.4)
+        specifier: ^4.5.2
+        version: 4.5.2
       vitest:
-        specifier: ^0.31.4
-        version: 0.31.4(happy-dom@9.20.3)
+        specifier: ^1.6.0
+        version: 1.6.0(happy-dom@9.20.3)
       webpack:
         specifier: ^5.88.2
-        version: 5.88.2(esbuild@0.18.20)
+        version: 5.88.2(esbuild@0.19.12)
 
   apps/wing-console/packages/error-message:
     devDependencies:
-      "@wingconsole/eslint-plugin":
+      '@wingconsole/eslint-plugin':
         specifier: workspace:^
         version: link:../../tools/eslint-plugin
-      "@wingconsole/tsconfig":
+      '@wingconsole/tsconfig':
         specifier: workspace:^
         version: link:../../tools/tsconfig
       typescript:
@@ -935,13 +926,13 @@ importers:
 
   apps/wing-console/packages/use-loading:
     devDependencies:
-      "@types/react":
+      '@types/react':
         specifier: ^18.2.21
         version: 18.2.25
-      "@wingconsole/eslint-plugin":
+      '@wingconsole/eslint-plugin':
         specifier: workspace:^
         version: link:../../tools/eslint-plugin
-      "@wingconsole/tsconfig":
+      '@wingconsole/tsconfig':
         specifier: workspace:^
         version: link:../../tools/tsconfig
       typescript:
@@ -950,13 +941,13 @@ importers:
 
   apps/wing-console/packages/use-persistent-state:
     devDependencies:
-      "@types/react":
+      '@types/react':
         specifier: ^18.2.12
         version: 18.2.25
-      "@wingconsole/eslint-plugin":
+      '@wingconsole/eslint-plugin':
         specifier: workspace:^
         version: link:../../tools/eslint-plugin
-      "@wingconsole/tsconfig":
+      '@wingconsole/tsconfig':
         specifier: workspace:^
         version: link:../../tools/tsconfig
       typescript:
@@ -965,13 +956,13 @@ importers:
 
   apps/wing-console/tools/eslint-plugin:
     dependencies:
-      "@cloudy-ts/eslint-plugin":
+      '@cloudy-ts/eslint-plugin':
         specifier: ^0.0.260
         version: 0.0.260(eslint@8.51.0)
-      "@typescript-eslint/eslint-plugin":
+      '@typescript-eslint/eslint-plugin':
         specifier: ^5.62.0
         version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.2.2)
-      "@typescript-eslint/parser":
+      '@typescript-eslint/parser':
         specifier: ^5.62.0
         version: 5.62.0(eslint@8.51.0)(typescript@5.2.2)
       eslint-config-prettier:
@@ -1018,33 +1009,56 @@ importers:
         specifier: ^5.2.2
         version: 5.2.2
 
+  apps/wingcli-v2:
+    dependencies:
+      '@winglang/sdk':
+        specifier: workspace:^
+        version: link:../../libs/wingsdk
+      '@winglang/wingc':
+        specifier: workspace:^
+        version: link:../../libs/wingc
+      '@winglang/wingii':
+        specifier: workspace:^
+        version: link:../../libs/wingii
+
+  docs:
+    devDependencies:
+      '@types/node':
+        specifier: ^20.14.0
+        version: 20.14.2
+      tsx:
+        specifier: ^4.11.2
+        version: 4.15.2
+      typescript:
+        specifier: ^5.4.5
+        version: 5.4.5
+
   docs/docs: {}
 
   examples/jsii-fixture:
     devDependencies:
       jsii:
-        specifier: ^1.70.0
-        version: 1.90.0
-      jsii-pacmak:
-        specifier: ^1.70.0
-        version: 1.90.0
-      jsii-release:
-        specifier: ^0.2.519
-        version: 0.2.519
+        specifier: ~5.3.11
+        version: 5.3.11(patch_hash=ckgthkljzwfnfbd5qz6x7vtvme)
+
+  examples/tests/doc_examples: {}
 
   examples/tests/error: {}
 
   examples/tests/invalid:
     dependencies:
       cdktf:
-        specifier: 0.17.0
-        version: 0.17.0(constructs@10.2.70)
+        specifier: 0.20.3
+        version: 0.20.3(constructs@10.3.0)
       constructs:
-        specifier: ^10.2.70
-        version: 10.2.70
+        specifier: ^10.3
+        version: 10.3.0
       jsii-code-samples:
         specifier: 1.7.0
         version: 1.7.0
+      jsii-fixture:
+        specifier: workspace:^
+        version: link:../../jsii-fixture
 
   examples/tests/sdk_tests:
     dependencies:
@@ -1057,39 +1071,39 @@ importers:
 
   examples/tests/valid:
     dependencies:
-      "@aws-cdk/asset-awscli-v1":
-        specifier: ^2.2.200
-        version: 2.2.200
-      "@aws-cdk/asset-kubectl-v20":
+      '@aws-cdk/asset-awscli-v1':
+        specifier: ^2.2.202
+        version: 2.2.202
+      '@aws-cdk/asset-kubectl-v20':
         specifier: ^2.1.2
         version: 2.1.2
-      "@aws-cdk/asset-node-proxy-agent-v6":
+      '@aws-cdk/asset-node-proxy-agent-v6':
         specifier: ^2.0.1
         version: 2.0.1
-      "@aws-sdk/client-dynamodb":
-        specifier: ^3.405.0
-        version: 3.405.0
-      "@cdktf/provider-aws":
-        specifier: ^15.0.0
-        version: 15.0.0(cdktf@0.17.0)(constructs@10.2.70)
-      "@winglibs/testfixture":
+      '@aws-sdk/client-dynamodb':
+        specifier: ^3.503.1
+        version: 3.503.1
+      '@cdktf/provider-aws':
+        specifier: ^19
+        version: 19.3.0(cdktf@0.20.3)(constructs@10.3.0)
+      '@winglibs/testfixture':
         specifier: workspace:^
         version: link:../../wing-fixture
       aws-cdk-lib:
-        specifier: ^2.94.0
-        version: 2.100.0(constructs@10.2.70)
+        specifier: ^2.124.0
+        version: 2.124.0(constructs@10.3.0)
       cdk8s:
-        specifier: ^2.64.2
-        version: 2.66.8(constructs@10.2.70)
+        specifier: ^2.68.43
+        version: 2.68.43(constructs@10.3.0)
       cdk8s-plus-27:
-        specifier: ^2.7.1
-        version: 2.7.32(cdk8s@2.66.8)(constructs@10.2.70)
+        specifier: ^2.7.81
+        version: 2.7.81(cdk8s@2.68.43)(constructs@10.3.0)
       cdktf:
-        specifier: 0.17.0
-        version: 0.17.0(constructs@10.2.70)
+        specifier: 0.20.3
+        version: 0.20.3(constructs@10.3.0)
       constructs:
-        specifier: ^10.2.70
-        version: 10.2.70
+        specifier: ^10.3
+        version: 10.3.0
       jsii-code-samples:
         specifier: 1.7.0
         version: 1.7.0
@@ -1103,19 +1117,64 @@ importers:
         specifier: ^9.0.0
         version: 9.0.1
 
-  examples/wing-fixture: {}
+  examples/ts-fixture:
+    dependencies:
+      '@wingcloud/framework':
+        specifier: workspace:^
+        version: link:../../libs/@wingcloud/framework
+      '@winglibs/testfixture':
+        specifier: workspace:^
+        version: link:../wing-fixture
+    devDependencies:
+      '@types/node':
+        specifier: ^20
+        version: 20.11.0
+      winglang:
+        specifier: workspace:^
+        version: link:../../apps/wing
+
+  examples/wing-fixture:
+    devDependencies:
+      '@winglang/sdk':
+        specifier: workspace:^
+        version: link:../../libs/wingsdk
+      winglang:
+        specifier: workspace:^
+        version: link:../../apps/wing
+
+  libs/@wingcloud/framework:
+    dependencies:
+      typescript:
+        specifier: ^5.3.3
+        version: 5.3.3
+    devDependencies:
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@winglang/sdk':
+        specifier: workspace:^
+        version: link:../../wingsdk
+      bump-pack:
+        specifier: workspace:^
+        version: link:../../../tools/bump-pack
+      tsup:
+        specifier: ^8.0.2
+        version: 8.0.2(typescript@5.3.3)
+      vitest:
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.0)
 
   libs/awscdk:
     dependencies:
-      "@winglang/sdk":
+      '@winglang/sdk':
         specifier: workspace:^
         version: link:../wingsdk
       aws-cdk-lib:
-        specifier: ^2.64.0
-        version: 2.100.0(constructs@10.2.70)
+        specifier: ^2.124.0
+        version: 2.124.0(constructs@10.3.0)
       constructs:
-        specifier: ~10.2.69
-        version: 10.2.70
+        specifier: ^10.3
+        version: 10.3.0
       safe-stable-stringify:
         specifier: ^2.4.3
         version: 2.4.3
@@ -1124,150 +1183,196 @@ importers:
         specifier: workspace:^
         version: link:../../tools/bump-pack
       tsup:
-        specifier: ^6.7.0
-        version: 6.7.0(typescript@4.9.5)
+        specifier: ^8.0.2
+        version: 8.0.2(typescript@5.3.3)
+      typescript:
+        specifier: ^5.3.3
+        version: 5.3.3
+      vitest:
+        specifier: ^1.6.0
+        version: 1.6.0(happy-dom@9.20.3)
+
+  libs/compatibility-spy:
+    dependencies:
+      '@winglang/sdk':
+        specifier: workspace:^
+        version: link:../wingsdk
+      constructs:
+        specifier: ^10.3
+        version: 10.3.0
+    devDependencies:
+      bump-pack:
+        specifier: workspace:^
+        version: link:../../tools/bump-pack
+      tsup:
+        specifier: ^8.0.2
+        version: 8.0.2(typescript@5.3.3)
       typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
+        specifier: ^5.3.3
+        version: 5.3.3
       vitest:
-        specifier: ^0.32.4
-        version: 0.32.4
+        specifier: ^1.6.0
+        version: 1.6.0(happy-dom@9.20.3)
 
   libs/tree-sitter-wing:
     dependencies:
-      nan:
-        specifier: ^2.17.0
-        version: 2.18.0
+      node-addon-api:
+        specifier: ^7.1.0
+        version: 7.1.0
+      tree-sitter:
+        specifier: ^0.21.0
+        version: 0.21.1
     devDependencies:
       nodemon:
-        specifier: ^3.0.1
-        version: 3.0.1
+        specifier: ^3.1.0
+        version: 3.1.0
       tree-sitter-cli:
-        specifier: 0.20.6
-        version: 0.20.6
+        specifier: 0.22.5
+        version: 0.22.5
 
   libs/wingc:
     devDependencies:
-      "@winglang/sdk":
+      '@winglang/sdk':
         specifier: workspace:^
         version: link:../wingsdk
-      "@winglang/tree-sitter-wing":
+      '@winglang/tree-sitter-wing':
         specifier: workspace:^
         version: link:../tree-sitter-wing
-      "@winglang/wingii":
+      '@winglang/wingii':
         specifier: workspace:^
         version: link:../wingii
 
   libs/wingcompiler:
     dependencies:
-      "@winglang/sdk":
+      '@wingcloud/framework':
+        specifier: workspace:^
+        version: link:../@wingcloud/framework
+      '@winglang/sdk':
         specifier: workspace:^
         version: link:../wingsdk
+      jiti:
+        specifier: ^1.21.0
+        version: 1.21.0
       wasi-js:
         specifier: ^1.7.3
         version: 1.7.3(patch_hash=rmwvp46j2ligfusbdx5dzh4a3q)
     devDependencies:
-      "@types/node":
-        specifier: ^18.17.13
-        version: 18.18.4
-      "@winglang/wingc":
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@winglang/wingc':
         specifier: workspace:^
         version: link:../wingc
       bump-pack:
         specifier: workspace:^
         version: link:../../tools/bump-pack
       tsup:
-        specifier: ^6.7.0
-        version: 6.7.0(typescript@4.9.5)
+        specifier: ^8.0.2
+        version: 8.0.2(typescript@5.3.3)
       typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
+        specifier: ^5.3.3
+        version: 5.3.3
       vitest:
-        specifier: ^0.30.1
-        version: 0.30.1
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.0)
 
   libs/wingii: {}
 
   libs/wingsdk:
     dependencies:
-      "@aws-sdk/client-cloudwatch-logs":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/client-dynamodb":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/client-elasticache":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/client-lambda":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/client-s3":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/client-secrets-manager":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/client-sns":
+      '@aws-sdk/client-cloudwatch-logs':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/client-dynamodb':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/client-elasticache':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/client-lambda':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/client-s3':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/client-secrets-manager':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/client-sns':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/client-sqs':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/s3-request-presigner':
+        specifier: 3.577.0
+        version: 3.577.0
+      '@aws-sdk/types':
         specifier: 3.449.0
         version: 3.449.0
-      "@aws-sdk/client-sqs":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/s3-request-presigner":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/types":
-        specifier: 3.449.0
-        version: 3.449.0
-      "@aws-sdk/util-dynamodb":
-        specifier: 3.449.0
-        version: 3.449.0(@aws-sdk/client-dynamodb@3.449.0)
-      "@azure/core-paging":
+      '@aws-sdk/util-dynamodb':
+        specifier: 3.577.0
+        version: 3.577.0(@aws-sdk/client-dynamodb@3.577.0)
+      '@azure/core-paging':
         specifier: ^1.5.0
         version: 1.5.0
-      "@azure/identity":
-        specifier: 3.1.3
-        version: 3.1.3
-      "@azure/storage-blob":
+      '@azure/data-tables':
+        specifier: 13.2.2
+        version: 13.2.2
+      '@azure/identity':
+        specifier: 4.0.1
+        version: 4.0.1
+      '@azure/storage-blob':
         specifier: 12.14.0
         version: 12.14.0
-      "@google-cloud/storage":
+      '@google-cloud/datastore':
+        specifier: 8.4.0
+        version: 8.4.0
+      '@google-cloud/storage':
         specifier: 6.9.5
         version: 6.9.5
-      "@smithy/util-stream":
+      '@smithy/util-stream':
         specifier: 2.0.17
         version: 2.0.17
-      "@smithy/util-utf8":
+      '@smithy/util-utf8':
         specifier: 2.0.0
         version: 2.0.0
-      "@types/aws-lambda":
+      '@types/aws-lambda':
         specifier: ^8.10.119
         version: 8.10.124
+      '@winglang/wingtunnels':
+        specifier: workspace:^
+        version: link:../wingtunnels
+      ajv:
+        specifier: ^8.12.0
+        version: 8.12.0
       cdktf:
-        specifier: 0.17.0
-        version: 0.17.0(constructs@10.2.70)
+        specifier: 0.20.3
+        version: 0.20.3(constructs@10.3.0)
       constructs:
-        specifier: ~10.2.69
-        version: 10.2.70
+        specifier: ^10.3
+        version: 10.3.0
       cron-parser:
         specifier: ^4.9.0
         version: 4.9.0
-      esbuild-wasm:
-        specifier: ^0.18.20
-        version: 0.18.20(patch_hash=b6w4kbugtl4xi6w24tkr3hfz4y)
+      cron-validator:
+        specifier: ^1.3.1
+        version: 1.3.1
       express:
-        specifier: ^4.18.2
-        version: 4.18.2
+        specifier: ^4.19.2
+        version: 4.19.2
+      glob:
+        specifier: ^8.1.0
+        version: 8.1.0
       google-auth-library:
         specifier: ^8.9.0
         version: 8.9.0
       ioredis:
         specifier: ^5.3.2
         version: 5.3.2
-      jsonschema:
-        specifier: ^1.4.1
-        version: 1.4.1
+      jiti:
+        specifier: ^1.21.0
+        version: 1.21.0
       mime:
         specifier: ^3.0.0
         version: 3.0.0(patch_hash=2he2uszztbibyal6zfzmv2a2oa)
@@ -1277,106 +1382,116 @@ importers:
       nanoid:
         specifier: ^3.3.6
         version: 3.3.6
+      protobufjs:
+        specifier: 7.2.5
+        version: 7.2.5(patch_hash=plkkb5oxv62w7nyvt6cqmvgk4q)
       safe-stable-stringify:
         specifier: ^2.4.3
         version: 2.4.3
       stacktracey:
         specifier: ^2.1.8
         version: 2.1.8
-      undici:
-        specifier: ^5.25.4
-        version: 5.25.4
+      toml:
+        specifier: ^3.0.0
+        version: 3.0.0
+      ulid:
+        specifier: ^2.3.0
+        version: 2.3.0
       uuid:
         specifier: ^8.3.2
         version: 8.3.2
+      vlq:
+        specifier: ^2.0.4
+        version: 2.0.4
       yaml:
         specifier: ^2.3.2
         version: 2.3.2
+    optionalDependencies:
+      esbuild:
+        specifier: ^0.19.12
+        version: 0.19.12
     devDependencies:
-      "@cdktf/provider-aws":
-        specifier: ^15.0.0
-        version: 15.0.0(cdktf@0.17.0)(constructs@10.2.70)
-      "@types/express":
+      '@cdktf/provider-aws':
+        specifier: ^19
+        version: 19.3.0(cdktf@0.20.3)(constructs@10.3.0)
+      '@types/express':
         specifier: ^4.17.17
         version: 4.17.18
-      "@types/fs-extra":
+      '@types/fs-extra':
         specifier: ^11.0.1
         version: 11.0.2
-      "@types/mime-types":
+      '@types/glob':
+        specifier: ^7.2.0
+        version: 7.2.0
+      '@types/mime-types':
         specifier: ^2.1.2
         version: 2.1.2
-      "@types/node":
-        specifier: ^18
-        version: 18.18.4
-      "@types/uuid":
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/uuid':
         specifier: ^9.0.3
         version: 9.0.5
-      "@typescript-eslint/eslint-plugin":
-        specifier: ^5
-        version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/parser":
-        specifier: ^5
-        version: 5.62.0(eslint@8.51.0)(typescript@4.9.5)
-      "@vitest/coverage-v8":
-        specifier: ^0.32.4
-        version: 0.32.4(vitest@0.32.4)
-      "@winglang/jsii-docgen":
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^7
+        version: 7.0.2(@typescript-eslint/parser@7.0.2)(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser':
+        specifier: ^7
+        version: 7.0.2(eslint@8.56.0)(typescript@5.3.3)
+      '@winglang/jsii-docgen':
         specifier: workspace:^
         version: link:../../apps/jsii-docgen
       aws-sdk-client-mock:
-        specifier: ^2.2.0
-        version: 2.2.0
+        specifier: 3.0.0
+        version: 3.0.0
       aws-sdk-client-mock-jest:
-        specifier: ^2.2.0
-        version: 2.2.0(aws-sdk-client-mock@2.2.0)
+        specifier: 3.0.0
+        version: 3.0.0(aws-sdk-client-mock@3.0.0)
       bump-pack:
         specifier: workspace:^
         version: link:../../tools/bump-pack
       cdktf-cli:
-        specifier: 0.17.0
-        version: 0.17.0(ink@3.2.0)(react@17.0.2)
+        specifier: 0.20.3
+        version: 0.20.3(ink@3.2.0)(react@17.0.2)
       chalk:
         specifier: ^4.1.2
         version: 4.1.2
       eslint:
-        specifier: ^8
-        version: 8.51.0
+        specifier: ^8.56.0
+        version: 8.56.0
       eslint-config-prettier:
         specifier: ^8.10.0
-        version: 8.10.0(eslint@8.51.0)
+        version: 8.10.0(eslint@8.56.0)
       eslint-import-resolver-node:
         specifier: ^0.3.9
         version: 0.3.9
       eslint-import-resolver-typescript:
         specifier: ^3.6.0
-        version: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.28.1)(eslint@8.51.0)
+        version: 3.6.1(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.28.1)(eslint@8.56.0)
       eslint-plugin-import:
         specifier: ^2.28.1
-        version: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.51.0)
+        version: 2.28.1(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)
       eslint-plugin-prettier:
         specifier: ^4.2.1
-        version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.51.0)(prettier@2.8.8)
+        version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8)
       eslint-plugin-sort-exports:
         specifier: ^0.8.0
-        version: 0.8.0(eslint@8.51.0)
+        version: 0.8.0(eslint@8.56.0)
       fs-extra:
         specifier: ^10.1.0
         version: 10.1.0
       jsii:
-        specifier: 5.0.11
-        version: 5.0.11(patch_hash=zhi5puwzi5jiulxnmqgkd4wl2a)
+        specifier: ~5.3.11
+        version: 5.3.11(patch_hash=ckgthkljzwfnfbd5qz6x7vtvme)
       jsii-diff:
-        specifier: ^1.88.0
-        version: 1.90.0
+        specifier: ^1.94.0
+        version: 1.94.0
       jsii-pacmak:
-        specifier: ^1.88.0
-        version: 1.90.0
+        specifier: ^1.94.0
+        version: 1.94.0
       mock-gcs:
-        specifier: ^1.0.0
-        version: 1.1.0
-      npm-check-updates:
-        specifier: ^16
-        version: 16.14.5
+        specifier: ^1.2.0
+        version: 1.2.0
       prettier:
         specifier: ^2.8.8
         version: 2.8.8
@@ -1386,31 +1501,62 @@ importers:
       standard-version:
         specifier: ^9
         version: 9.5.0
-      ts-node:
-        specifier: ^10.9.1
-        version: 10.9.1(@types/node@18.18.4)(typescript@4.9.5)
+      tsx:
+        specifier: ^4.7.0
+        version: 4.7.0
       typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
+        specifier: ^5.3.3
+        version: 5.3.3
       vitest:
-        specifier: ^0.32.4
-        version: 0.32.4
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.0)
       wing-api-checker:
         specifier: workspace:^
         version: link:../../apps/wing-api-checker
 
+  libs/wingtunnels:
+    dependencies:
+      '@types/debug':
+        specifier: ^4.1.9
+        version: 4.1.12
+      '@types/node':
+        specifier: ^20.11.19
+        version: 20.11.20
+      '@types/ws':
+        specifier: ^8.5.7
+        version: 8.5.10
+      debug:
+        specifier: ^4.3.4
+        version: 4.3.4(supports-color@5.5.0)
+      ws:
+        specifier: ^8.14.2
+        version: 8.14.2
+    devDependencies:
+      bump-pack:
+        specifier: workspace:^
+        version: link:../../tools/bump-pack
+      tsup:
+        specifier: ^6.7.0
+        version: 6.7.0(typescript@5.3.3)
+      typescript:
+        specifier: ^5.3.3
+        version: 5.3.3
+      vitest:
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.20)
+
   tools/bump-pack:
     dependencies:
-      "@actions/core":
-        specifier: ^1.10.0
+      '@actions/core':
+        specifier: ^1.10.1
         version: 1.10.1
-      "@pnpm/find-workspace-dir":
+      '@pnpm/find-workspace-dir':
         specifier: ^6.0.2
         version: 6.0.2
-      "@pnpm/reviewing.dependencies-hierarchy":
+      '@pnpm/reviewing.dependencies-hierarchy':
         specifier: ^2.0.10
         version: 2.1.1(@pnpm/logger@5.0.0)
-      "@pnpm/workspace.find-packages":
+      '@pnpm/workspace.find-packages':
         specifier: ^1.0.5
         version: 1.0.13(@pnpm/logger@5.0.0)
       changelogen:
@@ -1429,44 +1575,72 @@ importers:
         specifier: ^7.5.4
         version: 7.5.4
       tsx:
-        specifier: ^3.12.8
-        version: 3.13.0
+        specifier: ^4.7.0
+        version: 4.7.0
     devDependencies:
-      "@types/fs-extra":
+      '@types/fs-extra':
         specifier: ^11.0.1
         version: 11.0.2
-      "@types/node":
-        specifier: ^18.17.13
-        version: 18.18.4
-      "@types/semver":
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/semver':
         specifier: ^7.5.1
         version: 7.5.3
       typescript:
         specifier: ^5.2.2
         version: 5.2.2
+      vitest:
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.0)
+
+  tools/compatibility-matrix-automation:
+    dependencies:
+      '@winglang/sdk':
+        specifier: workspace:^
+        version: link:../../libs/wingsdk
+      winglang:
+        specifier: workspace:^
+        version: link:../../apps/wing
+    devDependencies:
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      npm-which:
+        specifier: ^3.0.1
+        version: 3.0.1
+      tsx:
+        specifier: ^4.7.0
+        version: 4.7.0
+      typescript:
+        specifier: ^5.3.3
+        version: 5.3.3
+      vitest:
+        specifier: ^1.6.0
+        version: 1.6.0(@types/node@20.11.0)
 
   tools/generate-workspace:
     dependencies:
-      "@pnpm/find-workspace-dir":
+      '@pnpm/find-workspace-dir':
         specifier: ^6.0.2
         version: 6.0.2
-      "@pnpm/workspace.find-packages":
+      '@pnpm/workspace.find-packages':
         specifier: ^1.0.1
         version: 1.0.13(@pnpm/logger@5.0.0)
       npm-which:
         specifier: ^3.0.1
         version: 3.0.1
       tsx:
-        specifier: ^3.12.7
-        version: 3.13.0
+        specifier: ^4.7.0
+        version: 4.7.0
     devDependencies:
-      "@types/fs-extra":
+      '@types/fs-extra':
         specifier: ^11
         version: 11.0.2
-      "@types/node":
-        specifier: ^18.16.18
-        version: 18.18.4
-      "@types/semver":
+      '@types/node':
+        specifier: ^20.11.0
+        version: 20.11.0
+      '@types/semver':
         specifier: ^7.5.0
         version: 7.5.3
       typescript:
@@ -1475,30 +1649,33 @@ importers:
 
   tools/hangar:
     devDependencies:
-      "@wingconsole/app":
+      '@wingconsole/app':
         specifier: workspace:^
         version: link:../../apps/wing-console/console/app
-      "@wingconsole/design-system":
+      '@wingconsole/design-system':
         specifier: workspace:^
         version: link:../../apps/wing-console/console/design-system
-      "@wingconsole/server":
+      '@wingconsole/server':
         specifier: workspace:^
         version: link:../../apps/wing-console/console/server
-      "@wingconsole/ui":
+      '@wingconsole/ui':
         specifier: workspace:^
         version: link:../../apps/wing-console/console/ui
-      "@winglang/compiler":
+      '@winglang/compatibility-spy':
+        specifier: workspace:^
+        version: link:../../libs/compatibility-spy
+      '@winglang/compiler':
         specifier: workspace:^
         version: link:../../libs/wingcompiler
-      "@winglang/platform-awscdk":
+      '@winglang/platform-awscdk':
         specifier: workspace:^
         version: link:../../libs/awscdk
-      "@winglang/sdk":
+      '@winglang/sdk':
         specifier: workspace:^
         version: link:../../libs/wingsdk
       cdktf:
-        specifier: ^0.17.3
-        version: 0.17.3(constructs@10.2.70)
+        specifier: ^0.20.3
+        version: 0.20.3(constructs@10.3.0)
       execa:
         specifier: ^7.2.0
         version: 7.2.0
@@ -1509,14 +1686,14 @@ importers:
         specifier: ^9.8.1
         version: 9.9.0
       octokit:
-        specifier: ^3.1.0
-        version: 3.1.1
+        specifier: ^3.1.2
+        version: 3.1.2
       tsx:
-        specifier: ^3.12.8
-        version: 3.13.0
+        specifier: ^4.7.0
+        version: 4.7.0
       vitest:
-        specifier: ^0.34.5
-        version: 0.34.6
+        specifier: ^1.6.0
+        version: 1.6.0(happy-dom@9.20.3)
       winglang:
         specifier: workspace:^
         version: link:../../apps/wing
@@ -1525,14 +1702,15 @@ importers:
         version: 2.3.2
 
 packages:
+
   /@aashutoshrathi/word-wrap@1.2.6:
     resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /@actions/core@1.10.1:
     resolution: {integrity: sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==}
     dependencies:
-      "@actions/http-client": 2.2.0
+      '@actions/http-client': 2.2.0
       uuid: 8.3.2
     dev: false
 
@@ -1545,14 +1723,14 @@ packages:
 
   /@alloc/quick-lru@5.2.0:
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /@ampproject/remapping@2.2.1:
     resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
-    engines: {node: ">=6.0.0"}
+    engines: {node: '>=6.0.0'}
     dependencies:
-      "@jridgewell/gen-mapping": 0.3.3
-      "@jridgewell/trace-mapping": 0.3.19
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
     dev: true
 
   /@aw-web-design/x-default-browser@1.4.126:
@@ -1562,8 +1740,8 @@ packages:
       default-browser-id: 3.0.0
     dev: true
 
-  /@aws-cdk/asset-awscli-v1@2.2.200:
-    resolution: {integrity: sha512-Kf5J8DfJK4wZFWT2Myca0lhwke7LwHcHBo+4TvWOGJrFVVKVuuiLCkzPPRBQQVDj0Vtn2NBokZAz8pfMpAqAKg==}
+  /@aws-cdk/asset-awscli-v1@2.2.202:
+    resolution: {integrity: sha512-JqlF0D4+EVugnG5dAsNZMqhu3HW7ehOXm5SDMxMbXNDMdsF0pxtQKNHRl52z1U9igsHmaFpUgSGjbhAJ+0JONg==}
     dev: false
 
   /@aws-cdk/asset-kubectl-v20@2.1.2:
@@ -1576,88 +1754,88 @@ packages:
 
   /@aws-cdk/aws-events@1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/core@1.204.0)(constructs@3.4.344):
     resolution: {integrity: sha512-KnfUmtv+4RhydD9+5CHFxNJxtgn7+Xftwfwg1G7qV/tWYPFHcNIvhlSOgwDrQPa+pTo1MmkiUN0lAR0G8B/cbw==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
       For more information on how to migrate, see https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html
     peerDependencies:
-      "@aws-cdk/aws-iam": 1.204.0
-      "@aws-cdk/core": 1.204.0
+      '@aws-cdk/aws-iam': 1.204.0
+      '@aws-cdk/core': 1.204.0
       constructs: ^3.3.69
     dependencies:
-      "@aws-cdk/aws-iam": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/core": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/aws-iam': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/core': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
       constructs: 3.4.344
-    dev: false
+    dev: true
 
   /@aws-cdk/aws-iam@1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344):
     resolution: {integrity: sha512-Fh2egW3v/uDdw3m4jvcupS7COL/+sJl2NHjz9l298ddyMxqDwJD2NQwE8mvgPLK4rDtAtDnE0c8RS6d+NWiC+w==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
       For more information on how to migrate, see https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html
     peerDependencies:
-      "@aws-cdk/core": 1.204.0
-      "@aws-cdk/region-info": 1.204.0
+      '@aws-cdk/core': 1.204.0
+      '@aws-cdk/region-info': 1.204.0
       constructs: ^3.3.69
     dependencies:
-      "@aws-cdk/core": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/cx-api": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
-      "@aws-cdk/region-info": 1.204.0
+      '@aws-cdk/core': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/cx-api': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
+      '@aws-cdk/region-info': 1.204.0
       constructs: 3.4.344
     transitivePeerDependencies:
-      - "@aws-cdk/cloud-assembly-schema"
-    dev: false
+      - '@aws-cdk/cloud-assembly-schema'
+    dev: true
 
   /@aws-cdk/aws-kms@1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/cx-api@1.204.0)(constructs@3.4.344):
     resolution: {integrity: sha512-iryZQ428L1VUVQ0zE96XTWWX7ANVtDrb6x+ZXXLTVUEPgjEd/W6zlcp++Qi0A3a9HLNd4PbEhK9rs0UKNTylzw==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
       For more information on how to migrate, see https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html
     peerDependencies:
-      "@aws-cdk/aws-iam": 1.204.0
-      "@aws-cdk/cloud-assembly-schema": 1.204.0
-      "@aws-cdk/core": 1.204.0
-      "@aws-cdk/cx-api": 1.204.0
+      '@aws-cdk/aws-iam': 1.204.0
+      '@aws-cdk/cloud-assembly-schema': 1.204.0
+      '@aws-cdk/core': 1.204.0
+      '@aws-cdk/cx-api': 1.204.0
       constructs: ^3.3.69
     dependencies:
-      "@aws-cdk/aws-iam": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/cloud-assembly-schema": 1.204.0
-      "@aws-cdk/core": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/cx-api": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
+      '@aws-cdk/aws-iam': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/cloud-assembly-schema': 1.204.0
+      '@aws-cdk/core': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/cx-api': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
       constructs: 3.4.344
-    dev: false
+    dev: true
 
   /@aws-cdk/aws-s3@1.204.0(@aws-cdk/aws-events@1.204.0)(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/aws-kms@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/cx-api@1.204.0)(constructs@3.4.344):
     resolution: {integrity: sha512-jsQ4n1L4MdPYDirBoOYgg7yzSk1TaFYo4dnwDlKiLJ5LcHG3Nai1cHb9XQbCy/9KKqbWsbd3WlkH+vcWEl8EUA==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
       For more information on how to migrate, see https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html
     peerDependencies:
-      "@aws-cdk/aws-events": 1.204.0
-      "@aws-cdk/aws-iam": 1.204.0
-      "@aws-cdk/aws-kms": 1.204.0
-      "@aws-cdk/core": 1.204.0
-      "@aws-cdk/cx-api": 1.204.0
+      '@aws-cdk/aws-events': 1.204.0
+      '@aws-cdk/aws-iam': 1.204.0
+      '@aws-cdk/aws-kms': 1.204.0
+      '@aws-cdk/core': 1.204.0
+      '@aws-cdk/cx-api': 1.204.0
       constructs: ^3.3.69
     dependencies:
-      "@aws-cdk/aws-events": 1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/core@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/aws-iam": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/aws-kms": 1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/cx-api@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/core": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
-      "@aws-cdk/cx-api": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
+      '@aws-cdk/aws-events': 1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/core@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/aws-iam': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/aws-kms': 1.204.0(@aws-cdk/aws-iam@1.204.0)(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/core@1.204.0)(@aws-cdk/cx-api@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/core': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344)
+      '@aws-cdk/cx-api': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
       constructs: 3.4.344
-    dev: false
+    dev: true
 
   /@aws-cdk/cloud-assembly-schema@1.204.0:
     resolution: {integrity: sha512-DMNSR4DNKMNNfhOq1UizwZvesOKdhk3R3gRigrvWBHIkHMQg+W6aZFl7WZLKSBkChAXhIsH///psjhDQ20gl1w==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
@@ -1665,78 +1843,74 @@ packages:
     dependencies:
       jsonschema: 1.4.1
       semver: 7.5.4
-    dev: false
+    dev: true
     bundledDependencies:
       - jsonschema
       - semver
 
   /@aws-cdk/core@1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)(@aws-cdk/cx-api@1.204.0)(@aws-cdk/region-info@1.204.0)(constructs@3.4.344):
     resolution: {integrity: sha512-yO/flJ9ihpzRhLTEqlbdbuPGtyyghHiiQPkUTLslwUM5vThVTbpgvW4UQHSGqytyst4MYXrN2jQn2RkwIRU57g==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
       For more information on how to migrate, see https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html
     peerDependencies:
-      "@aws-cdk/cloud-assembly-schema": 1.204.0
-      "@aws-cdk/cx-api": 1.204.0
-      "@aws-cdk/region-info": 1.204.0
+      '@aws-cdk/cloud-assembly-schema': 1.204.0
+      '@aws-cdk/cx-api': 1.204.0
+      '@aws-cdk/region-info': 1.204.0
       constructs: ^3.3.69
     dependencies:
-      "@aws-cdk/cloud-assembly-schema": 1.204.0
-      "@aws-cdk/cx-api": 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
-      "@aws-cdk/region-info": 1.204.0
-      "@balena/dockerignore": 1.0.2
+      '@aws-cdk/cloud-assembly-schema': 1.204.0
+      '@aws-cdk/cx-api': 1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0)
+      '@aws-cdk/region-info': 1.204.0
       constructs: 3.4.344
-      fs-extra: 9.1.0
-      ignore: 5.2.4
-      minimatch: 3.1.2
-    dev: false
+    dev: true
     bundledDependencies:
       - fs-extra
       - minimatch
-      - "@balena/dockerignore"
+      - '@balena/dockerignore'
       - ignore
 
   /@aws-cdk/cx-api@1.204.0(@aws-cdk/cloud-assembly-schema@1.204.0):
     resolution: {integrity: sha512-Juh/jL1kFPD5JcI9Uu6X0mM2L6hBCN5grdjSS40F8dThbH25VPzFBejaKjiy5nP1UZB83X+HW3utYOEi97DqxA==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
       For more information on how to migrate, see https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html
     peerDependencies:
-      "@aws-cdk/cloud-assembly-schema": 1.204.0
+      '@aws-cdk/cloud-assembly-schema': 1.204.0
     dependencies:
-      "@aws-cdk/cloud-assembly-schema": 1.204.0
+      '@aws-cdk/cloud-assembly-schema': 1.204.0
       semver: 7.5.4
-    dev: false
+    dev: true
     bundledDependencies:
       - semver
 
   /@aws-cdk/region-info@1.204.0:
     resolution: {integrity: sha512-lPkYJNoN4Gjlf0Fdfgcd1RTm5RD9qtfaFMwVvTn2KGTr7ZqmFskGQ9FqIcd5vd6GmsbAL8OrFOToLr1AHDuOiQ==}
-    engines: {node: ">= 14.15.0"}
+    engines: {node: '>= 14.15.0'}
     deprecated: |-
       AWS CDK v1 has reached End-of-Support on 2023-06-01.
       This package is no longer being updated, and users should migrate to AWS CDK v2.
 
       For more information on how to migrate, see https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html
-    dev: false
+    dev: true
 
   /@aws-crypto/crc32@3.0.0:
     resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==}
     dependencies:
-      "@aws-crypto/util": 3.0.0
-      "@aws-sdk/types": 3.449.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.449.0
       tslib: 1.14.1
     dev: false
 
   /@aws-crypto/crc32c@3.0.0:
     resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==}
     dependencies:
-      "@aws-crypto/util": 3.0.0
-      "@aws-sdk/types": 3.449.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.449.0
       tslib: 1.14.1
     dev: false
 
@@ -1749,33 +1923,33 @@ packages:
   /@aws-crypto/sha1-browser@3.0.0:
     resolution: {integrity: sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==}
     dependencies:
-      "@aws-crypto/ie11-detection": 3.0.0
-      "@aws-crypto/supports-web-crypto": 3.0.0
-      "@aws-crypto/util": 3.0.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-locate-window": 3.310.0
-      "@aws-sdk/util-utf8-browser": 3.259.0
+      '@aws-crypto/ie11-detection': 3.0.0
+      '@aws-crypto/supports-web-crypto': 3.0.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.449.0
+      '@aws-sdk/util-locate-window': 3.310.0
+      '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
     dev: false
 
   /@aws-crypto/sha256-browser@3.0.0:
     resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==}
     dependencies:
-      "@aws-crypto/ie11-detection": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-crypto/supports-web-crypto": 3.0.0
-      "@aws-crypto/util": 3.0.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-locate-window": 3.310.0
-      "@aws-sdk/util-utf8-browser": 3.259.0
+      '@aws-crypto/ie11-detection': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-crypto/supports-web-crypto': 3.0.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.449.0
+      '@aws-sdk/util-locate-window': 3.310.0
+      '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
     dev: false
 
   /@aws-crypto/sha256-js@3.0.0:
     resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
     dependencies:
-      "@aws-crypto/util": 3.0.0
-      "@aws-sdk/types": 3.449.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.449.0
       tslib: 1.14.1
     dev: false
 
@@ -1788,1290 +1962,1445 @@ packages:
   /@aws-crypto/util@3.0.0:
     resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-utf8-browser": 3.259.0
+      '@aws-sdk/types': 3.449.0
+      '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
     dev: false
 
-  /@aws-sdk/client-cloudwatch-logs@3.449.0:
-    resolution: {integrity: sha512-Oz9eV+e0ehaiHTt8w3xk5fDek0DOzKUn8QDBC0BzlO2OozFVKkJ27XiGsqLRUEYjgXH8mv80hOvfoNQK2Y5FDw==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/client-cloudwatch-logs@3.577.0:
+    resolution: {integrity: sha512-boUa2GIE4JHzVH6bx1GZuddk9y+QWe8lhX7vydlduAkTgSjaoxUluC3kLi1P0m5qKP2oTQA2/K26OOnZ9Hv74Q==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/eventstream-serde-browser': 3.0.0
+      '@smithy/eventstream-serde-config-resolver': 3.0.0
+      '@smithy/eventstream-serde-node': 3.0.0
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
-      uuid: 8.3.2
+      uuid: 9.0.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-dynamodb@3.405.0:
-    resolution: {integrity: sha512-hBaC5F6M1CMRg7RkVC4xbqT+9CVunxrxeQKZCy4H2iMnOmFyY9InjOqF06rF3dRTTDJl5Ski9AWJrovg29Q+iw==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.405.0
-      "@aws-sdk/credential-provider-node": 3.405.0
-      "@aws-sdk/middleware-endpoint-discovery": 3.405.0
-      "@aws-sdk/middleware-host-header": 3.398.0
-      "@aws-sdk/middleware-logger": 3.398.0
-      "@aws-sdk/middleware-recursion-detection": 3.398.0
-      "@aws-sdk/middleware-signing": 3.398.0
-      "@aws-sdk/middleware-user-agent": 3.398.0
-      "@aws-sdk/types": 3.398.0
-      "@aws-sdk/util-endpoints": 3.398.0
-      "@aws-sdk/util-user-agent-browser": 3.398.0
-      "@aws-sdk/util-user-agent-node": 3.405.0
-      "@smithy/config-resolver": 2.0.14
-      "@smithy/fetch-http-handler": 2.2.2
-      "@smithy/hash-node": 2.0.11
-      "@smithy/invalid-dependency": 2.0.11
-      "@smithy/middleware-content-length": 2.0.13
-      "@smithy/middleware-endpoint": 2.0.11
-      "@smithy/middleware-retry": 2.0.16
-      "@smithy/middleware-serde": 2.0.11
-      "@smithy/middleware-stack": 2.0.5
-      "@smithy/node-config-provider": 2.1.1
-      "@smithy/node-http-handler": 2.1.7
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/smithy-client": 2.1.10
-      "@smithy/types": 2.3.5
-      "@smithy/url-parser": 2.0.11
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.14
-      "@smithy/util-defaults-mode-node": 2.0.18
-      "@smithy/util-retry": 2.0.4
-      "@smithy/util-utf8": 2.0.0
-      "@smithy/util-waiter": 2.0.11
+  /@aws-sdk/client-dynamodb@3.503.1:
+    resolution: {integrity: sha512-u0ELAHn3QDcD3VkM1QEZGk7kYFdvSyEHxdA0Gnrg/jSRKmm24z3VmluT2i4tGntjEaD51jTC7e70s1wC1fgldg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sts': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/core': 3.496.0
+      '@aws-sdk/credential-provider-node': 3.503.1
+      '@aws-sdk/middleware-endpoint-discovery': 3.502.0
+      '@aws-sdk/middleware-host-header': 3.502.0
+      '@aws-sdk/middleware-logger': 3.502.0
+      '@aws-sdk/middleware-recursion-detection': 3.502.0
+      '@aws-sdk/middleware-user-agent': 3.502.0
+      '@aws-sdk/region-config-resolver': 3.502.0
+      '@aws-sdk/types': 3.502.0
+      '@aws-sdk/util-endpoints': 3.502.0
+      '@aws-sdk/util-user-agent-browser': 3.502.0
+      '@aws-sdk/util-user-agent-node': 3.502.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/core': 1.3.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-middleware': 2.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-utf8': 2.1.1
+      '@smithy/util-waiter': 2.1.1
       tslib: 2.6.2
       uuid: 8.3.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-dynamodb@3.449.0:
-    resolution: {integrity: sha512-v645mRyTQHx9yJUZ9bZHjpl09G1AMO6zhv3bZYbxFAyByJTse81XtfP3pvBJ2ghkYvWNFts2YQp0XnqCj3IIrg==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-endpoint-discovery": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
-      "@smithy/util-waiter": 2.0.12
+  /@aws-sdk/client-dynamodb@3.577.0:
+    resolution: {integrity: sha512-jR+rhYz25aPcMQgQy9tyQS9bsZ2bUKf7gaJ89jvhrrt61dcvw2iXzoO++2SCJWTx8WE1nsT6Vcw70RYpc5y71g==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-endpoint-discovery': 3.577.0
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-waiter': 3.0.0
       tslib: 2.6.2
-      uuid: 8.3.2
+      uuid: 9.0.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-elasticache@3.449.0:
-    resolution: {integrity: sha512-DOyJKkysq8Kjy5yKbdPu6ZdG+ru2Smr+Drk48a862kDrO0sMH2jFTMjQbSkJhXS1sZAekkJjW6Vwkg9EKGdvtg==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
-      "@smithy/util-waiter": 2.0.12
-      fast-xml-parser: 4.2.5
+  /@aws-sdk/client-elasticache@3.577.0:
+    resolution: {integrity: sha512-2ZPzz0P/GLD0kGbZM40wgML6VNeRJhUDhJThz4dSPGoABQBuedfC15m/zrVJtzE1C8+aEepOV2xDfUYB/3VgUg==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-waiter': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-lambda@3.449.0:
-    resolution: {integrity: sha512-0gbOj7EhYUEJpQlmUH4t77wU1hgIUtsOlZoENopkREu914TS/Yz1qM8jgBRUZSKty3aBHFTr88pZ5zgEFjuHZA==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/eventstream-serde-browser": 2.0.12
-      "@smithy/eventstream-serde-config-resolver": 2.0.12
-      "@smithy/eventstream-serde-node": 2.0.12
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-stream": 2.0.17
-      "@smithy/util-utf8": 2.0.0
-      "@smithy/util-waiter": 2.0.12
+  /@aws-sdk/client-lambda@3.577.0:
+    resolution: {integrity: sha512-z1Rvz2LEAPF1mg/khJ133v14VhLvO4Aqx/0wKg70C9K+ZeHKssiAc38M3QZ0OjM7mJ6dIWOvRSBPmvDyls7rcg==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/eventstream-serde-browser': 3.0.0
+      '@smithy/eventstream-serde-config-resolver': 3.0.0
+      '@smithy/eventstream-serde-node': 3.0.0
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-stream': 3.0.1
+      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-waiter': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-s3@3.449.0:
-    resolution: {integrity: sha512-+xRyzPc2pVR1sX5cGvOIjyxWroa2hQ1IgjA5t4OV5QfQe87uFrxP2zHTclUo8+1USzaB5fESwUs2jXZQ647Z0g==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha1-browser": 3.0.0
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-bucket-endpoint": 3.449.0
-      "@aws-sdk/middleware-expect-continue": 3.449.0
-      "@aws-sdk/middleware-flexible-checksums": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-location-constraint": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-sdk-s3": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-ssec": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/signature-v4-multi-region": 3.449.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@aws-sdk/xml-builder": 3.310.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/eventstream-serde-browser": 2.0.12
-      "@smithy/eventstream-serde-config-resolver": 2.0.12
-      "@smithy/eventstream-serde-node": 2.0.12
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-blob-browser": 2.0.12
-      "@smithy/hash-node": 2.0.12
-      "@smithy/hash-stream-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/md5-js": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-stream": 2.0.17
-      "@smithy/util-utf8": 2.0.0
-      "@smithy/util-waiter": 2.0.12
-      fast-xml-parser: 4.2.5
+  /@aws-sdk/client-s3@3.577.0:
+    resolution: {integrity: sha512-mQYXwn6E4Rwggn6teF6EIWJtK8jsKcxnPj2QVETkSmD8QaFLm4g/DgLPdamDE97UI8k1k0cmWqXcTOLIaZ7wQg==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha1-browser': 3.0.0
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-bucket-endpoint': 3.577.0
+      '@aws-sdk/middleware-expect-continue': 3.577.0
+      '@aws-sdk/middleware-flexible-checksums': 3.577.0
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-location-constraint': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-sdk-s3': 3.577.0
+      '@aws-sdk/middleware-signing': 3.577.0
+      '@aws-sdk/middleware-ssec': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/signature-v4-multi-region': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@aws-sdk/xml-builder': 3.575.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/eventstream-serde-browser': 3.0.0
+      '@smithy/eventstream-serde-config-resolver': 3.0.0
+      '@smithy/eventstream-serde-node': 3.0.0
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-blob-browser': 3.0.0
+      '@smithy/hash-node': 3.0.0
+      '@smithy/hash-stream-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/md5-js': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-stream': 3.0.1
+      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-waiter': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-secrets-manager@3.449.0:
-    resolution: {integrity: sha512-wIwxdAdbW2TZOvRkmOlZNI0V+JPAVYMsLJy9N5XscArelPA2aHVY0aSZAP85jsdPNmrMzwCIpTXHwpu+MFqI0w==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/client-secrets-manager@3.577.0:
+    resolution: {integrity: sha512-9OVz1jkQbJ2tpSPpkT5LX7gnO1/MQl0XcKHIdtOFx5M4qS+1YC+ONm3H7r7X8nQf8UZpEWF1/iYXteLcIAYluw==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
-      uuid: 8.3.2
+      uuid: 9.0.1
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sns@3.449.0:
-    resolution: {integrity: sha512-wkn9/KYTJkmJNVhyRzi5c8HsnEDaHHQl5F1mIDWIRZjoeTLX3OkqW8DqwDOfwLcDqtCVC6Gi+ZOn0GoC7QlOzw==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
-      fast-xml-parser: 4.2.5
+  /@aws-sdk/client-sns@3.577.0:
+    resolution: {integrity: sha512-sZ02OFHqB5o4dtLkcXZHsSBcno3McCgSVsxcve2fA8yMeI/nB8n/e/s9yr8Lupfzgpwh3lgOndPBeJQrmxDs7w==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sqs@3.449.0:
-    resolution: {integrity: sha512-moT+iLy61s1YmmDS3iOByRgueWCfvNT/nl+BALgktXN4sV92+1JE3epu6wSj4Xwk7SB3bLIt81bMfF32DBJ70w==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/client-sts": 3.449.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-sdk-sqs": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/md5-js": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/client-sqs@3.577.0:
+    resolution: {integrity: sha512-h3Gquz0BrR7aN5n4mTPp59rxcpGVn4j6HV5TuhMbsfnZet2Aee1c+JlXdWRNkf3Vfrb1tmt9EF2b7jNpYRf3pw==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-sdk-sqs': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/md5-js': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sso@3.405.0:
-    resolution: {integrity: sha512-z1ssydU07bDhe0tNXQwVO+rWh/iSfK48JI8s8vgpBNwH+NejMzIJ9r3AkjCiJ+LSAwlBZItUsNWwR0veIfgBiw==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/middleware-host-header": 3.398.0
-      "@aws-sdk/middleware-logger": 3.398.0
-      "@aws-sdk/middleware-recursion-detection": 3.398.0
-      "@aws-sdk/middleware-user-agent": 3.398.0
-      "@aws-sdk/types": 3.398.0
-      "@aws-sdk/util-endpoints": 3.398.0
-      "@aws-sdk/util-user-agent-browser": 3.398.0
-      "@aws-sdk/util-user-agent-node": 3.405.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/client-sso-oidc@3.502.0(@aws-sdk/credential-provider-node@3.503.1):
+    resolution: {integrity: sha512-Yc9tZqTOMWtdgpkrdjKShgWb9oKNsFQrItfoiN1xWDllaFFRPi2KTiZiR0AbSTrNasJy13d210DOxrIdte+kWQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@aws-sdk/credential-provider-node': '*'
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sts': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/core': 3.496.0
+      '@aws-sdk/credential-provider-node': 3.503.1
+      '@aws-sdk/middleware-host-header': 3.502.0
+      '@aws-sdk/middleware-logger': 3.502.0
+      '@aws-sdk/middleware-recursion-detection': 3.502.0
+      '@aws-sdk/middleware-signing': 3.502.0
+      '@aws-sdk/middleware-user-agent': 3.502.0
+      '@aws-sdk/region-config-resolver': 3.502.0
+      '@aws-sdk/types': 3.502.0
+      '@aws-sdk/util-endpoints': 3.502.0
+      '@aws-sdk/util-user-agent-browser': 3.502.0
+      '@aws-sdk/util-user-agent-node': 3.502.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/core': 1.3.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sso@3.449.0:
-    resolution: {integrity: sha512-HFTlFbf9jwp5BJkXbMKlEwk6oGC7AVYaPEkaNk77kzZ8RGoqVSAqe0HL74DACcJUpMD/VWYX7pfWq/Wm+2B79g==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/client-sso-oidc@3.577.0(@aws-sdk/client-sts@3.577.0):
+    resolution: {integrity: sha512-njmKSPDWueWWYVFpFcZ2P3fI6/pdQVDa0FgCyYZhOnJLgEHZIcBBg1AsnkVWacBuLopp9XVt2m+7hO6ugY1/1g==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sts'
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sts@3.405.0:
-    resolution: {integrity: sha512-asVEpda3zu5QUO5ZNNjbLBS0718IhxxyUDVrNmVTKZoOhK1pMNouGZf+l49v0Lb5cOPbUds8cxsNaInj2MvIKw==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/credential-provider-node": 3.405.0
-      "@aws-sdk/middleware-host-header": 3.398.0
-      "@aws-sdk/middleware-logger": 3.398.0
-      "@aws-sdk/middleware-recursion-detection": 3.398.0
-      "@aws-sdk/middleware-sdk-sts": 3.398.0
-      "@aws-sdk/middleware-signing": 3.398.0
-      "@aws-sdk/middleware-user-agent": 3.398.0
-      "@aws-sdk/types": 3.398.0
-      "@aws-sdk/util-endpoints": 3.398.0
-      "@aws-sdk/util-user-agent-browser": 3.398.0
-      "@aws-sdk/util-user-agent-node": 3.405.0
-      "@smithy/config-resolver": 2.0.14
-      "@smithy/fetch-http-handler": 2.2.2
-      "@smithy/hash-node": 2.0.11
-      "@smithy/invalid-dependency": 2.0.11
-      "@smithy/middleware-content-length": 2.0.13
-      "@smithy/middleware-endpoint": 2.0.11
-      "@smithy/middleware-retry": 2.0.16
-      "@smithy/middleware-serde": 2.0.11
-      "@smithy/middleware-stack": 2.0.5
-      "@smithy/node-config-provider": 2.1.1
-      "@smithy/node-http-handler": 2.1.7
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/smithy-client": 2.1.10
-      "@smithy/types": 2.3.5
-      "@smithy/url-parser": 2.0.11
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.14
-      "@smithy/util-defaults-mode-node": 2.0.18
-      "@smithy/util-retry": 2.0.4
-      "@smithy/util-utf8": 2.0.0
-      fast-xml-parser: 4.2.5
+  /@aws-sdk/client-sso@3.502.0:
+    resolution: {integrity: sha512-OZAYal1+PQgUUtWiHhRayDtX0OD+XpXHKAhjYgEIPbyhQaCMp3/Bq1xDX151piWXvXqXLJHFKb8DUEqzwGO9QA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.496.0
+      '@aws-sdk/middleware-host-header': 3.502.0
+      '@aws-sdk/middleware-logger': 3.502.0
+      '@aws-sdk/middleware-recursion-detection': 3.502.0
+      '@aws-sdk/middleware-user-agent': 3.502.0
+      '@aws-sdk/region-config-resolver': 3.502.0
+      '@aws-sdk/types': 3.502.0
+      '@aws-sdk/util-endpoints': 3.502.0
+      '@aws-sdk/util-user-agent-browser': 3.502.0
+      '@aws-sdk/util-user-agent-node': 3.502.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/core': 1.3.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-utf8': 2.1.1
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
+
+  /@aws-sdk/client-sso@3.577.0:
+    resolution: {integrity: sha512-BwujdXrydlk6UEyPmewm5GqG4nkQ6OVyRhS/SyZP/6UKSFv2/sf391Cmz0hN0itUTH1rR4XeLln8XCOtarkrzg==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sts@3.449.0:
-    resolution: {integrity: sha512-iKh5Es9tyY+Ch17bvMubW67ydW4X3Buy9vwTIqpmXlnXEfbvjZRwycjWK2MO/P1Su3wjA14zNBq2ifNWFxkwFA==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/core": 3.445.0
-      "@aws-sdk/credential-provider-node": 3.449.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-sdk-sts": 3.449.0
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/client-sts@3.502.0(@aws-sdk/credential-provider-node@3.503.1):
+    resolution: {integrity: sha512-0q08gsvn6nuRqjK+i/e30PT/t7vvYwmGJS0PhJikZWv5yRDNSUxSYG0uDwKSbLDzmc2UX5+mLeyjPHlL4hbGlA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@aws-sdk/credential-provider-node': '*'
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.496.0
+      '@aws-sdk/credential-provider-node': 3.503.1
+      '@aws-sdk/middleware-host-header': 3.502.0
+      '@aws-sdk/middleware-logger': 3.502.0
+      '@aws-sdk/middleware-recursion-detection': 3.502.0
+      '@aws-sdk/middleware-user-agent': 3.502.0
+      '@aws-sdk/region-config-resolver': 3.502.0
+      '@aws-sdk/types': 3.502.0
+      '@aws-sdk/util-endpoints': 3.502.0
+      '@aws-sdk/util-user-agent-browser': 3.502.0
+      '@aws-sdk/util-user-agent-node': 3.502.0
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/core': 1.3.1
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/hash-node': 2.1.1
+      '@smithy/invalid-dependency': 2.1.1
+      '@smithy/middleware-content-length': 2.1.1
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-body-length-browser': 2.1.1
+      '@smithy/util-body-length-node': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.1.1
+      '@smithy/util-defaults-mode-node': 2.1.1
+      '@smithy/util-endpoints': 1.1.1
+      '@smithy/util-middleware': 2.1.1
+      '@smithy/util-retry': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       fast-xml-parser: 4.2.5
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/core@3.445.0:
-    resolution: {integrity: sha512-6GYLElUG1QTOdmXG8zXa+Ull9IUeSeItKDYHKzHYfIkbsagMfYlf7wm9XIYlatjtgodNfZ3gPHAJfRyPmwKrsg==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@smithy/smithy-client": 2.1.12
+  /@aws-sdk/client-sts@3.577.0:
+    resolution: {integrity: sha512-509Kklimva1XVlhGbpTpeX3kOP6ORpm44twJxDHpa9TURbmoaxj7veWlnLCbDorxDTrbsDghvYZshvcLsojVpg==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/core': 3.576.0
+      '@aws-sdk/credential-provider-node': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/middleware-host-header': 3.577.0
+      '@aws-sdk/middleware-logger': 3.577.0
+      '@aws-sdk/middleware-recursion-detection': 3.577.0
+      '@aws-sdk/middleware-user-agent': 3.577.0
+      '@aws-sdk/region-config-resolver': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@aws-sdk/util-user-agent-browser': 3.577.0
+      '@aws-sdk/util-user-agent-node': 3.577.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/core': 2.0.1
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/hash-node': 3.0.0
+      '@smithy/invalid-dependency': 3.0.0
+      '@smithy/middleware-content-length': 3.0.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.1
+      '@smithy/util-defaults-mode-node': 3.0.1
+      '@smithy/util-endpoints': 2.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-env@3.398.0:
-    resolution: {integrity: sha512-Z8Yj5z7FroAsR6UVML+XUdlpoqEe9Dnle8c2h8/xWwIC2feTfIBhjLhRVxfbpbM1pLgBSNEcZ7U8fwq5l7ESVQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/core@3.496.0:
+    resolution: {integrity: sha512-yT+ug7Cw/3eJi7x2es0+46x12+cIJm5Xv+GPWsrTFD1TKgqO/VPEgfDtHFagDNbFmjNQA65Ygc/kEdIX9ICX/A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/property-provider": 2.0.12
-      "@smithy/types": 2.4.0
+      '@smithy/core': 1.3.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/signature-v4': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-env@3.449.0:
-    resolution: {integrity: sha512-SwO9XQcBoyA0XrsSmgnMqCnR99wIyp+BjGhvzDU+Wetib7QPt++E2slJkLM/iCNc6YiqiHZtHsvXapSV7RzBJw==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/core@3.576.0:
+    resolution: {integrity: sha512-KDvDlbeipSTIf+ffKtTg1m419TK7s9mZSWC8bvuZ9qx6/sjQFOXIKOVqyuli6DnfxGbvRcwoRuY99OcCH1N/0w==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/property-provider": 2.0.13
-      "@smithy/types": 2.4.0
+      '@smithy/core': 2.0.1
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/signature-v4': 3.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      fast-xml-parser: 4.2.5
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-ini@3.405.0:
-    resolution: {integrity: sha512-b4TqVsM4WQM96GDVs+TYOhU2/0SnUWzz6NH55qY1y2xyF8/pZEhc0XXdpvZtQQBLGdROhXCbxhBVye8GmTpgcg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-env@3.502.0:
+    resolution: {integrity: sha512-KIB8Ae1Z7domMU/jU4KiIgK4tmYgvuXlhR54ehwlVHxnEoFPoPuGHFZU7oFn79jhhSLUFQ1lRYMxP0cEwb7XeQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/credential-provider-env": 3.398.0
-      "@aws-sdk/credential-provider-process": 3.405.0
-      "@aws-sdk/credential-provider-sso": 3.405.0
-      "@aws-sdk/credential-provider-web-identity": 3.398.0
-      "@aws-sdk/types": 3.398.0
-      "@smithy/credential-provider-imds": 2.0.16
-      "@smithy/property-provider": 2.0.12
-      "@smithy/shared-ini-file-loader": 2.2.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
-    transitivePeerDependencies:
+    dev: false
+
+  /@aws-sdk/credential-provider-env@3.577.0:
+    resolution: {integrity: sha512-Jxu255j0gToMGEiqufP8ZtKI8HW90lOLjwJ3LrdlD/NLsAY0tOQf1fWc53u28hWmmNGMxmCrL2p66IOgMDhDUw==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.577.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/types': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@aws-sdk/credential-provider-http@3.503.1:
+    resolution: {integrity: sha512-rTdlFFGoPPFMF2YjtlfRuSgKI+XsF49u7d98255hySwhsbwd3Xp+utTTPquxP+CwDxMHbDlI7NxDzFiFdsoZug==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.502.0
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-stream': 2.1.1
+      tslib: 2.6.2
+    dev: false
+
+  /@aws-sdk/credential-provider-http@3.577.0:
+    resolution: {integrity: sha512-n++yhCp67b9+ZRGEdY1jhamB5E/O+QsIDOPSuRmdaSGMCOd82oUEKPgIVEU1bkqxDsBxgiEWuvtfhK6sNiDS0A==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.577.0
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/util-stream': 3.0.1
+      tslib: 2.6.2
+    dev: false
+
+  /@aws-sdk/credential-provider-ini@3.503.1(@aws-sdk/credential-provider-node@3.503.1):
+    resolution: {integrity: sha512-1RiC72NdWJ5w2IaX/91Fku+FrrChzaHuMCD5wbjk5TMHjwiDZ622wvMKYVmn30biW0RbJidaw38Y9PAGivdZxw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/client-sts': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/credential-provider-env': 3.502.0
+      '@aws-sdk/credential-provider-process': 3.502.0
+      '@aws-sdk/credential-provider-sso': 3.503.1(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/credential-provider-web-identity': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/types': 3.502.0
+      '@smithy/credential-provider-imds': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - '@aws-sdk/credential-provider-node'
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-ini@3.449.0:
-    resolution: {integrity: sha512-C2pMYysIfbRBR4Q+Aj7J0cRsKY/X2cOnrggrWzsEUJK3EJ1aHwrzm3HI0VM5DttJyya5hE4tZ/H1VX3zNGUtKA==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-ini@3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0):
+    resolution: {integrity: sha512-q7lHPtv6BjRvChUE3m0tIaEZKxPTaZ1B3lKxGYsFl3VLAu5N8yGCUKwuA1izf4ucT+LyKscVGqK6VDZx1ev3nw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-sts': ^3.577.0
     dependencies:
-      "@aws-sdk/credential-provider-env": 3.449.0
-      "@aws-sdk/credential-provider-process": 3.449.0
-      "@aws-sdk/credential-provider-sso": 3.449.0
-      "@aws-sdk/credential-provider-web-identity": 3.449.0
-      "@aws-sdk/types": 3.449.0
-      "@smithy/credential-provider-imds": 2.0.18
-      "@smithy/property-provider": 2.0.13
-      "@smithy/shared-ini-file-loader": 2.2.2
-      "@smithy/types": 2.4.0
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/credential-provider-env': 3.577.0
+      '@aws-sdk/credential-provider-process': 3.577.0
+      '@aws-sdk/credential-provider-sso': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)
+      '@aws-sdk/credential-provider-web-identity': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/types': 3.577.0
+      '@smithy/credential-provider-imds': 3.0.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/shared-ini-file-loader': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-node@3.405.0:
-    resolution: {integrity: sha512-AMmRP09nwYsft0MXDlHIxMQe7IloWW8As0lbZmPrG7Y7mK5RDmCIwD2yMDz77Zqlv09FsYt+9+cOK2fTNhim+Q==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-sdk/credential-provider-env": 3.398.0
-      "@aws-sdk/credential-provider-ini": 3.405.0
-      "@aws-sdk/credential-provider-process": 3.405.0
-      "@aws-sdk/credential-provider-sso": 3.405.0
-      "@aws-sdk/credential-provider-web-identity": 3.398.0
-      "@aws-sdk/types": 3.398.0
-      "@smithy/credential-provider-imds": 2.0.16
-      "@smithy/property-provider": 2.0.12
-      "@smithy/shared-ini-file-loader": 2.2.0
-      "@smithy/types": 2.3.5
+  /@aws-sdk/credential-provider-node@3.503.1:
+    resolution: {integrity: sha512-1qsRWnXl8OUZEDpUFF/gjCGjePjZB6fIpX+XQuTpKokeDzYZk0HwQSakPspfmzT8MkyB9IBJVWb7KbFCjKNt0A==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.502.0
+      '@aws-sdk/credential-provider-http': 3.503.1
+      '@aws-sdk/credential-provider-ini': 3.503.1(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/credential-provider-process': 3.502.0
+      '@aws-sdk/credential-provider-sso': 3.503.1(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/credential-provider-web-identity': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/types': 3.502.0
+      '@smithy/credential-provider-imds': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-node@3.449.0:
-    resolution: {integrity: sha512-cCsqMqL8vmHADwIHCmTWDB4vr5fCXb4PZn3njbA/PIA92xL4S7hRmYi/1ll0CMd+fks+t/h+s+PIhFGo54C7cA==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-sdk/credential-provider-env": 3.449.0
-      "@aws-sdk/credential-provider-ini": 3.449.0
-      "@aws-sdk/credential-provider-process": 3.449.0
-      "@aws-sdk/credential-provider-sso": 3.449.0
-      "@aws-sdk/credential-provider-web-identity": 3.449.0
-      "@aws-sdk/types": 3.449.0
-      "@smithy/credential-provider-imds": 2.0.18
-      "@smithy/property-provider": 2.0.13
-      "@smithy/shared-ini-file-loader": 2.2.2
-      "@smithy/types": 2.4.0
+  /@aws-sdk/credential-provider-node@3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0):
+    resolution: {integrity: sha512-epZ1HOMsrXBNczc0HQpv0VMjqAEpc09DUA7Rg3gUJfn8umhML7A7bXnUyqPA+S54q397UYg1leQKdSn23OiwQQ==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.577.0
+      '@aws-sdk/credential-provider-http': 3.577.0
+      '@aws-sdk/credential-provider-ini': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/credential-provider-process': 3.577.0
+      '@aws-sdk/credential-provider-sso': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)
+      '@aws-sdk/credential-provider-web-identity': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/types': 3.577.0
+      '@smithy/credential-provider-imds': 3.0.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/shared-ini-file-loader': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
+      - '@aws-sdk/client-sts'
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-process@3.405.0:
-    resolution: {integrity: sha512-EqAMcUVeZAICYHHL8x5Fi5CYPgCo9UCE7ScWmU5Sa2wAFY4XLyQ1mMxX3lKGYx9lBxWk3dqnhmvlcqdzN7AjyQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-process@3.502.0:
+    resolution: {integrity: sha512-fJJowOjQ4infYQX0E1J3xFVlmuwEYJAFk0Mo1qwafWmEthsBJs+6BR2RiWDELHKrSK35u4Pf3fu3RkYuCtmQFw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/property-provider": 2.0.12
-      "@smithy/shared-ini-file-loader": 2.2.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-process@3.449.0:
-    resolution: {integrity: sha512-IofhAgpwdSnaEg9H0dhydac07GCQ55Mc5oRzdzp/tm0Rl0MqnGdIvN8wYsxAeVhEi9pBSNla4eRiTu3LY6Z5+A==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-process@3.577.0:
+    resolution: {integrity: sha512-Gin6BWtOiXxIgITrJ3Nwc+Y2P1uVT6huYR4EcbA/DJUPWyO0n9y5UFLewPvVbLkRn15JeEqErBLUrHclkiOKtw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/property-provider": 2.0.13
-      "@smithy/shared-ini-file-loader": 2.2.2
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/shared-ini-file-loader': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-sso@3.405.0:
-    resolution: {integrity: sha512-fXqSgQHz7qcmIWMVguwSMSjqFkVfN2+XiNgiskcmeYiCS7mIGAgUnKABZc9Ds2+YW9ATYiY0BOD5aWxc8TX5fA==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-sso@3.503.1(@aws-sdk/credential-provider-node@3.503.1):
+    resolution: {integrity: sha512-Wj+rgpD4EcGB+j6mMYPD4SPNEN0sUSq7UMTTfdzZ+1MSTnbPDC9rgde0D3yJPrJ1le/0j+sXPALvr5RKSpENbg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/client-sso": 3.405.0
-      "@aws-sdk/token-providers": 3.405.0
-      "@aws-sdk/types": 3.398.0
-      "@smithy/property-provider": 2.0.12
-      "@smithy/shared-ini-file-loader": 2.2.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/client-sso': 3.502.0
+      '@aws-sdk/token-providers': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/types': 3.502.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/credential-provider-node'
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-sso@3.449.0:
-    resolution: {integrity: sha512-Lfhh38rOjFAZBjZZJ2ehve+X048xxr+hTr+ntGOKady1GAH6W1U5UGNYuD9fr5vFaQQtAcNLKkUui+TnmJ4z/w==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-sso@3.577.0(@aws-sdk/client-sso-oidc@3.577.0):
+    resolution: {integrity: sha512-iVm5SQvS7EgZTJsRaqUOmDQpBQPPPat42SCbWFvFQOLrl8qewq8OP94hFS5w2mP62zngeYzqhJnDel79HXbxew==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/client-sso": 3.449.0
-      "@aws-sdk/token-providers": 3.449.0
-      "@aws-sdk/types": 3.449.0
-      "@smithy/property-provider": 2.0.13
-      "@smithy/shared-ini-file-loader": 2.2.2
-      "@smithy/types": 2.4.0
+      '@aws-sdk/client-sso': 3.577.0
+      '@aws-sdk/token-providers': 3.577.0(@aws-sdk/client-sso-oidc@3.577.0)
+      '@aws-sdk/types': 3.577.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/shared-ini-file-loader': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-web-identity@3.398.0:
-    resolution: {integrity: sha512-iG3905Alv9pINbQ8/MIsshgqYMbWx+NDQWpxbIW3W0MkSH3iAqdVpSCteYidYX9G/jv2Um1nW3y360ib20bvNg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-web-identity@3.502.0(@aws-sdk/credential-provider-node@3.503.1):
+    resolution: {integrity: sha512-veBAjDqjMMgA2Qxxf9ywDfHYLeJpaeHWLWCQ9XCHwJJ6ZIGWmAZPTq3he/UMr5JIQXooIccqqyqXMDIXPenXpA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/property-provider": 2.0.12
-      "@smithy/types": 2.4.0
+      '@aws-sdk/client-sts': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/types': 3.502.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
+    transitivePeerDependencies:
+      - '@aws-sdk/credential-provider-node'
+      - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-web-identity@3.449.0:
-    resolution: {integrity: sha512-BdqATzdqg39z2VXnEH7I6dzuX/Di6F/4C8FyiiJYx2+VciYdqt6GPprlpGdpngtWct/f8pA/LxQysNBVuwU/RA==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/credential-provider-web-identity@3.577.0(@aws-sdk/client-sts@3.577.0):
+    resolution: {integrity: sha512-ZGHGNRaCtJJmszb9UTnC7izNCtRUttdPlLdMkh41KPS32vfdrBDHs1JrpbZijItRj1xKuOXsiYSXLAaHGcLh8Q==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-sts': ^3.577.0
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/property-provider": 2.0.13
-      "@smithy/types": 2.4.0
+      '@aws-sdk/client-sts': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/endpoint-cache@3.310.0:
-    resolution: {integrity: sha512-y3wipforet41EDTI0vnzxILqwAGll1KfI5qcdX9pXF/WF1f+3frcOtPiWtQEZQpy4czRogKm3BHo70QBYAZxlQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/endpoint-cache@3.495.0:
+    resolution: {integrity: sha512-XCDrpiS50WaPzPzp7FwsChPHtX9PQQUU4nRzcn2N7IkUtpcFCUx8m1PAZe086VQr6hrbdeE4Z4j8hUPNwVdJGQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
       mnemonist: 0.38.3
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-bucket-endpoint@3.449.0:
-    resolution: {integrity: sha512-gH+IEdDfhzTmQLdWwfc23A40EhvvAhk8taXUu3DX/lXl+2lBqd4qCoGk8vfUtwh9y1kbRDnhLq04XM2DPvvj2w==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/endpoint-cache@3.572.0:
+    resolution: {integrity: sha512-CzuRWMj/xtN9p9eP915nlPmlyniTzke732Ow/M60++gGgB3W+RtZyFftw3TEx+NzNhd1tH54dEcGiWdiNaBz3Q==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-arn-parser": 3.310.0
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
-      "@smithy/util-config-provider": 2.0.0
+      mnemonist: 0.38.3
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-endpoint-discovery@3.405.0:
-    resolution: {integrity: sha512-6Q4quuNjXEkX61eI6/UJOh16SGBZzGykJu/SYrALftHpn8D+hgeaOpc2wAkpObT8KSItoRSE/uXWTnN7XNmJLA==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-bucket-endpoint@3.577.0:
+    resolution: {integrity: sha512-twlkNX2VofM6kHXzDEiJOiYCc9tVABe5cbyxMArRWscIsCWG9mamPhC77ezG4XsN9dFEwVdxEYD5Crpm/5EUiw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/endpoint-cache": 3.310.0
-      "@aws-sdk/types": 3.398.0
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/types": 2.3.5
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-arn-parser': 3.568.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-config-provider': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-endpoint-discovery@3.449.0:
-    resolution: {integrity: sha512-rzse3aAhC59Lr4kgtGk5kGdEnAx/eAG16V8nOKwhNDO1N7LucocXwWabn+TT/5CtUFAARtUTUy0YkSUANRYddg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-endpoint-discovery@3.502.0:
+    resolution: {integrity: sha512-DQBbyelebBshYPTb5ah25sAdMTQKYBUYE0If66sXHNUQAdUg28z076kE4E8p8RxyfGHqESN2MrqfIjQpEnjcqg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/endpoint-cache": 3.310.0
-      "@aws-sdk/types": 3.449.0
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
+      '@aws-sdk/endpoint-cache': 3.495.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-expect-continue@3.449.0:
-    resolution: {integrity: sha512-OOR78JoTbCo/42HViuA+F2Uy/cNWo31mN0YZJRbnY5oAMgLRrY7d2+NlJpvHlS4XPdUZ6UHeUecJ9BAWuVuWAQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-endpoint-discovery@3.577.0:
+    resolution: {integrity: sha512-duLI1awiBV7xyi+SQQnFy0J2s9Fhk5miHR5LsyEpk4p4M1Zi9hbBMg3wOdoxGCnNGn56PcP70isD79BfrbWwlA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
+      '@aws-sdk/endpoint-cache': 3.572.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-flexible-checksums@3.449.0:
-    resolution: {integrity: sha512-pKBgmwqA6jdiWZrYX0uaPOGdRldRiG2ArA7ufS5B7iz9X1JJP8ESZcO2wD+AbrLBtkZtVG31974qpqfNU6n4dQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-expect-continue@3.577.0:
+    resolution: {integrity: sha512-6dPp8Tv4F0of4un5IAyG6q++GrRrNQQ4P2NAMB1W0VO4JoEu1C8GievbbDLi88TFIFmtKpnHB0ODCzwnoe8JsA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-crypto/crc32": 3.0.0
-      "@aws-crypto/crc32c": 3.0.0
-      "@aws-sdk/types": 3.449.0
-      "@smithy/is-array-buffer": 2.0.0
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
-      "@smithy/util-utf8": 2.0.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-host-header@3.398.0:
-    resolution: {integrity: sha512-m+5laWdBaxIZK2ko0OwcCHJZJ5V1MgEIt8QVQ3k4/kOkN9ICjevOYmba751pHoTnbOYB7zQd6D2OT3EYEEsUcA==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-flexible-checksums@3.577.0:
+    resolution: {integrity: sha512-IHAUEipIfagjw92LV8SOSBiCF7ZnqfHcw14IkcZW2/mfrCy1Fh/k40MoS/t3Tro2tQ91rgQPwUoSgB/QCi2Org==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/types": 2.3.5
+      '@aws-crypto/crc32': 3.0.0
+      '@aws-crypto/crc32c': 3.0.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-host-header@3.449.0:
-    resolution: {integrity: sha512-uO7ao5eFhqEEPk8uqkhNhYqqJPPv/+i2aLchvSYrviDcmcbz9HURc8j+Q9WkmIj3jf0hjAJ9UVMQggBUfoLEgg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-host-header@3.502.0:
+    resolution: {integrity: sha512-EjnG0GTYXT/wJBmm5/mTjDcAkzU8L7wQjOzd3FTXuTCNNyvAvwrszbOj5FlarEw5XJBbQiZtBs+I5u9+zy560w==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-location-constraint@3.449.0:
-    resolution: {integrity: sha512-MPCFKOpgke/ZV6WSxZZ/y9X4mn0ywLC2HVcaPJvDSKA0gsRtJLEQjWs2+I2QYTzEM0iwgoW9UOSgbFZYXF0Pow==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-host-header@3.577.0:
+    resolution: {integrity: sha512-9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-logger@3.398.0:
-    resolution: {integrity: sha512-CiJjW+FL12elS6Pn7/UVjVK8HWHhXMfvHZvOwx/Qkpy340sIhkuzOO6fZEruECDTZhl2Wqn81XdJ1ZQ4pRKpCg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-location-constraint@3.577.0:
+    resolution: {integrity: sha512-DKPTD2D2s+t2QUo/IXYtVa/6Un8GZ+phSTBkyBNx2kfZz4Kwavhl/JJzSqTV3GfCXkVdFu7CrjoX7BZ6qWeTUA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/types": 2.3.5
+      '@aws-sdk/types': 3.577.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-logger@3.449.0:
-    resolution: {integrity: sha512-YwmPLuSx5Zjdnloxr7bArT2KgF+VvlSe5+p5T/woZWEQgINRaCLdvDB37p7x/LlHrxxZRmk20MaFwSKlJU85qQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-logger@3.502.0:
+    resolution: {integrity: sha512-FDyv6K4nCoHxbjLGS2H8ex8I0KDIiu4FJgVRPs140ZJy6gE5Pwxzv6YTzZGLMrnqcIs9gh065Lf6DjwMelZqaw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-recursion-detection@3.398.0:
-    resolution: {integrity: sha512-7QpOqPQAZNXDXv6vsRex4R8dLniL0E/80OPK4PPFsrCh9btEyhN9Begh4i1T+5lL28hmYkztLOkTQ2N5J3hgRQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-logger@3.577.0:
+    resolution: {integrity: sha512-aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/types": 2.3.5
+      '@aws-sdk/types': 3.577.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-recursion-detection@3.449.0:
-    resolution: {integrity: sha512-8kWxxpPBHwFUADf8JaZsUbJ+FtS3K9MGQpMx0AZhh3P9xLaoh602CL0y0+UEEdb2uh6FJJjQiIk4eQXEolhG6Q==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-recursion-detection@3.502.0:
+    resolution: {integrity: sha512-hvbyGJbxeuezxOu8VfFmcV4ql1hKXLxHTe5FNYfEBat2KaZXVhc1Hg+4TvB06/53p+E8J99Afmumkqbxs2esUA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-sdk-s3@3.449.0:
-    resolution: {integrity: sha512-HbgWdv0txBdV9+9aJSGtGWXnQlVvpIXS6gqmJ5ESHKwZMiRHXswwptccZkvSrLjCQr5uuN37yIz3219MRrvrmw==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-recursion-detection@3.577.0:
+    resolution: {integrity: sha512-pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-arn-parser": 3.310.0
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-sdk-sqs@3.449.0:
-    resolution: {integrity: sha512-Z4IuH+OKkvVN78oUyotaefsL5/CvwXTVnMp0+9lfgkC+YnRvFJHwDglL4YU0gVsNV3ChWjFvwX6nI1eIw2cXpQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-sdk-s3@3.577.0:
+    resolution: {integrity: sha512-/t8Shvy6lGIRdTEKG6hA8xy+oon/CDF5H8Ksms/cd/uvIy/MYbNjOJ/Arwk8H5W6LB4DP/1O+tOzOpGx1MCufA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/types": 2.4.0
-      "@smithy/util-hex-encoding": 2.0.0
-      "@smithy/util-utf8": 2.0.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-arn-parser': 3.568.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/signature-v4': 3.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/util-config-provider': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-sdk-sts@3.398.0:
-    resolution: {integrity: sha512-+JH76XHEgfVihkY+GurohOQ5Z83zVN1nYcQzwCFnCDTh4dG4KwhnZKG+WPw6XJECocY0R+H0ivofeALHvVWJtQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-sdk-sqs@3.577.0:
+    resolution: {integrity: sha512-XUOIFL3xRLgePbIzH4t/tOI9S/aGwXcTuR/hefkkXOZlTLh3LOHtgyRAPOiMGedmMMoCLuRY1AGKTOce5vuPYQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/middleware-signing": 3.398.0
-      "@aws-sdk/types": 3.398.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-sdk-sts@3.449.0:
-    resolution: {integrity: sha512-a+mknJkS9jDiDoHg2sFW24B0f6MgT2zs/oF6zMFvVmImvUHjbhSgBzYStE+Phl/uM1zwp1lJfbuO+I+5tVwZEw==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-signing@3.502.0:
+    resolution: {integrity: sha512-4hF08vSzJ7L6sB+393gOFj3s2N6nLusYS0XrMW6wYNFU10IDdbf8Z3TZ7gysDJJHEGQPmTAesPEDBsasGWcMxg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/middleware-signing": 3.449.0
-      "@aws-sdk/types": 3.449.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/signature-v4': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-signing@3.398.0:
-    resolution: {integrity: sha512-O0KqXAix1TcvZBFt1qoFkHMUNJOSgjJTYS7lFTRKSwgsD27bdW2TM2r9R8DAccWFt5Amjkdt+eOwQMIXPGTm8w==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-signing@3.577.0:
+    resolution: {integrity: sha512-QS/dh3+NqZbXtY0j/DZ867ogP413pG5cFGqBy9OeOhDMsolcwLrQbi0S0c621dc1QNq+er9ffaMhZ/aPkyXXIg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/property-provider": 2.0.12
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/signature-v4": 2.0.11
-      "@smithy/types": 2.3.5
-      "@smithy/util-middleware": 2.0.4
+      '@aws-sdk/types': 3.577.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/signature-v4': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-middleware': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-signing@3.449.0:
-    resolution: {integrity: sha512-L33efrgdDDY3myjLwraeS2tzUlebaZL6WS7ooACsOwkB9mRs6UQRpSpT90HbcSAjwLaa+xGqaxTA0biAuRjT5A==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-ssec@3.577.0:
+    resolution: {integrity: sha512-i2BPJR+rp8xmRVIGc0h1kDRFcM2J9GnClqqpc+NLSjmYadlcg4mPklisz9HzwFVcRPJ5XcGf3U4BYs5G8+iTyg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/property-provider": 2.0.13
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/signature-v4": 2.0.11
-      "@smithy/types": 2.4.0
-      "@smithy/util-middleware": 2.0.5
+      '@aws-sdk/types': 3.577.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-ssec@3.449.0:
-    resolution: {integrity: sha512-NY7jt1/ukqXCUqnaK2rlm5yGFyj9sOJBqK6X8Gpu5qQaYAvIP892U1UMj6VTPC7yBLPYhW2/YCfDvxOClbqKEg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-user-agent@3.502.0:
+    resolution: {integrity: sha512-TxbBZbRiXPH0AUxegqiNd9aM9zNSbfjtBs5MEfcBsweeT/B2O7K1EjP9+CkB8Xmk/5FLKhAKLr19b1TNoE27rw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@aws-sdk/util-endpoints': 3.502.0
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-user-agent@3.398.0:
-    resolution: {integrity: sha512-nF1jg0L+18b5HvTcYzwyFgfZQQMELJINFqI0mi4yRKaX7T5a3aGp5RVLGGju/6tAGTuFbfBoEhkhU3kkxexPYQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/middleware-user-agent@3.577.0:
+    resolution: {integrity: sha512-P55HAXgwmiHHpFx5JEPvOnAbfhN7v6sWv9PBQs+z2tC7QiBcPS0cdJR6PfV7J1n4VPK52/OnrK3l9VxdQ7Ms0g==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@aws-sdk/util-endpoints": 3.398.0
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/types": 2.3.5
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-endpoints': 3.577.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-user-agent@3.449.0:
-    resolution: {integrity: sha512-0cRptIhIthxUYadrgb5FmcTgGhPIeXnFATBILaa2gA/ivfVY/CiqMAvOvLHxtBAYNK8/VXM9DFL5TfOt8mF2UQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/region-config-resolver@3.502.0:
+    resolution: {integrity: sha512-mxmsX2AGgnSM+Sah7mcQCIneOsJQNiLX0COwEttuf8eO+6cLMAZvVudH3BnWTfea4/A9nuri9DLCqBvEmPrilg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-config-provider': 2.2.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/region-config-resolver@3.433.0:
-    resolution: {integrity: sha512-xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/region-config-resolver@3.577.0:
+    resolution: {integrity: sha512-4ChCFACNwzqx/xjg3zgFcW8Ali6R9C95cFECKWT/7CUM1D0MGvkclSH2cLarmHCmJgU6onKkJroFtWp0kHhgyg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/types": 2.4.0
-      "@smithy/util-config-provider": 2.0.0
-      "@smithy/util-middleware": 2.0.5
+      '@aws-sdk/types': 3.577.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/s3-request-presigner@3.449.0:
-    resolution: {integrity: sha512-Rt4ys/Jt3deLCdLDyn8aEDMbpkbQaKKAitF2N2awGS/3pGGoz/V7BftMLi96yUARWo4cUWqnzfz/rEyVZFkNPg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/s3-request-presigner@3.577.0:
+    resolution: {integrity: sha512-mlcf//A/gFSnKnY4Kc/zCt/zvRiFLeDfaH4t5vpwdBhNjZCRJcHwh6eJeC27/8R+IkRVU5s2CVXrUM5RyeLDWg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/signature-v4-multi-region": 3.449.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-format-url": 3.449.0
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
+      '@aws-sdk/signature-v4-multi-region': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@aws-sdk/util-format-url': 3.577.0
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/signature-v4-multi-region@3.449.0:
-    resolution: {integrity: sha512-Ne8dF3R2Cj6JJBw0Utm7INtoJ2PdqGNgDpeTOFTnFGSGWnsumACbcVp4ikcZzgABTCQgKx88wPdXUHUZtaBqcg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/signature-v4-multi-region@3.577.0:
+    resolution: {integrity: sha512-mMykGRFBYmlDcMhdbhNM0z1JFUaYYZ8r9WV7Dd0T2PWELv2brSAjDAOBHdJLHObDMYRnM6H0/Y974qTl3icEcQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/signature-v4": 2.0.11
-      "@smithy/types": 2.4.0
+      '@aws-sdk/middleware-sdk-s3': 3.577.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/signature-v4': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/token-providers@3.405.0:
-    resolution: {integrity: sha512-rVzC7ptf7TlV84M9w+Ds9isio1EY7bs1MRFv/6lmYstsyTri+DaZG10TwXSGfzIMwB0yVh11niCxO9wSjQ36zg==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/middleware-host-header": 3.398.0
-      "@aws-sdk/middleware-logger": 3.398.0
-      "@aws-sdk/middleware-recursion-detection": 3.398.0
-      "@aws-sdk/middleware-user-agent": 3.398.0
-      "@aws-sdk/types": 3.398.0
-      "@aws-sdk/util-endpoints": 3.398.0
-      "@aws-sdk/util-user-agent-browser": 3.398.0
-      "@aws-sdk/util-user-agent-node": 3.405.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/property-provider": 2.0.12
-      "@smithy/protocol-http": 2.0.5
-      "@smithy/shared-ini-file-loader": 2.2.0
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/token-providers@3.502.0(@aws-sdk/credential-provider-node@3.503.1):
+    resolution: {integrity: sha512-RQgMgIXYlSf0xGl6EUeD+pqIPBlb7e29dbqHOBFc66hJVYUC2ULZX7Y+jLvcGIEaMiIaTPyvntZRFip+U+9hag==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/client-sso-oidc': 3.502.0(@aws-sdk/credential-provider-node@3.503.1)
+      '@aws-sdk/types': 3.502.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/credential-provider-node'
       - aws-crt
     dev: false
 
-  /@aws-sdk/token-providers@3.449.0:
-    resolution: {integrity: sha512-Tgu6Z/l75uFuNQpKIidbn1gc5bI7OKmGdH5+E/ZAc58XYvxYs9N77HjhrhAGvYQEnXY6gRm26/WSeHAAh5wlgQ==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@aws-crypto/sha256-browser": 3.0.0
-      "@aws-crypto/sha256-js": 3.0.0
-      "@aws-sdk/middleware-host-header": 3.449.0
-      "@aws-sdk/middleware-logger": 3.449.0
-      "@aws-sdk/middleware-recursion-detection": 3.449.0
-      "@aws-sdk/middleware-user-agent": 3.449.0
-      "@aws-sdk/region-config-resolver": 3.433.0
-      "@aws-sdk/types": 3.449.0
-      "@aws-sdk/util-endpoints": 3.449.0
-      "@aws-sdk/util-user-agent-browser": 3.449.0
-      "@aws-sdk/util-user-agent-node": 3.449.0
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/hash-node": 2.0.12
-      "@smithy/invalid-dependency": 2.0.12
-      "@smithy/middleware-content-length": 2.0.14
-      "@smithy/middleware-endpoint": 2.1.3
-      "@smithy/middleware-retry": 2.0.18
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/property-provider": 2.0.13
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/shared-ini-file-loader": 2.2.2
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-body-length-browser": 2.0.0
-      "@smithy/util-body-length-node": 2.1.0
-      "@smithy/util-defaults-mode-browser": 2.0.16
-      "@smithy/util-defaults-mode-node": 2.0.21
-      "@smithy/util-endpoints": 1.0.2
-      "@smithy/util-retry": 2.0.5
-      "@smithy/util-utf8": 2.0.0
+  /@aws-sdk/token-providers@3.577.0(@aws-sdk/client-sso-oidc@3.577.0):
+    resolution: {integrity: sha512-0CkIZpcC3DNQJQ1hDjm2bdSy/Xjs7Ny5YvSsacasGOkNfk+FdkiQy6N67bZX3Zbc9KIx+Nz4bu3iDeNSNplnnQ==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-sso-oidc': ^3.577.0
+    dependencies:
+      '@aws-sdk/client-sso-oidc': 3.577.0(@aws-sdk/client-sts@3.577.0)
+      '@aws-sdk/types': 3.577.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/shared-ini-file-loader': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
     dev: false
 
-  /@aws-sdk/types@3.398.0:
-    resolution: {integrity: sha512-r44fkS+vsEgKCuEuTV+TIk0t0m5ZlXHNjSDYEUvzLStbbfUFiNus/YG4UCa0wOk9R7VuQI67badsvvPeVPCGDQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/types@3.449.0:
+    resolution: {integrity: sha512-tSQPAvknheB6XnRoc+AuEgdzn2KhY447hddeVW0Mbg8Yl9es4u4TKVINloKDEyUrCKhB/1f93Hb5uJkPe/e/Ww==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.3.5
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/types@3.449.0:
-    resolution: {integrity: sha512-tSQPAvknheB6XnRoc+AuEgdzn2KhY447hddeVW0Mbg8Yl9es4u4TKVINloKDEyUrCKhB/1f93Hb5uJkPe/e/Ww==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/types@3.502.0:
+    resolution: {integrity: sha512-M0DSPYe/gXhwD2QHgoukaZv5oDxhW3FfvYIrJptyqUq3OnPJBcDbihHjrE0PBtfh/9kgMZT60/fQ2NVFANfa2g==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.9.1
+      tslib: 2.6.2
+    dev: false
+
+  /@aws-sdk/types@3.577.0:
+    resolution: {integrity: sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-arn-parser@3.310.0:
-    resolution: {integrity: sha512-jL8509owp/xB9+Or0pvn3Fe+b94qfklc2yPowZZIFAkFcCSIdkIglz18cPDWnYAcy9JGewpMS1COXKIUhZkJsA==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/util-arn-parser@3.568.0:
+    resolution: {integrity: sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==}
+    engines: {node: '>=16.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-dynamodb@3.449.0(@aws-sdk/client-dynamodb@3.449.0):
-    resolution: {integrity: sha512-3Y0ZMcMTcwP8EM/twMVcA0mr7rnarcmRchLM+Lxgt4172K9YJ5Iy895Xy03g0aOgiAwAE8ogkzum0hwbv6RClg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/util-dynamodb@3.577.0(@aws-sdk/client-dynamodb@3.577.0):
+    resolution: {integrity: sha512-GGzUZ1saDcP052jFpZ6HfukMwBM2Jtxq1H0fzfWV1YPLikjNJaXt8j/Eng2cNNH0RUdTkPGVAF+mlHjNirosKA==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      "@aws-sdk/client-dynamodb": ^3.0.0
+      '@aws-sdk/client-dynamodb': ^3.577.0
     dependencies:
-      "@aws-sdk/client-dynamodb": 3.449.0
+      '@aws-sdk/client-dynamodb': 3.577.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-endpoints@3.398.0:
-    resolution: {integrity: sha512-Fy0gLYAei/Rd6BrXG4baspCnWTUSd0NdokU1pZh4KlfEAEN1i8SPPgfiO5hLk7+2inqtCmqxVJlfqbMVe9k4bw==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/util-endpoints@3.502.0:
+    resolution: {integrity: sha512-6LKFlJPp2J24r1Kpfoz5ESQn+1v5fEjDB3mtUKRdpwarhm3syu7HbKlHCF3KbcCOyahobvLvhoedT78rJFEeeg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.398.0
+      '@aws-sdk/types': 3.502.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-endpoints': 1.1.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-endpoints@3.449.0:
-    resolution: {integrity: sha512-hWGM/e+BnbCExXLaIEa6gRb0JW3+XGfcHgRqWkAxsKCaxQuXVIPUA3HyifimxTZDKmTbGZcyWfxCnKGS7I19rw==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/util-endpoints@3.577.0:
+    resolution: {integrity: sha512-FjuUz1Kdy4Zly2q/c58tpdqHd6z7iOdU/caYzoc8jwgAHBDBbIJNQLCU9hXJnPV2M8pWxQDyIZsoVwtmvErPzw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/util-endpoints": 1.0.2
+      '@aws-sdk/types': 3.577.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-endpoints': 2.0.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-format-url@3.449.0:
-    resolution: {integrity: sha512-ZZR2clVM1U5NH7CQ2YQfTy/JsQlLbt/p0MjvlTIPWIm9ZLFUPww7yPR0+Ps/bCAOqKYs5xj+/WjgzvRnDk4Vyg==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/util-format-url@3.577.0:
+    resolution: {integrity: sha512-SyEGC2J+y/krFRuPgiF02FmMYhqbiIkOjDE6k4nYLJQRyS6XEAGxZoG+OHeOVEM+bsDgbxokXZiM3XKGu6qFIg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/querystring-builder": 2.0.12
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/querystring-builder': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@aws-sdk/util-locate-window@3.310.0:
     resolution: {integrity: sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-user-agent-browser@3.398.0:
-    resolution: {integrity: sha512-A3Tzx1tkDHlBT+IgxmsMCHbV8LM7SwwCozq2ZjJRx0nqw3MCrrcxQFXldHeX/gdUMO+0Oocb7HGSnVODTq+0EA==}
+  /@aws-sdk/util-user-agent-browser@3.502.0:
+    resolution: {integrity: sha512-v8gKyCs2obXoIkLETAeEQ3AM+QmhHhst9xbM1cJtKUGsRlVIak/XyyD+kVE6kmMm1cjfudHpHKABWk9apQcIZQ==}
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/types": 2.3.5
+      '@aws-sdk/types': 3.502.0
+      '@smithy/types': 2.9.1
       bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-user-agent-browser@3.449.0:
-    resolution: {integrity: sha512-MUQ8YIVZNZZso5w1qlatHu9c1JKYvdjlAugzKhj7npgV4U8D9RBOJUd2Ct8meXPaH4DTfW1qohPlZu/fWWqNVQ==}
+  /@aws-sdk/util-user-agent-browser@3.577.0:
+    resolution: {integrity: sha512-zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA==}
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/types': 3.0.0
       bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-user-agent-node@3.405.0:
-    resolution: {integrity: sha512-6Ssld7aalKCnW6lSGfiiWpqwo2L+AmYq2oV3P9yYAo9ZL+Q78dXquabwj3uq3plJ4l2xE4Gfcf2FJ/1PZpqDvQ==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/util-user-agent-node@3.502.0:
+    resolution: {integrity: sha512-9RjxpkGZKbTdl96tIJvAo+vZoz4P/cQh36SBUt9xfRfW0BtsaLyvSrvlR5wyUYhvRcC12Axqh/8JtnAPq//+Vw==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
-      aws-crt: ">=1.0.0"
+      aws-crt: '>=1.0.0'
     peerDependenciesMeta:
       aws-crt:
         optional: true
     dependencies:
-      "@aws-sdk/types": 3.398.0
-      "@smithy/node-config-provider": 2.1.1
-      "@smithy/types": 2.3.5
+      '@aws-sdk/types': 3.502.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-user-agent-node@3.449.0:
-    resolution: {integrity: sha512-PFMnFMSQTdhMAS63anMFFkzz56kWKcjGscgl0bBheEaxo8zgfLf1AAdFuBM+Ob2KYXeMezUbxYu9zOC/0S2hvw==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/util-user-agent-node@3.577.0:
+    resolution: {integrity: sha512-XqvtFjbSMtycZTWVwDe8DRWovuoMbA54nhUoZwVU6rW9OSD6NZWGR512BUGHFaWzW0Wg8++Dj10FrKTG2XtqfA==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      aws-crt: ">=1.0.0"
+      aws-crt: '>=1.0.0'
     peerDependenciesMeta:
       aws-crt:
         optional: true
     dependencies:
-      "@aws-sdk/types": 3.449.0
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/types": 2.4.0
+      '@aws-sdk/types': 3.577.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
@@ -3081,39 +3410,40 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/xml-builder@3.310.0:
-    resolution: {integrity: sha512-TqELu4mOuSIKQCqj63fGVs86Yh+vBx5nHRpWKNUNhB2nPTpfbziTs5c1X358be3peVWA4wPxW7Nt53KIg1tnNw==}
-    engines: {node: ">=14.0.0"}
+  /@aws-sdk/xml-builder@3.575.0:
+    resolution: {integrity: sha512-cWgAwmbFYNCFzPwxL705+lWps0F3ZvOckufd2KKoEZUmtpVw9/txUXNrPySUXSmRTSRhoatIMABNfStWR043bQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@azure/abort-controller@1.1.0:
     resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
   /@azure/core-auth@1.5.0:
     resolution: {integrity: sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@azure/abort-controller": 1.1.0
-      "@azure/core-util": 1.5.0
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-util': 1.5.0
       tslib: 2.6.2
     dev: false
 
   /@azure/core-client@1.7.3:
     resolution: {integrity: sha512-kleJ1iUTxcO32Y06dH9Pfi9K4U+Tlb111WXEnbt7R/ne+NLRwppZiTGJuTD5VVoxTMK5NTbEtm5t2vcdNCFe2g==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@azure/abort-controller": 1.1.0
-      "@azure/core-auth": 1.5.0
-      "@azure/core-rest-pipeline": 1.12.1
-      "@azure/core-tracing": 1.0.1
-      "@azure/core-util": 1.5.0
-      "@azure/logger": 1.0.4
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.5.0
+      '@azure/core-rest-pipeline': 1.12.1
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-util': 1.5.0
+      '@azure/logger': 1.0.4
       tslib: 2.6.2
     transitivePeerDependencies:
       - supports-color
@@ -3121,15 +3451,15 @@ packages:
 
   /@azure/core-http@3.0.3:
     resolution: {integrity: sha512-QMib3wXotJMFhHgmJBPUF9YsyErw34H0XDFQd9CauH7TPB+RGcyl9Ayy7iURtJB04ngXhE6YwrQsWDXlSLrilg==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@azure/abort-controller": 1.1.0
-      "@azure/core-auth": 1.5.0
-      "@azure/core-tracing": 1.0.0-preview.13
-      "@azure/core-util": 1.5.0
-      "@azure/logger": 1.0.4
-      "@types/node-fetch": 2.6.6
-      "@types/tunnel": 0.0.3
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.5.0
+      '@azure/core-tracing': 1.0.0-preview.13
+      '@azure/core-util': 1.5.0
+      '@azure/logger': 1.0.4
+      '@types/node-fetch': 2.6.6
+      '@types/tunnel': 0.0.3
       form-data: 4.0.0
       node-fetch: 2.7.0
       process: 0.11.10
@@ -3143,30 +3473,30 @@ packages:
 
   /@azure/core-lro@2.5.4:
     resolution: {integrity: sha512-3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@azure/abort-controller": 1.1.0
-      "@azure/core-util": 1.5.0
-      "@azure/logger": 1.0.4
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-util': 1.5.0
+      '@azure/logger': 1.0.4
       tslib: 2.6.2
     dev: false
 
   /@azure/core-paging@1.5.0:
     resolution: {integrity: sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
   /@azure/core-rest-pipeline@1.12.1:
     resolution: {integrity: sha512-SsyWQ+T5MFQRX+M8H/66AlaI6HyCbQStGfFngx2fuiW+vKI2DkhtOvbYodPyf9fOe/ARLWWc3ohX54lQ5Kmaog==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@azure/abort-controller": 1.1.0
-      "@azure/core-auth": 1.5.0
-      "@azure/core-tracing": 1.0.1
-      "@azure/core-util": 1.5.0
-      "@azure/logger": 1.0.4
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.5.0
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-util': 1.5.0
+      '@azure/logger': 1.0.4
       form-data: 4.0.0
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
@@ -3177,94 +3507,112 @@ packages:
 
   /@azure/core-tracing@1.0.0-preview.13:
     resolution: {integrity: sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      "@opentelemetry/api": 1.6.0
+      '@opentelemetry/api': 1.6.0
       tslib: 2.6.2
     dev: false
 
   /@azure/core-tracing@1.0.1:
     resolution: {integrity: sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
   /@azure/core-util@1.5.0:
     resolution: {integrity: sha512-GZBpVFDtQ/15hW1OgBcRdT4Bl7AEpcEZqLfbAvOtm1CQUncKWiYapFHVD588hmlV27NbOOtSm3cnLF3lvoHi4g==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/core-xml@1.3.4:
+    resolution: {integrity: sha512-B1xI79Ur/u+KR69fGTcsMNj8KDjBSqAy0Ys6Byy4Qm1CqoUy7gCT5A7Pej0EBWRskuH6bpCwrAnosfmQEalkcg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      fast-xml-parser: 4.2.5
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/data-tables@13.2.2:
+    resolution: {integrity: sha512-Dq2Aq0mMMF0BPzYQKdBY/OtO7VemP/foh6z+mJpUO1hRL+65C1rGQUJf20LJHotSyU8wHb4HJzOs+Z50GXSy1w==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@azure/abort-controller": 1.1.0
+      '@azure/core-auth': 1.5.0
+      '@azure/core-client': 1.7.3
+      '@azure/core-paging': 1.5.0
+      '@azure/core-rest-pipeline': 1.12.1
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-xml': 1.3.4
+      '@azure/logger': 1.0.4
       tslib: 2.6.2
+      uuid: 8.3.2
+    transitivePeerDependencies:
+      - supports-color
     dev: false
 
-  /@azure/identity@3.1.3:
-    resolution: {integrity: sha512-y0jFjSfHsVPwXSwi3KaSPtOZtJZqhiqAhWUXfFYBUd/+twUBovZRXspBwLrF5rJe0r5NyvmScpQjL+TYDTQVvw==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@azure/abort-controller": 1.1.0
-      "@azure/core-auth": 1.5.0
-      "@azure/core-client": 1.7.3
-      "@azure/core-rest-pipeline": 1.12.1
-      "@azure/core-tracing": 1.0.1
-      "@azure/core-util": 1.5.0
-      "@azure/logger": 1.0.4
-      "@azure/msal-browser": 2.38.2
-      "@azure/msal-common": 9.1.1
-      "@azure/msal-node": 1.18.3
+  /@azure/identity@4.0.1:
+    resolution: {integrity: sha512-yRdgF03SFLqUMZZ1gKWt0cs0fvrDIkq2bJ6Oidqcoo5uM85YMBnXWMzYKK30XqIT76lkFyAaoAAy5knXhrG4Lw==}
+    engines: {node: '>=18.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.5.0
+      '@azure/core-client': 1.7.3
+      '@azure/core-rest-pipeline': 1.12.1
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-util': 1.5.0
+      '@azure/logger': 1.0.4
+      '@azure/msal-browser': 3.7.1
+      '@azure/msal-node': 2.6.2
       events: 3.3.0
       jws: 4.0.0
       open: 8.4.2
       stoppable: 1.1.0
       tslib: 2.6.2
-      uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
     dev: false
 
   /@azure/logger@1.0.4:
     resolution: {integrity: sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@azure/msal-browser@2.38.2:
-    resolution: {integrity: sha512-71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A==}
-    engines: {node: ">=0.8.0"}
+  /@azure/msal-browser@3.7.1:
+    resolution: {integrity: sha512-EZnk81zn1/5/jv/VVN2Tp+dUVchHmwbbt7pn654Eqa+ua7wtEIg1btuW/mowB13BV2nGYcvniY9Mf+3Sbe0cCg==}
+    engines: {node: '>=0.8.0'}
     dependencies:
-      "@azure/msal-common": 13.3.0
+      '@azure/msal-common': 14.6.1
     dev: false
 
-  /@azure/msal-common@13.3.0:
-    resolution: {integrity: sha512-/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg==}
-    engines: {node: ">=0.8.0"}
+  /@azure/msal-common@14.6.1:
+    resolution: {integrity: sha512-yL97p2La0WrgU3MdXThOLOpdmBMvH8J69vwQ/skOqORYwOW/UYPdp9nZpvvfBO+zFZB5M3JkqA2NKtn4GfVBHw==}
+    engines: {node: '>=0.8.0'}
     dev: false
 
-  /@azure/msal-common@9.1.1:
-    resolution: {integrity: sha512-we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw==}
-    engines: {node: ">=0.8.0"}
-    dev: false
-
-  /@azure/msal-node@1.18.3:
-    resolution: {integrity: sha512-lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg==}
-    engines: {node: 10 || 12 || 14 || 16 || 18}
+  /@azure/msal-node@2.6.2:
+    resolution: {integrity: sha512-XyP+5lUZxTpWpLCC2wAFGA9wXrUhHp1t4NLmQW0mQZzUdcSay3rG7kGGqxxeLf8mRdwoR0B70TCLmIGX6cfK/g==}
+    engines: {node: '>=16'}
     dependencies:
-      "@azure/msal-common": 13.3.0
+      '@azure/msal-common': 14.6.1
       jsonwebtoken: 9.0.2
       uuid: 8.3.2
     dev: false
 
   /@azure/storage-blob@12.14.0:
     resolution: {integrity: sha512-g8GNUDpMisGXzBeD+sKphhH5yLwesB4JkHr1U6be/X3F+cAMcyGLPD1P89g2M7wbEtUJWoikry1rlr83nNRBzg==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@azure/abort-controller": 1.1.0
-      "@azure/core-http": 3.0.3
-      "@azure/core-lro": 2.5.4
-      "@azure/core-paging": 1.5.0
-      "@azure/core-tracing": 1.0.0-preview.13
-      "@azure/logger": 1.0.4
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-http': 3.0.3
+      '@azure/core-lro': 2.5.4
+      '@azure/core-paging': 1.5.0
+      '@azure/core-tracing': 1.0.0-preview.13
+      '@azure/logger': 1.0.4
       events: 3.3.0
       tslib: 2.6.2
     transitivePeerDependencies:
@@ -3273,55 +3621,45 @@ packages:
 
   /@babel/code-frame@7.22.13:
     resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': 7.22.20
+      chalk: 2.4.2
+    dev: true
+
+  /@babel/code-frame@7.23.5:
+    resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/highlight": 7.22.20
+      '@babel/highlight': 7.23.4
       chalk: 2.4.2
 
   /@babel/compat-data@7.22.20:
     resolution: {integrity: sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==}
-    engines: {node: ">=6.9.0"}
-    dev: true
-
-  /@babel/core@7.23.0:
-    resolution: {integrity: sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==}
-    engines: {node: ">=6.9.0"}
-    dependencies:
-      "@ampproject/remapping": 2.2.1
-      "@babel/code-frame": 7.22.13
-      "@babel/generator": 7.23.0
-      "@babel/helper-compilation-targets": 7.22.15
-      "@babel/helper-module-transforms": 7.23.0(@babel/core@7.23.0)
-      "@babel/helpers": 7.23.1
-      "@babel/parser": 7.23.0
-      "@babel/template": 7.22.15
-      "@babel/traverse": 7.23.0
-      "@babel/types": 7.23.0
-      convert-source-map: 2.0.0
-      debug: 4.3.4
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
+    engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/core@7.23.3:
-    resolution: {integrity: sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==}
-    engines: {node: ">=6.9.0"}
-    dependencies:
-      "@ampproject/remapping": 2.2.1
-      "@babel/code-frame": 7.22.13
-      "@babel/generator": 7.23.3
-      "@babel/helper-compilation-targets": 7.22.15
-      "@babel/helper-module-transforms": 7.23.3(@babel/core@7.23.3)
-      "@babel/helpers": 7.23.2
-      "@babel/parser": 7.23.3
-      "@babel/template": 7.22.15
-      "@babel/traverse": 7.23.3
-      "@babel/types": 7.23.3
+  /@babel/compat-data@7.23.5:
+    resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/core@7.23.9:
+    resolution: {integrity: sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.23.6
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helpers': 7.23.9
+      '@babel/parser': 7.23.9
+      '@babel/template': 7.23.9
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
       convert-source-map: 2.0.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -3331,1269 +3669,1292 @@ packages:
 
   /@babel/generator@7.23.0:
     resolution: {integrity: sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
-      "@jridgewell/gen-mapping": 0.3.3
-      "@jridgewell/trace-mapping": 0.3.19
+      '@babel/types': 7.23.9
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.20
       jsesc: 2.5.2
     dev: true
 
-  /@babel/generator@7.23.3:
-    resolution: {integrity: sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==}
-    engines: {node: ">=6.9.0"}
+  /@babel/generator@7.23.6:
+    resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.3
-      "@jridgewell/gen-mapping": 0.3.3
-      "@jridgewell/trace-mapping": 0.3.20
+      '@babel/types': 7.23.9
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.20
       jsesc: 2.5.2
     dev: true
 
   /@babel/helper-annotate-as-pure@7.22.5:
     resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-builder-binary-assignment-operator-visitor@7.22.15:
     resolution: {integrity: sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
-  /@babel/helper-compilation-targets@7.22.15:
-    resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==}
-    engines: {node: ">=6.9.0"}
+  /@babel/helper-compilation-targets@7.23.6:
+    resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/compat-data": 7.22.20
-      "@babel/helper-validator-option": 7.22.15
-      browserslist: 4.22.1
+      '@babel/compat-data': 7.23.5
+      '@babel/helper-validator-option': 7.23.5
+      browserslist: 4.23.0
       lru-cache: 5.1.1
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.0):
+  /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
-    engines: {node: ">=6.9.0"}
-    peerDependencies:
-      "@babel/core": ^7.0.0
-    dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-annotate-as-pure": 7.22.5
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-function-name": 7.23.0
-      "@babel/helper-member-expression-to-functions": 7.23.0
-      "@babel/helper-optimise-call-expression": 7.22.5
-      "@babel/helper-replace-supers": 7.22.20(@babel/core@7.23.0)
-      "@babel/helper-skip-transparent-expression-wrappers": 7.22.5
-      "@babel/helper-split-export-declaration": 7.22.6
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.23.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-member-expression-to-functions': 7.23.0
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.9)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.0):
+  /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-annotate-as-pure": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-annotate-as-pure': 7.22.5
       regexpu-core: 5.3.2
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.23.0):
+  /@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.23.9):
     resolution: {integrity: sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==}
     peerDependencies:
-      "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-compilation-targets": 7.22.15
-      "@babel/helper-plugin-utils": 7.22.5
-      debug: 4.3.4
+      '@babel/core': 7.23.9
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-plugin-utils': 7.22.5
+      debug: 4.3.4(supports-color@5.5.0)
       lodash.debounce: 4.0.8
-      resolve: 1.22.6
+      resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
     dev: true
 
   /@babel/helper-environment-visitor@7.22.20:
     resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dev: true
 
   /@babel/helper-function-name@7.23.0:
     resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/template": 7.22.15
-      "@babel/types": 7.23.0
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-hoist-variables@7.22.5:
     resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-member-expression-to-functions@7.23.0:
     resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-module-imports@7.22.15:
     resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
-    engines: {node: ">=6.9.0"}
-    dependencies:
-      "@babel/types": 7.23.0
-    dev: true
-
-  /@babel/helper-module-transforms@7.23.0(@babel/core@7.23.0):
-    resolution: {integrity: sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==}
-    engines: {node: ">=6.9.0"}
-    peerDependencies:
-      "@babel/core": ^7.0.0
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-module-imports": 7.22.15
-      "@babel/helper-simple-access": 7.22.5
-      "@babel/helper-split-export-declaration": 7.22.6
-      "@babel/helper-validator-identifier": 7.22.20
+      '@babel/types': 7.23.9
     dev: true
 
-  /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.3):
+  /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.3
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-module-imports": 7.22.15
-      "@babel/helper-simple-access": 7.22.5
-      "@babel/helper-split-export-declaration": 7.22.6
-      "@babel/helper-validator-identifier": 7.22.20
+      '@babel/core': 7.23.9
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-module-imports': 7.22.15
+      '@babel/helper-simple-access': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
   /@babel/helper-optimise-call-expression@7.22.5:
     resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-plugin-utils@7.22.5:
     resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.0):
+  /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.9):
     resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-annotate-as-pure": 7.22.5
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-wrap-function": 7.22.20
+      '@babel/core': 7.23.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-wrap-function': 7.22.20
     dev: true
 
-  /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.0):
+  /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.9):
     resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-member-expression-to-functions": 7.23.0
-      "@babel/helper-optimise-call-expression": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-member-expression-to-functions': 7.23.0
+      '@babel/helper-optimise-call-expression': 7.22.5
     dev: true
 
   /@babel/helper-simple-access@7.22.5:
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
     resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-split-export-declaration@7.22.6:
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@babel/helper-string-parser@7.22.5:
     resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-string-parser@7.23.4:
+    resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-string-parser@7.24.7:
+    resolution: {integrity: sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==}
+    engines: {node: '>=6.9.0'}
     dev: true
 
   /@babel/helper-validator-identifier@7.22.20:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-validator-identifier@7.24.7:
+    resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
+    engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-validator-option@7.22.15:
     resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-option@7.23.5:
+    resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
+    engines: {node: '>=6.9.0'}
     dev: true
 
   /@babel/helper-wrap-function@7.22.20:
     resolution: {integrity: sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/helper-function-name": 7.23.0
-      "@babel/template": 7.22.15
-      "@babel/types": 7.23.0
+      '@babel/helper-function-name': 7.23.0
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
     dev: true
 
-  /@babel/helpers@7.23.1:
-    resolution: {integrity: sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==}
-    engines: {node: ">=6.9.0"}
+  /@babel/helpers@7.23.9:
+    resolution: {integrity: sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/template": 7.22.15
-      "@babel/traverse": 7.23.0
-      "@babel/types": 7.23.0
+      '@babel/template': 7.23.9
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/helpers@7.23.2:
-    resolution: {integrity: sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==}
-    engines: {node: ">=6.9.0"}
+  /@babel/highlight@7.22.20:
+    resolution: {integrity: sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/template": 7.22.15
-      "@babel/traverse": 7.23.3
-      "@babel/types": 7.23.3
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/helper-validator-identifier': 7.22.20
+      chalk: 2.4.2
+      js-tokens: 4.0.0
     dev: true
 
-  /@babel/highlight@7.22.20:
-    resolution: {integrity: sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==}
-    engines: {node: ">=6.9.0"}
+  /@babel/highlight@7.23.4:
+    resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/helper-validator-identifier": 7.22.20
+      '@babel/helper-validator-identifier': 7.22.20
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser@7.23.0:
-    resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==}
-    engines: {node: ">=6.0.0"}
+  /@babel/parser@7.23.3:
+    resolution: {integrity: sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==}
+    engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
-  /@babel/parser@7.23.3:
-    resolution: {integrity: sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==}
-    engines: {node: ">=6.0.0"}
+  /@babel/parser@7.23.9:
+    resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.23.9
+    dev: true
+
+  /@babel/parser@7.24.7:
+    resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==}
+    engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      "@babel/types": 7.23.3
+      '@babel/types': 7.24.7
     dev: true
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.13.0
+      '@babel/core': ^7.13.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-skip-transparent-expression-wrappers": 7.22.5
-      "@babel/plugin-transform-optional-chaining": 7.23.0(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-transform-optional-chaining': 7.23.0(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.23.0):
+  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-class-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.23.0):
+  /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.23.0):
+  /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-skip-transparent-expression-wrappers": 7.22.5
-      "@babel/plugin-syntax-optional-chaining": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.0):
+  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.9):
     resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
+      '@babel/core': 7.23.9
     dev: true
 
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.0):
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
-    dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-    dev: true
-
-  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.23.0):
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
-    peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.0):
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.9):
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.0):
+  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.0):
+  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-flow@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-flow@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.0):
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.0):
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.0):
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.0):
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.0):
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.0):
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.0):
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.0):
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.0):
+  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-regexp-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-async-generator-functions@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-transform-async-generator-functions@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-remap-async-to-generator": 7.22.20(@babel/core@7.23.0)
-      "@babel/plugin-syntax-async-generators": 7.8.4(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.9)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-module-imports": 7.22.15
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-remap-async-to-generator": 7.22.20(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-module-imports': 7.22.15
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-block-scoping@7.23.0(@babel/core@7.23.0):
+  /@babel/plugin-transform-block-scoping@7.23.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-class-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-class-static-block@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-class-static-block@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.12.0
+      '@babel/core': ^7.12.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-class-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-class-static-block": 7.14.5(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-classes@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-transform-classes@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==}
-    engines: {node: ">=6.9.0"}
-    peerDependencies:
-      "@babel/core": ^7.0.0-0
-    dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-annotate-as-pure": 7.22.5
-      "@babel/helper-compilation-targets": 7.22.15
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-function-name": 7.23.0
-      "@babel/helper-optimise-call-expression": 7.22.5
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-replace-supers": 7.22.20(@babel/core@7.23.0)
-      "@babel/helper-split-export-declaration": 7.22.6
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.23.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.9)
+      '@babel/helper-split-export-declaration': 7.22.6
       globals: 11.12.0
     dev: true
 
-  /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/template": 7.22.15
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/template': 7.23.9
     dev: true
 
-  /@babel/plugin-transform-destructuring@7.23.0(@babel/core@7.23.0):
+  /@babel/plugin-transform-destructuring@7.23.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-regexp-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-dynamic-import@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-dynamic-import@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-dynamic-import": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-builder-binary-assignment-operator-visitor": 7.22.15
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-export-namespace-from@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-export-namespace-from@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-export-namespace-from": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-flow-strip-types@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-flow-strip-types@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-flow": 7.22.5(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-flow': 7.22.5(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-for-of@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-transform-for-of@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-compilation-targets": 7.22.15
-      "@babel/helper-function-name": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-json-strings@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-json-strings@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-json-strings": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-literals@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-literals@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-logical-assignment-operators@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-logical-assignment-operators@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-logical-assignment-operators": 7.10.4(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-amd@7.23.0(@babel/core@7.23.0):
+  /@babel/plugin-transform-modules-amd@7.23.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-module-transforms": 7.23.0(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.23.0(@babel/core@7.23.0):
+  /@babel/plugin-transform-modules-commonjs@7.23.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-module-transforms": 7.23.0(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-simple-access": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-simple-access': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-systemjs@7.23.0(@babel/core@7.23.0):
+  /@babel/plugin-transform-modules-systemjs@7.23.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-hoist-variables": 7.22.5
-      "@babel/helper-module-transforms": 7.23.0(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-validator-identifier": 7.22.20
+      '@babel/core': 7.23.9
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
-  /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-module-transforms": 7.23.0(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-regexp-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-new-target@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-new-target@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-nullish-coalescing-operator@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-nullish-coalescing-operator@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-numeric-separator@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-numeric-separator@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-numeric-separator": 7.10.4(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-object-rest-spread@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-transform-object-rest-spread@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/compat-data": 7.22.20
-      "@babel/core": 7.23.0
-      "@babel/helper-compilation-targets": 7.22.15
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-object-rest-spread": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-transform-parameters": 7.22.15(@babel/core@7.23.0)
+      '@babel/compat-data': 7.23.5
+      '@babel/core': 7.23.9
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-parameters': 7.22.15(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-object-super@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-object-super@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-replace-supers": 7.22.20(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-optional-catch-binding@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-optional-catch-binding@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-optional-catch-binding": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-optional-chaining@7.23.0(@babel/core@7.23.0):
+  /@babel/plugin-transform-optional-chaining@7.23.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-skip-transparent-expression-wrappers": 7.22.5
-      "@babel/plugin-syntax-optional-chaining": 7.8.3(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-parameters@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-transform-parameters@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-class-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-private-property-in-object@7.22.11(@babel/core@7.23.0):
+  /@babel/plugin-transform-private-property-in-object@7.22.11(@babel/core@7.23.9):
     resolution: {integrity: sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-annotate-as-pure": 7.22.5
-      "@babel/helper-create-class-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-private-property-in-object": 7.14.5(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-react-jsx-self@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-react-jsx-self@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-transform-react-jsx-self@7.23.3(@babel/core@7.23.9):
+    resolution: {integrity: sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-react-jsx-source@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-react-jsx-source@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-transform-react-jsx-source@7.23.3(@babel/core@7.23.9):
+    resolution: {integrity: sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-regenerator@7.22.10(@babel/core@7.23.0):
+  /@babel/plugin-transform-regenerator@7.22.10(@babel/core@7.23.9):
     resolution: {integrity: sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
       regenerator-transform: 0.15.2
     dev: true
 
-  /@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-spread@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-spread@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-skip-transparent-expression-wrappers": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-typescript@7.22.15(@babel/core@7.23.0):
+  /@babel/plugin-transform-typescript@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-annotate-as-pure": 7.22.5
-      "@babel/helper-create-class-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/plugin-syntax-typescript": 7.22.5(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-unicode-escapes@7.22.10(@babel/core@7.23.0):
+  /@babel/plugin-transform-unicode-escapes@7.22.10(@babel/core@7.23.9):
     resolution: {integrity: sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-regexp-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-regexp-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.23.0):
+  /@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0
+      '@babel/core': ^7.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-create-regexp-features-plugin": 7.22.15(@babel/core@7.23.0)
-      "@babel/helper-plugin-utils": 7.22.5
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/preset-env@7.22.20(@babel/core@7.23.0):
+  /@babel/preset-env@7.22.20(@babel/core@7.23.9):
     resolution: {integrity: sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==}
-    engines: {node: ">=6.9.0"}
-    peerDependencies:
-      "@babel/core": ^7.0.0-0
-    dependencies:
-      "@babel/compat-data": 7.22.20
-      "@babel/core": 7.23.0
-      "@babel/helper-compilation-targets": 7.22.15
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-validator-option": 7.22.15
-      "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": 7.22.15(@babel/core@7.23.0)
-      "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": 7.22.15(@babel/core@7.23.0)
-      "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.0)
-      "@babel/plugin-syntax-async-generators": 7.8.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-class-properties": 7.12.13(@babel/core@7.23.0)
-      "@babel/plugin-syntax-class-static-block": 7.14.5(@babel/core@7.23.0)
-      "@babel/plugin-syntax-dynamic-import": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-export-namespace-from": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-import-assertions": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-syntax-import-attributes": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-syntax-import-meta": 7.10.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-json-strings": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-logical-assignment-operators": 7.10.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-numeric-separator": 7.10.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-object-rest-spread": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-optional-catch-binding": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-optional-chaining": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-private-property-in-object": 7.14.5(@babel/core@7.23.0)
-      "@babel/plugin-syntax-top-level-await": 7.14.5(@babel/core@7.23.0)
-      "@babel/plugin-syntax-unicode-sets-regex": 7.18.6(@babel/core@7.23.0)
-      "@babel/plugin-transform-arrow-functions": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-async-generator-functions": 7.22.15(@babel/core@7.23.0)
-      "@babel/plugin-transform-async-to-generator": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-block-scoped-functions": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-block-scoping": 7.23.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-class-properties": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-class-static-block": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-classes": 7.22.15(@babel/core@7.23.0)
-      "@babel/plugin-transform-computed-properties": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-destructuring": 7.23.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-dotall-regex": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-duplicate-keys": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-dynamic-import": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-exponentiation-operator": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-export-namespace-from": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-for-of": 7.22.15(@babel/core@7.23.0)
-      "@babel/plugin-transform-function-name": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-json-strings": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-literals": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-logical-assignment-operators": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-member-expression-literals": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-modules-amd": 7.23.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-modules-commonjs": 7.23.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-modules-systemjs": 7.23.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-modules-umd": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-named-capturing-groups-regex": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-new-target": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-nullish-coalescing-operator": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-numeric-separator": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-object-rest-spread": 7.22.15(@babel/core@7.23.0)
-      "@babel/plugin-transform-object-super": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-optional-catch-binding": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-optional-chaining": 7.23.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-parameters": 7.22.15(@babel/core@7.23.0)
-      "@babel/plugin-transform-private-methods": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-private-property-in-object": 7.22.11(@babel/core@7.23.0)
-      "@babel/plugin-transform-property-literals": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-regenerator": 7.22.10(@babel/core@7.23.0)
-      "@babel/plugin-transform-reserved-words": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-shorthand-properties": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-spread": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-sticky-regex": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-template-literals": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-typeof-symbol": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-unicode-escapes": 7.22.10(@babel/core@7.23.0)
-      "@babel/plugin-transform-unicode-property-regex": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-unicode-regex": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-unicode-sets-regex": 7.22.5(@babel/core@7.23.0)
-      "@babel/preset-modules": 0.1.6-no-external-plugins(@babel/core@7.23.0)
-      "@babel/types": 7.23.0
-      babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.23.0)
-      babel-plugin-polyfill-corejs3: 0.8.4(@babel/core@7.23.0)
-      babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.23.0)
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.22.20
+      '@babel/core': 7.23.9
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-option': 7.22.15
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.15(@babel/core@7.23.9)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.15(@babel/core@7.23.9)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.9)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.9)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-async-generator-functions': 7.22.15(@babel/core@7.23.9)
+      '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-block-scoping': 7.23.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-class-static-block': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-classes': 7.22.15(@babel/core@7.23.9)
+      '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-destructuring': 7.23.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-dynamic-import': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-export-namespace-from': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-for-of': 7.22.15(@babel/core@7.23.9)
+      '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-json-strings': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-logical-assignment-operators': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-amd': 7.23.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-systemjs': 7.23.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-numeric-separator': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-object-rest-spread': 7.22.15(@babel/core@7.23.9)
+      '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-optional-catch-binding': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-optional-chaining': 7.23.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-parameters': 7.22.15(@babel/core@7.23.9)
+      '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-private-property-in-object': 7.22.11(@babel/core@7.23.9)
+      '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-regenerator': 7.22.10(@babel/core@7.23.9)
+      '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-escapes': 7.22.10(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.23.9)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.9)
+      '@babel/types': 7.23.9
+      babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.23.9)
+      babel-plugin-polyfill-corejs3: 0.8.4(@babel/core@7.23.9)
+      babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.23.9)
       core-js-compat: 3.33.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/preset-flow@7.22.15(@babel/core@7.23.0):
+  /@babel/preset-flow@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-dB5aIMqpkgbTfN5vDdTRPzjqtWiZcRESNR88QYnoPR+bmdYoluOzMX9tQerTv0XzSgZYctPfO1oc0N5zdog1ew==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-validator-option": 7.22.15
-      "@babel/plugin-transform-flow-strip-types": 7.22.5(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-option': 7.23.5
+      '@babel/plugin-transform-flow-strip-types': 7.22.5(@babel/core@7.23.9)
     dev: true
 
-  /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.0):
+  /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.9):
     resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
     peerDependencies:
-      "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/types": 7.23.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/types': 7.23.9
       esutils: 2.0.3
     dev: true
 
-  /@babel/preset-typescript@7.23.0(@babel/core@7.23.0):
+  /@babel/preset-typescript@7.23.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-6P6VVa/NM/VlAYj5s2Aq/gdVg8FSENCg3wlZ6Qau9AcPaoF5LbN1nyGlR9DTRIw9PpxI94e+ReydsJHcjwAweg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-plugin-utils": 7.22.5
-      "@babel/helper-validator-option": 7.22.15
-      "@babel/plugin-syntax-jsx": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-modules-commonjs": 7.23.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-typescript": 7.22.15(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-option': 7.23.5
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.23.9)
     dev: true
 
-  /@babel/register@7.22.15(@babel/core@7.23.0):
+  /@babel/register@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-V3Q3EqoQdn65RCgTLwauZaTfd1ShhwPmbBv+1dkZV/HpCGMKVyn6oFcRlI7RaKqiDQjX2Qd3AuoEguBgdjIKlg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      "@babel/core": ^7.0.0-0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
+      '@babel/core': 7.23.9
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
@@ -4607,50 +4968,41 @@ packages:
 
   /@babel/runtime@7.23.1:
     resolution: {integrity: sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.14.0
 
   /@babel/template@7.22.15:
     resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==}
-    engines: {node: ">=6.9.0"}
-    dependencies:
-      "@babel/code-frame": 7.22.13
-      "@babel/parser": 7.23.0
-      "@babel/types": 7.23.0
-    dev: true
-
-  /@babel/traverse@7.23.0:
-    resolution: {integrity: sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==}
-    engines: {node: ">=6.9.0"}
-    dependencies:
-      "@babel/code-frame": 7.22.13
-      "@babel/generator": 7.23.0
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-function-name": 7.23.0
-      "@babel/helper-hoist-variables": 7.22.5
-      "@babel/helper-split-export-declaration": 7.22.6
-      "@babel/parser": 7.23.0
-      "@babel/types": 7.23.0
-      debug: 4.3.4
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.23.5
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
+    dev: true
+
+  /@babel/template@7.23.9:
+    resolution: {integrity: sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.23.5
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
     dev: true
 
-  /@babel/traverse@7.23.3:
-    resolution: {integrity: sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==}
-    engines: {node: ">=6.9.0"}
+  /@babel/traverse@7.23.9:
+    resolution: {integrity: sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/code-frame": 7.22.13
-      "@babel/generator": 7.23.3
-      "@babel/helper-environment-visitor": 7.22.20
-      "@babel/helper-function-name": 7.23.0
-      "@babel/helper-hoist-variables": 7.22.5
-      "@babel/helper-split-export-declaration": 7.22.6
-      "@babel/parser": 7.23.3
-      "@babel/types": 7.23.3
-      debug: 4.3.4
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.23.6
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
+      debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -4658,25 +5010,39 @@ packages:
 
   /@babel/types@7.23.0:
     resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/helper-string-parser": 7.22.5
-      "@babel/helper-validator-identifier": 7.22.20
+      '@babel/helper-string-parser': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
     dev: true
 
-  /@babel/types@7.23.3:
-    resolution: {integrity: sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==}
-    engines: {node: ">=6.9.0"}
+  /@babel/types@7.23.6:
+    resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      "@babel/helper-string-parser": 7.22.5
-      "@babel/helper-validator-identifier": 7.22.20
+      '@babel/helper-string-parser': 7.23.4
+      '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
     dev: true
 
-  /@balena/dockerignore@1.0.2:
-    resolution: {integrity: sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==}
-    dev: false
+  /@babel/types@7.23.9:
+    resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.23.4
+      '@babel/helper-validator-identifier': 7.22.20
+      to-fast-properties: 2.0.0
+    dev: true
+
+  /@babel/types@7.24.7:
+    resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.24.7
+      '@babel/helper-validator-identifier': 7.24.7
+      to-fast-properties: 2.0.0
+    dev: true
 
   /@base2/pretty-print-object@1.0.1:
     resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
@@ -4686,27 +5052,29 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@cdktf/cli-core@0.17.0(react@17.0.2):
-    resolution: {integrity: sha512-SW84rbcnvUsROC5FOIw6AXBGq2cBAdM278ar7j3PPTaun5tjYZaImIN70YFI5aV2A8PDm8yoilZADem8/2rUUA==}
+  /@cdktf/cli-core@0.20.3(react@17.0.2):
+    resolution: {integrity: sha512-FlxQC7VFmOvYV/0CAd3BRP45nvrjFu1QEfr0OuS0YfyBpF/GG1FCBm1D7hepfqkxbvpGUxglI/JhCoI9IYQ54Q==}
     dependencies:
-      "@cdktf/commons": 0.17.0
-      "@cdktf/hcl2cdk": 0.17.0
-      "@cdktf/hcl2json": 0.17.0
-      "@cdktf/node-pty-prebuilt-multiarch": 0.10.1-pre.10
-      "@sentry/node": 6.19.7
+      '@cdktf/commons': 0.20.3(constructs@10.1.167)
+      '@cdktf/hcl-tools': 0.20.3
+      '@cdktf/hcl2cdk': 0.20.3(constructs@10.1.167)
+      '@cdktf/hcl2json': 0.20.3
+      '@cdktf/node-pty-prebuilt-multiarch': 0.10.1-pre.11
+      '@cdktf/provider-schema': 0.20.3(constructs@10.1.167)
+      '@sentry/node': 7.91.0
       archiver: 5.3.2
-      cdktf: 0.17.0(constructs@10.2.70)
+      cdktf: 0.20.3(constructs@10.1.167)
       chalk: 4.1.2
       chokidar: 3.5.3
-      cli-spinners: 2.7.0
-      codemaker: 1.90.0
-      constructs: 10.2.70
+      cli-spinners: 2.9.2
+      codemaker: 1.93.0
+      constructs: 10.1.167
       cross-fetch: 3.1.8
       cross-spawn: 7.0.3
       detect-port: 1.5.1
       execa: 5.1.1
       extract-zip: 2.0.1
-      follow-redirects: 1.15.3
+      follow-redirects: 1.15.4
       fs-extra: 8.1.0
       https-proxy-agent: 5.0.1
       indent-string: 4.0.0
@@ -4715,9 +5083,9 @@ packages:
       ink-spinner: 4.0.3(ink@3.2.0)(react@17.0.2)
       ink-testing-library: 2.1.0
       ink-use-stdout-dimensions: 1.0.5(ink@3.2.0)(react@17.0.2)
-      jsii: 5.0.21
-      jsii-pacmak: 1.90.0
-      jsii-srcmak: 0.1.951
+      jsii: 5.3.3
+      jsii-pacmak: 1.93.0
+      jsii-srcmak: 0.1.999
       lodash.isequal: 4.5.0
       log4js: 6.9.1
       minimatch: 5.1.6
@@ -4732,12 +5100,12 @@ packages:
       tunnel-agent: 0.6.0
       uuid: 8.3.2
       xml-js: 1.6.11
-      xstate: 4.38.2
+      xstate: 4.38.3
       yargs: 17.7.2
       yoga-layout-prebuilt: 1.10.0
-      zod: 1.11.17
+      zod: 3.22.4
     transitivePeerDependencies:
-      - "@types/react"
+      - '@types/react'
       - bufferutil
       - debug
       - encoding
@@ -4746,90 +5114,113 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@cdktf/commons@0.17.0:
-    resolution: {integrity: sha512-zXWuaU/5HpIrg+IJPcCIp+yJHsn34Z0tmB6OusCofjhK677TLDt+jE5KKhgThM+NJLBYW5iSd8dMqn9e5KZong==}
+  /@cdktf/commons@0.20.3(constructs@10.1.167):
+    resolution: {integrity: sha512-9vysGHMeUnvv5G59bBKGHs7Gh3XaW9gqfmDU4xIivwsTLmcFJERUQGDrHNB3DNgLLc8LCCOTN0FKte51Mx+VgA==}
     dependencies:
-      "@npmcli/ci-detect": 1.4.0
-      "@sentry/node": 6.19.7
-      cdktf: 0.17.0(constructs@10.2.70)
-      codemaker: 1.90.0
-      constructs: 10.2.70
+      '@sentry/node': 7.94.1
+      cdktf: 0.20.3(constructs@10.1.167)
+      ci-info: 3.9.0
+      codemaker: 1.94.0
       cross-spawn: 7.0.3
-      follow-redirects: 1.15.3
-      fs-extra: 8.1.0
+      follow-redirects: 1.15.5
+      fs-extra: 11.2.0
       is-valid-domain: 0.1.6
       log4js: 6.9.1
-      uuid: 8.3.2
+      strip-ansi: 6.0.1
+      uuid: 9.0.1
     transitivePeerDependencies:
+      - constructs
       - debug
       - supports-color
     dev: true
 
-  /@cdktf/hcl2cdk@0.17.0:
-    resolution: {integrity: sha512-RkBTWlK15YjO5wqlgmLyPBy2nsoeIFZRI5EhaPeYhqjBr8qHH+Zhg4/jSSfW/trrdZazIortQzdfdbShvZYhhw==}
+  /@cdktf/hcl-tools@0.20.3:
+    resolution: {integrity: sha512-S0i3XKSFVVRW16xvodbIC81/2WiEAySJQK3JttmMMgADWGs76j9aIiDOZzs0NF9EbLY4QkxgcPApO33l9EATLw==}
+    dev: true
+
+  /@cdktf/hcl2cdk@0.20.3(constructs@10.1.167):
+    resolution: {integrity: sha512-XXNDp52vIXh2revaaosE/e6TXY6SDoss48cCJ1FQjd5GJw9HdwAXEhQvCH59v7wAVokZk3NGEUybSXHq3zwCYA==}
     dependencies:
-      "@babel/generator": 7.23.0
-      "@babel/template": 7.22.15
-      "@babel/types": 7.23.0
-      "@cdktf/commons": 0.17.0
-      "@cdktf/hcl2json": 0.17.0
-      "@cdktf/provider-generator": 0.17.0
+      '@babel/generator': 7.23.6
+      '@babel/template': 7.22.15
+      '@babel/types': 7.23.6
+      '@cdktf/commons': 0.20.3(constructs@10.1.167)
+      '@cdktf/hcl2json': 0.20.3
+      '@cdktf/provider-generator': 0.20.3(constructs@10.1.167)
+      '@cdktf/provider-schema': 0.20.3(constructs@10.1.167)
       camelcase: 6.3.0
-      deep-equal: 2.2.2
+      cdktf: 0.20.3(constructs@10.1.167)
+      codemaker: 1.94.0
+      deep-equal: 2.2.3
       glob: 10.3.10
       graphology: 0.25.4(graphology-types@0.24.7)
       graphology-types: 0.24.7
-      jsii-rosetta: 5.0.11
+      jsii-rosetta: 5.3.7
       prettier: 2.8.8
       reserved-words: 0.1.2
       zod: 3.22.4
     transitivePeerDependencies:
+      - constructs
       - debug
       - supports-color
     dev: true
 
-  /@cdktf/hcl2json@0.17.0:
-    resolution: {integrity: sha512-PNEDsVJBHqlBZtQNvMimjpkIkqqrRqWq7NVJaGiCSpb02rf5VeCgJvZhY0stUXd6hmsi4pg/Y10v4tjv7gb/XA==}
+  /@cdktf/hcl2json@0.20.3:
+    resolution: {integrity: sha512-GCq/GrVRXI0nR5gQM0LW7pxEA/tZav0dGQZGowHif/vXsMlOZjTh/F1ISVmDUCkNHV7pgbFmy6tDg7RtsiavXw==}
     dependencies:
-      fs-extra: 11.1.1
+      fs-extra: 11.2.0
     dev: true
 
-  /@cdktf/node-pty-prebuilt-multiarch@0.10.1-pre.10:
-    resolution: {integrity: sha512-5ysQrHJvqYLYg407KvaDNu+xx68ZGaqeF0SohXe5e4yNqJhPFPUQ536rkReQcPc2yZiF5PDmmvf5T9MOacHpSQ==}
+  /@cdktf/node-pty-prebuilt-multiarch@0.10.1-pre.11:
+    resolution: {integrity: sha512-qvga/nzEtdCJMu/6jJfDqpzbRejvXtNhWFnbubfuYyN5nMNORNXX+POT4j+mQSDQar5bIQ1a812szw/zr47cfw==}
     requiresBuild: true
     dependencies:
-      nan: 2.18.0
+      nan: 2.19.0
       prebuild-install: 7.1.1
     dev: true
 
-  /@cdktf/provider-aws@15.0.0(cdktf@0.17.0)(constructs@10.2.70):
-    resolution: {integrity: sha512-GeXpsU8+TsXhFFowjos+7bYv2CDAMHjOlKxXTx6aaqEO7BTlyqXBM/Qetw6y/6MxwIcyEf5siduBeT6T3lg3Dg==}
-    engines: {node: ">= 16.14.0"}
+  /@cdktf/provider-aws@19.3.0(cdktf@0.20.3)(constructs@10.3.0):
+    resolution: {integrity: sha512-8PyEnXfjUZslNwr0Nt+34AhBz9cMlC5LsvtauUaPbRh6BaSE45UX0w7ykG4Tzkx6/On0zrH23XdL31DWgLG3Ig==}
+    engines: {node: '>= 18.12.0'}
     peerDependencies:
-      cdktf: ^0.17.0
-      constructs: ^10.0.0
+      cdktf: ^0.20.0
+      constructs: ^10.3.0
     dependencies:
-      cdktf: 0.17.0(constructs@10.2.70)
-      constructs: 10.2.70
+      cdktf: 0.20.3(constructs@10.3.0)
+      constructs: 10.3.0
 
-  /@cdktf/provider-generator@0.17.0:
-    resolution: {integrity: sha512-/Ei9uVuLT6xjJIn6hvGepmS7tOjOAYsUplpc3J2jS1US85aO7oMASgjjgISvDC7saddLqhYCfysSWrYU5zUp0g==}
+  /@cdktf/provider-generator@0.20.3(constructs@10.1.167):
+    resolution: {integrity: sha512-PIu/7kK3YZk9YefCTqJ8OiSER2zojz1EvpeeOxpIj+m98iMB2fpIRAA0ytVzkC3ilbDRCLyQb6+SlMxgSnenYg==}
     dependencies:
-      "@cdktf/commons": 0.17.0
-      "@cdktf/hcl2json": 0.17.0
-      "@types/node": 16.18.23
-      codemaker: 1.90.0
-      deepmerge: 4.3.1
+      '@cdktf/commons': 0.20.3(constructs@10.1.167)
+      '@cdktf/provider-schema': 0.20.3(constructs@10.1.167)
+      '@types/node': 18.19.7
+      codemaker: 1.94.0
       fs-extra: 8.1.0
-      jsii-srcmak: 0.1.951
+      glob: 10.3.10
+      jsii-srcmak: 0.1.1005
+    transitivePeerDependencies:
+      - constructs
+      - debug
+      - supports-color
+    dev: true
+
+  /@cdktf/provider-schema@0.20.3(constructs@10.1.167):
+    resolution: {integrity: sha512-fgqHtVY5FYN2spYsDLTPOxvspWu2JfmV4nxThVwd8bGBmdFf36ceWCSyyuc5tnSd4rJstXoAXMkTYlX2GtOubQ==}
+    dependencies:
+      '@cdktf/commons': 0.20.3(constructs@10.1.167)
+      '@cdktf/hcl2json': 0.20.3
+      deepmerge: 4.3.1
+      fs-extra: 11.2.0
     transitivePeerDependencies:
+      - constructs
       - debug
       - supports-color
     dev: true
 
   /@cloudy-ts/eslint-plugin@0.0.260(eslint@8.51.0):
     resolution: {integrity: sha512-4mOL06xDWMyUz6OB0chNOwb3zhmDrXpHL7e7ZkCp5ysUQ2EEG4ms1Qg0vKBatKTN3LkYBeVqEqJRVGGg7/icSQ==}
-    engines: {node: ">= 14.18.0"}
+    engines: {node: '>= 14.18.0'}
     peerDependencies:
       eslint: ^8.36.0
     dependencies:
@@ -4838,31 +5229,24 @@ packages:
 
   /@colors/colors@1.5.0:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
-    engines: {node: ">=0.1.90"}
+    engines: {node: '>=0.1.90'}
     requiresBuild: true
     optional: true
 
   /@colors/colors@1.6.0:
     resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==}
-    engines: {node: ">=0.1.90"}
+    engines: {node: '>=0.1.90'}
     requiresBuild: true
     dev: false
     optional: true
 
   /@cowasm/memfs@3.5.1:
     resolution: {integrity: sha512-TSz00K+BdLxAYFQvwHmKgM/eAK6h9OYSQhPTcv/9XSyOF0Q90EtMkJvtwirwAXunfTsZw8R9YMu1UU213ooVKw==}
-    engines: {node: ">= 4.0.0"}
+    engines: {node: '>= 4.0.0'}
     dependencies:
       fs-monkey: 1.0.5
     dev: false
 
-  /@cspotcode/source-map-support@0.8.1:
-    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
-    engines: {node: ">=12"}
-    dependencies:
-      "@jridgewell/trace-mapping": 0.3.9
-    dev: true
-
   /@dabh/diagnostics@2.0.3:
     resolution: {integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==}
     requiresBuild: true
@@ -4875,14 +5259,14 @@ packages:
 
   /@discoveryjs/json-ext@0.5.7:
     resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
-    engines: {node: ">=10.0.0"}
+    engines: {node: '>=10.0.0'}
     dev: true
 
   /@emotion/is-prop-valid@0.8.8:
     resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==}
     requiresBuild: true
     dependencies:
-      "@emotion/memoize": 0.7.4
+      '@emotion/memoize': 0.7.4
     dev: false
     optional: true
 
@@ -4895,14 +5279,31 @@ packages:
   /@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@18.2.0):
     resolution: {integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==}
     peerDependencies:
-      react: ">=16.8.0"
+      react: '>=16.8.0'
     dependencies:
       react: 18.2.0
     dev: true
 
+  /@esbuild/aix-ppc64@0.19.12:
+    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/aix-ppc64@0.21.5:
+    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm64@0.17.19:
     resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
@@ -4911,15 +5312,33 @@ packages:
 
   /@esbuild/android-arm64@0.18.20:
     resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-arm64@0.19.12:
+    resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/android-arm64@0.21.5:
+    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/android-arm@0.15.18:
     resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
     requiresBuild: true
@@ -4928,7 +5347,7 @@ packages:
 
   /@esbuild/android-arm@0.17.19:
     resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
     requiresBuild: true
@@ -4937,15 +5356,33 @@ packages:
 
   /@esbuild/android-arm@0.18.20:
     resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-arm@0.19.12:
+    resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/android-arm@0.21.5:
+    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/android-x64@0.17.19:
     resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
     requiresBuild: true
@@ -4954,15 +5391,33 @@ packages:
 
   /@esbuild/android-x64@0.18.20:
     resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-x64@0.19.12:
+    resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/android-x64@0.21.5:
+    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/darwin-arm64@0.17.19:
     resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
@@ -4971,15 +5426,33 @@ packages:
 
   /@esbuild/darwin-arm64@0.18.20:
     resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-arm64@0.19.12:
+    resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/darwin-arm64@0.21.5:
+    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/darwin-x64@0.17.19:
     resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
@@ -4988,15 +5461,33 @@ packages:
 
   /@esbuild/darwin-x64@0.18.20:
     resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-x64@0.19.12:
+    resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/darwin-x64@0.21.5:
+    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/freebsd-arm64@0.17.19:
     resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
@@ -5005,15 +5496,33 @@ packages:
 
   /@esbuild/freebsd-arm64@0.18.20:
     resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-arm64@0.19.12:
+    resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/freebsd-arm64@0.21.5:
+    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/freebsd-x64@0.17.19:
     resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
@@ -5022,15 +5531,33 @@ packages:
 
   /@esbuild/freebsd-x64@0.18.20:
     resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-x64@0.19.12:
+    resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/freebsd-x64@0.21.5:
+    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-arm64@0.17.19:
     resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
@@ -5039,15 +5566,33 @@ packages:
 
   /@esbuild/linux-arm64@0.18.20:
     resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-arm64@0.19.12:
+    resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-arm64@0.21.5:
+    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-arm@0.17.19:
     resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
@@ -5056,32 +5601,68 @@ packages:
 
   /@esbuild/linux-arm@0.18.20:
     resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.17.19:
-    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
-    engines: {node: ">=12"}
-    cpu: [ia32]
+  /@esbuild/linux-arm@0.19.12:
+    resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.18.20:
-    resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
-    engines: {node: ">=12"}
+  /@esbuild/linux-arm@0.21.5:
+    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.17.19:
+    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.18.20:
+    resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.19.12:
+    resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.21.5:
+    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-loong64@0.15.18:
     resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
@@ -5090,7 +5671,7 @@ packages:
 
   /@esbuild/linux-loong64@0.17.19:
     resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
@@ -5099,15 +5680,33 @@ packages:
 
   /@esbuild/linux-loong64@0.18.20:
     resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-loong64@0.19.12:
+    resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-loong64@0.21.5:
+    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
+    engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-mips64el@0.17.19:
     resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
@@ -5116,15 +5715,33 @@ packages:
 
   /@esbuild/linux-mips64el@0.18.20:
     resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-mips64el@0.19.12:
+    resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-mips64el@0.21.5:
+    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
+    engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-ppc64@0.17.19:
     resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
@@ -5133,15 +5750,33 @@ packages:
 
   /@esbuild/linux-ppc64@0.18.20:
     resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ppc64@0.19.12:
+    resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-ppc64@0.21.5:
+    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
+    engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-riscv64@0.17.19:
     resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
@@ -5150,15 +5785,33 @@ packages:
 
   /@esbuild/linux-riscv64@0.18.20:
     resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-riscv64@0.19.12:
+    resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-riscv64@0.21.5:
+    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-s390x@0.17.19:
     resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
@@ -5167,15 +5820,33 @@ packages:
 
   /@esbuild/linux-s390x@0.18.20:
     resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-s390x@0.19.12:
+    resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-s390x@0.21.5:
+    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
+    engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/linux-x64@0.17.19:
     resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
@@ -5184,15 +5855,33 @@ packages:
 
   /@esbuild/linux-x64@0.18.20:
     resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-x64@0.19.12:
+    resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-x64@0.21.5:
+    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/netbsd-x64@0.17.19:
     resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
@@ -5201,15 +5890,33 @@ packages:
 
   /@esbuild/netbsd-x64@0.18.20:
     resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/netbsd-x64@0.19.12:
+    resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/netbsd-x64@0.21.5:
+    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/openbsd-x64@0.17.19:
     resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
@@ -5218,15 +5925,33 @@ packages:
 
   /@esbuild/openbsd-x64@0.18.20:
     resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/openbsd-x64@0.19.12:
+    resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/openbsd-x64@0.21.5:
+    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/sunos-x64@0.17.19:
     resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
@@ -5235,15 +5960,33 @@ packages:
 
   /@esbuild/sunos-x64@0.18.20:
     resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/sunos-x64@0.19.12:
+    resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/sunos-x64@0.21.5:
+    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/win32-arm64@0.17.19:
     resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
@@ -5252,15 +5995,33 @@ packages:
 
   /@esbuild/win32-arm64@0.18.20:
     resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-arm64@0.19.12:
+    resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/win32-arm64@0.21.5:
+    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/win32-ia32@0.17.19:
     resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
@@ -5269,15 +6030,33 @@ packages:
 
   /@esbuild/win32-ia32@0.18.20:
     resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-ia32@0.19.12:
+    resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/win32-ia32@0.21.5:
+    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
+    dev: true
     optional: true
 
   /@esbuild/win32-x64@0.17.19:
     resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
@@ -5286,10 +6065,28 @@ packages:
 
   /@esbuild/win32-x64@0.18.20:
     resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-x64@0.19.12:
+    resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/win32-x64@0.21.5:
+    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
     optional: true
 
   /@eslint-community/eslint-utils@4.4.0(eslint@8.51.0):
@@ -5301,6 +6098,16 @@ packages:
       eslint: 8.51.0
       eslint-visitor-keys: 3.4.3
 
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0):
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+    dependencies:
+      eslint: 8.56.0
+      eslint-visitor-keys: 3.4.3
+    dev: true
+
   /@eslint-community/regexpp@4.9.1:
     resolution: {integrity: sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
@@ -5310,7 +6117,23 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
+      espree: 9.6.1
+      globals: 13.23.0
+      ignore: 5.2.4
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /@eslint/eslintrc@2.1.4:
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.3.4(supports-color@5.5.0)
       espree: 9.6.1
       globals: 13.23.0
       ignore: 5.2.4
@@ -5320,40 +6143,46 @@ packages:
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@eslint/js@8.51.0:
     resolution: {integrity: sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  /@eslint/js@8.56.0:
+    resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /@fal-works/esbuild-plugin-global-externals@2.1.2:
     resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
     dev: true
 
   /@fastify/busboy@2.0.0:
     resolution: {integrity: sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     dev: false
 
   /@floating-ui/core@1.5.0:
     resolution: {integrity: sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==}
     dependencies:
-      "@floating-ui/utils": 0.1.6
+      '@floating-ui/utils': 0.1.6
     dev: true
 
   /@floating-ui/dom@1.5.3:
     resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==}
     dependencies:
-      "@floating-ui/core": 1.5.0
-      "@floating-ui/utils": 0.1.6
+      '@floating-ui/core': 1.5.0
+      '@floating-ui/utils': 0.1.6
     dev: true
 
   /@floating-ui/react-dom@2.0.2(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==}
     peerDependencies:
-      react: ">=16.8.0"
-      react-dom: ">=16.8.0"
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
     dependencies:
-      "@floating-ui/dom": 1.5.3
+      '@floating-ui/dom': 1.5.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
@@ -5362,9 +6191,26 @@ packages:
     resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
     dev: true
 
+  /@google-cloud/datastore@8.4.0:
+    resolution: {integrity: sha512-zSU4R4LkVBTPdZJi8pK0QPe+3ZQL5+1mFXI7Yh5mdDcJhtX2Y5VD9wXsEJ0N48kpiA5V6+cxh4g0NB+mAyQbKg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@google-cloud/promisify': 4.0.0
+      arrify: 2.0.1
+      concat-stream: 2.0.0
+      extend: 3.0.2
+      google-gax: 4.0.5
+      is: 3.3.0
+      split-array-stream: 2.0.0
+      stream-events: 1.0.5
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
   /@google-cloud/paginator@3.0.7:
     resolution: {integrity: sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       arrify: 2.0.1
       extend: 3.0.2
@@ -5372,21 +6218,26 @@ packages:
 
   /@google-cloud/projectify@3.0.0:
     resolution: {integrity: sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dev: false
 
   /@google-cloud/promisify@3.0.1:
     resolution: {integrity: sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    dev: false
+
+  /@google-cloud/promisify@4.0.0:
+    resolution: {integrity: sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==}
+    engines: {node: '>=14'}
     dev: false
 
   /@google-cloud/storage@6.9.5:
     resolution: {integrity: sha512-fcLsDA8YKcGuqvhk0XTjJGVpG9dzs5Em8IcUjSjspYvERuHYqMy9CMChWapSjv3Lyw//exa3mv4nUxPlV93BnA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
-      "@google-cloud/paginator": 3.0.7
-      "@google-cloud/projectify": 3.0.0
-      "@google-cloud/promisify": 3.0.1
+      '@google-cloud/paginator': 3.0.7
+      '@google-cloud/projectify': 3.0.0
+      '@google-cloud/promisify': 3.0.1
       abort-controller: 3.0.0
       async-retry: 1.3.3
       compressible: 2.0.18
@@ -5406,14 +6257,33 @@ packages:
       - supports-color
     dev: false
 
+  /@grpc/grpc-js@1.9.9:
+    resolution: {integrity: sha512-vQ1qwi/Kiyprt+uhb1+rHMpyk4CVRMTGNUGGPRGS7pLNfWkdCHrGEnT6T3/JyC2VZgoOX/X1KwdoU0WYQAeYcQ==}
+    engines: {node: ^8.13.0 || >=10.10.0}
+    dependencies:
+      '@grpc/proto-loader': 0.7.10
+      '@types/node': 20.14.2
+    dev: false
+
+  /@grpc/proto-loader@0.7.10:
+    resolution: {integrity: sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==}
+    engines: {node: '>=6'}
+    hasBin: true
+    dependencies:
+      lodash.camelcase: 4.3.0
+      long: 5.2.3
+      protobufjs: 7.2.5(patch_hash=plkkb5oxv62w7nyvt6cqmvgk4q)
+      yargs: 17.7.2
+    dev: false
+
   /@gwhitney/detect-indent@7.0.1:
     resolution: {integrity: sha512-7bQW+gkKa2kKZPeJf6+c6gFK9ARxQfn+FKy9ScTBppyKRWH2KzsmweXUoklqeEiHiNVWaeP5csIdsNq6w7QhzA==}
-    engines: {node: ">=12.20"}
+    engines: {node: '>=12.20'}
     dev: false
 
   /@headlessui/react@1.7.17(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-4am+tzvkqDSSgiwrsEpGWqgGo9dz8qU5M3znCkC4PgkpY4HcCZzEDEvozltGGGHIKl9jbXbZPSH5TWn4sWJdow==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
       react: ^16 || ^17 || ^18
       react-dom: ^16 || ^17 || ^18
@@ -5426,31 +6296,46 @@ packages:
   /@heroicons/react@2.0.18(react@18.2.0):
     resolution: {integrity: sha512-7TyMjRrZZMBPa+/5Y8lN0iyvUU/01PeMGX2+RE7cQWpEUIcb4QotzUObFkJDejj/HUH4qjP/eQ0gzzKs2f+6Yw==}
     peerDependencies:
-      react: ">= 16"
+      react: '>= 16'
     dependencies:
       react: 18.2.0
     dev: false
 
   /@humanwhocodes/config-array@0.11.11:
     resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==}
-    engines: {node: ">=10.10.0"}
+    engines: {node: '>=10.10.0'}
+    dependencies:
+      '@humanwhocodes/object-schema': 1.2.1
+      debug: 4.3.4(supports-color@5.5.0)
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  /@humanwhocodes/config-array@0.11.14:
+    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
+    engines: {node: '>=10.10.0'}
     dependencies:
-      "@humanwhocodes/object-schema": 1.2.1
-      debug: 4.3.4
+      '@humanwhocodes/object-schema': 2.0.2
+      debug: 4.3.4(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
-    engines: {node: ">=12.22"}
+    engines: {node: '>=12.22'}
 
   /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
 
+  /@humanwhocodes/object-schema@2.0.2:
+    resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
+    dev: true
+
   /@hutson/parse-repository-url@3.0.2:
     resolution: {integrity: sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dev: true
 
   /@iarna/toml@2.2.5:
@@ -5462,10 +6347,10 @@ packages:
 
   /@inquirer/checkbox@1.4.0:
     resolution: {integrity: sha512-7YcekwCvMTjrgjUursrH6AGZUSPw7gKPMvp0VhM3iq9mL46a7AeCfOTQTW0UPeiIfWmZK8wHyAD6wIhfDyLHpw==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/core": 5.1.0
-      "@inquirer/type": 1.1.5
+      '@inquirer/core': 5.1.0
+      '@inquirer/type': 1.1.5
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       figures: 3.2.0
@@ -5473,21 +6358,21 @@ packages:
 
   /@inquirer/confirm@2.0.14:
     resolution: {integrity: sha512-Elzo5VX5lO1q9xy8CChDtDQNVLaucufdZBAM12qdfX1L3NQ+TypnZytGmWDXHBTpBTwuhEuwxNvUw7B0HCURkw==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/core": 5.1.0
-      "@inquirer/type": 1.1.5
+      '@inquirer/core': 5.1.0
+      '@inquirer/type': 1.1.5
       chalk: 4.1.2
     dev: true
 
   /@inquirer/core@2.3.1:
     resolution: {integrity: sha512-faYAYnIfdEuns3jGKykaog5oUqFiEVbCx9nXGZfUhyEEpKcHt5bpJfZTb3eOBQKo8I/v4sJkZeBHmFlSZQuBCw==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/type": 1.1.5
-      "@types/mute-stream": 0.0.1
-      "@types/node": 20.8.3
-      "@types/wrap-ansi": 3.0.0
+      '@inquirer/type': 1.1.5
+      '@types/mute-stream': 0.0.1
+      '@types/node': 20.14.2
+      '@types/wrap-ansi': 3.0.0
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       cli-spinners: 2.9.1
@@ -5502,12 +6387,12 @@ packages:
 
   /@inquirer/core@5.1.0:
     resolution: {integrity: sha512-EVnific72BhMOMo8mElvrYhGFWJZ73X6j0I+fITIPTsdAz6Z9A3w3csKy+XaH87/5QAEIQHR7RSCVXvQpIqNdQ==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/type": 1.1.5
-      "@types/mute-stream": 0.0.2
-      "@types/node": 20.8.3
-      "@types/wrap-ansi": 3.0.0
+      '@inquirer/type': 1.1.5
+      '@types/mute-stream': 0.0.2
+      '@types/node': 20.14.2
+      '@types/wrap-ansi': 3.0.0
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       cli-spinners: 2.9.1
@@ -5522,73 +6407,73 @@ packages:
 
   /@inquirer/editor@1.2.12:
     resolution: {integrity: sha512-Y7zXQqcglPbbPkx0DPwx6HQFstJR5uex4hoQprjpdxSj8+Bf04+Og6mK/FNxoQbPvoNecegtmMGxDC+hVcMJZA==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/core": 5.1.0
-      "@inquirer/type": 1.1.5
+      '@inquirer/core': 5.1.0
+      '@inquirer/type': 1.1.5
       chalk: 4.1.2
       external-editor: 3.1.0
     dev: true
 
   /@inquirer/expand@1.1.13:
     resolution: {integrity: sha512-/+7CGCa7iyJIpli0NtukEAjSI7+wGgjYzsByLVSSAk3U696ZlCCP6iPtsWx6d1qfmaMmCzejcjylOj6OAeu4bA==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/core": 5.1.0
-      "@inquirer/type": 1.1.5
+      '@inquirer/core': 5.1.0
+      '@inquirer/type': 1.1.5
       chalk: 4.1.2
       figures: 3.2.0
     dev: true
 
   /@inquirer/input@1.2.13:
     resolution: {integrity: sha512-gALuvSpZRYfqygPjlYWodMZ4TXwALvw7Pk4tRFhE1oMN79rLVlg88Z/X6JCUh+uV2qLaxxgbeP+cgPWTvuWsCg==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/core": 5.1.0
-      "@inquirer/type": 1.1.5
+      '@inquirer/core': 5.1.0
+      '@inquirer/type': 1.1.5
       chalk: 4.1.2
     dev: true
 
   /@inquirer/password@1.1.13:
     resolution: {integrity: sha512-6STGbL4Vm6ohE2yDBOSENCpCeywnvPux5psZVpvblGDop1oPiZkdsVI+NhsA0c4BE6YT0fNVK8Oqxf5Dgt5k7g==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/input": 1.2.13
-      "@inquirer/type": 1.1.5
+      '@inquirer/input': 1.2.13
+      '@inquirer/type': 1.1.5
       ansi-escapes: 4.3.2
       chalk: 4.1.2
     dev: true
 
-  /@inquirer/prompts@2.3.1:
-    resolution: {integrity: sha512-YQeBFzIE+6fcec5N/U2mSz+IcKEG4wtGDwF7MBLIDgITWzB3o723JpKJ1rxWqdCvTXkYE+gDXK/seSN6omo3DQ==}
-    engines: {node: ">=14.18.0"}
+  /@inquirer/prompts@2.3.0:
+    resolution: {integrity: sha512-x79tSDIZAibOl9WaBoOuyaQqNnisOO8Pk0qWyulP/nPaD/WkoRvkzk7hR4WTRmWAyE8CNbjdYgGltvd0qmvCGQ==}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/checkbox": 1.4.0
-      "@inquirer/confirm": 2.0.14
-      "@inquirer/core": 2.3.1
-      "@inquirer/editor": 1.2.12
-      "@inquirer/expand": 1.1.13
-      "@inquirer/input": 1.2.13
-      "@inquirer/password": 1.1.13
-      "@inquirer/rawlist": 1.2.13
-      "@inquirer/select": 1.3.0
+      '@inquirer/checkbox': 1.4.0
+      '@inquirer/confirm': 2.0.14
+      '@inquirer/core': 2.3.1
+      '@inquirer/editor': 1.2.12
+      '@inquirer/expand': 1.1.13
+      '@inquirer/input': 1.2.13
+      '@inquirer/password': 1.1.13
+      '@inquirer/rawlist': 1.2.13
+      '@inquirer/select': 1.3.0
     dev: true
 
   /@inquirer/rawlist@1.2.13:
     resolution: {integrity: sha512-f+bASrCY2x2F90MrBYX7nUSetL6FsVLfskhGWEyVwj6VIXzc9T878z3v7KU3V10D1trWrCVHOdeqEcbnO68yhg==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/core": 5.1.0
-      "@inquirer/type": 1.1.5
+      '@inquirer/core': 5.1.0
+      '@inquirer/type': 1.1.5
       chalk: 4.1.2
     dev: true
 
   /@inquirer/select@1.3.0:
     resolution: {integrity: sha512-3sL5odCDYI+i+piAFqFa5ULDUKEpc0U1zEY4Wm6gjP6nMAHWM8r1UzMlpQXCyHny91Tz+oeSLeKinAde0z6R7w==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dependencies:
-      "@inquirer/core": 5.1.0
-      "@inquirer/type": 1.1.5
+      '@inquirer/core': 5.1.0
+      '@inquirer/type': 1.1.5
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       figures: 3.2.0
@@ -5596,7 +6481,7 @@ packages:
 
   /@inquirer/type@1.1.5:
     resolution: {integrity: sha512-wmwHvHozpPo4IZkkNtbYenem/0wnfI6hvOcGKmPEa0DwuaH5XUQzFqy6OpEpjEegZMhYIk8HDYITI16BPLtrRA==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
     dev: true
 
   /@ioredis/commands@1.2.0:
@@ -5605,7 +6490,7 @@ packages:
 
   /@isaacs/cliui@8.0.2:
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       string-width: 5.1.2
       string-width-cjs: /string-width@4.2.3
@@ -5620,7 +6505,7 @@ packages:
 
   /@istanbuljs/load-nyc-config@1.1.0:
     resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       camelcase: 5.3.1
       find-up: 4.1.0
@@ -5631,393 +6516,41 @@ packages:
 
   /@istanbuljs/schema@0.1.3:
     resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
-  /@jest/console@27.5.1:
-    resolution: {integrity: sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+  /@jest/expect-utils@28.1.3:
+    resolution: {integrity: sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      jest-message-util: 27.5.1
-      jest-util: 27.5.1
-      slash: 3.0.0
+      jest-get-type: 28.0.2
     dev: true
 
-  /@jest/console@29.7.0:
-    resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==}
+  /@jest/schemas@28.1.3:
+    resolution: {integrity: sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@sinclair/typebox': 0.24.51
+    dev: true
+
+  /@jest/schemas@29.6.3:
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-      slash: 3.0.0
+      '@sinclair/typebox': 0.27.8
     dev: true
 
-  /@jest/core@27.5.1(ts-node@10.9.1):
-    resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
+  /@jest/transform@29.7.0:
+    resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      "@jest/console": 27.5.1
-      "@jest/reporters": 27.5.1
-      "@jest/test-result": 27.5.1
-      "@jest/transform": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      ansi-escapes: 4.3.2
+      '@babel/core': 7.23.9
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.20
+      babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
-      emittery: 0.8.1
-      exit: 0.1.2
-      graceful-fs: 4.2.11
-      jest-changed-files: 27.5.1
-      jest-config: 27.5.1(ts-node@10.9.1)
-      jest-haste-map: 27.5.1
-      jest-message-util: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-resolve-dependencies: 27.5.1
-      jest-runner: 27.5.1
-      jest-runtime: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      jest-watcher: 27.5.1
-      micromatch: 4.0.5
-      rimraf: 3.0.2
-      slash: 3.0.0
-      strip-ansi: 6.0.1
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - ts-node
-      - utf-8-validate
-    dev: true
-
-  /@jest/core@29.7.0(ts-node@10.9.1):
-    resolution: {integrity: sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      "@jest/console": 29.7.0
-      "@jest/reporters": 29.7.0
-      "@jest/test-result": 29.7.0
-      "@jest/transform": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      exit: 0.1.2
-      graceful-fs: 4.2.11
-      jest-changed-files: 29.7.0
-      jest-config: 29.7.0(@types/node@18.18.4)(ts-node@10.9.1)
-      jest-haste-map: 29.7.0
-      jest-message-util: 29.7.0
-      jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-resolve-dependencies: 29.7.0
-      jest-runner: 29.7.0
-      jest-runtime: 29.7.0
-      jest-snapshot: 29.7.0
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      jest-watcher: 29.7.0
-      micromatch: 4.0.5
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      strip-ansi: 6.0.1
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
-    dev: true
-
-  /@jest/environment@27.5.1:
-    resolution: {integrity: sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/fake-timers": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      jest-mock: 27.5.1
-    dev: true
-
-  /@jest/environment@29.7.0:
-    resolution: {integrity: sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/fake-timers": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      jest-mock: 29.7.0
-    dev: true
-
-  /@jest/expect-utils@28.1.3:
-    resolution: {integrity: sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      jest-get-type: 28.0.2
-    dev: true
-
-  /@jest/expect-utils@29.7.0:
-    resolution: {integrity: sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-get-type: 29.6.3
-    dev: true
-
-  /@jest/expect@29.7.0:
-    resolution: {integrity: sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      expect: 29.7.0
-      jest-snapshot: 29.7.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/fake-timers@27.5.1:
-    resolution: {integrity: sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      "@sinonjs/fake-timers": 8.1.0
-      "@types/node": 18.18.4
-      jest-message-util: 27.5.1
-      jest-mock: 27.5.1
-      jest-util: 27.5.1
-    dev: true
-
-  /@jest/fake-timers@29.7.0:
-    resolution: {integrity: sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/types": 29.6.3
-      "@sinonjs/fake-timers": 10.3.0
-      "@types/node": 18.18.4
-      jest-message-util: 29.7.0
-      jest-mock: 29.7.0
-      jest-util: 29.7.0
-    dev: true
-
-  /@jest/globals@27.5.1:
-    resolution: {integrity: sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/environment": 27.5.1
-      "@jest/types": 27.5.1
-      expect: 27.5.1
-    dev: true
-
-  /@jest/globals@29.7.0:
-    resolution: {integrity: sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/environment": 29.7.0
-      "@jest/expect": 29.7.0
-      "@jest/types": 29.6.3
-      jest-mock: 29.7.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/reporters@27.5.1:
-    resolution: {integrity: sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      "@bcoe/v8-coverage": 0.2.3
-      "@jest/console": 27.5.1
-      "@jest/test-result": 27.5.1
-      "@jest/transform": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      collect-v8-coverage: 1.0.2
-      exit: 0.1.2
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-instrument: 5.2.1
-      istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.6
-      jest-haste-map: 27.5.1
-      jest-resolve: 27.5.1
-      jest-util: 27.5.1
-      jest-worker: 27.5.1
-      slash: 3.0.0
-      source-map: 0.6.1
-      string-length: 4.0.2
-      terminal-link: 2.1.1
-      v8-to-istanbul: 8.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/reporters@29.7.0:
-    resolution: {integrity: sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      "@bcoe/v8-coverage": 0.2.3
-      "@jest/console": 29.7.0
-      "@jest/test-result": 29.7.0
-      "@jest/transform": 29.7.0
-      "@jest/types": 29.6.3
-      "@jridgewell/trace-mapping": 0.3.19
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      collect-v8-coverage: 1.0.2
-      exit: 0.1.2
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-instrument: 6.0.1
-      istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.6
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-      jest-worker: 29.7.0
-      slash: 3.0.0
-      string-length: 4.0.2
-      strip-ansi: 6.0.1
-      v8-to-istanbul: 9.1.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/schemas@28.1.3:
-    resolution: {integrity: sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      "@sinclair/typebox": 0.24.51
-    dev: true
-
-  /@jest/schemas@29.6.3:
-    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@sinclair/typebox": 0.27.8
-    dev: true
-
-  /@jest/source-map@27.5.1:
-    resolution: {integrity: sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      callsites: 3.1.0
-      graceful-fs: 4.2.11
-      source-map: 0.6.1
-    dev: true
-
-  /@jest/source-map@29.6.3:
-    resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jridgewell/trace-mapping": 0.3.19
-      callsites: 3.1.0
-      graceful-fs: 4.2.11
-    dev: true
-
-  /@jest/test-result@27.5.1:
-    resolution: {integrity: sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/console": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/istanbul-lib-coverage": 2.0.4
-      collect-v8-coverage: 1.0.2
-    dev: true
-
-  /@jest/test-result@29.7.0:
-    resolution: {integrity: sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/console": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/istanbul-lib-coverage": 2.0.4
-      collect-v8-coverage: 1.0.2
-    dev: true
-
-  /@jest/test-sequencer@27.5.1:
-    resolution: {integrity: sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/test-result": 27.5.1
-      graceful-fs: 4.2.11
-      jest-haste-map: 27.5.1
-      jest-runtime: 27.5.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/test-sequencer@29.7.0:
-    resolution: {integrity: sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/test-result": 29.7.0
-      graceful-fs: 4.2.11
-      jest-haste-map: 29.7.0
-      slash: 3.0.0
-    dev: true
-
-  /@jest/transform@27.5.1:
-    resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@babel/core": 7.23.0
-      "@jest/types": 27.5.1
-      babel-plugin-istanbul: 6.1.1
-      chalk: 4.1.2
-      convert-source-map: 1.9.0
-      fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.11
-      jest-haste-map: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-util: 27.5.1
-      micromatch: 4.0.5
-      pirates: 4.0.6
-      slash: 3.0.0
-      source-map: 0.6.1
-      write-file-atomic: 3.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/transform@29.7.0:
-    resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@babel/core": 7.23.0
-      "@jest/types": 29.6.3
-      "@jridgewell/trace-mapping": 0.3.19
-      babel-plugin-istanbul: 6.1.1
-      chalk: 4.1.2
-      convert-source-map: 2.0.0
-      fast-json-stable-stringify: 2.1.0
+      convert-source-map: 2.0.0
+      fast-json-stable-stringify: 2.1.0
       graceful-fs: 4.2.11
       jest-haste-map: 29.7.0
       jest-regex-util: 29.6.3
@@ -6034,10 +6567,10 @@ packages:
     resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      "@types/istanbul-lib-coverage": 2.0.4
-      "@types/istanbul-reports": 3.0.2
-      "@types/node": 18.18.4
-      "@types/yargs": 16.0.6
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.2
+      '@types/node': 20.14.2
+      '@types/yargs': 16.0.6
       chalk: 4.1.2
     dev: true
 
@@ -6045,11 +6578,11 @@ packages:
     resolution: {integrity: sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      "@jest/schemas": 28.1.3
-      "@types/istanbul-lib-coverage": 2.0.4
-      "@types/istanbul-reports": 3.0.2
-      "@types/node": 18.18.4
-      "@types/yargs": 17.0.28
+      '@jest/schemas': 28.1.3
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.2
+      '@types/node': 20.14.2
+      '@types/yargs': 17.0.28
       chalk: 4.1.2
     dev: true
 
@@ -6057,18 +6590,18 @@ packages:
     resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      "@jest/schemas": 29.6.3
-      "@types/istanbul-lib-coverage": 2.0.4
-      "@types/istanbul-reports": 3.0.2
-      "@types/node": 18.18.4
-      "@types/yargs": 17.0.28
+      '@jest/schemas': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.2
+      '@types/node': 20.14.2
+      '@types/yargs': 17.0.28
       chalk: 4.1.2
     dev: true
 
-  /@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.2.2)(vite@4.4.11):
+  /@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.2.2)(vite@4.5.2):
     resolution: {integrity: sha512-ou4ZJSXMMWHqGS4g8uNRbC5TiTWxAgQZiVucoUrOCWuPrTbkpJbmVyIi9jU72SBry7gQtuMEDp4YR8EEXAg7VQ==}
     peerDependencies:
-      typescript: ">= 4.3.x"
+      typescript: '>= 4.3.x'
       vite: ^3.0.0 || ^4.0.0
     peerDependenciesMeta:
       typescript:
@@ -6079,98 +6612,87 @@ packages:
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.2.2)
       typescript: 5.2.2
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 4.5.2
     dev: true
 
   /@jridgewell/gen-mapping@0.3.3:
     resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
-    engines: {node: ">=6.0.0"}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/set-array': 1.1.2
+      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/trace-mapping': 0.3.20
+    dev: true
+
+  /@jridgewell/gen-mapping@0.3.5:
+    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
+    engines: {node: '>=6.0.0'}
     dependencies:
-      "@jridgewell/set-array": 1.1.2
-      "@jridgewell/sourcemap-codec": 1.4.15
-      "@jridgewell/trace-mapping": 0.3.19
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/trace-mapping': 0.3.25
 
   /@jridgewell/resolve-uri@3.1.1:
     resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
-    engines: {node: ">=6.0.0"}
+    engines: {node: '>=6.0.0'}
+    dev: true
+
+  /@jridgewell/resolve-uri@3.1.2:
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
 
   /@jridgewell/set-array@1.1.2:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
-    engines: {node: ">=6.0.0"}
+    engines: {node: '>=6.0.0'}
+    dev: true
+
+  /@jridgewell/set-array@1.2.1:
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
+    engines: {node: '>=6.0.0'}
 
   /@jridgewell/source-map@0.3.5:
     resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
     dependencies:
-      "@jridgewell/gen-mapping": 0.3.3
-      "@jridgewell/trace-mapping": 0.3.19
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.20
     dev: true
 
   /@jridgewell/sourcemap-codec@1.4.15:
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  /@jridgewell/trace-mapping@0.3.19:
-    resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==}
-    dependencies:
-      "@jridgewell/resolve-uri": 3.1.1
-      "@jridgewell/sourcemap-codec": 1.4.15
-
   /@jridgewell/trace-mapping@0.3.20:
     resolution: {integrity: sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==}
     dependencies:
-      "@jridgewell/resolve-uri": 3.1.1
-      "@jridgewell/sourcemap-codec": 1.4.15
-    dev: true
-
-  /@jridgewell/trace-mapping@0.3.9:
-    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
-    dependencies:
-      "@jridgewell/resolve-uri": 3.1.1
-      "@jridgewell/sourcemap-codec": 1.4.15
+      '@jridgewell/resolve-uri': 3.1.1
+      '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
-  /@jsii/check-node@1.84.0:
-    resolution: {integrity: sha512-gLa+N1WKksCjTXaK8VMjTbEXf58QlrDOovoTOEzhGNgTFyAUX8woIRAUmk+X70ssDzBvgh3E98mIsDKoWOp6zA==}
-    engines: {node: ">= 14.17.0"}
+  /@jridgewell/trace-mapping@0.3.25:
+    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
     dependencies:
-      chalk: 4.1.2
-      semver: 7.5.4
-    dev: true
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.4.15
 
-  /@jsii/check-node@1.88.0:
-    resolution: {integrity: sha512-AveFyqkJIb8qZvGk5nZal/8mEJB6lWhwqvAQLodHmqE3WzpmZD5+h+aspBVt0El5cEFRJ1k1mrQqhAnJCVpvxg==}
-    engines: {node: ">= 14.17.0"}
+  /@jsii/check-node@1.93.0:
+    resolution: {integrity: sha512-NLn1Js6wEG2hYjH7gE5Q8s/hPlp3I+KhK/T8ykGdYVod7iODnk/0QVSZsk2iEyuw8NzvvgXUDBWreadUIWSz+g==}
+    engines: {node: '>= 14.17.0'}
     dependencies:
       chalk: 4.1.2
       semver: 7.5.4
     dev: true
 
-  /@jsii/check-node@1.90.0:
-    resolution: {integrity: sha512-bHrSs/X0mX6rVgBySk6JB/VYiqIV0HkznthZ4lpLabrgTEistwBYXxTf1kgNzfmUbIt0EeETwxdLAY0sqHE/+A==}
-    engines: {node: ">= 14.17.0"}
-    dependencies:
-      chalk: 4.1.2
-      semver: 7.5.4
-
-  /@jsii/check-node@1.91.0:
-    resolution: {integrity: sha512-K9UFkRe4uJNVp1O2o4OBM/3usba6Vw3XF1Mq3TVBAYl1EzpAiA62DojGp30+3zwFlb1lkavVj1hKlCrIWIuJhw==}
-    engines: {node: ">= 14.17.0"}
+  /@jsii/check-node@1.94.0:
+    resolution: {integrity: sha512-46W+V1oTFvF9ZpKpPYy//1WUmhZ8AD8O0ElmQtv9mundLHccZm+q7EmCYhozr7rlK5uSjU9/WHfbIx2DwynuJw==}
+    engines: {node: '>= 14.17.0'}
     dependencies:
       chalk: 4.1.2
       semver: 7.5.4
-    dev: true
-
-  /@jsii/spec@1.90.0:
-    resolution: {integrity: sha512-Uajku7MWhkfxd8Ux8+8lOzT6Oa/Td8HzmBYZb9kd9v04qEGBQH/tQkUr80Md7dvq6SbRUKevDenYNQ8qiHHxpg==}
-    engines: {node: ">= 14.17.0"}
-    dependencies:
-      ajv: 8.12.0
 
-  /@jsii/spec@1.91.0:
-    resolution: {integrity: sha512-Ir01bk5CwIFAApRJjRC+JG/f9db5dACEYFSxsHyvXRMu+J/LIANdwD4OPSelWrhbRiQdY6U16BKsRO63uaNRqg==}
-    engines: {node: ">= 14.17.0"}
+  /@jsii/spec@1.94.0:
+    resolution: {integrity: sha512-ur1aUMPsdZgflUIZC4feyJzrkGYzvtiIJxRowkSxr7Ip/sLCKvi61dvImWtJY9ZhEAl7Kiq7I/R32WVyxW0JrQ==}
+    engines: {node: '>= 14.17.0'}
     dependencies:
       ajv: 8.12.0
-    dev: true
 
   /@juggle/resize-observer@3.4.0:
     resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==}
@@ -6178,23 +6700,23 @@ packages:
 
   /@lukeed/csprng@1.1.0:
     resolution: {integrity: sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: false
 
   /@lukeed/uuid@2.0.1:
     resolution: {integrity: sha512-qC72D4+CDdjGqJvkFMMEAtancHUQ7/d/tAiHf64z8MopFDmcrtbcJuerDtFceuAfQJ2pDSfCKCtbqoGBNnwg0w==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
-      "@lukeed/csprng": 1.1.0
+      '@lukeed/csprng': 1.1.0
     dev: false
 
   /@mdx-js/react@2.3.0(react@18.2.0):
     resolution: {integrity: sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==}
     peerDependencies:
-      react: ">=16"
+      react: '>=16'
     dependencies:
-      "@types/mdx": 2.0.8
-      "@types/react": 18.2.25
+      '@types/mdx': 2.0.8
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
@@ -6208,20 +6730,20 @@ packages:
 
   /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
-      "@nodelib/fs.stat": 2.0.5
+      '@nodelib/fs.stat': 2.0.5
       run-parallel: 1.2.0
 
   /@nodelib/fs.stat@2.0.5:
     resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
 
   /@nodelib/fs.walk@1.2.8:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
-      "@nodelib/fs.scandir": 2.1.5
+      '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
   /@npm/types@1.0.2:
@@ -6246,16 +6768,16 @@ packages:
     engines: {node: ^16.14.0 || >=18.0.0}
     hasBin: true
     dependencies:
-      "@isaacs/string-locale-compare": 1.1.0
-      "@npmcli/fs": 3.1.0
-      "@npmcli/installed-package-contents": 2.0.2
-      "@npmcli/map-workspaces": 3.0.4
-      "@npmcli/metavuln-calculator": 7.0.0
-      "@npmcli/name-from-folder": 2.0.0
-      "@npmcli/node-gyp": 3.0.0
-      "@npmcli/package-json": 5.0.0
-      "@npmcli/query": 3.0.1
-      "@npmcli/run-script": 7.0.1
+      '@isaacs/string-locale-compare': 1.1.0
+      '@npmcli/fs': 3.1.0
+      '@npmcli/installed-package-contents': 2.0.2
+      '@npmcli/map-workspaces': 3.0.4
+      '@npmcli/metavuln-calculator': 7.0.0
+      '@npmcli/name-from-folder': 2.0.0
+      '@npmcli/node-gyp': 3.0.0
+      '@npmcli/package-json': 5.0.0
+      '@npmcli/query': 3.0.1
+      '@npmcli/run-script': 7.0.1
       bin-links: 4.0.2
       cacache: 18.0.0
       common-ancestor-path: 1.0.1
@@ -6284,38 +6806,18 @@ packages:
       - supports-color
     dev: false
 
-  /@npmcli/ci-detect@1.4.0:
-    resolution: {integrity: sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==}
-    deprecated: this package has been deprecated, use `ci-info` instead
-    dev: true
-
   /@npmcli/fs@3.1.0:
     resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       semver: 7.5.4
-
-  /@npmcli/git@4.1.0:
-    resolution: {integrity: sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      "@npmcli/promise-spawn": 6.0.2
-      lru-cache: 7.18.3
-      npm-pick-manifest: 8.0.2
-      proc-log: 3.0.0
-      promise-inflight: 1.0.1
-      promise-retry: 2.0.1
-      semver: 7.5.4
-      which: 3.0.1
-    transitivePeerDependencies:
-      - bluebird
-    dev: true
+    dev: false
 
   /@npmcli/git@5.0.3:
     resolution: {integrity: sha512-UZp9NwK+AynTrKvHn5k3KviW/hA5eENmFsu3iAPe7sWRt0lFUdsY/wXIYjpDFe7cdSNwOIzbObfwgt6eL5/2zw==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@npmcli/promise-spawn": 7.0.0
+      '@npmcli/promise-spawn': 7.0.0
       lru-cache: 10.0.1
       npm-pick-manifest: 9.0.0
       proc-log: 3.0.0
@@ -6334,12 +6836,13 @@ packages:
     dependencies:
       npm-bundled: 3.0.0
       npm-normalize-package-bin: 3.0.1
+    dev: false
 
   /@npmcli/map-workspaces@3.0.4:
     resolution: {integrity: sha512-Z0TbvXkRbacjFFLpVpV0e2mheCh+WzQpcqL+4xp49uNJOxOnIAPZyXtUxZ5Qn3QBTGKA11Exjd9a5411rBrhDg==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
-      "@npmcli/name-from-folder": 2.0.0
+      '@npmcli/name-from-folder': 2.0.0
       glob: 10.3.10
       minimatch: 9.0.3
       read-package-json-fast: 3.0.2
@@ -6366,12 +6869,13 @@ packages:
   /@npmcli/node-gyp@3.0.0:
     resolution: {integrity: sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    dev: false
 
   /@npmcli/package-json@5.0.0:
     resolution: {integrity: sha512-OI2zdYBLhQ7kpNPaJxiflofYIpkNLi+lnGdzqUOfRmCF3r2l1nadcjtCYMJKv/Utm/ZtlffaUuTiAktPHbc17g==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@npmcli/git": 5.0.3
+      '@npmcli/git': 5.0.3
       glob: 10.3.10
       hosted-git-info: 7.0.1
       json-parse-even-better-errors: 3.0.0
@@ -6382,13 +6886,6 @@ packages:
       - bluebird
     dev: false
 
-  /@npmcli/promise-spawn@6.0.2:
-    resolution: {integrity: sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      which: 3.0.1
-    dev: true
-
   /@npmcli/promise-spawn@7.0.0:
     resolution: {integrity: sha512-wBqcGsMELZna0jDblGd7UXgOby45TQaMWmbFwWX+SEotk4HV6zG2t6rT9siyLhPk4P6YYqgfL1UO8nMWDBVJXQ==}
     engines: {node: ^16.14.0 || >=18.0.0}
@@ -6403,25 +6900,12 @@ packages:
       postcss-selector-parser: 6.0.13
     dev: false
 
-  /@npmcli/run-script@6.0.2:
-    resolution: {integrity: sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      "@npmcli/node-gyp": 3.0.0
-      "@npmcli/promise-spawn": 6.0.2
-      node-gyp: 9.4.0
-      read-package-json-fast: 3.0.2
-      which: 3.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@npmcli/run-script@7.0.1:
     resolution: {integrity: sha512-Od/JMrgkjZ8alyBE0IzeqZDiF1jgMez9Gkc/OYrCkHHiXNwM0wc6s7+h+xM7kYDZkS0tAoOLr9VvygyE5+2F7g==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@npmcli/node-gyp": 3.0.0
-      "@npmcli/promise-spawn": 7.0.0
+      '@npmcli/node-gyp': 3.0.0
+      '@npmcli/promise-spawn': 7.0.0
       node-gyp: 9.4.0
       read-package-json-fast: 3.0.2
       which: 4.0.0
@@ -6429,28 +6913,28 @@ packages:
       - supports-color
     dev: false
 
-  /@octokit/app@14.0.1:
-    resolution: {integrity: sha512-4opdXcWBVhzd6FOxlaxDKXXqi9Vz2hsDSWQGNo49HbYFAX11UqMpksMjEdfvHy0x19Pse8Nvn+R6inNb/V398w==}
-    engines: {node: ">= 18"}
+  /@octokit/app@14.0.2:
+    resolution: {integrity: sha512-NCSCktSx+XmjuSUVn2dLfqQ9WIYePGP95SDJs4I9cn/0ZkeXcPkaoCLl64Us3dRKL2ozC7hArwze5Eu+/qt1tg==}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/auth-app": 6.0.1
-      "@octokit/auth-unauthenticated": 5.0.1
-      "@octokit/core": 5.0.1
-      "@octokit/oauth-app": 6.0.0
-      "@octokit/plugin-paginate-rest": 9.0.0(@octokit/core@5.0.1)
-      "@octokit/types": 12.0.0
-      "@octokit/webhooks": 12.0.3
+      '@octokit/auth-app': 6.0.1
+      '@octokit/auth-unauthenticated': 5.0.1
+      '@octokit/core': 5.0.1
+      '@octokit/oauth-app': 6.0.0
+      '@octokit/plugin-paginate-rest': 9.0.0(@octokit/core@5.0.1)
+      '@octokit/types': 12.0.0
+      '@octokit/webhooks': 12.1.2
     dev: true
 
   /@octokit/auth-app@6.0.1:
     resolution: {integrity: sha512-tjCD4nzQNZgmLH62+PSnTF6eGerisFgV4v6euhqJik6yWV96e1ZiiGj+NXIqbgnpjLmtnBqVUrNyGKu3DoGEGA==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/auth-oauth-app": 7.0.1
-      "@octokit/auth-oauth-user": 4.0.1
-      "@octokit/request": 8.1.3
-      "@octokit/request-error": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/auth-oauth-app': 7.0.1
+      '@octokit/auth-oauth-user': 4.0.1
+      '@octokit/request': 8.1.3
+      '@octokit/request-error': 5.0.1
+      '@octokit/types': 12.0.0
       deprecation: 2.3.1
       lru-cache: 10.0.1
       universal-github-app-jwt: 1.1.1
@@ -6459,35 +6943,35 @@ packages:
 
   /@octokit/auth-oauth-app@7.0.1:
     resolution: {integrity: sha512-RE0KK0DCjCHXHlQBoubwlLijXEKfhMhKm9gO56xYvFmP1QTMb+vvwRPmQLLx0V+5AvV9N9I3lr1WyTzwL3rMDg==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/auth-oauth-device": 6.0.1
-      "@octokit/auth-oauth-user": 4.0.1
-      "@octokit/request": 8.1.3
-      "@octokit/types": 12.0.0
-      "@types/btoa-lite": 1.0.0
+      '@octokit/auth-oauth-device': 6.0.1
+      '@octokit/auth-oauth-user': 4.0.1
+      '@octokit/request': 8.1.3
+      '@octokit/types': 12.0.0
+      '@types/btoa-lite': 1.0.0
       btoa-lite: 1.0.0
       universal-user-agent: 6.0.0
     dev: true
 
   /@octokit/auth-oauth-device@6.0.1:
     resolution: {integrity: sha512-yxU0rkL65QkjbqQedgVx3gmW7YM5fF+r5uaSj9tM/cQGVqloXcqP2xK90eTyYvl29arFVCW8Vz4H/t47mL0ELw==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/oauth-methods": 4.0.0
-      "@octokit/request": 8.1.3
-      "@octokit/types": 12.0.0
+      '@octokit/oauth-methods': 4.0.0
+      '@octokit/request': 8.1.3
+      '@octokit/types': 12.0.0
       universal-user-agent: 6.0.0
     dev: true
 
   /@octokit/auth-oauth-user@4.0.1:
     resolution: {integrity: sha512-N94wWW09d0hleCnrO5wt5MxekatqEJ4zf+1vSe8MKMrhZ7gAXKFOKrDEZW2INltvBWJCyDUELgGRv8gfErH1Iw==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/auth-oauth-device": 6.0.1
-      "@octokit/oauth-methods": 4.0.0
-      "@octokit/request": 8.1.3
-      "@octokit/types": 12.0.0
+      '@octokit/auth-oauth-device': 6.0.1
+      '@octokit/oauth-methods': 4.0.0
+      '@octokit/request': 8.1.3
+      '@octokit/types': 12.0.0
       btoa-lite: 1.0.0
       universal-user-agent: 6.0.0
     dev: true
@@ -6496,32 +6980,32 @@ packages:
     resolution: {integrity: sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==}
     requiresBuild: true
     dependencies:
-      "@octokit/types": 6.41.0
+      '@octokit/types': 6.41.0
     dev: false
     optional: true
 
   /@octokit/auth-token@4.0.0:
     resolution: {integrity: sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dev: true
 
   /@octokit/auth-unauthenticated@5.0.1:
     resolution: {integrity: sha512-oxeWzmBFxWd+XolxKTc4zr+h3mt+yofn4r7OfoIkR/Cj/o70eEGmPsFbueyJE2iBAGpjgTnEOKM3pnuEGVmiqg==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/request-error": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/request-error': 5.0.1
+      '@octokit/types': 12.0.0
     dev: true
 
   /@octokit/core@3.6.0:
     resolution: {integrity: sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==}
     requiresBuild: true
     dependencies:
-      "@octokit/auth-token": 2.5.0
-      "@octokit/graphql": 4.8.0
-      "@octokit/request": 5.6.3
-      "@octokit/request-error": 2.1.0
-      "@octokit/types": 6.41.0
+      '@octokit/auth-token': 2.5.0
+      '@octokit/graphql': 4.8.0
+      '@octokit/request': 5.6.3
+      '@octokit/request-error': 2.1.0
+      '@octokit/types': 6.41.0
       before-after-hook: 2.2.3
       universal-user-agent: 6.0.0
     transitivePeerDependencies:
@@ -6531,13 +7015,13 @@ packages:
 
   /@octokit/core@5.0.1:
     resolution: {integrity: sha512-lyeeeZyESFo+ffI801SaBKmCfsvarO+dgV8/0gD8u1d87clbEdWsP5yC+dSj3zLhb2eIf5SJrn6vDz9AheETHw==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/auth-token": 4.0.0
-      "@octokit/graphql": 7.0.2
-      "@octokit/request": 8.1.3
-      "@octokit/request-error": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/auth-token': 4.0.0
+      '@octokit/graphql': 7.0.2
+      '@octokit/request': 8.1.3
+      '@octokit/request-error': 5.0.1
+      '@octokit/types': 12.0.0
       before-after-hook: 2.2.3
       universal-user-agent: 6.0.0
     dev: true
@@ -6546,7 +7030,7 @@ packages:
     resolution: {integrity: sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==}
     requiresBuild: true
     dependencies:
-      "@octokit/types": 6.41.0
+      '@octokit/types': 6.41.0
       is-plain-object: 5.0.0
       universal-user-agent: 6.0.0
     dev: false
@@ -6554,9 +7038,9 @@ packages:
 
   /@octokit/endpoint@9.0.1:
     resolution: {integrity: sha512-hRlOKAovtINHQPYHZlfyFwaM8OyetxeoC81lAkBy34uLb8exrZB50SQdeW3EROqiY9G9yxQTpp5OHTV54QD+vA==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/types": 12.0.0
+      '@octokit/types': 12.0.0
       is-plain-object: 5.0.0
       universal-user-agent: 6.0.0
     dev: true
@@ -6565,8 +7049,8 @@ packages:
     resolution: {integrity: sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==}
     requiresBuild: true
     dependencies:
-      "@octokit/request": 5.6.3
-      "@octokit/types": 6.41.0
+      '@octokit/request': 5.6.3
+      '@octokit/types': 6.41.0
       universal-user-agent: 6.0.0
     transitivePeerDependencies:
       - encoding
@@ -6575,40 +7059,40 @@ packages:
 
   /@octokit/graphql@7.0.2:
     resolution: {integrity: sha512-OJ2iGMtj5Tg3s6RaXH22cJcxXRi7Y3EBqbHTBRq+PQAqfaS8f/236fUrWhfSn8P4jovyzqucxme7/vWSSZBX2Q==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/request": 8.1.3
-      "@octokit/types": 12.0.0
+      '@octokit/request': 8.1.3
+      '@octokit/types': 12.0.0
       universal-user-agent: 6.0.0
     dev: true
 
   /@octokit/oauth-app@6.0.0:
     resolution: {integrity: sha512-bNMkS+vJ6oz2hCyraT9ZfTpAQ8dZNqJJQVNaKjPLx4ue5RZiFdU1YWXguOPR8AaSHS+lKe+lR3abn2siGd+zow==}
-    engines: {node: ">= 18"}
-    dependencies:
-      "@octokit/auth-oauth-app": 7.0.1
-      "@octokit/auth-oauth-user": 4.0.1
-      "@octokit/auth-unauthenticated": 5.0.1
-      "@octokit/core": 5.0.1
-      "@octokit/oauth-authorization-url": 6.0.2
-      "@octokit/oauth-methods": 4.0.0
-      "@types/aws-lambda": 8.10.124
+    engines: {node: '>= 18'}
+    dependencies:
+      '@octokit/auth-oauth-app': 7.0.1
+      '@octokit/auth-oauth-user': 4.0.1
+      '@octokit/auth-unauthenticated': 5.0.1
+      '@octokit/core': 5.0.1
+      '@octokit/oauth-authorization-url': 6.0.2
+      '@octokit/oauth-methods': 4.0.0
+      '@types/aws-lambda': 8.10.124
       universal-user-agent: 6.0.0
     dev: true
 
   /@octokit/oauth-authorization-url@6.0.2:
     resolution: {integrity: sha512-CdoJukjXXxqLNK4y/VOiVzQVjibqoj/xHgInekviUJV73y/BSIcwvJ/4aNHPBPKcPWFnd4/lO9uqRV65jXhcLA==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dev: true
 
   /@octokit/oauth-methods@4.0.0:
     resolution: {integrity: sha512-dqy7BZLfLbi3/8X8xPKUKZclMEK9vN3fK5WF3ortRvtplQTszFvdAGbTo71gGLO+4ZxspNiLjnqdd64Chklf7w==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/oauth-authorization-url": 6.0.2
-      "@octokit/request": 8.1.3
-      "@octokit/request-error": 5.0.1
-      "@octokit/types": 11.1.0
+      '@octokit/oauth-authorization-url': 6.0.2
+      '@octokit/request': 8.1.3
+      '@octokit/request-error': 5.0.1
+      '@octokit/types': 11.1.0
       btoa-lite: 1.0.0
     dev: true
 
@@ -6628,86 +7112,86 @@ packages:
 
   /@octokit/plugin-paginate-graphql@4.0.0(@octokit/core@5.0.1):
     resolution: {integrity: sha512-7HcYW5tP7/Z6AETAPU14gp5H5KmCPT3hmJrS/5tO7HIgbwenYmgw4OY9Ma54FDySuxMwD+wsJlxtuGWwuZuItA==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     peerDependencies:
-      "@octokit/core": ">=5"
+      '@octokit/core': '>=5'
     dependencies:
-      "@octokit/core": 5.0.1
+      '@octokit/core': 5.0.1
     dev: true
 
   /@octokit/plugin-paginate-rest@2.21.3(@octokit/core@3.6.0):
     resolution: {integrity: sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==}
     requiresBuild: true
     peerDependencies:
-      "@octokit/core": ">=2"
+      '@octokit/core': '>=2'
     dependencies:
-      "@octokit/core": 3.6.0
-      "@octokit/types": 6.41.0
+      '@octokit/core': 3.6.0
+      '@octokit/types': 6.41.0
     dev: false
     optional: true
 
   /@octokit/plugin-paginate-rest@9.0.0(@octokit/core@5.0.1):
     resolution: {integrity: sha512-oIJzCpttmBTlEhBmRvb+b9rlnGpmFgDtZ0bB6nq39qIod6A5DP+7RkVLMOixIgRCYSHDTeayWqmiJ2SZ6xgfdw==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     peerDependencies:
-      "@octokit/core": ">=5"
+      '@octokit/core': '>=5'
     dependencies:
-      "@octokit/core": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/core': 5.0.1
+      '@octokit/types': 12.0.0
     dev: true
 
   /@octokit/plugin-request-log@1.0.4(@octokit/core@3.6.0):
     resolution: {integrity: sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==}
     requiresBuild: true
     peerDependencies:
-      "@octokit/core": ">=3"
+      '@octokit/core': '>=3'
     dependencies:
-      "@octokit/core": 3.6.0
+      '@octokit/core': 3.6.0
     dev: false
     optional: true
 
   /@octokit/plugin-rest-endpoint-methods@10.0.0(@octokit/core@5.0.1):
     resolution: {integrity: sha512-16VkwE2v6rXU+/gBsYC62M8lKWOphY5Lg4wpjYnVE9Zbu0J6IwiT5kILoj1YOB53XLmcJR+Nqp8DmifOPY4H3g==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     peerDependencies:
-      "@octokit/core": ">=5"
+      '@octokit/core': '>=5'
     dependencies:
-      "@octokit/core": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/core': 5.0.1
+      '@octokit/types': 12.0.0
     dev: true
 
   /@octokit/plugin-rest-endpoint-methods@5.16.2(@octokit/core@3.6.0):
     resolution: {integrity: sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==}
     requiresBuild: true
     peerDependencies:
-      "@octokit/core": ">=3"
+      '@octokit/core': '>=3'
     dependencies:
-      "@octokit/core": 3.6.0
-      "@octokit/types": 6.41.0
+      '@octokit/core': 3.6.0
+      '@octokit/types': 6.41.0
       deprecation: 2.3.1
     dev: false
     optional: true
 
   /@octokit/plugin-retry@6.0.1(@octokit/core@5.0.1):
     resolution: {integrity: sha512-SKs+Tz9oj0g4p28qkZwl/topGcb0k0qPNX/i7vBKmDsjoeqnVfFUquqrE/O9oJY7+oLzdCtkiWSXLpLjvl6uog==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     peerDependencies:
-      "@octokit/core": ">=5"
+      '@octokit/core': '>=5'
     dependencies:
-      "@octokit/core": 5.0.1
-      "@octokit/request-error": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/core': 5.0.1
+      '@octokit/request-error': 5.0.1
+      '@octokit/types': 12.0.0
       bottleneck: 2.19.5
     dev: true
 
   /@octokit/plugin-throttling@8.0.0(@octokit/core@5.0.1):
     resolution: {integrity: sha512-OkMbHYUidj81q92YRkPzWmwXkEtsI3KOcSkNm763aqUOh9IEplyX05XjKAdZFANAvaYH0Q4JBZwu4h2VnPVXZA==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     peerDependencies:
-      "@octokit/core": ^5.0.0
+      '@octokit/core': ^5.0.0
     dependencies:
-      "@octokit/core": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/core': 5.0.1
+      '@octokit/types': 12.0.0
       bottleneck: 2.19.5
     dev: true
 
@@ -6715,7 +7199,7 @@ packages:
     resolution: {integrity: sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==}
     requiresBuild: true
     dependencies:
-      "@octokit/types": 6.41.0
+      '@octokit/types': 6.41.0
       deprecation: 2.3.1
       once: 1.4.0
     dev: false
@@ -6723,9 +7207,9 @@ packages:
 
   /@octokit/request-error@5.0.1:
     resolution: {integrity: sha512-X7pnyTMV7MgtGmiXBwmO6M5kIPrntOXdyKZLigNfQWSEQzVxR4a4vo49vJjTWX70mPndj8KhfT4Dx+2Ng3vnBQ==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/types": 12.0.0
+      '@octokit/types': 12.0.0
       deprecation: 2.3.1
       once: 1.4.0
     dev: true
@@ -6734,9 +7218,9 @@ packages:
     resolution: {integrity: sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==}
     requiresBuild: true
     dependencies:
-      "@octokit/endpoint": 6.0.12
-      "@octokit/request-error": 2.1.0
-      "@octokit/types": 6.41.0
+      '@octokit/endpoint': 6.0.12
+      '@octokit/request-error': 2.1.0
+      '@octokit/types': 6.41.0
       is-plain-object: 5.0.0
       node-fetch: 2.7.0
       universal-user-agent: 6.0.0
@@ -6747,11 +7231,11 @@ packages:
 
   /@octokit/request@8.1.3:
     resolution: {integrity: sha512-iUvXP4QmysS8kyE/a4AGwR0A+tHDVxgW6TmPd2ci8/Xc8KjlBtTKSDpZlUT5Y4S4Nu+eM8LvbOYjVAp/sz3Gpg==}
-    engines: {node: ">= 18"}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/endpoint": 9.0.1
-      "@octokit/request-error": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/endpoint': 9.0.1
+      '@octokit/request-error': 5.0.1
+      '@octokit/types': 12.0.0
       is-plain-object: 5.0.0
       universal-user-agent: 6.0.0
     dev: true
@@ -6760,10 +7244,10 @@ packages:
     resolution: {integrity: sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==}
     requiresBuild: true
     dependencies:
-      "@octokit/core": 3.6.0
-      "@octokit/plugin-paginate-rest": 2.21.3(@octokit/core@3.6.0)
-      "@octokit/plugin-request-log": 1.0.4(@octokit/core@3.6.0)
-      "@octokit/plugin-rest-endpoint-methods": 5.16.2(@octokit/core@3.6.0)
+      '@octokit/core': 3.6.0
+      '@octokit/plugin-paginate-rest': 2.21.3(@octokit/core@3.6.0)
+      '@octokit/plugin-request-log': 1.0.4(@octokit/core@3.6.0)
+      '@octokit/plugin-rest-endpoint-methods': 5.16.2(@octokit/core@3.6.0)
     transitivePeerDependencies:
       - encoding
     dev: false
@@ -6772,81 +7256,81 @@ packages:
   /@octokit/types@11.1.0:
     resolution: {integrity: sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==}
     dependencies:
-      "@octokit/openapi-types": 18.1.1
+      '@octokit/openapi-types': 18.1.1
     dev: true
 
   /@octokit/types@12.0.0:
     resolution: {integrity: sha512-EzD434aHTFifGudYAygnFlS1Tl6KhbTynEWELQXIbTY8Msvb5nEqTZIm7sbPEt4mQYLZwu3zPKVdeIrw0g7ovg==}
     dependencies:
-      "@octokit/openapi-types": 19.0.0
+      '@octokit/openapi-types': 19.0.0
     dev: true
 
   /@octokit/types@6.41.0:
     resolution: {integrity: sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==}
     requiresBuild: true
     dependencies:
-      "@octokit/openapi-types": 12.11.0
+      '@octokit/openapi-types': 12.11.0
     dev: false
     optional: true
 
-  /@octokit/webhooks-methods@4.0.0:
-    resolution: {integrity: sha512-M8mwmTXp+VeolOS/kfRvsDdW+IO0qJ8kYodM/sAysk093q6ApgmBXwK1ZlUvAwXVrp/YVHp6aArj4auAxUAOFw==}
-    engines: {node: ">= 18"}
+  /@octokit/webhooks-methods@4.1.0:
+    resolution: {integrity: sha512-zoQyKw8h9STNPqtm28UGOYFE7O6D4Il8VJwhAtMHFt2C4L0VQT1qGKLeefUOqHNs1mNRYSadVv7x0z8U2yyeWQ==}
+    engines: {node: '>= 18'}
     dev: true
 
-  /@octokit/webhooks-types@7.1.0:
-    resolution: {integrity: sha512-y92CpG4kFFtBBjni8LHoV12IegJ+KFxLgKRengrVjKmGE5XMeCuGvlfRe75lTRrgXaG6XIWJlFpIDTlkoJsU8w==}
+  /@octokit/webhooks-types@7.3.2:
+    resolution: {integrity: sha512-JWOoOgtWTFnTSAamPXXyjTY5/apttvNxF+vPBnwdSu5cj5snrd7FO0fyw4+wTXy8fHduq626JjhO+TwCyyA6vA==}
     dev: true
 
-  /@octokit/webhooks@12.0.3:
-    resolution: {integrity: sha512-8iG+/yza7hwz1RrQ7i7uGpK2/tuItZxZq1aTmeg2TNp2xTUB8F8lZF/FcZvyyAxT8tpDMF74TjFGCDACkf1kAQ==}
-    engines: {node: ">= 18"}
+  /@octokit/webhooks@12.1.2:
+    resolution: {integrity: sha512-+nGS3ReCByF6m+nbNB59x7Aa3CNjCCGuBLFzfkiJP1O3uVKKuJbkP4uO4t46YqH26nlugmOhqjT7nx5D0VPtdA==}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/request-error": 5.0.1
-      "@octokit/webhooks-methods": 4.0.0
-      "@octokit/webhooks-types": 7.1.0
+      '@octokit/request-error': 5.0.1
+      '@octokit/webhooks-methods': 4.1.0
+      '@octokit/webhooks-types': 7.3.2
       aggregate-error: 3.1.0
     dev: true
 
   /@oozcitak/dom@1.15.10:
     resolution: {integrity: sha512-0JT29/LaxVgRcGKvHmSrUTEvZ8BXvZhGl2LASRUgHqDTC1M5g1pLmVv56IYNyt3bG2CUjDkc67wnyZC14pbQrQ==}
-    engines: {node: ">=8.0"}
+    engines: {node: '>=8.0'}
     dependencies:
-      "@oozcitak/infra": 1.0.8
-      "@oozcitak/url": 1.0.4
-      "@oozcitak/util": 8.3.8
+      '@oozcitak/infra': 1.0.8
+      '@oozcitak/url': 1.0.4
+      '@oozcitak/util': 8.3.8
 
   /@oozcitak/infra@1.0.8:
     resolution: {integrity: sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==}
-    engines: {node: ">=6.0"}
+    engines: {node: '>=6.0'}
     dependencies:
-      "@oozcitak/util": 8.3.8
+      '@oozcitak/util': 8.3.8
 
   /@oozcitak/url@1.0.4:
     resolution: {integrity: sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==}
-    engines: {node: ">=8.0"}
+    engines: {node: '>=8.0'}
     dependencies:
-      "@oozcitak/infra": 1.0.8
-      "@oozcitak/util": 8.3.8
+      '@oozcitak/infra': 1.0.8
+      '@oozcitak/util': 8.3.8
 
   /@oozcitak/util@8.3.8:
     resolution: {integrity: sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==}
-    engines: {node: ">=8.0"}
+    engines: {node: '>=8.0'}
 
   /@opentelemetry/api@1.6.0:
     resolution: {integrity: sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==}
-    engines: {node: ">=8.0.0"}
+    engines: {node: '>=8.0.0'}
     dev: false
 
   /@pkgjs/parseargs@0.11.0:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     requiresBuild: true
     optional: true
 
   /@playwright/test@1.38.1:
     resolution: {integrity: sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==}
-    engines: {node: ">=16"}
+    engines: {node: '>=16'}
     hasBin: true
     dependencies:
       playwright: 1.38.1
@@ -6854,48 +7338,49 @@ packages:
 
   /@pnpm/cli-meta@5.0.3:
     resolution: {integrity: sha512-Pbx63/wc9LkDZ4QKvKFrgSI/c0LEOWUbXHi+R8vs9npfM5zeD4IdqSrDArpEzX5NQIs+8NLItSTeEOKX0C2EEQ==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/types": 9.3.0
+      '@pnpm/types': 9.3.0
       load-json-file: 6.2.0
     dev: false
 
   /@pnpm/cli-utils@2.0.23(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-Om1G0haOQFXopTihC6uakz9OJySaHXoVjUMLrkbCSHz6cATfL0URx7Ym8RTgs11yWta7jtdhbPepsAsr26UCvg==}
-    engines: {node: ">=16.14"}
-    peerDependencies:
-      "@pnpm/logger": ^5.0.0
-    dependencies:
-      "@pnpm/cli-meta": 5.0.3
-      "@pnpm/config": 19.2.1(@pnpm/logger@5.0.0)
-      "@pnpm/default-reporter": 12.4.2(@pnpm/logger@5.0.0)
-      "@pnpm/error": 5.0.2
-      "@pnpm/logger": 5.0.0
-      "@pnpm/manifest-utils": 5.0.4(@pnpm/logger@5.0.0)
-      "@pnpm/package-is-installable": 8.0.5(@pnpm/logger@5.0.0)
-      "@pnpm/read-project-manifest": 5.0.7
-      "@pnpm/types": 9.3.0
+    engines: {node: '>=16.14'}
+    peerDependencies:
+      '@pnpm/logger': ^5.0.0
+    dependencies:
+      '@pnpm/cli-meta': 5.0.3
+      '@pnpm/config': 19.2.1(@pnpm/logger@5.0.0)
+      '@pnpm/default-reporter': 12.4.2(@pnpm/logger@5.0.0)
+      '@pnpm/error': 5.0.2
+      '@pnpm/logger': 5.0.0
+      '@pnpm/manifest-utils': 5.0.4(@pnpm/logger@5.0.0)
+      '@pnpm/package-is-installable': 8.0.5(@pnpm/logger@5.0.0)
+      '@pnpm/read-project-manifest': 5.0.7
+      '@pnpm/types': 9.3.0
       chalk: 4.1.2
       load-json-file: 6.2.0
     dev: false
 
   /@pnpm/config.env-replace@1.1.0:
     resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==}
-    engines: {node: ">=12.22.0"}
+    engines: {node: '>=12.22.0'}
+    dev: false
 
   /@pnpm/config@19.2.1(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-FISlC9B9bejhAXNINg5yUFQ1MlmvLLPYdVd1EJAzyDavIAiNdFj4tiF6W5BdOx36S7EbWX3gDsdFYhfgqqQliw==}
-    engines: {node: ">=16.14"}
-    dependencies:
-      "@pnpm/config.env-replace": 1.1.0
-      "@pnpm/constants": 7.1.1
-      "@pnpm/error": 5.0.2
-      "@pnpm/git-utils": 1.0.0
-      "@pnpm/matcher": 5.0.0
-      "@pnpm/npm-conf": 2.2.2
-      "@pnpm/pnpmfile": 5.0.14(@pnpm/logger@5.0.0)
-      "@pnpm/read-project-manifest": 5.0.7
-      "@pnpm/types": 9.3.0
+    engines: {node: '>=16.14'}
+    dependencies:
+      '@pnpm/config.env-replace': 1.1.0
+      '@pnpm/constants': 7.1.1
+      '@pnpm/error': 5.0.2
+      '@pnpm/git-utils': 1.0.0
+      '@pnpm/matcher': 5.0.0
+      '@pnpm/npm-conf': 2.2.2
+      '@pnpm/pnpmfile': 5.0.14(@pnpm/logger@5.0.0)
+      '@pnpm/read-project-manifest': 5.0.7
+      '@pnpm/types': 9.3.0
       better-path-resolve: 1.0.0
       camelcase: 6.3.0
       camelcase-keys: 6.2.2
@@ -6910,59 +7395,59 @@ packages:
       realpath-missing: 1.1.0
       which: 3.0.1
     transitivePeerDependencies:
-      - "@pnpm/logger"
+      - '@pnpm/logger'
     dev: false
 
   /@pnpm/constants@7.1.1:
     resolution: {integrity: sha512-31pZqMtjwV+Vaq7MaPrT1EoDFSYwye3dp6BiHIGRJmVThCQwySRKM7hCvqqI94epNkqFAAYoWrNynWoRYosGdw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dev: false
 
   /@pnpm/core-loggers@9.0.3(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-qjy8tkqfN3FQtLSh4qN3Qvll+T1lav1K6hgdGiy3R0Zv5rMORc60yaeBzLDq/dvb/DvY7tdwDcMX9e5odAhrNw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     peerDependencies:
-      "@pnpm/logger": ^5.0.0
+      '@pnpm/logger': ^5.0.0
     dependencies:
-      "@pnpm/logger": 5.0.0
-      "@pnpm/types": 9.3.0
+      '@pnpm/logger': 5.0.0
+      '@pnpm/types': 9.3.0
     dev: false
 
   /@pnpm/crypto.base32-hash@2.0.0:
     resolution: {integrity: sha512-3ttOeHBpmWRbgJrpDQ8Nwd3W8s8iuiP5YZM0JRyKWaMtX8lu9d7/AKyxPmhYsMJuN+q/1dwHa7QFeDZJ53b0oA==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
       rfc4648: 1.5.2
     dev: false
 
   /@pnpm/dedupe.issues-renderer@1.0.0:
     resolution: {integrity: sha512-vlo2t1ERLH3vsL1PtlCue6qfpWofN2Pt2bvGIPtN6Y4siCZVwjy9GU3yXJk1wS2+a7qj9plPiobebadJgV/VHw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/dedupe.types": 1.0.0
+      '@pnpm/dedupe.types': 1.0.0
       archy: 1.0.0
       chalk: 4.1.2
     dev: false
 
   /@pnpm/dedupe.types@1.0.0:
     resolution: {integrity: sha512-WGZ5E7aMPwaM+WMFYszTCP3Sms/gE0nLgI37gFnNbaKgAh5R7GojSHCxLgXqjiz0Jwx+Qi9BmdDgN1cJs5XBsg==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dev: false
 
   /@pnpm/default-reporter@12.4.2(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-9GK3ol+PQx9WEx3uetb+M9lhP/uK/vAm+PCaeOH/DVadbYQyy7fhKOgYBuOMshHNLqwGcdfnLeyY3b2lQdrEIg==}
-    engines: {node: ">=16.14"}
-    peerDependencies:
-      "@pnpm/logger": ^5.0.0
-    dependencies:
-      "@pnpm/config": 19.2.1(@pnpm/logger@5.0.0)
-      "@pnpm/core-loggers": 9.0.3(@pnpm/logger@5.0.0)
-      "@pnpm/dedupe.issues-renderer": 1.0.0
-      "@pnpm/dedupe.types": 1.0.0
-      "@pnpm/error": 5.0.2
-      "@pnpm/logger": 5.0.0
-      "@pnpm/render-peer-issues": 4.0.3
-      "@pnpm/types": 9.3.0
+    engines: {node: '>=16.14'}
+    peerDependencies:
+      '@pnpm/logger': ^5.0.0
+    dependencies:
+      '@pnpm/config': 19.2.1(@pnpm/logger@5.0.0)
+      '@pnpm/core-loggers': 9.0.3(@pnpm/logger@5.0.0)
+      '@pnpm/dedupe.issues-renderer': 1.0.0
+      '@pnpm/dedupe.types': 1.0.0
+      '@pnpm/error': 5.0.2
+      '@pnpm/logger': 5.0.0
+      '@pnpm/render-peer-issues': 4.0.3
+      '@pnpm/types': 9.3.0
       ansi-diff: 1.1.1
       boxen: 5.1.2
       chalk: 4.1.2
@@ -6980,87 +7465,87 @@ packages:
 
   /@pnpm/dependency-path@2.1.4:
     resolution: {integrity: sha512-QdT1Q3A2tx2TnGJZjso6W/LkJE+hnvcj3O6eN9NT46ckVmYEI2/6cYmRJY8PGrem/X222b7BeE4I8bnLDWZaWQ==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/crypto.base32-hash": 2.0.0
-      "@pnpm/types": 9.3.0
+      '@pnpm/crypto.base32-hash': 2.0.0
+      '@pnpm/types': 9.3.0
       encode-registry: 3.0.1
       semver: 7.5.4
     dev: false
 
   /@pnpm/error@5.0.2:
     resolution: {integrity: sha512-0TEm+tWNYm+9uh6DSKyRbv8pv/6b4NL0PastLvMxIoqZbBZ5Zj1cYi332R9xsSUi31ZOsu2wpgn/bC7DA9hrjg==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/constants": 7.1.1
+      '@pnpm/constants': 7.1.1
     dev: false
 
   /@pnpm/fetcher-base@15.0.2:
     resolution: {integrity: sha512-a+vy3k24dRZZ2iY9N22PNOxwEthxBG46pw1YmlXL96ioizVVbFeFAEdsZiiD0t8Th+mmKFAvk7tzdg3Vpo1d0g==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/resolver-base": 10.0.3
-      "@pnpm/types": 9.3.0
-      "@types/ssri": 7.1.2
+      '@pnpm/resolver-base': 10.0.3
+      '@pnpm/types': 9.3.0
+      '@types/ssri': 7.1.2
     dev: false
 
   /@pnpm/find-workspace-dir@6.0.2:
     resolution: {integrity: sha512-JSrpQUFCs4vY1D5tOmj7qBb+oE2j/lO6341giEdUpvYf3FijY8CY13l8rPjfHV2y3m//utzl0An+q+qx14S6Nw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/error": 5.0.2
+      '@pnpm/error': 5.0.2
       find-up: 5.0.0
     dev: false
 
   /@pnpm/fs.find-packages@2.0.7:
     resolution: {integrity: sha512-0X3UblPT+p9zWw4Qkg1M8YBIv0Bz41p4V8iQPDKVgUBajMlNAlG0fkL45BkLDGGO+JYfMJl/uinVKqNjE7nf+Q==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/read-project-manifest": 5.0.7
-      "@pnpm/types": 9.3.0
-      "@pnpm/util.lex-comparator": 1.0.0
-      fast-glob: 3.3.1
+      '@pnpm/read-project-manifest': 5.0.7
+      '@pnpm/types': 9.3.0
+      '@pnpm/util.lex-comparator': 1.0.0
+      fast-glob: 3.3.2
       p-filter: 2.1.0
     dev: false
 
   /@pnpm/git-utils@1.0.0:
     resolution: {integrity: sha512-lUI+XrzOJN4zdPGOGnFUrmtXAXpXi8wD8OI0nWOZmlh+raqbLzC3VkXu1zgaduOK6YonOcnQW88O+ojav1rAdA==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
       execa: /safe-execa@0.1.2
     dev: false
 
   /@pnpm/graceful-fs@3.2.0:
     resolution: {integrity: sha512-vRoXJxscDpHak7YE9SqCkzfrayn+Lw+YueOeHIPEqkgokrHeYgYeONoc2kGh0ObHaRtNSsonozVfJ456kxLNvA==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
       graceful-fs: 4.2.11
     dev: false
 
   /@pnpm/hooks.types@1.0.3:
     resolution: {integrity: sha512-MGPDi2t/Rg9qfmYvml+bV7aB2LeKv2flGWLguu8Gqwgfu4/mQKVX6u9NU8IdV2dmVoPBCO+bTqigYkaXYexjQg==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/lockfile-types": 5.1.2
-      "@pnpm/types": 9.3.0
+      '@pnpm/lockfile-types': 5.1.2
+      '@pnpm/types': 9.3.0
     dev: false
 
   /@pnpm/lockfile-file@8.1.3(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-t1qzYJcm/JAfKW1MdLhswM0+fSvy9/pRSXNQhxADCGor29zvBxieb/8xhDweIW5acH0T0TbS3Hgo0Iu/Ui2JuQ==}
-    engines: {node: ">=16.14"}
-    peerDependencies:
-      "@pnpm/logger": ^5.0.0
-    dependencies:
-      "@pnpm/constants": 7.1.1
-      "@pnpm/dependency-path": 2.1.4
-      "@pnpm/error": 5.0.2
-      "@pnpm/git-utils": 1.0.0
-      "@pnpm/lockfile-types": 5.1.2
-      "@pnpm/logger": 5.0.0
-      "@pnpm/merge-lockfile-changes": 5.0.4
-      "@pnpm/types": 9.3.0
-      "@pnpm/util.lex-comparator": 1.0.0
-      "@zkochan/rimraf": 2.1.3
+    engines: {node: '>=16.14'}
+    peerDependencies:
+      '@pnpm/logger': ^5.0.0
+    dependencies:
+      '@pnpm/constants': 7.1.1
+      '@pnpm/dependency-path': 2.1.4
+      '@pnpm/error': 5.0.2
+      '@pnpm/git-utils': 1.0.0
+      '@pnpm/lockfile-types': 5.1.2
+      '@pnpm/logger': 5.0.0
+      '@pnpm/merge-lockfile-changes': 5.0.4
+      '@pnpm/types': 9.3.0
+      '@pnpm/util.lex-comparator': 1.0.0
+      '@zkochan/rimraf': 2.1.3
       comver-to-semver: 1.0.0
       js-yaml: /@zkochan/js-yaml@0.0.6
       normalize-path: 3.0.0
@@ -7073,55 +7558,55 @@ packages:
 
   /@pnpm/lockfile-types@5.1.2:
     resolution: {integrity: sha512-yPghe5atvPxn9xrltX+BOLnJF4mFzYN2SsCUq8otn7F7NekNrxwkedTKRIMcaOg0cAzxka7+fPWaB3svRtPk5g==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/types": 9.3.0
+      '@pnpm/types': 9.3.0
     dev: false
 
   /@pnpm/lockfile-utils@8.0.6:
     resolution: {integrity: sha512-JauinxV3H+bmR6Mh6so4nn2r5RgTgH70w9GPZZrbandaJwBQsBEsR59MCJXmvEJzcJthbjLiZH1ndWuQmJinUw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/dependency-path": 2.1.4
-      "@pnpm/lockfile-types": 5.1.2
-      "@pnpm/pick-fetcher": 2.0.1
-      "@pnpm/resolver-base": 10.0.3
-      "@pnpm/types": 9.3.0
+      '@pnpm/dependency-path': 2.1.4
+      '@pnpm/lockfile-types': 5.1.2
+      '@pnpm/pick-fetcher': 2.0.1
+      '@pnpm/resolver-base': 10.0.3
+      '@pnpm/types': 9.3.0
       get-npm-tarball-url: 2.0.3
       ramda: /@pnpm/ramda@0.28.1
     dev: false
 
   /@pnpm/logger@5.0.0:
     resolution: {integrity: sha512-YfcB2QrX+Wx1o6LD1G2Y2fhDhOix/bAY/oAnMpHoNLsKkWIRbt1oKLkIFvxBMzLwAEPqnYWguJrYC+J6i4ywbw==}
-    engines: {node: ">=12.17"}
+    engines: {node: '>=12.17'}
     dependencies:
-      bole: 5.0.9
+      bole: 5.0.11
       ndjson: 2.0.0
     dev: false
 
   /@pnpm/manifest-utils@5.0.4(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-RW7wPx4k1BFZ8jA1Hk818K22V9AqFq4JlhCWlkGTPf37jsKNQL4ZrEOuM4s5lsHPFiOzT5f4VOnOxhp+PXLV6g==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/core-loggers": 9.0.3(@pnpm/logger@5.0.0)
-      "@pnpm/error": 5.0.2
-      "@pnpm/types": 9.3.0
+      '@pnpm/core-loggers': 9.0.3(@pnpm/logger@5.0.0)
+      '@pnpm/error': 5.0.2
+      '@pnpm/types': 9.3.0
     transitivePeerDependencies:
-      - "@pnpm/logger"
+      - '@pnpm/logger'
     dev: false
 
   /@pnpm/matcher@5.0.0:
     resolution: {integrity: sha512-uh+JBmW8XHGwz9x0K0Ok+TtMiu3ghEaqHHm7dqIubitBP8y9Y0LLP6D2fxWblogjpVzSlH3DpDR1Vicuhw9/cQ==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
       escape-string-regexp: 4.0.0
     dev: false
 
   /@pnpm/merge-lockfile-changes@5.0.4:
     resolution: {integrity: sha512-hM95tVX8sGF6zmVB1xVmSYINqnqrRvy1UZSTFWgGgf20wyfLsoHsSYsl4l0/vhkK00D0jMH4ZjlbzF/DEC72aQ==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/lockfile-types": 5.1.2
+      '@pnpm/lockfile-types': 5.1.2
       comver-to-semver: 1.0.0
       ramda: /@pnpm/ramda@0.28.1
       semver: 7.5.4
@@ -7129,9 +7614,9 @@ packages:
 
   /@pnpm/modules-yaml@12.1.3:
     resolution: {integrity: sha512-XXyUZdd578rml7nnoUv3You5Ns4ReUXDieP4VNglNLBIYs1RrbMIZGdqxnxii7cjLmIYauzlE1QMbFjTr/5pkA==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/types": 9.3.0
+      '@pnpm/types': 9.3.0
       is-windows: 1.0.2
       ramda: /@pnpm/ramda@0.28.1
       read-yaml-file: 2.1.0
@@ -7140,30 +7625,32 @@ packages:
 
   /@pnpm/network.ca-file@1.0.2:
     resolution: {integrity: sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==}
-    engines: {node: ">=12.22.0"}
+    engines: {node: '>=12.22.0'}
     dependencies:
       graceful-fs: 4.2.10
+    dev: false
 
   /@pnpm/normalize-registries@5.0.3:
     resolution: {integrity: sha512-llPtT/fQDT9Al3DAOmaFetfnwJKRQXrrsN9nRiRSqZzYSmiLTPM3upQ+uWHEZVv4DJI6ZEZfZT039HDKdkYanQ==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/types": 9.3.0
+      '@pnpm/types': 9.3.0
       normalize-registry-url: 2.0.0
       ramda: /@pnpm/ramda@0.28.1
     dev: false
 
   /@pnpm/npm-conf@2.2.2:
     resolution: {integrity: sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
-      "@pnpm/config.env-replace": 1.1.0
-      "@pnpm/network.ca-file": 1.0.2
+      '@pnpm/config.env-replace': 1.1.0
+      '@pnpm/network.ca-file': 1.0.2
       config-chain: 1.1.13
+    dev: false
 
   /@pnpm/npm-package-arg@1.0.0:
     resolution: {integrity: sha512-oQYP08exi6mOPdAZZWcNIGS+KKPsnNwUBzSuAEGWuCcqwMAt3k/WVCqVIXzBxhO5sP2b43og69VHmPj6IroKqw==}
-    engines: {node: ">=14.6"}
+    engines: {node: '>=14.6'}
     dependencies:
       hosted-git-info: 4.1.0
       semver: 7.5.4
@@ -7172,14 +7659,14 @@ packages:
 
   /@pnpm/package-is-installable@8.0.5(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-FNcjvgoYzLVQ73yG9mhuzXqxhjTdaP0QkiBFetCqY/JniGHtqYOzuzZq3KuRnfJoN7UWqQLzLWV1VRwqefmYiw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     peerDependencies:
-      "@pnpm/logger": ^5.0.0
+      '@pnpm/logger': ^5.0.0
     dependencies:
-      "@pnpm/core-loggers": 9.0.3(@pnpm/logger@5.0.0)
-      "@pnpm/error": 5.0.2
-      "@pnpm/logger": 5.0.0
-      "@pnpm/types": 9.3.0
+      '@pnpm/core-loggers': 9.0.3(@pnpm/logger@5.0.0)
+      '@pnpm/error': 5.0.2
+      '@pnpm/logger': 5.0.0
+      '@pnpm/types': 9.3.0
       detect-libc: 2.0.2
       execa: /safe-execa@0.1.2
       mem: 8.1.1
@@ -7188,22 +7675,22 @@ packages:
 
   /@pnpm/pick-fetcher@2.0.1:
     resolution: {integrity: sha512-rW9IqroTLSdrFgCRfxDOyL845e3ju0Lt8HmfljgJLIR8mIoCE6PUR7+JouoSUcauAx28mSMbYbbRYXKlxacdiA==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dev: false
 
   /@pnpm/pnpmfile@5.0.14(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-ZzgXwaJuWCOBylA58YpzppIhRzPgxPH9at8Pab1xsbKj0UZP15pHxilINuihnVoS/KP39ysprjqeJ5qApErQfw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     peerDependencies:
-      "@pnpm/logger": ^5.0.0
+      '@pnpm/logger': ^5.0.0
     dependencies:
-      "@pnpm/core-loggers": 9.0.3(@pnpm/logger@5.0.0)
-      "@pnpm/error": 5.0.2
-      "@pnpm/hooks.types": 1.0.3
-      "@pnpm/lockfile-types": 5.1.2
-      "@pnpm/logger": 5.0.0
-      "@pnpm/store-controller-types": 17.0.1
-      "@pnpm/types": 9.3.0
+      '@pnpm/core-loggers': 9.0.3(@pnpm/logger@5.0.0)
+      '@pnpm/error': 5.0.2
+      '@pnpm/hooks.types': 1.0.3
+      '@pnpm/lockfile-types': 5.1.2
+      '@pnpm/logger': 5.0.0
+      '@pnpm/store-controller-types': 17.0.1
+      '@pnpm/types': 9.3.0
       chalk: 4.1.2
       path-absolute: 1.0.1
     dev: false
@@ -7214,31 +7701,31 @@ packages:
 
   /@pnpm/read-modules-dir@6.0.1:
     resolution: {integrity: sha512-/h+3VB1j+hhUlEYkE+dAH5WbhR/qYDDvliqWQxN/AA0CYAFwMud5z4FOKzYHgY6RD+KVVgEelLquxCi7fKvT8A==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
       graceful-fs: 4.2.11
     dev: false
 
   /@pnpm/read-package-json@8.0.4:
     resolution: {integrity: sha512-qvFNjXV153PYXYvp5jNPboSC/XTNly4h3NVy0L2YbUUQr8TGYuMAOf30yW5xdsmzxjEim8S0qnZ2j57tKVrUag==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/error": 5.0.2
-      "@pnpm/types": 9.3.0
+      '@pnpm/error': 5.0.2
+      '@pnpm/types': 9.3.0
       load-json-file: 6.2.0
       normalize-package-data: 5.0.0
     dev: false
 
   /@pnpm/read-project-manifest@5.0.7:
     resolution: {integrity: sha512-zq9XlZCbWmpjeNaU6faV51ehD4Rk6nTMv+jWkOGPSAwIG8uBh1NBxOYKx4R9Ixu7x8zNUUdfxOo89c6Ds5cY1w==}
-    engines: {node: ">=16.14"}
-    dependencies:
-      "@gwhitney/detect-indent": 7.0.1
-      "@pnpm/error": 5.0.2
-      "@pnpm/graceful-fs": 3.2.0
-      "@pnpm/text.comments-parser": 2.0.0
-      "@pnpm/types": 9.3.0
-      "@pnpm/write-project-manifest": 5.0.3
+    engines: {node: '>=16.14'}
+    dependencies:
+      '@gwhitney/detect-indent': 7.0.1
+      '@pnpm/error': 5.0.2
+      '@pnpm/graceful-fs': 3.2.0
+      '@pnpm/text.comments-parser': 2.0.0
+      '@pnpm/types': 9.3.0
+      '@pnpm/write-project-manifest': 5.0.3
       fast-deep-equal: 3.1.3
       is-windows: 1.0.2
       json5: 2.2.3
@@ -7251,9 +7738,9 @@ packages:
 
   /@pnpm/render-peer-issues@4.0.3:
     resolution: {integrity: sha512-TsUTr3PxTSkITYWMQE/qyQF9wbumleGWb82yC6aG4Cv2mk6B+zeG72auflek9mljV8DI+7yS25uvrENabJ53Bw==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/types": 9.3.0
+      '@pnpm/types': 9.3.0
       archy: 1.0.0
       chalk: 4.1.2
       cli-columns: 4.0.0
@@ -7261,80 +7748,80 @@ packages:
 
   /@pnpm/resolver-base@10.0.3:
     resolution: {integrity: sha512-7cwt7DxIbvp5vlJgOYS3AN9QmOaKWfSSl9tH5lQ8QOU3bUTmYV5gPxJduY87Avwhs3Qll7V2oyyLeqegMFDbXA==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/types": 9.3.0
+      '@pnpm/types': 9.3.0
     dev: false
 
   /@pnpm/reviewing.dependencies-hierarchy@2.1.1(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-2FmnQgsywwWgqZkZPojqP4umTjLRZeBx19kiF7rDqp/XTLIGwHgU1RY/Hf08OWjxIECdZ7zkQrxBScCcJpnoeA==}
-    engines: {node: ">=16.14"}
-    dependencies:
-      "@pnpm/dependency-path": 2.1.4
-      "@pnpm/lockfile-file": 8.1.3(@pnpm/logger@5.0.0)
-      "@pnpm/lockfile-utils": 8.0.6
-      "@pnpm/matcher": 5.0.0
-      "@pnpm/modules-yaml": 12.1.3
-      "@pnpm/normalize-registries": 5.0.3
-      "@pnpm/npm-package-arg": 1.0.0
-      "@pnpm/read-modules-dir": 6.0.1
-      "@pnpm/read-package-json": 8.0.4
-      "@pnpm/types": 9.3.0
+    engines: {node: '>=16.14'}
+    dependencies:
+      '@pnpm/dependency-path': 2.1.4
+      '@pnpm/lockfile-file': 8.1.3(@pnpm/logger@5.0.0)
+      '@pnpm/lockfile-utils': 8.0.6
+      '@pnpm/matcher': 5.0.0
+      '@pnpm/modules-yaml': 12.1.3
+      '@pnpm/normalize-registries': 5.0.3
+      '@pnpm/npm-package-arg': 1.0.0
+      '@pnpm/read-modules-dir': 6.0.1
+      '@pnpm/read-package-json': 8.0.4
+      '@pnpm/types': 9.3.0
       normalize-path: 3.0.0
       realpath-missing: 1.1.0
       resolve-link-target: 2.0.0
       semver: 7.5.4
     transitivePeerDependencies:
-      - "@pnpm/logger"
+      - '@pnpm/logger'
     dev: false
 
   /@pnpm/store-controller-types@17.0.1:
     resolution: {integrity: sha512-1GSzM3mLt7nTTG+TH5h+NESNkjmooriwJSlPiE88mLk79Y4cvXRJxafSn86kMkKVVj0QBNZK8LECKrnSQ6MrDg==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/fetcher-base": 15.0.2
-      "@pnpm/resolver-base": 10.0.3
-      "@pnpm/types": 9.3.0
+      '@pnpm/fetcher-base': 15.0.2
+      '@pnpm/resolver-base': 10.0.3
+      '@pnpm/types': 9.3.0
     dev: false
 
   /@pnpm/text.comments-parser@2.0.0:
     resolution: {integrity: sha512-DRWtTmmxQQtuWHf1xPt9bqzCSq8d0MQF5x1kdpCDMLd7xk3nP4To2/OGkPrb8MKbrWsgCNDwXyKCFlEKrAg7fg==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
       strip-comments-strings: 1.2.0
     dev: false
 
   /@pnpm/types@9.3.0:
     resolution: {integrity: sha512-BUm6KWNyiQ575D+zi4OkGWImHv0gM6LQYUY/qK/7j9uxmZ66topXQlZSoFX8rR/FcpIRUTrT325iqFqMHoJnww==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dev: false
 
   /@pnpm/util.lex-comparator@1.0.0:
     resolution: {integrity: sha512-3aBQPHntVgk5AweBWZn+1I/fqZ9krK/w01197aYVkAJQGftb+BVWgEepxY5GChjSW12j52XX+CmfynYZ/p0DFQ==}
-    engines: {node: ">=12.22.0"}
+    engines: {node: '>=12.22.0'}
     dev: false
 
   /@pnpm/workspace.find-packages@1.0.13(@pnpm/logger@5.0.0):
     resolution: {integrity: sha512-xjzVIx9XP9QoMAvqJaXxxE5b72VXS9rJbEN2//iJL8+5cim7RjkQgBfLgk2+CVM8DkcjVQZVf3tdAM78wYph/g==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     peerDependencies:
-      "@pnpm/logger": ^5.0.0
+      '@pnpm/logger': ^5.0.0
     dependencies:
-      "@pnpm/cli-utils": 2.0.23(@pnpm/logger@5.0.0)
-      "@pnpm/constants": 7.1.1
-      "@pnpm/fs.find-packages": 2.0.7
-      "@pnpm/logger": 5.0.0
-      "@pnpm/types": 9.3.0
-      "@pnpm/util.lex-comparator": 1.0.0
+      '@pnpm/cli-utils': 2.0.23(@pnpm/logger@5.0.0)
+      '@pnpm/constants': 7.1.1
+      '@pnpm/fs.find-packages': 2.0.7
+      '@pnpm/logger': 5.0.0
+      '@pnpm/types': 9.3.0
+      '@pnpm/util.lex-comparator': 1.0.0
       read-yaml-file: 2.1.0
     dev: false
 
   /@pnpm/write-project-manifest@5.0.3:
     resolution: {integrity: sha512-B2tH3v0ecp8H3Wg52R3/0hHvsvAdYfmoXn/gMAEjmXhIR8yIAOe9R/YWSMUBDXs8WUH119wB6H3BEJyX8bpznQ==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
-      "@pnpm/text.comments-parser": 2.0.0
-      "@pnpm/types": 9.3.0
+      '@pnpm/text.comments-parser': 2.0.0
+      '@pnpm/types': 9.3.0
       json5: 2.2.3
       write-file-atomic: 5.0.1
       write-yaml-file: 5.0.0
@@ -7344,57 +7831,102 @@ packages:
     resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
     dev: false
 
-  /@radix-ui/number@1.0.1:
-    resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==}
-    dependencies:
-      "@babel/runtime": 7.23.1
-    dev: true
+  /@protobufjs/aspromise@1.1.2:
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+    dev: false
 
-  /@radix-ui/primitive@1.0.1:
-    resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
-    dependencies:
-      "@babel/runtime": 7.23.1
-    dev: true
+  /@protobufjs/base64@1.1.2:
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+    dev: false
 
-  /@radix-ui/react-arrow@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
+  /@protobufjs/codegen@2.0.4:
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+    dev: false
+
+  /@protobufjs/eventemitter@1.1.0:
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+    dev: false
+
+  /@protobufjs/fetch@1.1.0:
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/inquire': 1.1.0
+    dev: false
+
+  /@protobufjs/float@1.0.2:
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+    dev: false
+
+  /@protobufjs/inquire@1.1.0:
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+    dev: false
+
+  /@protobufjs/path@1.1.2:
+    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+    dev: false
+
+  /@protobufjs/pool@1.1.0:
+    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+    dev: false
+
+  /@protobufjs/utf8@1.1.0:
+    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+    dev: false
+
+  /@radix-ui/number@1.0.1:
+    resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==}
+    dependencies:
+      '@babel/runtime': 7.23.1
+    dev: true
+
+  /@radix-ui/primitive@1.0.1:
+    resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
+    dependencies:
+      '@babel/runtime': 7.23.1
+    dev: true
+
+  /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-collection@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-compose-refs": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-context": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-slot": 1.0.2(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
@@ -7402,65 +7934,66 @@ packages:
   /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-context@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-direction@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
-  /@radix-ui/react-dismissable-layer@1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/primitive": 1.0.1
-      "@radix-ui/react-compose-refs": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-use-callback-ref": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-escape-keydown": 1.0.3(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
@@ -7468,35 +8001,36 @@ packages:
   /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
-  /@radix-ui/react-focus-scope@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-compose-refs": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-use-callback-ref": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
@@ -7504,171 +8038,177 @@ packages:
   /@radix-ui/react-id@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-use-layout-effect": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
-  /@radix-ui/react-popper@1.1.2(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-popper@1.1.2(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@floating-ui/react-dom": 2.0.2(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-arrow": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-compose-refs": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-context": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-use-callback-ref": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-layout-effect": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-rect": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-size": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/rect": 1.0.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/rect': 1.0.1
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-portal@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-primitive@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-slot": 1.0.2(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-roving-focus@1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/primitive": 1.0.1
-      "@radix-ui/react-collection": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-compose-refs": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-context": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-direction": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-id": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-use-callback-ref": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-controllable-state": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-id': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-select@1.2.2(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-select@1.2.2(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/number": 1.0.1
-      "@radix-ui/primitive": 1.0.1
-      "@radix-ui/react-collection": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-compose-refs": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-context": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-direction": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-dismissable-layer": 1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-focus-guards": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-focus-scope": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-id": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-popper": 1.1.2(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-portal": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-slot": 1.0.2(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-callback-ref": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-controllable-state": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-layout-effect": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-use-previous": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-visually-hidden": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/number': 1.0.1
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-id': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       aria-hidden: 1.2.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-remove-scroll: 2.5.5(@types/react@18.2.25)(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-separator@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-separator@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
@@ -7676,88 +8216,91 @@ packages:
   /@radix-ui/react-slot@1.0.2(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-compose-refs": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
-  /@radix-ui/react-toggle-group@1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-toggle-group@1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/primitive": 1.0.1
-      "@radix-ui/react-context": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-direction": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-roving-focus": 1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-toggle": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-use-controllable-state": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-context': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toggle': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-toggle@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-toggle@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/primitive": 1.0.1
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-use-controllable-state": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@radix-ui/react-toolbar@1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-toolbar@1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-tBgmM/O7a07xbaEkYJWYTXkIdU/1pW4/KZORR43toC/4XWyBCURK0ei9kMUdp+gTPPKBgYLxXmRSH1EVcIDp8Q==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/primitive": 1.0.1
-      "@radix-ui/react-context": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-direction": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-roving-focus": 1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-separator": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-toggle-group": 1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-context': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-separator': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toggle-group': 1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
@@ -7765,121 +8308,122 @@ packages:
   /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-use-callback-ref": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-use-callback-ref": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-use-previous@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-use-rect@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/rect": 1.0.1
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/rect': 1.0.1
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
   /@radix-ui/react-use-size@1.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==}
     peerDependencies:
-      "@types/react": "*"
+      '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-use-layout-effect": 1.0.1(@types/react@18.2.25)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.25)(react@18.2.0)
+      '@types/react': 18.2.25
       react: 18.2.0
     dev: true
 
-  /@radix-ui/react-visually-hidden@1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==}
     peerDependencies:
-      "@types/react": "*"
-      "@types/react-dom": "*"
+      '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0
       react-dom: ^16.8 || ^17.0 || ^18.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
-      "@types/react-dom":
+      '@types/react-dom':
         optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@radix-ui/react-primitive": 1.0.3(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@types/react": 18.2.25
+      '@babel/runtime': 7.23.1
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@types/react': 18.2.25
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
@@ -7887,20 +8431,20 @@ packages:
   /@radix-ui/rect@1.0.1:
     resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
     dependencies:
-      "@babel/runtime": 7.23.1
+      '@babel/runtime': 7.23.1
     dev: true
 
   /@redis/bloom@1.2.0(@redis/client@1.5.11):
     resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
     peerDependencies:
-      "@redis/client": ^1.0.0
+      '@redis/client': ^1.0.0
     dependencies:
-      "@redis/client": 1.5.11
+      '@redis/client': 1.5.11
     dev: true
 
   /@redis/client@1.5.11:
     resolution: {integrity: sha512-cV7yHcOAtNQ5x/yQl7Yw1xf53kO0FNDTdDU6bFIMbW6ljB7U7ns0YRM+QIkpoqTAt6zK5k9Fq0QWlUbLcq9AvA==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     dependencies:
       cluster-key-slot: 1.1.2
       generic-pool: 3.9.0
@@ -7910,63 +8454,191 @@ packages:
   /@redis/graph@1.1.0(@redis/client@1.5.11):
     resolution: {integrity: sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==}
     peerDependencies:
-      "@redis/client": ^1.0.0
+      '@redis/client': ^1.0.0
     dependencies:
-      "@redis/client": 1.5.11
+      '@redis/client': 1.5.11
     dev: true
 
   /@redis/json@1.0.6(@redis/client@1.5.11):
     resolution: {integrity: sha512-rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==}
     peerDependencies:
-      "@redis/client": ^1.0.0
+      '@redis/client': ^1.0.0
     dependencies:
-      "@redis/client": 1.5.11
+      '@redis/client': 1.5.11
     dev: true
 
   /@redis/search@1.1.5(@redis/client@1.5.11):
     resolution: {integrity: sha512-hPP8w7GfGsbtYEJdn4n7nXa6xt6hVZnnDktKW4ArMaFQ/m/aR7eFvsLQmG/mn1Upq99btPJk+F27IQ2dYpCoUg==}
     peerDependencies:
-      "@redis/client": ^1.0.0
+      '@redis/client': ^1.0.0
     dependencies:
-      "@redis/client": 1.5.11
+      '@redis/client': 1.5.11
     dev: true
 
   /@redis/time-series@1.0.5(@redis/client@1.5.11):
     resolution: {integrity: sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==}
     peerDependencies:
-      "@redis/client": ^1.0.0
+      '@redis/client': ^1.0.0
     dependencies:
-      "@redis/client": 1.5.11
+      '@redis/client': 1.5.11
     dev: true
 
   /@rollup/pluginutils@5.0.5:
     resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
     peerDependenciesMeta:
       rollup:
         optional: true
     dependencies:
-      "@types/estree": 1.0.2
+      '@types/estree': 1.0.2
       estree-walker: 2.0.2
       picomatch: 2.3.1
     dev: true
 
+  /@rollup/rollup-android-arm-eabi@4.18.0:
+    resolution: {integrity: sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-android-arm64@4.18.0:
+    resolution: {integrity: sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-arm64@4.18.0:
+    resolution: {integrity: sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-x64@4.18.0:
+    resolution: {integrity: sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-gnueabihf@4.18.0:
+    resolution: {integrity: sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-musleabihf@4.18.0:
+    resolution: {integrity: sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-gnu@4.18.0:
+    resolution: {integrity: sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-musl@4.18.0:
+    resolution: {integrity: sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-powerpc64le-gnu@4.18.0:
+    resolution: {integrity: sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-riscv64-gnu@4.18.0:
+    resolution: {integrity: sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-s390x-gnu@4.18.0:
+    resolution: {integrity: sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-gnu@4.18.0:
+    resolution: {integrity: sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-musl@4.18.0:
+    resolution: {integrity: sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-arm64-msvc@4.18.0:
+    resolution: {integrity: sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-ia32-msvc@4.18.0:
+    resolution: {integrity: sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-x64-msvc@4.18.0:
+    resolution: {integrity: sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@segment/analytics-core@1.3.1:
     resolution: {integrity: sha512-KGblJ8WQNC4t0j31zeyYBm2thHWuPULNAoP7waU5ts7Asz9ipvGoHqFSLG6warqvcnBdkiRbNam242zmxX53oA==}
     dependencies:
-      "@lukeed/uuid": 2.0.1
+      '@lukeed/uuid': 2.0.1
       dset: 3.1.2
       tslib: 2.6.2
     dev: false
 
   /@segment/analytics-node@1.1.1:
     resolution: {integrity: sha512-YNn32SfD8KrxIBowLz3MVav0GzhGIbBRgAtjW4Kv57oHwgaJNSLEp/z/ypnu7vAqUjm9jAwAW9Wfc24ssZI49g==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     dependencies:
-      "@lukeed/uuid": 2.0.1
-      "@segment/analytics-core": 1.3.1
+      '@lukeed/uuid': 2.0.1
+      '@segment/analytics-core': 1.3.1
       buffer: 6.0.3
       node-fetch: 2.7.0
       tslib: 2.6.2
@@ -7974,119 +8646,163 @@ packages:
       - encoding
     dev: false
 
-  /@sentry/core@6.19.7:
-    resolution: {integrity: sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==}
-    engines: {node: ">=6"}
+  /@sentry-internal/tracing@7.64.0:
+    resolution: {integrity: sha512-1XE8W6ki7hHyBvX9hfirnGkKDBKNq3bDJyXS86E0bYVDl94nvbRM9BD9DHsCFetqYkVm1yDGEK+6aUVs4CztoQ==}
+    engines: {node: '>=8'}
     dependencies:
-      "@sentry/hub": 6.19.7
-      "@sentry/minimal": 6.19.7
-      "@sentry/types": 6.19.7
-      "@sentry/utils": 6.19.7
-      tslib: 1.14.1
+      '@sentry/core': 7.64.0
+      '@sentry/types': 7.64.0
+      '@sentry/utils': 7.64.0
+      tslib: 2.6.2
     dev: true
 
-  /@sentry/hub@6.19.7:
-    resolution: {integrity: sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==}
-    engines: {node: ">=6"}
+  /@sentry-internal/tracing@7.91.0:
+    resolution: {integrity: sha512-JH5y6gs6BS0its7WF2DhySu7nkhPDfZcdpAXldxzIlJpqFkuwQKLU5nkYJpiIyZz1NHYYtW5aum2bV2oCOdDRA==}
+    engines: {node: '>=8'}
     dependencies:
-      "@sentry/types": 6.19.7
-      "@sentry/utils": 6.19.7
-      tslib: 1.14.1
+      '@sentry/core': 7.91.0
+      '@sentry/types': 7.91.0
+      '@sentry/utils': 7.91.0
     dev: true
 
-  /@sentry/minimal@6.19.7:
-    resolution: {integrity: sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==}
-    engines: {node: ">=6"}
+  /@sentry-internal/tracing@7.94.1:
+    resolution: {integrity: sha512-znxCdrz7tPXm9Bwoe46PW72Zr0Iv7bXT6+b2LNg5fxWiCQVBbQFrMuVvtXEmHxeRRJVEgTh/4TdulB7wrtQIUQ==}
+    engines: {node: '>=8'}
     dependencies:
-      "@sentry/hub": 6.19.7
-      "@sentry/types": 6.19.7
-      tslib: 1.14.1
+      '@sentry/core': 7.94.1
+      '@sentry/types': 7.94.1
+      '@sentry/utils': 7.94.1
     dev: true
 
-  /@sentry/node@6.19.7:
-    resolution: {integrity: sha512-gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg==}
-    engines: {node: ">=6"}
+  /@sentry/core@7.64.0:
+    resolution: {integrity: sha512-IzmEyl5sNG7NyEFiyFHEHC+sizsZp9MEw1+RJRLX6U5RITvcsEgcajSkHQFafaBPzRrcxZMdm47Cwhl212LXcw==}
+    engines: {node: '>=8'}
     dependencies:
-      "@sentry/core": 6.19.7
-      "@sentry/hub": 6.19.7
-      "@sentry/types": 6.19.7
-      "@sentry/utils": 6.19.7
+      '@sentry/types': 7.64.0
+      '@sentry/utils': 7.64.0
+      tslib: 2.6.2
+    dev: true
+
+  /@sentry/core@7.91.0:
+    resolution: {integrity: sha512-tu+gYq4JrTdrR+YSh5IVHF0fJi/Pi9y0HZ5H9HnYy+UMcXIotxf6hIEaC6ZKGeLWkGXffz2gKpQLe/g6vy/lPA==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry/types': 7.91.0
+      '@sentry/utils': 7.91.0
+    dev: true
+
+  /@sentry/core@7.94.1:
+    resolution: {integrity: sha512-4sjiMnkbGpv9O98YHVZe7fHNwwdYl+zLoCOoEOadtrJ1EYYvnK/MSixN2HJF7g/0s22xd4xY958QyNIRVR+Iiw==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry/types': 7.94.1
+      '@sentry/utils': 7.94.1
+    dev: true
+
+  /@sentry/node@7.64.0:
+    resolution: {integrity: sha512-wRi0uTnp1WSa83X2yLD49tV9QPzGh5e42IKdIDBiQ7lV9JhLILlyb34BZY1pq6p4dp35yDasDrP3C7ubn7wo6A==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry-internal/tracing': 7.64.0
+      '@sentry/core': 7.64.0
+      '@sentry/types': 7.64.0
+      '@sentry/utils': 7.64.0
       cookie: 0.4.2
       https-proxy-agent: 5.0.1
       lru_map: 0.3.3
-      tslib: 1.14.1
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@sentry/node@7.91.0:
+    resolution: {integrity: sha512-hTIfSQxD7L+AKIqyjoq8CWBRkEQrrMZmA3GSZgPI5JFWBHgO0HBo5TH/8TU81oEJh6kqqHAl2ObMhmcnaFqlzg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry-internal/tracing': 7.91.0
+      '@sentry/core': 7.91.0
+      '@sentry/types': 7.91.0
+      '@sentry/utils': 7.91.0
+      https-proxy-agent: 5.0.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@sentry/types@6.19.7:
-    resolution: {integrity: sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==}
-    engines: {node: ">=6"}
+  /@sentry/node@7.94.1:
+    resolution: {integrity: sha512-30nyrfVbY1vNoWg5ptGW+soykU532VvKLuXiKty3SKEXjp5bv23JrCcVtuwp9KrW4josHOJbxZUqeNni85YplQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry-internal/tracing': 7.94.1
+      '@sentry/core': 7.94.1
+      '@sentry/types': 7.94.1
+      '@sentry/utils': 7.94.1
+    dev: true
+
+  /@sentry/types@7.64.0:
+    resolution: {integrity: sha512-LqjQprWXjUFRmzIlUjyA+KL+38elgIYmAeoDrdyNVh8MK5IC1W2Lh1Q87b4yOiZeMiIhIVNBd7Ecoh2rodGrGA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /@sentry/types@7.91.0:
+    resolution: {integrity: sha512-bcQnb7J3P3equbCUc+sPuHog2Y47yGD2sCkzmnZBjvBT0Z1B4f36fI/5WjyZhTjLSiOdg3F2otwvikbMjmBDew==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /@sentry/types@7.94.1:
+    resolution: {integrity: sha512-A7CdEXFSgGyWv2BT2p9cAvJfb+dypvOtsY8ZvZvdPLUa7kqCV7ndhURUqKjvMBzsL2GParHn3ehDTl2eVc7pvA==}
+    engines: {node: '>=8'}
     dev: true
 
-  /@sentry/utils@6.19.7:
-    resolution: {integrity: sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==}
-    engines: {node: ">=6"}
+  /@sentry/utils@7.64.0:
+    resolution: {integrity: sha512-HRlM1INzK66Gt+F4vCItiwGKAng4gqzCR4C5marsL3qv6SrKH98dQnCGYgXluSWaaa56h97FRQu7TxCk6jkSvQ==}
+    engines: {node: '>=8'}
     dependencies:
-      "@sentry/types": 6.19.7
-      tslib: 1.14.1
+      '@sentry/types': 7.64.0
+      tslib: 2.6.2
     dev: true
 
-  /@sigstore/bundle@1.1.0:
-    resolution: {integrity: sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  /@sentry/utils@7.91.0:
+    resolution: {integrity: sha512-fvxjrEbk6T6Otu++Ax9ntlQ0sGRiwSC179w68aC3u26Wr30FAIRKqHTCCdc2jyWk7Gd9uWRT/cq+g8NG/8BfSg==}
+    engines: {node: '>=8'}
     dependencies:
-      "@sigstore/protobuf-specs": 0.2.1
+      '@sentry/types': 7.91.0
+    dev: true
+
+  /@sentry/utils@7.94.1:
+    resolution: {integrity: sha512-gQ2EaMpUU1gGH3S+iqpog9gkXbCo8tlhGYA9a5FUtEtER3D3OAlp8dGFwClwzWDAwzjdLT1+X55zmEptU1cP/A==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry/types': 7.94.1
     dev: true
 
   /@sigstore/bundle@2.1.0:
     resolution: {integrity: sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@sigstore/protobuf-specs": 0.2.1
+      '@sigstore/protobuf-specs': 0.2.1
     dev: false
 
   /@sigstore/protobuf-specs@0.2.1:
     resolution: {integrity: sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
-  /@sigstore/sign@1.0.0:
-    resolution: {integrity: sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      "@sigstore/bundle": 1.1.0
-      "@sigstore/protobuf-specs": 0.2.1
-      make-fetch-happen: 11.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /@sigstore/sign@2.1.0:
     resolution: {integrity: sha512-4VRpfJxs+8eLqzLVrZngVNExVA/zAhVbi4UT4zmtLi4xRd7vz5qie834OgkrGsLlLB1B2nz/3wUxT1XAUBe8gw==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@sigstore/bundle": 2.1.0
-      "@sigstore/protobuf-specs": 0.2.1
+      '@sigstore/bundle': 2.1.0
+      '@sigstore/protobuf-specs': 0.2.1
       make-fetch-happen: 13.0.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@sigstore/tuf@1.0.3:
-    resolution: {integrity: sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      "@sigstore/protobuf-specs": 0.2.1
-      tuf-js: 1.1.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@sigstore/tuf@2.2.0:
     resolution: {integrity: sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@sigstore/protobuf-specs": 0.2.1
+      '@sigstore/protobuf-specs': 0.2.1
       tuf-js: 2.1.0
     transitivePeerDependencies:
       - supports-color
@@ -8100,11 +8816,6 @@ packages:
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
     dev: true
 
-  /@sindresorhus/is@5.6.0:
-    resolution: {integrity: sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==}
-    engines: {node: ">=14.16"}
-    dev: true
-
   /@sinonjs/commons@1.8.6:
     resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
     dependencies:
@@ -8126,25 +8837,19 @@ packages:
   /@sinonjs/fake-timers@10.3.0:
     resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
     dependencies:
-      "@sinonjs/commons": 3.0.0
-    dev: true
-
-  /@sinonjs/fake-timers@8.1.0:
-    resolution: {integrity: sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==}
-    dependencies:
-      "@sinonjs/commons": 1.8.6
+      '@sinonjs/commons': 3.0.0
     dev: true
 
   /@sinonjs/fake-timers@9.1.2:
     resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
     dependencies:
-      "@sinonjs/commons": 1.8.6
+      '@sinonjs/commons': 1.8.6
     dev: true
 
   /@sinonjs/samsam@7.0.1:
     resolution: {integrity: sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==}
     dependencies:
-      "@sinonjs/commons": 2.0.0
+      '@sinonjs/commons': 2.0.0
       lodash.get: 4.4.2
       type-detect: 4.0.8
     dev: true
@@ -8153,716 +8858,951 @@ packages:
     resolution: {integrity: sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==}
     dev: true
 
-  /@smithy/abort-controller@2.0.11:
-    resolution: {integrity: sha512-MSzE1qR2JNyb7ot3blIOT3O3H0Jn06iNDEgHRaqZUwBgx5EG+VIx24Y21tlKofzYryIOcWpIohLrIIyocD6LMA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/abort-controller@2.0.12:
+    resolution: {integrity: sha512-YIJyefe1mi3GxKdZxEBEuzYOeQ9xpYfqnFmWzojCssRAuR7ycxwpoRQgp965vuW426xUAQhCV5rCaWElQ7XsaA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/abort-controller@2.0.12:
-    resolution: {integrity: sha512-YIJyefe1mi3GxKdZxEBEuzYOeQ9xpYfqnFmWzojCssRAuR7ycxwpoRQgp965vuW426xUAQhCV5rCaWElQ7XsaA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/abort-controller@2.1.1:
+    resolution: {integrity: sha512-1+qdrUqLhaALYL0iOcN43EP6yAXXQ2wWZ6taf4S2pNGowmOc5gx+iMQv+E42JizNJjB0+gEadOXeV1Bf7JWL1Q==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.9.1
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/abort-controller@3.0.0:
+    resolution: {integrity: sha512-p6GlFGBt9K4MYLu72YuJ523NVR4A8oHlC5M2JO6OmQqN8kAc/uh1JqLE+FizTokrSJGg0CSvC+BrsmGzKtsZKA==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/types': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/chunked-blob-reader-native@3.0.0:
+    resolution: {integrity: sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/util-base64': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/chunked-blob-reader-native@2.0.0:
-    resolution: {integrity: sha512-HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ==}
+  /@smithy/chunked-blob-reader@3.0.0:
+    resolution: {integrity: sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==}
     dependencies:
-      "@smithy/util-base64": 2.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/chunked-blob-reader@2.0.0:
-    resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==}
+  /@smithy/config-resolver@2.1.1:
+    resolution: {integrity: sha512-lxfLDpZm+AWAHPFZps5JfDoO9Ux1764fOgvRUBpHIO8HWHcSN1dkgsago1qLRVgm1BZ8RCm8cgv99QvtaOWIhw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-config-provider': 2.2.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/config-resolver@2.0.14:
-    resolution: {integrity: sha512-K1K+FuWQoy8j/G7lAmK85o03O89s2Vvh6kMFmzEmiHUoQCRH1rzbDtMnGNiaMHeSeYJ6y79IyTusdRG+LuWwtg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/config-resolver@3.0.0:
+    resolution: {integrity: sha512-2GzOfADwYLQugYkKQhIyZyQlM05K+tMKvRnc6eFfZcpJGRfKoMUMYdPlBKmqHwQFXQKBrGV6cxL9oymWgDzvFw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.1
-      "@smithy/types": 2.3.5
-      "@smithy/util-config-provider": 2.0.0
-      "@smithy/util-middleware": 2.0.4
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/config-resolver@2.0.16:
-    resolution: {integrity: sha512-1k+FWHQDt2pfpXhJsOmNMmlAZ3NUQ98X5tYsjQhVGq+0X6cOBMhfh6Igd0IX3Ut6lEO6DQAdPMI/blNr3JZfMQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/core@1.3.1:
+    resolution: {integrity: sha512-tf+NIu9FkOh312b6M9G4D68is4Xr7qptzaZGZUREELF8ysE1yLKphqt7nsomjKZVwW7WE5pDDex9idowNGRQ/Q==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/types": 2.4.0
-      "@smithy/util-config-provider": 2.0.0
-      "@smithy/util-middleware": 2.0.5
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-retry': 2.1.1
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-middleware': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/credential-provider-imds@2.0.16:
-    resolution: {integrity: sha512-tKa2xF+69TvGxJT+lnJpGrKxUuAZDLYXFhqnPEgnHz+psTpkpcB4QRjHj63+uj83KaeFJdTfW201eLZeRn6FfA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/core@2.0.1:
+    resolution: {integrity: sha512-rcMkjvwxH/bER+oZUPR0yTA0ELD6m3A+d92+CFkdF6HJFCBB1bXo7P5pm21L66XwTN01B6bUhSCQ7cymWRD8zg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/property-provider": 2.0.12
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-retry': 3.0.1
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/util-middleware': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/credential-provider-imds@2.0.18:
-    resolution: {integrity: sha512-QnPBi6D2zj6AHJdUTo5zXmk8vwHJ2bNevhcVned1y+TZz/OI5cizz5DsYNkqFUIDn8tBuEyKNgbmKVNhBbuY3g==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/credential-provider-imds@2.2.1:
+    resolution: {integrity: sha512-7XHjZUxmZYnONheVQL7j5zvZXga+EWNgwEAP6OPZTi7l8J4JTeNh9aIOfE5fKHZ/ee2IeNOh54ZrSna+Vc6TFA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/property-provider": 2.0.13
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-codec@2.0.11:
-    resolution: {integrity: sha512-BQCTjxhCYRZIfXapa2LmZSaH8QUBGwMZw7XRN83hrdixbLjIcj+o549zjkedFS07Ve2TlvWUI6BTzP+nv7snBA==}
+  /@smithy/credential-provider-imds@3.0.0:
+    resolution: {integrity: sha512-lfmBiFQcA3FsDAPxNfY0L7CawcWtbyWsBOHo34nF095728JLkBX4Y9q/VPPE2r7fqMVK+drmDigqE2/SSQeVRA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@aws-crypto/crc32": 3.0.0
-      "@smithy/types": 2.4.0
-      "@smithy/util-hex-encoding": 2.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-codec@2.0.12:
-    resolution: {integrity: sha512-ZZQLzHBJkbiAAdj2C5K+lBlYp/XJ+eH2uy+jgJgYIFW/o5AM59Hlj7zyI44/ZTDIQWmBxb3EFv/c5t44V8/g8A==}
+  /@smithy/eventstream-codec@2.1.1:
+    resolution: {integrity: sha512-E8KYBxBIuU4c+zrpR22VsVrOPoEDzk35bQR3E+xm4k6Pa6JqzkDOdMyf9Atac5GPNKHJBdVaQ4JtjdWX2rl/nw==}
     dependencies:
-      "@aws-crypto/crc32": 3.0.0
-      "@smithy/types": 2.4.0
-      "@smithy/util-hex-encoding": 2.0.0
+      '@aws-crypto/crc32': 3.0.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-hex-encoding': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-browser@2.0.12:
-    resolution: {integrity: sha512-0pi8QlU/pwutNshoeJcbKR1p7Ie5STd8UFAMX5xhSoSJjNlxIv/OsHbF023jscMRN2Prrqd6ToGgdCnsZVQjvg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/eventstream-codec@3.0.0:
+    resolution: {integrity: sha512-PUtyEA0Oik50SaEFCZ0WPVtF9tz/teze2fDptW6WRXl+RrEenH8UbEjudOz8iakiMl3lE3lCVqYf2Y+znL8QFQ==}
     dependencies:
-      "@smithy/eventstream-serde-universal": 2.0.12
-      "@smithy/types": 2.4.0
+      '@aws-crypto/crc32': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-hex-encoding': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-config-resolver@2.0.12:
-    resolution: {integrity: sha512-I0XfwQkIX3gAnbrU5rLMkBSjTM9DHttdbLwf12CXmj7SSI5dT87PxtKLRrZGanaCMbdf2yCep+MW5/4M7IbvQA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/eventstream-serde-browser@3.0.0:
+    resolution: {integrity: sha512-NB7AFiPN4NxP/YCAnrvYR18z2/ZsiHiF7VtG30gshO9GbFrIb1rC8ep4NGpJSWrz6P64uhPXeo4M0UsCLnZKqw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/eventstream-serde-universal': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-node@2.0.12:
-    resolution: {integrity: sha512-vf1vMHGOkG3uqN9x1zKOhnvW/XgvhJXWqjV6zZiT2FMjlEayugQ1mzpSqr7uf89+BzjTzuZKERmOsEAmewLbxw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/eventstream-serde-config-resolver@3.0.0:
+    resolution: {integrity: sha512-RUQG3vQ3LX7peqqHAbmayhgrF5aTilPnazinaSGF1P0+tgM3vvIRWPHmlLIz2qFqB9LqFIxditxc8O2Z6psrRw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/eventstream-serde-universal": 2.0.12
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/eventstream-serde-universal@2.0.12:
-    resolution: {integrity: sha512-xZ3ZNpCxIND+q+UCy7y1n1/5VQEYicgSTNCcPqsKawX+Vd+6OcFX7gUHMyPzL8cZr+GdmJuxNleqHlH4giK2tw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/eventstream-serde-node@3.0.0:
+    resolution: {integrity: sha512-baRPdMBDMBExZXIUAoPGm/hntixjt/VFpU6+VmCyiYJYzRHRxoaI1MN+5XE+hIS8AJ2GCHLMFEIOLzq9xx1EgQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/eventstream-codec": 2.0.12
-      "@smithy/types": 2.4.0
+      '@smithy/eventstream-serde-universal': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/fetch-http-handler@2.2.2:
-    resolution: {integrity: sha512-K7aRtRuaBjzlk+jWWeyfDTLAmRRvmA4fU8eHUXtjsuEDgi3f356ZE32VD2ssxIH13RCLVZbXMt5h7wHzYiSuVA==}
+  /@smithy/eventstream-serde-universal@3.0.0:
+    resolution: {integrity: sha512-HNFfShmotWGeAoW4ujP8meV9BZavcpmerDbPIjkJbxKbN8RsUcpRQ/2OyIxWNxXNH2GWCAxuSB7ynmIGJlQ3Dw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/protocol-http": 3.0.7
-      "@smithy/querystring-builder": 2.0.11
-      "@smithy/types": 2.3.5
-      "@smithy/util-base64": 2.0.0
+      '@smithy/eventstream-codec': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@smithy/fetch-http-handler@2.2.4:
     resolution: {integrity: sha512-gIPRFEGi+c6V52eauGKrjDzPWF2Cu7Z1r5F8A3j2wcwz25sPG/t8kjsbEhli/tS/2zJp/ybCZXe4j4ro3yv/HA==}
     dependencies:
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/querystring-builder": 2.0.12
-      "@smithy/types": 2.4.0
-      "@smithy/util-base64": 2.0.0
+      '@smithy/protocol-http': 3.0.8
+      '@smithy/querystring-builder': 2.0.12
+      '@smithy/types': 2.4.0
+      '@smithy/util-base64': 2.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/fetch-http-handler@2.4.1:
+    resolution: {integrity: sha512-VYGLinPsFqH68lxfRhjQaSkjXM7JysUOJDTNjHBuN/ykyRb2f1gyavN9+VhhPTWCy32L4yZ2fdhpCs/nStEicg==}
+    dependencies:
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/querystring-builder': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-base64': 2.1.1
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/fetch-http-handler@3.0.1:
+    resolution: {integrity: sha512-uaH74i5BDj+rBwoQaXioKpI0SHBJFtOVwzrCpxZxphOW0ki5jhj7dXvDMYM2IJem8TpdFvS2iC08sjOblfFGFg==}
+    dependencies:
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/querystring-builder': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-base64': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/hash-blob-browser@2.0.12:
-    resolution: {integrity: sha512-riLnV16f27yyePX8UF0deRHAeccUK8SrOxyTykSTrnVkgS3DsjNapZtTbd8OGNKEbI60Ncdb5GwN3rHZudXvog==}
+  /@smithy/hash-blob-browser@3.0.0:
+    resolution: {integrity: sha512-/Wbpdg+bwJvW7lxR/zpWAc1/x/YkcqguuF2bAzkJrvXriZu1vm8r+PUdE4syiVwQg7PPR2dXpi3CLBb9qRDaVQ==}
     dependencies:
-      "@smithy/chunked-blob-reader": 2.0.0
-      "@smithy/chunked-blob-reader-native": 2.0.0
-      "@smithy/types": 2.4.0
+      '@smithy/chunked-blob-reader': 3.0.0
+      '@smithy/chunked-blob-reader-native': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/hash-node@2.0.11:
-    resolution: {integrity: sha512-PbleVugN2tbhl1ZoNWVrZ1oTFFas/Hq+s6zGO8B9bv4w/StTriTKA9W+xZJACOj9X7zwfoTLbscM+avCB1KqOQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/hash-node@2.1.1:
+    resolution: {integrity: sha512-Qhoq0N8f2OtCnvUpCf+g1vSyhYQrZjhSwvJ9qvR8BUGOtTXiyv2x1OD2e6jVGmlpC4E4ax1USHoyGfV9JFsACg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.3.5
-      "@smithy/util-buffer-from": 2.0.0
-      "@smithy/util-utf8": 2.0.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-buffer-from': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/hash-node@2.0.12:
-    resolution: {integrity: sha512-fDZnTr5j9t5qcbeJ037aMZXxMka13Znqwrgy3PAqYj6Dm3XHXHftTH3q+NWgayUxl1992GFtQt1RuEzRMy3NnQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/hash-node@3.0.0:
+    resolution: {integrity: sha512-84qXstNemP3XS5jcof0el6+bDfjzuvhJPQTEfro3lgtbCtKgzPm3MgiS6ehXVPjeQ5+JS0HqmTz8f/RYfzHVxw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
-      "@smithy/util-buffer-from": 2.0.0
-      "@smithy/util-utf8": 2.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/hash-stream-node@2.0.12:
-    resolution: {integrity: sha512-x/DrSynPKrW0k00q7aZ/vy531a3mRw79mOajHp+cIF0TrA1SqEMFoy/B8X0XtoAtlJWt/vvgeDNqt/KAeaAqMw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/hash-stream-node@3.0.0:
+    resolution: {integrity: sha512-J0i7de+EgXDEGITD4fxzmMX8CyCNETTIRXlxjMiNUvvu76Xn3GJ31wQR85ynlPk2wI1lqoknAFJaD1fiNDlbIA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
-      "@smithy/util-utf8": 2.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/invalid-dependency@2.0.11:
-    resolution: {integrity: sha512-zazq99ujxYv/NOf9zh7xXbNgzoVLsqE0wle8P/1zU/XdhPi/0zohTPKWUzIxjGdqb5hkkwfBkNkl5H+LE0mvgw==}
+  /@smithy/invalid-dependency@2.1.1:
+    resolution: {integrity: sha512-7WTgnKw+VPg8fxu2v9AlNOQ5yaz6RA54zOVB4f6vQuR0xFKd+RzlCpt0WidYTsye7F+FYDIaS/RnJW4pxjNInw==}
     dependencies:
-      "@smithy/types": 2.3.5
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/invalid-dependency@2.0.12:
-    resolution: {integrity: sha512-p5Y+iMHV3SoEpy3VSR7mifbreHQwVSvHSAz/m4GdoXfOzKzaYC8hYv10Ks7Deblkf7lhas8U+lAp9ThbBM+ZXA==}
+  /@smithy/invalid-dependency@3.0.0:
+    resolution: {integrity: sha512-F6wBBaEFgJzj0s4KUlliIGPmqXemwP6EavgvDqYwCH40O5Xr2iMHvS8todmGVZtuJCorBkXsYLyTu4PuizVq5g==}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@smithy/is-array-buffer@2.0.0:
     resolution: {integrity: sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/md5-js@2.0.12:
-    resolution: {integrity: sha512-OgDt+Xnrw+W5z3MSl5KZZzebqmXrYl9UdbCiBYnnjErmNywwSjV6QB/Oic3/7hnsPniSU81n7Rvlhz2kH4EREQ==}
+  /@smithy/is-array-buffer@2.1.1:
+    resolution: {integrity: sha512-xozSQrcUinPpNPNPds4S7z/FakDTh1MZWtRP/2vQtYB/u3HYrX2UXuZs+VhaKBd6Vc7g2XPr2ZtwGBNDN6fNKQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
-      "@smithy/util-utf8": 2.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-content-length@2.0.13:
-    resolution: {integrity: sha512-Md2kxWpaec3bXp1oERFPQPBhOXCkGSAF7uc1E+4rkwjgw3/tqAXRtbjbggu67HJdwaif76As8AV6XxbD1HzqTQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/is-array-buffer@3.0.0:
+    resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/protocol-http": 3.0.7
-      "@smithy/types": 2.3.5
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-content-length@2.0.14:
-    resolution: {integrity: sha512-poUNgKTw9XwPXfX9nEHpVgrMNVpaSMZbshqvPxFVoalF4wp6kRzYKOfdesSVectlQ51VtigoLfbXcdyPwvxgTg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/md5-js@3.0.0:
+    resolution: {integrity: sha512-Tm0vrrVzjlD+6RCQTx7D3Ls58S3FUH1ZCtU1MIh/qQmaOo1H9lMN2as6CikcEwgattnA9SURSdoJJ27xMcEfMA==}
     dependencies:
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-endpoint@2.0.11:
-    resolution: {integrity: sha512-mCugsvB15up6fqpzUEpMT4CuJmFkEI+KcozA7QMzYguXCaIilyMKsyxgamwmr+o7lo3QdjN0//XLQ9bWFL129g==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-content-length@2.1.1:
+    resolution: {integrity: sha512-rSr9ezUl9qMgiJR0UVtVOGEZElMdGFyl8FzWEF5iEKTlcWxGr2wTqGfDwtH3LAB7h+FPkxqv4ZU4cpuCN9Kf/g==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/middleware-serde": 2.0.11
-      "@smithy/types": 2.3.5
-      "@smithy/url-parser": 2.0.11
-      "@smithy/util-middleware": 2.0.4
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-endpoint@2.1.3:
-    resolution: {integrity: sha512-ZrQ0/YX6hNVTxqMEHtEaDbDv6pNeEji/a5Vk3HuFC5R3ZY8lfoATyxmOGxBVYnF3NUvZLNC7umEv1WzWGWvCGQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-content-length@3.0.0:
+    resolution: {integrity: sha512-3C4s4d/iGobgCtk2tnWW6+zSTOBg1PRAm2vtWZLdriwTroFbbWNSr3lcyzHdrQHnEXYCC5K52EbpfodaIUY8sg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/middleware-serde": 2.0.12
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/shared-ini-file-loader": 2.2.2
-      "@smithy/types": 2.4.0
-      "@smithy/url-parser": 2.0.12
-      "@smithy/util-middleware": 2.0.5
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-retry@2.0.16:
-    resolution: {integrity: sha512-Br5+0yoiMS0ugiOAfJxregzMMGIRCbX4PYo1kDHtLgvkA/d++aHbnHB819m5zOIAMPvPE7AThZgcsoK+WOsUTA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-endpoint@2.4.1:
+    resolution: {integrity: sha512-XPZTb1E2Oav60Ven3n2PFx+rX9EDsU/jSTA8VDamt7FXks67ekjPY/XrmmPDQaFJOTUHJNKjd8+kZxVO5Ael4Q==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.1
-      "@smithy/protocol-http": 3.0.7
-      "@smithy/service-error-classification": 2.0.4
-      "@smithy/types": 2.3.5
-      "@smithy/util-middleware": 2.0.4
-      "@smithy/util-retry": 2.0.4
+      '@smithy/middleware-serde': 2.1.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/url-parser': 2.1.1
+      '@smithy/util-middleware': 2.1.1
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/middleware-endpoint@3.0.0:
+    resolution: {integrity: sha512-aXOAWztw/5qAfp0NcA2OWpv6ZI/E+Dh9mByif7i91D/0iyYNUcKvskmXiowKESFkuZ7PIMd3VOR4fTibZDs2OQ==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/middleware-serde': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/shared-ini-file-loader': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/url-parser': 3.0.0
+      '@smithy/util-middleware': 3.0.0
       tslib: 2.6.2
-      uuid: 8.3.2
     dev: false
 
-  /@smithy/middleware-retry@2.0.18:
-    resolution: {integrity: sha512-VyrHQRldGSb3v9oFOB5yPxmLT7U2sQic2ytylOnYlnsmVOLlFIaI6sW22c+w2675yq+XZ6HOuzV7x2OBYCWRNA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-retry@2.1.1:
+    resolution: {integrity: sha512-eMIHOBTXro6JZ+WWzZWd/8fS8ht5nS5KDQjzhNMHNRcG5FkNTqcKpYhw7TETMYzbLfhO5FYghHy1vqDWM4FLDA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/service-error-classification": 2.0.5
-      "@smithy/types": 2.4.0
-      "@smithy/util-middleware": 2.0.5
-      "@smithy/util-retry": 2.0.5
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/service-error-classification': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-middleware': 2.1.1
+      '@smithy/util-retry': 2.1.1
       tslib: 2.6.2
       uuid: 8.3.2
     dev: false
 
-  /@smithy/middleware-serde@2.0.11:
-    resolution: {integrity: sha512-NuxnjMyf4zQqhwwdh0OTj5RqpnuT6HcH5Xg5GrPijPcKzc2REXVEVK4Yyk8ckj8ez1XSj/bCmJ+oNjmqB02GWA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-retry@3.0.1:
+    resolution: {integrity: sha512-hBhSEuL841FhJBK/19WpaGk5YWSzFk/P2UaVjANGKRv3eYNO8Y1lANWgqnuPWjOyCEWMPr58vELFDWpxvRKANw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.3.5
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/service-error-classification': 3.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-retry': 3.0.0
       tslib: 2.6.2
+      uuid: 9.0.1
     dev: false
 
-  /@smithy/middleware-serde@2.0.12:
-    resolution: {integrity: sha512-IBeco157lIScecq2Z+n0gq56i4MTnfKxS7rbfrAORveDJgnbBAaEQgYqMqp/cYqKrpvEXcyTjwKHrBjCCIZh2A==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-serde@2.1.1:
+    resolution: {integrity: sha512-D8Gq0aQBeE1pxf3cjWVkRr2W54t+cdM2zx78tNrVhqrDykRA7asq8yVJij1u5NDtKzKqzBSPYh7iW0svUKg76g==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-stack@2.0.5:
-    resolution: {integrity: sha512-bVQU/rZzBY7CbSxIrDTGZYnBWKtIw+PL/cRc9B7etZk1IKSOe0NvKMJyWllfhfhrTeMF6eleCzOihIQympAvPw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-serde@3.0.0:
+    resolution: {integrity: sha512-I1vKG1foI+oPgG9r7IMY1S+xBnmAn1ISqployvqkwHoSb8VPsngHDTOgYGYBonuOKndaWRUGJZrKYYLB+Ane6w==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.3.5
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-stack@2.0.6:
-    resolution: {integrity: sha512-YSvNZeOKWLJ0M/ycxwDIe2Ztkp6Qixmcml1ggsSv2fdHKGkBPhGrX5tMzPGMI1yyx55UEYBi2OB4s+RriXX48A==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-stack@2.1.1:
+    resolution: {integrity: sha512-KPJhRlhsl8CjgGXK/DoDcrFGfAqoqvuwlbxy+uOO4g2Azn1dhH+GVfC3RAp+6PoL5PWPb+vt6Z23FP+Mr6qeCw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/node-config-provider@2.1.1:
-    resolution: {integrity: sha512-1lF6s1YWBi1LBu2O30tD3jyTgMtuvk/Z1twzXM4GPYe4dmZix4nNREPJIPOcfFikNU2o0eTYP80+izx5F2jIJA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/middleware-stack@3.0.0:
+    resolution: {integrity: sha512-+H0jmyfAyHRFXm6wunskuNAqtj7yfmwFB6Fp37enytp2q047/Od9xetEaUbluyImOlGnGpaVGaVfjwawSr+i6Q==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/property-provider": 2.0.12
-      "@smithy/shared-ini-file-loader": 2.2.0
-      "@smithy/types": 2.3.5
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/node-config-provider@2.1.3:
-    resolution: {integrity: sha512-J6lXvRHGVnSX3n1PYi+e1L5HN73DkkJpUviV3Ebf+8wSaIjAf+eVNbzyvh/S5EQz7nf4KVfwbD5vdoZMAthAEQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/node-config-provider@2.2.1:
+    resolution: {integrity: sha512-epzK3x1xNxA9oJgHQ5nz+2j6DsJKdHfieb+YgJ7ATWxzNcB7Hc+Uya2TUck5MicOPhDV8HZImND7ZOecVr+OWg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/property-provider": 2.0.13
-      "@smithy/shared-ini-file-loader": 2.2.2
-      "@smithy/types": 2.4.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/shared-ini-file-loader': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/node-http-handler@2.1.7:
-    resolution: {integrity: sha512-PQIKZXlp3awCDn/xNlCSTFE7aYG/5Tx33M05NfQmWYeB5yV1GZZOSz4dXpwiNJYTXb9jPqjl+ueXXkwtEluFFA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/node-config-provider@3.0.0:
+    resolution: {integrity: sha512-buqfaSdDh0zo62EPLf8rGDvcpKwGpO5ho4bXS2cdFhlOta7tBkWJt+O5uiaAeICfIOfPclNOndshDNSanX2X9g==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/abort-controller": 2.0.11
-      "@smithy/protocol-http": 3.0.7
-      "@smithy/querystring-builder": 2.0.11
-      "@smithy/types": 2.3.5
+      '@smithy/property-provider': 3.0.0
+      '@smithy/shared-ini-file-loader': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@smithy/node-http-handler@2.1.8:
     resolution: {integrity: sha512-KZylM7Wff/So5SmCiwg2kQNXJ+RXgz34wkxS7WNwIUXuZrZZpY/jKJCK+ZaGyuESDu3TxcaY+zeYGJmnFKbQsA==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/abort-controller": 2.0.12
-      "@smithy/protocol-http": 3.0.8
-      "@smithy/querystring-builder": 2.0.12
-      "@smithy/types": 2.4.0
+      '@smithy/abort-controller': 2.0.12
+      '@smithy/protocol-http': 3.0.8
+      '@smithy/querystring-builder': 2.0.12
+      '@smithy/types': 2.4.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/property-provider@2.0.12:
-    resolution: {integrity: sha512-Un/OvvuQ1Kg8WYtoMCicfsFFuHb/TKL3pCA6ZIo/WvNTJTR94RtoRnL7mY4XkkUAoFMyf6KjcQJ76y1FX7S5rw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/node-http-handler@2.3.1:
+    resolution: {integrity: sha512-gLA8qK2nL9J0Rk/WEZSvgin4AppvuCYRYg61dcUo/uKxvMZsMInL5I5ZdJTogOvdfVug3N2dgI5ffcUfS4S9PA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/abort-controller': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/querystring-builder': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/property-provider@2.0.13:
-    resolution: {integrity: sha512-VJqUf2CbsQX6uUiC5dUPuoEATuFjkbkW3lJHbRnpk9EDC9X+iKqhfTK+WP+lve5EQ9TcCI1Q6R7hrg41FyC54w==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/node-http-handler@3.0.0:
+    resolution: {integrity: sha512-3trD4r7NOMygwLbUJo4eodyQuypAWr7uvPnebNJ9a70dQhVn+US8j/lCnvoJS6BXfZeF7PkkkI0DemVJw+n+eQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/abort-controller': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/querystring-builder': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/protocol-http@2.0.5:
-    resolution: {integrity: sha512-d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/property-provider@2.1.1:
+    resolution: {integrity: sha512-FX7JhhD/o5HwSwg6GLK9zxrMUrGnb3PzNBrcthqHKBc3dH0UfgEAU24xnJ8F0uow5mj17UeBEOI6o3CF2k7Mhw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.3.5
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/protocol-http@3.0.7:
-    resolution: {integrity: sha512-HnZW8y+r66ntYueCDbLqKwWcMNWW8o3eVpSrHNluwtBJ/EUWfQHRKSiu6vZZtc6PGfPQWgVfucoCE/C3QufMAA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/property-provider@3.0.0:
+    resolution: {integrity: sha512-LmbPgHBswdXCrkWWuUwBm9w72S2iLWyC/5jet9/Y9cGHtzqxi+GVjfCfahkvNV4KXEwgnH8EMpcrD9RUYe0eLQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@smithy/protocol-http@3.0.8:
     resolution: {integrity: sha512-SHJvYeWq8q0FK8xHk+xjV9dzDUDjFMT+G1pZbV+XB6OVoac/FSVshlMNPeUJ8AmSkcDKHRu5vASnRqZHgD3qhw==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.4.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/protocol-http@3.1.1:
+    resolution: {integrity: sha512-6ZRTSsaXuSL9++qEwH851hJjUA0OgXdQFCs+VDw4tGH256jQ3TjYY/i34N4vd24RV3nrjNsgd1yhb57uMoKbzQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/querystring-builder@2.0.11:
-    resolution: {integrity: sha512-b4kEbVMxpmfv2VWUITn2otckTi7GlMteZQxi+jlwedoATOGEyrCJPfRcYQJjbCi3fZ2QTfh3PcORvB27+j38Yg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/protocol-http@4.0.0:
+    resolution: {integrity: sha512-qOQZOEI2XLWRWBO9AgIYuHuqjZ2csyr8/IlgFDHDNuIgLAMRx2Bl8ck5U5D6Vh9DPdoaVpuzwWMa0xcdL4O/AQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
-      "@smithy/util-uri-escape": 2.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@smithy/querystring-builder@2.0.12:
     resolution: {integrity: sha512-cDbF07IuCjiN8CdGvPzfJjXIrmDSelScRfyJYrYBNBbKl2+k7QD/KqiHhtRyEKgID5mmEVrV6KE6L/iPJ98sFw==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
-      "@smithy/util-uri-escape": 2.0.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-uri-escape': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/querystring-parser@2.0.11:
-    resolution: {integrity: sha512-YXe7jhi7s3dQ0Fu9dLoY/gLu6NCyy8tBWJL/v2c9i7/RLpHgKT+uT96/OqZkHizCJ4kr0ZD46tzMjql/o60KLg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/querystring-builder@2.1.1:
+    resolution: {integrity: sha512-C/ko/CeEa8jdYE4gt6nHO5XDrlSJ3vdCG0ZAc6nD5ZIE7LBp0jCx4qoqp7eoutBu7VrGMXERSRoPqwi1WjCPbg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 2.9.1
+      '@smithy/util-uri-escape': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/querystring-parser@2.0.12:
-    resolution: {integrity: sha512-fytyTcXaMzPBuNtPlhj5v6dbl4bJAnwKZFyyItAGt4Tgm9HFPZNo7a9r1SKPr/qdxUEBzvL9Rh+B9SkTX3kFxg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/querystring-builder@3.0.0:
+    resolution: {integrity: sha512-bW8Fi0NzyfkE0TmQphDXr1AmBDbK01cA4C1Z7ggwMAU5RDz5AAv/KmoRwzQAS0kxXNf/D2ALTEgwK0U2c4LtRg==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-uri-escape': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/service-error-classification@2.0.4:
-    resolution: {integrity: sha512-77506l12I5gxTZqBkx3Wb0RqMG81bMYLaVQ+EqIWFwQDJRs5UFeXogKxSKojCmz1wLUziHZQXm03MBzPQiumQw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/querystring-parser@2.1.1:
+    resolution: {integrity: sha512-H4+6jKGVhG1W4CIxfBaSsbm98lOO88tpDWmZLgkJpt8Zkk/+uG0FmmqMuCAc3HNM2ZDV+JbErxr0l5BcuIf/XQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 2.9.1
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/querystring-parser@3.0.0:
+    resolution: {integrity: sha512-UzHwthk0UEccV4dHzPySnBy34AWw3V9lIqUTxmozQ+wPDAO9csCWMfOLe7V9A2agNYy7xE+Pb0S6K/J23JSzfQ==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/types': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/service-error-classification@2.1.1:
+    resolution: {integrity: sha512-txEdZxPUgM1PwGvDvHzqhXisrc5LlRWYCf2yyHfvITWioAKat7srQvpjMAvgzf0t6t7j8yHrryXU9xt7RZqFpw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.9.1
     dev: false
 
-  /@smithy/service-error-classification@2.0.5:
-    resolution: {integrity: sha512-M0SeJnEgD2ywJyV99Fb1yKFzmxDe9JfpJiYTVSRMyRLc467BPU0qsuuDPzMCdB1mU8M8u1rVOdkqdoyFN8UFTw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/service-error-classification@3.0.0:
+    resolution: {integrity: sha512-3BsBtOUt2Gsnc3X23ew+r2M71WwtpHfEDGhHYHSDg6q1t8FrWh15jT25DLajFV1H+PpxAJ6gqe9yYeRUsmSdFA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
     dev: false
 
-  /@smithy/shared-ini-file-loader@2.2.0:
-    resolution: {integrity: sha512-xFXqs4vAb5BdkzHSRrTapFoaqS4/3m/CGZzdw46fBjYZ0paYuLAoMY60ICCn1FfGirG+PiJ3eWcqJNe4/SkfyA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/shared-ini-file-loader@2.3.1:
+    resolution: {integrity: sha512-2E2kh24igmIznHLB6H05Na4OgIEilRu0oQpYXo3LCNRrawHAcfDKq9004zJs+sAMt2X5AbY87CUCJ7IpqpSgdw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/shared-ini-file-loader@2.2.2:
-    resolution: {integrity: sha512-noyQUPn7b1M8uB0GEXc/Zyxq+5K2b7aaqWnLp+hgJ7+xu/FCvtyWy5eWLDjQEsHnAet2IZhS5QF8872OR69uNg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/shared-ini-file-loader@3.0.0:
+    resolution: {integrity: sha512-REVw6XauXk8xE4zo5aGL7Rz4ywA8qNMUn8RtWeTRQsgAlmlvbJ7CEPBcaXU2NDC3AYBgYAXrGyWD8XrN8UGDog==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/signature-v4@2.0.11:
-    resolution: {integrity: sha512-EFVU1dT+2s8xi227l1A9O27edT/GNKvyAK6lZnIZ0zhIHq/jSLznvkk15aonGAM1kmhmZBVGpI7Tt0odueZK9A==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/signature-v4@2.1.1:
+    resolution: {integrity: sha512-Hb7xub0NHuvvQD3YwDSdanBmYukoEkhqBjqoxo+bSdC0ryV9cTfgmNjuAQhTPYB6yeU7hTR+sPRiFMlxqv6kmg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/eventstream-codec": 2.0.11
-      "@smithy/is-array-buffer": 2.0.0
-      "@smithy/types": 2.4.0
-      "@smithy/util-hex-encoding": 2.0.0
-      "@smithy/util-middleware": 2.0.4
-      "@smithy/util-uri-escape": 2.0.0
-      "@smithy/util-utf8": 2.0.0
+      '@smithy/eventstream-codec': 2.1.1
+      '@smithy/is-array-buffer': 2.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-hex-encoding': 2.1.1
+      '@smithy/util-middleware': 2.1.1
+      '@smithy/util-uri-escape': 2.1.1
+      '@smithy/util-utf8': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/smithy-client@2.1.10:
-    resolution: {integrity: sha512-2OEmZDiW1Z196QHuQZ5M6cBE8FCSG0H2HADP1G+DY8P3agsvb0YJyfhyKuJbxIQy15tr3eDAK6FOrlbxgKOOew==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/signature-v4@3.0.0:
+    resolution: {integrity: sha512-kXFOkNX+BQHe2qnLxpMEaCRGap9J6tUGLzc3A9jdn+nD4JdMwCKTJ+zFwQ20GkY+mAXGatyTw3HcoUlR39HwmA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/middleware-stack": 2.0.5
-      "@smithy/types": 2.3.5
-      "@smithy/util-stream": 2.0.17
+      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/util-middleware': 3.0.0
+      '@smithy/util-uri-escape': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/smithy-client@2.1.12:
-    resolution: {integrity: sha512-XXqhridfkKnpj+lt8vM6HRlZbqUAqBjVC74JIi13F/AYQd/zTj9SOyGfxnbp4mjY9q28LityxIuV8CTinr9r5w==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/smithy-client@2.3.1:
+    resolution: {integrity: sha512-YsTdU8xVD64r2pLEwmltrNvZV6XIAC50LN6ivDopdt+YiF/jGH6PY9zUOu0CXD/d8GMB8gbhnpPsdrjAXHS9QA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/middleware-stack": 2.0.6
-      "@smithy/types": 2.4.0
-      "@smithy/util-stream": 2.0.17
+      '@smithy/middleware-endpoint': 2.4.1
+      '@smithy/middleware-stack': 2.1.1
+      '@smithy/protocol-http': 3.1.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-stream': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/types@2.3.5:
-    resolution: {integrity: sha512-ehyDt8M9hehyxrLQGoA1BGPou8Js1Ocoh5M0ngDhJMqbFmNK5N6Xhr9/ZExWkyIW8XcGkiMPq3ZUEE0ScrhbuQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/smithy-client@3.0.1:
+    resolution: {integrity: sha512-KAiFY4Y4jdHxR+4zerH/VBhaFKM8pbaVmJZ/CWJRwtM/CmwzTfXfvYwf6GoUwiHepdv+lwiOXCuOl6UBDUEINw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
+      '@smithy/middleware-endpoint': 3.0.0
+      '@smithy/middleware-stack': 3.0.0
+      '@smithy/protocol-http': 4.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-stream': 3.0.1
       tslib: 2.6.2
     dev: false
 
   /@smithy/types@2.4.0:
     resolution: {integrity: sha512-iH1Xz68FWlmBJ9vvYeHifVMWJf82ONx+OybPW8ZGf5wnEv2S0UXcU4zwlwJkRXuLKpcSLHrraHbn2ucdVXLb4g==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/types@2.9.1:
+    resolution: {integrity: sha512-vjXlKNXyprDYDuJ7UW5iobdmyDm6g8dDG+BFUncAg/3XJaN45Gy5RWWWUVgrzIK7S4R1KWgIX5LeJcfvSI24bw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/types@3.0.0:
+    resolution: {integrity: sha512-VvWuQk2RKFuOr98gFhjca7fkBS+xLLURT8bUjk5XQoV0ZLm7WPwWPPY3/AwzTLuUBDeoKDCthfe1AsTUWaSEhw==}
+    engines: {node: '>=16.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/url-parser@2.0.11:
-    resolution: {integrity: sha512-h89yXMCCF+S5k9XIoKltMIWTYj+FcEkU/IIFZ6RtE222fskOTL4Iak6ZRG+ehSvZDt8yKEcxqheTDq7JvvtK3g==}
+  /@smithy/url-parser@2.1.1:
+    resolution: {integrity: sha512-qC9Bv8f/vvFIEkHsiNrUKYNl8uKQnn4BdhXl7VzQRP774AwIjiSMMwkbT+L7Fk8W8rzYVifzJNYxv1HwvfBo3Q==}
     dependencies:
-      "@smithy/querystring-parser": 2.0.11
-      "@smithy/types": 2.3.5
+      '@smithy/querystring-parser': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/url-parser@2.0.12:
-    resolution: {integrity: sha512-qgkW2mZqRvlNUcBkxYB/gYacRaAdck77Dk3/g2iw0S9F0EYthIS3loGfly8AwoWpIvHKhkTsCXXQfzksgZ4zIA==}
+  /@smithy/url-parser@3.0.0:
+    resolution: {integrity: sha512-2XLazFgUu+YOGHtWihB3FSLAfCUajVfNBXGGYjOaVKjLAuAxx3pSBY3hBgLzIgB17haf59gOG3imKqTy8mcrjw==}
     dependencies:
-      "@smithy/querystring-parser": 2.0.12
-      "@smithy/types": 2.4.0
+      '@smithy/querystring-parser': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
   /@smithy/util-base64@2.0.0:
     resolution: {integrity: sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/util-buffer-from": 2.0.0
+      '@smithy/util-buffer-from': 2.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-body-length-browser@2.0.0:
-    resolution: {integrity: sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==}
+  /@smithy/util-base64@2.1.1:
+    resolution: {integrity: sha512-UfHVpY7qfF/MrgndI5PexSKVTxSZIdz9InghTFa49QOvuu9I52zLPLUHXvHpNuMb1iD2vmc6R+zbv/bdMipR/g==}
+    engines: {node: '>=14.0.0'}
     dependencies:
+      '@smithy/util-buffer-from': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-body-length-node@2.1.0:
-    resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-base64@3.0.0:
+    resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-body-length-browser@2.1.1:
+    resolution: {integrity: sha512-ekOGBLvs1VS2d1zM2ER4JEeBWAvIOUKeaFch29UjjJsxmZ/f0L3K3x0dEETgh3Q9bkZNHgT+rkdl/J/VUqSRag==}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-body-length-browser@3.0.0:
+    resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-body-length-node@2.2.1:
+    resolution: {integrity: sha512-/ggJG+ta3IDtpNVq4ktmEUtOkH1LW64RHB5B0hcr5ZaWBmo96UX2cIOVbjCqqDickTXqBWZ4ZO0APuaPrD7Abg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-body-length-node@3.0.0:
+    resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
   /@smithy/util-buffer-from@2.0.0:
     resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/is-array-buffer": 2.0.0
+      '@smithy/is-array-buffer': 2.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-config-provider@2.0.0:
-    resolution: {integrity: sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-buffer-from@2.1.1:
+    resolution: {integrity: sha512-clhNjbyfqIv9Md2Mg6FffGVrJxw7bgK7s3Iax36xnfVj6cg0fUG7I4RH0XgXJF8bxi+saY5HR21g2UPKSxVCXg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
+      '@smithy/is-array-buffer': 2.1.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-browser@2.0.14:
-    resolution: {integrity: sha512-NupG7SWUucm3vJrvlpt9jG1XeoPJphjcivgcUUXhDJbUPy4F04LhlTiAhWSzwlCNcF8OJsMvZ/DWbpYD3pselw==}
-    engines: {node: ">= 10.0.0"}
+  /@smithy/util-buffer-from@3.0.0:
+    resolution: {integrity: sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/property-provider": 2.0.12
-      "@smithy/smithy-client": 2.1.10
-      "@smithy/types": 2.3.5
-      bowser: 2.11.0
+      '@smithy/is-array-buffer': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-browser@2.0.16:
-    resolution: {integrity: sha512-Uv5Cu8nVkuvLn0puX+R9zWbSNpLIR3AxUlPoLJ7hC5lvir8B2WVqVEkJLwtixKAncVLasnTVjPDCidtAUTGEQw==}
-    engines: {node: ">= 10.0.0"}
+  /@smithy/util-config-provider@2.2.1:
+    resolution: {integrity: sha512-50VL/tx9oYYcjJn/qKqNy7sCtpD0+s8XEBamIFo4mFFTclKMNp+rsnymD796uybjiIquB7VCB/DeafduL0y2kw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/property-provider": 2.0.13
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
-      bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-node@2.0.18:
-    resolution: {integrity: sha512-+3jMom/b/Cdp21tDnY4vKu249Al+G/P0HbRbct7/aSZDlROzv1tksaYukon6UUv7uoHn+/McqnsvqZHLlqvQ0g==}
-    engines: {node: ">= 10.0.0"}
+  /@smithy/util-config-provider@3.0.0:
+    resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/config-resolver": 2.0.14
-      "@smithy/credential-provider-imds": 2.0.16
-      "@smithy/node-config-provider": 2.1.1
-      "@smithy/property-provider": 2.0.12
-      "@smithy/smithy-client": 2.1.10
-      "@smithy/types": 2.3.5
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-node@2.0.21:
-    resolution: {integrity: sha512-cUEsttVZ79B7Al2rWK2FW03HBpD9LyuqFtm+1qFty5u9sHSdesr215gS2Ln53fTopNiPgeXpdoM3IgjvIO0rJw==}
-    engines: {node: ">= 10.0.0"}
+  /@smithy/util-defaults-mode-browser@2.1.1:
+    resolution: {integrity: sha512-lqLz/9aWRO6mosnXkArtRuQqqZBhNpgI65YDpww4rVQBuUT7qzKbDLG5AmnQTCiU4rOquaZO/Kt0J7q9Uic7MA==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      "@smithy/config-resolver": 2.0.16
-      "@smithy/credential-provider-imds": 2.0.18
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/property-provider": 2.0.13
-      "@smithy/smithy-client": 2.1.12
-      "@smithy/types": 2.4.0
+      '@smithy/property-provider': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
+      bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-endpoints@1.0.2:
-    resolution: {integrity: sha512-QEdq+sP68IJHAMVB2ugKVVZEWeKQtZLuf+akHzc8eTVElsZ2ZdVLWC6Cp+uKjJ/t4yOj1qu6ZzyxJQEQ8jdEjg==}
-    engines: {node: ">= 14.0.0"}
+  /@smithy/util-defaults-mode-browser@3.0.1:
+    resolution: {integrity: sha512-nW5kEzdJn1Bn5TF+gOPHh2rcPli8JU9vSSXLbfg7uPnfR1TMRQqs9zlYRhIb87NeSxIbpdXOI94tvXSy+fvDYg==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      "@smithy/node-config-provider": 2.1.3
-      "@smithy/types": 2.4.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
+      bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-hex-encoding@2.0.0:
-    resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-defaults-mode-node@2.1.1:
+    resolution: {integrity: sha512-tYVrc+w+jSBfBd267KDnvSGOh4NMz+wVH7v4CClDbkdPfnjvImBZsOURncT5jsFwR9KCuDyPoSZq4Pa6+eCUrA==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
+      '@smithy/config-resolver': 2.1.1
+      '@smithy/credential-provider-imds': 2.2.1
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/property-provider': 2.1.1
+      '@smithy/smithy-client': 2.3.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-middleware@2.0.4:
-    resolution: {integrity: sha512-Pbu6P4MBwRcjrLgdTR1O4Y3c0sTZn2JdOiJNcgL7EcIStcQodj+6ZTXtbyU/WTEU3MV2NMA10LxFc3AWHZ3+4A==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-defaults-mode-node@3.0.1:
+    resolution: {integrity: sha512-TFk+Qb+elLc/MOhtSp+50fstyfZ6avQbgH2d96xUBpeScu+Al9elxv+UFAjaTHe0HQe5n+wem8ZLpXvU8lwV6Q==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/config-resolver': 3.0.0
+      '@smithy/credential-provider-imds': 3.0.0
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/property-provider': 3.0.0
+      '@smithy/smithy-client': 3.0.1
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-middleware@2.0.5:
-    resolution: {integrity: sha512-1lyT3TcaMJQe+OFfVI+TlomDkPuVzb27NZYdYtmSTltVmLaUjdCyt4KE+OH1CnhZKsz4/cdCL420Lg9UH5Z2Mw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-endpoints@1.1.1:
+    resolution: {integrity: sha512-sI4d9rjoaekSGEtq3xSb2nMjHMx8QXcz2cexnVyRWsy4yQ9z3kbDpX+7fN0jnbdOp0b3KSTZJZ2Yb92JWSanLw==}
+    engines: {node: '>= 14.0.0'}
     dependencies:
-      "@smithy/types": 2.4.0
+      '@smithy/node-config-provider': 2.2.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-retry@2.0.4:
-    resolution: {integrity: sha512-b+n1jBBKc77C1E/zfBe1Zo7S9OXGBiGn55N0apfhZHxPUP/fMH5AhFUUcWaJh7NAnah284M5lGkBKuhnr3yK5w==}
-    engines: {node: ">= 14.0.0"}
+  /@smithy/util-endpoints@2.0.0:
+    resolution: {integrity: sha512-+exaXzEY3DNt2qtA2OtRNSDlVrE4p32j1JSsQkzA5AdP0YtJNjkYbYhJxkFmPYcjI1abuwopOZCwUmv682QkiQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/service-error-classification": 2.0.4
-      "@smithy/types": 2.3.5
+      '@smithy/node-config-provider': 3.0.0
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-retry@2.0.5:
-    resolution: {integrity: sha512-x3t1+MQAJ6QONk3GTbJNcugCFDVJ+Bkro5YqQQK1EyVesajNDqxFtCx9WdOFNGm/Cbm7tUdwVEmfKQOJoU2Vtw==}
-    engines: {node: ">= 14.0.0"}
+  /@smithy/util-hex-encoding@2.0.0:
+    resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/service-error-classification": 2.0.5
-      "@smithy/types": 2.4.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-stream@2.0.17:
-    resolution: {integrity: sha512-fP/ZQ27rRvHsqItds8yB7jerwMpZFTL3QqbQbidUiG0+mttMoKdP0ZqnvM8UK5q0/dfc3/pN7g4XKPXOU7oRWw==}
-    engines: {node: ">=14.0.0"}
-    dependencies:
-      "@smithy/fetch-http-handler": 2.2.4
-      "@smithy/node-http-handler": 2.1.8
-      "@smithy/types": 2.4.0
-      "@smithy/util-base64": 2.0.0
-      "@smithy/util-buffer-from": 2.0.0
-      "@smithy/util-hex-encoding": 2.0.0
-      "@smithy/util-utf8": 2.0.0
+  /@smithy/util-hex-encoding@2.1.1:
+    resolution: {integrity: sha512-3UNdP2pkYUUBGEXzQI9ODTDK+Tcu1BlCyDBaRHwyxhA+8xLP8agEKQq4MGmpjqb4VQAjq9TwlCQX0kP6XDKYLg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-uri-escape@2.0.0:
-    resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-hex-encoding@3.0.0:
+    resolution: {integrity: sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-utf8@2.0.0:
-    resolution: {integrity: sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-middleware@2.1.1:
+    resolution: {integrity: sha512-mKNrk8oz5zqkNcbcgAAepeJbmfUW6ogrT2Z2gDbIUzVzNAHKJQTYmH9jcy0jbWb+m7ubrvXKb6uMjkSgAqqsFA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      "@smithy/util-buffer-from": 2.0.0
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-waiter@2.0.11:
-    resolution: {integrity: sha512-8SJWUl9O1YhjC77EccgltI3q4XZQp3vp9DGEW6o0OdkUcwqm/H4qOLnMkA2n+NDojuM5Iia2jWoCdbluIiG7TA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-middleware@3.0.0:
+    resolution: {integrity: sha512-q5ITdOnV2pXHSVDnKWrwgSNTDBAMHLptFE07ua/5Ty5WJ11bvr0vk2a7agu7qRhrCFRQlno5u3CneU5EELK+DQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      "@smithy/abort-controller": 2.0.11
-      "@smithy/types": 2.3.5
+      '@smithy/types': 3.0.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-waiter@2.0.12:
-    resolution: {integrity: sha512-3sENmyVa1NnOPoiT2NCApPmu7ukP7S/v7kL9IxNmnygkDldn7/yK0TP42oPJLwB2k3mospNsSePIlqdXEUyPHA==}
-    engines: {node: ">=14.0.0"}
+  /@smithy/util-retry@2.1.1:
+    resolution: {integrity: sha512-Mg+xxWPTeSPrthpC5WAamJ6PW4Kbo01Fm7lWM1jmGRvmrRdsd3192Gz2fBXAMURyXpaNxyZf6Hr/nQ4q70oVEA==}
+    engines: {node: '>= 14.0.0'}
     dependencies:
-      "@smithy/abort-controller": 2.0.12
-      "@smithy/types": 2.4.0
+      '@smithy/service-error-classification': 2.1.1
+      '@smithy/types': 2.9.1
       tslib: 2.6.2
     dev: false
 
-  /@storybook/addon-actions@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-SsqZr3js5NinKPnC8AeNI7Ij+Q6fIl9tRdRmSulEgjksjOg7E5S1/Wsn5Bb2CCgj7MaX6VxGyC7s3XskQtDiIQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  /@smithy/util-retry@3.0.0:
+    resolution: {integrity: sha512-nK99bvJiziGv/UOKJlDvFF45F00WgPLKVIGUfAK+mDhzVN2hb/S33uW2Tlhg5PVBoqY7tDVqL0zmu4OxAHgo9g==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/service-error-classification': 3.0.0
+      '@smithy/types': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-stream@2.0.17:
+    resolution: {integrity: sha512-fP/ZQ27rRvHsqItds8yB7jerwMpZFTL3QqbQbidUiG0+mttMoKdP0ZqnvM8UK5q0/dfc3/pN7g4XKPXOU7oRWw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/fetch-http-handler': 2.2.4
+      '@smithy/node-http-handler': 2.1.8
+      '@smithy/types': 2.4.0
+      '@smithy/util-base64': 2.0.0
+      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-hex-encoding': 2.0.0
+      '@smithy/util-utf8': 2.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-stream@2.1.1:
+    resolution: {integrity: sha512-J7SMIpUYvU4DQN55KmBtvaMc7NM3CZ2iWICdcgaovtLzseVhAqFRYqloT3mh0esrFw+3VEK6nQFteFsTqZSECQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/fetch-http-handler': 2.4.1
+      '@smithy/node-http-handler': 2.3.1
+      '@smithy/types': 2.9.1
+      '@smithy/util-base64': 2.1.1
+      '@smithy/util-buffer-from': 2.1.1
+      '@smithy/util-hex-encoding': 2.1.1
+      '@smithy/util-utf8': 2.1.1
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-stream@3.0.1:
+    resolution: {integrity: sha512-7F7VNNhAsfMRA8I986YdOY5fE0/T1/ZjFF6OLsqkvQVNP3vZ/szYDfGCyphb7ioA09r32K/0qbSFfNFU68aSzA==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/fetch-http-handler': 3.0.1
+      '@smithy/node-http-handler': 3.0.0
+      '@smithy/types': 3.0.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-uri-escape@2.1.1:
+    resolution: {integrity: sha512-saVzI1h6iRBUVSqtnlOnc9ssU09ypo7n+shdQ8hBTZno/9rZ3AuRYvoHInV57VF7Qn7B+pFJG7qTzFiHxWlWBw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-uri-escape@3.0.0:
+    resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-utf8@2.0.0:
+    resolution: {integrity: sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/util-buffer-from': 2.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-utf8@2.1.1:
+    resolution: {integrity: sha512-BqTpzYEcUMDwAKr7/mVRUtHDhs6ZoXDi9NypMvMfOr/+u1NW7JgqodPDECiiLboEm6bobcPcECxzjtQh865e9A==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/util-buffer-from': 2.1.1
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-utf8@3.0.0:
+    resolution: {integrity: sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/util-buffer-from': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-waiter@2.1.1:
+    resolution: {integrity: sha512-kYy6BLJJNif+uqNENtJqWdXcpqo1LS+nj1AfXcDhOpqpSHJSAkVySLyZV9fkmuVO21lzGoxjvd1imGGJHph/IA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/abort-controller': 2.1.1
+      '@smithy/types': 2.9.1
+      tslib: 2.6.2
+    dev: false
+
+  /@smithy/util-waiter@3.0.0:
+    resolution: {integrity: sha512-+fEXJxGDLCoqRKVSmo0auGxaqbiCo+8oph+4auefYjaNxjOLKSY2MxVQfRzo65PaZv4fr+5lWg+au7vSuJJ/zw==}
+    engines: {node: '>=16.0.0'}
+    dependencies:
+      '@smithy/abort-controller': 3.0.0
+      '@smithy/types': 3.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@storybook/addon-actions@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-SsqZr3js5NinKPnC8AeNI7Ij+Q6fIl9tRdRmSulEgjksjOg7E5S1/Wsn5Bb2CCgj7MaX6VxGyC7s3XskQtDiIQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
       react:
@@ -8870,14 +9810,14 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       dequal: 2.0.3
       lodash: 4.17.21
       polished: 4.2.2
@@ -8889,11 +9829,11 @@ packages:
       ts-dedent: 2.2.0
       uuid: 9.0.1
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-backgrounds@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-backgrounds@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-+LHTZB/ZYMAzkyD5ZxSriBsqmsrvIaW/Nnd/BeuXGbkrVKKqM0qAKiFZAfjc2WchA1piVNy0/1Rsf+kuYCEiJw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -8904,24 +9844,24 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       memoizerific: 1.11.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-controls@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-controls@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-4lq3sycEUIsK8SUWDYc60QgF4vV9FZZ3lDr6M7j2W9bOnvGw49d2fbdlnq+bX1ZprZZ9VgglQpBAorQB3BXZRw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -8932,48 +9872,48 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/blocks": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-common": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/node-logger": 7.4.6
-      "@storybook/preview-api": 7.4.6
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@storybook/blocks': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-common': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 7.4.6
+      '@storybook/preview-api': 7.4.6
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       lodash: 4.17.21
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-docs@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-docs@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-dLaub+XWFq4hChw+xfuF9yYg0Txp77FUawKoAigccfjWXx+OOhRV3XTuAcknpXkYq94GWynHgUFXosXT9kbDNA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      "@jest/transform": 29.7.0
-      "@mdx-js/react": 2.3.0(react@18.2.0)
-      "@storybook/blocks": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/csf-plugin": 7.4.6
-      "@storybook/csf-tools": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/mdx2-csf": 1.1.0
-      "@storybook/node-logger": 7.4.6
-      "@storybook/postinstall": 7.4.6
-      "@storybook/preview-api": 7.4.6
-      "@storybook/react-dom-shim": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@jest/transform': 29.7.0
+      '@mdx-js/react': 2.3.0(react@18.2.0)
+      '@storybook/blocks': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/csf-plugin': 7.4.6
+      '@storybook/csf-tools': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/mdx2-csf': 1.1.0
+      '@storybook/node-logger': 7.4.6
+      '@storybook/postinstall': 7.4.6
+      '@storybook/preview-api': 7.4.6
+      '@storybook/react-dom-shim': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       fs-extra: 11.1.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -8981,37 +9921,37 @@ packages:
       remark-slug: 6.1.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-essentials@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-essentials@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-dWodufrt71TK7ELkeIvVae/x4PzECUlbOm57Iqqt4yQCyR291CgvI4PjeB8un2HbpcXCGZ+N/Oj3YkytvzBi4A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      "@storybook/addon-actions": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-backgrounds": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-controls": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-docs": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-highlight": 7.4.6
-      "@storybook/addon-measure": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-outline": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-toolbars": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/addon-viewport": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-common": 7.4.6
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/node-logger": 7.4.6
-      "@storybook/preview-api": 7.4.6
+      '@storybook/addon-actions': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-backgrounds': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-controls': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-docs': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-highlight': 7.4.6
+      '@storybook/addon-measure': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-outline': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-toolbars': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-viewport': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-common': 7.4.6
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 7.4.6
+      '@storybook/preview-api': 7.4.6
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
@@ -9019,12 +9959,12 @@ packages:
   /@storybook/addon-highlight@7.4.6:
     resolution: {integrity: sha512-zCufxxD2KS5VwczxfkcBxe1oR/juTTn2H1Qm8kYvWCJQx3UxzX0+G9cwafbpV7eivqaufLweEwROkH+0KjAtkQ==}
     dependencies:
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/preview-api": 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 7.4.6
     dev: true
 
-  /@storybook/addon-interactions@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-interactions@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-zVZYrEPZPhNrXBuPqM7HbQvr6jwsje1sbCYj3wnp83U5wjciuqrngqHIlaSZ30zOWSfRVyzbyqL+JQZKA58BNA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -9035,24 +9975,24 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-common": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/instrumenter": 7.4.6
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-common': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/instrumenter': 7.4.6
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       jest-mock: 27.5.1
       polished: 4.2.2
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
@@ -9068,21 +10008,21 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/csf": 0.1.1
-      "@storybook/global": 5.0.0
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/router": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/csf': 0.1.1
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/router': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-measure@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-measure@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-nCymMLaHnxv8TE3yEM1A9Tulb1NuRXRNmtsdHTkjv7P1aWCxZo8A/GZaottKe/GLT8jSRjZ+dnpYWrbAhw6wTQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -9093,22 +10033,22 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/types": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/types': 7.4.6
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       tiny-invariant: 1.3.1
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-outline@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-outline@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-errNUblRVDLpuEaHQPr/nsrnsUkD2ARmXawkRvizgDWLIDMDJYjTON3MUCaVx3x+hlZ3I6X//G5TVcma8tCc8A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -9119,22 +10059,22 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/types": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/types': 7.4.6
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-toolbars@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-toolbars@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-L9m2FBcKeteGq7qIYsMJr0LEfiH7Wdrv5IDcldZTn68eZUJTh1p4GdJZcOmzX1P5IFRr76hpu03iWsNlWQjpbQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -9145,19 +10085,19 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/addon-viewport@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/addon-viewport@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-INDtk54j7bi7NgxMfd2ATmbA0J7nAd6X8itMkLIyPuPJtx8bYHPDORyemDOd0AojgmAdTOAyUtDYdI/PFeo4Cw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -9168,40 +10108,40 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
       memoizerific: 1.11.3
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
-  /@storybook/blocks@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/blocks@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-HxBSAeOiTZW2jbHQlo1upRWFgoMsaAyKijUFf5MwwMNIesXCuuTGZDJ3xTABwAVLK2qC9Ektfbo0CZCiPVuDRQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      "@storybook/channels": 7.4.6
-      "@storybook/client-logger": 7.4.6
-      "@storybook/components": 7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/core-events": 7.4.6
-      "@storybook/csf": 0.1.1
-      "@storybook/docs-tools": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/manager-api": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/preview-api": 7.4.6
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
-      "@types/lodash": 4.14.199
+      '@storybook/channels': 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/components': 7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.4.6
+      '@storybook/csf': 0.1.1
+      '@storybook/docs-tools': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.4.6
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
+      '@types/lodash': 4.14.199
       color-convert: 2.0.1
       dequal: 2.0.3
       lodash: 4.17.21
@@ -9216,8 +10156,8 @@ packages:
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
       - encoding
       - supports-color
     dev: true
@@ -9225,18 +10165,18 @@ packages:
   /@storybook/builder-manager@7.4.6:
     resolution: {integrity: sha512-zylZCD2rmyLOOFBFmUgtJg6UNUKmRNgXiig1XApzS2TkIbTZP827DsVEUl0ey/lskCe0uArkrEBR6ICba8p/Rw==}
     dependencies:
-      "@fal-works/esbuild-plugin-global-externals": 2.1.2
-      "@storybook/core-common": 7.4.6
-      "@storybook/manager": 7.4.6
-      "@storybook/node-logger": 7.4.6
-      "@types/ejs": 3.1.3
-      "@types/find-cache-dir": 3.2.1
-      "@yarnpkg/esbuild-plugin-pnp": 3.0.0-rc.15(esbuild@0.18.20)
+      '@fal-works/esbuild-plugin-global-externals': 2.1.2
+      '@storybook/core-common': 7.4.6
+      '@storybook/manager': 7.4.6
+      '@storybook/node-logger': 7.4.6
+      '@types/ejs': 3.1.3
+      '@types/find-cache-dir': 3.2.1
+      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.18.20)
       browser-assert: 1.2.1
       ejs: 3.1.9
       esbuild: 0.18.20
       esbuild-plugin-alias: 0.2.1
-      express: 4.18.2
+      express: 4.19.2
       find-cache-dir: 3.3.2
       fs-extra: 11.1.1
       process: 0.11.10
@@ -9246,42 +10186,42 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-vite@7.4.6(typescript@5.2.2)(vite@4.4.11):
+  /@storybook/builder-vite@7.4.6(typescript@5.2.2)(vite@4.5.2):
     resolution: {integrity: sha512-xV9STYK+TkqWWTf2ydm6jx+7P70fjD2UPd1XTUw08uKszIjhuuxk+bG/OF5R1E25mPunAKXm6kBFh351AKejBg==}
     peerDependencies:
-      "@preact/preset-vite": "*"
-      typescript: ">= 4.3.x"
+      '@preact/preset-vite': '*'
+      typescript: '>= 4.3.x'
       vite: ^3.0.0 || ^4.0.0
-      vite-plugin-glimmerx: "*"
+      vite-plugin-glimmerx: '*'
     peerDependenciesMeta:
-      "@preact/preset-vite":
+      '@preact/preset-vite':
         optional: true
       typescript:
         optional: true
       vite-plugin-glimmerx:
         optional: true
     dependencies:
-      "@storybook/channels": 7.4.6
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-common": 7.4.6
-      "@storybook/csf-plugin": 7.4.6
-      "@storybook/mdx2-csf": 1.1.0
-      "@storybook/node-logger": 7.4.6
-      "@storybook/preview": 7.4.6
-      "@storybook/preview-api": 7.4.6
-      "@storybook/types": 7.4.6
-      "@types/find-cache-dir": 3.2.1
+      '@storybook/channels': 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-common': 7.4.6
+      '@storybook/csf-plugin': 7.4.6
+      '@storybook/mdx2-csf': 1.1.0
+      '@storybook/node-logger': 7.4.6
+      '@storybook/preview': 7.4.6
+      '@storybook/preview-api': 7.4.6
+      '@storybook/types': 7.4.6
+      '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
       es-module-lexer: 0.9.3
-      express: 4.18.2
+      express: 4.19.2
       find-cache-dir: 3.3.2
       fs-extra: 11.1.1
-      magic-string: 0.30.4
+      magic-string: 0.30.7
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
       rollup: 3.29.4
       typescript: 5.2.2
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 4.5.2
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -9290,9 +10230,9 @@ packages:
   /@storybook/channels@7.4.6:
     resolution: {integrity: sha512-yPv/sfo2c18fM3fvG0i1xse63vG8l33Al/OU0k/dtovltPu001/HVa1QgBgsb/QrEfZtvGjGhmtdVeYb39fv3A==}
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
       qs: 6.11.2
       telejson: 7.2.0
       tiny-invariant: 1.3.1
@@ -9302,28 +10242,28 @@ packages:
     resolution: {integrity: sha512-rRwaH8pOL+FHz/pJMEkNpMH2xvZvWsrl7obBYw26NQiHmiVSAkfHJicndSN1mwc+p5w+9iXthrgzbLtSAOSvkA==}
     hasBin: true
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/preset-env": 7.22.20(@babel/core@7.23.0)
-      "@babel/types": 7.23.0
-      "@ndelangen/get-tarball": 3.0.9
-      "@storybook/codemod": 7.4.6
-      "@storybook/core-common": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/core-server": 7.4.6
-      "@storybook/csf-tools": 7.4.6
-      "@storybook/node-logger": 7.4.6
-      "@storybook/telemetry": 7.4.6
-      "@storybook/types": 7.4.6
-      "@types/semver": 7.5.3
-      "@yarnpkg/fslib": 2.10.3
-      "@yarnpkg/libzip": 2.3.0
+      '@babel/core': 7.23.9
+      '@babel/preset-env': 7.22.20(@babel/core@7.23.9)
+      '@babel/types': 7.23.0
+      '@ndelangen/get-tarball': 3.0.9
+      '@storybook/codemod': 7.4.6
+      '@storybook/core-common': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/core-server': 7.4.6
+      '@storybook/csf-tools': 7.4.6
+      '@storybook/node-logger': 7.4.6
+      '@storybook/telemetry': 7.4.6
+      '@storybook/types': 7.4.6
+      '@types/semver': 7.5.3
+      '@yarnpkg/fslib': 2.10.3
+      '@yarnpkg/libzip': 2.3.0
       chalk: 4.1.2
       commander: 6.2.1
       cross-spawn: 7.0.3
       detect-indent: 6.1.0
       envinfo: 7.10.0
       execa: 5.1.1
-      express: 4.18.2
+      express: 4.19.2
       find-up: 5.0.0
       fs-extra: 11.1.1
       get-npm-tarball-url: 2.0.3
@@ -9353,20 +10293,20 @@ packages:
   /@storybook/client-logger@7.4.6:
     resolution: {integrity: sha512-XDw31ZziU//86PKuMRnmc+L/G0VopaGKENQOGEpvAXCU9IZASwGKlKAtcyosjrpi+ZiUXlMgUXCpXM7x3b1Ehw==}
     dependencies:
-      "@storybook/global": 5.0.0
+      '@storybook/global': 5.0.0
     dev: true
 
   /@storybook/codemod@7.4.6:
     resolution: {integrity: sha512-lxmwEpwksCaAq96APN2YlooSDfKjJ1vKzN5Ni2EqQzf2TEXl7XQjLacHd7OOaII1kfsy+D5gNG4N5wBo7Ub30g==}
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/preset-env": 7.22.20(@babel/core@7.23.0)
-      "@babel/types": 7.23.0
-      "@storybook/csf": 0.1.1
-      "@storybook/csf-tools": 7.4.6
-      "@storybook/node-logger": 7.4.6
-      "@storybook/types": 7.4.6
-      "@types/cross-spawn": 6.0.3
+      '@babel/core': 7.23.9
+      '@babel/preset-env': 7.22.20(@babel/core@7.23.9)
+      '@babel/types': 7.23.9
+      '@storybook/csf': 0.1.1
+      '@storybook/csf-tools': 7.4.6
+      '@storybook/node-logger': 7.4.6
+      '@storybook/types': 7.4.6
+      '@types/cross-spawn': 6.0.3
       cross-spawn: 7.0.3
       globby: 11.1.0
       jscodeshift: 0.14.0(@babel/preset-env@7.22.20)
@@ -9377,46 +10317,46 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/components@7.4.6(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
+  /@storybook/components@7.4.6(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-nIRBhewAgrJJVafyCzuaLx1l+YOfvvD5dOZ0JxZsxJsefOdw1jFpUqUZ5fIpQ2moyvrR0mAUFw378rBfMdHz5Q==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      "@radix-ui/react-select": 1.2.2(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@radix-ui/react-toolbar": 1.0.4(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/client-logger": 7.4.6
-      "@storybook/csf": 0.1.1
-      "@storybook/global": 5.0.0
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@radix-ui/react-select': 1.2.2(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toolbar': 1.0.4(@types/react-dom@18.2.11)(@types/react@18.2.25)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.4.6
+      '@storybook/csf': 0.1.1
+      '@storybook/global': 5.0.0
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       memoizerific: 1.11.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       use-resize-observer: 9.1.0(react-dom@18.2.0)(react@18.2.0)
       util-deprecate: 1.0.2
     transitivePeerDependencies:
-      - "@types/react"
-      - "@types/react-dom"
+      - '@types/react'
+      - '@types/react-dom'
     dev: true
 
   /@storybook/core-client@7.4.6:
     resolution: {integrity: sha512-tfgxAHeCvMcs6DsVgtb4hQSDaCHeAPJOsoyhb47eDQfk4OmxzriM0qWucJV5DePSMi+KutX/rN2u0JxfOuN68g==}
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/preview-api": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/preview-api': 7.4.6
     dev: true
 
   /@storybook/core-common@7.4.6:
     resolution: {integrity: sha512-05MJFmOM86qvTLtgDskokIFz9txe0Lbhq4L3by1FtF0GwgH+p+W6I94KI7c6ANER+kVZkXQZhiRzwBFnVTW+Cg==}
     dependencies:
-      "@storybook/core-events": 7.4.6
-      "@storybook/node-logger": 7.4.6
-      "@storybook/types": 7.4.6
-      "@types/find-cache-dir": 3.2.1
-      "@types/node": 16.18.58
-      "@types/node-fetch": 2.6.6
-      "@types/pretty-hrtime": 1.0.1
+      '@storybook/core-events': 7.4.6
+      '@storybook/node-logger': 7.4.6
+      '@storybook/types': 7.4.6
+      '@types/find-cache-dir': 3.2.1
+      '@types/node': 16.18.58
+      '@types/node-fetch': 2.6.6
+      '@types/pretty-hrtime': 1.0.1
       chalk: 4.1.2
       esbuild: 0.18.20
       esbuild-register: 3.5.0(esbuild@0.18.20)
@@ -9447,31 +10387,31 @@ packages:
   /@storybook/core-server@7.4.6:
     resolution: {integrity: sha512-jqmRTGCJ1W0WReImivkisPVaLFT5sjtLnFoAk0feHp6QS5j7EYOPN7CYzliyQmARWTLUEXOVaFf3VD6nJZQhJQ==}
     dependencies:
-      "@aw-web-design/x-default-browser": 1.4.126
-      "@discoveryjs/json-ext": 0.5.7
-      "@storybook/builder-manager": 7.4.6
-      "@storybook/channels": 7.4.6
-      "@storybook/core-common": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/csf": 0.1.1
-      "@storybook/csf-tools": 7.4.6
-      "@storybook/docs-mdx": 0.1.0
-      "@storybook/global": 5.0.0
-      "@storybook/manager": 7.4.6
-      "@storybook/node-logger": 7.4.6
-      "@storybook/preview-api": 7.4.6
-      "@storybook/telemetry": 7.4.6
-      "@storybook/types": 7.4.6
-      "@types/detect-port": 1.3.3
-      "@types/node": 16.18.58
-      "@types/pretty-hrtime": 1.0.1
-      "@types/semver": 7.5.3
+      '@aw-web-design/x-default-browser': 1.4.126
+      '@discoveryjs/json-ext': 0.5.7
+      '@storybook/builder-manager': 7.4.6
+      '@storybook/channels': 7.4.6
+      '@storybook/core-common': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/csf': 0.1.1
+      '@storybook/csf-tools': 7.4.6
+      '@storybook/docs-mdx': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/manager': 7.4.6
+      '@storybook/node-logger': 7.4.6
+      '@storybook/preview-api': 7.4.6
+      '@storybook/telemetry': 7.4.6
+      '@storybook/types': 7.4.6
+      '@types/detect-port': 1.3.3
+      '@types/node': 16.18.58
+      '@types/pretty-hrtime': 1.0.1
+      '@types/semver': 7.5.3
       better-opn: 3.0.2
       chalk: 4.1.2
       cli-table3: 0.6.3
       compression: 1.7.4
       detect-port: 1.5.1
-      express: 4.18.2
+      express: 4.19.2
       fs-extra: 11.1.1
       globby: 11.1.0
       ip: 2.0.0
@@ -9498,7 +10438,7 @@ packages:
   /@storybook/csf-plugin@7.4.6:
     resolution: {integrity: sha512-yi7Qa4NSqKOyiJTWCxlB0ih2ijXq6oY5qZKW6MuMMBP14xJNRGLbH5KabpfXgN2T7YECcOWG1uWaGj2veJb1KA==}
     dependencies:
-      "@storybook/csf-tools": 7.4.6
+      '@storybook/csf-tools': 7.4.6
       unplugin: 1.5.0
     transitivePeerDependencies:
       - supports-color
@@ -9507,12 +10447,12 @@ packages:
   /@storybook/csf-tools@7.4.6:
     resolution: {integrity: sha512-ocKpcIUtTBy6hlLY34RUFQyX403cWpB2gGfqvkHbpGe2BQj7EyV0zpWnjsfVxvw+M9OWlCdxHWDOPUgXM33ELw==}
     dependencies:
-      "@babel/generator": 7.23.0
-      "@babel/parser": 7.23.0
-      "@babel/traverse": 7.23.0
-      "@babel/types": 7.23.0
-      "@storybook/csf": 0.1.1
-      "@storybook/types": 7.4.6
+      '@babel/generator': 7.23.6
+      '@babel/parser': 7.23.9
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
+      '@storybook/csf': 0.1.1
+      '@storybook/types': 7.4.6
       fs-extra: 11.1.1
       recast: 0.23.4
       ts-dedent: 2.2.0
@@ -9533,10 +10473,10 @@ packages:
   /@storybook/docs-tools@7.4.6:
     resolution: {integrity: sha512-nZj1L/8WwKWWJ41FW4MaKGajZUtrhnr9UwflRCkQJaWhAKmDfOb5M5TqI93uCOULpFPOm5wpoMBz2IHInQ2Lrg==}
     dependencies:
-      "@storybook/core-common": 7.4.6
-      "@storybook/preview-api": 7.4.6
-      "@storybook/types": 7.4.6
-      "@types/doctrine": 0.0.3
+      '@storybook/core-common': 7.4.6
+      '@storybook/preview-api': 7.4.6
+      '@storybook/types': 7.4.6
+      '@types/doctrine': 0.0.3
       doctrine: 3.0.0
       lodash: 4.17.21
     transitivePeerDependencies:
@@ -9551,11 +10491,11 @@ packages:
   /@storybook/instrumenter@7.4.6:
     resolution: {integrity: sha512-K5atRoVFCl6HEgkSxIbwygpzgE/iROc7BrtJ3z3a7E70sanFr6Jxt6Egu6fz2QkL3ef4EWpXMnle2vhEfG29pA==}
     dependencies:
-      "@storybook/channels": 7.4.6
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/preview-api": 7.4.6
+      '@storybook/channels': 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 7.4.6
     dev: true
 
   /@storybook/manager-api@7.4.6(react-dom@18.2.0)(react@18.2.0):
@@ -9564,14 +10504,14 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      "@storybook/channels": 7.4.6
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/csf": 0.1.1
-      "@storybook/global": 5.0.0
-      "@storybook/router": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/theming": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
+      '@storybook/channels': 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/csf': 0.1.1
+      '@storybook/global': 5.0.0
+      '@storybook/router': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
@@ -9602,13 +10542,13 @@ packages:
   /@storybook/preview-api@7.4.6:
     resolution: {integrity: sha512-byUS/Opt3ytWD4cWz3sNEKw5Yks8MkQgRN+GDSyIomaEAQkLAM0rchPC0MYjwCeUSecV7IIQweNX5RbV4a34BA==}
     dependencies:
-      "@storybook/channels": 7.4.6
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-events": 7.4.6
-      "@storybook/csf": 0.1.1
-      "@storybook/global": 5.0.0
-      "@storybook/types": 7.4.6
-      "@types/qs": 6.9.8
+      '@storybook/channels': 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-events': 7.4.6
+      '@storybook/csf': 0.1.1
+      '@storybook/global': 5.0.0
+      '@storybook/types': 7.4.6
+      '@types/qs': 6.9.8
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
@@ -9632,27 +10572,27 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/react-vite@7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)(vite@4.4.11):
+  /@storybook/react-vite@7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)(vite@4.5.2):
     resolution: {integrity: sha512-jkjnrf3FxzR5wcmebXRPflrsM4WIDjWyW/NVFJwxi5PeIOk7fE7/QAPrm4NFRUu2Q7DeuH3oLKsw8bigvUI9RA==}
-    engines: {node: ">=16"}
+    engines: {node: '>=16'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
       vite: ^3.0.0 || ^4.0.0
     dependencies:
-      "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1(typescript@5.2.2)(vite@4.4.11)
-      "@rollup/pluginutils": 5.0.5
-      "@storybook/builder-vite": 7.4.6(typescript@5.2.2)(vite@4.4.11)
-      "@storybook/react": 7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)
-      "@vitejs/plugin-react": 3.1.0(vite@4.4.11)
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.2.2)(vite@4.5.2)
+      '@rollup/pluginutils': 5.0.5
+      '@storybook/builder-vite': 7.4.6(typescript@5.2.2)(vite@4.5.2)
+      '@storybook/react': 7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2)
+      '@vitejs/plugin-react': 3.1.0(vite@4.5.2)
       ast-types: 0.14.2
       magic-string: 0.30.4
       react: 18.2.0
       react-docgen: 6.0.0-alpha.3
       react-dom: 18.2.0(react@18.2.0)
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 4.5.2
     transitivePeerDependencies:
-      - "@preact/preset-vite"
+      - '@preact/preset-vite'
       - encoding
       - rollup
       - supports-color
@@ -9662,25 +10602,25 @@ packages:
 
   /@storybook/react@7.4.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2):
     resolution: {integrity: sha512-w0dVo64baFFPTGpUOWFqkKsu6pQincoymegSNgqaBd5DxEyMDRiRoTWSJHMKE9BwgE8SyWhRkP1ak1mkccSOhQ==}
-    engines: {node: ">=16.0.0"}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-client": 7.4.6
-      "@storybook/docs-tools": 7.4.6
-      "@storybook/global": 5.0.0
-      "@storybook/preview-api": 7.4.6
-      "@storybook/react-dom-shim": 7.4.6(react-dom@18.2.0)(react@18.2.0)
-      "@storybook/types": 7.4.6
-      "@types/escodegen": 0.0.6
-      "@types/estree": 0.0.51
-      "@types/node": 16.18.58
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-client': 7.4.6
+      '@storybook/docs-tools': 7.4.6
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 7.4.6
+      '@storybook/react-dom-shim': 7.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.4.6
+      '@types/escodegen': 0.0.6
+      '@types/estree': 0.0.51
+      '@types/node': 16.18.58
       acorn: 7.4.1
       acorn-jsx: 5.3.2(acorn@7.4.1)
       acorn-walk: 7.2.0
@@ -9706,7 +10646,7 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      "@storybook/client-logger": 7.4.6
+      '@storybook/client-logger': 7.4.6
       memoizerific: 1.11.3
       qs: 6.11.2
       react: 18.2.0
@@ -9716,9 +10656,9 @@ packages:
   /@storybook/telemetry@7.4.6:
     resolution: {integrity: sha512-c8p/C1NIH8EMBviZkBCx8MMDk6rrITJ+b29DEp5MaWSRlklIVyhGiC4RPIRv6sxJwlD41PnqWVFtfu2j2eXLdQ==}
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/core-common": 7.4.6
-      "@storybook/csf-tools": 7.4.6
+      '@storybook/client-logger': 7.4.6
+      '@storybook/core-common': 7.4.6
+      '@storybook/csf-tools': 7.4.6
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.6
@@ -9732,10 +10672,10 @@ packages:
   /@storybook/testing-library@0.1.0:
     resolution: {integrity: sha512-g947f4LJZw3IluBhysMKLJXByAFiSxnGuooENqU+ZPt/GTrz1I9GDBlhmoTJahuFkVbwHvziAl/8riY2Re921g==}
     dependencies:
-      "@storybook/client-logger": 7.4.6
-      "@storybook/instrumenter": 7.4.6
-      "@testing-library/dom": 8.20.1
-      "@testing-library/user-event": 13.5.0(@testing-library/dom@8.20.1)
+      '@storybook/client-logger': 7.4.6
+      '@storybook/instrumenter': 7.4.6
+      '@testing-library/dom': 8.20.1
+      '@testing-library/user-event': 13.5.0(@testing-library/dom@8.20.1)
       ts-dedent: 2.2.0
     dev: true
 
@@ -9745,9 +10685,9 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      "@emotion/use-insertion-effect-with-fallbacks": 1.0.1(react@18.2.0)
-      "@storybook/client-logger": 7.4.6
-      "@storybook/global": 5.0.0
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
+      '@storybook/client-logger': 7.4.6
+      '@storybook/global': 5.0.0
       memoizerific: 1.11.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -9756,125 +10696,130 @@ packages:
   /@storybook/types@7.4.6:
     resolution: {integrity: sha512-6QLXtMVsFZFpzPkdGWsu/iuc8na9dnS67AMOBKm5qCLPwtUJOYkwhMdFRSSeJthLRpzV7JLAL8Kwvl7MFP3QSw==}
     dependencies:
-      "@storybook/channels": 7.4.6
-      "@types/babel__core": 7.20.2
-      "@types/express": 4.17.18
+      '@storybook/channels': 7.4.6
+      '@types/babel__core': 7.20.2
+      '@types/express': 4.17.18
       file-system-cache: 2.3.0
     dev: true
 
-  /@swc/core-darwin-arm64@1.3.92:
-    resolution: {integrity: sha512-v7PqZUBtIF6Q5Cp48gqUiG8zQQnEICpnfNdoiY3xjQAglCGIQCjJIDjreZBoeZQZspB27lQN4eZ43CX18+2SnA==}
-    engines: {node: ">=10"}
+  /@supercharge/promise-pool@3.2.0:
+    resolution: {integrity: sha512-pj0cAALblTZBPtMltWOlZTQSLT07jIaFNeM8TWoJD1cQMgDB9mcMlVMoetiB35OzNJpqQ2b+QEtwiR9f20mADg==}
+    engines: {node: '>=8'}
+    dev: false
+
+  /@swc/core-darwin-arm64@1.4.2:
+    resolution: {integrity: sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw==}
+    engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-darwin-x64@1.3.92:
-    resolution: {integrity: sha512-Q3XIgQfXyxxxms3bPN+xGgvwk0TtG9l89IomApu+yTKzaIIlf051mS+lGngjnh9L0aUiCp6ICyjDLtutWP54fw==}
-    engines: {node: ">=10"}
+  /@swc/core-darwin-x64@1.4.2:
+    resolution: {integrity: sha512-TYD28+dCQKeuxxcy7gLJUCFLqrwDZnHtC2z7cdeGfZpbI2mbfppfTf2wUPzqZk3gEC96zHd4Yr37V3Tvzar+lQ==}
+    engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf@1.3.92:
-    resolution: {integrity: sha512-tnOCoCpNVXC+0FCfG84PBZJyLlz0Vfj9MQhyhCvlJz9hQmvpf8nTdKH7RHrOn8VfxtUBLdVi80dXgIFgbvl7qA==}
-    engines: {node: ">=10"}
+  /@swc/core-linux-arm-gnueabihf@1.4.2:
+    resolution: {integrity: sha512-Eyqipf7ZPGj0vplKHo8JUOoU1un2sg5PjJMpEesX0k+6HKE2T8pdyeyXODN0YTFqzndSa/J43EEPXm+rHAsLFQ==}
+    engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu@1.3.92:
-    resolution: {integrity: sha512-lFfGhX32w8h1j74Iyz0Wv7JByXIwX11OE9UxG+oT7lG0RyXkF4zKyxP8EoxfLrDXse4Oop434p95e3UNC3IfCw==}
-    engines: {node: ">=10"}
+  /@swc/core-linux-arm64-gnu@1.4.2:
+    resolution: {integrity: sha512-wZn02DH8VYPv3FC0ub4my52Rttsus/rFw+UUfzdb3tHMHXB66LqN+rR0ssIOZrH6K+VLN6qpTw9VizjyoH0BxA==}
+    engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-linux-arm64-musl@1.3.92:
-    resolution: {integrity: sha512-rOZtRcLj57MSAbiecMsqjzBcZDuaCZ8F6l6JDwGkQ7u1NYR57cqF0QDyU7RKS1Jq27Z/Vg21z5cwqoH5fLN+Sg==}
-    engines: {node: ">=10"}
+  /@swc/core-linux-arm64-musl@1.4.2:
+    resolution: {integrity: sha512-3G0D5z9hUj9bXNcwmA1eGiFTwe5rWkuL3DsoviTj73TKLpk7u64ND0XjEfO0huVv4vVu9H1jodrKb7nvln/dlw==}
+    engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-linux-x64-gnu@1.3.92:
-    resolution: {integrity: sha512-qptoMGnBL6v89x/Qpn+l1TH1Y0ed+v0qhNfAEVzZvCvzEMTFXphhlhYbDdpxbzRmCjH6GOGq7Y+xrWt9T1/ARg==}
-    engines: {node: ">=10"}
+  /@swc/core-linux-x64-gnu@1.4.2:
+    resolution: {integrity: sha512-LFxn9U8cjmYHw3jrdPNqPAkBGglKE3tCZ8rA7hYyp0BFxuo7L2ZcEnPm4RFpmSCCsExFH+LEJWuMGgWERoktvg==}
+    engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-linux-x64-musl@1.3.92:
-    resolution: {integrity: sha512-g2KrJ43bZkCZHH4zsIV5ErojuV1OIpUHaEyW1gf7JWKaFBpWYVyubzFPvPkjcxHGLbMsEzO7w/NVfxtGMlFH/Q==}
-    engines: {node: ">=10"}
+  /@swc/core-linux-x64-musl@1.4.2:
+    resolution: {integrity: sha512-dp0fAmreeVVYTUcb4u9njTPrYzKnbIH0EhH2qvC9GOYNNREUu2GezSIDgonjOXkHiTCvopG4xU7y56XtXj4VrQ==}
+    engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc@1.3.92:
-    resolution: {integrity: sha512-3MCRGPAYDoQ8Yyd3WsCMc8eFSyKXY5kQLyg/R5zEqA0uthomo0m0F5/fxAJMZGaSdYkU1DgF73ctOWOf+Z/EzQ==}
-    engines: {node: ">=10"}
+  /@swc/core-win32-arm64-msvc@1.4.2:
+    resolution: {integrity: sha512-HlVIiLMQkzthAdqMslQhDkoXJ5+AOLUSTV6fm6shFKZKqc/9cJvr4S8UveNERL9zUficA36yM3bbfo36McwnvQ==}
+    engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc@1.3.92:
-    resolution: {integrity: sha512-zqTBKQhgfWm73SVGS8FKhFYDovyRl1f5dTX1IwSKynO0qHkRCqJwauFJv/yevkpJWsI2pFh03xsRs9HncTQKSA==}
-    engines: {node: ">=10"}
+  /@swc/core-win32-ia32-msvc@1.4.2:
+    resolution: {integrity: sha512-WCF8faPGjCl4oIgugkp+kL9nl3nUATlzKXCEGFowMEmVVCFM0GsqlmGdPp1pjZoWc9tpYanoXQDnp5IvlDSLhA==}
+    engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core-win32-x64-msvc@1.3.92:
-    resolution: {integrity: sha512-41bE66ddr9o/Fi1FBh0sHdaKdENPTuDpv1IFHxSg0dJyM/jX8LbkjnpdInYXHBxhcLVAPraVRrNsC4SaoPw2Pg==}
-    engines: {node: ">=10"}
+  /@swc/core-win32-x64-msvc@1.4.2:
+    resolution: {integrity: sha512-oV71rwiSpA5xre2C5570BhCsg1HF97SNLsZ/12xv7zayGzqr3yvFALFJN8tHKpqUdCB4FGPjoP3JFdV3i+1wUw==}
+    engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@swc/core@1.3.92:
-    resolution: {integrity: sha512-vx0vUrf4YTEw59njOJ46Ha5i0cZTMYdRHQ7KXU29efN1MxcmJH2RajWLPlvQarOP1ab9iv9cApD7SMchDyx2vA==}
-    engines: {node: ">=10"}
+  /@swc/core@1.4.2:
+    resolution: {integrity: sha512-vWgY07R/eqj1/a0vsRKLI9o9klGZfpLNOVEnrv4nrccxBgYPjcf22IWwAoaBJ+wpA7Q4fVjCUM8lP0m01dpxcg==}
+    engines: {node: '>=10'}
     requiresBuild: true
     peerDependencies:
-      "@swc/helpers": ^0.5.0
+      '@swc/helpers': ^0.5.0
     peerDependenciesMeta:
-      "@swc/helpers":
+      '@swc/helpers':
         optional: true
     dependencies:
-      "@swc/counter": 0.1.2
-      "@swc/types": 0.1.5
+      '@swc/counter': 0.1.2
+      '@swc/types': 0.1.5
     optionalDependencies:
-      "@swc/core-darwin-arm64": 1.3.92
-      "@swc/core-darwin-x64": 1.3.92
-      "@swc/core-linux-arm-gnueabihf": 1.3.92
-      "@swc/core-linux-arm64-gnu": 1.3.92
-      "@swc/core-linux-arm64-musl": 1.3.92
-      "@swc/core-linux-x64-gnu": 1.3.92
-      "@swc/core-linux-x64-musl": 1.3.92
-      "@swc/core-win32-arm64-msvc": 1.3.92
-      "@swc/core-win32-ia32-msvc": 1.3.92
-      "@swc/core-win32-x64-msvc": 1.3.92
+      '@swc/core-darwin-arm64': 1.4.2
+      '@swc/core-darwin-x64': 1.4.2
+      '@swc/core-linux-arm-gnueabihf': 1.4.2
+      '@swc/core-linux-arm64-gnu': 1.4.2
+      '@swc/core-linux-arm64-musl': 1.4.2
+      '@swc/core-linux-x64-gnu': 1.4.2
+      '@swc/core-linux-x64-musl': 1.4.2
+      '@swc/core-win32-arm64-msvc': 1.4.2
+      '@swc/core-win32-ia32-msvc': 1.4.2
+      '@swc/core-win32-x64-msvc': 1.4.2
     dev: true
 
   /@swc/counter@0.1.2:
@@ -9885,20 +10830,25 @@ packages:
     resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==}
     dev: true
 
-  /@szmarczak/http-timer@5.0.1:
-    resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
-    engines: {node: ">=14.16"}
+  /@tailwindcss/forms@0.5.7(tailwindcss@3.4.3):
+    resolution: {integrity: sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==}
+    peerDependencies:
+      tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1'
     dependencies:
-      defer-to-connect: 2.0.1
-    dev: true
+      mini-svg-data-uri: 1.4.4
+      tailwindcss: 3.4.3
 
-  /@tailwindcss/forms@0.5.6(tailwindcss@3.3.3):
-    resolution: {integrity: sha512-Fw+2BJ0tmAwK/w01tEFL5TiaJBX1NLT1/YbWgvm7ws3Qcn11kiXxzNTEQDMs5V3mQemhB56l3u0i9dwdzSQldA==}
+  /@tailwindcss/typography@0.5.12(tailwindcss@3.4.3):
+    resolution: {integrity: sha512-CNwpBpconcP7ppxmuq3qvaCxiRWnbhANpY/ruH4L5qs2GCiVDJXde/pjj2HWPV1+Q4G9+V/etrwUYopdcjAlyg==}
     peerDependencies:
-      tailwindcss: ">=3.0.0 || >= 3.0.0-alpha.1"
+      tailwindcss: '>=3.0.0 || insiders'
     dependencies:
-      mini-svg-data-uri: 1.4.4
-      tailwindcss: 3.3.3
+      lodash.castarray: 4.4.0
+      lodash.isplainobject: 4.0.6
+      lodash.merge: 4.6.2
+      postcss-selector-parser: 6.0.10
+      tailwindcss: 3.4.3
+    dev: false
 
   /@tanstack/query-core@4.36.1:
     resolution: {integrity: sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA==}
@@ -9909,14 +10859,14 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-native: "*"
+      react-native: '*'
     peerDependenciesMeta:
       react-dom:
         optional: true
       react-native:
         optional: true
     dependencies:
-      "@tanstack/query-core": 4.36.1
+      '@tanstack/query-core': 4.36.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       use-sync-external-store: 1.2.0(react@18.2.0)
@@ -9924,11 +10874,11 @@ packages:
 
   /@testing-library/dom@8.20.1:
     resolution: {integrity: sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
-      "@babel/code-frame": 7.22.13
-      "@babel/runtime": 7.23.1
-      "@types/aria-query": 5.0.2
+      '@babel/code-frame': 7.22.13
+      '@babel/runtime': 7.23.1
+      '@types/aria-query': 5.0.2
       aria-query: 5.1.3
       chalk: 4.1.2
       dom-accessibility-api: 0.5.16
@@ -9938,11 +10888,11 @@ packages:
 
   /@testing-library/dom@9.3.3:
     resolution: {integrity: sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     dependencies:
-      "@babel/code-frame": 7.22.13
-      "@babel/runtime": 7.23.1
-      "@types/aria-query": 5.0.2
+      '@babel/code-frame': 7.22.13
+      '@babel/runtime': 7.23.1
+      '@types/aria-query': 5.0.2
       aria-query: 5.1.3
       chalk: 4.1.2
       dom-accessibility-api: 0.5.16
@@ -9952,103 +10902,70 @@ packages:
 
   /@testing-library/react@14.0.0(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     peerDependencies:
       react: ^18.0.0
       react-dom: ^18.0.0
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@testing-library/dom": 9.3.3
-      "@types/react-dom": 18.2.11
+      '@babel/runtime': 7.23.1
+      '@testing-library/dom': 9.3.3
+      '@types/react-dom': 18.2.11
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
   /@testing-library/user-event@13.5.0(@testing-library/dom@8.20.1):
     resolution: {integrity: sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==}
-    engines: {node: ">=10", npm: ">=6"}
+    engines: {node: '>=10', npm: '>=6'}
     peerDependencies:
-      "@testing-library/dom": ">=7.21.4"
+      '@testing-library/dom': '>=7.21.4'
     dependencies:
-      "@babel/runtime": 7.23.1
-      "@testing-library/dom": 8.20.1
-    dev: true
-
-  /@tootallnate/once@1.1.2:
-    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
-    engines: {node: ">= 6"}
+      '@babel/runtime': 7.23.1
+      '@testing-library/dom': 8.20.1
     dev: true
 
   /@tootallnate/once@2.0.0:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
+    dev: false
 
-  /@trpc/client@10.40.0(@trpc/server@10.40.0):
-    resolution: {integrity: sha512-bT6BcdWjj0KzGQiimE6rB2tIaRYX0Ear4Gthb5szN/c01wrP0yC1Fbz2uCcm/QTVAwu4Lve5M+YjPoEaTHG6lg==}
+  /@trpc/client@10.45.2(@trpc/server@10.45.2):
+    resolution: {integrity: sha512-ykALM5kYWTLn1zYuUOZ2cPWlVfrXhc18HzBDyRhoPYN0jey4iQHEFSEowfnhg1RvYnrAVjNBgHNeSAXjrDbGwg==}
     peerDependencies:
-      "@trpc/server": 10.40.0
+      '@trpc/server': 10.45.2
     dependencies:
-      "@trpc/server": 10.40.0
+      '@trpc/server': 10.45.2
 
-  /@trpc/react-query@10.40.0(@tanstack/react-query@4.36.1)(@trpc/client@10.40.0)(@trpc/server@10.40.0)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-DpJrV3lmYNo9xtPtcg49lfh9CUFap3ZivjhlSmfe4QPf7H6xBjAE+ml4OdJ0RmKvSTFvbLSOiNdB1k5O8zIdzQ==}
+  /@trpc/react-query@10.45.2(@tanstack/react-query@4.36.1)(@trpc/client@10.45.2)(@trpc/server@10.45.2)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-BAqb9bGZIscroradlNx+Cc9522R+idY3BOSf5z0jHUtkxdMbjeGKxSSMxxu7JzoLqSIEC+LVzL3VvF8sdDWaZQ==}
     peerDependencies:
-      "@tanstack/react-query": ^4.18.0
-      "@trpc/client": 10.40.0
-      "@trpc/server": 10.40.0
-      react: ">=16.8.0"
-      react-dom: ">=16.8.0"
+      '@tanstack/react-query': ^4.18.0
+      '@trpc/client': 10.45.2
+      '@trpc/server': 10.45.2
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
     dependencies:
-      "@tanstack/react-query": 4.36.1(react-dom@18.2.0)(react@18.2.0)
-      "@trpc/client": 10.40.0(@trpc/server@10.40.0)
-      "@trpc/server": 10.40.0
+      '@tanstack/react-query': 4.36.1(react-dom@18.2.0)(react@18.2.0)
+      '@trpc/client': 10.45.2(@trpc/server@10.45.2)
+      '@trpc/server': 10.45.2
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@trpc/server@10.40.0:
-    resolution: {integrity: sha512-49SUOMWzSZtu5+OdrADmJD+u+sjSE0qj1cWgYk2FY4jLkPJunLuNRuhzM7aOeBhiUjyfhg2YTfur8FN1WBmvEw==}
-
-  /@tsconfig/node10@1.0.9:
-    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
-    dev: true
-
-  /@tsconfig/node12@1.0.11:
-    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
-    dev: true
-
-  /@tsconfig/node14@1.0.3:
-    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
-    dev: true
-
-  /@tsconfig/node16@1.0.4:
-    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
-    dev: true
-
-  /@tufjs/canonical-json@1.0.0:
-    resolution: {integrity: sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
+  /@trpc/server@10.45.2:
+    resolution: {integrity: sha512-wOrSThNNE4HUnuhJG6PfDRp4L2009KDVxsd+2VYH8ro6o/7/jwYZ8Uu5j+VaW+mOmc8EHerHzGcdbGNQSAUPgg==}
 
   /@tufjs/canonical-json@2.0.0:
     resolution: {integrity: sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dev: false
 
-  /@tufjs/models@1.0.4:
-    resolution: {integrity: sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      "@tufjs/canonical-json": 1.0.0
-      minimatch: 9.0.3
-    dev: true
-
   /@tufjs/models@2.0.0:
     resolution: {integrity: sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@tufjs/canonical-json": 2.0.0
-      minimatch: 9.0.3
+      '@tufjs/canonical-json': 2.0.0
+      minimatch: 9.0.4
     dev: false
 
   /@types/aria-query@5.0.2:
@@ -10061,37 +10978,47 @@ packages:
   /@types/babel__core@7.20.2:
     resolution: {integrity: sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==}
     dependencies:
-      "@babel/parser": 7.23.0
-      "@babel/types": 7.23.0
-      "@types/babel__generator": 7.6.5
-      "@types/babel__template": 7.4.2
-      "@types/babel__traverse": 7.20.2
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
+      '@types/babel__generator': 7.6.5
+      '@types/babel__template': 7.4.2
+      '@types/babel__traverse': 7.20.2
+    dev: true
+
+  /@types/babel__core@7.20.5:
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
+    dependencies:
+      '@babel/parser': 7.23.3
+      '@babel/types': 7.23.6
+      '@types/babel__generator': 7.6.5
+      '@types/babel__template': 7.4.2
+      '@types/babel__traverse': 7.20.2
     dev: true
 
   /@types/babel__generator@7.6.5:
     resolution: {integrity: sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@types/babel__template@7.4.2:
     resolution: {integrity: sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==}
     dependencies:
-      "@babel/parser": 7.23.0
-      "@babel/types": 7.23.0
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
     dev: true
 
   /@types/babel__traverse@7.20.2:
     resolution: {integrity: sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==}
     dependencies:
-      "@babel/types": 7.23.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@types/body-parser@1.19.3:
     resolution: {integrity: sha512-oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ==}
     dependencies:
-      "@types/connect": 3.4.36
-      "@types/node": 18.18.4
+      '@types/connect': 3.4.36
+      '@types/node': 20.14.2
     dev: true
 
   /@types/btoa-lite@1.0.0:
@@ -10101,35 +11028,35 @@ packages:
   /@types/cacache@17.0.0:
     resolution: {integrity: sha512-4BfoYFzkHdmINTyUIX9MSbKUkntVPR082FRnNc+5KlvvebrcxWWhfP3MRQ28QgfFncP3fTKCuemDYJqFjmWEAA==}
     dependencies:
-      "@types/node": 18.18.4
-    dev: true
-
-  /@types/chai-subset@1.3.3:
-    resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
-    dependencies:
-      "@types/chai": 4.3.6
+      '@types/node': 20.14.2
     dev: true
 
-  /@types/chai@4.3.6:
-    resolution: {integrity: sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==}
-    dev: true
+  /@types/caseless@0.12.4:
+    resolution: {integrity: sha512-2in/lrHRNmDvHPgyormtEralhPcN3An1gLjJzj2Bw145VBxkQ75JEXW6CTdMAwShiHQcYsl2d10IjQSdJSJz4g==}
+    dev: false
 
   /@types/connect@3.4.36:
     resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: true
 
   /@types/cors@2.8.14:
     resolution: {integrity: sha512-RXHUvNWYICtbP6s18PnOCaqToK8y14DnLd75c6HfyKf228dxy7pHNOQkxPtvXKp/hINFMDjbYzsj63nnpPMSRQ==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.11.0
     dev: true
 
   /@types/cross-spawn@6.0.3:
     resolution: {integrity: sha512-BDAkU7WHHRHnvBf5z89lcvACsvkz/n7Tv+HyD/uW76O29HoH1Tk/W6iQrepaZVbisvlEek4ygwT8IW7ow9XLAA==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
+    dev: true
+
+  /@types/cross-spawn@6.0.6:
+    resolution: {integrity: sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==}
+    dependencies:
+      '@types/node': 20.11.0
     dev: true
 
   /@types/d3-color@3.1.1:
@@ -10139,7 +11066,7 @@ packages:
   /@types/d3-interpolate@3.0.2:
     resolution: {integrity: sha512-zAbCj9lTqW9J9PlF4FwnvEjXZUy75NQqPm7DMHZXuxCFTpuTrdK2NMYGQekf4hlasL78fCYOLu4EE3/tXElwow==}
     dependencies:
-      "@types/d3-color": 3.1.1
+      '@types/d3-color': 3.1.1
     dev: true
 
   /@types/d3-selection@3.0.7:
@@ -10149,20 +11076,20 @@ packages:
   /@types/d3-zoom@3.0.5:
     resolution: {integrity: sha512-mIefdTLtxuWUWTbBupCUXPAXVPmi8/Uwrq41gQpRh0rD25GMU1ku+oTELqNY2NuuiI0F3wXC5e1liBQi7YS7XQ==}
     dependencies:
-      "@types/d3-interpolate": 3.0.2
-      "@types/d3-selection": 3.0.7
+      '@types/d3-interpolate': 3.0.2
+      '@types/d3-selection': 3.0.7
     dev: true
 
   /@types/debug@4.1.12:
     resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
     dependencies:
-      "@types/ms": 0.7.34
+      '@types/ms': 0.7.34
     dev: false
 
   /@types/debug@4.1.9:
     resolution: {integrity: sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==}
     dependencies:
-      "@types/ms": 0.7.32
+      '@types/ms': 0.7.32
     dev: true
 
   /@types/detect-port@1.3.3:
@@ -10188,15 +11115,15 @@ packages:
   /@types/eslint-scope@3.7.5:
     resolution: {integrity: sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==}
     dependencies:
-      "@types/eslint": 8.44.3
-      "@types/estree": 1.0.2
+      '@types/eslint': 8.44.3
+      '@types/estree': 1.0.2
     dev: true
 
   /@types/eslint@8.44.3:
     resolution: {integrity: sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==}
     dependencies:
-      "@types/estree": 1.0.2
-      "@types/json-schema": 7.0.13
+      '@types/estree': 1.0.2
+      '@types/json-schema': 7.0.13
     dev: true
 
   /@types/estree@0.0.51:
@@ -10207,22 +11134,26 @@ packages:
     resolution: {integrity: sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==}
     dev: true
 
+  /@types/estree@1.0.5:
+    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
+    dev: true
+
   /@types/express-serve-static-core@4.17.37:
     resolution: {integrity: sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg==}
     dependencies:
-      "@types/node": 18.18.4
-      "@types/qs": 6.9.8
-      "@types/range-parser": 1.2.5
-      "@types/send": 0.17.2
+      '@types/node': 20.14.2
+      '@types/qs': 6.9.8
+      '@types/range-parser': 1.2.5
+      '@types/send': 0.17.2
     dev: true
 
   /@types/express@4.17.18:
     resolution: {integrity: sha512-Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ==}
     dependencies:
-      "@types/body-parser": 1.19.3
-      "@types/express-serve-static-core": 4.17.37
-      "@types/qs": 6.9.8
-      "@types/serve-static": 1.15.3
+      '@types/body-parser': 1.19.3
+      '@types/express-serve-static-core': 4.17.37
+      '@types/qs': 6.9.8
+      '@types/serve-static': 1.15.3
     dev: true
 
   /@types/find-cache-dir@3.2.1:
@@ -10232,52 +11163,42 @@ packages:
   /@types/fs-extra@11.0.2:
     resolution: {integrity: sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==}
     dependencies:
-      "@types/jsonfile": 6.1.2
-      "@types/node": 18.18.4
-    dev: true
-
-  /@types/fs-extra@8.1.4:
-    resolution: {integrity: sha512-OMcQKnlrkrOI0TaZ/MgVDA8LYFl7CykzFsjMj9l5x3un2nFxCY20ZFlnqrM0lcqlbs0Yro2HbnZlmopyRaoJ5w==}
-    dependencies:
-      "@types/node": 18.18.4
+      '@types/jsonfile': 6.1.2
+      '@types/node': 20.14.2
     dev: true
 
   /@types/fs-extra@9.0.13:
     resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.11.0
     dev: true
 
   /@types/glob@7.2.0:
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
     dependencies:
-      "@types/minimatch": 5.1.2
-      "@types/node": 18.18.4
+      '@types/minimatch': 5.1.2
+      '@types/node': 20.14.2
     dev: true
 
   /@types/glob@8.1.0:
     resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==}
     dependencies:
-      "@types/minimatch": 5.1.2
-      "@types/node": 18.18.4
+      '@types/minimatch': 5.1.2
+      '@types/node': 20.14.2
     dev: false
 
   /@types/graceful-fs@4.1.7:
     resolution: {integrity: sha512-MhzcwU8aUygZroVwL2jeYk6JisJrPl/oov/gsgGCue9mkgl9wjGbzReYQClxiUgFDnib9FuHqTndccKeZKxTRw==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: true
 
   /@types/hast@3.0.3:
     resolution: {integrity: sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
     dev: false
 
-  /@types/http-cache-semantics@4.0.2:
-    resolution: {integrity: sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==}
-    dev: true
-
   /@types/http-errors@2.0.2:
     resolution: {integrity: sha512-lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg==}
     dev: true
@@ -10285,7 +11206,14 @@ packages:
   /@types/ignore-walk@4.0.1:
     resolution: {integrity: sha512-jve9GxuPfapQBNbsmLB4yTUV/uT16xJTxgnlcEWKcA9D5i1uMqokpyq7eKjrTH0zb1sBx1SAY3xRXSbxqj0fAg==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
+    dev: true
+
+  /@types/inquirer@9.0.7:
+    resolution: {integrity: sha512-Q0zyBupO6NxGRZut/JdmqYKOnN95Eg5V8Csg3PGKkP+FnvsUZx1jAyK7fztIszxxMuoBA6E3KXWvdZVXIpx60g==}
+    dependencies:
+      '@types/through': 0.0.33
+      rxjs: 7.8.1
     dev: true
 
   /@types/istanbul-lib-coverage@2.0.4:
@@ -10295,20 +11223,13 @@ packages:
   /@types/istanbul-lib-report@3.0.1:
     resolution: {integrity: sha512-gPQuzaPR5h/djlAv2apEG1HVOyj1IUs7GpfMZixU0/0KXT3pm64ylHuMUI1/Akh+sq/iikxg6Z2j+fcMDXaaTQ==}
     dependencies:
-      "@types/istanbul-lib-coverage": 2.0.4
+      '@types/istanbul-lib-coverage': 2.0.4
     dev: true
 
   /@types/istanbul-reports@3.0.2:
     resolution: {integrity: sha512-kv43F9eb3Lhj+lr/Hn6OcLCs/sSM8bt+fIaP11rCYngfV6NVjzWXJ17owQtDQTL9tQ8WSLUrGsSJ6rJz0F1w1A==}
     dependencies:
-      "@types/istanbul-lib-report": 3.0.1
-    dev: true
-
-  /@types/jest@27.5.2:
-    resolution: {integrity: sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==}
-    dependencies:
-      jest-matcher-utils: 27.5.1
-      pretty-format: 27.5.1
+      '@types/istanbul-lib-report': 3.0.1
     dev: true
 
   /@types/jest@28.1.8:
@@ -10318,12 +11239,9 @@ packages:
       pretty-format: 28.1.3
     dev: true
 
-  /@types/jest@29.5.5:
-    resolution: {integrity: sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==}
-    dependencies:
-      expect: 29.7.0
-      pretty-format: 29.7.0
-    dev: true
+  /@types/js-cookie@2.2.7:
+    resolution: {integrity: sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==}
+    dev: false
 
   /@types/json-schema@7.0.13:
     resolution: {integrity: sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==}
@@ -10334,47 +11252,57 @@ packages:
   /@types/jsonfile@6.1.2:
     resolution: {integrity: sha512-8t92P+oeW4d/CRQfJaSqEwXujrhH4OEeHRjGU3v1Q8mUS8GPF3yiX26sw4svv6faL2HfBtGTe2xWIoVgN3dy9w==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: true
 
   /@types/jsonwebtoken@9.0.3:
     resolution: {integrity: sha512-b0jGiOgHtZ2jqdPgPnP6WLCXZk1T8p06A/vPGzUvxpFGgKMbjXJDjC5m52ErqBnIuWZFgGoIJyRdeG5AyreJjA==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: true
 
   /@types/lodash.debounce@4.0.7:
     resolution: {integrity: sha512-X1T4wMZ+gT000M2/91SYj0d/7JfeNZ9PeeOldSNoE/lunLeQXKvkmIumI29IaKMotU/ln/McOIvgzZcQ/3TrSA==}
     dependencies:
-      "@types/lodash": 4.14.199
+      '@types/lodash': 4.14.199
+    dev: true
+
+  /@types/lodash.once@4.1.9:
+    resolution: {integrity: sha512-nvZ7GYfyZB6CUmXL+7HSXg53rFpc49FsKuRmMiCIGhgJB/yyTip8uHk4mxGyVJOl87dXPlf3qy42WsjOcIrnmg==}
+    dependencies:
+      '@types/lodash': 4.14.199
     dev: true
 
   /@types/lodash.throttle@4.1.7:
     resolution: {integrity: sha512-znwGDpjCHQ4FpLLx19w4OXDqq8+OvREa05H89obtSyXyOFKL3dDjCslsmfBz0T2FU8dmf5Wx1QvogbINiGIu9g==}
     dependencies:
-      "@types/lodash": 4.14.199
+      '@types/lodash': 4.14.199
     dev: true
 
   /@types/lodash.uniq@4.5.7:
     resolution: {integrity: sha512-qg7DeAbdZMi6DGvCxThlJycykLLhETrJrQZ6F2KaZ+o0sNK1qRHz46lgNA+nHHjwrmA2a91DyiZTp3ey3m1rEw==}
     dependencies:
-      "@types/lodash": 4.14.199
+      '@types/lodash': 4.14.199
     dev: true
 
   /@types/lodash.uniqby@4.7.7:
     resolution: {integrity: sha512-sv2g6vkCIvEUsK5/Vq17haoZaisfj2EWW8mP7QWlnKi6dByoNmeuHDDXHR7sabuDqwO4gvU7ModIL22MmnOocg==}
     dependencies:
-      "@types/lodash": 4.14.199
+      '@types/lodash': 4.14.199
     dev: true
 
   /@types/lodash@4.14.199:
     resolution: {integrity: sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==}
     dev: true
 
+  /@types/long@4.0.2:
+    resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
+    dev: false
+
   /@types/mdast@4.0.3:
     resolution: {integrity: sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
     dev: false
 
   /@types/mdx@2.0.8:
@@ -10411,42 +11339,52 @@ packages:
   /@types/mute-stream@0.0.1:
     resolution: {integrity: sha512-0yQLzYhCqGz7CQPE3iDmYjhb7KMBFOP+tBkyw+/Y2YyDI5wpS7itXXxneN1zSsUwWx3Ji6YiVYrhAnpQGS/vkw==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: true
 
   /@types/mute-stream@0.0.2:
     resolution: {integrity: sha512-FpiGjk6+IOrN0lZEfUUjdra1csU1VxwYFj4S0Zj+TJpu5x5mZW30RkEZojTadrNZHNmpCHgoE62IQZAH0OeuIA==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: true
 
   /@types/node-fetch@2.6.6:
     resolution: {integrity: sha512-95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.11.0
       form-data: 4.0.0
 
   /@types/node-persist@3.1.4:
     resolution: {integrity: sha512-MXwo/ijhPIIKa5jLxwBfs8wTVZzwO36V/a12TSzsm5hAMFiY9CgSzbFobvQEmQTRu778CIIhJoT59KF2BzSYwg==}
     dependencies:
-      "@types/node": 18.18.4
-    dev: true
-
-  /@types/node@16.18.23:
-    resolution: {integrity: sha512-XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g==}
+      '@types/node': 20.11.0
     dev: true
 
   /@types/node@16.18.58:
     resolution: {integrity: sha512-YGncyA25/MaVtQkjWW9r0EFBukZ+JulsLcVZBlGUfIb96OBMjkoRWwQo5IEWJ8Fj06Go3GHw+bjYDitv6BaGsA==}
     dev: true
 
-  /@types/node@18.18.4:
-    resolution: {integrity: sha512-t3rNFBgJRugIhackit2mVcLfF6IRc0JE4oeizPQL8Zrm8n2WY/0wOdpOPhdtG0V9Q2TlW/axbF1MJ6z+Yj/kKQ==}
-
-  /@types/node@20.8.3:
-    resolution: {integrity: sha512-jxiZQFpb+NlH5kjW49vXxvxTjeeqlbsnTAdBTKpzEdPs9itay7MscYXz3Fo9VYFEsfQ6LJFitHad3faerLAjCw==}
+  /@types/node@18.19.7:
+    resolution: {integrity: sha512-IGRJfoNX10N/PfrReRZ1br/7SQ+2vF/tK3KXNwzXz82D32z5dMQEoOlFew18nLSN+vMNcLY4GrKfzwi/yWI8/w==}
+    dependencies:
+      undici-types: 5.26.5
     dev: true
 
+  /@types/node@20.11.0:
+    resolution: {integrity: sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==}
+    dependencies:
+      undici-types: 5.26.5
+
+  /@types/node@20.11.20:
+    resolution: {integrity: sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==}
+    dependencies:
+      undici-types: 5.26.5
+
+  /@types/node@20.14.2:
+    resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==}
+    dependencies:
+      undici-types: 5.26.5
+
   /@types/normalize-package-data@2.4.2:
     resolution: {integrity: sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==}
 
@@ -10457,27 +11395,27 @@ packages:
   /@types/npm-packlist@7.0.1:
     resolution: {integrity: sha512-yXDRMaiBWpn7ZrWU95DSQwsEMOfPCWgOkJlQzLsDToRzNhRW3v6GxZXGjqMEwq5juziJleS6hNfjvwhTAuNZxQ==}
     dependencies:
-      "@types/ignore-walk": 4.0.1
-      "@types/npmcli__arborist": 5.6.2
+      '@types/ignore-walk': 4.0.1
+      '@types/npmcli__arborist': 5.6.2
     dev: true
 
   /@types/npm-registry-fetch@8.0.5:
     resolution: {integrity: sha512-mAyQmKTF/4dhXTeSicltEtMO+Vj/LEUoBkMgDn9tS2fGp8IsrZPkYv2GH0KKBcbFLXUq67wuzYwl0DCZGeRcpw==}
     dependencies:
-      "@types/node": 18.18.4
-      "@types/node-fetch": 2.6.6
-      "@types/npm-package-arg": 6.1.2
-      "@types/npmlog": 4.1.4
-      "@types/ssri": 7.1.2
+      '@types/node': 20.14.2
+      '@types/node-fetch': 2.6.6
+      '@types/npm-package-arg': 6.1.2
+      '@types/npmlog': 4.1.4
+      '@types/ssri': 7.1.2
     dev: true
 
   /@types/npmcli__arborist@5.6.2:
     resolution: {integrity: sha512-WoQds2QiNPxMCOiQXVwfTiHNOSEUyTR0DY2mev+sMMY1c6AxjCFEnbiZsHLDJnIGL363W9IAZz1GD0kQuKvoRg==}
     dependencies:
-      "@npm/types": 1.0.2
-      "@types/cacache": 17.0.0
-      "@types/npmcli__package-json": 4.0.1
-      "@types/pacote": 11.1.6
+      '@npm/types': 1.0.2
+      '@types/cacache': 17.0.0
+      '@types/npmcli__package-json': 4.0.1
+      '@types/pacote': 11.1.6
     dev: true
 
   /@types/npmcli__package-json@4.0.1:
@@ -10491,10 +11429,10 @@ packages:
   /@types/pacote@11.1.6:
     resolution: {integrity: sha512-Uh0+ivCS2p+pMFZmU1u20sGi7O8BJnBOCuNXsBaAMD/6/NIcbI/CcnBUNpTeVhOuFmOwn9/z8BxprpPhL+UkVg==}
     dependencies:
-      "@types/node": 18.18.4
-      "@types/npm-registry-fetch": 8.0.5
-      "@types/npmlog": 4.1.4
-      "@types/ssri": 7.1.2
+      '@types/node': 20.14.2
+      '@types/npm-registry-fetch': 8.0.5
+      '@types/npmlog': 4.1.4
+      '@types/ssri': 7.1.2
     dev: true
 
   /@types/prettier@2.6.0:
@@ -10519,16 +11457,25 @@ packages:
   /@types/react-dom@18.2.11:
     resolution: {integrity: sha512-zq6Dy0EiCuF9pWFW6I6k6W2LdpUixLE4P6XjXU1QHLfak3GPACQfLwEuHzY5pOYa4hzj1d0GxX/P141aFjZsyg==}
     dependencies:
-      "@types/react": 18.2.25
+      '@types/react': 18.2.25
     dev: true
 
   /@types/react@18.2.25:
     resolution: {integrity: sha512-24xqse6+VByVLIr+xWaQ9muX1B4bXJKXBbjszbld/UEDslGLY53+ZucF44HCmLbMPejTzGG9XgR+3m2/Wqu1kw==}
     dependencies:
-      "@types/prop-types": 15.7.8
-      "@types/scheduler": 0.16.4
+      '@types/prop-types': 15.7.8
+      '@types/scheduler': 0.16.4
       csstype: 3.1.2
 
+  /@types/request@2.48.11:
+    resolution: {integrity: sha512-HuihY1+Vss5RS9ZHzRyTGIzwPTdrJBkCm/mAeLRYrOQu/MGqyezKXWOK1VhCnR+SDbp9G2mRUP+OVEqCrzpcfA==}
+    dependencies:
+      '@types/caseless': 0.12.4
+      '@types/node': 20.14.2
+      '@types/tough-cookie': 4.0.4
+      form-data: 2.5.1
+    dev: false
+
   /@types/scheduler@0.16.4:
     resolution: {integrity: sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==}
 
@@ -10542,22 +11489,22 @@ packages:
   /@types/send@0.17.2:
     resolution: {integrity: sha512-aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw==}
     dependencies:
-      "@types/mime": 1.3.3
-      "@types/node": 18.18.4
+      '@types/mime': 1.3.3
+      '@types/node': 20.14.2
     dev: true
 
   /@types/serve-static@1.15.3:
     resolution: {integrity: sha512-yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg==}
     dependencies:
-      "@types/http-errors": 2.0.2
-      "@types/mime": 3.0.2
-      "@types/node": 18.18.4
+      '@types/http-errors': 2.0.2
+      '@types/mime': 3.0.2
+      '@types/node': 20.14.2
     dev: true
 
   /@types/sinon@10.0.19:
     resolution: {integrity: sha512-MWZNGPSchIdDfb5FL+VFi4zHsHbNOTQEgjqFQk7HazXSXwUU9PAX3z9XBqb3AJGYr9YwrtCtaSMsT3brYsN/jQ==}
     dependencies:
-      "@types/sinonjs__fake-timers": 8.1.3
+      '@types/sinonjs__fake-timers': 8.1.3
     dev: true
 
   /@types/sinonjs__fake-timers@8.1.3:
@@ -10567,7 +11514,7 @@ packages:
   /@types/ssri@7.1.2:
     resolution: {integrity: sha512-Mbo/NaBiZlXNlOFTLK+PXeVEzKFxi+ZVELuzmk4VxdRz6aqKpmP9bhcNqsIB2c/s78355WBHwUCGYhQDydcfEg==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
 
   /@types/stack-utils@2.0.1:
     resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
@@ -10576,10 +11523,20 @@ packages:
   /@types/tar@6.1.6:
     resolution: {integrity: sha512-HQ06kiiDXz9uqtmE9ksQUn1ovcPr1gGV9EgaCWo6FGYKD0onNBCetBzL0kfcS8Kbj1EFxJWY9jL2W4ZvvtGI8Q==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.11.0
       minipass: 4.2.8
     dev: true
 
+  /@types/through@0.0.33:
+    resolution: {integrity: sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==}
+    dependencies:
+      '@types/node': 20.14.2
+    dev: true
+
+  /@types/tough-cookie@4.0.4:
+    resolution: {integrity: sha512-95Sfz4nvMAb0Nl9DTxN3j64adfwfbBPEYq14VN7zT5J5O2M9V6iZMIIQU1U+pJyl9agHYHNCqhCXgyEtIRRa5A==}
+    dev: false
+
   /@types/triple-beam@1.3.3:
     resolution: {integrity: sha512-6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g==}
     requiresBuild: true
@@ -10589,7 +11546,7 @@ packages:
   /@types/tunnel@0.0.3:
     resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: false
 
   /@types/unist@2.0.10:
@@ -10620,10 +11577,16 @@ packages:
     resolution: {integrity: sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==}
     dev: true
 
+  /@types/ws@8.5.10:
+    resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
+    dependencies:
+      '@types/node': 20.14.2
+    dev: false
+
   /@types/ws@8.5.6:
     resolution: {integrity: sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg==}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.11.0
     dev: true
 
   /@types/yargs-parser@21.0.1:
@@ -10633,20 +11596,20 @@ packages:
   /@types/yargs@16.0.6:
     resolution: {integrity: sha512-oTP7/Q13GSPrgcwEwdlnkoZSQ1Hg9THe644qq8PG6hhJzjZ3qj1JjEFPIwWV/IXVs5XGIVqtkNOS9kh63WIJ+A==}
     dependencies:
-      "@types/yargs-parser": 21.0.1
+      '@types/yargs-parser': 21.0.1
     dev: true
 
   /@types/yargs@17.0.28:
     resolution: {integrity: sha512-N3e3fkS86hNhtk6BEnc0rj3zcehaxx8QWhCROJkqpl5Zaoi7nAic3jH8q94jVD3zu5LGk+PUB6KAiDmimYOEQw==}
     dependencies:
-      "@types/yargs-parser": 21.0.1
+      '@types/yargs-parser': 21.0.1
     dev: true
 
   /@types/yauzl@2.10.3:
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
     requiresBuild: true
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
     dev: true
     optional: true
 
@@ -10654,147 +11617,197 @@ packages:
     resolution: {integrity: sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==}
     dev: true
 
-  /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.2.2):
     resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      "@typescript-eslint/parser": ^5.0.0
+      '@typescript-eslint/parser': ^5.0.0
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@eslint-community/regexpp": 4.9.1
-      "@typescript-eslint/parser": 5.62.0(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/scope-manager": 5.62.0
-      "@typescript-eslint/type-utils": 5.62.0(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/utils": 5.62.0(eslint@8.51.0)(typescript@4.9.5)
-      debug: 4.3.4
+      '@eslint-community/regexpp': 4.9.1
+      '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.2.2)
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.51.0)(typescript@5.2.2)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.2.2)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@4.9.5)
-      typescript: 4.9.5
+      tsutils: 3.21.0(typescript@5.2.2)
+      typescript: 5.2.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
+    dev: false
 
-  /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.2.2):
+  /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      "@typescript-eslint/parser": ^5.0.0
+      '@typescript-eslint/parser': ^5.0.0
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@eslint-community/regexpp": 4.9.1
-      "@typescript-eslint/parser": 5.62.0(eslint@8.51.0)(typescript@5.2.2)
-      "@typescript-eslint/scope-manager": 5.62.0
-      "@typescript-eslint/type-utils": 5.62.0(eslint@8.51.0)(typescript@5.2.2)
-      "@typescript-eslint/utils": 5.62.0(eslint@8.51.0)(typescript@5.2.2)
-      debug: 4.3.4
+      '@eslint-community/regexpp': 4.9.1
+      '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.3.3)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.2.2)
-      typescript: 5.2.2
+      tsutils: 3.21.0(typescript@5.3.3)
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
+    dev: true
 
-  /@typescript-eslint/eslint-plugin@6.7.4(@typescript-eslint/parser@6.7.4)(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/eslint-plugin@6.7.4(@typescript-eslint/parser@6.7.4)(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-DAbgDXwtX+pDkAHwiGhqP3zWUGpW49B7eqmgpPtg+BKJXwdct79ut9+ifqOFPJGClGKSHXn2PTBatCnldJRUoA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
+      '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
       eslint: ^7.0.0 || ^8.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@eslint-community/regexpp": 4.9.1
-      "@typescript-eslint/parser": 6.7.4(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/scope-manager": 6.7.4
-      "@typescript-eslint/type-utils": 6.7.4(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/utils": 6.7.4(eslint@8.51.0)(typescript@4.9.5)
-      "@typescript-eslint/visitor-keys": 6.7.4
-      debug: 4.3.4
+      '@eslint-community/regexpp': 4.9.1
+      '@typescript-eslint/parser': 6.7.4(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/scope-manager': 6.7.4
+      '@typescript-eslint/type-utils': 6.7.4(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.7.4(eslint@8.51.0)(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 6.7.4
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
       semver: 7.5.4
-      ts-api-utils: 1.0.3(typescript@4.9.5)
-      typescript: 4.9.5
+      ts-api-utils: 1.0.3(typescript@5.3.3)
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/eslint-plugin@7.0.2(@typescript-eslint/parser@7.0.2)(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-/XtVZJtbaphtdrWjr+CJclaCVGPtOdBpFEnvtNf/jRV0IiEemRrL0qABex/nEt8isYcnFacm3nPHYQwL+Wb7qg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^7.0.0
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@eslint-community/regexpp': 4.9.1
+      '@typescript-eslint/parser': 7.0.2(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/scope-manager': 7.0.2
+      '@typescript-eslint/type-utils': 7.0.2(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.0.2(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 7.0.2
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 8.56.0
+      graphemer: 1.4.0
+      ignore: 5.2.4
+      natural-compare: 1.4.0
+      semver: 7.5.4
+      ts-api-utils: 1.0.3(typescript@5.3.3)
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.62.0(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/parser@5.62.0(eslint@8.51.0)(typescript@5.2.2):
     resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/scope-manager": 5.62.0
-      "@typescript-eslint/types": 5.62.0
-      "@typescript-eslint/typescript-estree": 5.62.0(typescript@4.9.5)
-      debug: 4.3.4
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
-      typescript: 4.9.5
+      typescript: 5.2.2
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /@typescript-eslint/parser@5.62.0(eslint@8.51.0)(typescript@5.2.2):
+  /@typescript-eslint/parser@5.62.0(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/scope-manager": 5.62.0
-      "@typescript-eslint/types": 5.62.0
-      "@typescript-eslint/typescript-estree": 5.62.0(typescript@5.2.2)
-      debug: 4.3.4
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
-      typescript: 5.2.2
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@typescript-eslint/parser@6.7.4(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/parser@6.7.4(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-I5zVZFY+cw4IMZUeNCU7Sh2PO5O57F7Lr0uyhgCJmhN/BuTlnc55KxPonR4+EM3GBdfiCyGZye6DgMjtubQkmA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/scope-manager": 6.7.4
-      "@typescript-eslint/types": 6.7.4
-      "@typescript-eslint/typescript-estree": 6.7.4(typescript@4.9.5)
-      "@typescript-eslint/visitor-keys": 6.7.4
-      debug: 4.3.4
+      '@typescript-eslint/scope-manager': 6.7.4
+      '@typescript-eslint/types': 6.7.4
+      '@typescript-eslint/typescript-estree': 6.7.4(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 6.7.4
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
-      typescript: 4.9.5
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/parser@7.0.2(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-GdwfDglCxSmU+QTS9vhz2Sop46ebNCXpPPvsByK7hu0rFGRHL+AusKQJ7SoN+LbLh6APFpQwHKmDSwN35Z700Q==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 7.0.2
+      '@typescript-eslint/types': 7.0.2
+      '@typescript-eslint/typescript-estree': 7.0.2(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 7.0.2
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 8.56.0
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -10803,73 +11816,101 @@ packages:
     resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.62.0
-      "@typescript-eslint/visitor-keys": 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
 
   /@typescript-eslint/scope-manager@6.7.4:
     resolution: {integrity: sha512-SdGqSLUPTXAXi7c3Ob7peAGVnmMoGzZ361VswK2Mqf8UOYcODiYvs8rs5ILqEdfvX1lE7wEZbLyELCW+Yrql1A==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      "@typescript-eslint/types": 6.7.4
-      "@typescript-eslint/visitor-keys": 6.7.4
+      '@typescript-eslint/types': 6.7.4
+      '@typescript-eslint/visitor-keys': 6.7.4
     dev: true
 
-  /@typescript-eslint/type-utils@5.62.0(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/scope-manager@7.0.2:
+    resolution: {integrity: sha512-l6sa2jF3h+qgN2qUMjVR3uCNGjWw4ahGfzIYsCtFrQJCjhbrDPdiihYT8FnnqFwsWX+20hK592yX9I2rxKTP4g==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 7.0.2
+      '@typescript-eslint/visitor-keys': 7.0.2
+    dev: true
+
+  /@typescript-eslint/type-utils@5.62.0(eslint@8.51.0)(typescript@5.2.2):
     resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: "*"
-      typescript: "*"
+      eslint: '*'
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/typescript-estree": 5.62.0(typescript@4.9.5)
-      "@typescript-eslint/utils": 5.62.0(eslint@8.51.0)(typescript@4.9.5)
-      debug: 4.3.4
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.2.2)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
-      tsutils: 3.21.0(typescript@4.9.5)
-      typescript: 4.9.5
+      tsutils: 3.21.0(typescript@5.2.2)
+      typescript: 5.2.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
+    dev: false
 
-  /@typescript-eslint/type-utils@5.62.0(eslint@8.51.0)(typescript@5.2.2):
+  /@typescript-eslint/type-utils@5.62.0(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: "*"
-      typescript: "*"
+      eslint: '*'
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/typescript-estree": 5.62.0(typescript@5.2.2)
-      "@typescript-eslint/utils": 5.62.0(eslint@8.51.0)(typescript@5.2.2)
-      debug: 4.3.4
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.3.3)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
-      tsutils: 3.21.0(typescript@5.2.2)
-      typescript: 5.2.2
+      tsutils: 3.21.0(typescript@5.3.3)
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
+    dev: true
 
-  /@typescript-eslint/type-utils@6.7.4(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/type-utils@6.7.4(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-n+g3zi1QzpcAdHFP9KQF+rEFxMb2KxtnJGID3teA/nxKHOVi3ylKovaqEzGBbVY2pBttU6z85gp0D00ufLzViQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/typescript-estree": 6.7.4(typescript@4.9.5)
-      "@typescript-eslint/utils": 6.7.4(eslint@8.51.0)(typescript@4.9.5)
-      debug: 4.3.4
+      '@typescript-eslint/typescript-estree': 6.7.4(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.7.4(eslint@8.51.0)(typescript@5.3.3)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.51.0
-      ts-api-utils: 1.0.3(typescript@4.9.5)
-      typescript: 4.9.5
+      ts-api-utils: 1.0.3(typescript@5.3.3)
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/type-utils@7.0.2(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-IKKDcFsKAYlk8Rs4wiFfEwJTQlHcdn8CLwLaxwd6zb8HNiMcQIFX9sWax2k4Cjj7l7mGS5N1zl7RCHOVwHq2VQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/typescript-estree': 7.0.2(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.0.2(eslint@8.56.0)(typescript@5.3.3)
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 8.56.0
+      ts-api-utils: 1.0.3(typescript@5.3.3)
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -10883,120 +11924,147 @@ packages:
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree@5.62.0(typescript@4.9.5):
+  /@typescript-eslint/types@7.0.2:
+    resolution: {integrity: sha512-ZzcCQHj4JaXFjdOql6adYV4B/oFOFjPOC9XYwCaZFRvqN8Llfvv4gSxrkQkd2u4Ci62i2c6W6gkDwQJDaRc4nA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dev: true
+
+  /@typescript-eslint/typescript-estree@5.62.0(typescript@5.2.2):
     resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/types": 5.62.0
-      "@typescript-eslint/visitor-keys": 5.62.0
-      debug: 4.3.4
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@4.9.5)
-      typescript: 4.9.5
+      tsutils: 3.21.0(typescript@5.2.2)
+      typescript: 5.2.2
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /@typescript-eslint/typescript-estree@5.62.0(typescript@5.2.2):
+  /@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.3):
     resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      typescript: "*"
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/types": 5.62.0
-      "@typescript-eslint/visitor-keys": 5.62.0
-      debug: 4.3.4
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.2.2)
-      typescript: 5.2.2
+      tsutils: 3.21.0(typescript@5.3.3)
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@typescript-eslint/typescript-estree@6.7.4(typescript@4.9.5):
+  /@typescript-eslint/typescript-estree@6.7.4(typescript@5.3.3):
     resolution: {integrity: sha512-ty8b5qHKatlNYd9vmpHooQz3Vki3gG+3PchmtsA4TgrZBKWHNjWfkQid7K7xQogBqqc7/BhGazxMD5vr6Ha+iQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      typescript: "*"
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 6.7.4
+      '@typescript-eslint/visitor-keys': 6.7.4
+      debug: 4.3.4(supports-color@5.5.0)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.5.4
+      ts-api-utils: 1.0.3(typescript@5.3.3)
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/typescript-estree@7.0.2(typescript@5.3.3):
+    resolution: {integrity: sha512-3AMc8khTcELFWcKcPc0xiLviEvvfzATpdPj/DXuOGIdQIIFybf4DMT1vKRbuAEOFMwhWt7NFLXRkbjsvKZQyvw==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/types": 6.7.4
-      "@typescript-eslint/visitor-keys": 6.7.4
-      debug: 4.3.4
+      '@typescript-eslint/types': 7.0.2
+      '@typescript-eslint/visitor-keys': 7.0.2
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
+      minimatch: 9.0.3
       semver: 7.5.4
-      ts-api-utils: 1.0.3(typescript@4.9.5)
-      typescript: 4.9.5
+      ts-api-utils: 1.0.3(typescript@5.3.3)
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@5.62.0(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/utils@5.62.0(eslint@8.51.0)(typescript@5.2.2):
     resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      "@eslint-community/eslint-utils": 4.4.0(eslint@8.51.0)
-      "@types/json-schema": 7.0.13
-      "@types/semver": 7.5.3
-      "@typescript-eslint/scope-manager": 5.62.0
-      "@typescript-eslint/types": 5.62.0
-      "@typescript-eslint/typescript-estree": 5.62.0(typescript@4.9.5)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.51.0)
+      '@types/json-schema': 7.0.13
+      '@types/semver': 7.5.3
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2)
       eslint: 8.51.0
       eslint-scope: 5.1.1
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
+    dev: false
 
-  /@typescript-eslint/utils@5.62.0(eslint@8.51.0)(typescript@5.2.2):
+  /@typescript-eslint/utils@5.62.0(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      "@eslint-community/eslint-utils": 4.4.0(eslint@8.51.0)
-      "@types/json-schema": 7.0.13
-      "@types/semver": 7.5.3
-      "@typescript-eslint/scope-manager": 5.62.0
-      "@typescript-eslint/types": 5.62.0
-      "@typescript-eslint/typescript-estree": 5.62.0(typescript@5.2.2)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.51.0)
+      '@types/json-schema': 7.0.13
+      '@types/semver': 7.5.3
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
       eslint: 8.51.0
       eslint-scope: 5.1.1
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: false
+    dev: true
 
-  /@typescript-eslint/utils@6.7.4(eslint@8.51.0)(typescript@4.9.5):
+  /@typescript-eslint/utils@6.7.4(eslint@8.51.0)(typescript@5.3.3):
     resolution: {integrity: sha512-PRQAs+HUn85Qdk+khAxsVV+oULy3VkbH3hQ8hxLRJXWBEd7iI+GbQxH5SEUSH7kbEoTp6oT1bOwyga24ELALTA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
     dependencies:
-      "@eslint-community/eslint-utils": 4.4.0(eslint@8.51.0)
-      "@types/json-schema": 7.0.13
-      "@types/semver": 7.5.3
-      "@typescript-eslint/scope-manager": 6.7.4
-      "@typescript-eslint/types": 6.7.4
-      "@typescript-eslint/typescript-estree": 6.7.4(typescript@4.9.5)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.51.0)
+      '@types/json-schema': 7.0.13
+      '@types/semver': 7.5.3
+      '@typescript-eslint/scope-manager': 6.7.4
+      '@typescript-eslint/types': 6.7.4
+      '@typescript-eslint/typescript-estree': 6.7.4(typescript@5.3.3)
       eslint: 8.51.0
       semver: 7.5.4
     transitivePeerDependencies:
@@ -11004,274 +12072,159 @@ packages:
       - typescript
     dev: true
 
+  /@typescript-eslint/utils@7.0.2(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-PZPIONBIB/X684bhT1XlrkjNZJIEevwkKDsdwfiu1WeqBxYEEdIgVDgm8/bbKHVu+6YOpeRqcfImTdImx/4Bsw==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
+      '@types/json-schema': 7.0.13
+      '@types/semver': 7.5.3
+      '@typescript-eslint/scope-manager': 7.0.2
+      '@typescript-eslint/types': 7.0.2
+      '@typescript-eslint/typescript-estree': 7.0.2(typescript@5.3.3)
+      eslint: 8.56.0
+      semver: 7.5.4
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
   /@typescript-eslint/visitor-keys@5.62.0:
     resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.62.0
+      '@typescript-eslint/types': 5.62.0
       eslint-visitor-keys: 3.4.3
 
   /@typescript-eslint/visitor-keys@6.7.4:
     resolution: {integrity: sha512-pOW37DUhlTZbvph50x5zZCkFn3xzwkGtNoJHzIM3svpiSkJzwOYr/kVBaXmf+RAQiUDs1AHEZVNPg6UJCJpwRA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      "@typescript-eslint/types": 6.7.4
+      '@typescript-eslint/types': 6.7.4
+      eslint-visitor-keys: 3.4.3
+    dev: true
+
+  /@typescript-eslint/visitor-keys@7.0.2:
+    resolution: {integrity: sha512-8Y+YiBmqPighbm5xA2k4wKTxRzx9EkBu7Rlw+WHqMvRJ3RPz/BMBO9b2ru0LUNmXg120PHUXD5+SWFy2R8DqlQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 7.0.2
       eslint-visitor-keys: 3.4.3
     dev: true
 
   /@ungap/structured-clone@1.2.0:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
-    dev: false
 
-  /@vitejs/plugin-react-swc@3.4.0(vite@4.4.11):
-    resolution: {integrity: sha512-m7UaA4Uvz82N/0EOVpZL4XsFIakRqrFKeSNxa1FBLSXGvWrWRBwmZb4qxk+ZIVAZcW3c3dn5YosomDgx62XWcQ==}
+  /@vitejs/plugin-react-swc@3.6.0(vite@4.5.2):
+    resolution: {integrity: sha512-XFRbsGgpGxGzEV5i5+vRiro1bwcIaZDIdBRP16qwm+jP68ue/S8FJTBEgOeojtVDYrbSua3XFp71kC8VJE6v+g==}
     peerDependencies:
-      vite: ^4
+      vite: ^4 || ^5
     dependencies:
-      "@swc/core": 1.3.92
-      vite: 4.4.11(@types/node@18.18.4)
+      '@swc/core': 1.4.2
+      vite: 4.5.2
     transitivePeerDependencies:
-      - "@swc/helpers"
+      - '@swc/helpers'
     dev: true
 
-  /@vitejs/plugin-react@3.1.0(vite@4.4.11):
+  /@vitejs/plugin-react@3.1.0(vite@4.5.2):
     resolution: {integrity: sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.1.0-beta.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/plugin-transform-react-jsx-self": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-react-jsx-source": 7.22.5(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.9)
       magic-string: 0.27.0
       react-refresh: 0.14.0
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 4.5.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitejs/plugin-react@4.1.0(vite@4.4.11):
-    resolution: {integrity: sha512-rM0SqazU9iqPUraQ2JlIvReeaxOoRj6n+PzB1C0cBzIbd8qP336nC39/R9yPi3wVcah7E7j/kdU1uCUqMEU4OQ==}
+  /@vitejs/plugin-react@4.2.1(vite@4.5.2):
+    resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      vite: ^4.2.0
+      vite: ^4.2.0 || ^5.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/plugin-transform-react-jsx-self": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-transform-react-jsx-source": 7.22.5(@babel/core@7.23.0)
-      "@types/babel__core": 7.20.2
+      '@babel/core': 7.23.9
+      '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.9)
+      '@types/babel__core': 7.20.5
       react-refresh: 0.14.0
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 4.5.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitest/coverage-c8@0.31.4(vitest@0.31.4):
-    resolution: {integrity: sha512-VPx368m4DTcpA/P0v3YdVxl4QOSh1DbUcXURLRvDShrIB5KxOgfzw4Bn2R8AhAe/GyiWW/FIsJ/OJdYXCCiC1w==}
-    deprecated: v8 coverage is moved to @vitest/coverage-v8 package
+  /@vitest/coverage-v8@1.6.0(vitest@1.6.0):
+    resolution: {integrity: sha512-KvapcbMY/8GYIG0rlwwOKCVNRc0OL20rrhFkg/CHNzncV03TE2XWvO5w9uZYoxNiMEBacAJt3unSOiZ7svePew==}
     peerDependencies:
-      vitest: ">=0.30.0 <1"
+      vitest: 1.6.0
     dependencies:
-      "@ampproject/remapping": 2.2.1
-      c8: 7.14.0
-      magic-string: 0.30.4
+      '@ampproject/remapping': 2.2.1
+      '@bcoe/v8-coverage': 0.2.3
+      debug: 4.3.4(supports-color@5.5.0)
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-report: 3.0.1
+      istanbul-lib-source-maps: 5.0.4
+      istanbul-reports: 3.1.6
+      magic-string: 0.30.7
+      magicast: 0.3.4
       picocolors: 1.0.0
-      std-env: 3.4.3
-      vitest: 0.31.4(happy-dom@9.20.3)
+      std-env: 3.7.0
+      strip-literal: 2.0.0
+      test-exclude: 6.0.0
+      vitest: 1.6.0(happy-dom@9.20.3)
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@vitest/coverage-c8@0.31.4(vitest@0.34.6):
-    resolution: {integrity: sha512-VPx368m4DTcpA/P0v3YdVxl4QOSh1DbUcXURLRvDShrIB5KxOgfzw4Bn2R8AhAe/GyiWW/FIsJ/OJdYXCCiC1w==}
-    deprecated: v8 coverage is moved to @vitest/coverage-v8 package
-    peerDependencies:
-      vitest: ">=0.30.0 <1"
+  /@vitest/expect@1.6.0:
+    resolution: {integrity: sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==}
     dependencies:
-      "@ampproject/remapping": 2.2.1
-      c8: 7.14.0
-      magic-string: 0.30.4
-      picocolors: 1.0.0
-      std-env: 3.4.3
-      vitest: 0.34.6
-    dev: true
-
-  /@vitest/coverage-v8@0.32.4(vitest@0.32.4):
-    resolution: {integrity: sha512-itiCYY3TmWEK+5wnFBoNr0ZA+adACp7Op1r2TeX5dPOgU2See7+Gx2NlK2lVMHVxfPsu5z9jszKa3i//eR+hqg==}
-    peerDependencies:
-      vitest: ">=0.32.0 <1"
-    dependencies:
-      "@ampproject/remapping": 2.2.1
-      "@bcoe/v8-coverage": 0.2.3
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.6
-      magic-string: 0.30.4
-      picocolors: 1.0.0
-      std-env: 3.4.3
-      test-exclude: 6.0.0
-      v8-to-istanbul: 9.1.3
-      vitest: 0.32.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@vitest/expect@0.30.1:
-    resolution: {integrity: sha512-c3kbEtN8XXJSeN81iDGq29bUzSjQhjES2WR3aColsS4lPGbivwLtas4DNUe0jD9gg/FYGIteqOenfU95EFituw==}
-    dependencies:
-      "@vitest/spy": 0.30.1
-      "@vitest/utils": 0.30.1
-      chai: 4.3.10
-    dev: true
-
-  /@vitest/expect@0.31.4:
-    resolution: {integrity: sha512-tibyx8o7GUyGHZGyPgzwiaPaLDQ9MMuCOrc03BYT0nryUuhLbL7NV2r/q98iv5STlwMgaKuFJkgBW/8iPKwlSg==}
-    dependencies:
-      "@vitest/spy": 0.31.4
-      "@vitest/utils": 0.31.4
-      chai: 4.3.10
-    dev: true
-
-  /@vitest/expect@0.32.4:
-    resolution: {integrity: sha512-m7EPUqmGIwIeoU763N+ivkFjTzbaBn0n9evsTOcde03ugy2avPs3kZbYmw3DkcH1j5mxhMhdamJkLQ6dM1bk/A==}
-    dependencies:
-      "@vitest/spy": 0.32.4
-      "@vitest/utils": 0.32.4
-      chai: 4.3.10
-    dev: true
-
-  /@vitest/expect@0.34.6:
-    resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
-    dependencies:
-      "@vitest/spy": 0.34.6
-      "@vitest/utils": 0.34.6
+      '@vitest/spy': 1.6.0
+      '@vitest/utils': 1.6.0
       chai: 4.3.10
     dev: true
 
-  /@vitest/runner@0.30.1:
-    resolution: {integrity: sha512-W62kT/8i0TF1UBCNMRtRMOBWJKRnNyv9RrjIgdUryEe0wNpGZvvwPDLuzYdxvgSckzjp54DSpv1xUbv4BQ0qVA==}
-    dependencies:
-      "@vitest/utils": 0.30.1
-      concordance: 5.0.4
-      p-limit: 4.0.0
-      pathe: 1.1.1
-    dev: true
-
-  /@vitest/runner@0.31.4:
-    resolution: {integrity: sha512-Wgm6UER+gwq6zkyrm5/wbpXGF+g+UBB78asJlFkIOwyse0pz8lZoiC6SW5i4gPnls/zUcPLWS7Zog0LVepXnpg==}
-    dependencies:
-      "@vitest/utils": 0.31.4
-      concordance: 5.0.4
-      p-limit: 4.0.0
-      pathe: 1.1.1
-    dev: true
-
-  /@vitest/runner@0.32.4:
-    resolution: {integrity: sha512-cHOVCkiRazobgdKLnczmz2oaKK9GJOw6ZyRcaPdssO1ej+wzHVIkWiCiNacb3TTYPdzMddYkCgMjZ4r8C0JFCw==}
-    dependencies:
-      "@vitest/utils": 0.32.4
-      p-limit: 4.0.0
-      pathe: 1.1.1
-    dev: true
-
-  /@vitest/runner@0.34.6:
-    resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
-    dependencies:
-      "@vitest/utils": 0.34.6
-      p-limit: 4.0.0
-      pathe: 1.1.1
-    dev: true
-
-  /@vitest/snapshot@0.30.1:
-    resolution: {integrity: sha512-fJZqKrE99zo27uoZA/azgWyWbFvM1rw2APS05yB0JaLwUIg9aUtvvnBf4q7JWhEcAHmSwbrxKFgyBUga6tq9Tw==}
-    dependencies:
-      magic-string: 0.30.4
-      pathe: 1.1.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /@vitest/snapshot@0.31.4:
-    resolution: {integrity: sha512-LemvNumL3NdWSmfVAMpXILGyaXPkZbG5tyl6+RQSdcHnTj6hvA49UAI8jzez9oQyE/FWLKRSNqTGzsHuk89LRA==}
-    dependencies:
-      magic-string: 0.30.4
-      pathe: 1.1.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /@vitest/snapshot@0.32.4:
-    resolution: {integrity: sha512-IRpyqn9t14uqsFlVI2d7DFMImGMs1Q9218of40bdQQgMePwVdmix33yMNnebXcTzDU5eiV3eUsoxxH5v0x/IQA==}
+  /@vitest/runner@1.6.0:
+    resolution: {integrity: sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==}
     dependencies:
-      magic-string: 0.30.4
+      '@vitest/utils': 1.6.0
+      p-limit: 5.0.0
       pathe: 1.1.1
-      pretty-format: 29.7.0
     dev: true
 
-  /@vitest/snapshot@0.34.6:
-    resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
+  /@vitest/snapshot@1.6.0:
+    resolution: {integrity: sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==}
     dependencies:
-      magic-string: 0.30.4
+      magic-string: 0.30.7
       pathe: 1.1.1
       pretty-format: 29.7.0
     dev: true
 
-  /@vitest/spy@0.30.1:
-    resolution: {integrity: sha512-YfJeIf37GvTZe04ZKxzJfnNNuNSmTEGnla2OdL60C8od16f3zOfv9q9K0nNii0NfjDJRt/CVN/POuY5/zTS+BA==}
-    dependencies:
-      tinyspy: 2.2.0
-    dev: true
-
-  /@vitest/spy@0.31.4:
-    resolution: {integrity: sha512-3ei5ZH1s3aqbEyftPAzSuunGICRuhE+IXOmpURFdkm5ybUADk+viyQfejNk6q8M5QGX8/EVKw+QWMEP3DTJDag==}
-    dependencies:
-      tinyspy: 2.2.0
-    dev: true
-
-  /@vitest/spy@0.32.4:
-    resolution: {integrity: sha512-oA7rCOqVOOpE6rEoXuCOADX7Lla1LIa4hljI2MSccbpec54q+oifhziZIJXxlE/CvI2E+ElhBHzVu0VEvJGQKQ==}
-    dependencies:
-      tinyspy: 2.2.0
-    dev: true
-
-  /@vitest/spy@0.34.6:
-    resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
+  /@vitest/spy@1.6.0:
+    resolution: {integrity: sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==}
     dependencies:
       tinyspy: 2.2.0
     dev: true
 
-  /@vitest/utils@0.30.1:
-    resolution: {integrity: sha512-/c8Xv2zUVc+rnNt84QF0Y0zkfxnaGhp87K2dYJMLtLOIckPzuxLVzAtFCicGFdB4NeBHNzTRr1tNn7rCtQcWFA==}
-    dependencies:
-      concordance: 5.0.4
-      loupe: 2.3.6
-      pretty-format: 27.5.1
-    dev: true
-
-  /@vitest/utils@0.31.4:
-    resolution: {integrity: sha512-DobZbHacWznoGUfYU8XDPY78UubJxXfMNY1+SUdOp1NsI34eopSA6aZMeaGu10waSOeYwE8lxrd/pLfT0RMxjQ==}
-    dependencies:
-      concordance: 5.0.4
-      loupe: 2.3.6
-      pretty-format: 27.5.1
-    dev: true
-
-  /@vitest/utils@0.32.4:
-    resolution: {integrity: sha512-Gwnl8dhd1uJ+HXrYyV0eRqfmk9ek1ASE/LWfTCuWMw+d07ogHqp4hEAV28NiecimK6UY9DpSEPh+pXBA5gtTBg==}
-    dependencies:
-      diff-sequences: 29.6.3
-      loupe: 2.3.6
-      pretty-format: 29.7.0
-    dev: true
-
-  /@vitest/utils@0.34.6:
-    resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
+  /@vitest/utils@1.6.0:
+    resolution: {integrity: sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==}
     dependencies:
       diff-sequences: 29.6.3
-      loupe: 2.3.6
+      estree-walker: 3.0.3
+      loupe: 2.3.7
       pretty-format: 29.7.0
     dev: true
 
   /@vscode/vsce@2.21.1:
     resolution: {integrity: sha512-f45/aT+HTubfCU2oC7IaWnH9NjOWp668ML002QiFObFRVUCoLtcwepp9mmql/ArFUy+HCHp54Xrq4koTcOD6TA==}
-    engines: {node: ">= 14"}
+    engines: {node: '>= 14'}
     hasBin: true
     dependencies:
       azure-devops-node-api: 11.2.0
@@ -11307,8 +12260,8 @@ packages:
   /@webassemblyjs/ast@1.11.6:
     resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==}
     dependencies:
-      "@webassemblyjs/helper-numbers": 1.11.6
-      "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+      '@webassemblyjs/helper-numbers': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
     dev: true
 
   /@webassemblyjs/floating-point-hex-parser@1.11.6:
@@ -11326,9 +12279,9 @@ packages:
   /@webassemblyjs/helper-numbers@1.11.6:
     resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==}
     dependencies:
-      "@webassemblyjs/floating-point-hex-parser": 1.11.6
-      "@webassemblyjs/helper-api-error": 1.11.6
-      "@xtuc/long": 4.2.2
+      '@webassemblyjs/floating-point-hex-parser': 1.11.6
+      '@webassemblyjs/helper-api-error': 1.11.6
+      '@xtuc/long': 4.2.2
     dev: true
 
   /@webassemblyjs/helper-wasm-bytecode@1.11.6:
@@ -11338,22 +12291,22 @@ packages:
   /@webassemblyjs/helper-wasm-section@1.11.6:
     resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==}
     dependencies:
-      "@webassemblyjs/ast": 1.11.6
-      "@webassemblyjs/helper-buffer": 1.11.6
-      "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-      "@webassemblyjs/wasm-gen": 1.11.6
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-buffer': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/wasm-gen': 1.11.6
     dev: true
 
   /@webassemblyjs/ieee754@1.11.6:
     resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==}
     dependencies:
-      "@xtuc/ieee754": 1.2.0
+      '@xtuc/ieee754': 1.2.0
     dev: true
 
   /@webassemblyjs/leb128@1.11.6:
     resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==}
     dependencies:
-      "@xtuc/long": 4.2.2
+      '@xtuc/long': 4.2.2
     dev: true
 
   /@webassemblyjs/utf8@1.11.6:
@@ -11363,58 +12316,62 @@ packages:
   /@webassemblyjs/wasm-edit@1.11.6:
     resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==}
     dependencies:
-      "@webassemblyjs/ast": 1.11.6
-      "@webassemblyjs/helper-buffer": 1.11.6
-      "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-      "@webassemblyjs/helper-wasm-section": 1.11.6
-      "@webassemblyjs/wasm-gen": 1.11.6
-      "@webassemblyjs/wasm-opt": 1.11.6
-      "@webassemblyjs/wasm-parser": 1.11.6
-      "@webassemblyjs/wast-printer": 1.11.6
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-buffer': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/helper-wasm-section': 1.11.6
+      '@webassemblyjs/wasm-gen': 1.11.6
+      '@webassemblyjs/wasm-opt': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
+      '@webassemblyjs/wast-printer': 1.11.6
     dev: true
 
   /@webassemblyjs/wasm-gen@1.11.6:
     resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==}
     dependencies:
-      "@webassemblyjs/ast": 1.11.6
-      "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-      "@webassemblyjs/ieee754": 1.11.6
-      "@webassemblyjs/leb128": 1.11.6
-      "@webassemblyjs/utf8": 1.11.6
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/ieee754': 1.11.6
+      '@webassemblyjs/leb128': 1.11.6
+      '@webassemblyjs/utf8': 1.11.6
     dev: true
 
   /@webassemblyjs/wasm-opt@1.11.6:
     resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==}
     dependencies:
-      "@webassemblyjs/ast": 1.11.6
-      "@webassemblyjs/helper-buffer": 1.11.6
-      "@webassemblyjs/wasm-gen": 1.11.6
-      "@webassemblyjs/wasm-parser": 1.11.6
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-buffer': 1.11.6
+      '@webassemblyjs/wasm-gen': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
     dev: true
 
   /@webassemblyjs/wasm-parser@1.11.6:
     resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==}
     dependencies:
-      "@webassemblyjs/ast": 1.11.6
-      "@webassemblyjs/helper-api-error": 1.11.6
-      "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-      "@webassemblyjs/ieee754": 1.11.6
-      "@webassemblyjs/leb128": 1.11.6
-      "@webassemblyjs/utf8": 1.11.6
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-api-error': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/ieee754': 1.11.6
+      '@webassemblyjs/leb128': 1.11.6
+      '@webassemblyjs/utf8': 1.11.6
     dev: true
 
   /@webassemblyjs/wast-printer@1.11.6:
     resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==}
     dependencies:
-      "@webassemblyjs/ast": 1.11.6
-      "@xtuc/long": 4.2.2
+      '@webassemblyjs/ast': 1.11.6
+      '@xtuc/long': 4.2.2
     dev: true
 
   /@xmldom/xmldom@0.8.10:
     resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==}
-    engines: {node: ">=10.0.0"}
+    engines: {node: '>=10.0.0'}
     dev: true
 
+  /@xobotyi/scrollbar-width@1.9.5:
+    resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==}
+    dev: false
+
   /@xtuc/ieee754@1.2.0:
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
     dev: true
@@ -11425,9 +12382,9 @@ packages:
 
   /@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.18.20):
     resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
-    engines: {node: ">=14.15.0"}
+    engines: {node: '>=14.15.0'}
     peerDependencies:
-      esbuild: ">=0.10.0"
+      esbuild: '>=0.10.0'
     dependencies:
       esbuild: 0.18.20
       tslib: 2.6.2
@@ -11435,17 +12392,17 @@ packages:
 
   /@yarnpkg/fslib@2.10.3:
     resolution: {integrity: sha512-41H+Ga78xT9sHvWLlFOZLIhtU6mTGZ20pZ29EiZa97vnxdohJD2AF42rCoAoWfqUz486xY6fhjMH+DYEM9r14A==}
-    engines: {node: ">=12 <14 || 14.2 - 14.9 || >14.10.0"}
+    engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
     dependencies:
-      "@yarnpkg/libzip": 2.3.0
+      '@yarnpkg/libzip': 2.3.0
       tslib: 1.14.1
     dev: true
 
   /@yarnpkg/libzip@2.3.0:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
-    engines: {node: ">=12 <14 || 14.2 - 14.9 || >14.10.0"}
+    engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
     dependencies:
-      "@types/emscripten": 1.39.8
+      '@types/emscripten': 1.39.8
       tslib: 1.14.1
     dev: true
 
@@ -11458,14 +12415,14 @@ packages:
 
   /@zkochan/rimraf@2.1.3:
     resolution: {integrity: sha512-mCfR3gylCzPC+iqdxEA6z5SxJeOgzgbwmyxanKriIne5qZLswDe/M43aD3p5MNzwzXRhbZg/OX+MpES6Zk1a6A==}
-    engines: {node: ">=12.10"}
+    engines: {node: '>=12.10'}
     dependencies:
       rimraf: 3.0.2
     dev: false
 
   /@zkochan/which@2.0.3:
     resolution: {integrity: sha512-C1ReN7vt2/2O0fyTsx5xnbQuxBrmG5NMSbcIkPKCCfCTJgpZBsuRYzFXHj3nVq8vTfK7vxHUmzfCpSHgO7j4rg==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     hasBin: true
     dependencies:
       isexe: 2.0.0
@@ -11479,10 +12436,6 @@ packages:
       through: 2.3.8
     dev: true
 
-  /abab@2.0.6:
-    resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
-    dev: true
-
   /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
 
@@ -11493,25 +12446,18 @@ packages:
 
   /abort-controller@3.0.0:
     resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
-    engines: {node: ">=6.5"}
+    engines: {node: '>=6.5'}
     dependencies:
       event-target-shim: 5.0.1
     dev: false
 
   /accepts@1.3.8:
     resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
     dependencies:
       mime-types: 2.1.35
       negotiator: 0.6.3
 
-  /acorn-globals@6.0.0:
-    resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
-    dependencies:
-      acorn: 7.4.1
-      acorn-walk: 7.2.0
-    dev: true
-
   /acorn-import-assertions@1.9.0(acorn@8.10.0):
     resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
     peerDependencies:
@@ -11537,23 +12483,23 @@ packages:
 
   /acorn-walk@7.2.0:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
-    engines: {node: ">=0.4.0"}
+    engines: {node: '>=0.4.0'}
     dev: true
 
-  /acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
-    engines: {node: ">=0.4.0"}
+  /acorn-walk@8.3.2:
+    resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
+    engines: {node: '>=0.4.0'}
     dev: true
 
   /acorn@7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
-    engines: {node: ">=0.4.0"}
+    engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
 
   /acorn@8.10.0:
     resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
-    engines: {node: ">=0.4.0"}
+    engines: {node: '>=0.4.0'}
     hasBin: true
 
   /add-stream@1.0.0:
@@ -11562,54 +12508,44 @@ packages:
 
   /address@1.2.2:
     resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
-    engines: {node: ">= 10.0.0"}
+    engines: {node: '>= 10.0.0'}
     dev: true
 
   /agent-base@5.1.1:
     resolution: {integrity: sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==}
-    engines: {node: ">= 6.0.0"}
+    engines: {node: '>= 6.0.0'}
     dev: true
 
   /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
-    engines: {node: ">= 6.0.0"}
+    engines: {node: '>= 6.0.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   /agent-base@7.1.0:
     resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
-    engines: {node: ">= 14"}
+    engines: {node: '>= 14'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   /agentkeepalive@4.5.0:
     resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
-    engines: {node: ">= 8.0.0"}
+    engines: {node: '>= 8.0.0'}
     dependencies:
       humanize-ms: 1.2.1
+    dev: false
 
   /aggregate-error@3.1.0:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  /ajv-formats@2.1.1(ajv@8.12.0):
-    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
-    dependencies:
-      ajv: 8.12.0
-    dev: true
-
   /ajv-keywords@3.5.2(ajv@6.12.6):
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
@@ -11638,6 +12574,7 @@ packages:
     resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==}
     dependencies:
       string-width: 4.2.3
+    dev: false
 
   /ansi-diff@1.1.1:
     resolution: {integrity: sha512-XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw==}
@@ -11647,22 +12584,22 @@ packages:
 
   /ansi-escapes@4.3.2:
     resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       type-fest: 0.21.3
 
   /ansi-regex@3.0.1:
     resolution: {integrity: sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: false
 
   /ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /ansi-regex@6.0.1:
     resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /ansi-split@1.0.1:
     resolution: {integrity: sha512-RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg==}
@@ -11672,31 +12609,31 @@ packages:
 
   /ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
 
   /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       color-convert: 2.0.1
 
   /ansi-styles@5.2.0:
     resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: true
 
   /ansi-styles@6.2.1:
     resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /any-promise@1.3.0:
     resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
 
   /anymatch@3.1.3:
     resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
@@ -11707,10 +12644,11 @@ packages:
 
   /aproba@2.0.0:
     resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
+    dev: false
 
   /archiver-utils@2.1.0:
     resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       glob: 7.2.3
       graceful-fs: 4.2.11
@@ -11722,10 +12660,11 @@ packages:
       lodash.union: 4.6.0
       normalize-path: 3.0.0
       readable-stream: 2.3.8
+    dev: true
 
   /archiver-utils@3.0.4:
     resolution: {integrity: sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     dependencies:
       glob: 7.2.3
       graceful-fs: 4.2.11
@@ -11737,22 +12676,22 @@ packages:
       lodash.union: 4.6.0
       normalize-path: 3.0.0
       readable-stream: 3.6.2
+    dev: true
 
-  /archiver@5.3.1:
-    resolution: {integrity: sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==}
-    engines: {node: ">= 10"}
+  /archiver-utils@4.0.1:
+    resolution: {integrity: sha512-Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg==}
+    engines: {node: '>= 12.0.0'}
     dependencies:
-      archiver-utils: 2.1.0
-      async: 3.2.4
-      buffer-crc32: 0.2.13
+      glob: 8.1.0
+      graceful-fs: 4.2.11
+      lazystream: 1.0.1
+      lodash: 4.17.21
+      normalize-path: 3.0.0
       readable-stream: 3.6.2
-      readdir-glob: 1.1.3
-      tar-stream: 2.2.0
-      zip-stream: 4.1.1
 
   /archiver@5.3.2:
     resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     dependencies:
       archiver-utils: 2.1.0
       async: 3.2.4
@@ -11763,6 +12702,18 @@ packages:
       zip-stream: 4.1.1
     dev: true
 
+  /archiver@6.0.1:
+    resolution: {integrity: sha512-CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ==}
+    engines: {node: '>= 12.0.0'}
+    dependencies:
+      archiver-utils: 4.0.1
+      async: 3.2.4
+      buffer-crc32: 0.2.13
+      readable-stream: 3.6.2
+      readdir-glob: 1.1.3
+      tar-stream: 3.1.7
+      zip-stream: 5.0.1
+
   /archy@1.0.0:
     resolution: {integrity: sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==}
     dev: false
@@ -11773,6 +12724,7 @@ packages:
     dependencies:
       delegates: 1.0.0
       readable-stream: 3.6.2
+    dev: false
 
   /are-we-there-yet@4.0.1:
     resolution: {integrity: sha512-2zuA+jpOYBRgoBCfa+fB87Rk0oGJjDX6pxGzqH6f33NzUhG25Xur6R0u0Z9VVAq8Z5JvQpQI6j6rtonuivC8QA==}
@@ -11782,10 +12734,6 @@ packages:
       readable-stream: 4.4.2
     dev: false
 
-  /arg@4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
-    dev: true
-
   /arg@5.0.2:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
 
@@ -11799,7 +12747,7 @@ packages:
 
   /aria-hidden@1.2.3:
     resolution: {integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       tslib: 2.6.2
     dev: true
@@ -11818,13 +12766,13 @@ packages:
 
   /arr-rotate@1.0.0:
     resolution: {integrity: sha512-yOzOZcR9Tn7enTF66bqKorGGH0F36vcPaSWg8fO0c0UYb3LX3VMXj5ZxEqQLNOecAhlRJ7wYZja5i4jTlnbIfQ==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /array-buffer-byte-length@1.0.0:
     resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       is-array-buffer: 3.0.2
 
   /array-flatten@1.1.1:
@@ -11836,7 +12784,7 @@ packages:
 
   /array-includes@3.1.7:
     resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -11849,11 +12797,11 @@ packages:
 
   /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /array.prototype.findlastindex@1.2.3:
     resolution: {integrity: sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -11863,7 +12811,7 @@ packages:
 
   /array.prototype.flat@1.3.2:
     resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -11872,7 +12820,7 @@ packages:
 
   /array.prototype.flatmap@1.3.2:
     resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -11891,10 +12839,10 @@ packages:
 
   /arraybuffer.prototype.slice@1.0.2:
     resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       array-buffer-byte-length: 1.0.0
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.2
       get-intrinsic: 1.2.1
@@ -11903,12 +12851,12 @@ packages:
 
   /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /arrify@2.0.1:
     resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: false
 
   /as-table@1.0.55:
@@ -11920,7 +12868,7 @@ packages:
   /assert@2.1.0:
     resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       is-nan: 1.3.2
       object-is: 1.1.5
       object.assign: 4.1.4
@@ -11937,28 +12885,28 @@ packages:
 
   /ast-types@0.14.2:
     resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       tslib: 2.6.2
     dev: true
 
   /ast-types@0.15.2:
     resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       tslib: 2.6.2
     dev: true
 
   /ast-types@0.16.1:
     resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       tslib: 2.6.2
     dev: true
 
   /astral-regex@2.0.0:
     resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /async-limiter@1.0.1:
     resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
@@ -11984,21 +12932,15 @@ packages:
 
   /at-least-node@1.0.0:
     resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
-    engines: {node: ">= 4.0.0"}
-
-  /atomically@2.0.2:
-    resolution: {integrity: sha512-Xfmb4q5QV7uqTlVdMSTtO5eF4DCHfNOdaPyKlbFShkzeNP+3lj3yjjcbdjSmEY4+pDBKJ9g26aP+ImTe88UHoQ==}
-    dependencies:
-      stubborn-fs: 1.2.5
-      when-exit: 2.1.1
+    engines: {node: '>= 4.0.0'}
     dev: true
 
   /auto-bind@4.0.0:
     resolution: {integrity: sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
-  /autoprefixer@10.4.16(postcss@8.4.31):
+  /autoprefixer@10.4.16(postcss@8.4.38):
     resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
@@ -12010,37 +12952,27 @@ packages:
       fraction.js: 4.3.6
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.4.31
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
   /available-typed-arrays@1.0.5:
     resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
 
-  /aws-cdk-lib@2.100.0(constructs@10.2.70):
-    resolution: {integrity: sha512-oWDPcbdqD69wDIUvcGdbDxmKcDfkCg515wf8JkiQLnhAI/AFyKAVTEWhbSUi00lvJQNUjX8Mal2lbKlCRA4hjQ==}
-    engines: {node: ">= 14.15.0"}
+  /aws-cdk-lib@2.124.0(constructs@10.3.0):
+    resolution: {integrity: sha512-K/Tey8TMw30GO6UD0qb19CPhBMZhleGshz520ZnbDUJwNfFtejwZOnpmRMOdUP9f4tHc5BrXl1VGsZtXtUaGhg==}
+    engines: {node: '>= 14.15.0'}
     peerDependencies:
       constructs: ^10.0.0
     dependencies:
-      "@aws-cdk/asset-awscli-v1": 2.2.200
-      "@aws-cdk/asset-kubectl-v20": 2.1.2
-      "@aws-cdk/asset-node-proxy-agent-v6": 2.0.1
-      "@balena/dockerignore": 1.0.2
-      case: 1.6.3
-      constructs: 10.2.70
-      fs-extra: 11.1.1
-      ignore: 5.2.4
-      jsonschema: 1.4.1
-      minimatch: 3.1.2
-      punycode: 2.3.0
-      semver: 7.5.4
-      table: 6.8.1
-      yaml: 1.10.2
+      '@aws-cdk/asset-awscli-v1': 2.2.202
+      '@aws-cdk/asset-kubectl-v20': 2.1.2
+      '@aws-cdk/asset-node-proxy-agent-v6': 2.0.1
+      constructs: 10.3.0
     dev: false
     bundledDependencies:
-      - "@balena/dockerignore"
+      - '@balena/dockerignore'
       - case
       - fs-extra
       - ignore
@@ -12051,34 +12983,34 @@ packages:
       - table
       - yaml
 
-  /aws-sdk-client-mock-jest@2.2.0(aws-sdk-client-mock@2.2.0):
-    resolution: {integrity: sha512-lpPapmCjTe70qhXYFIjUL9cdA75YmtC0surig3QSr2Y5doaG1e4fuXlgkNeH6V873rlwu9TWCG2MFOr4rHuMfg==}
+  /aws-sdk-client-mock-jest@3.0.0(aws-sdk-client-mock@3.0.0):
+    resolution: {integrity: sha512-oV1rBQZc4UumLbzZAhi8UAehUq+k75hkQYGLrVIP0iJj85Z9xw+EaSsmJke/KQ8Z3vng+Xv1xbounsxpvZpunQ==}
     peerDependencies:
-      aws-sdk-client-mock: 2.2.0
+      aws-sdk-client-mock: 3.0.0
     dependencies:
-      "@types/jest": 28.1.8
-      aws-sdk-client-mock: 2.2.0
+      '@types/jest': 28.1.8
+      aws-sdk-client-mock: 3.0.0
       tslib: 2.6.2
     dev: true
 
-  /aws-sdk-client-mock@2.2.0:
-    resolution: {integrity: sha512-Kq2N+6gHRDedbrgTA0NMMfyN1XDWEA5Kbpm9/M/cenSxoNjfvQBOtBawI1lQe5h4UziLl///E7u17K9PBoHEKA==}
+  /aws-sdk-client-mock@3.0.0:
+    resolution: {integrity: sha512-4mBiWhuLYLZe1+K/iB8eYy5SAZyW2se+Keyh5u9QouMt6/qJ5SRZhss68xvUX5g3ApzROJ06QPRziYHP6buuvQ==}
     dependencies:
-      "@types/sinon": 10.0.19
+      '@types/sinon': 10.0.19
       sinon: 14.0.2
       tslib: 2.6.2
     dev: true
 
   /axe-core@4.8.2:
     resolution: {integrity: sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: false
 
   /axios@0.27.2:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     requiresBuild: true
     dependencies:
-      follow-redirects: 1.15.3
+      follow-redirects: 1.15.5
       form-data: 4.0.0
     transitivePeerDependencies:
       - debug
@@ -12098,169 +13030,73 @@ packages:
       typed-rest-client: 1.8.11
     dev: true
 
-  /babel-core@7.0.0-bridge.0(@babel/core@7.23.0):
-    resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
-    peerDependencies:
-      "@babel/core": ^7.0.0-0
-    dependencies:
-      "@babel/core": 7.23.0
-    dev: true
-
-  /babel-jest@27.5.1(@babel/core@7.23.0):
-    resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      "@babel/core": ^7.8.0
-    dependencies:
-      "@babel/core": 7.23.0
-      "@jest/transform": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/babel__core": 7.20.2
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 27.5.1(@babel/core@7.23.0)
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      slash: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+  /b4a@1.6.6:
+    resolution: {integrity: sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==}
 
-  /babel-jest@29.7.0(@babel/core@7.23.0):
-    resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /babel-core@7.0.0-bridge.0(@babel/core@7.23.9):
+    resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
     peerDependencies:
-      "@babel/core": ^7.8.0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      "@babel/core": 7.23.0
-      "@jest/transform": 29.7.0
-      "@types/babel__core": 7.20.2
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.6.3(@babel/core@7.23.0)
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      slash: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.23.9
     dev: true
 
   /babel-plugin-istanbul@6.1.1:
     resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
-      "@babel/helper-plugin-utils": 7.22.5
-      "@istanbuljs/load-nyc-config": 1.1.0
-      "@istanbuljs/schema": 0.1.3
+      '@babel/helper-plugin-utils': 7.22.5
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.3
       istanbul-lib-instrument: 5.2.1
       test-exclude: 6.0.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-jest-hoist@27.5.1:
-    resolution: {integrity: sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@babel/template": 7.22.15
-      "@babel/types": 7.23.0
-      "@types/babel__core": 7.20.2
-      "@types/babel__traverse": 7.20.2
-    dev: true
-
-  /babel-plugin-jest-hoist@29.6.3:
-    resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@babel/template": 7.22.15
-      "@babel/types": 7.23.0
-      "@types/babel__core": 7.20.2
-      "@types/babel__traverse": 7.20.2
-    dev: true
-
-  /babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.23.0):
+  /babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==}
     peerDependencies:
-      "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      "@babel/compat-data": 7.22.20
-      "@babel/core": 7.23.0
-      "@babel/helper-define-polyfill-provider": 0.4.2(@babel/core@7.23.0)
+      '@babel/compat-data': 7.23.5
+      '@babel/core': 7.23.9
+      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.23.9)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-corejs3@0.8.4(@babel/core@7.23.0):
+  /babel-plugin-polyfill-corejs3@0.8.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==}
     peerDependencies:
-      "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-define-polyfill-provider": 0.4.2(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.23.9)
       core-js-compat: 3.33.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.23.0):
+  /babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.23.9):
     resolution: {integrity: sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==}
     peerDependencies:
-      "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/helper-define-polyfill-provider": 0.4.2(@babel/core@7.23.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.23.9)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.23.0):
-    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
-    peerDependencies:
-      "@babel/core": ^7.0.0
-    dependencies:
-      "@babel/core": 7.23.0
-      "@babel/plugin-syntax-async-generators": 7.8.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-bigint": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-class-properties": 7.12.13(@babel/core@7.23.0)
-      "@babel/plugin-syntax-import-meta": 7.10.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-json-strings": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-logical-assignment-operators": 7.10.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-numeric-separator": 7.10.4(@babel/core@7.23.0)
-      "@babel/plugin-syntax-object-rest-spread": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-optional-catch-binding": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-optional-chaining": 7.8.3(@babel/core@7.23.0)
-      "@babel/plugin-syntax-top-level-await": 7.14.5(@babel/core@7.23.0)
-    dev: true
-
-  /babel-preset-jest@27.5.1(@babel/core@7.23.0):
-    resolution: {integrity: sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      "@babel/core": ^7.0.0
-    dependencies:
-      "@babel/core": 7.23.0
-      babel-plugin-jest-hoist: 27.5.1
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.0)
-    dev: true
-
-  /babel-preset-jest@29.6.3(@babel/core@7.23.0):
-    resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      "@babel/core": ^7.0.0
-    dependencies:
-      "@babel/core": 7.23.0
-      babel-plugin-jest-hoist: 29.6.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.0)
-    dev: true
-
   /backport@8.5.0:
     resolution: {integrity: sha512-gX8v+l+BTue2lmmqD/yQiR6JUUY+5OWNZTI1qyusViqC9R2iv4YFPqT23IcJfpYqlYb3DOiwunfVjKLickdQ6g==}
-    engines: {node: ">=16.0.0"}
+    engines: {node: '>=16.0.0'}
     hasBin: true
     requiresBuild: true
     dependencies:
-      "@octokit/rest": 18.12.0
+      '@octokit/rest': 18.12.0
       axios: 0.27.2
       dedent: 0.7.0
       del: 6.1.1
@@ -12300,21 +13136,21 @@ packages:
 
   /better-opn@3.0.2:
     resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dependencies:
       open: 8.4.2
     dev: true
 
   /better-path-resolve@1.0.0:
     resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       is-windows: 1.0.2
     dev: false
 
   /big-integer@1.6.51:
     resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
-    engines: {node: ">=0.6"}
+    engines: {node: '>=0.6'}
 
   /bignumber.js@9.1.2:
     resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==}
@@ -12332,7 +13168,7 @@ packages:
 
   /binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
@@ -12341,13 +13177,9 @@ packages:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
-  /blueimp-md5@2.19.0:
-    resolution: {integrity: sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==}
-    dev: true
-
-  /body-parser@1.20.1:
-    resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==}
-    engines: {node: ">= 0.8", npm: 1.2.8000 || >= 1.4.16}
+  /body-parser@1.20.2:
+    resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
@@ -12358,14 +13190,14 @@ packages:
       iconv-lite: 0.4.24
       on-finished: 2.4.1
       qs: 6.11.0
-      raw-body: 2.5.1
+      raw-body: 2.5.2
       type-is: 1.6.18
       unpipe: 1.0.0
     transitivePeerDependencies:
       - supports-color
 
-  /bole@5.0.9:
-    resolution: {integrity: sha512-35GeBG6T7GW9VmLDF2IoKAtFCqMjmmq1uICbsICI0pID7ZAyUKlf7dg1wpXmn9GcMKHtg0S19CPMU5yfY3tv+g==}
+  /bole@5.0.11:
+    resolution: {integrity: sha512-KB0Ye0iMAW5BnNbnLfMSQcnI186hKUzE2fpkZWqcxsoTR7eqzlTidSOMYPHJOn/yR7VGH7uSZp37qH9q2Et0zQ==}
     dependencies:
       fast-safe-stringify: 2.1.1
       individual: 3.0.0
@@ -12385,7 +13217,7 @@ packages:
 
   /boxen@5.1.2:
     resolution: {integrity: sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       ansi-align: 3.0.1
       camelcase: 6.3.0
@@ -12397,23 +13229,9 @@ packages:
       wrap-ansi: 7.0.0
     dev: false
 
-  /boxen@7.1.1:
-    resolution: {integrity: sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      ansi-align: 3.0.1
-      camelcase: 7.0.1
-      chalk: 5.3.0
-      cli-boxes: 3.0.0
-      string-width: 5.1.2
-      type-fest: 2.19.0
-      widest-line: 4.0.1
-      wrap-ansi: 8.1.0
-    dev: true
-
   /bplist-parser@0.2.0:
     resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}
-    engines: {node: ">= 5.10.0"}
+    engines: {node: '>= 5.10.0'}
     dependencies:
       big-integer: 1.6.51
 
@@ -12430,7 +13248,7 @@ packages:
 
   /braces@3.0.2:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       fill-range: 7.0.1
 
@@ -12438,10 +13256,6 @@ packages:
     resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==}
     dev: true
 
-  /browser-process-hrtime@1.0.0:
-    resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
-    dev: true
-
   /browserify-zlib@0.1.4:
     resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==}
     dependencies:
@@ -12459,11 +13273,15 @@ packages:
       update-browserslist-db: 1.0.13(browserslist@4.22.1)
     dev: true
 
-  /bs-logger@0.2.6:
-    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
-    engines: {node: ">= 6"}
+  /browserslist@4.23.0:
+    resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
     dependencies:
-      fast-json-stable-stringify: 2.1.0
+      caniuse-lite: 1.0.30001589
+      electron-to-chromium: 1.4.682
+      node-releases: 2.0.14
+      update-browserslist-db: 1.0.13(browserslist@4.23.0)
     dev: true
 
   /bser@2.1.1:
@@ -12500,48 +13318,50 @@ packages:
 
   /builtin-modules@3.3.0:
     resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: false
 
   /builtins@5.0.1:
     resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
     dependencies:
       semver: 7.5.4
+    dev: false
 
   /bundle-name@3.0.0:
     resolution: {integrity: sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       run-applescript: 5.0.0
+    dev: false
 
   /bundle-require@4.0.2(esbuild@0.17.19):
     resolution: {integrity: sha512-jwzPOChofl67PSTW2SGubV9HBQAhhR2i6nskiOThauo9dzwDUgOWQScFVaJkjEfYX+UXiD+LEx8EblQMc2wIag==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
-      esbuild: ">=0.17"
+      esbuild: '>=0.17'
     dependencies:
       esbuild: 0.17.19
       load-tsconfig: 0.2.5
     dev: true
 
-  /bundle-require@4.0.2(esbuild@0.18.20):
+  /bundle-require@4.0.2(esbuild@0.19.12):
     resolution: {integrity: sha512-jwzPOChofl67PSTW2SGubV9HBQAhhR2i6nskiOThauo9dzwDUgOWQScFVaJkjEfYX+UXiD+LEx8EblQMc2wIag==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
-      esbuild: ">=0.17"
+      esbuild: '>=0.17'
     dependencies:
-      esbuild: 0.18.20
+      esbuild: 0.19.12
       load-tsconfig: 0.2.5
     dev: true
 
   /bytes@3.0.0:
     resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
     dev: true
 
   /bytes@3.1.2:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
 
   /c12@1.4.2:
     resolution: {integrity: sha512-3IP/MuamSVRVw8W8+CHWAz9gKN4gd+voF2zm/Ln6D25C2RhytEZ1ABbC8MjKr4BR9rhoV1JQ7jJA158LDiTkLg==}
@@ -12550,7 +13370,7 @@ packages:
       defu: 6.1.2
       dotenv: 16.3.1
       giget: 1.1.3
-      jiti: 1.20.0
+      jiti: 1.21.0
       mlly: 1.4.2
       ohash: 1.1.3
       pathe: 1.1.1
@@ -12563,14 +13383,14 @@ packages:
 
   /c8@7.14.0:
     resolution: {integrity: sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==}
-    engines: {node: ">=10.12.0"}
+    engines: {node: '>=10.12.0'}
     hasBin: true
     dependencies:
-      "@bcoe/v8-coverage": 0.2.3
-      "@istanbuljs/schema": 0.1.3
+      '@bcoe/v8-coverage': 0.2.3
+      '@istanbuljs/schema': 0.1.3
       find-up: 5.0.0
       foreground-child: 2.0.0
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-reports: 3.1.6
       rimraf: 3.0.2
@@ -12582,14 +13402,14 @@ packages:
 
   /cac@6.7.14:
     resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /cacache@17.1.4:
     resolution: {integrity: sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
-      "@npmcli/fs": 3.1.0
+      '@npmcli/fs': 3.1.0
       fs-minipass: 3.0.3
       glob: 10.3.10
       lru-cache: 7.18.3
@@ -12601,12 +13421,13 @@ packages:
       ssri: 10.0.5
       tar: 6.2.0
       unique-filename: 3.0.0
+    dev: false
 
   /cacache@18.0.0:
     resolution: {integrity: sha512-I7mVOPl3PUCeRub1U8YoGz2Lqv9WOBpobZ8RyWFXmReuILz+3OAyTa5oH3QPdtKZD7N0Yk00aLfzn0qvp8dZ1w==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@npmcli/fs": 3.1.0
+      '@npmcli/fs': 3.1.0
       fs-minipass: 3.0.3
       glob: 10.3.10
       lru-cache: 10.0.1
@@ -12620,41 +13441,30 @@ packages:
       unique-filename: 3.0.0
     dev: false
 
-  /cacheable-lookup@7.0.0:
-    resolution: {integrity: sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==}
-    engines: {node: ">=14.16"}
-    dev: true
-
-  /cacheable-request@10.2.14:
-    resolution: {integrity: sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      "@types/http-cache-semantics": 4.0.2
-      get-stream: 6.0.1
-      http-cache-semantics: 4.1.1
-      keyv: 4.5.4
-      mimic-response: 4.0.0
-      normalize-url: 8.0.0
-      responselike: 3.0.0
-    dev: true
-
   /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
       get-intrinsic: 1.2.1
 
+  /call-bind@1.0.5:
+    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
+    dependencies:
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.2
+      set-function-length: 1.2.0
+
   /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
 
   /camelcase-css@2.0.1:
     resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
 
   /camelcase-keys@6.2.2:
     resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       camelcase: 5.3.1
       map-obj: 4.3.0
@@ -12662,20 +13472,15 @@ packages:
 
   /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
 
   /camelcase@6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
-    engines: {node: ">=10"}
-
-  /camelcase@7.0.1:
-    resolution: {integrity: sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==}
-    engines: {node: ">=14.16"}
-    dev: true
+    engines: {node: '>=10'}
 
   /can-write-to-dir@1.1.1:
     resolution: {integrity: sha512-eOgiEWqjppB+3DN/5E82EQ8dTINus8d9GXMCbEsUnp2hcUIcXmBvzWmD3tXMk3CuBK0v+ddK9qw0EAF+JVRMjQ==}
-    engines: {node: ">=10.13"}
+    engines: {node: '>=10.13'}
     dependencies:
       path-temp: 2.1.0
     dev: false
@@ -12684,19 +13489,23 @@ packages:
     resolution: {integrity: sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==}
     dev: true
 
+  /caniuse-lite@1.0.30001589:
+    resolution: {integrity: sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==}
+    dev: true
+
   /case@1.6.3:
     resolution: {integrity: sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
 
-  /cdk8s-plus-27@2.7.32(cdk8s@2.66.8)(constructs@10.2.70):
-    resolution: {integrity: sha512-h2/JDogQC+LW1+LUOaFCbTIM4Bxqo7iYtvjr/Aqzu0i0LsrEoTeFmGzqjck3q6PQcovRdYYcPr9eaNQFevx9TA==}
-    engines: {node: ">= 16.20.0"}
+  /cdk8s-plus-27@2.7.81(cdk8s@2.68.43)(constructs@10.3.0):
+    resolution: {integrity: sha512-udabjGUObc0nJKI/Q+HfRPM5nCNnTEqR0SUMYhnGyVjZDxrrr52eNbGPvFiuYPm+Pul4jEyVB+1A3PWYVR2oTw==}
+    engines: {node: '>= 16.20.0'}
     peerDependencies:
-      cdk8s: ^2.66.5
-      constructs: ^10.2.70
+      cdk8s: ^2.68.11
+      constructs: ^10.3.0
     dependencies:
-      cdk8s: 2.66.8(constructs@10.2.70)
-      constructs: 10.2.70
+      cdk8s: 2.68.43(constructs@10.3.0)
+      constructs: 10.3.0
       minimatch: 3.1.2
     optionalDependencies:
       backport: 8.5.0
@@ -12707,15 +13516,15 @@ packages:
     bundledDependencies:
       - minimatch
 
-  /cdk8s@2.66.8(constructs@10.2.70):
-    resolution: {integrity: sha512-ELWEWe84VXd06O8itktG8TtzDDNxr1wpiucuzeZnxe1YHoEM2jr+8nc1j85tWzz6Cy6miPStglQs2TZc/LxK4g==}
-    engines: {node: ">= 16.20.0"}
+  /cdk8s@2.68.43(constructs@10.3.0):
+    resolution: {integrity: sha512-TpPpM5YMdcJDFgBupJ5bEx2k6hLqNP9v2oCrfGVLTNRv+D5rP/V5J30vi7XC4cW9RUjaLpFgV4no9/AofTobAw==}
+    engines: {node: '>= 16.20.0'}
     peerDependencies:
       constructs: ^10
     dependencies:
-      constructs: 10.2.70
+      constructs: 10.3.0
       fast-json-patch: 3.1.1
-      follow-redirects: 1.15.3
+      follow-redirects: 1.15.5
       yaml: 2.3.2
     optionalDependencies:
       backport: 8.5.0
@@ -12728,36 +13537,38 @@ packages:
       - follow-redirects
       - yaml
 
-  /cdktf-cli@0.17.0(ink@3.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-D2vZRtmFenYLDLUXF+uxuxUkJM3uYNce7Jn7/nWk/+qlcH/3n7TOEqV9UAgZFvjMLotGrA5/FIEDv4xse7sKRg==}
+  /cdktf-cli@0.20.3(ink@3.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-fPdG4pqUmBE/R8wFEJ9QugpeIJkczwnl8lsg13eo0PsmL8biaY8waLX4N5a/p2LLzGrPrVySdrZjF7Cnf+3J/A==}
     hasBin: true
     dependencies:
-      "@cdktf/cli-core": 0.17.0(react@17.0.2)
-      "@cdktf/commons": 0.17.0
-      "@cdktf/hcl2cdk": 0.17.0
-      "@cdktf/hcl2json": 0.17.0
-      "@inquirer/prompts": 2.3.1
-      "@sentry/node": 6.19.7
-      cdktf: 0.17.0(constructs@10.2.70)
-      codemaker: 1.90.0
-      constructs: 10.2.70
+      '@cdktf/cli-core': 0.20.3(react@17.0.2)
+      '@cdktf/commons': 0.20.3(constructs@10.1.167)
+      '@cdktf/hcl-tools': 0.20.3
+      '@cdktf/hcl2cdk': 0.20.3(constructs@10.1.167)
+      '@cdktf/hcl2json': 0.20.3
+      '@inquirer/prompts': 2.3.0
+      '@sentry/node': 7.64.0
+      cdktf: 0.20.3(constructs@10.1.167)
+      ci-info: 3.8.0
+      codemaker: 1.93.0
+      constructs: 10.1.167
       cross-spawn: 7.0.3
       https-proxy-agent: 5.0.1
-      ink-select-input: 4.2.2(ink@3.2.0)(react@17.0.2)
+      ink-select-input: 4.2.1(ink@3.2.0)(react@17.0.2)
       ink-table: 3.0.0(ink@3.2.0)(react@17.0.2)
-      jsii: 5.0.21
-      jsii-pacmak: 1.90.0
-      minimatch: 5.1.6
-      node-fetch: 2.7.0
+      jsii: 5.3.2
+      jsii-pacmak: 1.93.0
+      minimatch: 5.1.0
+      node-fetch: 2.6.7
       pidtree: 0.6.0
       pidusage: 3.0.2
       tunnel-agent: 0.6.0
       xml-js: 1.6.11
-      yargs: 17.7.2
+      yargs: 17.6.2
       yoga-layout-prebuilt: 1.10.0
-      zod: 1.11.17
+      zod: 3.22.4
     transitivePeerDependencies:
-      - "@types/react"
+      - '@types/react'
       - bufferutil
       - debug
       - encoding
@@ -12767,30 +13578,30 @@ packages:
       - utf-8-validate
     dev: true
 
-  /cdktf@0.17.0(constructs@10.2.70):
-    resolution: {integrity: sha512-4R57uBLBqeb8NgfKZdn/az8UE3yXxGHyzH6Xjsz1Oo9kNvSkPibX7YqNLUpuCgdYNVgU2fdaNoHj9h4LXc6iCw==}
+  /cdktf@0.20.3(constructs@10.1.167):
+    resolution: {integrity: sha512-y8F3pjYzbMHy9ZG3yXSSerx2Yv9dr2i2j2842IKT1tpN74CBfuuPrselTNdI6QoaMvlQJQQB2l93cJmL6eIkaw==}
     peerDependencies:
       constructs: ^10.0.25
     dependencies:
-      archiver: 5.3.1
-      constructs: 10.2.70
-      json-stable-stringify: 1.0.2
+      archiver: 6.0.1
+      constructs: 10.1.167
+      json-stable-stringify: 1.1.0
       semver: 7.5.4
+    dev: true
     bundledDependencies:
       - archiver
       - json-stable-stringify
       - semver
 
-  /cdktf@0.17.3(constructs@10.2.70):
-    resolution: {integrity: sha512-bqAzuuYLc8sy0ZoKw/RnohS6SH6fwAhCsU31vxuEiwu0BVcCaExfjQVZx/iJgmF1TJqk/cu2fMCLUgT3PDAuhQ==}
+  /cdktf@0.20.3(constructs@10.3.0):
+    resolution: {integrity: sha512-y8F3pjYzbMHy9ZG3yXSSerx2Yv9dr2i2j2842IKT1tpN74CBfuuPrselTNdI6QoaMvlQJQQB2l93cJmL6eIkaw==}
     peerDependencies:
       constructs: ^10.0.25
     dependencies:
-      archiver: 5.3.1
-      constructs: 10.2.70
-      json-stable-stringify: 1.0.2
+      archiver: 6.0.1
+      constructs: 10.3.0
+      json-stable-stringify: 1.1.0
       semver: 7.5.4
-    dev: true
     bundledDependencies:
       - archiver
       - json-stable-stringify
@@ -12798,20 +13609,20 @@ packages:
 
   /chai@4.3.10:
     resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       assertion-error: 1.1.0
       check-error: 1.0.3
       deep-eql: 4.1.3
       get-func-name: 2.0.2
-      loupe: 2.3.6
+      loupe: 2.3.7
       pathval: 1.1.1
       type-detect: 4.0.8
     dev: true
 
   /chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       ansi-styles: 3.2.1
       escape-string-regexp: 1.0.5
@@ -12819,16 +13630,11 @@ packages:
 
   /chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  /chalk@5.3.0:
-    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
-    dev: true
-
   /changelogen@0.5.5:
     resolution: {integrity: sha512-IzgToIJ/R9NhVKmL+PW33ozYkv53bXvufDNUSH3GTKXq1iCHGgkbgbtqEWbo8tnWNnt7nPDpjL8PwSG2iS8RVw==}
     hasBin: true
@@ -12854,7 +13660,8 @@ packages:
 
   /char-regex@1.0.2:
     resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
+    dev: false
 
   /character-entities@2.0.2:
     resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
@@ -12883,7 +13690,7 @@ packages:
 
   /cheerio@1.0.0-rc.12:
     resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       cheerio-select: 2.1.0
       dom-serializer: 2.0.0
@@ -12896,7 +13703,21 @@ packages:
 
   /chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
-    engines: {node: ">= 8.10.0"}
+    engines: {node: '>= 8.10.0'}
+    dependencies:
+      anymatch: 3.1.3
+      braces: 3.0.2
+      glob-parent: 5.1.2
+      is-binary-path: 2.1.0
+      is-glob: 4.0.3
+      normalize-path: 3.0.0
+      readdirp: 3.6.0
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  /chokidar@3.6.0:
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
     dependencies:
       anymatch: 3.1.3
       braces: 3.0.2
@@ -12915,52 +13736,48 @@ packages:
 
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /chrome-trace-event@1.0.3:
     resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
-    engines: {node: ">=6.0"}
+    engines: {node: '>=6.0'}
     dev: true
 
   /ci-info@2.0.0:
     resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==}
     dev: true
 
+  /ci-info@3.8.0:
+    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
+    engines: {node: '>=8'}
+    dev: true
+
   /ci-info@3.9.0:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
-    engines: {node: ">=8"}
-
-  /cjs-module-lexer@1.2.3:
-    resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==}
-    dev: true
+    engines: {node: '>=8'}
 
-  /classnames@2.3.2:
-    resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==}
+  /classnames@2.5.1:
+    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
     dev: false
 
   /clean-regexp@1.0.0:
     resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       escape-string-regexp: 1.0.5
     dev: false
 
   /clean-stack@2.2.0:
     resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
 
   /cli-boxes@2.2.1:
     resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==}
-    engines: {node: ">=6"}
-
-  /cli-boxes@3.0.0:
-    resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==}
-    engines: {node: ">=10"}
-    dev: true
+    engines: {node: '>=6'}
 
   /cli-columns@4.0.0:
     resolution: {integrity: sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
@@ -12968,18 +13785,18 @@ packages:
 
   /cli-cursor@3.1.0:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       restore-cursor: 3.1.0
 
-  /cli-spinners@2.7.0:
-    resolution: {integrity: sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==}
-    engines: {node: ">=6"}
-    dev: true
-
   /cli-spinners@2.9.1:
     resolution: {integrity: sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
+
+  /cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+    dev: true
 
   /cli-table3@0.6.3:
     resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
@@ -12987,26 +13804,25 @@ packages:
     dependencies:
       string-width: 4.2.3
     optionalDependencies:
-      "@colors/colors": 1.5.0
+      '@colors/colors': 1.5.0
     dev: true
 
   /cli-truncate@2.1.0:
     resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       slice-ansi: 3.0.0
       string-width: 4.2.3
 
   /cli-width@3.0.0:
     resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     requiresBuild: true
     dev: false
-    optional: true
 
   /cli-width@4.1.0:
     resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
-    engines: {node: ">= 12"}
+    engines: {node: '>= 12'}
     dev: true
 
   /client-only@0.0.1:
@@ -13030,7 +13846,7 @@ packages:
 
   /cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
@@ -13038,7 +13854,7 @@ packages:
 
   /clone-deep@4.0.1:
     resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       is-plain-object: 2.0.4
       kind-of: 6.0.3
@@ -13047,55 +13863,55 @@ packages:
 
   /clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
-    engines: {node: ">=0.8"}
+    engines: {node: '>=0.8'}
 
   /clone@2.1.2:
     resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
-    engines: {node: ">=0.8"}
+    engines: {node: '>=0.8'}
     dev: true
 
   /cluster-key-slot@1.1.2:
     resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /cmd-shim@6.0.1:
     resolution: {integrity: sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dev: false
 
-  /co@4.6.0:
-    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
-    engines: {iojs: ">= 1.0.0", node: ">= 0.12.0"}
-    dev: true
-
   /code-excerpt@3.0.0:
     resolution: {integrity: sha512-VHNTVhd7KsLGOqfX3SyeO8RyYPMp1GJOg194VITk04WMYCv4plV68YWe6TJZxd9MhobjtpMRnVky01gqZsalaw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       convert-to-spaces: 1.0.2
     dev: true
 
-  /codemaker@1.90.0:
-    resolution: {integrity: sha512-0h95TmecbC1CYkpcvyq4qoipQ4vJT96MRevLKUL3hjgxtd5BB+hZ7AG2pjTFHQt62eRpQE0fZz6J/aLv/wUNUA==}
-    engines: {node: ">= 14.17.0"}
+  /codemaker@1.93.0:
+    resolution: {integrity: sha512-n9AdncxhGti20YhA7HI2oAYhELh/qlDnW9JIAYQW9iULXdeaKtsxHgvcwBCltpieOcQrq10bt+sUawBs62vxLg==}
+    engines: {node: '>= 14.17.0'}
     dependencies:
       camelcase: 6.3.0
       decamelize: 5.0.1
       fs-extra: 10.1.0
     dev: true
 
-  /codespan-wasm@0.4.0:
-    resolution: {integrity: sha512-TVS9MyHIeTV1Zm/wBpgjY1Lyx49Ikj7mccrBrCwWc0/oM7MoeHtVPWwM+Q9CBKWJTZLwp7D1s8PT6NnCqvQrhA==}
+  /codemaker@1.94.0:
+    resolution: {integrity: sha512-V+896C7RojQVfG0UlOXaFfVVxmFb08rPtJvzcxhdJfowc2o6xGwGG0OpWSLHy6fQrmt4BxLXnKZ6Xeuqt4aKjw==}
+    engines: {node: '>= 14.17.0'}
     dependencies:
-      debug: 4.3.4
+      camelcase: 6.3.0
+      decamelize: 5.0.1
+      fs-extra: 10.1.0
+    dev: true
+
+  /codespan-wasm@0.4.0:
+    resolution: {integrity: sha512-TVS9MyHIeTV1Zm/wBpgjY1Lyx49Ikj7mccrBrCwWc0/oM7MoeHtVPWwM+Q9CBKWJTZLwp7D1s8PT6NnCqvQrhA==}
+    dependencies:
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /collect-v8-coverage@1.0.2:
-    resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==}
-    dev: true
-
   /color-convert@1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
@@ -13103,7 +13919,7 @@ packages:
 
   /color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: ">=7.0.0"}
+    engines: {node: '>=7.0.0'}
     dependencies:
       color-name: 1.1.4
 
@@ -13125,6 +13941,7 @@ packages:
   /color-support@1.1.3:
     resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
     hasBin: true
+    dev: false
 
   /color@3.2.1:
     resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
@@ -13149,7 +13966,7 @@ packages:
 
   /combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: 1.0.0
 
@@ -13159,23 +13976,24 @@ packages:
 
   /commander@10.0.1:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
+    dev: false
 
   /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
   /commander@4.1.1:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
 
   /commander@6.2.1:
     resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dev: true
 
   /comment-json@4.2.2:
     resolution: {integrity: sha512-H8T+kl3nZesZu41zO2oNXIJWojNeK3mHxCLrsBNu6feksBXsgb+PtYz5daP5P86A0F3sz3840KVYehr04enISQ==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       array-timsort: 1.0.3
       core-util-is: 1.0.3
@@ -13214,22 +14032,32 @@ packages:
 
   /compress-commons@4.1.2:
     resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     dependencies:
       buffer-crc32: 0.2.13
       crc32-stream: 4.0.3
       normalize-path: 3.0.0
       readable-stream: 3.6.2
+    dev: true
+
+  /compress-commons@5.0.1:
+    resolution: {integrity: sha512-MPh//1cERdLtqwO3pOFLeXtpuai0Y2WCd5AhtKxznqM7WtaMYaOEMSgn45d9D10sIHSfIKE603HlOp8OPGrvag==}
+    engines: {node: '>= 12.0.0'}
+    dependencies:
+      crc-32: 1.2.2
+      crc32-stream: 5.0.0
+      normalize-path: 3.0.0
+      readable-stream: 3.6.2
 
   /compressible@2.0.18:
     resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.52.0
 
   /compression@1.7.4:
     resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
     dependencies:
       accepts: 1.3.8
       bytes: 3.0.0
@@ -13244,7 +14072,7 @@ packages:
 
   /comver-to-semver@1.0.0:
     resolution: {integrity: sha512-gcGtbRxjwROQOdXLUWH1fQAXqThUVRZ219aAwgtX3KfYw429/Zv6EIJRf5TBSzWdAGwePmqH7w70WTaX4MDqag==}
-    engines: {node: ">=12.17"}
+    engines: {node: '>=12.17'}
     dev: false
 
   /concat-map@0.0.1:
@@ -13252,7 +14080,7 @@ packages:
 
   /concat-stream@1.6.2:
     resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
-    engines: {"0": node >= 0.8}
+    engines: {'0': node >= 0.8}
     dependencies:
       buffer-from: 1.1.2
       inherits: 2.0.4
@@ -13262,58 +14090,19 @@ packages:
 
   /concat-stream@2.0.0:
     resolution: {integrity: sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==}
-    engines: {"0": node >= 6.0}
+    engines: {'0': node >= 6.0}
     dependencies:
       buffer-from: 1.1.2
       inherits: 2.0.4
       readable-stream: 3.6.2
       typedarray: 0.0.6
-    dev: true
-
-  /concordance@5.0.4:
-    resolution: {integrity: sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==}
-    engines: {node: ">=10.18.0 <11 || >=12.14.0 <13 || >=14"}
-    dependencies:
-      date-time: 3.1.0
-      esutils: 2.0.3
-      fast-diff: 1.3.0
-      js-string-escape: 1.0.1
-      lodash: 4.17.21
-      md5-hex: 3.0.1
-      semver: 7.5.4
-      well-known-symbols: 2.0.0
-    dev: true
-
-  /conf@11.0.2:
-    resolution: {integrity: sha512-jjyhlQ0ew/iwmtwsS2RaB6s8DBifcE2GYBEaw2SJDUY/slJJbNfY4GlDVzOs/ff8cM/Wua5CikqXgbFl5eu85A==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      ajv: 8.12.0
-      ajv-formats: 2.1.1(ajv@8.12.0)
-      atomically: 2.0.2
-      debounce-fn: 5.1.2
-      dot-prop: 7.2.0
-      env-paths: 3.0.0
-      json-schema-typed: 8.0.1
-      semver: 7.5.4
-    dev: true
 
   /config-chain@1.1.13:
     resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
     dependencies:
       ini: 1.3.8
       proto-list: 1.2.4
-
-  /configstore@6.0.0:
-    resolution: {integrity: sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==}
-    engines: {node: ">=12"}
-    dependencies:
-      dot-prop: 6.0.1
-      graceful-fs: 4.2.11
-      unique-string: 3.0.0
-      write-file-atomic: 3.0.3
-      xdg-basedir: 5.1.0
-    dev: true
+    dev: false
 
   /consola@3.2.3:
     resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
@@ -13322,29 +14111,35 @@ packages:
 
   /console-control-strings@1.1.0:
     resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
+    dev: false
+
+  /constructs@10.1.167:
+    resolution: {integrity: sha512-zGt88EmcJUtWbd/sTM9GKcHRjYWzEx5jzMYuK69vl25Dj01sJAc7uF6AEJgZBtlLAc3VnRUvzgitHwmJkS9BFw==}
+    engines: {node: '>= 14.17.0'}
+    dev: true
 
-  /constructs@10.2.70:
-    resolution: {integrity: sha512-z6zr1E8K/9tzJbCQzY0UGX0/oVKPFKu9C/mzEnghCG6TAJINnvlq0CMKm63XqqeMleadZYm5T3sZGJKcxJS/Pg==}
-    engines: {node: ">= 16.14.0"}
+  /constructs@10.3.0:
+    resolution: {integrity: sha512-vbK8i3rIb/xwZxSpTjz3SagHn1qq9BChLEfy5Hf6fB3/2eFbrwt2n9kHwQcS0CPTRBesreeAcsJfMq2229FnbQ==}
+    engines: {node: '>= 16.14.0'}
 
   /constructs@3.4.344:
     resolution: {integrity: sha512-Qq3upn44oGdvgasHUKWVFsrynyYrtVRd9fd8ko9cJOrFzx9eCm3iI4bhBryQqaISdausbTYUOXmoEe/YSJ16Nw==}
-    engines: {node: ">= 16.14.0"}
-    dev: false
+    engines: {node: '>= 16.14.0'}
+    dev: true
 
   /content-disposition@0.5.4:
     resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
     dependencies:
       safe-buffer: 5.2.1
 
   /content-type@1.0.5:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
   /conventional-changelog-angular@5.0.13:
     resolution: {integrity: sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       compare-func: 2.0.0
       q: 1.5.1
@@ -13352,14 +14147,14 @@ packages:
 
   /conventional-changelog-atom@2.0.8:
     resolution: {integrity: sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       q: 1.5.1
     dev: true
 
   /conventional-changelog-codemirror@2.0.8:
     resolution: {integrity: sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       q: 1.5.1
     dev: true
@@ -13369,7 +14164,7 @@ packages:
 
   /conventional-changelog-conventionalcommits@4.6.3:
     resolution: {integrity: sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       compare-func: 2.0.0
       lodash: 4.17.21
@@ -13378,7 +14173,7 @@ packages:
 
   /conventional-changelog-core@4.2.4:
     resolution: {integrity: sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       add-stream: 1.0.0
       conventional-changelog-writer: 5.0.1
@@ -13398,35 +14193,35 @@ packages:
 
   /conventional-changelog-ember@2.0.9:
     resolution: {integrity: sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       q: 1.5.1
     dev: true
 
   /conventional-changelog-eslint@3.0.9:
     resolution: {integrity: sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       q: 1.5.1
     dev: true
 
   /conventional-changelog-express@2.0.6:
     resolution: {integrity: sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       q: 1.5.1
     dev: true
 
   /conventional-changelog-jquery@3.0.11:
     resolution: {integrity: sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       q: 1.5.1
     dev: true
 
   /conventional-changelog-jshint@2.0.9:
     resolution: {integrity: sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       compare-func: 2.0.0
       q: 1.5.1
@@ -13434,12 +14229,12 @@ packages:
 
   /conventional-changelog-preset-loader@2.3.4:
     resolution: {integrity: sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: true
 
   /conventional-changelog-writer@5.0.1:
     resolution: {integrity: sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       conventional-commits-filter: 2.0.7
@@ -13455,7 +14250,7 @@ packages:
 
   /conventional-changelog@3.1.25:
     resolution: {integrity: sha512-ryhi3fd1mKf3fSjbLXOfK2D06YwKNic1nC9mWqybBHdObPd8KJ2vjaXZfYj1U23t+V8T8n0d7gwnc9XbIdFbyQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       conventional-changelog-angular: 5.0.13
       conventional-changelog-atom: 2.0.8
@@ -13472,7 +14267,7 @@ packages:
 
   /conventional-commits-filter@2.0.7:
     resolution: {integrity: sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       lodash.ismatch: 4.4.0
       modify-values: 1.0.1
@@ -13480,7 +14275,7 @@ packages:
 
   /conventional-commits-parser@3.2.4:
     resolution: {integrity: sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       JSONStream: 1.3.5
@@ -13493,7 +14288,7 @@ packages:
 
   /conventional-recommended-bump@6.1.0:
     resolution: {integrity: sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       concat-stream: 2.0.0
@@ -13510,17 +14305,13 @@ packages:
     resolution: {integrity: sha512-t5yxPyI8h8KPvRwrS/sRrfIpT2gJbmBAY0TFokyUBy3PM44RuFRpZwHdACz+GTSPLRLo3s4qsscOMLjHiXBwzw==}
     dev: false
 
-  /convert-source-map@1.9.0:
-    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
-    dev: true
-
   /convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
     dev: true
 
   /convert-to-spaces@1.0.2:
     resolution: {integrity: sha512-cj09EBuObp9gZNQCzc7hByQyrs6jVGE+o9kSJmeUoj+GiPiJvi5LYqEH/Hmme4+MTLHM+Ejtq+FChpjjEnsPdQ==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
     dev: true
 
   /cookie-signature@1.0.6:
@@ -13528,17 +14319,23 @@ packages:
 
   /cookie@0.4.2:
     resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
     dev: true
 
-  /cookie@0.5.0:
-    resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
-    engines: {node: ">= 0.6"}
+  /cookie@0.6.0:
+    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
+    engines: {node: '>= 0.6'}
+
+  /copy-to-clipboard@3.3.3:
+    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
+    dependencies:
+      toggle-selection: 1.0.6
+    dev: false
 
   /core-js-compat@3.33.0:
     resolution: {integrity: sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==}
     dependencies:
-      browserslist: 4.22.1
+      browserslist: 4.23.0
     dev: true
 
   /core-util-is@1.0.3:
@@ -13546,7 +14343,7 @@ packages:
 
   /cors@2.8.5:
     resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
-    engines: {node: ">= 0.10"}
+    engines: {node: '>= 0.10'}
     dependencies:
       object-assign: 4.1.1
       vary: 1.1.2
@@ -13554,46 +14351,35 @@ packages:
 
   /crc-32@1.2.2:
     resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
-    engines: {node: ">=0.8"}
+    engines: {node: '>=0.8'}
     hasBin: true
 
   /crc32-stream@4.0.3:
     resolution: {integrity: sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     dependencies:
       crc-32: 1.2.2
       readable-stream: 3.6.2
-
-  /create-jest@29.7.0(@types/node@16.18.58)(ts-node@10.9.1):
-    resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    dependencies:
-      "@jest/types": 29.6.3
-      chalk: 4.1.2
-      exit: 0.1.2
-      graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@16.18.58)(ts-node@10.9.1)
-      jest-util: 29.7.0
-      prompts: 2.4.2
-    transitivePeerDependencies:
-      - "@types/node"
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
     dev: true
 
-  /create-require@1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
-    dev: true
+  /crc32-stream@5.0.0:
+    resolution: {integrity: sha512-B0EPa1UK+qnpBZpG+7FgPCu0J2ETLpXq09o9BkLkEAhdB6Z61Qo4pJ3JYu0c+Qi+/SAL7QThqnzS06pmSSyZaw==}
+    engines: {node: '>= 12.0.0'}
+    dependencies:
+      crc-32: 1.2.2
+      readable-stream: 3.6.2
 
   /cron-parser@4.9.0:
     resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dependencies:
       luxon: 3.4.3
     dev: false
 
+  /cron-validator@1.3.1:
+    resolution: {integrity: sha512-C1HsxuPCY/5opR55G5/WNzyEGDWFVG+6GLrA+fW/sCTcP6A6NTjUP2AK7B8n2PyFs90kDG2qzwm8LMheADku6A==}
+    dev: false
+
   /cross-fetch@3.1.8:
     resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==}
     dependencies:
@@ -13604,7 +14390,7 @@ packages:
 
   /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
@@ -13612,14 +14398,13 @@ packages:
 
   /crypto-random-string@2.0.0:
     resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
-  /crypto-random-string@4.0.0:
-    resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==}
-    engines: {node: ">=12"}
+  /css-in-js-utils@3.1.0:
+    resolution: {integrity: sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==}
     dependencies:
-      type-fest: 1.4.0
-    dev: true
+      hyphenate-style-name: 1.0.4
+    dev: false
 
   /css-select@5.1.0:
     resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
@@ -13631,9 +14416,17 @@ packages:
       nth-check: 2.1.1
     dev: true
 
+  /css-tree@1.1.3:
+    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      mdn-data: 2.0.14
+      source-map: 0.6.1
+    dev: false
+
   /css-what@6.1.0:
     resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dev: true
 
   /css.escape@1.5.1:
@@ -13642,99 +14435,19 @@ packages:
 
   /cssesc@3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     hasBin: true
 
-  /cssom@0.3.8:
-    resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
-    dev: true
-
-  /cssom@0.4.4:
-    resolution: {integrity: sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==}
-    dev: true
-
-  /cssstyle@2.3.0:
-    resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
-    engines: {node: ">=8"}
-    dependencies:
-      cssom: 0.3.8
-    dev: true
-
   /csstype@3.1.2:
     resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
 
-  /d3-color@3.1.0:
-    resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
-    engines: {node: ">=12"}
-    dev: false
-
-  /d3-dispatch@3.0.1:
-    resolution: {integrity: sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==}
-    engines: {node: ">=12"}
-    dev: false
-
-  /d3-drag@3.0.0:
-    resolution: {integrity: sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==}
-    engines: {node: ">=12"}
-    dependencies:
-      d3-dispatch: 3.0.1
-      d3-selection: 3.0.0
-    dev: false
-
-  /d3-ease@3.0.1:
-    resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
-    engines: {node: ">=12"}
-    dev: false
-
-  /d3-interpolate@3.0.1:
-    resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
-    engines: {node: ">=12"}
-    dependencies:
-      d3-color: 3.1.0
-    dev: false
-
-  /d3-selection@3.0.0:
-    resolution: {integrity: sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==}
-    engines: {node: ">=12"}
-    dev: false
-
-  /d3-timer@3.0.1:
-    resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
-    engines: {node: ">=12"}
-    dev: false
-
-  /d3-transition@3.0.1(d3-selection@3.0.0):
-    resolution: {integrity: sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==}
-    engines: {node: ">=12"}
-    peerDependencies:
-      d3-selection: 2 - 3
-    dependencies:
-      d3-color: 3.1.0
-      d3-dispatch: 3.0.1
-      d3-ease: 3.0.1
-      d3-interpolate: 3.0.1
-      d3-selection: 3.0.0
-      d3-timer: 3.0.1
-    dev: false
-
-  /d3-zoom@3.0.0:
-    resolution: {integrity: sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==}
-    engines: {node: ">=12"}
-    dependencies:
-      d3-dispatch: 3.0.1
-      d3-drag: 3.0.0
-      d3-interpolate: 3.0.1
-      d3-selection: 3.0.0
-      d3-transition: 3.0.1(d3-selection@3.0.0)
-    dev: false
-
   /damerau-levenshtein@1.0.8:
     resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
     dev: false
 
   /dargs@7.0.0:
     resolution: {integrity: sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /data-uri-to-buffer@2.0.2:
@@ -13743,76 +14456,53 @@ packages:
 
   /data-uri-to-buffer@4.0.1:
     resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
-    engines: {node: ">= 12"}
-    dev: true
-
-  /data-urls@2.0.0:
-    resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==}
-    engines: {node: ">=10"}
-    dependencies:
-      abab: 2.0.6
-      whatwg-mimetype: 2.3.0
-      whatwg-url: 8.7.0
+    engines: {node: '>= 12'}
     dev: true
 
   /date-format@4.0.14:
     resolution: {integrity: sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==}
-    engines: {node: ">=4.0"}
-    dev: true
-
-  /date-time@3.1.0:
-    resolution: {integrity: sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==}
-    engines: {node: ">=6"}
-    dependencies:
-      time-zone: 1.0.0
+    engines: {node: '>=4.0'}
     dev: true
 
   /dateformat@3.0.3:
     resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}
     dev: true
 
-  /debounce-fn@5.1.2:
-    resolution: {integrity: sha512-Sr4SdOZ4vw6eQDvPYNxHogvrxmCIld/VenC5JbNrFwMiwd7lY/Z18ZFfo+EWNG4DD9nFlAujWAo/wGuOPHmy5A==}
-    engines: {node: ">=12"}
-    dependencies:
-      mimic-fn: 4.0.0
-    dev: true
-
   /debug@2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
-      supports-color: "*"
+      supports-color: '*'
     peerDependenciesMeta:
       supports-color:
         optional: true
     dependencies:
       ms: 2.0.0
 
-  /debug@3.2.7(supports-color@5.5.0):
+  /debug@3.2.7:
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
     peerDependencies:
-      supports-color: "*"
+      supports-color: '*'
     peerDependenciesMeta:
       supports-color:
         optional: true
     dependencies:
       ms: 2.1.3
-      supports-color: 5.5.0
 
-  /debug@4.3.4:
+  /debug@4.3.4(supports-color@5.5.0):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: ">=6.0"}
+    engines: {node: '>=6.0'}
     peerDependencies:
-      supports-color: "*"
+      supports-color: '*'
     peerDependenciesMeta:
       supports-color:
         optional: true
     dependencies:
       ms: 2.1.2
+      supports-color: 5.5.0
 
   /decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       decamelize: 1.2.0
       map-obj: 1.0.1
@@ -13820,16 +14510,12 @@ packages:
 
   /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /decamelize@5.0.1:
     resolution: {integrity: sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==}
-    engines: {node: ">=10"}
-    dev: true
-
-  /decimal.js@10.4.3:
-    resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
+    engines: {node: '>=10'}
     dev: true
 
   /decode-named-character-reference@1.0.2:
@@ -13840,26 +14526,21 @@ packages:
 
   /decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
+    requiresBuild: true
     dependencies:
       mimic-response: 3.1.0
     dev: true
 
   /dedent@0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
-
-  /dedent@1.5.1:
-    resolution: {integrity: sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==}
-    peerDependencies:
-      babel-plugin-macros: ^3.1.0
-    peerDependenciesMeta:
-      babel-plugin-macros:
-        optional: true
-    dev: true
+    requiresBuild: true
+    dev: false
+    optional: true
 
   /deep-eql@4.1.3:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       type-detect: 4.0.8
     dev: true
@@ -13868,7 +14549,7 @@ packages:
     resolution: {integrity: sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==}
     dependencies:
       array-buffer-byte-length: 1.0.0
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       es-get-iterator: 1.1.3
       get-intrinsic: 1.2.1
       is-arguments: 1.1.1
@@ -13887,9 +14568,33 @@ packages:
       which-typed-array: 1.1.11
     dev: true
 
+  /deep-equal@2.2.3:
+    resolution: {integrity: sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.5
+      es-get-iterator: 1.1.3
+      get-intrinsic: 1.2.2
+      is-arguments: 1.1.1
+      is-array-buffer: 3.0.2
+      is-date-object: 1.0.5
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      isarray: 2.0.5
+      object-is: 1.1.5
+      object-keys: 1.1.1
+      object.assign: 4.1.4
+      regexp.prototype.flags: 1.5.1
+      side-channel: 1.0.4
+      which-boxed-primitive: 1.0.2
+      which-collection: 1.0.1
+      which-typed-array: 1.1.13
+    dev: true
+
   /deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
-    engines: {node: ">=4.0.0"}
+    engines: {node: '>=4.0.0'}
     requiresBuild: true
     dev: true
 
@@ -13898,54 +14603,59 @@ packages:
 
   /deepmerge@4.3.1:
     resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /default-browser-id@3.0.0:
     resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       bplist-parser: 0.2.0
       untildify: 4.0.0
 
   /default-browser@4.0.0:
     resolution: {integrity: sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==}
-    engines: {node: ">=14.16"}
+    engines: {node: '>=14.16'}
     dependencies:
       bundle-name: 3.0.0
       default-browser-id: 3.0.0
       execa: 7.2.0
       titleize: 3.0.0
+    dev: false
 
   /defaults@1.0.4:
     resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
     dependencies:
       clone: 1.0.4
 
-  /defer-to-connect@2.0.1:
-    resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
-    engines: {node: ">=10"}
-    dev: true
-
   /define-data-property@1.1.0:
     resolution: {integrity: sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       get-intrinsic: 1.2.1
       gopd: 1.0.1
       has-property-descriptors: 1.0.0
 
+  /define-data-property@1.1.1:
+    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+
   /define-lazy-prop@2.0.0:
     resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /define-lazy-prop@3.0.0:
     resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    dev: false
 
   /define-properties@1.2.1:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       define-data-property: 1.1.0
       has-property-descriptors: 1.0.0
@@ -13956,7 +14666,7 @@ packages:
 
   /del@6.1.1:
     resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
       graceful-fs: 4.2.11
@@ -13969,26 +14679,27 @@ packages:
 
   /delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: ">=0.4.0"}
+    engines: {node: '>=0.4.0'}
 
   /delegates@1.0.0:
     resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
+    dev: false
 
   /denque@2.1.0:
     resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
-    engines: {node: ">=0.10"}
+    engines: {node: '>=0.10'}
     dev: false
 
   /depd@2.0.0:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
 
   /deprecation@2.3.1:
     resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==}
 
   /dequal@2.0.3:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
 
   /destr@2.0.1:
     resolution: {integrity: sha512-M1Ob1zPSIvlARiJUkKqvAZ3VAqQY6Jcuth/pBKQ2b1dX/Qx0OnJ8Vux6J2H5PTMQeRzWrrbTu70VxBfv/OPDJA==}
@@ -13996,30 +14707,30 @@ packages:
 
   /destroy@1.2.0:
     resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
-    engines: {node: ">= 0.8", npm: 1.2.8000 || >= 1.4.16}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
   /detect-indent@5.0.0:
     resolution: {integrity: sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /detect-indent@6.1.0:
     resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /detect-libc@2.0.2:
     resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /detect-newline@2.1.0:
     resolution: {integrity: sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /detect-newline@3.1.0:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /detect-node-es@1.1.0:
@@ -14028,7 +14739,7 @@ packages:
 
   /detect-package-manager@2.0.1:
     resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       execa: 5.1.1
     dev: true
@@ -14038,7 +14749,7 @@ packages:
     hasBin: true
     dependencies:
       address: 1.2.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -14052,11 +14763,6 @@ packages:
   /didyoumean@1.2.2:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
-  /diff-sequences@27.5.1:
-    resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dev: true
-
   /diff-sequences@28.1.1:
     resolution: {integrity: sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
@@ -14067,19 +14773,14 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /diff@4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: ">=0.3.1"}
-    dev: true
-
   /diff@5.1.0:
     resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
-    engines: {node: ">=0.3.1"}
+    engines: {node: '>=0.3.1'}
     dev: true
 
   /dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       path-type: 4.0.0
 
@@ -14088,13 +14789,13 @@ packages:
 
   /doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       esutils: 2.0.3
 
   /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: ">=6.0.0"}
+    engines: {node: '>=6.0.0'}
     dependencies:
       esutils: 2.0.3
 
@@ -14114,16 +14815,9 @@ packages:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
     dev: true
 
-  /domexception@2.0.1:
-    resolution: {integrity: sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==}
-    engines: {node: ">=8"}
-    dependencies:
-      webidl-conversions: 5.0.0
-    dev: true
-
   /domhandler@5.0.3:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
     dev: true
@@ -14138,36 +14832,22 @@ packages:
 
   /dot-prop@5.3.0:
     resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
-    engines: {node: ">=8"}
-    dependencies:
-      is-obj: 2.0.0
-    dev: true
-
-  /dot-prop@6.0.1:
-    resolution: {integrity: sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=8'}
     dependencies:
       is-obj: 2.0.0
     dev: true
 
-  /dot-prop@7.2.0:
-    resolution: {integrity: sha512-Ol/IPXUARn9CSbkrdV4VJo7uCy1I3VuSiWCaFSg+8BdUOzF9n3jefIpcgAydvUZbTdEBZs2vEiTiS9m61ssiDA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      type-fest: 2.19.0
-    dev: true
-
   /dotenv-expand@10.0.0:
     resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /dotenv@16.3.1:
     resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /dotgitignore@2.1.0:
     resolution: {integrity: sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       find-up: 3.0.0
       minimatch: 3.1.2
@@ -14179,12 +14859,12 @@ packages:
     dependencies:
       semver: 7.5.4
       shelljs: 0.8.5
-      typescript: 5.4.0-dev.20231124
+      typescript: 5.6.0-dev.20240612
     dev: true
 
   /dset@3.1.2:
     resolution: {integrity: sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: false
 
   /duplexify@3.7.1:
@@ -14218,7 +14898,7 @@ packages:
 
   /ejs@3.1.9:
     resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     hasBin: true
     dependencies:
       jake: 10.8.7
@@ -14228,23 +14908,17 @@ packages:
     resolution: {integrity: sha512-54z7squS1FyFRSUqq/knOFSptjjogLZXbKcYk3B0qkE1KZzvqASwRZnY2KzZQJqIYLVD38XZeoiMRflYSwyO4w==}
     dev: true
 
+  /electron-to-chromium@1.4.682:
+    resolution: {integrity: sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==}
+    dev: true
+
   /elkjs@0.8.2:
     resolution: {integrity: sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==}
     dev: false
 
-  /emittery@0.13.1:
-    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
-    engines: {node: ">=12"}
-    dev: true
-
-  /emittery@0.8.1:
-    resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==}
-    engines: {node: ">=10"}
-    dev: true
-
   /emittery@1.0.1:
     resolution: {integrity: sha512-2ID6FdrMD9KDLldGesP6317G78K7km/kMcwItRtVFva7I/cSEOIaLpewaUb+YLXVwdAp3Ctfxh/V5zIl1sj7dQ==}
-    engines: {node: ">=14.16"}
+    engines: {node: '>=14.16'}
     dev: true
 
   /emoji-regex@8.0.0:
@@ -14261,20 +14935,21 @@ packages:
 
   /encode-registry@3.0.1:
     resolution: {integrity: sha512-6qOwkl1g0fv0DN3Y3ggr2EaZXN71aoAqPp3p/pVaWSBSIo+YjLOWN61Fva43oVyQNPf7kgm8lkudzlzojwE2jw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       mem: 8.1.1
     dev: false
 
   /encodeurl@1.0.2:
     resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
 
   /encoding@0.1.13:
     resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
     requiresBuild: true
     dependencies:
       iconv-lite: 0.6.3
+    dev: false
     optional: true
 
   /end-of-stream@1.4.4:
@@ -14284,7 +14959,7 @@ packages:
 
   /enhanced-resolve@5.15.0:
     resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==}
-    engines: {node: ">=10.13.0"}
+    engines: {node: '>=10.13.0'}
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.2.1
@@ -14303,12 +14978,13 @@ packages:
 
   /entities@4.5.0:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
-    engines: {node: ">=0.12"}
+    engines: {node: '>=0.12'}
     dev: true
 
   /env-paths@2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
+    dev: false
 
   /env-paths@3.0.0:
     resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==}
@@ -14317,21 +14993,28 @@ packages:
 
   /envinfo@7.10.0:
     resolution: {integrity: sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     hasBin: true
     dev: true
 
   /err-code@2.0.3:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
+    dev: false
 
   /error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
       is-arrayish: 0.2.1
 
+  /error-stack-parser@2.1.4:
+    resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==}
+    dependencies:
+      stackframe: 1.3.4
+    dev: false
+
   /es-abstract@1.22.2:
     resolution: {integrity: sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       array-buffer-byte-length: 1.0.0
       arraybuffer.prototype.slice: 1.0.2
@@ -14376,8 +15059,8 @@ packages:
   /es-get-iterator@1.1.3:
     resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
       has-symbols: 1.0.3
       is-arguments: 1.1.1
       is-map: 2.0.2
@@ -14416,7 +15099,7 @@ packages:
 
   /es-set-tostringtag@2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       get-intrinsic: 1.2.1
       has: 1.0.4
@@ -14429,7 +15112,7 @@ packages:
 
   /es-to-primitive@1.2.1:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       is-callable: 1.2.7
       is-date-object: 1.0.5
@@ -14437,7 +15120,7 @@ packages:
 
   /esbuild-android-64@0.15.18:
     resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
     requiresBuild: true
@@ -14446,7 +15129,7 @@ packages:
 
   /esbuild-android-arm64@0.15.18:
     resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
@@ -14455,7 +15138,7 @@ packages:
 
   /esbuild-darwin-64@0.15.18:
     resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
@@ -14464,7 +15147,7 @@ packages:
 
   /esbuild-darwin-arm64@0.15.18:
     resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
@@ -14473,7 +15156,7 @@ packages:
 
   /esbuild-freebsd-64@0.15.18:
     resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
@@ -14482,7 +15165,7 @@ packages:
 
   /esbuild-freebsd-arm64@0.15.18:
     resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
@@ -14491,7 +15174,7 @@ packages:
 
   /esbuild-linux-32@0.15.18:
     resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
@@ -14500,7 +15183,7 @@ packages:
 
   /esbuild-linux-64@0.15.18:
     resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
@@ -14509,7 +15192,7 @@ packages:
 
   /esbuild-linux-arm64@0.15.18:
     resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
@@ -14518,7 +15201,7 @@ packages:
 
   /esbuild-linux-arm@0.15.18:
     resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
@@ -14527,7 +15210,7 @@ packages:
 
   /esbuild-linux-mips64le@0.15.18:
     resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
@@ -14536,7 +15219,7 @@ packages:
 
   /esbuild-linux-ppc64le@0.15.18:
     resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
@@ -14545,7 +15228,7 @@ packages:
 
   /esbuild-linux-riscv64@0.15.18:
     resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
@@ -14554,7 +15237,7 @@ packages:
 
   /esbuild-linux-s390x@0.15.18:
     resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
@@ -14563,7 +15246,7 @@ packages:
 
   /esbuild-netbsd-64@0.15.18:
     resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
@@ -14572,7 +15255,7 @@ packages:
 
   /esbuild-openbsd-64@0.15.18:
     resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
@@ -14594,9 +15277,9 @@ packages:
   /esbuild-register@3.5.0(esbuild@0.18.20):
     resolution: {integrity: sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==}
     peerDependencies:
-      esbuild: ">=0.12 <1"
+      esbuild: '>=0.12 <1'
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       esbuild: 0.18.20
     transitivePeerDependencies:
       - supports-color
@@ -14604,23 +15287,16 @@ packages:
 
   /esbuild-sunos-64@0.15.18:
     resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
     dev: true
     optional: true
 
-  /esbuild-wasm@0.18.20(patch_hash=b6w4kbugtl4xi6w24tkr3hfz4y):
-    resolution: {integrity: sha512-xRXxH7q4FeC783rORSCyBPWQhcboleKXRPvt3Yl2YMe7jTtu/j7/zjWjqkVhO9BNVHSNVC6igG+XVTPWNQ+kRA==}
-    engines: {node: ">=12"}
-    hasBin: true
-    dev: false
-    patched: true
-
   /esbuild-windows-32@0.15.18:
     resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
@@ -14629,7 +15305,7 @@ packages:
 
   /esbuild-windows-64@0.15.18:
     resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
@@ -14638,7 +15314,7 @@ packages:
 
   /esbuild-windows-arm64@0.15.18:
     resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
@@ -14647,12 +15323,12 @@ packages:
 
   /esbuild@0.15.18:
     resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      "@esbuild/android-arm": 0.15.18
-      "@esbuild/linux-loong64": 0.15.18
+      '@esbuild/android-arm': 0.15.18
+      '@esbuild/linux-loong64': 0.15.18
       esbuild-android-64: 0.15.18
       esbuild-android-arm64: 0.15.18
       esbuild-darwin-64: 0.15.18
@@ -14677,91 +15353,148 @@ packages:
 
   /esbuild@0.17.19:
     resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      "@esbuild/android-arm": 0.17.19
-      "@esbuild/android-arm64": 0.17.19
-      "@esbuild/android-x64": 0.17.19
-      "@esbuild/darwin-arm64": 0.17.19
-      "@esbuild/darwin-x64": 0.17.19
-      "@esbuild/freebsd-arm64": 0.17.19
-      "@esbuild/freebsd-x64": 0.17.19
-      "@esbuild/linux-arm": 0.17.19
-      "@esbuild/linux-arm64": 0.17.19
-      "@esbuild/linux-ia32": 0.17.19
-      "@esbuild/linux-loong64": 0.17.19
-      "@esbuild/linux-mips64el": 0.17.19
-      "@esbuild/linux-ppc64": 0.17.19
-      "@esbuild/linux-riscv64": 0.17.19
-      "@esbuild/linux-s390x": 0.17.19
-      "@esbuild/linux-x64": 0.17.19
-      "@esbuild/netbsd-x64": 0.17.19
-      "@esbuild/openbsd-x64": 0.17.19
-      "@esbuild/sunos-x64": 0.17.19
-      "@esbuild/win32-arm64": 0.17.19
-      "@esbuild/win32-ia32": 0.17.19
-      "@esbuild/win32-x64": 0.17.19
+      '@esbuild/android-arm': 0.17.19
+      '@esbuild/android-arm64': 0.17.19
+      '@esbuild/android-x64': 0.17.19
+      '@esbuild/darwin-arm64': 0.17.19
+      '@esbuild/darwin-x64': 0.17.19
+      '@esbuild/freebsd-arm64': 0.17.19
+      '@esbuild/freebsd-x64': 0.17.19
+      '@esbuild/linux-arm': 0.17.19
+      '@esbuild/linux-arm64': 0.17.19
+      '@esbuild/linux-ia32': 0.17.19
+      '@esbuild/linux-loong64': 0.17.19
+      '@esbuild/linux-mips64el': 0.17.19
+      '@esbuild/linux-ppc64': 0.17.19
+      '@esbuild/linux-riscv64': 0.17.19
+      '@esbuild/linux-s390x': 0.17.19
+      '@esbuild/linux-x64': 0.17.19
+      '@esbuild/netbsd-x64': 0.17.19
+      '@esbuild/openbsd-x64': 0.17.19
+      '@esbuild/sunos-x64': 0.17.19
+      '@esbuild/win32-arm64': 0.17.19
+      '@esbuild/win32-ia32': 0.17.19
+      '@esbuild/win32-x64': 0.17.19
     dev: true
 
   /esbuild@0.18.20:
     resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.18.20
+      '@esbuild/android-arm64': 0.18.20
+      '@esbuild/android-x64': 0.18.20
+      '@esbuild/darwin-arm64': 0.18.20
+      '@esbuild/darwin-x64': 0.18.20
+      '@esbuild/freebsd-arm64': 0.18.20
+      '@esbuild/freebsd-x64': 0.18.20
+      '@esbuild/linux-arm': 0.18.20
+      '@esbuild/linux-arm64': 0.18.20
+      '@esbuild/linux-ia32': 0.18.20
+      '@esbuild/linux-loong64': 0.18.20
+      '@esbuild/linux-mips64el': 0.18.20
+      '@esbuild/linux-ppc64': 0.18.20
+      '@esbuild/linux-riscv64': 0.18.20
+      '@esbuild/linux-s390x': 0.18.20
+      '@esbuild/linux-x64': 0.18.20
+      '@esbuild/netbsd-x64': 0.18.20
+      '@esbuild/openbsd-x64': 0.18.20
+      '@esbuild/sunos-x64': 0.18.20
+      '@esbuild/win32-arm64': 0.18.20
+      '@esbuild/win32-ia32': 0.18.20
+      '@esbuild/win32-x64': 0.18.20
+    dev: true
+
+  /esbuild@0.19.12:
+    resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
+    engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      "@esbuild/android-arm": 0.18.20
-      "@esbuild/android-arm64": 0.18.20
-      "@esbuild/android-x64": 0.18.20
-      "@esbuild/darwin-arm64": 0.18.20
-      "@esbuild/darwin-x64": 0.18.20
-      "@esbuild/freebsd-arm64": 0.18.20
-      "@esbuild/freebsd-x64": 0.18.20
-      "@esbuild/linux-arm": 0.18.20
-      "@esbuild/linux-arm64": 0.18.20
-      "@esbuild/linux-ia32": 0.18.20
-      "@esbuild/linux-loong64": 0.18.20
-      "@esbuild/linux-mips64el": 0.18.20
-      "@esbuild/linux-ppc64": 0.18.20
-      "@esbuild/linux-riscv64": 0.18.20
-      "@esbuild/linux-s390x": 0.18.20
-      "@esbuild/linux-x64": 0.18.20
-      "@esbuild/netbsd-x64": 0.18.20
-      "@esbuild/openbsd-x64": 0.18.20
-      "@esbuild/sunos-x64": 0.18.20
-      "@esbuild/win32-arm64": 0.18.20
-      "@esbuild/win32-ia32": 0.18.20
-      "@esbuild/win32-x64": 0.18.20
+      '@esbuild/aix-ppc64': 0.19.12
+      '@esbuild/android-arm': 0.19.12
+      '@esbuild/android-arm64': 0.19.12
+      '@esbuild/android-x64': 0.19.12
+      '@esbuild/darwin-arm64': 0.19.12
+      '@esbuild/darwin-x64': 0.19.12
+      '@esbuild/freebsd-arm64': 0.19.12
+      '@esbuild/freebsd-x64': 0.19.12
+      '@esbuild/linux-arm': 0.19.12
+      '@esbuild/linux-arm64': 0.19.12
+      '@esbuild/linux-ia32': 0.19.12
+      '@esbuild/linux-loong64': 0.19.12
+      '@esbuild/linux-mips64el': 0.19.12
+      '@esbuild/linux-ppc64': 0.19.12
+      '@esbuild/linux-riscv64': 0.19.12
+      '@esbuild/linux-s390x': 0.19.12
+      '@esbuild/linux-x64': 0.19.12
+      '@esbuild/netbsd-x64': 0.19.12
+      '@esbuild/openbsd-x64': 0.19.12
+      '@esbuild/sunos-x64': 0.19.12
+      '@esbuild/win32-arm64': 0.19.12
+      '@esbuild/win32-ia32': 0.19.12
+      '@esbuild/win32-x64': 0.19.12
+
+  /esbuild@0.21.5:
+    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.21.5
+      '@esbuild/android-arm': 0.21.5
+      '@esbuild/android-arm64': 0.21.5
+      '@esbuild/android-x64': 0.21.5
+      '@esbuild/darwin-arm64': 0.21.5
+      '@esbuild/darwin-x64': 0.21.5
+      '@esbuild/freebsd-arm64': 0.21.5
+      '@esbuild/freebsd-x64': 0.21.5
+      '@esbuild/linux-arm': 0.21.5
+      '@esbuild/linux-arm64': 0.21.5
+      '@esbuild/linux-ia32': 0.21.5
+      '@esbuild/linux-loong64': 0.21.5
+      '@esbuild/linux-mips64el': 0.21.5
+      '@esbuild/linux-ppc64': 0.21.5
+      '@esbuild/linux-riscv64': 0.21.5
+      '@esbuild/linux-s390x': 0.21.5
+      '@esbuild/linux-x64': 0.21.5
+      '@esbuild/netbsd-x64': 0.21.5
+      '@esbuild/openbsd-x64': 0.21.5
+      '@esbuild/sunos-x64': 0.21.5
+      '@esbuild/win32-arm64': 0.21.5
+      '@esbuild/win32-ia32': 0.21.5
+      '@esbuild/win32-x64': 0.21.5
+    dev: true
 
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
-    engines: {node: ">=6"}
-
-  /escape-goat@4.0.0:
-    resolution: {integrity: sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==}
-    engines: {node: ">=12"}
-    dev: true
+    engines: {node: '>=6'}
 
   /escape-html@1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
 
   /escape-string-regexp@1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: ">=0.8.0"}
+    engines: {node: '>=0.8.0'}
 
   /escape-string-regexp@2.0.0:
     resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /escodegen@2.1.0:
     resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
-    engines: {node: ">=6.0"}
+    engines: {node: '>=6.0'}
     hasBin: true
     dependencies:
       esprima: 4.0.1
@@ -14775,14 +15508,23 @@ packages:
     resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==}
     hasBin: true
     peerDependencies:
-      eslint: ">=7.0.0"
+      eslint: '>=7.0.0'
     dependencies:
       eslint: 8.51.0
 
+  /eslint-config-prettier@8.10.0(eslint@8.56.0):
+    resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+    dependencies:
+      eslint: 8.56.0
+    dev: true
+
   /eslint-import-resolver-node@0.3.9:
     resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7
       is-core-module: 2.13.0
       resolve: 1.22.6
     transitivePeerDependencies:
@@ -14792,10 +15534,10 @@ packages:
     resolution: {integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      eslint: "*"
-      eslint-plugin-import: "*"
+      eslint: '*'
+      eslint-plugin-import: '*'
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       enhanced-resolve: 5.15.0
       eslint: 8.51.0
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.51.0)
@@ -14805,7 +15547,7 @@ packages:
       is-core-module: 2.13.0
       is-glob: 4.0.3
     transitivePeerDependencies:
-      - "@typescript-eslint/parser"
+      - '@typescript-eslint/parser'
       - eslint-import-resolver-node
       - eslint-import-resolver-webpack
       - supports-color
@@ -14814,10 +15556,10 @@ packages:
     resolution: {integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      eslint: "*"
-      eslint-plugin-import: "*"
+      eslint: '*'
+      eslint-plugin-import: '*'
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       enhanced-resolve: 5.15.0
       eslint: 8.51.0
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.51.0)
@@ -14827,7 +15569,30 @@ packages:
       is-core-module: 2.13.0
       is-glob: 4.0.3
     transitivePeerDependencies:
-      - "@typescript-eslint/parser"
+      - '@typescript-eslint/parser'
+      - eslint-import-resolver-node
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
+  /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.28.1)(eslint@8.56.0):
+    resolution: {integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      eslint-plugin-import: '*'
+    dependencies:
+      debug: 4.3.4(supports-color@5.5.0)
+      enhanced-resolve: 5.15.0
+      eslint: 8.56.0
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)
+      eslint-plugin-import: 2.28.1(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)
+      fast-glob: 3.3.1
+      get-tsconfig: 4.7.2
+      is-core-module: 2.13.0
+      is-glob: 4.0.3
+    transitivePeerDependencies:
+      - '@typescript-eslint/parser'
       - eslint-import-resolver-node
       - eslint-import-resolver-webpack
       - supports-color
@@ -14835,15 +15600,15 @@ packages:
 
   /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.51.0):
     resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     peerDependencies:
-      "@typescript-eslint/parser": "*"
-      eslint: "*"
-      eslint-import-resolver-node: "*"
-      eslint-import-resolver-typescript: "*"
-      eslint-import-resolver-webpack: "*"
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
     peerDependenciesMeta:
-      "@typescript-eslint/parser":
+      '@typescript-eslint/parser':
         optional: true
       eslint:
         optional: true
@@ -14854,8 +15619,8 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 5.62.0(eslint@8.51.0)(typescript@4.9.5)
-      debug: 3.2.7(supports-color@5.5.0)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.3.3)
+      debug: 3.2.7
       eslint: 8.51.0
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.28.1)(eslint@8.51.0)
@@ -14864,15 +15629,15 @@ packages:
 
   /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.51.0):
     resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     peerDependencies:
-      "@typescript-eslint/parser": "*"
-      eslint: "*"
-      eslint-import-resolver-node: "*"
-      eslint-import-resolver-typescript: "*"
-      eslint-import-resolver-webpack: "*"
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
     peerDependenciesMeta:
-      "@typescript-eslint/parser":
+      '@typescript-eslint/parser':
         optional: true
       eslint:
         optional: true
@@ -14883,8 +15648,8 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 6.7.4(eslint@8.51.0)(typescript@4.9.5)
-      debug: 3.2.7(supports-color@5.5.0)
+      '@typescript-eslint/parser': 6.7.4(eslint@8.51.0)(typescript@5.3.3)
+      debug: 3.2.7
       eslint: 8.51.0
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.28.1)(eslint@8.51.0)
@@ -14892,22 +15657,52 @@ packages:
       - supports-color
     dev: true
 
+  /eslint-module-utils@2.8.0(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0):
+    resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 7.0.2(eslint@8.56.0)(typescript@5.3.3)
+      debug: 3.2.7
+      eslint: 8.56.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.28.1)(eslint@8.56.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /eslint-plugin-import@2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.51.0):
     resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     peerDependencies:
-      "@typescript-eslint/parser": "*"
+      '@typescript-eslint/parser': '*'
       eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
     peerDependenciesMeta:
-      "@typescript-eslint/parser":
+      '@typescript-eslint/parser':
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 5.62.0(eslint@8.51.0)(typescript@4.9.5)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.3.3)
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.3
       array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7
       doctrine: 2.1.0
       eslint: 8.51.0
       eslint-import-resolver-node: 0.3.9
@@ -14928,20 +15723,20 @@ packages:
 
   /eslint-plugin-import@2.28.1(@typescript-eslint/parser@6.7.4)(eslint-import-resolver-typescript@3.6.1)(eslint@8.51.0):
     resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     peerDependencies:
-      "@typescript-eslint/parser": "*"
+      '@typescript-eslint/parser': '*'
       eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
     peerDependenciesMeta:
-      "@typescript-eslint/parser":
+      '@typescript-eslint/parser':
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 6.7.4(eslint@8.51.0)(typescript@4.9.5)
+      '@typescript-eslint/parser': 6.7.4(eslint@8.51.0)(typescript@5.3.3)
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.3
       array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7
       doctrine: 2.1.0
       eslint: 8.51.0
       eslint-import-resolver-node: 0.3.9
@@ -14961,38 +15756,73 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jsx-a11y@6.7.1(eslint@8.51.0):
-    resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==}
-    engines: {node: ">=4.0"}
+  /eslint-plugin-import@2.28.1(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0):
+    resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==}
+    engines: {node: '>=4'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
     dependencies:
-      "@babel/runtime": 7.23.1
-      aria-query: 5.3.0
+      '@typescript-eslint/parser': 7.0.2(eslint@8.56.0)(typescript@5.3.3)
       array-includes: 3.1.7
+      array.prototype.findlastindex: 1.2.3
+      array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
-      ast-types-flow: 0.0.7
-      axe-core: 4.8.2
-      axobject-query: 3.2.1
-      damerau-levenshtein: 1.0.8
-      emoji-regex: 9.2.2
-      eslint: 8.51.0
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.56.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.0.2)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)
       has: 1.0.4
-      jsx-ast-utils: 3.3.5
-      language-tags: 1.0.5
+      is-core-module: 2.13.0
+      is-glob: 4.0.3
       minimatch: 3.1.2
-      object.entries: 1.1.7
+      object.fromentries: 2.0.7
+      object.groupby: 1.0.1
+      object.values: 1.1.7
+      semver: 6.3.1
+      tsconfig-paths: 3.14.2
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
+  /eslint-plugin-jsx-a11y@6.7.1(eslint@8.51.0):
+    resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+    dependencies:
+      '@babel/runtime': 7.23.1
+      aria-query: 5.3.0
+      array-includes: 3.1.7
+      array.prototype.flatmap: 1.3.2
+      ast-types-flow: 0.0.7
+      axe-core: 4.8.2
+      axobject-query: 3.2.1
+      damerau-levenshtein: 1.0.8
+      emoji-regex: 9.2.2
+      eslint: 8.51.0
+      has: 1.0.4
+      jsx-ast-utils: 3.3.5
+      language-tags: 1.0.5
+      minimatch: 3.1.2
+      object.entries: 1.1.7
       object.fromentries: 2.0.7
       semver: 6.3.1
     dev: false
 
   /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0)(eslint@8.51.0)(prettier@2.8.8):
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     peerDependencies:
-      eslint: ">=7.28.0"
-      eslint-config-prettier: "*"
-      prettier: ">=2.0.0"
+      eslint: '>=7.28.0'
+      eslint-config-prettier: '*'
+      prettier: '>=2.0.0'
     peerDependenciesMeta:
       eslint-config-prettier:
         optional: true
@@ -15002,9 +15832,26 @@ packages:
       prettier: 2.8.8
       prettier-linter-helpers: 1.0.0
 
+  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8):
+    resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      eslint: '>=7.28.0'
+      eslint-config-prettier: '*'
+      prettier: '>=2.0.0'
+    peerDependenciesMeta:
+      eslint-config-prettier:
+        optional: true
+    dependencies:
+      eslint: 8.56.0
+      eslint-config-prettier: 8.10.0(eslint@8.56.0)
+      prettier: 2.8.8
+      prettier-linter-helpers: 1.0.0
+    dev: true
+
   /eslint-plugin-react-hooks@4.6.0(eslint@8.51.0):
     resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
@@ -15013,7 +15860,7 @@ packages:
 
   /eslint-plugin-react@7.33.2(eslint@8.51.0):
     resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
@@ -15036,22 +15883,22 @@ packages:
       string.prototype.matchall: 4.0.10
     dev: false
 
-  /eslint-plugin-sort-exports@0.8.0(eslint@8.51.0):
+  /eslint-plugin-sort-exports@0.8.0(eslint@8.56.0):
     resolution: {integrity: sha512-5x7kJNjIS5bSyehFJ6Gk2gh2wUPt/rmhwDHF8JPDicSH7bvrLRFdlkhHu74YqYBjEySHYaOZVoKNP90TjI0v6w==}
     peerDependencies:
-      eslint: ">=5.0.0"
+      eslint: '>=5.0.0'
     dependencies:
-      eslint: 8.51.0
+      eslint: 8.56.0
     dev: true
 
   /eslint-plugin-unicorn@47.0.0(eslint@8.51.0):
     resolution: {integrity: sha512-ivB3bKk7fDIeWOUmmMm9o3Ax9zbMz1Bsza/R2qm46ufw4T6VBFBaJIR1uN3pCKSmSXm8/9Nri8V+iUut1NhQGA==}
-    engines: {node: ">=16"}
+    engines: {node: '>=16'}
     peerDependencies:
-      eslint: ">=8.38.0"
+      eslint: '>=8.38.0'
     dependencies:
-      "@babel/helper-validator-identifier": 7.22.20
-      "@eslint-community/eslint-utils": 4.4.0(eslint@8.51.0)
+      '@babel/helper-validator-identifier': 7.22.20
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.51.0)
       ci-info: 3.9.0
       clean-regexp: 1.0.0
       eslint: 8.51.0
@@ -15071,7 +15918,7 @@ packages:
 
   /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
-    engines: {node: ">=8.0.0"}
+    engines: {node: '>=8.0.0'}
     dependencies:
       esrecurse: 4.3.0
       estraverse: 4.3.0
@@ -15092,17 +15939,63 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      "@eslint-community/eslint-utils": 4.4.0(eslint@8.51.0)
-      "@eslint-community/regexpp": 4.9.1
-      "@eslint/eslintrc": 2.1.2
-      "@eslint/js": 8.51.0
-      "@humanwhocodes/config-array": 0.11.11
-      "@humanwhocodes/module-importer": 1.0.1
-      "@nodelib/fs.walk": 1.2.8
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.51.0)
+      '@eslint-community/regexpp': 4.9.1
+      '@eslint/eslintrc': 2.1.2
+      '@eslint/js': 8.51.0
+      '@humanwhocodes/config-array': 0.11.11
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.3
+      debug: 4.3.4(supports-color@5.5.0)
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.5.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      globals: 13.23.0
+      graphemer: 1.4.0
+      ignore: 5.2.4
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      js-yaml: 4.1.0
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.3
+      strip-ansi: 6.0.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /eslint@8.56.0:
+    resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
+      '@eslint-community/regexpp': 4.9.1
+      '@eslint/eslintrc': 2.1.4
+      '@eslint/js': 8.56.0
+      '@humanwhocodes/config-array': 0.11.14
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      '@ungap/structured-clone': 1.2.0
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -15131,6 +16024,7 @@ packages:
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /espree@9.6.1:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
@@ -15142,35 +16036,35 @@ packages:
 
   /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     hasBin: true
 
   /esquery@1.5.0:
     resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
-    engines: {node: ">=0.10"}
+    engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
 
   /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: ">=4.0"}
+    engines: {node: '>=4.0'}
     dependencies:
       estraverse: 5.3.0
 
   /estraverse@4.3.0:
     resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
-    engines: {node: ">=4.0"}
+    engines: {node: '>=4.0'}
 
   /estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: ">=4.0"}
+    engines: {node: '>=4.0'}
 
   /estree-to-babel@3.2.1:
     resolution: {integrity: sha512-YNF+mZ/Wu2FU/gvmzuWtYc8rloubL7wfXCTgouFrnjGVXPA/EeYYA7pupXWrb3Iv1cTBeSSxxJIbK23l4MRNqg==}
-    engines: {node: ">=8.3.0"}
+    engines: {node: '>=8.3.0'}
     dependencies:
-      "@babel/traverse": 7.23.0
-      "@babel/types": 7.23.0
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
       c8: 7.14.0
     transitivePeerDependencies:
       - supports-color
@@ -15180,26 +16074,32 @@ packages:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
     dev: true
 
+  /estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+    dependencies:
+      '@types/estree': 1.0.2
+    dev: true
+
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /etag@1.8.1:
     resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
   /event-target-shim@5.0.1:
     resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: false
 
   /events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
-    engines: {node: ">=0.8.x"}
+    engines: {node: '>=0.8.x'}
 
   /execa@5.1.1:
     resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       cross-spawn: 7.0.3
       get-stream: 6.0.1
@@ -15227,7 +16127,7 @@ packages:
 
   /execa@8.0.1:
     resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
-    engines: {node: ">=16.17"}
+    engines: {node: '>=16.17'}
     dependencies:
       cross-spawn: 7.0.3
       get-stream: 8.0.1
@@ -15238,63 +16138,38 @@ packages:
       onetime: 6.0.0
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
-    dev: false
-
-  /exit@0.1.2:
-    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
-    engines: {node: ">= 0.8.0"}
-    dev: true
 
   /expand-template@2.0.3:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
-    engines: {node: ">=6"}
-    dev: true
-
-  /expect@27.5.1:
-    resolution: {integrity: sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      jest-get-type: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
+    engines: {node: '>=6'}
+    requiresBuild: true
     dev: true
 
   /expect@28.1.3:
     resolution: {integrity: sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      "@jest/expect-utils": 28.1.3
+      '@jest/expect-utils': 28.1.3
       jest-get-type: 28.0.2
       jest-matcher-utils: 28.1.3
       jest-message-util: 28.1.3
       jest-util: 28.1.3
     dev: true
 
-  /expect@29.7.0:
-    resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/expect-utils": 29.7.0
-      jest-get-type: 29.6.3
-      jest-matcher-utils: 29.7.0
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-    dev: true
-
   /exponential-backoff@3.1.1:
     resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==}
+    dev: false
 
-  /express@4.18.2:
-    resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
-    engines: {node: ">= 0.10.0"}
+  /express@4.19.2:
+    resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}
+    engines: {node: '>= 0.10.0'}
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
-      body-parser: 1.20.1
+      body-parser: 1.20.2
       content-disposition: 0.5.4
       content-type: 1.0.5
-      cookie: 0.5.0
+      cookie: 0.6.0
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
@@ -15328,7 +16203,7 @@ packages:
 
   /external-editor@3.1.0:
     resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       chardet: 0.7.0
       iconv-lite: 0.4.24
@@ -15348,14 +16223,14 @@ packages:
 
   /extract-zip@2.0.1:
     resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
-    engines: {node: ">= 10.17.0"}
+    engines: {node: '>= 10.17.0'}
     hasBin: true
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
-      "@types/yauzl": 2.10.3
+      '@types/yauzl': 2.10.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -15366,12 +16241,25 @@ packages:
   /fast-diff@1.3.0:
     resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
 
+  /fast-fifo@1.3.2:
+    resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
+
   /fast-glob@3.3.1:
     resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==}
-    engines: {node: ">=8.6.0"}
+    engines: {node: '>=8.6.0'}
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.5
+
+  /fast-glob@3.3.2:
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
     dependencies:
-      "@nodelib/fs.stat": 2.0.5
-      "@nodelib/fs.walk": 1.2.8
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
       micromatch: 4.0.5
@@ -15385,14 +16273,18 @@ packages:
   /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  /fast-memoize@2.5.2:
-    resolution: {integrity: sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==}
-    dev: true
+  /fast-loops@1.1.3:
+    resolution: {integrity: sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==}
+    dev: false
 
   /fast-safe-stringify@2.1.1:
     resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
     dev: false
 
+  /fast-shallow-equal@1.0.0:
+    resolution: {integrity: sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==}
+    dev: false
+
   /fast-text-encoding@1.0.6:
     resolution: {integrity: sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==}
     dev: false
@@ -15404,6 +16296,10 @@ packages:
       strnum: 1.0.5
     dev: false
 
+  /fastest-stable-stringify@2.0.2:
+    resolution: {integrity: sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==}
+    dev: false
+
   /fastq@1.15.0:
     resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
     dependencies:
@@ -15449,7 +16345,7 @@ packages:
 
   /figures@3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       escape-string-regexp: 1.0.5
 
@@ -15474,13 +16370,13 @@ packages:
 
   /fill-range@7.0.1:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       to-regex-range: 5.0.1
 
   /finalhandler@1.2.0:
     resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
     dependencies:
       debug: 2.6.9
       encodeurl: 1.0.2
@@ -15494,7 +16390,7 @@ packages:
 
   /find-cache-dir@2.1.0:
     resolution: {integrity: sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       commondir: 1.0.1
       make-dir: 2.1.0
@@ -15503,7 +16399,7 @@ packages:
 
   /find-cache-dir@3.3.2:
     resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       commondir: 1.0.1
       make-dir: 3.1.0
@@ -15512,35 +16408,35 @@ packages:
 
   /find-up@2.1.0:
     resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       locate-path: 2.0.0
     dev: true
 
   /find-up@3.0.0:
     resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       locate-path: 3.0.0
     dev: true
 
   /find-up@4.1.0:
     resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       locate-path: 5.0.0
       path-exists: 4.0.0
 
   /find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       locate-path: 6.0.0
       path-exists: 4.0.0
 
   /flat-cache@3.1.1:
     resolution: {integrity: sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dependencies:
       flatted: 3.2.9
       keyv: 4.5.4
@@ -15556,7 +16452,7 @@ packages:
 
   /flow-parser@0.218.0:
     resolution: {integrity: sha512-mk4e7UK4P/W3tjrJyto6oxPuCjwvRMyzBh72hTl8T0dOcTzkP0M2JJHpncgyhKphMFi9pnjwHfc8e0oe4Uk3LA==}
-    engines: {node: ">=0.4.0"}
+    engines: {node: '>=0.4.0'}
     dev: true
 
   /fn.name@1.1.0:
@@ -15565,11 +16461,21 @@ packages:
     dev: false
     optional: true
 
-  /follow-redirects@1.15.3:
-    resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==}
-    engines: {node: ">=4.0"}
+  /follow-redirects@1.15.4:
+    resolution: {integrity: sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dev: true
+
+  /follow-redirects@1.15.5:
+    resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==}
+    engines: {node: '>=4.0'}
     peerDependencies:
-      debug: "*"
+      debug: '*'
     peerDependenciesMeta:
       debug:
         optional: true
@@ -15581,7 +16487,7 @@ packages:
 
   /foreground-child@2.0.0:
     resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
-    engines: {node: ">=8.0.0"}
+    engines: {node: '>=8.0.0'}
     dependencies:
       cross-spawn: 7.0.3
       signal-exit: 3.0.7
@@ -15589,28 +16495,23 @@ packages:
 
   /foreground-child@3.1.1:
     resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     dependencies:
       cross-spawn: 7.0.3
       signal-exit: 4.1.0
 
-  /form-data-encoder@2.1.4:
-    resolution: {integrity: sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==}
-    engines: {node: ">= 14.17"}
-    dev: true
-
-  /form-data@3.0.1:
-    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
-    engines: {node: ">= 6"}
+  /form-data@2.5.1:
+    resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
+    engines: {node: '>= 0.12'}
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
-    dev: true
+    dev: false
 
   /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
@@ -15618,19 +16519,14 @@ packages:
 
   /formdata-polyfill@4.0.10:
     resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
-    engines: {node: ">=12.20.0"}
+    engines: {node: '>=12.20.0'}
     dependencies:
       fetch-blob: 3.2.0
     dev: true
 
   /forwarded@0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
-    engines: {node: ">= 0.6"}
-
-  /fp-and-or@0.1.4:
-    resolution: {integrity: sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==}
-    engines: {node: ">=10"}
-    dev: true
+    engines: {node: '>= 0.6'}
 
   /fraction.js@4.3.6:
     resolution: {integrity: sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==}
@@ -15651,19 +16547,21 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
       tslib: 2.6.2
     optionalDependencies:
-      "@emotion/is-prop-valid": 0.8.8
+      '@emotion/is-prop-valid': 0.8.8
     dev: false
 
   /fresh@0.5.2:
     resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
   /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+    requiresBuild: true
+    dev: true
 
   /fs-extra@10.1.0:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
@@ -15671,15 +16569,24 @@ packages:
 
   /fs-extra@11.1.1:
     resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
-    engines: {node: ">=14.14"}
+    engines: {node: '>=14.14'}
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.0
 
+  /fs-extra@11.2.0:
+    resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
+    engines: {node: '>=14.14'}
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+    dev: true
+
   /fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
-    engines: {node: ">=6 <7 || >=8"}
+    engines: {node: '>=6 <7 || >=8'}
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 4.0.0
@@ -15688,16 +16595,17 @@ packages:
 
   /fs-extra@9.1.0:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       at-least-node: 1.0.0
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.0
+    dev: true
 
   /fs-minipass@2.1.0:
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
 
@@ -15706,6 +16614,7 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       minipass: 7.0.4
+    dev: false
 
   /fs-monkey@1.0.5:
     resolution: {integrity: sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==}
@@ -15732,11 +16641,14 @@ packages:
   /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
+  /function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
   /function.prototype.name@1.1.6:
     resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.2
       functions-have-names: 1.2.3
@@ -15756,6 +16668,7 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wide-align: 1.1.5
+    dev: false
 
   /gauge@5.0.1:
     resolution: {integrity: sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==}
@@ -15773,7 +16686,7 @@ packages:
 
   /gaxios@5.1.3:
     resolution: {integrity: sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       extend: 3.0.2
       https-proxy-agent: 5.0.1
@@ -15784,9 +16697,22 @@ packages:
       - supports-color
     dev: false
 
+  /gaxios@6.1.1:
+    resolution: {integrity: sha512-bw8smrX+XlAoo9o1JAksBwX+hi/RG15J+NTSxmNPIclKC3ZVK6C2afwY8OSdRvOK0+ZLecUJYtj2MmjOt3Dm0w==}
+    engines: {node: '>=14'}
+    dependencies:
+      extend: 3.0.2
+      https-proxy-agent: 7.0.2
+      is-stream: 2.0.1
+      node-fetch: 2.7.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
   /gcp-metadata@5.3.0:
     resolution: {integrity: sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       gaxios: 5.1.3
       json-bigint: 1.0.0
@@ -15795,14 +16721,25 @@ packages:
       - supports-color
     dev: false
 
+  /gcp-metadata@6.0.0:
+    resolution: {integrity: sha512-Ozxyi23/1Ar51wjUT2RDklK+3HxqDr8TLBNK8rBBFQ7T85iIGnXnVusauj06QyqCXRFZig8LZC+TUddWbndlpQ==}
+    engines: {node: '>=14'}
+    dependencies:
+      gaxios: 6.1.1
+      json-bigint: 1.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
   /generic-pool@3.9.0:
     resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
     dev: true
 
   /gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     dev: true
 
   /get-caller-file@2.0.5:
@@ -15821,26 +16758,34 @@ packages:
       has-proto: 1.0.1
       has-symbols: 1.0.3
 
+  /get-intrinsic@1.2.2:
+    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
+    dependencies:
+      function-bind: 1.1.2
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      hasown: 2.0.0
+
   /get-nonce@1.0.1:
     resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: true
 
   /get-npm-tarball-url@2.0.3:
     resolution: {integrity: sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==}
-    engines: {node: ">=12.17"}
+    engines: {node: '>=12.17'}
 
   /get-package-type@0.1.0:
     resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
-    engines: {node: ">=8.0.0"}
+    engines: {node: '>=8.0.0'}
     dev: true
 
   /get-pkg-repo@4.2.1:
     resolution: {integrity: sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==}
-    engines: {node: ">=6.9.0"}
+    engines: {node: '>=6.9.0'}
     hasBin: true
     dependencies:
-      "@hutson/parse-repository-url": 3.0.2
+      '@hutson/parse-repository-url': 3.0.2
       hosted-git-info: 4.1.0
       through2: 2.0.5
       yargs: 16.2.0
@@ -15848,7 +16793,7 @@ packages:
 
   /get-port@5.1.1:
     resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /get-port@6.1.2:
@@ -15863,32 +16808,26 @@ packages:
       source-map: 0.6.1
     dev: false
 
-  /get-stdin@8.0.0:
-    resolution: {integrity: sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==}
-    engines: {node: ">=10"}
-    dev: true
-
   /get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       pump: 3.0.0
     dev: true
 
   /get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /get-stream@8.0.1:
     resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
-    engines: {node: ">=16"}
-    dev: false
+    engines: {node: '>=16'}
 
   /get-symbol-description@1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       get-intrinsic: 1.2.1
 
   /get-tsconfig@4.7.2:
@@ -15896,6 +16835,12 @@ packages:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
+  /get-tsconfig@4.7.5:
+    resolution: {integrity: sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==}
+    dependencies:
+      resolve-pkg-maps: 1.0.0
+    dev: true
+
   /giget@1.1.3:
     resolution: {integrity: sha512-zHuCeqtfgqgDwvXlR84UNgnJDuUHQcNI5OqWqFxxuk2BshuKbYhJWdxBsEo4PvKqoGh23lUAIvBNpChMLv7/9Q==}
     hasBin: true
@@ -15912,7 +16857,7 @@ packages:
 
   /git-raw-commits@2.0.11:
     resolution: {integrity: sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       dargs: 7.0.0
@@ -15924,7 +16869,7 @@ packages:
 
   /git-remote-origin-url@2.0.0:
     resolution: {integrity: sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       gitconfiglocal: 1.0.0
       pify: 2.3.0
@@ -15932,7 +16877,7 @@ packages:
 
   /git-semver-tags@4.1.1:
     resolution: {integrity: sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       meow: 8.1.2
@@ -15947,6 +16892,7 @@ packages:
 
   /github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+    requiresBuild: true
     dev: true
 
   /github-slugger@1.5.0:
@@ -15955,33 +16901,33 @@ packages:
 
   /glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       is-glob: 4.0.3
 
   /glob-parent@6.0.2:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: ">=10.13.0"}
+    engines: {node: '>=10.13.0'}
     dependencies:
       is-glob: 4.0.3
 
   /glob-promise@4.2.2(glob@7.2.3):
     resolution: {integrity: sha512-xcUzJ8NWN5bktoTIX7eOclO1Npxd/dyVqUJxlLIDasT4C7KZyqlPIwkdJ0Ypiy3p2ZKahTjK4M9uC3sNSfNMzw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     peerDependencies:
       glob: ^7.1.6
     dependencies:
-      "@types/glob": 7.2.0
+      '@types/glob': 7.2.0
       glob: 7.2.3
     dev: true
 
   /glob-promise@6.0.5(glob@8.1.0):
     resolution: {integrity: sha512-uUzvxo60yo/vMLXZHCNAlfdM5U5A07jCnUO8xTK44Z0Vc58poGDXhDx8ju1DmPdprOORh+4Lpog64hl+AJ5piA==}
-    engines: {node: ">=16"}
+    engines: {node: '>=16'}
     peerDependencies:
       glob: ^8.0.3
     dependencies:
-      "@types/glob": 8.1.0
+      '@types/glob': 8.1.0
       glob: 8.1.0
     dev: false
 
@@ -15991,7 +16937,7 @@ packages:
 
   /glob@10.3.10:
     resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}
-    engines: {node: ">=16 || 14 >=14.17"}
+    engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
     dependencies:
       foreground-child: 3.1.1
@@ -16000,6 +16946,17 @@ packages:
       minipass: 7.0.4
       path-scurry: 1.10.1
 
+  /glob@10.3.12:
+    resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+    dependencies:
+      foreground-child: 3.1.1
+      jackspeak: 2.3.6
+      minimatch: 9.0.4
+      minipass: 7.0.4
+      path-scurry: 1.10.2
+
   /glob@7.1.6:
     resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
     dependencies:
@@ -16009,6 +16966,7 @@ packages:
       minimatch: 3.1.2
       once: 1.4.0
       path-is-absolute: 1.0.1
+    dev: true
 
   /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
@@ -16022,7 +16980,7 @@ packages:
 
   /glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6
@@ -16030,44 +16988,37 @@ packages:
       minimatch: 5.1.6
       once: 1.4.0
 
-  /global-dirs@3.0.1:
-    resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
-    engines: {node: ">=10"}
-    dependencies:
-      ini: 2.0.0
-    dev: true
-
   /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /globals@13.23.0:
     resolution: {integrity: sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
 
   /globalthis@1.0.3:
     resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       define-properties: 1.2.1
 
   /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 3.0.0
 
   /google-auth-library@8.9.0:
     resolution: {integrity: sha512-f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       arrify: 2.0.1
       base64-js: 1.5.1
@@ -16083,9 +17034,44 @@ packages:
       - supports-color
     dev: false
 
+  /google-auth-library@9.2.0:
+    resolution: {integrity: sha512-1oV3p0JhNEhVbj26eF3FAJcv9MXXQt4S0wcvKZaDbl4oHq5V3UJoSbsGZGQNcjoCdhW4kDSwOs11wLlHog3fgQ==}
+    engines: {node: '>=14'}
+    dependencies:
+      base64-js: 1.5.1
+      ecdsa-sig-formatter: 1.0.11
+      gaxios: 6.1.1
+      gcp-metadata: 6.0.0
+      gtoken: 7.0.1
+      jws: 4.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
+  /google-gax@4.0.5:
+    resolution: {integrity: sha512-yLoYtp4zE+8OQA74oBEbNkbzI6c95W01JSL7RqC8XERKpRvj3ytZp1dgnbA6G9aRsc8pZB25xWYBcCmrbYOEhA==}
+    engines: {node: '>=14'}
+    dependencies:
+      '@grpc/grpc-js': 1.9.9
+      '@grpc/proto-loader': 0.7.10
+      '@types/long': 4.0.2
+      abort-controller: 3.0.0
+      duplexify: 4.1.2
+      google-auth-library: 9.2.0
+      node-fetch: 2.7.0
+      object-hash: 3.0.0
+      proto3-json-serializer: 2.0.0
+      protobufjs: 7.2.5(patch_hash=plkkb5oxv62w7nyvt6cqmvgk4q)
+      retry-request: 7.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
   /google-p12-pem@4.0.1:
     resolution: {integrity: sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
       node-forge: 1.3.1
@@ -16096,25 +17082,9 @@ packages:
     dependencies:
       get-intrinsic: 1.2.1
 
-  /got@12.6.1:
-    resolution: {integrity: sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      "@sindresorhus/is": 5.6.0
-      "@szmarczak/http-timer": 5.0.1
-      cacheable-lookup: 7.0.0
-      cacheable-request: 10.2.14
-      decompress-response: 6.0.0
-      form-data-encoder: 2.1.4
-      get-stream: 6.0.1
-      http2-wrapper: 2.2.0
-      lowercase-keys: 3.0.0
-      p-cancelable: 3.0.0
-      responselike: 3.0.0
-    dev: true
-
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
+    dev: false
 
   /graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
@@ -16129,7 +17099,7 @@ packages:
   /graphology@0.25.4(graphology-types@0.24.7):
     resolution: {integrity: sha512-33g0Ol9nkWdD6ulw687viS8YJQBxqG5LWII6FI6nul0pq6iM2t5EKquOTFDbyTblRB3O9I+7KX4xI8u5ffekAQ==}
     peerDependencies:
-      graphology-types: ">=0.24.0"
+      graphology-types: '>=0.24.0'
     dependencies:
       events: 3.3.0
       graphology-types: 0.24.7
@@ -16138,7 +17108,7 @@ packages:
 
   /graphql-tag@2.12.6(graphql@16.8.1):
     resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     requiresBuild: true
     peerDependencies:
       graphql: ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
@@ -16157,7 +17127,7 @@ packages:
 
   /gtoken@6.1.2:
     resolution: {integrity: sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     dependencies:
       gaxios: 5.1.3
       google-p12-pem: 4.0.1
@@ -16167,6 +17137,17 @@ packages:
       - supports-color
     dev: false
 
+  /gtoken@7.0.1:
+    resolution: {integrity: sha512-KcFVtoP1CVFtQu0aSk3AyAt2og66PFhZAlkUOuWKwzMLoulHXG5W5wE5xAnHb+yl3/wEFoqGW7/cDGMU8igDZQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      gaxios: 6.1.1
+      jws: 4.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
   /gunzip-maybe@1.4.2:
     resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==}
     hasBin: true
@@ -16181,7 +17162,7 @@ packages:
 
   /handlebars@4.7.8:
     resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==}
-    engines: {node: ">=0.4.7"}
+    engines: {node: '>=0.4.7'}
     hasBin: true
     dependencies:
       minimist: 1.2.8
@@ -16205,7 +17186,7 @@ packages:
 
   /hard-rejection@2.1.0:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: true
 
   /has-bigints@1.0.2:
@@ -16213,52 +17194,65 @@ packages:
 
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /has-own-prop@2.0.0:
     resolution: {integrity: sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
       get-intrinsic: 1.2.1
 
+  /has-property-descriptors@1.0.1:
+    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
+    dependencies:
+      get-intrinsic: 1.2.2
+
   /has-proto@1.0.1:
     resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
 
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
 
   /has-tostringtag@1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
 
   /has-unicode@2.0.1:
     resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
-
-  /has-yarn@3.0.0:
-    resolution: {integrity: sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
+    dev: false
 
   /has@1.0.4:
     resolution: {integrity: sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==}
-    engines: {node: ">= 0.4.0"}
+    engines: {node: '>= 0.4.0'}
+
+  /hasown@2.0.0:
+    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
+
+  /hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
 
   /hast-util-to-jsx-runtime@2.2.0:
     resolution: {integrity: sha512-wSlp23N45CMjDg/BPW8zvhEi3R+8eRE1qFbjEyAUzMCzu2l1Wzwakq+Tlia9nkCtEl5mDxa7nKHsvYJ6Gfn21A==}
     dependencies:
-      "@types/hast": 3.0.3
-      "@types/unist": 3.0.2
+      '@types/hast': 3.0.3
+      '@types/unist': 3.0.2
       comma-separated-tokens: 2.0.3
       hast-util-whitespace: 3.0.0
       property-information: 6.4.0
@@ -16271,7 +17265,7 @@ packages:
   /hast-util-whitespace@3.0.0:
     resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
     dependencies:
-      "@types/hast": 3.0.3
+      '@types/hast': 3.0.3
     dev: false
 
   /hosted-git-info@2.8.9:
@@ -16279,22 +17273,16 @@ packages:
 
   /hosted-git-info@4.1.0:
     resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       lru-cache: 6.0.0
 
-  /hosted-git-info@5.2.1:
-    resolution: {integrity: sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      lru-cache: 7.18.3
-    dev: true
-
   /hosted-git-info@6.1.1:
     resolution: {integrity: sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       lru-cache: 7.18.3
+    dev: false
 
   /hosted-git-info@7.0.1:
     resolution: {integrity: sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==}
@@ -16303,20 +17291,13 @@ packages:
       lru-cache: 10.0.1
     dev: false
 
-  /html-encoding-sniffer@2.0.1:
-    resolution: {integrity: sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==}
-    engines: {node: ">=10"}
-    dependencies:
-      whatwg-encoding: 1.0.5
-    dev: true
-
   /html-escaper@2.0.2:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
 
   /html-tags@3.3.1:
     resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /html-url-attributes@3.0.0:
@@ -16334,10 +17315,11 @@ packages:
 
   /http-cache-semantics@4.1.1:
     resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
+    dev: false
 
   /http-errors@2.0.0:
     resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
     dependencies:
       depd: 2.0.0
       inherits: 2.0.4
@@ -16345,100 +17327,86 @@ packages:
       statuses: 2.0.1
       toidentifier: 1.0.1
 
-  /http-proxy-agent@4.0.1:
-    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
-    engines: {node: ">= 6"}
-    dependencies:
-      "@tootallnate/once": 1.1.2
-      agent-base: 6.0.2
-      debug: 4.3.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
-      "@tootallnate/once": 2.0.0
+      '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /http-proxy-agent@7.0.0:
     resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
-    engines: {node: ">= 14"}
+    engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /http2-wrapper@2.2.0:
-    resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==}
-    engines: {node: ">=10.19.0"}
-    dependencies:
-      quick-lru: 5.1.1
-      resolve-alpn: 1.2.1
-    dev: true
-
   /https-proxy-agent@4.0.0:
     resolution: {integrity: sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==}
-    engines: {node: ">= 6.0.0"}
+    engines: {node: '>= 6.0.0'}
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
   /https-proxy-agent@5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   /https-proxy-agent@7.0.2:
     resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
-    engines: {node: ">= 14"}
+    engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   /human-signals@2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
-    engines: {node: ">=10.17.0"}
+    engines: {node: '>=10.17.0'}
 
   /human-signals@4.3.1:
     resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}
-    engines: {node: ">=14.18.0"}
+    engines: {node: '>=14.18.0'}
 
   /human-signals@5.0.0:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
-    engines: {node: ">=16.17.0"}
-    dev: false
+    engines: {node: '>=16.17.0'}
 
   /humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
     dependencies:
       ms: 2.1.3
+    dev: false
+
+  /hyphenate-style-name@1.0.4:
+    resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==}
+    dev: false
 
   /iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
 
   /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     requiresBuild: true
     dependencies:
       safer-buffer: 2.1.2
@@ -16455,10 +17423,11 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       minimatch: 9.0.3
+    dev: false
 
   /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
 
   /immediate@3.0.6:
     resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
@@ -16466,32 +17435,18 @@ packages:
 
   /import-fresh@3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  /import-lazy@4.0.0:
-    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
-    engines: {node: ">=8"}
-    dev: true
-
-  /import-local@3.1.0:
-    resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
-    engines: {node: ">=8"}
-    hasBin: true
-    dependencies:
-      pkg-dir: 4.2.0
-      resolve-cwd: 3.0.0
-    dev: true
-
   /imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: ">=0.8.19"}
+    engines: {node: '>=0.8.19'}
 
   /indent-string@4.0.0:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /individual@3.0.0:
     resolution: {integrity: sha512-rUY5vtT748NMRbEMrTNiFfy29BgGZwGXUi2NFUVMWQrogSLzlJvQV9eeMWi+g1aVaQ53tpyLAQtd5x/JH0Nh1g==}
@@ -16511,21 +17466,16 @@ packages:
 
   /ini@2.0.0:
     resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /ini@3.0.1:
     resolution: {integrity: sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dev: false
 
-  /ini@4.1.1:
-    resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
-
-  /ink-select-input@4.2.2(ink@3.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-E5AS2Vnd4CSzEa7Rm+hG47wxRQo1ASfh4msKxO7FHmn/ym+GKSSsFIfR+FonqjKNDPXYJClw8lM47RdN3Pi+nw==}
-    engines: {node: ">=10"}
+  /ink-select-input@4.2.1(ink@3.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-WvlrYdwmdnD6/nE/9mNhaaanTQOKmwy/hT/vuAqbDec3PUQBQ8Pkwszii/8eGvDTx5bGiUHu18P9D5IoB/ERaw==}
+    engines: {node: '>=10'}
     peerDependencies:
       ink: ^3.0.5
       react: ^16.5.2 || ^17.0.0
@@ -16537,14 +17487,28 @@ packages:
       react: 17.0.2
     dev: true
 
-  /ink-spinner@4.0.3(ink@3.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ==}
-    engines: {node: ">=10"}
+  /ink-select-input@4.2.2(ink@3.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-E5AS2Vnd4CSzEa7Rm+hG47wxRQo1ASfh4msKxO7FHmn/ym+GKSSsFIfR+FonqjKNDPXYJClw8lM47RdN3Pi+nw==}
+    engines: {node: '>=10'}
     peerDependencies:
-      ink: ">=3.0.5"
-      react: ">=16.8.2"
+      ink: ^3.0.5
+      react: ^16.5.2 || ^17.0.0
     dependencies:
-      cli-spinners: 2.7.0
+      arr-rotate: 1.0.0
+      figures: 3.2.0
+      ink: 3.2.0(react@17.0.2)
+      lodash.isequal: 4.5.0
+      react: 17.0.2
+    dev: true
+
+  /ink-spinner@4.0.3(ink@3.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      ink: '>=3.0.5'
+      react: '>=16.8.2'
+    dependencies:
+      cli-spinners: 2.9.2
       ink: 3.2.0(react@17.0.2)
       react: 17.0.2
     dev: true
@@ -16552,8 +17516,8 @@ packages:
   /ink-table@3.0.0(ink@3.2.0)(react@17.0.2):
     resolution: {integrity: sha512-RtcYjenHKZWjnwVNQ6zSYWMOLKwkWscDAJsqUQXftyjkYho1gGrluGss87NOoIzss0IKr74lKasd6MtlQYALiA==}
     peerDependencies:
-      ink: ">=3.0.0"
-      react: ">=16.8.0"
+      ink: '>=3.0.0'
+      react: '>=16.8.0'
     dependencies:
       ink: 3.2.0(react@17.0.2)
       object-hash: 2.2.0
@@ -16562,19 +17526,19 @@ packages:
 
   /ink-testing-library@2.1.0:
     resolution: {integrity: sha512-7TNlOjJlJXB33vG7yVa+MMO7hCjaC1bCn+zdpSjknWoLbOWMaFdKc7LJvqVkZ0rZv2+akhjXPrcR/dbxissjUw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
-      "@types/react": ">=16.8.0"
+      '@types/react': '>=16.8.0'
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dev: true
 
   /ink-use-stdout-dimensions@1.0.5(ink@3.2.0)(react@17.0.2):
     resolution: {integrity: sha512-rVsqnw4tQEAJUoknU09+zHdDf30GJdkumkHr0iz/TOYMYEZJkYqziQSGJAM+Z+M603EDfO89+Nxyn/Ko2Zknfw==}
     peerDependencies:
-      ink: ">=2.0.0"
-      react: ">=16.0.0"
+      ink: '>=2.0.0'
+      react: '>=16.0.0'
     dependencies:
       ink: 3.2.0(react@17.0.2)
       react: 17.0.2
@@ -16582,12 +17546,12 @@ packages:
 
   /ink@3.2.0(react@17.0.2):
     resolution: {integrity: sha512-firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
-      "@types/react": ">=16.8.0"
-      react: ">=16.8.0"
+      '@types/react': '>=16.8.0'
+      react: '>=16.8.0'
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
       ansi-escapes: 4.3.2
@@ -16623,9 +17587,16 @@ packages:
     resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
     dev: false
 
+  /inline-style-prefixer@7.0.0:
+    resolution: {integrity: sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ==}
+    dependencies:
+      css-in-js-utils: 3.1.0
+      fast-loops: 1.1.3
+    dev: false
+
   /inquirer@8.2.6:
     resolution: {integrity: sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     requiresBuild: true
     dependencies:
       ansi-escapes: 4.3.2
@@ -16644,11 +17615,10 @@ packages:
       through: 2.3.8
       wrap-ansi: 6.2.0
     dev: false
-    optional: true
 
   /internal-slot@1.0.5:
     resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       get-intrinsic: 1.2.1
       has: 1.0.4
@@ -16656,7 +17626,7 @@ packages:
 
   /interpret@1.4.0:
     resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
-    engines: {node: ">= 0.10"}
+    engines: {node: '>= 0.10'}
 
   /invariant@2.2.4:
     resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
@@ -16670,11 +17640,11 @@ packages:
 
   /ioredis@5.3.2:
     resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
-    engines: {node: ">=12.22.0"}
+    engines: {node: '>=12.22.0'}
     dependencies:
-      "@ioredis/commands": 1.2.0
+      '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -16690,25 +17660,25 @@ packages:
 
   /ipaddr.js@1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
-    engines: {node: ">= 0.10"}
+    engines: {node: '>= 0.10'}
 
   /is-absolute-url@3.0.3:
     resolution: {integrity: sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /is-arguments@1.1.1:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       has-tostringtag: 1.0.0
     dev: true
 
   /is-array-buffer@3.0.2:
     resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       get-intrinsic: 1.2.1
       is-typed-array: 1.1.12
 
@@ -16723,7 +17693,7 @@ packages:
 
   /is-async-function@2.0.0:
     resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
     dev: false
@@ -16735,27 +17705,27 @@ packages:
 
   /is-binary-path@2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       binary-extensions: 2.2.0
 
   /is-boolean-object@1.1.2:
     resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       has-tostringtag: 1.0.0
 
   /is-builtin-module@3.2.1:
     resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       builtin-modules: 3.3.0
     dev: false
 
   /is-callable@1.2.7:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
 
   /is-ci@2.0.0:
     resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==}
@@ -16764,21 +17734,19 @@ packages:
       ci-info: 2.0.0
     dev: true
 
-  /is-ci@3.0.1:
-    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
-    hasBin: true
-    dependencies:
-      ci-info: 3.9.0
-    dev: true
-
   /is-core-module@2.13.0:
     resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==}
     dependencies:
       has: 1.0.4
 
+  /is-core-module@2.13.1:
+    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
+    dependencies:
+      hasown: 2.0.2
+
   /is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
 
@@ -16788,151 +17756,132 @@ packages:
 
   /is-docker@2.2.1:
     resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     hasBin: true
 
   /is-docker@3.0.0:
     resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
+    dev: false
 
   /is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /is-finalizationregistry@1.0.2:
     resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
     dev: false
 
   /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: ">=8"}
-
-  /is-generator-fn@2.1.0:
-    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
-    engines: {node: ">=6"}
-    dev: true
+    engines: {node: '>=8'}
 
   /is-generator-function@1.0.10:
     resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
 
   /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
 
   /is-gzip@1.0.0:
     resolution: {integrity: sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /is-inside-container@1.0.0:
     resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==}
-    engines: {node: ">=14.16"}
+    engines: {node: '>=14.16'}
     hasBin: true
     dependencies:
       is-docker: 3.0.0
-
-  /is-installed-globally@0.4.0:
-    resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
-    engines: {node: ">=10"}
-    dependencies:
-      global-dirs: 3.0.1
-      is-path-inside: 3.0.3
-    dev: true
+    dev: false
 
   /is-interactive@1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /is-lambda@1.0.1:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
+    dev: false
 
   /is-map@2.0.2:
     resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
 
   /is-nan@1.3.2:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
     dev: true
 
   /is-negative-zero@2.0.2:
     resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: ">= 0.4"}
-
-  /is-npm@6.0.0:
-    resolution: {integrity: sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
+    engines: {node: '>= 0.4'}
 
   /is-number-object@1.0.7:
     resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
 
   /is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: ">=0.12.0"}
+    engines: {node: '>=0.12.0'}
 
   /is-obj@2.0.0:
     resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /is-path-cwd@2.2.0:
     resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     requiresBuild: true
 
   /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /is-plain-obj@1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /is-plain-obj@2.1.0:
     resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: false
 
   /is-plain-obj@4.1.0:
     resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dev: false
 
   /is-plain-object@2.0.4:
     resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       isobject: 3.0.1
     dev: true
 
   /is-plain-object@5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
-    engines: {node: ">=0.10.0"}
-
-  /is-potential-custom-element-name@1.0.1:
-    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
-    dev: true
+    engines: {node: '>=0.10.0'}
 
   /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       has-tostringtag: 1.0.0
 
   /is-set@2.0.2:
@@ -16941,11 +17890,15 @@ packages:
   /is-shared-array-buffer@1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
+
+  /is-stream-ended@0.1.4:
+    resolution: {integrity: sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==}
+    dev: false
 
   /is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /is-stream@3.0.0:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
@@ -16953,43 +17906,39 @@ packages:
 
   /is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
 
   /is-subdir@1.2.0:
     resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       better-path-resolve: 1.0.0
     dev: false
 
   /is-symbol@1.0.4:
     resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
 
   /is-text-path@1.0.1:
     resolution: {integrity: sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       text-extensions: 1.9.0
     dev: true
 
   /is-typed-array@1.1.12:
     resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       which-typed-array: 1.1.11
 
-  /is-typedarray@1.0.0:
-    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
-    dev: true
-
   /is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /is-valid-domain@0.1.6:
     resolution: {integrity: sha512-ZKtq737eFkZr71At8NxOFcP9O1K89gW3DkdrGMpp1upr/ueWjj+Weh4l9AI4rN0Gt8W2M1w7jrG2b/Yv83Ljpg==}
@@ -17003,29 +17952,28 @@ packages:
   /is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
 
   /is-weakset@2.0.2:
     resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
 
   /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: false
 
   /is-wsl@2.2.0:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       is-docker: 2.2.1
 
-  /is-yarn-global@0.4.1:
-    resolution: {integrity: sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==}
-    engines: {node: ">=12"}
-    dev: true
+  /is@3.3.0:
+    resolution: {integrity: sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==}
+    dev: false
 
   /isarray@0.0.1:
     resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
@@ -17042,67 +17990,54 @@ packages:
 
   /isexe@3.1.1:
     resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==}
-    engines: {node: ">=16"}
+    engines: {node: '>=16'}
 
   /isobject@3.0.1:
     resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
-  /istanbul-lib-coverage@3.2.0:
-    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
-    engines: {node: ">=8"}
+  /istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
     dev: true
 
   /istanbul-lib-instrument@5.2.1:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/parser": 7.23.0
-      "@istanbuljs/schema": 0.1.3
-      istanbul-lib-coverage: 3.2.0
+      '@babel/core': 7.23.9
+      '@babel/parser': 7.24.7
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.2
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /istanbul-lib-instrument@6.0.1:
-    resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==}
-    engines: {node: ">=10"}
-    dependencies:
-      "@babel/core": 7.23.0
-      "@babel/parser": 7.23.0
-      "@istanbuljs/schema": 0.1.3
-      istanbul-lib-coverage: 3.2.0
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /istanbul-lib-report@3.0.1:
     resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       make-dir: 4.0.0
       supports-color: 7.2.0
     dev: true
 
-  /istanbul-lib-source-maps@4.0.1:
-    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
-    engines: {node: ">=10"}
+  /istanbul-lib-source-maps@5.0.4:
+    resolution: {integrity: sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==}
+    engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4
-      istanbul-lib-coverage: 3.2.0
-      source-map: 0.6.1
+      '@jridgewell/trace-mapping': 0.3.25
+      debug: 4.3.4(supports-color@5.5.0)
+      istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
   /istanbul-reports@3.1.6:
     resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       html-escaper: 2.0.2
       istanbul-lib-report: 3.0.1
@@ -17120,15 +18055,15 @@ packages:
 
   /jackspeak@2.3.6:
     resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
-    engines: {node: ">=14"}
+    engines: {node: '>=14'}
     dependencies:
-      "@isaacs/cliui": 8.0.2
+      '@isaacs/cliui': 8.0.2
     optionalDependencies:
-      "@pkgjs/parseargs": 0.11.0
+      '@pkgjs/parseargs': 0.11.0
 
   /jake@10.8.7:
     resolution: {integrity: sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       async: 3.2.4
@@ -17137,857 +18072,84 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /jest-changed-files@27.5.1:
-    resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      execa: 5.1.1
-      throat: 6.0.2
-    dev: true
-
-  /jest-changed-files@29.7.0:
-    resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      execa: 5.1.1
-      jest-util: 29.7.0
-      p-limit: 3.1.0
-    dev: true
-
-  /jest-circus@27.5.1:
-    resolution: {integrity: sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/environment": 27.5.1
-      "@jest/test-result": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      co: 4.6.0
-      dedent: 0.7.0
-      expect: 27.5.1
-      is-generator-fn: 2.1.0
-      jest-each: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
-      jest-runtime: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      pretty-format: 27.5.1
-      slash: 3.0.0
-      stack-utils: 2.0.6
-      throat: 6.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-circus@29.7.0:
-    resolution: {integrity: sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/environment": 29.7.0
-      "@jest/expect": 29.7.0
-      "@jest/test-result": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      co: 4.6.0
-      dedent: 1.5.1
-      is-generator-fn: 2.1.0
-      jest-each: 29.7.0
-      jest-matcher-utils: 29.7.0
-      jest-message-util: 29.7.0
-      jest-runtime: 29.7.0
-      jest-snapshot: 29.7.0
-      jest-util: 29.7.0
-      p-limit: 3.1.0
-      pretty-format: 29.7.0
-      pure-rand: 6.0.4
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-    dev: true
-
-  /jest-cli@27.5.1(ts-node@10.9.1):
-    resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      "@jest/core": 27.5.1(ts-node@10.9.1)
-      "@jest/test-result": 27.5.1
-      "@jest/types": 27.5.1
-      chalk: 4.1.2
-      exit: 0.1.2
-      graceful-fs: 4.2.11
-      import-local: 3.1.0
-      jest-config: 27.5.1(ts-node@10.9.1)
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      prompts: 2.4.2
-      yargs: 16.2.0
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - ts-node
-      - utf-8-validate
-    dev: true
-
-  /jest-cli@29.7.0(@types/node@16.18.58)(ts-node@10.9.1):
-    resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      "@jest/core": 29.7.0(ts-node@10.9.1)
-      "@jest/test-result": 29.7.0
-      "@jest/types": 29.6.3
-      chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@16.18.58)(ts-node@10.9.1)
-      exit: 0.1.2
-      import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@16.18.58)(ts-node@10.9.1)
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - "@types/node"
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
-    dev: true
-
-  /jest-config@27.5.1(ts-node@10.9.1):
-    resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      ts-node: ">=9.0.0"
-    peerDependenciesMeta:
-      ts-node:
-        optional: true
-    dependencies:
-      "@babel/core": 7.23.0
-      "@jest/test-sequencer": 27.5.1
-      "@jest/types": 27.5.1
-      babel-jest: 27.5.1(@babel/core@7.23.0)
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      deepmerge: 4.3.1
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-circus: 27.5.1
-      jest-environment-jsdom: 27.5.1
-      jest-environment-node: 27.5.1
-      jest-get-type: 27.5.1
-      jest-jasmine2: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-runner: 27.5.1
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 27.5.1
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-      ts-node: 10.9.1(@types/node@16.18.58)(typescript@4.9.5)
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /jest-config@29.7.0(@types/node@16.18.58)(ts-node@10.9.1):
-    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      "@types/node": "*"
-      ts-node: ">=9.0.0"
-    peerDependenciesMeta:
-      "@types/node":
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      "@babel/core": 7.23.0
-      "@jest/test-sequencer": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 16.18.58
-      babel-jest: 29.7.0(@babel/core@7.23.0)
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      deepmerge: 4.3.1
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-circus: 29.7.0
-      jest-environment-node: 29.7.0
-      jest-get-type: 29.6.3
-      jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-runner: 29.7.0
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-      ts-node: 10.9.1(@types/node@16.18.58)(typescript@4.9.5)
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-    dev: true
-
-  /jest-config@29.7.0(@types/node@18.18.4)(ts-node@10.9.1):
-    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      "@types/node": "*"
-      ts-node: ">=9.0.0"
-    peerDependenciesMeta:
-      "@types/node":
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      "@babel/core": 7.23.0
-      "@jest/test-sequencer": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      babel-jest: 29.7.0(@babel/core@7.23.0)
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      deepmerge: 4.3.1
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-circus: 29.7.0
-      jest-environment-node: 29.7.0
-      jest-get-type: 29.6.3
-      jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-runner: 29.7.0
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-      ts-node: 10.9.1(@types/node@16.18.58)(typescript@4.9.5)
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-    dev: true
-
-  /jest-diff@27.5.1:
-    resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 27.5.1
-      jest-get-type: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
   /jest-diff@28.1.3:
     resolution: {integrity: sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
       chalk: 4.1.2
-      diff-sequences: 28.1.1
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.3
-    dev: true
-
-  /jest-diff@29.7.0:
-    resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 29.6.3
-      jest-get-type: 29.6.3
-      pretty-format: 29.7.0
-    dev: true
-
-  /jest-docblock@27.5.1:
-    resolution: {integrity: sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      detect-newline: 3.1.0
-    dev: true
-
-  /jest-docblock@29.7.0:
-    resolution: {integrity: sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      detect-newline: 3.1.0
-    dev: true
-
-  /jest-each@27.5.1:
-    resolution: {integrity: sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      chalk: 4.1.2
-      jest-get-type: 27.5.1
-      jest-util: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-each@29.7.0:
-    resolution: {integrity: sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/types": 29.6.3
-      chalk: 4.1.2
-      jest-get-type: 29.6.3
-      jest-util: 29.7.0
-      pretty-format: 29.7.0
-    dev: true
-
-  /jest-environment-jsdom@27.5.1:
-    resolution: {integrity: sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/environment": 27.5.1
-      "@jest/fake-timers": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      jest-mock: 27.5.1
-      jest-util: 27.5.1
-      jsdom: 16.7.0
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /jest-environment-node@27.5.1:
-    resolution: {integrity: sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/environment": 27.5.1
-      "@jest/fake-timers": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      jest-mock: 27.5.1
-      jest-util: 27.5.1
-    dev: true
-
-  /jest-environment-node@29.7.0:
-    resolution: {integrity: sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/environment": 29.7.0
-      "@jest/fake-timers": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      jest-mock: 29.7.0
-      jest-util: 29.7.0
-    dev: true
-
-  /jest-get-type@27.5.1:
-    resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dev: true
-
-  /jest-get-type@28.0.2:
-    resolution: {integrity: sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dev: true
-
-  /jest-get-type@29.6.3:
-    resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
-
-  /jest-haste-map@27.5.1:
-    resolution: {integrity: sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      "@types/graceful-fs": 4.1.7
-      "@types/node": 18.18.4
-      anymatch: 3.1.3
-      fb-watchman: 2.0.2
-      graceful-fs: 4.2.11
-      jest-regex-util: 27.5.1
-      jest-serializer: 27.5.1
-      jest-util: 27.5.1
-      jest-worker: 27.5.1
-      micromatch: 4.0.5
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /jest-haste-map@29.7.0:
-    resolution: {integrity: sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/types": 29.6.3
-      "@types/graceful-fs": 4.1.7
-      "@types/node": 18.18.4
-      anymatch: 3.1.3
-      fb-watchman: 2.0.2
-      graceful-fs: 4.2.11
-      jest-regex-util: 29.6.3
-      jest-util: 29.7.0
-      jest-worker: 29.7.0
-      micromatch: 4.0.5
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /jest-jasmine2@27.5.1:
-    resolution: {integrity: sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/environment": 27.5.1
-      "@jest/source-map": 27.5.1
-      "@jest/test-result": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      co: 4.6.0
-      expect: 27.5.1
-      is-generator-fn: 2.1.0
-      jest-each: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
-      jest-runtime: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      pretty-format: 27.5.1
-      throat: 6.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-junit@15.0.0:
-    resolution: {integrity: sha512-Z5sVX0Ag3HZdMUnD5DFlG+1gciIFSy7yIVPhOdGUi8YJaI9iLvvBb530gtQL2CHmv0JJeiwRZenr0VrSR7frvg==}
-    engines: {node: ">=10.12.0"}
-    dependencies:
-      mkdirp: 1.0.4
-      strip-ansi: 6.0.1
-      uuid: 8.3.2
-      xml: 1.0.1
-    dev: true
-
-  /jest-leak-detector@27.5.1:
-    resolution: {integrity: sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      jest-get-type: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-leak-detector@29.7.0:
-    resolution: {integrity: sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-get-type: 29.6.3
-      pretty-format: 29.7.0
-    dev: true
-
-  /jest-matcher-utils@27.5.1:
-    resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 27.5.1
-      jest-get-type: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-matcher-utils@28.1.3:
-    resolution: {integrity: sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 28.1.3
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.3
-    dev: true
-
-  /jest-matcher-utils@29.7.0:
-    resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.7.0
-      jest-get-type: 29.6.3
-      pretty-format: 29.7.0
-    dev: true
-
-  /jest-message-util@27.5.1:
-    resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@babel/code-frame": 7.22.13
-      "@jest/types": 27.5.1
-      "@types/stack-utils": 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      micromatch: 4.0.5
-      pretty-format: 27.5.1
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    dev: true
-
-  /jest-message-util@28.1.3:
-    resolution: {integrity: sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      "@babel/code-frame": 7.22.13
-      "@jest/types": 28.1.3
-      "@types/stack-utils": 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      micromatch: 4.0.5
-      pretty-format: 28.1.3
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    dev: true
-
-  /jest-message-util@29.7.0:
-    resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@babel/code-frame": 7.22.13
-      "@jest/types": 29.6.3
-      "@types/stack-utils": 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      micromatch: 4.0.5
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    dev: true
-
-  /jest-mock@27.5.1:
-    resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-    dev: true
-
-  /jest-mock@29.7.0:
-    resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      jest-util: 29.7.0
-    dev: true
-
-  /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
-    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
-    engines: {node: ">=6"}
-    peerDependencies:
-      jest-resolve: "*"
-    peerDependenciesMeta:
-      jest-resolve:
-        optional: true
-    dependencies:
-      jest-resolve: 27.5.1
-    dev: true
-
-  /jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
-    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
-    engines: {node: ">=6"}
-    peerDependencies:
-      jest-resolve: "*"
-    peerDependenciesMeta:
-      jest-resolve:
-        optional: true
-    dependencies:
-      jest-resolve: 29.7.0
-    dev: true
-
-  /jest-regex-util@27.5.1:
-    resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dev: true
-
-  /jest-regex-util@29.6.3:
-    resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
-
-  /jest-resolve-dependencies@27.5.1:
-    resolution: {integrity: sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      jest-regex-util: 27.5.1
-      jest-snapshot: 27.5.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-resolve-dependencies@29.7.0:
-    resolution: {integrity: sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-regex-util: 29.6.3
-      jest-snapshot: 29.7.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-resolve@27.5.1:
-    resolution: {integrity: sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      jest-haste-map: 27.5.1
-      jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1)
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      resolve: 1.22.6
-      resolve.exports: 1.1.1
-      slash: 3.0.0
-    dev: true
-
-  /jest-resolve@29.7.0:
-    resolution: {integrity: sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      jest-haste-map: 29.7.0
-      jest-pnp-resolver: 1.2.3(jest-resolve@29.7.0)
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      resolve: 1.22.6
-      resolve.exports: 2.0.2
-      slash: 3.0.0
-    dev: true
-
-  /jest-runner@27.5.1:
-    resolution: {integrity: sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/console": 27.5.1
-      "@jest/environment": 27.5.1
-      "@jest/test-result": 27.5.1
-      "@jest/transform": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      emittery: 0.8.1
-      graceful-fs: 4.2.11
-      jest-docblock: 27.5.1
-      jest-environment-jsdom: 27.5.1
-      jest-environment-node: 27.5.1
-      jest-haste-map: 27.5.1
-      jest-leak-detector: 27.5.1
-      jest-message-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-runtime: 27.5.1
-      jest-util: 27.5.1
-      jest-worker: 27.5.1
-      source-map-support: 0.5.21
-      throat: 6.0.2
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /jest-runner@29.7.0:
-    resolution: {integrity: sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/console": 29.7.0
-      "@jest/environment": 29.7.0
-      "@jest/test-result": 29.7.0
-      "@jest/transform": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      emittery: 0.13.1
-      graceful-fs: 4.2.11
-      jest-docblock: 29.7.0
-      jest-environment-node: 29.7.0
-      jest-haste-map: 29.7.0
-      jest-leak-detector: 29.7.0
-      jest-message-util: 29.7.0
-      jest-resolve: 29.7.0
-      jest-runtime: 29.7.0
-      jest-util: 29.7.0
-      jest-watcher: 29.7.0
-      jest-worker: 29.7.0
-      p-limit: 3.1.0
-      source-map-support: 0.5.13
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-runtime@27.5.1:
-    resolution: {integrity: sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/environment": 27.5.1
-      "@jest/fake-timers": 27.5.1
-      "@jest/globals": 27.5.1
-      "@jest/source-map": 27.5.1
-      "@jest/test-result": 27.5.1
-      "@jest/transform": 27.5.1
-      "@jest/types": 27.5.1
-      chalk: 4.1.2
-      cjs-module-lexer: 1.2.3
-      collect-v8-coverage: 1.0.2
-      execa: 5.1.1
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-haste-map: 27.5.1
-      jest-message-util: 27.5.1
-      jest-mock: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      slash: 3.0.0
-      strip-bom: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
+      diff-sequences: 28.1.1
+      jest-get-type: 28.0.2
+      pretty-format: 28.1.3
+    dev: true
+
+  /jest-get-type@28.0.2:
+    resolution: {integrity: sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dev: true
 
-  /jest-runtime@29.7.0:
-    resolution: {integrity: sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==}
+  /jest-haste-map@29.7.0:
+    resolution: {integrity: sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      "@jest/environment": 29.7.0
-      "@jest/fake-timers": 29.7.0
-      "@jest/globals": 29.7.0
-      "@jest/source-map": 29.6.3
-      "@jest/test-result": 29.7.0
-      "@jest/transform": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      cjs-module-lexer: 1.2.3
-      collect-v8-coverage: 1.0.2
-      glob: 7.2.3
+      '@jest/types': 29.6.3
+      '@types/graceful-fs': 4.1.7
+      '@types/node': 20.14.2
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
       graceful-fs: 4.2.11
-      jest-haste-map: 29.7.0
-      jest-message-util: 29.7.0
-      jest-mock: 29.7.0
       jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-snapshot: 29.7.0
       jest-util: 29.7.0
-      slash: 3.0.0
-      strip-bom: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-serializer@27.5.1:
-    resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@types/node": 18.18.4
-      graceful-fs: 4.2.11
+      jest-worker: 29.7.0
+      micromatch: 4.0.5
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.3
     dev: true
 
-  /jest-snapshot@27.5.1:
-    resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+  /jest-matcher-utils@28.1.3:
+    resolution: {integrity: sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/generator": 7.23.0
-      "@babel/plugin-syntax-typescript": 7.22.5(@babel/core@7.23.0)
-      "@babel/traverse": 7.23.0
-      "@babel/types": 7.23.0
-      "@jest/transform": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/babel__traverse": 7.20.2
-      "@types/prettier": 2.6.0
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.0)
       chalk: 4.1.2
-      expect: 27.5.1
-      graceful-fs: 4.2.11
-      jest-diff: 27.5.1
-      jest-get-type: 27.5.1
-      jest-haste-map: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
-      jest-util: 27.5.1
-      natural-compare: 1.4.0
-      pretty-format: 27.5.1
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
+      jest-diff: 28.1.3
+      jest-get-type: 28.0.2
+      pretty-format: 28.1.3
     dev: true
 
-  /jest-snapshot@29.7.0:
-    resolution: {integrity: sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /jest-message-util@28.1.3:
+    resolution: {integrity: sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/generator": 7.23.0
-      "@babel/plugin-syntax-jsx": 7.22.5(@babel/core@7.23.0)
-      "@babel/plugin-syntax-typescript": 7.22.5(@babel/core@7.23.0)
-      "@babel/types": 7.23.0
-      "@jest/expect-utils": 29.7.0
-      "@jest/transform": 29.7.0
-      "@jest/types": 29.6.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.0)
+      '@babel/code-frame': 7.23.5
+      '@jest/types': 28.1.3
+      '@types/stack-utils': 2.0.1
       chalk: 4.1.2
-      expect: 29.7.0
       graceful-fs: 4.2.11
-      jest-diff: 29.7.0
-      jest-get-type: 29.6.3
-      jest-matcher-utils: 29.7.0
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-      natural-compare: 1.4.0
-      pretty-format: 29.7.0
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
+      micromatch: 4.0.5
+      pretty-format: 28.1.3
+      slash: 3.0.0
+      stack-utils: 2.0.6
     dev: true
 
-  /jest-util@27.5.1:
-    resolution: {integrity: sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==}
+  /jest-mock@27.5.1:
+    resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      graceful-fs: 4.2.11
-      picomatch: 2.3.1
+      '@jest/types': 27.5.1
+      '@types/node': 20.14.2
+    dev: true
+
+  /jest-regex-util@29.6.3:
+    resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
   /jest-util@28.1.3:
     resolution: {integrity: sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      "@jest/types": 28.1.3
-      "@types/node": 18.18.4
+      '@jest/types': 28.1.3
+      '@types/node': 20.14.2
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
@@ -17998,70 +18160,19 @@ packages:
     resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
+      '@jest/types': 29.6.3
+      '@types/node': 20.14.2
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
       picomatch: 2.3.1
     dev: true
 
-  /jest-validate@27.5.1:
-    resolution: {integrity: sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/types": 27.5.1
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      jest-get-type: 27.5.1
-      leven: 3.1.0
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-validate@29.7.0:
-    resolution: {integrity: sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/types": 29.6.3
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      jest-get-type: 29.6.3
-      leven: 3.1.0
-      pretty-format: 29.7.0
-    dev: true
-
-  /jest-watcher@27.5.1:
-    resolution: {integrity: sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      "@jest/test-result": 27.5.1
-      "@jest/types": 27.5.1
-      "@types/node": 18.18.4
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      jest-util: 27.5.1
-      string-length: 4.0.2
-    dev: true
-
-  /jest-watcher@29.7.0:
-    resolution: {integrity: sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      "@jest/test-result": 29.7.0
-      "@jest/types": 29.6.3
-      "@types/node": 18.18.4
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      emittery: 0.13.1
-      jest-util: 29.7.0
-      string-length: 4.0.2
-    dev: true
-
   /jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
-    engines: {node: ">= 10.13.0"}
+    engines: {node: '>= 10.13.0'}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -18070,75 +18181,32 @@ packages:
     resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      "@types/node": 18.18.4
+      '@types/node': 20.14.2
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest@27.5.1(ts-node@10.9.1):
-    resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      "@jest/core": 27.5.1(ts-node@10.9.1)
-      import-local: 3.1.0
-      jest-cli: 27.5.1(ts-node@10.9.1)
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - ts-node
-      - utf-8-validate
-    dev: true
-
-  /jest@29.7.0(@types/node@16.18.58)(ts-node@10.9.1):
-    resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      "@jest/core": 29.7.0(ts-node@10.9.1)
-      "@jest/types": 29.6.3
-      import-local: 3.1.0
-      jest-cli: 29.7.0(@types/node@16.18.58)(ts-node@10.9.1)
-    transitivePeerDependencies:
-      - "@types/node"
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
-    dev: true
-
-  /jiti@1.20.0:
-    resolution: {integrity: sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==}
+  /jiti@1.21.0:
+    resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
     hasBin: true
 
-  /jju@1.4.0:
-    resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
-    dev: true
-
   /joycon@3.1.1:
     resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: true
 
-  /js-string-escape@1.0.1:
-    resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==}
-    engines: {node: ">= 0.8"}
-    dev: true
+  /js-cookie@2.2.1:
+    resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==}
+    dev: false
 
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
+  /js-tokens@8.0.3:
+    resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==}
+    dev: true
+
   /js-yaml@3.14.1:
     resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
     hasBin: true
@@ -18156,19 +18224,19 @@ packages:
     resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
     hasBin: true
     peerDependencies:
-      "@babel/preset-env": ^7.1.6
-    dependencies:
-      "@babel/core": 7.23.0
-      "@babel/parser": 7.23.0
-      "@babel/plugin-proposal-class-properties": 7.18.6(@babel/core@7.23.0)
-      "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6(@babel/core@7.23.0)
-      "@babel/plugin-proposal-optional-chaining": 7.21.0(@babel/core@7.23.0)
-      "@babel/plugin-transform-modules-commonjs": 7.23.0(@babel/core@7.23.0)
-      "@babel/preset-env": 7.22.20(@babel/core@7.23.0)
-      "@babel/preset-flow": 7.22.15(@babel/core@7.23.0)
-      "@babel/preset-typescript": 7.23.0(@babel/core@7.23.0)
-      "@babel/register": 7.22.15(@babel/core@7.23.0)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.23.0)
+      '@babel/preset-env': ^7.1.6
+    dependencies:
+      '@babel/core': 7.23.9
+      '@babel/parser': 7.23.9
+      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.23.9)
+      '@babel/preset-env': 7.22.20(@babel/core@7.23.9)
+      '@babel/preset-flow': 7.22.15(@babel/core@7.23.9)
+      '@babel/preset-typescript': 7.23.0(@babel/core@7.23.9)
+      '@babel/register': 7.22.15(@babel/core@7.23.9)
+      babel-core: 7.0.0-bridge.0(@babel/core@7.23.9)
       chalk: 4.1.2
       flow-parser: 0.218.0
       graceful-fs: 4.2.11
@@ -18182,61 +18250,19 @@ packages:
       - supports-color
     dev: true
 
-  /jsdom@16.7.0:
-    resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
-    engines: {node: ">=10"}
-    peerDependencies:
-      canvas: ^2.5.0
-    peerDependenciesMeta:
-      canvas:
-        optional: true
-    dependencies:
-      abab: 2.0.6
-      acorn: 8.10.0
-      acorn-globals: 6.0.0
-      cssom: 0.4.4
-      cssstyle: 2.3.0
-      data-urls: 2.0.0
-      decimal.js: 10.4.3
-      domexception: 2.0.1
-      escodegen: 2.1.0
-      form-data: 3.0.1
-      html-encoding-sniffer: 2.0.1
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.7
-      parse5: 6.0.1
-      saxes: 5.0.1
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.3
-      w3c-hr-time: 1.0.2
-      w3c-xmlserializer: 2.0.0
-      webidl-conversions: 6.1.0
-      whatwg-encoding: 1.0.5
-      whatwg-mimetype: 2.3.0
-      whatwg-url: 8.7.0
-      ws: 7.5.9
-      xml-name-validator: 3.0.0
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: true
-
   /jsesc@0.5.0:
     resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
     hasBin: true
 
   /jsesc@2.5.2:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     hasBin: true
     dev: true
 
   /jsesc@3.0.2:
     resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     hasBin: true
     dev: false
 
@@ -18244,77 +18270,90 @@ packages:
     resolution: {integrity: sha512-op3y4UUzd6J6lfjV+UP/hhEQIPUtpsLNtMRXLO1v5X7hbJ8N76gdO6UHu7RqyCElRjUaNqtGug0pkQBC5sDepg==}
     dev: false
 
-  /jsii-diff@1.90.0:
-    resolution: {integrity: sha512-74GxSLjdjVEU7Qfvdroyhih1DcdpoG7ZAeYBkdcbri2bH5RzqtjcVOwhvyqIjGBlvS45md8/ftURbWVWmbMhsA==}
-    engines: {node: ">= 14.17.0"}
+  /jsii-diff@1.94.0:
+    resolution: {integrity: sha512-jbiMsbzi0wrBl8tuXB+HvYiIHDQfj0Ktrc7bshhzung+POnT5QCU3M0/MwNr2V+u4F0DDCvO3PFML26eXABA5w==}
+    engines: {node: '>= 14.17.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.90.0
-      "@jsii/spec": 1.90.0
+      '@jsii/check-node': 1.94.0
+      '@jsii/spec': 1.94.0
       fs-extra: 10.1.0
-      jsii-reflect: 1.90.0
+      jsii-reflect: 1.94.0
       log4js: 6.9.1
       yargs: 16.2.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jsii-pacmak@1.90.0:
-    resolution: {integrity: sha512-TG1IR9dt5RDZDEKDsMgq41PcAZkMKHaDXXFeDFs5ffjRtXbDxBkyTQVfXNSZKiDQIizFg8LEv5O30Lo9s3wbnA==}
-    engines: {node: ">= 14.17.0"}
+  /jsii-pacmak@1.93.0:
+    resolution: {integrity: sha512-A2rn4seHN+1/VzwQ0H8t6zxAz9HpZWbF+kVi9MpNgqd2iiNYxS1XNyirzyQ8D3e5ZNWoPAyFVuGqkXrtdo4etg==}
+    engines: {node: '>= 14.17.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.90.0
-      "@jsii/spec": 1.90.0
+      '@jsii/check-node': 1.93.0
+      '@jsii/spec': 1.94.0
       clone: 2.1.2
-      codemaker: 1.90.0
+      codemaker: 1.94.0
       commonmark: 0.30.0
       escape-string-regexp: 4.0.0
       fs-extra: 10.1.0
-      jsii-reflect: 1.90.0
-      jsii-rosetta: 1.91.0
+      jsii-reflect: 1.94.0
+      jsii-rosetta: 1.94.0
       semver: 7.5.4
-      spdx-license-list: 6.7.0
+      spdx-license-list: 6.8.0
       xmlbuilder: 15.1.1
       yargs: 16.2.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jsii-reflect@1.90.0:
-    resolution: {integrity: sha512-kYX9boDV1pUwX8A2HFQNtbypcRGY3MwEWFyXL+qKcXb8QrHuiDC4fEVYpI5oBxq5b7NZ8ePfPWAj9EtEpvKbnw==}
-    engines: {node: ">= 14.17.0"}
+  /jsii-pacmak@1.94.0:
+    resolution: {integrity: sha512-L5s3RZ0AOx1XfAhXsEjyeCteVrw6nwJLynL+t93eXVDcw7NFT7S0fCFXzQ4lpYQ23P/yVpSIy32J3zpUOf4uDQ==}
+    engines: {node: '>= 14.17.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.90.0
-      "@jsii/spec": 1.90.0
-      chalk: 4.1.2
+      '@jsii/check-node': 1.94.0
+      '@jsii/spec': 1.94.0
+      clone: 2.1.2
+      codemaker: 1.94.0
+      commonmark: 0.30.0
+      escape-string-regexp: 4.0.0
       fs-extra: 10.1.0
-      oo-ascii-tree: 1.90.0
+      jsii-reflect: 1.94.0
+      jsii-rosetta: 1.94.0
+      semver: 7.5.4
+      spdx-license-list: 6.8.0
+      xmlbuilder: 15.1.1
       yargs: 16.2.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /jsii-release@0.2.519:
-    resolution: {integrity: sha512-R3HD2u4W5Rdy+Tj0mQizmqfmefn7jhKz9KxpZT+WrC6U5Cb7xDM61KWXLjW3/OOkqhonSPyaRx2xPQPLKzzrKQ==}
+  /jsii-reflect@1.94.0:
+    resolution: {integrity: sha512-Oupkl5iFFeq3GJ2a/fQNMnsXRMISmEKklPHksYs/l6MqrNFUQ5kg9oj1qxjSyaCpvvXBI8Eh7y73dqNE8w4cVw==}
+    engines: {node: '>= 14.17.0'}
     hasBin: true
     dependencies:
-      "@types/fs-extra": 8.1.4
-      fs-extra: 8.1.0
-      shlex: 2.1.2
-    dev: true
+      '@jsii/check-node': 1.94.0
+      '@jsii/spec': 1.94.0
+      chalk: 4.1.2
+      fs-extra: 10.1.0
+      oo-ascii-tree: 1.94.0
+      yargs: 16.2.0
 
-  /jsii-rosetta@1.91.0:
-    resolution: {integrity: sha512-v8eW/XiJHklnkmTtCIbyAeDPUVfovU/ZNh1ixvGri/ps5H3iRRpLEmqGJGMm2IEIjNCSmnmIsDMQLw20/7Nu+Q==}
-    engines: {node: ">= 14.17.0"}
+  /jsii-rosetta@1.94.0:
+    resolution: {integrity: sha512-FLQAxdZJsH0sg87S9u/e4+HDGr6Pth+UZ4ool3//MFMsw+C0iwagAlNVhZuyohMdlvumpQeg9Gr+FvoBZFoBrA==}
+    engines: {node: '>= 14.17.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.91.0
-      "@jsii/spec": 1.91.0
-      "@xmldom/xmldom": 0.8.10
+      '@jsii/check-node': 1.94.0
+      '@jsii/spec': 1.94.0
+      '@xmldom/xmldom': 0.8.10
       commonmark: 0.30.0
-      fast-glob: 3.3.1
-      jsii: 1.91.0
+      fast-glob: 3.3.2
+      jsii: 1.94.0
       semver: 7.5.4
-      semver-intersect: 1.4.0
+      semver-intersect: 1.5.0
       stream-json: 1.8.0
       typescript: 3.9.10
       workerpool: 6.5.1
@@ -18323,147 +18362,160 @@ packages:
       - supports-color
     dev: true
 
-  /jsii-rosetta@5.0.11:
-    resolution: {integrity: sha512-rdL+eBpvHTSbCjSellJHtskICY3MTMICkFgPG1B2c/aE0xdsZCQHLxi9/A8VoobhMk2r7wZtpml7vrzNIpyKYg==}
-    engines: {node: ">= 14.18.0"}
+  /jsii-rosetta@5.3.7:
+    resolution: {integrity: sha512-x9knz6DaGPwLucSUAZNxz8EQW3WwsCBrZldWs/FBVKKbdszSH5HHvXKG7elpitqzj+7XDFH9QnKv/bLfUWy5lA==}
+    engines: {node: '>= 18.12.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.84.0
-      "@jsii/spec": 1.91.0
-      "@xmldom/xmldom": 0.8.10
+      '@jsii/check-node': 1.94.0
+      '@jsii/spec': 1.94.0
+      '@xmldom/xmldom': 0.8.10
       chalk: 4.1.2
       commonmark: 0.30.0
-      fast-glob: 3.3.1
-      jsii: 5.0.21
+      fast-glob: 3.3.2
+      jsii: 5.3.11(patch_hash=ckgthkljzwfnfbd5qz6x7vtvme)
       semver: 7.5.4
-      semver-intersect: 1.4.0
+      semver-intersect: 1.5.0
       stream-json: 1.8.0
-      typescript: 5.0.4
+      typescript: 5.3.3
       workerpool: 6.5.1
       yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jsii-srcmak@0.1.951:
-    resolution: {integrity: sha512-zaKqrsR416yX+QhE1T4mkBWqPpsHQmBnBbsR0f5a32Uknr3+l4PCVtuV5/rgthAG6iE4Pa6c/jO0vcTzyzEY6A==}
+  /jsii-srcmak@0.1.1005:
+    resolution: {integrity: sha512-JnL8UNW3akZW+XYhrAU5/wtpmyaEHwTrb455PsYMYpHU1OsWcqAHBdn2xdXV05X754yAYKAEv9ga+KV2OVNDOw==}
     hasBin: true
     dependencies:
       fs-extra: 9.1.0
-      jsii: 5.1.12
-      jsii-pacmak: 1.90.0
+      jsii: 5.3.11(patch_hash=ckgthkljzwfnfbd5qz6x7vtvme)
+      jsii-pacmak: 1.94.0
       ncp: 2.0.0
       yargs: 15.4.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jsii@1.90.0:
-    resolution: {integrity: sha512-V8XSGrQZXeBQGZa51UqceKSMWhTc2jk84vw+s2BlYvucQnR7oJcM2z8CuiTigvFuT6hY39cgsK8mSYNSM3VNzw==}
-    engines: {node: ">= 14.17.0"}
+  /jsii-srcmak@0.1.999:
+    resolution: {integrity: sha512-8jhGRjceKdvYlW3rujnrZWTa1bss7TUhcsVrRsT7Q+MDYxRZan0FsqyHKrjfb8GYpgSh5DVpc9iYCwmn6VgXsw==}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.90.0
-      "@jsii/spec": 1.90.0
+      fs-extra: 9.1.0
+      jsii: 5.2.44
+      jsii-pacmak: 1.94.0
+      ncp: 2.0.0
+      yargs: 15.4.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jsii@1.94.0:
+    resolution: {integrity: sha512-20KlKsBZlo7Ti6vfqTpKfZXnT2MKRGfh5bIPrwDODoCQmHNATfPFt1fs5+Wqd7xdrEj+A+sLAtjfHTw6i+sxCw==}
+    engines: {node: '>= 14.17.0'}
+    hasBin: true
+    dependencies:
+      '@jsii/check-node': 1.94.0
+      '@jsii/spec': 1.94.0
       case: 1.6.3
       chalk: 4.1.2
       fast-deep-equal: 3.1.3
       fs-extra: 10.1.0
       log4js: 6.9.1
       semver: 7.5.4
-      semver-intersect: 1.4.0
+      semver-intersect: 1.5.0
       sort-json: 2.0.1
-      spdx-license-list: 6.7.0
+      spdx-license-list: 6.8.0
       typescript: 3.9.10
       yargs: 16.2.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jsii@1.91.0:
-    resolution: {integrity: sha512-dJ2FbnUfX5Eg9BdZx6Cz2JhDsvzGi2DoQeomzdjO9ltvVUouAFPWkpcUtJdLXaNmHQtPM4/I+AzelUX7w2mWVw==}
-    engines: {node: ">= 14.17.0"}
+  /jsii@5.2.44:
+    resolution: {integrity: sha512-Z7sTqYzQ5yoJU/ie+svjqSzrOF5rl4pW/bojvCb/7MfJ+SaGqhMUQMxQGTfqmSvauME8JoVYqwMH89x6qreJ8A==}
+    engines: {node: '>= 16.14.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.91.0
-      "@jsii/spec": 1.91.0
+      '@jsii/check-node': 1.93.0
+      '@jsii/spec': 1.94.0
       case: 1.6.3
       chalk: 4.1.2
+      downlevel-dts: 0.11.0
       fast-deep-equal: 3.1.3
-      fs-extra: 10.1.0
       log4js: 6.9.1
       semver: 7.5.4
-      semver-intersect: 1.4.0
+      semver-intersect: 1.5.0
       sort-json: 2.0.1
       spdx-license-list: 6.8.0
-      typescript: 3.9.10
-      yargs: 16.2.0
+      typescript: 5.2.2
+      yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jsii@5.0.11(patch_hash=zhi5puwzi5jiulxnmqgkd4wl2a):
-    resolution: {integrity: sha512-mFW7gTA6w+LEB3WzJqP7isFNUYYeJHmHKIKoO3kdG266giTQuoqqnuezqgr2Hl3p66Gzs7rdDzLwefQ0vIAs8A==}
-    engines: {node: ">= 14.18.0"}
+  /jsii@5.3.11(patch_hash=ckgthkljzwfnfbd5qz6x7vtvme):
+    resolution: {integrity: sha512-AhRb6bGYzQ4qeKn0dksJjRY/bQUz1zt/FwPPgb488P0Hr+taUbggNihebZEAzLZCJ3yH0ohgIgtQEAIx+NI/vA==}
+    engines: {node: '>= 18.12.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.84.0
-      "@jsii/spec": 1.90.0
+      '@jsii/check-node': 1.94.0
+      '@jsii/spec': 1.94.0
       case: 1.6.3
       chalk: 4.1.2
       downlevel-dts: 0.11.0
       fast-deep-equal: 3.1.3
       log4js: 6.9.1
       semver: 7.5.4
-      semver-intersect: 1.4.0
+      semver-intersect: 1.5.0
       sort-json: 2.0.1
-      spdx-license-list: 6.7.0
-      typescript: 5.0.4
+      spdx-license-list: 6.8.0
+      typescript: 5.3.3
       yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
     dev: true
     patched: true
 
-  /jsii@5.0.21:
-    resolution: {integrity: sha512-m5WEKKnER9veGrJNxr5OULu43D6DSe69RmKgQjTSHLEKSCS+taCf32sFmBT/b3nBcSh1gfch7QfjoHKoKpUz2w==}
-    engines: {node: ">= 16.14.0"}
+  /jsii@5.3.2:
+    resolution: {integrity: sha512-wwwp47+6orlMXpny4dlTOP6776cBo2WFDgxZyGjQaV4VWNydsJiTcinuJzCj1XVZicBhpAnkuBMr89+2aT8Dcg==}
+    engines: {node: '>= 18.12.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.88.0
-      "@jsii/spec": 1.90.0
+      '@jsii/check-node': 1.93.0
+      '@jsii/spec': 1.94.0
       case: 1.6.3
       chalk: 4.1.2
       downlevel-dts: 0.11.0
       fast-deep-equal: 3.1.3
       log4js: 6.9.1
       semver: 7.5.4
-      semver-intersect: 1.4.0
+      semver-intersect: 1.5.0
       sort-json: 2.0.1
-      spdx-license-list: 6.7.0
-      typescript: 5.0.4
+      spdx-license-list: 6.8.0
+      typescript: 5.3.3
       yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jsii@5.1.12:
-    resolution: {integrity: sha512-iY3zLosUEKbeua6IAGJXjFxibiiI0xHFjyYPyewOc56MBRHC7nczWSVGRP+Jgwyo7HWXs4TvJKLG6w8zSuAZrg==}
-    engines: {node: ">= 16.14.0"}
+  /jsii@5.3.3:
+    resolution: {integrity: sha512-M+kAUKJiLXXJXKYmBB0Q2n1aGoeNHyzMCLAx7402JqXSLxH4JGh6kOf4EH3U3LmQKzv2kxOHMRCg3Ssh82KtrQ==}
+    engines: {node: '>= 18.12.0'}
     hasBin: true
     dependencies:
-      "@jsii/check-node": 1.88.0
-      "@jsii/spec": 1.91.0
+      '@jsii/check-node': 1.93.0
+      '@jsii/spec': 1.94.0
       case: 1.6.3
       chalk: 4.1.2
       downlevel-dts: 0.11.0
       fast-deep-equal: 3.1.3
       log4js: 6.9.1
       semver: 7.5.4
-      semver-intersect: 1.4.0
+      semver-intersect: 1.5.0
       sort-json: 2.0.1
-      spdx-license-list: 6.7.0
-      typescript: 5.1.6
+      spdx-license-list: 6.8.0
+      typescript: 5.3.3
       yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
@@ -18488,12 +18540,7 @@ packages:
   /json-parse-even-better-errors@3.0.0:
     resolution: {integrity: sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
-  /json-parse-helpfulerror@1.0.3:
-    resolution: {integrity: sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==}
-    dependencies:
-      jju: 1.4.0
-    dev: true
+    dev: false
 
   /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
@@ -18501,17 +18548,17 @@ packages:
   /json-schema-traverse@1.0.0:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
 
-  /json-schema-typed@8.0.1:
-    resolution: {integrity: sha512-XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==}
-    dev: true
-
   /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
-  /json-stable-stringify@1.0.2:
-    resolution: {integrity: sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==}
+  /json-stable-stringify@1.1.0:
+    resolution: {integrity: sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==}
+    engines: {node: '>= 0.4'}
     dependencies:
+      call-bind: 1.0.5
+      isarray: 2.0.5
       jsonify: 0.0.1
+      object-keys: 1.1.1
 
   /json-stringify-nice@1.1.4:
     resolution: {integrity: sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==}
@@ -18528,7 +18575,7 @@ packages:
 
   /json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     hasBin: true
 
   /jsonc-parser@3.2.0:
@@ -18550,21 +18597,17 @@ packages:
   /jsonify@0.0.1:
     resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
 
-  /jsonlines@0.1.1:
-    resolution: {integrity: sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==}
-    dev: true
-
   /jsonparse@1.3.1:
     resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
-    engines: {"0": node >= 0.2.0}
+    engines: {'0': node >= 0.2.0}
 
   /jsonschema@1.4.1:
     resolution: {integrity: sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==}
-    dev: false
+    dev: true
 
   /jsonwebtoken@9.0.2:
     resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
-    engines: {node: ">=12", npm: ">=6"}
+    engines: {node: '>=12', npm: '>=6'}
     dependencies:
       jws: 3.2.2
       lodash.includes: 4.3.0
@@ -18579,7 +18622,7 @@ packages:
 
   /jsx-ast-utils@3.3.5:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
-    engines: {node: ">=4.0"}
+    engines: {node: '>=4.0'}
     dependencies:
       array-includes: 3.1.7
       array.prototype.flat: 1.3.2
@@ -18652,17 +18695,12 @@ packages:
 
   /kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
-    engines: {node: ">=6"}
-    dev: true
-
-  /kleur@4.1.5:
-    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: true
 
   /kuler@2.0.0:
@@ -18681,13 +18719,6 @@ packages:
       language-subtag-registry: 0.3.22
     dev: false
 
-  /latest-version@7.0.0:
-    resolution: {integrity: sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      package-json: 8.1.1
-    dev: true
-
   /launch-editor@2.6.1:
     resolution: {integrity: sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==}
     dependencies:
@@ -18697,7 +18728,7 @@ packages:
 
   /lazy-universal-dotenv@4.0.0:
     resolution: {integrity: sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dependencies:
       app-root-dir: 1.0.2
       dotenv: 16.3.1
@@ -18706,18 +18737,18 @@ packages:
 
   /lazystream@1.0.1:
     resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
-    engines: {node: ">= 0.6.3"}
+    engines: {node: '>= 0.6.3'}
     dependencies:
       readable-stream: 2.3.8
 
   /leven@3.1.0:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: true
 
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
@@ -18730,7 +18761,11 @@ packages:
 
   /lilconfig@2.1.0:
     resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
+
+  /lilconfig@3.1.1:
+    resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==}
+    engines: {node: '>=14'}
 
   /lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
@@ -18745,7 +18780,7 @@ packages:
     resolution: {integrity: sha512-2K9Y1cUdvq40dFWqCJ//X+WP19nlzIVITFGI93RjLnA0M7KbnxQ/ffC3AZIZaEIrLangF9Hjt3i0GQ9/anEG5A==}
     peerDependencies:
       linkifyjs: ^4.0.0
-      react: ">= 15.0.0"
+      react: '>= 15.0.0'
     dependencies:
       linkifyjs: 4.1.1
       react: 18.2.0
@@ -18757,7 +18792,7 @@ packages:
 
   /load-json-file@4.0.0:
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       graceful-fs: 4.2.11
       parse-json: 4.0.0
@@ -18767,7 +18802,7 @@ packages:
 
   /load-json-file@6.2.0:
     resolution: {integrity: sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       graceful-fs: 4.2.11
       parse-json: 5.2.0
@@ -18782,17 +18817,20 @@ packages:
 
   /loader-runner@4.3.0:
     resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
-    engines: {node: ">=6.11.5"}
+    engines: {node: '>=6.11.5'}
     dev: true
 
-  /local-pkg@0.4.3:
-    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
-    engines: {node: ">=14"}
+  /local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
+    engines: {node: '>=14'}
+    dependencies:
+      mlly: 1.4.2
+      pkg-types: 1.0.3
     dev: true
 
   /locate-path@2.0.0:
     resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       p-locate: 2.0.0
       path-exists: 3.0.0
@@ -18800,7 +18838,7 @@ packages:
 
   /locate-path@3.0.0:
     resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       p-locate: 3.0.0
       path-exists: 3.0.0
@@ -18808,16 +18846,24 @@ packages:
 
   /locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       p-locate: 4.1.0
 
   /locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       p-locate: 5.0.0
 
+  /lodash.camelcase@4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.castarray@4.4.0:
+    resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==}
+    dev: false
+
   /lodash.clonedeep@4.5.0:
     resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
     dev: false
@@ -18830,9 +18876,11 @@ packages:
 
   /lodash.difference@4.5.0:
     resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
+    dev: true
 
   /lodash.flatten@4.4.0:
     resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
+    dev: true
 
   /lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
@@ -18868,10 +18916,6 @@ packages:
   /lodash.isstring@4.0.1:
     resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
 
-  /lodash.memoize@4.1.2:
-    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
-    dev: true
-
   /lodash.merge@4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
@@ -18886,12 +18930,9 @@ packages:
     resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
     dev: false
 
-  /lodash.truncate@4.4.2:
-    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
-    dev: false
-
   /lodash.union@4.6.0:
     resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
+    dev: true
 
   /lodash.uniq@4.5.0:
     resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
@@ -18905,17 +18946,17 @@ packages:
 
   /log-symbols@4.1.0:
     resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       chalk: 4.1.2
       is-unicode-supported: 0.1.0
 
   /log4js@6.9.1:
     resolution: {integrity: sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==}
-    engines: {node: ">=8.0"}
+    engines: {node: '>=8.0'}
     dependencies:
       date-format: 4.0.14
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       flatted: 3.2.9
       rfdc: 1.3.0
       streamroller: 3.1.5
@@ -18927,8 +18968,8 @@ packages:
     resolution: {integrity: sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==}
     requiresBuild: true
     dependencies:
-      "@colors/colors": 1.5.0
-      "@types/triple-beam": 1.3.3
+      '@colors/colors': 1.5.0
+      '@types/triple-beam': 1.3.3
       fecha: 4.2.3
       ms: 2.1.3
       safe-stable-stringify: 2.4.3
@@ -18936,27 +18977,30 @@ packages:
     dev: false
     optional: true
 
+  /long@5.2.3:
+    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+    dev: false
+
   /loose-envify@1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
     dependencies:
       js-tokens: 4.0.0
 
-  /loupe@2.3.6:
-    resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
+  /loupe@2.3.7:
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
     dependencies:
       get-func-name: 2.0.2
     dev: true
 
-  /lowercase-keys@3.0.0:
-    resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
-
   /lru-cache@10.0.1:
     resolution: {integrity: sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==}
     engines: {node: 14 || >=16.14}
 
+  /lru-cache@10.2.0:
+    resolution: {integrity: sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==}
+    engines: {node: 14 || >=16.14}
+
   /lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
     dependencies:
@@ -18965,13 +19009,14 @@ packages:
 
   /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       yallist: 4.0.0
 
   /lru-cache@7.18.3:
     resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    dev: false
 
   /lru_map@0.3.3:
     resolution: {integrity: sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==}
@@ -18979,7 +19024,7 @@ packages:
 
   /luxon@3.4.3:
     resolution: {integrity: sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dev: false
 
   /lz-string@1.5.0:
@@ -18989,21 +19034,36 @@ packages:
 
   /magic-string@0.27.0:
     resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
-      "@jridgewell/sourcemap-codec": 1.4.15
+      '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
   /magic-string@0.30.4:
     resolution: {integrity: sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
+
+  /magic-string@0.30.7:
+    resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
+
+  /magicast@0.3.4:
+    resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==}
     dependencies:
-      "@jridgewell/sourcemap-codec": 1.4.15
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
+      source-map-js: 1.2.0
     dev: true
 
   /make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       pify: 4.0.1
       semver: 5.7.2
@@ -19011,21 +19071,17 @@ packages:
 
   /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       semver: 6.3.1
 
   /make-dir@4.0.0:
     resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       semver: 7.5.4
     dev: true
 
-  /make-error@1.3.6:
-    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
-    dev: true
-
   /make-fetch-happen@11.1.1:
     resolution: {integrity: sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -19047,12 +19103,13 @@ packages:
       ssri: 10.0.5
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /make-fetch-happen@13.0.0:
     resolution: {integrity: sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@npmcli/agent": 2.2.0
+      '@npmcli/agent': 2.2.0
       cacache: 18.0.0
       http-cache-semantics: 4.1.1
       is-lambda: 1.0.1
@@ -19075,19 +19132,19 @@ packages:
 
   /map-age-cleaner@0.1.3:
     resolution: {integrity: sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       p-defer: 1.0.0
     dev: false
 
   /map-obj@1.0.1:
     resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /map-obj@4.3.0:
     resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /map-or-similar@1.5.0:
     resolution: {integrity: sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==}
@@ -19106,20 +19163,13 @@ packages:
 
   /markdown-to-jsx@7.3.2(react@18.2.0):
     resolution: {integrity: sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     peerDependencies:
-      react: ">= 0.14.0"
+      react: '>= 0.14.0'
     dependencies:
       react: 18.2.0
     dev: true
 
-  /md5-hex@3.0.1:
-    resolution: {integrity: sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==}
-    engines: {node: ">=8"}
-    dependencies:
-      blueimp-md5: 2.19.0
-    dev: true
-
   /mdast-util-definitions@4.0.0:
     resolution: {integrity: sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==}
     dependencies:
@@ -19129,8 +19179,8 @@ packages:
   /mdast-util-from-markdown@2.0.0:
     resolution: {integrity: sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==}
     dependencies:
-      "@types/mdast": 4.0.3
-      "@types/unist": 3.0.2
+      '@types/mdast': 4.0.3
+      '@types/unist': 3.0.2
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       mdast-util-to-string: 4.0.0
@@ -19148,9 +19198,9 @@ packages:
   /mdast-util-to-hast@13.0.2:
     resolution: {integrity: sha512-U5I+500EOOw9e3ZrclN3Is3fRpw8c19SMyNZlZ2IS+7vLsNzb2Om11VpIVOR+/0137GhZsFEF6YiKD5+0Hr2Og==}
     dependencies:
-      "@types/hast": 3.0.3
-      "@types/mdast": 4.0.3
-      "@ungap/structured-clone": 1.2.0
+      '@types/hast': 3.0.3
+      '@types/mdast': 4.0.3
+      '@ungap/structured-clone': 1.2.0
       devlop: 1.1.0
       micromark-util-sanitize-uri: 2.0.0
       trim-lines: 3.0.1
@@ -19165,7 +19215,11 @@ packages:
   /mdast-util-to-string@4.0.0:
     resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
     dependencies:
-      "@types/mdast": 4.0.3
+      '@types/mdast': 4.0.3
+    dev: false
+
+  /mdn-data@2.0.14:
+    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
     dev: false
 
   /mdurl@1.0.1:
@@ -19174,11 +19228,11 @@ packages:
 
   /media-typer@0.3.0:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
   /mem@8.1.1:
     resolution: {integrity: sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       map-age-cleaner: 0.1.3
       mimic-fn: 3.1.0
@@ -19192,9 +19246,9 @@ packages:
 
   /meow@8.1.2:
     resolution: {integrity: sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
-      "@types/minimist": 1.2.3
+      '@types/minimist': 1.2.3
       camelcase-keys: 6.2.2
       decamelize-keys: 1.1.1
       hard-rejection: 2.1.0
@@ -19215,11 +19269,11 @@ packages:
 
   /merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
 
   /methods@1.1.2:
     resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
   /micromark-core-commonmark@2.0.0:
     resolution: {integrity: sha512-jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA==}
@@ -19375,8 +19429,8 @@ packages:
   /micromark@4.0.0:
     resolution: {integrity: sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==}
     dependencies:
-      "@types/debug": 4.1.12
-      debug: 4.3.4
+      '@types/debug': 4.1.12
+      debug: 4.3.4(supports-color@5.5.0)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -19398,53 +19452,49 @@ packages:
 
   /micromatch@4.0.5:
     resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: ">=8.6"}
+    engines: {node: '>=8.6'}
     dependencies:
       braces: 3.0.2
       picomatch: 2.3.1
 
   /mime-db@1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
   /mime-types@2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.52.0
 
   /mime@3.0.0(patch_hash=2he2uszztbibyal6zfzmv2a2oa):
     resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
-    engines: {node: ">=10.0.0"}
+    engines: {node: '>=10.0.0'}
     hasBin: true
     patched: true
 
   /mimic-fn@2.1.0:
     resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
 
   /mimic-fn@3.1.0:
     resolution: {integrity: sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: false
 
   /mimic-fn@4.0.0:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
-    engines: {node: ">=10"}
-    dev: true
-
-  /mimic-response@4.0.0:
-    resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    engines: {node: '>=10'}
+    requiresBuild: true
     dev: true
 
   /min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
 
   /mini-svg-data-uri@1.4.4:
     resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
@@ -19455,21 +19505,34 @@ packages:
     dependencies:
       brace-expansion: 1.1.11
 
+  /minimatch@5.1.0:
+    resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimatch@5.1.6:
     resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
 
   /minimatch@9.0.3:
     resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
-    engines: {node: ">=16 || 14 >=14.17"}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
+
+  /minimatch@9.0.4:
+    resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==}
+    engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
       brace-expansion: 2.0.1
 
   /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       arrify: 1.0.1
       is-plain-obj: 1.1.0
@@ -19481,9 +19544,10 @@ packages:
 
   /minipass-collect@1.0.2:
     resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
+    dev: false
 
   /minipass-fetch@3.0.4:
     resolution: {integrity: sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==}
@@ -19494,59 +19558,65 @@ packages:
       minizlib: 2.1.2
     optionalDependencies:
       encoding: 0.1.13
+    dev: false
 
   /minipass-flush@1.0.5:
     resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
+    dev: false
 
   /minipass-json-stream@1.0.1:
     resolution: {integrity: sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==}
     dependencies:
       jsonparse: 1.3.1
       minipass: 3.3.6
+    dev: false
 
   /minipass-pipeline@1.2.4:
     resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       minipass: 3.3.6
+    dev: false
 
   /minipass-sized@1.0.3:
     resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       minipass: 3.3.6
+    dev: false
 
   /minipass@3.3.6:
     resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       yallist: 4.0.0
 
   /minipass@4.2.8:
     resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /minipass@5.0.0:
     resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /minipass@7.0.4:
     resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==}
-    engines: {node: ">=16 || 14 >=14.17"}
+    engines: {node: '>=16 || 14 >=14.17'}
 
   /minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
       yallist: 4.0.0
 
   /mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+    requiresBuild: true
     dev: true
 
   /mkdirp@0.5.6:
@@ -19558,7 +19628,7 @@ packages:
 
   /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
 
   /mlly@1.4.2:
@@ -19575,20 +19645,20 @@ packages:
       obliterator: 1.6.1
     dev: false
 
-  /mock-gcs@1.1.0:
-    resolution: {integrity: sha512-FOr/++36kErcRrJZ72aghbYEdHvHbdw9t8YZEkxnPl6jzXXKz4+aZGOheoLI0sJB7qrOgelQ5d41E7IOTdkKiQ==}
+  /mock-gcs@1.2.0:
+    resolution: {integrity: sha512-/RsqqS9ZsjFnTNTYjOwW7q0y9Y84idZVNMA+S9kVdbWjPVq92jzxNWqBmOIEFY9D2O1JZw+wyGh9gwuMm3TT+g==}
     dependencies:
       stream-buffers: 3.0.2
     dev: true
 
   /modify-values@1.0.1:
     resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /mri@1.2.0:
     resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
 
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
@@ -19614,13 +19684,38 @@ packages:
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  /nan@2.18.0:
-    resolution: {integrity: sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==}
+  /nan@2.19.0:
+    resolution: {integrity: sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==}
+    dev: true
+
+  /nano-css@5.6.1(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw==}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+      css-tree: 1.1.3
+      csstype: 3.1.2
+      fastest-stable-stringify: 2.0.2
+      inline-style-prefixer: 7.0.0
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      rtl-css-js: 1.16.1
+      stacktrace-js: 2.0.2
+      stylis: 4.3.0
+    dev: false
 
   /nanoid@3.3.6:
     resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
+    dev: false
+
+  /nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
 
   /nanoid@4.0.2:
     resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
@@ -19629,6 +19724,7 @@ packages:
 
   /napi-build-utils@1.0.2:
     resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
+    requiresBuild: true
     dev: true
 
   /natural-compare-lite@1.4.0:
@@ -19644,7 +19740,7 @@ packages:
 
   /ndjson@2.0.0:
     resolution: {integrity: sha512-nGl7LRGrzugTtaFcJMhLbpzJM6XdivmbkdlaGcrk/LXg2KL/YBC6z1g70xh0/al+oFuVFP8N8kiWRucmeEH/qQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       json-stringify-safe: 5.0.1
@@ -19656,7 +19752,7 @@ packages:
 
   /negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
   /neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
@@ -19665,16 +19761,17 @@ packages:
   /nise@5.1.4:
     resolution: {integrity: sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==}
     dependencies:
-      "@sinonjs/commons": 2.0.0
-      "@sinonjs/fake-timers": 10.3.0
-      "@sinonjs/text-encoding": 0.7.2
+      '@sinonjs/commons': 2.0.0
+      '@sinonjs/fake-timers': 10.3.0
+      '@sinonjs/text-encoding': 0.7.2
       just-extend: 4.2.1
       path-to-regexp: 1.8.0
     dev: true
 
   /node-abi@3.47.0:
     resolution: {integrity: sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
+    requiresBuild: true
     dependencies:
       semver: 7.5.4
     dev: true
@@ -19685,21 +19782,43 @@ packages:
     dev: true
     optional: true
 
+  /node-addon-api@7.1.0:
+    resolution: {integrity: sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==}
+    engines: {node: ^16 || ^18 || >= 20}
+    dev: false
+
+  /node-addon-api@8.0.0:
+    resolution: {integrity: sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==}
+    engines: {node: ^18 || ^20 || >= 21}
+    dev: false
+
   /node-dir@0.1.17:
     resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==}
-    engines: {node: ">= 0.10.5"}
+    engines: {node: '>= 0.10.5'}
     dependencies:
       minimatch: 3.1.2
     dev: true
 
   /node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
-    engines: {node: ">=10.5.0"}
+    engines: {node: '>=10.5.0'}
     dev: true
 
   /node-fetch-native@1.4.0:
     resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==}
 
+  /node-fetch@2.6.7:
+    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: true
+
   /node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
     engines: {node: 4.x || >=6.0.0}
@@ -19722,7 +19841,12 @@ packages:
 
   /node-forge@1.3.1:
     resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
-    engines: {node: ">= 6.13.0"}
+    engines: {node: '>= 6.13.0'}
+    dev: false
+
+  /node-gyp-build@4.8.0:
+    resolution: {integrity: sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==}
+    hasBin: true
     dev: false
 
   /node-gyp@9.4.0:
@@ -19743,6 +19867,7 @@ packages:
       which: 2.0.2
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /node-int64@0.4.0:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
@@ -19752,13 +19877,17 @@ packages:
     resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==}
     dev: true
 
-  /nodemon@3.0.1:
-    resolution: {integrity: sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==}
-    engines: {node: ">=10"}
+  /node-releases@2.0.14:
+    resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
+    dev: true
+
+  /nodemon@3.1.0:
+    resolution: {integrity: sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       chokidar: 3.5.3
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@5.5.0)
       ignore-by-default: 1.0.1
       minimatch: 3.1.2
       pstree.remy: 1.1.8
@@ -19782,6 +19911,7 @@ packages:
     hasBin: true
     dependencies:
       abbrev: 1.1.1
+    dev: false
 
   /nopt@7.2.0:
     resolution: {integrity: sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==}
@@ -19795,13 +19925,13 @@ packages:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
-      resolve: 1.22.6
+      resolve: 1.22.8
       semver: 5.7.2
       validate-npm-package-license: 3.0.4
 
   /normalize-package-data@3.0.3:
     resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       hosted-git-info: 4.1.0
       is-core-module: 2.13.0
@@ -19817,6 +19947,7 @@ packages:
       is-core-module: 2.13.0
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
+    dev: false
 
   /normalize-package-data@6.0.0:
     resolution: {integrity: sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==}
@@ -19830,89 +19961,35 @@ packages:
 
   /normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /normalize-range@0.1.2:
     resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /normalize-registry-url@2.0.0:
     resolution: {integrity: sha512-3e9FwDyRAhbxXw4slm4Tjv40u78yPwMc/WZkACpqNQOs5sM7wic853AeTLkMFEVhivZkclGYlse8iYsklz0Yvg==}
     dev: false
 
-  /normalize-url@8.0.0:
-    resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==}
-    engines: {node: ">=14.16"}
-    dev: true
-
   /npm-bundled@3.0.0:
     resolution: {integrity: sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       npm-normalize-package-bin: 3.0.1
-
-  /npm-check-updates@16.14.5:
-    resolution: {integrity: sha512-f7v3YzPUgadtkB2LAVhiWMjrSejJ0N8OM9JjjVfxBz2neHqmPSWQUAUA+U/p3xeXHl9bghRD6knRqBhm9dkRGg==}
-    engines: {node: ">=14.14"}
-    hasBin: true
-    dependencies:
-      chalk: 5.3.0
-      cli-table3: 0.6.3
-      commander: 10.0.1
-      fast-memoize: 2.5.2
-      find-up: 5.0.0
-      fp-and-or: 0.1.4
-      get-stdin: 8.0.0
-      globby: 11.1.0
-      hosted-git-info: 5.2.1
-      ini: 4.1.1
-      js-yaml: 4.1.0
-      json-parse-helpfulerror: 1.0.3
-      jsonlines: 0.1.1
-      lodash: 4.17.21
-      make-fetch-happen: 11.1.1
-      minimatch: 9.0.3
-      p-map: 4.0.0
-      pacote: 15.2.0
-      parse-github-url: 1.0.2
-      progress: 2.0.3
-      prompts-ncu: 3.0.0
-      rc-config-loader: 4.1.3
-      remote-git-tags: 3.0.0
-      rimraf: 5.0.5
-      semver: 7.5.4
-      semver-utils: 1.1.4
-      source-map-support: 0.5.21
-      spawn-please: 2.0.2
-      strip-ansi: 7.1.0
-      strip-json-comments: 5.0.1
-      untildify: 4.0.0
-      update-notifier: 6.0.2
-    transitivePeerDependencies:
-      - bluebird
-      - supports-color
-    dev: true
+    dev: false
 
   /npm-install-checks@6.3.0:
     resolution: {integrity: sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       semver: 7.5.4
+    dev: false
 
   /npm-normalize-package-bin@3.0.1:
     resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
-  /npm-package-arg@10.1.0:
-    resolution: {integrity: sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      hosted-git-info: 6.1.1
-      proc-log: 3.0.0
-      semver: 7.5.4
-      validate-npm-package-name: 5.0.0
-    dev: true
+    dev: false
 
   /npm-package-arg@11.0.1:
     resolution: {integrity: sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==}
@@ -19924,13 +20001,6 @@ packages:
       validate-npm-package-name: 5.0.0
     dev: false
 
-  /npm-packlist@7.0.4:
-    resolution: {integrity: sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      ignore-walk: 6.0.3
-    dev: true
-
   /npm-packlist@8.0.0:
     resolution: {integrity: sha512-ErAGFB5kJUciPy1mmx/C2YFbvxoJ0QJ9uwkCZOeR6CqLLISPZBOiFModAbSXnjjlwW5lOhuhXva+fURsSGJqyw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -19940,21 +20010,10 @@ packages:
 
   /npm-path@2.0.4:
     resolution: {integrity: sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==}
-    engines: {node: ">=0.8"}
+    engines: {node: '>=0.8'}
     hasBin: true
     dependencies:
       which: 1.3.1
-    dev: false
-
-  /npm-pick-manifest@8.0.2:
-    resolution: {integrity: sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      npm-install-checks: 6.3.0
-      npm-normalize-package-bin: 3.0.1
-      npm-package-arg: 10.1.0
-      semver: 7.5.4
-    dev: true
 
   /npm-pick-manifest@9.0.0:
     resolution: {integrity: sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==}
@@ -19966,21 +20025,6 @@ packages:
       semver: 7.5.4
     dev: false
 
-  /npm-registry-fetch@14.0.5:
-    resolution: {integrity: sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      make-fetch-happen: 11.1.1
-      minipass: 5.0.0
-      minipass-fetch: 3.0.4
-      minipass-json-stream: 1.0.1
-      minizlib: 2.1.2
-      npm-package-arg: 10.1.0
-      proc-log: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /npm-registry-fetch@16.0.0:
     resolution: {integrity: sha512-JFCpAPUpvpwfSydv99u85yhP68rNIxSFmDpNbNnRWKSe3gpjHnWL8v320gATwRzjtgmZ9Jfe37+ZPOLZPwz6BQ==}
     engines: {node: ^16.14.0 || >=18.0.0}
@@ -19998,7 +20042,7 @@ packages:
 
   /npm-run-path@4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       path-key: 3.1.1
 
@@ -20010,13 +20054,12 @@ packages:
 
   /npm-which@3.0.1:
     resolution: {integrity: sha512-CM8vMpeFQ7MAPin0U3wzDhSGV0hMHNwHU0wjo402IVizPDrs45jSfSuoC+wThevY88LQti8VvaAnqYAeVy3I1A==}
-    engines: {node: ">=4.2.0"}
+    engines: {node: '>=4.2.0'}
     hasBin: true
     dependencies:
       commander: 2.20.3
       npm-path: 2.0.4
       which: 1.3.1
-    dev: false
 
   /npm@9.9.0:
     resolution: {integrity: sha512-wkd7sjz4KmdmddYQcd0aTP73P1cEuPlekeulz4jTDeMVx/Zo5XZ5KQ1z3eUzV3Q/WZpEO0NJXTrD5FNFe6fhCA==}
@@ -20024,14 +20067,14 @@ packages:
     hasBin: true
     dev: true
     bundledDependencies:
-      - "@isaacs/string-locale-compare"
-      - "@npmcli/arborist"
-      - "@npmcli/config"
-      - "@npmcli/fs"
-      - "@npmcli/map-workspaces"
-      - "@npmcli/package-json"
-      - "@npmcli/promise-spawn"
-      - "@npmcli/run-script"
+      - '@isaacs/string-locale-compare'
+      - '@npmcli/arborist'
+      - '@npmcli/config'
+      - '@npmcli/fs'
+      - '@npmcli/map-workspaces'
+      - '@npmcli/package-json'
+      - '@npmcli/promise-spawn'
+      - '@npmcli/run-script'
       - abbrev
       - archy
       - cacache
@@ -20103,6 +20146,7 @@ packages:
       console-control-strings: 1.1.0
       gauge: 4.0.4
       set-blocking: 2.0.0
+    dev: false
 
   /npmlog@7.0.1:
     resolution: {integrity: sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==}
@@ -20120,50 +20164,46 @@ packages:
       boolbase: 1.0.0
     dev: true
 
-  /nwsapi@2.2.7:
-    resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
-    dev: true
-
   /object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /object-hash@2.2.0:
     resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dev: true
 
   /object-hash@3.0.0:
     resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
 
   /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
 
   /object-is@1.1.5:
     resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
     dev: true
 
   /object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
 
   /object.assign@4.1.4:
     resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
       has-symbols: 1.0.3
       object-keys: 1.1.1
 
   /object.entries@1.1.7:
     resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -20172,7 +20212,7 @@ packages:
 
   /object.fromentries@2.0.7:
     resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -20195,7 +20235,7 @@ packages:
 
   /object.values@1.1.7:
     resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -20209,20 +20249,20 @@ packages:
     resolution: {integrity: sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==}
     dev: true
 
-  /octokit@3.1.1:
-    resolution: {integrity: sha512-AKJs5XYs7iAh7bskkYpxhUIpsYZdLqjnlnqrN5s9FFZuJ/a6ATUHivGpUKDpGB/xa+LGDtG9Lu8bOCfPM84vHQ==}
-    engines: {node: ">= 18"}
+  /octokit@3.1.2:
+    resolution: {integrity: sha512-MG5qmrTL5y8KYwFgE1A4JWmgfQBaIETE/lOlfwNYx1QOtCQHGVxkRJmdUJltFc1HVn73d61TlMhMyNTOtMl+ng==}
+    engines: {node: '>= 18'}
     dependencies:
-      "@octokit/app": 14.0.1
-      "@octokit/core": 5.0.1
-      "@octokit/oauth-app": 6.0.0
-      "@octokit/plugin-paginate-graphql": 4.0.0(@octokit/core@5.0.1)
-      "@octokit/plugin-paginate-rest": 9.0.0(@octokit/core@5.0.1)
-      "@octokit/plugin-rest-endpoint-methods": 10.0.0(@octokit/core@5.0.1)
-      "@octokit/plugin-retry": 6.0.1(@octokit/core@5.0.1)
-      "@octokit/plugin-throttling": 8.0.0(@octokit/core@5.0.1)
-      "@octokit/request-error": 5.0.1
-      "@octokit/types": 12.0.0
+      '@octokit/app': 14.0.2
+      '@octokit/core': 5.0.1
+      '@octokit/oauth-app': 6.0.0
+      '@octokit/plugin-paginate-graphql': 4.0.0(@octokit/core@5.0.1)
+      '@octokit/plugin-paginate-rest': 9.0.0(@octokit/core@5.0.1)
+      '@octokit/plugin-rest-endpoint-methods': 10.0.0(@octokit/core@5.0.1)
+      '@octokit/plugin-retry': 6.0.1(@octokit/core@5.0.1)
+      '@octokit/plugin-throttling': 8.0.0(@octokit/core@5.0.1)
+      '@octokit/request-error': 5.0.1
+      '@octokit/types': 12.0.0
     dev: true
 
   /ofetch@1.3.3:
@@ -20239,13 +20279,13 @@ packages:
 
   /on-finished@2.4.1:
     resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
     dependencies:
       ee-first: 1.1.1
 
   /on-headers@1.0.2:
     resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
     dev: true
 
   /once@1.4.0:
@@ -20263,23 +20303,23 @@ packages:
 
   /onetime@5.1.2:
     resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       mimic-fn: 2.1.0
 
   /onetime@6.0.0:
     resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       mimic-fn: 4.0.0
 
-  /oo-ascii-tree@1.90.0:
-    resolution: {integrity: sha512-LixRPYQJtgVfMi9gsUPB/zxrna4DqSe+M+iRGQBAq150BiPD33nWXOj/Je7uauGsOf+NkvRjZiD1P6yW/j8hsQ==}
-    engines: {node: ">= 14.17.0"}
+  /oo-ascii-tree@1.94.0:
+    resolution: {integrity: sha512-i6UllReifEW2InBJHVFJNxrledRp3yr/yKVbpDmgWTguRe8/7BtBK3njzjvZNcPLEAtiWWxr0o9SpwYjapmTOw==}
+    engines: {node: '>= 14.17.0'}
 
   /open@7.4.2:
     resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       is-docker: 2.2.1
       is-wsl: 2.2.0
@@ -20287,7 +20327,7 @@ packages:
 
   /open@8.4.2:
     resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       define-lazy-prop: 2.0.0
       is-docker: 2.2.1
@@ -20295,18 +20335,19 @@ packages:
 
   /open@9.1.0:
     resolution: {integrity: sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==}
-    engines: {node: ">=14.16"}
+    engines: {node: '>=14.16'}
     dependencies:
       default-browser: 4.0.0
       define-lazy-prop: 3.0.0
       is-inside-container: 1.0.0
       is-wsl: 2.2.0
+    dev: false
 
   /optionator@0.9.3:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      "@aashutoshrathi/word-wrap": 1.2.6
+      '@aashutoshrathi/word-wrap': 1.2.6
       deep-is: 0.1.4
       fast-levenshtein: 2.0.6
       levn: 0.4.1
@@ -20315,7 +20356,7 @@ packages:
 
   /ora@5.4.1:
     resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       bl: 4.1.0
       chalk: 4.1.2
@@ -20329,145 +20370,102 @@ packages:
 
   /os-tmpdir@1.0.2:
     resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     requiresBuild: true
 
-  /p-cancelable@3.0.0:
-    resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==}
-    engines: {node: ">=12.20"}
-    dev: true
-
   /p-defer@1.0.0:
     resolution: {integrity: sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: false
 
   /p-filter@2.1.0:
     resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       p-map: 2.1.0
     dev: false
 
   /p-limit@1.3.0:
     resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       p-try: 1.0.0
     dev: true
 
   /p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       p-try: 2.2.0
 
   /p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       yocto-queue: 0.1.0
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  /p-limit@5.0.0:
+    resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
+    engines: {node: '>=18'}
     dependencies:
       yocto-queue: 1.0.0
     dev: true
 
   /p-locate@2.0.0:
     resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       p-limit: 1.3.0
     dev: true
 
   /p-locate@3.0.0:
     resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       p-limit: 2.3.0
     dev: true
 
   /p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       p-limit: 2.3.0
 
   /p-locate@5.0.0:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       p-limit: 3.1.0
 
   /p-map@2.1.0:
     resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: false
 
   /p-map@4.0.0:
     resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       aggregate-error: 3.1.0
 
   /p-try@1.0.0:
     resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: ">=6"}
-
-  /package-json@8.1.1:
-    resolution: {integrity: sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      got: 12.6.1
-      registry-auth-token: 5.0.2
-      registry-url: 6.0.1
-      semver: 7.5.4
-    dev: true
-
-  /pacote@15.2.0:
-    resolution: {integrity: sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    hasBin: true
-    dependencies:
-      "@npmcli/git": 4.1.0
-      "@npmcli/installed-package-contents": 2.0.2
-      "@npmcli/promise-spawn": 6.0.2
-      "@npmcli/run-script": 6.0.2
-      cacache: 17.1.4
-      fs-minipass: 3.0.3
-      minipass: 5.0.0
-      npm-package-arg: 10.1.0
-      npm-packlist: 7.0.4
-      npm-pick-manifest: 8.0.2
-      npm-registry-fetch: 14.0.5
-      proc-log: 3.0.0
-      promise-retry: 2.0.1
-      read-package-json: 6.0.4
-      read-package-json-fast: 3.0.2
-      sigstore: 1.9.0
-      ssri: 10.0.5
-      tar: 6.2.0
-    transitivePeerDependencies:
-      - bluebird
-      - supports-color
-    dev: true
+    engines: {node: '>=6'}
 
   /pacote@17.0.4:
     resolution: {integrity: sha512-eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg==}
     engines: {node: ^16.14.0 || >=18.0.0}
     hasBin: true
     dependencies:
-      "@npmcli/git": 5.0.3
-      "@npmcli/installed-package-contents": 2.0.2
-      "@npmcli/promise-spawn": 7.0.0
-      "@npmcli/run-script": 7.0.1
+      '@npmcli/git': 5.0.3
+      '@npmcli/installed-package-contents': 2.0.2
+      '@npmcli/promise-spawn': 7.0.0
+      '@npmcli/run-script': 7.0.1
       cacache: 18.0.0
       fs-minipass: 3.0.3
       minipass: 7.0.4
@@ -20497,7 +20495,7 @@ packages:
 
   /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       callsites: 3.1.0
 
@@ -20510,20 +20508,14 @@ packages:
       just-diff-apply: 5.5.0
     dev: false
 
-  /parse-github-url@1.0.2:
-    resolution: {integrity: sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==}
-    engines: {node: ">=0.10.0"}
-    hasBin: true
-    dev: true
-
   /parse-gitignore@1.0.1:
     resolution: {integrity: sha512-UGyowyjtx26n65kdAMWhm6/3uy5uSrpcuH7tt+QEVudiBoVS+eqHxD5kbi9oWVRwj7sCzXqwuM+rUGw7earl6A==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: true
 
   /parse-json@4.0.0:
     resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       error-ex: 1.3.2
       json-parse-better-errors: 1.0.2
@@ -20531,16 +20523,16 @@ packages:
 
   /parse-json@5.2.0:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
-      "@babel/code-frame": 7.22.13
+      '@babel/code-frame': 7.23.5
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
   /parse-ms@2.1.0:
     resolution: {integrity: sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: false
 
   /parse-semver@1.1.1:
@@ -20556,10 +20548,6 @@ packages:
       parse5: 7.1.2
     dev: true
 
-  /parse5@6.0.1:
-    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
-    dev: true
-
   /parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
     dependencies:
@@ -20568,16 +20556,16 @@ packages:
 
   /parseurl@1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
 
   /patch-console@1.0.0:
     resolution: {integrity: sha512-nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: true
 
   /path-absolute@1.0.1:
     resolution: {integrity: sha512-gds5iRhSeOcDtj8gfWkRHLtZKTPsFVuh7utbjYtvnclw4XM+ffRzJrwqMhOD1PVqef7nBLmgsu1vIujjvAJrAw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: false
 
   /path-browserify@1.0.1:
@@ -20586,24 +20574,24 @@ packages:
 
   /path-exists@3.0.0:
     resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /path-key@4.0.0:
     resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /path-name@1.0.0:
     resolution: {integrity: sha512-/dcAb5vMXH0f51yvMuSUqFpxUcA8JelbRmE5mW/p4CUJxrNgK24IkstnV7ENtg2IDGBOu6izKTG6eilbnbNKWQ==}
@@ -20614,14 +20602,21 @@ packages:
 
   /path-scurry@1.10.1:
     resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
-    engines: {node: ">=16 || 14 >=14.17"}
+    engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
       lru-cache: 10.0.1
       minipass: 7.0.4
 
+  /path-scurry@1.10.2:
+    resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      lru-cache: 10.2.0
+      minipass: 7.0.4
+
   /path-temp@2.1.0:
     resolution: {integrity: sha512-cMMJTAZlion/RWRRC48UbrDymEIt+/YSD/l8NqjneyDw2rDOBQcP5yRkMB4CYGn47KMhZvbblBP7Z79OsMw72w==}
-    engines: {node: ">=8.15"}
+    engines: {node: '>=8.15'}
     dependencies:
       unique-string: 2.0.0
     dev: false
@@ -20637,14 +20632,14 @@ packages:
 
   /path-type@3.0.0:
     resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       pify: 3.0.0
     dev: true
 
   /path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /pathe@1.1.1:
     resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
@@ -20674,56 +20669,56 @@ packages:
 
   /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: ">=8.6"}
+    engines: {node: '>=8.6'}
 
   /pidtree@0.6.0:
     resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
-    engines: {node: ">=0.10"}
+    engines: {node: '>=0.10'}
     hasBin: true
     dev: true
 
   /pidusage@3.0.2:
     resolution: {integrity: sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       safe-buffer: 5.2.1
     dev: true
 
   /pify@2.3.0:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /pify@3.0.0:
     resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: true
 
   /pirates@4.0.6:
     resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
 
   /pkg-dir@3.0.0:
     resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       find-up: 3.0.0
     dev: true
 
   /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       find-up: 4.1.0
     dev: true
 
   /pkg-dir@5.0.0:
     resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       find-up: 5.0.0
     dev: true
@@ -20737,20 +20732,20 @@ packages:
 
   /pkg-up@3.1.0:
     resolution: {integrity: sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       find-up: 3.0.0
     dev: true
 
   /playwright-core@1.38.1:
     resolution: {integrity: sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==}
-    engines: {node: ">=16"}
+    engines: {node: '>=16'}
     hasBin: true
     dev: true
 
   /playwright@1.38.1:
     resolution: {integrity: sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==}
-    engines: {node: ">=16"}
+    engines: {node: '>=16'}
     hasBin: true
     dependencies:
       playwright-core: 1.38.1
@@ -20760,42 +20755,42 @@ packages:
 
   /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: false
 
   /polished@4.2.2:
     resolution: {integrity: sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
-      "@babel/runtime": 7.23.1
+      '@babel/runtime': 7.23.1
     dev: true
 
-  /postcss-import@15.1.0(postcss@8.4.31):
+  /postcss-import@15.1.0(postcss@8.4.38):
     resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       postcss: ^8.0.0
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
-      resolve: 1.22.6
+      resolve: 1.22.8
 
-  /postcss-js@4.0.1(postcss@8.4.31):
+  /postcss-js@4.0.1(postcss@8.4.38):
     resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
     engines: {node: ^12 || ^14 || >= 16}
     peerDependencies:
       postcss: ^8.4.21
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.4.31
+      postcss: 8.4.38
 
-  /postcss-load-config@3.1.4(postcss@8.4.31):
+  /postcss-load-config@3.1.4:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     peerDependencies:
-      postcss: ">=8.0.9"
-      ts-node: ">=9.0.0"
+      postcss: '>=8.0.9'
+      ts-node: '>=9.0.0'
     peerDependenciesMeta:
       postcss:
         optional: true
@@ -20803,16 +20798,15 @@ packages:
         optional: true
     dependencies:
       lilconfig: 2.1.0
-      postcss: 8.4.31
       yaml: 1.10.2
     dev: true
 
-  /postcss-load-config@3.1.4(ts-node@10.9.1):
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: ">= 10"}
+  /postcss-load-config@4.0.1(postcss@8.4.38):
+    resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}
+    engines: {node: '>= 14'}
     peerDependencies:
-      postcss: ">=8.0.9"
-      ts-node: ">=9.0.0"
+      postcss: '>=8.0.9'
+      ts-node: '>=9.0.0'
     peerDependenciesMeta:
       postcss:
         optional: true
@@ -20820,38 +20814,54 @@ packages:
         optional: true
     dependencies:
       lilconfig: 2.1.0
-      ts-node: 10.9.1(@types/node@16.18.58)(typescript@4.9.5)
-      yaml: 1.10.2
+      postcss: 8.4.38
+      yaml: 2.3.2
     dev: true
 
-  /postcss-load-config@4.0.1(postcss@8.4.31):
-    resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}
-    engines: {node: ">= 14"}
+  /postcss-load-config@4.0.2(postcss@8.4.38):
+    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
+    engines: {node: '>= 14'}
     peerDependencies:
-      postcss: ">=8.0.9"
-      ts-node: ">=9.0.0"
+      postcss: '>=8.0.9'
+      ts-node: '>=9.0.0'
     peerDependenciesMeta:
       postcss:
         optional: true
       ts-node:
         optional: true
     dependencies:
-      lilconfig: 2.1.0
-      postcss: 8.4.31
-      yaml: 2.3.2
+      lilconfig: 3.1.1
+      postcss: 8.4.38
+      yaml: 2.4.1
 
-  /postcss-nested@6.0.1(postcss@8.4.31):
+  /postcss-nested@6.0.1(postcss@8.4.38):
     resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
-    engines: {node: ">=12.0"}
+    engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.2.14
     dependencies:
-      postcss: 8.4.31
-      postcss-selector-parser: 6.0.13
+      postcss: 8.4.38
+      postcss-selector-parser: 6.0.16
+
+  /postcss-selector-parser@6.0.10:
+    resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
+    engines: {node: '>=4'}
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+    dev: false
 
   /postcss-selector-parser@6.0.13:
     resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+    dev: false
+
+  /postcss-selector-parser@6.0.16:
+    resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==}
+    engines: {node: '>=4'}
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
@@ -20859,17 +20869,26 @@ packages:
   /postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  /postcss@8.4.31:
-    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
+  /postcss@8.4.35:
+    resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: 3.3.6
+      nanoid: 3.3.7
       picocolors: 1.0.0
       source-map-js: 1.0.2
+    dev: true
+
+  /postcss@8.4.38:
+    resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.2.0
 
   /prebuild-install@7.1.1:
     resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       detect-libc: 2.0.2
@@ -20888,22 +20907,22 @@ packages:
 
   /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
 
   /prettier-linter-helpers@1.0.0:
     resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
-    engines: {node: ">=6.0.0"}
+    engines: {node: '>=6.0.0'}
     dependencies:
       fast-diff: 1.3.0
 
   /prettier@2.8.8:
     resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
-    engines: {node: ">=10.13.0"}
+    engines: {node: '>=10.13.0'}
     hasBin: true
 
   /pretty-bytes@5.6.0:
     resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dev: false
 
   /pretty-format@27.5.1:
@@ -20919,7 +20938,7 @@ packages:
     resolution: {integrity: sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      "@jest/schemas": 28.1.3
+      '@jest/schemas': 28.1.3
       ansi-regex: 5.0.1
       ansi-styles: 5.2.0
       react-is: 18.2.0
@@ -20929,19 +20948,19 @@ packages:
     resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      "@jest/schemas": 29.6.3
+      '@jest/schemas': 29.6.3
       ansi-styles: 5.2.0
       react-is: 18.2.0
     dev: true
 
   /pretty-hrtime@1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
     dev: true
 
   /pretty-ms@7.0.1:
     resolution: {integrity: sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       parse-ms: 2.1.0
     dev: false
@@ -20953,25 +20972,26 @@ packages:
   /proc-log@3.0.0:
     resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    dev: false
 
   /process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
   /process@0.11.10:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
-    engines: {node: ">= 0.6.0"}
+    engines: {node: '>= 0.6.0'}
 
   /progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
-    engines: {node: ">=0.4.0"}
+    engines: {node: '>=0.4.0'}
     dev: true
 
   /projen@0.71.163:
     resolution: {integrity: sha512-Sj0UthyhhvHYAhgvuQtQk6R4ia/AkHGT/JG3PFbEjIIYcPSImonW+1OIrZ+S+ofWZJPWZj07RBYLiZ+qAVm8NQ==}
-    engines: {node: ">= 14.0.0"}
+    engines: {node: '>= 14.0.0'}
     hasBin: true
     dependencies:
-      "@iarna/toml": 2.2.5
+      '@iarna/toml': 2.2.5
       case: 1.6.3
       chalk: 4.1.2
       comment-json: 4.2.2
@@ -20985,7 +21005,7 @@ packages:
       yaml: 2.3.2
       yargs: 17.7.2
     bundledDependencies:
-      - "@iarna/toml"
+      - '@iarna/toml'
       - case
       - chalk
       - comment-json
@@ -21010,29 +21030,23 @@ packages:
   /promise-inflight@1.0.1:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
     peerDependencies:
-      bluebird: "*"
+      bluebird: '*'
     peerDependenciesMeta:
       bluebird:
         optional: true
+    dev: false
 
   /promise-retry@2.0.1:
     resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       err-code: 2.0.3
       retry: 0.12.0
-
-  /prompts-ncu@3.0.0:
-    resolution: {integrity: sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==}
-    engines: {node: ">= 14"}
-    dependencies:
-      kleur: 4.1.5
-      sisteransi: 1.0.5
-    dev: true
+    dev: false
 
   /prompts@2.4.2:
     resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       kleur: 3.0.3
       sisteransi: 1.0.5
@@ -21051,10 +21065,38 @@ packages:
 
   /proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
+    dev: false
+
+  /proto3-json-serializer@2.0.0:
+    resolution: {integrity: sha512-FB/YaNrpiPkyQNSNPilpn8qn0KdEfkgmJ9JP93PQyF/U4bAiXY5BiUdDhiDO4S48uSQ6AesklgVlrKiqZPzegw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      protobufjs: 7.2.5(patch_hash=plkkb5oxv62w7nyvt6cqmvgk4q)
+    dev: false
+
+  /protobufjs@7.2.5(patch_hash=plkkb5oxv62w7nyvt6cqmvgk4q):
+    resolution: {integrity: sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==}
+    engines: {node: '>=12.0.0'}
+    requiresBuild: true
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.4
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.0
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.0
+      '@types/node': 20.14.2
+      long: 5.2.3
+    dev: false
+    patched: true
 
   /proxy-addr@2.0.7:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
-    engines: {node: ">= 0.10"}
+    engines: {node: '>= 0.10'}
     dependencies:
       forwarded: 0.2.0
       ipaddr.js: 1.9.1
@@ -21063,10 +21105,6 @@ packages:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
     dev: true
 
-  /psl@1.9.0:
-    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
-    dev: true
-
   /pstree.remy@1.1.8:
     resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
     dev: true
@@ -21095,21 +21133,14 @@ packages:
 
   /punycode@2.3.0:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
-    engines: {node: ">=6"}
-
-  /pupa@3.1.0:
-    resolution: {integrity: sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==}
-    engines: {node: ">=12.20"}
-    dependencies:
-      escape-goat: 4.0.0
-    dev: true
+    engines: {node: '>=6'}
 
   /puppeteer-core@2.1.1:
     resolution: {integrity: sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==}
-    engines: {node: ">=8.16.0"}
+    engines: {node: '>=8.16.0'}
     dependencies:
-      "@types/mime-types": 2.1.2
-      debug: 4.3.4
+      '@types/mime-types': 2.1.2
+      debug: 4.3.4(supports-color@5.5.0)
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 3.0.0(patch_hash=2he2uszztbibyal6zfzmv2a2oa)
@@ -21124,43 +21155,33 @@ packages:
       - utf-8-validate
     dev: true
 
-  /pure-rand@6.0.4:
-    resolution: {integrity: sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==}
-    dev: true
-
   /q@1.5.1:
     resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==}
-    engines: {node: ">=0.6.0", teleport: ">=0.2.0"}
+    engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
     dev: true
 
   /qs@6.11.0:
     resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
-    engines: {node: ">=0.6"}
+    engines: {node: '>=0.6'}
     dependencies:
       side-channel: 1.0.4
 
   /qs@6.11.2:
     resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
-    engines: {node: ">=0.6"}
+    engines: {node: '>=0.6'}
     dependencies:
       side-channel: 1.0.4
     dev: true
 
-  /querystringify@2.2.0:
-    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-    dev: true
-
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
+  /queue-tick@1.0.1:
+    resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
+
   /quick-lru@4.0.1:
     resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
-    engines: {node: ">=8"}
-
-  /quick-lru@5.1.1:
-    resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
-    engines: {node: ">=10"}
-    dev: true
+    engines: {node: '>=8'}
 
   /ramda@0.29.0:
     resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}
@@ -21180,28 +21201,17 @@ packages:
 
   /range-parser@1.2.1:
     resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
 
-  /raw-body@2.5.1:
-    resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==}
-    engines: {node: ">= 0.8"}
+  /raw-body@2.5.2:
+    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
+    engines: {node: '>= 0.8'}
     dependencies:
       bytes: 3.1.2
       http-errors: 2.0.0
       iconv-lite: 0.4.24
       unpipe: 1.0.0
 
-  /rc-config-loader@4.1.3:
-    resolution: {integrity: sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==}
-    dependencies:
-      debug: 4.3.4
-      js-yaml: 4.1.0
-      json5: 2.2.3
-      require-from-string: 2.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /rc9@2.1.1:
     resolution: {integrity: sha512-lNeOl38Ws0eNxpO3+wD1I9rkHGQyj1NU1jlzv4go2CtEnEQEUfqnIvZG7W+bC/aXdJ27n5x/yUjb6RoT9tko+Q==}
     dependencies:
@@ -21213,6 +21223,7 @@ packages:
   /rc@1.2.8:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
+    requiresBuild: true
     dependencies:
       deep-extend: 0.6.0
       ini: 1.3.8
@@ -21223,8 +21234,8 @@ packages:
   /react-colorful@5.6.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==}
     peerDependencies:
-      react: ">=16.8.0"
-      react-dom: ">=16.8.0"
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -21243,18 +21254,18 @@ packages:
   /react-docgen-typescript@2.2.2(typescript@5.2.2):
     resolution: {integrity: sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==}
     peerDependencies:
-      typescript: ">= 4.3.x"
+      typescript: '>= 4.3.x'
     dependencies:
       typescript: 5.2.2
     dev: true
 
   /react-docgen@6.0.0-alpha.3:
     resolution: {integrity: sha512-DDLvB5EV9As1/zoUsct6Iz2Cupw9FObEGD3DMcIs3EDFIoSKyz8FZtoWj3Wj+oodrU4/NfidN0BL5yrapIcTSA==}
-    engines: {node: ">=12.0.0"}
+    engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      "@babel/core": 7.23.0
-      "@babel/generator": 7.23.0
+      '@babel/core': 7.23.9
+      '@babel/generator': 7.23.0
       ast-types: 0.14.2
       commander: 2.20.3
       doctrine: 3.0.0
@@ -21282,7 +21293,7 @@ packages:
       react: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
       react-dom: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
     dependencies:
-      "@base2/pretty-print-object": 1.0.1
+      '@base2/pretty-print-object': 1.0.1
       is-plain-object: 5.0.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -21319,11 +21330,11 @@ packages:
   /react-markdown@9.0.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-186Gw/vF1uRkydbsOIkcGXw7aHq0sZOCRFFjGrr7b9+nVZg4UfA4enXCaxm4fUzecU38sWfrNDitGhshuU7rdg==}
     peerDependencies:
-      "@types/react": ">=18"
-      react: ">=18"
+      '@types/react': '>=18'
+      react: '>=18'
     dependencies:
-      "@types/hast": 3.0.3
-      "@types/react": 18.2.25
+      '@types/hast': 3.0.3
+      '@types/react': 18.2.25
       devlop: 1.1.0
       hast-util-to-jsx-runtime: 2.2.0
       html-url-attributes: 3.0.0
@@ -21341,11 +21352,11 @@ packages:
   /react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
     peerDependencies:
-      "@popperjs/core": ^2.0.0
+      '@popperjs/core': ^2.0.0
       react: ^16.8.0 || ^17 || ^18
       react-dom: ^16.8.0 || ^17 || ^18
     dependencies:
-      "@popperjs/core": 2.11.8
+      '@popperjs/core': 2.11.8
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-fast-compare: 3.2.2
@@ -21354,7 +21365,7 @@ packages:
 
   /react-reconciler@0.26.2(react@17.0.2):
     resolution: {integrity: sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     peerDependencies:
       react: ^17.0.2
     dependencies:
@@ -21366,20 +21377,20 @@ packages:
 
   /react-refresh@0.14.0:
     resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dev: true
 
   /react-remove-scroll-bar@2.3.4(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
-      "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@types/react": 18.2.25
+      '@types/react': 18.2.25
       react: 18.2.0
       react-style-singleton: 2.2.1(@types/react@18.2.25)(react@18.2.0)
       tslib: 2.6.2
@@ -21387,15 +21398,15 @@ packages:
 
   /react-remove-scroll@2.5.5(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
-      "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@types/react": 18.2.25
+      '@types/react': 18.2.25
       react: 18.2.0
       react-remove-scroll-bar: 2.3.4(@types/react@18.2.25)(react@18.2.0)
       react-style-singleton: 2.2.1(@types/react@18.2.25)(react@18.2.0)
@@ -21406,24 +21417,58 @@ packages:
 
   /react-style-singleton@2.2.1(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
-      "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@types/react": 18.2.25
+      '@types/react': 18.2.25
       get-nonce: 1.0.1
       invariant: 2.2.4
       react: 18.2.0
       tslib: 2.6.2
     dev: true
 
+  /react-universal-interface@0.6.2(react@18.2.0)(tslib@2.6.2):
+    resolution: {integrity: sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==}
+    peerDependencies:
+      react: '*'
+      tslib: '*'
+    dependencies:
+      react: 18.2.0
+      tslib: 2.6.2
+    dev: false
+
+  /react-use@17.4.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-1jPtmWLD8OJJNYCdYLJEH/HM+bPDfJuyGwCYeJFgPmWY8ttwpgZnW5QnzgM55CYUByUiTjHxsGOnEpLl6yQaoQ==}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+    dependencies:
+      '@types/js-cookie': 2.2.7
+      '@xobotyi/scrollbar-width': 1.9.5
+      copy-to-clipboard: 3.3.3
+      fast-deep-equal: 3.1.3
+      fast-shallow-equal: 1.0.0
+      js-cookie: 2.2.1
+      nano-css: 5.6.1(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-universal-interface: 0.6.2(react@18.2.0)(tslib@2.6.2)
+      resize-observer-polyfill: 1.5.1
+      screenfull: 5.2.0
+      set-harmonic-interval: 1.0.1
+      throttle-debounce: 3.0.1
+      ts-easing: 0.2.0
+      tslib: 2.6.2
+    dev: false
+
   /react@17.0.2:
     resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       loose-envify: 1.4.0
       object-assign: 4.1.1
@@ -21431,7 +21476,7 @@ packages:
 
   /react@18.2.0:
     resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     dependencies:
       loose-envify: 1.4.0
 
@@ -21447,7 +21492,7 @@ packages:
 
   /read-ini-file@4.0.0:
     resolution: {integrity: sha512-zz4qv/sKETv7nAkATqSJ9YMbKD8NXRPuA8d17VdYCuNYrVstB1S6UAMU6aytf5vRa9MESbZN7jLZdcmrOxz4gg==}
-    engines: {node: ">=14.6"}
+    engines: {node: '>=14.6'}
     dependencies:
       ini: 3.0.1
       strip-bom: 4.0.0
@@ -21459,16 +21504,7 @@ packages:
     dependencies:
       json-parse-even-better-errors: 3.0.0
       npm-normalize-package-bin: 3.0.1
-
-  /read-package-json@6.0.4:
-    resolution: {integrity: sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      glob: 10.3.10
-      json-parse-even-better-errors: 3.0.0
-      normalize-package-data: 5.0.0
-      npm-normalize-package-bin: 3.0.1
-    dev: true
+    dev: false
 
   /read-package-json@7.0.0:
     resolution: {integrity: sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==}
@@ -21482,7 +21518,7 @@ packages:
 
   /read-pkg-up@3.0.0:
     resolution: {integrity: sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       find-up: 2.1.0
       read-pkg: 3.0.0
@@ -21490,7 +21526,7 @@ packages:
 
   /read-pkg-up@7.0.1:
     resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       find-up: 4.1.0
       read-pkg: 5.2.0
@@ -21498,7 +21534,7 @@ packages:
 
   /read-pkg@3.0.0:
     resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       load-json-file: 4.0.0
       normalize-package-data: 2.5.0
@@ -21507,16 +21543,16 @@ packages:
 
   /read-pkg@5.2.0:
     resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
-      "@types/normalize-package-data": 2.4.2
+      '@types/normalize-package-data': 2.4.2
       normalize-package-data: 2.5.0
       parse-json: 5.2.0
       type-fest: 0.6.0
 
   /read-yaml-file@2.1.0:
     resolution: {integrity: sha512-UkRNRIwnhG+y7hpqnycCL/xbTk7+ia9VuVTC0S+zVbwd65DI9eUpRMfsWIGrCWxTU/mi+JW8cHQCrv+zfCbEPQ==}
-    engines: {node: ">=10.13"}
+    engines: {node: '>=10.13'}
     dependencies:
       js-yaml: 4.1.0
       strip-bom: 4.0.0
@@ -21524,7 +21560,7 @@ packages:
 
   /read@1.0.7:
     resolution: {integrity: sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==}
-    engines: {node: ">=0.8"}
+    engines: {node: '>=0.8'}
     dependencies:
       mute-stream: 0.0.8
     dev: true
@@ -21542,7 +21578,7 @@ packages:
 
   /readable-stream@3.6.2:
     resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     dependencies:
       inherits: 2.0.4
       string_decoder: 1.3.0
@@ -21566,18 +21602,18 @@ packages:
 
   /readdirp@3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: ">=8.10.0"}
+    engines: {node: '>=8.10.0'}
     dependencies:
       picomatch: 2.3.1
 
   /realpath-missing@1.1.0:
     resolution: {integrity: sha512-wnWtnywepjg/eHIgWR97R7UuM5i+qHLA195qdN9UPKvcMqfn60+67S8sPPW3vDlSEfYHoFkKU8IvpCNty3zQvQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: false
 
   /recast@0.21.5:
     resolution: {integrity: sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
     dependencies:
       ast-types: 0.15.2
       esprima: 4.0.1
@@ -21587,7 +21623,7 @@ packages:
 
   /recast@0.23.4:
     resolution: {integrity: sha512-qtEDqIZGVcSZCHniWwZWbRy79Dc6Wp3kT/UmDA2RJKBPg7+7k51aQBZirHmUGn5uvHf2rg8DkjizrN26k61ATw==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
     dependencies:
       assert: 2.1.0
       ast-types: 0.16.1
@@ -21598,13 +21634,13 @@ packages:
 
   /rechoir@0.6.2:
     resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
-    engines: {node: ">= 0.10"}
+    engines: {node: '>= 0.10'}
     dependencies:
-      resolve: 1.22.6
+      resolve: 1.22.8
 
   /redent@3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       indent-string: 4.0.0
       strip-indent: 3.0.0
@@ -21612,12 +21648,12 @@ packages:
 
   /redis-errors@1.2.0:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: false
 
   /redis-parser@3.0.0:
     resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       redis-errors: 1.2.0
     dev: false
@@ -21625,19 +21661,19 @@ packages:
   /redis@4.6.10:
     resolution: {integrity: sha512-mmbyhuKgDiJ5TWUhiKhBssz+mjsuSI/lSZNPI9QvZOYzWvYGejtb+W3RlDDf8LD6Bdl5/mZeG8O1feUGhXTxEg==}
     dependencies:
-      "@redis/bloom": 1.2.0(@redis/client@1.5.11)
-      "@redis/client": 1.5.11
-      "@redis/graph": 1.1.0(@redis/client@1.5.11)
-      "@redis/json": 1.0.6(@redis/client@1.5.11)
-      "@redis/search": 1.1.5(@redis/client@1.5.11)
-      "@redis/time-series": 1.0.5(@redis/client@1.5.11)
+      '@redis/bloom': 1.2.0(@redis/client@1.5.11)
+      '@redis/client': 1.5.11
+      '@redis/graph': 1.1.0(@redis/client@1.5.11)
+      '@redis/json': 1.0.6(@redis/client@1.5.11)
+      '@redis/search': 1.1.5(@redis/client@1.5.11)
+      '@redis/time-series': 1.0.5(@redis/client@1.5.11)
     dev: true
 
   /reflect.getprototypeof@1.0.4:
     resolution: {integrity: sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.2
       get-intrinsic: 1.2.1
@@ -21647,7 +21683,7 @@ packages:
 
   /regenerate-unicode-properties@10.1.1:
     resolution: {integrity: sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       regenerate: 1.4.2
     dev: true
@@ -21662,7 +21698,7 @@ packages:
   /regenerator-transform@0.15.2:
     resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
     dependencies:
-      "@babel/runtime": 7.23.1
+      '@babel/runtime': 7.23.1
     dev: true
 
   /regexp-tree@0.1.27:
@@ -21672,7 +21708,7 @@ packages:
 
   /regexp.prototype.flags@1.5.1:
     resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.2.1
@@ -21680,9 +21716,9 @@ packages:
 
   /regexpu-core@5.3.2:
     resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
-      "@babel/regjsgen": 0.8.0
+      '@babel/regjsgen': 0.8.0
       regenerate: 1.4.2
       regenerate-unicode-properties: 10.1.1
       regjsparser: 0.9.1
@@ -21690,20 +21726,6 @@ packages:
       unicode-match-property-value-ecmascript: 2.1.0
     dev: true
 
-  /registry-auth-token@5.0.2:
-    resolution: {integrity: sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==}
-    engines: {node: ">=14"}
-    dependencies:
-      "@pnpm/npm-conf": 2.2.2
-    dev: true
-
-  /registry-url@6.0.1:
-    resolution: {integrity: sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==}
-    engines: {node: ">=12"}
-    dependencies:
-      rc: 1.2.8
-    dev: true
-
   /regjsparser@0.10.0:
     resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
     hasBin: true
@@ -21731,7 +21753,7 @@ packages:
   /remark-parse@11.0.0:
     resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==}
     dependencies:
-      "@types/mdast": 4.0.3
+      '@types/mdast': 4.0.3
       mdast-util-from-markdown: 2.0.0
       micromark-util-types: 2.0.0
       unified: 11.0.4
@@ -21742,8 +21764,8 @@ packages:
   /remark-rehype@11.0.0:
     resolution: {integrity: sha512-vx8x2MDMcxuE4lBmQ46zYUDfcFMmvg80WYX+UNLeG6ixjdCCLcw1lrgAukwBTuOFsS78eoAedHGn9sNM0w7TPw==}
     dependencies:
-      "@types/hast": 3.0.3
-      "@types/mdast": 4.0.3
+      '@types/hast': 3.0.3
+      '@types/mdast': 4.0.3
       mdast-util-to-hast: 13.0.2
       unified: 11.0.4
       vfile: 6.0.1
@@ -21757,73 +21779,47 @@ packages:
       unist-util-visit: 2.0.3
     dev: true
 
-  /remote-git-tags@3.0.0:
-    resolution: {integrity: sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==}
-    engines: {node: ">=8"}
-    dev: true
-
   /repeat-string@1.6.1:
     resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
-    engines: {node: ">=0.10"}
+    engines: {node: '>=0.10'}
 
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /require-from-string@2.0.2:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
 
   /require-main-filename@2.0.0:
     resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
     dev: true
 
-  /requires-port@1.0.0:
-    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
-    dev: true
-
   /reserved-words@0.1.2:
     resolution: {integrity: sha512-0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw==}
     dev: true
 
-  /resolve-alpn@1.2.1:
-    resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
-    dev: true
-
-  /resolve-cwd@3.0.0:
-    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
-    engines: {node: ">=8"}
-    dependencies:
-      resolve-from: 5.0.0
-    dev: true
+  /resize-observer-polyfill@1.5.1:
+    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
+    dev: false
 
   /resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
 
   /resolve-from@5.0.0:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /resolve-link-target@2.0.0:
     resolution: {integrity: sha512-jR9pmK8PUtjwUSNYn4fuTewcNUJE5e9B8tWD1C2dmDk40dvig+l1WSPmdH/03cx3ULWK7oS0E3cdam+poDepYQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: false
 
   /resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
-  /resolve.exports@1.1.1:
-    resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==}
-    engines: {node: ">=10"}
-    dev: true
-
-  /resolve.exports@2.0.2:
-    resolution: {integrity: sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==}
-    engines: {node: ">=10"}
-    dev: true
-
   /resolve@1.22.6:
     resolution: {integrity: sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==}
     hasBin: true
@@ -21832,6 +21828,14 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  /resolve@1.22.8:
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.13.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
   /resolve@2.0.0-next.4:
     resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==}
     hasBin: true
@@ -21841,42 +21845,49 @@ packages:
       supports-preserve-symlinks-flag: 1.0.0
     dev: false
 
-  /responselike@3.0.0:
-    resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      lowercase-keys: 3.0.0
-    dev: true
-
   /restore-cursor@3.1.0:
     resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       onetime: 5.1.2
       signal-exit: 3.0.7
 
   /retry-request@5.0.2:
     resolution: {integrity: sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    dependencies:
+      debug: 4.3.4(supports-color@5.5.0)
+      extend: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /retry-request@7.0.1:
+    resolution: {integrity: sha512-ZI6vJp9rfB71mrZpw+n9p/B6HCsd7QJlSEQftZ+xfJzr3cQ9EPGKw1FF0BnViJ0fYREX6FhymBD2CARpmsFciQ==}
+    engines: {node: '>=14'}
     dependencies:
-      debug: 4.3.4
+      '@types/request': 2.48.11
+      debug: 4.3.4(supports-color@5.5.0)
       extend: 3.0.2
+      teeny-request: 9.0.0
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: false
 
   /retry@0.12.0:
     resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
+    dev: false
 
   /retry@0.13.1:
     resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
     dev: false
 
   /reusify@1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: ">=1.0.0", node: ">=0.10.0"}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
   /rfc4648@1.5.2:
     resolution: {integrity: sha512-tLOizhR6YGovrEBLatX1sdcuhoSCXddw3mqNVAcKxGJ+J0hFeJ+SjeWCv5UPA/WU3YzWPPuCVYgXBKZUPGpKtg==}
@@ -21888,7 +21899,7 @@ packages:
 
   /right-pad@1.0.1:
     resolution: {integrity: sha512-bYBjgxmkvTAfgIYy328fmkwhp39v8lwVgWhhrzxPV3yHtcSqyYKe9/XOhvW48UFjATg3VuJbpsp5822ACNvkmw==}
-    engines: {node: ">= 0.10"}
+    engines: {node: '>= 0.10'}
     dev: false
 
   /rimraf@2.6.3:
@@ -21911,38 +21922,62 @@ packages:
     dependencies:
       glob: 7.2.3
 
-  /rimraf@5.0.5:
-    resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==}
-    engines: {node: ">=14"}
-    hasBin: true
-    dependencies:
-      glob: 10.3.10
-    dev: true
-
   /rollup@3.29.4:
     resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==}
-    engines: {node: ">=14.18.0", npm: ">=8.0.0"}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
 
+  /rollup@4.18.0:
+    resolution: {integrity: sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+    dependencies:
+      '@types/estree': 1.0.5
+    optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.18.0
+      '@rollup/rollup-android-arm64': 4.18.0
+      '@rollup/rollup-darwin-arm64': 4.18.0
+      '@rollup/rollup-darwin-x64': 4.18.0
+      '@rollup/rollup-linux-arm-gnueabihf': 4.18.0
+      '@rollup/rollup-linux-arm-musleabihf': 4.18.0
+      '@rollup/rollup-linux-arm64-gnu': 4.18.0
+      '@rollup/rollup-linux-arm64-musl': 4.18.0
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.18.0
+      '@rollup/rollup-linux-riscv64-gnu': 4.18.0
+      '@rollup/rollup-linux-s390x-gnu': 4.18.0
+      '@rollup/rollup-linux-x64-gnu': 4.18.0
+      '@rollup/rollup-linux-x64-musl': 4.18.0
+      '@rollup/rollup-win32-arm64-msvc': 4.18.0
+      '@rollup/rollup-win32-ia32-msvc': 4.18.0
+      '@rollup/rollup-win32-x64-msvc': 4.18.0
+      fsevents: 2.3.3
+    dev: true
+
+  /rtl-css-js@1.16.1:
+    resolution: {integrity: sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==}
+    dependencies:
+      '@babel/runtime': 7.23.1
+    dev: false
+
   /run-applescript@5.0.0:
     resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       execa: 5.1.1
+    dev: false
 
   /run-async@2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
-    engines: {node: ">=0.12.0"}
+    engines: {node: '>=0.12.0'}
     requiresBuild: true
     dev: false
-    optional: true
 
   /run-async@3.0.0:
     resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==}
-    engines: {node: ">=0.12.0"}
+    engines: {node: '>=0.12.0'}
     dev: true
 
   /run-parallel@1.2.0:
@@ -21954,11 +21989,10 @@ packages:
     resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
     dependencies:
       tslib: 2.6.2
-    dev: false
 
   /safe-array-concat@1.0.1:
     resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==}
-    engines: {node: ">=0.4"}
+    engines: {node: '>=0.4'}
     dependencies:
       call-bind: 1.0.2
       get-intrinsic: 1.2.1
@@ -21973,9 +22007,9 @@ packages:
 
   /safe-execa@0.1.2:
     resolution: {integrity: sha512-vdTshSQ2JsRCgT8eKZWNJIL26C6bVqy1SOmuCMlKHegVeo8KYRobRrefOdUq9OozSPUUiSxrylteeRmLOMFfWg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
-      "@zkochan/which": 2.0.3
+      '@zkochan/which': 2.0.3
       execa: 5.1.1
       path-name: 1.0.0
     dev: false
@@ -21989,7 +22023,7 @@ packages:
   /safe-regex-test@1.0.0:
     resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       get-intrinsic: 1.2.1
       is-regex: 1.1.4
 
@@ -22001,7 +22035,7 @@ packages:
 
   /safe-stable-stringify@2.4.3:
     resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: false
 
   /safer-buffer@2.1.2:
@@ -22011,13 +22045,6 @@ packages:
   /sax@1.3.0:
     resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
 
-  /saxes@5.0.1:
-    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
-    engines: {node: ">=10"}
-    dependencies:
-      xmlchars: 2.2.0
-    dev: true
-
   /scheduler@0.20.2:
     resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
     dependencies:
@@ -22032,32 +22059,26 @@ packages:
 
   /schema-utils@3.3.0:
     resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==}
-    engines: {node: ">= 10.13.0"}
+    engines: {node: '>= 10.13.0'}
     dependencies:
-      "@types/json-schema": 7.0.13
+      '@types/json-schema': 7.0.13
       ajv: 6.12.6
       ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
 
+  /screenfull@5.2.0:
+    resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
   /scule@1.0.0:
     resolution: {integrity: sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==}
     dev: false
 
-  /semver-diff@4.0.0:
-    resolution: {integrity: sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==}
-    engines: {node: ">=12"}
-    dependencies:
-      semver: 7.5.4
-    dev: true
-
-  /semver-intersect@1.4.0:
-    resolution: {integrity: sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==}
+  /semver-intersect@1.5.0:
+    resolution: {integrity: sha512-BDjWX7yCC0haX4W/zrnV2JaMpVirwaEkGOBmgRQtH++F1N3xl9v7k9H44xfTqwl+yLNNSbMKosoVSTIiJVQ2Pw==}
     dependencies:
-      semver: 5.7.2
-    dev: true
-
-  /semver-utils@1.1.4:
-    resolution: {integrity: sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==}
+      semver: 6.3.1
     dev: true
 
   /semver@5.7.2:
@@ -22070,14 +22091,14 @@ packages:
 
   /semver@7.5.4:
     resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
 
   /send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
     dependencies:
       debug: 2.6.9
       depd: 2.0.0
@@ -22103,7 +22124,7 @@ packages:
 
   /serve-static@1.15.0:
     resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
     dependencies:
       encodeurl: 1.0.2
       escape-html: 1.0.3
@@ -22115,14 +22136,29 @@ packages:
   /set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
+  /set-function-length@1.2.0:
+    resolution: {integrity: sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+
   /set-function-name@2.0.1:
     resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       define-data-property: 1.1.0
       functions-have-names: 1.2.3
       has-property-descriptors: 1.0.0
 
+  /set-harmonic-interval@1.0.1:
+    resolution: {integrity: sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==}
+    engines: {node: '>=6.9'}
+    dev: false
+
   /setimmediate@1.0.5:
     resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
     dev: false
@@ -22132,40 +22168,36 @@ packages:
 
   /shallow-clone@3.0.1:
     resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       kind-of: 6.0.3
     dev: true
 
   /shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       shebang-regex: 3.0.0
 
   /shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /shell-quote@1.8.1:
     resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
 
   /shelljs@0.8.5:
     resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     hasBin: true
     dependencies:
       glob: 7.2.3
       interpret: 1.4.0
       rechoir: 0.6.2
 
-  /shlex@2.1.2:
-    resolution: {integrity: sha512-Nz6gtibMVgYeMEhUjp2KuwAgqaJA1K155dU/HuDaEJUGgnmYfVtVZah+uerVWdH8UGnyahhDCgABbYTbs254+w==}
-    dev: true
-
   /shx@0.3.4:
     resolution: {integrity: sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     hasBin: true
     dependencies:
       minimist: 1.2.8
@@ -22174,8 +22206,8 @@ packages:
   /side-channel@1.0.4:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
       object-inspect: 1.12.3
 
   /siginfo@2.0.0:
@@ -22187,30 +22219,16 @@ packages:
 
   /signal-exit@4.1.0:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
-    engines: {node: ">=14"}
-
-  /sigstore@1.9.0:
-    resolution: {integrity: sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    hasBin: true
-    dependencies:
-      "@sigstore/bundle": 1.1.0
-      "@sigstore/protobuf-specs": 0.2.1
-      "@sigstore/sign": 1.0.0
-      "@sigstore/tuf": 1.0.3
-      make-fetch-happen: 11.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    engines: {node: '>=14'}
 
   /sigstore@2.1.0:
     resolution: {integrity: sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@sigstore/bundle": 2.1.0
-      "@sigstore/protobuf-specs": 0.2.1
-      "@sigstore/sign": 2.1.0
-      "@sigstore/tuf": 2.2.0
+      '@sigstore/bundle': 2.1.0
+      '@sigstore/protobuf-specs': 0.2.1
+      '@sigstore/sign': 2.1.0
+      '@sigstore/tuf': 2.2.0
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -22222,6 +22240,7 @@ packages:
 
   /simple-get@4.0.1:
     resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+    requiresBuild: true
     dependencies:
       decompress-response: 6.0.0
       once: 1.4.0
@@ -22238,17 +22257,18 @@ packages:
 
   /simple-update-notifier@2.0.0:
     resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       semver: 7.5.4
     dev: true
 
   /sinon@14.0.2:
     resolution: {integrity: sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==}
+    deprecated: 16.1.1
     dependencies:
-      "@sinonjs/commons": 2.0.0
-      "@sinonjs/fake-timers": 9.1.2
-      "@sinonjs/samsam": 7.0.1
+      '@sinonjs/commons': 2.0.0
+      '@sinonjs/fake-timers': 9.1.2
+      '@sinonjs/samsam': 7.0.1
       diff: 5.1.0
       nise: 5.1.4
       supports-color: 7.2.0
@@ -22260,45 +22280,38 @@ packages:
 
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /slice-ansi@3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
-    engines: {node: ">=8"}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-
-  /slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=8'}
     dependencies:
       ansi-styles: 4.3.0
       astral-regex: 2.0.0
       is-fullwidth-code-point: 3.0.0
-    dev: false
 
   /smart-buffer@4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
-    engines: {node: ">= 6.0.0", npm: ">= 3.0.0"}
+    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
+    dev: false
 
   /socks-proxy-agent@7.0.0:
     resolution: {integrity: sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /socks-proxy-agent@8.0.2:
     resolution: {integrity: sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==}
-    engines: {node: ">= 14"}
+    engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -22306,10 +22319,11 @@ packages:
 
   /socks@2.7.1:
     resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
-    engines: {node: ">= 10.13.0", npm: ">= 3.0.0"}
+    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
     dependencies:
       ip: 2.0.0
       smart-buffer: 4.2.0
+    dev: false
 
   /sort-json@2.0.1:
     resolution: {integrity: sha512-s8cs2bcsQCzo/P2T/uoU6Js4dS/jnX8+4xunziNoq9qmSpZNCrRIAIvp4avsz0ST18HycV4z/7myJ7jsHWB2XQ==}
@@ -22322,40 +22336,39 @@ packages:
 
   /sort-keys@4.2.0:
     resolution: {integrity: sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       is-plain-obj: 2.1.0
     dev: false
 
   /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: ">=0.10.0"}
-
-  /source-map-support@0.5.13:
-    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
-    dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
+    engines: {node: '>=0.10.0'}
     dev: true
 
+  /source-map-js@1.2.0:
+    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+    engines: {node: '>=0.10.0'}
+
   /source-map-support@0.5.21:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
+    dev: true
+
+  /source-map@0.5.6:
+    resolution: {integrity: sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==}
+    engines: {node: '>=0.10.0'}
+    dev: false
 
   /source-map@0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: ">=0.10.0"}
-
-  /source-map@0.7.4:
-    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
-    engines: {node: ">= 8"}
-    dev: true
+    engines: {node: '>=0.10.0'}
 
   /source-map@0.8.0-beta.0:
     resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dependencies:
       whatwg-url: 7.1.0
     dev: true
@@ -22368,13 +22381,6 @@ packages:
     resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
     dev: false
 
-  /spawn-please@2.0.2:
-    resolution: {integrity: sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==}
-    engines: {node: ">=14"}
-    dependencies:
-      cross-spawn: 7.0.3
-    dev: true
-
   /spdx-correct@3.2.0:
     resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
     dependencies:
@@ -22393,16 +22399,17 @@ packages:
   /spdx-license-ids@3.0.16:
     resolution: {integrity: sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==}
 
-  /spdx-license-list@6.7.0:
-    resolution: {integrity: sha512-NFqavuJxNsHdwSy/0PjmUpcc76XwlmHQRPjVVtE62qmSLhKJUnzSvJCkU9nrY6TsChfGU1xqGePriBkNtNRMiA==}
-    engines: {node: ">=8"}
-    dev: true
-
   /spdx-license-list@6.8.0:
     resolution: {integrity: sha512-5UdM7r9yJ1EvsPQZWfa41AZjLQngl9iMMysm9XBW7Lqhq7aF8cllfqjS+rFCHB8FFMGSM0yFWue2LUV9mR0QzQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
+  /split-array-stream@2.0.0:
+    resolution: {integrity: sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==}
+    dependencies:
+      is-stream-ended: 0.1.4
+    dev: false
+
   /split2@3.2.2:
     resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==}
     dependencies:
@@ -22419,7 +22426,7 @@ packages:
 
   /sscaff@1.2.274:
     resolution: {integrity: sha512-sztRa50SL1LVxZnF1au6QT1SC2z0S1oEOyi2Kpnlg6urDns93aL32YxiJcNkLcY+VHFtVqm/SRv4cb+6LeoBQA==}
-    engines: {node: ">= 12.13.0"}
+    engines: {node: '>= 12.13.0'}
     dev: true
 
   /ssri@10.0.5:
@@ -22427,6 +22434,13 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       minipass: 7.0.4
+    dev: false
+
+  /stack-generator@2.0.10:
+    resolution: {integrity: sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==}
+    dependencies:
+      stackframe: 1.3.4
+    dev: false
 
   /stack-trace@0.0.10:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
@@ -22436,7 +22450,7 @@ packages:
 
   /stack-utils@2.0.6:
     resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       escape-string-regexp: 2.0.0
     dev: true
@@ -22445,6 +22459,25 @@ packages:
     resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
     dev: true
 
+  /stackframe@1.3.4:
+    resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==}
+    dev: false
+
+  /stacktrace-gps@3.1.2:
+    resolution: {integrity: sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==}
+    dependencies:
+      source-map: 0.5.6
+      stackframe: 1.3.4
+    dev: false
+
+  /stacktrace-js@2.0.2:
+    resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==}
+    dependencies:
+      error-stack-parser: 2.1.4
+      stack-generator: 2.0.10
+      stacktrace-gps: 3.1.2
+    dev: false
+
   /stacktracey@2.1.8:
     resolution: {integrity: sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==}
     dependencies:
@@ -22458,7 +22491,7 @@ packages:
 
   /standard-version@9.5.0:
     resolution: {integrity: sha512-3zWJ/mmZQsOaO+fOlsa0+QK90pwhNd042qEcw6hKFNoLFs7peGyvPffpEBbK/DSGPbyOvli0mUIFv5A4qTjh2Q==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       chalk: 2.4.2
@@ -22479,21 +22512,26 @@ packages:
 
   /statuses@2.0.1:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
 
   /std-env@3.4.3:
     resolution: {integrity: sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==}
+    dev: false
+
+  /std-env@3.7.0:
+    resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==}
+    dev: true
 
   /stop-iteration-iterator@1.0.0:
     resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       internal-slot: 1.0.5
     dev: true
 
   /stoppable@1.1.0:
     resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
-    engines: {node: ">=4", npm: ">=6"}
+    engines: {node: '>=4', npm: '>=6'}
     dev: false
 
   /store2@2.14.2:
@@ -22504,7 +22542,7 @@ packages:
     resolution: {integrity: sha512-YkFSpnR47j5zz7yElA+2axLjXN7K7TxDGJRHHlqXmG5iQ0PXzmjrj2RxMDKFz4Ybp/QjEUoJ4rx//ESEY0Nb5A==}
     hasBin: true
     dependencies:
-      "@storybook/cli": 7.4.6
+      '@storybook/cli': 7.4.6
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -22514,7 +22552,7 @@ packages:
 
   /stream-buffers@3.0.2:
     resolution: {integrity: sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==}
-    engines: {node: ">= 0.10.0"}
+    engines: {node: '>= 0.10.0'}
     dev: true
 
   /stream-chain@2.2.5:
@@ -22538,25 +22576,32 @@ packages:
 
   /streamroller@3.1.5:
     resolution: {integrity: sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==}
-    engines: {node: ">=8.0"}
+    engines: {node: '>=8.0'}
     dependencies:
       date-format: 4.0.14
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       fs-extra: 8.1.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /streamx@2.15.7:
+    resolution: {integrity: sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA==}
+    dependencies:
+      fast-fifo: 1.3.2
+      queue-tick: 1.0.1
+
   /string-length@4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       char-regex: 1.0.2
       strip-ansi: 6.0.1
+    dev: false
 
   /string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
@@ -22564,7 +22609,7 @@ packages:
 
   /string-width@5.1.2:
     resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       eastasianwidth: 0.2.0
       emoji-regex: 9.2.2
@@ -22590,23 +22635,23 @@ packages:
 
   /string.prototype.trim@1.2.8:
     resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.2
 
   /string.prototype.trimend@1.0.7:
     resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.2
 
   /string.prototype.trimstart@1.0.7:
     resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       define-properties: 1.2.1
       es-abstract: 1.22.2
 
@@ -22627,23 +22672,24 @@ packages:
 
   /strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       ansi-regex: 5.0.1
 
   /strip-ansi@7.1.0:
     resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       ansi-regex: 6.0.1
 
   /strip-bom@3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
 
   /strip-bom@4.0.0:
     resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
+    dev: false
 
   /strip-comments-strings@1.2.0:
     resolution: {integrity: sha512-zwF4bmnyEjZwRhaak9jUWNxc0DoeKBJ7lwSN/LEc8dQXZcUFG6auaaTQJokQWXopLdM3iTx01nQT8E4aL29DAQ==}
@@ -22651,47 +22697,38 @@ packages:
 
   /strip-final-newline@2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
 
   /strip-final-newline@3.0.0:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       min-indent: 1.0.1
 
   /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
-    engines: {node: ">=0.10.0"}
+    engines: {node: '>=0.10.0'}
     requiresBuild: true
     dev: true
 
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: ">=8"}
-
-  /strip-json-comments@5.0.1:
-    resolution: {integrity: sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==}
-    engines: {node: ">=14.16"}
-    dev: true
+    engines: {node: '>=8'}
 
-  /strip-literal@1.3.0:
-    resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==}
+  /strip-literal@2.0.0:
+    resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==}
     dependencies:
-      acorn: 8.10.0
+      js-tokens: 8.0.3
     dev: true
 
   /strnum@1.0.5:
     resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
     dev: false
 
-  /stubborn-fs@1.2.5:
-    resolution: {integrity: sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==}
-    dev: true
-
   /stubs@3.0.0:
     resolution: {integrity: sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==}
     dev: false
@@ -22702,101 +22739,107 @@ packages:
       inline-style-parser: 0.1.1
     dev: false
 
+  /stylis@4.3.0:
+    resolution: {integrity: sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==}
+    dev: false
+
   /sucrase@3.34.0:
     resolution: {integrity: sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     hasBin: true
     dependencies:
-      "@jridgewell/gen-mapping": 0.3.3
+      '@jridgewell/gen-mapping': 0.3.3
       commander: 4.1.1
       glob: 7.1.6
       lines-and-columns: 1.2.4
       mz: 2.7.0
       pirates: 4.0.6
       ts-interface-checker: 0.1.13
+    dev: true
+
+  /sucrase@3.35.0:
+    resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      commander: 4.1.1
+      glob: 10.3.12
+      lines-and-columns: 1.2.4
+      mz: 2.7.0
+      pirates: 4.0.6
+      ts-interface-checker: 0.1.13
 
   /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       has-flag: 4.0.0
 
   /supports-color@8.1.1:
     resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       has-flag: 4.0.0
     dev: true
 
   /supports-hyperlinks@2.3.0:
     resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
+    requiresBuild: true
     dependencies:
       has-flag: 4.0.0
       supports-color: 7.2.0
+    dev: false
+    optional: true
 
   /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: ">= 0.4"}
-
-  /symbol-tree@3.2.4:
-    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
-    dev: true
+    engines: {node: '>= 0.4'}
 
   /synchronous-promise@2.0.17:
     resolution: {integrity: sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==}
     dev: true
 
-  /table@6.8.1:
-    resolution: {integrity: sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==}
-    engines: {node: ">=10.0.0"}
-    dependencies:
-      ajv: 8.12.0
-      lodash.truncate: 4.4.2
-      slice-ansi: 4.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: false
-
-  /tailwindcss@3.3.3:
-    resolution: {integrity: sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==}
-    engines: {node: ">=14.0.0"}
+  /tailwindcss@3.4.3:
+    resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
-      "@alloc/quick-lru": 5.2.0
+      '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
-      chokidar: 3.5.3
+      chokidar: 3.6.0
       didyoumean: 1.2.2
       dlv: 1.1.3
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       glob-parent: 6.0.2
       is-glob: 4.0.3
-      jiti: 1.20.0
+      jiti: 1.21.0
       lilconfig: 2.1.0
       micromatch: 4.0.5
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.0.0
-      postcss: 8.4.31
-      postcss-import: 15.1.0(postcss@8.4.31)
-      postcss-js: 4.0.1(postcss@8.4.31)
-      postcss-load-config: 4.0.1(postcss@8.4.31)
-      postcss-nested: 6.0.1(postcss@8.4.31)
-      postcss-selector-parser: 6.0.13
-      resolve: 1.22.6
-      sucrase: 3.34.0
+      postcss: 8.4.38
+      postcss-import: 15.1.0(postcss@8.4.38)
+      postcss-js: 4.0.1(postcss@8.4.38)
+      postcss-load-config: 4.0.2(postcss@8.4.38)
+      postcss-nested: 6.0.1(postcss@8.4.38)
+      postcss-selector-parser: 6.0.16
+      resolve: 1.22.8
+      sucrase: 3.35.0
     transitivePeerDependencies:
       - ts-node
 
   /tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
 
   /tar-fs@2.1.1:
     resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
@@ -22809,17 +22852,25 @@ packages:
 
   /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       bl: 4.1.0
       end-of-stream: 1.4.4
       fs-constants: 1.0.0
       inherits: 2.0.4
       readable-stream: 3.6.2
+    dev: true
+
+  /tar-stream@3.1.7:
+    resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
+    dependencies:
+      b4a: 1.6.6
+      fast-fifo: 1.3.2
+      streamx: 2.15.7
 
   /tar@6.2.0:
     resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       chownr: 2.0.0
       fs-minipass: 2.1.0
@@ -22830,7 +22881,21 @@ packages:
 
   /teeny-request@8.0.3:
     resolution: {integrity: sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    dependencies:
+      http-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
+      node-fetch: 2.7.0
+      stream-events: 1.0.5
+      uuid: 9.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
+  /teeny-request@9.0.0:
+    resolution: {integrity: sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==}
+    engines: {node: '>=14'}
     dependencies:
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
@@ -22850,19 +22915,19 @@ packages:
 
   /temp-dir@2.0.0:
     resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /temp@0.8.4:
     resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}
-    engines: {node: ">=6.0.0"}
+    engines: {node: '>=6.0.0'}
     dependencies:
       rimraf: 2.6.3
     dev: true
 
   /tempy@1.0.1:
     resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       del: 6.1.1
       is-stream: 2.0.1
@@ -22873,42 +22938,45 @@ packages:
 
   /terminal-link@2.1.1:
     resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
+    requiresBuild: true
     dependencies:
       ansi-escapes: 4.3.2
       supports-hyperlinks: 2.3.0
+    dev: false
+    optional: true
 
-  /terser-webpack-plugin@5.3.9(esbuild@0.18.20)(webpack@5.88.2):
+  /terser-webpack-plugin@5.3.9(esbuild@0.19.12)(webpack@5.88.2):
     resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==}
-    engines: {node: ">= 10.13.0"}
+    engines: {node: '>= 10.13.0'}
     peerDependencies:
-      "@swc/core": "*"
-      esbuild: "*"
-      uglify-js: "*"
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
       webpack: ^5.1.0
     peerDependenciesMeta:
-      "@swc/core":
+      '@swc/core':
         optional: true
       esbuild:
         optional: true
       uglify-js:
         optional: true
     dependencies:
-      "@jridgewell/trace-mapping": 0.3.19
-      esbuild: 0.18.20
+      '@jridgewell/trace-mapping': 0.3.20
+      esbuild: 0.19.12
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.1
       terser: 5.21.0
-      webpack: 5.88.2(esbuild@0.18.20)
+      webpack: 5.88.2(esbuild@0.19.12)
     dev: true
 
   /terser@5.21.0:
     resolution: {integrity: sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
-      "@jridgewell/source-map": 0.3.5
+      '@jridgewell/source-map': 0.3.5
       acorn: 8.10.0
       commander: 2.20.3
       source-map-support: 0.5.21
@@ -22916,16 +22984,16 @@ packages:
 
   /test-exclude@6.0.0:
     resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
-      "@istanbuljs/schema": 0.1.3
+      '@istanbuljs/schema': 0.1.3
       glob: 7.2.3
       minimatch: 3.1.2
     dev: true
 
   /text-extensions@1.9.0:
     resolution: {integrity: sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==}
-    engines: {node: ">=0.10"}
+    engines: {node: '>=0.10'}
     dev: true
 
   /text-hex@1.0.0:
@@ -22939,7 +23007,7 @@ packages:
 
   /thenify-all@1.6.0:
     resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
-    engines: {node: ">=0.8"}
+    engines: {node: '>=0.8'}
     dependencies:
       thenify: 3.3.1
 
@@ -22948,9 +23016,10 @@ packages:
     dependencies:
       any-promise: 1.3.0
 
-  /throat@6.0.2:
-    resolution: {integrity: sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==}
-    dev: true
+  /throttle-debounce@3.0.1:
+    resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==}
+    engines: {node: '>=10'}
+    dev: false
 
   /through2@2.0.5:
     resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
@@ -22967,11 +23036,6 @@ packages:
   /through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
 
-  /time-zone@1.0.0:
-    resolution: {integrity: sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==}
-    engines: {node: ">=4"}
-    dev: true
-
   /tiny-colors@2.1.2:
     resolution: {integrity: sha512-6peGRBtkYBJpVrQUWOPKrC0ECo6WotUlXxirVTKvihjdgxQETpKtLdCKIb68IHjJYH1AOE7GM7RnxFvkGHsqOg==}
     dev: false
@@ -22992,40 +23056,31 @@ packages:
     resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
     dev: true
 
-  /tinypool@0.4.0:
-    resolution: {integrity: sha512-2ksntHOKf893wSAH4z/+JbPpi92esw8Gn9N2deXX+B0EO92hexAVI9GIZZPx7P5aYo5KULfeOSt3kMOmSOy6uA==}
-    engines: {node: ">=14.0.0"}
-    dev: true
-
-  /tinypool@0.5.0:
-    resolution: {integrity: sha512-paHQtnrlS1QZYKF/GnLoOM/DN9fqaGOFbCbxzAhwniySnzl9Ebk8w73/dd34DAhe/obUbPAOldTyYXQZxnPBPQ==}
-    engines: {node: ">=14.0.0"}
-    dev: true
-
-  /tinypool@0.7.0:
-    resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
-    engines: {node: ">=14.0.0"}
+  /tinypool@0.8.4:
+    resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==}
+    engines: {node: '>=14.0.0'}
     dev: true
 
   /tinyspy@2.2.0:
     resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
     dev: true
 
   /titleize@3.0.0:
     resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
+    dev: false
 
   /tmp@0.0.33:
     resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
-    engines: {node: ">=0.6.0"}
+    engines: {node: '>=0.6.0'}
     requiresBuild: true
     dependencies:
       os-tmpdir: 1.0.2
 
   /tmp@0.2.1:
     resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
-    engines: {node: ">=8.17.0"}
+    engines: {node: '>=8.17.0'}
     dependencies:
       rimraf: 3.0.2
     dev: true
@@ -23036,12 +23091,12 @@ packages:
 
   /to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: ">=8.0"}
+    engines: {node: '>=8.0'}
     dependencies:
       is-number: 7.0.0
 
@@ -23049,9 +23104,17 @@ packages:
     resolution: {integrity: sha512-R5Muhi/TUu4i4snWVrMgNoXyJm2f8sJfdgIkQvqb+cuIXQEIMAiWGWgCgYXHqX4+XiS/Bnm7IYZ9Zy6NVe6lhw==}
     dev: true
 
+  /toggle-selection@1.0.6:
+    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
+    dev: false
+
   /toidentifier@1.0.1:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
-    engines: {node: ">=0.6"}
+    engines: {node: '>=0.6'}
+
+  /toml@3.0.0:
+    resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==}
+    dev: false
 
   /touch@3.1.0:
     resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==}
@@ -23060,16 +23123,6 @@ packages:
       nopt: 1.0.10
     dev: true
 
-  /tough-cookie@4.1.3:
-    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
-    engines: {node: ">=6"}
-    dependencies:
-      psl: 1.9.0
-      punycode: 2.3.0
-      universalify: 0.2.0
-      url-parse: 1.5.10
-    dev: true
-
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
@@ -23079,24 +23132,25 @@ packages:
       punycode: 2.3.0
     dev: true
 
-  /tr46@2.1.0:
-    resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
-    engines: {node: ">=8"}
-    dependencies:
-      punycode: 2.3.0
-    dev: true
-
   /tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
     dev: true
 
-  /tree-sitter-cli@0.20.6:
-    resolution: {integrity: sha512-tjbAeuGSMhco/EnsThjWkQbDIYMDmdkWsTPsa/NJAW7bjaki9P7oM9TkLxfdlnm4LXd1wR5wVSM2/RTLtZbm6A==}
+  /tree-sitter-cli@0.22.5:
+    resolution: {integrity: sha512-c3VT46Bc3a6pEd0JAwufbqEw9Q2FRLDp5E230hGvnr+Hivw+Y6jyeP+3T89KDptvn48MOPVmbgaLm69xYgLVTw==}
     hasBin: true
     requiresBuild: true
     dev: true
 
+  /tree-sitter@0.21.1:
+    resolution: {integrity: sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==}
+    requiresBuild: true
+    dependencies:
+      node-addon-api: 8.0.0
+      node-gyp-build: 4.8.0
+    dev: false
+
   /treeverse@3.0.0:
     resolution: {integrity: sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -23108,12 +23162,12 @@ packages:
 
   /trim-newlines@3.0.1:
     resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dev: true
 
   /triple-beam@1.4.1:
     resolution: {integrity: sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==}
-    engines: {node: ">= 14.0.0"}
+    engines: {node: '>= 14.0.0'}
     requiresBuild: true
     dev: false
     optional: true
@@ -23122,215 +23176,51 @@ packages:
     resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==}
     dev: false
 
-  /ts-api-utils@1.0.3(typescript@4.9.5):
+  /ts-api-utils@1.0.3(typescript@5.3.3):
     resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==}
-    engines: {node: ">=16.13.0"}
+    engines: {node: '>=16.13.0'}
     peerDependencies:
-      typescript: ">=4.2.0"
+      typescript: '>=4.2.0'
     dependencies:
-      typescript: 4.9.5
+      typescript: 5.3.3
     dev: true
 
   /ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
-    engines: {node: ">=6.10"}
+    engines: {node: '>=6.10'}
     dev: true
 
+  /ts-easing@0.2.0:
+    resolution: {integrity: sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==}
+    dev: false
+
   /ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
-  /ts-jest@27.1.5(@babel/core@7.23.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5):
-    resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    hasBin: true
-    peerDependencies:
-      "@babel/core": ">=7.0.0-beta.0 <8"
-      "@types/jest": ^27.0.0
-      babel-jest: ">=27.0.0 <28"
-      esbuild: "*"
-      jest: ^27.0.0
-      typescript: ">=3.8 <5.0"
-    peerDependenciesMeta:
-      "@babel/core":
-        optional: true
-      "@types/jest":
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      "@babel/core": 7.23.3
-      "@types/jest": 27.5.2
-      bs-logger: 0.2.6
-      fast-json-stable-stringify: 2.1.0
-      jest: 27.5.1(ts-node@10.9.1)
-      jest-util: 27.5.1
-      json5: 2.2.3
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.5.4
-      typescript: 4.9.5
-      yargs-parser: 20.2.9
-    dev: true
-
-  /ts-jest@29.1.1(@babel/core@7.23.3)(jest@29.7.0)(typescript@4.9.5):
-    resolution: {integrity: sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      "@babel/core": ">=7.0.0-beta.0 <8"
-      "@jest/types": ^29.0.0
-      babel-jest: ^29.0.0
-      esbuild: "*"
-      jest: ^29.0.0
-      typescript: ">=4.3 <6"
-    peerDependenciesMeta:
-      "@babel/core":
-        optional: true
-      "@jest/types":
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      "@babel/core": 7.23.3
-      bs-logger: 0.2.6
-      fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0(@types/node@16.18.58)(ts-node@10.9.1)
-      jest-util: 29.7.0
-      json5: 2.2.3
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.5.4
-      typescript: 4.9.5
-      yargs-parser: 21.1.1
-    dev: true
-
-  /ts-node@10.9.1(@types/node@16.18.58)(typescript@4.9.5):
-    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
-    hasBin: true
-    peerDependencies:
-      "@swc/core": ">=1.2.50"
-      "@swc/wasm": ">=1.2.50"
-      "@types/node": "*"
-      typescript: ">=2.7"
-    peerDependenciesMeta:
-      "@swc/core":
-        optional: true
-      "@swc/wasm":
-        optional: true
-    dependencies:
-      "@cspotcode/source-map-support": 0.8.1
-      "@tsconfig/node10": 1.0.9
-      "@tsconfig/node12": 1.0.11
-      "@tsconfig/node14": 1.0.3
-      "@tsconfig/node16": 1.0.4
-      "@types/node": 16.18.58
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 4.9.5
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
-    dev: true
-
-  /ts-node@10.9.1(@types/node@18.18.4)(typescript@4.9.5):
-    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
-    hasBin: true
-    peerDependencies:
-      "@swc/core": ">=1.2.50"
-      "@swc/wasm": ">=1.2.50"
-      "@types/node": "*"
-      typescript: ">=2.7"
-    peerDependenciesMeta:
-      "@swc/core":
-        optional: true
-      "@swc/wasm":
-        optional: true
-    dependencies:
-      "@cspotcode/source-map-support": 0.8.1
-      "@tsconfig/node10": 1.0.9
-      "@tsconfig/node12": 1.0.11
-      "@tsconfig/node14": 1.0.3
-      "@tsconfig/node16": 1.0.4
-      "@types/node": 18.18.4
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 4.9.5
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
-    dev: true
-
   /tsconfig-paths@3.14.2:
     resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==}
     dependencies:
-      "@types/json5": 0.0.29
+      '@types/json5': 0.0.29
       json5: 1.0.2
       minimist: 1.2.8
-      strip-bom: 3.0.0
-
-  /tslib@1.14.1:
-    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
-
-  /tslib@2.6.2:
-    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
-
-  /tsup@6.7.0(postcss@8.4.31)(typescript@5.2.2):
-    resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==}
-    engines: {node: ">=14.18"}
-    hasBin: true
-    peerDependencies:
-      "@swc/core": ^1
-      postcss: ^8.4.12
-      typescript: ">=4.1.0"
-    peerDependenciesMeta:
-      "@swc/core":
-        optional: true
-      postcss:
-        optional: true
-      typescript:
-        optional: true
-    dependencies:
-      bundle-require: 4.0.2(esbuild@0.17.19)
-      cac: 6.7.14
-      chokidar: 3.5.3
-      debug: 4.3.4
-      esbuild: 0.17.19
-      execa: 5.1.1
-      globby: 11.1.0
-      joycon: 3.1.1
-      postcss: 8.4.31
-      postcss-load-config: 3.1.4(postcss@8.4.31)
-      resolve-from: 5.0.0
-      rollup: 3.29.4
-      source-map: 0.8.0-beta.0
-      sucrase: 3.34.0
-      tree-kill: 1.2.2
-      typescript: 5.2.2
-    transitivePeerDependencies:
-      - supports-color
-      - ts-node
-    dev: true
+      strip-bom: 3.0.0
+
+  /tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
 
-  /tsup@6.7.0(ts-node@10.9.1)(typescript@4.9.5):
+  /tslib@2.6.2:
+    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
+
+  /tsup@6.7.0(typescript@5.3.3):
     resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==}
-    engines: {node: ">=14.18"}
+    engines: {node: '>=14.18'}
     hasBin: true
     peerDependencies:
-      "@swc/core": ^1
+      '@swc/core': ^1
       postcss: ^8.4.12
-      typescript: ">=4.1.0"
+      typescript: '>=4.1.0'
     peerDependenciesMeta:
-      "@swc/core":
+      '@swc/core':
         optional: true
       postcss:
         optional: true
@@ -23340,142 +23230,148 @@ packages:
       bundle-require: 4.0.2(esbuild@0.17.19)
       cac: 6.7.14
       chokidar: 3.5.3
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       esbuild: 0.17.19
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
-      postcss-load-config: 3.1.4(ts-node@10.9.1)
+      postcss-load-config: 3.1.4
       resolve-from: 5.0.0
       rollup: 3.29.4
       source-map: 0.8.0-beta.0
       sucrase: 3.34.0
       tree-kill: 1.2.2
-      typescript: 4.9.5
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
       - ts-node
     dev: true
 
-  /tsup@6.7.0(typescript@4.9.5):
-    resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==}
-    engines: {node: ">=14.18"}
+  /tsup@8.0.2(postcss@8.4.38)(typescript@5.2.2):
+    resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==}
+    engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
-      "@swc/core": ^1
+      '@microsoft/api-extractor': ^7.36.0
+      '@swc/core': ^1
       postcss: ^8.4.12
-      typescript: ">=4.1.0"
+      typescript: '>=4.5.0'
     peerDependenciesMeta:
-      "@swc/core":
+      '@microsoft/api-extractor':
+        optional: true
+      '@swc/core':
         optional: true
       postcss:
         optional: true
       typescript:
         optional: true
     dependencies:
-      bundle-require: 4.0.2(esbuild@0.17.19)
+      bundle-require: 4.0.2(esbuild@0.19.12)
       cac: 6.7.14
       chokidar: 3.5.3
-      debug: 4.3.4
-      esbuild: 0.17.19
+      debug: 4.3.4(supports-color@5.5.0)
+      esbuild: 0.19.12
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
-      postcss-load-config: 3.1.4(postcss@8.4.31)
+      postcss: 8.4.38
+      postcss-load-config: 4.0.1(postcss@8.4.38)
       resolve-from: 5.0.0
-      rollup: 3.29.4
+      rollup: 4.18.0
       source-map: 0.8.0-beta.0
       sucrase: 3.34.0
       tree-kill: 1.2.2
-      typescript: 4.9.5
+      typescript: 5.2.2
     transitivePeerDependencies:
       - supports-color
       - ts-node
     dev: true
 
-  /tsup@7.2.0(postcss@8.4.31)(typescript@5.2.2):
-    resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==}
-    engines: {node: ">=16.14"}
+  /tsup@8.0.2(typescript@5.3.3):
+    resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==}
+    engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
-      "@swc/core": ^1
+      '@microsoft/api-extractor': ^7.36.0
+      '@swc/core': ^1
       postcss: ^8.4.12
-      typescript: ">=4.1.0"
+      typescript: '>=4.5.0'
     peerDependenciesMeta:
-      "@swc/core":
+      '@microsoft/api-extractor':
+        optional: true
+      '@swc/core':
         optional: true
       postcss:
         optional: true
       typescript:
         optional: true
     dependencies:
-      bundle-require: 4.0.2(esbuild@0.18.20)
+      bundle-require: 4.0.2(esbuild@0.19.12)
       cac: 6.7.14
       chokidar: 3.5.3
-      debug: 4.3.4
-      esbuild: 0.18.20
+      debug: 4.3.4(supports-color@5.5.0)
+      esbuild: 0.19.12
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
-      postcss: 8.4.31
-      postcss-load-config: 4.0.1(postcss@8.4.31)
+      postcss-load-config: 4.0.1(postcss@8.4.38)
       resolve-from: 5.0.0
-      rollup: 3.29.4
+      rollup: 4.18.0
       source-map: 0.8.0-beta.0
       sucrase: 3.34.0
       tree-kill: 1.2.2
-      typescript: 5.2.2
+      typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
       - ts-node
     dev: true
 
-  /tsutils@3.21.0(typescript@4.9.5):
+  /tsutils@3.21.0(typescript@5.2.2):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     peerDependencies:
-      typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
       tslib: 1.14.1
-      typescript: 4.9.5
+      typescript: 5.2.2
+    dev: false
 
-  /tsutils@3.21.0(typescript@5.2.2):
+  /tsutils@3.21.0(typescript@5.3.3):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
     peerDependencies:
-      typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
       tslib: 1.14.1
-      typescript: 5.2.2
-    dev: false
+      typescript: 5.3.3
 
-  /tsx@3.13.0:
-    resolution: {integrity: sha512-rjmRpTu3as/5fjNq/kOkOtihgLxuIz6pbKdj9xwP4J5jOLkBxw/rjN5ANw+KyrrOXV5uB7HC8+SrrSJxT65y+A==}
+  /tsx@4.15.2:
+    resolution: {integrity: sha512-kIZTOCmR37nEw0qxQks2dR+eZWSXydhTGmz7yx94vEiJtJGBTkUl0D/jt/5fey+CNdm6i3Cp+29WKRay9ScQUw==}
+    engines: {node: '>=18.0.0'}
     hasBin: true
     dependencies:
-      esbuild: 0.18.20
-      get-tsconfig: 4.7.2
-      source-map-support: 0.5.21
+      esbuild: 0.21.5
+      get-tsconfig: 4.7.5
     optionalDependencies:
       fsevents: 2.3.3
+    dev: true
 
-  /tuf-js@1.1.7:
-    resolution: {integrity: sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  /tsx@4.7.0:
+    resolution: {integrity: sha512-I+t79RYPlEYlHn9a+KzwrvEwhJg35h/1zHsLC2JXvhC2mdynMv6Zxzvhv5EMV6VF5qJlLlkSnMVvdZV3PSIGcg==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
     dependencies:
-      "@tufjs/models": 1.0.4
-      debug: 4.3.4
-      make-fetch-happen: 11.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      esbuild: 0.19.12
+      get-tsconfig: 4.7.2
+    optionalDependencies:
+      fsevents: 2.3.3
 
   /tuf-js@2.1.0:
     resolution: {integrity: sha512-eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA==}
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
-      "@tufjs/models": 2.0.0
-      debug: 4.3.4
+      '@tufjs/models': 2.0.0
+      debug: 4.3.4(supports-color@5.5.0)
       make-fetch-happen: 13.0.0
     transitivePeerDependencies:
       - supports-color
@@ -23489,150 +23385,145 @@ packages:
 
   /tunnel@0.0.6:
     resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
-    engines: {node: ">=0.6.11 <=0.7.0 || >=0.7.3"}
+    engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
 
-  /turbo-darwin-64@1.10.15:
-    resolution: {integrity: sha512-Sik5uogjkRTe1XVP9TC2GryEMOJCaKE2pM/O9uLn4koQDnWKGcLQv+mDU+H+9DXvKLnJnKCD18OVRkwK5tdpoA==}
+  /turbo-darwin-64@1.13.3:
+    resolution: {integrity: sha512-glup8Qx1qEFB5jerAnXbS8WrL92OKyMmg5Hnd4PleLljAeYmx+cmmnsmLT7tpaVZIN58EAAwu8wHC6kIIqhbWA==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-darwin-arm64@1.10.15:
-    resolution: {integrity: sha512-xwqyFDYUcl2xwXyGPmHkmgnNm4Cy0oNzMpMOBGRr5x64SErS7QQLR4VHb0ubiR+VAb8M+ECPklU6vD1Gm+wekg==}
+  /turbo-darwin-arm64@1.13.3:
+    resolution: {integrity: sha512-/np2xD+f/+9qY8BVtuOQXRq5f9LehCFxamiQnwdqWm5iZmdjygC5T3uVSYuagVFsZKMvX3ycySwh8dylGTl6lg==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-64@1.10.15:
-    resolution: {integrity: sha512-dM07SiO3RMAJ09Z+uB2LNUSkPp3I1IMF8goH5eLj+d8Kkwoxd/+qbUZOj9RvInyxU/IhlnO9w3PGd3Hp14m/nA==}
+  /turbo-linux-64@1.13.3:
+    resolution: {integrity: sha512-G+HGrau54iAnbXLfl+N/PynqpDwi/uDzb6iM9hXEDG+yJnSJxaHMShhOkXYJPk9offm9prH33Khx2scXrYVW1g==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-arm64@1.10.15:
-    resolution: {integrity: sha512-MkzKLkKYKyrz4lwfjNXH8aTny5+Hmiu4SFBZbx+5C0vOlyp6fV5jZANDBvLXWiDDL4DSEAuCEK/2cmN6FVH1ow==}
+  /turbo-linux-arm64@1.13.3:
+    resolution: {integrity: sha512-qWwEl5VR02NqRyl68/3pwp3c/olZuSp+vwlwrunuoNTm6JXGLG5pTeme4zoHNnk0qn4cCX7DFrOboArlYxv0wQ==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-64@1.10.15:
-    resolution: {integrity: sha512-3TdVU+WEH9ThvQGwV3ieX/XHebtYNHv9HARHauPwmVj3kakoALkpGxLclkHFBLdLKkqDvmHmXtcsfs6cXXRHJg==}
+  /turbo-windows-64@1.13.3:
+    resolution: {integrity: sha512-Nudr4bRChfJzBPzEmpVV85VwUYRCGKecwkBFpbp2a4NtrJ3+UP1VZES653ckqCu2FRyRuS0n03v9euMbAvzH+Q==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-arm64@1.10.15:
-    resolution: {integrity: sha512-l+7UOBCbfadvPMYsX08hyLD+UIoAkg6ojfH+E8aud3gcA1padpjCJTh9gMpm3QdMbKwZteT5uUM+wyi6Rbbyww==}
+  /turbo-windows-arm64@1.13.3:
+    resolution: {integrity: sha512-ouJCgsVLd3icjRLmRvHQDDZnmGzT64GBupM1Y+TjtYn2LVaEBoV6hicFy8x5DUpnqdLy+YpCzRMkWlwhmkX7sQ==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo@1.10.15:
-    resolution: {integrity: sha512-mKKkqsuDAQy1wCCIjCdG+jOCwUflhckDMSRoeBPcIL/CnCl7c5yRDFe7SyaXloUUkt4tUR0rvNIhVCcT7YeQpg==}
+  /turbo@1.13.3:
+    resolution: {integrity: sha512-n17HJv4F4CpsYTvKzUJhLbyewbXjq1oLCi90i5tW1TiWDz16ML1eDG7wi5dHaKxzh5efIM56SITnuVbMq5dk4g==}
     hasBin: true
     optionalDependencies:
-      turbo-darwin-64: 1.10.15
-      turbo-darwin-arm64: 1.10.15
-      turbo-linux-64: 1.10.15
-      turbo-linux-arm64: 1.10.15
-      turbo-windows-64: 1.10.15
-      turbo-windows-arm64: 1.10.15
+      turbo-darwin-64: 1.13.3
+      turbo-darwin-arm64: 1.13.3
+      turbo-linux-64: 1.13.3
+      turbo-linux-arm64: 1.13.3
+      turbo-windows-64: 1.13.3
+      turbo-windows-arm64: 1.13.3
     dev: true
 
   /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: ">= 0.8.0"}
+    engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
 
   /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /type-fest@0.12.0:
     resolution: {integrity: sha512-53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: true
 
   /type-fest@0.16.0:
     resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: true
 
   /type-fest@0.18.1:
     resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dev: true
 
   /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /type-fest@0.6.0:
     resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /type-fest@0.8.1:
     resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: ">=8"}
-
-  /type-fest@1.4.0:
-    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
-    engines: {node: ">=10"}
-    dev: true
+    engines: {node: '>=8'}
 
   /type-fest@2.19.0:
     resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
-    engines: {node: ">=12.20"}
+    engines: {node: '>=12.20'}
     dev: true
 
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
-    engines: {node: ">= 0.6"}
+    engines: {node: '>= 0.6'}
     dependencies:
       media-typer: 0.3.0
       mime-types: 2.1.35
 
   /typed-array-buffer@1.0.0:
     resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       get-intrinsic: 1.2.1
       is-typed-array: 1.1.12
 
   /typed-array-byte-length@1.0.0:
     resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       for-each: 0.3.3
       has-proto: 1.0.1
       is-typed-array: 1.1.12
 
   /typed-array-byte-offset@1.0.0:
     resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       for-each: 0.3.3
       has-proto: 1.0.1
       is-typed-array: 1.1.12
@@ -23640,7 +23531,7 @@ packages:
   /typed-array-length@1.0.4:
     resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       for-each: 0.3.3
       is-typed-array: 1.1.12
 
@@ -23652,51 +23543,38 @@ packages:
       underscore: 1.13.6
     dev: true
 
-  /typedarray-to-buffer@3.1.5:
-    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
-    dependencies:
-      is-typedarray: 1.0.0
-    dev: true
-
   /typedarray-to-buffer@4.0.0:
     resolution: {integrity: sha512-6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ==}
     dev: false
 
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
-    dev: true
 
   /typescript@3.9.10:
     resolution: {integrity: sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==}
-    engines: {node: ">=4.2.0"}
+    engines: {node: '>=4.2.0'}
     hasBin: true
     dev: true
 
-  /typescript@4.9.5:
-    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
-    engines: {node: ">=4.2.0"}
+  /typescript@5.2.2:
+    resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
-  /typescript@5.0.4:
-    resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
-    engines: {node: ">=12.20"}
+  /typescript@5.3.3:
+    resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==}
+    engines: {node: '>=14.17'}
     hasBin: true
-    dev: true
 
-  /typescript@5.1.6:
-    resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==}
-    engines: {node: ">=14.17"}
+  /typescript@5.4.5:
+    resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==}
+    engines: {node: '>=14.17'}
     hasBin: true
     dev: true
 
-  /typescript@5.2.2:
-    resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==}
-    engines: {node: ">=14.17"}
-    hasBin: true
-
-  /typescript@5.4.0-dev.20231124:
-    resolution: {integrity: sha512-XGgnXNUfccFaEWyWZ0i/JuPNbHzutjS/vKgpz5TpEjmwFYwyQMSr06Nicv0HJBw/8WQ7m8EoKbyyXN8wdWmoVg==}
-    engines: {node: ">=14.17"}
+  /typescript@5.6.0-dev.20240612:
+    resolution: {integrity: sha512-C5WDxLlEMZhdyZBkhZkysctw9uOpGnua48Zrq0FxJLx6+tFrNkanXn4Zhatjg1vbKjzk19FYggX4Gc6Wgz5flg==}
+    engines: {node: '>=14.17'}
     hasBin: true
     dev: true
 
@@ -23709,16 +23587,21 @@ packages:
 
   /uglify-js@3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
-    engines: {node: ">=0.8.0"}
+    engines: {node: '>=0.8.0'}
     hasBin: true
     requiresBuild: true
     dev: true
     optional: true
 
+  /ulid@2.3.0:
+    resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
+    hasBin: true
+    dev: false
+
   /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.5
       has-bigints: 1.0.2
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
@@ -23731,21 +23614,24 @@ packages:
     resolution: {integrity: sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==}
     dev: true
 
+  /undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+
   /undici@5.25.4:
     resolution: {integrity: sha512-450yJxT29qKMf3aoudzFpIciqpx6Pji3hEWaXqXmanbXF58LTAGCKxcJjxMXWu3iG+Mudgo3ZUfDB6YDFd/dAw==}
-    engines: {node: ">=14.0"}
+    engines: {node: '>=14.0'}
     dependencies:
-      "@fastify/busboy": 2.0.0
+      '@fastify/busboy': 2.0.0
     dev: false
 
   /unicode-canonical-property-names-ecmascript@2.0.0:
     resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /unicode-match-property-ecmascript@2.0.0:
     resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dependencies:
       unicode-canonical-property-names-ecmascript: 2.0.0
       unicode-property-aliases-ecmascript: 2.1.0
@@ -23753,18 +23639,18 @@ packages:
 
   /unicode-match-property-value-ecmascript@2.1.0:
     resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /unicode-property-aliases-ecmascript@2.1.0:
     resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
-    engines: {node: ">=4"}
+    engines: {node: '>=4'}
     dev: true
 
   /unified@11.0.4:
     resolution: {integrity: sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
       bail: 2.0.2
       devlop: 1.1.0
       extend: 3.0.2
@@ -23778,26 +23664,21 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       unique-slug: 4.0.0
+    dev: false
 
   /unique-slug@4.0.0:
     resolution: {integrity: sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       imurmurhash: 0.1.4
+    dev: false
 
   /unique-string@2.0.0:
     resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       crypto-random-string: 2.0.0
 
-  /unique-string@3.0.0:
-    resolution: {integrity: sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==}
-    engines: {node: ">=12"}
-    dependencies:
-      crypto-random-string: 4.0.0
-    dev: true
-
   /unist-util-is@4.1.0:
     resolution: {integrity: sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==}
     dev: true
@@ -23805,39 +23686,39 @@ packages:
   /unist-util-is@6.0.0:
     resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
     dev: false
 
   /unist-util-position@5.0.0:
     resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
     dev: false
 
   /unist-util-stringify-position@4.0.0:
     resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
     dev: false
 
   /unist-util-visit-parents@3.1.1:
     resolution: {integrity: sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==}
     dependencies:
-      "@types/unist": 2.0.10
+      '@types/unist': 2.0.10
       unist-util-is: 4.1.0
     dev: true
 
   /unist-util-visit-parents@6.0.1:
     resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
       unist-util-is: 6.0.0
     dev: false
 
   /unist-util-visit@2.0.3:
     resolution: {integrity: sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==}
     dependencies:
-      "@types/unist": 2.0.10
+      '@types/unist': 2.0.10
       unist-util-is: 4.1.0
       unist-util-visit-parents: 3.1.1
     dev: true
@@ -23845,7 +23726,7 @@ packages:
   /unist-util-visit@5.0.0:
     resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
       unist-util-is: 6.0.0
       unist-util-visit-parents: 6.0.1
     dev: false
@@ -23853,7 +23734,7 @@ packages:
   /universal-github-app-jwt@1.1.1:
     resolution: {integrity: sha512-G33RTLrIBMFmlDV4u4CBF7dh71eWwykck4XgaxaIVeZKOYZRAAxvcGMRFTUclVY6xoUPQvO4Ne5wKGxYm/Yy9w==}
     dependencies:
-      "@types/jsonwebtoken": 9.0.3
+      '@types/jsonwebtoken': 9.0.3
       jsonwebtoken: 9.0.2
     dev: true
 
@@ -23862,64 +23743,50 @@ packages:
 
   /universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
-    engines: {node: ">= 4.0.0"}
-    dev: true
-
-  /universalify@0.2.0:
-    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
-    engines: {node: ">= 4.0.0"}
+    engines: {node: '>= 4.0.0'}
     dev: true
 
   /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
-    engines: {node: ">= 10.0.0"}
+    engines: {node: '>= 10.0.0'}
 
   /unpipe@1.0.0:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
 
   /unplugin@1.5.0:
     resolution: {integrity: sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==}
     dependencies:
       acorn: 8.10.0
-      chokidar: 3.5.3
+      chokidar: 3.6.0
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
     dev: true
 
   /untildify@4.0.0:
     resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
 
   /update-browserslist-db@1.0.13(browserslist@4.22.1):
     resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
     hasBin: true
     peerDependencies:
-      browserslist: ">= 4.21.0"
+      browserslist: '>= 4.21.0'
     dependencies:
       browserslist: 4.22.1
       escalade: 3.1.1
       picocolors: 1.0.0
     dev: true
 
-  /update-notifier@6.0.2:
-    resolution: {integrity: sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==}
-    engines: {node: ">=14.16"}
-    dependencies:
-      boxen: 7.1.1
-      chalk: 5.3.0
-      configstore: 6.0.0
-      has-yarn: 3.0.0
-      import-lazy: 4.0.0
-      is-ci: 3.0.1
-      is-installed-globally: 0.4.0
-      is-npm: 6.0.0
-      is-yarn-global: 0.4.1
-      latest-version: 7.0.0
-      pupa: 3.1.0
-      semver: 7.5.4
-      semver-diff: 4.0.0
-      xdg-basedir: 5.1.0
+  /update-browserslist-db@1.0.13(browserslist@4.23.0):
+    resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+    dependencies:
+      browserslist: 4.23.0
+      escalade: 3.1.1
+      picocolors: 1.0.0
     dev: true
 
   /uri-js@4.4.1:
@@ -23931,24 +23798,17 @@ packages:
     resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==}
     dev: true
 
-  /url-parse@1.5.10:
-    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
-    dependencies:
-      querystringify: 2.2.0
-      requires-port: 1.0.0
-    dev: true
-
   /use-callback-ref@1.3.0(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
-      "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@types/react": 18.2.25
+      '@types/react': 18.2.25
       react: 18.2.0
       tslib: 2.6.2
     dev: true
@@ -23959,22 +23819,22 @@ packages:
       react: 16.8.0 - 18
       react-dom: 16.8.0 - 18
     dependencies:
-      "@juggle/resize-observer": 3.4.0
+      '@juggle/resize-observer': 3.4.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
   /use-sidecar@1.1.2(@types/react@18.2.25)(react@18.2.0):
     resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     peerDependencies:
-      "@types/react": ^16.9.0 || ^17.0.0 || ^18.0.0
+      '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
-      "@types/react":
+      '@types/react':
         optional: true
     dependencies:
-      "@types/react": 18.2.25
+      '@types/react': 18.2.25
       detect-node-es: 1.1.0
       react: 18.2.0
       tslib: 2.6.2
@@ -23998,19 +23858,19 @@ packages:
       is-arguments: 1.1.1
       is-generator-function: 1.0.10
       is-typed-array: 1.1.12
-      which-typed-array: 1.1.11
+      which-typed-array: 1.1.13
     dev: true
 
   /utility-types@3.10.0:
     resolution: {integrity: sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==}
-    engines: {node: ">= 4"}
+    engines: {node: '>= 4'}
     requiresBuild: true
     dev: false
     optional: true
 
   /utils-merge@1.0.1:
     resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
-    engines: {node: ">= 0.4.0"}
+    engines: {node: '>= 0.4.0'}
 
   /uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
@@ -24020,25 +23880,12 @@ packages:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
-  /v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
-    dev: true
-
-  /v8-to-istanbul@8.1.1:
-    resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==}
-    engines: {node: ">=10.12.0"}
-    dependencies:
-      "@types/istanbul-lib-coverage": 2.0.4
-      convert-source-map: 1.9.0
-      source-map: 0.7.4
-    dev: true
-
   /v8-to-istanbul@9.1.3:
     resolution: {integrity: sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==}
-    engines: {node: ">=10.12.0"}
+    engines: {node: '>=10.12.0'}
     dependencies:
-      "@jridgewell/trace-mapping": 0.3.19
-      "@types/istanbul-lib-coverage": 2.0.4
+      '@jridgewell/trace-mapping': 0.3.25
+      '@types/istanbul-lib-coverage': 2.0.4
       convert-source-map: 2.0.0
     dev: true
 
@@ -24060,61 +23907,39 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       builtins: 5.0.1
+    dev: false
 
   /vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
-    engines: {node: ">= 0.8"}
+    engines: {node: '>= 0.8'}
 
   /vfile-message@4.0.2:
     resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
       unist-util-stringify-position: 4.0.0
     dev: false
 
   /vfile@6.0.1:
     resolution: {integrity: sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==}
     dependencies:
-      "@types/unist": 3.0.2
+      '@types/unist': 3.0.2
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
     dev: false
 
-  /vite-node@0.30.1(@types/node@18.18.4):
-    resolution: {integrity: sha512-vTikpU/J7e6LU/8iM3dzBo8ZhEiKZEKRznEMm+mJh95XhWaPrJQraT/QsT2NWmuEf+zgAoMe64PKT7hfZ1Njmg==}
-    engines: {node: ">=v14.18.0"}
-    hasBin: true
-    dependencies:
-      cac: 6.7.14
-      debug: 4.3.4
-      mlly: 1.4.2
-      pathe: 1.1.1
-      picocolors: 1.0.0
-      vite: 4.4.11(@types/node@18.18.4)
-    transitivePeerDependencies:
-      - "@types/node"
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-    dev: true
-
-  /vite-node@0.31.4(@types/node@18.18.4):
-    resolution: {integrity: sha512-uzL377GjJtTbuc5KQxVbDu2xfU/x0wVjUtXQR2ihS21q/NK6ROr4oG0rsSkBBddZUVCwzfx22in76/0ZZHXgkQ==}
-    engines: {node: ">=v14.18.0"}
+  /vite-node@1.6.0:
+    resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4
-      mlly: 1.4.2
+      debug: 4.3.4(supports-color@5.5.0)
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 5.1.4(@types/node@20.11.20)
     transitivePeerDependencies:
-      - "@types/node"
+      - '@types/node'
       - less
       - lightningcss
       - sass
@@ -24124,19 +23949,18 @@ packages:
       - terser
     dev: true
 
-  /vite-node@0.32.4(@types/node@18.18.4):
-    resolution: {integrity: sha512-L2gIw+dCxO0LK14QnUMoqSYpa9XRGnTTTDjW2h19Mr+GR0EFj4vx52W41gFXfMLqpA00eK4ZjOVYo1Xk//LFEw==}
-    engines: {node: ">=v14.18.0"}
+  /vite-node@1.6.0(@types/node@20.11.0):
+    resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4
-      mlly: 1.4.2
+      debug: 4.3.4(supports-color@5.5.0)
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 5.1.4(@types/node@20.11.0)
     transitivePeerDependencies:
-      - "@types/node"
+      - '@types/node'
       - less
       - lightningcss
       - sass
@@ -24146,19 +23970,18 @@ packages:
       - terser
     dev: true
 
-  /vite-node@0.34.6(@types/node@18.18.4):
-    resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
-    engines: {node: ">=v14.18.0"}
+  /vite-node@1.6.0(@types/node@20.11.20):
+    resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4
-      mlly: 1.4.2
+      debug: 4.3.4(supports-color@5.5.0)
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 4.4.11(@types/node@18.18.4)
+      vite: 5.1.4(@types/node@20.11.20)
     transitivePeerDependencies:
-      - "@types/node"
+      - '@types/node'
       - less
       - lightningcss
       - sass
@@ -24168,20 +23991,20 @@ packages:
       - terser
     dev: true
 
-  /vite@4.4.11(@types/node@18.18.4):
-    resolution: {integrity: sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==}
+  /vite@4.5.2:
+    resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
-      "@types/node": ">= 14"
-      less: "*"
+      '@types/node': '>= 14'
+      less: '*'
       lightningcss: ^1.21.0
-      sass: "*"
-      stylus: "*"
-      sugarss: "*"
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
       terser: ^5.4.0
     peerDependenciesMeta:
-      "@types/node":
+      '@types/node':
         optional: true
       less:
         optional: true
@@ -24196,137 +24019,130 @@ packages:
       terser:
         optional: true
     dependencies:
-      "@types/node": 18.18.4
       esbuild: 0.18.20
-      postcss: 8.4.31
+      postcss: 8.4.35
       rollup: 3.29.4
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
 
-  /vitest@0.30.1:
-    resolution: {integrity: sha512-y35WTrSTlTxfMLttgQk4rHcaDkbHQwDP++SNwPb+7H8yb13Q3cu2EixrtHzF27iZ8v0XCciSsLg00RkPAzB/aA==}
-    engines: {node: ">=v14.18.0"}
+  /vite@5.1.4(@types/node@20.11.0):
+    resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
-      "@edge-runtime/vm": "*"
-      "@vitest/browser": "*"
-      "@vitest/ui": "*"
-      happy-dom: "*"
-      jsdom: "*"
-      playwright: "*"
-      safaridriver: "*"
-      webdriverio: "*"
+      '@types/node': ^18.0.0 || >=20.0.0
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
     peerDependenciesMeta:
-      "@edge-runtime/vm":
+      '@types/node':
         optional: true
-      "@vitest/browser":
-        optional: true
-      "@vitest/ui":
+      less:
         optional: true
-      happy-dom:
+      lightningcss:
         optional: true
-      jsdom:
+      sass:
         optional: true
-      playwright:
+      stylus:
         optional: true
-      safaridriver:
+      sugarss:
         optional: true
-      webdriverio:
+      terser:
         optional: true
     dependencies:
-      "@types/chai": 4.3.6
-      "@types/chai-subset": 1.3.3
-      "@types/node": 18.18.4
-      "@vitest/expect": 0.30.1
-      "@vitest/runner": 0.30.1
-      "@vitest/snapshot": 0.30.1
-      "@vitest/spy": 0.30.1
-      "@vitest/utils": 0.30.1
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-      cac: 6.7.14
-      chai: 4.3.10
-      concordance: 5.0.4
-      debug: 4.3.4
-      local-pkg: 0.4.3
-      magic-string: 0.30.4
-      pathe: 1.1.1
-      picocolors: 1.0.0
-      source-map: 0.6.1
-      std-env: 3.4.3
-      strip-literal: 1.3.0
-      tinybench: 2.5.1
-      tinypool: 0.4.0
-      vite: 4.4.11(@types/node@18.18.4)
-      vite-node: 0.30.1(@types/node@18.18.4)
-      why-is-node-running: 2.2.2
-    transitivePeerDependencies:
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
+      '@types/node': 20.11.0
+      esbuild: 0.19.12
+      postcss: 8.4.38
+      rollup: 4.18.0
+    optionalDependencies:
+      fsevents: 2.3.3
     dev: true
 
-  /vitest@0.31.4(happy-dom@9.20.3):
-    resolution: {integrity: sha512-GoV0VQPmWrUFOZSg3RpQAPN+LPmHg2/gxlMNJlyxJihkz6qReHDV6b0pPDcqFLNEPya4tWJ1pgwUNP9MLmUfvQ==}
-    engines: {node: ">=v14.18.0"}
+  /vite@5.1.4(@types/node@20.11.20):
+    resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
-      "@edge-runtime/vm": "*"
-      "@vitest/browser": "*"
-      "@vitest/ui": "*"
-      happy-dom: "*"
-      jsdom: "*"
-      playwright: "*"
-      safaridriver: "*"
-      webdriverio: "*"
+      '@types/node': ^18.0.0 || >=20.0.0
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
     peerDependenciesMeta:
-      "@edge-runtime/vm":
+      '@types/node':
+        optional: true
+      less:
         optional: true
-      "@vitest/browser":
+      lightningcss:
         optional: true
-      "@vitest/ui":
+      sass:
         optional: true
-      happy-dom:
+      stylus:
         optional: true
-      jsdom:
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+    dependencies:
+      '@types/node': 20.11.20
+      esbuild: 0.19.12
+      postcss: 8.4.38
+      rollup: 4.18.0
+    optionalDependencies:
+      fsevents: 2.3.3
+    dev: true
+
+  /vitest@1.6.0(@types/node@20.11.0):
+    resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': 1.6.0
+      '@vitest/ui': 1.6.0
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser':
         optional: true
-      playwright:
+      '@vitest/ui':
         optional: true
-      safaridriver:
+      happy-dom:
         optional: true
-      webdriverio:
+      jsdom:
         optional: true
     dependencies:
-      "@types/chai": 4.3.6
-      "@types/chai-subset": 1.3.3
-      "@types/node": 18.18.4
-      "@vitest/expect": 0.31.4
-      "@vitest/runner": 0.31.4
-      "@vitest/snapshot": 0.31.4
-      "@vitest/spy": 0.31.4
-      "@vitest/utils": 0.31.4
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-      cac: 6.7.14
+      '@types/node': 20.11.0
+      '@vitest/expect': 1.6.0
+      '@vitest/runner': 1.6.0
+      '@vitest/snapshot': 1.6.0
+      '@vitest/spy': 1.6.0
+      '@vitest/utils': 1.6.0
+      acorn-walk: 8.3.2
       chai: 4.3.10
-      concordance: 5.0.4
-      debug: 4.3.4
-      happy-dom: 9.20.3
-      local-pkg: 0.4.3
-      magic-string: 0.30.4
+      debug: 4.3.4(supports-color@5.5.0)
+      execa: 8.0.1
+      local-pkg: 0.5.0
+      magic-string: 0.30.7
       pathe: 1.1.1
       picocolors: 1.0.0
-      std-env: 3.4.3
-      strip-literal: 1.3.0
+      std-env: 3.7.0
+      strip-literal: 2.0.0
       tinybench: 2.5.1
-      tinypool: 0.5.0
-      vite: 4.4.11(@types/node@18.18.4)
-      vite-node: 0.31.4(@types/node@18.18.4)
+      tinypool: 0.8.4
+      vite: 5.1.4(@types/node@20.11.0)
+      vite-node: 1.6.0(@types/node@20.11.0)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -24338,60 +24154,51 @@ packages:
       - terser
     dev: true
 
-  /vitest@0.32.4:
-    resolution: {integrity: sha512-3czFm8RnrsWwIzVDu/Ca48Y/M+qh3vOnF16czJm98Q/AN1y3B6PBsyV8Re91Ty5s7txKNjEhpgtGPcfdbh2MZg==}
-    engines: {node: ">=v14.18.0"}
+  /vitest@1.6.0(@types/node@20.11.20):
+    resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
-      "@edge-runtime/vm": "*"
-      "@vitest/browser": "*"
-      "@vitest/ui": "*"
-      happy-dom: "*"
-      jsdom: "*"
-      playwright: "*"
-      safaridriver: "*"
-      webdriverio: "*"
+      '@edge-runtime/vm': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': 1.6.0
+      '@vitest/ui': 1.6.0
+      happy-dom: '*'
+      jsdom: '*'
     peerDependenciesMeta:
-      "@edge-runtime/vm":
+      '@edge-runtime/vm':
         optional: true
-      "@vitest/browser":
+      '@types/node':
         optional: true
-      "@vitest/ui":
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
         optional: true
       happy-dom:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
     dependencies:
-      "@types/chai": 4.3.6
-      "@types/chai-subset": 1.3.3
-      "@types/node": 18.18.4
-      "@vitest/expect": 0.32.4
-      "@vitest/runner": 0.32.4
-      "@vitest/snapshot": 0.32.4
-      "@vitest/spy": 0.32.4
-      "@vitest/utils": 0.32.4
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-      cac: 6.7.14
+      '@types/node': 20.11.20
+      '@vitest/expect': 1.6.0
+      '@vitest/runner': 1.6.0
+      '@vitest/snapshot': 1.6.0
+      '@vitest/spy': 1.6.0
+      '@vitest/utils': 1.6.0
+      acorn-walk: 8.3.2
       chai: 4.3.10
-      debug: 4.3.4
-      local-pkg: 0.4.3
-      magic-string: 0.30.4
+      debug: 4.3.4(supports-color@5.5.0)
+      execa: 8.0.1
+      local-pkg: 0.5.0
+      magic-string: 0.30.7
       pathe: 1.1.1
       picocolors: 1.0.0
-      std-env: 3.4.3
-      strip-literal: 1.3.0
+      std-env: 3.7.0
+      strip-literal: 2.0.0
       tinybench: 2.5.1
-      tinypool: 0.5.0
-      vite: 4.4.11(@types/node@18.18.4)
-      vite-node: 0.32.4(@types/node@18.18.4)
+      tinypool: 0.8.4
+      vite: 5.1.4(@types/node@20.11.20)
+      vite-node: 1.6.0(@types/node@20.11.20)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -24403,60 +24210,51 @@ packages:
       - terser
     dev: true
 
-  /vitest@0.34.6:
-    resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
-    engines: {node: ">=v14.18.0"}
+  /vitest@1.6.0(happy-dom@9.20.3):
+    resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
-      "@edge-runtime/vm": "*"
-      "@vitest/browser": "*"
-      "@vitest/ui": "*"
-      happy-dom: "*"
-      jsdom: "*"
-      playwright: "*"
-      safaridriver: "*"
-      webdriverio: "*"
+      '@edge-runtime/vm': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': 1.6.0
+      '@vitest/ui': 1.6.0
+      happy-dom: '*'
+      jsdom: '*'
     peerDependenciesMeta:
-      "@edge-runtime/vm":
+      '@edge-runtime/vm':
+        optional: true
+      '@types/node':
         optional: true
-      "@vitest/browser":
+      '@vitest/browser':
         optional: true
-      "@vitest/ui":
+      '@vitest/ui':
         optional: true
       happy-dom:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
     dependencies:
-      "@types/chai": 4.3.6
-      "@types/chai-subset": 1.3.3
-      "@types/node": 18.18.4
-      "@vitest/expect": 0.34.6
-      "@vitest/runner": 0.34.6
-      "@vitest/snapshot": 0.34.6
-      "@vitest/spy": 0.34.6
-      "@vitest/utils": 0.34.6
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-      cac: 6.7.14
+      '@vitest/expect': 1.6.0
+      '@vitest/runner': 1.6.0
+      '@vitest/snapshot': 1.6.0
+      '@vitest/spy': 1.6.0
+      '@vitest/utils': 1.6.0
+      acorn-walk: 8.3.2
       chai: 4.3.10
-      debug: 4.3.4
-      local-pkg: 0.4.3
-      magic-string: 0.30.4
+      debug: 4.3.4(supports-color@5.5.0)
+      execa: 8.0.1
+      happy-dom: 9.20.3
+      local-pkg: 0.5.0
+      magic-string: 0.30.7
       pathe: 1.1.1
       picocolors: 1.0.0
-      std-env: 3.4.3
-      strip-literal: 1.3.0
+      std-env: 3.7.0
+      strip-literal: 2.0.0
       tinybench: 2.5.1
-      tinypool: 0.7.0
-      vite: 4.4.11(@types/node@18.18.4)
-      vite-node: 0.34.6(@types/node@18.18.4)
+      tinypool: 0.8.4
+      vite: 5.1.4(@types/node@20.11.20)
+      vite-node: 1.6.0
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -24468,9 +24266,13 @@ packages:
       - terser
     dev: true
 
+  /vlq@2.0.4:
+    resolution: {integrity: sha512-aodjPa2wPQFkra1G8CzJBTHXhgk3EVSwxSWXNPr1fgdFLUb8kvLV1iEb6rFgasIsjP82HWI6dsb5Io26DDnasA==}
+    dev: false
+
   /vscode-jsonrpc@8.1.0:
     resolution: {integrity: sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==}
-    engines: {node: ">=14.0.0"}
+    engines: {node: '>=14.0.0'}
 
   /vscode-languageclient@8.1.0:
     resolution: {integrity: sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==}
@@ -24497,20 +24299,6 @@ packages:
       vscode-languageserver-protocol: 3.17.3
     dev: false
 
-  /w3c-hr-time@1.0.2:
-    resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
-    deprecated: Use your platform's native performance.now() and performance.timeOrigin.
-    dependencies:
-      browser-process-hrtime: 1.0.0
-    dev: true
-
-  /w3c-xmlserializer@2.0.0:
-    resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==}
-    engines: {node: ">=10"}
-    dependencies:
-      xml-name-validator: 3.0.0
-    dev: true
-
   /walk-up-path@3.0.1:
     resolution: {integrity: sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==}
     dev: false
@@ -24532,9 +24320,9 @@ packages:
     hasBin: true
     requiresBuild: true
     dependencies:
-      "@cowasm/memfs": 3.5.1
-      "@wapython/unionfs": 4.5.7
-      debug: 4.3.4
+      '@cowasm/memfs': 3.5.1
+      '@wapython/unionfs': 4.5.7
+      debug: 4.3.4(supports-color@5.5.0)
       fflate: 0.7.4
       path-browserify: 1.0.1
       randomfill: 1.0.4
@@ -24546,7 +24334,7 @@ packages:
 
   /watchpack@2.4.0:
     resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
-    engines: {node: ">=10.13.0"}
+    engines: {node: '>=10.13.0'}
     dependencies:
       glob-to-regexp: 0.4.1
       graceful-fs: 4.2.11
@@ -24559,7 +24347,7 @@ packages:
 
   /web-streams-polyfill@3.2.1:
     resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     dev: true
 
   /webidl-conversions@3.0.1:
@@ -24569,45 +24357,35 @@ packages:
     resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
     dev: true
 
-  /webidl-conversions@5.0.0:
-    resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==}
-    engines: {node: ">=8"}
-    dev: true
-
-  /webidl-conversions@6.1.0:
-    resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==}
-    engines: {node: ">=10.4"}
-    dev: true
-
   /webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dev: true
 
   /webpack-sources@3.2.3:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: ">=10.13.0"}
+    engines: {node: '>=10.13.0'}
     dev: true
 
   /webpack-virtual-modules@0.5.0:
     resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
     dev: true
 
-  /webpack@5.88.2(esbuild@0.18.20):
+  /webpack@5.88.2(esbuild@0.19.12):
     resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==}
-    engines: {node: ">=10.13.0"}
+    engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
-      webpack-cli: "*"
+      webpack-cli: '*'
     peerDependenciesMeta:
       webpack-cli:
         optional: true
     dependencies:
-      "@types/eslint-scope": 3.7.5
-      "@types/estree": 1.0.2
-      "@webassemblyjs/ast": 1.11.6
-      "@webassemblyjs/wasm-edit": 1.11.6
-      "@webassemblyjs/wasm-parser": 1.11.6
+      '@types/eslint-scope': 3.7.5
+      '@types/estree': 1.0.2
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/wasm-edit': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
       acorn: 8.10.0
       acorn-import-assertions: 1.9.0(acorn@8.10.0)
       browserslist: 4.22.1
@@ -24624,40 +24402,25 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.9(esbuild@0.18.20)(webpack@5.88.2)
+      terser-webpack-plugin: 5.3.9(esbuild@0.19.12)(webpack@5.88.2)
       watchpack: 2.4.0
       webpack-sources: 3.2.3
     transitivePeerDependencies:
-      - "@swc/core"
+      - '@swc/core'
       - esbuild
       - uglify-js
     dev: true
 
-  /well-known-symbols@2.0.0:
-    resolution: {integrity: sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==}
-    engines: {node: ">=6"}
-    dev: true
-
-  /whatwg-encoding@1.0.5:
-    resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==}
-    dependencies:
-      iconv-lite: 0.4.24
-    dev: true
-
   /whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       iconv-lite: 0.6.3
     dev: true
 
-  /whatwg-mimetype@2.3.0:
-    resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==}
-    dev: true
-
   /whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dev: true
 
   /whatwg-url@5.0.0:
@@ -24674,17 +24437,9 @@ packages:
       webidl-conversions: 4.0.2
     dev: true
 
-  /whatwg-url@8.7.0:
-    resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==}
-    engines: {node: ">=10"}
-    dependencies:
-      lodash: 4.17.21
-      tr46: 2.1.0
-      webidl-conversions: 6.1.0
-    dev: true
-
   /when-exit@2.1.1:
     resolution: {integrity: sha512-XLipGldz/UcleuGaoQjbYuWwD+ICRnzIjlldtwTaTWr7aZz8yQW49rXk6MHQnh+KxOiWiJpM1vIyaxprOnlW4g==}
+    dev: false
 
   /which-boxed-primitive@1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
@@ -24697,7 +24452,7 @@ packages:
 
   /which-builtin-type@1.1.3:
     resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       function.prototype.name: 1.1.6
       has-tostringtag: 1.0.0
@@ -24727,24 +24482,34 @@ packages:
 
   /which-typed-array@1.1.11:
     resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
-    engines: {node: ">= 0.4"}
+    engines: {node: '>= 0.4'}
     dependencies:
       available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
+      call-bind: 1.0.5
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+
+  /which-typed-array@1.1.13:
+    resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.5
       for-each: 0.3.3
       gopd: 1.0.1
       has-tostringtag: 1.0.0
+    dev: true
 
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
     dependencies:
       isexe: 2.0.0
-    dev: false
 
   /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: ">= 8"}
+    engines: {node: '>= 8'}
     hasBin: true
     dependencies:
       isexe: 2.0.0
@@ -24755,6 +24520,7 @@ packages:
     hasBin: true
     dependencies:
       isexe: 2.0.0
+    dev: false
 
   /which@4.0.0:
     resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==}
@@ -24765,7 +24531,7 @@ packages:
 
   /why-is-node-running@2.2.2:
     resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     hasBin: true
     dependencies:
       siginfo: 2.0.0
@@ -24776,23 +24542,17 @@ packages:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
     dependencies:
       string-width: 4.2.3
+    dev: false
 
   /widest-line@3.1.0:
     resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       string-width: 4.2.3
 
-  /widest-line@4.0.1:
-    resolution: {integrity: sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==}
-    engines: {node: ">=12"}
-    dependencies:
-      string-width: 5.1.2
-    dev: true
-
   /winston-transport@4.5.0:
     resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==}
-    engines: {node: ">= 6.4.0"}
+    engines: {node: '>= 6.4.0'}
     requiresBuild: true
     dependencies:
       logform: 2.5.1
@@ -24803,11 +24563,11 @@ packages:
 
   /winston@3.11.0:
     resolution: {integrity: sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==}
-    engines: {node: ">= 12.0.0"}
+    engines: {node: '>= 12.0.0'}
     requiresBuild: true
     dependencies:
-      "@colors/colors": 1.6.0
-      "@dabh/diagnostics": 2.0.3
+      '@colors/colors': 1.6.0
+      '@dabh/diagnostics': 2.0.3
       async: 3.2.4
       is-stream: 2.0.1
       logform: 2.5.1
@@ -24830,7 +24590,7 @@ packages:
 
   /wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       ansi-styles: 4.3.0
       string-width: 4.2.3
@@ -24838,7 +24598,7 @@ packages:
 
   /wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       ansi-styles: 4.3.0
       string-width: 4.2.3
@@ -24846,7 +24606,7 @@ packages:
 
   /wrap-ansi@8.1.0:
     resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       ansi-styles: 6.2.1
       string-width: 5.1.2
@@ -24863,15 +24623,6 @@ packages:
       signal-exit: 3.0.7
     dev: true
 
-  /write-file-atomic@3.0.3:
-    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
-    dependencies:
-      imurmurhash: 0.1.4
-      is-typedarray: 1.0.0
-      signal-exit: 3.0.7
-      typedarray-to-buffer: 3.1.5
-    dev: true
-
   /write-file-atomic@4.0.2:
     resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -24890,7 +24641,7 @@ packages:
 
   /write-yaml-file@5.0.0:
     resolution: {integrity: sha512-FdNA4RyH1L43TlvGG8qOMIfcEczwA5ij+zLXUy3Z83CjxhLvcV7/Q/8pk22wnCgYw7PJhtK+7lhO+qqyT4NdvQ==}
-    engines: {node: ">=16.14"}
+    engines: {node: '>=16.14'}
     dependencies:
       js-yaml: 4.1.0
       write-file-atomic: 5.0.1
@@ -24912,7 +24663,7 @@ packages:
 
   /ws@7.5.9:
     resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
-    engines: {node: ">=8.3.0"}
+    engines: {node: '>=8.3.0'}
     peerDependencies:
       bufferutil: ^4.0.1
       utf-8-validate: ^5.0.2
@@ -24925,21 +24676,15 @@ packages:
 
   /ws@8.14.2:
     resolution: {integrity: sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==}
-    engines: {node: ">=10.0.0"}
+    engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
-      utf-8-validate: ">=5.0.2"
+      utf-8-validate: '>=5.0.2'
     peerDependenciesMeta:
       bufferutil:
         optional: true
       utf-8-validate:
         optional: true
-    dev: true
-
-  /xdg-basedir@5.1.0:
-    resolution: {integrity: sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==}
-    engines: {node: ">=12"}
-    dev: true
 
   /xml-js@1.6.11:
     resolution: {integrity: sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==}
@@ -24948,50 +24693,38 @@ packages:
       sax: 1.3.0
     dev: true
 
-  /xml-name-validator@3.0.0:
-    resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==}
-    dev: true
-
   /xml2js@0.5.0:
     resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
-    engines: {node: ">=4.0.0"}
+    engines: {node: '>=4.0.0'}
     dependencies:
       sax: 1.3.0
       xmlbuilder: 11.0.1
 
-  /xml@1.0.1:
-    resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==}
-    dev: true
-
   /xmlbuilder2@3.1.1:
     resolution: {integrity: sha512-WCSfbfZnQDdLQLiMdGUQpMxxckeQ4oZNMNhLVkcekTu7xhD4tuUDyAPoY8CwXvBYE6LwBHd6QW2WZXlOWr1vCw==}
-    engines: {node: ">=12.0"}
+    engines: {node: '>=12.0'}
     dependencies:
-      "@oozcitak/dom": 1.15.10
-      "@oozcitak/infra": 1.0.8
-      "@oozcitak/util": 8.3.8
+      '@oozcitak/dom': 1.15.10
+      '@oozcitak/infra': 1.0.8
+      '@oozcitak/util': 8.3.8
       js-yaml: 3.14.1
 
   /xmlbuilder@11.0.1:
     resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
-    engines: {node: ">=4.0"}
+    engines: {node: '>=4.0'}
 
   /xmlbuilder@15.1.1:
     resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}
-    engines: {node: ">=8.0"}
-    dev: true
-
-  /xmlchars@2.2.0:
-    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+    engines: {node: '>=8.0'}
     dev: true
 
-  /xstate@4.38.2:
-    resolution: {integrity: sha512-Fba/DwEPDLneHT3tbJ9F3zafbQXszOlyCJyQqqdzmtlY/cwE2th462KK48yaANf98jHlP6lJvxfNtN0LFKXPQg==}
+  /xstate@4.38.3:
+    resolution: {integrity: sha512-SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw==}
     dev: true
 
   /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: ">=0.4"}
+    engines: {node: '>=0.4'}
     dev: true
 
   /y18n@4.0.3:
@@ -25000,7 +24733,7 @@ packages:
 
   /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
@@ -25011,15 +24744,21 @@ packages:
 
   /yaml@1.10.2:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
-    engines: {node: ">= 6"}
+    engines: {node: '>= 6'}
+    dev: true
 
   /yaml@2.3.2:
     resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==}
-    engines: {node: ">= 14"}
+    engines: {node: '>= 14'}
+
+  /yaml@2.4.1:
+    resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==}
+    engines: {node: '>= 14'}
+    hasBin: true
 
   /yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: ">=6"}
+    engines: {node: '>=6'}
     dependencies:
       camelcase: 5.3.1
       decamelize: 1.2.0
@@ -25027,15 +24766,15 @@ packages:
 
   /yargs-parser@20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
 
   /yargs@15.4.1:
     resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
       cliui: 6.0.0
       decamelize: 1.2.0
@@ -25052,7 +24791,7 @@ packages:
 
   /yargs@16.2.0:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
     dependencies:
       cliui: 7.0.4
       escalade: 3.1.1
@@ -25062,9 +24801,22 @@ packages:
       y18n: 5.0.8
       yargs-parser: 20.2.9
 
+  /yargs@17.6.2:
+    resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==}
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+    dev: true
+
   /yargs@17.7.2:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
-    engines: {node: ">=12"}
+    engines: {node: '>=12'}
     dependencies:
       cliui: 8.0.1
       escalade: 3.1.1
@@ -25087,38 +24839,38 @@ packages:
       buffer-crc32: 0.2.13
     dev: true
 
-  /yn@3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
-    engines: {node: ">=6"}
-    dev: true
-
   /yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: ">=10"}
+    engines: {node: '>=10'}
 
   /yocto-queue@1.0.0:
     resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
-    engines: {node: ">=12.20"}
+    engines: {node: '>=12.20'}
     dev: true
 
   /yoga-layout-prebuilt@1.10.0:
     resolution: {integrity: sha512-YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==}
-    engines: {node: ">=8"}
+    engines: {node: '>=8'}
     dependencies:
-      "@types/yoga-layout": 1.9.2
+      '@types/yoga-layout': 1.9.2
     dev: true
 
   /zip-stream@4.1.1:
     resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
-    engines: {node: ">= 10"}
+    engines: {node: '>= 10'}
     dependencies:
       archiver-utils: 3.0.4
       compress-commons: 4.1.2
       readable-stream: 3.6.2
-
-  /zod@1.11.17:
-    resolution: {integrity: sha512-UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA==}
     dev: true
 
+  /zip-stream@5.0.1:
+    resolution: {integrity: sha512-UfZ0oa0C8LI58wJ+moL46BDIMgCQbnsb+2PoiJYtonhBsMh2bq1eRBVkvjfVsqbEHd9/EgKPUuL9saSSsec8OA==}
+    engines: {node: '>= 12.0.0'}
+    dependencies:
+      archiver-utils: 4.0.1
+      compress-commons: 5.0.1
+      readable-stream: 3.6.2
+
   /zod@3.22.4:
     resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 429bbbf8a59..49189862465 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,7 +1,9 @@
 packages:
   - "apps/*"
   - "libs/*"
+  - "libs/@wingcloud/*"
   - "tools/*"
+  - "docs"
   - "docs/docs"
   - "apps/wing-console/packages/*"
   - "apps/wing-console/console/*"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 6f845e2f98f..c95f6616b11 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 profile = "default"
-channel = "1.73.0"
+channel = "1.77.2"
 targets = ["wasm32-wasi"]
\ No newline at end of file
diff --git a/scripts/setup_wasi.sh b/scripts/setup_wasi.sh
index 6021105775b..1016c8beb7f 100755
--- a/scripts/setup_wasi.sh
+++ b/scripts/setup_wasi.sh
@@ -3,8 +3,8 @@ set -eo pipefail
 
 TOOL_INSTALL_DIR="./.cargo"
 
-BINARYEN_VERSION="version_116"
-WASI_SDK_VERSION="20"
+BINARYEN_VERSION="version_117"
+WASI_SDK_VERSION="21"
 WASI_SDK_VERSION_FULL="$WASI_SDK_VERSION.0"
 
 SYS_OS=$OSTYPE
@@ -49,8 +49,6 @@ if [ ! -f $BINARYEN_BINARIES ]; then
         echo "Error extracting Binaryen. Exiting."
         exit 1
     fi
-else
-    echo "Binaryen $BINARYEN_VERSION already installed."
 fi
 
 # Download wasi-sdk
diff --git a/tools/bump-pack/bin/turbo-diff.cjs b/tools/bump-pack/bin/turbo-diff.cjs
index 4baa41d10f1..1408a0e245d 100755
--- a/tools/bump-pack/bin/turbo-diff.cjs
+++ b/tools/bump-pack/bin/turbo-diff.cjs
@@ -4,7 +4,7 @@ const { resolve, relative } = require("node:path");
 
 const which = require("npm-which")(__dirname);
 const tsx = relative(process.cwd(), which.sync("tsx"));
-const cliSource = relative(process.cwd(), resolve(__dirname, "../src/turbo-diff.ts"));
+const cliSource = relative(process.cwd(), resolve(__dirname, "../src/turbo-diff.cli.ts"));
 execSync(`${tsx} ${cliSource} ${process.argv.slice(2).join(" ")}`, {
   stdio: "inherit",
 });
diff --git a/tools/bump-pack/package.json b/tools/bump-pack/package.json
index 64e6680190b..ac190bbfbad 100644
--- a/tools/bump-pack/package.json
+++ b/tools/bump-pack/package.json
@@ -16,12 +16,13 @@
   "scripts": {},
   "devDependencies": {
     "@types/fs-extra": "^11.0.1",
-    "@types/node": "^18.17.13",
+    "@types/node": "^20.11.0",
     "@types/semver": "^7.5.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@actions/core": "^1.10.0",
+    "@actions/core": "^1.10.1",
     "@pnpm/find-workspace-dir": "^6.0.2",
     "@pnpm/reviewing.dependencies-hierarchy": "^2.0.10",
     "@pnpm/workspace.find-packages": "^1.0.5",
@@ -30,7 +31,7 @@
     "minimatch": "^9.0.3",
     "npm-which": "^3.0.1",
     "semver": "^7.5.4",
-    "tsx": "^3.12.8"
+    "tsx": "^4.7.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/tools/bump-pack/src/bundle-link.ts b/tools/bump-pack/src/bundle-link.ts
index 55e6de8b315..66ee9e240f3 100644
--- a/tools/bump-pack/src/bundle-link.ts
+++ b/tools/bump-pack/src/bundle-link.ts
@@ -94,6 +94,12 @@ export async function linkBundledTransitiveDeps(
       if (!(await fs.pathExists(dep.path))) {
         throw new Error(`pnpm dependency path not found: ${dep.path}`);
       }
+
+      // if the symlink exists but is broken, attempt to remove it
+      await fs
+        .stat(destModule)
+        .catch(() => fs.unlink(destModule).catch(() => {}));
+
       await fs.ensureSymlink(dep.path, destModule);
     }
   }
diff --git a/tools/bump-pack/src/turbo-diff.cli.ts b/tools/bump-pack/src/turbo-diff.cli.ts
new file mode 100644
index 00000000000..2faeba23dc6
--- /dev/null
+++ b/tools/bump-pack/src/turbo-diff.cli.ts
@@ -0,0 +1,61 @@
+/*
+Usage: turbo-diff [options]
+
+Summary:
+  turbo-diff is a tool that can be used to determine which turbo tasks changed based on a git diff.
+
+Output:
+  The output is a JSON object with the following structure:
+  {
+    "<task-id>": {
+      "cached": <boolean>,
+      "changes": <boolean>
+    }
+  }
+
+  The "cached" field indicates whether or not the task is cached based on the info that turbo has locally (or remotely if using a turbo remote cache).
+  The "changes" field indicates whether or not the task has changes based on the git diff.
+
+Expectations:
+  - The winglang monorepo this is contained in must have a enough history to covert startRef and EndRef.
+
+Remarks:
+  Why can't we just use turbo's built in diffing?
+  In turbo, you can use `-F=...[startRef..endRef]` to filter tasks based on a git diff. This method has two major issues:
+  1. See this issue: https://github.com/vercel/turbo/issues/4678. 
+     Basically, it does not actually use task inputs to determine if a task changed, it uses the entire project dir
+  2. It only tells you if a project changed, not a specific task.
+
+Options:
+  --start-ref <ref>  The start ref to use for the git diff (default: "HEAD")
+  --end-ref <ref>    The end ref to use for the git diff (default: "", current working tree)
+*/
+
+import { parseArgs } from "node:util";
+import { setOutput } from "@actions/core";
+import { getChangedFiles, getChanges, getTurboTaskData } from "./turbo-diff";
+
+const args = parseArgs({
+  options: {
+    startRef: {
+      type: "string",
+      default: "HEAD",
+    },
+    endRef: {
+      type: "string",
+      default: "",
+    },
+  },
+});
+
+const changes = getChangedFiles(args.values.startRef, args.values.endRef);
+console.log(changes.absoluteChanges);
+
+const turboOutput = getTurboTaskData();
+
+const taskData = getChanges(turboOutput, changes);
+
+console.log(taskData);
+if (process.env.GITHUB_ACTIONS) {
+  setOutput("data", taskData);
+}
diff --git a/tools/bump-pack/src/turbo-diff.test.ts b/tools/bump-pack/src/turbo-diff.test.ts
new file mode 100644
index 00000000000..5571ac0ff2d
--- /dev/null
+++ b/tools/bump-pack/src/turbo-diff.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from "vitest";
+import { getChanges, TurboOutput } from "./turbo-diff";
+
+const turboOutputBase: TurboOutput = {
+  absoluteRoot: "/tmp/root",
+  tasks: [
+    {
+      taskId: "project1#task",
+      directory: "project1",
+      cache: { status: "HIT" },
+      package: "project1",
+      dependencies: [],
+      inputs: {
+        "file1.js": {},
+        "file2.js": {},
+      },
+    },
+    {
+      taskId: "project2#task",
+      directory: "project2",
+      cache: { status: "MISS" },
+      package: "project2",
+      dependencies: [],
+      inputs: {
+        "file3.js": {},
+        "file4.js": {},
+      },
+    },
+  ],
+  globalInputFiles: [],
+};
+
+const turboOutputWithDependencies = structuredClone(turboOutputBase);
+turboOutputWithDependencies.tasks[0].dependencies = ["project2#task"];
+
+function createChanges(...files: string[]) {
+  return {
+    absoluteChanges: files.map((file) => `/tmp/root/${file}`),
+    relativeChanges: files,
+  };
+}
+
+describe("getChanges", () => {
+  it("should detect single file change", () => {
+    const fileChanges = createChanges("project2/file3.js");
+
+    expect(getChanges(turboOutputBase, fileChanges)).toMatchInlineSnapshot(`
+      {
+        "project1#task": {
+          "cached": true,
+          "changes": false,
+        },
+        "project2#task": {
+          "cached": false,
+          "changes": true,
+        },
+      }
+    `);
+  });
+
+  it("should should detect change from dependency", () => {
+    const fileChanges = createChanges("project2/file3.js");
+
+    expect(getChanges(turboOutputWithDependencies, fileChanges))
+      .toMatchInlineSnapshot(`
+      {
+        "project1#task": {
+          "cached": true,
+          "changes": true,
+        },
+        "project2#task": {
+          "cached": false,
+          "changes": true,
+        },
+      }
+    `);
+  });
+});
diff --git a/tools/bump-pack/src/turbo-diff.ts b/tools/bump-pack/src/turbo-diff.ts
index 24baae136b8..60b471c8b16 100644
--- a/tools/bump-pack/src/turbo-diff.ts
+++ b/tools/bump-pack/src/turbo-diff.ts
@@ -1,46 +1,31 @@
-/*
-Usage: turbo-diff [options]
-
-Summary:
-  turbo-diff is a tool that can be used to determine which turbo tasks changed based on a git diff.
-
-Output:
-  The output is a JSON object with the following structure:
-  {
-    "<task-id>": {
-      "cached": <boolean>,
-      "changes": <boolean>
-    }
-  }
-
-  The "cached" field indicates whether or not the task is cached based on the info that turbo has locally (or remotely if using a turbo remote cache).
-  The "changes" field indicates whether or not the task has changes based on the git diff.
-
-Expectations:
-  - The winglang monorepo this is contained in must have a enough history to covert startRef and EndRef.
-
-Remarks:
-  Why can't we just use turbo's built in diffing?
-  In turbo, you can use `-F=...[startRef..endRef]` to filter tasks based on a git diff. This method has two major issues:
-  1. See this issue: https://github.com/vercel/turbo/issues/4678. 
-     Basically, it does not actually use task inputs to determine if a task changed, it uses the entire project dir
-  2. It only tells you if a project changed, not a specific task.
-
-Options:
-  --start-ref <ref>  The start ref to use for the git diff (default: "HEAD")
-  --end-ref <ref>    The end ref to use for the git diff (default: "", current working tree)
-*/
-
 import { join } from "node:path";
 import { execSync } from "node:child_process";
-import { parseArgs } from "node:util";
-import { setOutput } from "@actions/core";
 import { minimatch } from "minimatch";
 import { fileURLToPath } from "node:url";
 
+type TurboTaskOutput = {
+  package: string;
+  taskId: string;
+  directory: string;
+  cache: {
+    status: "HIT" | "MISS";
+  };
+  dependencies: string[];
+  inputs: { [key: string]: any };
+};
+
+type FileChanges = { relativeChanges: string[]; absoluteChanges: string[] };
+export type TurboOutput = {
+  absoluteRoot: string;
+  globalInputFiles: string[];
+  tasks: TurboTaskOutput[];
+};
+type TaskChangeMap = { [key: string]: { cached: boolean; changes: boolean } };
+
 const currentFile = fileURLToPath(import.meta.url);
 const rootDir = join(currentFile, "..", "..", "..", "..");
-function betterExec(command: string) {
+
+export function betterExec(command: string) {
   return execSync(command, {
     cwd: rootDir,
     encoding: "utf8",
@@ -48,106 +33,153 @@ function betterExec(command: string) {
   }).trim();
 }
 
-const args = parseArgs({
-  options: {
-    startRef: {
-      type: "string",
-      default: "HEAD",
-    },
-    endRef: {
-      type: "string",
-      default: "",
-    },
-  },
-});
-
-let relativeChangedFiles = betterExec(
-  `git diff --name-only ${args.values.startRef} ${args.values.endRef}`
-).split("\n");
-
-if (args.values.endRef === "") {
-  // include untracked files
-  const OtherChangedFiles = betterExec(
-    `git ls-files --other --exclude-standard`
+export function getChangedFiles(
+  startRef: string | undefined,
+  endRef: string | undefined
+): FileChanges {
+  let relativeChanges = betterExec(
+    `git diff --name-only ${startRef} ${endRef}`
   ).split("\n");
 
-  relativeChangedFiles = relativeChangedFiles.concat(OtherChangedFiles);
+  if (endRef === "") {
+    // include untracked files
+    const OtherChangedFiles = betterExec(
+      `git ls-files --other --exclude-standard`
+    ).split("\n");
+
+    relativeChanges = relativeChanges.concat(OtherChangedFiles);
+  }
+
+  const absoluteChanges = relativeChanges.map((file) => join(rootDir, file));
+
+  return {
+    relativeChanges,
+    absoluteChanges,
+  };
 }
 
-// resolve to absolute paths
-const absoluteChangedFiles = relativeChangedFiles.map((file) =>
-  join(rootDir, file)
-);
-
-console.log(absoluteChangedFiles)
-
-const turboArgs = [
-  "pnpm",
-  "turbo",
-  "run",
-  "compile",
-  "test",
-  "package",
-  "bench",
-  "preview:fly",
-  "--dry-run=json",
-];
-
-const turboOutput = JSON.parse(betterExec(turboArgs.join(" ")));
-
-const taskData: { [key: string]: { cached: boolean; changes: boolean } } = {};
-
-for (const task of turboOutput.tasks) {
-  // double check that all the changes files based on git are actually included in all these tasks
-  const absoluteTaskRoot = join(rootDir, task.directory);
-  const changesRelativeToTask = absoluteChangedFiles
-    .map((file) => file.replace(absoluteTaskRoot + "/", ""))
-    .filter((file) => !file.startsWith("/"));
-
-  const anyChanges = changesRelativeToTask.some((file) =>
-    Object.keys(task.inputs).includes(file)
-  );
-  taskData[task.taskId] = {
-    cached: task.cache.status === "HIT",
-    changes: anyChanges,
+export function getTurboTaskData(): TurboOutput {
+  const turboArgs = [
+    "pnpm",
+    "turbo",
+    "run",
+    "compile",
+    "test",
+    "package",
+    "bench",
+    "preview:fly",
+    "--dry-run=json",
+  ];
+
+  const turboOutput = JSON.parse(betterExec(turboArgs.join(" ")));
+
+  return {
+    absoluteRoot: rootDir,
+    globalInputFiles: Object.keys(turboOutput.globalCacheInputs.files),
+    tasks: turboOutput.tasks,
   };
 }
 
-const globalDeps = Object.keys(turboOutput.globalCacheInputs.files);
-const globalPattern = `{${globalDeps.join(",")}}`;
-for (const changedFile of relativeChangedFiles) {
-  if (minimatch(changedFile, globalPattern)) {
-    for (const taskId in taskData) {
-      taskData[taskId].changes = true;
+export function getChanges(
+  turbo: TurboOutput,
+  fileChanges: FileChanges
+): TaskChangeMap {
+  // based only on the changes within the project itself and global deps
+  const immediateChanges: TaskChangeMap = {};
+
+  // includes transitive deps
+  const fullChanges: TaskChangeMap = {};
+
+  // create initial change map based on task data
+  for (const task of turbo.tasks) {
+    // double check that all the changes files based on git are actually included in all these tasks
+    const absoluteTaskRoot = join(turbo.absoluteRoot, task.directory);
+    const changesRelativeToTask = fileChanges.absoluteChanges
+      .map((file) => file.replace(absoluteTaskRoot + "/", ""))
+      .filter((file) => !file.startsWith("/"));
+
+    immediateChanges[task.taskId] = {
+      cached: task.cache.status === "HIT",
+      changes: changesRelativeToTask.some((file) =>
+        Object.keys(task.inputs).includes(file)
+      ),
+    };
+  }
+
+  // check if any global deps changed
+  const globalPattern = `{${turbo.globalInputFiles.join(",")}}`;
+  for (const changedFile of fileChanges.relativeChanges) {
+    if (minimatch(changedFile, globalPattern)) {
+      for (const taskId in immediateChanges) {
+        immediateChanges[taskId].changes = true;
+      }
+
+      // early return because we know all tasks have changes
+      return immediateChanges;
+    }
+  }
+
+  /**
+   * Check if any of the dependencies of the given task have changes.
+   * @returns true if changes were found
+   */
+  function checkTransitiveChanges(turbo: TurboOutput, task: TurboTaskOutput) {
+    const dataEntry = immediateChanges[task.taskId];
+    if (dataEntry.changes) {
+      return dataEntry;
+    }
+
+    let dependencies = getDependencies(turbo, task.taskId);
+
+    if (task.package === "hangar") {
+      /*
+      The wing console is a transitive dependency of hangar (hangar->winglang->@console/*).
+      Because of that, turbo knows that hangar itself also depends on it.
+      However, hangar doesn't actually interact with the console at all so it's functionally not a real dependency.
+      There is no way to denote this in turbo configuration so we have to do it manually here.
+      */
+      dependencies = dependencies.filter(
+        (dep) => !dep.startsWith("@wingconsole")
+      );
+    }
+
+    for (const dependency of dependencies) {
+      if (immediateChanges[dependency].changes) {
+        return {
+          ...dataEntry,
+          changes: true,
+        };
+      }
     }
-    break;
+
+    return dataEntry;
+  }
+
+  for (const task of turbo.tasks) {
+    fullChanges[task.taskId] = checkTransitiveChanges(turbo, task);
   }
+
+  return fullChanges;
 }
 
-for (const task of turboOutput.tasks) {
-  const dataEntry = taskData[task.taskId];
-  if (dataEntry.changes) {
-    continue;
+/**
+ * Get all the dependencies (including transitive) of the given task
+ */
+export function getDependencies(turbo: TurboOutput, taskId: string): string[] {
+  const task = turbo.tasks.find((task) => task.taskId === taskId);
+  if (!task) {
+    throw new Error(`Could not find task ${taskId}`);
   }
+
   let dependencies = task.dependencies;
-  if (task.package === "hangar") {
-    /*
-    The wing console is a transitive dependency of hangar (hangar->winglang->@console/*).
-    Because of that, turbo knows that hangar itself also depends on it.
-    However, hangar doesn't actually interact with the console at all so it's functionally not a real dependency.
-    There is no way to denote this in turbo configuration so we have to do it manually here.
-    */
-    dependencies = dependencies.filter(
-      (dependency: string) => !dependency.startsWith("@wingconsole")
-    );
-  }
+
+  // get all transitive dependencies
   for (const dependency of dependencies) {
-    dataEntry.changes = dataEntry.changes || taskData[dependency].changes;
+    dependencies = dependencies.concat(getDependencies(turbo, dependency));
   }
-}
 
-console.log(taskData);
+  // dedupe
+  dependencies = [...new Set(dependencies)];
 
-if (process.env.GITHUB_ACTIONS) {
-  setOutput("data", taskData);
+  return dependencies;
 }
diff --git a/tools/compatibility-matrix-automation/.prettierrc.json b/tools/compatibility-matrix-automation/.prettierrc.json
new file mode 100644
index 00000000000..84c85a38828
--- /dev/null
+++ b/tools/compatibility-matrix-automation/.prettierrc.json
@@ -0,0 +1,3 @@
+{
+  "overrides": []
+}
diff --git a/tools/compatibility-matrix-automation/README.md b/tools/compatibility-matrix-automation/README.md
new file mode 100644
index 00000000000..5acd0936d12
--- /dev/null
+++ b/tools/compatibility-matrix-automation/README.md
@@ -0,0 +1,9 @@
+## compatibility matrix automation
+
+A small program that is used for taking test output files, and use them in order to update the compatibility matrix (can be found here: https://www.winglang.io/docs/standard-library/compatibility-matrix)
+
+To run the script:
+
+```
+OUT_FOLDER=<path to the output files relative to this folder> npx update-matrix
+```
diff --git a/tools/compatibility-matrix-automation/bin/update-matrix.cjs b/tools/compatibility-matrix-automation/bin/update-matrix.cjs
new file mode 100755
index 00000000000..2d864177cda
--- /dev/null
+++ b/tools/compatibility-matrix-automation/bin/update-matrix.cjs
@@ -0,0 +1,13 @@
+#!/usr/bin/env -S node
+const { execSync } = require("node:child_process");
+const { resolve, relative } = require("node:path");
+
+const which = require("npm-which")(__dirname);
+const tsx = relative(process.cwd(), which.sync("tsx"));
+const cliSource = relative(
+  process.cwd(),
+  resolve(__dirname, "../src/index.ts")
+);
+execSync(`${tsx} ${cliSource} ${process.argv.slice(2).join(" ")}`, {
+  stdio: "inherit",
+});
diff --git a/tools/compatibility-matrix-automation/package.json b/tools/compatibility-matrix-automation/package.json
new file mode 100644
index 00000000000..fd6be4675e2
--- /dev/null
+++ b/tools/compatibility-matrix-automation/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "compatibility-matrix-automation",
+  "version": "1.0.0",
+  "description": "",
+  "main": "lib/index.js",
+  "bin": {
+    "update-matrix": "./bin/update-matrix.cjs"
+  },
+  "scripts": {
+    "test": "vitest run --passWithNoTests --update"
+  },
+  "author": {
+    "name": "Wing Cloud",
+    "email": "ping@wing.cloud",
+    "organization": true
+  },
+  "private": true,
+  "exports": null,
+  "sideEffects": false,
+  "dependencies": {
+    "@winglang/sdk": "workspace:^",
+    "winglang": "workspace:^"
+  },
+  "devDependencies": {
+    "typescript": "^5.3.3",
+    "vitest": "^1.6.0",
+    "@types/node": "^20.11.0",
+    "npm-which": "^3.0.1",
+    "tsx": "^4.7.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "license": "MIT",
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/tools/compatibility-matrix-automation/src/index.ts b/tools/compatibility-matrix-automation/src/index.ts
new file mode 100644
index 00000000000..a618f41d1d7
--- /dev/null
+++ b/tools/compatibility-matrix-automation/src/index.ts
@@ -0,0 +1,16 @@
+import { existsSync } from "fs";
+import { updateMatrix } from "./matrix-automation";
+import { resolve } from "path";
+
+export interface Options {}
+
+try {
+  const outFolder = process.env.TEST_OUTPUT_FOLDER;
+  if (!outFolder || !existsSync(resolve(outFolder))) {
+    throw new Error(`output folder ${outFolder} does not exist`);
+  }
+  updateMatrix(outFolder);
+} catch (err) {
+  console.error(err);
+  process.exitCode = 1;
+}
diff --git a/tools/compatibility-matrix-automation/src/matrix-automation.ts b/tools/compatibility-matrix-automation/src/matrix-automation.ts
new file mode 100644
index 00000000000..71d3ac72554
--- /dev/null
+++ b/tools/compatibility-matrix-automation/src/matrix-automation.ts
@@ -0,0 +1,148 @@
+import { readFileSync, readdirSync, writeFileSync } from "fs";
+import { join, extname } from "path";
+import { TestResultsJson } from "winglang/dist/commands/test/results";
+import { CompatibilityMatrix, CompatibilitySets } from "./types";
+
+export const SKIPPED_RESOURCES = ["TestRunner", "State"];
+export const MATRIX_PATH = join(
+  __dirname,
+  "../../../docs/docs/04-standard-library/compatibility/compatibility.json"
+);
+export const OUT_PATH = join(__dirname, "../../../out.json");
+
+export const PLATFORMS = {
+  "tf-aws": "tf-aws",
+  "tf-gcp": "tf-gcp",
+  "tf-azure": "tf-azure",
+  awscdk: "awscdk", // in the future we plan to move awscdk to its own compatibility matrix https://github.com/winglang/wing/issues/5560
+  sim: "sim",
+};
+
+export function updateMatrix(outFolderPath: string, matrixPath = MATRIX_PATH) {
+  const files = readdirSync(join(outFolderPath), {
+    withFileTypes: true,
+  }).filter((file) => file.isFile() && extname(file.name) === ".json");
+
+  const matrix = JSON.parse(
+    readFileSync(matrixPath).toString()
+  ) as CompatibilityMatrix;
+
+  for (const file of files) {
+    try {
+      const outFile = JSON.parse(
+        readFileSync(join(outFolderPath, file.name), "utf8")
+      ) as TestResultsJson;
+
+      updateMatrixFromFile(outFile, matrix);
+      console.log(`"${file.name}" parsed successfully!`);
+    } catch (error) {
+      console.error(
+        `an error occurred while trying to parse "${file.name}". error: ${error}`
+      );
+    }
+  }
+
+  writeFileSync(MATRIX_PATH, `${JSON.stringify(matrix, null, 2)}\n`);
+}
+
+export function updateMatrixFromFile(
+  outFile: TestResultsJson,
+  matrix: CompatibilityMatrix
+) {
+  const compatibility: Map<string, CompatibilitySets> = new Map();
+
+  const platform = outFile.platforms[0] as keyof typeof PLATFORMS;
+
+  for (const testFile of Object.values(outFile.results)) {
+    // @ts-expect-error
+    for (const testName in testFile) {
+      const {
+        pass,
+        unsupported,
+        unsupportedOperation,
+        unsupportedResource,
+        args = {},
+        // @ts-expect-error
+      } = testFile[testName];
+      if (unsupported && unsupportedOperation && unsupportedResource) {
+        addToCompatibilitySet(
+          compatibility,
+          unsupportedResource,
+          unsupportedOperation,
+          false
+        );
+      } else {
+        if (args.methods) {
+          for (const resource in args.methods) {
+            if (SKIPPED_RESOURCES.includes(resource)) {
+              continue;
+            }
+            (args.methods as Record<string, string[]>)[resource].forEach((op) =>
+              addToCompatibilitySet(compatibility, resource, op, pass)
+            );
+          }
+        }
+      }
+    }
+  }
+
+  return writeToMatrix(compatibility, matrix, platform);
+}
+
+export function addToCompatibilitySet(
+  compatibility: Map<string, CompatibilitySets>,
+  resource: string,
+  op: string,
+  isImplemented: boolean
+) {
+  if (!compatibility.has(resource)) {
+    compatibility.set(resource, {
+      unsupportedOps: new Set(),
+      supportedOps: new Set(),
+    });
+  }
+  const sets = compatibility.get(resource);
+  if (isImplemented) {
+    sets?.supportedOps.add(op);
+    sets?.unsupportedOps.delete(op);
+  } else if (!isImplemented && !sets?.supportedOps.has(op)) {
+    sets?.unsupportedOps.add(op);
+  }
+}
+
+export function writeOpImplementationStatus(
+  matrix: CompatibilityMatrix,
+  target: keyof typeof PLATFORMS,
+  resource: string,
+  op: string,
+  implemented: boolean
+) {
+  if (!matrix[resource]) {
+    matrix[resource] = {};
+  }
+  if (!matrix[resource][op]) {
+    matrix[resource][op] = {};
+  }
+  if (!matrix[resource][op][target]) {
+    matrix[resource][op][target] = { implemented };
+  } else {
+    matrix[resource][op][target].implemented = implemented;
+  }
+}
+
+export function writeToMatrix(
+  compatibilitySet: Map<string, CompatibilitySets>,
+  matrix: CompatibilityMatrix,
+  platform: keyof typeof PLATFORMS
+): CompatibilityMatrix {
+  for (const entry of compatibilitySet) {
+    const [resource, ops] = entry;
+    ops.supportedOps.forEach((op) =>
+      writeOpImplementationStatus(matrix, platform, resource, op, true)
+    );
+    ops.unsupportedOps.forEach((op) =>
+      writeOpImplementationStatus(matrix, platform, resource, op, false)
+    );
+  }
+  return matrix;
+}
diff --git a/tools/compatibility-matrix-automation/src/types.ts b/tools/compatibility-matrix-automation/src/types.ts
new file mode 100644
index 00000000000..9962427b987
--- /dev/null
+++ b/tools/compatibility-matrix-automation/src/types.ts
@@ -0,0 +1,9 @@
+export type CompatibilityMatrix = Record<
+  string,
+  Record<string, Record<string, { implemented: boolean; issue?: string }>>
+>;
+
+export interface CompatibilitySets {
+  supportedOps: Set<string>;
+  unsupportedOps: Set<string>;
+}
diff --git a/tools/compatibility-matrix-automation/test/matrix-automation.test.ts b/tools/compatibility-matrix-automation/test/matrix-automation.test.ts
new file mode 100644
index 00000000000..b40ddb42760
--- /dev/null
+++ b/tools/compatibility-matrix-automation/test/matrix-automation.test.ts
@@ -0,0 +1,179 @@
+import { test, describe, expect } from "vitest";
+import {
+  addToCompatibilitySet,
+  updateMatrixFromFile,
+  writeOpImplementationStatus,
+  writeToMatrix,
+} from "../src/matrix-automation";
+import { TestResultsJson } from "winglang/dist/commands/test/results";
+
+describe("addToCompatibilitySet", () => {
+  test("adds an implemented method to the right set", () => {
+    const compatibilitySet = new Map();
+    addToCompatibilitySet(compatibilitySet, "Bucket", "get", true);
+    expect(compatibilitySet.get("Bucket").supportedOps).toEqual(
+      new Set(["get"])
+    );
+    expect(compatibilitySet.get("Bucket").unsupportedOps).toEqual(new Set());
+  });
+  test("adds non implemented method to the right set- if doesn't exist on the implemented set", () => {
+    const compatibilitySet = new Map();
+    addToCompatibilitySet(compatibilitySet, "Bucket", "get", false);
+    expect(compatibilitySet.get("Bucket").unsupportedOps).toEqual(
+      new Set(["get"])
+    );
+    expect(compatibilitySet.get("Bucket").supportedOps).toEqual(new Set());
+  });
+  test("adds non implemented method to the right set- if exists on the implemented set", () => {
+    const compatibilitySet = new Map();
+    compatibilitySet.set("Bucket", {
+      supportedOps: new Set(["get"]),
+      unsupportedOps: new Set(),
+    });
+    addToCompatibilitySet(compatibilitySet, "Bucket", "get", false);
+    expect(compatibilitySet.get("Bucket").supportedOps).toEqual(
+      new Set(["get"])
+    );
+    expect(compatibilitySet.get("Bucket").unsupportedOps).toEqual(new Set());
+  });
+});
+
+// writeOpImplementationStatus
+describe("writeOpImplementationStatus adds method implementation status when", () => {
+  test("Bucket does't appear in matrix", () => {
+    const matrix = {};
+    writeOpImplementationStatus(matrix, "sim", "Bucket", "get", false);
+    expect(matrix).toEqual({
+      Bucket: { get: { sim: { implemented: false } } },
+    });
+  });
+  test("method doesn't appear in matrix", () => {
+    const matrix = {
+      Bucket: { put: { sim: { implemented: false } } },
+    };
+    writeOpImplementationStatus(matrix, "sim", "Bucket", "get", true);
+    expect(matrix).toEqual({
+      Bucket: {
+        get: { sim: { implemented: true } },
+        put: { sim: { implemented: false } },
+      },
+    });
+  });
+  test("target doesn't appear in matrix", () => {
+    const matrix = {
+      Bucket: { get: { "tf-aws": { implemented: false } } },
+    };
+    writeOpImplementationStatus(matrix, "sim", "Bucket", "get", true);
+    expect(matrix).toEqual({
+      Bucket: {
+        get: {
+          "tf-aws": { implemented: false },
+          sim: { implemented: true },
+        },
+      },
+    });
+  });
+  test("Bucket, method and target appear in matrix", () => {
+    const matrix = {
+      Bucket: { get: { sim: { implemented: false } } },
+    };
+    writeOpImplementationStatus(matrix, "sim", "Bucket", "get", true);
+    expect(matrix).toEqual({
+      Bucket: {
+        get: {
+          sim: { implemented: true },
+        },
+      },
+    });
+  });
+});
+
+describe("writeToMatrix", () => {
+  test("adds supported op set to a matrix", () => {
+    const matrix = {};
+    const compatibilitySets = new Map();
+    compatibilitySets.set("Bucket", {
+      supportedOps: new Set(["get", "put"]),
+      unsupportedOps: new Set(),
+    });
+    writeToMatrix(compatibilitySets, matrix, "sim");
+    expect(matrix).toEqual({
+      Bucket: {
+        get: {
+          sim: { implemented: true },
+        },
+        put: {
+          sim: { implemented: true },
+        },
+      },
+    });
+  });
+  test("adds non supported op set to a matrix", () => {
+    const matrix = {};
+    const compatibilitySets = new Map();
+    compatibilitySets.set("Bucket", {
+      unsupportedOps: new Set(["put", "putJson"]),
+      supportedOps: new Set(),
+    });
+    writeToMatrix(compatibilitySets, matrix, "sim");
+    expect(matrix).toEqual({
+      Bucket: {
+        put: {
+          sim: { implemented: false },
+        },
+        putJson: {
+          sim: { implemented: false },
+        },
+      },
+    });
+  });
+});
+
+describe("updateMatrixFromFile", () => {
+  test("reads a file and returns matrix information", () => {
+    const outFile: TestResultsJson = {
+      duration: 6000,
+      platforms: ["sim"],
+      results: {
+        testFile: {
+          test1: {
+            path: "",
+            pass: true,
+            args: {
+              methods: { TestRunner: ["findTests"], Bucket: ["put", "list"] },
+            },
+            traces: [],
+          },
+          test2: {
+            path: "",
+            pass: true,
+            unsupported: true,
+            unsupportedResource: "Bucket",
+            unsupportedOperation: "signedUrl",
+            traces: [],
+          },
+          test3: {
+            path: "",
+            pass: false,
+            args: {
+              methods: {
+                TestRunner: ["findTests"],
+                Bucket: ["putJson", "list"],
+              },
+            },
+            traces: [],
+          },
+        },
+      },
+    };
+    const matrix = updateMatrixFromFile(outFile, {});
+    expect(matrix).toEqual({
+      Bucket: {
+        put: { sim: { implemented: true } },
+        list: { sim: { implemented: true } },
+        signedUrl: { sim: { implemented: false } },
+        putJson: { sim: { implemented: false } },
+      },
+    });
+  });
+});
diff --git a/tools/compatibility-matrix-automation/tsconfig.json b/tools/compatibility-matrix-automation/tsconfig.json
new file mode 100644
index 00000000000..0fde2334d66
--- /dev/null
+++ b/tools/compatibility-matrix-automation/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "module": "ES2022",
+    "target": "ES2022",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  }
+}
diff --git a/tools/compatibility-matrix-automation/turbo.json b/tools/compatibility-matrix-automation/turbo.json
new file mode 100644
index 00000000000..91d776dab12
--- /dev/null
+++ b/tools/compatibility-matrix-automation/turbo.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "test": {}
+  }
+}
diff --git a/tools/generate-workspace/package.json b/tools/generate-workspace/package.json
index 78725c35fc9..ff4ee42ce22 100644
--- a/tools/generate-workspace/package.json
+++ b/tools/generate-workspace/package.json
@@ -14,14 +14,14 @@
   "scripts": {},
   "devDependencies": {
     "@types/fs-extra": "^11",
-    "@types/node": "^18.16.18",
+    "@types/node": "^20.11.0",
     "@types/semver": "^7.5.0",
     "typescript": "^5.1.3"
   },
   "dependencies": {
     "@pnpm/find-workspace-dir": "^6.0.2",
     "@pnpm/workspace.find-packages": "^1.0.1",
-    "tsx": "^3.12.7",
+    "tsx": "^4.7.0",
     "npm-which": "^3.0.1"
   },
   "volta": {
diff --git a/tools/generate-workspace/src/cli.ts b/tools/generate-workspace/src/cli.ts
index 251383d5004..12083693adb 100644
--- a/tools/generate-workspace/src/cli.ts
+++ b/tools/generate-workspace/src/cli.ts
@@ -5,38 +5,47 @@ import { join } from "path";
 
 // Define ignore list and name mapping
 const ignoreList = [
-  "construct-library",
-  "@wingconsole/eslint-plugin",
-  "generate-workspace",
-  "bump-pack",
-  "@winglang/wingii",
-  "@winglang/wingc",
-  "@winglang/tree-sitter-wing",
+  "@wingcloud/framework",
+  "@wingconsole/design-system",
   "@wingconsole/error-message",
-  "@wingconsole/use-loading",
+  "@wingconsole/eslint-plugin",
   "@wingconsole/tsconfig",
-  "hangar",
-  "@wingconsole/design-system",
+  "@wingconsole/use-loading",
   "@wingconsole/use-persistent-state",
+  "@winglang/compatibility-spy",
+  "@winglang/platform-awscdk",
+  "@winglang/tree-sitter-wing",
+  "@winglang/wingc",
+  "@winglang/wingii",
   "@winglibs/testfixture",
+  "bump-pack",
+  "compatibility-matrix-automation",
+  "construct-library",
+  "generate-workspace",
+  "hangar",
+  "jsii-fixture",
+  "ts-fixture",
 ];
 
 const nameMapping: Record<string, string> = {
-  "@winglang/monorepo": "ROOT",
-  "winglang": "CLI",
-  "@winglang/compiler": "Compiler",
-  "@winglang/sdk": "SDK",
-  "examples-sdk": "SDK Tests",
-  "docs": "Docs",
   "@wingconsole/app": "Console App",
   "@wingconsole/server": "Console Server",
   "@wingconsole/ui": "Console UI",
-  "vscode-wing": "VSCode",
+  "@winglang/compiler": "Compiler",
   "@winglang/jsii-docgen": "API Docs Generator",
-  "wing-api-checker": "API Checker",
-  "examples-valid": "Tests: Valid",
-  "examples-invalid": "Tests: Invalid",
+  "@winglang/compatibility-spy": "Compatibility spy",
+  "@winglang/monorepo": "ROOT",
+  "@winglang/sdk": "SDK",
+  docs: "Docs",
   "examples-error": "Tests: Error",
+  "examples-invalid": "Tests: Invalid",
+  "examples-sdk": "SDK Tests",
+  "examples-valid": "Tests: Valid",
+  "vscode-wing": "VSCode",
+  "wing-api-checker": "API Checker",
+  winglang: "CLI",
+  "wingcli-v2": "CLIv2",
+  "@winglang/wingtunnels": "Tunnel Server",
 };
 
 async function getWorkspaceDir() {
@@ -70,32 +79,46 @@ function getFolders(workspacePackages: any[], workspaceDir: string) {
 }
 
 function sortFolders(folders: any[]) {
-  let sortedFolders = Object.keys(nameMapping).map(key => {
-    return folders.find(folder => folder.name === key || folder.name === nameMapping[key]);
-  }).filter(Boolean);
+  let sortedFolders = Object.keys(nameMapping)
+    .map((key) => {
+      return folders.find(
+        (folder) => folder.name === key || folder.name === nameMapping[key]
+      );
+    })
+    .filter(Boolean);
   return sortedFolders;
 }
 
 function warnAboutPackages(workspacePackages: any[]) {
-  workspacePackages.forEach(pkg => {
+  workspacePackages.forEach((pkg) => {
     const pkgName = pkg.manifest.name;
-    if (pkgName && (!ignoreList.includes(pkgName) && !Object.keys(nameMapping).includes(pkgName))) {
-      console.warn(`Warning: Package ${pkgName} is not present in ignore list or name mappings. Please check ./tools/generate-workspace/src/cli.ts`);
+    if (
+      pkgName &&
+      !ignoreList.includes(pkgName) &&
+      !Object.keys(nameMapping).includes(pkgName)
+    ) {
+      console.warn(
+        `Warning: Package ${pkgName} is not present in ignore list or name mappings. Please check ./tools/generate-workspace/src/cli.ts`
+      );
     }
   });
 }
 
 function checkIgnoreListAndNameMapping(workspacePackages: any[]) {
-  ignoreList.forEach(ignoreItem => {
-    if (!workspacePackages.some(pkg => pkg.manifest.name === ignoreItem)) {
-      console.error(`Error: ${ignoreItem} from ignore list is not present as a workspace package. Please check ./tools/generate-workspace/src/cli.ts`);
+  ignoreList.forEach((ignoreItem) => {
+    if (!workspacePackages.some((pkg) => pkg.manifest.name === ignoreItem)) {
+      console.error(
+        `Error: ${ignoreItem} from ignore list is not present as a workspace package. Please check ./tools/generate-workspace/src/cli.ts`
+      );
       process.exit(1);
     }
   });
 
-  Object.keys(nameMapping).forEach(mappingItem => {
-    if (!workspacePackages.some(pkg => pkg.manifest.name === mappingItem)) {
-      console.error(`Error: ${mappingItem} from name mapping is not present as a workspace package. Please check ./tools/generate-workspace/src/cli.ts`);
+  Object.keys(nameMapping).forEach((mappingItem) => {
+    if (!workspacePackages.some((pkg) => pkg.manifest.name === mappingItem)) {
+      console.error(
+        `Error: ${mappingItem} from name mapping is not present as a workspace package. Please check ./tools/generate-workspace/src/cli.ts`
+      );
       process.exit(1);
     }
   });
@@ -103,7 +126,10 @@ function checkIgnoreListAndNameMapping(workspacePackages: any[]) {
 
 function writeWorkspaceFile(workspaceDir: string, sortedFolders: any[]) {
   const workspaceFilePath = join(workspaceDir, "wing.code-workspace");
-  writeFileSync(workspaceFilePath, JSON.stringify({ folders: sortedFolders, settings: {}}, null, 2));
+  writeFileSync(
+    workspaceFilePath,
+    JSON.stringify({ folders: sortedFolders, settings: {} }, null, 2)
+  );
   console.log(`Workspace file written to ${workspaceFilePath}`);
 }
 
diff --git a/tools/hangar/__snapshots__/compatibility-spy.ts.snap b/tools/hangar/__snapshots__/compatibility-spy.ts.snap
new file mode 100644
index 00000000000..c57efc15d52
--- /dev/null
+++ b/tools/hangar/__snapshots__/compatibility-spy.ts.snap
@@ -0,0 +1,855 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`aws-counter.test.w 1`] = `
+{
+  "duration": "<DURATION>",
+  "platforms": [
+    "sim",
+    "node_modules/@winglang/compatibility-spy/lib",
+  ],
+  "results": {
+    "counter/aws-counter.test.w": {
+      "validates the AWS counter name": {
+        "args": {
+          "methods": {
+            "TestRunner": [
+              "findTests",
+            ],
+          },
+        },
+        "pass": true,
+        "path": "root/env0/test:validates the AWS counter name",
+        "traces": [
+          {
+            "data": {
+              "message": "Invoke (payload=undefined).",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/test:validates the AWS counter name/Handler",
+            "sourceType": "@winglang/sdk.cloud.Function",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+        ],
+      },
+    },
+  },
+}
+`;
+
+exports[`dec.test.w 1`] = `
+{
+  "duration": "<DURATION>",
+  "platforms": [
+    "sim",
+    "node_modules/@winglang/compatibility-spy/lib",
+  ],
+  "results": {
+    "counter/dec.test.w": {
+      "dec()": {
+        "args": {
+          "methods": {
+            "Counter": [
+              "dec",
+              "peek",
+            ],
+            "TestRunner": [
+              "findTests",
+            ],
+          },
+        },
+        "pass": true,
+        "path": "root/env0/test:dec()",
+        "traces": [
+          {
+            "data": {
+              "message": "dec()",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "-1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "dec(5)",
+              "result": "-1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "-6",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "dec(-4)",
+              "result": "-6",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "-2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "dec(0)",
+              "result": "-2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "-2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "dec(5, "custom-key")",
+              "result": "-1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "-6",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "dec(-4, "custom-key")",
+              "result": "-6",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "-2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "dec(0, "custom-key")",
+              "result": "-2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "-2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "Invoke (payload=undefined).",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/test:dec()/Handler",
+            "sourceType": "@winglang/sdk.cloud.Function",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+        ],
+      },
+    },
+  },
+}
+`;
+
+exports[`inc.test.w 1`] = `
+{
+  "duration": "<DURATION>",
+  "platforms": [
+    "sim",
+    "node_modules/@winglang/compatibility-spy/lib",
+  ],
+  "results": {
+    "counter/inc.test.w": {
+      "inc()": {
+        "args": {
+          "methods": {
+            "Counter": [
+              "inc",
+              "peek",
+            ],
+            "TestRunner": [
+              "findTests",
+            ],
+          },
+        },
+        "pass": true,
+        "path": "root/env0/test:inc()",
+        "traces": [
+          {
+            "data": {
+              "message": "inc()",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc(5)",
+              "result": "1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "6",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc(-4)",
+              "result": "6",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc(0)",
+              "result": "2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "2",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc(5, "custom-key")",
+              "result": "-1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "4",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc(-4, "custom-key")",
+              "result": "4",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc(0, "custom-key")",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "Invoke (payload=undefined).",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/test:inc()/Handler",
+            "sourceType": "@winglang/sdk.cloud.Function",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+        ],
+      },
+    },
+  },
+}
+`;
+
+exports[`initial.test.w 1`] = `
+{
+  "duration": "<DURATION>",
+  "platforms": [
+    "sim",
+    "node_modules/@winglang/compatibility-spy/lib",
+  ],
+  "results": {
+    "counter/initial.test.w": {
+      "initial": {
+        "args": {
+          "methods": {
+            "Counter": [
+              "initial",
+              "peek",
+            ],
+            "TestRunner": [
+              "findTests",
+            ],
+          },
+        },
+        "pass": true,
+        "path": "root/env0/test:initial",
+        "traces": [
+          {
+            "data": {
+              "message": "peek()",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counterA/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "500",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counterB/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "-198",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counterC/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "Invoke (payload=undefined).",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/test:initial/Handler",
+            "sourceType": "@winglang/sdk.cloud.Function",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+        ],
+      },
+    },
+  },
+}
+`;
+
+exports[`peek.test.w 1`] = `
+{
+  "duration": "<DURATION>",
+  "platforms": [
+    "sim",
+    "node_modules/@winglang/compatibility-spy/lib",
+  ],
+  "results": {
+    "counter/peek.test.w": {
+      "peek": {
+        "args": {
+          "methods": {
+            "Counter": [
+              "peek",
+              "inc",
+            ],
+            "TestRunner": [
+              "findTests",
+            ],
+          },
+        },
+        "pass": true,
+        "path": "root/env0/test:peek",
+        "traces": [
+          {
+            "data": {
+              "message": "peek()",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc()",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("my-key")",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("my-key")",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "inc(nil, "my-key")",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("my-key")",
+              "result": "1",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/Counter/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "Invoke (payload=undefined).",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/test:peek/Handler",
+            "sourceType": "@winglang/sdk.cloud.Function",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+        ],
+      },
+    },
+  },
+}
+`;
+
+exports[`set.test.w 1`] = `
+{
+  "duration": "<DURATION>",
+  "platforms": [
+    "sim",
+    "node_modules/@winglang/compatibility-spy/lib",
+  ],
+  "results": {
+    "counter/set.test.w": {
+      "set()": {
+        "args": {
+          "methods": {
+            "Counter": [
+              "set",
+              "peek",
+            ],
+            "TestRunner": [
+              "findTests",
+            ],
+          },
+        },
+        "pass": true,
+        "path": "root/env0/test:set()",
+        "traces": [
+          {
+            "data": {
+              "message": "set(42)",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "42",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "set(-100)",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "-100",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "set(0)",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek()",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter1/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "set(42, "custom-key")",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "42",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "set(-100, "custom-key")",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "-100",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "set(0, "custom-key")",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "peek("custom-key")",
+              "result": "0",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/counter2/Resource",
+            "sourceType": "@winglang/sdk.sim.Resource",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+          {
+            "data": {
+              "message": "Invoke (payload=undefined).",
+              "status": "success",
+            },
+            "level": "verbose",
+            "sourcePath": "root/env0/test:set()/Handler",
+            "sourceType": "@winglang/sdk.cloud.Function",
+            "timestamp": "<TIMESTAMP>",
+            "type": "resource",
+          },
+        ],
+      },
+    },
+  },
+}
+`;
diff --git a/tools/hangar/__snapshots__/error.ts.snap b/tools/hangar/__snapshots__/error.ts.snap
index 64e5e9eed79..b5936f2d530 100644
--- a/tools/hangar/__snapshots__/error.ts.snap
+++ b/tools/hangar/__snapshots__/error.ts.snap
@@ -1,60 +1,140 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`bool_from_json.test.w 1`] = `
-"runtime error: unable to parse bool:
-- instance is not of a type(s) boolean
+"Error: unable to parse bool:
+- bool must be boolean
   --> ../../../examples/tests/error/bool_from_json.test.w:5:15
   | // If it is run with other tests, subsequent failures will be ignored in snapshot.
   | let j = Json { a: 123 };
   | 
-5 | let a: bool = bool.fromJson(j.get(\\"a\\"));
+5 | let a: bool = bool.fromJson(j.get("a"));
   |               ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/bool_from_json.test.w:5:15
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`fail_to_start_simulator.test.w 1`] = `
+"[ERROR] dep_on_failing_resource | Error: Failed to start container: Command "docker pull" exited with non-zero code 1 (see verbose logs)
+[ERROR] dep_on_failing_resource | Error: Unable to resolve attribute 'host_port' for resource "root/env0/Container" referenced by "root/env0/test:dep_on_failing_resource/Handler"
+[ERROR] (no test) | Error: Unable to resolve attribute 'host_port' for resource "root/env0/Container" referenced by "root/env0/test:dep_on_failing_resource/Handler"
+Failed to start resources: "root/env0/test:dep_on_failing_resource/Handler", "root/cloud.TestRunner"
+
 Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`inflight_stacktraces.test.w 1`] = `
+"fail ┌ inflight_stacktraces.test.wsim » root/env0/test:assert              
+     │ Error: assertion failed: false
+     │   --> ../../../examples/tests/error/inflight_stacktraces.test.w:7:3
+     │   | let bucket = new cloud.Bucket();
+     │   | 
+     │   | test "assert" {
+     │ 7 |   assert(false);
+     │   |   ^
+     └ at <ABSOLUTE>/inflight_stacktraces.test.w:7:3
+fail ┌ inflight_stacktraces.test.wsim » root/env1/test:expect.equal        
+     │ Error: AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:
+     │ 
+     │ 1 !== 2
+     │ 
+     │    --> ../../../examples/tests/error/inflight_stacktraces.test.w:11:3
+     │    | }
+     │    | 
+     │    | test "expect.equal" {
+     │ 11 |   expect.equal(1,2 );
+     │    |   ^
+     └ at <ABSOLUTE>/inflight_stacktraces.test.w:11:3
+fail ┌ inflight_stacktraces.test.wsim » root/env2/test:bucket failed delete
+     │ Error: Object does not exist (key=doesn't exist).
+     │    --> ../../../examples/tests/error/inflight_stacktraces.test.w:15:3
+     │    | }
+     │    | 
+     │    | test "bucket failed delete" {
+     │ 15 |   bucket.delete("doesn't exist", mustExist: true);
+     │    |   ^
+     └ at <ABSOLUTE>/inflight_stacktraces.test.w:15:3
+fail ┌ inflight_stacktraces.test.wsim » root/env3/test:throw from closure  
+     │ Error: ouch
+     │    --> ../../../examples/tests/error/inflight_stacktraces.test.w:20:5
+     │    | 
+     │    | test "throw from closure" {
+     │    |   let closure = inflight () => {
+     │ 20 |     throw "ouch";
+     │    |     ^
+     │ at closure <ABSOLUTE>/inflight_stacktraces.test.w:20:5
+     └ at <ABSOLUTE>/inflight_stacktraces.test.w:22:3
+fail ┌ inflight_stacktraces.test.wsim » root/env4/test:assert with message 
+     │ Error: assertion failed: x is false
+     │    --> ../../../examples/tests/error/inflight_stacktraces.test.w:27:3
+     │    | 
+     │    | test "assert with message" {
+     │    |   let x = false;
+     │ 27 |   assert(x, "x is false");
+     │    |   ^
+     └ at <ABSOLUTE>/inflight_stacktraces.test.w:27:3
+
+Tests 5 failed (5)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`invalid-token.test.w 1`] = `
+"[ERROR] test cannot access unresolved token | Error: Unable to resolve attribute 'fake-attr' for resource "root/env0/MyResource/Resource" referenced by "root/env0/test:test cannot access unresolved token/Handler"
+[ERROR] (no test) | Error: Unable to resolve attribute 'fake-attr' for resource "root/env0/MyResource/Resource" referenced by "root/env0/test:test cannot access unresolved token/Handler"
+Failed to start resources: "root/env0/test:test cannot access unresolved token/Handler", "root/cloud.TestRunner"
+
+Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`num_from_str.test.w 1`] = `
-"runtime error: unable to parse \\"123a\\" as a number
+"Error: unable to parse "123a" as a number
   --> ../../../examples/tests/error/num_from_str.test.w:3:14
   | // Note that this test has to be alone because it needs to compile successfully and fail at preflight.
   | // If it is run with other tests, subsequent failures will be ignored in snapshot.
-3 | let a: num = num.fromStr(\\"123a\\");
+3 | let a: num = num.fromStr("123a");
   |              ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/num_from_str.test.w:3:14
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`number_from_json.test.w 1`] = `
-"runtime error: unable to parse num:
-- instance is not of a type(s) number
+"Error: unable to parse num:
+- num must be number
   --> ../../../examples/tests/error/number_from_json.test.w:5:14
   | // If it is run with other tests, subsequent failures will be ignored in snapshot.
-  | let j = Json { a: \\"apples\\" };
+  | let j = Json { a: "apples" };
   | 
-5 | let a: num = num.fromJson(j.get(\\"a\\"));
+5 | let a: num = num.fromJson(j.get("a"));
   |              ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/number_from_json.test.w:5:14
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`repeat_construct_id.test.w 1`] = `
-"runtime error: There is already a Construct with name 'cloud.Bucket' in $Root [env0]
+"Error: There is already a Construct with name 'Bucket' in $Root [env0]
 
 hint: Every preflight object needs a unique identifier within its scope. You can assign one as shown:
 
-> new cloud.Bucket() as \\"MyBucket\\";
+> new cloud.Bucket() as "MyBucket";
 
 For more information, see https://www.winglang.io/docs/concepts/application-tree
   --> ../../../examples/tests/error/repeat_construct_id.test.w:4:15
@@ -63,149 +143,149 @@ For more information, see https://www.winglang.io/docs/concepts/application-tree
   | let bucket1 = new cloud.Bucket();
 4 | let bucket2 = new cloud.Bucket();
   |               ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/repeat_construct_id.test.w:4:15
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`repeat_construct_id2.test.w 1`] = `
-"runtime error: There is already a Construct with name 'bucket-name' in $Root [env0]
+"Error: There is already a Construct with name 'bucket-name' in $Root [env0]
 
 hint: Every preflight object needs a unique identifier within its scope. You can assign one as shown:
 
-> new cloud.Bucket() as \\"MyBucket\\";
+> new cloud.Bucket() as "MyBucket";
 
 For more information, see https://www.winglang.io/docs/concepts/application-tree
   --> ../../../examples/tests/error/repeat_construct_id2.test.w:8:15
   | };
   | 
-  | let bucket1 = new cloud.Bucket() as \\"{make_name()}\\";
-8 | let bucket2 = new cloud.Bucket() as \\"{make_name()}\\";
+  | let bucket1 = new cloud.Bucket() as "{make_name()}";
+8 | let bucket2 = new cloud.Bucket() as "{make_name()}";
   |               ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/repeat_construct_id2.test.w:8:15
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`string_from_json.test.w 1`] = `
-"runtime error: unable to parse string:
-- instance is not of a type(s) string
+"Error: unable to parse string:
+- string must be string
   --> ../../../examples/tests/error/string_from_json.test.w:5:14
   | // If it is run with other tests, subsequent failures will be ignored in snapshot.
   | let j = Json { a: 123 };
   | 
-5 | let a: str = str.fromJson(j.get(\\"a\\"));
+5 | let a: str = str.fromJson(j.get("a"));
   |              ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/string_from_json.test.w:5:14
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`struct_from_json_1.test.w 1`] = `
-"runtime error: unable to parse Person:
-- instance.age is not of a type(s) number
+"Error: unable to parse Person:
+- Person/age must be number
    --> ../../../examples/tests/error/struct_from_json_1.test.w:11:1
    | 
-   | let j = {name: \\"cool\\", age: \\"not a number\\"};
+   | let j = {name: "cool", age: "not a number"};
    | 
 11 | Person.fromJson(j);
    | ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/struct_from_json_1.test.w:11:1
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`struct_from_json_2.test.w 1`] = `
-"runtime error: unable to parse Student:
-- instance.age is not of a type(s) number
-- instance requires property \\"advisor\\"
+"Error: unable to parse Student:
+- Student must have required property 'advisor'
+- Student/age must be number
    --> ../../../examples/tests/error/struct_from_json_2.test.w:22:1
-   |   age: \\"not a number\\"
+   |   age: "not a number"
    | };
    | 
 22 | Student.fromJson(missingAdvisor);
    | ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/struct_from_json_2.test.w:22:1
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`struct_from_json_3.test.w 1`] = `
-"runtime error: unable to parse Student:
-- instance.advisors[1].id is not of a type(s) string
-- instance.age is not of a type(s) number
+"Error: unable to parse Student:
+- Student/advisors/1/id must be string
+- Student/age must be number
    --> ../../../examples/tests/error/struct_from_json_3.test.w:26:1
    |   ]
    | };
    | 
 26 | Student.fromJson(invalidAdvisorInArray);
    | ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/struct_from_json_3.test.w:26:1
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`struct_from_json_4.test.w 1`] = `
-"runtime error: unable to parse Student:
-- instance.advisors contains duplicate item
+"Error: unable to parse Student:
+- Student/advisors must NOT have duplicate items (items ## 0 and 1 are identical)
    --> ../../../examples/tests/error/struct_from_json_4.test.w:27:1
    |   ]
    | };
    | 
 27 | Student.fromJson(invalidAdvisorInArray);
    | ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/struct_from_json_4.test.w:27:1
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`struct_from_json_5.test.w 1`] = `
-"runtime error: unable to parse Foo:
-- instance.names.c is not of a type(s) string
+"Error: unable to parse Foo:
+- Foo/names/c must be string
    --> ../../../examples/tests/error/struct_from_json_5.test.w:16:1
    |   }
    | };
    | 
 16 | Foo.fromJson(jFoo);
    | ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/struct_from_json_5.test.w:16:1
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`utilities.test.w 1`] = `
-"runtime error: assertion failed: false
+"Error: assertion failed: false
   --> ../../../examples/tests/error/utilities.test.w:1:1
 1 | assert(false);
   | ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/utilities.test.w:1:1
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
diff --git a/tools/hangar/__snapshots__/esm.ts.snap b/tools/hangar/__snapshots__/esm.ts.snap
new file mode 100644
index 00000000000..f0e50ebf2c2
--- /dev/null
+++ b/tools/hangar/__snapshots__/esm.ts.snap
@@ -0,0 +1,10 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`tests module package type 1`] = `
+"pass ─ module_type.test.wsim » root/env0/test:run extern
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>"
+`;
diff --git a/tools/hangar/__snapshots__/invalid.ts.snap b/tools/hangar/__snapshots__/invalid.ts.snap
index 519ca25480c..d9674665bb4 100644
--- a/tools/hangar/__snapshots__/invalid.ts.snap
+++ b/tools/hangar/__snapshots__/invalid.ts.snap
@@ -1,223 +1,308 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`access_hidden_namespace.test.w 1`] = `
-"error: Unknown symbol \\"core\\"
+"error: Unknown symbol "core"
   --> ../../../examples/tests/invalid/access_hidden_namespace.test.w:7:5
   |
-7 | new core.NodeJsCode(\\"<ABSOLUTE>/test.txt\\"); // This should fail even though \`fs.TextFile\` extends \`core.FileBase\` because we didn't bring in \`core\` explicitly.
-  |     ^^^^ Unknown symbol \\"core\\"
+7 | new core.NodeJsCode("<ABSOLUTE>/test.txt"); // This should fail even though \`fs.TextFile\` extends \`core.FileBase\` because we didn't bring in \`core\` explicitly.
+  |     ^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`access_modifiers.test.w 1`] = `
-"error: Method \\"private_method\\" is private in \\"Foo\\" but it's an implementation of \\"SomeInterface\\". Interface members must be public.
+"error: Method "private_method" is private in "Foo" but it's an implementation of "SomeInterface". Interface members must be public.
    --> ../../../examples/tests/invalid/access_modifiers.test.w:49:3
    |
 49 |   private_method() {}
-   |   ^^^^^^^^^^^^^^ Method \\"private_method\\" is private in \\"Foo\\" but it's an implementation of \\"SomeInterface\\". Interface members must be public.
+   |   ^^^^^^^^^^^^^^
 
 
-error: Method \\"protected_method\\" is protected in \\"Foo\\" but it's an implementation of \\"SomeInterface\\". Interface members must be public.
+error: Method "protected_method" is protected in "Foo" but it's an implementation of "SomeInterface". Interface members must be public.
    --> ../../../examples/tests/invalid/access_modifiers.test.w:47:13
    |
 47 |   protected protected_method() {}
-   |             ^^^^^^^^^^^^^^^^ Method \\"protected_method\\" is protected in \\"Foo\\" but it's an implementation of \\"SomeInterface\\". Interface members must be public.
+   |             ^^^^^^^^^^^^^^^^
 
 
-error: Cannot override private method \\"method\\" of \\"Foo\\"
+error: Cannot override private method "method" of "Foo"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:58:3
    |
 58 |   method() {
-   |   ^^^^^^ Cannot override private method \\"method\\" of \\"Foo\\"
+   |   ^^^^^^
 
 
-error: Cannot override private method \\"method\\" of \\"Bar\\"
+error: Cannot override private method "method" of "Bar"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:81:3
    |
 81 |   method() {
-   |   ^^^^^^ Cannot override private method \\"method\\" of \\"Bar\\"
+   |   ^^^^^^
 
 
-error: Cannot access protected member \\"protected_field\\" of \\"Foo\\"
+error: Cannot access protected member "protected_field" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:109:9
     |
+  8 |   protected protected_field: str;
+    |             --------------- defined here
+    .
 109 | log(foo.protected_field);
-    |         ^^^^^^^^^^^^^^^ Cannot access protected member \\"protected_field\\" of \\"Foo\\"
+    |         ^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "protected_field" needs a broader access modifier like "pub" to be used outside of "Foo"
 
 
-error: Cannot access private member \\"private_field\\" of \\"Foo\\"
+error: Cannot access private member "private_field" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:111:9
     |
+  9 |   private_field: str;
+    |   ------------- defined here
+    .
 111 | log(foo.private_field);
-    |         ^^^^^^^^^^^^^ Cannot access private member \\"private_field\\" of \\"Foo\\"
+    |         ^^^^^^^^^^^^^
+    |
+    = hint: the definition of "private_field" needs a broader access modifier like "pub" or "protected" to be used outside of "Foo"
 
 
-error: Cannot access protected member \\"protected_static_method\\" of \\"Foo\\"
+error: Cannot access protected member "protected_static_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:115:5
     |
+ 53 |   protected static protected_static_method() {}
+    |                    ----------------------- defined here
+    .
 115 | Foo.protected_static_method();
-    |     ^^^^^^^^^^^^^^^^^^^^^^^ Cannot access protected member \\"protected_static_method\\" of \\"Foo\\"
+    |     ^^^^^^^^^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "protected_static_method" needs a broader access modifier like "pub" to be used outside of "Foo"
 
 
-error: Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+error: Cannot access private member "private_static_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:117:5
     |
+ 54 |   static private_static_method() {}
+    |          --------------------- defined here
+    .
 117 | Foo.private_static_method();
-    |     ^^^^^^^^^^^^^^^^^^^^^ Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+    |     ^^^^^^^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "private_static_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Foo"
 
 
-error: Cannot override public method \\"public_method\\" of \\"Foo\\" with a private method
+error: Cannot override public method "public_method" of "Foo" with a private method
     --> ../../../examples/tests/invalid/access_modifiers.test.w:157:3
     |
 157 |   public_method() {}
-    |   ^^^^^^^^^^^^^ Cannot override public method \\"public_method\\" of \\"Foo\\" with a private method
+    |   ^^^^^^^^^^^^^
 
 
-error: Cannot override protected method \\"protected_method\\" of \\"Foo\\" with a private method
+error: Cannot override protected method "protected_method" of "Foo" with a private method
     --> ../../../examples/tests/invalid/access_modifiers.test.w:159:3
     |
 159 |   protected_method() {}
-    |   ^^^^^^^^^^^^^^^^ Cannot override protected method \\"protected_method\\" of \\"Foo\\" with a private method
+    |   ^^^^^^^^^^^^^^^^
 
 
-error: Cannot override private method \\"private_method\\" of \\"Foo\\"
+error: Cannot override private method "private_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:161:3
     |
 161 |   private_method() {}
-    |   ^^^^^^^^^^^^^^ Cannot override private method \\"private_method\\" of \\"Foo\\"
+    |   ^^^^^^^^^^^^^^
 
 
-error: Cannot override public method \\"public_method\\" of \\"Foo\\" with a protected method
+error: Cannot override public method "public_method" of "Foo" with a protected method
     --> ../../../examples/tests/invalid/access_modifiers.test.w:166:13
     |
 166 |   protected public_method() {}
-    |             ^^^^^^^^^^^^^ Cannot override public method \\"public_method\\" of \\"Foo\\" with a protected method
+    |             ^^^^^^^^^^^^^
 
 
-error: Cannot override private method \\"private_method\\" of \\"Foo\\"
+error: Cannot override private method "private_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:169:13
     |
 169 |   protected private_method() {}
-    |             ^^^^^^^^^^^^^^ Cannot override private method \\"private_method\\" of \\"Foo\\"
+    |             ^^^^^^^^^^^^^^
 
 
-error: Cannot override private method \\"private_method\\" of \\"Foo\\"
+error: Cannot override private method "private_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:176:7
     |
 176 |   pub private_method() {}
-    |       ^^^^^^^^^^^^^^ Cannot override private method \\"private_method\\" of \\"Foo\\"
+    |       ^^^^^^^^^^^^^^
 
 
-error: Cannot access private member \\"private_field\\" of \\"Bar\\"
+error: Cannot access private member "private_field" of "Bar"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:61:14
    |
+ 9 |   private_field: str;
+   |   ------------- defined here
+   .
 61 |     log(this.private_field);
-   |              ^^^^^^^^^^^^^ Cannot access private member \\"private_field\\" of \\"Bar\\"
+   |              ^^^^^^^^^^^^^
+   |
+   = hint: the definition of "private_field" needs a broader access modifier like "pub" or "protected" to be used outside of "Bar"
 
 
-error: Cannot access private member \\"private_method\\" of \\"Bar\\"
+error: Cannot access private member "private_method" of "Bar"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:66:10
    |
+49 |   private_method() {}
+   |   -------------- defined here
+   .
 66 |     this.private_method();
-   |          ^^^^^^^^^^^^^^ Cannot access private member \\"private_method\\" of \\"Bar\\"
+   |          ^^^^^^^^^^^^^^
+   |
+   = hint: the definition of "private_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Bar"
 
 
-error: Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+error: Cannot access private member "private_static_method" of "Foo"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:74:9
    |
+54 |   static private_static_method() {}
+   |          --------------------- defined here
+   .
 74 |     Foo.private_static_method();
-   |         ^^^^^^^^^^^^^^^^^^^^^ Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+   |         ^^^^^^^^^^^^^^^^^^^^^
+   |
+   = hint: the definition of "private_static_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Foo"
 
 
-error: Cannot access private member \\"private_field\\" of \\"Baz\\"
+error: Cannot access private member "private_field" of "Baz"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:84:14
    |
+ 9 |   private_field: str;
+   |   ------------- defined here
+   .
 84 |     log(this.private_field);
-   |              ^^^^^^^^^^^^^ Cannot access private member \\"private_field\\" of \\"Baz\\"
+   |              ^^^^^^^^^^^^^
+   |
+   = hint: the definition of "private_field" needs a broader access modifier like "pub" or "protected" to be used outside of "Baz"
 
 
-error: Cannot access private member \\"private_method\\" of \\"Baz\\"
+error: Cannot access private member "private_method" of "Baz"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:89:10
    |
+49 |   private_method() {}
+   |   -------------- defined here
+   .
 89 |     this.private_method();
-   |          ^^^^^^^^^^^^^^ Cannot access private member \\"private_method\\" of \\"Baz\\"
+   |          ^^^^^^^^^^^^^^
+   |
+   = hint: the definition of "private_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Baz"
 
 
-error: Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+error: Cannot access private member "private_static_method" of "Foo"
    --> ../../../examples/tests/invalid/access_modifiers.test.w:97:9
    |
+54 |   static private_static_method() {}
+   |          --------------------- defined here
+   .
 97 |     Foo.private_static_method();
-   |         ^^^^^^^^^^^^^^^^^^^^^ Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+   |         ^^^^^^^^^^^^^^^^^^^^^
+   |
+   = hint: the definition of "private_static_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Foo"
 
 
-error: Cannot access private member \\"private_static_method\\" of \\"Bar\\"
+error: Cannot access private member "private_static_method" of "Bar"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:102:9
     |
+ 54 |   static private_static_method() {}
+    |          --------------------- defined here
+    .
 102 |     Bar.private_static_method();
-    |         ^^^^^^^^^^^^^^^^^^^^^ Cannot access private member \\"private_static_method\\" of \\"Bar\\"
+    |         ^^^^^^^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "private_static_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Bar"
 
 
-error: Cannot access protected member \\"protected_field\\" of \\"Foo\\"
+error: Cannot access protected member "protected_field" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:123:13
     |
+  8 |   protected protected_field: str;
+    |             --------------- defined here
+    .
 123 |     log(foo.protected_field);
-    |             ^^^^^^^^^^^^^^^ Cannot access protected member \\"protected_field\\" of \\"Foo\\"
+    |             ^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "protected_field" needs a broader access modifier like "pub" to be used outside of "Foo"
 
 
-error: Cannot access private member \\"private_field\\" of \\"Foo\\"
+error: Cannot access private member "private_field" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:125:13
     |
+  9 |   private_field: str;
+    |   ------------- defined here
+    .
 125 |     log(foo.private_field);
-    |             ^^^^^^^^^^^^^ Cannot access private member \\"private_field\\" of \\"Foo\\"
+    |             ^^^^^^^^^^^^^
+    |
+    = hint: the definition of "private_field" needs a broader access modifier like "pub" or "protected" to be used outside of "Foo"
 
 
-error: Cannot access protected member \\"protected_method\\" of \\"Foo\\"
+error: Cannot access protected member "protected_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:129:9
     |
+ 47 |   protected protected_method() {}
+    |             ---------------- defined here
+    .
 129 |     foo.protected_method();
-    |         ^^^^^^^^^^^^^^^^ Cannot access protected member \\"protected_method\\" of \\"Foo\\"
+    |         ^^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "protected_method" needs a broader access modifier like "pub" to be used outside of "Foo"
 
 
-error: Cannot access private member \\"private_method\\" of \\"Foo\\"
+error: Cannot access private member "private_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:131:9
     |
+ 49 |   private_method() {}
+    |   -------------- defined here
+    .
 131 |     foo.private_method();
-    |         ^^^^^^^^^^^^^^ Cannot access private member \\"private_method\\" of \\"Foo\\"
+    |         ^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "private_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Foo"
 
 
-error: Cannot access protected member \\"protected_static_method\\" of \\"Foo\\"
+error: Cannot access protected member "protected_static_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:137:9
     |
+ 53 |   protected static protected_static_method() {}
+    |                    ----------------------- defined here
+    .
 137 |     Foo.protected_static_method();
-    |         ^^^^^^^^^^^^^^^^^^^^^^^ Cannot access protected member \\"protected_static_method\\" of \\"Foo\\"
+    |         ^^^^^^^^^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "protected_static_method" needs a broader access modifier like "pub" to be used outside of "Foo"
 
 
-error: Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+error: Cannot access private member "private_static_method" of "Foo"
     --> ../../../examples/tests/invalid/access_modifiers.test.w:139:9
     |
+ 54 |   static private_static_method() {}
+    |          --------------------- defined here
+    .
 139 |     Foo.private_static_method();
-    |         ^^^^^^^^^^^^^^^^^^^^^ Cannot access private member \\"private_static_method\\" of \\"Foo\\"
+    |         ^^^^^^^^^^^^^^^^^^^^^
+    |
+    = hint: the definition of "private_static_method" needs a broader access modifier like "pub" or "protected" to be used outside of "Foo"
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`access_private_apis.test.w 1`] = `
-"error: Class \\"subdir2.MyPrivateClass\\" is private
+"error: Class "subdir2.MyPrivateClass" is private
   --> ../../../examples/tests/invalid/access_private_apis.test.w:3:5
   |
 3 | new subdir2.MyPrivateClass();
-  |     ^^^^^^^^^^^^^^^^^^^^^^ Class \\"subdir2.MyPrivateClass\\" is private
+  |     ^^^^^^^^^^^^^^^^^^^^^^
   |
   --> ../../../examples/tests/invalid/subdir2/file.w:1:7
   |
@@ -225,11 +310,11 @@ exports[`access_private_apis.test.w 1`] = `
   |       -------------- defined here
 
 
-error: Class \\"subdir2.inner.MyOtherPrivateClass\\" is private
+error: Class "subdir2.inner.MyOtherPrivateClass" is private
   --> ../../../examples/tests/invalid/access_private_apis.test.w:6:5
   |
 6 | new subdir2.inner.MyOtherPrivateClass();
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Class \\"subdir2.inner.MyOtherPrivateClass\\" is private
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   --> ../../../examples/tests/invalid/subdir2/inner/blah.w:1:7
   |
@@ -237,11 +322,11 @@ error: Class \\"subdir2.inner.MyOtherPrivateClass\\" is private
   |       ------------------- defined here
 
 
-error: Interface \\"subdir2.MyPrivateInterface\\" is private
+error: Interface "subdir2.MyPrivateInterface" is private
    --> ../../../examples/tests/invalid/access_private_apis.test.w:11:14
    |
 11 | class A impl subdir2.MyPrivateInterface {}
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^ Interface \\"subdir2.MyPrivateInterface\\" is private
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    --> ../../../examples/tests/invalid/subdir2/file.w:7:11
    |
@@ -249,18 +334,18 @@ error: Interface \\"subdir2.MyPrivateInterface\\" is private
    |           ------------------ defined here
 
 
-error: Expected an interface, instead found type \\"unresolved\\"
+error: Expected an interface, instead found type "unresolved"
    --> ../../../examples/tests/invalid/access_private_apis.test.w:11:14
    |
 11 | class A impl subdir2.MyPrivateInterface {}
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected an interface, instead found type \\"unresolved\\"
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Struct \\"subdir2.MyPrivateStruct\\" is private
+error: Struct "subdir2.MyPrivateStruct" is private
    --> ../../../examples/tests/invalid/access_private_apis.test.w:14:9
    |
 14 | let s = subdir2.MyPrivateStruct {};
-   |         ^^^^^^^^^^^^^^^^^^^^^^^ Struct \\"subdir2.MyPrivateStruct\\" is private
+   |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
    --> ../../../examples/tests/invalid/subdir2/file.w:3:8
    |
@@ -268,16 +353,16 @@ error: Struct \\"subdir2.MyPrivateStruct\\" is private
    |        --------------- defined here
 
 
-error: Expected identifier \\"subdir2\\" to be a variable, but it's a namespace
+error: Expected identifier "subdir2" to be a variable, but it's a namespace
    --> ../../../examples/tests/invalid/access_private_apis.test.w:17:9
    |
 17 | let e = subdir2.MyPrivateEnum.A;
-   |         ^^^^^^^ Expected identifier \\"subdir2\\" to be a variable, but it's a namespace
+   |         ^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -287,56 +372,56 @@ exports[`access_static_from_instance.test.w 1`] = `
   --> ../../../examples/tests/invalid/access_static_from_instance.test.w:4:3
   |
 4 |   pub static f: num;
-  |   ^^^^^^^^^^^^^^^^^^ Static class fields not supported yet, see https://github.com/winglang/wing/issues/1668
+  |   ^^^^^^^^^^^^^^^^^^
 
 
-error: Cannot access static property \\"f\\" from instance
+error: Cannot access static property "f" from instance
    --> ../../../examples/tests/invalid/access_static_from_instance.test.w:19:5
    |
 19 | foo.f; // Can't access static fields through instances
-   |     ^ Cannot access static property \\"f\\" from instance
+   |     ^
 
 
-error: Cannot access static property \\"m\\" from instance
+error: Cannot access static property "m" from instance
    --> ../../../examples/tests/invalid/access_static_from_instance.test.w:20:5
    |
 20 | foo.m(); // Can't access static methods through instances
-   |     ^ Cannot access static property \\"m\\" from instance
+   |     ^
 
 
-error: Unknown symbol \\"this\\"
-  --> ../../../examples/tests/invalid/access_static_from_instance.test.w:7:5
+error: Member "instanceField" does not exist in "Construct"
+  --> ../../../examples/tests/invalid/access_static_from_instance.test.w:7:10
   |
 7 |     this.instanceField = 1; // Can't access instance fields from static methods
-  |     ^^^^ Unknown symbol \\"this\\"
+  |          ^^^^^^^^^^^^^
 
 
-error: Unknown symbol \\"this\\"
-  --> ../../../examples/tests/invalid/access_static_from_instance.test.w:8:5
+error: Member "f" does not exist in "Construct"
+  --> ../../../examples/tests/invalid/access_static_from_instance.test.w:8:10
   |
 8 |     this.f = 1; // Can't access static fields through \`this\`
-  |     ^^^^ Unknown symbol \\"this\\"
+  |          ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`ambiguous_api_paths.test.w 1`] = `
-"runtime error: Endpoint for path '/test/:variable' and method 'GET' is ambiguous - it conflicts with existing endpoint for path '/test/path'
+"Error: Endpoint for path '/test/:variable' and method 'GET' is ambiguous - it conflicts with existing endpoint for path '/test/path'
    --> ../../../examples/tests/invalid/ambiguous_api_paths.test.w:12:1
    | };
    | 
-   | api.get(\\"<ABSOLUTE>/path\\", handler);
-12 | api.get(\\"<ABSOLUTE>/:variable\\", handler);
+   | api.get("<ABSOLUTE>/path", handler);
+12 | api.get("<ABSOLUTE>/:variable", handler);
    | ^
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+at <ABSOLUTE>/ambiguous_api_paths.test.w:12:1
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -346,137 +431,137 @@ exports[`bring.test.w 1`] = `
   --> ../../../examples/tests/invalid/bring.test.w:6:7
   |
 6 | bring ;
-  |       ^ Expected module specification (see https://www.winglang.io/docs/libraries)
+  |       ^
 
 
-error: Could not find a trusted library \\"@winglibs/c\\" installed. Did you mean to run \`npm i @winglibs/c\`?
+error: Could not find a trusted library "@winglibs/c" installed. Did you mean to run \`npm i @winglibs/c\`?
   --> ../../../examples/tests/invalid/bring.test.w:8:1
   |
 8 | bring c;
-  | ^^^^^^^^ Could not find a trusted library \\"@winglibs/c\\" installed. Did you mean to run \`npm i @winglibs/c\`?
+  | ^^^^^^^^
 
 
-error: Redundant bring of \\"std\\"
+error: Redundant bring of "std"
   --> ../../../examples/tests/invalid/bring.test.w:1:1
   |
 1 | bring std;
-  | ^^^^^^^^^^ Redundant bring of \\"std\\"
+  | ^^^^^^^^^^
 
 
-error: \\"cloud\\" is already defined
+error: "cloud" is already defined
   --> ../../../examples/tests/invalid/bring.test.w:4:7
   |
 4 | bring cloud;
-  |       ^^^^^ \\"cloud\\" is already defined
+  |       ^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`bring_invalid_dir.w 1`] = `
-"error: Cannot explicitly bring directory with no Wing files \\"no_wing_files\\"
+"error: Cannot explicitly bring directory with no Wing files "no_wing_files"
+
 
+error: Cannot bring Wing directories that contain invalid characters: "in.valid"
 
-error: Cannot bring Wing directories that contain invalid characters: \\"in.valid\\"
 
+error: Cannot bring Wing directories that contain invalid characters: "not-valid"
 
-error: Cannot bring Wing directories that contain invalid characters: \\"not-valid\\"
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`bring_jsii.test.w 1`] = `
-"error: bring \\"jsii-code-samples\\" must be assigned to an identifier (e.g. bring \\"foo\\" as foo)
+"error: bring "jsii-code-samples" must be assigned to an identifier (e.g. bring "foo" as foo)
   --> ../../../examples/tests/invalid/bring_jsii.test.w:1:1
   |
-1 | bring \\"jsii-code-samples\\";
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^ bring \\"jsii-code-samples\\" must be assigned to an identifier (e.g. bring \\"foo\\" as foo)
+1 | bring "jsii-code-samples";
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Unable to load \\"foobar\\": Module not found in \\"<ABSOLUTE>/bring_jsii.test.w\\"
+error: Unable to load "foobar": Module not found in "<ABSOLUTE>/bring_jsii.test.w"
   --> ../../../examples/tests/invalid/bring_jsii.test.w:4:1
   |
-4 | bring \\"foobar\\" as baz;
-  | ^^^^^^^^^^^^^^^^^^^^^^ Unable to load \\"foobar\\": Module not found in \\"<ABSOLUTE>/bring_jsii.test.w\\"
+4 | bring "foobar" as baz;
+  | ^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`bring_local_dir.test.w 1`] = `
-"error: Cannot bring \\"/subdir\\" since it is not a relative path
+"error: Cannot bring "/subdir" since it is not a relative path
   --> ../../../examples/tests/invalid/bring_local_dir.test.w:4:7
   |
-4 | bring \\"/subdir\\" as baz;
-  |       ^^^^^^^^^ Cannot bring \\"/subdir\\" since it is not a relative path
+4 | bring "/subdir" as baz;
+  |       ^^^^^^^^^
 
 
-error: Symbol \\"Foo\\" has multiple definitions in \\"<ABSOLUTE>/inner\\"
+error: Symbol "Foo" has multiple definitions in "<ABSOLUTE>/inner"
   --> ../../../examples/tests/invalid/subdir/other.w:1:1
   |
-1 | bring \\"./inner\\" as inner;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ Symbol \\"Foo\\" has multiple definitions in \\"<ABSOLUTE>/inner\\"
+1 | bring "./inner" as inner;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Symbol \\"Foo\\" has multiple definitions in \\"<ABSOLUTE>/inner\\"
+error: Symbol "Foo" has multiple definitions in "<ABSOLUTE>/inner"
   --> ../../../examples/tests/invalid/bring_local_dir.test.w:1:1
   |
-1 | bring \\"./subdir\\" as subdir;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Symbol \\"Foo\\" has multiple definitions in \\"<ABSOLUTE>/inner\\"
+1 | bring "./subdir" as subdir;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`bring_local_self.test.w 1`] = `
-"error: Cannot find module \\"./bring_local_self.main.w\\"
+"error: Cannot find module "./bring_local_self.main.w"
   --> ../../../examples/tests/invalid/bring_local_self.test.w:1:7
   |
-1 | bring \\"./bring_local_self.main.w\\" as foo;
-  |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Cannot find module \\"./bring_local_self.main.w\\"
+1 | bring "./bring_local_self.main.w" as foo;
+  |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Cannot find module \\"./non-existent.w\\"
+error: Cannot find module "./non-existent.w"
   --> ../../../examples/tests/invalid/bring_local_self.test.w:4:7
   |
-4 | bring \\"./non-existent.w\\" as bar;
-  |       ^^^^^^^^^^^^^^^^^^ Cannot find module \\"./non-existent.w\\"
+4 | bring "./non-existent.w" as bar;
+  |       ^^^^^^^^^^^^^^^^^^
 
 
-error: Cannot bring \\"/hello.w\\" since it is not a relative path
+error: Cannot bring "/hello.w" since it is not a relative path
   --> ../../../examples/tests/invalid/bring_local_self.test.w:7:7
   |
-7 | bring \\"/hello.w\\" as baz;
-  |       ^^^^^^^^^^ Cannot bring \\"/hello.w\\" since it is not a relative path
+7 | bring "/hello.w" as baz;
+  |       ^^^^^^^^^^
 
 
-error: Cannot bring module \\"./bring_local_dir.test.w\\" since it is an entrypoint file
+error: Cannot bring module "./bring_local_dir.test.w" since it is an entrypoint file
    --> ../../../examples/tests/invalid/bring_local_self.test.w:10:7
    |
-10 | bring \\"./bring_local_dir.test.w\\" as qux;
-   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^ Cannot bring module \\"./bring_local_dir.test.w\\" since it is an entrypoint file
+10 | bring "./bring_local_dir.test.w" as qux;
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -486,33 +571,33 @@ exports[`bring_local_variables.test.w 1`] = `
   --> ../../../examples/tests/invalid/file_with_variables.w:5:1
   |
 5 | let x = 5;
-  | ^^^^^^^^^^ Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+  | ^^^^^^^^^^
 
 
 error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
   --> ../../../examples/tests/invalid/file_with_variables.w:6:1
   |
-6 | let y = [\\"hello\\", \\"world\\"];
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+6 | let y = ["hello", "world"];
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
   --> ../../../examples/tests/invalid/file_with_variables.w:7:1
   |
 7 | let z = new cloud.Bucket();
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Preflight field \\"x\\" is not initialized
+error: Preflight field "x" is not initialized
    --> ../../../examples/tests/invalid/file_with_variables.w:10:3
    |
 10 |   x: num;
-   |   ^ Preflight field \\"x\\" is not initialized
+   |   ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -522,26 +607,62 @@ exports[`bring_non_std_construct.test.w 1`] = `
   --> ../../../examples/tests/invalid/bring_non_std_construct.test.w:8:1
   |
 8 | new cdktf.S3Backend();
-  | ^^^^^^^^^^^^^^^^^^^^^ Expected 2 positional argument(s) or named arguments for the last parameter but got 0
+  | ^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Cannot set id of non-standard preflight class \\"S3Backend\\" using \`as\`
+error: Cannot set id of non-standard preflight class "S3Backend" using \`as\`
    --> ../../../examples/tests/invalid/bring_non_std_construct.test.w:13:85
    |
-13 |     new cdktf.S3Backend(this, cdktf.S3BackendConfig {bucket: \\"foo\\", key: \\"bar\\"}) as \\"s3_backend\\";
-   |                                                                                     ^^^^^^^^^^^^ Cannot set id of non-standard preflight class \\"S3Backend\\" using \`as\`
+13 |     new cdktf.S3Backend(this, cdktf.S3BackendConfig {bucket: "foo", key: "bar"}) as "s3_backend";
+   |                                                                                     ^^^^^^^^^^^^
 
 
-error: Cannot set scope of non-standard preflight class \\"S3Backend\\" using \`in\`
+error: Cannot set scope of non-standard preflight class "S3Backend" using \`in\`
    --> ../../../examples/tests/invalid/bring_non_std_construct.test.w:15:85
    |
-15 |     new cdktf.S3Backend(this, cdktf.S3BackendConfig {bucket: \\"foo\\", key: \\"bar\\"}) in this;
-   |                                                                                     ^^^^ Cannot set scope of non-standard preflight class \\"S3Backend\\" using \`in\`
+15 |     new cdktf.S3Backend(this, cdktf.S3BackendConfig {bucket: "foo", key: "bar"}) in this;
+   |                                                                                     ^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`bypass_return.test.w 1`] = `
+"error: Expected type to be "num", but got "str" instead
+  --> ../../../examples/tests/invalid/bypass_return.test.w:2:12
+  |
+2 |     return "a";
+  |            ^^^
+
+
+error: Expected type to be "num", but got "str" instead
+  --> ../../../examples/tests/invalid/bypass_return.test.w:8:12
+  |
+8 |     return "a";
+  |            ^^^
+
+
+error: A function whose return type is "num" must return a value.
+   --> ../../../examples/tests/invalid/bypass_return.test.w:15:28
+   |
+15 | let emptyBody = (): num => {};
+   |                            ^^
+
+
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/bypass_return.test.w:20:12
+   |
+20 |     return "a";
+   |            ^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -551,297 +672,445 @@ exports[`call_inflight_from_preflight.test.w 1`] = `
   --> ../../../examples/tests/invalid/call_inflight_from_preflight.test.w:4:1
   |
 4 | util.sleep(1s);
-  | ^^^^^^^^^^^^^^ Cannot call into inflight phase while preflight
+  | ^^^^^^^^^^^^^^
 
 
 error: Cannot call into inflight phase while preflight
    --> ../../../examples/tests/invalid/call_inflight_from_preflight.test.w:12:1
    |
 12 | foo.do();
-   | ^^^^^^^^ Cannot call into inflight phase while preflight
+   | ^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`capture_redefinition.test.w 1`] = `
-"error: Cannot access \\"y\\" because it is shadowed by another symbol with the same name
+"error: Cannot access "y" because it is shadowed by another symbol with the same name
   --> ../../../examples/tests/invalid/capture_redefinition.test.w:5:7
   |
 5 |   log(y);
-  |       ^ Cannot access \\"y\\" because it is shadowed by another symbol with the same name
+  |       ^
 
 
-error: Cannot access \\"y\\" because it is shadowed by another symbol with the same name
+error: Cannot access "y" because it is shadowed by another symbol with the same name
    --> ../../../examples/tests/invalid/capture_redefinition.test.w:14:9
    |
 14 |     log(y);
-   |         ^ Cannot access \\"y\\" because it is shadowed by another symbol with the same name
+   |         ^
 
 
-error: Cannot access \\"x\\" because it is shadowed by another symbol with the same name
+error: Cannot access "x" because it is shadowed by another symbol with the same name
    --> ../../../examples/tests/invalid/capture_redefinition.test.w:22:7
    |
 22 |   log(x);
-   |       ^ Cannot access \\"x\\" because it is shadowed by another symbol with the same name
+   |       ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`class.test.w 1`] = `
 "error: Call to super constructor can only be made from derived classes
-   --> ../../../examples/tests/invalid/class.test.w:86:5
-   |
-86 |     super();
-   |     ^^^^^^^^ Call to super constructor can only be made from derived classes
-
-
-error: Call to super constructor must be first statement in constructor
-   --> ../../../examples/tests/invalid/class.test.w:98:5
+   --> ../../../examples/tests/invalid/class.test.w:97:5
    |
-98 |     super(name, major);
-   |     ^^^^^^^^^^^^^^^^^^^ Call to super constructor must be first statement in constructor
+97 |     super();
+   |     ^^^^^^^^
 
 
 error: Call to super constructor can only be done from within class constructor
-    --> ../../../examples/tests/invalid/class.test.w:103:5
+    --> ../../../examples/tests/invalid/class.test.w:114:5
     |
-103 |     super(\\"cool\\", \\"blue\\");
-    |     ^^^^^^^^^^^^^^^^^^^^^^ Call to super constructor can only be done from within class constructor
+114 |     super("cool", "blue");
+    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 
 error: Call to super constructor can only be done from within a class constructor
-    --> ../../../examples/tests/invalid/class.test.w:108:4
+    --> ../../../examples/tests/invalid/class.test.w:119:4
     |
-108 |    super();
-    |    ^^^^^^^^ Call to super constructor can only be done from within a class constructor
+119 |    super();
+    |    ^^^^^^^^
 
 
-error: Reserved method name. Initializers are declared with \\"init\\"
-    --> ../../../examples/tests/invalid/class.test.w:160:3
+error: Reserved method name. Constructors are declared with a method named "new"
+    --> ../../../examples/tests/invalid/class.test.w:171:3
     |
-160 |   constructor() {
-    |   ^^^^^^^^^^^ Reserved method name. Initializers are declared with \\"init\\"
+171 |   constructor() {
+    |   ^^^^^^^^^^^
 
 
 error: Expected block
-   --> ../../../examples/tests/invalid/class.test.w:17:16
+   --> ../../../examples/tests/invalid/class.test.w:28:16
    |
-17 |   new(foo: str)
-   |                ^ Expected block
+28 |   new(foo: str)
+   |                ^
 
 
-error: Preflight field \\"x\\" is not initialized
+error: Preflight field "x" is not initialized
   --> ../../../examples/tests/invalid/class.test.w:4:4
   |
 4 |    x:num;
-  |    ^ Preflight field \\"x\\" is not initialized
+  |    ^
 
 
-error: Expected 0 positional argument(s) but got 1
-  --> ../../../examples/tests/invalid/class.test.w:9:1
+error: Preflight field "x" is not initialized
+  --> ../../../examples/tests/invalid/class.test.w:9:3
   |
-9 | new C2(1);
-  | ^^^^^^^^^ Expected 0 positional argument(s) but got 1
+9 |   x:num;
+  |   ^
+
+
+error: Expected 0 positional argument(s) but got 1
+   --> ../../../examples/tests/invalid/class.test.w:20:1
+   |
+20 | new C2(1);
+   | ^^^^^^^^^
 
 
 error: No named arguments expected
-   --> ../../../examples/tests/invalid/class.test.w:13:1
+   --> ../../../examples/tests/invalid/class.test.w:24:1
    |
-13 | new C9(token: \\"1\\");
-   | ^^^^^^^^^^^^^^^^^^ No named arguments expected
+24 | new C9(token: "1");
+   | ^^^^^^^^^^^^^^^^^^
 
 
 error: Expected 1 positional argument(s) but got 0
-   --> ../../../examples/tests/invalid/class.test.w:19:1
+   --> ../../../examples/tests/invalid/class.test.w:30:1
    |
-19 | new C10(); 
-   | ^^^^^^^^^ Expected 1 positional argument(s) but got 0
+30 | new C10(); 
+   | ^^^^^^^^^
 
 
 error: No named arguments expected
-   --> ../../../examples/tests/invalid/class.test.w:22:1
+   --> ../../../examples/tests/invalid/class.test.w:33:1
    |
-22 | new C10(foo: \\"bar\\"); 
-   | ^^^^^^^^^^^^^^^^^^^ No named arguments expected
+33 | new C10(foo: "bar"); 
+   | ^^^^^^^^^^^^^^^^^^^
 
 
 error: Expected 1 positional argument(s) but got 0
-   --> ../../../examples/tests/invalid/class.test.w:22:1
+   --> ../../../examples/tests/invalid/class.test.w:33:1
    |
-22 | new C10(foo: \\"bar\\"); 
-   | ^^^^^^^^^^^^^^^^^^^ Expected 1 positional argument(s) but got 0
+33 | new C10(foo: "bar"); 
+   | ^^^^^^^^^^^^^^^^^^^
 
 
 error: No named arguments expected
-   --> ../../../examples/tests/invalid/class.test.w:25:1
+   --> ../../../examples/tests/invalid/class.test.w:36:1
    |
-25 | new C10(\\"hello\\", foo: \\"bar\\"); 
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ No named arguments expected
+36 | new C10("hello", foo: "bar"); 
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Inflight field \\"x\\" is not initialized
-   --> ../../../examples/tests/invalid/class.test.w:37:16
+error: Inflight field "x" is not initialized
+   --> ../../../examples/tests/invalid/class.test.w:48:16
    |
-37 |   inflight var x: num;
-   |                ^ Inflight field \\"x\\" is not initialized
+48 |   inflight var x: num;
+   |                ^
 
 
-error: Inflight field \\"y\\" is not initialized
-   --> ../../../examples/tests/invalid/class.test.w:39:12
+error: Inflight field "y" is not initialized
+   --> ../../../examples/tests/invalid/class.test.w:50:12
    |
-39 |   inflight y: str;
-   |            ^ Inflight field \\"y\\" is not initialized
+50 |   inflight y: str;
+   |            ^
 
 
-error: Inflight field \\"x\\" is not initialized
-   --> ../../../examples/tests/invalid/class.test.w:44:12
+error: Inflight field "x" is not initialized
+   --> ../../../examples/tests/invalid/class.test.w:55:12
    |
-44 |   inflight x: num;
-   |            ^ Inflight field \\"x\\" is not initialized
+55 |   inflight x: num;
+   |            ^
 
 
-error: Inflight field \\"x\\" is not initialized
-   --> ../../../examples/tests/invalid/class.test.w:50:12
+error: Inflight field "x" is not initialized
+   --> ../../../examples/tests/invalid/class.test.w:61:12
    |
-50 |   inflight x: num;
-   |            ^ Inflight field \\"x\\" is not initialized
+61 |   inflight x: num;
+   |            ^
 
 
-error: \\"y\\" cannot be initialized in the inflight initializer
-   --> ../../../examples/tests/invalid/class.test.w:61:10
+error: "y" cannot be initialized in the inflight constructor
+   --> ../../../examples/tests/invalid/class.test.w:72:10
    |
-61 |     this.y = 1;
-   |          ^ \\"y\\" cannot be initialized in the inflight initializer
+72 |     this.y = 1;
+   |          ^
 
 
-error: \\"x\\" cannot be initialized in the preflight initializer
-   --> ../../../examples/tests/invalid/class.test.w:56:10
+error: "x" cannot be initialized in the preflight constructor
+   --> ../../../examples/tests/invalid/class.test.w:67:10
    |
-56 |     this.x = 1;
-   |          ^ \\"x\\" cannot be initialized in the preflight initializer
+67 |     this.x = 1;
+   |          ^
 
 
-error: Preflight field \\"y\\" is not initialized
-   --> ../../../examples/tests/invalid/class.test.w:52:3
+error: Preflight field "y" is not initialized
+   --> ../../../examples/tests/invalid/class.test.w:63:3
    |
-52 |   y: num;
-   |   ^ Preflight field \\"y\\" is not initialized
+63 |   y: num;
+   |   ^
 
 
-error: Expected \\"x\\" to be a type but it's a variable
-   --> ../../../examples/tests/invalid/class.test.w:68:18
+error: Expected "x" to be a type but it's a variable
+   --> ../../../examples/tests/invalid/class.test.w:79:18
    |
-68 | class C7 extends x {
-   |                  ^ Expected \\"x\\" to be a type but it's a variable
+79 | class C7 extends x {
+   |                  ^
 
 
-error: Expected \\"S1\\" to be a class
-   --> ../../../examples/tests/invalid/class.test.w:74:18
+error: Expected "S1" to be a class
+   --> ../../../examples/tests/invalid/class.test.w:85:18
    |
-74 | class C8 extends S1 {
-   |                  ^^ Expected \\"S1\\" to be a class
+85 | class C8 extends S1 {
+   |                  ^^
 
 
-error: Unknown symbol \\"C11\\"
-   --> ../../../examples/tests/invalid/class.test.w:78:19
+error: Unknown symbol "C11"
+   --> ../../../examples/tests/invalid/class.test.w:89:19
    |
-78 | class C11 extends C11 {
-   |                   ^^^ Unknown symbol \\"C11\\"
+89 | class C11 extends C11 {
+   |                   ^^^
+
+
+error: super() call must be the first statement of PaidStudent's constructor
+    --> ../../../examples/tests/invalid/class.test.w:109:5
+    |
+109 |     super(name, major);
+    |     ^^^^^^^^^^^^^^^^^^^
+
+
+error: Cannot instantiate abstract class "Resource"
+    --> ../../../examples/tests/invalid/class.test.w:176:1
+    |
+176 | new std.Resource();
+    | ^^^^^^^^^^^^^^^^^^
+
+
+error: Symbol "z" already defined in this scope
+    --> ../../../examples/tests/invalid/class.test.w:194:3
+    |
+181 |   z: num;
+    |   - previous definition
+    .
+194 |   z: str;
+    |   ^
+
+
+error: Symbol "z" already defined in this scope
+    --> ../../../examples/tests/invalid/class.test.w:182:3
+    |
+181 |   z: num;
+    |   - previous definition
+182 |   z(): num {
+    |   ^
+
+
+error: Symbol "z" already defined in this scope
+    --> ../../../examples/tests/invalid/class.test.w:196:3
+    |
+181 |   z: num;
+    |   - previous definition
+    .
+196 |   z(): str {
+    |   ^
+
+
+error: Symbol "z" already defined in this scope
+    --> ../../../examples/tests/invalid/class.test.w:226:3
+    |
+215 |   z: num;
+    |   - previous definition
+    .
+226 |   z: str;
+    |   ^
+
+
+error: Symbol "z" already defined in this scope
+    --> ../../../examples/tests/invalid/class.test.w:207:3
+    |
+207 |   z(): num {
+    |   ^
+    .
+215 |   z: num;
+    |   - previous definition
 
 
-error: Cannot instantiate abstract class \\"Resource\\"
-    --> ../../../examples/tests/invalid/class.test.w:165:1
+error: Symbol "z" already defined in this scope
+    --> ../../../examples/tests/invalid/class.test.w:219:3
     |
-165 | new std.Resource();
-    | ^^^^^^^^^^^^^^^^^^ Cannot instantiate abstract class \\"Resource\\"
+215 |   z: num;
+    |   - previous definition
+    .
+219 |   z(): str {
+    |   ^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
-   --> ../../../examples/tests/invalid/class.test.w:31:14
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/class.test.w:42:14
    |
-31 |     this.x = \\"Hi\\";
-   |              ^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+42 |     this.x = "Hi";
+   |              ^^^^
 
 
 error: Variable cannot be reassigned from inflight
-   --> ../../../examples/tests/invalid/class.test.w:61:5
+   --> ../../../examples/tests/invalid/class.test.w:72:5
    |
-61 |     this.y = 1;
-   |     ^^^^^^ Variable cannot be reassigned from inflight
+72 |     this.y = 1;
+   |     ^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
-    --> ../../../examples/tests/invalid/class.test.w:123:11
+error: Expected type to be "num", but got "str" instead
+    --> ../../../examples/tests/invalid/class.test.w:134:11
     |
-123 |     super(someStr);
-    |           ^^^^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+134 |     super(someStr);
+    |           ^^^^^^^
 
 
 error: Expected 1 positional argument(s) but got 0
-    --> ../../../examples/tests/invalid/class.test.w:132:5
+    --> ../../../examples/tests/invalid/class.test.w:143:5
     |
-132 |     super();
-    |     ^^^^^^^^ Expected 1 positional argument(s) but got 0
+143 |     super();
+    |     ^^^^^^^^
 
 
 error: Expected 1 positional argument(s) but got 2
-    --> ../../../examples/tests/invalid/class.test.w:141:5
+    --> ../../../examples/tests/invalid/class.test.w:152:5
     |
-141 |     super(someNum, someStr);
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^ Expected 1 positional argument(s) but got 2
+152 |     super(someNum, someStr);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 error: Expected 1 positional argument(s) but got 0
-    --> ../../../examples/tests/invalid/class.test.w:157:5
+    --> ../../../examples/tests/invalid/class.test.w:168:5
+    |
+168 |     super();
+    |     ^^^^^^^^
+
+
+error: Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
+    --> ../../../examples/tests/invalid/class.test.w:185:5
+    |
+185 |     2 + "2";
+    |     ^^^^^^^
+
+
+error: Expected type to be "num", but got "str" instead
+    --> ../../../examples/tests/invalid/class.test.w:188:12
+    |
+188 |     return "hello";
+    |            ^^^^^^^
+
+
+error: Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
+    --> ../../../examples/tests/invalid/class.test.w:198:5
+    |
+198 |     2 + "2";
+    |     ^^^^^^^
+
+
+error: Expected type to be "str", but got "num" instead
+    --> ../../../examples/tests/invalid/class.test.w:200:12
+    |
+200 |     return 5;
+    |            ^
+
+
+error: Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
+    --> ../../../examples/tests/invalid/class.test.w:210:5
+    |
+210 |     2 + "2";
+    |     ^^^^^^^
+
+
+error: Expected type to be "num", but got "str" instead
+    --> ../../../examples/tests/invalid/class.test.w:212:12
+    |
+212 |     return "hello";
+    |            ^^^^^^^
+
+
+error: Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
+    --> ../../../examples/tests/invalid/class.test.w:221:5
+    |
+221 |     2 + "2";
+    |     ^^^^^^^
+
+
+error: Expected type to be "str", but got "num" instead
+    --> ../../../examples/tests/invalid/class.test.w:223:12
     |
-157 |     super();
-    |     ^^^^^^^^ Expected 1 positional argument(s) but got 0
+223 |     return 5;
+    |            ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`cloud_function_expects_inflight.test.w 1`] = `
-"error: Expected type to be \\"inflight (event: str): void\\", but got \\"preflight (name: str): str\\" instead
+"error: Expected type to be "inflight (event: str?): str?", but got "preflight (name: str): str" instead
   --> ../../../examples/tests/invalid/cloud_function_expects_inflight.test.w:3:20
   |  
 3 |   new cloud.Function((name: str): str => {
   | /--------------------^
-4 | |   return \\"Hello {name}\\";
+4 | |   return "Hello {name}";
 5 | | });
-  | \\\\-^ Expected type to be \\"inflight (event: str): void\\", but got \\"preflight (name: str): str\\" instead
+  | \\-^
   |  
   = hint: expected phase to be inflight, but got preflight instead
 
 
-error: Expected type to be \\"inflight (message: str): void\\", but got \\"inflight (x: num): unknown\\" instead
+error: Expected type to be "inflight (message: str): void", but got "inflight (x: num): unknown" instead
    --> ../../../examples/tests/invalid/cloud_function_expects_inflight.test.w:9:15
    |  
  9 |   q.setConsumer(inflight (x: num) => {
    | /---------------^
-10 | |                      // ^ \\"num\\" doesn't match the expected type \\"str\\"
+10 | |                      // ^ "num" doesn't match the expected type "str"
 11 | |   return;
 12 | | });
-   | \\\\-^ Expected type to be \\"inflight (message: str): void\\", but got \\"inflight (x: num): unknown\\" instead
+   | \\-^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`constructs.test.w 1`] = `
+"error: Member "node" does not exist in "A"
+  --> ../../../examples/tests/invalid/constructs.test.w:5:10
+  |
+5 |     this.node.hidden;
+  |          ^^^^
+  |
+  = hint: use nodeof(x) to access the tree node on a preflight class
+
+
+error: Member "node" does not exist in "IConstruct"
+   --> ../../../examples/tests/invalid/constructs.test.w:10:23
+   |
+10 |     nodeof(this).root.node;
+   |                       ^^^^
+   |
+   = hint: use nodeof(x) to access the tree node on a preflight class
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -850,760 +1119,1271 @@ exports[`container_types.test.w 1`] = `
 "error: Unknown parser error
    --> ../../../examples/tests/invalid/container_types.test.w:14:25
    |
-14 | let m2: Map<num> = [\\"a\\" => 1, \\"b\\" => \\"2\\", \\"c\\" => 3];
-   |                         ^^^^ Unknown parser error
+14 | let m2: Map<num> = ["a" => 1, "b" => "2", "c" => 3];
+   |                         ^^^^
 
 
 error: Unexpected 'string'
    --> ../../../examples/tests/invalid/container_types.test.w:14:31
    |
-14 | let m2: Map<num> = [\\"a\\" => 1, \\"b\\" => \\"2\\", \\"c\\" => 3];
-   |                               ^^^ Unexpected 'string'
+14 | let m2: Map<num> = ["a" => 1, "b" => "2", "c" => 3];
+   |                               ^^^
 
 
 error: Unknown parser error
    --> ../../../examples/tests/invalid/container_types.test.w:14:47
    |
-14 | let m2: Map<num> = [\\"a\\" => 1, \\"b\\" => \\"2\\", \\"c\\" => 3];
-   |                                               ^^^^ Unknown parser error
+14 | let m2: Map<num> = ["a" => 1, "b" => "2", "c" => 3];
+   |                                               ^^^^
 
 
 error: Unknown parser error
    --> ../../../examples/tests/invalid/container_types.test.w:41:24
    |
-41 | let ss1: MutSet<str> = Set{\\"c\\"};
-   |                        ^^^ Unknown parser error
+41 | let ss1: MutSet<str> = Set["c"];
+   |                        ^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
   --> ../../../examples/tests/invalid/container_types.test.w:2:28
   |
-2 | let arr1: Array<num> = [1, \\"2\\", 3];
-  |                            ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+2 | let arr1: Array<num> = [1, "2", 3];
+  |                            ^^^
 
 
-error: Expected \\"Set\\" or \\"MutSet\\", found \\"Array<num>\\"
-  --> ../../../examples/tests/invalid/container_types.test.w:3:12
-  |
-3 | let arr2 = Array<num> {1, 2, 3};
-  |            ^^^^^^^^^^ Expected \\"Set\\" or \\"MutSet\\", found \\"Array<num>\\"
-
-
-error: Expected type to be \\"Array<num>\\", but got \\"Array<str>\\" instead
+error: Expected type to be "Array<num>", but got "Array<str>" instead
   --> ../../../examples/tests/invalid/container_types.test.w:5:24
   |
 5 | let arr4: Array<num> = arr3;
-  |                        ^^^^ Expected type to be \\"Array<num>\\", but got \\"Array<str>\\" instead
+  |                        ^^^^
 
 
-error: Unknown symbol \\"someRandomMethod\\"
+error: Member "someRandomMethod" does not exist in "Array"
   --> ../../../examples/tests/invalid/container_types.test.w:6:6
   |
 6 | arr1.someRandomMethod();
-  |      ^^^^^^^^^^^^^^^^ Unknown symbol \\"someRandomMethod\\"
+  |      ^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"num?\\" instead
+error: Expected type to be "num", but got "num?" instead
   --> ../../../examples/tests/invalid/container_types.test.w:9:16
   |
 9 | let val: num = arr5.tryAt(0);
-  |                ^^^^^^^^^^^^^ Expected type to be \\"num\\", but got \\"num?\\" instead
+  |                ^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/container_types.test.w:13:38
    |
-13 | let m1: Map<num> = {\\"a\\" => 1, \\"b\\" => \\"2\\", \\"c\\" => 3};
-   |                                      ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+13 | let m1: Map<num> = {"a" => 1, "b" => "2", "c" => 3};
+   |                                      ^^^
 
 
-error: Expected type to be \\"Map<num>\\", but got \\"Array<str>\\" instead
+error: Expected type to be "Map<num>", but got "Array<str>" instead
    --> ../../../examples/tests/invalid/container_types.test.w:14:20
    |
-14 | let m2: Map<num> = [\\"a\\" => 1, \\"b\\" => \\"2\\", \\"c\\" => 3];
-   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"Map<num>\\", but got \\"Array<str>\\" instead
+14 | let m2: Map<num> = ["a" => 1, "b" => "2", "c" => 3];
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"Map<num>\\", but got \\"Map<str>\\" instead
+error: Expected type to be "Map<num>", but got "Map<str>" instead
    --> ../../../examples/tests/invalid/container_types.test.w:16:20
    |
 16 | let m4: Map<num> = m3;
-   |                    ^^ Expected type to be \\"Map<num>\\", but got \\"Map<str>\\" instead
+   |                    ^^
 
 
-error: Unknown symbol \\"someRandomMethod\\"
+error: Member "someRandomMethod" does not exist in "Map"
    --> ../../../examples/tests/invalid/container_types.test.w:17:4
    |
 17 | m1.someRandomMethod();
-   |    ^^^^^^^^^^^^^^^^ Unknown symbol \\"someRandomMethod\\"
+   |    ^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"str\\", but got \\"num\\" instead
+error: Expected type to be "str", but got "num" instead
    --> ../../../examples/tests/invalid/container_types.test.w:20:35
    |
-20 | let m5 = {\\"a\\" => 1, \\"{1+1}\\" => 2, 1+1 => 3};
-   |                                   ^^^ Expected type to be \\"str\\", but got \\"num\\" instead
+20 | let m5 = {"a" => 1, "{1+1}" => 2, 1+1 => 3};
+   |                                   ^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/container_types.test.w:24:24
    |
-24 | let s1: Set<num> = {1, \\"2\\", 3};
-   |                        ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+24 | let s1: Set<num> = [1, "2", 3];
+   |                        ^^^
+
+
+error: Expected type to be "Set<num>", but got "Array<num>" instead
+   --> ../../../examples/tests/invalid/container_types.test.w:24:20
+   |
+24 | let s1: Set<num> = [1, "2", 3];
+   |                    ^^^^^^^^^^^
 
 
-error: Expected \\"Array\\" or \\"MutArray\\", found \\"Set<num>\\"
-   --> ../../../examples/tests/invalid/container_types.test.w:25:10
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/container_types.test.w:25:23
    |
-25 | let s2 = Set<num> [1, \\"2\\", 3];
-   |          ^^^^^^^^ Expected \\"Array\\" or \\"MutArray\\", found \\"Set<num>\\"
+25 | let s2 = Set<num> [1, "2", 3];
+   |                       ^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/container_types.test.w:26:24
    |
-26 | let s3: Set<num> = [1, \\"2\\", 3];
-   |                        ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+26 | let s3: Set<num> = [1, "2", 3];
+   |                        ^^^
 
 
-error: Expected type to be \\"Set<num>\\", but got \\"Array<num>\\" instead
+error: Expected type to be "Set<num>", but got "Array<num>" instead
    --> ../../../examples/tests/invalid/container_types.test.w:26:20
    |
-26 | let s3: Set<num> = [1, \\"2\\", 3];
-   |                    ^^^^^^^^^^^ Expected type to be \\"Set<num>\\", but got \\"Array<num>\\" instead
+26 | let s3: Set<num> = [1, "2", 3];
+   |                    ^^^^^^^^^^^
 
 
-error: Expected type to be \\"Set<str>\\", but got \\"Set<num>\\" instead
+error: Expected type to be "Set<str>", but got "Set<num>" instead
    --> ../../../examples/tests/invalid/container_types.test.w:28:20
    |
 28 | let s5: Set<str> = s4;
-   |                    ^^ Expected type to be \\"Set<str>\\", but got \\"Set<num>\\" instead
+   |                    ^^
 
 
-error: Unknown symbol \\"someRandomMethod\\"
+error: Member "someRandomMethod" does not exist in "Set"
    --> ../../../examples/tests/invalid/container_types.test.w:29:4
    |
 29 | s1.someRandomMethod();
-   |    ^^^^^^^^^^^^^^^^ Unknown symbol \\"someRandomMethod\\"
+   |    ^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"Array<str>\\", but got \\"MutArray<str>\\" instead
+error: Expected type to be "Array<str>", but got "MutArray<str>" instead
    --> ../../../examples/tests/invalid/container_types.test.w:31:21
    |
 31 | let a: Array<str> = MutArray<str>[];
-   |                     ^^^^^^^^^^^^^^^ Expected type to be \\"Array<str>\\", but got \\"MutArray<str>\\" instead
+   |                     ^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"MutMap<num>\\", but got \\"Map<num>\\" instead
+error: Expected type to be "MutMap<num>", but got "Map<num>" instead
    --> ../../../examples/tests/invalid/container_types.test.w:34:24
    |
-34 | let mm1: MutMap<num> = { \\"a\\" => 1, \\"b\\" => 2, \\"c\\" => 3 };
-   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"MutMap<num>\\", but got \\"Map<num>\\" instead
+34 | let mm1: MutMap<num> = { "a" => 1, "b" => 2, "c" => 3 };
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Unknown symbol \\"copyMut\\"
+error: Member "copyMut" does not exist in "MutMap"
    --> ../../../examples/tests/invalid/container_types.test.w:37:15
    |
 37 | let mm3 = mm2.copyMut();
-   |               ^^^^^^^ Unknown symbol \\"copyMut\\"
+   |               ^^^^^^^
 
 
-error: Expected type to be \\"MutSet<str>\\", but got \\"Set<str>\\" instead
+error: Expected type to be "MutSet<str>", but got "Array<str>" instead
    --> ../../../examples/tests/invalid/container_types.test.w:41:27
    |
-41 | let ss1: MutSet<str> = Set{\\"c\\"};
-   |                           ^^^^^ Expected type to be \\"MutSet<str>\\", but got \\"Set<str>\\" instead
+41 | let ss1: MutSet<str> = Set["c"];
+   |                           ^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"bool\\" instead
-   --> ../../../examples/tests/invalid/container_types.test.w:43:37
+error: Expected type to be "num", but got "bool" instead
+   --> ../../../examples/tests/invalid/container_types.test.w:43:36
    |
-43 | let ss2: MutSet<num> = MutSet<num> {true};
-   |                                     ^^^^ Expected type to be \\"num\\", but got \\"bool\\" instead
+43 | let ss2: MutSet<num> = MutSet<num>[true];
+   |                                    ^^^^
 
 
-error: Unknown symbol \\"copyMut\\"
+error: Member "copyMut" does not exist in "MutSet"
    --> ../../../examples/tests/invalid/container_types.test.w:46:15
    |
 46 | let ss4 = ss3.copyMut();
-   |               ^^^^^^^ Unknown symbol \\"copyMut\\"
+   |               ^^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`ctor_super.test.w 1`] = `
+"error: Missing super() call as first statement of PreflighChild1's constructor
+  --> ../../../examples/tests/invalid/ctor_super.test.w:9:7
+  |
+9 | class PreflighChild1 extends PreflightBaseWithCtorParam {}
+  |       ^^^^^^^^^^^^^^
+
+
+error: Missing super() call as first statement of PreflighChild2's constructor
+   --> ../../../examples/tests/invalid/ctor_super.test.w:13:15
+   |
+13 |   new(a: num) {}
+   |               ^^
+
+
+error: Missing super() call as first statement of InflightChild1's constructor
+   --> ../../../examples/tests/invalid/ctor_super.test.w:29:16
+   |
+29 | inflight class InflightChild1 extends InflightBaseWithCtorParam {}
+   |                ^^^^^^^^^^^^^^
+
+
+error: Missing super() call as first statement of InflightChild2's constructor
+   --> ../../../examples/tests/invalid/ctor_super.test.w:33:15
+   |
+33 |   new(a: num) {}
+   |               ^^
+
+
+error: Missing super() call as first statement of InflightChild4's constructor
+   --> ../../../examples/tests/invalid/ctor_super.test.w:45:9
+   |
+45 |   new() {}
+   |         ^^
+
+
+error: Expected 1 positional argument(s) but got 0
+   --> ../../../examples/tests/invalid/ctor_super.test.w:19:5
+   |
+19 |     super();
+   |     ^^^^^^^^
+
+
+error: Expected 1 positional argument(s) but got 0
+   --> ../../../examples/tests/invalid/ctor_super.test.w:39:5
+   |
+39 |     super();
+   |     ^^^^^^^^
+
+
+error: Missing super() call as first statement of InflightChild1's constructor
+   --> ../../../examples/tests/invalid/ctor_super.test.w:55:9
+   |
+55 |   class InflightChild1 extends InflightBaseWithCtorParam {}
+   |         ^^^^^^^^^^^^^^
+
+
+error: Missing super() call as first statement of InflightChild2's constructor
+   --> ../../../examples/tests/invalid/ctor_super.test.w:59:17
+   |
+59 |     new(a: num) {}
+   |                 ^^
+
+
+error: Missing super() call as first statement of InflightChild4's constructor
+   --> ../../../examples/tests/invalid/ctor_super.test.w:71:11
+   |
+71 |     new() {}
+   |           ^^
+
+
+error: Expected 1 positional argument(s) but got 0
+   --> ../../../examples/tests/invalid/ctor_super.test.w:65:7
+   |
+65 |       super();
+   |       ^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`cyclic_bring1.w 1`] = `
-"error: Could not compile \\"<ABSOLUTE>/cyclic_bring1.w\\" due to cyclic bring statements:
+"error: Could not compile "<ABSOLUTE>/cyclic_bring1.w" due to cyclic bring statements:
 - <ABSOLUTE>/cyclic_bring3.w
 - <ABSOLUTE>/cyclic_bring2.w
 - <ABSOLUTE>/cyclic_bring1.w
 
 
-error: Could not type check \\"<ABSOLUTE>/cyclic_bring2.w\\" due to cyclic bring statements
+error: Could not type check "<ABSOLUTE>/cyclic_bring2.w" due to cyclic bring statements
   --> ../../../examples/tests/invalid/cyclic_bring1.w:1:1
   |
-1 | bring \\"./cyclic_bring2.w\\" as foo;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Could not type check \\"<ABSOLUTE>/cyclic_bring2.w\\" due to cyclic bring statements
+1 | bring "./cyclic_bring2.w" as foo;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Could not type check \\"<ABSOLUTE>/cyclic_bring3.w\\" due to cyclic bring statements
+error: Could not type check "<ABSOLUTE>/cyclic_bring3.w" due to cyclic bring statements
   --> ../../../examples/tests/invalid/cyclic_bring2.w:1:1
   |
-1 | bring \\"./cyclic_bring3.w\\" as foo;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Could not type check \\"<ABSOLUTE>/cyclic_bring3.w\\" due to cyclic bring statements
+1 | bring "./cyclic_bring3.w" as foo;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`cyclic_bring2.w 1`] = `
-"error: Could not compile \\"<ABSOLUTE>/cyclic_bring2.w\\" due to cyclic bring statements:
+"error: Could not compile "<ABSOLUTE>/cyclic_bring2.w" due to cyclic bring statements:
 - <ABSOLUTE>/cyclic_bring1.w
 - <ABSOLUTE>/cyclic_bring3.w
 - <ABSOLUTE>/cyclic_bring2.w
 
 
-error: Could not type check \\"<ABSOLUTE>/cyclic_bring3.w\\" due to cyclic bring statements
+error: Could not type check "<ABSOLUTE>/cyclic_bring3.w" due to cyclic bring statements
   --> ../../../examples/tests/invalid/cyclic_bring2.w:1:1
   |
-1 | bring \\"./cyclic_bring3.w\\" as foo;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Could not type check \\"<ABSOLUTE>/cyclic_bring3.w\\" due to cyclic bring statements
+1 | bring "./cyclic_bring3.w" as foo;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Could not type check \\"<ABSOLUTE>/cyclic_bring1.w\\" due to cyclic bring statements
+error: Could not type check "<ABSOLUTE>/cyclic_bring1.w" due to cyclic bring statements
   --> ../../../examples/tests/invalid/cyclic_bring3.w:1:1
   |
-1 | bring \\"./cyclic_bring1.w\\" as foo;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Could not type check \\"<ABSOLUTE>/cyclic_bring1.w\\" due to cyclic bring statements
+1 | bring "./cyclic_bring1.w" as foo;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`cyclic_bring3.w 1`] = `
-"error: Could not compile \\"<ABSOLUTE>/cyclic_bring3.w\\" due to cyclic bring statements:
+"error: Could not compile "<ABSOLUTE>/cyclic_bring3.w" due to cyclic bring statements:
 - <ABSOLUTE>/cyclic_bring2.w
 - <ABSOLUTE>/cyclic_bring1.w
 - <ABSOLUTE>/cyclic_bring3.w
 
 
-error: Could not type check \\"<ABSOLUTE>/cyclic_bring1.w\\" due to cyclic bring statements
+error: Could not type check "<ABSOLUTE>/cyclic_bring1.w" due to cyclic bring statements
   --> ../../../examples/tests/invalid/cyclic_bring3.w:1:1
   |
-1 | bring \\"./cyclic_bring1.w\\" as foo;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Could not type check \\"<ABSOLUTE>/cyclic_bring1.w\\" due to cyclic bring statements
+1 | bring "./cyclic_bring1.w" as foo;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Could not type check \\"<ABSOLUTE>/cyclic_bring2.w\\" due to cyclic bring statements
+error: Could not type check "<ABSOLUTE>/cyclic_bring2.w" due to cyclic bring statements
   --> ../../../examples/tests/invalid/cyclic_bring1.w:1:1
   |
-1 | bring \\"./cyclic_bring2.w\\" as foo;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Could not type check \\"<ABSOLUTE>/cyclic_bring2.w\\" due to cyclic bring statements
+1 | bring "./cyclic_bring2.w" as foo;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`diags_with_multibyte_chars.test.w 1`] = `
-"error: Unknown symbol \\"asdf\\"
+"error: Unknown symbol "asdf"
   --> ../../../examples/tests/invalid/diags_with_multibyte_chars.test.w:4:1
   |
 4 | asdf;
-  | ^^^^ Unknown symbol \\"asdf\\"
+  | ^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`enums.test.w 1`] = `
-"error: Enum \\"SomeEnum\\" does not contain value \\"FOUR\\"
+"error: Enum "SomeEnum" does not contain value "FOUR"
   --> ../../../examples/tests/invalid/enums.test.w:5:21
   |
 5 | let four = SomeEnum.FOUR;
-  |                     ^^^^ Enum \\"SomeEnum\\" does not contain value \\"FOUR\\"
+  |                     ^^^^
 
 
 error: Property not found
   --> ../../../examples/tests/invalid/enums.test.w:8:24
   |
 8 | let two = SomeEnum.TWO.TWO;
-  |                        ^^^ Property not found
+  |                        ^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
-exports[`extern.test.w 1`] = `
-"error: File not found: \\"./sad.js\\"
-  --> ../../../examples/tests/invalid/extern.test.w:2:3
+exports[`equality.test.w 1`] = `
+"error: Expected type to be "Array<num>", but got "Array<str>" instead
+  --> ../../../examples/tests/invalid/equality.test.w:8:8
   |
-2 |   extern \\"./sad.js\\" static getNum(): num;
-  |   ^^^^^^^^^^^^^^^^^ File not found: \\"./sad.js\\"
+8 | assert([1,2] == ["a", "b"]);
+  |        ^^^^^^^^^^^^^^^^^^^
 
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
+error: Expected type to be "Array<str>", but got "Array<num>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:11:8
+   |
+11 | assert(["a", "b"] == [1,2]);
+   |        ^^^^^^^^^^^^^^^^^^^
 
-exports[`extern_static.test.w 1`] = `
-"error: Extern methods must be declared \\"static\\" (they cannot access instance members)
-  --> ../../../examples/tests/invalid/extern_static.test.w:2:45
-  |
-2 |   extern \\"../valid/external_js.js\\" inflight getGreeting(name: str): str;
-  |                                             ^^^^^^^^^^^ Extern methods must be declared \\"static\\" (they cannot access instance members)
 
+error: Expected type to be "Array<str>", but got "Array<Json>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:18:8
+   |
+18 | assert(["1", "2"] == [{a: 1}]);
+   |        ^^^^^^^^^^^^^^^^^^^^^^
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
 
-exports[`file_with_variables.w 1`] = `
-"error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
-  --> ../../../examples/tests/invalid/file_with_variables.w:5:1
-  |
-5 | let x = 5;
-  | ^^^^^^^^^^ Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+error: Expected type to be "Array<Array<str>>", but got "Array<Array<Json>>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:21:8
+   |
+21 | assert([["1", "2"]] == [[{a: 1}]]);
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
-  --> ../../../examples/tests/invalid/file_with_variables.w:6:1
-  |
-6 | let y = [\\"hello\\", \\"world\\"];
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+error: Expected type to be "Map<Array<str>>", but got "Map<Array<num>>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:24:8
+   |
+24 | assert({"a" => ["a"]} == {"a" => [1]});
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
-  --> ../../../examples/tests/invalid/file_with_variables.w:7:1
-  |
-7 | let z = new cloud.Bucket();
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+error: Expected type to be "Array<Map<Array<num>>>", but got "Array<Map<Array<str>>>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:27:8
+   |
+27 | assert([{"a" => [1]}] == [{"a" => ["a"]}]);
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Preflight field \\"x\\" is not initialized
-   --> ../../../examples/tests/invalid/file_with_variables.w:10:3
+error: Expected type to be "Array<bool>?", but got "Array<str>?" instead
+   --> ../../../examples/tests/invalid/equality.test.w:33:8
    |
-10 |   x: num;
-   |   ^ Preflight field \\"x\\" is not initialized
+33 | assert(a1 == a2);
+   |        ^^^^^^^^
 
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
+error: Expected type to be "Array<str>", but got "Array<str>?" instead
+   --> ../../../examples/tests/invalid/equality.test.w:39:8
+   |
+39 | assert(b1 == b2);
+   |        ^^^^^^^^
 
-exports[`for_loop.test.w 1`] = `
-"error: Reserved word
-  --> ../../../examples/tests/invalid/for_loop.test.w:5:5
-  |
-5 | for test in bucket {
-  |     ^^^^ Reserved word
 
+error: Expected type to be "Array<nil>", but got "Array<str>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:42:8
+   |
+42 | assert([nil] == ["a"]);
+   |        ^^^^^^^^^^^^^^
 
-error: Unable to iterate over \\"Bucket\\"
-  --> ../../../examples/tests/invalid/for_loop.test.w:5:13
-  |
-5 | for test in bucket {
-  |             ^^^^^^ Unable to iterate over \\"Bucket\\"
 
+error: Expected type to be "Json", but got "nil" instead
+   --> ../../../examples/tests/invalid/equality.test.w:45:20
+   |
+45 | assert(Array<Json>[nil] == ["a"]);
+   |                    ^^^
+   |
+   = hint: to allow "nil" assignment use optional type: "Json?"
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
 
-exports[`function_call_arity.test.w 1`] = `
-"error: Unexpected 'identifier'
-   --> ../../../examples/tests/invalid/function_call_arity.test.w:31:62
+error: Expected type to be "Array<num?>", but got "Array<str?>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:54:8
    |
-31 | invalidCombinationFunc2(1, 2, prefix: \\"debug\\", priority: 0, \\"hello\\", \\"world\\");
-   |                                                              ^^^^^ Unexpected 'identifier'
+54 | assert([c1] == [c2]);
+   |        ^^^^^^^^^^^^
 
 
-error: Unexpected 'identifier'
-   --> ../../../examples/tests/invalid/function_call_arity.test.w:31:71
+error: Expected type to be "Array<Array<num>>", but got "Array<Array<str>>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:58:8
    |
-31 | invalidCombinationFunc2(1, 2, prefix: \\"debug\\", priority: 0, \\"hello\\", \\"world\\");
-   |                                                                       ^^^^^ Unexpected 'identifier'
+58 | assert([[1]] == [["1"]]);
+   |        ^^^^^^^^^^^^^^^^
 
 
-error: Expected 2 positional argument(s) but got 0
-  --> ../../../examples/tests/invalid/function_call_arity.test.w:2:1
-  |
-2 | func(); // Expected {} positional arguments but got {}
-  | ^^^^^^ Expected 2 positional argument(s) but got 0
+error: Expected type to be "Array<Array<str>>", but got "Array<Array<num>>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:61:8
+   |
+61 | assert([["1"]] == [[1]]);
+   |        ^^^^^^^^^^^^^^^^
 
 
-error: Expected between 2 and 3 positional arguments but got 1
-  --> ../../../examples/tests/invalid/function_call_arity.test.w:5:1
-  |
-5 | optionalParamsFunc(1); // Expected between {} and {} positional arguments but got {}
-  | ^^^^^^^^^^^^^^^^^^^^^ Expected between 2 and 3 positional arguments but got 1
+error: Expected type to be "Map<num>", but got "Map<str>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:66:8
+   |
+66 | assert(d1 == d2);
+   |        ^^^^^^^^
 
 
-error: Expected 2 positional argument(s) + variadic args but got 0
-  --> ../../../examples/tests/invalid/function_call_arity.test.w:8:1
-  |
-8 | variadicFunc(); // Expected {} positional arguments + variadic args but got {}
-  | ^^^^^^^^^^^^^^ Expected 2 positional argument(s) + variadic args but got 0
+error: Expected type to be "MutSet<bool>", but got "Set<num>" instead
+   --> ../../../examples/tests/invalid/equality.test.w:72:8
+   |
+72 | assert(e1 == e2);
+   |        ^^^^^^^^
 
 
-error: Expected between 2 and 3 positional arguments + variadic args but got 1
-   --> ../../../examples/tests/invalid/function_call_arity.test.w:12:1
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`explicit_lift_qualification.test.w 1`] = `
+"error: Lift blocks are only allowed in inflight phase
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:11:5
+   |
+11 |     lift {bucket: [put]}{} // Lift statment in preflight method
+   |     ^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Lift blocks are only allowed in inflight phase
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:21:1
+   |
+21 | lift {bucket: [put]}{}
+   | ^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Expected a preflight object, but found inflight expression instead
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:26:11
+   |
+26 |     lift {b: [put]}{} // Explicit qualification with inflight object
+   |           ^
+
+
+error: Expected a preflight object type, but found str instead
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:27:11
+   |
+27 |     lift {prelight_string: contains}{} // Explicit qualification on preflight non-class
+   |           ^^^^^^^^^^^^^^^
+   |
+   = hint: Preflight objects are instances of either a class or interface defined preflight without the \`inflight\` modifier
+
+
+error: Object of type Bucket does not have an inflight member named "shoot"
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:28:20
+   |
+28 |     lift {bucket: [shoot]}{} // Explicit qualification with unknown member
+   |           ------   ^^^^^
+   |           |         
+   |           Operation does not exist in this object
+
+
+error: Object of type Bucket does not have an inflight member named "shoot"
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:29:19
+   |
+29 |     lift {bucket: shoot}{} // Explicit qualification with unknown, single method format
+   |           ------  ^^^^^
+   |           |        
+   |           Operation does not exist in this object
+
+
+error: Unknown symbol "not_bucket"
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:30:11
+   |
+30 |     lift {not_bucket: put, not_bucket_again: get}{} // Explicit qualification with unknown objects
+   |           ^^^^^^^^^^
+
+
+error: Unknown symbol "not_bucket_again"
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:30:28
+   |
+30 |     lift {not_bucket: put, not_bucket_again: get}{} // Explicit qualification with unknown objects
+   |                            ^^^^^^^^^^^^^^^^
+
+
+error: Only inflight members may be qualified. "addObject" is a preflight member.
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:31:19
+   |
+31 |     lift {bucket: addObject}{} // Explicit qualification with preflight method op
+   |                   ^^^^^^^^^
+
+
+error: Only instance (non-static) members may be qualified
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:32:28
+   |
+32 |     lift {preflight_class: static_method}{} // Explicit qualification with static method
+   |                            ^^^^^^^^^^^^^
+
+
+error: Cannot reference an inflight value from within a preflight expression
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:26:11
+   |
+26 |     lift {b: [put]}{} // Explicit qualification with inflight object
+   |           ^
+
+
+error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:37:5
+   |
+37 |     b.put("k", "v"); // With no explicit qualification this should be an error
+   |     ^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
+
+error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:41:5
+   |
+41 |     b2.put("k", "v"); // With explicit qualification, but outside of lift block, this should be an error
+   |     ^^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
+
+error: Expression of type "IPreflightInterface" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/explicit_lift_qualification.test.w:44:5
+   |
+44 |     i.method(); // With no explicit qualification this should be an error
+   |     ^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`extern.test.w 1`] = `
+"error: File not found: "./sad.js"
+  --> ../../../examples/tests/invalid/extern.test.w:2:3
+  |
+2 |   extern "./sad.js" static getNum(): num;
+  |   ^^^^^^^^^^^^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`extern_static.test.w 1`] = `
+"error: Extern methods must be declared "static" (they cannot access instance members)
+  --> ../../../examples/tests/invalid/extern_static.test.w:2:45
+  |
+2 |   extern "../valid/external_ts.ts" inflight getGreeting(name: str): str;
+  |                                             ^^^^^^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`file_with_variables.w 1`] = `
+"error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+  --> ../../../examples/tests/invalid/file_with_variables.w:5:1
+  |
+5 | let x = 5;
+  | ^^^^^^^^^^
+
+
+error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+  --> ../../../examples/tests/invalid/file_with_variables.w:6:1
+  |
+6 | let y = ["hello", "world"];
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Module files cannot have statements besides classes, interfaces, enums, and structs. Rename the file to end with \`.main.w\` or \`.test.w\` to make this an entrypoint file.
+  --> ../../../examples/tests/invalid/file_with_variables.w:7:1
+  |
+7 | let z = new cloud.Bucket();
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Preflight field "x" is not initialized
+   --> ../../../examples/tests/invalid/file_with_variables.w:10:3
+   |
+10 |   x: num;
+   |   ^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`for_loop.test.w 1`] = `
+"error: Reserved word
+  --> ../../../examples/tests/invalid/for_loop.test.w:5:5
+  |
+5 | for test in bucket {
+  |     ^^^^
+
+
+error: Unable to iterate over "Bucket"
+  --> ../../../examples/tests/invalid/for_loop.test.w:5:13
+  |
+5 | for test in bucket {
+  |             ^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`function_call_arity.test.w 1`] = `
+"error: Positional arguments must come before named arguments
+   --> ../../../examples/tests/invalid/function_call_arity.test.w:31:61
+   |
+31 | invalidCombinationFunc2(1, 2, prefix: "debug", priority: 0, "hello", "world");
+   |                                                             ^^^^^^^
+
+
+error: Positional arguments must come before named arguments
+   --> ../../../examples/tests/invalid/function_call_arity.test.w:31:70
+   |
+31 | invalidCombinationFunc2(1, 2, prefix: "debug", priority: 0, "hello", "world");
+   |                                                                      ^^^^^^^
+
+
+error: Expected 2 positional argument(s) but got 0
+  --> ../../../examples/tests/invalid/function_call_arity.test.w:2:1
+  |
+2 | func(); // Expected {} positional arguments but got {}
+  | ^^^^^^
+
+
+error: Expected between 2 and 3 positional arguments but got 1
+  --> ../../../examples/tests/invalid/function_call_arity.test.w:5:1
+  |
+5 | optionalParamsFunc(1); // Expected between {} and {} positional arguments but got {}
+  | ^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Expected 2 positional argument(s) + variadic args but got 0
+  --> ../../../examples/tests/invalid/function_call_arity.test.w:8:1
+  |
+8 | variadicFunc(); // Expected {} positional arguments + variadic args but got {}
+  | ^^^^^^^^^^^^^^
+
+
+error: Expected between 2 and 3 positional arguments + variadic args but got 1
+   --> ../../../examples/tests/invalid/function_call_arity.test.w:12:1
    |
 12 | variadicOptionalParamsFunc(2); // Expected between {} and {} positional arguments + variadic args but got {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected between 2 and 3 positional arguments + variadic args but got 1
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 error: Expected 3 positional argument(s) or named arguments for the last parameter but got 0
    --> ../../../examples/tests/invalid/function_call_arity.test.w:20:1
    |
 20 | namedFunc(); // Expected {} positional arguments or named arguments for the last parameter but got {}
-   | ^^^^^^^^^^^ Expected 3 positional argument(s) or named arguments for the last parameter but got 0
+   | ^^^^^^^^^^^
 
 
 error: Optional parameters must always be after all non-optional parameters.
    --> ../../../examples/tests/invalid/function_call_arity.test.w:22:49
    |
 22 | let namedOptionalParamsFunc = (n: num, b: bool, s: str?, opts: Options) => {};
-   |                                                 ^ Optional parameters must always be after all non-optional parameters.
+   |                                                 ^
 
 
 error: Expected between 3 and 4 positional arguments or named arguments for the last parameter but got 1
    --> ../../../examples/tests/invalid/function_call_arity.test.w:23:1
    |
 23 | namedOptionalParamsFunc(3); // Expected between {} and {} positional arguments or named arguments for the last parameter but got {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected between 3 and 4 positional arguments or named arguments for the last parameter but got 1
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 error: Variadic parameters must always be the last parameter in a function.
    --> ../../../examples/tests/invalid/function_call_arity.test.w:27:51
    |
 27 | let invalidCombinationFunc = (n: num, b: bool, ...variadic: Array<str>, opts: Options) => {};
-   |                                                   ^^^^^^^^ Variadic parameters must always be the last parameter in a function.
+   |                                                   ^^^^^^^^
 
 
 error: No named arguments expected
    --> ../../../examples/tests/invalid/function_call_arity.test.w:31:1
    |
-31 | invalidCombinationFunc2(1, 2, prefix: \\"debug\\", priority: 0, \\"hello\\", \\"world\\");
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ No named arguments expected
+31 | invalidCombinationFunc2(1, 2, prefix: "debug", priority: 0, "hello", "world");
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"bool\\", but got \\"num\\" instead
+error: Expected type to be "bool", but got "num" instead
    --> ../../../examples/tests/invalid/function_call_arity.test.w:31:28
    |
-31 | invalidCombinationFunc2(1, 2, prefix: \\"debug\\", priority: 0, \\"hello\\", \\"world\\");
-   |                            ^ Expected type to be \\"bool\\", but got \\"num\\" instead
+31 | invalidCombinationFunc2(1, 2, prefix: "debug", priority: 0, "hello", "world");
+   |                            ^
+
+
+error: Expected type to be "Options", but got "str" instead
+   --> ../../../examples/tests/invalid/function_call_arity.test.w:31:61
+   |
+31 | invalidCombinationFunc2(1, 2, prefix: "debug", priority: 0, "hello", "world");
+   |                                                             ^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`function_call_variadic.test.w 1`] = `
-"error: Expected type to be \\"str\\", but got \\"num\\" instead
+"error: Expected type to be "str", but got "num" instead
   --> ../../../examples/tests/invalid/function_call_variadic.test.w:3:6
   |
 3 | func(1, 2, 3); // should fail due to wrong type for variadic
-  |      ^ Expected type to be \\"str\\", but got \\"num\\" instead
+  |      ^
 
 
-error: Expected type to be \\"str\\", but got \\"num\\" instead
+error: Expected type to be "str", but got "num" instead
   --> ../../../examples/tests/invalid/function_call_variadic.test.w:3:9
   |
 3 | func(1, 2, 3); // should fail due to wrong type for variadic
-  |         ^ Expected type to be \\"str\\", but got \\"num\\" instead
+  |         ^
 
 
-error: Expected type to be \\"str\\", but got \\"num\\" instead
+error: Expected type to be "str", but got "num" instead
   --> ../../../examples/tests/invalid/function_call_variadic.test.w:3:12
   |
 3 | func(1, 2, 3); // should fail due to wrong type for variadic
-  |            ^ Expected type to be \\"str\\", but got \\"num\\" instead
+  |            ^
 
 
-error: Expected type to be \\"str\\", but got \\"Array<str>\\" instead
+error: Expected type to be "str", but got "Array<str>" instead
   --> ../../../examples/tests/invalid/function_call_variadic.test.w:4:6
   |
-4 | func([\\"a\\", \\"b\\", \\"c\\"]); // should fail as the parameter is variadic
-  |      ^^^^^^^^^^^^^^^ Expected type to be \\"str\\", but got \\"Array<str>\\" instead
+4 | func(["a", "b", "c"]); // should fail as the parameter is variadic
+  |      ^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`function_type.test.w 1`] = `
 "error: Expected function return type
-  --> ../../../examples/tests/invalid/function_type.test.w:2:26
+  --> ../../../examples/tests/invalid/function_type.test.w:3:3
   |
-2 | let my_func = (callback: (num)) => {  };
-  |                          ^^^^^ Expected function return type
+3 |   my_method(x: num);
+  |   ^^^^^^^^^^^^^^^^^^
 
 
 error: Expected function return type
-  --> ../../../examples/tests/invalid/function_type.test.w:4:28
+  --> ../../../examples/tests/invalid/function_type.test.w:5:3
   |
-4 | let my_func2 = (callback: ((num)): (str)) => {  };
-  |                            ^^^^^ Expected function return type
+5 |   inflight my_method2(x: num);
+  |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 error: Optional parameters must always be after all non-optional parameters.
-   --> ../../../examples/tests/invalid/function_type.test.w:16:25
-   |
-16 | let my_func3 = (a: num, b: str?, c: bool) => {};
-   |                         ^ Optional parameters must always be after all non-optional parameters.
+  --> ../../../examples/tests/invalid/function_type.test.w:9:25
+  |
+9 | let my_func3 = (a: num, b: str?, c: bool) => {};
+  |                         ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`function_variadic_definition.test.w 1`] = `
-"error: Unknown parser error
+"error: Positional arguments must come before named arguments
    --> ../../../examples/tests/invalid/function_variadic_definition.test.w:15:13
    |
 15 | f5(args: 1, 2);
-   |             ^ Unknown parser error
+   |             ^
 
 
 error: Variadic parameters must always be the last parameter in a function.
   --> ../../../examples/tests/invalid/function_variadic_definition.test.w:1:14
   |
 1 | let f1 = (...args: Array<num>, x:num) => {};
-  |              ^^^^ Variadic parameters must always be the last parameter in a function.
+  |              ^^^^
 
 
 error: Variadic parameters must always be the last parameter in a function.
   --> ../../../examples/tests/invalid/function_variadic_definition.test.w:4:14
   |
 4 | let f2 = (...nums: Array<num>, ...strs: Array<str>) => {};
-  |              ^^^^ Variadic parameters must always be the last parameter in a function.
+  |              ^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"bool\\" instead
+error: Expected type to be "num", but got "bool" instead
   --> ../../../examples/tests/invalid/function_variadic_definition.test.w:8:7
   |
 8 | f3(1, true, 2);
-  |       ^^^^ Expected type to be \\"num\\", but got \\"bool\\" instead
+  |       ^^^^
 
 
 error: Variadic parameters must be type Array or MutArray.
    --> ../../../examples/tests/invalid/function_variadic_definition.test.w:11:14
    |
 11 | let f4 = (...args: Set<num>) => {};
-   |              ^^^^ Variadic parameters must be type Array or MutArray.
+   |              ^^^^
 
 
 error: No named arguments expected
    --> ../../../examples/tests/invalid/function_variadic_definition.test.w:15:1
    |
 15 | f5(args: 1, 2);
-   | ^^^^^^^^^^^^^^ No named arguments expected
+   | ^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"Bucket\\", but got \\"bool\\" instead
+error: Expected type to be "Bucket", but got "bool" instead
    --> ../../../examples/tests/invalid/function_variadic_definition.test.w:24:21
    |
 24 | funcBucket(bucket1, true, bucket2);
-   |                     ^^^^ Expected type to be \\"Bucket\\", but got \\"bool\\" instead
+   |                     ^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`global_symbols.test.w 1`] = `
+"error: Symbol "log" already defined in this scope
+  --> ../../../examples/tests/invalid/global_symbols.test.w:1:5
+  |
+1 | let log = "hi";
+  |     ^^^
+
+
+error: Symbol "assert" already defined in this scope
+  --> ../../../examples/tests/invalid/global_symbols.test.w:3:5
+  |
+3 | let assert = "there";
+  |     ^^^^^^
+
+
+error: Symbol "unsafeCast" already defined in this scope
+  --> ../../../examples/tests/invalid/global_symbols.test.w:5:5
+  |
+5 | let unsafeCast = "wingnuts";
+  |     ^^^^^^^^^^
+
+
+error: Symbol "nodeof" already defined in this scope
+  --> ../../../examples/tests/invalid/global_symbols.test.w:7:5
+  |
+7 | let nodeof = "!";
+  |     ^^^^^^
+
+
+error: Variable is not reassignable
+   --> ../../../examples/tests/invalid/global_symbols.test.w:10:1
+   |
+10 | log = "hi";
+   | ^^^
+
+
+error: Expected type to be "(value: stringable): void", but got "str" instead
+   --> ../../../examples/tests/invalid/global_symbols.test.w:10:7
+   |
+10 | log = "hi";
+   |       ^^^^
+
+
+error: Variable is not reassignable
+   --> ../../../examples/tests/invalid/global_symbols.test.w:12:1
+   |
+12 | assert = "there";
+   | ^^^^^^
+
+
+error: Expected type to be "(condition: bool, message: str?): void", but got "str" instead
+   --> ../../../examples/tests/invalid/global_symbols.test.w:12:10
+   |
+12 | assert = "there";
+   |          ^^^^^^^
+
+
+error: Variable is not reassignable
+   --> ../../../examples/tests/invalid/global_symbols.test.w:14:1
+   |
+14 | unsafeCast = "wingnuts";
+   | ^^^^^^^^^^
+
+
+error: Expected type to be "(value: any): any", but got "str" instead
+   --> ../../../examples/tests/invalid/global_symbols.test.w:14:14
+   |
+14 | unsafeCast = "wingnuts";
+   |              ^^^^^^^^^^
+
+
+error: Variable is not reassignable
+   --> ../../../examples/tests/invalid/global_symbols.test.w:16:1
+   |
+16 | nodeof = "!";
+   | ^^^^^^
+
+
+error: Expected type to be "preflight (construct: IConstruct): Node", but got "str" instead
+   --> ../../../examples/tests/invalid/global_symbols.test.w:16:10
+   |
+16 | nodeof = "!";
+   |          ^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`immutable_container_types.test.w 1`] = `
-"error: Unknown symbol \\"set\\"
+"error: Member "set" does not exist in "Map"
   --> ../../../examples/tests/invalid/immutable_container_types.test.w:3:4
   |
-3 | m1.set(\\"a\\", \\"bye\\");
-  |    ^^^ Unknown symbol \\"set\\"
+3 | m1.set("a", "bye");
+  |    ^^^
 
 
-error: Expected type to be \\"Map<str>\\", but got \\"MutMap<str>\\" instead
+error: Expected type to be "Map<str>", but got "MutMap<str>" instead
   --> ../../../examples/tests/invalid/immutable_container_types.test.w:6:20
   |
 6 | let m2: Map<str> = MutMap<str> {};
-  |                    ^^^^^^^^^^^^^^ Expected type to be \\"Map<str>\\", but got \\"MutMap<str>\\" instead
+  |                    ^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"bool\\", but got \\"str\\" instead
+error: Expected type to be "bool", but got "str" instead
   --> ../../../examples/tests/invalid/immutable_container_types.test.w:8:29
   |
-8 | let m3 = Map<bool> { \\"a\\" => \\"A\\" };
-  |                             ^^^ Expected type to be \\"bool\\", but got \\"str\\" instead
+8 | let m3 = Map<bool> { "a" => "A" };
+  |                             ^^^
 
 
-error: Unknown symbol \\"set\\"
+error: Member "set" does not exist in "Map"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:11:4
    |
-11 | m4.set(\\"2\\", 3);
-   |    ^^^ Unknown symbol \\"set\\"
+11 | m4.set("2", 3);
+   |    ^^^
 
 
-error: Unknown symbol \\"copy\\"
+error: Member "copy" does not exist in "Map"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:13:13
    |
 13 | let m5 = m4.copy();
-   |             ^^^^ Unknown symbol \\"copy\\"
+   |             ^^^^
 
 
-error: Unknown symbol \\"delete\\"
+error: Member "delete" does not exist in "Map"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:15:4
    |
-15 | m4.delete(\\"1\\");
-   |    ^^^^^^ Unknown symbol \\"delete\\"
+15 | m4.delete("1");
+   |    ^^^^^^
 
 
-error: Unknown symbol \\"clear\\"
+error: Member "clear" does not exist in "Map"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:17:4
    |
 17 | m4.clear();
-   |    ^^^^^ Unknown symbol \\"clear\\"
+   |    ^^^^^
 
 
-error: Expected type to be \\"Set<Array<num>>\\", but got \\"MutSet<Array<num>>\\" instead
+error: Expected type to be "Set<Array<num>>", but got "MutSet<Array<num>>" instead
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:21:27
    |
-21 | let s1: Set<Array<num>> = MutSet<Array<num>> {[1]};
-   |                           ^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"Set<Array<num>>\\", but got \\"MutSet<Array<num>>\\" instead
+21 | let s1: Set<Array<num>> = MutSet<Array<num>>[[1]];
+   |                           ^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Unknown symbol \\"delete\\"
+error: Member "delete" does not exist in "Set"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:24:4
    |
-24 | s2.delete(\\"a\\");
-   |    ^^^^^^ Unknown symbol \\"delete\\"
+24 | s2.delete("a");
+   |    ^^^^^^
 
 
-error: Unknown symbol \\"add\\"
+error: Member "add" does not exist in "Set"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:26:4
    |
-26 | s2.add(\\"d\\");
-   |    ^^^ Unknown symbol \\"add\\"
+26 | s2.add("d");
+   |    ^^^
 
 
-error: Unknown symbol \\"copy\\"
+error: Member "copy" does not exist in "Set"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:28:13
    |
 28 | let s3 = s2.copy();
-   |             ^^^^ Unknown symbol \\"copy\\"
+   |             ^^^^
 
 
-error: Unknown symbol \\"clear\\"
+error: Member "clear" does not exist in "Set"
    --> ../../../examples/tests/invalid/immutable_container_types.test.w:30:4
    |
 30 | s2.clear();
-   |    ^^^^^ Unknown symbol \\"clear\\"
+   |    ^^^^^
 
 
-error: Expected type to be \\"Set<bool>\\", but got \\"Set<Array<num>>\\" instead
-   --> ../../../examples/tests/invalid/immutable_container_types.test.w:32:21
+error: Expected type to be "bool", but got "Array<num>" instead
+   --> ../../../examples/tests/invalid/immutable_container_types.test.w:32:31
    |
-32 | let s4: Set<bool> = {[3]};
-   |                     ^^^^^ Expected type to be \\"Set<bool>\\", but got \\"Set<Array<num>>\\" instead
+32 | let s4: Set<bool> = Set<bool>[[3]];
+   |                               ^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`impl_interface.test.w 1`] = `
-"error: Class \\"A\\" does not implement method \\"handle\\" of interface \\"IQueueSetConsumerHandler\\"
+"error: Class "A" does not implement method "handle" of interface "IQueueSetConsumerHandler"
   --> ../../../examples/tests/invalid/impl_interface.test.w:3:7
   |
 3 | class A impl cloud.IQueueSetConsumerHandler {
-  |       ^ Class \\"A\\" does not implement method \\"handle\\" of interface \\"IQueueSetConsumerHandler\\"
+  |       ^
 
 
-error: Expected type to be \\"inflight (message: str): void\\", but got \\"inflight (x: num): void\\" instead
-  --> ../../../examples/tests/invalid/impl_interface.test.w:7:7
+error: Expected type to be "inflight (message: str): void", but got "inflight (x: num): void" instead
+  --> ../../../examples/tests/invalid/impl_interface.test.w:8:16
   |
-7 | class B impl cloud.IQueueSetConsumerHandler {
-  |       ^ Expected type to be \\"inflight (message: str): void\\", but got \\"inflight (x: num): void\\" instead
+8 |   pub inflight handle(x: num) {
+  |                ^^^^^^
 
 
-error: Expected an interface, instead found type \\"Bucket\\"
+error: Expected an interface, instead found type "Bucket"
    --> ../../../examples/tests/invalid/impl_interface.test.w:14:14
    |
 14 | class C impl cloud.Bucket {
-   |              ^^^^^^^^^^^^ Expected an interface, instead found type \\"Bucket\\"
+   |              ^^^^^^^^^^^^
 
 
-error: Class \\"r\\" does not implement method \\"method1\\" of interface \\"I3\\"
+error: Class "r" does not implement method "method1" of interface "I3"
    --> ../../../examples/tests/invalid/impl_interface.test.w:30:7
    |
 30 | class r impl I3 {
-   |       ^ Class \\"r\\" does not implement method \\"method1\\" of interface \\"I3\\"
+   |       ^
 
 
-error: Class \\"r\\" does not implement method \\"method2\\" of interface \\"I3\\"
+error: Class "r" does not implement method "method2" of interface "I3"
    --> ../../../examples/tests/invalid/impl_interface.test.w:30:7
    |
 30 | class r impl I3 {
-   |       ^ Class \\"r\\" does not implement method \\"method2\\" of interface \\"I3\\"
+   |       ^
 
 
-error: Class \\"r\\" does not implement method \\"method3\\" of interface \\"I3\\"
+error: Class "r" does not implement method "method3" of interface "I3"
    --> ../../../examples/tests/invalid/impl_interface.test.w:30:7
    |
 30 | class r impl I3 {
-   |       ^ Class \\"r\\" does not implement method \\"method3\\" of interface \\"I3\\"
+   |       ^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`indexing.test.w 1`] = `
+"error: Cannot update elements of an immutable Array
+  --> ../../../examples/tests/invalid/indexing.test.w:6:1
+  |
+6 | arr[0] = 5;
+  | ^^^^^^
+  |
+  = hint: Consider using MutArray instead
+
+
+error: Expected type to be "num", but got "str" instead
+  --> ../../../examples/tests/invalid/indexing.test.w:9:5
+  |
+9 | arr["key"];
+  |     ^^^^^
+
+
+error: Type "Bucket" is not indexable
+   --> ../../../examples/tests/invalid/indexing.test.w:13:1
+   |
+13 | b[0] = 5;
+   | ^
+
+
+error: Type "Array<num>?" is not indexable
+   --> ../../../examples/tests/invalid/indexing.test.w:17:1
+   |
+17 | optarr[0] = 5;
+   | ^^^^^^
+
+
+error: Expected type to be "str", but got "num" instead
+   --> ../../../examples/tests/invalid/indexing.test.w:21:5
+   |
+21 | map[0];
+   |     ^
+
+
+error: Cannot update elements of an immutable Map
+   --> ../../../examples/tests/invalid/indexing.test.w:25:1
+   |
+25 | mutmap["a"] = false;
+   | ^^^^^^^^^^^
+   |
+   = hint: Consider using MutMap instead
+
+
+error: Cannot update elements of an immutable Json
+   --> ../../../examples/tests/invalid/indexing.test.w:29:1
+   |
+29 | json[0] = 5;
+   | ^^^^^^^
+   |
+   = hint: Consider using MutJson instead
+
+
+error: Strings are immutable
+   --> ../../../examples/tests/invalid/indexing.test.w:33:1
+   |
+33 | s[0] = "H";
+   | ^^^^
+
+
+error: Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
+   --> ../../../examples/tests/invalid/indexing.test.w:36:13
+   |
+36 | let var x = 3 + "hello";
+   |             ^^^^^^^^^^^
+
+
+error: Unsupported reassignment of element of type unresolved
+   --> ../../../examples/tests/invalid/indexing.test.w:37:1
+   |
+37 | x["hi"] = 4;
+   | ^^^^^^^
+
+
+error: Indexing into an inferred type is not supported
+   --> ../../../examples/tests/invalid/indexing.test.w:41:7
+   |
+41 |   log(x[0]);
+   |       ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -1613,91 +2393,84 @@ exports[`inference.test.w 1`] = `
    --> ../../../examples/tests/invalid/inference.test.w:78:8
    |
 78 |   args(nice) {
-   |        ^^^^ Missing required type annotation for method signature
+   |        ^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/inference.test.w:13:18
    |
-13 | recursiveClosure(\\"\\");
-   |                  ^^ Expected type to be \\"num\\", but got \\"str\\" instead
+13 | recursiveClosure("");
+   |                  ^^
 
 
-error: Expected type to be \\"str\\", but got \\"num\\" instead
+error: Expected type to be "str", but got "num" instead
    --> ../../../examples/tests/invalid/inference.test.w:32:19
    |
 32 | stringArray2.push(2);
-   |                   ^ Expected type to be \\"str\\", but got \\"num\\" instead
+   |                   ^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/inference.test.w:38:16
    |
-38 | numArray2.push(\\"2\\");
-   |                ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+38 | numArray2.push("2");
+   |                ^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/inference.test.w:42:40
    |
 42 | let dependentArray = [numArray2.at(0), stringArray2.at(1)];
-   |                                        ^^^^^^^^^^^^^^^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+   |                                        ^^^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/inference.test.w:45:60
    |
-45 | let dependentMap = { \\"cool\\" => numArray2.at(0), \\"cool2\\" => stringArray2.at(1) };
-   |                                                            ^^^^^^^^^^^^^^^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+45 | let dependentMap = { "cool" => numArray2.at(0), "cool2" => stringArray2.at(1) };
+   |                                                            ^^^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"inflight (key: str, type: BucketEventType): void\\", but got \\"inflight (request: ApiRequest): ApiResponse\\" instead
+error: Expected type to be "inflight (key: str, type: BucketEventType): void", but got "inflight (request: ApiRequest): ApiResponse?" instead
    --> ../../../examples/tests/invalid/inference.test.w:57:31
    |
 57 | (new cloud.Bucket()).onCreate(func);
-   |                               ^^^^ Expected type to be \\"inflight (key: str, type: BucketEventType): void\\", but got \\"inflight (request: ApiRequest): ApiResponse\\" instead
+   |                               ^^^^
 
 
-error: Expected type to be \\"inflight (str): void\\", but got \\"inflight (arg1: num): unknown\\" instead
+error: Expected type to be "inflight (str): void", but got "inflight (arg1: num): unknown" instead
    --> ../../../examples/tests/invalid/inference.test.w:84:37
    |
 84 | let badFunc: inflight (str): void = inflight (arg1: num) => {};
-   |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"inflight (str): void\\", but got \\"inflight (arg1: num): unknown\\" instead
+   |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
   --> ../../../examples/tests/invalid/inference.test.w:4:29
   |
 4 | let preflightClosureArgs = (nice) => { return true; };
-  |                             ^^^^ Unable to infer type
-
-
-error: Unable to infer type
-   --> ../../../examples/tests/invalid/inference.test.w:25:44
-   |
-25 | let stringInterpolationCannotBeInferred = (nice) => {
-   |                                            ^^^^ Unable to infer type
+  |                             ^^^^
 
 
 error: Property not found
    --> ../../../examples/tests/invalid/inference.test.w:63:19
    |
 63 |     body: request.body,
-   |                   ^^^^ Property not found
+   |                   ^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
    --> ../../../examples/tests/invalid/inference.test.w:60:23
    |
 60 | let func2 = inflight (request) => {
-   |                       ^^^^^^^ Unable to infer type
+   |                       ^^^^^^^
 
 
 error: Unexpected return value from void function. Return type annotations are required for methods.
    --> ../../../examples/tests/invalid/inference.test.w:75:5
    |
 75 |     return true;
-   |     ^^^^^^^^^^^^ Unexpected return value from void function. Return type annotations are required for methods.
+   |     ^^^^^^^^^^^^
 
 
 error: Inferred type Array<str> conflicts with already inferred type Array<num>
@@ -1708,172 +2481,201 @@ error: Inferred type Array<str> conflicts with already inferred type Array<num>
 93 | |     a: a,
 94 | |     b: a,
 95 | |   };
-   | \\\\---^ Inferred type Array<str> conflicts with already inferred type Array<num>
+   | \\---^
 
 
-error: Expected type to be \\"str\\", but got \\"num\\" instead
+error: Expected type to be "str", but got "num" instead
     --> ../../../examples/tests/invalid/inference.test.w:102:16
     |
 102 |   let x: str = returnsNumber();
-    |                ^^^^^^^^^^^^^^^ Expected type to be \\"str\\", but got \\"num\\" instead
+    |                ^^^^^^^^^^^^^^^
 
 
 error: Property not found
     --> ../../../examples/tests/invalid/inference.test.w:109:14
     |
-109 |   return arg.get(\\"a\\");
-    |              ^^^ Property not found
+109 |   return arg.get("a");
+    |              ^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
     --> ../../../examples/tests/invalid/inference.test.w:107:19
     |
 107 | let unknownArg = (arg) => {
-    |                   ^^^ Unable to infer type
+    |                   ^^^
+
+
+error: Expected type to be "str", but got "num" instead
+    --> ../../../examples/tests/invalid/inference.test.w:118:16
+    |
+118 |   let s: str = a;
+    |                ^
+
+
+error: Expected type to be "num", but got "str" instead
+    --> ../../../examples/tests/invalid/inference.test.w:120:10
+    |
+120 |   return "";
+    |          ^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
    --> ../../../examples/tests/invalid/inference.test.w:69:5
    |
 69 | let anotherEmptyArray = [];
-   |     ^^^^^^^^^^^^^^^^^ Unable to infer type
+   |     ^^^^^^^^^^^^^^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
    --> ../../../examples/tests/invalid/inference.test.w:21:5
    |
 21 | let clonedArray = emptyArray.copyMut();
-   |     ^^^^^^^^^^^ Unable to infer type
+   |     ^^^^^^^^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
    --> ../../../examples/tests/invalid/inference.test.w:16:5
    |
 16 | let emptyArray = [];
-   |     ^^^^^^^^^^ Unable to infer type
+   |     ^^^^^^^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
    --> ../../../examples/tests/invalid/inference.test.w:60:5
    |
 60 | let func2 = inflight (request) => {
-   |     ^^^^^ Unable to infer type
+   |     ^^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
    --> ../../../examples/tests/invalid/inference.test.w:18:5
    |
 18 | let numArray = emptyArray;
-   |     ^^^^^^^^ Unable to infer type
+   |     ^^^^^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
   --> ../../../examples/tests/invalid/inference.test.w:4:5
   |
 4 | let preflightClosureArgs = (nice) => { return true; };
-  |     ^^^^^^^^^^^^^^^^^^^^ Unable to infer type
-
+  |     ^^^^^^^^^^^^^^^^^^^^
 
-error: Unable to infer type
-   --> ../../../examples/tests/invalid/inference.test.w:25:5
-   |
-25 | let stringInterpolationCannotBeInferred = (nice) => {
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unable to infer type
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`inflight_class_created_in_preflight.test.w 1`] = `
-"error: Cannot create inflight class \\"Foo\\" in preflight phase
+"error: Cannot create inflight class "Foo" in preflight phase
   --> ../../../examples/tests/invalid/inflight_class_created_in_preflight.test.w:3:1
   |
 3 | new Foo();
-  | ^^^^^^^^^ Cannot create inflight class \\"Foo\\" in preflight phase
+  | ^^^^^^^^^
 
 
-error: Cannot create inflight class \\"Foo\\" in preflight phase
+error: Cannot create inflight class "Foo" in preflight phase
   --> ../../../examples/tests/invalid/inflight_class_created_in_preflight.test.w:8:5
   |
 8 |     new Foo();
-  |     ^^^^^^^^^ Cannot create inflight class \\"Foo\\" in preflight phase
+  |     ^^^^^^^^^
 
 
-error: Cannot create inflight class \\"Foo\\" in preflight phase
+error: Cannot create inflight class "Foo" in preflight phase
    --> ../../../examples/tests/invalid/inflight_class_created_in_preflight.test.w:13:5
    |
 13 |     new Foo();
-   |     ^^^^^^^^^ Cannot create inflight class \\"Foo\\" in preflight phase
+   |     ^^^^^^^^^
 
 
-error: Cannot create preflight class \\"PreflightClass\\" in inflight phase
+error: Cannot create preflight class "PreflightClass" in inflight phase
    --> ../../../examples/tests/invalid/inflight_class_created_in_preflight.test.w:19:3
    |
 19 |   new PreflightClass();
-   |   ^^^^^^^^^^^^^^^^^^^^ Cannot create preflight class \\"PreflightClass\\" in inflight phase
+   |   ^^^^^^^^^^^^^^^^^^^^
 
 
-error: Cannot qualify access to a lifted type \\"PreflightClass\\" (see https://github.com/winglang/wing/issues/76 for more details)
+error: Cannot qualify access to a lifted type "PreflightClass" (see https://github.com/winglang/wing/issues/76 for more details)
    --> ../../../examples/tests/invalid/inflight_class_created_in_preflight.test.w:19:7
    |
 19 |   new PreflightClass();
-   |       ^^^^^^^^^^^^^^ Cannot qualify access to a lifted type \\"PreflightClass\\" (see https://github.com/winglang/wing/issues/76 for more details)
+   |       ^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`inflight_class_dup_init.test.w 1`] = `
-"error: Multiple inflight initializers defined in class Foo
+"error: Multiple inflight constructors defined in class Foo
   --> ../../../examples/tests/invalid/inflight_class_dup_init.test.w:6:3
   |  
 6 | /   inflight new() {
 7 | | 
 8 | |   }
-  | \\\\---^ Multiple inflight initializers defined in class Foo
+  | \\---^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`inflight_class_in_preflight.test.w 1`] = `
-"error: Cannot create inflight class \\"Foo\\" in preflight phase
+"error: Cannot create inflight class "Foo" in preflight phase
   --> ../../../examples/tests/invalid/inflight_class_in_preflight.test.w:5:1
   |
 5 | new Foo();
-  | ^^^^^^^^^ Cannot create inflight class \\"Foo\\" in preflight phase
+  | ^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`inflight_class_interface_structural_typing.test.w 1`] = `
-"error: Expected type to be \\"IGoo\\", but got \\"NotGoo\\" instead
+"error: Expected type to be "IGoo", but got "NotGoo" instead
    --> ../../../examples/tests/invalid/inflight_class_interface_structural_typing.test.w:26:17
    |
 26 |   let x: IGoo = new NotGoo();
-   |                 ^^^^^^^^^^^^ Expected type to be \\"IGoo\\", but got \\"NotGoo\\" instead
+   |                 ^^^^^^^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`inflight_intrinsic.test.w 1`] = `
+"error: Must specify an "alias" to lift this expression
+  --> ../../../examples/tests/invalid/inflight_intrinsic.test.w:4:10
+  |
+4 |   { obj: [1, 2, 3] }
+  |          ^^^^^^^^^
+
+
+error: Inflight path must be a non-interpolated string literal
+  --> ../../../examples/tests/invalid/inflight_intrinsic.test.w:2:40
+  |
+2 | let func: inflight (): str = @inflight(funkPath, lifts: [
+  |                                        ^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -1882,181 +2684,321 @@ exports[`inflight_reassign.test.w 1`] = `
 "error: Variable cannot be reassigned from inflight
   --> ../../../examples/tests/invalid/inflight_reassign.test.w:5:3
   |
-5 |   xvar = \\"hi\\";
-  |   ^^^^ Variable cannot be reassigned from inflight
+5 |   xvar = "hi";
+  |   ^^^^
 
 
 error: Variable is not reassignable
   --> ../../../examples/tests/invalid/inflight_reassign.test.w:8:3
   |
 2 | let ylet = 123;
-  |     ---- defined here (try adding \\"var\\" in front)
+  |     ---- defined here (try adding "var" in front)
   .
 8 |   ylet = 456;
-  |   ^^^^ Variable is not reassignable
+  |   ^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`inflight_ref_explicit_ops.test.w 1`] = `
-"error: Cannot qualify access to a lifted object of type \\"Queue\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/inflight_ref_explicit_ops.test.w:13:12
+"error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/inflight_ref_explicit_ops.test.w:36:5
+   |
+36 |     x.put("hello", "world");
+   |     ^
    |
-13 |     return this.myQueue;
-   |            ^^^^^^^^^^^^ Cannot qualify access to a lifted object of type \\"Queue\\" (see https://github.com/winglang/wing/issues/76 for more details)
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
 
 
-error: Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/inflight_ref_explicit_ops.test.w:34:13
+error: Expression of type "Queue" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/inflight_ref_explicit_ops.test.w:43:5
    |
-34 |     let x = this.b;
-   |             ^^^^^^ Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
+43 |     q.push("push!");
+   |     ^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
 
 
-error: Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/inflight_ref_explicit_ops.test.w:47:13
+error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/inflight_ref_explicit_ops.test.w:48:12
+   |
+48 |     assert(b.list().length == 0);
+   |            ^
    |
-47 |     let b = this.array.at(1);
-   |             ^^^^^^^^^^^^^^^^ Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`inflight_ref_resource_sub_method.test.w 1`] = `
-"error: Cannot qualify access to a lifted object of type \\"Queue\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/inflight_ref_resource_sub_method.test.w:13:12
+"error: Expression of type "Queue" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/inflight_ref_resource_sub_method.test.w:32:5
    |
-13 |     return this.myQueue;
-   |            ^^^^^^^^^^^^ Cannot qualify access to a lifted object of type \\"Queue\\" (see https://github.com/winglang/wing/issues/76 for more details)
+32 |     q.push("push!");
+   |     ^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
 
 
-error: Cannot qualify access to a lifted object of type \\"Queue\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/inflight_ref_resource_sub_method.test.w:18:12
+error: Expression of type "Queue" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/inflight_ref_resource_sub_method.test.w:35:5
+   |
+35 |     q2.push("push!");
+   |     ^^
    |
-18 |     return globalQueue;
-   |            ^^^^^^^^^^^ Cannot qualify access to a lifted object of type \\"Queue\\" (see https://github.com/winglang/wing/issues/76 for more details)
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`inflight_ref_unknown_op.test.w 1`] = `
-"error: Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/inflight_ref_unknown_op.test.w:13:13
+"error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/inflight_ref_unknown_op.test.w:15:5
    |
-13 |     let x = this.b;
-   |             ^^^^^^ Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
+15 |     x.put("hello", "world");
+   |     ^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
 
 
-error: Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/inflight_ref_unknown_op.test.w:17:13
+error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/inflight_ref_unknown_op.test.w:19:5
+   |
+19 |     y.put("boom", "shakalaka");
+   |     ^
    |
-17 |     let y = globalB;
-   |             ^^^^^^^ Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`interface.test.w 1`] = `
 "error: Properties are not supported in interfaces
-   --> ../../../examples/tests/invalid/interface.test.w:30:3
+   --> ../../../examples/tests/invalid/interface.test.w:32:3
    |
-30 |   bar: str;
-   |   ^^^^^^^^^ Properties are not supported in interfaces
+32 |   bar: str;
+   |   ^^^^^^^^^
 
 
-error: Unknown symbol \\"IB\\"
-  --> ../../../examples/tests/invalid/interface.test.w:2:22
+error: Access modifiers are not allowed in interfaces
+   --> ../../../examples/tests/invalid/interface.test.w:38:3
+   |
+38 |   pub method2(): str;  
+   |   ^^^^^^^^^^^^^^^^^^^
+
+
+error: Expected type annotation
+   --> ../../../examples/tests/invalid/interface.test.w:44:11
+   |
+44 |   method1(a, b): void;
+   |           ^
+
+
+error: Expected type annotation
+   --> ../../../examples/tests/invalid/interface.test.w:44:14
+   |
+44 |   method1(a, b): void;
+   |              ^
+
+
+error: Unknown parser error
+   --> ../../../examples/tests/invalid/interface.test.w:38:14
+   |
+38 |   pub method2(): str;  
+   |              ^^
+
+
+error: Unknown symbol "IB"
+  --> ../../../examples/tests/invalid/interface.test.w:4:22
   |
-2 | interface IA extends IB {
-  |                      ^^ Unknown symbol \\"IB\\"
+4 | interface IA extends IB {
+  |                      ^^
 
 
-error: Unknown symbol \\"IDontExist\\"
-   --> ../../../examples/tests/invalid/interface.test.w:10:26
+error: Unknown symbol "IDontExist"
+   --> ../../../examples/tests/invalid/interface.test.w:12:26
    |
-10 | interface IExist extends IDontExist {
-   |                          ^^^^^^^^^^ Unknown symbol \\"IDontExist\\"
+12 | interface IExist extends IDontExist {
+   |                          ^^^^^^^^^^
 
 
-error: Expected an interface, instead found type \\"ISomeClass\\"
-   --> ../../../examples/tests/invalid/interface.test.w:16:34
+error: Unknown symbol "ISomeClass"
+   --> ../../../examples/tests/invalid/interface.test.w:18:34
    |
-16 | interface ISomeInterface extends ISomeClass {
-   |                                  ^^^^^^^^^^ Expected an interface, instead found type \\"ISomeClass\\"
+18 | interface ISomeInterface extends ISomeClass {
+   |                                  ^^^^^^^^^^
 
 
-error: Symbol \\"foo\\" already defined in this scope
-   --> ../../../examples/tests/invalid/interface.test.w:23:5
+error: Symbol "foo" already defined in this scope
+   --> ../../../examples/tests/invalid/interface.test.w:25:5
    |
-22 |     foo(): void;
+24 |     foo(): void;
    |     --- previous definition
-23 |     foo(): void;
-   |     ^^^ Symbol \\"foo\\" already defined in this scope
+25 |     foo(): void;
+   |     ^^^
 
 
-error: Symbol \\"foo\\" already defined in this scope
-   --> ../../../examples/tests/invalid/interface.test.w:25:5
+error: Symbol "foo" already defined in this scope
+   --> ../../../examples/tests/invalid/interface.test.w:27:5
    |
-22 |     foo(): void;
+24 |     foo(): void;
    |     --- previous definition
    .
-25 |     foo(): num;
-   |     ^^^ Symbol \\"foo\\" already defined in this scope
+27 |     foo(): num;
+   |     ^^^
+
+
+error: Inflight class CImplPreflightIface cannot implement a preflight interface IPreflight
+   --> ../../../examples/tests/invalid/interface.test.w:52:1
+   |  
+52 | / inflight class CImplPreflightIface impl IPreflight {
+53 | |   pub method1(): void {}
+54 | | }
+   | \\-^
+
+
+error: Expected type to be "preflight (): void", but got "inflight (): void" instead
+   --> ../../../examples/tests/invalid/interface.test.w:53:7
+   |
+53 |   pub method1(): void {}
+   |       ^^^^^^^
+   |
+   = hint: expected phase to be preflight, but got inflight instead
+
+
+error: Inflight interface IInflightExtendsPreflight cannot extend a preflight interface IPreflight
+   --> ../../../examples/tests/invalid/interface.test.w:57:20
+   |
+57 | inflight interface IInflightExtendsPreflight extends IPreflight {
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Inflight interface IInflightExtendsJsii cannot extend a preflight interface ISomeInterface
+   --> ../../../examples/tests/invalid/interface.test.w:62:20
+   |
+62 | inflight interface IInflightExtendsJsii extends jsii_fixture.ISomeInterface {
+   |                    ^^^^^^^^^^^^^^^^^^^^
+
+
+error: Interface "IInflightExtendsJsii" extends "ISomeInterface" but has a conflicting member "method" (preflight (): void != inflight (): void)
+   --> ../../../examples/tests/invalid/interface.test.w:62:20
+   |
+62 | inflight interface IInflightExtendsJsii extends jsii_fixture.ISomeInterface {
+   |                    ^^^^^^^^^^^^^^^^^^^^
+
+
+error: Inflight class CInflightImplJsii cannot implement a preflight interface ISomeInterface
+   --> ../../../examples/tests/invalid/interface.test.w:67:1
+   |  
+67 | / inflight class CInflightImplJsii impl jsii_fixture.ISomeInterface {
+68 | |   pub method(): void {}
+69 | | }
+   | \\-^
+
+
+error: Expected type to be "preflight (): void", but got "inflight (): void" instead
+   --> ../../../examples/tests/invalid/interface.test.w:68:7
+   |
+68 |   pub method(): void {}
+   |       ^^^^^^
+   |
+   = hint: expected phase to be preflight, but got inflight instead
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`intrinsics.test.w 1`] = `
+"error: @dirname does not expect arguments
+  --> ../../../examples/tests/invalid/intrinsics.test.w:6:20
+  |
+6 | let path = @dirname();
+  |                    ^^
+
+
+error: @dirname cannot be used in inflight
+  --> ../../../examples/tests/invalid/intrinsics.test.w:2:11
+  |
+2 |   let x = @dirname;
+  |           ^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
+exports[`invalid compile directory 1`] = `
+"error: <ABSOLUTE>/external_ts.ts must be a sub directory of <ABSOLUTE>/lib
+  --> ../../../examples/tests/invalid/lib/extern_above.w:2:3
+  |
+2 |   extern "../../valid/external_ts.ts" static getGreeting(name: str): str;
+  |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+"
+`;
+
 exports[`issue_2767.test.w 1`] = `
-"error: Expected type to be \\"MutJson\\", but got \\"Bucket\\" instead
+"error: Expected type to be "MutJson", but got "Bucket" instead
   --> ../../../examples/tests/invalid/issue_2767.test.w:4:16
   |
-4 | x.set(\\"hello\\", new cloud.Bucket());
-  |                ^^^^^^^^^^^^^^^^^^ Expected type to be \\"MutJson\\", but got \\"Bucket\\" instead
+4 | x.set("hello", new cloud.Bucket());
+  |                ^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`jsii_access_modifiers.test.w 1`] = `
-"error: Cannot access protected member \\"createTopic\\" of \\"Bucket\\"
+"error: Cannot access protected member "createTopic" of "Bucket"
    --> ../../../examples/tests/invalid/jsii_access_modifiers.test.w:13:3
    |
 13 | b.createTopic(cloud.BucketEventType.CREATE);
-   |   ^^^^^^^^^^^ Cannot access protected member \\"createTopic\\" of \\"Bucket\\"
+   |   ^^^^^^^^^^^
+   |
+   = hint: the definition of "createTopic" needs a broader access modifier like "pub" to be used outside of "Bucket"
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -2066,169 +3008,270 @@ exports[`json.test.w 1`] = `
    --> ../../../examples/tests/invalid/json.test.w:29:26
    |
 29 | let jsonIncomplete = Json;
-   |                          ^ Json literal must have an element
+   |                          ^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Duplicate key numField in json object literal
+    --> ../../../examples/tests/invalid/json.test.w:132:12
+    |
+132 | {numField, numField};
+    |            ^^^^^^^^
+
+
+error: Duplicate key numField in json object literal
+    --> ../../../examples/tests/invalid/json.test.w:133:15
+    |
+133 | {numField: 5, numField};
+    |               ^^^^^^^^
+
+
+error: Expected type to be "num", but got "str" instead
   --> ../../../examples/tests/invalid/json.test.w:6:14
   |
 6 | let n: num = j;
-  |              ^ Expected type to be \\"num\\", but got \\"str\\" instead
+  |              ^
 
 
-error: Expected type to be \\"bool\\", but got \\"str\\" instead
+error: Expected type to be "bool", but got "str" instead
   --> ../../../examples/tests/invalid/json.test.w:8:15
   |
 8 | let b: bool = j;
-  |               ^ Expected type to be \\"bool\\", but got \\"str\\" instead
+  |               ^
 
 
-error: Expected type to be \\"Map<str>\\", but got \\"str\\" instead
+error: Expected type to be "Map<str>", but got "str" instead
    --> ../../../examples/tests/invalid/json.test.w:10:19
    |
 10 | let m: Map<str> = j;
-   |                   ^ Expected type to be \\"Map<str>\\", but got \\"str\\" instead
+   |                   ^
 
 
-error: Expected type to be \\"Set<str>\\", but got \\"str\\" instead
+error: Expected type to be "Set<str>", but got "str" instead
    --> ../../../examples/tests/invalid/json.test.w:12:20
    |
 12 | let s2: Set<str> = j;
-   |                    ^ Expected type to be \\"Set<str>\\", but got \\"str\\" instead
+   |                    ^
 
 
-error: Expected type to be \\"Array<str>\\", but got \\"str\\" instead
+error: Expected type to be "Array<str>", but got "str" instead
    --> ../../../examples/tests/invalid/json.test.w:14:21
    |
 14 | let a: Array<str> = j;
-   |                     ^ Expected type to be \\"Array<str>\\", but got \\"str\\" instead
+   |                     ^
 
 
-error: Unknown symbol \\"set\\"
+error: Member "set" does not exist in "Json"
    --> ../../../examples/tests/invalid/json.test.w:19:13
    |
-19 | foreverJson.set(\\"a\\", \\"world!\\");
-   |             ^^^ Unknown symbol \\"set\\"
+19 | foreverJson.set("a", "world!");
+   |             ^^^
 
 
-error: Expected type to be \\"num?\\", but got \\"str?\\" instead
+error: Expected type to be "num?", but got "str?" instead
    --> ../../../examples/tests/invalid/json.test.w:32:20
    |
 32 | let tryNum: num? = j.tryAsStr();
-   |                    ^^^^^^^^^^^^ Expected type to be \\"num?\\", but got \\"str?\\" instead
+   |                    ^^^^^^^^^^^^
 
 
-error: Expected type to be \\"str?\\", but got \\"bool?\\" instead
+error: Expected type to be "str?", but got "bool?" instead
    --> ../../../examples/tests/invalid/json.test.w:35:20
    |
 35 | let tryStr: str? = j.tryAsBool();
-   |                    ^^^^^^^^^^^^^ Expected type to be \\"str?\\", but got \\"bool?\\" instead
+   |                    ^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"bool?\\", but got \\"num?\\" instead
+error: Expected type to be "bool?", but got "num?" instead
    --> ../../../examples/tests/invalid/json.test.w:38:22
    |
 38 | let tryBool: bool? = j.tryAsNum();
-   |                      ^^^^^^^^^^^^ Expected type to be \\"bool?\\", but got \\"num?\\" instead
+   |                      ^^^^^^^^^^^^
 
 
-error: Missing required field \\"maybe\\" from \\"StructyJson\\"
+error: Missing required field "maybe" from "StructyJson"
    --> ../../../examples/tests/invalid/json.test.w:55:40
    |  
 55 |   let notJsonMissingField: StructyJson = {
    | /----------------------------------------^
-56 | |   foo: \\"bar\\",
+56 | |   foo: "bar",
 57 | |   stuff: [],
 58 | | };
-   | \\\\-^ Missing required field \\"maybe\\" from \\"StructyJson\\"
+   | \\-^
 
 
-error: Missing required field \\"maybe\\" from \\"StructyJson\\"
+error: Missing required field "maybe" from "StructyJson"
    --> ../../../examples/tests/invalid/json.test.w:63:5
    |  
 63 | /     {
-64 | |       foo: \\"bar\\",
+64 | |       foo: "bar",
 65 | |       stuff: [],
 66 | |     }
-   | \\\\-----^ Missing required field \\"maybe\\" from \\"StructyJson\\"
+   | \\-----^
 
 
-error: Expected type to be \\"bool\\", but got \\"num\\" instead
-   --> ../../../examples/tests/invalid/json.test.w:75:11
+error: Expected type to be "bool", but got "num" instead
+   --> ../../../examples/tests/invalid/json.test.w:76:11
    |
-75 |     good: 2,
-   |           ^ Expected type to be \\"bool\\", but got \\"num\\" instead
+76 |     good: 2,
+   |           ^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
-   --> ../../../examples/tests/invalid/json.test.w:82:14
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/json.test.w:83:14
    |
-82 |   stuff: [1, \\"hi\\", 3],
-   |              ^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+83 |   stuff: [1, "hi", 3],
+   |              ^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
-   --> ../../../examples/tests/invalid/json.test.w:93:8
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/json.test.w:94:8
    |
-93 |     b: \\"\\",
-   |        ^^ Expected type to be \\"num\\", but got \\"str\\" instead
+94 |     b: "",
+   |        ^^
 
 
-error: Expected type to be \\"StructyJson\\", but got \\"Json\\" instead
-    --> ../../../examples/tests/invalid/json.test.w:106:38
+error: Expected type to be "StructyJson", but got "Json" instead
+    --> ../../../examples/tests/invalid/json.test.w:107:38
     |
-106 | let mutableJsonStruct: StructyJson = mutableJson;
-    |                                      ^^^^^^^^^^^ Expected type to be \\"StructyJson\\", but got \\"Json\\" instead
+107 | let mutableJsonStruct: StructyJson = mutableJson;
+    |                                      ^^^^^^^^^^^
+    |
+    = hint: use StructyJson.fromJson() to convert dynamic Json"
+
+
+error: Expected type to be "Array<num>", but got "Json" instead
+    --> ../../../examples/tests/invalid/json.test.w:119:10
+    |
+119 |   stuff: {a: 1}, // Error: expeced an array but got a JSON object
+    |          ^^^^^^
+
+
+error: Unknown symbol "unknownVar"
+    --> ../../../examples/tests/invalid/json.test.w:127:15
     |
-    = hint: use StructyJson.fromJson() to convert dynamic Json\\"
+127 | {"x":1, y: 2, unknownVar};
+    |               ^^^^^^^^^^
 
 
-error: \\"Array<Json>\\" is not a legal JSON value
+error: Unknown symbol "unknownVar"
+    --> ../../../examples/tests/invalid/json.test.w:129:20
+    |
+129 | Json {"x":1, y: 2, unknownVar};
+    |                    ^^^^^^^^^^
+
+
+error: "Array<Json>" is not a legal JSON value
    --> ../../../examples/tests/invalid/json.test.w:23:17
    |
 23 | let jArr = Json [bkt];
-   |                 ^^^^^ \\"Array<Json>\\" is not a legal JSON value
+   |                 ^^^^^
 
 
-error: \\"Bucket\\" is not a legal JSON value
+error: "Bucket" is not a legal JSON value
    --> ../../../examples/tests/invalid/json.test.w:26:28
    |
 26 | let jsonObj = Json { boom: bkt };
-   |                            ^^^ \\"Bucket\\" is not a legal JSON value
+   |                            ^^^
+
+
+error: "Bucket" is not a legal JSON value
+    --> ../../../examples/tests/invalid/json.test.w:111:6
+    |
+111 |   b: new cloud.Bucket()
+    |      ^^^^^^^^^^^^^^^^^^
 
 
-error: \\"Bucket\\" is not a legal JSON value
-    --> ../../../examples/tests/invalid/json.test.w:110:6
+error: "Bucket" is not a legal JSON value
+    --> ../../../examples/tests/invalid/json.test.w:115:21
     |
-110 |   b: new cloud.Bucket()
-    |      ^^^^^^^^^^^^^^^^^^ \\"Bucket\\" is not a legal JSON value
+115 | let isBucket = Json new cloud.Bucket();
+    |                     ^^^^^^^^^^^^^^^^^^
+
+
+error: "Bucket" is not a legal JSON value
+    --> ../../../examples/tests/invalid/json.test.w:137:8
+    |
+137 | Json { bucket };
+    |        ^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`json_static.test.w 1`] = `
+"error: Member "set" does not exist in "Json"
+  --> ../../../examples/tests/invalid/json_static.test.w:4:10
+  |
+4 | immutObj.set("a", "foo");
+  |          ^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
 
+exports[`map_entries.test.w 1`] = `
+"error: Expected type to be "str", but got "num" instead
+  --> ../../../examples/tests/invalid/map_entries.test.w:2:20
+  |
+2 | let someStr: str = mapToNumber.entries().at(0).value;
+  |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: \\"Bucket\\" is not a legal JSON value
-    --> ../../../examples/tests/invalid/json.test.w:114:21
-    |
-114 | let isBucket = Json new cloud.Bucket();
-    |                     ^^^^^^^^^^^^^^^^^^ \\"Bucket\\" is not a legal JSON value
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
-exports[`json_static.test.w 1`] = `
-"error: Unknown symbol \\"set\\"
-  --> ../../../examples/tests/invalid/json_static.test.w:4:10
-  |
-4 | immutObj.set(\\"a\\", \\"foo\\");
-  |          ^^^ Unknown symbol \\"set\\"
+exports[`missing_return.test.w 1`] = `
+"error: A function whose return type is "str" must return a value.
+  --> ../../../examples/tests/invalid/missing_return.test.w:1:40
+  |  
+1 |   let returnString = inflight (): str => {
+  | /----------------------------------------^
+2 | |   log("i am not going to return anything!");
+3 | | };
+  | \\-^
+
+
+error: A function whose return type is "str" must return a value.
+   --> ../../../examples/tests/invalid/missing_return.test.w:28:32
+   |  
+28 |   let returnString3 = (): str => {
+   | /--------------------------------^
+29 | |   let x = (): str => {
+30 | |     return "what?"; // This should be ignored and we should produce a missing return error
+31 | |   };
+32 | | };
+   | \\-^
+
+
+error: A function whose return type is "str" must return a value.
+   --> ../../../examples/tests/invalid/missing_return.test.w:36:32
+   |  
+36 |   let returnString4 = (): str => {
+   | /--------------------------------^
+37 | |   class Foo {
+38 | |     pub static blah(): num {
+39 | |       return 5;
+40 | |     }
+41 | |   }
+42 | | };
+   | \\-^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -2238,303 +3281,302 @@ exports[`missing_semicolon.test.w 1`] = `
   --> ../../../examples/tests/invalid/missing_semicolon.test.w:9:3
   |
 9 | })
-  |   ^ Expected ';'
+  |   ^
 
 
 error: Expected ';'
-   --> ../../../examples/tests/invalid/missing_semicolon.test.w:16:9
+   --> ../../../examples/tests/invalid/missing_semicolon.test.w:16:10
    |
 16 | let x = 5 //
-   |         ^ Expected ';'
+   |          ^
 
 
 error: Expected '}'
    --> ../../../examples/tests/invalid/missing_semicolon.test.w:19:13
    |
 19 | if (x > 10) {
-   |             ^ Expected '}'
+   |             ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`mut_container_types.test.w 1`] = `
-"error: Expected type to be \\"num\\", but got \\"str\\" instead
+"error: Expected type to be "num", but got "str" instead
   --> ../../../examples/tests/invalid/mut_container_types.test.w:2:29
   |
-2 | let arr1 = MutArray<num>[1, \\"2\\", 3];
-  |                             ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+2 | let arr1 = MutArray<num>[1, "2", 3];
+  |                             ^^^
 
 
-error: Expected \\"Set\\" or \\"MutSet\\", found \\"MutArray<num>\\"
-  --> ../../../examples/tests/invalid/mut_container_types.test.w:3:12
+error: Expected type to be "MutArray<num>", but got "Array<num>" instead
+  --> ../../../examples/tests/invalid/mut_container_types.test.w:3:27
   |
-3 | let arr2 = MutArray<num>{1, 2, 3};
-  |            ^^^^^^^^^^^^^ Expected \\"Set\\" or \\"MutSet\\", found \\"MutArray<num>\\"
+3 | let arr3: MutArray<num> = [1, 2, 3]; // https://github.com/winglang/wing/issues/1117
+  |                           ^^^^^^^^^
 
 
-error: Expected type to be \\"MutArray<num>\\", but got \\"Array<num>\\" instead
-  --> ../../../examples/tests/invalid/mut_container_types.test.w:4:27
+error: Expected type to be "MutArray<num>", but got "MutArray<str>" instead
+  --> ../../../examples/tests/invalid/mut_container_types.test.w:5:27
   |
-4 | let arr3: MutArray<num> = [1, 2, 3]; // https://github.com/winglang/wing/issues/1117
-  |                           ^^^^^^^^^ Expected type to be \\"MutArray<num>\\", but got \\"Array<num>\\" instead
+5 | let arr5: MutArray<num> = arr4;
+  |                           ^^^^
 
 
-error: Expected type to be \\"MutArray<num>\\", but got \\"MutArray<str>\\" instead
-  --> ../../../examples/tests/invalid/mut_container_types.test.w:6:27
+error: Member "someMethod" does not exist in "MutArray"
+  --> ../../../examples/tests/invalid/mut_container_types.test.w:6:6
   |
-6 | let arr5: MutArray<num> = arr4;
-  |                           ^^^^ Expected type to be \\"MutArray<num>\\", but got \\"MutArray<str>\\" instead
+6 | arr1.someMethod();
+  |      ^^^^^^^^^^
 
 
-error: Unknown symbol \\"someMethod\\"
-  --> ../../../examples/tests/invalid/mut_container_types.test.w:7:6
+error: Expected type to be "num", but got "str" instead
+  --> ../../../examples/tests/invalid/mut_container_types.test.w:9:25
   |
-7 | arr1.someMethod();
-  |      ^^^^^^^^^^ Unknown symbol \\"someMethod\\"
+9 | let s1 = MutSet<num>[1, "2", 3];
+  |                         ^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/mut_container_types.test.w:10:25
    |
-10 | let s1 = MutSet<num>{1, \\"2\\", 3};
-   |                         ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
-
-
-error: Expected \\"Array\\" or \\"MutArray\\", found \\"MutSet<num>\\"
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:11:10
-   |
-11 | let s2 = MutSet<num>[1, \\"2\\", 3];
-   |          ^^^^^^^^^^^ Expected \\"Array\\" or \\"MutArray\\", found \\"MutSet<num>\\"
+10 | let s2 = MutSet<num>[1, "2", 3];
+   |                         ^^^
 
 
-error: Expected type to be \\"MutSet<num>\\", but got \\"Set<num>\\" instead
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:12:23
+error: Expected type to be "MutSet<num>", but got "MutSet<str>" instead
+   --> ../../../examples/tests/invalid/mut_container_types.test.w:13:23
    |
-12 | let s3: MutSet<num> = {1, 1, 3}; // https://github.com/winglang/wing/issues/1117
-   |                       ^^^^^^^^^ Expected type to be \\"MutSet<num>\\", but got \\"Set<num>\\" instead
+13 | let s5: MutSet<num> = s4;
+   |                       ^^
 
 
-error: Expected type to be \\"MutSet<num>\\", but got \\"MutSet<str>\\" instead
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:14:23
+error: Member "someMethod" does not exist in "MutSet"
+   --> ../../../examples/tests/invalid/mut_container_types.test.w:14:4
    |
-14 | let s5: MutSet<num> = s4;
-   |                       ^^ Expected type to be \\"MutSet<num>\\", but got \\"MutSet<str>\\" instead
+14 | s3.someMethod();
+   |    ^^^^^^^^^^
 
 
-error: Unknown symbol \\"someMethod\\"
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:15:4
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/mut_container_types.test.w:17:33
    |
-15 | s3.someMethod();
-   |    ^^^^^^^^^^ Unknown symbol \\"someMethod\\"
+17 | let m1 = MutMap<num>{"hello" => "world"};
+   |                                 ^^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:18:33
+error: Expected "Array" or "MutArray", found "MutMap<str>"
+   --> ../../../examples/tests/invalid/mut_container_types.test.w:19:10
    |
-18 | let m1 = MutMap<num>{\\"hello\\" => \\"world\\"};
-   |                                 ^^^^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+19 | let m2 = MutMap<str>["hello", "world"];
+   |          ^^^^^^^^^^^
 
 
-error: Expected \\"Array\\" or \\"MutArray\\", found \\"MutMap<str>\\"
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:20:10
+error: Expected type to be "MutMap<num>", but got "Map<str>" instead
+   --> ../../../examples/tests/invalid/mut_container_types.test.w:21:23
    |
-20 | let m2 = MutMap<str>[\\"hello\\", \\"world\\"];
-   |          ^^^^^^^^^^^ Expected \\"Array\\" or \\"MutArray\\", found \\"MutMap<str>\\"
+21 | let m3: MutMap<num> = {"hello" => "world"};
+   |                       ^^^^^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"MutMap<num>\\", but got \\"Map<str>\\" instead
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:22:23
+error: Expected type to be "MutMap<str>", but got "MutMap<num>" instead
+   --> ../../../examples/tests/invalid/mut_container_types.test.w:24:23
    |
-22 | let m3: MutMap<num> = {\\"hello\\" => \\"world\\"};
-   |                       ^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"MutMap<num>\\", but got \\"Map<str>\\" instead
-
-
-error: Expected type to be \\"MutMap<str>\\", but got \\"MutMap<num>\\" instead
-   --> ../../../examples/tests/invalid/mut_container_types.test.w:25:23
-   |
-25 | let m5: MutMap<str> = m4;
-   |                       ^^ Expected type to be \\"MutMap<str>\\", but got \\"MutMap<num>\\" instead
-
-
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
-
-exports[`new_in_static_without_scope.test.w 1`] = `
-"error: Cannot instantiate preflight class \\"Bucket\\" in a static method without an explicit scope
-  --> ../../../examples/tests/invalid/new_in_static_without_scope.test.w:7:12
-  |
-7 |     return new cloud.Bucket();
-  |            ^^^^^^^^^^^^^^^^^^ Cannot instantiate preflight class \\"Bucket\\" in a static method without an explicit scope
-
+24 | let m5: MutMap<str> = m4;
+   |                       ^^
 
-error: Cannot instantiate preflight class \\"MyClass\\" in a static method without an explicit scope
-   --> ../../../examples/tests/invalid/new_in_static_without_scope.test.w:10:12
-   |
-10 |     return new MyClass();
-   |            ^^^^^^^^^^^^^ Cannot instantiate preflight class \\"MyClass\\" in a static method without an explicit scope
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`nil.test.w 1`] = `
-"error: Expected type to be \\"str\\", but got \\"nil\\" instead
+"error: Expected type to be "str", but got "nil" instead
   --> ../../../examples/tests/invalid/nil.test.w:3:14
   |
 3 | let x: str = nil;
-  |              ^^^ Expected type to be \\"str\\", but got \\"nil\\" instead
+  |              ^^^
   |
-  = hint: to allow \\"nil\\" assignment use optional type: \\"str?\\"
+  = hint: to allow "nil" assignment use optional type: "str?"
 
 
-error: Expected optional type, found \\"nil\\"
+error: Expected optional type, found "nil"
    --> ../../../examples/tests/invalid/nil.test.w:24:4
    |
 24 | if nil? {
-   |    ^^^ Expected optional type, found \\"nil\\"
+   |    ^^^
 
 
 error: Cannot assign nil value to variables without explicit optional type
    --> ../../../examples/tests/invalid/nil.test.w:28:18
    |
 28 | let nilWannabe = nil;
-   |                  ^^^ Cannot assign nil value to variables without explicit optional type
+   |                  ^^^
 
 
 error: Cannot assign nil value to variables without explicit optional type
    --> ../../../examples/tests/invalid/nil.test.w:31:17
    |
 31 | let nilGaggle = [nil, nil, nil];
-   |                 ^^^^^^^^^^^^^^^ Cannot assign nil value to variables without explicit optional type
+   |                 ^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"nil\\" instead
+error: Expected type to be "num", but got "nil" instead
    --> ../../../examples/tests/invalid/nil.test.w:20:14
    |
 20 |   foo.setBar(nil);
-   |              ^^^ Expected type to be \\"num\\", but got \\"nil\\" instead
+   |              ^^^
    |
-   = hint: to allow \\"nil\\" assignment use optional type: \\"num?\\"
+   = hint: to allow "nil" assignment use optional type: "num?"
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`optionals.test.w 1`] = `
-"error: Expected type to be \\"num\\", but got \\"num?\\" instead
+"error: Unexpected 'parameter_type_list'
+   --> ../../../examples/tests/invalid/optionals.test.w:98:36
+   |
+98 | let optionalFunctionWithNoRetType: ()? = () => {};
+   |                                    ^^
+
+
+error: Expected type to be "num", but got "num?" instead
    --> ../../../examples/tests/invalid/optionals.test.w:11:3
    |
 11 | f(x);
-   |   ^ Expected type to be \\"num\\", but got \\"num?\\" instead
+   |   ^
 
 
-error: Expected type to be \\"num?\\", but got \\"str\\" instead
+error: Expected type to be "num?", but got "str" instead
    --> ../../../examples/tests/invalid/optionals.test.w:14:11
    |
-14 | fOptional(\\"\\");
-   |           ^^ Expected type to be \\"num?\\", but got \\"str\\" instead
+14 | fOptional("");
+   |           ^^
 
 
-error: Expected optional type, found \\"bool\\"
+error: Expected optional type, found "bool"
    --> ../../../examples/tests/invalid/optionals.test.w:18:4
    |
 18 | if y? {
-   |    ^ Expected optional type, found \\"bool\\"
+   |    ^
 
 
-error: Expected optional type, found \\"bool\\"
+error: Expected optional type, found "bool"
    --> ../../../examples/tests/invalid/optionals.test.w:22:9
    |
 22 | let z = y ?? 1;
-   |         ^ Expected optional type, found \\"bool\\"
+   |         ^
 
 
-error: Expected type to be \\"str\\", but got \\"num\\" instead
+error: Expected type to be "str", but got "num" instead
    --> ../../../examples/tests/invalid/optionals.test.w:25:14
    |
 25 | let w: str = x ?? 3;
-   |              ^^^^^^ Expected type to be \\"str\\", but got \\"num\\" instead
+   |              ^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/optionals.test.w:28:6
    |
-28 | x ?? \\"hello\\";
-   |      ^^^^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+28 | x ?? "hello";
+   |      ^^^^^^^
 
 
-error: Expected type to be \\"Sub1\\", but got \\"Sub2\\" instead
+error: Expected type to be "Sub1", but got "Sub2" instead
    --> ../../../examples/tests/invalid/optionals.test.w:39:17
    |
 39 | optionalSub1 ?? new Sub2();
-   |                 ^^^^^^^^^^ Expected type to be \\"Sub1\\", but got \\"Sub2\\" instead
+   |                 ^^^^^^^^^^
 
 
-error: Expected type to be \\"Sub1\\", but got \\"Super\\" instead
+error: Expected type to be "Sub1", but got "Super" instead
    --> ../../../examples/tests/invalid/optionals.test.w:41:17
    |
 41 | optionalSub1 ?? new Super();
-   |                 ^^^^^^^^^^^ Expected type to be \\"Sub1\\", but got \\"Super\\" instead
+   |                 ^^^^^^^^^^^
 
 
-error: Expected type to be optional, but got \\"bool\\" instead
+error: Expected type to be optional, but got "bool" instead
    --> ../../../examples/tests/invalid/optionals.test.w:45:12
    |
 45 | if let x = true {
-   |            ^^^^ Expected type to be optional, but got \\"bool\\" instead
+   |            ^^^^
 
 
-error: Property access on optional type \\"A?\\" requires optional accessor: \\"?.\\"
+error: Property access on optional type "A?" requires optional accessor: "?."
    --> ../../../examples/tests/invalid/optionals.test.w:68:9
    |
 68 | let c = b.a.val;
-   |         ^^^ Property access on optional type \\"A?\\" requires optional accessor: \\"?.\\"
+   |         ^^^
 
 
-error: Expected type to be \\"str\\", but got \\"str?\\" instead
+error: Expected type to be "str", but got "str?" instead
    --> ../../../examples/tests/invalid/optionals.test.w:91:16
    |
 91 | let val: str = baz?.bar?.foo?.val;
-   |                ^^^^^^^^^^^^^^^^^^ Expected type to be \\"str\\", but got \\"str?\\" instead
+   |                ^^^^^^^^^^^^^^^^^^
 
 
 error: Cannot call an optional function
    --> ../../../examples/tests/invalid/optionals.test.w:95:1
    |
 95 | optionalFunction();
-   | ^^^^^^^^^^^^^^^^ Cannot call an optional function
+   | ^^^^^^^^^^^^^^^^
+
+
+error: Expected type to be "(preflight (num): void)?", but got "preflight (x: str): void" instead
+    --> ../../../examples/tests/invalid/optionals.test.w:102:53
+    |
+102 | let functionWithOptionalFuncParam1: ((num):void)? = (x: str):void => {};
+    |                                                     ^^^^^^^^^^^^^^^^^^^
+
+
+error: Expected type to be "(preflight (): num)?", but got "preflight (): str" instead
+    --> ../../../examples/tests/invalid/optionals.test.w:104:49
+    |
+104 | let functionWithOptionalFuncParam2: (():num)? = ():str => { return "s"; };
+    |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: '!' expects an optional type, found "num"
+    --> ../../../examples/tests/invalid/optionals.test.w:110:19
+    |
+110 | let unwrapValue = nonOptional!;
+    |                   ^^^^^^^^^^^
+
+
+error: '!' expects an optional type, found "num"
+    --> ../../../examples/tests/invalid/optionals.test.w:116:21
+    |
+116 | let unwrapValueFn = nonOptionalFn()!;
+    |                     ^^^^^^^^^^^^^^^
 
 
 error: Variable is not reassignable
    --> ../../../examples/tests/invalid/optionals.test.w:53:3
    |
 50 | if let hi = hi {
-   |        -- defined here (try adding \\"var\\" in front)
+   |        -- defined here (try adding "var" in front)
    .
-53 |   hi = \\"bye\\";
-   |   ^^ Variable is not reassignable
+53 |   hi = "bye";
+   |   ^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -2545,73 +3587,78 @@ User invoked panic'), please report at https://www.winglang.io/contributing/star
   --> ../../../examples/tests/invalid/panic.test.w:6:1
   |
 6 | 😱;
-  | ^^ Compiler bug during type-checking ('panicked at libs/wingc/src/type_check.rs:LINE:COL:
-User invoked panic'), please report at https://www.winglang.io/contributing/start-here/bugs
+  | ^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`panic.test.w 2`] = `"Panicked, backtrace not captured: Unsupported"`;
 
+exports[`parameters.test.w 1`] = `
+"Error: Parameter validation errors:
+- must have required property 'foo'
+
+(hint: make sure to use --values to provide the required parameters file)
+        
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
 exports[`phase_mismatch.test.w 1`] = `
-"error: Expected type to be \\"inflight (num): num\\", but got \\"preflight (n: num): num\\" instead
+"error: Expected type to be "inflight (num): num", but got "preflight (n: num): num" instead
   --> ../../../examples/tests/invalid/phase_mismatch.test.w:2:10
   |
 2 | my_func1((n: num): num => { return n * 2; });
-  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"inflight (num): num\\", but got \\"preflight (n: num): num\\" instead
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = hint: expected phase to be inflight, but got preflight instead
 
 
-error: Expected type to be \\"preflight (num): num\\", but got \\"inflight (n: num): num\\" instead
+error: Expected type to be "preflight (num): num", but got "inflight (n: num): num" instead
   --> ../../../examples/tests/invalid/phase_mismatch.test.w:5:10
   |
 5 | my_func2(inflight (n: num): num => { return n * 2; });
-  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"preflight (num): num\\", but got \\"inflight (n: num): num\\" instead
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = hint: expected phase to be preflight, but got inflight instead
 
 
-error: Expected type to be \\"inflight (n: num): num\\", but got \\"preflight (n: num): num\\" instead
+error: Expected type to be "inflight (n: num): num", but got "preflight (n: num): num" instead
    --> ../../../examples/tests/invalid/phase_mismatch.test.w:12:10
    |
 12 | my_func3((n: num): num => { return n * 2; });
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"inflight (n: num): num\\", but got \\"preflight (n: num): num\\" instead
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = hint: expected phase to be inflight, but got preflight instead
 
 
-error: Expected type to be \\"preflight (num): num\\", but got \\"inflight (s: str): str\\" instead
+error: Expected type to be "preflight (num): num", but got "inflight (s: str): str" instead
    --> ../../../examples/tests/invalid/phase_mismatch.test.w:15:10
    |
 15 | my_func4(inflight (s: str): str => { return s.uppercase(); });
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected type to be \\"preflight (num): num\\", but got \\"inflight (s: str): str\\" instead
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = hint: expected phase to be preflight, but got inflight instead
 
 
-error: Expected type to be \\"preflight (inflight (str): str): void\\", but got \\"preflight (inner_fn: preflight (preflight (str): str): void): void\\" instead
+error: Expected type to be "preflight (inflight (str): str): void", but got "preflight (inner_fn: preflight (preflight (str): str): void): void" instead
    --> ../../../examples/tests/invalid/phase_mismatch.test.w:25:18
    |
 25 | accepts_callback(callback); // error
-   |                  ^^^^^^^^ Expected type to be \\"preflight (inflight (str): str): void\\", but got \\"preflight (inner_fn: preflight (preflight (str): str): void): void\\" instead
+   |                  ^^^^^^^^
 
 
-error: Unknown symbol \\"this\\"
-  --> ../../../examples/tests/invalid/phase_mismatch.test.w:1:1
-  |
-1 | let my_func1 = (callback: inflight (num): num) => {  };
-  | ^ Unknown symbol \\"this\\"
-
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -2621,84 +3668,92 @@ exports[`preflight_from_inflight.test.w 1`] = `
    --> ../../../examples/tests/invalid/preflight_from_inflight.test.w:15:5
    |
 15 |     this.r.myPreflight();
-   |     ^^^^^^^^^^^^^^^^^^^^ Cannot call into preflight phase while inflight
+   |     ^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`primitives.test.w 1`] = `
-"error: Unexpected reference \\"structured_access_expression\\"
-  --> ../../../examples/tests/invalid/primitives.test.w:5:5
+"error: Member "blabla" does not exist in "Array"
+  --> ../../../examples/tests/invalid/primitives.test.w:6:16
   |
-5 | log(y[0]);
-  |     ^^^^ Unexpected reference \\"structured_access_expression\\"
+6 | let join = arr.blabla(",");
+  |                ^^^^^^
 
 
-error: Unknown symbol \\"blabla\\"
-  --> ../../../examples/tests/invalid/primitives.test.w:9:16
+error: Member "push" does not exist in "Array"
+  --> ../../../examples/tests/invalid/primitives.test.w:8:5
   |
-9 | let join = arr.blabla(\\",\\");
-  |                ^^^^^^ Unknown symbol \\"blabla\\"
+8 | arr.push(4);
+  |     ^^^^
 
 
-error: Unknown symbol \\"push\\"
-   --> ../../../examples/tests/invalid/primitives.test.w:11:5
+error: Expected type to be "str", but got "num" instead
+   --> ../../../examples/tests/invalid/primitives.test.w:10:14
    |
-11 | arr.push(4);
-   |     ^^^^ Unknown symbol \\"push\\"
+10 | let n: str = arr.at(0);
+   |              ^^^^^^^^^
 
 
-error: Expected type to be \\"str\\", but got \\"num\\" instead
-   --> ../../../examples/tests/invalid/primitives.test.w:13:14
-   |
-13 | let n: str = arr.at(0);
-   |              ^^^^^^^^^ Expected type to be \\"str\\", but got \\"num\\" instead
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`private_constructor.test.w 1`] = `
+"error: Constructor for class "JsiiClassWithPrivateConstructor" is private
+  --> ../../../examples/tests/invalid/private_constructor.test.w:3:1
+  |
+3 | new jsii_fixture.JsiiClassWithPrivateConstructor();
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`protected_access_modifiers.test.w 1`] = `
-"error: Structs must be public (\\"pub\\") or private
+"error: Structs must be public ("pub") or private
   --> ../../../examples/tests/invalid/protected_access_modifiers.test.w:1:1
   |
 1 | protected struct MyStruct {}
-  | ^^^^^^^^^ Structs must be public (\\"pub\\") or private
+  | ^^^^^^^^^
 
 
-error: Classes must be public (\\"pub\\") or private
+error: Classes must be public ("pub") or private
   --> ../../../examples/tests/invalid/protected_access_modifiers.test.w:4:1
   |
 4 | protected class MyClass {}
-  | ^^^^^^^^^ Classes must be public (\\"pub\\") or private
+  | ^^^^^^^^^
 
 
-error: Interfaces must be public (\\"pub\\") or private
+error: Interfaces must be public ("pub") or private
   --> ../../../examples/tests/invalid/protected_access_modifiers.test.w:7:1
   |
 7 | protected interface MyInterface {}
-  | ^^^^^^^^^ Interfaces must be public (\\"pub\\") or private
+  | ^^^^^^^^^
 
 
-error: Enums must be public (\\"pub\\") or private
+error: Enums must be public ("pub") or private
    --> ../../../examples/tests/invalid/protected_access_modifiers.test.w:10:1
    |
 10 | protected enum MyEnum {}
-   | ^^^^^^^^^ Enums must be public (\\"pub\\") or private
+   | ^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -2708,53 +3763,53 @@ exports[`reassign_to_nonreassignable.test.w 1`] = `
   --> ../../../examples/tests/invalid/reassign_to_nonreassignable.test.w:3:1
   |
 2 | let x = 5;
-  |     - defined here (try adding \\"var\\" in front)
+  |     - defined here (try adding "var" in front)
 3 | x = x + 1;
-  | ^ Variable is not reassignable
+  | ^
 
 
 error: Variable is not reassignable
    --> ../../../examples/tests/invalid/reassign_to_nonreassignable.test.w:28:5
    |
 14 |   f: num;
-   |   - defined here (try adding \\"var\\" in front)
+   |   - defined here (try adding "var" in front)
    .
 28 |     this.f = this.f + 1;
-   |     ^^^^^^ Variable is not reassignable
+   |     ^^^^^^
 
 
 error: Variable is not reassignable
    --> ../../../examples/tests/invalid/reassign_to_nonreassignable.test.w:30:5
    |
  6 |   pub inflight inner: num;
-   |                ----- defined here (try adding \\"var\\" in front)
+   |                ----- defined here (try adding "var" in front)
    .
 30 |     this.innerR.inner = 2;
-   |     ^^^^^^^^^^^^^^^^^ Variable is not reassignable
+   |     ^^^^^^^^^^^^^^^^^
 
 
 error: Variable is not reassignable
    --> ../../../examples/tests/invalid/reassign_to_nonreassignable.test.w:35:5
    |
 16 |   inflight inflightF: num;
-   |            --------- defined here (try adding \\"var\\" in front)
+   |            --------- defined here (try adding "var" in front)
    .
 35 |     this.inflightF = this.inflightF + 1;
-   |     ^^^^^^^^^^^^^^ Variable is not reassignable
+   |     ^^^^^^^^^^^^^^
 
 
 error: Variable is not reassignable
    --> ../../../examples/tests/invalid/reassign_to_nonreassignable.test.w:42:3
    |
 41 | let f = (arg: num):num => {
-   |          --- defined here (try adding \\"var\\" in front)
+   |          --- defined here (try adding "var" in front)
 42 |   arg = 0;
-   |   ^^^ Variable is not reassignable
+   |   ^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -2767,7 +3822,6 @@ exports[`redundant_modifiers.w 1`] = `
   |   ^^^^^^^
   |   |   |
   |   |   possible redundant modifier
-  |   Multiple or ambiguous modifiers found
   |   possible redundant modifier
 
 
@@ -2778,7 +3832,6 @@ error: Multiple or ambiguous modifiers found
   |   ^^^^^^^^^^^^^
   |   |   |
   |   |   possible redundant modifier
-  |   Multiple or ambiguous modifiers found
   |   possible redundant modifier
 
 
@@ -2789,7 +3842,6 @@ error: Multiple or ambiguous modifiers found
    |   ^^^^^^^^^^^^^^^^^
    |   |          |
    |   |          possible redundant modifier
-   |   Multiple or ambiguous modifiers found
    |   possible redundant modifier
 
 
@@ -2798,21 +3850,19 @@ error: Multiple or ambiguous modifiers found
    |
 15 |   pub inflight static inflight m4() {}
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |   |   |               |
-   |   |   |               possible redundant modifier
-   |   |   possible redundant modifier
-   |   Multiple or ambiguous modifiers found
+   |       |               |
+   |       |               possible redundant modifier
+   |       possible redundant modifier
 
 
 error: Multiple or ambiguous modifiers found
    --> ../../../examples/tests/invalid/redundant_modifiers.w:19:3
    |
-19 |   static extern \\"x.js\\" pub extern \\"y.js\\" m5();
+19 |   static extern "x.js" pub extern "y.js" m5();
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |   |      |                 |
-   |   |      |                 possible redundant modifier
-   |   |      possible redundant modifier
-   |   Multiple or ambiguous modifiers found
+   |          |                 |
+   |          |                 possible redundant modifier
+   |          possible redundant modifier
 
 
 error: Multiple or ambiguous modifiers found
@@ -2822,7 +3872,6 @@ error: Multiple or ambiguous modifiers found
    |   ^^^^^^^^^^^^^^^^^^^
    |   |         |
    |   |         possible redundant modifier
-   |   Multiple or ambiguous modifiers found
    |   possible redundant modifier
 
 
@@ -2831,10 +3880,9 @@ error: Multiple or ambiguous modifiers found
    |
 27 |   protected inflight inflight f2: str;
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |   |         |        |
-   |   |         |        possible redundant modifier
-   |   |         possible redundant modifier
-   |   Multiple or ambiguous modifiers found
+   |             |        |
+   |             |        possible redundant modifier
+   |             possible redundant modifier
 
 
 error: Multiple or ambiguous modifiers found
@@ -2844,7 +3892,6 @@ error: Multiple or ambiguous modifiers found
    |   ^^^^^^^^^^^^^^^^^
    |   |          |
    |   |          possible redundant modifier
-   |   Multiple or ambiguous modifiers found
    |   possible redundant modifier
 
 
@@ -2855,7 +3902,6 @@ error: Multiple or ambiguous modifiers found
    |   ^^^^^^^^^^^
    |   |       |
    |   |       possible redundant modifier
-   |   Multiple or ambiguous modifiers found
    |   possible redundant modifier
 
 
@@ -2866,7 +3912,6 @@ error: Multiple or ambiguous modifiers found
    | ^^^^^^^^^^^^^^^^^
    | |        |
    | |        possible redundant modifier
-   | Multiple or ambiguous modifiers found
    | possible redundant modifier
 
 
@@ -2877,223 +3922,576 @@ error: Multiple or ambiguous modifiers found
    | ^^^^^^^^^^^^^^^^
    | |            |
    | |            possible redundant modifier
-   | Multiple or ambiguous modifiers found
    | possible redundant modifier
 
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
 
-exports[`resource_access_field_as_method.test.w 1`] = `
-"error: Expected a function or method, found \\"str\\"
-  --> ../../../examples/tests/invalid/resource_access_field_as_method.test.w:9:1
-  |
-9 | x.name();
-  | ^^^^^^ Expected a function or method, found \\"str\\"
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`resource_access_field_as_method.test.w 1`] = `
+"error: Expected a function or method, found "str"
+  --> ../../../examples/tests/invalid/resource_access_field_as_method.test.w:9:1
+  |
+9 | x.name();
+  | ^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`resource_captures.test.w 1`] = `
+"error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/resource_captures.test.w:14:5
+   |
+14 |     b.put("hello", "world");
+   |     ^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
+
+error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/resource_captures.test.w:17:5
+   |
+17 |     this.collectionOfResources.at(0).put("hello", "world");
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`resource_inflight.test.w 1`] = `
+"error: Cannot create preflight class "Bucket" in inflight phase
+  --> ../../../examples/tests/invalid/resource_inflight.test.w:4:3
+  |
+4 |   new cloud.Bucket(); // Should fail because we can't create resources inflight
+  |   ^^^^^^^^^^^^^^^^^^
+
+
+error: Cannot qualify access to a lifted type "Bucket" (see https://github.com/winglang/wing/issues/76 for more details)
+  --> ../../../examples/tests/invalid/resource_inflight.test.w:4:7
+  |
+4 |   new cloud.Bucket(); // Should fail because we can't create resources inflight
+  |       ^^^^^^^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`resource_init.test.w 1`] = `
+"error: Multiple constructors defined in class R
+  --> ../../../examples/tests/invalid/resource_init.test.w:3:3
+  |
+3 |   new() {}
+  |   ^^^^^^^^
+
+
+error: Multiple inflight constructors defined in class R
+  --> ../../../examples/tests/invalid/resource_init.test.w:6:3
+  |
+6 |   inflight new() {}
+  |   ^^^^^^^^^^^^^^^^^
+
+
+error: Multiple inflight constructors defined in class R
+  --> ../../../examples/tests/invalid/resource_init.test.w:9:3
+  |
+9 |   inflight new(x: num) {}
+  |   ^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Inflight constructors cannot have parameters
+  --> ../../../examples/tests/invalid/resource_init.test.w:9:15
+  |
+9 |   inflight new(x: num) {}
+  |               ^^^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`return_types.test.w 1`] = `
+"error: Return statement outside of function cannot return a value
+  --> ../../../examples/tests/invalid/return_types.test.w:1:5
+  |
+1 |     return 9;
+  |     ^^^^^^^^^
+
+
+error: Return statement outside of function cannot return a value
+  --> ../../../examples/tests/invalid/return_types.test.w:4:5
+  |
+4 |     return 9;
+  |     ^^^^^^^^^
+
+
+error: Unexpected return value from void function. Return type annotations are required for methods.
+  --> ../../../examples/tests/invalid/return_types.test.w:9:3
+  |
+9 |   return 9;
+  |   ^^^^^^^^^
+
+
+error: Unexpected return value from void function. Return type annotations are required for methods.
+   --> ../../../examples/tests/invalid/return_types.test.w:12:5
+   |
+12 |     return 9;
+   |     ^^^^^^^^^
+
+
+error: Unexpected return value from void function. Return type annotations are required for methods.
+   --> ../../../examples/tests/invalid/return_types.test.w:19:5
+   |
+19 |     return 9;
+   |     ^^^^^^^^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`scope_and_id.test.w 1`] = `
+"error: Expected type to be "str", but got "num" instead
+  --> ../../../examples/tests/invalid/scope_and_id.test.w:6:25
+  |
+6 | new PreflightClass() as x;
+  |                         ^
+
+
+error: Expected scope to be a preflight object, instead found "num"
+  --> ../../../examples/tests/invalid/scope_and_id.test.w:8:1
+  |
+8 | new PreflightClass() in x;
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Inflight classes cannot have an id
+   --> ../../../examples/tests/invalid/scope_and_id.test.w:15:26
+   |
+15 |   new InflightClass() as "hi";
+   |                          ^^^^
+
+
+error: Inflight classes cannot have a scope
+   --> ../../../examples/tests/invalid/scope_and_id.test.w:17:26
+   |
+17 |   new InflightClass() in pc;
+   |                          ^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`sim_resource.test.w 1`] = `
+"error: Parameter "a" cannot have a mutable type "MutJson" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:16:3
+   |
+16 |   pub methodWithMutJsons(a: MutJson): MutJson { return {}; }
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Return value cannot have a mutable type "MutJson" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:16:3
+   |
+16 |   pub methodWithMutJsons(a: MutJson): MutJson { return {}; }
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: Parameter "a" cannot have a mutable type "MutArray<str>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:18:3
+   |  
+18 | /   pub methodWithMuArrays(a: MutArray<str>, b: MutArray<num>): MutArray<bool> {
+19 | |     // ^ error: Parameter "a" cannot have mutable type "MutArray<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+20 | |     return MutArray<bool>[];
+21 | |   }
+   | \\---^
+
+
+error: Parameter "b" cannot have a mutable type "MutArray<num>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:18:3
+   |  
+18 | /   pub methodWithMuArrays(a: MutArray<str>, b: MutArray<num>): MutArray<bool> {
+19 | |     // ^ error: Parameter "a" cannot have mutable type "MutArray<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+20 | |     return MutArray<bool>[];
+21 | |   }
+   | \\---^
+
+
+error: Return value cannot have a mutable type "MutArray<bool>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:18:3
+   |  
+18 | /   pub methodWithMuArrays(a: MutArray<str>, b: MutArray<num>): MutArray<bool> {
+19 | |     // ^ error: Parameter "a" cannot have mutable type "MutArray<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+20 | |     return MutArray<bool>[];
+21 | |   }
+   | \\---^
+
+
+error: Parameter "a" cannot have a non-serializable type "Set<str>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:22:3
+   |  
+22 | /   pub methodWithSets(a: Set<str>, b: Set<num>): Set<bool> {
+23 | |     // ^ error: Parameter "a" cannot have non-serializable type "Set<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+24 | |     return Set<bool>[];
+25 | |   }
+   | \\---^
+
+
+error: Parameter "b" cannot have a non-serializable type "Set<num>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:22:3
+   |  
+22 | /   pub methodWithSets(a: Set<str>, b: Set<num>): Set<bool> {
+23 | |     // ^ error: Parameter "a" cannot have non-serializable type "Set<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+24 | |     return Set<bool>[];
+25 | |   }
+   | \\---^
+
+
+error: Return value cannot have a non-serializable type "Set<bool>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:22:3
+   |  
+22 | /   pub methodWithSets(a: Set<str>, b: Set<num>): Set<bool> {
+23 | |     // ^ error: Parameter "a" cannot have non-serializable type "Set<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+24 | |     return Set<bool>[];
+25 | |   }
+   | \\---^
+
+
+error: Parameter "a" cannot have a mutable type "MutSet<str>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:26:3
+   |  
+26 | /   pub methodWithMutSets(a: MutSet<str>, b: MutSet<num>): MutSet<bool> {
+27 | |     // ^ error: Parameter "a" cannot have mutable type "MutSet<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+28 | |     return MutSet<bool>[];
+29 | |   }
+   | \\---^
+
+
+error: Parameter "a" cannot have a non-serializable type "MutSet<str>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:26:3
+   |  
+26 | /   pub methodWithMutSets(a: MutSet<str>, b: MutSet<num>): MutSet<bool> {
+27 | |     // ^ error: Parameter "a" cannot have mutable type "MutSet<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+28 | |     return MutSet<bool>[];
+29 | |   }
+   | \\---^
+
+
+error: Parameter "b" cannot have a mutable type "MutSet<num>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:26:3
+   |  
+26 | /   pub methodWithMutSets(a: MutSet<str>, b: MutSet<num>): MutSet<bool> {
+27 | |     // ^ error: Parameter "a" cannot have mutable type "MutSet<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+28 | |     return MutSet<bool>[];
+29 | |   }
+   | \\---^
+
+
+error: Parameter "b" cannot have a non-serializable type "MutSet<num>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:26:3
+   |  
+26 | /   pub methodWithMutSets(a: MutSet<str>, b: MutSet<num>): MutSet<bool> {
+27 | |     // ^ error: Parameter "a" cannot have mutable type "MutSet<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+28 | |     return MutSet<bool>[];
+29 | |   }
+   | \\---^
+
+
+error: Return value cannot have a mutable type "MutSet<bool>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:26:3
+   |  
+26 | /   pub methodWithMutSets(a: MutSet<str>, b: MutSet<num>): MutSet<bool> {
+27 | |     // ^ error: Parameter "a" cannot have mutable type "MutSet<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+28 | |     return MutSet<bool>[];
+29 | |   }
+   | \\---^
+
+
+error: Return value cannot have a non-serializable type "MutSet<bool>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:26:3
+   |  
+26 | /   pub methodWithMutSets(a: MutSet<str>, b: MutSet<num>): MutSet<bool> {
+27 | |     // ^ error: Parameter "a" cannot have mutable type "MutSet<str>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+28 | |     return MutSet<bool>[];
+29 | |   }
+   | \\---^
+
 
+error: Parameter "a" cannot have a mutable type "MutMap<num>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:30:3
+   |  
+30 | /   pub methodWithMutMaps(a: MutMap<num>, b: MutMap<str>): MutMap<bool> {
+31 | |     // ^ error: Parameter "a" cannot have mutable type "MutMap<num>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+32 | |     return MutMap<bool>{};
+33 | |   }
+   | \\---^
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
 
-exports[`resource_captures.test.w 1`] = `
-"error: Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/resource_captures.test.w:13:13
-   |
-13 |     let b = this.bucket;
-   |             ^^^^^^^^^^^ Cannot qualify access to a lifted object of type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
+error: Parameter "b" cannot have a mutable type "MutMap<str>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:30:3
+   |  
+30 | /   pub methodWithMutMaps(a: MutMap<num>, b: MutMap<str>): MutMap<bool> {
+31 | |     // ^ error: Parameter "a" cannot have mutable type "MutMap<num>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+32 | |     return MutMap<bool>{};
+33 | |   }
+   | \\---^
 
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
+error: Return value cannot have a mutable type "MutMap<bool>" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:30:3
+   |  
+30 | /   pub methodWithMutMaps(a: MutMap<num>, b: MutMap<str>): MutMap<bool> {
+31 | |     // ^ error: Parameter "a" cannot have mutable type "MutMap<num>" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+32 | |     return MutMap<bool>{};
+33 | |   }
+   | \\---^
 
-exports[`resource_inflight.test.w 1`] = `
-"error: Cannot create preflight class \\"Bucket\\" in inflight phase
-  --> ../../../examples/tests/invalid/resource_inflight.test.w:4:3
-  |
-4 |   new cloud.Bucket(); // Should fail because we can't create resources inflight
-  |   ^^^^^^^^^^^^^^^^^^ Cannot create preflight class \\"Bucket\\" in inflight phase
 
+error: Parameter "a" cannot have a non-serializable type "duration" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:34:3
+   |  
+34 | /   pub methodWithDurations(a: duration): duration {
+35 | |     // ^ error: Parameter "a" cannot have non-serializable type "duration" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+36 | |     return 0s;
+37 | |   }
+   | \\---^
 
-error: Cannot qualify access to a lifted type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
-  --> ../../../examples/tests/invalid/resource_inflight.test.w:4:7
-  |
-4 |   new cloud.Bucket(); // Should fail because we can't create resources inflight
-  |       ^^^^^^^^^^^^ Cannot qualify access to a lifted type \\"Bucket\\" (see https://github.com/winglang/wing/issues/76 for more details)
 
+error: Return value cannot have a non-serializable type "duration" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:34:3
+   |  
+34 | /   pub methodWithDurations(a: duration): duration {
+35 | |     // ^ error: Parameter "a" cannot have non-serializable type "duration" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+36 | |     return 0s;
+37 | |   }
+   | \\---^
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
 
-exports[`resource_init.test.w 1`] = `
-"error: Multiple initializers defined in class R
-  --> ../../../examples/tests/invalid/resource_init.test.w:3:3
-  |
-3 |   new() {}
-  |   ^^^^^^^^ Multiple initializers defined in class R
+error: Parameter "a" cannot have a non-serializable type "Bucket" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:38:3
+   |  
+38 | /   pub methodWithClasses(a: cloud.Bucket): cloud.Queue? {
+39 | |     // ^ error: Parameter "a" cannot have non-serializable type "cloud.Bucket" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+40 | |     return nil;
+41 | |   }
+   | \\---^
 
 
-error: Multiple inflight initializers defined in class R
-  --> ../../../examples/tests/invalid/resource_init.test.w:6:3
-  |
-6 |   inflight new() {}
-  |   ^^^^^^^^^^^^^^^^^ Multiple inflight initializers defined in class R
+error: Return value cannot have a non-serializable type "Queue?" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:38:3
+   |  
+38 | /   pub methodWithClasses(a: cloud.Bucket): cloud.Queue? {
+39 | |     // ^ error: Parameter "a" cannot have non-serializable type "cloud.Bucket" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+40 | |     return nil;
+41 | |   }
+   | \\---^
 
 
-error: Multiple inflight initializers defined in class R
-  --> ../../../examples/tests/invalid/resource_init.test.w:9:3
-  |
-9 |   inflight new(x: num) {}
-  |   ^^^^^^^^^^^^^^^^^^^^^^^ Multiple inflight initializers defined in class R
+error: Parameter "a" cannot have a non-serializable type "IPreflightInterface" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:42:3
+   |  
+42 | /   pub methodWithInterfaces(a: IPreflightInterface, b: IInflightInterface): IPreflightInterface {
+43 | |     // ^ error: Parameter "a" cannot have non-serializable type "IPreflightInterface" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+44 | |     return a;
+45 | |   }
+   | \\---^
 
 
-error: Inflight initializers cannot have parameters
-  --> ../../../examples/tests/invalid/resource_init.test.w:9:15
-  |
-9 |   inflight new(x: num) {}
-  |               ^^^^^^^^ Inflight initializers cannot have parameters
+error: Parameter "b" cannot have a non-serializable type "IInflightInterface" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:42:3
+   |  
+42 | /   pub methodWithInterfaces(a: IPreflightInterface, b: IInflightInterface): IPreflightInterface {
+43 | |     // ^ error: Parameter "a" cannot have non-serializable type "IPreflightInterface" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+44 | |     return a;
+45 | |   }
+   | \\---^
 
 
- 
- 
-Tests 1 failed (1)
-Test Files 1 failed (1)
-Duration <DURATION>"
-`;
+error: Return value cannot have a non-serializable type "IPreflightInterface" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:42:3
+   |  
+42 | /   pub methodWithInterfaces(a: IPreflightInterface, b: IInflightInterface): IPreflightInterface {
+43 | |     // ^ error: Parameter "a" cannot have non-serializable type "IPreflightInterface" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+44 | |     return a;
+45 | |   }
+   | \\---^
 
-exports[`return_types.test.w 1`] = `
-"error: Return statement outside of function cannot return a value
-  --> ../../../examples/tests/invalid/return_types.test.w:1:5
-  |
-1 |     return 9;
-  |     ^^^^^^^^^ Return statement outside of function cannot return a value
 
+error: Parameter "a" cannot have a non-serializable type "inflight (str): str" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:46:3
+   |  
+46 | /   pub methodWithFunctions(a: (str): str, b: inflight (num): bool): (inflight (): bool)? {
+47 | |     // ^ error: Parameter "a" cannot have non-serializable type "(str): str" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+48 | |     return nil;
+49 | |   }
+   | \\---^
 
-error: Return statement outside of function cannot return a value
-  --> ../../../examples/tests/invalid/return_types.test.w:4:5
-  |
-4 |     return 9;
-  |     ^^^^^^^^^ Return statement outside of function cannot return a value
 
+error: Parameter "b" cannot have a non-serializable type "inflight (num): bool" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:46:3
+   |  
+46 | /   pub methodWithFunctions(a: (str): str, b: inflight (num): bool): (inflight (): bool)? {
+47 | |     // ^ error: Parameter "a" cannot have non-serializable type "(str): str" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+48 | |     return nil;
+49 | |   }
+   | \\---^
 
-error: Unexpected return value from void function. Return type annotations are required for methods.
-  --> ../../../examples/tests/invalid/return_types.test.w:9:3
-  |
-9 |   return 9;
-  |   ^^^^^^^^^ Unexpected return value from void function. Return type annotations are required for methods.
 
+error: Return value cannot have a non-serializable type "(inflight (): bool)?" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:46:3
+   |  
+46 | /   pub methodWithFunctions(a: (str): str, b: inflight (num): bool): (inflight (): bool)? {
+47 | |     // ^ error: Parameter "a" cannot have non-serializable type "(str): str" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+48 | |     return nil;
+49 | |   }
+   | \\---^
 
-error: Unexpected return value from void function. Return type annotations are required for methods.
-   --> ../../../examples/tests/invalid/return_types.test.w:12:5
-   |
-12 |     return 9;
-   |     ^^^^^^^^^ Unexpected return value from void function. Return type annotations are required for methods.
 
+error: Parameter "a" cannot have a non-serializable type "MyStructWithNonSerializableTypes" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:50:3
+   |  
+50 | /   pub methodWithBadStructs(a: MyStructWithNonSerializableTypes): MyStructWithNonSerializableTypes {
+51 | |     // ^ error: Parameter "a" cannot have non-serializable type "MyStructWithNonSerializableTypes" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+52 | |     return a;
+53 | |   }
+   | \\---^
+
+
+error: Return value cannot have a non-serializable type "MyStructWithNonSerializableTypes" because the method's class implements sim.IResource. Only serializable, immutable types can be used in methods of simulator resources.
+   --> ../../../examples/tests/invalid/sim_resource.test.w:50:3
+   |  
+50 | /   pub methodWithBadStructs(a: MyStructWithNonSerializableTypes): MyStructWithNonSerializableTypes {
+51 | |     // ^ error: Parameter "a" cannot have non-serializable type "MyStructWithNonSerializableTypes" because the class implements sim.IResource. Only serializable, non-mutable types can be used as arguments or return types on simulator resources.
+52 | |     return a;
+53 | |   }
+   | \\---^
 
-error: Unexpected return value from void function. Return type annotations are required for methods.
-   --> ../../../examples/tests/invalid/return_types.test.w:19:5
-   |
-19 |     return 9;
-   |     ^^^^^^^^^ Unexpected return value from void function. Return type annotations are required for methods.
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
-exports[`scope_and_id.test.w 1`] = `
-"error: Expected type to be \\"str\\", but got \\"num\\" instead
-  --> ../../../examples/tests/invalid/scope_and_id.test.w:6:25
-  |
-6 | new PreflightClass() as x;
-  |                         ^ Expected type to be \\"str\\", but got \\"num\\" instead
+exports[`simulator_permissions.test.w 1`] = `
+"error: Expected expression
+   --> ../../../examples/tests/invalid/simulator_permissions.test.w:10:21
+   |
+10 |   lift(buckets.at(1), ["put"]);
+   |                     ^
 
 
-error: Expected scope to be a preflight object, instead found \\"num\\"
-  --> ../../../examples/tests/invalid/scope_and_id.test.w:8:1
-  |
-8 | new PreflightClass() in x;
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ Expected scope to be a preflight object, instead found \\"num\\"
+error: Expected expression
+   --> ../../../examples/tests/invalid/simulator_permissions.test.w:20:21
+   |
+20 |   lift(buckets.at(0), ["list"]);
+   |                     ^
 
 
-error: Inflight classes cannot have an id
-   --> ../../../examples/tests/invalid/scope_and_id.test.w:15:26
+error: Unknown parser error
+   --> ../../../examples/tests/invalid/simulator_permissions.test.w:10:3
    |
-15 |   new InflightClass() as \\"hi\\";
-   |                          ^^^^ Inflight classes cannot have an id
+10 |   lift(buckets.at(1), ["put"]);
+   |   ^^^^
 
 
-error: Inflight classes cannot have a scope
-   --> ../../../examples/tests/invalid/scope_and_id.test.w:17:26
+error: Unknown parser error
+   --> ../../../examples/tests/invalid/simulator_permissions.test.w:20:3
    |
-17 |   new InflightClass() in pc;
-   |                          ^^ Inflight classes cannot have a scope
+20 |   lift(buckets.at(0), ["list"]);
+   |   ^^^^
 
 
-error: Cannot qualify access to a lifted object of type \\"PreflightClass\\" (see https://github.com/winglang/wing/issues/76 for more details)
-   --> ../../../examples/tests/invalid/scope_and_id.test.w:17:26
+error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/simulator_permissions.test.w:15:3
    |
-17 |   new InflightClass() in pc;
-   |                          ^^ Cannot qualify access to a lifted object of type \\"PreflightClass\\" (see https://github.com/winglang/wing/issues/76 for more details)
+15 |   buckets.at(i).put("key", "value");
+   |   ^^^^^^^^^^^^^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
+
+error: Expression of type "Bucket" references an unknown preflight object, can't qualify its capabilities
+   --> ../../../examples/tests/invalid/simulator_permissions.test.w:25:3
+   |
+25 |   buckets.at(i).put("key", "value");
+   |   ^^^^^^^^^^^^^
+   |
+   = hint: Use a \`lift\` block to explicitly qualify the preflight object and disable this error
+   = hint: For details see: https://www.winglang.io/docs/concepts/inflights#explicit-lift-qualification
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`sorted_errors_no_span.test.w 1`] = `
-"error: Expected type to be \\"num\\", but got \\"str\\" instead
+"error: Expected type to be "num", but got "str" instead
   --> ../../../examples/tests/invalid/sorted_errors_no_span.test.w:1:14
   |
-1 | let a: num = \\"s\\";
-  |              ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+1 | let a: num = "s";
+  |              ^^^
 
 
-error: Expected \\"b\\" to be a type but it's a variable
+error: Expected "b" to be a type but it's a variable
   --> ../../../examples/tests/invalid/sorted_errors_no_span.test.w:3:26
   |
 3 | inflight class c extends b {}
-  |                          ^ Expected \\"b\\" to be a type but it's a variable
+  |                          ^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
   --> ../../../examples/tests/invalid/sorted_errors_no_span.test.w:4:14
   |
-4 | let d: num = \\"s\\";
-  |              ^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+4 | let d: num = "s";
+  |              ^^^
 
 
-error: Expected \\"b\\" to be a type but it's a variable
+error: Expected "b" to be a type but it's a variable
   --> ../../../examples/tests/invalid/sorted_errors_no_span.test.w:5:26
   |
 5 | inflight class e extends b {}
-  |                          ^ Expected \\"b\\" to be a type but it's a variable
+  |                          ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -3103,300 +4501,437 @@ exports[`statement_invalid_scope.test.w 1`] = `
   --> ../../../examples/tests/invalid/statement_invalid_scope.test.w:3:5
   |
 3 |     break;
-  |     ^^^^^^ Expected break statement to be inside of a loop (while/for)
+  |     ^^^^^^
 
 
 error: Expected break statement to be inside of a loop (while/for)
   --> ../../../examples/tests/invalid/statement_invalid_scope.test.w:7:5
   |
 7 |     break;
-  |     ^^^^^^ Expected break statement to be inside of a loop (while/for)
+  |     ^^^^^^
 
 
 error: Expected continue statement to be inside of a loop (while/for)
    --> ../../../examples/tests/invalid/statement_invalid_scope.test.w:11:5
    |
 11 |     continue;
-   |     ^^^^^^^^^ Expected continue statement to be inside of a loop (while/for)
+   |     ^^^^^^^^^
 
 
 error: Expected continue statement to be inside of a loop (while/for)
    --> ../../../examples/tests/invalid/statement_invalid_scope.test.w:15:5
    |
 15 |     continue;
-   |     ^^^^^^^^^ Expected continue statement to be inside of a loop (while/for)
+   |     ^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`statements_if.test.w 1`] = `
-"error: Unexpected unary operator \\"--\\"
+"error: Unexpected unary operator "--"
   --> ../../../examples/tests/invalid/statements_if.test.w:2:1
   |
 2 | --n;
-  | ^^^ Unexpected unary operator \\"--\\"
+  | ^^^
 
 
-error: Expected type to be \\"bool\\", but got \\"num\\" instead
+error: Expected type to be "bool", but got "num" instead
   --> ../../../examples/tests/invalid/statements_if.test.w:5:5
   |
 5 | if !n {}
-  |     ^ Expected type to be \\"bool\\", but got \\"num\\" instead
+  |     ^
 
 
-error: Expected type to be \\"bool\\", but got \\"num\\" instead
+error: Expected type to be "bool", but got "num" instead
   --> ../../../examples/tests/invalid/statements_if.test.w:8:5
   |
 8 | if !n || true {}
-  |     ^ Expected type to be \\"bool\\", but got \\"num\\" instead
+  |     ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`std_containers.test.w 1`] = `
-"error: Expected type to be \\"Array<num>\\", but got \\"Array<str>\\" instead
+"error: Expected type to be "Array<num>", but got "Array<str>" instead
   --> ../../../examples/tests/invalid/std_containers.test.w:3:18
   |
 3 | let c = a.concat(b); 
-  |                  ^ Expected type to be \\"Array<num>\\", but got \\"Array<str>\\" instead
+  |                  ^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`stringify.test.w 1`] = `
+"error: Expected type to be "stringable", but got "B" instead
+  --> ../../../examples/tests/invalid/stringify.test.w:3:13
+  |
+3 | log("hello {b}");
+  |             ^
+  |
+  = hint: str, num, bool, json, and enums are stringable
+
+
+error: Expected type to be "stringable", but got "str?" instead
+  --> ../../../examples/tests/invalid/stringify.test.w:7:7
+  |
+7 | log("{x}");
+  |       ^
+  |
+  = hint: str? is an optional, try unwrapping it with 'x ?? "nil"' or 'x!'
+
+
+error: Expected type to be "stringable", but got "B" instead
+   --> ../../../examples/tests/invalid/stringify.test.w:10:5
+   |
+10 | log(b);
+   |     ^
+   |
+   = hint: str, num, bool, json, and enums are stringable
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`struct_expansion.test.w 1`] = `
-"error: Unexpected 'keyword_argument'
-   --> ../../../examples/tests/invalid/struct_expansion.test.w:11:15
+"error: Positional arguments must come before named arguments
+   --> ../../../examples/tests/invalid/struct_expansion.test.w:11:33
    |
-11 |   bucket1.put(file: \\"file.txt\\", \\"data\\");
-   |               ^^^^^^^^^^^^^^^^ Unexpected 'keyword_argument'
+11 |   bucket1.put(file: "file.txt", "data");
+   |                                 ^^^^^^
 
 
-error: \\"bublic\\" is not a field of \\"BucketProps\\"
+error: "bublic" is not a field of "BucketProps"
   --> ../../../examples/tests/invalid/struct_expansion.test.w:3:15
   |
 3 | let bucket1 = new cloud.Bucket(bublic: false, public: true);
-  |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \\"bublic\\" is not a field of \\"BucketProps\\"
+  |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 error: Expected either a positional argument or named arguments for the last parameter, but got both
   --> ../../../examples/tests/invalid/struct_expansion.test.w:7:15
   |
 7 | let bucket2 = new cloud.Bucket(2, public: true);
-  |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected either a positional argument or named arguments for the last parameter, but got both
+  |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Expected type to be \\"BucketProps?\\", but got \\"num\\" instead
+error: Expected type to be "BucketProps?", but got "num" instead
   --> ../../../examples/tests/invalid/struct_expansion.test.w:7:32
   |
 7 | let bucket2 = new cloud.Bucket(2, public: true);
-  |                                ^ Expected type to be \\"BucketProps?\\", but got \\"num\\" instead
-
+  |                                ^
 
-error: \\"status\\" is not initialized
-   --> ../../../examples/tests/invalid/struct_expansion.test.w:15:9
-   |  
-15 |   let x = cloud.ApiResponse {
-   | /---------^
-16 | |   body: \\"Hello, world!\\",
-17 | | };
-   | \\\\-^ \\"status\\" is not initialized
 
-
-error: \\"notAField\\" is not a field of \\"ApiResponse\\"
+error: "notAField" is not a field of "ApiResponse"
    --> ../../../examples/tests/invalid/struct_expansion.test.w:20:9
    |  
 20 |   let y = cloud.ApiResponse {
    | /---------^
 21 | |   status: 200,
 22 | |   notAField: 500,
-23 | | // ^^^^^^^^^^^ \\"notAField\\" is not a field of \\"ApiResponse\\"
+23 | | // ^^^^^^^^^^^ "notAField" is not a field of "ApiResponse"
 24 | | };
-   | \\\\-^ \\"notAField\\" is not a field of \\"ApiResponse\\"
+   | \\-^
+
+
+error: Expected type to be "inflight (event: str?): str?", but got "inflight (event: str): unknown" instead
+   --> ../../../examples/tests/invalid/struct_expansion.test.w:27:3
+   |
+27 |   handler, 
+   |   ^^^^^^^
+
+
+error: "file" is not a field of "BucketPutOptions"
+   --> ../../../examples/tests/invalid/struct_expansion.test.w:11:3
+   |
+11 |   bucket1.put(file: "file.txt", "data");
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-error: Expected between 2 and 3 positional arguments or named arguments for the last parameter but got 1
+error: Missing required field "contentType" from "BucketPutOptions"
    --> ../../../examples/tests/invalid/struct_expansion.test.w:11:3
    |
-11 |   bucket1.put(file: \\"file.txt\\", \\"data\\");
-   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Expected between 2 and 3 positional arguments or named arguments for the last parameter but got 1
+11 |   bucket1.put(file: "file.txt", "data");
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
 
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`struct_from_parameter.test.w 1`] = `
+"Error: unable to parse MyParams:
+- MyParams must have required property 'bar'
+- MyParams must have required property 'baz'
+- MyParams must have required property 'foo'
+   --> ../../../examples/tests/invalid/struct_from_parameter.test.w:14:1
+   | // technically we never enforced the parameters must have been
+   | // provided
+   | 
+14 | MyParams.fromJson(app.parameters.read());
+   | ^
+at <ABSOLUTE>/struct_from_parameter.test.w:14:1
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`struct_json_conversion.test.w 1`] = `
-"error: Struct \\"A\\" contains field \\"b\\" which cannot be represented in Json
+"error: Struct "A" contains field "b" which cannot be represented in Json
   --> ../../../examples/tests/invalid/struct_json_conversion.test.w:8:3
   |
 8 | A.fromJson({});
-  |   ^^^^^^^^ Struct \\"A\\" contains field \\"b\\" which cannot be represented in Json
+  |   ^^^^^^^^
 
 
-error: Struct \\"B\\" contains field \\"a\\" which cannot be represented in Json
+error: Struct "B" contains field "a" which cannot be represented in Json
    --> ../../../examples/tests/invalid/struct_json_conversion.test.w:15:3
    |
 15 | B.fromJson({});
-   |   ^^^^^^^^ Struct \\"B\\" contains field \\"a\\" which cannot be represented in Json
+   |   ^^^^^^^^
 
 
-error: Struct \\"C\\" contains field \\"b\\" which cannot be represented in Json
+error: Struct "C" contains field "b" which cannot be represented in Json
    --> ../../../examples/tests/invalid/struct_json_conversion.test.w:22:3
    |
 22 | C.fromJson({});
-   |   ^^^^^^^^ Struct \\"C\\" contains field \\"b\\" which cannot be represented in Json
+   |   ^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`structs.test.w 1`] = `
-"error: Struct \\"C\\" extends \\"B\\" which introduces a conflicting member \\"x\\" (str != num)
+"error: Struct "C" extends "B" which introduces a conflicting member "x" (str != num)
    --> ../../../examples/tests/invalid/structs.test.w:13:3
    |
 13 |   x: num;
-   |   ^ Struct \\"C\\" extends \\"B\\" which introduces a conflicting member \\"x\\" (str != num)
+   |   ^
 
 
-error: \\"x\\" is not initialized
+error: "x" is not initialized
    --> ../../../examples/tests/invalid/structs.test.w:16:18
    |
 16 | let someStruct = B { y: 5 };
-   |                  ^^^^^^^^^^ \\"x\\" is not initialized
+   |                  ^^^^^^^^^^
 
 
 error: Struct fields must have immutable types
    --> ../../../examples/tests/invalid/structs.test.w:20:3
    |
 20 |   f: MutArray<str>;
-   |   ^ Struct fields must have immutable types
+   |   ^
 
 
 error: Struct fields must have immutable types
    --> ../../../examples/tests/invalid/structs.test.w:25:3
    |
 25 |   f: Map<Array<MutArray<str>>>;
-   |   ^ Struct fields must have immutable types
+   |   ^
 
 
-error: Unknown symbol \\"badField\\"
+error: Member "badField" does not exist in "A"
    --> ../../../examples/tests/invalid/structs.test.w:32:7
    |
 32 | log(a.badField);
-   |       ^^^^^^^^ Unknown symbol \\"badField\\"
+   |       ^^^^^^^^
 
 
-error: Struct \\"Showtime\\" extends \\"Dazzle\\" which introduces a conflicting member \\"a\\" (num != str)
+error: Struct "Showtime" extends "Dazzle" which introduces a conflicting member "a" (num != str)
    --> ../../../examples/tests/invalid/structs.test.w:37:3
    |
 37 |   a: str;
-   |   ^ Struct \\"Showtime\\" extends \\"Dazzle\\" which introduces a conflicting member \\"a\\" (num != str)
+   |   ^
 
 
-error: Cannot instantiate type \\"BucketProps\\" because it is a struct and not a class. Use struct instantiation instead.
+error: Cannot instantiate type "BucketProps" because it is a struct and not a class. Use struct instantiation instead.
    --> ../../../examples/tests/invalid/structs.test.w:47:13
    |
 47 | let x = new cloud.BucketProps(1);
-   |             ^^^^^^^^^^^^^^^^^ Cannot instantiate type \\"BucketProps\\" because it is a struct and not a class. Use struct instantiation instead.
+   |             ^^^^^^^^^^^^^^^^^
+
+
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/structs.test.w:70:15
+   |
+70 | SomeStruct1 { numField }; // Wrong type when using punning
+   |               ^^^^^^^^
+
+
+error: "numField" is not initialized
+   --> ../../../examples/tests/invalid/structs.test.w:71:1
+   |
+71 | SomeStruct1 { noSuchField }; // Wrong field when using punning
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: "noSuchField" is not a field of "SomeStruct1"
+   --> ../../../examples/tests/invalid/structs.test.w:71:1
+   |
+71 | SomeStruct1 { noSuchField }; // Wrong field when using punning
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+error: struct "PreflightStruct" must be declared at the top-level of a file
+   --> ../../../examples/tests/invalid/structs.test.w:51:10
+   |
+51 |   struct PreflightStruct {
+   |          ^^^^^^^^^^^^^^^
+
+
+error: struct "InflightStruct" must be declared at the top-level of a file
+   --> ../../../examples/tests/invalid/structs.test.w:58:10
+   |
+58 |   struct InflightStruct {
+   |          ^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`super_call.test.w 1`] = `
-"error: \\"super\\" can only be used inside of classes
+"error: Cannot call super method because class Construct has no parent
    --> ../../../examples/tests/invalid/super_call.test.w:32:7
    |
 32 | super.do();
-   |       ^^ \\"super\\" can only be used inside of classes
+   |       ^^
 
 
-error: Cannot override private method \\"m1\\" of \\"BaseClass\\"
+error: Cannot override private method "m1" of "BaseClass"
    --> ../../../examples/tests/invalid/super_call.test.w:47:12
    |
 47 |   inflight m1(): str {
-   |            ^^ Cannot override private method \\"m1\\" of \\"BaseClass\\"
+   |            ^^
 
 
 error: Cannot call super method because class A has no parent
   --> ../../../examples/tests/invalid/super_call.test.w:4:11
   |
 4 |     super.method();
-  |           ^^^^^^ Cannot call super method because class A has no parent
+  |           ^^^^^^
 
 
 error: Cannot call super method because class InflightA has no parent
    --> ../../../examples/tests/invalid/super_call.test.w:12:11
    |
 12 |     super.method();
-   |           ^^^^^^ Cannot call super method because class InflightA has no parent
+   |           ^^^^^^
 
 
-error: super class \\"A\\" does not have a method named \\"child_method\\"
+error: super class "A" does not have a method named "child_method"
    --> ../../../examples/tests/invalid/super_call.test.w:20:11
    |
 20 |     super.child_method();
-   |           ^^^^^^^^^^^^ super class \\"A\\" does not have a method named \\"child_method\\"
+   |           ^^^^^^^^^^^^
 
 
-error: Cannot call super method inside of a static method
+error: Cannot call super method because class Construct has no parent
    --> ../../../examples/tests/invalid/super_call.test.w:26:11
    |
 26 |     super.method();
-   |           ^^^^^^ Cannot call super method inside of a static method
+   |           ^^^^^^
+
+
+error: Expected type to be "inflight (event: str?): str?", but got "inflight (s: str): str" instead
+   --> ../../../examples/tests/invalid/super_call.test.w:55:31
+   |
+55 |     return new cloud.Function(inflight_closure);
+   |                               ^^^^^^^^^^^^^^^^
 
 
 error: \`super\` calls inside inflight closures not supported yet, see: https://github.com/winglang/wing/issues/3474
    --> ../../../examples/tests/invalid/super_call.test.w:52:48
    |
-52 |       return \\"this: {this.m1()}, super: {super.m1()}\\";
-   |                                                ^^ \`super\` calls inside inflight closures not supported yet, see: https://github.com/winglang/wing/issues/3474
+52 |       return "this: {this.m1()}, super: {super.m1()}";
+   |                                                ^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`this.w 1`] = `
+"error: Unknown symbol "this"
+  --> ../../../examples/tests/invalid/this.w:3:9
+  |
+3 |     log(this.node.id);
+  |         ^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`throw_non_string.test.w 1`] = `
-"error: Expected type to be \\"str\\", but got \\"num\\" instead
+"error: Expected type to be "str", but got "num" instead
   --> ../../../examples/tests/invalid/throw_non_string.test.w:1:7
   |
 1 | throw 42;
-  |       ^^ Expected type to be \\"str\\", but got \\"num\\" instead
+  |       ^^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`try_catch_parenthesis.test.w 1`] = `
+"error: Unexpected parentheses in catch block. Use 'catch e' instead of 'catch (e)'.
+  --> ../../../examples/tests/invalid/try_catch_parenthesis.test.w:3:9
+  |
+3 | } catch (e) {
+  |         ^^^
+
+
+error: Unexpected parentheses in catch block. Use 'catch longError' instead of 'catch (longError)'.
+   --> ../../../examples/tests/invalid/try_catch_parenthesis.test.w:10:9
+   |
+10 | } catch (longError) {
+   |         ^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -3406,14 +4941,14 @@ exports[`try_no_catch_or_finally.test.w 1`] = `
   --> ../../../examples/tests/invalid/try_no_catch_or_finally.test.w:1:1
   |  
 1 | / try {
-2 | |   log(\\"Hello World\\");
+2 | |   log("Hello World");
 3 | | }
-  | \\\\-^ Missing \`catch\` or \`finally\` blocks for this try statement
+  | \\-^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -3422,220 +4957,301 @@ exports[`types_strings_arithmetic.test.w 1`] = `
 "error: Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
   --> ../../../examples/tests/invalid/types_strings_arithmetic.test.w:1:10
   |
-1 | let e1 = 2 + \\"2\\";
-  |          ^^^^^^^ Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
+1 | let e1 = 2 + "2";
+  |          ^^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
   --> ../../../examples/tests/invalid/types_strings_arithmetic.test.w:4:10
   |
-4 | let e2 = 2 == \\"2\\";
-  |          ^^^^^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+4 | let e2 = 2 == "2";
+  |          ^^^^^^^^
 
 
-error: Expected type to be \\"num\\", but got \\"str\\" instead
+error: Expected type to be "num", but got "str" instead
    --> ../../../examples/tests/invalid/types_strings_arithmetic.test.w:10:10
    |
-10 | let e3 = \\"{strExample}!\\" * numExample;
-   |          ^^^^^^^^^^^^^^^ Expected type to be \\"num\\", but got \\"str\\" instead
+10 | let e3 = "{strExample}!" * numExample;
+   |          ^^^^^^^^^^^^^^^
+
+
+error: Expected type to be "num", but got "str" instead
+   --> ../../../examples/tests/invalid/types_strings_arithmetic.test.w:15:6
+   |
+15 | a += b;
+   |      ^
+
+
+
+Tests 1 failed (1)
+Snapshots 1 skipped
+Test Files 1 failed (1)
+Duration <DURATION>"
+`;
+
+exports[`un_mut_lifted_objects.test.w 1`] = `
+"error: Member "push" does not exist in "Array"
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:22:6
+   |
+22 |   ar.push(2); // Error: push doesn't exist in Array
+   |      ^^^^
+
+
+error: Cannot update elements of an immutable Array
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:23:3
+   |
+23 |   ar[0] = 1; // Error: Cannot update elements of an immutable Array
+   |   ^^^^^
+   |
+   = hint: Consider using MutArray instead
+
+
+error: Member "set" does not exist in "Json"
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:24:5
+   |
+24 |   j.set("a", 3); // Error: set doesn't exist in Json
+   |     ^^^
+
+
+error: Member "add" does not exist in "Set"
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:25:6
+   |
+25 |   st.add(4); // Error: add doesn't exist in Set
+   |      ^^^
+
+
+error: Member "set" does not exist in "Map"
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:26:6
+   |
+26 |   mp.set("a", 3); // Error: set doesn't exist in Map
+   |      ^^^
+
+
+error: Member "push" does not exist in "Array"
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:27:11
+   |
+27 |   opt_ar?.push(2); // Error: push doesn't exist in Array
+   |           ^^^^
+
+
+error: Member "push" does not exist in "Array"
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:28:16
+   |
+28 |   recursive_ar.push(MutArray<num>[2]); // Error: push doesn't exist in Array
+   |                ^^^^
+
+
+error: Member "push" does not exist in "Array"
+   --> ../../../examples/tests/invalid/un_mut_lifted_objects.test.w:29:22
+   |
+29 |   recursive_ar.at(0).push(3); // Error: push doesn't exist in Array
+   |                      ^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`unimplemented_grammar.test.w 1`] = `
-"error: builtin \\"any\\" is not supported yet - see https://github.com/winglang/wing/issues/434
+"error: builtin "any" is not supported yet - see https://github.com/winglang/wing/issues/434
   --> ../../../examples/tests/invalid/unimplemented_grammar.test.w:1:8
   |
 1 | let b: any = 0;
-  |        ^^^ builtin \\"any\\" is not supported yet - see https://github.com/winglang/wing/issues/434
+  |        ^^^
 
 
-error: builtin container type \\"Promise\\" is not supported yet - see https://github.com/winglang/wing/issues/529
+error: builtin container type "Promise" is not supported yet - see https://github.com/winglang/wing/issues/529
   --> ../../../examples/tests/invalid/unimplemented_grammar.test.w:2:19
   |
 2 | let somePromise = Promise<str>{};
-  |                   ^^^^^^^^^^^^ builtin container type \\"Promise\\" is not supported yet - see https://github.com/winglang/wing/issues/529
+  |                   ^^^^^^^^^^^^
 
 
-error: expression \\"defer_expression\\" is not supported yet - see https://github.com/winglang/wing/issues/116
+error: expression "defer_expression" is not supported yet - see https://github.com/winglang/wing/issues/116
   --> ../../../examples/tests/invalid/unimplemented_grammar.test.w:3:9
   |
 3 | let c = defer somePromise();
-  |         ^^^^^^^^^^^^^^^^^^^ expression \\"defer_expression\\" is not supported yet - see https://github.com/winglang/wing/issues/116
+  |         ^^^^^^^^^^^^^^^^^^^
 
 
-error: expression \\"await_expression\\" is not supported yet - see https://github.com/winglang/wing/issues/116
+error: expression "await_expression" is not supported yet - see https://github.com/winglang/wing/issues/116
   --> ../../../examples/tests/invalid/unimplemented_grammar.test.w:4:9
   |
 4 | let d = await c;
-  |         ^^^^^^^ expression \\"await_expression\\" is not supported yet - see https://github.com/winglang/wing/issues/116
+  |         ^^^^^^^
 
 
-error: Unable to infer type
+error: Unable to infer type by usage, an explicit type annotation is required
   --> ../../../examples/tests/invalid/unimplemented_grammar.test.w:2:5
   |
 2 | let somePromise = Promise<str>{};
-  |     ^^^^^^^^^^^ Unable to infer type
+  |     ^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`unknown_field.test.w 1`] = `
-"error: Unknown symbol \\"a\\"
+"error: Member "a" does not exist in "String"
   --> ../../../examples/tests/invalid/unknown_field.test.w:1:12
   |
 1 | std.String.a.b.c.fromJson();
-  |            ^ Unknown symbol \\"a\\"
+  |            ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`unknown_submodule.test.w 1`] = `
-"error: Expected identifier \\"std\\" to be a variable, but it's a namespace
+"error: Expected identifier "std" to be a variable, but it's a namespace
   --> ../../../examples/tests/invalid/unknown_submodule.test.w:1:1
   |
-1 | std.random.String.fromJson(\\"hello\\");
-  | ^^^ Expected identifier \\"std\\" to be a variable, but it's a namespace
+1 | std.random.String.fromJson("hello");
+  | ^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`unknown_symbol.test.w 1`] = `
 "error: Reserved word
-   --> ../../../examples/tests/invalid/unknown_symbol.test.w:35:5
+   --> ../../../examples/tests/invalid/unknown_symbol.test.w:43:5
    |
-35 | let let = 2;
-   |     ^^^ Reserved word
+43 | let let = 2;
+   |     ^^^
 
 
-error: Unknown symbol \\"clod\\"
+error: Unknown symbol "clod"
   --> ../../../examples/tests/invalid/unknown_symbol.test.w:3:18
   |
 3 | let bucket = new clod.Bucket();
-  |                  ^^^^ Unknown symbol \\"clod\\"
+  |                  ^^^^
 
 
-error: Unknown symbol \\"cloudy\\"
+error: Unknown symbol "cloudy"
   --> ../../../examples/tests/invalid/unknown_symbol.test.w:6:17
   |
 6 | let funky = new cloudy.Funktion(inflight () => { });
-  |                 ^^^^^^ Unknown symbol \\"cloudy\\"
+  |                 ^^^^^^
 
 
-error: Unknown symbol \\"y\\"
+error: Unknown symbol "y"
   --> ../../../examples/tests/invalid/unknown_symbol.test.w:9:13
   |
 9 | let x = 2 + y;
-  |             ^ Unknown symbol \\"y\\"
+  |             ^
 
 
-error: Unknown symbol \\"B\\"
+error: Unknown symbol "B"
    --> ../../../examples/tests/invalid/unknown_symbol.test.w:28:17
    |
 28 | class A extends B {
-   |                 ^ Unknown symbol \\"B\\"
+   |                 ^
 
 
-error: Unknown symbol \\"unknown\\"
-   --> ../../../examples/tests/invalid/unknown_symbol.test.w:32:1
+error: Member "dodo" does not exist in "SomeResourceChild"
+   --> ../../../examples/tests/invalid/unknown_symbol.test.w:37:5
    |
-32 | unknown = 1;
-   | ^^^^^^^ Unknown symbol \\"unknown\\"
+37 | src.dodo();
+   |     ^^^^
 
 
-error: Unknown symbol \\"assert\\"
-   --> ../../../examples/tests/invalid/unknown_symbol.test.w:20:17
+error: Unknown symbol "unknown"
+   --> ../../../examples/tests/invalid/unknown_symbol.test.w:40:1
    |
-20 |     this.bucket.assert(2 + \\"2\\");
-   |                 ^^^^^^ Unknown symbol \\"assert\\"
+40 | unknown = 1;
+   | ^^^^^^^
 
 
 error: Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
    --> ../../../examples/tests/invalid/unknown_symbol.test.w:20:24
    |
-20 |     this.bucket.assert(2 + \\"2\\");
-   |                        ^^^^^^^ Binary operator '+' cannot be applied to operands of type 'num' and 'str'; only (num, num) and (str, str) are supported
+20 |     this.bucket.assert(2 + "2");
+   |                        ^^^^^^^
+
+
+error: Member "assert" does not exist in "Bucket"
+   --> ../../../examples/tests/invalid/unknown_symbol.test.w:20:17
+   |
+20 |     this.bucket.assert(2 + "2");
+   |                 ^^^^^^
 
 
-error: Unknown symbol \\"methodWhichIsNotPartOfBucketApi\\"
+error: Member "methodWhichIsNotPartOfBucketApi" does not exist in "Bucket"
    --> ../../../examples/tests/invalid/unknown_symbol.test.w:23:24
    |
 23 |     return this.bucket.methodWhichIsNotPartOfBucketApi(id);
-   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unknown symbol \\"methodWhichIsNotPartOfBucketApi\\"
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`unresolved_state.test.w 1`] = `
-"Could not start resource root/env0/cloud.Function after 10 attempts. This could be due to a dependency cycle or an invalid attribute reference.
- 
- 
+"[ERROR] (no test) | Error: Unable to resolve attribute 'my_unresolved_token' for resource "root/env0/State" referenced by "root/env0/Function"
+Failed to start resources: "root/env0/Function"
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`use_before_defined.test.w 1`] = `
-"error: Unknown symbol \\"y\\"
+"error: Unknown symbol "y"
   --> ../../../examples/tests/invalid/use_before_defined.test.w:1:7
   |
-1 | log(\\"{y}\\"); // Access y before it's defined
-  |       ^ Unknown symbol \\"y\\"
+1 | log("{y}"); // Access y before it's defined
+  |       ^
 
 
-error: Symbol \\"x\\" used before being defined
+error: Symbol "x" used before being defined
   --> ../../../examples/tests/invalid/use_before_defined.test.w:5:9
   |
-5 |   log(\\"{x}\\");
-  |         ^ Symbol \\"x\\" used before being defined
+5 |   log("{x}");
+  |         ^
   .
-8 | let x = \\"hi\\";
+8 | let x = "hi";
   |     - defined later here
 
 
- 
- 
+
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
 
 exports[`variable_scoping.test.w 1`] = `
-"error: Unknown symbol \\"x\\"
+"error: Unknown symbol "x"
   --> ../../../examples/tests/invalid/variable_scoping.test.w:6:11
   |
 6 |   let z = x;
-  |           ^ Unknown symbol \\"x\\"
+  |           ^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
@@ -3644,20 +5260,50 @@ exports[`void_in_expression_position.test.w 1`] = `
 "error: Property not found
   --> ../../../examples/tests/invalid/void_in_expression_position.test.w:1:12
   |
-1 | log(\\"hey\\").get(\\"x\\");
-  |            ^^^ Property not found
+1 | log("hey").get("x");
+  |            ^^^
+
+
+error: Expected type to be "stringable", but got "void" instead
+  --> ../../../examples/tests/invalid/void_in_expression_position.test.w:4:22
+  |
+4 | let x = "my name is {log("mister cloud")}";
+  |                      ^^^^^^^^^^^^^^^^^^^
+  |
+  = hint: str, num, bool, json, and enums are stringable
 
 
 error: Binary operator '+' cannot be applied to operands of type 'num' and 'void'; only (num, num) and (str, str) are supported
   --> ../../../examples/tests/invalid/void_in_expression_position.test.w:7:9
   |
-7 | let y = 5 + log(\\"hello\\");
-  |         ^^^^^^^^^^^^^^^^ Binary operator '+' cannot be applied to operands of type 'num' and 'void'; only (num, num) and (str, str) are supported
+7 | let y = 5 + log("hello");
+  |         ^^^^^^^^^^^^^^^^
+
+
+error: Cannot assign expression of type "void" to a variable
+   --> ../../../examples/tests/invalid/void_in_expression_position.test.w:11:5
+   |
+11 | let z = returnsNothing();
+   |     ^
+
+
+error: Cannot assign expression of type "void" to a variable
+   --> ../../../examples/tests/invalid/void_in_expression_position.test.w:15:5
+   |
+15 | let w: str? = returnsNothing2();
+   |     ^
+
+
+error: Expected type to be "str?", but got "void" instead
+   --> ../../../examples/tests/invalid/void_in_expression_position.test.w:15:15
+   |
+15 | let w: str? = returnsNothing2();
+   |               ^^^^^^^^^^^^^^^^^
+
 
 
- 
- 
 Tests 1 failed (1)
+Snapshots 1 skipped
 Test Files 1 failed (1)
 Duration <DURATION>"
 `;
diff --git a/tools/hangar/__snapshots__/platform.ts.snap b/tools/hangar/__snapshots__/platform.ts.snap
index d864a0896a0..fb94f34cb93 100644
--- a/tools/hangar/__snapshots__/platform.ts.snap
+++ b/tools/hangar/__snapshots__/platform.ts.snap
@@ -6,22 +6,9 @@ exports[`Multiple platforms > only first platform app is used 1`] = `
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+      "version": "0.20.3",
     },
+    "outputs": {},
   },
   "provider": {
     "aws": [
@@ -30,71 +17,74 @@ exports[`Multiple platforms > only first platform app is used 1`] = `
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419",
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C",
           },
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB",
           },
         },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"},{"Action":["s3:PutObject*","s3:Abort*"],"Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D",
           },
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC",
           },
         },
         "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer0.function_name}",
+        "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
+        "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0",
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0",
           },
         },
         "architectures": [
@@ -102,21 +92,21 @@ exports[`Multiple platforms > only first platform app is used 1`] = `
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "\${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws",
           },
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
@@ -124,32 +114,32 @@ exports[`Multiple platforms > only first platform app is used 1`] = `
       },
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket",
           },
         },
-        "bucket_prefix": "code-c84a50b1-",
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false,
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
+            "path": "root/Default/Code",
+            "uniqueId": "Code",
           },
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
+        "bucket_prefix": "code-c84a50b1-",
       },
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF",
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795",
           },
         },
         "bucket": "\${aws_s3_bucket.Code.bucket}",
@@ -158,15 +148,15 @@ exports[`Multiple platforms > only first platform app is used 1`] = `
       },
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue",
           },
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30,
       },
     },
@@ -180,22 +170,9 @@ exports[`Platform examples > AWS target platform > permission-boundary.js 1`] =
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+      "version": "0.20.3",
     },
+    "outputs": {},
   },
   "provider": {
     "aws": [
@@ -204,72 +181,75 @@ exports[`Platform examples > AWS target platform > permission-boundary.js 1`] =
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419",
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C",
           },
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
         "permissions_boundary": "some:fake:arn:SUPERADMIN",
       },
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB",
           },
         },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"},{"Action":["s3:PutObject*","s3:Abort*"],"Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D",
           },
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC",
           },
         },
         "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer0.function_name}",
+        "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
+        "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0",
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0",
           },
         },
         "architectures": [
@@ -277,21 +257,21 @@ exports[`Platform examples > AWS target platform > permission-boundary.js 1`] =
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "\${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws",
           },
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
@@ -299,32 +279,32 @@ exports[`Platform examples > AWS target platform > permission-boundary.js 1`] =
       },
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket",
           },
         },
-        "bucket_prefix": "code-c84a50b1-",
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false,
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
+            "path": "root/Default/Code",
+            "uniqueId": "Code",
           },
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
+        "bucket_prefix": "code-c84a50b1-",
       },
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF",
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795",
           },
         },
         "bucket": "\${aws_s3_bucket.Code.bucket}",
@@ -333,15 +313,15 @@ exports[`Platform examples > AWS target platform > permission-boundary.js 1`] =
       },
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue",
           },
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30,
       },
     },
@@ -355,22 +335,9 @@ exports[`Platform examples > AWS target platform > replicate-s3.js 1`] = `
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+      "version": "0.20.3",
     },
+    "outputs": {},
   },
   "provider": {
     "aws": [
@@ -379,18 +346,28 @@ exports[`Platform examples > AWS target platform > replicate-s3.js 1`] = `
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419",
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C",
           },
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30,
       },
     },
     "aws_iam_policy": {
+      "Bucket_ReplicaDefaultPolicy_5311A90C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/ReplicaDefaultPolicy",
+            "uniqueId": "Bucket_ReplicaDefaultPolicy_5311A90C",
+          },
+        },
+        "name": "some-prefix\${aws_s3_bucket.Bucket.bucket}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["s3:GetReplicationConfiguration","s3:ListBucket"],"Effect":"Allow","Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"]},{"Action":["s3:GetObjectVersionForReplication","s3:GetObjectVersionAcl","s3:GetObjectVersionTagging"],"Effect":"Allow","Resource":"\${aws_s3_bucket.Bucket.arn}/*"},{"Action":["s3:ReplicateObject","s3:ReplicateDelete","s3:ReplicateTags"],"Effect":"Allow","Resource":"\${aws_s3_bucket.Bucket_ReplicaDefault_F9F29351.arn}/*"}]}",
+      },
       "ReplicaCodePolicy": {
         "//": {
           "metadata": {
@@ -399,20 +376,23 @@ exports[`Platform examples > AWS target platform > replicate-s3.js 1`] = `
           },
         },
         "name": "some-prefix\${aws_s3_bucket.Code.bucket}",
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"s3:GetReplicationConfiguration\\",\\"s3:ListBucket\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":[\\"\${aws_s3_bucket.Code.arn}\\",\\"\${aws_s3_bucket.Code.arn}/*\\"]},{\\"Action\\":[\\"s3:GetObjectVersionForReplication\\",\\"s3:GetObjectVersionAcl\\",\\"s3:GetObjectVersionTagging\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.Code.arn}/*\\"},{\\"Action\\":[\\"s3:ReplicateObject\\",\\"s3:ReplicateDelete\\",\\"s3:ReplicateTags\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.ReplicaCode.arn}/*\\"}]}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["s3:GetReplicationConfiguration","s3:ListBucket"],"Effect":"Allow","Resource":["\${aws_s3_bucket.Code.arn}","\${aws_s3_bucket.Code.arn}/*"]},{"Action":["s3:GetObjectVersionForReplication","s3:GetObjectVersionAcl","s3:GetObjectVersionTagging"],"Effect":"Allow","Resource":"\${aws_s3_bucket.Code.arn}/*"},{"Action":["s3:ReplicateObject","s3:ReplicateDelete","s3:ReplicateTags"],"Effect":"Allow","Resource":"\${aws_s3_bucket.ReplicaCode.arn}/*"}]}",
       },
-      "cloudBucket_ReplicaDefaultPolicy_8B2539A7": {
+    },
+    "aws_iam_policy_attachment": {
+      "Bucket_ReplicaDefaultPolicyAttachment_710AD30F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultPolicy",
-            "uniqueId": "cloudBucket_ReplicaDefaultPolicy_8B2539A7",
+            "path": "root/Default/Default/Bucket/ReplicaDefaultPolicyAttachment",
+            "uniqueId": "Bucket_ReplicaDefaultPolicyAttachment_710AD30F",
           },
         },
-        "name": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"s3:GetReplicationConfiguration\\",\\"s3:ListBucket\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"]},{\\"Action\\":[\\"s3:GetObjectVersionForReplication\\",\\"s3:GetObjectVersionAcl\\",\\"s3:GetObjectVersionTagging\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"},{\\"Action\\":[\\"s3:ReplicateObject\\",\\"s3:ReplicateDelete\\",\\"s3:ReplicateTags\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.cloudBucket_ReplicaDefault_870F5CB9.arn}/*\\"}]}",
+        "name": "some-prefixpolicy-attachment\${aws_s3_bucket.Bucket.bucket}",
+        "policy_arn": "\${aws_iam_policy.Bucket_ReplicaDefaultPolicy_5311A90C.arn}",
+        "roles": [
+          "\${aws_iam_role.Bucket_ReplicaDefaultRole_B700A568.name}",
+        ],
       },
-    },
-    "aws_iam_policy_attachment": {
       "ReplicaCodePolicyAttachment": {
         "//": {
           "metadata": {
@@ -426,94 +406,84 @@ exports[`Platform examples > AWS target platform > replicate-s3.js 1`] = `
           "\${aws_iam_role.ReplicaCodeRole.name}",
         ],
       },
-      "cloudBucket_ReplicaDefaultPolicyAttachment_7A65C0F4": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultPolicyAttachment",
-            "uniqueId": "cloudBucket_ReplicaDefaultPolicyAttachment_7A65C0F4",
-          },
-        },
-        "name": "some-prefixpolicy-attachment\${aws_s3_bucket.cloudBucket.bucket}",
-        "policy_arn": "\${aws_iam_policy.cloudBucket_ReplicaDefaultPolicy_8B2539A7.arn}",
-        "roles": [
-          "\${aws_iam_role.cloudBucket_ReplicaDefaultRole_8996C4FA.name}",
-        ],
-      },
     },
     "aws_iam_role": {
-      "ReplicaCodeRole": {
+      "Bucket_ReplicaDefaultRole_B700A568": {
         "//": {
           "metadata": {
-            "path": "root/Default/ReplicaCodeRole",
-            "uniqueId": "ReplicaCodeRole",
+            "path": "root/Default/Default/Bucket/ReplicaDefaultRole",
+            "uniqueId": "Bucket_ReplicaDefaultRole_B700A568",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Effect\\":\\"Allow\\",\\"Sid\\":\\"AllowS3Replication\\"}]}",
-        "name": "some-prefix\${aws_s3_bucket.Code.bucket}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"s3.amazonaws.com"},"Effect":"Allow","Sid":"AllowS3Replication"}]}",
+        "name": "some-prefix\${aws_s3_bucket.Bucket.bucket}",
       },
-      "cloudBucket_ReplicaDefaultRole_8996C4FA": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultRole",
-            "uniqueId": "cloudBucket_ReplicaDefaultRole_8996C4FA",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Effect\\":\\"Allow\\",\\"Sid\\":\\"AllowS3Replication\\"}]}",
-        "name": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "ReplicaCodeRole": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138",
+            "path": "root/Default/ReplicaCodeRole",
+            "uniqueId": "ReplicaCodeRole",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"s3.amazonaws.com"},"Effect":"Allow","Sid":"AllowS3Replication"}]}",
+        "name": "some-prefix\${aws_s3_bucket.Code.bucket}",
       },
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB",
           },
         },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"},{"Action":["s3:PutObject*","s3:Abort*"],"Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D",
           },
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC",
           },
         },
         "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer0.function_name}",
+        "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
+        "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0",
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0",
           },
         },
         "architectures": [
@@ -521,21 +491,21 @@ exports[`Platform examples > AWS target platform > replicate-s3.js 1`] = `
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "\${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws",
           },
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
@@ -543,150 +513,150 @@ exports[`Platform examples > AWS target platform > replicate-s3.js 1`] = `
       },
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket",
           },
         },
-        "bucket_prefix": "code-c84a50b1-",
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false,
       },
-      "ReplicaCode": {
+      "Bucket_ReplicaDefault_F9F29351": {
         "//": {
           "metadata": {
-            "path": "root/Default/ReplicaCode",
-            "uniqueId": "ReplicaCode",
+            "path": "root/Default/Default/Bucket/ReplicaDefault",
+            "uniqueId": "Bucket_ReplicaDefault_F9F29351",
           },
         },
-        "bucket": "some-prefix\${aws_s3_bucket.Code.bucket}",
+        "bucket": "some-prefix\${aws_s3_bucket.Bucket.bucket}",
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
+            "path": "root/Default/Code",
+            "uniqueId": "Code",
           },
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
+        "bucket_prefix": "code-c84a50b1-",
       },
-      "cloudBucket_ReplicaDefault_870F5CB9": {
+      "ReplicaCode": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefault",
-            "uniqueId": "cloudBucket_ReplicaDefault_870F5CB9",
+            "path": "root/Default/ReplicaCode",
+            "uniqueId": "ReplicaCode",
           },
         },
-        "bucket": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
+        "bucket": "some-prefix\${aws_s3_bucket.Code.bucket}",
       },
     },
     "aws_s3_bucket_replication_configuration": {
-      "ReplicaCodeConfig": {
+      "Bucket_ReplicaDefaultConfig_A63C952B": {
         "//": {
           "metadata": {
-            "path": "root/Default/ReplicaCodeConfig",
-            "uniqueId": "ReplicaCodeConfig",
+            "path": "root/Default/Default/Bucket/ReplicaDefaultConfig",
+            "uniqueId": "Bucket_ReplicaDefaultConfig_A63C952B",
           },
         },
-        "bucket": "\${aws_s3_bucket.Code.id}",
+        "bucket": "\${aws_s3_bucket.Bucket.id}",
         "depends_on": [
-          "aws_s3_bucket_versioning.ReplicaCodeVersioning",
-          "aws_s3_bucket_versioning.SourceCodeVersioning",
+          "aws_s3_bucket_versioning.Bucket_ReplicaDefaultVersioning_38F52DB1",
+          "aws_s3_bucket_versioning.Bucket_SourceDefaultVersioning_07CBDA44",
         ],
-        "role": "\${aws_iam_role.ReplicaCodeRole.arn}",
+        "role": "\${aws_iam_role.Bucket_ReplicaDefaultRole_B700A568.arn}",
         "rule": [
           {
             "destination": {
-              "bucket": "\${aws_s3_bucket.ReplicaCode.arn}",
+              "bucket": "\${aws_s3_bucket.Bucket_ReplicaDefault_F9F29351.arn}",
               "storage_class": "STANDARD",
             },
-            "id": "some-prefix\${aws_s3_bucket.Code.bucket}",
+            "id": "some-prefix\${aws_s3_bucket.Bucket.bucket}",
             "status": "Enabled",
           },
         ],
       },
-      "cloudBucket_ReplicaDefaultConfig_B5F7C7E5": {
+      "ReplicaCodeConfig": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultConfig",
-            "uniqueId": "cloudBucket_ReplicaDefaultConfig_B5F7C7E5",
+            "path": "root/Default/ReplicaCodeConfig",
+            "uniqueId": "ReplicaCodeConfig",
           },
         },
-        "bucket": "\${aws_s3_bucket.cloudBucket.id}",
+        "bucket": "\${aws_s3_bucket.Code.id}",
         "depends_on": [
-          "aws_s3_bucket_versioning.cloudBucket_ReplicaDefaultVersioning_1CE02442",
-          "aws_s3_bucket_versioning.cloudBucket_SourceDefaultVersioning_6A904B70",
+          "aws_s3_bucket_versioning.ReplicaCodeVersioning",
+          "aws_s3_bucket_versioning.SourceCodeVersioning",
         ],
-        "role": "\${aws_iam_role.cloudBucket_ReplicaDefaultRole_8996C4FA.arn}",
+        "role": "\${aws_iam_role.ReplicaCodeRole.arn}",
         "rule": [
           {
             "destination": {
-              "bucket": "\${aws_s3_bucket.cloudBucket_ReplicaDefault_870F5CB9.arn}",
+              "bucket": "\${aws_s3_bucket.ReplicaCode.arn}",
               "storage_class": "STANDARD",
             },
-            "id": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
+            "id": "some-prefix\${aws_s3_bucket.Code.bucket}",
             "status": "Enabled",
           },
         ],
       },
     },
     "aws_s3_bucket_versioning": {
-      "ReplicaCodeVersioning": {
+      "Bucket_ReplicaDefaultVersioning_38F52DB1": {
         "//": {
           "metadata": {
-            "path": "root/Default/ReplicaCodeVersioning",
-            "uniqueId": "ReplicaCodeVersioning",
+            "path": "root/Default/Default/Bucket/ReplicaDefaultVersioning",
+            "uniqueId": "Bucket_ReplicaDefaultVersioning_38F52DB1",
           },
         },
-        "bucket": "\${aws_s3_bucket.ReplicaCode.id}",
+        "bucket": "\${aws_s3_bucket.Bucket_ReplicaDefault_F9F29351.id}",
         "versioning_configuration": {
           "status": "Enabled",
         },
       },
-      "SourceCodeVersioning": {
+      "Bucket_SourceDefaultVersioning_07CBDA44": {
         "//": {
           "metadata": {
-            "path": "root/Default/SourceCodeVersioning",
-            "uniqueId": "SourceCodeVersioning",
+            "path": "root/Default/Default/Bucket/SourceDefaultVersioning",
+            "uniqueId": "Bucket_SourceDefaultVersioning_07CBDA44",
           },
         },
-        "bucket": "\${aws_s3_bucket.Code.id}",
+        "bucket": "\${aws_s3_bucket.Bucket.id}",
         "versioning_configuration": {
           "status": "Enabled",
         },
       },
-      "cloudBucket_ReplicaDefaultVersioning_1CE02442": {
+      "ReplicaCodeVersioning": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultVersioning",
-            "uniqueId": "cloudBucket_ReplicaDefaultVersioning_1CE02442",
+            "path": "root/Default/ReplicaCodeVersioning",
+            "uniqueId": "ReplicaCodeVersioning",
           },
         },
-        "bucket": "\${aws_s3_bucket.cloudBucket_ReplicaDefault_870F5CB9.id}",
+        "bucket": "\${aws_s3_bucket.ReplicaCode.id}",
         "versioning_configuration": {
           "status": "Enabled",
         },
       },
-      "cloudBucket_SourceDefaultVersioning_6A904B70": {
+      "SourceCodeVersioning": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/SourceDefaultVersioning",
-            "uniqueId": "cloudBucket_SourceDefaultVersioning_6A904B70",
+            "path": "root/Default/SourceCodeVersioning",
+            "uniqueId": "SourceCodeVersioning",
           },
         },
-        "bucket": "\${aws_s3_bucket.cloudBucket.id}",
+        "bucket": "\${aws_s3_bucket.Code.id}",
         "versioning_configuration": {
           "status": "Enabled",
         },
       },
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF",
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795",
           },
         },
         "bucket": "\${aws_s3_bucket.Code.bucket}",
@@ -695,15 +665,15 @@ exports[`Platform examples > AWS target platform > replicate-s3.js 1`] = `
       },
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue",
           },
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30,
       },
     },
@@ -717,22 +687,9 @@ exports[`Platform examples > AWS target platform > tf-backend.js > azurerm backe
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+      "version": "0.20.3",
     },
+    "outputs": {},
   },
   "provider": {
     "aws": [
@@ -741,71 +698,74 @@ exports[`Platform examples > AWS target platform > tf-backend.js > azurerm backe
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419",
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C",
           },
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB",
           },
         },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"},{"Action":["s3:PutObject*","s3:Abort*"],"Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D",
           },
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC",
           },
         },
         "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer0.function_name}",
+        "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
+        "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0",
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0",
           },
         },
         "architectures": [
@@ -813,21 +773,21 @@ exports[`Platform examples > AWS target platform > tf-backend.js > azurerm backe
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "\${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws",
           },
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
@@ -835,32 +795,32 @@ exports[`Platform examples > AWS target platform > tf-backend.js > azurerm backe
       },
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket",
           },
         },
-        "bucket_prefix": "code-c84a50b1-",
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false,
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
+            "path": "root/Default/Code",
+            "uniqueId": "Code",
           },
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
+        "bucket_prefix": "code-c84a50b1-",
       },
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF",
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795",
           },
         },
         "bucket": "\${aws_s3_bucket.Code.bucket}",
@@ -869,15 +829,15 @@ exports[`Platform examples > AWS target platform > tf-backend.js > azurerm backe
       },
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue",
           },
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30,
       },
     },
@@ -891,22 +851,9 @@ exports[`Platform examples > AWS target platform > tf-backend.js > gcp backend 1
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+      "version": "0.20.3",
     },
+    "outputs": {},
   },
   "provider": {
     "aws": [
@@ -915,71 +862,74 @@ exports[`Platform examples > AWS target platform > tf-backend.js > gcp backend 1
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419",
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C",
           },
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB",
           },
         },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"},{"Action":["s3:PutObject*","s3:Abort*"],"Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D",
           },
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC",
           },
         },
         "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer0.function_name}",
+        "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
+        "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0",
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0",
           },
         },
         "architectures": [
@@ -987,21 +937,21 @@ exports[`Platform examples > AWS target platform > tf-backend.js > gcp backend 1
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "\${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws",
           },
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
@@ -1009,32 +959,32 @@ exports[`Platform examples > AWS target platform > tf-backend.js > gcp backend 1
       },
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket",
           },
         },
-        "bucket_prefix": "code-c84a50b1-",
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false,
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
+            "path": "root/Default/Code",
+            "uniqueId": "Code",
           },
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
+        "bucket_prefix": "code-c84a50b1-",
       },
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF",
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795",
           },
         },
         "bucket": "\${aws_s3_bucket.Code.bucket}",
@@ -1043,15 +993,15 @@ exports[`Platform examples > AWS target platform > tf-backend.js > gcp backend 1
       },
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue",
           },
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30,
       },
     },
@@ -1065,22 +1015,9 @@ exports[`Platform examples > AWS target platform > tf-backend.js > s3 backend 1`
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
+      "version": "0.20.3",
     },
+    "outputs": {},
   },
   "provider": {
     "aws": [
@@ -1089,71 +1026,74 @@ exports[`Platform examples > AWS target platform > tf-backend.js > s3 backend 1`
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419",
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C",
           },
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30,
       },
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED",
           },
         },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
+        "assume_role_policy": "{"Version":"2012-10-17","Statement":[{"Action":"sts:AssumeRole","Principal":{"Service":"lambda.amazonaws.com"},"Effect":"Allow"}]}",
       },
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB",
           },
         },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "policy": "{"Version":"2012-10-17","Statement":[{"Action":["sqs:ReceiveMessage","sqs:ChangeMessageVisibility","sqs:GetQueueUrl","sqs:DeleteMessage","sqs:GetQueueAttributes"],"Resource":["\${aws_sqs_queue.Queue.arn}"],"Effect":"Allow"},{"Action":["s3:PutObject*","s3:Abort*"],"Resource":["\${aws_s3_bucket.Bucket.arn}","\${aws_s3_bucket.Bucket.arn}/*"],"Effect":"Allow"}]}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A",
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D",
           },
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}",
       },
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC",
           },
         },
         "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer0.function_name}",
+        "event_source_arn": "\${aws_sqs_queue.Queue.arn}",
+        "function_name": "\${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures",
+        ],
       },
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0",
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0",
           },
         },
         "architectures": [
@@ -1161,21 +1101,21 @@ exports[`Platform examples > AWS target platform > tf-backend.js > s3 backend 1`
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "\${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws",
           },
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "\${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "\${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "\${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": [],
@@ -1183,32 +1123,32 @@ exports[`Platform examples > AWS target platform > tf-backend.js > s3 backend 1`
       },
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket",
           },
         },
-        "bucket_prefix": "code-c84a50b1-",
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false,
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
+            "path": "root/Default/Code",
+            "uniqueId": "Code",
           },
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
+        "bucket_prefix": "code-c84a50b1-",
       },
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF",
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795",
           },
         },
         "bucket": "\${aws_s3_bucket.Code.bucket}",
@@ -1217,15 +1157,15 @@ exports[`Platform examples > AWS target platform > tf-backend.js > s3 backend 1`
       },
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue",
           },
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30,
       },
     },
diff --git a/tools/hangar/__snapshots__/plugins.ts.snap b/tools/hangar/__snapshots__/plugins.ts.snap
deleted file mode 100644
index 3d3dbac679b..00000000000
--- a/tools/hangar/__snapshots__/plugins.ts.snap
+++ /dev/null
@@ -1,1055 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Plugin examples > AWS target plugins > permission-boundary.js 1`] = `
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "provider": {
-    "aws": [
-      {},
-    ],
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874",
-          },
-        },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "retention_in_days": 30,
-      },
-    },
-    "aws_iam_role": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828",
-          },
-        },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
-        "permissions_boundary": "some:fake:arn:SUPERADMIN",
-      },
-    },
-    "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937",
-          },
-        },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65",
-          },
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
-          },
-        },
-        "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer-cdafee6e.function_name}",
-      },
-    },
-    "aws_lambda_function": {
-      "cloudQueue-SetConsumer-cdafee6e": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/Default",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e",
-          },
-        },
-        "architectures": [
-          "arm64",
-        ],
-        "environment": {
-          "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-            "WING_MODEL": "tf-aws",
-          },
-        },
-        "function_name": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": [],
-        },
-      },
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
-          },
-        },
-        "bucket_prefix": "code-c84a50b1-",
-      },
-      "cloudBucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
-          },
-        },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
-      },
-    },
-    "aws_s3_object": {
-      "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>",
-      },
-    },
-    "aws_sqs_queue": {
-      "cloudQueue": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
-          },
-        },
-        "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
-        "visibility_timeout_seconds": 30,
-      },
-    },
-  },
-}
-`;
-
-exports[`Plugin examples > AWS target plugins > replicate-s3.js 1`] = `
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "provider": {
-    "aws": [
-      {},
-    ],
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874",
-          },
-        },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "retention_in_days": 30,
-      },
-    },
-    "aws_iam_policy": {
-      "ReplicaCodePolicy": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/ReplicaCodePolicy",
-            "uniqueId": "ReplicaCodePolicy",
-          },
-        },
-        "name": "some-prefix\${aws_s3_bucket.Code.bucket}",
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"s3:GetReplicationConfiguration\\",\\"s3:ListBucket\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":[\\"\${aws_s3_bucket.Code.arn}\\",\\"\${aws_s3_bucket.Code.arn}/*\\"]},{\\"Action\\":[\\"s3:GetObjectVersionForReplication\\",\\"s3:GetObjectVersionAcl\\",\\"s3:GetObjectVersionTagging\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.Code.arn}/*\\"},{\\"Action\\":[\\"s3:ReplicateObject\\",\\"s3:ReplicateDelete\\",\\"s3:ReplicateTags\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.ReplicaCode.arn}/*\\"}]}",
-      },
-      "cloudBucket_ReplicaDefaultPolicy_8B2539A7": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultPolicy",
-            "uniqueId": "cloudBucket_ReplicaDefaultPolicy_8B2539A7",
-          },
-        },
-        "name": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"s3:GetReplicationConfiguration\\",\\"s3:ListBucket\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"]},{\\"Action\\":[\\"s3:GetObjectVersionForReplication\\",\\"s3:GetObjectVersionAcl\\",\\"s3:GetObjectVersionTagging\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"},{\\"Action\\":[\\"s3:ReplicateObject\\",\\"s3:ReplicateDelete\\",\\"s3:ReplicateTags\\"],\\"Effect\\":\\"Allow\\",\\"Resource\\":\\"\${aws_s3_bucket.cloudBucket_ReplicaDefault_870F5CB9.arn}/*\\"}]}",
-      },
-    },
-    "aws_iam_policy_attachment": {
-      "ReplicaCodePolicyAttachment": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/ReplicaCodePolicyAttachment",
-            "uniqueId": "ReplicaCodePolicyAttachment",
-          },
-        },
-        "name": "some-prefixpolicy-attachment\${aws_s3_bucket.Code.bucket}",
-        "policy_arn": "\${aws_iam_policy.ReplicaCodePolicy.arn}",
-        "roles": [
-          "\${aws_iam_role.ReplicaCodeRole.name}",
-        ],
-      },
-      "cloudBucket_ReplicaDefaultPolicyAttachment_7A65C0F4": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultPolicyAttachment",
-            "uniqueId": "cloudBucket_ReplicaDefaultPolicyAttachment_7A65C0F4",
-          },
-        },
-        "name": "some-prefixpolicy-attachment\${aws_s3_bucket.cloudBucket.bucket}",
-        "policy_arn": "\${aws_iam_policy.cloudBucket_ReplicaDefaultPolicy_8B2539A7.arn}",
-        "roles": [
-          "\${aws_iam_role.cloudBucket_ReplicaDefaultRole_8996C4FA.name}",
-        ],
-      },
-    },
-    "aws_iam_role": {
-      "ReplicaCodeRole": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/ReplicaCodeRole",
-            "uniqueId": "ReplicaCodeRole",
-          },
-        },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Effect\\":\\"Allow\\",\\"Sid\\":\\"AllowS3Replication\\"}]}",
-        "name": "some-prefix\${aws_s3_bucket.Code.bucket}",
-      },
-      "cloudBucket_ReplicaDefaultRole_8996C4FA": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultRole",
-            "uniqueId": "cloudBucket_ReplicaDefaultRole_8996C4FA",
-          },
-        },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"s3.amazonaws.com\\"},\\"Effect\\":\\"Allow\\",\\"Sid\\":\\"AllowS3Replication\\"}]}",
-        "name": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
-      },
-      "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828",
-          },
-        },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
-      },
-    },
-    "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937",
-          },
-        },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65",
-          },
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
-          },
-        },
-        "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer-cdafee6e.function_name}",
-      },
-    },
-    "aws_lambda_function": {
-      "cloudQueue-SetConsumer-cdafee6e": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/Default",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e",
-          },
-        },
-        "architectures": [
-          "arm64",
-        ],
-        "environment": {
-          "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-            "WING_MODEL": "tf-aws",
-          },
-        },
-        "function_name": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": [],
-        },
-      },
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
-          },
-        },
-        "bucket_prefix": "code-c84a50b1-",
-      },
-      "ReplicaCode": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/ReplicaCode",
-            "uniqueId": "ReplicaCode",
-          },
-        },
-        "bucket": "some-prefix\${aws_s3_bucket.Code.bucket}",
-      },
-      "cloudBucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
-          },
-        },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
-      },
-      "cloudBucket_ReplicaDefault_870F5CB9": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefault",
-            "uniqueId": "cloudBucket_ReplicaDefault_870F5CB9",
-          },
-        },
-        "bucket": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
-      },
-    },
-    "aws_s3_bucket_replication_configuration": {
-      "ReplicaCodeConfig": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/ReplicaCodeConfig",
-            "uniqueId": "ReplicaCodeConfig",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.Code.id}",
-        "depends_on": [
-          "aws_s3_bucket_versioning.ReplicaCodeVersioning",
-          "aws_s3_bucket_versioning.SourceCodeVersioning",
-        ],
-        "role": "\${aws_iam_role.ReplicaCodeRole.arn}",
-        "rule": [
-          {
-            "destination": {
-              "bucket": "\${aws_s3_bucket.ReplicaCode.arn}",
-              "storage_class": "STANDARD",
-            },
-            "id": "some-prefix\${aws_s3_bucket.Code.bucket}",
-            "status": "Enabled",
-          },
-        ],
-      },
-      "cloudBucket_ReplicaDefaultConfig_B5F7C7E5": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultConfig",
-            "uniqueId": "cloudBucket_ReplicaDefaultConfig_B5F7C7E5",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.cloudBucket.id}",
-        "depends_on": [
-          "aws_s3_bucket_versioning.cloudBucket_ReplicaDefaultVersioning_1CE02442",
-          "aws_s3_bucket_versioning.cloudBucket_SourceDefaultVersioning_6A904B70",
-        ],
-        "role": "\${aws_iam_role.cloudBucket_ReplicaDefaultRole_8996C4FA.arn}",
-        "rule": [
-          {
-            "destination": {
-              "bucket": "\${aws_s3_bucket.cloudBucket_ReplicaDefault_870F5CB9.arn}",
-              "storage_class": "STANDARD",
-            },
-            "id": "some-prefix\${aws_s3_bucket.cloudBucket.bucket}",
-            "status": "Enabled",
-          },
-        ],
-      },
-    },
-    "aws_s3_bucket_versioning": {
-      "ReplicaCodeVersioning": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/ReplicaCodeVersioning",
-            "uniqueId": "ReplicaCodeVersioning",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.ReplicaCode.id}",
-        "versioning_configuration": {
-          "status": "Enabled",
-        },
-      },
-      "SourceCodeVersioning": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/SourceCodeVersioning",
-            "uniqueId": "SourceCodeVersioning",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.Code.id}",
-        "versioning_configuration": {
-          "status": "Enabled",
-        },
-      },
-      "cloudBucket_ReplicaDefaultVersioning_1CE02442": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ReplicaDefaultVersioning",
-            "uniqueId": "cloudBucket_ReplicaDefaultVersioning_1CE02442",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.cloudBucket_ReplicaDefault_870F5CB9.id}",
-        "versioning_configuration": {
-          "status": "Enabled",
-        },
-      },
-      "cloudBucket_SourceDefaultVersioning_6A904B70": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/SourceDefaultVersioning",
-            "uniqueId": "cloudBucket_SourceDefaultVersioning_6A904B70",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.cloudBucket.id}",
-        "versioning_configuration": {
-          "status": "Enabled",
-        },
-      },
-    },
-    "aws_s3_object": {
-      "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>",
-      },
-    },
-    "aws_sqs_queue": {
-      "cloudQueue": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
-          },
-        },
-        "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
-        "visibility_timeout_seconds": 30,
-      },
-    },
-  },
-}
-`;
-
-exports[`Plugin examples > AWS target plugins > tf-backend.js > azurerm backend 1`] = `
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "provider": {
-    "aws": [
-      {},
-    ],
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874",
-          },
-        },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "retention_in_days": 30,
-      },
-    },
-    "aws_iam_role": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828",
-          },
-        },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
-      },
-    },
-    "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937",
-          },
-        },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65",
-          },
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
-          },
-        },
-        "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer-cdafee6e.function_name}",
-      },
-    },
-    "aws_lambda_function": {
-      "cloudQueue-SetConsumer-cdafee6e": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/Default",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e",
-          },
-        },
-        "architectures": [
-          "arm64",
-        ],
-        "environment": {
-          "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-            "WING_MODEL": "tf-aws",
-          },
-        },
-        "function_name": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": [],
-        },
-      },
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
-          },
-        },
-        "bucket_prefix": "code-c84a50b1-",
-      },
-      "cloudBucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
-          },
-        },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
-      },
-    },
-    "aws_s3_object": {
-      "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>",
-      },
-    },
-    "aws_sqs_queue": {
-      "cloudQueue": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
-          },
-        },
-        "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
-        "visibility_timeout_seconds": 30,
-      },
-    },
-  },
-}
-`;
-
-exports[`Plugin examples > AWS target plugins > tf-backend.js > gcp backend 1`] = `
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "provider": {
-    "aws": [
-      {},
-    ],
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874",
-          },
-        },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "retention_in_days": 30,
-      },
-    },
-    "aws_iam_role": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828",
-          },
-        },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
-      },
-    },
-    "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937",
-          },
-        },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65",
-          },
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
-          },
-        },
-        "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer-cdafee6e.function_name}",
-      },
-    },
-    "aws_lambda_function": {
-      "cloudQueue-SetConsumer-cdafee6e": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/Default",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e",
-          },
-        },
-        "architectures": [
-          "arm64",
-        ],
-        "environment": {
-          "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-            "WING_MODEL": "tf-aws",
-          },
-        },
-        "function_name": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": [],
-        },
-      },
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
-          },
-        },
-        "bucket_prefix": "code-c84a50b1-",
-      },
-      "cloudBucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
-          },
-        },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
-      },
-    },
-    "aws_s3_object": {
-      "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>",
-      },
-    },
-    "aws_sqs_queue": {
-      "cloudQueue": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
-          },
-        },
-        "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
-        "visibility_timeout_seconds": 30,
-      },
-    },
-  },
-}
-`;
-
-exports[`Plugin examples > AWS target plugins > tf-backend.js > s3 backend 1`] = `
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0",
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS",
-          },
-        },
-      },
-    },
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]",
-    },
-  },
-  "provider": {
-    "aws": [
-      {},
-    ],
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_CloudwatchLogGroup_F895C874",
-          },
-        },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "retention_in_days": 30,
-      },
-    },
-    "aws_iam_role": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828",
-          },
-        },
-        "assume_role_policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":\\"sts:AssumeRole\\",\\"Principal\\":{\\"Service\\":\\"lambda.amazonaws.com\\"},\\"Effect\\":\\"Allow\\"}]}",
-      },
-    },
-    "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicy_37133937",
-          },
-        },
-        "policy": "{\\"Version\\":\\"2012-10-17\\",\\"Statement\\":[{\\"Action\\":[\\"sqs:ReceiveMessage\\",\\"sqs:ChangeMessageVisibility\\",\\"sqs:GetQueueUrl\\",\\"sqs:DeleteMessage\\",\\"sqs:GetQueueAttributes\\"],\\"Resource\\":[\\"\${aws_sqs_queue.cloudQueue.arn}\\"],\\"Effect\\":\\"Allow\\"},{\\"Action\\":[\\"s3:PutObject*\\",\\"s3:Abort*\\"],\\"Resource\\":[\\"\${aws_s3_bucket.cloudBucket.arn}\\",\\"\${aws_s3_bucket.cloudBucket.arn}/*\\"],\\"Effect\\":\\"Allow\\"}]}",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_IamRolePolicyAttachment_45079F65",
-          },
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.name}",
-      },
-    },
-    "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136",
-          },
-        },
-        "batch_size": 1,
-        "event_source_arn": "\${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "\${aws_lambda_function.cloudQueue-SetConsumer-cdafee6e.function_name}",
-      },
-    },
-    "aws_lambda_function": {
-      "cloudQueue-SetConsumer-cdafee6e": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/Default",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e",
-          },
-        },
-        "architectures": [
-          "arm64",
-        ],
-        "environment": {
-          "variables": {
-            "BUCKET_NAME_d755b447": "\${aws_s3_bucket.cloudBucket.bucket}",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-            "WING_MODEL": "tf-aws",
-          },
-        },
-        "function_name": "cloud-Queue-SetConsumer-cdafee6e-c8eb6a09",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "\${aws_iam_role.cloudQueue-SetConsumer-cdafee6e_IamRole_2548D828.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "\${aws_s3_bucket.Code.bucket}",
-        "s3_key": "\${aws_s3_object.cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB.key}",
-        "timeout": "\${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": [],
-        },
-      },
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code",
-          },
-        },
-        "bucket_prefix": "code-c84a50b1-",
-      },
-      "cloudBucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket",
-          },
-        },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false,
-      },
-    },
-    "aws_s3_object": {
-      "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer-cdafee6e/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer-cdafee6e_S3Object_8868B9FB",
-          },
-        },
-        "bucket": "\${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>",
-      },
-    },
-    "aws_sqs_queue": {
-      "cloudQueue": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue",
-          },
-        },
-        "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
-        "visibility_timeout_seconds": 30,
-      },
-    },
-  },
-}
-`;
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_compile_tf-aws.md
index 95198810d54..2e69e0d539a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,103 +57,103 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/hello\":{\"get\":{\"operationId\":\"get-hello\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_hello_0_2F9F5F19.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/hello\":{\"get\":{\"operationId\":\"get-hello\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_hello0-c8557c1a/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_hello_0_CloudwatchLogGroup_332ABC56": {
+      "Api_get_hello0_CloudwatchLogGroup_1025B41C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_hello_0_CloudwatchLogGroup_332ABC56"
+            "path": "root/Default/Default/Api/get_hello0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_hello0_CloudwatchLogGroup_1025B41C"
           }
         },
-        "name": "/aws/lambda/get_hello_-0-c8ed7599",
+        "name": "/aws/lambda/get_hello0-c8557c1a",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_hello_0_IamRole_AF63D6EC": {
+      "Api_get_hello0_IamRole_1E6956F6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/IamRole",
-            "uniqueId": "cloudApi_get_hello_0_IamRole_AF63D6EC"
+            "path": "root/Default/Default/Api/get_hello0/IamRole",
+            "uniqueId": "Api_get_hello0_IamRole_1E6956F6"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_hello_0_IamRolePolicy_0D701926": {
+      "Api_get_hello0_IamRolePolicy_CFA96C73": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_hello_0_IamRolePolicy_0D701926"
+            "path": "root/Default/Default/Api/get_hello0/IamRolePolicy",
+            "uniqueId": "Api_get_hello0_IamRolePolicy_CFA96C73"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_hello_0_IamRole_AF63D6EC.name}"
+        "role": "${aws_iam_role.Api_get_hello0_IamRole_1E6956F6.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_hello_0_IamRolePolicyAttachment_65673571": {
+      "Api_get_hello0_IamRolePolicyAttachment_2CF40947": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_hello_0_IamRolePolicyAttachment_65673571"
+            "path": "root/Default/Default/Api/get_hello0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_hello0_IamRolePolicyAttachment_2CF40947"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_hello_0_IamRole_AF63D6EC.name}"
+        "role": "${aws_iam_role.Api_get_hello0_IamRole_1E6956F6.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_hello_0_2F9F5F19": {
+      "Api_get_hello0_910B8B13": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/Default",
-            "uniqueId": "cloudApi_get_hello_0_2F9F5F19"
+            "path": "root/Default/Default/Api/get_hello0/Default",
+            "uniqueId": "Api_get_hello0_910B8B13"
           }
         },
         "architectures": [
@@ -148,18 +162,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_hello_-0-c8ed7599",
+            "WING_FUNCTION_NAME": "get_hello0-c8557c1a",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_hello_-0-c8ed7599",
+        "function_name": "get_hello0-c8557c1a",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_hello_0_IamRole_AF63D6EC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_hello0_IamRole_1E6956F6.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_hello_0_S3Object_B8DCD8E8.key}",
+        "s3_key": "${aws_s3_object.Api_get_hello0_S3Object_6B43B0B3.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -168,17 +182,17 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-df16733f_0EEF8FF5": {
+      "Api_api_permission-GET-df16733f_BE6D5FC5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-df16733f",
-            "uniqueId": "cloudApi_api_permission-GET-df16733f_0EEF8FF5"
+            "path": "root/Default/Default/Api/api/permission-GET-df16733f",
+            "uniqueId": "Api_api_permission-GET-df16733f_BE6D5FC5"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_hello_0_2F9F5F19.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_hello0_910B8B13.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/hello",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/hello",
         "statement_id": "AllowExecutionFromAPIGateway-GET-df16733f"
       }
     },
@@ -194,11 +208,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_hello_0_S3Object_B8DCD8E8": {
+      "Api_get_hello0_S3Object_6B43B0B3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/S3Object",
-            "uniqueId": "cloudApi_get_hello_0_S3Object_B8DCD8E8"
+            "path": "root/Default/Default/Api/get_hello0/S3Object",
+            "uniqueId": "Api_get_hello0_S3Object_6B43B0B3"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_test_sim.md
index ee5ed0462ec..5f3d48000e7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/404.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ 404.test.wsim » root/env0/test:it responds with 404
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_compile_tf-aws.md
index c466c663977..b734a10f596 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "api": {
+              "Endpoint": {
+                "Url": "api_Endpoint_Url_E5DB9C2F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "api_Endpoint_Url_E5DB9C2F": {
+      "value": "https://${aws_api_gateway_rest_api.api_DD79FE08.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.api_stage_ABA3AD8B.stage_name}"
     }
   },
   "provider": {
@@ -67,7 +81,7 @@
             "uniqueId": "api_DD79FE08"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/api\":{\"get\":{\"operationId\":\"get-api\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.api_get_api_0_80CC0CB8.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/api\":{\"get\":{\"operationId\":\"get-api\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_api0-c8c47de3/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
@@ -88,58 +102,58 @@
       }
     },
     "aws_cloudwatch_log_group": {
-      "api_get_api_0_CloudwatchLogGroup_3A146126": {
+      "api_get_api0_CloudwatchLogGroup_065995CC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/api/get_api_}0/CloudwatchLogGroup",
-            "uniqueId": "api_get_api_0_CloudwatchLogGroup_3A146126"
+            "path": "root/Default/Default/api/get_api0/CloudwatchLogGroup",
+            "uniqueId": "api_get_api0_CloudwatchLogGroup_065995CC"
           }
         },
-        "name": "/aws/lambda/get_api_-0-c8a09fa4",
+        "name": "/aws/lambda/get_api0-c8c47de3",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "api_get_api_0_IamRole_EB61CF92": {
+      "api_get_api0_IamRole_1D6098F5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/api/get_api_}0/IamRole",
-            "uniqueId": "api_get_api_0_IamRole_EB61CF92"
+            "path": "root/Default/Default/api/get_api0/IamRole",
+            "uniqueId": "api_get_api0_IamRole_1D6098F5"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "api_get_api_0_IamRolePolicy_91C67C80": {
+      "api_get_api0_IamRolePolicy_55513989": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/api/get_api_}0/IamRolePolicy",
-            "uniqueId": "api_get_api_0_IamRolePolicy_91C67C80"
+            "path": "root/Default/Default/api/get_api0/IamRolePolicy",
+            "uniqueId": "api_get_api0_IamRolePolicy_55513989"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.api_get_api_0_IamRole_EB61CF92.name}"
+        "role": "${aws_iam_role.api_get_api0_IamRole_1D6098F5.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "api_get_api_0_IamRolePolicyAttachment_E4D8A20D": {
+      "api_get_api0_IamRolePolicyAttachment_04CCC841": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/api/get_api_}0/IamRolePolicyAttachment",
-            "uniqueId": "api_get_api_0_IamRolePolicyAttachment_E4D8A20D"
+            "path": "root/Default/Default/api/get_api0/IamRolePolicyAttachment",
+            "uniqueId": "api_get_api0_IamRolePolicyAttachment_04CCC841"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.api_get_api_0_IamRole_EB61CF92.name}"
+        "role": "${aws_iam_role.api_get_api0_IamRole_1D6098F5.name}"
       }
     },
     "aws_lambda_function": {
-      "api_get_api_0_80CC0CB8": {
+      "api_get_api0_F4BE8E80": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/api/get_api_}0/Default",
-            "uniqueId": "api_get_api_0_80CC0CB8"
+            "path": "root/Default/Default/api/get_api0/Default",
+            "uniqueId": "api_get_api0_F4BE8E80"
           }
         },
         "architectures": [
@@ -148,18 +162,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_api_-0-c8a09fa4",
+            "WING_FUNCTION_NAME": "get_api0-c8c47de3",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_api_-0-c8a09fa4",
+        "function_name": "get_api0-c8c47de3",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.api_get_api_0_IamRole_EB61CF92.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.api_get_api0_IamRole_1D6098F5.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.api_get_api_0_S3Object_797A12CE.key}",
+        "s3_key": "${aws_s3_object.api_get_api0_S3Object_6BECABA3.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -176,7 +190,7 @@
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.api_get_api_0_80CC0CB8.function_name}",
+        "function_name": "${aws_lambda_function.api_get_api0_F4BE8E80.function_name}",
         "principal": "apigateway.amazonaws.com",
         "source_arn": "${aws_api_gateway_rest_api.api_DD79FE08.execution_arn}/*/GET/api",
         "statement_id": "AllowExecutionFromAPIGateway-GET-77bab856"
@@ -194,11 +208,11 @@
       }
     },
     "aws_s3_object": {
-      "api_get_api_0_S3Object_797A12CE": {
+      "api_get_api0_S3Object_6BECABA3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/api/get_api_}0/S3Object",
-            "uniqueId": "api_get_api_0_S3Object_797A12CE"
+            "path": "root/Default/Default/api/get_api0/S3Object",
+            "uniqueId": "api_get_api0_S3Object_6BECABA3"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_test_sim.md
index d001e9fefc3..5e2d2d2be43 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/aws-api.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ aws-api.test.wsim » root/env0/test:validates the AWS Api
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_compile_tf-aws.md
index 070e1ef1356..e0a19df7656 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,103 +57,103 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/path\":{\"get\":{\"operationId\":\"get-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_path_0_185DD801.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'*'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,PUT,DELETE,HEAD,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type,Authorization,X-Requested-With'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/path\":{\"get\":{\"operationId\":\"get-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_path0-c8789d12/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'*'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,PUT,DELETE,HEAD,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type,Authorization,X-Requested-With'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_path_0_CloudwatchLogGroup_B9CA7CA5": {
+      "Api_get_path0_CloudwatchLogGroup_B7150EB5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_path_0_CloudwatchLogGroup_B9CA7CA5"
+            "path": "root/Default/Default/Api/get_path0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_path0_CloudwatchLogGroup_B7150EB5"
           }
         },
-        "name": "/aws/lambda/get_path_-0-c87a12e4",
+        "name": "/aws/lambda/get_path0-c8789d12",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_path_0_IamRole_415454B9": {
+      "Api_get_path0_IamRole_66BB88D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/IamRole",
-            "uniqueId": "cloudApi_get_path_0_IamRole_415454B9"
+            "path": "root/Default/Default/Api/get_path0/IamRole",
+            "uniqueId": "Api_get_path0_IamRole_66BB88D8"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_path_0_IamRolePolicy_CAECAB35": {
+      "Api_get_path0_IamRolePolicy_C87DDBC3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_path_0_IamRolePolicy_CAECAB35"
+            "path": "root/Default/Default/Api/get_path0/IamRolePolicy",
+            "uniqueId": "Api_get_path0_IamRolePolicy_C87DDBC3"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_path_0_IamRole_415454B9.name}"
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_path_0_IamRolePolicyAttachment_D15F11D3": {
+      "Api_get_path0_IamRolePolicyAttachment_94BA0B78": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_path_0_IamRolePolicyAttachment_D15F11D3"
+            "path": "root/Default/Default/Api/get_path0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_path0_IamRolePolicyAttachment_94BA0B78"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_path_0_IamRole_415454B9.name}"
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_path_0_185DD801": {
+      "Api_get_path0_CB7C4BBC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/Default",
-            "uniqueId": "cloudApi_get_path_0_185DD801"
+            "path": "root/Default/Default/Api/get_path0/Default",
+            "uniqueId": "Api_get_path0_CB7C4BBC"
           }
         },
         "architectures": [
@@ -148,18 +162,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_path_-0-c87a12e4",
+            "WING_FUNCTION_NAME": "get_path0-c8789d12",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_path_-0-c87a12e4",
+        "function_name": "get_path0-c8789d12",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_path_0_IamRole_415454B9.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_path_0_S3Object_CCF25491.key}",
+        "s3_key": "${aws_s3_object.Api_get_path0_S3Object_6334C185.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -168,17 +182,17 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-e2131352_3FDDE199": {
+      "Api_api_permission-GET-e2131352_9A82BDF8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-e2131352",
-            "uniqueId": "cloudApi_api_permission-GET-e2131352_3FDDE199"
+            "path": "root/Default/Default/Api/api/permission-GET-e2131352",
+            "uniqueId": "Api_api_permission-GET-e2131352_9A82BDF8"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_path_0_185DD801.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_path0_CB7C4BBC.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/path",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/path",
         "statement_id": "AllowExecutionFromAPIGateway-GET-e2131352"
       }
     },
@@ -194,11 +208,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_path_0_S3Object_CCF25491": {
+      "Api_get_path0_S3Object_6334C185": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/S3Object",
-            "uniqueId": "cloudApi_get_path_0_S3Object_CCF25491"
+            "path": "root/Default/Default/Api/get_path0/S3Object",
+            "uniqueId": "Api_get_path0_S3Object_6334C185"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_test_sim.md
index 609dc4aaa45..d355026ca61 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cors.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ cors.test.wsim » root/env0/test:http.get and http.fetch can preform a call to an api
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cycle.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cycle.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..52eba5c5629
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cycle.test.w_compile_tf-aws.md
@@ -0,0 +1,227 @@
+# [cycle.test.w](../../../../../../examples/tests/sdk_tests/api/cycle.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+      "root": {
+        "Default": {
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
+    "aws_region": {
+      "Region": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Region",
+            "uniqueId": "Region"
+          }
+        }
+      }
+    }
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    }
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
+        }
+      }
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
+          }
+        },
+        "body": "{\"paths\":{\"/my_url\":{\"get\":{\"operationId\":\"get-my_url\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_my_url0-c8ebe364/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c8f613f0"
+      }
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod"
+      }
+    },
+    "aws_cloudwatch_log_group": {
+      "Api_get_my_url0_CloudwatchLogGroup_03778440": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_my_url0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_my_url0_CloudwatchLogGroup_03778440"
+          }
+        },
+        "name": "/aws/lambda/get_my_url0-c8ebe364",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Api_get_my_url0_IamRole_2A08E79F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_my_url0/IamRole",
+            "uniqueId": "Api_get_my_url0_IamRole_2A08E79F"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Api_get_my_url0_IamRolePolicy_04BD1959": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_my_url0/IamRolePolicy",
+            "uniqueId": "Api_get_my_url0_IamRolePolicy_04BD1959"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Api_get_my_url0_IamRole_2A08E79F.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Api_get_my_url0_IamRolePolicyAttachment_291D6C17": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_my_url0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_my_url0_IamRolePolicyAttachment_291D6C17"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_my_url0_IamRole_2A08E79F.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Api_get_my_url0_7A7AAD6C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_my_url0/Default",
+            "uniqueId": "Api_get_my_url0_7A7AAD6C"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_my_url0-c8ebe364",
+            "WING_TARGET": "tf-aws",
+            "WING_TOKEN_HTTPS_TFTOKEN_TOKEN_8_EXECUTE_API_TFTOKEN_TOKEN_0_AMAZONAWS_COM_TFTOKEN_TOKEN_9": "${jsonencode(\"https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}\")}"
+          }
+        },
+        "function_name": "get_my_url0-c8ebe364",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_my_url0_IamRole_2A08E79F.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_my_url0_S3Object_1398834C.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Api_api_permission-GET-1cdff2e7_A9CF8DD9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-1cdff2e7",
+            "uniqueId": "Api_api_permission-GET-1cdff2e7_A9CF8DD9"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_my_url0_7A7AAD6C.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/my_url",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-1cdff2e7"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Api_get_my_url0_S3Object_1398834C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_my_url0/S3Object",
+            "uniqueId": "Api_get_my_url0_S3Object_1398834C"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cycle.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cycle.test.w_test_sim.md
new file mode 100644
index 00000000000..1d76cde28be
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/cycle.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [cycle.test.w](../../../../../../examples/tests/sdk_tests/api/cycle.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ cycle.test.wsim » root/env0/test:GET --my_url
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_compile_tf-aws.md
index 6eb50047bfa..2fc97c382e3 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,103 +57,103 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/path\":{\"delete\":{\"operationId\":\"delete-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_delete_path_0_6CBBB14F.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/path\":{\"delete\":{\"operationId\":\"delete-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:delete_path0-c8bf96b7/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_delete_path_0_CloudwatchLogGroup_28D9E083": {
+      "Api_delete_path0_CloudwatchLogGroup_89857450": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/delete_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_delete_path_0_CloudwatchLogGroup_28D9E083"
+            "path": "root/Default/Default/Api/delete_path0/CloudwatchLogGroup",
+            "uniqueId": "Api_delete_path0_CloudwatchLogGroup_89857450"
           }
         },
-        "name": "/aws/lambda/delete_path_-0-c84317aa",
+        "name": "/aws/lambda/delete_path0-c8bf96b7",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_delete_path_0_IamRole_57DD3D4B": {
+      "Api_delete_path0_IamRole_00A5C11E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/delete_path_}0/IamRole",
-            "uniqueId": "cloudApi_delete_path_0_IamRole_57DD3D4B"
+            "path": "root/Default/Default/Api/delete_path0/IamRole",
+            "uniqueId": "Api_delete_path0_IamRole_00A5C11E"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_delete_path_0_IamRolePolicy_9A98C64F": {
+      "Api_delete_path0_IamRolePolicy_144236F6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/delete_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_delete_path_0_IamRolePolicy_9A98C64F"
+            "path": "root/Default/Default/Api/delete_path0/IamRolePolicy",
+            "uniqueId": "Api_delete_path0_IamRolePolicy_144236F6"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_delete_path_0_IamRole_57DD3D4B.name}"
+        "role": "${aws_iam_role.Api_delete_path0_IamRole_00A5C11E.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_delete_path_0_IamRolePolicyAttachment_8D62B363": {
+      "Api_delete_path0_IamRolePolicyAttachment_D76FD008": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/delete_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_delete_path_0_IamRolePolicyAttachment_8D62B363"
+            "path": "root/Default/Default/Api/delete_path0/IamRolePolicyAttachment",
+            "uniqueId": "Api_delete_path0_IamRolePolicyAttachment_D76FD008"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_delete_path_0_IamRole_57DD3D4B.name}"
+        "role": "${aws_iam_role.Api_delete_path0_IamRole_00A5C11E.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_delete_path_0_6CBBB14F": {
+      "Api_delete_path0_6B77C227": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/delete_path_}0/Default",
-            "uniqueId": "cloudApi_delete_path_0_6CBBB14F"
+            "path": "root/Default/Default/Api/delete_path0/Default",
+            "uniqueId": "Api_delete_path0_6B77C227"
           }
         },
         "architectures": [
@@ -148,18 +162,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "delete_path_-0-c84317aa",
+            "WING_FUNCTION_NAME": "delete_path0-c8bf96b7",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "delete_path_-0-c84317aa",
+        "function_name": "delete_path0-c8bf96b7",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_delete_path_0_IamRole_57DD3D4B.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_delete_path0_IamRole_00A5C11E.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_delete_path_0_S3Object_9EDC1684.key}",
+        "s3_key": "${aws_s3_object.Api_delete_path0_S3Object_49A7AB9C.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -168,17 +182,17 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-DELETE-e2131352_FCB789AC": {
+      "Api_api_permission-DELETE-e2131352_8848D3F7": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-DELETE-e2131352",
-            "uniqueId": "cloudApi_api_permission-DELETE-e2131352_FCB789AC"
+            "path": "root/Default/Default/Api/api/permission-DELETE-e2131352",
+            "uniqueId": "Api_api_permission-DELETE-e2131352_8848D3F7"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_delete_path_0_6CBBB14F.function_name}",
+        "function_name": "${aws_lambda_function.Api_delete_path0_6B77C227.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/DELETE/path",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/DELETE/path",
         "statement_id": "AllowExecutionFromAPIGateway-DELETE-e2131352"
       }
     },
@@ -194,11 +208,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_delete_path_0_S3Object_9EDC1684": {
+      "Api_delete_path0_S3Object_49A7AB9C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/delete_path_}0/S3Object",
-            "uniqueId": "cloudApi_delete_path_0_S3Object_9EDC1684"
+            "path": "root/Default/Default/Api/delete_path0/S3Object",
+            "uniqueId": "Api_delete_path0_S3Object_49A7AB9C"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_test_sim.md
index f98e0ca5078..9cd456c6c19 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/delete.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ delete.test.wsim » root/env0/test:http.delete and http.fetch can preform a call to an api
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/env.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/env.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..91a7ca9c92a
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/env.test.w_compile_tf-aws.md
@@ -0,0 +1,227 @@
+# [env.test.w](../../../../../../examples/tests/sdk_tests/api/env.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+      "root": {
+        "Default": {
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
+    "aws_region": {
+      "Region": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Region",
+            "uniqueId": "Region"
+          }
+        }
+      }
+    }
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    }
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
+        }
+      }
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
+          }
+        },
+        "body": "{\"paths\":{\"/path\":{\"get\":{\"operationId\":\"get-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_path0-c8789d12/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c8f613f0"
+      }
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod"
+      }
+    },
+    "aws_cloudwatch_log_group": {
+      "Api_get_path0_CloudwatchLogGroup_B7150EB5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_path0_CloudwatchLogGroup_B7150EB5"
+          }
+        },
+        "name": "/aws/lambda/get_path0-c8789d12",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Api_get_path0_IamRole_66BB88D8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/IamRole",
+            "uniqueId": "Api_get_path0_IamRole_66BB88D8"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Api_get_path0_IamRolePolicy_C87DDBC3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/IamRolePolicy",
+            "uniqueId": "Api_get_path0_IamRolePolicy_C87DDBC3"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Api_get_path0_IamRolePolicyAttachment_94BA0B78": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_path0_IamRolePolicyAttachment_94BA0B78"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Api_get_path0_CB7C4BBC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/Default",
+            "uniqueId": "Api_get_path0_CB7C4BBC"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "FOO": "bar",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_path0-c8789d12",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_path0-c8789d12",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_path0_S3Object_6334C185.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Api_api_permission-GET-e2131352_9A82BDF8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-e2131352",
+            "uniqueId": "Api_api_permission-GET-e2131352_9A82BDF8"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_path0_CB7C4BBC.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/path",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-e2131352"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Api_get_path0_S3Object_6334C185": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/S3Object",
+            "uniqueId": "Api_get_path0_S3Object_6334C185"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/env.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/env.test.w_test_sim.md
new file mode 100644
index 00000000000..8098857580a
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/env.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [env.test.w](../../../../../../examples/tests/sdk_tests/api/env.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ env.test.wsim » root/env0/test:can access env vars in handler
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_compile_tf-aws.md
index 07100e9f0ec..08960625639 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,103 +57,243 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/path\":{\"get\":{\"operationId\":\"get-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_path_0_185DD801.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/path\":{\"get\":{\"operationId\":\"get-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_path0-c8789d12/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/default-response\":{\"get\":{\"operationId\":\"get-default-response\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_default-response0-c8ce77c1/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/default-status\":{\"get\":{\"operationId\":\"get-default-status\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_default-status0-c8c4d89b/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_path_0_CloudwatchLogGroup_B9CA7CA5": {
+      "Api_get_default-response0_CloudwatchLogGroup_510DECD8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_path_0_CloudwatchLogGroup_B9CA7CA5"
+            "path": "root/Default/Default/Api/get_default-response0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_default-response0_CloudwatchLogGroup_510DECD8"
           }
         },
-        "name": "/aws/lambda/get_path_-0-c87a12e4",
+        "name": "/aws/lambda/get_default-response0-c8ce77c1",
+        "retention_in_days": 30
+      },
+      "Api_get_default-status0_CloudwatchLogGroup_E8CEA189": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-status0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_default-status0_CloudwatchLogGroup_E8CEA189"
+          }
+        },
+        "name": "/aws/lambda/get_default-status0-c8c4d89b",
+        "retention_in_days": 30
+      },
+      "Api_get_path0_CloudwatchLogGroup_B7150EB5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_path0_CloudwatchLogGroup_B7150EB5"
+          }
+        },
+        "name": "/aws/lambda/get_path0-c8789d12",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_path_0_IamRole_415454B9": {
+      "Api_get_default-response0_IamRole_A864CAEB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-response0/IamRole",
+            "uniqueId": "Api_get_default-response0_IamRole_A864CAEB"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "Api_get_default-status0_IamRole_39C8F206": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-status0/IamRole",
+            "uniqueId": "Api_get_default-status0_IamRole_39C8F206"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "Api_get_path0_IamRole_66BB88D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/IamRole",
-            "uniqueId": "cloudApi_get_path_0_IamRole_415454B9"
+            "path": "root/Default/Default/Api/get_path0/IamRole",
+            "uniqueId": "Api_get_path0_IamRole_66BB88D8"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_path_0_IamRolePolicy_CAECAB35": {
+      "Api_get_default-response0_IamRolePolicy_6787CAC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-response0/IamRolePolicy",
+            "uniqueId": "Api_get_default-response0_IamRolePolicy_6787CAC4"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Api_get_default-response0_IamRole_A864CAEB.name}"
+      },
+      "Api_get_default-status0_IamRolePolicy_7535C430": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-status0/IamRolePolicy",
+            "uniqueId": "Api_get_default-status0_IamRolePolicy_7535C430"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Api_get_default-status0_IamRole_39C8F206.name}"
+      },
+      "Api_get_path0_IamRolePolicy_C87DDBC3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_path_0_IamRolePolicy_CAECAB35"
+            "path": "root/Default/Default/Api/get_path0/IamRolePolicy",
+            "uniqueId": "Api_get_path0_IamRolePolicy_C87DDBC3"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_path_0_IamRole_415454B9.name}"
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_path_0_IamRolePolicyAttachment_D15F11D3": {
+      "Api_get_default-response0_IamRolePolicyAttachment_852746EE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_path_0_IamRolePolicyAttachment_D15F11D3"
+            "path": "root/Default/Default/Api/get_default-response0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_default-response0_IamRolePolicyAttachment_852746EE"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_path_0_IamRole_415454B9.name}"
+        "role": "${aws_iam_role.Api_get_default-response0_IamRole_A864CAEB.name}"
+      },
+      "Api_get_default-status0_IamRolePolicyAttachment_6414F6CB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-status0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_default-status0_IamRolePolicyAttachment_6414F6CB"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_default-status0_IamRole_39C8F206.name}"
+      },
+      "Api_get_path0_IamRolePolicyAttachment_94BA0B78": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_path0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_path0_IamRolePolicyAttachment_94BA0B78"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_path_0_185DD801": {
+      "Api_get_default-response0_E3CB7035": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-response0/Default",
+            "uniqueId": "Api_get_default-response0_E3CB7035"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_default-response0-c8ce77c1",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_default-response0-c8ce77c1",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_default-response0_IamRole_A864CAEB.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_default-response0_S3Object_1F3962E5.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "Api_get_default-status0_EF75A37E": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-status0/Default",
+            "uniqueId": "Api_get_default-status0_EF75A37E"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_default-status0-c8c4d89b",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_default-status0-c8c4d89b",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_default-status0_IamRole_39C8F206.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_default-status0_S3Object_300B32EC.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "Api_get_path0_CB7C4BBC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/Default",
-            "uniqueId": "cloudApi_get_path_0_185DD801"
+            "path": "root/Default/Default/Api/get_path0/Default",
+            "uniqueId": "Api_get_path0_CB7C4BBC"
           }
         },
         "architectures": [
@@ -148,18 +302,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_path_-0-c87a12e4",
+            "WING_FUNCTION_NAME": "get_path0-c8789d12",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_path_-0-c87a12e4",
+        "function_name": "get_path0-c8789d12",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_path_0_IamRole_415454B9.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_path0_IamRole_66BB88D8.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_path_0_S3Object_CCF25491.key}",
+        "s3_key": "${aws_s3_object.Api_get_path0_S3Object_6334C185.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -168,18 +322,44 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-e2131352_3FDDE199": {
+      "Api_api_permission-GET-06c7b019_02ED7C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-e2131352",
-            "uniqueId": "cloudApi_api_permission-GET-e2131352_3FDDE199"
+            "path": "root/Default/Default/Api/api/permission-GET-06c7b019",
+            "uniqueId": "Api_api_permission-GET-06c7b019_02ED7C5D"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_path_0_185DD801.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_default-status0_EF75A37E.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/path",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/default-status",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-06c7b019"
+      },
+      "Api_api_permission-GET-e2131352_9A82BDF8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-e2131352",
+            "uniqueId": "Api_api_permission-GET-e2131352_9A82BDF8"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_path0_CB7C4BBC.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/path",
         "statement_id": "AllowExecutionFromAPIGateway-GET-e2131352"
+      },
+      "Api_api_permission-GET-eb193fe3_48F25ED3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-eb193fe3",
+            "uniqueId": "Api_api_permission-GET-eb193fe3_48F25ED3"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_default-response0_E3CB7035.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/default-response",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-eb193fe3"
       }
     },
     "aws_s3_bucket": {
@@ -194,11 +374,33 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_path_0_S3Object_CCF25491": {
+      "Api_get_default-response0_S3Object_1F3962E5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-response0/S3Object",
+            "uniqueId": "Api_get_default-response0_S3Object_1F3962E5"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "Api_get_default-status0_S3Object_300B32EC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_default-status0/S3Object",
+            "uniqueId": "Api_get_default-status0_S3Object_300B32EC"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "Api_get_path0_S3Object_6334C185": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_}0/S3Object",
-            "uniqueId": "cloudApi_get_path_0_S3Object_CCF25491"
+            "path": "root/Default/Default/Api/get_path0/S3Object",
+            "uniqueId": "Api_get_path0_S3Object_6334C185"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_test_sim.md
index 7abde41bc50..6f39028d26f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/get.test.w_test_sim.md
@@ -2,10 +2,13 @@
 
 ## stdout.log
 ```log
+[INFO] http.get and http.fetch can preform a call to an api | 200 ok
+[INFO] http.get and http.fetch can preform a call to an api | 
+[INFO] http.get and http.fetch can preform a call to an api | ok
 pass ─ get.test.wsim » root/env0/test:http.get and http.fetch can preform a call to an api
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/inner_aws_api.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/inner_aws_api.test.w_test_sim.md
deleted file mode 100644
index cf178d79e45..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/inner_aws_api.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [inner_aws_api.test.w](../../../../../../examples/tests/sdk_tests/api/inner_aws_api.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ inner_aws_api.test.wsim » root/env0/test:validates the AWS api name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_compile_tf-aws.md
index 4af8a752907..408edb54d32 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,181 +57,181 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/path\":{\"options\":{\"operationId\":\"options-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_options_path_0_C625FF74.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}},\"head\":{\"operationId\":\"head-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_head_path_0_6E6840F1.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}},\"connect\":{\"operationId\":\"connect-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_connect_path_0_2469026D.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/path\":{\"options\":{\"operationId\":\"options-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:options_path0-c858e550/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}},\"head\":{\"operationId\":\"head-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:head_path0-c8127a73/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}},\"connect\":{\"operationId\":\"connect-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:connect_path0-c88ada6c/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_connect_path_0_CloudwatchLogGroup_712B8519": {
+      "Api_connect_path0_CloudwatchLogGroup_2EB34FC0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/connect_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_connect_path_0_CloudwatchLogGroup_712B8519"
+            "path": "root/Default/Default/Api/connect_path0/CloudwatchLogGroup",
+            "uniqueId": "Api_connect_path0_CloudwatchLogGroup_2EB34FC0"
           }
         },
-        "name": "/aws/lambda/connect_path_-0-c800b91d",
+        "name": "/aws/lambda/connect_path0-c88ada6c",
         "retention_in_days": 30
       },
-      "cloudApi_head_path_0_CloudwatchLogGroup_A896E845": {
+      "Api_head_path0_CloudwatchLogGroup_AE2FC969": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/head_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_head_path_0_CloudwatchLogGroup_A896E845"
+            "path": "root/Default/Default/Api/head_path0/CloudwatchLogGroup",
+            "uniqueId": "Api_head_path0_CloudwatchLogGroup_AE2FC969"
           }
         },
-        "name": "/aws/lambda/head_path_-0-c8113999",
+        "name": "/aws/lambda/head_path0-c8127a73",
         "retention_in_days": 30
       },
-      "cloudApi_options_path_0_CloudwatchLogGroup_00461C4D": {
+      "Api_options_path0_CloudwatchLogGroup_55814EB4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/options_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_options_path_0_CloudwatchLogGroup_00461C4D"
+            "path": "root/Default/Default/Api/options_path0/CloudwatchLogGroup",
+            "uniqueId": "Api_options_path0_CloudwatchLogGroup_55814EB4"
           }
         },
-        "name": "/aws/lambda/options_path_-0-c850eab5",
+        "name": "/aws/lambda/options_path0-c858e550",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_connect_path_0_IamRole_372127E9": {
+      "Api_connect_path0_IamRole_879E3AD0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/connect_path_}0/IamRole",
-            "uniqueId": "cloudApi_connect_path_0_IamRole_372127E9"
+            "path": "root/Default/Default/Api/connect_path0/IamRole",
+            "uniqueId": "Api_connect_path0_IamRole_879E3AD0"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudApi_head_path_0_IamRole_C6940D62": {
+      "Api_head_path0_IamRole_8A76125C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/head_path_}0/IamRole",
-            "uniqueId": "cloudApi_head_path_0_IamRole_C6940D62"
+            "path": "root/Default/Default/Api/head_path0/IamRole",
+            "uniqueId": "Api_head_path0_IamRole_8A76125C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudApi_options_path_0_IamRole_C94B1F2A": {
+      "Api_options_path0_IamRole_993D1A6D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/options_path_}0/IamRole",
-            "uniqueId": "cloudApi_options_path_0_IamRole_C94B1F2A"
+            "path": "root/Default/Default/Api/options_path0/IamRole",
+            "uniqueId": "Api_options_path0_IamRole_993D1A6D"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_connect_path_0_IamRolePolicy_804BCE21": {
+      "Api_connect_path0_IamRolePolicy_8F2AA257": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/connect_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_connect_path_0_IamRolePolicy_804BCE21"
+            "path": "root/Default/Default/Api/connect_path0/IamRolePolicy",
+            "uniqueId": "Api_connect_path0_IamRolePolicy_8F2AA257"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_connect_path_0_IamRole_372127E9.name}"
+        "role": "${aws_iam_role.Api_connect_path0_IamRole_879E3AD0.name}"
       },
-      "cloudApi_head_path_0_IamRolePolicy_30E288BA": {
+      "Api_head_path0_IamRolePolicy_C0B77C9E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/head_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_head_path_0_IamRolePolicy_30E288BA"
+            "path": "root/Default/Default/Api/head_path0/IamRolePolicy",
+            "uniqueId": "Api_head_path0_IamRolePolicy_C0B77C9E"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_head_path_0_IamRole_C6940D62.name}"
+        "role": "${aws_iam_role.Api_head_path0_IamRole_8A76125C.name}"
       },
-      "cloudApi_options_path_0_IamRolePolicy_53595878": {
+      "Api_options_path0_IamRolePolicy_6105672A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/options_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_options_path_0_IamRolePolicy_53595878"
+            "path": "root/Default/Default/Api/options_path0/IamRolePolicy",
+            "uniqueId": "Api_options_path0_IamRolePolicy_6105672A"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_options_path_0_IamRole_C94B1F2A.name}"
+        "role": "${aws_iam_role.Api_options_path0_IamRole_993D1A6D.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_connect_path_0_IamRolePolicyAttachment_B40F8B82": {
+      "Api_connect_path0_IamRolePolicyAttachment_0EA53E52": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/connect_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_connect_path_0_IamRolePolicyAttachment_B40F8B82"
+            "path": "root/Default/Default/Api/connect_path0/IamRolePolicyAttachment",
+            "uniqueId": "Api_connect_path0_IamRolePolicyAttachment_0EA53E52"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_connect_path_0_IamRole_372127E9.name}"
+        "role": "${aws_iam_role.Api_connect_path0_IamRole_879E3AD0.name}"
       },
-      "cloudApi_head_path_0_IamRolePolicyAttachment_B2A58D32": {
+      "Api_head_path0_IamRolePolicyAttachment_D8123259": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/head_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_head_path_0_IamRolePolicyAttachment_B2A58D32"
+            "path": "root/Default/Default/Api/head_path0/IamRolePolicyAttachment",
+            "uniqueId": "Api_head_path0_IamRolePolicyAttachment_D8123259"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_head_path_0_IamRole_C6940D62.name}"
+        "role": "${aws_iam_role.Api_head_path0_IamRole_8A76125C.name}"
       },
-      "cloudApi_options_path_0_IamRolePolicyAttachment_F4B07B89": {
+      "Api_options_path0_IamRolePolicyAttachment_6CDDBCBD": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/options_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_options_path_0_IamRolePolicyAttachment_F4B07B89"
+            "path": "root/Default/Default/Api/options_path0/IamRolePolicyAttachment",
+            "uniqueId": "Api_options_path0_IamRolePolicyAttachment_6CDDBCBD"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_options_path_0_IamRole_C94B1F2A.name}"
+        "role": "${aws_iam_role.Api_options_path0_IamRole_993D1A6D.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_connect_path_0_2469026D": {
+      "Api_connect_path0_9A10CD07": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/connect_path_}0/Default",
-            "uniqueId": "cloudApi_connect_path_0_2469026D"
+            "path": "root/Default/Default/Api/connect_path0/Default",
+            "uniqueId": "Api_connect_path0_9A10CD07"
           }
         },
         "architectures": [
@@ -226,29 +240,29 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "connect_path_-0-c800b91d",
+            "WING_FUNCTION_NAME": "connect_path0-c88ada6c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "connect_path_-0-c800b91d",
+        "function_name": "connect_path0-c88ada6c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_connect_path_0_IamRole_372127E9.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_connect_path0_IamRole_879E3AD0.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_connect_path_0_S3Object_31BCDE9B.key}",
+        "s3_key": "${aws_s3_object.Api_connect_path0_S3Object_F19FB71A.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudApi_head_path_0_6E6840F1": {
+      "Api_head_path0_CD0BF570": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/head_path_}0/Default",
-            "uniqueId": "cloudApi_head_path_0_6E6840F1"
+            "path": "root/Default/Default/Api/head_path0/Default",
+            "uniqueId": "Api_head_path0_CD0BF570"
           }
         },
         "architectures": [
@@ -257,29 +271,29 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "head_path_-0-c8113999",
+            "WING_FUNCTION_NAME": "head_path0-c8127a73",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "head_path_-0-c8113999",
+        "function_name": "head_path0-c8127a73",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_head_path_0_IamRole_C6940D62.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_head_path0_IamRole_8A76125C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_head_path_0_S3Object_3B3422F6.key}",
+        "s3_key": "${aws_s3_object.Api_head_path0_S3Object_AFB8E06A.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudApi_options_path_0_C625FF74": {
+      "Api_options_path0_AA6A3AAD": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/options_path_}0/Default",
-            "uniqueId": "cloudApi_options_path_0_C625FF74"
+            "path": "root/Default/Default/Api/options_path0/Default",
+            "uniqueId": "Api_options_path0_AA6A3AAD"
           }
         },
         "architectures": [
@@ -288,18 +302,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "options_path_-0-c850eab5",
+            "WING_FUNCTION_NAME": "options_path0-c858e550",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "options_path_-0-c850eab5",
+        "function_name": "options_path0-c858e550",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_options_path_0_IamRole_C94B1F2A.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_options_path0_IamRole_993D1A6D.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_options_path_0_S3Object_A0FC37D3.key}",
+        "s3_key": "${aws_s3_object.Api_options_path0_S3Object_F1D01B85.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -308,43 +322,43 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-CONNECT-e2131352_C00751A2": {
+      "Api_api_permission-CONNECT-e2131352_6940B960": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-CONNECT-e2131352",
-            "uniqueId": "cloudApi_api_permission-CONNECT-e2131352_C00751A2"
+            "path": "root/Default/Default/Api/api/permission-CONNECT-e2131352",
+            "uniqueId": "Api_api_permission-CONNECT-e2131352_6940B960"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_connect_path_0_2469026D.function_name}",
+        "function_name": "${aws_lambda_function.Api_connect_path0_9A10CD07.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/CONNECT/path",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/CONNECT/path",
         "statement_id": "AllowExecutionFromAPIGateway-CONNECT-e2131352"
       },
-      "cloudApi_api_permission-HEAD-e2131352_C80E1586": {
+      "Api_api_permission-HEAD-e2131352_8155B558": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-HEAD-e2131352",
-            "uniqueId": "cloudApi_api_permission-HEAD-e2131352_C80E1586"
+            "path": "root/Default/Default/Api/api/permission-HEAD-e2131352",
+            "uniqueId": "Api_api_permission-HEAD-e2131352_8155B558"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_head_path_0_6E6840F1.function_name}",
+        "function_name": "${aws_lambda_function.Api_head_path0_CD0BF570.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/HEAD/path",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/HEAD/path",
         "statement_id": "AllowExecutionFromAPIGateway-HEAD-e2131352"
       },
-      "cloudApi_api_permission-OPTIONS-e2131352_70546290": {
+      "Api_api_permission-OPTIONS-e2131352_EDD2B8E4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-OPTIONS-e2131352",
-            "uniqueId": "cloudApi_api_permission-OPTIONS-e2131352_70546290"
+            "path": "root/Default/Default/Api/api/permission-OPTIONS-e2131352",
+            "uniqueId": "Api_api_permission-OPTIONS-e2131352_EDD2B8E4"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_options_path_0_C625FF74.function_name}",
+        "function_name": "${aws_lambda_function.Api_options_path0_AA6A3AAD.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/OPTIONS/path",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/OPTIONS/path",
         "statement_id": "AllowExecutionFromAPIGateway-OPTIONS-e2131352"
       }
     },
@@ -360,33 +374,33 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_connect_path_0_S3Object_31BCDE9B": {
+      "Api_connect_path0_S3Object_F19FB71A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/connect_path_}0/S3Object",
-            "uniqueId": "cloudApi_connect_path_0_S3Object_31BCDE9B"
+            "path": "root/Default/Default/Api/connect_path0/S3Object",
+            "uniqueId": "Api_connect_path0_S3Object_F19FB71A"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudApi_head_path_0_S3Object_3B3422F6": {
+      "Api_head_path0_S3Object_AFB8E06A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/head_path_}0/S3Object",
-            "uniqueId": "cloudApi_head_path_0_S3Object_3B3422F6"
+            "path": "root/Default/Default/Api/head_path0/S3Object",
+            "uniqueId": "Api_head_path0_S3Object_AFB8E06A"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudApi_options_path_0_S3Object_A0FC37D3": {
+      "Api_options_path0_S3Object_F1D01B85": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/options_path_}0/S3Object",
-            "uniqueId": "cloudApi_options_path_0_S3Object_A0FC37D3"
+            "path": "root/Default/Default/Api/options_path0/S3Object",
+            "uniqueId": "Api_options_path0_S3Object_F1D01B85"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_test_sim.md
index 745d9f7b4e4..ec3e7ff1394 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/options.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ options.test.wsim » root/env0/test:http.fetch can preform a call to an api to CONNECT, HEAD and OPTIONS
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_compile_tf-aws.md
index 28da74e072b..b52acfc51d1 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,103 +57,103 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/path/{id}\":{\"patch\":{\"operationId\":\"patch-path/:id\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"id\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_patch_path_id_0_309E7B7B.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/path/{id}\":{\"patch\":{\"operationId\":\"patch-path/:id\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"id\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:patch_path_-id0-c8d36c2c/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_patch_path_id_0_CloudwatchLogGroup_F8F327BB": {
+      "Api_patch_path_id0_CloudwatchLogGroup_07EB869E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/patch_path_:id_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_patch_path_id_0_CloudwatchLogGroup_F8F327BB"
+            "path": "root/Default/Default/Api/patch_path_:id0/CloudwatchLogGroup",
+            "uniqueId": "Api_patch_path_id0_CloudwatchLogGroup_07EB869E"
           }
         },
-        "name": "/aws/lambda/patch_path_-id_-0-c8e446a7",
+        "name": "/aws/lambda/patch_path_-id0-c8d36c2c",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_patch_path_id_0_IamRole_FFF5C122": {
+      "Api_patch_path_id0_IamRole_E174D2FC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/patch_path_:id_}0/IamRole",
-            "uniqueId": "cloudApi_patch_path_id_0_IamRole_FFF5C122"
+            "path": "root/Default/Default/Api/patch_path_:id0/IamRole",
+            "uniqueId": "Api_patch_path_id0_IamRole_E174D2FC"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_patch_path_id_0_IamRolePolicy_0399BFDA": {
+      "Api_patch_path_id0_IamRolePolicy_A5123AA6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/patch_path_:id_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_patch_path_id_0_IamRolePolicy_0399BFDA"
+            "path": "root/Default/Default/Api/patch_path_:id0/IamRolePolicy",
+            "uniqueId": "Api_patch_path_id0_IamRolePolicy_A5123AA6"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_patch_path_id_0_IamRole_FFF5C122.name}"
+        "role": "${aws_iam_role.Api_patch_path_id0_IamRole_E174D2FC.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_patch_path_id_0_IamRolePolicyAttachment_C5A7298E": {
+      "Api_patch_path_id0_IamRolePolicyAttachment_504F3B24": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/patch_path_:id_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_patch_path_id_0_IamRolePolicyAttachment_C5A7298E"
+            "path": "root/Default/Default/Api/patch_path_:id0/IamRolePolicyAttachment",
+            "uniqueId": "Api_patch_path_id0_IamRolePolicyAttachment_504F3B24"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_patch_path_id_0_IamRole_FFF5C122.name}"
+        "role": "${aws_iam_role.Api_patch_path_id0_IamRole_E174D2FC.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_patch_path_id_0_309E7B7B": {
+      "Api_patch_path_id0_2ECCFD42": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/patch_path_:id_}0/Default",
-            "uniqueId": "cloudApi_patch_path_id_0_309E7B7B"
+            "path": "root/Default/Default/Api/patch_path_:id0/Default",
+            "uniqueId": "Api_patch_path_id0_2ECCFD42"
           }
         },
         "architectures": [
@@ -148,18 +162,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "patch_path_-id_-0-c8e446a7",
+            "WING_FUNCTION_NAME": "patch_path_-id0-c8d36c2c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "patch_path_-id_-0-c8e446a7",
+        "function_name": "patch_path_-id0-c8d36c2c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_patch_path_id_0_IamRole_FFF5C122.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_patch_path_id0_IamRole_E174D2FC.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_patch_path_id_0_S3Object_4462299F.key}",
+        "s3_key": "${aws_s3_object.Api_patch_path_id0_S3Object_14F8B22B.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -168,17 +182,17 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-PATCH-b2e416be_7FF52903": {
+      "Api_api_permission-PATCH-b2e416be_999AAB0F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-PATCH-b2e416be",
-            "uniqueId": "cloudApi_api_permission-PATCH-b2e416be_7FF52903"
+            "path": "root/Default/Default/Api/api/permission-PATCH-b2e416be",
+            "uniqueId": "Api_api_permission-PATCH-b2e416be_999AAB0F"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_patch_path_id_0_309E7B7B.function_name}",
+        "function_name": "${aws_lambda_function.Api_patch_path_id0_2ECCFD42.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/PATCH/path/{id}",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/PATCH/path/{id}",
         "statement_id": "AllowExecutionFromAPIGateway-PATCH-b2e416be"
       }
     },
@@ -194,11 +208,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_patch_path_id_0_S3Object_4462299F": {
+      "Api_patch_path_id0_S3Object_14F8B22B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/patch_path_:id_}0/S3Object",
-            "uniqueId": "cloudApi_patch_path_id_0_S3Object_4462299F"
+            "path": "root/Default/Default/Api/patch_path_:id0/S3Object",
+            "uniqueId": "Api_patch_path_id0_S3Object_14F8B22B"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_test_sim.md
index 800f2e12241..a16d6faf817 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/patch.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ patch.test.wsim » root/env0/test:http.patch and http.fetch can preform a call to an api
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_compile_tf-aws.md
index cb728cc396a..126cf33b243 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,142 +57,142 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/users/{name}\":{\"get\":{\"operationId\":\"get-users/:name\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_users_name_0_20FCFE31.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/path/{name}\":{\"get\":{\"operationId\":\"get-path/:name\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_users_name_0_20FCFE31.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/users/permission/{name}\":{\"get\":{\"operationId\":\"get-users/permission/:name\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_users_name_0_20FCFE31.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/path/{name}/{age}\":{\"get\":{\"operationId\":\"get-path/:name/:age\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"age\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_path_name_age_0_65BF533A.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/users/{name}\":{\"get\":{\"operationId\":\"get-users/:name\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_users_-name0-c8831d94/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/path/{name}\":{\"get\":{\"operationId\":\"get-path/:name\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_users_-name0-c8831d94/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/users/permission/{name}\":{\"get\":{\"operationId\":\"get-users/permission/:name\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_users_-name0-c8831d94/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/path/{name}/{age}\":{\"get\":{\"operationId\":\"get-path/:name/:age\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"name\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"age\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_path_-name_-age0-c8e1843f/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_path_name_age_0_CloudwatchLogGroup_13A3BAE4": {
+      "Api_get_path_name_age0_CloudwatchLogGroup_4046BC2E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_:name_:age_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_path_name_age_0_CloudwatchLogGroup_13A3BAE4"
+            "path": "root/Default/Default/Api/get_path_:name_:age0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_path_name_age0_CloudwatchLogGroup_4046BC2E"
           }
         },
-        "name": "/aws/lambda/get_path_-name_-age_-0-c80a5333",
+        "name": "/aws/lambda/get_path_-name_-age0-c8e1843f",
         "retention_in_days": 30
       },
-      "cloudApi_get_users_name_0_CloudwatchLogGroup_6D58B237": {
+      "Api_get_users_name0_CloudwatchLogGroup_32124378": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_:name_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_users_name_0_CloudwatchLogGroup_6D58B237"
+            "path": "root/Default/Default/Api/get_users_:name0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_users_name0_CloudwatchLogGroup_32124378"
           }
         },
-        "name": "/aws/lambda/get_users_-name_-0-c8bea0a1",
+        "name": "/aws/lambda/get_users_-name0-c8831d94",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_path_name_age_0_IamRole_B346AB90": {
+      "Api_get_path_name_age0_IamRole_02E21B80": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_:name_:age_}0/IamRole",
-            "uniqueId": "cloudApi_get_path_name_age_0_IamRole_B346AB90"
+            "path": "root/Default/Default/Api/get_path_:name_:age0/IamRole",
+            "uniqueId": "Api_get_path_name_age0_IamRole_02E21B80"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudApi_get_users_name_0_IamRole_595620B4": {
+      "Api_get_users_name0_IamRole_B9DD1767": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_:name_}0/IamRole",
-            "uniqueId": "cloudApi_get_users_name_0_IamRole_595620B4"
+            "path": "root/Default/Default/Api/get_users_:name0/IamRole",
+            "uniqueId": "Api_get_users_name0_IamRole_B9DD1767"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_path_name_age_0_IamRolePolicy_413CFA9D": {
+      "Api_get_path_name_age0_IamRolePolicy_B3AA7950": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_:name_:age_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_path_name_age_0_IamRolePolicy_413CFA9D"
+            "path": "root/Default/Default/Api/get_path_:name_:age0/IamRolePolicy",
+            "uniqueId": "Api_get_path_name_age0_IamRolePolicy_B3AA7950"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_path_name_age_0_IamRole_B346AB90.name}"
+        "role": "${aws_iam_role.Api_get_path_name_age0_IamRole_02E21B80.name}"
       },
-      "cloudApi_get_users_name_0_IamRolePolicy_86600901": {
+      "Api_get_users_name0_IamRolePolicy_F101FDF4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_:name_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_users_name_0_IamRolePolicy_86600901"
+            "path": "root/Default/Default/Api/get_users_:name0/IamRolePolicy",
+            "uniqueId": "Api_get_users_name0_IamRolePolicy_F101FDF4"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_users_name_0_IamRole_595620B4.name}"
+        "role": "${aws_iam_role.Api_get_users_name0_IamRole_B9DD1767.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_path_name_age_0_IamRolePolicyAttachment_AC1D94FC": {
+      "Api_get_path_name_age0_IamRolePolicyAttachment_50B2C16D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_:name_:age_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_path_name_age_0_IamRolePolicyAttachment_AC1D94FC"
+            "path": "root/Default/Default/Api/get_path_:name_:age0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_path_name_age0_IamRolePolicyAttachment_50B2C16D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_path_name_age_0_IamRole_B346AB90.name}"
+        "role": "${aws_iam_role.Api_get_path_name_age0_IamRole_02E21B80.name}"
       },
-      "cloudApi_get_users_name_0_IamRolePolicyAttachment_0A04DDBA": {
+      "Api_get_users_name0_IamRolePolicyAttachment_4B78F6FC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_:name_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_users_name_0_IamRolePolicyAttachment_0A04DDBA"
+            "path": "root/Default/Default/Api/get_users_:name0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_users_name0_IamRolePolicyAttachment_4B78F6FC"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_users_name_0_IamRole_595620B4.name}"
+        "role": "${aws_iam_role.Api_get_users_name0_IamRole_B9DD1767.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_path_name_age_0_65BF533A": {
+      "Api_get_path_name_age0_ECE6563E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_:name_:age_}0/Default",
-            "uniqueId": "cloudApi_get_path_name_age_0_65BF533A"
+            "path": "root/Default/Default/Api/get_path_:name_:age0/Default",
+            "uniqueId": "Api_get_path_name_age0_ECE6563E"
           }
         },
         "architectures": [
@@ -187,29 +201,29 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_path_-name_-age_-0-c80a5333",
+            "WING_FUNCTION_NAME": "get_path_-name_-age0-c8e1843f",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_path_-name_-age_-0-c80a5333",
+        "function_name": "get_path_-name_-age0-c8e1843f",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_path_name_age_0_IamRole_B346AB90.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_path_name_age0_IamRole_02E21B80.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_path_name_age_0_S3Object_44C9D5F4.key}",
+        "s3_key": "${aws_s3_object.Api_get_path_name_age0_S3Object_34F30D83.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudApi_get_users_name_0_20FCFE31": {
+      "Api_get_users_name0_81456D48": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_:name_}0/Default",
-            "uniqueId": "cloudApi_get_users_name_0_20FCFE31"
+            "path": "root/Default/Default/Api/get_users_:name0/Default",
+            "uniqueId": "Api_get_users_name0_81456D48"
           }
         },
         "architectures": [
@@ -218,18 +232,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_users_-name_-0-c8bea0a1",
+            "WING_FUNCTION_NAME": "get_users_-name0-c8831d94",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_users_-name_-0-c8bea0a1",
+        "function_name": "get_users_-name0-c8831d94",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_users_name_0_IamRole_595620B4.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_users_name0_IamRole_B9DD1767.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_users_name_0_S3Object_447D8506.key}",
+        "s3_key": "${aws_s3_object.Api_get_users_name0_S3Object_02C47532.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -238,56 +252,56 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-26eaaef3_CF20170D": {
+      "Api_api_permission-GET-26eaaef3_2017F9D3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-26eaaef3",
-            "uniqueId": "cloudApi_api_permission-GET-26eaaef3_CF20170D"
+            "path": "root/Default/Default/Api/api/permission-GET-26eaaef3",
+            "uniqueId": "Api_api_permission-GET-26eaaef3_2017F9D3"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_users_name_0_20FCFE31.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_users_name0_81456D48.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/users/permission/{name}",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/users/permission/{name}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-26eaaef3"
       },
-      "cloudApi_api_permission-GET-35cb425d_1F0EB84A": {
+      "Api_api_permission-GET-35cb425d_CE77814E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-35cb425d",
-            "uniqueId": "cloudApi_api_permission-GET-35cb425d_1F0EB84A"
+            "path": "root/Default/Default/Api/api/permission-GET-35cb425d",
+            "uniqueId": "Api_api_permission-GET-35cb425d_CE77814E"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_users_name_0_20FCFE31.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_users_name0_81456D48.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/users/{name}",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/users/{name}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-35cb425d"
       },
-      "cloudApi_api_permission-GET-e8bcf98a_080C36F9": {
+      "Api_api_permission-GET-e8bcf98a_26C304C4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-e8bcf98a",
-            "uniqueId": "cloudApi_api_permission-GET-e8bcf98a_080C36F9"
+            "path": "root/Default/Default/Api/api/permission-GET-e8bcf98a",
+            "uniqueId": "Api_api_permission-GET-e8bcf98a_26C304C4"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_path_name_age_0_65BF533A.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_path_name_age0_ECE6563E.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/path/{name}/{age}",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/path/{name}/{age}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-e8bcf98a"
       },
-      "cloudApi_api_permission-GET-e93953c8_FF4AD35C": {
+      "Api_api_permission-GET-e93953c8_90524D52": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-e93953c8",
-            "uniqueId": "cloudApi_api_permission-GET-e93953c8_FF4AD35C"
+            "path": "root/Default/Default/Api/api/permission-GET-e93953c8",
+            "uniqueId": "Api_api_permission-GET-e93953c8_90524D52"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_users_name_0_20FCFE31.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_users_name0_81456D48.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/path/{name}",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/path/{name}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-e93953c8"
       }
     },
@@ -303,22 +317,22 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_path_name_age_0_S3Object_44C9D5F4": {
+      "Api_get_path_name_age0_S3Object_34F30D83": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_path_:name_:age_}0/S3Object",
-            "uniqueId": "cloudApi_get_path_name_age_0_S3Object_44C9D5F4"
+            "path": "root/Default/Default/Api/get_path_:name_:age0/S3Object",
+            "uniqueId": "Api_get_path_name_age0_S3Object_34F30D83"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudApi_get_users_name_0_S3Object_447D8506": {
+      "Api_get_users_name0_S3Object_02C47532": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_:name_}0/S3Object",
-            "uniqueId": "cloudApi_get_users_name_0_S3Object_447D8506"
+            "path": "root/Default/Default/Api/get_users_:name0/S3Object",
+            "uniqueId": "Api_get_users_name0_S3Object_02C47532"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_test_sim.md
index b6bdec31c04..dea00da1a3e 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/path_vars.test.w_test_sim.md
@@ -2,13 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ path_vars.test.wsim » root/env0/test:test 
-pass ─ path_vars.test.wsim » root/env1/test:test2
-pass ─ path_vars.test.wsim » root/env2/test:test3
-pass ─ path_vars.test.wsim » root/env3/test:test4
- 
- 
-Tests 4 passed (4)
+pass ─ path_vars.test.wsim » root/env0/test:path vars are valid
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_compile_tf-aws.md
index 3d2eba86d9c..ccfc1c80390 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,103 +57,103 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/path\":{\"post\":{\"operationId\":\"post-path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_post_path_0_E27483C8.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/\":{\"post\":{\"operationId\":\"post\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:post_0-c8d25f85/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_post_path_0_CloudwatchLogGroup_0663C103": {
+      "Api_post_0_CloudwatchLogGroup_2657635B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_post_path_0_CloudwatchLogGroup_0663C103"
+            "path": "root/Default/Default/Api/post_0/CloudwatchLogGroup",
+            "uniqueId": "Api_post_0_CloudwatchLogGroup_2657635B"
           }
         },
-        "name": "/aws/lambda/post_path_-0-c85e18f0",
+        "name": "/aws/lambda/post_0-c8d25f85",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_post_path_0_IamRole_9AE38C26": {
+      "Api_post_0_IamRole_5AF65E98": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_path_}0/IamRole",
-            "uniqueId": "cloudApi_post_path_0_IamRole_9AE38C26"
+            "path": "root/Default/Default/Api/post_0/IamRole",
+            "uniqueId": "Api_post_0_IamRole_5AF65E98"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_post_path_0_IamRolePolicy_06114269": {
+      "Api_post_0_IamRolePolicy_DB973D78": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_post_path_0_IamRolePolicy_06114269"
+            "path": "root/Default/Default/Api/post_0/IamRolePolicy",
+            "uniqueId": "Api_post_0_IamRolePolicy_DB973D78"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_post_path_0_IamRole_9AE38C26.name}"
+        "role": "${aws_iam_role.Api_post_0_IamRole_5AF65E98.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_post_path_0_IamRolePolicyAttachment_DC454716": {
+      "Api_post_0_IamRolePolicyAttachment_ABFC7DE6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_post_path_0_IamRolePolicyAttachment_DC454716"
+            "path": "root/Default/Default/Api/post_0/IamRolePolicyAttachment",
+            "uniqueId": "Api_post_0_IamRolePolicyAttachment_ABFC7DE6"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_post_path_0_IamRole_9AE38C26.name}"
+        "role": "${aws_iam_role.Api_post_0_IamRole_5AF65E98.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_post_path_0_E27483C8": {
+      "Api_post_0_211FC41C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_path_}0/Default",
-            "uniqueId": "cloudApi_post_path_0_E27483C8"
+            "path": "root/Default/Default/Api/post_0/Default",
+            "uniqueId": "Api_post_0_211FC41C"
           }
         },
         "architectures": [
@@ -148,18 +162,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "post_path_-0-c85e18f0",
+            "WING_FUNCTION_NAME": "post_0-c8d25f85",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "post_path_-0-c85e18f0",
+        "function_name": "post_0-c8d25f85",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_post_path_0_IamRole_9AE38C26.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_post_0_IamRole_5AF65E98.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_post_path_0_S3Object_47AD15D0.key}",
+        "s3_key": "${aws_s3_object.Api_post_0_S3Object_F8F9D391.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -168,18 +182,18 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-POST-e2131352_099525EE": {
+      "Api_api_permission-POST-c2e3ffa8_4BF1BB79": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-POST-e2131352",
-            "uniqueId": "cloudApi_api_permission-POST-e2131352_099525EE"
+            "path": "root/Default/Default/Api/api/permission-POST-c2e3ffa8",
+            "uniqueId": "Api_api_permission-POST-c2e3ffa8_4BF1BB79"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_post_path_0_E27483C8.function_name}",
+        "function_name": "${aws_lambda_function.Api_post_0_211FC41C.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/POST/path",
-        "statement_id": "AllowExecutionFromAPIGateway-POST-e2131352"
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/POST/",
+        "statement_id": "AllowExecutionFromAPIGateway-POST-c2e3ffa8"
       }
     },
     "aws_s3_bucket": {
@@ -194,11 +208,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_post_path_0_S3Object_47AD15D0": {
+      "Api_post_0_S3Object_F8F9D391": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_path_}0/S3Object",
-            "uniqueId": "cloudApi_post_path_0_S3Object_47AD15D0"
+            "path": "root/Default/Default/Api/post_0/S3Object",
+            "uniqueId": "Api_post_0_S3Object_F8F9D391"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_test_sim.md
index 441e9c588e6..8aa8d6a84b8 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/post.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ post.test.wsim » root/env0/test:http.post and http.fetch can preform a call to an api
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_compile_tf-aws.md
index 38088616960..eb8365bb636 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,103 +57,103 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/path/{id}/nn/{user}\":{\"put\":{\"operationId\":\"put-path/:id/nn/:user\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"id\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"user\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_put_path_id_nn_user_0_7D521134.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/path/{id}/nn/{user}\":{\"put\":{\"operationId\":\"put-path/:id/nn/:user\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"id\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"user\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:put_path_-id_nn_-user0-c8982eb3/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_put_path_id_nn_user_0_CloudwatchLogGroup_29B16C30": {
+      "Api_put_path_id_nn_user0_CloudwatchLogGroup_6FDE8C46": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/put_path_:id_nn_:user_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_put_path_id_nn_user_0_CloudwatchLogGroup_29B16C30"
+            "path": "root/Default/Default/Api/put_path_:id_nn_:user0/CloudwatchLogGroup",
+            "uniqueId": "Api_put_path_id_nn_user0_CloudwatchLogGroup_6FDE8C46"
           }
         },
-        "name": "/aws/lambda/put_path_-id_nn_-user_-0-c83af0b0",
+        "name": "/aws/lambda/put_path_-id_nn_-user0-c8982eb3",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_put_path_id_nn_user_0_IamRole_EE0ADE87": {
+      "Api_put_path_id_nn_user0_IamRole_1C9DE02F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/put_path_:id_nn_:user_}0/IamRole",
-            "uniqueId": "cloudApi_put_path_id_nn_user_0_IamRole_EE0ADE87"
+            "path": "root/Default/Default/Api/put_path_:id_nn_:user0/IamRole",
+            "uniqueId": "Api_put_path_id_nn_user0_IamRole_1C9DE02F"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_put_path_id_nn_user_0_IamRolePolicy_0A46A400": {
+      "Api_put_path_id_nn_user0_IamRolePolicy_0EB967A3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/put_path_:id_nn_:user_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_put_path_id_nn_user_0_IamRolePolicy_0A46A400"
+            "path": "root/Default/Default/Api/put_path_:id_nn_:user0/IamRolePolicy",
+            "uniqueId": "Api_put_path_id_nn_user0_IamRolePolicy_0EB967A3"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_put_path_id_nn_user_0_IamRole_EE0ADE87.name}"
+        "role": "${aws_iam_role.Api_put_path_id_nn_user0_IamRole_1C9DE02F.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_put_path_id_nn_user_0_IamRolePolicyAttachment_2BD6631A": {
+      "Api_put_path_id_nn_user0_IamRolePolicyAttachment_045FFFB7": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/put_path_:id_nn_:user_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_put_path_id_nn_user_0_IamRolePolicyAttachment_2BD6631A"
+            "path": "root/Default/Default/Api/put_path_:id_nn_:user0/IamRolePolicyAttachment",
+            "uniqueId": "Api_put_path_id_nn_user0_IamRolePolicyAttachment_045FFFB7"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_put_path_id_nn_user_0_IamRole_EE0ADE87.name}"
+        "role": "${aws_iam_role.Api_put_path_id_nn_user0_IamRole_1C9DE02F.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_put_path_id_nn_user_0_7D521134": {
+      "Api_put_path_id_nn_user0_A9826CF0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/put_path_:id_nn_:user_}0/Default",
-            "uniqueId": "cloudApi_put_path_id_nn_user_0_7D521134"
+            "path": "root/Default/Default/Api/put_path_:id_nn_:user0/Default",
+            "uniqueId": "Api_put_path_id_nn_user0_A9826CF0"
           }
         },
         "architectures": [
@@ -148,18 +162,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "put_path_-id_nn_-user_-0-c83af0b0",
+            "WING_FUNCTION_NAME": "put_path_-id_nn_-user0-c8982eb3",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "put_path_-id_nn_-user_-0-c83af0b0",
+        "function_name": "put_path_-id_nn_-user0-c8982eb3",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_put_path_id_nn_user_0_IamRole_EE0ADE87.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_put_path_id_nn_user0_IamRole_1C9DE02F.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_put_path_id_nn_user_0_S3Object_AD9086D4.key}",
+        "s3_key": "${aws_s3_object.Api_put_path_id_nn_user0_S3Object_5E224671.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -168,17 +182,17 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-PUT-526849ff_B95D45FA": {
+      "Api_api_permission-PUT-526849ff_9087005A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-PUT-526849ff",
-            "uniqueId": "cloudApi_api_permission-PUT-526849ff_B95D45FA"
+            "path": "root/Default/Default/Api/api/permission-PUT-526849ff",
+            "uniqueId": "Api_api_permission-PUT-526849ff_9087005A"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_put_path_id_nn_user_0_7D521134.function_name}",
+        "function_name": "${aws_lambda_function.Api_put_path_id_nn_user0_A9826CF0.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/PUT/path/{id}/nn/{user}",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/PUT/path/{id}/nn/{user}",
         "statement_id": "AllowExecutionFromAPIGateway-PUT-526849ff"
       }
     },
@@ -194,11 +208,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_put_path_id_nn_user_0_S3Object_AD9086D4": {
+      "Api_put_path_id_nn_user0_S3Object_5E224671": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/put_path_:id_nn_:user_}0/S3Object",
-            "uniqueId": "cloudApi_put_path_id_nn_user_0_S3Object_AD9086D4"
+            "path": "root/Default/Default/Api/put_path_:id_nn_:user0/S3Object",
+            "uniqueId": "Api_put_path_id_nn_user0_S3Object_5E224671"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_test_sim.md
index ebd3bdc52e7..2fdc87a96c8 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/put.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ put.test.wsim » root/env0/test:http.put and http.fetch can preform a call to an api
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/root_path_vars.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/root_path_vars.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..a8795f148a8
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/root_path_vars.test.w_compile_tf-aws.md
@@ -0,0 +1,265 @@
+# [root_path_vars.test.w](../../../../../../examples/tests/sdk_tests/api/root_path_vars.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+      "root": {
+        "Default": {
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
+    "aws_region": {
+      "Region": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Region",
+            "uniqueId": "Region"
+          }
+        }
+      }
+    }
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    }
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
+        }
+      }
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
+          }
+        },
+        "body": "{\"paths\":{\"/{id}\":{\"get\":{\"operationId\":\"get-:id\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"id\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_-id0-c8c761b0/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{id}/comments\":{\"get\":{\"operationId\":\"get-:id/comments\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"id\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_-id0-c8c761b0/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{id}/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c8f613f0"
+      }
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod"
+      }
+    },
+    "aws_cloudwatch_log_group": {
+      "Api_get_id0_CloudwatchLogGroup_3D15D155": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_:id0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_id0_CloudwatchLogGroup_3D15D155"
+          }
+        },
+        "name": "/aws/lambda/get_-id0-c8c761b0",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Api_get_id0_IamRole_74C8077C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_:id0/IamRole",
+            "uniqueId": "Api_get_id0_IamRole_74C8077C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Api_get_id0_IamRolePolicy_7D71CFCB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_:id0/IamRolePolicy",
+            "uniqueId": "Api_get_id0_IamRolePolicy_7D71CFCB"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Api_get_id0_IamRole_74C8077C.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Api_get_id0_IamRolePolicyAttachment_7C1C1CAD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_:id0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_id0_IamRolePolicyAttachment_7C1C1CAD"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_id0_IamRole_74C8077C.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Api_get_id0_A3510FB1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_:id0/Default",
+            "uniqueId": "Api_get_id0_A3510FB1"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_-id0-c8c761b0",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_-id0-c8c761b0",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_id0_IamRole_74C8077C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_id0_S3Object_D25336B5.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Api_api_permission-GET-86d7f190_3EAF9825": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-86d7f190",
+            "uniqueId": "Api_api_permission-GET-86d7f190_3EAF9825"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_id0_A3510FB1.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/{id}",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-86d7f190"
+      },
+      "Api_api_permission-GET-8d0f082e_AD9E18AF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-8d0f082e",
+            "uniqueId": "Api_api_permission-GET-8d0f082e_AD9E18AF"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_id0_A3510FB1.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/{id}/comments",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-8d0f082e"
+      },
+      "Api_api_permission-GET-f57faab6_11BF5CEE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-f57faab6",
+            "uniqueId": "Api_api_permission-GET-f57faab6_11BF5CEE"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_id0_A3510FB1.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/{username}/something",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-f57faab6"
+      },
+      "Api_api_permission-POST-88b37de1_E0D219BB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-POST-88b37de1",
+            "uniqueId": "Api_api_permission-POST-88b37de1_E0D219BB"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_id0_A3510FB1.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/POST/{username}",
+        "statement_id": "AllowExecutionFromAPIGateway-POST-88b37de1"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Api_get_id0_S3Object_D25336B5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_:id0/S3Object",
+            "uniqueId": "Api_get_id0_S3Object_D25336B5"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/root_path_vars.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/root_path_vars.test.w_test_sim.md
new file mode 100644
index 00000000000..b1bac5650db
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/api/root_path_vars.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [root_path_vars.test.w](../../../../../../examples/tests/sdk_tests/api/root_path_vars.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ root_path_vars.test.wsim » root/env0/test:path vars at endpoint root are working as expected
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_compile_tf-aws.md
index 7f83c054472..e4719bb5745 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,37 +18,37 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     },
     "aws_s3_object": {
-      "cloudBucket_S3Object-file1txt_2E641337": {
+      "Bucket_S3Object-file1txt_A14F86D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/S3Object-file1.txt",
-            "uniqueId": "cloudBucket_S3Object-file1txt_2E641337"
+            "path": "root/Default/Default/Bucket/S3Object-file1.txt",
+            "uniqueId": "Bucket_S3Object-file1txt_A14F86D6"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudBucket.bucket}",
+        "bucket": "${aws_s3_bucket.Bucket.bucket}",
         "content": "test1",
         "key": "file1.txt"
       },
-      "cloudBucket_S3Object-file2txt_C6672D6C": {
+      "Bucket_S3Object-file2txt_2016A6BF": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/S3Object-file2.txt",
-            "uniqueId": "cloudBucket_S3Object-file2txt_C6672D6C"
+            "path": "root/Default/Default/Bucket/S3Object-file2.txt",
+            "uniqueId": "Bucket_S3Object-file2txt_2016A6BF"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudBucket.bucket}",
+        "bucket": "${aws_s3_bucket.Bucket.bucket}",
         "content": "test2",
         "key": "file2.txt"
       }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_test_sim.md
index 89bb6ab977f..2375c7ad548 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_file.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ add_file.test.wsim » root/env0/test:addObject
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_compile_tf-aws.md
index ea98328bebe..39d223484d7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,37 +18,37 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     },
     "aws_s3_object": {
-      "cloudBucket_S3Object-file1json_574A6AAF": {
+      "Bucket_S3Object-file1json_6A4AD365": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/S3Object-file1.json",
-            "uniqueId": "cloudBucket_S3Object-file1json_574A6AAF"
+            "path": "root/Default/Default/Bucket/S3Object-file1.json",
+            "uniqueId": "Bucket_S3Object-file1json_6A4AD365"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudBucket.bucket}",
+        "bucket": "${aws_s3_bucket.Bucket.bucket}",
         "content": "{\"key1\":\"value1\"}",
         "key": "file1.json"
       },
-      "cloudBucket_S3Object-file2txt_C6672D6C": {
+      "Bucket_S3Object-file2txt_2016A6BF": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/S3Object-file2.txt",
-            "uniqueId": "cloudBucket_S3Object-file2txt_C6672D6C"
+            "path": "root/Default/Default/Bucket/S3Object-file2.txt",
+            "uniqueId": "Bucket_S3Object-file2txt_2016A6BF"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudBucket.bucket}",
+        "bucket": "${aws_s3_bucket.Bucket.bucket}",
         "content": "Bar",
         "key": "file2.txt"
       }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_test_sim.md
index 92c603f5b7d..7a60dbc2dcc 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/add_object.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ add_object.test.wsim » root/env0/test:addObject
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_compile_tf-aws.md
index 42c667f4c57..d049080c330 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_test_sim.md
index 5c6cba495ee..8500e065401 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws-bucket.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ aws-bucket.test.wsim » root/env0/test:validates the AWS Bucket
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws_bucket.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws_bucket.test.w_compile_tf-aws.md
deleted file mode 100644
index 81f3ac67338..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws_bucket.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# [aws_bucket.test.w](../../../../../../examples/tests/sdk_tests/bucket/aws_bucket.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_s3_bucket": {
-      "aws-wing-bucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-bucket/Default",
-            "uniqueId": "aws-wing-bucket"
-          }
-        },
-        "bucket_prefix": "aws-wing-bucket-c8f5eeeb-",
-        "force_destroy": false
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws_bucket.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws_bucket.test.w_test_sim.md
deleted file mode 100644
index 4e1b8aff93b..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/aws_bucket.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [aws_bucket.test.w](../../../../../../examples/tests/sdk_tests/bucket/aws_bucket.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ aws_bucket.test.wsim » root/env0/test:validates the AWS bucket name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket-ref.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket-ref.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..ba9742fa736
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket-ref.test.w_compile_tf-aws.md
@@ -0,0 +1,631 @@
+# [bucket-ref.test.w](../../../../../../examples/tests/sdk_tests/bucket/bucket-ref.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "BucketRef_AwsConsoleField_Handler_CloudwatchLogGroup_4D1EBC65": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/AwsConsoleField/Handler/CloudwatchLogGroup",
+            "uniqueId": "BucketRef_AwsConsoleField_Handler_CloudwatchLogGroup_4D1EBC65"
+          }
+        },
+        "name": "/aws/lambda/Handler-c85d8af5",
+        "retention_in_days": 30
+      },
+      "BucketRef_BucketArnField_Handler_CloudwatchLogGroup_FBE2A504": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketArnField/Handler/CloudwatchLogGroup",
+            "uniqueId": "BucketRef_BucketArnField_Handler_CloudwatchLogGroup_FBE2A504"
+          }
+        },
+        "name": "/aws/lambda/Handler-c85e098f",
+        "retention_in_days": 30
+      },
+      "BucketRef_BucketNameField_Handler_CloudwatchLogGroup_EB9D84EB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketNameField/Handler/CloudwatchLogGroup",
+            "uniqueId": "BucketRef_BucketNameField_Handler_CloudwatchLogGroup_EB9D84EB"
+          }
+        },
+        "name": "/aws/lambda/Handler-c885f795",
+        "retention_in_days": 30
+      },
+      "BucketRef_FileBrowser_delete_CloudwatchLogGroup_03193899": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/delete/CloudwatchLogGroup",
+            "uniqueId": "BucketRef_FileBrowser_delete_CloudwatchLogGroup_03193899"
+          }
+        },
+        "name": "/aws/lambda/delete-c8d8aa8e",
+        "retention_in_days": 30
+      },
+      "BucketRef_FileBrowser_get_CloudwatchLogGroup_F6322EE3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/get/CloudwatchLogGroup",
+            "uniqueId": "BucketRef_FileBrowser_get_CloudwatchLogGroup_F6322EE3"
+          }
+        },
+        "name": "/aws/lambda/get-c8ba1e5f",
+        "retention_in_days": 30
+      },
+      "BucketRef_FileBrowser_list_CloudwatchLogGroup_F3917C68": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/list/CloudwatchLogGroup",
+            "uniqueId": "BucketRef_FileBrowser_list_CloudwatchLogGroup_F3917C68"
+          }
+        },
+        "name": "/aws/lambda/list-c88fd67a",
+        "retention_in_days": 30
+      },
+      "BucketRef_FileBrowser_put_CloudwatchLogGroup_7FDBAF92": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/put/CloudwatchLogGroup",
+            "uniqueId": "BucketRef_FileBrowser_put_CloudwatchLogGroup_7FDBAF92"
+          }
+        },
+        "name": "/aws/lambda/put-c8cdb51a",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "BucketRef_AwsConsoleField_Handler_IamRole_BF718408": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/AwsConsoleField/Handler/IamRole",
+            "uniqueId": "BucketRef_AwsConsoleField_Handler_IamRole_BF718408"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "BucketRef_BucketArnField_Handler_IamRole_DF52E4B1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketArnField/Handler/IamRole",
+            "uniqueId": "BucketRef_BucketArnField_Handler_IamRole_DF52E4B1"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "BucketRef_BucketNameField_Handler_IamRole_4C746299": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketNameField/Handler/IamRole",
+            "uniqueId": "BucketRef_BucketNameField_Handler_IamRole_4C746299"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "BucketRef_FileBrowser_delete_IamRole_A66062FE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/delete/IamRole",
+            "uniqueId": "BucketRef_FileBrowser_delete_IamRole_A66062FE"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "BucketRef_FileBrowser_get_IamRole_8E0DB684": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/get/IamRole",
+            "uniqueId": "BucketRef_FileBrowser_get_IamRole_8E0DB684"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "BucketRef_FileBrowser_list_IamRole_DC0C9222": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/list/IamRole",
+            "uniqueId": "BucketRef_FileBrowser_list_IamRole_DC0C9222"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "BucketRef_FileBrowser_put_IamRole_9C4230CD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/put/IamRole",
+            "uniqueId": "BucketRef_FileBrowser_put_IamRole_9C4230CD"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "BucketRef_AwsConsoleField_Handler_IamRolePolicy_CE523926": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/AwsConsoleField/Handler/IamRolePolicy",
+            "uniqueId": "BucketRef_AwsConsoleField_Handler_IamRolePolicy_CE523926"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\",\"s3:DeleteObject*\",\"s3:DeleteObjectVersion*\",\"s3:PutLifecycleConfiguration*\",\"s3:CopyObject\"],\"Resource\":[\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}\",\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BucketRef_AwsConsoleField_Handler_IamRole_BF718408.name}"
+      },
+      "BucketRef_BucketArnField_Handler_IamRolePolicy_566A37EB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketArnField/Handler/IamRolePolicy",
+            "uniqueId": "BucketRef_BucketArnField_Handler_IamRolePolicy_566A37EB"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.BucketRef_BucketArnField_Handler_IamRole_DF52E4B1.name}"
+      },
+      "BucketRef_BucketNameField_Handler_IamRolePolicy_280191CD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketNameField/Handler/IamRolePolicy",
+            "uniqueId": "BucketRef_BucketNameField_Handler_IamRolePolicy_280191CD"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.BucketRef_BucketNameField_Handler_IamRole_4C746299.name}"
+      },
+      "BucketRef_FileBrowser_delete_IamRolePolicy_A19F20B1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/delete/IamRolePolicy",
+            "uniqueId": "BucketRef_FileBrowser_delete_IamRolePolicy_A19F20B1"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\",\"s3:DeleteObject*\",\"s3:DeleteObjectVersion*\",\"s3:PutLifecycleConfiguration*\",\"s3:CopyObject\"],\"Resource\":[\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}\",\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_delete_IamRole_A66062FE.name}"
+      },
+      "BucketRef_FileBrowser_get_IamRolePolicy_E6B24E15": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/get/IamRolePolicy",
+            "uniqueId": "BucketRef_FileBrowser_get_IamRolePolicy_E6B24E15"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\",\"s3:DeleteObject*\",\"s3:DeleteObjectVersion*\",\"s3:PutLifecycleConfiguration*\",\"s3:CopyObject\"],\"Resource\":[\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}\",\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_get_IamRole_8E0DB684.name}"
+      },
+      "BucketRef_FileBrowser_list_IamRolePolicy_B923CA4C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/list/IamRolePolicy",
+            "uniqueId": "BucketRef_FileBrowser_list_IamRolePolicy_B923CA4C"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\",\"s3:DeleteObject*\",\"s3:DeleteObjectVersion*\",\"s3:PutLifecycleConfiguration*\",\"s3:CopyObject\"],\"Resource\":[\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}\",\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_list_IamRole_DC0C9222.name}"
+      },
+      "BucketRef_FileBrowser_put_IamRolePolicy_F4928644": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/put/IamRolePolicy",
+            "uniqueId": "BucketRef_FileBrowser_put_IamRolePolicy_F4928644"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\",\"s3:DeleteObject*\",\"s3:DeleteObjectVersion*\",\"s3:PutLifecycleConfiguration*\",\"s3:CopyObject\"],\"Resource\":[\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}\",\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_put_IamRole_9C4230CD.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "BucketRef_AwsConsoleField_Handler_IamRolePolicyAttachment_FD723E7D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/AwsConsoleField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "BucketRef_AwsConsoleField_Handler_IamRolePolicyAttachment_FD723E7D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.BucketRef_AwsConsoleField_Handler_IamRole_BF718408.name}"
+      },
+      "BucketRef_BucketArnField_Handler_IamRolePolicyAttachment_9A46A0BE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketArnField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "BucketRef_BucketArnField_Handler_IamRolePolicyAttachment_9A46A0BE"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.BucketRef_BucketArnField_Handler_IamRole_DF52E4B1.name}"
+      },
+      "BucketRef_BucketNameField_Handler_IamRolePolicyAttachment_E13E8317": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketNameField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "BucketRef_BucketNameField_Handler_IamRolePolicyAttachment_E13E8317"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.BucketRef_BucketNameField_Handler_IamRole_4C746299.name}"
+      },
+      "BucketRef_FileBrowser_delete_IamRolePolicyAttachment_1539DE0D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/delete/IamRolePolicyAttachment",
+            "uniqueId": "BucketRef_FileBrowser_delete_IamRolePolicyAttachment_1539DE0D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_delete_IamRole_A66062FE.name}"
+      },
+      "BucketRef_FileBrowser_get_IamRolePolicyAttachment_3D6DE10D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/get/IamRolePolicyAttachment",
+            "uniqueId": "BucketRef_FileBrowser_get_IamRolePolicyAttachment_3D6DE10D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_get_IamRole_8E0DB684.name}"
+      },
+      "BucketRef_FileBrowser_list_IamRolePolicyAttachment_AA2F34CC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/list/IamRolePolicyAttachment",
+            "uniqueId": "BucketRef_FileBrowser_list_IamRolePolicyAttachment_AA2F34CC"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_list_IamRole_DC0C9222.name}"
+      },
+      "BucketRef_FileBrowser_put_IamRolePolicyAttachment_B78BA9C7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/put/IamRolePolicyAttachment",
+            "uniqueId": "BucketRef_FileBrowser_put_IamRolePolicyAttachment_B78BA9C7"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.BucketRef_FileBrowser_put_IamRole_9C4230CD.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "BucketRef_AwsConsoleField_Handler_714621CF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/AwsConsoleField/Handler/Default",
+            "uniqueId": "BucketRef_AwsConsoleField_Handler_714621CF"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_bb1ba780": "${aws_s3_bucket.Bucket.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Handler-c85d8af5",
+            "WING_TARGET": "tf-aws",
+            "WING_TOKEN_TFTOKEN_TOKEN_2": "${jsonencode(aws_s3_bucket.Bucket.bucket)}"
+          }
+        },
+        "function_name": "Handler-c85d8af5",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.BucketRef_AwsConsoleField_Handler_IamRole_BF718408.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.BucketRef_AwsConsoleField_Handler_S3Object_61367A1E.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "BucketRef_BucketArnField_Handler_89268E34": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketArnField/Handler/Default",
+            "uniqueId": "BucketRef_BucketArnField_Handler_89268E34"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Handler-c85e098f",
+            "WING_TARGET": "tf-aws",
+            "WING_TOKEN_ARN_AWS_S3_TFTOKEN_TOKEN_2": "${jsonencode(\"arn:aws:s3:::${aws_s3_bucket.Bucket.bucket}\")}"
+          }
+        },
+        "function_name": "Handler-c85e098f",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.BucketRef_BucketArnField_Handler_IamRole_DF52E4B1.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.BucketRef_BucketArnField_Handler_S3Object_9A7F1E69.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "BucketRef_BucketNameField_Handler_BA1EDC2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketNameField/Handler/Default",
+            "uniqueId": "BucketRef_BucketNameField_Handler_BA1EDC2D"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Handler-c885f795",
+            "WING_TARGET": "tf-aws",
+            "WING_TOKEN_TFTOKEN_TOKEN_2": "${jsonencode(aws_s3_bucket.Bucket.bucket)}"
+          }
+        },
+        "function_name": "Handler-c885f795",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.BucketRef_BucketNameField_Handler_IamRole_4C746299.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.BucketRef_BucketNameField_Handler_S3Object_4572BF63.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "BucketRef_FileBrowser_delete_5803F41A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/delete/Default",
+            "uniqueId": "BucketRef_FileBrowser_delete_5803F41A"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_bb1ba780": "${aws_s3_bucket.Bucket.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "delete-c8d8aa8e",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "delete-c8d8aa8e",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.BucketRef_FileBrowser_delete_IamRole_A66062FE.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.BucketRef_FileBrowser_delete_S3Object_5563CB3A.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "BucketRef_FileBrowser_get_28175BDE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/get/Default",
+            "uniqueId": "BucketRef_FileBrowser_get_28175BDE"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_bb1ba780": "${aws_s3_bucket.Bucket.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get-c8ba1e5f",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get-c8ba1e5f",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.BucketRef_FileBrowser_get_IamRole_8E0DB684.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.BucketRef_FileBrowser_get_S3Object_F2A905BD.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "BucketRef_FileBrowser_list_7AD57CAA": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/list/Default",
+            "uniqueId": "BucketRef_FileBrowser_list_7AD57CAA"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_bb1ba780": "${aws_s3_bucket.Bucket.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "list-c88fd67a",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "list-c88fd67a",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.BucketRef_FileBrowser_list_IamRole_DC0C9222.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.BucketRef_FileBrowser_list_S3Object_B982678A.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "BucketRef_FileBrowser_put_C3049759": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/put/Default",
+            "uniqueId": "BucketRef_FileBrowser_put_C3049759"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_bb1ba780": "${aws_s3_bucket.Bucket.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "put-c8cdb51a",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "put-c8cdb51a",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.BucketRef_FileBrowser_put_IamRole_9C4230CD.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.BucketRef_FileBrowser_put_S3Object_FA99EA77.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      },
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "BucketRef_AwsConsoleField_Handler_S3Object_61367A1E": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/AwsConsoleField/Handler/S3Object",
+            "uniqueId": "BucketRef_AwsConsoleField_Handler_S3Object_61367A1E"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "BucketRef_BucketArnField_Handler_S3Object_9A7F1E69": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketArnField/Handler/S3Object",
+            "uniqueId": "BucketRef_BucketArnField_Handler_S3Object_9A7F1E69"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "BucketRef_BucketNameField_Handler_S3Object_4572BF63": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/BucketNameField/Handler/S3Object",
+            "uniqueId": "BucketRef_BucketNameField_Handler_S3Object_4572BF63"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "BucketRef_FileBrowser_delete_S3Object_5563CB3A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/delete/S3Object",
+            "uniqueId": "BucketRef_FileBrowser_delete_S3Object_5563CB3A"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "BucketRef_FileBrowser_get_S3Object_F2A905BD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/get/S3Object",
+            "uniqueId": "BucketRef_FileBrowser_get_S3Object_F2A905BD"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "BucketRef_FileBrowser_list_S3Object_B982678A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/list/S3Object",
+            "uniqueId": "BucketRef_FileBrowser_list_S3Object_B982678A"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "BucketRef_FileBrowser_put_S3Object_FA99EA77": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BucketRef/FileBrowser/put/S3Object",
+            "uniqueId": "BucketRef_FileBrowser_put_S3Object_FA99EA77"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket-ref.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket-ref.test.w_test_sim.md
new file mode 100644
index 00000000000..d0d60933d6d
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket-ref.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [bucket-ref.test.w](../../../../../../examples/tests/sdk_tests/bucket/bucket-ref.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ bucket-ref.test.wsim » root/env0/test:bucketArn returns the arn                                              
+pass ─ bucket-ref.test.wsim » root/env1/test:get() sends a request to aws, fails because we are using a dummy bucket
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_compile_tf-aws.md
index 7ceb2015aa9..b0ed7a36d27 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,26 +18,26 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     },
     "aws_s3_object": {
-      "cloudBucket_S3Object-file3txt_DFC4715B": {
+      "Bucket_S3Object-file3txt_6AB69768": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/S3Object-file3.txt",
-            "uniqueId": "cloudBucket_S3Object-file3txt_DFC4715B"
+            "path": "root/Default/Default/Bucket/S3Object-file3.txt",
+            "uniqueId": "Bucket_S3Object-file3txt_6AB69768"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudBucket.bucket}",
+        "bucket": "${aws_s3_bucket.Bucket.bucket}",
         "content": "Baz",
         "key": "file3.txt"
       }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_test_sim.md
index bc339222639..c2444330d8d 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/bucket_list.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bucket_list.test.wsim » root/env0/test:list
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_compile_tf-aws.md
index c3a548ba022..16dd6f4614e 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_test_sim.md
index cba5f9e4711..e0420e71068 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/copy.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ copy.test.wsim » root/env0/test:copy()
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_compile_tf-aws.md
index bf83aecfeac..2e1f40f16d6 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,26 +18,26 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     },
     "aws_s3_object": {
-      "cloudBucket_S3Object-file2txt_C6672D6C": {
+      "Bucket_S3Object-file2txt_2016A6BF": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/S3Object-file2.txt",
-            "uniqueId": "cloudBucket_S3Object-file2txt_C6672D6C"
+            "path": "root/Default/Default/Bucket/S3Object-file2.txt",
+            "uniqueId": "Bucket_S3Object-file2txt_2016A6BF"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudBucket.bucket}",
+        "bucket": "${aws_s3_bucket.Bucket.bucket}",
         "content": "Bar",
         "key": "file2.txt"
       }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_test_sim.md
index c4d4c0b0ce4..82b893a12fa 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/delete.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ delete.test.wsim » root/env0/test:delete
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_compile_tf-aws.md
index 8a2918a18e4..fd0815e36ad 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,73 +18,73 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudBucket_oncreate-OnMessage0_CloudwatchLogGroup_F81FF873": {
+      "Bucket_OnCreate-OnMessage0_CloudwatchLogGroup_6BF9DEA3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "cloudBucket_oncreate-OnMessage0_CloudwatchLogGroup_F81FF873"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Bucket_OnCreate-OnMessage0_CloudwatchLogGroup_6BF9DEA3"
           }
         },
-        "name": "/aws/lambda/oncreate-OnMessage0-c835636b",
+        "name": "/aws/lambda/OnCreate-OnMessage0-c8740b4b",
         "retention_in_days": 30
       },
-      "cloudBucket_oncreate-OnMessage1_CloudwatchLogGroup_FA18C2EA": {
+      "Bucket_OnCreate-OnMessage1_CloudwatchLogGroup_A09583DA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage1/CloudwatchLogGroup",
-            "uniqueId": "cloudBucket_oncreate-OnMessage1_CloudwatchLogGroup_FA18C2EA"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage1/CloudwatchLogGroup",
+            "uniqueId": "Bucket_OnCreate-OnMessage1_CloudwatchLogGroup_A09583DA"
           }
         },
-        "name": "/aws/lambda/oncreate-OnMessage1-c8d72382",
+        "name": "/aws/lambda/OnCreate-OnMessage1-c8347a52",
         "retention_in_days": 30
       },
-      "cloudBucket_ondelete-OnMessage0_CloudwatchLogGroup_55334E14": {
+      "Bucket_OnDelete-OnMessage0_CloudwatchLogGroup_682144EA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "cloudBucket_ondelete-OnMessage0_CloudwatchLogGroup_55334E14"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Bucket_OnDelete-OnMessage0_CloudwatchLogGroup_682144EA"
           }
         },
-        "name": "/aws/lambda/ondelete-OnMessage0-c8308ba7",
+        "name": "/aws/lambda/OnDelete-OnMessage0-c8e711ef",
         "retention_in_days": 30
       },
-      "cloudBucket_ondelete-OnMessage1_CloudwatchLogGroup_AF50ED5A": {
+      "Bucket_OnDelete-OnMessage1_CloudwatchLogGroup_ADB44727": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage1/CloudwatchLogGroup",
-            "uniqueId": "cloudBucket_ondelete-OnMessage1_CloudwatchLogGroup_AF50ED5A"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage1/CloudwatchLogGroup",
+            "uniqueId": "Bucket_OnDelete-OnMessage1_CloudwatchLogGroup_ADB44727"
           }
         },
-        "name": "/aws/lambda/ondelete-OnMessage1-c8920f94",
+        "name": "/aws/lambda/OnDelete-OnMessage1-c8905f5b",
         "retention_in_days": 30
       },
-      "cloudBucket_onupdate-OnMessage0_CloudwatchLogGroup_98BF6B34": {
+      "Bucket_OnUpdate-OnMessage0_CloudwatchLogGroup_9492CFAF": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "cloudBucket_onupdate-OnMessage0_CloudwatchLogGroup_98BF6B34"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Bucket_OnUpdate-OnMessage0_CloudwatchLogGroup_9492CFAF"
           }
         },
-        "name": "/aws/lambda/onupdate-OnMessage0-c8cd54ba",
+        "name": "/aws/lambda/OnUpdate-OnMessage0-c81b9fec",
         "retention_in_days": 30
       },
-      "cloudBucket_onupdate-OnMessage1_CloudwatchLogGroup_7D9AC801": {
+      "Bucket_OnUpdate-OnMessage1_CloudwatchLogGroup_FA500C0F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage1/CloudwatchLogGroup",
-            "uniqueId": "cloudBucket_onupdate-OnMessage1_CloudwatchLogGroup_7D9AC801"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage1/CloudwatchLogGroup",
+            "uniqueId": "Bucket_OnUpdate-OnMessage1_CloudwatchLogGroup_FA500C0F"
           }
         },
-        "name": "/aws/lambda/onupdate-OnMessage1-c8356ea9",
+        "name": "/aws/lambda/OnUpdate-OnMessage1-c8513427",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -108,13 +95,13 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       },
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -125,195 +112,198 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "_id",
-        "name": "key-historyex.Table-c840a49c"
+        "name": "key-historyTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     },
     "aws_iam_role": {
-      "cloudBucket_oncreate-OnMessage0_IamRole_781D1FBC": {
+      "Bucket_OnCreate-OnMessage0_IamRole_D3BF2935": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage0/IamRole",
-            "uniqueId": "cloudBucket_oncreate-OnMessage0_IamRole_781D1FBC"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage0/IamRole",
+            "uniqueId": "Bucket_OnCreate-OnMessage0_IamRole_D3BF2935"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudBucket_oncreate-OnMessage1_IamRole_5FEF97DC": {
+      "Bucket_OnCreate-OnMessage1_IamRole_0E855131": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage1/IamRole",
-            "uniqueId": "cloudBucket_oncreate-OnMessage1_IamRole_5FEF97DC"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage1/IamRole",
+            "uniqueId": "Bucket_OnCreate-OnMessage1_IamRole_0E855131"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudBucket_ondelete-OnMessage0_IamRole_32E9B6B6": {
+      "Bucket_OnDelete-OnMessage0_IamRole_A52E721B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage0/IamRole",
-            "uniqueId": "cloudBucket_ondelete-OnMessage0_IamRole_32E9B6B6"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage0/IamRole",
+            "uniqueId": "Bucket_OnDelete-OnMessage0_IamRole_A52E721B"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudBucket_ondelete-OnMessage1_IamRole_3A69AD5D": {
+      "Bucket_OnDelete-OnMessage1_IamRole_AA3A5721": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage1/IamRole",
-            "uniqueId": "cloudBucket_ondelete-OnMessage1_IamRole_3A69AD5D"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage1/IamRole",
+            "uniqueId": "Bucket_OnDelete-OnMessage1_IamRole_AA3A5721"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudBucket_onupdate-OnMessage0_IamRole_A18E1E60": {
+      "Bucket_OnUpdate-OnMessage0_IamRole_96499EB9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage0/IamRole",
-            "uniqueId": "cloudBucket_onupdate-OnMessage0_IamRole_A18E1E60"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage0/IamRole",
+            "uniqueId": "Bucket_OnUpdate-OnMessage0_IamRole_96499EB9"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudBucket_onupdate-OnMessage1_IamRole_F9C45633": {
+      "Bucket_OnUpdate-OnMessage1_IamRole_7B19D23F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage1/IamRole",
-            "uniqueId": "cloudBucket_onupdate-OnMessage1_IamRole_F9C45633"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage1/IamRole",
+            "uniqueId": "Bucket_OnUpdate-OnMessage1_IamRole_7B19D23F"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudBucket_oncreate-OnMessage0_IamRolePolicy_44CBF0C5": {
+      "Bucket_OnCreate-OnMessage0_IamRolePolicy_9749552C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage0/IamRolePolicy",
-            "uniqueId": "cloudBucket_oncreate-OnMessage0_IamRolePolicy_44CBF0C5"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage0/IamRolePolicy",
+            "uniqueId": "Bucket_OnCreate-OnMessage0_IamRolePolicy_9749552C"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudBucket_oncreate-OnMessage0_IamRole_781D1FBC.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Bucket_OnCreate-OnMessage0_IamRole_D3BF2935.name}"
       },
-      "cloudBucket_oncreate-OnMessage1_IamRolePolicy_EDFB1610": {
+      "Bucket_OnCreate-OnMessage1_IamRolePolicy_975FD372": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage1/IamRolePolicy",
-            "uniqueId": "cloudBucket_oncreate-OnMessage1_IamRolePolicy_EDFB1610"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage1/IamRolePolicy",
+            "uniqueId": "Bucket_OnCreate-OnMessage1_IamRolePolicy_975FD372"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudBucket_oncreate-OnMessage1_IamRole_5FEF97DC.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Bucket_OnCreate-OnMessage1_IamRole_0E855131.name}"
       },
-      "cloudBucket_ondelete-OnMessage0_IamRolePolicy_CF363F05": {
+      "Bucket_OnDelete-OnMessage0_IamRolePolicy_A027DCBC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage0/IamRolePolicy",
-            "uniqueId": "cloudBucket_ondelete-OnMessage0_IamRolePolicy_CF363F05"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage0/IamRolePolicy",
+            "uniqueId": "Bucket_OnDelete-OnMessage0_IamRolePolicy_A027DCBC"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudBucket_ondelete-OnMessage0_IamRole_32E9B6B6.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Bucket_OnDelete-OnMessage0_IamRole_A52E721B.name}"
       },
-      "cloudBucket_ondelete-OnMessage1_IamRolePolicy_0867305D": {
+      "Bucket_OnDelete-OnMessage1_IamRolePolicy_07F086F7": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage1/IamRolePolicy",
-            "uniqueId": "cloudBucket_ondelete-OnMessage1_IamRolePolicy_0867305D"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage1/IamRolePolicy",
+            "uniqueId": "Bucket_OnDelete-OnMessage1_IamRolePolicy_07F086F7"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudBucket_ondelete-OnMessage1_IamRole_3A69AD5D.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Bucket_OnDelete-OnMessage1_IamRole_AA3A5721.name}"
       },
-      "cloudBucket_onupdate-OnMessage0_IamRolePolicy_1C574D04": {
+      "Bucket_OnUpdate-OnMessage0_IamRolePolicy_DAF73AB9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage0/IamRolePolicy",
-            "uniqueId": "cloudBucket_onupdate-OnMessage0_IamRolePolicy_1C574D04"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage0/IamRolePolicy",
+            "uniqueId": "Bucket_OnUpdate-OnMessage0_IamRolePolicy_DAF73AB9"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudBucket_onupdate-OnMessage0_IamRole_A18E1E60.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Bucket_OnUpdate-OnMessage0_IamRole_96499EB9.name}"
       },
-      "cloudBucket_onupdate-OnMessage1_IamRolePolicy_AF88DE22": {
+      "Bucket_OnUpdate-OnMessage1_IamRolePolicy_E38714A4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage1/IamRolePolicy",
-            "uniqueId": "cloudBucket_onupdate-OnMessage1_IamRolePolicy_AF88DE22"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage1/IamRolePolicy",
+            "uniqueId": "Bucket_OnUpdate-OnMessage1_IamRolePolicy_E38714A4"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudBucket_onupdate-OnMessage1_IamRole_F9C45633.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Bucket_OnUpdate-OnMessage1_IamRole_7B19D23F.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudBucket_oncreate-OnMessage0_IamRolePolicyAttachment_0014344A": {
+      "Bucket_OnCreate-OnMessage0_IamRolePolicyAttachment_B9851CC6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "cloudBucket_oncreate-OnMessage0_IamRolePolicyAttachment_0014344A"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Bucket_OnCreate-OnMessage0_IamRolePolicyAttachment_B9851CC6"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudBucket_oncreate-OnMessage0_IamRole_781D1FBC.name}"
+        "role": "${aws_iam_role.Bucket_OnCreate-OnMessage0_IamRole_D3BF2935.name}"
       },
-      "cloudBucket_oncreate-OnMessage1_IamRolePolicyAttachment_D98B9654": {
+      "Bucket_OnCreate-OnMessage1_IamRolePolicyAttachment_CAB55010": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage1/IamRolePolicyAttachment",
-            "uniqueId": "cloudBucket_oncreate-OnMessage1_IamRolePolicyAttachment_D98B9654"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage1/IamRolePolicyAttachment",
+            "uniqueId": "Bucket_OnCreate-OnMessage1_IamRolePolicyAttachment_CAB55010"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudBucket_oncreate-OnMessage1_IamRole_5FEF97DC.name}"
+        "role": "${aws_iam_role.Bucket_OnCreate-OnMessage1_IamRole_0E855131.name}"
       },
-      "cloudBucket_ondelete-OnMessage0_IamRolePolicyAttachment_51AD370B": {
+      "Bucket_OnDelete-OnMessage0_IamRolePolicyAttachment_9AC35049": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "cloudBucket_ondelete-OnMessage0_IamRolePolicyAttachment_51AD370B"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Bucket_OnDelete-OnMessage0_IamRolePolicyAttachment_9AC35049"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudBucket_ondelete-OnMessage0_IamRole_32E9B6B6.name}"
+        "role": "${aws_iam_role.Bucket_OnDelete-OnMessage0_IamRole_A52E721B.name}"
       },
-      "cloudBucket_ondelete-OnMessage1_IamRolePolicyAttachment_175F98FB": {
+      "Bucket_OnDelete-OnMessage1_IamRolePolicyAttachment_EFA92AD6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage1/IamRolePolicyAttachment",
-            "uniqueId": "cloudBucket_ondelete-OnMessage1_IamRolePolicyAttachment_175F98FB"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage1/IamRolePolicyAttachment",
+            "uniqueId": "Bucket_OnDelete-OnMessage1_IamRolePolicyAttachment_EFA92AD6"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudBucket_ondelete-OnMessage1_IamRole_3A69AD5D.name}"
+        "role": "${aws_iam_role.Bucket_OnDelete-OnMessage1_IamRole_AA3A5721.name}"
       },
-      "cloudBucket_onupdate-OnMessage0_IamRolePolicyAttachment_8CE952F6": {
+      "Bucket_OnUpdate-OnMessage0_IamRolePolicyAttachment_FAF69EA1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "cloudBucket_onupdate-OnMessage0_IamRolePolicyAttachment_8CE952F6"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Bucket_OnUpdate-OnMessage0_IamRolePolicyAttachment_FAF69EA1"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudBucket_onupdate-OnMessage0_IamRole_A18E1E60.name}"
+        "role": "${aws_iam_role.Bucket_OnUpdate-OnMessage0_IamRole_96499EB9.name}"
       },
-      "cloudBucket_onupdate-OnMessage1_IamRolePolicyAttachment_558C639E": {
+      "Bucket_OnUpdate-OnMessage1_IamRolePolicyAttachment_5CF4587E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage1/IamRolePolicyAttachment",
-            "uniqueId": "cloudBucket_onupdate-OnMessage1_IamRolePolicyAttachment_558C639E"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage1/IamRolePolicyAttachment",
+            "uniqueId": "Bucket_OnUpdate-OnMessage1_IamRolePolicyAttachment_5CF4587E"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudBucket_onupdate-OnMessage1_IamRole_F9C45633.name}"
+        "role": "${aws_iam_role.Bucket_OnUpdate-OnMessage1_IamRole_7B19D23F.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudBucket_oncreate-OnMessage0_0B1CA993": {
+      "Bucket_OnCreate-OnMessage0_4C972FB4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage0/Default",
-            "uniqueId": "cloudBucket_oncreate-OnMessage0_0B1CA993"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage0/Default",
+            "uniqueId": "Bucket_OnCreate-OnMessage0_4C972FB4"
           }
         },
         "architectures": [
@@ -321,34 +311,34 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "_id",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "_id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "oncreate-OnMessage0-c835636b",
+            "WING_FUNCTION_NAME": "OnCreate-OnMessage0-c8740b4b",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "oncreate-OnMessage0-c835636b",
+        "function_name": "OnCreate-OnMessage0-c8740b4b",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudBucket_oncreate-OnMessage0_IamRole_781D1FBC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Bucket_OnCreate-OnMessage0_IamRole_D3BF2935.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudBucket_oncreate-OnMessage0_S3Object_C2C8A7A9.key}",
+        "s3_key": "${aws_s3_object.Bucket_OnCreate-OnMessage0_S3Object_3AC22680.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudBucket_oncreate-OnMessage1_46B1E9AC": {
+      "Bucket_OnCreate-OnMessage1_18599D01": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage1/Default",
-            "uniqueId": "cloudBucket_oncreate-OnMessage1_46B1E9AC"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage1/Default",
+            "uniqueId": "Bucket_OnCreate-OnMessage1_18599D01"
           }
         },
         "architectures": [
@@ -356,34 +346,34 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "_id",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "_id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "oncreate-OnMessage1-c8d72382",
+            "WING_FUNCTION_NAME": "OnCreate-OnMessage1-c8347a52",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "oncreate-OnMessage1-c8d72382",
+        "function_name": "OnCreate-OnMessage1-c8347a52",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudBucket_oncreate-OnMessage1_IamRole_5FEF97DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Bucket_OnCreate-OnMessage1_IamRole_0E855131.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudBucket_oncreate-OnMessage1_S3Object_73E1B72B.key}",
+        "s3_key": "${aws_s3_object.Bucket_OnCreate-OnMessage1_S3Object_24FED042.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudBucket_ondelete-OnMessage0_31BC8C5B": {
+      "Bucket_OnDelete-OnMessage0_BBD3A051": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage0/Default",
-            "uniqueId": "cloudBucket_ondelete-OnMessage0_31BC8C5B"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage0/Default",
+            "uniqueId": "Bucket_OnDelete-OnMessage0_BBD3A051"
           }
         },
         "architectures": [
@@ -391,34 +381,34 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "_id",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "_id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "ondelete-OnMessage0-c8308ba7",
+            "WING_FUNCTION_NAME": "OnDelete-OnMessage0-c8e711ef",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "ondelete-OnMessage0-c8308ba7",
+        "function_name": "OnDelete-OnMessage0-c8e711ef",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudBucket_ondelete-OnMessage0_IamRole_32E9B6B6.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Bucket_OnDelete-OnMessage0_IamRole_A52E721B.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudBucket_ondelete-OnMessage0_S3Object_E710FD99.key}",
+        "s3_key": "${aws_s3_object.Bucket_OnDelete-OnMessage0_S3Object_555C9D08.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudBucket_ondelete-OnMessage1_97EDDB9C": {
+      "Bucket_OnDelete-OnMessage1_A17F4764": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage1/Default",
-            "uniqueId": "cloudBucket_ondelete-OnMessage1_97EDDB9C"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage1/Default",
+            "uniqueId": "Bucket_OnDelete-OnMessage1_A17F4764"
           }
         },
         "architectures": [
@@ -426,34 +416,34 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "_id",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "_id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "ondelete-OnMessage1-c8920f94",
+            "WING_FUNCTION_NAME": "OnDelete-OnMessage1-c8905f5b",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "ondelete-OnMessage1-c8920f94",
+        "function_name": "OnDelete-OnMessage1-c8905f5b",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudBucket_ondelete-OnMessage1_IamRole_3A69AD5D.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Bucket_OnDelete-OnMessage1_IamRole_AA3A5721.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudBucket_ondelete-OnMessage1_S3Object_83BF5AC3.key}",
+        "s3_key": "${aws_s3_object.Bucket_OnDelete-OnMessage1_S3Object_DE01EBE1.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudBucket_onupdate-OnMessage0_7E23A21E": {
+      "Bucket_OnUpdate-OnMessage0_ABC5042C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage0/Default",
-            "uniqueId": "cloudBucket_onupdate-OnMessage0_7E23A21E"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage0/Default",
+            "uniqueId": "Bucket_OnUpdate-OnMessage0_ABC5042C"
           }
         },
         "architectures": [
@@ -461,34 +451,34 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "_id",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "_id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "onupdate-OnMessage0-c8cd54ba",
+            "WING_FUNCTION_NAME": "OnUpdate-OnMessage0-c81b9fec",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "onupdate-OnMessage0-c8cd54ba",
+        "function_name": "OnUpdate-OnMessage0-c81b9fec",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudBucket_onupdate-OnMessage0_IamRole_A18E1E60.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Bucket_OnUpdate-OnMessage0_IamRole_96499EB9.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudBucket_onupdate-OnMessage0_S3Object_1E3DAE34.key}",
+        "s3_key": "${aws_s3_object.Bucket_OnUpdate-OnMessage0_S3Object_45CBA374.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudBucket_onupdate-OnMessage1_AD4C1239": {
+      "Bucket_OnUpdate-OnMessage1_A9787FC1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage1/Default",
-            "uniqueId": "cloudBucket_onupdate-OnMessage1_AD4C1239"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage1/Default",
+            "uniqueId": "Bucket_OnUpdate-OnMessage1_A9787FC1"
           }
         },
         "architectures": [
@@ -496,23 +486,23 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "_id",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"_id\":0,\"key\":0,\"operation\":0,\"source\":0}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "_id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "onupdate-OnMessage1-c8356ea9",
+            "WING_FUNCTION_NAME": "OnUpdate-OnMessage1-c8513427",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "onupdate-OnMessage1-c8356ea9",
+        "function_name": "OnUpdate-OnMessage1-c8513427",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudBucket_onupdate-OnMessage1_IamRole_F9C45633.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Bucket_OnUpdate-OnMessage1_IamRole_7B19D23F.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudBucket_onupdate-OnMessage1_S3Object_0756209E.key}",
+        "s3_key": "${aws_s3_object.Bucket_OnUpdate-OnMessage1_S3Object_A8B89403.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -521,113 +511,113 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudBucket_oncreate-OnMessage0_InvokePermission-c8f9c22ef33cda1b8ee1583450fa95d2a469b4ca3b_557C66F2": {
+      "Bucket_OnCreate-OnMessage0_InvokePermission-c8b721b0d6157aa6ade66017aa9bfcbb77f8df59d7_F5383BED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage0/InvokePermission-c8f9c22ef33cda1b8ee1583450fa95d2a469b4ca3b",
-            "uniqueId": "cloudBucket_oncreate-OnMessage0_InvokePermission-c8f9c22ef33cda1b8ee1583450fa95d2a469b4ca3b_557C66F2"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage0/InvokePermission-c8b721b0d6157aa6ade66017aa9bfcbb77f8df59d7",
+            "uniqueId": "Bucket_OnCreate-OnMessage0_InvokePermission-c8b721b0d6157aa6ade66017aa9bfcbb77f8df59d7_F5383BED"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudBucket_oncreate-OnMessage0_0B1CA993.function_name}",
+        "function_name": "${aws_lambda_function.Bucket_OnCreate-OnMessage0_4C972FB4.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudBucket_oncreate_BF58CCF3.arn}"
+        "source_arn": "${aws_sns_topic.Bucket_OnCreate_9682272C.arn}"
       },
-      "cloudBucket_oncreate-OnMessage1_InvokePermission-c8f9c22ef33cda1b8ee1583450fa95d2a469b4ca3b_42E7BD52": {
+      "Bucket_OnCreate-OnMessage1_InvokePermission-c8b721b0d6157aa6ade66017aa9bfcbb77f8df59d7_C0F2EA79": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage1/InvokePermission-c8f9c22ef33cda1b8ee1583450fa95d2a469b4ca3b",
-            "uniqueId": "cloudBucket_oncreate-OnMessage1_InvokePermission-c8f9c22ef33cda1b8ee1583450fa95d2a469b4ca3b_42E7BD52"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage1/InvokePermission-c8b721b0d6157aa6ade66017aa9bfcbb77f8df59d7",
+            "uniqueId": "Bucket_OnCreate-OnMessage1_InvokePermission-c8b721b0d6157aa6ade66017aa9bfcbb77f8df59d7_C0F2EA79"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudBucket_oncreate-OnMessage1_46B1E9AC.function_name}",
+        "function_name": "${aws_lambda_function.Bucket_OnCreate-OnMessage1_18599D01.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudBucket_oncreate_BF58CCF3.arn}"
+        "source_arn": "${aws_sns_topic.Bucket_OnCreate_9682272C.arn}"
       },
-      "cloudBucket_ondelete-OnMessage0_InvokePermission-c82a684284f1978ef059ff478889b7d0422cd30e56_39B5412A": {
+      "Bucket_OnDelete-OnMessage0_InvokePermission-c8951577e6e6b8b443e69cf3aa712434a41064d057_3C678F8E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage0/InvokePermission-c82a684284f1978ef059ff478889b7d0422cd30e56",
-            "uniqueId": "cloudBucket_ondelete-OnMessage0_InvokePermission-c82a684284f1978ef059ff478889b7d0422cd30e56_39B5412A"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage0/InvokePermission-c8951577e6e6b8b443e69cf3aa712434a41064d057",
+            "uniqueId": "Bucket_OnDelete-OnMessage0_InvokePermission-c8951577e6e6b8b443e69cf3aa712434a41064d057_3C678F8E"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudBucket_ondelete-OnMessage0_31BC8C5B.function_name}",
+        "function_name": "${aws_lambda_function.Bucket_OnDelete-OnMessage0_BBD3A051.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudBucket_ondelete_5C7719AC.arn}"
+        "source_arn": "${aws_sns_topic.Bucket_OnDelete_0EB7243C.arn}"
       },
-      "cloudBucket_ondelete-OnMessage1_InvokePermission-c82a684284f1978ef059ff478889b7d0422cd30e56_55397F0C": {
+      "Bucket_OnDelete-OnMessage1_InvokePermission-c8951577e6e6b8b443e69cf3aa712434a41064d057_DB38FC8F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage1/InvokePermission-c82a684284f1978ef059ff478889b7d0422cd30e56",
-            "uniqueId": "cloudBucket_ondelete-OnMessage1_InvokePermission-c82a684284f1978ef059ff478889b7d0422cd30e56_55397F0C"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage1/InvokePermission-c8951577e6e6b8b443e69cf3aa712434a41064d057",
+            "uniqueId": "Bucket_OnDelete-OnMessage1_InvokePermission-c8951577e6e6b8b443e69cf3aa712434a41064d057_DB38FC8F"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudBucket_ondelete-OnMessage1_97EDDB9C.function_name}",
+        "function_name": "${aws_lambda_function.Bucket_OnDelete-OnMessage1_A17F4764.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudBucket_ondelete_5C7719AC.arn}"
+        "source_arn": "${aws_sns_topic.Bucket_OnDelete_0EB7243C.arn}"
       },
-      "cloudBucket_onupdate-OnMessage0_InvokePermission-c8223d472543ef1fe5e1f0eacaf63338362fb1a751_3E88DA77": {
+      "Bucket_OnUpdate-OnMessage0_InvokePermission-c81749ea32d17e6c85fdd886350ce3ffe9fd7c0be7_026E0359": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage0/InvokePermission-c8223d472543ef1fe5e1f0eacaf63338362fb1a751",
-            "uniqueId": "cloudBucket_onupdate-OnMessage0_InvokePermission-c8223d472543ef1fe5e1f0eacaf63338362fb1a751_3E88DA77"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage0/InvokePermission-c81749ea32d17e6c85fdd886350ce3ffe9fd7c0be7",
+            "uniqueId": "Bucket_OnUpdate-OnMessage0_InvokePermission-c81749ea32d17e6c85fdd886350ce3ffe9fd7c0be7_026E0359"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudBucket_onupdate-OnMessage0_7E23A21E.function_name}",
+        "function_name": "${aws_lambda_function.Bucket_OnUpdate-OnMessage0_ABC5042C.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudBucket_onupdate_34404C29.arn}"
+        "source_arn": "${aws_sns_topic.Bucket_OnUpdate_E297838E.arn}"
       },
-      "cloudBucket_onupdate-OnMessage1_InvokePermission-c8223d472543ef1fe5e1f0eacaf63338362fb1a751_F065AB16": {
+      "Bucket_OnUpdate-OnMessage1_InvokePermission-c81749ea32d17e6c85fdd886350ce3ffe9fd7c0be7_E1A5BEF6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage1/InvokePermission-c8223d472543ef1fe5e1f0eacaf63338362fb1a751",
-            "uniqueId": "cloudBucket_onupdate-OnMessage1_InvokePermission-c8223d472543ef1fe5e1f0eacaf63338362fb1a751_F065AB16"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage1/InvokePermission-c81749ea32d17e6c85fdd886350ce3ffe9fd7c0be7",
+            "uniqueId": "Bucket_OnUpdate-OnMessage1_InvokePermission-c81749ea32d17e6c85fdd886350ce3ffe9fd7c0be7_E1A5BEF6"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudBucket_onupdate-OnMessage1_AD4C1239.function_name}",
+        "function_name": "${aws_lambda_function.Bucket_OnUpdate-OnMessage1_A9787FC1.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudBucket_onupdate_34404C29.arn}"
+        "source_arn": "${aws_sns_topic.Bucket_OnUpdate_E297838E.arn}"
       }
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "code-c84a50b1-"
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
+        "bucket_prefix": "code-c84a50b1-"
       }
     },
     "aws_s3_bucket_notification": {
-      "cloudBucket_S3BucketNotification_7C82677F": {
+      "Bucket_S3BucketNotification_D5E2F72C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/S3BucketNotification",
-            "uniqueId": "cloudBucket_S3BucketNotification_7C82677F"
+            "path": "root/Default/Default/Bucket/S3BucketNotification",
+            "uniqueId": "Bucket_S3BucketNotification_D5E2F72C"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudBucket.id}",
+        "bucket": "${aws_s3_bucket.Bucket.id}",
         "depends_on": [
-          "aws_sns_topic_policy.cloudBucket_ondelete_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_F136B625",
-          "aws_sns_topic_policy.cloudBucket_onupdate_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_76578151",
-          "aws_sns_topic_policy.cloudBucket_oncreate_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_C1C190D3"
+          "aws_sns_topic_policy.Bucket_OnDelete_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_89434C6B",
+          "aws_sns_topic_policy.Bucket_OnUpdate_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_9BF3340C",
+          "aws_sns_topic_policy.Bucket_OnCreate_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_E9DA9F8C"
         ],
         "topic": [
           {
@@ -635,86 +625,86 @@
               "s3:ObjectRemoved:*"
             ],
             "id": "on-ondelete-notification",
-            "topic_arn": "${aws_sns_topic.cloudBucket_ondelete_5C7719AC.arn}"
+            "topic_arn": "${aws_sns_topic.Bucket_OnDelete_0EB7243C.arn}"
           },
           {
             "events": [
               "s3:ObjectCreated:Post"
             ],
             "id": "on-onupdate-notification",
-            "topic_arn": "${aws_sns_topic.cloudBucket_onupdate_34404C29.arn}"
+            "topic_arn": "${aws_sns_topic.Bucket_OnUpdate_E297838E.arn}"
           },
           {
             "events": [
               "s3:ObjectCreated:Put"
             ],
             "id": "on-oncreate-notification",
-            "topic_arn": "${aws_sns_topic.cloudBucket_oncreate_BF58CCF3.arn}"
+            "topic_arn": "${aws_sns_topic.Bucket_OnCreate_9682272C.arn}"
           }
         ]
       }
     },
     "aws_s3_object": {
-      "cloudBucket_oncreate-OnMessage0_S3Object_C2C8A7A9": {
+      "Bucket_OnCreate-OnMessage0_S3Object_3AC22680": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage0/S3Object",
-            "uniqueId": "cloudBucket_oncreate-OnMessage0_S3Object_C2C8A7A9"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage0/S3Object",
+            "uniqueId": "Bucket_OnCreate-OnMessage0_S3Object_3AC22680"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudBucket_oncreate-OnMessage1_S3Object_73E1B72B": {
+      "Bucket_OnCreate-OnMessage1_S3Object_24FED042": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate-OnMessage1/S3Object",
-            "uniqueId": "cloudBucket_oncreate-OnMessage1_S3Object_73E1B72B"
+            "path": "root/Default/Default/Bucket/OnCreate-OnMessage1/S3Object",
+            "uniqueId": "Bucket_OnCreate-OnMessage1_S3Object_24FED042"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudBucket_ondelete-OnMessage0_S3Object_E710FD99": {
+      "Bucket_OnDelete-OnMessage0_S3Object_555C9D08": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage0/S3Object",
-            "uniqueId": "cloudBucket_ondelete-OnMessage0_S3Object_E710FD99"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage0/S3Object",
+            "uniqueId": "Bucket_OnDelete-OnMessage0_S3Object_555C9D08"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudBucket_ondelete-OnMessage1_S3Object_83BF5AC3": {
+      "Bucket_OnDelete-OnMessage1_S3Object_DE01EBE1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete-OnMessage1/S3Object",
-            "uniqueId": "cloudBucket_ondelete-OnMessage1_S3Object_83BF5AC3"
+            "path": "root/Default/Default/Bucket/OnDelete-OnMessage1/S3Object",
+            "uniqueId": "Bucket_OnDelete-OnMessage1_S3Object_DE01EBE1"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudBucket_onupdate-OnMessage0_S3Object_1E3DAE34": {
+      "Bucket_OnUpdate-OnMessage0_S3Object_45CBA374": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage0/S3Object",
-            "uniqueId": "cloudBucket_onupdate-OnMessage0_S3Object_1E3DAE34"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage0/S3Object",
+            "uniqueId": "Bucket_OnUpdate-OnMessage0_S3Object_45CBA374"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudBucket_onupdate-OnMessage1_S3Object_0756209E": {
+      "Bucket_OnUpdate-OnMessage1_S3Object_A8B89403": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate-OnMessage1/S3Object",
-            "uniqueId": "cloudBucket_onupdate-OnMessage1_S3Object_0756209E"
+            "path": "root/Default/Default/Bucket/OnUpdate-OnMessage1/S3Object",
+            "uniqueId": "Bucket_OnUpdate-OnMessage1_S3Object_A8B89403"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -723,132 +713,132 @@
       }
     },
     "aws_sns_topic": {
-      "cloudBucket_oncreate_BF58CCF3": {
+      "Bucket_OnCreate_9682272C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate/Default",
-            "uniqueId": "cloudBucket_oncreate_BF58CCF3"
+            "path": "root/Default/Default/Bucket/OnCreate/Default",
+            "uniqueId": "Bucket_OnCreate_9682272C"
           }
         },
-        "name": "oncreate-c8f9c22e"
+        "name": "OnCreate-c8b721b0"
       },
-      "cloudBucket_ondelete_5C7719AC": {
+      "Bucket_OnDelete_0EB7243C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete/Default",
-            "uniqueId": "cloudBucket_ondelete_5C7719AC"
+            "path": "root/Default/Default/Bucket/OnDelete/Default",
+            "uniqueId": "Bucket_OnDelete_0EB7243C"
           }
         },
-        "name": "ondelete-c82a6842"
+        "name": "OnDelete-c8951577"
       },
-      "cloudBucket_onupdate_34404C29": {
+      "Bucket_OnUpdate_E297838E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate/Default",
-            "uniqueId": "cloudBucket_onupdate_34404C29"
+            "path": "root/Default/Default/Bucket/OnUpdate/Default",
+            "uniqueId": "Bucket_OnUpdate_E297838E"
           }
         },
-        "name": "onupdate-c8223d47"
+        "name": "OnUpdate-c81749ea"
       }
     },
     "aws_sns_topic_policy": {
-      "cloudBucket_oncreate_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_C1C190D3": {
+      "Bucket_OnCreate_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_E9DA9F8C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate/PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447",
-            "uniqueId": "cloudBucket_oncreate_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_C1C190D3"
+            "path": "root/Default/Default/Bucket/OnCreate/PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a",
+            "uniqueId": "Bucket_OnCreate_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_E9DA9F8C"
           }
         },
-        "arn": "${aws_sns_topic.cloudBucket_oncreate_BF58CCF3.arn}",
-        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.cloudBucket_oncreate_BF58CCF3.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.cloudBucket.arn}\"}}}]}"
+        "arn": "${aws_sns_topic.Bucket_OnCreate_9682272C.arn}",
+        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.Bucket_OnCreate_9682272C.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.Bucket.arn}\"}}}]}"
       },
-      "cloudBucket_ondelete_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_F136B625": {
+      "Bucket_OnDelete_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_89434C6B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete/PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447",
-            "uniqueId": "cloudBucket_ondelete_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_F136B625"
+            "path": "root/Default/Default/Bucket/OnDelete/PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a",
+            "uniqueId": "Bucket_OnDelete_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_89434C6B"
           }
         },
-        "arn": "${aws_sns_topic.cloudBucket_ondelete_5C7719AC.arn}",
-        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.cloudBucket_ondelete_5C7719AC.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.cloudBucket.arn}\"}}}]}"
+        "arn": "${aws_sns_topic.Bucket_OnDelete_0EB7243C.arn}",
+        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.Bucket_OnDelete_0EB7243C.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.Bucket.arn}\"}}}]}"
       },
-      "cloudBucket_onupdate_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_76578151": {
+      "Bucket_OnUpdate_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_9BF3340C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate/PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447",
-            "uniqueId": "cloudBucket_onupdate_PublishPermission-c87175e7bebeddc2b07a15f76241cf54a4d755b447_76578151"
+            "path": "root/Default/Default/Bucket/OnUpdate/PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a",
+            "uniqueId": "Bucket_OnUpdate_PublishPermission-c88fdc5f491a51d8438235500a4821fbc31357ca3a_9BF3340C"
           }
         },
-        "arn": "${aws_sns_topic.cloudBucket_onupdate_34404C29.arn}",
-        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.cloudBucket_onupdate_34404C29.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.cloudBucket.arn}\"}}}]}"
+        "arn": "${aws_sns_topic.Bucket_OnUpdate_E297838E.arn}",
+        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.Bucket_OnUpdate_E297838E.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.Bucket.arn}\"}}}]}"
       }
     },
     "aws_sns_topic_subscription": {
-      "cloudBucket_oncreate_TopicSubscription0_EFE36EE4": {
+      "Bucket_OnCreate_TopicSubscription0_A2B42747": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate/TopicSubscription0",
-            "uniqueId": "cloudBucket_oncreate_TopicSubscription0_EFE36EE4"
+            "path": "root/Default/Default/Bucket/OnCreate/TopicSubscription0",
+            "uniqueId": "Bucket_OnCreate_TopicSubscription0_A2B42747"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudBucket_oncreate-OnMessage0_0B1CA993.arn}",
+        "endpoint": "${aws_lambda_function.Bucket_OnCreate-OnMessage0_4C972FB4.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudBucket_oncreate_BF58CCF3.arn}"
+        "topic_arn": "${aws_sns_topic.Bucket_OnCreate_9682272C.arn}"
       },
-      "cloudBucket_oncreate_TopicSubscription1_EF79F340": {
+      "Bucket_OnCreate_TopicSubscription1_8F485EA8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/oncreate/TopicSubscription1",
-            "uniqueId": "cloudBucket_oncreate_TopicSubscription1_EF79F340"
+            "path": "root/Default/Default/Bucket/OnCreate/TopicSubscription1",
+            "uniqueId": "Bucket_OnCreate_TopicSubscription1_8F485EA8"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudBucket_oncreate-OnMessage1_46B1E9AC.arn}",
+        "endpoint": "${aws_lambda_function.Bucket_OnCreate-OnMessage1_18599D01.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudBucket_oncreate_BF58CCF3.arn}"
+        "topic_arn": "${aws_sns_topic.Bucket_OnCreate_9682272C.arn}"
       },
-      "cloudBucket_ondelete_TopicSubscription0_F0771109": {
+      "Bucket_OnDelete_TopicSubscription0_4D741190": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete/TopicSubscription0",
-            "uniqueId": "cloudBucket_ondelete_TopicSubscription0_F0771109"
+            "path": "root/Default/Default/Bucket/OnDelete/TopicSubscription0",
+            "uniqueId": "Bucket_OnDelete_TopicSubscription0_4D741190"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudBucket_ondelete-OnMessage0_31BC8C5B.arn}",
+        "endpoint": "${aws_lambda_function.Bucket_OnDelete-OnMessage0_BBD3A051.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudBucket_ondelete_5C7719AC.arn}"
+        "topic_arn": "${aws_sns_topic.Bucket_OnDelete_0EB7243C.arn}"
       },
-      "cloudBucket_ondelete_TopicSubscription1_012F51D5": {
+      "Bucket_OnDelete_TopicSubscription1_8362A2BD": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/ondelete/TopicSubscription1",
-            "uniqueId": "cloudBucket_ondelete_TopicSubscription1_012F51D5"
+            "path": "root/Default/Default/Bucket/OnDelete/TopicSubscription1",
+            "uniqueId": "Bucket_OnDelete_TopicSubscription1_8362A2BD"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudBucket_ondelete-OnMessage1_97EDDB9C.arn}",
+        "endpoint": "${aws_lambda_function.Bucket_OnDelete-OnMessage1_A17F4764.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudBucket_ondelete_5C7719AC.arn}"
+        "topic_arn": "${aws_sns_topic.Bucket_OnDelete_0EB7243C.arn}"
       },
-      "cloudBucket_onupdate_TopicSubscription0_C5A4C94D": {
+      "Bucket_OnUpdate_TopicSubscription0_6ECDED15": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate/TopicSubscription0",
-            "uniqueId": "cloudBucket_onupdate_TopicSubscription0_C5A4C94D"
+            "path": "root/Default/Default/Bucket/OnUpdate/TopicSubscription0",
+            "uniqueId": "Bucket_OnUpdate_TopicSubscription0_6ECDED15"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudBucket_onupdate-OnMessage0_7E23A21E.arn}",
+        "endpoint": "${aws_lambda_function.Bucket_OnUpdate-OnMessage0_ABC5042C.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudBucket_onupdate_34404C29.arn}"
+        "topic_arn": "${aws_sns_topic.Bucket_OnUpdate_E297838E.arn}"
       },
-      "cloudBucket_onupdate_TopicSubscription1_257D0F81": {
+      "Bucket_OnUpdate_TopicSubscription1_3F3174F8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/onupdate/TopicSubscription1",
-            "uniqueId": "cloudBucket_onupdate_TopicSubscription1_257D0F81"
+            "path": "root/Default/Default/Bucket/OnUpdate/TopicSubscription1",
+            "uniqueId": "Bucket_OnUpdate_TopicSubscription1_3F3174F8"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudBucket_onupdate-OnMessage1_AD4C1239.arn}",
+        "endpoint": "${aws_lambda_function.Bucket_OnUpdate-OnMessage1_A9787FC1.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudBucket_onupdate_34404C29.arn}"
+        "topic_arn": "${aws_sns_topic.Bucket_OnUpdate_E297838E.arn}"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_test_sim.md
index a01bd845d09..09f4ba4baf2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/events.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ events.test.wsim » root/env0/hitCount is incremented according to the bucket event
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_compile_tf-aws.md
index d016d8ad91f..6c160682628 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_test_sim.md
index a0ced367eb7..d5fa94ef344 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/exists.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ exists.test.wsim » root/env0/test:exists
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/get.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/get.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..ee3ae6ed087
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/get.test.w_compile_tf-aws.md
@@ -0,0 +1,35 @@
+# [get.test.w](../../../../../../examples/tests/sdk_tests/bucket/get.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/get.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/get.test.w_test_sim.md
new file mode 100644
index 00000000000..34cb9db1213
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/get.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [get.test.w](../../../../../../examples/tests/sdk_tests/bucket/get.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ get.test.wsim » root/env0/test:get range of an object
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_compile_tf-aws.md
index 1eb14eac9eb..f95c803b170 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_test_sim.md
index e5300ee8b0a..9b0c839d9c5 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/load_test.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ load_test.test.wsim » root/env0/test:uploading many objects
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_compile_tf-aws.md
index 72b9834eb8c..ebe3bc13b71 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_test_sim.md
index 5ca81c27b08..6a32d4c18d4 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/metadata.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ metadata.test.wsim » root/env0/test:metadata()
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_compile_tf-aws.md
index edf4597de99..24ef70aad31 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_test_sim.md
index 74646308436..108760bead3 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/public_url.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ public_url.test.wsim » root/env0/test:publicUrl
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_compile_tf-aws.md
index beca9e9d0ac..b7d5f0c24cf 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_test_sim.md
index 341f1b7ab0f..796824167ad 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ put.test.wsim » root/env0/test:put
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_compile_tf-aws.md
index 0fa11fed5dc..ac7d745cd28 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_test_sim.md
index f3d5631a71d..7023148ab35 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/put_json.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ put_json.test.wsim » root/env0/test:putJson
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/rename.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/rename.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..ec66ecf7068
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/rename.test.w_compile_tf-aws.md
@@ -0,0 +1,35 @@
+# [rename.test.w](../../../../../../examples/tests/sdk_tests/bucket/rename.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/rename.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/rename.test.w_test_sim.md
new file mode 100644
index 00000000000..a0d42f21b3c
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/rename.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [rename.test.w](../../../../../../examples/tests/sdk_tests/bucket/rename.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ rename.test.wsim » root/env0/test:rename()
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_compile_tf-aws.md
index c9cbb196cde..6001289d985 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,46 +18,16 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "testBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/testBucket/Default",
-            "uniqueId": "testBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "testbucket-c869e710-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
-    },
-    "aws_s3_bucket_policy": {
-      "testBucket_PublicPolicy_109D3538": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/testBucket/PublicPolicy",
-            "uniqueId": "testBucket_PublicPolicy_109D3538"
-          }
-        },
-        "bucket": "${aws_s3_bucket.testBucket.bucket}",
-        "depends_on": [
-          "aws_s3_bucket_public_access_block.testBucket_PublicAccessBlock_98049E5D"
-        ],
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":[\"s3:GetObject\"],\"Resource\":[\"${aws_s3_bucket.testBucket.arn}/*\"]}]}"
-      }
-    },
-    "aws_s3_bucket_public_access_block": {
-      "testBucket_PublicAccessBlock_98049E5D": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/testBucket/PublicAccessBlock",
-            "uniqueId": "testBucket_PublicAccessBlock_98049E5D"
-          }
-        },
-        "block_public_acls": false,
-        "block_public_policy": false,
-        "bucket": "${aws_s3_bucket.testBucket.bucket}",
-        "ignore_public_acls": false,
-        "restrict_public_buckets": false
-      }
     }
   }
 }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_test_sim.md
index 58c3a8983d5..ff67856cb45 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/signed_url.test.w_test_sim.md
@@ -2,19 +2,11 @@
 
 ## stdout.log
 ```log
-runtime error: Resource root/env0/testBucket does not support inflight operation signedUrl (requested by root/env0/test:signedUrl/Handler).
+Error: Resource root/env0/Bucket does not support inflight operation signedUrl.
 It might not be implemented yet.
-  --> signed_url.test.w:7:18
-  | 
-  | let testBucket = new cloud.Bucket(public: true) as "testBucket";
-  | 
-7 | test "signedUrl" {
-  |                  ^
-at _registerOnLift (<ABSOLUTE>:LINE:COL)
-at (<ABSOLUTE>:LINE:COL)
- 
- 
+
 Tests 1 unsupported (1)
+Snapshots 1 skipped
 Test Files 1 unsupported (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_compile_tf-aws.md
index 85399298596..2fa8598b48c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_test_sim.md
index ab11b9fc123..4c6b19c9da8 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_delete.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ try_delete.test.wsim » root/env0/test:tryDelete
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_compile_tf-aws.md
index 2e9eda6acaf..df48dc834e2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_test_sim.md
index b1a33e7a9db..9b3351c0005 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ try_get.test.wsim » root/env0/test:tryGet
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_compile_tf-aws.md
index ecd4c346549..ca4e8be7014 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_test_sim.md
index d8314a5ab28..152b9096bc7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/bucket/try_get_json.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ try_get_json.test.wsim » root/env0/test:tryGetJson
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/build-failure.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/build-failure.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..d14f0f16ef3
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/build-failure.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [build-failure.test.w](../../../../../../examples/tests/sdk_tests/container/build-failure.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/build-failure.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/build-failure.test.w_test_sim.md
new file mode 100644
index 00000000000..4e2a98e3300
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/build-failure.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [build-failure.test.w](../../../../../../examples/tests/sdk_tests/container/build-failure.test.w) | test | sim
+
+## stdout.log
+```log
+[ERROR] (no test) | Error: Failed to start container: Command "docker build" exited with non-zero code 1 (see verbose logs)
+pass ─ build-failure.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/container.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/container.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..a2fe48a7876
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/container.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [container.test.w](../../../../../../examples/tests/sdk_tests/container/container.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/container.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/container.test.w_test_sim.md
new file mode 100644
index 00000000000..709d96238a6
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/container.test.w_test_sim.md
@@ -0,0 +1,18 @@
+# [container.test.w](../../../../../../examples/tests/sdk_tests/container/container.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] get echo | bang
+[INFO] get echo | 
+[INFO] get app | Hello, Wingnuts!
+[WARNING] get echo | Timeout waiting for container root/env0/my-app to shutdown, removing forcefully
+[WARNING] get app | Timeout waiting for container root/env1/my-app to shutdown, removing forcefully
+pass ─ container.test.wsim » root/env0/test:get echo
+pass ─ container.test.wsim » root/env1/test:get app 
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/entrypoint.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/entrypoint.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..6ccd60a89d0
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/entrypoint.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [entrypoint.test.w](../../../../../../examples/tests/sdk_tests/container/entrypoint.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/entrypoint.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/entrypoint.test.w_test_sim.md
new file mode 100644
index 00000000000..ac93580ae7a
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/entrypoint.test.w_test_sim.md
@@ -0,0 +1,14 @@
+# [entrypoint.test.w](../../../../../../examples/tests/sdk_tests/container/entrypoint.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] container with entrypoint | hello
+[WARNING] container with entrypoint | Timeout waiting for container root/env0/with-entrypoint to shutdown, removing forcefully
+pass ─ entrypoint.test.wsim » root/env0/test:container with entrypoint
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/mount.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/mount.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..b6049bac43e
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/mount.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [mount.test.w](../../../../../../examples/tests/sdk_tests/container/mount.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/mount.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/mount.test.w_test_sim.md
new file mode 100644
index 00000000000..95a38ddb3bf
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/mount.test.w_test_sim.md
@@ -0,0 +1,14 @@
+# [mount.test.w](../../../../../../examples/tests/sdk_tests/container/mount.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] my test | dummy test
+[WARNING] my test | Timeout waiting for container root/env0/Container to shutdown, removing forcefully
+pass ─ mount.test.wsim » root/env0/test:my test
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/network.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/network.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..0792b86c89c
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/network.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [network.test.w](../../../../../../examples/tests/sdk_tests/container/network.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/network.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/network.test.w_test_sim.md
new file mode 100644
index 00000000000..5f0ce89db94
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/network.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [network.test.w](../../../../../../examples/tests/sdk_tests/container/network.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ network.test.wsim » root/env0/test:container with host network
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/pull-failure.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/pull-failure.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..3040813d746
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/pull-failure.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [pull-failure.test.w](../../../../../../examples/tests/sdk_tests/container/pull-failure.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/pull-failure.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/pull-failure.test.w_test_sim.md
new file mode 100644
index 00000000000..7a01a226695
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/container/pull-failure.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [pull-failure.test.w](../../../../../../examples/tests/sdk_tests/container/pull-failure.test.w) | test | sim
+
+## stdout.log
+```log
+[ERROR] (no test) | Error: Failed to start container: Command "docker pull" exited with non-zero code 1 (see verbose logs)
+pass ─ pull-failure.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_compile_tf-aws.md
index 69843409be0..feb65cfa25a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_test_sim.md
index 543b9cc9875..328dec56c09 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/aws-counter.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ aws-counter.test.wsim » root/env0/test:validates the AWS counter name
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_compile_tf-aws.md
index e714616281c..0705c097ef1 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,28 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "counter1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/counter1/Default",
+            "uniqueId": "counter1"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-counter1-c8e8f5f5"
+      },
+      "counter2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/counter2/Default",
+            "uniqueId": "counter2"
           }
         },
         "attribute": [
@@ -46,7 +50,7 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-counter2-c863f110"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_test_sim.md
index b4c8b0e21ea..b1b8c5f428a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/dec.test.w_test_sim.md
@@ -2,11 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ dec.test.wsim » root/env0/test:dec    
-pass ─ dec.test.wsim » root/env1/test:key dec
- 
- 
-Tests 2 passed (2)
+pass ─ dec.test.wsim » root/env0/test:dec()
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_compile_tf-aws.md
index b8ea881cb91..2b66def874c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,28 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "counter1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/counter1/Default",
+            "uniqueId": "counter1"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-counter1-c8e8f5f5"
+      },
+      "counter2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/counter2/Default",
+            "uniqueId": "counter2"
           }
         },
         "attribute": [
@@ -46,7 +50,7 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-counter2-c863f110"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_test_sim.md
index fd0c31a94c8..81d28a9777c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/inc.test.w_test_sim.md
@@ -2,11 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ inc.test.wsim » root/env0/test:inc    
-pass ─ inc.test.wsim » root/env1/test:key inc
- 
- 
-Tests 2 passed (2)
+pass ─ inc.test.wsim » root/env0/test:inc()
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_compile_tf-aws.md
index 087126060d9..7b2a248d66c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_test_sim.md
index b16d69a766e..ba862ed5984 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/initial.test.w_test_sim.md
@@ -2,12 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ initial.test.wsim » root/env0/test:initial:default       
-pass ─ initial.test.wsim » root/env1/test:initial:positive-value
-pass ─ initial.test.wsim » root/env2/test:initial:negative-value
- 
- 
-Tests 3 passed (3)
+pass ─ initial.test.wsim » root/env0/test:initial
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_compile_tf-aws.md
index 4cd640c2400..74e68f778f2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,11 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -46,7 +33,7 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_test_sim.md
index 3ef9582238e..f28b0c751f2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/peek.test.w_test_sim.md
@@ -2,11 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ peek.test.wsim » root/env0/test:peek    
-pass ─ peek.test.wsim » root/env1/test:key peek
- 
- 
-Tests 2 passed (2)
+pass ─ peek.test.wsim » root/env0/test:peek
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_compile_tf-aws.md
index 72bbfa373c0..5cadc6586ee 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,28 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "counter1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/counter1/Default",
+            "uniqueId": "counter1"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-counter1-c8e8f5f5"
+      },
+      "counter2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/counter2/Default",
+            "uniqueId": "counter2"
           }
         },
         "attribute": [
@@ -46,7 +50,7 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-counter2-c863f110"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_test_sim.md
index 38a02047d64..1894da33402 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/counter/set.test.w_test_sim.md
@@ -2,11 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ set.test.wsim » root/env0/test:set    
-pass ─ set.test.wsim » root/env1/test:key set
- 
- 
-Tests 2 passed (2)
+pass ─ set.test.wsim » root/env0/test:set()
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws-dynamodb.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws-dynamodb.test.w_compile_tf-aws.md
deleted file mode 100644
index 5dfbdff5f3c..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws-dynamodb.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# [aws-dynamodb.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/aws-dynamodb.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "aws-wing-dynamodb": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-dynamodb/Default",
-            "uniqueId": "aws-wing-dynamodb"
-          }
-        },
-        "attribute": [
-          {
-            "name": "k1",
-            "type": "S"
-          },
-          {
-            "name": "k2",
-            "type": "S"
-          }
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "k1",
-        "name": "test1aws-wing-dynamodb-c8eda51e",
-        "range_key": "k2"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws-dynamodb.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws-dynamodb.test.w_test_sim.md
deleted file mode 100644
index cdd09c2cae9..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws-dynamodb.test.w_test_sim.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# [aws-dynamodb.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/aws-dynamodb.test.w) | test | sim
-
-## stderr.log
-```log
-Error: No such object: amazon/dynamodb-local:2.0.0
-
-```
-
-## stdout.log
-```log
-pass ─ aws-dynamodb.test.wsim » root/env0/test:validates the AWS DynamodbTable
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws_dynamodb.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws_dynamodb.test.w_compile_tf-aws.md
deleted file mode 100644
index 445474de23e..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws_dynamodb.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# [aws_dynamodb.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/aws_dynamodb.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "aws-wing-dynamodb": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-dynamodb/Default",
-            "uniqueId": "aws-wing-dynamodb"
-          }
-        },
-        "attribute": [
-          {
-            "name": "k1",
-            "type": "S"
-          },
-          {
-            "name": "k2",
-            "type": "S"
-          }
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "k1",
-        "name": "test1aws-wing-dynamodb-c8eda51e",
-        "range_key": "k2"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws_dynamodb.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws_dynamodb.test.w_test_sim.md
deleted file mode 100644
index ce223b61936..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/aws_dynamodb.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [aws_dynamodb.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/aws_dynamodb.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ aws_dynamodb.test.wsim » root/env0/test:validates the AWS dynamodb name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w_compile_tf-aws.md
deleted file mode 100644
index 86eefc621df..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# [inner_aws_dynamodb.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "aws-wing-dynamodb": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-dynamodb/Default",
-            "uniqueId": "aws-wing-dynamodb"
-          }
-        },
-        "attribute": [
-          {
-            "name": "k1",
-            "type": "S"
-          },
-          {
-            "name": "k2",
-            "type": "S"
-          }
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "k1",
-        "name": "test1aws-wing-dynamodb-c8eda51e",
-        "range_key": "k2"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w_test_sim.md
deleted file mode 100644
index 36061c5648b..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [inner_aws_dynamodb.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/inner_aws_dynamodb.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ inner_aws_dynamodb.test.wsim » root/env0/test:validates the AWS dynamodb name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/query.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/query.test.w_compile_tf-aws.md
deleted file mode 100644
index fa740811b6f..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/query.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# [query.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/query.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "exDynamodbTable": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.DynamodbTable/Default",
-            "uniqueId": "exDynamodbTable"
-          }
-        },
-        "attribute": [
-          {
-            "name": "k1",
-            "type": "S"
-          },
-          {
-            "name": "k2",
-            "type": "S"
-          }
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "k1",
-        "name": "test1ex.DynamodbTable-c8d9b5e7",
-        "range_key": "k2"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/query.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/query.test.w_test_sim.md
deleted file mode 100644
index 5544d1834c5..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/query.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [query.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/query.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ query.test.wsim » root/env0/test:query
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/transaction.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/transaction.test.w_compile_tf-aws.md
deleted file mode 100644
index 7dc1d9abe64..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/transaction.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# [transaction.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/transaction.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "exDynamodbTable": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.DynamodbTable/Default",
-            "uniqueId": "exDynamodbTable"
-          }
-        },
-        "attribute": [
-          {
-            "name": "k1",
-            "type": "S"
-          },
-          {
-            "name": "k2",
-            "type": "S"
-          }
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "k1",
-        "name": "test1ex.DynamodbTable-c8d9b5e7",
-        "range_key": "k2"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/transaction.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/transaction.test.w_test_sim.md
deleted file mode 100644
index 2a06bd28ab0..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/dynamodb-table/transaction.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [transaction.test.w](../../../../../../examples/tests/sdk_tests/dynamodb-table/transaction.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ transaction.test.wsim » root/env0/test:transactWriteItems
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/endpoint/url.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/endpoint/url.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..8cfafdae611
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/endpoint/url.test.w_compile_tf-aws.md
@@ -0,0 +1,232 @@
+# [url.test.w](../../../../../../examples/tests/sdk_tests/endpoint/url.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+      "root": {
+        "Default": {
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            },
+            "Endpoint": {
+              "Url": "Endpoint_Url_8925A732"
+            }
+          }
+        }
+      }
+    }
+  },
+  "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
+    "aws_region": {
+      "Region": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Region",
+            "uniqueId": "Region"
+          }
+        }
+      }
+    }
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    },
+    "Endpoint_Url_8925A732": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    }
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
+        }
+      }
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
+          }
+        },
+        "body": "{\"paths\":{\"/\":{\"get\":{\"operationId\":\"get\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c8f613f0"
+      }
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod"
+      }
+    },
+    "aws_cloudwatch_log_group": {
+      "Api_get_0_CloudwatchLogGroup_196DE719": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_0_CloudwatchLogGroup_196DE719"
+          }
+        },
+        "name": "/aws/lambda/get_0-c86d29bb",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Api_get_0_IamRole_2FAC475D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/IamRole",
+            "uniqueId": "Api_get_0_IamRole_2FAC475D"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Api_get_0_IamRolePolicy_D9FB373B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/IamRolePolicy",
+            "uniqueId": "Api_get_0_IamRolePolicy_D9FB373B"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Api_get_0_IamRolePolicyAttachment_AEF1DC01": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_0_IamRolePolicyAttachment_AEF1DC01"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Api_get_0_244A7BA4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/Default",
+            "uniqueId": "Api_get_0_244A7BA4"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_0-c86d29bb",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_0-c86d29bb",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_0_IamRole_2FAC475D.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_0_S3Object_D1844823.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Api_api_permission-GET-c2e3ffa8_5BF93889": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-c2e3ffa8",
+            "uniqueId": "Api_api_permission-GET-c2e3ffa8_5BF93889"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_0_244A7BA4.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-c2e3ffa8"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Api_get_0_S3Object_D1844823": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/S3Object",
+            "uniqueId": "Api_get_0_S3Object_D1844823"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/endpoint/url.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/endpoint/url.test.w_test_sim.md
new file mode 100644
index 00000000000..57a8d35b146
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/endpoint/url.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [url.test.w](../../../../../../examples/tests/sdk_tests/endpoint/url.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ url.test.wsim » root/env0/test:access endpoint url
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.main.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.main.w_compile_tf-aws.md
deleted file mode 100644
index c7f0686fe7d..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.main.w_compile_tf-aws.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# [assert.main.w](../../../../../../examples/tests/sdk_tests/expect/assert.main.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.main.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.main.w_test_sim.md
deleted file mode 100644
index 730a3a21027..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.main.w_test_sim.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# [assert.main.w](../../../../../../examples/tests/sdk_tests/expect/assert.main.w) | test | sim
-
-## stdout.log
-```log
-pass ─ assert.main.wsim » root/env0/test:equal num             
-pass ─ assert.main.wsim » root/env1/test:equal str             
-pass ─ assert.main.wsim » root/env2/test:equal bool            
-pass ─ assert.main.wsim » root/env3/test:equal array of strings
-pass ─ assert.main.wsim » root/env4/test:equal array of numbers
-pass ─ assert.main.wsim » root/env5/test:equal objects         
-pass ─ assert.main.wsim » root/env6/test:equal maps            
-pass ─ assert.main.wsim » root/env7/test:equal sets            
-pass ─ assert.main.wsim » root/env8/test:equal durations       
- 
- 
-Tests 9 passed (9)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_compile_tf-aws.md
index d6e581900a3..bd71c72efd9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_test_sim.md
index 5838c474927..6c952495aa8 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/expect/assert.test.w_test_sim.md
@@ -2,18 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ assert.test.wsim » root/env0/test:equal num             
-pass ─ assert.test.wsim » root/env1/test:equal str             
-pass ─ assert.test.wsim » root/env2/test:equal bool            
-pass ─ assert.test.wsim » root/env3/test:equal array of strings
-pass ─ assert.test.wsim » root/env4/test:equal array of numbers
-pass ─ assert.test.wsim » root/env5/test:equal objects         
-pass ─ assert.test.wsim » root/env6/test:equal maps            
-pass ─ assert.test.wsim » root/env7/test:equal sets            
-pass ─ assert.test.wsim » root/env8/test:equal durations       
- 
- 
-Tests 9 passed (9)
+pass ─ assert.test.wsim » root/env0/test:expect
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_compile_tf-aws.md
index 2032374d4b0..fd604ff7062 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_test_sim.md
index 3cb83adcb56..5eadfc1810b 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/basic.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ basic.test.wsim » root/env0/test:inflight file basic operations
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_compile_tf-aws.md
index 8bfe6660685..52745c95589 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_test_sim.md
index 05f0d5afa27..26172ca2310 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/directory.test.w_test_sim.md
@@ -5,9 +5,9 @@
 pass ─ directory.test.wsim » root/env0/test:inflight create normal directory      
 pass ─ directory.test.wsim » root/env1/test:cannot overwrite directory with a file
 pass ─ directory.test.wsim » root/env2/test:isDir()                               
- 
- 
+
 Tests 3 passed (3)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_compile_tf-aws.md
index 7d248237ee2..87290338185 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_test_sim.md
index ffff39d9299..96173bcc060 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/json.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ json.test.wsim » root/env0/test:inflight json operations
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_compile_tf-aws.md
index 867e130e55f..71047db945e 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_test_sim.md
index 6bab08773c8..6b480b364bf 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/options.test.w_test_sim.md
@@ -6,9 +6,9 @@ pass ─ options.test.wsim » root/env0/test:write and read file with `encoding`
 pass ─ options.test.wsim » root/env1/test:write file with `flag` option                              
 pass ─ options.test.wsim » root/env2/test:removing non-existent file with `force: false` raises error
 pass ─ options.test.wsim » root/env3/test:removing directory with `recursive: false` raises error    
- 
- 
+
 Tests 4 passed (4)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_compile_tf-aws.md
index c2eec132bea..273a3cc8ccb 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_test_sim.md
index 350e6e4f9f5..d1b9c57b79e 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/path.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ path.test.wsim » root/env0/test:inflight path conversion
 pass ─ path.test.wsim » root/env1/test:extension()             
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_compile_tf-aws.md
index fc330e0e6ff..03508d048ab 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_test_sim.md
index 6ea7c7335bd..0bc5a8bdaaf 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/stat.test.w_test_sim.md
@@ -5,9 +5,9 @@
 pass ─ stat.test.wsim » root/env0/test:metadata()       
 pass ─ stat.test.wsim » root/env1/test:symlinkMetadata()
 pass ─ stat.test.wsim » root/env2/test:setPermissions() 
- 
- 
+
 Tests 3 passed (3)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_compile_tf-aws.md
index 394007fa601..14e6e8b858c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_test_sim.md
index 11f19e414e0..d257751fc1d 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/temp_dir.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ temp_dir.test.wsim » root/env0/test:inflight create temporary directory
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_compile_tf-aws.md
index c5e9a6349be..5b23bd3dad9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_test_sim.md
index 7bb710c4ea5..aca42dabbd2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/fs/yaml.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ yaml.test.wsim » root/env0/test:inflight yaml operations
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_compile_tf-aws.md
index c0166c5353c..c35fb9840c5 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,6 +18,16 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
+      "FunctionAccessingContext_CloudwatchLogGroup_A7EDE513": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionAccessingContext/CloudwatchLogGroup",
+            "uniqueId": "FunctionAccessingContext_CloudwatchLogGroup_A7EDE513"
+          }
+        },
+        "name": "/aws/lambda/FunctionAccessingContext-c84d6117",
+        "retention_in_days": 30
+      },
       "aws-wing-function_CloudwatchLogGroup_2CCFCD44": {
         "//": {
           "metadata": {
@@ -43,6 +40,15 @@
       }
     },
     "aws_iam_role": {
+      "FunctionAccessingContext_IamRole_6926384F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionAccessingContext/IamRole",
+            "uniqueId": "FunctionAccessingContext_IamRole_6926384F"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
       "aws-wing-function_IamRole_705FDD7E": {
         "//": {
           "metadata": {
@@ -54,6 +60,16 @@
       }
     },
     "aws_iam_role_policy": {
+      "FunctionAccessingContext_IamRolePolicy_80298DED": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionAccessingContext/IamRolePolicy",
+            "uniqueId": "FunctionAccessingContext_IamRolePolicy_80298DED"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.FunctionAccessingContext_IamRole_6926384F.name}"
+      },
       "aws-wing-function_IamRolePolicy_CF2194BD": {
         "//": {
           "metadata": {
@@ -66,6 +82,16 @@
       }
     },
     "aws_iam_role_policy_attachment": {
+      "FunctionAccessingContext_IamRolePolicyAttachment_5D73CD5C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionAccessingContext/IamRolePolicyAttachment",
+            "uniqueId": "FunctionAccessingContext_IamRolePolicyAttachment_5D73CD5C"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.FunctionAccessingContext_IamRole_6926384F.name}"
+      },
       "aws-wing-function_IamRolePolicyAttachment_F788B7D7": {
         "//": {
           "metadata": {
@@ -78,6 +104,37 @@
       }
     },
     "aws_lambda_function": {
+      "FunctionAccessingContext": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionAccessingContext/Default",
+            "uniqueId": "FunctionAccessingContext"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "FunctionAccessingContext-c84d6117",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "FunctionAccessingContext-c84d6117",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.FunctionAccessingContext_IamRole_6926384F.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.FunctionAccessingContext_S3Object_FCA6F30A.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
       "aws-wing-function": {
         "//": {
           "metadata": {
@@ -100,7 +157,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.aws-wing-function_IamRole_705FDD7E.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.aws-wing-function_S3Object_9678073C.key}",
         "timeout": 60,
@@ -122,6 +179,17 @@
       }
     },
     "aws_s3_object": {
+      "FunctionAccessingContext_S3Object_FCA6F30A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionAccessingContext/S3Object",
+            "uniqueId": "FunctionAccessingContext_S3Object_FCA6F30A"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
       "aws-wing-function_S3Object_9678073C": {
         "//": {
           "metadata": {
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_test_sim.md
index c355aa3956d..2f9b4ca05a9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws-function.test.w_test_sim.md
@@ -2,10 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ aws-function.test.wsim » root/env0/test:validates the AWS Function
- 
- 
+pass ─ aws-function.test.wsim » root/env0/test:AWS Function
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws_function.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws_function.test.w_compile_tf-aws.md
deleted file mode 100644
index d9c249c67cb..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws_function.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,140 +0,0 @@
-# [aws_function.test.w](../../../../../../examples/tests/sdk_tests/function/aws_function.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "aws-wing-function_CloudwatchLogGroup_2CCFCD44": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/CloudwatchLogGroup",
-            "uniqueId": "aws-wing-function_CloudwatchLogGroup_2CCFCD44"
-          }
-        },
-        "name": "/aws/lambda/aws-wing-function-c8f4cdef",
-        "retention_in_days": 30
-      }
-    },
-    "aws_iam_role": {
-      "aws-wing-function_IamRole_705FDD7E": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/IamRole",
-            "uniqueId": "aws-wing-function_IamRole_705FDD7E"
-          }
-        },
-        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
-      }
-    },
-    "aws_iam_role_policy": {
-      "aws-wing-function_IamRolePolicy_CF2194BD": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/IamRolePolicy",
-            "uniqueId": "aws-wing-function_IamRolePolicy_CF2194BD"
-          }
-        },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.aws-wing-function_IamRole_705FDD7E.name}"
-      }
-    },
-    "aws_iam_role_policy_attachment": {
-      "aws-wing-function_IamRolePolicyAttachment_F788B7D7": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/IamRolePolicyAttachment",
-            "uniqueId": "aws-wing-function_IamRolePolicyAttachment_F788B7D7"
-          }
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.aws-wing-function_IamRole_705FDD7E.name}"
-      }
-    },
-    "aws_lambda_function": {
-      "aws-wing-function": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/Default",
-            "uniqueId": "aws-wing-function"
-          }
-        },
-        "architectures": [
-          "arm64"
-        ],
-        "environment": {
-          "variables": {
-            "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "aws-wing-function-c8f4cdef",
-            "WING_TARGET": "tf-aws"
-          }
-        },
-        "function_name": "aws-wing-function-c8f4cdef",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "${aws_iam_role.aws-wing-function_IamRole_705FDD7E.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.aws-wing-function_S3Object_9678073C.key}",
-        "timeout": 60,
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": []
-        }
-      }
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
-          }
-        },
-        "bucket_prefix": "code-c84a50b1-"
-      }
-    },
-    "aws_s3_object": {
-      "aws-wing-function_S3Object_9678073C": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/S3Object",
-            "uniqueId": "aws-wing-function_S3Object_9678073C"
-          }
-        },
-        "bucket": "${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws_function.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws_function.test.w_test_sim.md
deleted file mode 100644
index 6815752bc1c..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/aws_function.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [aws_function.test.w](../../../../../../examples/tests/sdk_tests/function/aws_function.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ aws_function.test.wsim » root/env0/test:validates the AWS function name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/concurrency.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/concurrency.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..e18a196c5f3
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/concurrency.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [concurrency.test.w](../../../../../../examples/tests/sdk_tests/function/concurrency.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/concurrency.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/concurrency.test.w_test_sim.md
new file mode 100644
index 00000000000..5523f01f53e
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/concurrency.test.w_test_sim.md
@@ -0,0 +1,14 @@
+# [concurrency.test.w](../../../../../../examples/tests/sdk_tests/function/concurrency.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] queue applies backpressure to functions with limited concurrency | c: 3
+pass ─ concurrency.test.wsim » root/env0/test:f1 concurrency limit reached                                    
+pass ─ concurrency.test.wsim » root/env1/test:queue applies backpressure to functions with limited concurrency
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_compile_tf-aws.md
index 622d46ba1d7..dcc67738bc2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,58 +18,58 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudFunction_CloudwatchLogGroup_7399B890": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "cloudFunction_CloudwatchLogGroup_7399B890"
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d2eca1",
+        "name": "/aws/lambda/Function-c852aba6",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudFunction_IamRole_5A4430DC": {
+      "Function_IamRole_678BE84C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRole",
-            "uniqueId": "cloudFunction_IamRole_5A4430DC"
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudFunction_IamRolePolicy_618BF987": {
+      "Function_IamRolePolicy_E3B26607": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicy",
-            "uniqueId": "cloudFunction_IamRolePolicy_618BF987"
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudFunction_IamRolePolicyAttachment_288B9653": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "cloudFunction_IamRolePolicyAttachment_288B9653"
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudFunction": {
+      "Function": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/Default",
-            "uniqueId": "cloudFunction"
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
           }
         },
         "architectures": [
@@ -93,18 +80,18 @@
             "FOO1": "bar",
             "FOO2": "baz",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d2eca1",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d2eca1",
+        "function_name": "Function-c852aba6",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudFunction_S3Object_71908BAD.key}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -124,11 +111,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudFunction_S3Object_71908BAD": {
+      "Function_S3Object_C62A0C2D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/S3Object",
-            "uniqueId": "cloudFunction_S3Object_71908BAD"
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_test_sim.md
index c5fa4bcb9a3..3700c1d6b57 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/env.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ env.test.wsim » root/env0/test:addEnvironment
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/function-ref.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/function-ref.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..2519193814a
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/function-ref.test.w_compile_tf-aws.md
@@ -0,0 +1,311 @@
+# [function-ref.test.w](../../../../../../examples/tests/sdk_tests/function/function-ref.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "FunctionRef_AwsConsoleField_Handler_CloudwatchLogGroup_581C1C72": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/AwsConsoleField/Handler/CloudwatchLogGroup",
+            "uniqueId": "FunctionRef_AwsConsoleField_Handler_CloudwatchLogGroup_581C1C72"
+          }
+        },
+        "name": "/aws/lambda/Handler-c89bc30b",
+        "retention_in_days": 30
+      },
+      "FunctionRef_FunctionArnField_Handler_CloudwatchLogGroup_E3CD3CB7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/FunctionArnField/Handler/CloudwatchLogGroup",
+            "uniqueId": "FunctionRef_FunctionArnField_Handler_CloudwatchLogGroup_E3CD3CB7"
+          }
+        },
+        "name": "/aws/lambda/Handler-c8f37d21",
+        "retention_in_days": 30
+      },
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
+          }
+        },
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "FunctionRef_AwsConsoleField_Handler_IamRole_8EE0F0F7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/AwsConsoleField/Handler/IamRole",
+            "uniqueId": "FunctionRef_AwsConsoleField_Handler_IamRole_8EE0F0F7"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "FunctionRef_FunctionArnField_Handler_IamRole_87E7076C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/FunctionArnField/Handler/IamRole",
+            "uniqueId": "FunctionRef_FunctionArnField_Handler_IamRole_87E7076C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "Function_IamRole_678BE84C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "FunctionRef_AwsConsoleField_Handler_IamRolePolicy_30297616": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/AwsConsoleField/Handler/IamRolePolicy",
+            "uniqueId": "FunctionRef_AwsConsoleField_Handler_IamRolePolicy_30297616"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.FunctionRef_AwsConsoleField_Handler_IamRole_8EE0F0F7.name}"
+      },
+      "FunctionRef_FunctionArnField_Handler_IamRolePolicy_977A3750": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/FunctionArnField/Handler/IamRolePolicy",
+            "uniqueId": "FunctionRef_FunctionArnField_Handler_IamRolePolicy_977A3750"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.FunctionRef_FunctionArnField_Handler_IamRole_87E7076C.name}"
+      },
+      "Function_IamRolePolicy_E3B26607": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "FunctionRef_AwsConsoleField_Handler_IamRolePolicyAttachment_43AA1BA7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/AwsConsoleField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "FunctionRef_AwsConsoleField_Handler_IamRolePolicyAttachment_43AA1BA7"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.FunctionRef_AwsConsoleField_Handler_IamRole_8EE0F0F7.name}"
+      },
+      "FunctionRef_FunctionArnField_Handler_IamRolePolicyAttachment_CDD3A846": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/FunctionArnField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "FunctionRef_FunctionArnField_Handler_IamRolePolicyAttachment_CDD3A846"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.FunctionRef_FunctionArnField_Handler_IamRole_87E7076C.name}"
+      },
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "FunctionRef_AwsConsoleField_Handler_69607D0B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/AwsConsoleField/Handler/Default",
+            "uniqueId": "FunctionRef_AwsConsoleField_Handler_69607D0B"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Handler-c89bc30b",
+            "WING_TARGET": "tf-aws",
+            "WING_TOKEN_TFTOKEN_TOKEN_15": "${jsonencode(aws_lambda_function.Function.arn)}"
+          }
+        },
+        "function_name": "Handler-c89bc30b",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.FunctionRef_AwsConsoleField_Handler_IamRole_8EE0F0F7.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.FunctionRef_AwsConsoleField_Handler_S3Object_B6D5E5AC.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "FunctionRef_FunctionArnField_Handler_929A1EF9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/FunctionArnField/Handler/Default",
+            "uniqueId": "FunctionRef_FunctionArnField_Handler_929A1EF9"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Handler-c8f37d21",
+            "WING_TARGET": "tf-aws",
+            "WING_TOKEN_TFTOKEN_TOKEN_15": "${jsonencode(aws_lambda_function.Function.arn)}"
+          }
+        },
+        "function_name": "Handler-c8f37d21",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.FunctionRef_FunctionArnField_Handler_IamRole_87E7076C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.FunctionRef_FunctionArnField_Handler_S3Object_EA8F335F.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "FunctionRef_AwsConsoleField_Handler_S3Object_B6D5E5AC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/AwsConsoleField/Handler/S3Object",
+            "uniqueId": "FunctionRef_AwsConsoleField_Handler_S3Object_B6D5E5AC"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "FunctionRef_FunctionArnField_Handler_S3Object_EA8F335F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/FunctionRef/FunctionArnField/Handler/S3Object",
+            "uniqueId": "FunctionRef_FunctionArnField_Handler_S3Object_EA8F335F"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "Function_S3Object_C62A0C2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/function-ref.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/function-ref.test.w_test_sim.md
new file mode 100644
index 00000000000..62d1e9da70c
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/function-ref.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [function-ref.test.w](../../../../../../examples/tests/sdk_tests/function/function-ref.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ function-ref.test.wsim » root/env0/test:functionArn returns the arn                                                 
+pass ─ function-ref.test.wsim » root/env1/test:invoke() sends a request to aws, fails because we are using a dummy function
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/inner_aws_function.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/inner_aws_function.test.w_compile_tf-aws.md
deleted file mode 100644
index 547af31a3d4..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/inner_aws_function.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,140 +0,0 @@
-# [inner_aws_function.test.w](../../../../../../examples/tests/sdk_tests/function/inner_aws_function.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_cloudwatch_log_group": {
-      "aws-wing-function_CloudwatchLogGroup_2CCFCD44": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/CloudwatchLogGroup",
-            "uniqueId": "aws-wing-function_CloudwatchLogGroup_2CCFCD44"
-          }
-        },
-        "name": "/aws/lambda/aws-wing-function-c8f4cdef",
-        "retention_in_days": 30
-      }
-    },
-    "aws_iam_role": {
-      "aws-wing-function_IamRole_705FDD7E": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/IamRole",
-            "uniqueId": "aws-wing-function_IamRole_705FDD7E"
-          }
-        },
-        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
-      }
-    },
-    "aws_iam_role_policy": {
-      "aws-wing-function_IamRolePolicy_CF2194BD": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/IamRolePolicy",
-            "uniqueId": "aws-wing-function_IamRolePolicy_CF2194BD"
-          }
-        },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.aws-wing-function_IamRole_705FDD7E.name}"
-      }
-    },
-    "aws_iam_role_policy_attachment": {
-      "aws-wing-function_IamRolePolicyAttachment_F788B7D7": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/IamRolePolicyAttachment",
-            "uniqueId": "aws-wing-function_IamRolePolicyAttachment_F788B7D7"
-          }
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.aws-wing-function_IamRole_705FDD7E.name}"
-      }
-    },
-    "aws_lambda_function": {
-      "aws-wing-function": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/Default",
-            "uniqueId": "aws-wing-function"
-          }
-        },
-        "architectures": [
-          "arm64"
-        ],
-        "environment": {
-          "variables": {
-            "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "aws-wing-function-c8f4cdef",
-            "WING_TARGET": "tf-aws"
-          }
-        },
-        "function_name": "aws-wing-function-c8f4cdef",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "${aws_iam_role.aws-wing-function_IamRole_705FDD7E.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.aws-wing-function_S3Object_9678073C.key}",
-        "timeout": 60,
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": []
-        }
-      }
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
-          }
-        },
-        "bucket_prefix": "code-c84a50b1-"
-      }
-    },
-    "aws_s3_object": {
-      "aws-wing-function_S3Object_9678073C": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-function/S3Object",
-            "uniqueId": "aws-wing-function_S3Object_9678073C"
-          }
-        },
-        "bucket": "${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/inner_aws_function.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/inner_aws_function.test.w_test_sim.md
deleted file mode 100644
index 52960ebd0cf..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/inner_aws_function.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [inner_aws_function.test.w](../../../../../../examples/tests/sdk_tests/function/inner_aws_function.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ inner_aws_function.test.wsim » root/env0/test:validates the AWS function name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_compile_tf-aws.md
index f68876e4042..9596a7ffdef 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,58 +18,198 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudFunction_CloudwatchLogGroup_7399B890": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
+          }
+        },
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30
+      },
+      "f2_CloudwatchLogGroup_D231AE41": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/CloudwatchLogGroup",
+            "uniqueId": "f2_CloudwatchLogGroup_D231AE41"
+          }
+        },
+        "name": "/aws/lambda/f2-c812cd39",
+        "retention_in_days": 30
+      },
+      "f3_CloudwatchLogGroup_6427B63E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "cloudFunction_CloudwatchLogGroup_7399B890"
+            "path": "root/Default/Default/f3/CloudwatchLogGroup",
+            "uniqueId": "f3_CloudwatchLogGroup_6427B63E"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d2eca1",
+        "name": "/aws/lambda/f3-c8555a7c",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudFunction_IamRole_5A4430DC": {
+      "Function_IamRole_678BE84C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "f2_IamRole_B66911B2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/IamRole",
+            "uniqueId": "f2_IamRole_B66911B2"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "f3_IamRole_72675FA1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRole",
-            "uniqueId": "cloudFunction_IamRole_5A4430DC"
+            "path": "root/Default/Default/f3/IamRole",
+            "uniqueId": "f3_IamRole_72675FA1"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudFunction_IamRolePolicy_618BF987": {
+      "Function_IamRolePolicy_E3B26607": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicy",
-            "uniqueId": "cloudFunction_IamRolePolicy_618BF987"
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      },
+      "f2_IamRolePolicy_4B68F2E2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/IamRolePolicy",
+            "uniqueId": "f2_IamRolePolicy_4B68F2E2"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.f2_IamRole_B66911B2.name}"
+      },
+      "f3_IamRolePolicy_92FF1F39": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f3/IamRolePolicy",
+            "uniqueId": "f3_IamRolePolicy_92FF1F39"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.f3_IamRole_72675FA1.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudFunction_IamRolePolicyAttachment_288B9653": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      },
+      "f2_IamRolePolicyAttachment_E65452F9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/IamRolePolicyAttachment",
+            "uniqueId": "f2_IamRolePolicyAttachment_E65452F9"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.f2_IamRole_B66911B2.name}"
+      },
+      "f3_IamRolePolicyAttachment_1D6B7824": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "cloudFunction_IamRolePolicyAttachment_288B9653"
+            "path": "root/Default/Default/f3/IamRolePolicyAttachment",
+            "uniqueId": "f3_IamRolePolicyAttachment_1D6B7824"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.f3_IamRole_72675FA1.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudFunction": {
+      "Function": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "f2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/Default",
+            "uniqueId": "f2"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "f2-c812cd39",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "f2-c812cd39",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.f2_IamRole_B66911B2.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.f2_S3Object_ABE842D7.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "f3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/Default",
-            "uniqueId": "cloudFunction"
+            "path": "root/Default/Default/f3/Default",
+            "uniqueId": "f3"
           }
         },
         "architectures": [
@@ -91,18 +218,18 @@
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d2eca1",
+            "WING_FUNCTION_NAME": "f3-c8555a7c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d2eca1",
+        "function_name": "f3-c8555a7c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.f3_IamRole_72675FA1.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudFunction_S3Object_71908BAD.key}",
+        "s3_key": "${aws_s3_object.f3_S3Object_ED65218A.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -122,11 +249,33 @@
       }
     },
     "aws_s3_object": {
-      "cloudFunction_S3Object_71908BAD": {
+      "Function_S3Object_C62A0C2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "f2_S3Object_ABE842D7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/S3Object",
+            "uniqueId": "f2_S3Object_ABE842D7"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "f3_S3Object_ED65218A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/S3Object",
-            "uniqueId": "cloudFunction_S3Object_71908BAD"
+            "path": "root/Default/Default/f3/S3Object",
+            "uniqueId": "f3_S3Object_ED65218A"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_test_sim.md
index d815c824fb0..9224154fdf5 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke.test.w_test_sim.md
@@ -3,13 +3,15 @@
 ## stdout.log
 ```log
 log preflight
-pass ┌ invoke.test.wsim » root/env0/test:invoke
-     │ log inside test
-     └ log inside function
-contains 2 lines
- 
- 
+[INFO] invoke | log inside test
+[INFO] invoke | log inside function
+[INFO] invoke | contains 2 lines
+[INFO] invoke | no event, no return!
+[INFO] invoke | bang!
+pass ─ invoke.test.wsim » root/env0/test:invoke
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke_async.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke_async.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..4c068818e22
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke_async.test.w_compile_tf-aws.md
@@ -0,0 +1,147 @@
+# [invoke_async.test.w](../../../../../../examples/tests/sdk_tests/function/invoke_async.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
+          }
+        },
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "Function_IamRole_678BE84C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Function_IamRolePolicy_E3B26607": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Function_S3Object_C62A0C2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke_async.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke_async.test.w_test_sim.md
new file mode 100644
index 00000000000..99727d13e3b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/invoke_async.test.w_test_sim.md
@@ -0,0 +1,15 @@
+# [invoke_async.test.w](../../../../../../examples/tests/sdk_tests/function/invoke_async.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] invoke() waits for function to finish | log inside fn
+[INFO] invokeAsync() returns without waiting for the function finishes | log inside fn
+pass ─ invoke_async.test.wsim » root/env0/test:invoke() waits for function to finish                          
+pass ─ invoke_async.test.wsim » root/env1/test:invokeAsync() returns without waiting for the function finishes
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_compile_tf-aws.md
index 5043884c180..5497f3536e4 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -139,7 +126,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.f1_IamRole_FD68C58F.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.f1_S3Object_9A84AD47.key}",
         "timeout": 60,
@@ -171,7 +158,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.f2_IamRole_B66911B2.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.f2_S3Object_ABE842D7.key}",
         "timeout": 60,
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_test_sim.md
index e2d6a3d1223..092d7fe53cd 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/logging.test.w_test_sim.md
@@ -2,18 +2,18 @@
 
 ## stdout.log
 ```log
-pass ┌ logging.test.wsim » root/env0/test:logging
-     │ hello world
-     │ log inside f1
-     │ log inside f2
-     │ log inside f1
-     │ hello world
-     │ log inside f1
-     │ log inside f2
-     └ log inside f1
- 
- 
+[INFO] logging | hello world
+[INFO] logging | log inside f1
+[INFO] logging | log inside f2
+[INFO] logging | log inside f1
+[INFO] logging | hello world
+[INFO] logging | log inside f1
+[INFO] logging | log inside f2
+[INFO] logging | log inside f1
+pass ─ logging.test.wsim » root/env0/test:logging
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_compile_tf-aws.md
index ade26e4843a..0b3aa6739d6 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -53,11 +40,11 @@
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -68,7 +55,7 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     },
     "aws_iam_role": {
@@ -99,7 +86,7 @@
             "uniqueId": "envfn_IamRolePolicy_63955289"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
         "role": "${aws_iam_role.envfn_IamRole_88E952E6.name}"
       },
       "memoryfn_IamRolePolicy_5DA20EF5": {
@@ -109,7 +96,7 @@
             "uniqueId": "memoryfn_IamRolePolicy_5DA20EF5"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
         "role": "${aws_iam_role.memoryfn_IamRole_87751238.name}"
       }
     },
@@ -148,7 +135,7 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
             "WING_FUNCTION_NAME": "env-fn-c8a226dd",
             "WING_TARGET": "tf-aws",
@@ -161,7 +148,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.envfn_IamRole_88E952E6.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.envfn_S3Object_0080F00E.key}",
         "timeout": 60,
@@ -182,7 +169,7 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
             "WING_FUNCTION_NAME": "memory-fn-c844bdf7",
             "WING_TARGET": "tf-aws"
@@ -193,7 +180,7 @@
         "memory_size": 128,
         "publish": true,
         "role": "${aws_iam_role.memoryfn_IamRole_87751238.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.memoryfn_S3Object_3B51C445.key}",
         "timeout": 60,
@@ -204,24 +191,24 @@
       }
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "code-c84a50b1-"
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
+        "bucket_prefix": "code-c84a50b1-"
       }
     },
     "aws_s3_object": {
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_test_sim.md
index 00982affc8d..10fd7d58c5d 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/memory_and_env.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ memory_and_env.test.wsim » root/env0/test:function with memory and function with env can be invoked
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/timeout.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/timeout.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..7628bef06af
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/timeout.test.w_compile_tf-aws.md
@@ -0,0 +1,229 @@
+# [timeout.test.w](../../../../../../examples/tests/sdk_tests/function/timeout.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "functionwith1stimeout_CloudwatchLogGroup_5E37449F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with 1s timeout/CloudwatchLogGroup",
+            "uniqueId": "functionwith1stimeout_CloudwatchLogGroup_5E37449F"
+          }
+        },
+        "name": "/aws/lambda/function-with-1s-timeout-c8d47946",
+        "retention_in_days": 30
+      },
+      "functionwithdefaulttimeout_CloudwatchLogGroup_2A473165": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with default timeout/CloudwatchLogGroup",
+            "uniqueId": "functionwithdefaulttimeout_CloudwatchLogGroup_2A473165"
+          }
+        },
+        "name": "/aws/lambda/function-with-default-timeout-c8c15878",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "functionwith1stimeout_IamRole_C2456C80": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with 1s timeout/IamRole",
+            "uniqueId": "functionwith1stimeout_IamRole_C2456C80"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "functionwithdefaulttimeout_IamRole_E358F68D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with default timeout/IamRole",
+            "uniqueId": "functionwithdefaulttimeout_IamRole_E358F68D"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "functionwith1stimeout_IamRolePolicy_390EF952": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with 1s timeout/IamRolePolicy",
+            "uniqueId": "functionwith1stimeout_IamRolePolicy_390EF952"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.functionwith1stimeout_IamRole_C2456C80.name}"
+      },
+      "functionwithdefaulttimeout_IamRolePolicy_0375C4B5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with default timeout/IamRolePolicy",
+            "uniqueId": "functionwithdefaulttimeout_IamRolePolicy_0375C4B5"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.functionwithdefaulttimeout_IamRole_E358F68D.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "functionwith1stimeout_IamRolePolicyAttachment_66343DEF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with 1s timeout/IamRolePolicyAttachment",
+            "uniqueId": "functionwith1stimeout_IamRolePolicyAttachment_66343DEF"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.functionwith1stimeout_IamRole_C2456C80.name}"
+      },
+      "functionwithdefaulttimeout_IamRolePolicyAttachment_B7B164B0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with default timeout/IamRolePolicyAttachment",
+            "uniqueId": "functionwithdefaulttimeout_IamRolePolicyAttachment_B7B164B0"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.functionwithdefaulttimeout_IamRole_E358F68D.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "functionwith1stimeout": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with 1s timeout/Default",
+            "uniqueId": "functionwith1stimeout"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "function-with-1s-timeout-c8d47946",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "function-with-1s-timeout-c8d47946",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.functionwith1stimeout_IamRole_C2456C80.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.functionwith1stimeout_S3Object_4DCC675D.key}",
+        "timeout": 1,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "functionwithdefaulttimeout": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with default timeout/Default",
+            "uniqueId": "functionwithdefaulttimeout"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "function-with-default-timeout-c8c15878",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "function-with-default-timeout-c8c15878",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.functionwithdefaulttimeout_IamRole_E358F68D.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.functionwithdefaulttimeout_S3Object_6903B193.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "functionwith1stimeout_S3Object_4DCC675D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with 1s timeout/S3Object",
+            "uniqueId": "functionwith1stimeout_S3Object_4DCC675D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "functionwithdefaulttimeout_S3Object_6903B193": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/function with default timeout/S3Object",
+            "uniqueId": "functionwithdefaulttimeout_S3Object_6903B193"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/timeout.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/timeout.test.w_test_sim.md
new file mode 100644
index 00000000000..f72051559e3
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/function/timeout.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [timeout.test.w](../../../../../../examples/tests/sdk_tests/function/timeout.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ timeout.test.wsim » root/env0/function invoke throws on timeout
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/fetch.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/fetch.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..6f1ed792bcb
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/fetch.test.w_compile_tf-aws.md
@@ -0,0 +1,342 @@
+# [fetch.test.w](../../../../../../examples/tests/sdk_tests/http/fetch.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+      "root": {
+        "Default": {
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
+    "aws_region": {
+      "Region": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Region",
+            "uniqueId": "Region"
+          }
+        }
+      }
+    }
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    }
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
+        }
+      }
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
+          }
+        },
+        "body": "{\"paths\":{\"/redirect\":{\"get\":{\"operationId\":\"get-redirect\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_redirect0-c8014f2b/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/target\":{\"get\":{\"operationId\":\"get-target\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_target0-c8691704/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c8f613f0"
+      }
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod"
+      }
+    },
+    "aws_cloudwatch_log_group": {
+      "Api_get_redirect0_CloudwatchLogGroup_241B5139": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_redirect0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_redirect0_CloudwatchLogGroup_241B5139"
+          }
+        },
+        "name": "/aws/lambda/get_redirect0-c8014f2b",
+        "retention_in_days": 30
+      },
+      "Api_get_target0_CloudwatchLogGroup_7566BF70": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_target0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_target0_CloudwatchLogGroup_7566BF70"
+          }
+        },
+        "name": "/aws/lambda/get_target0-c8691704",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Api_get_redirect0_IamRole_C9E5BF5A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_redirect0/IamRole",
+            "uniqueId": "Api_get_redirect0_IamRole_C9E5BF5A"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "Api_get_target0_IamRole_865D04CC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_target0/IamRole",
+            "uniqueId": "Api_get_target0_IamRole_865D04CC"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Api_get_redirect0_IamRolePolicy_63A30C78": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_redirect0/IamRolePolicy",
+            "uniqueId": "Api_get_redirect0_IamRolePolicy_63A30C78"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Api_get_redirect0_IamRole_C9E5BF5A.name}"
+      },
+      "Api_get_target0_IamRolePolicy_575248B9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_target0/IamRolePolicy",
+            "uniqueId": "Api_get_target0_IamRolePolicy_575248B9"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Api_get_target0_IamRole_865D04CC.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Api_get_redirect0_IamRolePolicyAttachment_5ABDB8D1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_redirect0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_redirect0_IamRolePolicyAttachment_5ABDB8D1"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_redirect0_IamRole_C9E5BF5A.name}"
+      },
+      "Api_get_target0_IamRolePolicyAttachment_6DA6B250": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_target0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_target0_IamRolePolicyAttachment_6DA6B250"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_target0_IamRole_865D04CC.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Api_get_redirect0_61A02C26": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_redirect0/Default",
+            "uniqueId": "Api_get_redirect0_61A02C26"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_redirect0-c8014f2b",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_redirect0-c8014f2b",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_redirect0_IamRole_C9E5BF5A.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_redirect0_S3Object_16202317.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "Api_get_target0_6A24458B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_target0/Default",
+            "uniqueId": "Api_get_target0_6A24458B"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_target0-c8691704",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_target0-c8691704",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_target0_IamRole_865D04CC.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_target0_S3Object_0643C629.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Api_api_permission-GET-163e950c_45F5C5BB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-163e950c",
+            "uniqueId": "Api_api_permission-GET-163e950c_45F5C5BB"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_redirect0_61A02C26.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/redirect",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-163e950c"
+      },
+      "Api_api_permission-GET-5fe9bc05_7EDAB6BF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-5fe9bc05",
+            "uniqueId": "Api_api_permission-GET-5fe9bc05_7EDAB6BF"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_target0_6A24458B.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/target",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-5fe9bc05"
+      }
+    },
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      },
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Api_get_redirect0_S3Object_16202317": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_redirect0/S3Object",
+            "uniqueId": "Api_get_redirect0_S3Object_16202317"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "Api_get_target0_S3Object_0643C629": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_target0/S3Object",
+            "uniqueId": "Api_get_target0_S3Object_0643C629"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "Bucket_S3Object-urltxt_54506D60": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/S3Object-url.txt",
+            "uniqueId": "Bucket_S3Object-urltxt_54506D60"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Bucket.bucket}",
+        "content": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}",
+        "key": "url.txt"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/fetch.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/fetch.test.w_test_sim.md
new file mode 100644
index 00000000000..5e16d23acf2
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/fetch.test.w_test_sim.md
@@ -0,0 +1,14 @@
+# [fetch.test.w](../../../../../../examples/tests/sdk_tests/http/fetch.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] redirect is 'follow' by default | I am the target
+pass ─ fetch.test.wsim » root/env0/test:redirect is 'follow' by default
+pass ─ fetch.test.wsim » root/env1/test:redirect 'manual'              
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_compile_tf-aws.md
index e01d5315030..11dade15e49 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_test_sim.md
index a6679c7e522..255e3dca832 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/http/url.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ url.test.wsim » root/env0/test:parseUrl() 
 pass ─ url.test.wsim » root/env1/test:formatUrl()
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_compile_tf-aws.md
index 46f8207d1cd..ed356062800 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_test_sim.md
index d3e51991182..39a77b10a31 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/abs.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ abs.test.wsim » root/env0/test:inflight absolute
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_compile_tf-aws.md
index c1f91de2e89..952c83c2fcd 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_test_sim.md
index c9f9a83c541..eb854c6d277 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acos.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ acos.test.wsim » root/env0/test:inflight arc cosine
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_compile_tf-aws.md
index a4b49ebfd34..a9f3896b988 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_test_sim.md
index 36341e2395d..c39d5ac5a01 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acot.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ acot.test.wsim » root/env0/test:inflight arc cotgent
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_compile_tf-aws.md
index 48a8b2f970b..639eb1189ba 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_test_sim.md
index b7f003ce4be..9f2626e3591 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/acsc.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ acsc.test.wsim » root/env0/test:inflight arc cosecant
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_compile_tf-aws.md
index 99466ed92d5..720373b3260 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_test_sim.md
index 24cbe584d34..4043d378a27 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/angular_conversion.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ angular_conversion.test.wsim » root/env0/test:inflight angular conversions
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_compile_tf-aws.md
index 61392ae20f5..7cd2db97658 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_test_sim.md
index a39a3f44366..8503781463c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asec.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ asec.test.wsim » root/env0/test:inflight arc cosecant
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_compile_tf-aws.md
index 6494b4362f7..adf6f8fe44f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_test_sim.md
index 2edbd5a97bc..c67a5b5dfda 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/asin.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ asin.test.wsim » root/env0/test:inflight arc sine
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_compile_tf-aws.md
index e8befdd3065..6b0c9012781 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_test_sim.md
index 555264f62ec..e6931e93cc2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ atan.test.wsim » root/env0/test:inflight arc tangent
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_compile_tf-aws.md
index 35cd3ceb56b..11f564b8d5f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_test_sim.md
index c4c11d30170..98849718f7d 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/atan2.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ atan2.test.wsim » root/env0/test:inflight arc tangent 2
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_compile_tf-aws.md
index 419c2e96c07..6c8d57efb16 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_test_sim.md
index fd7578a640e..1cade9f29fa 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/combinations.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ combinations.test.wsim » root/env0/test:inflight combinations
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_compile_tf-aws.md
index baa4f9b53bc..db290c3880c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_test_sim.md
index 4e67111f5a9..6b2bafea071 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cos.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ cos.test.wsim » root/env0/test:inflight cosine
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_compile_tf-aws.md
index fa82b09a3a5..1c251e3b1e4 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_test_sim.md
index 2e8f99f942f..205cdb201a9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/cot.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ cot.test.wsim » root/env0/test:inflight cotangent
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_compile_tf-aws.md
index c1a1e100ac2..1e14a4218cb 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_test_sim.md
index d1019d12bfd..a062fb39834 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/csc.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ csc.test.wsim » root/env0/test:inflight cosecant
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_compile_tf-aws.md
index 3a49d7dbb4c..b6bde767c33 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_test_sim.md
index f16435faa1d..2165b841a18 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/euler.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ euler.test.wsim » root/env0/test:EULER
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_compile_tf-aws.md
index b27d52371ff..b5e246b2a0c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_test_sim.md
index 1243d72fc5d..e4c54089171 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/factorial.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ factorial.test.wsim » root/env0/test:inflight factorial
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_compile_tf-aws.md
index f98f04fff24..53fec009700 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_test_sim.md
index f5bad5a7354..53971f4e298 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/fibonacci.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ fibonacci.test.wsim » root/env0/test:inflight fibonacci
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_compile_tf-aws.md
index 3c93a163d3a..9d47857f7d3 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_test_sim.md
index 9d006253474..c0dfae7bd44 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/floor_ceil_round.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ floor_ceil_round.test.wsim » root/env0/test:inflight floor--ceil--round
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_compile_tf-aws.md
index a32bdb3d58d..897585ddfc7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_test_sim.md
index d74a0a79757..866e340beed 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/hypot.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ hypot.test.wsim » root/env0/test:inflight hypot
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..2d4373cff16
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [log.test.w](../../../../../../examples/tests/sdk_tests/math/log.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log.test.w_test_sim.md
new file mode 100644
index 00000000000..7f31dabaeb5
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [log.test.w](../../../../../../examples/tests/sdk_tests/math/log.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ log.test.wsim » root/env0/test:inflight absolute
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log10.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log10.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..d534fafa48b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log10.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [log10.test.w](../../../../../../examples/tests/sdk_tests/math/log10.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log10.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log10.test.w_test_sim.md
new file mode 100644
index 00000000000..515e9542ccc
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log10.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [log10.test.w](../../../../../../examples/tests/sdk_tests/math/log10.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ log10.test.wsim » root/env0/test:inflight absolute
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log2.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log2.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..96d7783948a
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log2.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [log2.test.w](../../../../../../examples/tests/sdk_tests/math/log2.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log2.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log2.test.w_test_sim.md
new file mode 100644
index 00000000000..4288a05af55
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/log2.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [log2.test.w](../../../../../../examples/tests/sdk_tests/math/log2.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ log2.test.wsim » root/env0/test:inflight absolute
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_compile_tf-aws.md
index 2d5df6278e2..58faaa96f84 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_test_sim.md
index d60a03eaba3..d015ad84c24 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/median_mode_mean.test.w_test_sim.md
@@ -5,9 +5,9 @@
 pass ─ median_mode_mean.test.wsim » root/env0/test:inflight median
 pass ─ median_mode_mean.test.wsim » root/env1/test:inflight mode  
 pass ─ median_mode_mean.test.wsim » root/env2/test:inflight mean  
- 
- 
+
 Tests 3 passed (3)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_compile_tf-aws.md
index 936993e18df..40770f93e45 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_test_sim.md
index 311563974f4..fab067b49d5 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/min_max.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ min_max.test.wsim » root/env0/test:inflight min--max
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_compile_tf-aws.md
index 2fce81c6ef7..0103c1d9ad4 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_test_sim.md
index 2b0a3a8d09a..812a43883dc 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/pi.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ pi.test.wsim » root/env0/test:PI
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_compile_tf-aws.md
index 67ee054c645..ba7a74d5dd4 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_test_sim.md
index a6d26352905..99ab6f35608 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/prime.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ prime.test.wsim » root/env0/test:inflight prime numbers
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_compile_tf-aws.md
index a5d26a748e8..17424c6dc92 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_test_sim.md
index af258e24e51..229940cad54 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/random.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ random.test.wsim » root/env0/test:inflight absolute
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_compile_tf-aws.md
index 6bafe6c4d9a..043486fef89 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_test_sim.md
index edaefcf1f02..3b53e9172c1 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sec.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ sec.test.wsim » root/env0/test:inflight secant
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sign.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sign.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..b16b2723c2e
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sign.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [sign.test.w](../../../../../../examples/tests/sdk_tests/math/sign.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sign.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sign.test.w_test_sim.md
new file mode 100644
index 00000000000..839ec24bbec
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sign.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [sign.test.w](../../../../../../examples/tests/sdk_tests/math/sign.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ sign.test.wsim » root/env0/test:inflight absolute
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_compile_tf-aws.md
index e0c46e1eddd..700c24c5e64 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_test_sim.md
index 08a6f431b00..cbf8ea7a85d 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sin.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ sin.test.wsim » root/env0/test:inflight sine
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_compile_tf-aws.md
index d9a99b9aeed..48c9f8d011b 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_test_sim.md
index 935217531b5..9662e2dfc4a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/sqrt.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ sqrt.test.wsim » root/env0/test:inflight square root
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_compile_tf-aws.md
index 36e724b1d35..f337afc2018 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_test_sim.md
index fb2a12ab352..42e909cad81 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tan.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ tan.test.wsim » root/env0/test:inflight tangent
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_compile_tf-aws.md
index fa4ce1f4b6c..271b31e9f58 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_test_sim.md
index 34df2ca8695..60c28d1004c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/tau.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ tau.test.wsim » root/env0/test:TAU
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/toradix.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/toradix.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..ba799558907
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/toradix.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [toradix.test.w](../../../../../../examples/tests/sdk_tests/math/toradix.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/toradix.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/toradix.test.w_test_sim.md
new file mode 100644
index 00000000000..aa56c639954
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/math/toradix.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [toradix.test.w](../../../../../../examples/tests/sdk_tests/math/toradix.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ toradix.test.wsim » root/env0/test:inflight base
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_compile_tf-aws.md
index c6b95112cee..1c7913d381c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_compile_tf-aws.md
@@ -7,19 +7,33 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -32,8 +46,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -43,142 +57,142 @@
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/foo\":{\"get\":{\"operationId\":\"get-foo\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_foo_0_1FC193B8.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/bar\":{\"get\":{\"operationId\":\"get-bar\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_bar_0_7132CABE.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/foo\":{\"get\":{\"operationId\":\"get-foo\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_foo0-c8fedbc0/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/bar\":{\"get\":{\"operationId\":\"get-bar\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_bar0-c8c593ee/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_bar_0_CloudwatchLogGroup_30A6F119": {
+      "Api_get_bar0_CloudwatchLogGroup_94D5A69E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_bar_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_bar_0_CloudwatchLogGroup_30A6F119"
+            "path": "root/Default/Default/Api/get_bar0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_bar0_CloudwatchLogGroup_94D5A69E"
           }
         },
-        "name": "/aws/lambda/get_bar_-0-c8961001",
+        "name": "/aws/lambda/get_bar0-c8c593ee",
         "retention_in_days": 30
       },
-      "cloudApi_get_foo_0_CloudwatchLogGroup_ED1063ED": {
+      "Api_get_foo0_CloudwatchLogGroup_DB4D118A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_foo_0_CloudwatchLogGroup_ED1063ED"
+            "path": "root/Default/Default/Api/get_foo0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_foo0_CloudwatchLogGroup_DB4D118A"
           }
         },
-        "name": "/aws/lambda/get_foo_-0-c8c183c7",
+        "name": "/aws/lambda/get_foo0-c8fedbc0",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_bar_0_IamRole_7740C464": {
+      "Api_get_bar0_IamRole_0AE7D598": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_bar_}0/IamRole",
-            "uniqueId": "cloudApi_get_bar_0_IamRole_7740C464"
+            "path": "root/Default/Default/Api/get_bar0/IamRole",
+            "uniqueId": "Api_get_bar0_IamRole_0AE7D598"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudApi_get_foo_0_IamRole_B5D27436": {
+      "Api_get_foo0_IamRole_B1AE8E5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/IamRole",
-            "uniqueId": "cloudApi_get_foo_0_IamRole_B5D27436"
+            "path": "root/Default/Default/Api/get_foo0/IamRole",
+            "uniqueId": "Api_get_foo0_IamRole_B1AE8E5D"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_bar_0_IamRolePolicy_D5C83F1D": {
+      "Api_get_bar0_IamRolePolicy_7133AAD7": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_bar_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_bar_0_IamRolePolicy_D5C83F1D"
+            "path": "root/Default/Default/Api/get_bar0/IamRolePolicy",
+            "uniqueId": "Api_get_bar0_IamRolePolicy_7133AAD7"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_bar_0_IamRole_7740C464.name}"
+        "role": "${aws_iam_role.Api_get_bar0_IamRole_0AE7D598.name}"
       },
-      "cloudApi_get_foo_0_IamRolePolicy_1AF0974B": {
+      "Api_get_foo0_IamRolePolicy_F8C7A0FA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_foo_0_IamRolePolicy_1AF0974B"
+            "path": "root/Default/Default/Api/get_foo0/IamRolePolicy",
+            "uniqueId": "Api_get_foo0_IamRolePolicy_F8C7A0FA"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.A_cloudBucket_DFCC9367.arn}\",\"${aws_s3_bucket.A_cloudBucket_DFCC9367.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_foo_0_IamRole_B5D27436.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.A_Bucket_EB05527C.arn}\",\"${aws_s3_bucket.A_Bucket_EB05527C.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Api_get_foo0_IamRole_B1AE8E5D.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_bar_0_IamRolePolicyAttachment_1C9C4A76": {
+      "Api_get_bar0_IamRolePolicyAttachment_879A7521": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_bar_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_bar_0_IamRolePolicyAttachment_1C9C4A76"
+            "path": "root/Default/Default/Api/get_bar0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_bar0_IamRolePolicyAttachment_879A7521"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_bar_0_IamRole_7740C464.name}"
+        "role": "${aws_iam_role.Api_get_bar0_IamRole_0AE7D598.name}"
       },
-      "cloudApi_get_foo_0_IamRolePolicyAttachment_6C30798B": {
+      "Api_get_foo0_IamRolePolicyAttachment_1ED86FF6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_foo_0_IamRolePolicyAttachment_6C30798B"
+            "path": "root/Default/Default/Api/get_foo0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_foo0_IamRolePolicyAttachment_1ED86FF6"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_foo_0_IamRole_B5D27436.name}"
+        "role": "${aws_iam_role.Api_get_foo0_IamRole_B1AE8E5D.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_bar_0_7132CABE": {
+      "Api_get_bar0_28E127E8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_bar_}0/Default",
-            "uniqueId": "cloudApi_get_bar_0_7132CABE"
+            "path": "root/Default/Default/Api/get_bar0/Default",
+            "uniqueId": "Api_get_bar0_28E127E8"
           }
         },
         "architectures": [
@@ -186,31 +200,31 @@
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_5c35566c": "${aws_s3_bucket.A_cloudBucket_DFCC9367.bucket}",
+            "BUCKET_NAME_8cb07fb3": "${aws_s3_bucket.A_Bucket_EB05527C.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_bar_-0-c8961001",
+            "WING_FUNCTION_NAME": "get_bar0-c8c593ee",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_bar_-0-c8961001",
+        "function_name": "get_bar0-c8c593ee",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_bar_0_IamRole_7740C464.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_bar0_IamRole_0AE7D598.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_bar_0_S3Object_412B6C4E.key}",
+        "s3_key": "${aws_s3_object.Api_get_bar0_S3Object_CBF78AB9.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudApi_get_foo_0_1FC193B8": {
+      "Api_get_foo0_2DF5B57F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/Default",
-            "uniqueId": "cloudApi_get_foo_0_1FC193B8"
+            "path": "root/Default/Default/Api/get_foo0/Default",
+            "uniqueId": "Api_get_foo0_2DF5B57F"
           }
         },
         "architectures": [
@@ -218,20 +232,20 @@
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_5c35566c": "${aws_s3_bucket.A_cloudBucket_DFCC9367.bucket}",
+            "BUCKET_NAME_8cb07fb3": "${aws_s3_bucket.A_Bucket_EB05527C.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_foo_-0-c8c183c7",
+            "WING_FUNCTION_NAME": "get_foo0-c8fedbc0",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_foo_-0-c8c183c7",
+        "function_name": "get_foo0-c8fedbc0",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_foo_0_IamRole_B5D27436.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_foo0_IamRole_B1AE8E5D.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_foo_0_S3Object_E859AED1.key}",
+        "s3_key": "${aws_s3_object.Api_get_foo0_S3Object_A8BEB597.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -240,42 +254,42 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-2d589ee9_3D8411D8": {
+      "Api_api_permission-GET-2d589ee9_E7DEBAD5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-2d589ee9",
-            "uniqueId": "cloudApi_api_permission-GET-2d589ee9_3D8411D8"
+            "path": "root/Default/Default/Api/api/permission-GET-2d589ee9",
+            "uniqueId": "Api_api_permission-GET-2d589ee9_E7DEBAD5"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_bar_0_7132CABE.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_bar0_28E127E8.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/bar",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/bar",
         "statement_id": "AllowExecutionFromAPIGateway-GET-2d589ee9"
       },
-      "cloudApi_api_permission-GET-4273ae49_974F3EC5": {
+      "Api_api_permission-GET-4273ae49_725CFBAA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-4273ae49",
-            "uniqueId": "cloudApi_api_permission-GET-4273ae49_974F3EC5"
+            "path": "root/Default/Default/Api/api/permission-GET-4273ae49",
+            "uniqueId": "Api_api_permission-GET-4273ae49_725CFBAA"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_foo_0_1FC193B8.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_foo0_2DF5B57F.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/foo",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/foo",
         "statement_id": "AllowExecutionFromAPIGateway-GET-4273ae49"
       }
     },
     "aws_s3_bucket": {
-      "A_cloudBucket_DFCC9367": {
+      "A_Bucket_EB05527C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Bucket/Default",
-            "uniqueId": "A_cloudBucket_DFCC9367"
+            "path": "root/Default/Default/A/Bucket/Default",
+            "uniqueId": "A_Bucket_EB05527C"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8eec589-",
+        "bucket_prefix": "bucket-c8e1d537-",
         "force_destroy": false
       },
       "Code": {
@@ -289,22 +303,22 @@
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_bar_0_S3Object_412B6C4E": {
+      "Api_get_bar0_S3Object_CBF78AB9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_bar_}0/S3Object",
-            "uniqueId": "cloudApi_get_bar_0_S3Object_412B6C4E"
+            "path": "root/Default/Default/Api/get_bar0/S3Object",
+            "uniqueId": "Api_get_bar0_S3Object_CBF78AB9"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudApi_get_foo_0_S3Object_E859AED1": {
+      "Api_get_foo0_S3Object_A8BEB597": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/S3Object",
-            "uniqueId": "cloudApi_get_foo_0_S3Object_E859AED1"
+            "path": "root/Default/Default/Api/get_foo0/S3Object",
+            "uniqueId": "Api_get_foo0_S3Object_A8BEB597"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_test_sim.md
index dd80e688bc1..b265668d818 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/misc/empty-actions.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ empty-actions.test.wsim » root/env0/test:main
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_compile_tf-aws.md
index 3260618584e..c0393e01129 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_compile_tf-aws.md
@@ -7,17 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
+    "outputs": {}
   },
   "data": {
     "aws_lambda_invocation": {
@@ -53,11 +45,6 @@
       }
     }
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
   "provider": {
     "aws": [
       {}
@@ -87,11 +74,11 @@
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -102,7 +89,7 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     },
     "aws_iam_role": {
@@ -133,7 +120,7 @@
             "uniqueId": "init1_Function_IamRolePolicy_19694F39"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
         "role": "${aws_iam_role.init1_Function_IamRole_3B884CB0.name}"
       },
       "init2_Function_IamRolePolicy_BC283A7E": {
@@ -143,7 +130,7 @@
             "uniqueId": "init2_Function_IamRolePolicy_BC283A7E"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
         "role": "${aws_iam_role.init2_Function_IamRole_A05B341B.name}"
       }
     },
@@ -182,7 +169,7 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
             "WING_FUNCTION_NAME": "Function-c899c2a8",
             "WING_TARGET": "tf-aws"
@@ -193,7 +180,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.init1_Function_IamRole_3B884CB0.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.init1_Function_S3Object_EFA6F99F.key}",
         "timeout": 60,
@@ -214,7 +201,7 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
             "WING_FUNCTION_NAME": "Function-c86c3d88",
             "WING_TARGET": "tf-aws"
@@ -225,7 +212,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.init2_Function_IamRole_A05B341B.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.init2_Function_S3Object_8A53C74F.key}",
         "timeout": 60,
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_test_sim.md
index 0ce5b263ceb..bce6d44bb57 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/on_deploy/execute_after.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ execute_after.test.wsim » root/env0/test:counter
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_compile_tf-aws.md
index 66f6559fba9..d73d3909dbc 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_test_sim.md
index 65651f8e8c7..5423eeb77f3 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws-queue.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ aws-queue.test.wsim » root/env0/test:validates the AWS queue name
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws_queue.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws_queue.test.w_compile_tf-aws.md
deleted file mode 100644
index bc75bbe9752..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws_queue.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# [aws_queue.test.w](../../../../../../examples/tests/sdk_tests/queue/aws_queue.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_sqs_queue": {
-      "aws-wing-queue": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-queue/Default",
-            "uniqueId": "aws-wing-queue"
-          }
-        },
-        "message_retention_seconds": 3600,
-        "name": "aws-wing-queue-c87f4487",
-        "visibility_timeout_seconds": 30
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws_queue.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws_queue.test.w_test_sim.md
deleted file mode 100644
index 51e5565ce5d..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/aws_queue.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [aws_queue.test.w](../../../../../../examples/tests/sdk_tests/queue/aws_queue.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ aws_queue.test.wsim » root/env0/test:validates the AWS queue name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/dead-letter-queue.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/dead-letter-queue.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..74d09daa612
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/dead-letter-queue.test.w_compile_tf-aws.md
@@ -0,0 +1,307 @@
+# [dead-letter-queue.test.w](../../../../../../examples/tests/sdk_tests/queue/dead-letter-queue.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "queuewithoutretries-SetConsumer0_CloudwatchLogGroup_9265B40C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "queuewithoutretries-SetConsumer0_CloudwatchLogGroup_9265B40C"
+          }
+        },
+        "name": "/aws/lambda/queue-without-retries-SetConsumer0-c8ba2958",
+        "retention_in_days": 30
+      },
+      "queuewithretries-SetConsumer0_CloudwatchLogGroup_98D9A088": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "queuewithretries-SetConsumer0_CloudwatchLogGroup_98D9A088"
+          }
+        },
+        "name": "/aws/lambda/queue-with-retries-SetConsumer0-c82b1a26",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "queuewithoutretries-SetConsumer0_IamRole_F76F585E": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries-SetConsumer0/IamRole",
+            "uniqueId": "queuewithoutretries-SetConsumer0_IamRole_F76F585E"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "queuewithretries-SetConsumer0_IamRole_B95C0A26": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries-SetConsumer0/IamRole",
+            "uniqueId": "queuewithretries-SetConsumer0_IamRole_B95C0A26"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "queuewithoutretries-SetConsumer0_IamRolePolicy_2603CFA0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries-SetConsumer0/IamRolePolicy",
+            "uniqueId": "queuewithoutretries-SetConsumer0_IamRolePolicy_2603CFA0"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.queuewithoutretries.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.queuewithoutretries-SetConsumer0_IamRole_F76F585E.name}"
+      },
+      "queuewithretries-SetConsumer0_IamRolePolicy_245846E1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries-SetConsumer0/IamRolePolicy",
+            "uniqueId": "queuewithretries-SetConsumer0_IamRolePolicy_245846E1"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.queuewithretries.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.queuewithretries-SetConsumer0_IamRole_B95C0A26.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "queuewithoutretries-SetConsumer0_IamRolePolicyAttachment_559EECE4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "queuewithoutretries-SetConsumer0_IamRolePolicyAttachment_559EECE4"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.queuewithoutretries-SetConsumer0_IamRole_F76F585E.name}"
+      },
+      "queuewithretries-SetConsumer0_IamRolePolicyAttachment_831C8294": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "queuewithretries-SetConsumer0_IamRolePolicyAttachment_831C8294"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.queuewithretries-SetConsumer0_IamRole_B95C0A26.name}"
+      }
+    },
+    "aws_lambda_event_source_mapping": {
+      "queuewithoutretries_EventSourceMapping_963C2B4C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries/EventSourceMapping",
+            "uniqueId": "queuewithoutretries_EventSourceMapping_963C2B4C"
+          }
+        },
+        "batch_size": 1,
+        "event_source_arn": "${aws_sqs_queue.queuewithoutretries.arn}",
+        "function_name": "${aws_lambda_function.queuewithoutretries-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
+      },
+      "queuewithretries_EventSourceMapping_A0EC80F3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries/EventSourceMapping",
+            "uniqueId": "queuewithretries_EventSourceMapping_A0EC80F3"
+          }
+        },
+        "batch_size": 1,
+        "event_source_arn": "${aws_sqs_queue.queuewithretries.arn}",
+        "function_name": "${aws_lambda_function.queuewithretries-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
+      }
+    },
+    "aws_lambda_function": {
+      "queuewithoutretries-SetConsumer0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries-SetConsumer0/Default",
+            "uniqueId": "queuewithoutretries-SetConsumer0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "queue-without-retries-SetConsumer0-c8ba2958",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "queue-without-retries-SetConsumer0-c8ba2958",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.queuewithoutretries-SetConsumer0_IamRole_F76F585E.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.queuewithoutretries-SetConsumer0_S3Object_ECD1395D.key}",
+        "timeout": "${aws_sqs_queue.queuewithoutretries.visibility_timeout_seconds}",
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "queuewithretries-SetConsumer0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries-SetConsumer0/Default",
+            "uniqueId": "queuewithretries-SetConsumer0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "queue-with-retries-SetConsumer0-c82b1a26",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "queue-with-retries-SetConsumer0-c82b1a26",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.queuewithretries-SetConsumer0_IamRole_B95C0A26.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.queuewithretries-SetConsumer0_S3Object_29ED03EE.key}",
+        "timeout": "${aws_sqs_queue.queuewithretries.visibility_timeout_seconds}",
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "queuewithoutretries-SetConsumer0_S3Object_ECD1395D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries-SetConsumer0/S3Object",
+            "uniqueId": "queuewithoutretries-SetConsumer0_S3Object_ECD1395D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "queuewithretries-SetConsumer0_S3Object_29ED03EE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries-SetConsumer0/S3Object",
+            "uniqueId": "queuewithretries-SetConsumer0_S3Object_29ED03EE"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    },
+    "aws_sqs_queue": {
+      "dlqwithoutretries": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/dlq without retries/Default",
+            "uniqueId": "dlqwithoutretries"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "dlq-without-retries-c83c0330",
+        "visibility_timeout_seconds": 30
+      },
+      "dlqwithretries": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/dlq with retries/Default",
+            "uniqueId": "dlqwithretries"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "dlq-with-retries-c877f5c7",
+        "visibility_timeout_seconds": 30
+      },
+      "queuewithoutretries": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue without retries/Default",
+            "uniqueId": "queuewithoutretries"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "queue-without-retries-c8a5001c",
+        "redrive_policy": "{\"deadLetterTargetArn\":\"${aws_sqs_queue.dlqwithoutretries.arn}\",\"maxReceiveCount\":1}",
+        "visibility_timeout_seconds": 30
+      },
+      "queuewithretries": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/queue with retries/Default",
+            "uniqueId": "queuewithretries"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "queue-with-retries-c8a06dc7",
+        "redrive_policy": "{\"deadLetterTargetArn\":\"${aws_sqs_queue.dlqwithretries.arn}\",\"maxReceiveCount\":2}",
+        "visibility_timeout_seconds": 30
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/dead-letter-queue.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/dead-letter-queue.test.w_test_sim.md
new file mode 100644
index 00000000000..f35d5d2ed2d
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/dead-letter-queue.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [dead-letter-queue.test.w](../../../../../../examples/tests/sdk_tests/queue/dead-letter-queue.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ dead-letter-queue.test.wsim » root/env0/one execution and send fail message to dead-letter queue                 
+pass ─ dead-letter-queue.test.wsim » root/env1/one execution, two retries and send the fail message to dead-letter queue
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/inner_aws_queue.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/inner_aws_queue.test.w_compile_tf-aws.md
deleted file mode 100644
index 493241a0747..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/inner_aws_queue.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# [inner_aws_queue.test.w](../../../../../../examples/tests/sdk_tests/queue/inner_aws_queue.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_sqs_queue": {
-      "aws-wing-queue": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-queue/Default",
-            "uniqueId": "aws-wing-queue"
-          }
-        },
-        "message_retention_seconds": 3600,
-        "name": "aws-wing-queue-c87f4487",
-        "visibility_timeout_seconds": 30
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/inner_aws_queue.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/inner_aws_queue.test.w_test_sim.md
deleted file mode 100644
index 0465b231323..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/inner_aws_queue.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [inner_aws_queue.test.w](../../../../../../examples/tests/sdk_tests/queue/inner_aws_queue.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ inner_aws_queue.test.wsim » root/env0/test:validates the AWS queue name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_compile_tf-aws.md
index 67f36b12202..f688c872133 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,15 +18,15 @@
   },
   "resource": {
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 3
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_test_sim.md
index 060952bdffa..4ea249092bf 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/pop.test.w_test_sim.md
@@ -2,11 +2,20 @@
 
 ## stdout.log
 ```log
-pass ─ pop.test.wsim » root/env0/test:pop
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
+Error: Queue.timeout is not supported on the sim platform yet.
+For more information see: https://github.com/winglang/wing/issues/1980.
+Contributions welcome ❤️
+  --> pop.test.w:5:9
+  | bring util;
+  | 
+  | let timeout = 3s;
+5 | let q = new cloud.Queue(timeout: timeout);
+  |         ^
+at <ABSOLUTE>/pop.test.w:5:9
+
+Tests 1 unsupported (1)
+Snapshots 1 skipped
+Test Files 1 unsupported (1)
 Duration <DURATION>
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_compile_tf-aws.md
index 23af5a34c26..5a16918438b 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,15 +18,15 @@
   },
   "resource": {
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_test_sim.md
index 31c0b1f6e57..c7d1d49879a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/purge.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ purge.test.wsim » root/env0/test:purge
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_compile_tf-aws.md
index 27f2d4d4369..f70ffc92a1f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,15 +18,15 @@
   },
   "resource": {
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_test_sim.md
index 737ce141ad7..a4bd738a6a5 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/push.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ push.test.wsim » root/env0/push
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/queue-ref.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/queue-ref.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..94a40a2c55b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/queue-ref.test.w_compile_tf-aws.md
@@ -0,0 +1,504 @@
+# [queue-ref.test.w](../../../../../../examples/tests/sdk_tests/queue/queue-ref.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
+          }
+        },
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30
+      },
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
+          }
+        },
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
+        "retention_in_days": 30
+      },
+      "QueueRef_AwsConsoleField_Handler_CloudwatchLogGroup_1FAC3ED5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/AwsConsoleField/Handler/CloudwatchLogGroup",
+            "uniqueId": "QueueRef_AwsConsoleField_Handler_CloudwatchLogGroup_1FAC3ED5"
+          }
+        },
+        "name": "/aws/lambda/Handler-c85cfbef",
+        "retention_in_days": 30
+      },
+      "QueueRef_QueueArnField_Handler_CloudwatchLogGroup_BDFDF613": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueArnField/Handler/CloudwatchLogGroup",
+            "uniqueId": "QueueRef_QueueArnField_Handler_CloudwatchLogGroup_BDFDF613"
+          }
+        },
+        "name": "/aws/lambda/Handler-c8c3c90a",
+        "retention_in_days": 30
+      },
+      "QueueRef_QueueUrlField_Handler_CloudwatchLogGroup_8AB6E3DD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueUrlField/Handler/CloudwatchLogGroup",
+            "uniqueId": "QueueRef_QueueUrlField_Handler_CloudwatchLogGroup_8AB6E3DD"
+          }
+        },
+        "name": "/aws/lambda/Handler-c8ec121e",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "Function_IamRole_678BE84C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/AwsConsoleField/Handler/IamRole",
+            "uniqueId": "QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "QueueRef_QueueArnField_Handler_IamRole_C121BD5E": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueArnField/Handler/IamRole",
+            "uniqueId": "QueueRef_QueueArnField_Handler_IamRole_C121BD5E"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "QueueRef_QueueUrlField_Handler_IamRole_709A15CB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueUrlField/Handler/IamRole",
+            "uniqueId": "QueueRef_QueueUrlField_Handler_IamRole_709A15CB"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Function_IamRolePolicy_E3B26607": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:GetQueueUrl\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:SendMessage\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:DeleteMessage\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      },
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
+      },
+      "QueueRef_AwsConsoleField_Handler_IamRolePolicy_184A5238": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/AwsConsoleField/Handler/IamRolePolicy",
+            "uniqueId": "QueueRef_AwsConsoleField_Handler_IamRolePolicy_184A5238"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:GetQueueUrl\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:SendMessage\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:PurgeQueue\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:DeleteMessage\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C.name}"
+      },
+      "QueueRef_QueueArnField_Handler_IamRolePolicy_64EE3F4B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueArnField/Handler/IamRolePolicy",
+            "uniqueId": "QueueRef_QueueArnField_Handler_IamRolePolicy_64EE3F4B"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.QueueRef_QueueArnField_Handler_IamRole_C121BD5E.name}"
+      },
+      "QueueRef_QueueUrlField_Handler_IamRolePolicy_A9F2F773": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueUrlField/Handler/IamRolePolicy",
+            "uniqueId": "QueueRef_QueueUrlField_Handler_IamRolePolicy_A9F2F773"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:GetQueueUrl\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:SendMessage\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:PurgeQueue\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:DeleteMessage\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.QueueRef_QueueUrlField_Handler_IamRole_709A15CB.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      },
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
+      },
+      "QueueRef_AwsConsoleField_Handler_IamRolePolicyAttachment_1F892467": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/AwsConsoleField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "QueueRef_AwsConsoleField_Handler_IamRolePolicyAttachment_1F892467"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C.name}"
+      },
+      "QueueRef_QueueArnField_Handler_IamRolePolicyAttachment_BA9083B2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueArnField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "QueueRef_QueueArnField_Handler_IamRolePolicyAttachment_BA9083B2"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.QueueRef_QueueArnField_Handler_IamRole_C121BD5E.name}"
+      },
+      "QueueRef_QueueUrlField_Handler_IamRolePolicyAttachment_9FA1E52D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueUrlField/Handler/IamRolePolicyAttachment",
+            "uniqueId": "QueueRef_QueueUrlField_Handler_IamRolePolicyAttachment_9FA1E52D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.QueueRef_QueueUrlField_Handler_IamRole_709A15CB.name}"
+      }
+    },
+    "aws_lambda_event_source_mapping": {
+      "Queue_EventSourceMapping_8332F7DC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
+          }
+        },
+        "batch_size": 1,
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
+      }
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "QUEUE_ARN_23984aca": "${aws_sqs_queue.Queue.arn}",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "Queue-SetConsumer0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Queue-SetConsumer0-c83c303c",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "QueueRef_AwsConsoleField_Handler_2D13D4BF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/AwsConsoleField/Handler/Default",
+            "uniqueId": "QueueRef_AwsConsoleField_Handler_2D13D4BF"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "QUEUE_ARN_23984aca": "${aws_sqs_queue.Queue.arn}",
+            "WING_FUNCTION_NAME": "Handler-c85cfbef",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Handler-c85cfbef",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.QueueRef_AwsConsoleField_Handler_IamRole_0DD0004C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.QueueRef_AwsConsoleField_Handler_S3Object_C4237D42.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "QueueRef_QueueArnField_Handler_0B477E06": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueArnField/Handler/Default",
+            "uniqueId": "QueueRef_QueueArnField_Handler_0B477E06"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Handler-c8c3c90a",
+            "WING_TARGET": "tf-aws",
+            "WING_TOKEN_TFTOKEN_TOKEN_20": "${jsonencode(aws_sqs_queue.Queue.arn)}"
+          }
+        },
+        "function_name": "Handler-c8c3c90a",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.QueueRef_QueueArnField_Handler_IamRole_C121BD5E.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.QueueRef_QueueArnField_Handler_S3Object_6AD15EC0.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "QueueRef_QueueUrlField_Handler_42A4BE81": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueUrlField/Handler/Default",
+            "uniqueId": "QueueRef_QueueUrlField_Handler_42A4BE81"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "QUEUE_ARN_23984aca": "${aws_sqs_queue.Queue.arn}",
+            "WING_FUNCTION_NAME": "Handler-c8ec121e",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Handler-c8ec121e",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.QueueRef_QueueUrlField_Handler_IamRole_709A15CB.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.QueueRef_QueueUrlField_Handler_S3Object_225E3B78.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Function_S3Object_C62A0C2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "QueueRef_AwsConsoleField_Handler_S3Object_C4237D42": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/AwsConsoleField/Handler/S3Object",
+            "uniqueId": "QueueRef_AwsConsoleField_Handler_S3Object_C4237D42"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "QueueRef_QueueArnField_Handler_S3Object_6AD15EC0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueArnField/Handler/S3Object",
+            "uniqueId": "QueueRef_QueueArnField_Handler_S3Object_6AD15EC0"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "QueueRef_QueueUrlField_Handler_S3Object_225E3B78": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/QueueRef/QueueUrlField/Handler/S3Object",
+            "uniqueId": "QueueRef_QueueUrlField_Handler_S3Object_225E3B78"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    },
+    "aws_sqs_queue": {
+      "Queue": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "Queue-c822c726",
+        "visibility_timeout_seconds": 30
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/queue-ref.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/queue-ref.test.w_test_sim.md
new file mode 100644
index 00000000000..28b24b86032
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/queue-ref.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [queue-ref.test.w](../../../../../../examples/tests/sdk_tests/queue/queue-ref.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ queue-ref.test.wsim » root/env0/test:queueArn returns the arn                                               
+pass ─ queue-ref.test.wsim » root/env1/test:push() sends a request to aws, fails because we are using a dummy queue
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_compile_tf-aws.md
index 88c27270184..61c408281a5 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,15 +18,15 @@
   },
   "resource": {
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 60,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_test_sim.md
index a46202c468b..ab92456b97e 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/retention_period.main.w_test_sim.md
@@ -2,10 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ retention_period.main.wsim » root/env0/retentionPeriod
- 
- 
+pass ─ retention_period.main.wsim (no tests)
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_compile_tf-aws.md
index 5520e380206..df687695171 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,23 +18,43 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419"
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
+        "retention_in_days": 30
+      },
+      "q2-SetConsumer0_CloudwatchLogGroup_A9ABA3A4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "q2-SetConsumer0_CloudwatchLogGroup_A9ABA3A4"
+          }
+        },
+        "name": "/aws/lambda/q2-SetConsumer0-c8ba098b",
+        "retention_in_days": 30
+      },
+      "q3-SetConsumer0_CloudwatchLogGroup_1FE8714D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q3-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "q3-SetConsumer0_CloudwatchLogGroup_1FE8714D"
+          }
+        },
+        "name": "/aws/lambda/q3-SetConsumer0-c8cd013e",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -58,63 +65,186 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
+      },
+      "c2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c2/Default",
+            "uniqueId": "c2"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-c2-c81701d2"
+      },
+      "c3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/c3/Default",
+            "uniqueId": "c3"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-c3-c893f3c2"
       }
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "q2-SetConsumer0_IamRole_910A96B5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/IamRole",
+            "uniqueId": "q2-SetConsumer0_IamRole_910A96B5"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "q3-SetConsumer0_IamRole_2934E47C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138"
+            "path": "root/Default/Default/q3-SetConsumer0/IamRole",
+            "uniqueId": "q3-SetConsumer0_IamRole_2934E47C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
+      },
+      "q2-SetConsumer0_IamRolePolicy_4F213331": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/IamRolePolicy",
+            "uniqueId": "q2-SetConsumer0_IamRolePolicy_4F213331"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.q2.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.c2.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:GetQueueUrl\"],\"Resource\":[\"${aws_sqs_queue.q2.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:SendMessage\"],\"Resource\":[\"${aws_sqs_queue.q2.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.q2-SetConsumer0_IamRole_910A96B5.name}"
+      },
+      "q3-SetConsumer0_IamRolePolicy_D9B45CEB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517"
+            "path": "root/Default/Default/q3-SetConsumer0/IamRolePolicy",
+            "uniqueId": "q3-SetConsumer0_IamRolePolicy_D9B45CEB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.cloudQueue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.q3.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.c3.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.q3-SetConsumer0_IamRole_2934E47C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
+      },
+      "q2-SetConsumer0_IamRolePolicyAttachment_6DB0A9EE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "q2-SetConsumer0_IamRolePolicyAttachment_6DB0A9EE"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.q2-SetConsumer0_IamRole_910A96B5.name}"
+      },
+      "q3-SetConsumer0_IamRolePolicyAttachment_F54AC63B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A"
+            "path": "root/Default/Default/q3-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "q3-SetConsumer0_IamRolePolicyAttachment_F54AC63B"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "role": "${aws_iam_role.q3-SetConsumer0_IamRole_2934E47C.name}"
       }
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
+          }
+        },
+        "batch_size": 1,
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
+      },
+      "q2_EventSourceMapping_F484014F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136"
+            "path": "root/Default/Default/q2/EventSourceMapping",
+            "uniqueId": "q2_EventSourceMapping_F484014F"
           }
         },
         "batch_size": 1,
-        "event_source_arn": "${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "${aws_lambda_function.cloudQueue-SetConsumer0.function_name}"
+        "event_source_arn": "${aws_sqs_queue.q2.arn}",
+        "function_name": "${aws_lambda_function.q2-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
+      },
+      "q3_EventSourceMapping_8BF6F975": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q3/EventSourceMapping",
+            "uniqueId": "q3_EventSourceMapping_8BF6F975"
+          }
+        },
+        "batch_size": 1,
+        "event_source_arn": "${aws_sqs_queue.q3.arn}",
+        "function_name": "${aws_lambda_function.q3-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0"
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
           }
         },
         "architectures": [
@@ -122,21 +252,86 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "q2-SetConsumer0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/Default",
+            "uniqueId": "q2-SetConsumer0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_7ba9f967": "${aws_dynamodb_table.c2.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "QUEUE_URL_3af1eae7": "${aws_sqs_queue.q2.url}",
+            "WING_FUNCTION_NAME": "q2-SetConsumer0-c8ba098b",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "q2-SetConsumer0-c8ba098b",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.q2-SetConsumer0_IamRole_910A96B5.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.q2-SetConsumer0_S3Object_FB40B099.key}",
+        "timeout": "${aws_sqs_queue.q2.visibility_timeout_seconds}",
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "q3-SetConsumer0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q3-SetConsumer0/Default",
+            "uniqueId": "q3-SetConsumer0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_9b30b36d": "${aws_dynamodb_table.c3.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "q3-SetConsumer0-c8cd013e",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "q3-SetConsumer0-c8cd013e",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.q3-SetConsumer0_IamRole_2934E47C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.q3-SetConsumer0_S3Object_69810AFF.key}",
+        "timeout": "${aws_sqs_queue.q3.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
@@ -155,11 +350,33 @@
       }
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "q2-SetConsumer0_S3Object_FB40B099": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/S3Object",
+            "uniqueId": "q2-SetConsumer0_S3Object_FB40B099"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "q3-SetConsumer0_S3Object_69810AFF": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF"
+            "path": "root/Default/Default/q3-SetConsumer0/S3Object",
+            "uniqueId": "q3-SetConsumer0_S3Object_69810AFF"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -168,15 +385,37 @@
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "Queue-c822c726",
+        "visibility_timeout_seconds": 30
+      },
+      "q2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2/Default",
+            "uniqueId": "q2"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "q2-c8aa6380",
+        "visibility_timeout_seconds": 30
+      },
+      "q3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/q3/Default",
+            "uniqueId": "q3"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "q3-c8ed13d1",
         "visibility_timeout_seconds": 30
       }
     }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_test_sim.md
index 9c0113c7672..182d94fc6a6 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/queue/set_consumer.test.w_test_sim.md
@@ -2,10 +2,12 @@
 
 ## stdout.log
 ```log
-pass ─ set_consumer.test.wsim » root/env0/test:setConsumer
- 
- 
-Tests 1 passed (1)
+pass ─ set_consumer.test.wsim » root/env0/test:setConsumer                                           
+pass ─ set_consumer.test.wsim » root/env1/test:function can push back to the queue                   
+pass ─ set_consumer.test.wsim » root/env2/test:messages pushed to queue can be processed concurrently
+
+Tests 3 passed (3)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/regex/match.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/regex/match.test.w_compile_tf-aws.md
deleted file mode 100644
index 99f849099fa..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/regex/match.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# [match.test.w](../../../../../../examples/tests/sdk_tests/regex/match.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/regex/match.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/regex/match.test.w_test_sim.md
deleted file mode 100644
index fb39ccd66ec..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/regex/match.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [match.test.w](../../../../../../examples/tests/sdk_tests/regex/match.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ match.test.wsim » root/env0/test:inflight match
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/call.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/call.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..e527d4c1172
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/call.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [call.test.w](../../../../../../examples/tests/sdk_tests/resource/call.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/call.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/call.test.w_test_sim.md
new file mode 100644
index 00000000000..8f02d875c16
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/call.test.w_test_sim.md
@@ -0,0 +1,21 @@
+# [call.test.w](../../../../../../examples/tests/sdk_tests/resource/call.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] resource can log messages at different levels | a regular (info) log
+[INFO] resource can log messages at different levels | an info log
+[INFO] resource can log messages at different levels | another info log
+[WARNING] resource can log messages at different levels | a warn log
+[ERROR] resource can log messages at different levels | Error: an error log
+pass ─ call.test.wsim » root/env0/test:resource.call with a field name returns the field value                
+pass ─ call.test.wsim » root/env1/test:resource.call cannot be used to call onStop                            
+pass ─ call.test.wsim » root/env2/test:exceptions thrown by the resource are caught and rethrown by the caller
+pass ─ call.test.wsim » root/env3/test:resource.call can accept and return various kinds of values            
+pass ─ call.test.wsim » root/env4/test:resource can log messages at different levels                          
+
+Tests 5 passed (5)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/no-stop.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/no-stop.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..d7d3d990bae
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/no-stop.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [no-stop.test.w](../../../../../../examples/tests/sdk_tests/resource/no-stop.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/no-stop.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/no-stop.test.w_test_sim.md
new file mode 100644
index 00000000000..07537837b5f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/no-stop.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [no-stop.test.w](../../../../../../examples/tests/sdk_tests/resource/no-stop.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ no-stop.test.wsim » root/env0/test:token is resolved
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-start.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-start.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..d404a2ea874
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-start.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [on-start.test.w](../../../../../../examples/tests/sdk_tests/resource/on-start.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-start.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-start.test.w_test_sim.md
new file mode 100644
index 00000000000..d14f7e85add
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-start.test.w_test_sim.md
@@ -0,0 +1,22 @@
+# [on-start.test.w](../../../../../../examples/tests/sdk_tests/resource/on-start.test.w) | test | sim
+
+## stdout.log
+```log
+[ERROR] method calls fail if the resource fails to start | Error: unexpected error!
+  --> on-start.test.w:6:5
+  | 
+  | inflight class OnStartThrowerBackend impl sim.IResource {
+  |   new() {
+6 |     throw "unexpected error!";
+  |     ^
+at $inflight_init <ABSOLUTE>/on-start.test.w:6:5
+at <ABSOLUTE>/on-start.test.w:17:18
+[ERROR] method calls fail if the resource fails to start | Error: Resource is not running (it may have crashed or stopped)
+pass ─ on-start.test.wsim » root/env0/test:method calls fail if the resource fails to start
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-stop.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-stop.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..ac1a5770bc1
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-stop.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [on-stop.test.w](../../../../../../examples/tests/sdk_tests/resource/on-stop.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-stop.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-stop.test.w_test_sim.md
new file mode 100644
index 00000000000..4674b8cc8b7
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/on-stop.test.w_test_sim.md
@@ -0,0 +1,20 @@
+# [on-stop.test.w](../../../../../../examples/tests/sdk_tests/resource/on-stop.test.w) | test | sim
+
+## stdout.log
+```log
+[ERROR] if a resource throws an error on stopping, it doesn't crash the simulation | Error: unexpected error!
+  --> on-stop.test.w:6:5
+  | 
+  | inflight class OnStopThrowerBackend impl sim.IResource {
+  |   pub onStop() {
+6 |     throw "unexpected error!";
+  |     ^
+at onStop <ABSOLUTE>/on-stop.test.w:6:5
+pass ─ on-stop.test.wsim » root/env0/test:if a resource throws an error on stopping, it doesn't crash the simulation
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/resource.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/resource.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..57b1eb52867
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/resource.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [resource.test.w](../../../../../../examples/tests/sdk_tests/resource/resource.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/resource.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/resource.test.w_test_sim.md
new file mode 100644
index 00000000000..b6e69cb406a
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/resource.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [resource.test.w](../../../../../../examples/tests/sdk_tests/resource/resource.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ resource.test.wsim » root/env0/test:Counter      
+pass ─ resource.test.wsim » root/env1/test:DoubleCounter
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/state.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/state.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..accf259f9e4
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/state.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [state.test.w](../../../../../../examples/tests/sdk_tests/resource/state.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/state.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/state.test.w_test_sim.md
new file mode 100644
index 00000000000..aeb793c5b4d
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/state.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [state.test.w](../../../../../../examples/tests/sdk_tests/resource/state.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ state.test.wsim » root/env0/test:sim.Resource can read and write state
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/tokens.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/tokens.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..b519f90012b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/tokens.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [tokens.test.w](../../../../../../examples/tests/sdk_tests/resource/tokens.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/tokens.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/tokens.test.w_test_sim.md
new file mode 100644
index 00000000000..49e00241865
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/resource/tokens.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [tokens.test.w](../../../../../../examples/tests/sdk_tests/resource/tokens.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ tokens.test.wsim » root/env0/test:calling resolveToken during a method call emits an error
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_compile_tf-aws.md
index a0b9c8c3ff5..c71573ca178 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -38,7 +25,6 @@
             "uniqueId": "from_cron_Schedule_6C1613E8"
           }
         },
-        "is_enabled": true,
         "schedule_expression": "cron(* * * * ? *)"
       },
       "from_rate_Schedule_5B82E706": {
@@ -48,7 +34,6 @@
             "uniqueId": "from_rate_Schedule_5B82E706"
           }
         },
-        "is_enabled": true,
         "schedule_expression": "rate(1 minute)"
       }
     },
@@ -220,7 +205,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.from_cron_OnTick0_IamRole_70AA37F2.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.from_cron_OnTick0_S3Object_0A802C5C.key}",
         "timeout": 60,
@@ -252,7 +237,7 @@
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.from_rate_OnTick0_IamRole_A7066F91.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.from_rate_OnTick0_S3Object_C6F96441.key}",
         "timeout": 60,
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_test_sim.md
index 5989a4afca4..0d89a0ec82a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/schedule/on_tick.test.w_test_sim.md
@@ -2,10 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ on_tick.test.wsim » root/env0/on tick is called both for rate and cron schedules
- 
- 
+pass ─ on_tick.test.wsim » root/env0/onTick()
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/secret/secret-ref.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/secret/secret-ref.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..40dd93c916f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/secret/secret-ref.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [secret-ref.test.w](../../../../../../examples/tests/sdk_tests/secret/secret-ref.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/secret/secret-ref.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/secret/secret-ref.test.w_test_sim.md
new file mode 100644
index 00000000000..6c0afffa039
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/secret/secret-ref.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [secret-ref.test.w](../../../../../../examples/tests/sdk_tests/secret/secret-ref.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ secret-ref.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_compile_tf-aws.md
index f6e08f3a0fa..07b8c69b216 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_test_sim.md
index 55da8811945..bc1fdec32b6 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/callbacks.test.w_test_sim.md
@@ -5,9 +5,9 @@
 pass ─ callbacks.test.wsim » root/env0/test:does not start automatically if autoStart is false
 pass ─ callbacks.test.wsim » root/env1/test:start() calls onStart() idempotently              
 pass ─ callbacks.test.wsim » root/env2/test:stop() calls onStop()                             
- 
- 
+
 Tests 3 passed (3)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_compile_tf-aws.md
index 20ad3b34a37..84e10b1f46a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_test_sim.md
index efe67e37b7b..2948dff3702 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/http-server.test.w_test_sim.md
@@ -2,13 +2,18 @@
 
 ## stdout.log
 ```log
-pass ┌ http-server.test.wsim » root/env0/test:http server is started with the service
-     └ bang bang!
-pass ┌ http-server.test.wsim » root/env1/test:service.stop() closes the http server  
-     └ closing server...
- 
- 
+[INFO] service.stop() closes the http server | starting service
+[INFO] service.stop() closes the http server | listening on port <PORT>
+[INFO] http server is started with the service | starting service
+[INFO] http server is started with the service | listening on port <PORT>
+[INFO] http server is started with the service | bang bang!
+[INFO] service.stop() closes the http server | closing server...
+[INFO] http server is started with the service | closing server...
+pass ─ http-server.test.wsim » root/env0/test:http server is started with the service
+pass ─ http-server.test.wsim » root/env1/test:service.stop() closes the http server  
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_compile_tf-aws.md
index e1e564db49d..19a403618bb 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_test_sim.md
index 7064a4c25b5..d443f4cc92f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/minimal.test.w_test_sim.md
@@ -2,11 +2,12 @@
 
 ## stdout.log
 ```log
-pass ┌ minimal.test.wsim » root/env0/test:start and stop
-     └ stopping!
- 
- 
+[INFO] start and stop | hello, service!
+[INFO] start and stop | stopping!
+pass ─ minimal.test.wsim » root/env0/test:start and stop
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_compile_tf-aws.md
index f1e7da8b608..f1afeeb7bb3 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_test_sim.md
index 04a2a2d4289..bb3609460d9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/stateful.test.w_test_sim.md
@@ -2,10 +2,13 @@
 
 ## stdout.log
 ```log
+[INFO] service is ready only after onStart finishes | starting service
+[INFO] service is ready only after onStart finishes | stopping service
+[INFO] service is ready only after onStart finishes | state is: 456
 pass ─ stateful.test.wsim » root/env0/test:service is ready only after onStart finishes
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_compile_tf-aws.md
index 63790dda3d4..f57e8cabceb 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_test_sim.md
index 564a6809526..307cfc1e7d9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/service/tokens.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ tokens.test.wsim » root/env0/test:will bind and use tokens
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_compile_tf-aws.md
index fb3b857527c..2203fe4be96 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_test_sim.md
index acaebcf19c1..e7ee106144f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/get.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ get.test.wsim » root/env0/test:state.get() returns the runtime value         
 pass ─ get.test.wsim » root/env1/test:state.tryGet() return nil if there is no value
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_compile_tf-aws.md
index dab19e924bd..6c00ede2136 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_test_sim.md
index d75ef509e5d..77559acfd28 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/state/set.test.w_test_sim.md
@@ -2,11 +2,11 @@
 
 ## stdout.log
 ```log
-pass ┌ set.test.wsim » root/env0/test:token resolved at runtime
-     └ 2023-10-16T20:47:39.511Z
- 
- 
+[INFO] token resolved at runtime | 2023-10-16T20:47:39.511Z
+pass ─ set.test.wsim » root/env0/test:token resolved at runtime
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_compile_tf-aws.md
index d17f9562a4e..1e68df87e0e 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,14 +18,14 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       },
       "myBucket": {
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_test_sim.md
index 455f16e3f8b..4ca4b3fe745 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/array.test.w_test_sim.md
@@ -11,6 +11,7 @@ pass ─ array.test.wsim » root/env13/test:lastIndexOf()
 pass ─ array.test.wsim » root/env14/test:set()                     
 pass ─ array.test.wsim » root/env15/test:insert()                  
 pass ─ array.test.wsim » root/env16/test:removeFirst()             
+pass ─ array.test.wsim » root/env17/test:slice()                   
 pass ─ array.test.wsim » root/env2/test:pushAndPop()               
 pass ─ array.test.wsim » root/env3/test:popAt()                    
 pass ─ array.test.wsim » root/env4/test:concatMutArray()           
@@ -19,9 +20,9 @@ pass ─ array.test.wsim » root/env6/test:contains()
 pass ─ array.test.wsim » root/env7/test:indexOf()                  
 pass ─ array.test.wsim » root/env8/test:indexOfArray()             
 pass ─ array.test.wsim » root/env9/test:join()                     
- 
- 
-Tests 17 passed (17)
+
+Tests 18 passed (18)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_compile_tf-aws.md
index 80d2c90fbf3..3960353a6f9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_test_sim.md
index 2feb1d6e6c7..e687f9a4465 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/bool.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bool.test.wsim » root/env0/test:fromJson()
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_compile_tf-aws.md
index fb93deb0ef1..b2326a2eaba 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_test_sim.md
index 7a4da5cb799..fe785e9c28d 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/datetime.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ datetime.test.wsim » root/env0/test:inflight datetime
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_compile_tf-aws.md
index 88e4531011e..95a3ca0c4a2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_test_sim.md
index b8dfe554505..98968c3f14a 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/duration.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ duration.test.wsim » root/env0/test:duration
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_compile_tf-aws.md
index 5e67819a1aa..3ee16348bf0 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_test_sim.md
index a6b942e1186..1ff2de3e9ea 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/json.test.w_test_sim.md
@@ -4,6 +4,7 @@
 ```log
 pass ─ json.test.wsim » root/env0/test:has()                      
 pass ─ json.test.wsim » root/env1/test:get()                      
+pass ─ json.test.wsim » root/env10/test:delete() for MutJson      
 pass ─ json.test.wsim » root/env2/test:getAt()                    
 pass ─ json.test.wsim » root/env3/test:set()                      
 pass ─ json.test.wsim » root/env4/test:setAt()                    
@@ -12,9 +13,9 @@ pass ─ json.test.wsim » root/env6/test:keys(), values(), entries()
 pass ─ json.test.wsim » root/env7/test:parse()                    
 pass ─ json.test.wsim » root/env8/test:tryParse()                 
 pass ─ json.test.wsim » root/env9/test:deepCopy(), deepCopyMut()  
- 
- 
-Tests 10 passed (10)
+
+Tests 11 passed (11)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_compile_tf-aws.md
index 37291684133..af178b8e28c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_test_sim.md
index d67efd4a6ab..76793879ce9 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/map.test.w_test_sim.md
@@ -6,6 +6,7 @@ pass ─ map.test.wsim » root/env0/test:equality
 pass ─ map.test.wsim » root/env1/test:mutability
 pass ─ map.test.wsim » root/env10/test:clear()  
 pass ─ map.test.wsim » root/env11/test:delete() 
+pass ─ map.test.wsim » root/env12/test:entries()
 pass ─ map.test.wsim » root/env2/test:size()    
 pass ─ map.test.wsim » root/env3/test:get()     
 pass ─ map.test.wsim » root/env4/test:has()     
@@ -14,9 +15,9 @@ pass ─ map.test.wsim » root/env6/test:keys()
 pass ─ map.test.wsim » root/env7/test:copyMut() 
 pass ─ map.test.wsim » root/env8/test:copy()    
 pass ─ map.test.wsim » root/env9/test:set()     
- 
- 
-Tests 12 passed (12)
+
+Tests 13 passed (13)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_compile_tf-aws.md
index 6f69a675588..49526bce222 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,24 +18,24 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "SingletonBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/SingletonBucket/Default",
-            "uniqueId": "SingletonBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "singletonbucket-c8ac9620-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       },
-      "cloudBucket": {
+      "SingletonBucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/SingletonBucket/Default",
+            "uniqueId": "SingletonBucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "singletonbucket-c8ac9620-",
         "force_destroy": false
       }
     },
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_test_sim.md
index bff2a074ae3..5da5c20b7fe 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/node.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ node.test.wsim » root/env0/test:singleton
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_compile_tf-aws.md
index f28281717b3..eaae3ae3bf7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_test_sim.md
index f8705e8f6e1..48a9fc032c7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/number.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ number.test.wsim » root/env0/test:fromJson
 pass ─ number.test.wsim » root/env1/test:fromStr 
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_compile_tf-aws.md
index 71b9a74affa..6a69b90025c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_test_sim.md
index d5eae1ab00b..86701394e5b 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/range.test.w_test_sim.md
@@ -2,19 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ range.test.wsim » root/env0/test:rangeOf                            
-pass ─ range.test.wsim » root/env1/test:defaultRange                       
-pass ─ range.test.wsim » root/env2/test:rangeOfWithoutLastNumber           
-pass ─ range.test.wsim » root/env3/test:rangeOfWithoutLastNumberDefault    
-pass ─ range.test.wsim » root/env4/test:rangeOfWithNegativeRange           
-pass ─ range.test.wsim » root/env5/test:rangeOfWithNegativeRangeDefault    
-pass ─ range.test.wsim » root/env6/test:rangeOfDecreasingNumbers           
-pass ─ range.test.wsim » root/env7/test:rangeOfDecreasingNumbersWithDefault
-pass ─ range.test.wsim » root/env8/test:forWithRange                       
-pass ─ range.test.wsim » root/env9/test:forWithRangeIncludeLastNumber      
- 
- 
-Tests 10 passed (10)
+pass ─ range.test.wsim » root/env0/test:ranges work
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/regex.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/regex.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..aee06b0cf5d
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/regex.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [regex.test.w](../../../../../../examples/tests/sdk_tests/std/regex.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/regex.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/regex.test.w_test_sim.md
new file mode 100644
index 00000000000..f84a8cc172b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/regex.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [regex.test.w](../../../../../../examples/tests/sdk_tests/std/regex.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ regex.test.wsim » root/env0/test:regex
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_compile_tf-aws.md
index 6644617250a..21eaaee6635 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_test_sim.md
index 4110b0c965a..e1cc15fbc44 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/set.test.w_test_sim.md
@@ -12,9 +12,9 @@ pass ─ set.test.wsim » root/env6/test:add()
 pass ─ set.test.wsim » root/env7/test:delete()  
 pass ─ set.test.wsim » root/env8/test:clear()   
 pass ─ set.test.wsim » root/env9/test:copy()    
- 
- 
+
 Tests 10 passed (10)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_compile_tf-aws.md
index 809bef6de9c..d8a219a8336 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_test_sim.md
index 0e94e0dc6ca..f7284323c79 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/string.test.w_test_sim.md
@@ -17,9 +17,9 @@ pass ─ string.test.wsim » root/env6/test:lowercase()
 pass ─ string.test.wsim » root/env7/test:uppercase()  
 pass ─ string.test.wsim » root/env8/test:split()      
 pass ─ string.test.wsim » root/env9/test:startsWith() 
- 
- 
+
 Tests 15 passed (15)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_compile_tf-aws.md
index 4449378edf4..9fa937052e7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_test_sim.md
index 403f7eb2f2b..c424fe82e04 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct.test.w_test_sim.md
@@ -6,9 +6,10 @@ pass ─ struct.test.wsim » root/env0/test:parseJson()
 pass ─ struct.test.wsim » root/env1/test:tryParseJson()        
 pass ─ struct.test.wsim » root/env2/test:invalid parseJson()   
 pass ─ struct.test.wsim » root/env3/test:invalid tryParseJson()
- 
- 
-Tests 4 passed (4)
+pass ─ struct.test.wsim » root/env4/test:valid Json types      
+
+Tests 5 passed (5)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct_a.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct_a.w_compile_tf-aws.md
new file mode 100644
index 00000000000..897b0928dc7
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct_a.w_compile_tf-aws.md
@@ -0,0 +1,2 @@
+# [struct_a.w](../../../../../../examples/tests/sdk_tests/std/struct_a.w) | compile | tf-aws
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct_b.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct_b.w_compile_tf-aws.md
new file mode 100644
index 00000000000..dd985d8cfd6
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/std/struct_b.w_compile_tf-aws.md
@@ -0,0 +1,2 @@
+# [struct_b.w](../../../../../../examples/tests/sdk_tests/std/struct_b.w) | compile | tf-aws
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_compile_tf-aws.md
index 2b5560a2f6a..27da3eb1c30 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,11 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -46,31 +33,34 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "name",
-        "name": "usersex.Table-c840a49c"
+        "name": "usersTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     },
     "aws_dynamodb_table_item": {
-      "exTable_DynamodbTableItem-mario_1CD163AB": {
+      "Table_DynamodbTableItem-mario_6E16BC1F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/DynamodbTableItem-mario",
-            "uniqueId": "exTable_DynamodbTableItem-mario_1CD163AB"
+            "path": "root/Default/Default/Table/DynamodbTableItem-mario",
+            "uniqueId": "Table_DynamodbTableItem-mario_6E16BC1F"
           }
         },
-        "hash_key": "${aws_dynamodb_table.exTable.hash_key}",
+        "hash_key": "${aws_dynamodb_table.Table.hash_key}",
         "item": "{\"name\":{\"S\":\"mario\"},\"gender\":{\"S\":\"male\"},\"role\":{\"S\":\"plumber\"}}",
-        "table_name": "${aws_dynamodb_table.exTable.name}"
+        "table_name": "${aws_dynamodb_table.Table.name}"
       },
-      "exTable_DynamodbTableItem-peach_C3D57BF1": {
+      "Table_DynamodbTableItem-peach_FD7A7AE1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/DynamodbTableItem-peach",
-            "uniqueId": "exTable_DynamodbTableItem-peach_C3D57BF1"
+            "path": "root/Default/Default/Table/DynamodbTableItem-peach",
+            "uniqueId": "Table_DynamodbTableItem-peach_FD7A7AE1"
           }
         },
-        "hash_key": "${aws_dynamodb_table.exTable.hash_key}",
+        "hash_key": "${aws_dynamodb_table.Table.hash_key}",
         "item": "{\"name\":{\"S\":\"peach\"},\"gender\":{\"S\":\"female\"},\"role\":{\"S\":\"princess\"}}",
-        "table_name": "${aws_dynamodb_table.exTable.name}"
+        "table_name": "${aws_dynamodb_table.Table.name}"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_test_sim.md
index c0991cafae1..247c7d22251 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/add_row.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ add_row.test.wsim » root/env0/test:addRow
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_compile_tf-aws.md
index 340fa7ff519..4d1b2324136 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -46,7 +33,10 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "name",
-        "name": "usersaws-wing-table-c82a4d4a"
+        "name": "usersaws-wing-table-c82a4d4a",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_test_sim.md
index b5ce022207d..8f7e6cf61ff 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws-table.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ aws-table.test.wsim » root/env0/test:validates the AWS topic name
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws_table.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws_table.test.w_compile_tf-aws.md
deleted file mode 100644
index fc8b24042ea..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws_table.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# [aws_table.test.w](../../../../../../examples/tests/sdk_tests/table/aws_table.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "aws-wing-table": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-table/Default",
-            "uniqueId": "aws-wing-table"
-          }
-        },
-        "attribute": [
-          {
-            "name": "name",
-            "type": "S"
-          }
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "name",
-        "name": "usersaws-wing-table-c82a4d4a"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws_table.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws_table.test.w_test_sim.md
deleted file mode 100644
index 0a9bfb67db0..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/aws_table.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [aws_table.test.w](../../../../../../examples/tests/sdk_tests/table/aws_table.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ aws_table.test.wsim » root/env0/test:validates the AWS table name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_compile_tf-aws.md
index 465f7a90904..b1285932d9c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,11 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -46,7 +33,10 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "name",
-        "name": "usersex.Table-c840a49c"
+        "name": "usersTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_test_sim.md
index f272db01dbc..3ce154984b6 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/get.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ get.test.wsim » root/env0/test:get
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/inner_aws_table.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/inner_aws_table.test.w_compile_tf-aws.md
deleted file mode 100644
index 2acd4af875b..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/inner_aws_table.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# [inner_aws_table.test.w](../../../../../../examples/tests/sdk_tests/table/inner_aws_table.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_dynamodb_table": {
-      "aws-wing-table": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-table/Default",
-            "uniqueId": "aws-wing-table"
-          }
-        },
-        "attribute": [
-          {
-            "name": "name",
-            "type": "S"
-          }
-        ],
-        "billing_mode": "PAY_PER_REQUEST",
-        "hash_key": "name",
-        "name": "usersaws-wing-table-c82a4d4a"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/inner_aws_table.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/inner_aws_table.test.w_test_sim.md
deleted file mode 100644
index 6b2e3980d5c..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/inner_aws_table.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [inner_aws_table.test.w](../../../../../../examples/tests/sdk_tests/table/inner_aws_table.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ inner_aws_table.test.wsim » root/env0/test:validates the AWS table name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_compile_tf-aws.md
index d2fd2dbcd2d..1e43be52fd2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,11 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -46,7 +33,10 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "name",
-        "name": "usersex.Table-c840a49c"
+        "name": "usersTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_test_sim.md
index 1d10531118b..7963d94dfe2 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/list.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ list.test.wsim » root/env0/test:list
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_compile_tf-aws.md
index 75ffcc8d2ce..aecf17b8a05 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,11 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -46,7 +33,10 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "name",
-        "name": "usersex.Table-c840a49c"
+        "name": "usersTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_test_sim.md
index 0a205336234..de3ded219eb 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/try_get.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ try_get.test.wsim » root/env0/test:tryGet
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_compile_tf-aws.md
index c12b0559bbb..7c86738a100 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,11 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -46,31 +33,34 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "name",
-        "name": "usersex.Table-c840a49c"
+        "name": "usersTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     },
     "aws_dynamodb_table_item": {
-      "exTable_DynamodbTableItem-luigi_6628CD6F": {
+      "Table_DynamodbTableItem-luigi_46B8F6CB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/DynamodbTableItem-luigi",
-            "uniqueId": "exTable_DynamodbTableItem-luigi_6628CD6F"
+            "path": "root/Default/Default/Table/DynamodbTableItem-luigi",
+            "uniqueId": "Table_DynamodbTableItem-luigi_46B8F6CB"
           }
         },
-        "hash_key": "${aws_dynamodb_table.exTable.hash_key}",
+        "hash_key": "${aws_dynamodb_table.Table.hash_key}",
         "item": "{\"name\":{\"S\":\"luigi\"},\"gender\":{\"S\":\"male\"},\"role\":{\"S\":\"plumber\"}}",
-        "table_name": "${aws_dynamodb_table.exTable.name}"
+        "table_name": "${aws_dynamodb_table.Table.name}"
       },
-      "exTable_DynamodbTableItem-mario_1CD163AB": {
+      "Table_DynamodbTableItem-mario_6E16BC1F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/DynamodbTableItem-mario",
-            "uniqueId": "exTable_DynamodbTableItem-mario_1CD163AB"
+            "path": "root/Default/Default/Table/DynamodbTableItem-mario",
+            "uniqueId": "Table_DynamodbTableItem-mario_6E16BC1F"
           }
         },
-        "hash_key": "${aws_dynamodb_table.exTable.hash_key}",
+        "hash_key": "${aws_dynamodb_table.Table.hash_key}",
         "item": "{\"name\":{\"S\":\"mario\"},\"gender\":{\"S\":\"male\"},\"role\":{\"S\":\"plumber\"}}",
-        "table_name": "${aws_dynamodb_table.exTable.name}"
+        "table_name": "${aws_dynamodb_table.Table.name}"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_test_sim.md
index e6c07cfef87..ec15cfb24df 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/table/upsert.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ upsert.test.wsim » root/env0/test:upsert
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert-equal-string.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert-equal-string.w_compile_tf-aws.md
deleted file mode 100644
index 6864d168cc9..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert-equal-string.w_compile_tf-aws.md
+++ /dev/null
@@ -1,192 +0,0 @@
-# [assert-equal-string.w](../../../../../../examples/tests/sdk_tests/testing/assert-equal-string.w) | compile | tf-aws
-
-## inflight.$Closure1-1.js
-```js
-module.exports = function({ $testing_Assert }) {
-  class $Closure1 {
-    constructor({  }) {
-      const $obj = (...args) => this.handle(...args);
-      Object.setPrototypeOf($obj, this);
-      return $obj;
-    }
-    async handle() {
-      (await $testing_Assert.equalStr("hello","hello"));
-    }
-  }
-  return $Closure1;
-}
-
-```
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_ARNS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_ARNS": {
-      "value": "[[\"root/Default/Default/test:inflight base64\",\"${aws_lambda_function.testinflightbase64_Handler_31E9772F.arn}\"]]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_iam_role": {
-      "testinflightbase64_Handler_IamRole_49F68A60": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/test:inflight base64/Handler/IamRole",
-            "uniqueId": "testinflightbase64_Handler_IamRole_49F68A60"
-          }
-        },
-        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
-      }
-    },
-    "aws_iam_role_policy": {
-      "testinflightbase64_Handler_IamRolePolicy_031C1061": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/test:inflight base64/Handler/IamRolePolicy",
-            "uniqueId": "testinflightbase64_Handler_IamRolePolicy_031C1061"
-          }
-        },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.testinflightbase64_Handler_IamRole_49F68A60.name}"
-      }
-    },
-    "aws_iam_role_policy_attachment": {
-      "testinflightbase64_Handler_IamRolePolicyAttachment_FA451656": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/test:inflight base64/Handler/IamRolePolicyAttachment",
-            "uniqueId": "testinflightbase64_Handler_IamRolePolicyAttachment_FA451656"
-          }
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.testinflightbase64_Handler_IamRole_49F68A60.name}"
-      }
-    },
-    "aws_lambda_function": {
-      "testinflightbase64_Handler_31E9772F": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/test:inflight base64/Handler/Default",
-            "uniqueId": "testinflightbase64_Handler_31E9772F"
-          }
-        },
-        "architectures": [
-          "arm64"
-        ],
-        "environment": {
-          "variables": {
-            "WING_FUNCTION_NAME": "Handler-c853d8cf",
-            "WING_TARGET": "tf-aws"
-          }
-        },
-        "function_name": "Handler-c853d8cf",
-        "handler": "index.handler",
-        "publish": true,
-        "role": "${aws_iam_role.testinflightbase64_Handler_IamRole_49F68A60.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.testinflightbase64_Handler_S3Object_C9A792F2.key}",
-        "timeout": 30,
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": []
-        }
-      }
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
-          }
-        },
-        "bucket_prefix": "code-c84a50b1-"
-      }
-    },
-    "aws_s3_object": {
-      "testinflightbase64_Handler_S3Object_C9A792F2": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/test:inflight base64/Handler/S3Object",
-            "uniqueId": "testinflightbase64_Handler_S3Object_C9A792F2"
-          }
-        },
-        "bucket": "${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>"
-      }
-    }
-  }
-}
-```
-
-## preflight.js
-```js
-const $stdlib = require('@winglang/sdk');
-const $plugins = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLUGIN_PATHS);
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const $wing_is_test = process.env.WING_IS_TEST === "true";
-const std = $stdlib.std;
-const util = $stdlib.util;
-const testing = $stdlib.testing;
-class $Root extends $stdlib.std.Resource {
-  constructor(scope, id) {
-    super(scope, id);
-    class $Closure1 extends $stdlib.std.Resource {
-      constructor(scope, id, ) {
-        super(scope, id);
-        (std.Node.of(this)).hidden = true;
-      }
-      static _toInflightType(context) {
-        return `
-          require("./inflight.$Closure1-1.js")({
-            $testing_Assert: ${context._lift(testing.Assert)},
-          })
-        `;
-      }
-      _toInflight() {
-        return `
-          (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
-            const client = new $Closure1Client({
-            });
-            if (client.$inflight_init) { await client.$inflight_init(); }
-            return client;
-          })())
-        `;
-      }
-      _getInflightOps() {
-        return ["handle", "$inflight_init"];
-      }
-    }
-    (testing.Assert.equalStr("hello","hello"));
-    this.node.root.new("@winglang/sdk.std.Test",std.Test,this,"test:inflight base64",new $Closure1(this,"$Closure1"));
-  }
-}
-const $App = $stdlib.core.App.for(process.env.WING_TARGET);
-new $App({ outdir: $outdir, name: "assert-equal-string", rootConstruct: $Root, plugins: $plugins, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] }).synth();
-
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert-equal-string.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert-equal-string.w_test_sim.md
deleted file mode 100644
index 3186911bd3e..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert-equal-string.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [assert-equal-string.w](../../../../../../examples/tests/sdk_tests/testing/assert-equal-string.w) | test | sim
-
-## stdout.log
-```log
-pass ─ assert-equal-string.wsim » root/env0/test:inflight base64
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert.main.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert.main.w_compile_tf-aws.md
deleted file mode 100644
index a82b97bce2e..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert.main.w_compile_tf-aws.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# [assert.main.w](../../../../../../examples/tests/sdk_tests/testing/assert.main.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert.main.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert.main.w_test_sim.md
deleted file mode 100644
index f713f67e41f..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/testing/assert.main.w_test_sim.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# [assert.main.w](../../../../../../examples/tests/sdk_tests/testing/assert.main.w) | test | sim
-
-## stdout.log
-```log
-pass ─ assert.main.wsim » root/env0/test:equal num 
-pass ─ assert.main.wsim » root/env1/test:equal str 
-pass ─ assert.main.wsim » root/env2/test:equal bool
- 
- 
-Tests 3 passed (3)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_compile_tf-aws.md
index 335a93eda3d..d6541c4a7b5 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_test_sim.md
index d729fc18885..3f667d3fa01 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/aws-topic.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ aws-topic.test.wsim » root/env0/test:validates the AWS topic name
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_compile_tf-aws.md
index 93b7a4d09c1..394bb49b81f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,23 +18,23 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudTopic-OnMessage0_CloudwatchLogGroup_EE5F97B3": {
+      "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "cloudTopic-OnMessage0_CloudwatchLogGroup_EE5F97B3"
+            "path": "root/Default/Default/Topic-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1"
           }
         },
-        "name": "/aws/lambda/cloud-Topic-OnMessage0-c81c4559",
+        "name": "/aws/lambda/Topic-OnMessage0-c85d7820",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -58,50 +45,50 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     },
     "aws_iam_role": {
-      "cloudTopic-OnMessage0_IamRole_A9AB13E2": {
+      "Topic-OnMessage0_IamRole_64DD36FA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRole",
-            "uniqueId": "cloudTopic-OnMessage0_IamRole_A9AB13E2"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRole",
+            "uniqueId": "Topic-OnMessage0_IamRole_64DD36FA"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudTopic-OnMessage0_IamRolePolicy_38E6FB0F": {
+      "Topic-OnMessage0_IamRolePolicy_F5EE09D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRolePolicy",
-            "uniqueId": "cloudTopic-OnMessage0_IamRolePolicy_38E6FB0F"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicy",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicy_F5EE09D8"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudTopic-OnMessage0_IamRolePolicyAttachment_0E97F0D4": {
+      "Topic-OnMessage0_IamRolePolicyAttachment_091E665D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "cloudTopic-OnMessage0_IamRolePolicyAttachment_0E97F0D4"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicyAttachment_091E665D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.name}"
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudTopic-OnMessage0": {
+      "Topic-OnMessage0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/Default",
-            "uniqueId": "cloudTopic-OnMessage0"
+            "path": "root/Default/Default/Topic-OnMessage0/Default",
+            "uniqueId": "Topic-OnMessage0"
           }
         },
         "architectures": [
@@ -109,20 +96,20 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Topic-OnMessage0-c81c4559",
+            "WING_FUNCTION_NAME": "Topic-OnMessage0-c85d7820",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Topic-OnMessage0-c81c4559",
+        "function_name": "Topic-OnMessage0-c85d7820",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudTopic-OnMessage0_S3Object_751FA064.key}",
+        "s3_key": "${aws_s3_object.Topic-OnMessage0_S3Object_D41E9C10.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -131,17 +118,17 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudTopic-OnMessage0_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_91E7486D": {
+      "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b",
-            "uniqueId": "cloudTopic-OnMessage0_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_91E7486D"
+            "path": "root/Default/Default/Topic-OnMessage0/InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
+            "uniqueId": "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudTopic-OnMessage0.function_name}",
+        "function_name": "${aws_lambda_function.Topic-OnMessage0.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "source_arn": "${aws_sns_topic.Topic.arn}"
       }
     },
     "aws_s3_bucket": {
@@ -156,11 +143,11 @@
       }
     },
     "aws_s3_object": {
-      "cloudTopic-OnMessage0_S3Object_751FA064": {
+      "Topic-OnMessage0_S3Object_D41E9C10": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/S3Object",
-            "uniqueId": "cloudTopic-OnMessage0_S3Object_751FA064"
+            "path": "root/Default/Default/Topic-OnMessage0/S3Object",
+            "uniqueId": "Topic-OnMessage0_S3Object_D41E9C10"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -169,27 +156,27 @@
       }
     },
     "aws_sns_topic": {
-      "cloudTopic": {
+      "Topic": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic/Default",
-            "uniqueId": "cloudTopic"
+            "path": "root/Default/Default/Topic/Default",
+            "uniqueId": "Topic"
           }
         },
-        "name": "cloud-Topic-c82b57aa"
+        "name": "Topic-c8228fb7"
       }
     },
     "aws_sns_topic_subscription": {
-      "cloudTopic_TopicSubscription0_D19DE229": {
+      "Topic_TopicSubscription0_0EA5CC90": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic/TopicSubscription0",
-            "uniqueId": "cloudTopic_TopicSubscription0_D19DE229"
+            "path": "root/Default/Default/Topic/TopicSubscription0",
+            "uniqueId": "Topic_TopicSubscription0_0EA5CC90"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudTopic-OnMessage0.arn}",
+        "endpoint": "${aws_lambda_function.Topic-OnMessage0.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_test_sim.md
index 605e62aa035..857ae398c05 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/no_blocking.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ no_blocking.test.wsim » root/env0/test:topic subscribers are invoked without blocking
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_compile_tf-aws.md
index 0a5692fb3eb..7aaf444dfd8 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,33 +18,33 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudTopic-OnMessage0_CloudwatchLogGroup_EE5F97B3": {
+      "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "cloudTopic-OnMessage0_CloudwatchLogGroup_EE5F97B3"
+            "path": "root/Default/Default/Topic-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1"
           }
         },
-        "name": "/aws/lambda/cloud-Topic-OnMessage0-c81c4559",
+        "name": "/aws/lambda/Topic-OnMessage0-c85d7820",
         "retention_in_days": 30
       },
-      "cloudTopic-OnMessage1_CloudwatchLogGroup_50FF3467": {
+      "Topic-OnMessage1_CloudwatchLogGroup_90B37BB1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage1/CloudwatchLogGroup",
-            "uniqueId": "cloudTopic-OnMessage1_CloudwatchLogGroup_50FF3467"
+            "path": "root/Default/Default/Topic-OnMessage1/CloudwatchLogGroup",
+            "uniqueId": "Topic-OnMessage1_CloudwatchLogGroup_90B37BB1"
           }
         },
-        "name": "/aws/lambda/cloud-Topic-OnMessage1-c8da402d",
+        "name": "/aws/lambda/Topic-OnMessage1-c8763765",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -68,79 +55,79 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     },
     "aws_iam_role": {
-      "cloudTopic-OnMessage0_IamRole_A9AB13E2": {
+      "Topic-OnMessage0_IamRole_64DD36FA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRole",
-            "uniqueId": "cloudTopic-OnMessage0_IamRole_A9AB13E2"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRole",
+            "uniqueId": "Topic-OnMessage0_IamRole_64DD36FA"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudTopic-OnMessage1_IamRole_8052D72E": {
+      "Topic-OnMessage1_IamRole_6EE8D90C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage1/IamRole",
-            "uniqueId": "cloudTopic-OnMessage1_IamRole_8052D72E"
+            "path": "root/Default/Default/Topic-OnMessage1/IamRole",
+            "uniqueId": "Topic-OnMessage1_IamRole_6EE8D90C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudTopic-OnMessage0_IamRolePolicy_38E6FB0F": {
+      "Topic-OnMessage0_IamRolePolicy_F5EE09D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRolePolicy",
-            "uniqueId": "cloudTopic-OnMessage0_IamRolePolicy_38E6FB0F"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicy",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicy_F5EE09D8"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
       },
-      "cloudTopic-OnMessage1_IamRolePolicy_B541E262": {
+      "Topic-OnMessage1_IamRolePolicy_AFCBFBCB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage1/IamRolePolicy",
-            "uniqueId": "cloudTopic-OnMessage1_IamRolePolicy_B541E262"
+            "path": "root/Default/Default/Topic-OnMessage1/IamRolePolicy",
+            "uniqueId": "Topic-OnMessage1_IamRolePolicy_AFCBFBCB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudTopic-OnMessage1_IamRole_8052D72E.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Topic-OnMessage1_IamRole_6EE8D90C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudTopic-OnMessage0_IamRolePolicyAttachment_0E97F0D4": {
+      "Topic-OnMessage0_IamRolePolicyAttachment_091E665D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "cloudTopic-OnMessage0_IamRolePolicyAttachment_0E97F0D4"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicyAttachment_091E665D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.name}"
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
       },
-      "cloudTopic-OnMessage1_IamRolePolicyAttachment_059688CF": {
+      "Topic-OnMessage1_IamRolePolicyAttachment_822D6E28": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage1/IamRolePolicyAttachment",
-            "uniqueId": "cloudTopic-OnMessage1_IamRolePolicyAttachment_059688CF"
+            "path": "root/Default/Default/Topic-OnMessage1/IamRolePolicyAttachment",
+            "uniqueId": "Topic-OnMessage1_IamRolePolicyAttachment_822D6E28"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudTopic-OnMessage1_IamRole_8052D72E.name}"
+        "role": "${aws_iam_role.Topic-OnMessage1_IamRole_6EE8D90C.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudTopic-OnMessage0": {
+      "Topic-OnMessage0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/Default",
-            "uniqueId": "cloudTopic-OnMessage0"
+            "path": "root/Default/Default/Topic-OnMessage0/Default",
+            "uniqueId": "Topic-OnMessage0"
           }
         },
         "architectures": [
@@ -148,31 +135,31 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Topic-OnMessage0-c81c4559",
+            "WING_FUNCTION_NAME": "Topic-OnMessage0-c85d7820",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Topic-OnMessage0-c81c4559",
+        "function_name": "Topic-OnMessage0-c85d7820",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudTopic-OnMessage0_S3Object_751FA064.key}",
+        "s3_key": "${aws_s3_object.Topic-OnMessage0_S3Object_D41E9C10.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudTopic-OnMessage1": {
+      "Topic-OnMessage1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage1/Default",
-            "uniqueId": "cloudTopic-OnMessage1"
+            "path": "root/Default/Default/Topic-OnMessage1/Default",
+            "uniqueId": "Topic-OnMessage1"
           }
         },
         "architectures": [
@@ -180,20 +167,20 @@
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Topic-OnMessage1-c8da402d",
+            "WING_FUNCTION_NAME": "Topic-OnMessage1-c8763765",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Topic-OnMessage1-c8da402d",
+        "function_name": "Topic-OnMessage1-c8763765",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudTopic-OnMessage1_IamRole_8052D72E.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Topic-OnMessage1_IamRole_6EE8D90C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudTopic-OnMessage1_S3Object_C2572EFD.key}",
+        "s3_key": "${aws_s3_object.Topic-OnMessage1_S3Object_F90CC803.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -202,29 +189,29 @@
       }
     },
     "aws_lambda_permission": {
-      "cloudTopic-OnMessage0_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_91E7486D": {
+      "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b",
-            "uniqueId": "cloudTopic-OnMessage0_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_91E7486D"
+            "path": "root/Default/Default/Topic-OnMessage0/InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
+            "uniqueId": "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudTopic-OnMessage0.function_name}",
+        "function_name": "${aws_lambda_function.Topic-OnMessage0.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "source_arn": "${aws_sns_topic.Topic.arn}"
       },
-      "cloudTopic-OnMessage1_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_3F1C0938": {
+      "Topic-OnMessage1_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_A7FB5FA3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage1/InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b",
-            "uniqueId": "cloudTopic-OnMessage1_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_3F1C0938"
+            "path": "root/Default/Default/Topic-OnMessage1/InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
+            "uniqueId": "Topic-OnMessage1_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_A7FB5FA3"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudTopic-OnMessage1.function_name}",
+        "function_name": "${aws_lambda_function.Topic-OnMessage1.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "source_arn": "${aws_sns_topic.Topic.arn}"
       }
     },
     "aws_s3_bucket": {
@@ -239,22 +226,22 @@
       }
     },
     "aws_s3_object": {
-      "cloudTopic-OnMessage0_S3Object_751FA064": {
+      "Topic-OnMessage0_S3Object_D41E9C10": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/S3Object",
-            "uniqueId": "cloudTopic-OnMessage0_S3Object_751FA064"
+            "path": "root/Default/Default/Topic-OnMessage0/S3Object",
+            "uniqueId": "Topic-OnMessage0_S3Object_D41E9C10"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudTopic-OnMessage1_S3Object_C2572EFD": {
+      "Topic-OnMessage1_S3Object_F90CC803": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage1/S3Object",
-            "uniqueId": "cloudTopic-OnMessage1_S3Object_C2572EFD"
+            "path": "root/Default/Default/Topic-OnMessage1/S3Object",
+            "uniqueId": "Topic-OnMessage1_S3Object_F90CC803"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -263,38 +250,38 @@
       }
     },
     "aws_sns_topic": {
-      "cloudTopic": {
+      "Topic": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic/Default",
-            "uniqueId": "cloudTopic"
+            "path": "root/Default/Default/Topic/Default",
+            "uniqueId": "Topic"
           }
         },
-        "name": "cloud-Topic-c82b57aa"
+        "name": "Topic-c8228fb7"
       }
     },
     "aws_sns_topic_subscription": {
-      "cloudTopic_TopicSubscription0_D19DE229": {
+      "Topic_TopicSubscription0_0EA5CC90": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic/TopicSubscription0",
-            "uniqueId": "cloudTopic_TopicSubscription0_D19DE229"
+            "path": "root/Default/Default/Topic/TopicSubscription0",
+            "uniqueId": "Topic_TopicSubscription0_0EA5CC90"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudTopic-OnMessage0.arn}",
+        "endpoint": "${aws_lambda_function.Topic-OnMessage0.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
       },
-      "cloudTopic_TopicSubscription1_BD9D6BB9": {
+      "Topic_TopicSubscription1_7AA173DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic/TopicSubscription1",
-            "uniqueId": "cloudTopic_TopicSubscription1_BD9D6BB9"
+            "path": "root/Default/Default/Topic/TopicSubscription1",
+            "uniqueId": "Topic_TopicSubscription1_7AA173DC"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudTopic-OnMessage1.arn}",
+        "endpoint": "${aws_lambda_function.Topic-OnMessage1.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_test_sim.md
index ae2757951fd..4d51d9ee652 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/on_message.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ on_message.test.wsim » root/env0/test:onMessage
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/subscribe-queue.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/subscribe-queue.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..f833a206df1
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/subscribe-queue.test.w_compile_tf-aws.md
@@ -0,0 +1,449 @@
+# [subscribe-queue.test.w](../../../../../../examples/tests/sdk_tests/topic/subscribe-queue.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1"
+          }
+        },
+        "name": "/aws/lambda/Topic-OnMessage0-c85d7820",
+        "retention_in_days": 30
+      },
+      "q1-SetConsumer0_CloudwatchLogGroup_B5256514": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "q1-SetConsumer0_CloudwatchLogGroup_B5256514"
+          }
+        },
+        "name": "/aws/lambda/q1-SetConsumer0-c8600a39",
+        "retention_in_days": 30
+      },
+      "q2-SetConsumer0_CloudwatchLogGroup_A9ABA3A4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "q2-SetConsumer0_CloudwatchLogGroup_A9ABA3A4"
+          }
+        },
+        "name": "/aws/lambda/q2-SetConsumer0-c8ba098b",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "Topic-OnMessage0_IamRole_64DD36FA": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/IamRole",
+            "uniqueId": "Topic-OnMessage0_IamRole_64DD36FA"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "q1-SetConsumer0_IamRole_8299B0EC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1-SetConsumer0/IamRole",
+            "uniqueId": "q1-SetConsumer0_IamRole_8299B0EC"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "q2-SetConsumer0_IamRole_910A96B5": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/IamRole",
+            "uniqueId": "q2-SetConsumer0_IamRole_910A96B5"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Topic-OnMessage0_IamRolePolicy_F5EE09D8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicy",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicy_F5EE09D8"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
+      },
+      "q1-SetConsumer0_IamRolePolicy_7B7EFF72": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1-SetConsumer0/IamRolePolicy",
+            "uniqueId": "q1-SetConsumer0_IamRolePolicy_7B7EFF72"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.q1.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.q1-SetConsumer0_IamRole_8299B0EC.name}"
+      },
+      "q2-SetConsumer0_IamRolePolicy_4F213331": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/IamRolePolicy",
+            "uniqueId": "q2-SetConsumer0_IamRolePolicy_4F213331"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.q2.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.q2-SetConsumer0_IamRole_910A96B5.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Topic-OnMessage0_IamRolePolicyAttachment_091E665D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicyAttachment_091E665D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
+      },
+      "q1-SetConsumer0_IamRolePolicyAttachment_87EE6CD7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "q1-SetConsumer0_IamRolePolicyAttachment_87EE6CD7"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.q1-SetConsumer0_IamRole_8299B0EC.name}"
+      },
+      "q2-SetConsumer0_IamRolePolicyAttachment_6DB0A9EE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "q2-SetConsumer0_IamRolePolicyAttachment_6DB0A9EE"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.q2-SetConsumer0_IamRole_910A96B5.name}"
+      }
+    },
+    "aws_lambda_event_source_mapping": {
+      "q1_EventSourceMapping_26C17B14": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1/EventSourceMapping",
+            "uniqueId": "q1_EventSourceMapping_26C17B14"
+          }
+        },
+        "batch_size": 1,
+        "event_source_arn": "${aws_sqs_queue.q1.arn}",
+        "function_name": "${aws_lambda_function.q1-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
+      },
+      "q2_EventSourceMapping_F484014F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2/EventSourceMapping",
+            "uniqueId": "q2_EventSourceMapping_F484014F"
+          }
+        },
+        "batch_size": 1,
+        "event_source_arn": "${aws_sqs_queue.q2.arn}",
+        "function_name": "${aws_lambda_function.q2-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
+      }
+    },
+    "aws_lambda_function": {
+      "Topic-OnMessage0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/Default",
+            "uniqueId": "Topic-OnMessage0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Topic-OnMessage0-c85d7820",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Topic-OnMessage0-c85d7820",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Topic-OnMessage0_S3Object_D41E9C10.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "q1-SetConsumer0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1-SetConsumer0/Default",
+            "uniqueId": "q1-SetConsumer0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "q1-SetConsumer0-c8600a39",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "q1-SetConsumer0-c8600a39",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.q1-SetConsumer0_IamRole_8299B0EC.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.q1-SetConsumer0_S3Object_60123604.key}",
+        "timeout": "${aws_sqs_queue.q1.visibility_timeout_seconds}",
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "q2-SetConsumer0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/Default",
+            "uniqueId": "q2-SetConsumer0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "q2-SetConsumer0-c8ba098b",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "q2-SetConsumer0-c8ba098b",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.q2-SetConsumer0_IamRole_910A96B5.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.q2-SetConsumer0_S3Object_FB40B099.key}",
+        "timeout": "${aws_sqs_queue.q2.visibility_timeout_seconds}",
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
+            "uniqueId": "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Topic-OnMessage0.function_name}",
+        "principal": "sns.amazonaws.com",
+        "source_arn": "${aws_sns_topic.Topic.arn}"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Topic-OnMessage0_S3Object_D41E9C10": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/S3Object",
+            "uniqueId": "Topic-OnMessage0_S3Object_D41E9C10"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "q1-SetConsumer0_S3Object_60123604": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1-SetConsumer0/S3Object",
+            "uniqueId": "q1-SetConsumer0_S3Object_60123604"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "q2-SetConsumer0_S3Object_FB40B099": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2-SetConsumer0/S3Object",
+            "uniqueId": "q2-SetConsumer0_S3Object_FB40B099"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    },
+    "aws_sns_topic": {
+      "Topic": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/Default",
+            "uniqueId": "Topic"
+          }
+        },
+        "name": "Topic-c8228fb7"
+      }
+    },
+    "aws_sns_topic_subscription": {
+      "Topic_TopicSubscription0_0EA5CC90": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/TopicSubscription0",
+            "uniqueId": "Topic_TopicSubscription0_0EA5CC90"
+          }
+        },
+        "endpoint": "${aws_lambda_function.Topic-OnMessage0.arn}",
+        "protocol": "lambda",
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
+      },
+      "Topic_TopicSubscription1_7AA173DC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/TopicSubscription1",
+            "uniqueId": "Topic_TopicSubscription1_7AA173DC"
+          }
+        },
+        "endpoint": "${aws_sqs_queue.q1.arn}",
+        "protocol": "sqs",
+        "raw_message_delivery": true,
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
+      },
+      "Topic_TopicSubscription2_588150DD": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/TopicSubscription2",
+            "uniqueId": "Topic_TopicSubscription2_588150DD"
+          }
+        },
+        "endpoint": "${aws_sqs_queue.q2.arn}",
+        "protocol": "sqs",
+        "raw_message_delivery": true,
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
+      }
+    },
+    "aws_sqs_queue": {
+      "q1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q1/Default",
+            "uniqueId": "q1"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "q1-c8d04b5e",
+        "visibility_timeout_seconds": 30
+      },
+      "q2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/q2/Default",
+            "uniqueId": "q2"
+          }
+        },
+        "message_retention_seconds": 3600,
+        "name": "q2-c8aa6380",
+        "visibility_timeout_seconds": 30
+      }
+    },
+    "aws_sqs_queue_policy": {
+      "Topic_SqsQueuePolicy-c8aa63803bb48703f04c4e86e7ec46acc23af1eae7_2C2F1390": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/SqsQueuePolicy-c8aa63803bb48703f04c4e86e7ec46acc23af1eae7",
+            "uniqueId": "Topic_SqsQueuePolicy-c8aa63803bb48703f04c4e86e7ec46acc23af1eae7_2C2F1390"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"sns.amazonaws.com\"},\"Action\":\"sqs:SendMessage\",\"Resource\":\"${aws_sqs_queue.q2.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_sns_topic.Topic.arn}\"}}}]}",
+        "queue_url": "${aws_sqs_queue.q2.url}"
+      },
+      "Topic_SqsQueuePolicy-c8d04b5ef86e7d86fc1200f50de3110292a6dd012d_38A7F5C3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/SqsQueuePolicy-c8d04b5ef86e7d86fc1200f50de3110292a6dd012d",
+            "uniqueId": "Topic_SqsQueuePolicy-c8d04b5ef86e7d86fc1200f50de3110292a6dd012d_38A7F5C3"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"sns.amazonaws.com\"},\"Action\":\"sqs:SendMessage\",\"Resource\":\"${aws_sqs_queue.q1.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_sns_topic.Topic.arn}\"}}}]}",
+        "queue_url": "${aws_sqs_queue.q1.url}"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/subscribe-queue.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/subscribe-queue.test.w_test_sim.md
new file mode 100644
index 00000000000..a7e449bf4e4
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/subscribe-queue.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [subscribe-queue.test.w](../../../../../../examples/tests/sdk_tests/topic/subscribe-queue.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ subscribe-queue.test.wsim » root/env0/test:functions and queues receiving messages from the topic
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/variadic-parameter.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/variadic-parameter.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..2bc3d594eaf
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/variadic-parameter.test.w_compile_tf-aws.md
@@ -0,0 +1,185 @@
+# [variadic-parameter.test.w](../../../../../../examples/tests/sdk_tests/topic/variadic-parameter.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1"
+          }
+        },
+        "name": "/aws/lambda/Topic-OnMessage0-c85d7820",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "Topic-OnMessage0_IamRole_64DD36FA": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/IamRole",
+            "uniqueId": "Topic-OnMessage0_IamRole_64DD36FA"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Topic-OnMessage0_IamRolePolicy_F5EE09D8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicy",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicy_F5EE09D8"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Topic-OnMessage0_IamRolePolicyAttachment_091E665D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicyAttachment_091E665D"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Topic-OnMessage0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/Default",
+            "uniqueId": "Topic-OnMessage0"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Topic-OnMessage0-c85d7820",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Topic-OnMessage0-c85d7820",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Topic-OnMessage0_S3Object_D41E9C10.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
+            "uniqueId": "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Topic-OnMessage0.function_name}",
+        "principal": "sns.amazonaws.com",
+        "source_arn": "${aws_sns_topic.Topic.arn}"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Topic-OnMessage0_S3Object_D41E9C10": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic-OnMessage0/S3Object",
+            "uniqueId": "Topic-OnMessage0_S3Object_D41E9C10"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    },
+    "aws_sns_topic": {
+      "Topic": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/Default",
+            "uniqueId": "Topic"
+          }
+        },
+        "name": "Topic-c8228fb7"
+      }
+    },
+    "aws_sns_topic_subscription": {
+      "Topic_TopicSubscription0_0EA5CC90": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Topic/TopicSubscription0",
+            "uniqueId": "Topic_TopicSubscription0_0EA5CC90"
+          }
+        },
+        "endpoint": "${aws_lambda_function.Topic-OnMessage0.arn}",
+        "protocol": "lambda",
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
+      }
+    }
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/variadic-parameter.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/variadic-parameter.test.w_test_sim.md
new file mode 100644
index 00000000000..3d25b2d907f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/topic/variadic-parameter.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [variadic-parameter.test.w](../../../../../../examples/tests/sdk_tests/topic/variadic-parameter.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ variadic-parameter.test.wsim » root/env0/test:publish message array to topic
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_compile_tf-aws.md
index eeaa93e95ee..8d2643ac397 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,33 +18,33 @@
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "WidgetService_uiButton_Handler_CloudwatchLogGroup_181B65EF": {
+      "WidgetService_Button_Handler_CloudwatchLogGroup_A9F35A47": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Button/Handler/CloudwatchLogGroup",
-            "uniqueId": "WidgetService_uiButton_Handler_CloudwatchLogGroup_181B65EF"
+            "path": "root/Default/Default/WidgetService/Button/Handler/CloudwatchLogGroup",
+            "uniqueId": "WidgetService_Button_Handler_CloudwatchLogGroup_A9F35A47"
           }
         },
-        "name": "/aws/lambda/Handler-c82f982f",
+        "name": "/aws/lambda/Handler-c8ba9e97",
         "retention_in_days": 30
       },
-      "WidgetService_uiField_Handler_CloudwatchLogGroup_82BCED02": {
+      "WidgetService_Field_Handler_CloudwatchLogGroup_5D72B206": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Field/Handler/CloudwatchLogGroup",
-            "uniqueId": "WidgetService_uiField_Handler_CloudwatchLogGroup_82BCED02"
+            "path": "root/Default/Default/WidgetService/Field/Handler/CloudwatchLogGroup",
+            "uniqueId": "WidgetService_Field_Handler_CloudwatchLogGroup_5D72B206"
           }
         },
-        "name": "/aws/lambda/Handler-c876ab08",
+        "name": "/aws/lambda/Handler-c8fa6fbe",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "WidgetService_cloudCounter_5741B0CD": {
+      "WidgetService_Counter_07B65A41": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/cloud.Counter/Default",
-            "uniqueId": "WidgetService_cloudCounter_5741B0CD"
+            "path": "root/Default/Default/WidgetService/Counter/Default",
+            "uniqueId": "WidgetService_Counter_07B65A41"
           }
         },
         "attribute": [
@@ -68,79 +55,79 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c8a16ecd"
+        "name": "wing-counter-Counter-c8a52f2e"
       }
     },
     "aws_iam_role": {
-      "WidgetService_uiButton_Handler_IamRole_6B3512D4": {
+      "WidgetService_Button_Handler_IamRole_B297B278": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Button/Handler/IamRole",
-            "uniqueId": "WidgetService_uiButton_Handler_IamRole_6B3512D4"
+            "path": "root/Default/Default/WidgetService/Button/Handler/IamRole",
+            "uniqueId": "WidgetService_Button_Handler_IamRole_B297B278"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "WidgetService_uiField_Handler_IamRole_F0F1B44A": {
+      "WidgetService_Field_Handler_IamRole_A196F9F2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Field/Handler/IamRole",
-            "uniqueId": "WidgetService_uiField_Handler_IamRole_F0F1B44A"
+            "path": "root/Default/Default/WidgetService/Field/Handler/IamRole",
+            "uniqueId": "WidgetService_Field_Handler_IamRole_A196F9F2"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "WidgetService_uiButton_Handler_IamRolePolicy_E258A8AD": {
+      "WidgetService_Button_Handler_IamRolePolicy_6B60FF83": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Button/Handler/IamRolePolicy",
-            "uniqueId": "WidgetService_uiButton_Handler_IamRolePolicy_E258A8AD"
+            "path": "root/Default/Default/WidgetService/Button/Handler/IamRolePolicy",
+            "uniqueId": "WidgetService_Button_Handler_IamRolePolicy_6B60FF83"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.WidgetService_cloudBucket_4055DD59.arn}\",\"${aws_s3_bucket.WidgetService_cloudBucket_4055DD59.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.WidgetService_cloudCounter_5741B0CD.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.WidgetService_uiButton_Handler_IamRole_6B3512D4.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.WidgetService_Counter_07B65A41.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.WidgetService_Bucket_125C963C.arn}\",\"${aws_s3_bucket.WidgetService_Bucket_125C963C.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.WidgetService_Button_Handler_IamRole_B297B278.name}"
       },
-      "WidgetService_uiField_Handler_IamRolePolicy_5A8ECF8B": {
+      "WidgetService_Field_Handler_IamRolePolicy_4CA2797D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Field/Handler/IamRolePolicy",
-            "uniqueId": "WidgetService_uiField_Handler_IamRolePolicy_5A8ECF8B"
+            "path": "root/Default/Default/WidgetService/Field/Handler/IamRolePolicy",
+            "uniqueId": "WidgetService_Field_Handler_IamRolePolicy_4CA2797D"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.WidgetService_cloudBucket_4055DD59.arn}\",\"${aws_s3_bucket.WidgetService_cloudBucket_4055DD59.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.WidgetService_uiField_Handler_IamRole_F0F1B44A.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.WidgetService_Bucket_125C963C.arn}\",\"${aws_s3_bucket.WidgetService_Bucket_125C963C.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.WidgetService_Field_Handler_IamRole_A196F9F2.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "WidgetService_uiButton_Handler_IamRolePolicyAttachment_B7C6F2E8": {
+      "WidgetService_Button_Handler_IamRolePolicyAttachment_FFFE7BCD": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Button/Handler/IamRolePolicyAttachment",
-            "uniqueId": "WidgetService_uiButton_Handler_IamRolePolicyAttachment_B7C6F2E8"
+            "path": "root/Default/Default/WidgetService/Button/Handler/IamRolePolicyAttachment",
+            "uniqueId": "WidgetService_Button_Handler_IamRolePolicyAttachment_FFFE7BCD"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.WidgetService_uiButton_Handler_IamRole_6B3512D4.name}"
+        "role": "${aws_iam_role.WidgetService_Button_Handler_IamRole_B297B278.name}"
       },
-      "WidgetService_uiField_Handler_IamRolePolicyAttachment_7E7212B5": {
+      "WidgetService_Field_Handler_IamRolePolicyAttachment_57C2FA54": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Field/Handler/IamRolePolicyAttachment",
-            "uniqueId": "WidgetService_uiField_Handler_IamRolePolicyAttachment_7E7212B5"
+            "path": "root/Default/Default/WidgetService/Field/Handler/IamRolePolicyAttachment",
+            "uniqueId": "WidgetService_Field_Handler_IamRolePolicyAttachment_57C2FA54"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.WidgetService_uiField_Handler_IamRole_F0F1B44A.name}"
+        "role": "${aws_iam_role.WidgetService_Field_Handler_IamRole_A196F9F2.name}"
       }
     },
     "aws_lambda_function": {
-      "WidgetService_uiButton_Handler_B4965FCF": {
+      "WidgetService_Button_Handler_23F2D2EE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Button/Handler/Default",
-            "uniqueId": "WidgetService_uiButton_Handler_B4965FCF"
+            "path": "root/Default/Default/WidgetService/Button/Handler/Default",
+            "uniqueId": "WidgetService_Button_Handler_23F2D2EE"
           }
         },
         "architectures": [
@@ -148,32 +135,32 @@
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_c70730ce": "${aws_s3_bucket.WidgetService_cloudBucket_4055DD59.bucket}",
-            "DYNAMODB_TABLE_NAME_fa6d1fc4": "${aws_dynamodb_table.WidgetService_cloudCounter_5741B0CD.name}",
+            "BUCKET_NAME_d47f60fd": "${aws_s3_bucket.WidgetService_Bucket_125C963C.bucket}",
+            "DYNAMODB_TABLE_NAME_e2f7658b": "${aws_dynamodb_table.WidgetService_Counter_07B65A41.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "Handler-c82f982f",
+            "WING_FUNCTION_NAME": "Handler-c8ba9e97",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "Handler-c82f982f",
+        "function_name": "Handler-c8ba9e97",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.WidgetService_uiButton_Handler_IamRole_6B3512D4.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.WidgetService_Button_Handler_IamRole_B297B278.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.WidgetService_uiButton_Handler_S3Object_EB849EC3.key}",
+        "s3_key": "${aws_s3_object.WidgetService_Button_Handler_S3Object_277180FD.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "WidgetService_uiField_Handler_A0505032": {
+      "WidgetService_Field_Handler_0963A3DE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Field/Handler/Default",
-            "uniqueId": "WidgetService_uiField_Handler_A0505032"
+            "path": "root/Default/Default/WidgetService/Field/Handler/Default",
+            "uniqueId": "WidgetService_Field_Handler_0963A3DE"
           }
         },
         "architectures": [
@@ -181,21 +168,21 @@
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_c70730ce": "${aws_s3_bucket.WidgetService_cloudBucket_4055DD59.bucket}",
-            "DYNAMODB_TABLE_NAME_fa6d1fc4": "${aws_dynamodb_table.WidgetService_cloudCounter_5741B0CD.name}",
+            "BUCKET_NAME_d47f60fd": "${aws_s3_bucket.WidgetService_Bucket_125C963C.bucket}",
+            "DYNAMODB_TABLE_NAME_e2f7658b": "${aws_dynamodb_table.WidgetService_Counter_07B65A41.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "Handler-c876ab08",
+            "WING_FUNCTION_NAME": "Handler-c8fa6fbe",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "Handler-c876ab08",
+        "function_name": "Handler-c8fa6fbe",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.WidgetService_uiField_Handler_IamRole_F0F1B44A.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.WidgetService_Field_Handler_IamRole_A196F9F2.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.WidgetService_uiField_Handler_S3Object_86A8EAFA.key}",
+        "s3_key": "${aws_s3_object.WidgetService_Field_Handler_S3Object_9825B672.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -213,34 +200,34 @@
         },
         "bucket_prefix": "code-c84a50b1-"
       },
-      "WidgetService_cloudBucket_4055DD59": {
+      "WidgetService_Bucket_125C963C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/cloud.Bucket/Default",
-            "uniqueId": "WidgetService_cloudBucket_4055DD59"
+            "path": "root/Default/Default/WidgetService/Bucket/Default",
+            "uniqueId": "WidgetService_Bucket_125C963C"
           }
         },
-        "bucket_prefix": "cloud-bucket-c801fba9-",
+        "bucket_prefix": "bucket-c8203287-",
         "force_destroy": false
       }
     },
     "aws_s3_object": {
-      "WidgetService_uiButton_Handler_S3Object_EB849EC3": {
+      "WidgetService_Button_Handler_S3Object_277180FD": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Button/Handler/S3Object",
-            "uniqueId": "WidgetService_uiButton_Handler_S3Object_EB849EC3"
+            "path": "root/Default/Default/WidgetService/Button/Handler/S3Object",
+            "uniqueId": "WidgetService_Button_Handler_S3Object_277180FD"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "WidgetService_uiField_Handler_S3Object_86A8EAFA": {
+      "WidgetService_Field_Handler_S3Object_9825B672": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/WidgetService/ui.Field/Handler/S3Object",
-            "uniqueId": "WidgetService_uiField_Handler_S3Object_86A8EAFA"
+            "path": "root/Default/Default/WidgetService/Field/Handler/S3Object",
+            "uniqueId": "WidgetService_Field_Handler_S3Object_9825B672"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_test_sim.md
index ef1b0ba8903..7419abe7d29 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/ui/section.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ section.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_compile_tf-aws.md
index 5d968d8b06c..581d9609926 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_test_sim.md
index 4946e2bf6cf..0cb5fecc777 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/base64.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ base64.test.wsim » root/env0/test:inflight base64
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_compile_tf-aws.md
index 01c29b04a75..dba0ead4db6 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_test_sim.md
index a92a124be09..30dd87de42f 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/env.test.w_test_sim.md
@@ -3,9 +3,10 @@
 ## stdout.log
 ```log
 pass ─ env.test.wsim » root/env0/test:use util from inflight
- 
- 
-Tests 1 passed (1)
+pass ─ env.test.wsim » root/env1/test:set env from inflight 
+
+Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/exec.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/exec.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..5d691b6ce5b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/exec.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [exec.test.w](../../../../../../examples/tests/sdk_tests/util/exec.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/exec.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/exec.test.w_test_sim.md
new file mode 100644
index 00000000000..1ae379cdd0d
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/exec.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [exec.test.w](../../../../../../examples/tests/sdk_tests/util/exec.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ exec.test.wsim » root/env0/test:exec()
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_compile_tf-aws.md
index 605d5be31e4..3cd1d916b3c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_test_sim.md
index b52c604d37d..c60dbd918c3 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/nanoid.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ nanoid.test.wsim » root/env0/test:inflight nanoid
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/os.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/os.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..73da961e99c
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/os.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [os.test.w](../../../../../../examples/tests/sdk_tests/util/os.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/os.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/os.test.w_test_sim.md
new file mode 100644
index 00000000000..1ce32caca53
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/os.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [os.test.w](../../../../../../examples/tests/sdk_tests/util/os.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ os.test.wsim » root/env0/test:util.os() inflight
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_compile_tf-aws.md
index 3e7239566a7..0d9c16e0826 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_test_sim.md
index 1540e466b87..4711e4825dc 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sha256.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ sha256.test.wsim » root/env0/test:inflight sha256
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/shell.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/shell.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..b9964567ec6
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/shell.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [shell.test.w](../../../../../../examples/tests/sdk_tests/util/shell.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/shell.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/shell.test.w_test_sim.md
new file mode 100644
index 00000000000..34e551c4a6e
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/shell.test.w_test_sim.md
@@ -0,0 +1,17 @@
+# [shell.test.w](../../../../../../examples/tests/sdk_tests/util/shell.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ shell.test.wsim » root/env0/test:shell() with valid command                
+pass ─ shell.test.wsim » root/env1/test:shell() with invalid command              
+pass ─ shell.test.wsim » root/env2/test:shell() with explicit non-zero exit status
+pass ─ shell.test.wsim » root/env3/test:shell() with env option                   
+pass ─ shell.test.wsim » root/env4/test:shell() with inheritEnv option            
+pass ─ shell.test.wsim » root/env5/test:shell() with cwd option                   
+
+Tests 6 passed (6)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_compile_tf-aws.md
index 8c45db0e271..92843433c6b 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_test_sim.md
index 2a5e011bec2..17841ee318c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/sleep.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ sleep.test.wsim » root/env0/test:sleep 100 mili seconds
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/spawn.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/spawn.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..c42cac57689
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/spawn.test.w_compile_tf-aws.md
@@ -0,0 +1,21 @@
+# [spawn.test.w](../../../../../../examples/tests/sdk_tests/util/spawn.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/spawn.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/spawn.test.w_test_sim.md
new file mode 100644
index 00000000000..80bbb943061
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/spawn.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [spawn.test.w](../../../../../../examples/tests/sdk_tests/util/spawn.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ spawn.test.wsim » root/env0/test:spawn()
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_compile_tf-aws.md
index ae8b7dd5171..be29596dc4c 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_test_sim.md
index 955731125ff..b92a9292ed0 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/uuidv4.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ uuidv4.test.wsim » root/env0/test:inflight uuidv4
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_compile_tf-aws.md
index df058ff689d..59131abc2d7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,45 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "invoke-counter1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/invoke-counter1/Default",
+            "uniqueId": "invoke-counter1"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-invoke-counter1-c8df96b3"
+      },
+      "invoke-counter2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/invoke-counter2/Default",
+            "uniqueId": "invoke-counter2"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-invoke-counter2-c8400881"
+      },
+      "invoke-counter3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/invoke-counter3/Default",
+            "uniqueId": "invoke-counter3"
           }
         },
         "attribute": [
@@ -46,7 +67,7 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-invoke-counter3-c8668bff"
       }
     }
   }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_test_sim.md
index 4c3ebf37489..78fd5318735 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/util/wait-until.test.w_test_sim.md
@@ -2,14 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ wait-until.test.wsim » root/env0/test:returns true immediately                                  
-pass ─ wait-until.test.wsim » root/env1/test:returns false goes to timeout                             
-pass ─ wait-until.test.wsim » root/env2/test:returns after some time waiting                           
-pass ─ wait-until.test.wsim » root/env3/test:setting props                                             
-pass ─ wait-until.test.wsim » root/env4/test:throwing exception from predicate should throw immediately
- 
- 
-Tests 5 passed (5)
+pass ─ wait-until.test.wsim » root/env0/test:waitUntil
+
+Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-react-app.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-react-app.test.w_compile_tf-aws.md
deleted file mode 100644
index afefc2299e0..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-react-app.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,227 +0,0 @@
-# [aws-react-app.test.w](../../../../../../examples/tests/sdk_tests/website/aws-react-app.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "data": {
-    "aws_iam_policy_document": {
-      "aws-wing-react-app_aws-wing-react-app-host_AllowDistributionReadOnly_7A91DE38": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/AllowDistributionReadOnly",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_AllowDistributionReadOnly_7A91DE38"
-          }
-        },
-        "statement": [
-          {
-            "actions": [
-              "s3:GetObject"
-            ],
-            "condition": [
-              {
-                "test": "StringEquals",
-                "values": [
-                  "${aws_cloudfront_distribution.aws-wing-react-app_aws-wing-react-app-host_Distribution_4EBFE5E4.arn}"
-                ],
-                "variable": "AWS:SourceArn"
-              }
-            ],
-            "principals": [
-              {
-                "identifiers": [
-                  "cloudfront.amazonaws.com"
-                ],
-                "type": "Service"
-              }
-            ],
-            "resources": [
-              "${aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516.arn}/*"
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_cloudfront_distribution": {
-      "aws-wing-react-app_aws-wing-react-app-host_Distribution_4EBFE5E4": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/Distribution",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_Distribution_4EBFE5E4"
-          }
-        },
-        "default_cache_behavior": {
-          "allowed_methods": [
-            "GET",
-            "HEAD"
-          ],
-          "cached_methods": [
-            "GET",
-            "HEAD"
-          ],
-          "compress": true,
-          "default_ttl": 3600,
-          "forwarded_values": {
-            "cookies": {
-              "forward": "none"
-            },
-            "query_string": false
-          },
-          "max_ttl": 86400,
-          "min_ttl": 0,
-          "target_origin_id": "s3Origin",
-          "viewer_protocol_policy": "redirect-to-https"
-        },
-        "default_root_object": "index.html",
-        "enabled": true,
-        "origin": [
-          {
-            "domain_name": "${aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516.bucket_regional_domain_name}",
-            "origin_access_control_id": "${aws_cloudfront_origin_access_control.aws-wing-react-app_aws-wing-react-app-host_CloudfrontOac_3CFA2BB8.id}",
-            "origin_id": "s3Origin"
-          }
-        ],
-        "price_class": "PriceClass_100",
-        "restrictions": {
-          "geo_restriction": {
-            "locations": [],
-            "restriction_type": "none"
-          }
-        },
-        "viewer_certificate": {
-          "cloudfront_default_certificate": true
-        }
-      }
-    },
-    "aws_cloudfront_origin_access_control": {
-      "aws-wing-react-app_aws-wing-react-app-host_CloudfrontOac_3CFA2BB8": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/CloudfrontOac",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_CloudfrontOac_3CFA2BB8"
-          }
-        },
-        "name": "aws-wing-c818c394-cloudfront-oac",
-        "origin_access_control_origin_type": "s3",
-        "signing_behavior": "always",
-        "signing_protocol": "sigv4"
-      }
-    },
-    "aws_s3_bucket": {
-      "aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/WebsiteBucket",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516"
-          }
-        },
-        "bucket_prefix": "aws-wing-react-app-host-c818c394-",
-        "force_destroy": false
-      }
-    },
-    "aws_s3_bucket_policy": {
-      "aws-wing-react-app_aws-wing-react-app-host_DistributionS3BucketPolicy_04AD3FD8": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/DistributionS3BucketPolicy",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_DistributionS3BucketPolicy_04AD3FD8"
-          }
-        },
-        "bucket": "${aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516.id}",
-        "policy": "${data.aws_iam_policy_document.aws-wing-react-app_aws-wing-react-app-host_AllowDistributionReadOnly_7A91DE38.json}"
-      }
-    },
-    "aws_s3_bucket_website_configuration": {
-      "aws-wing-react-app_aws-wing-react-app-host_BucketWebsiteConfiguration_FF549632": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/BucketWebsiteConfiguration",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_BucketWebsiteConfiguration_FF549632"
-          }
-        },
-        "bucket": "${aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516.bucket}",
-        "index_document": {
-          "suffix": "index.html"
-        }
-      }
-    },
-    "aws_s3_object": {
-      "aws-wing-react-app_aws-wing-react-app-host_File--indexhtml_3A47E22E": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/File--index.html",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_File--indexhtml_3A47E22E"
-          }
-        },
-        "bucket": "${aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516.bucket}",
-        "content_type": "text/html; charset=utf-8",
-        "depends_on": [
-          "aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516"
-        ],
-        "key": "/index.html",
-        "source": "<SOURCE>",
-        "source_hash": "${filemd5(<SOURCE>)}"
-      },
-      "aws-wing-react-app_aws-wing-react-app-host_File--indexjs_8F298937": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/File--index.js",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_File--indexjs_8F298937"
-          }
-        },
-        "bucket": "${aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516.bucket}",
-        "content_type": "application/javascript; charset=utf-8",
-        "depends_on": [
-          "aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516"
-        ],
-        "key": "/index.js",
-        "source": "<SOURCE>",
-        "source_hash": "${filemd5(<SOURCE>)}"
-      },
-      "aws-wing-react-app_aws-wing-react-app-host_File-wingjs_EB4C8CA1": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/aws-wing-react-app/aws-wing-react-app-host/File-wing.js",
-            "uniqueId": "aws-wing-react-app_aws-wing-react-app-host_File-wingjs_EB4C8CA1"
-          }
-        },
-        "bucket": "${aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516.bucket}",
-        "content": "// This file is generated by wing\nwindow.wingEnv = {};",
-        "content_type": "text/javascript",
-        "depends_on": [
-          "aws_s3_bucket.aws-wing-react-app_aws-wing-react-app-host_WebsiteBucket_8FC77516"
-        ],
-        "key": "wing.js"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-react-app.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-react-app.test.w_test_sim.md
deleted file mode 100644
index 1c219d7dc3b..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-react-app.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [aws-react-app.test.w](../../../../../../examples/tests/sdk_tests/website/aws-react-app.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ aws-react-app.test.wsim » root/env0/test:validates the AWS bucket name
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_compile_tf-aws.md
index 54e1f0ebbd1..728f121f212 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_compile_tf-aws.md
@@ -7,13 +7,17 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "aws-wing-website": {
+              "Endpoint": {
+                "Url": "aws-wing-website_Endpoint_Url_2C61EBBC"
+              }
+            }
           }
         }
       }
@@ -59,8 +63,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "aws-wing-website_Endpoint_Url_2C61EBBC": {
+      "value": "https://${aws_cloudfront_distribution.aws-wing-website_Distribution_87B2F767.domain_name}"
     }
   },
   "provider": {
@@ -173,6 +177,22 @@
       }
     },
     "aws_s3_object": {
+      "aws-wing-website_File--errorhtml_9E256301": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/aws-wing-website/File--error.html",
+            "uniqueId": "aws-wing-website_File--errorhtml_9E256301"
+          }
+        },
+        "bucket": "${aws_s3_bucket.aws-wing-website_WebsiteBucket_9D587AAD.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.aws-wing-website_WebsiteBucket_9D587AAD"
+        ],
+        "key": "/error.html",
+        "source": "<SOURCE>",
+        "source_hash": "${filemd5(<SOURCE>)}"
+      },
       "aws-wing-website_File--indexhtml_D03F523C": {
         "//": {
           "metadata": {
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_test_sim.md
index 50471e3baef..14c5dad96d8 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/aws-website.test.w_test_sim.md
@@ -2,10 +2,11 @@
 
 ## stdout.log
 ```log
+[INFO] validates the AWS bucket name | Website server listening on http://<IP>:<PORT>
 pass ─ aws-website.test.wsim » root/env0/test:validates the AWS bucket name
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/react-app.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/react-app.test.w_compile_tf-aws.md
deleted file mode 100644
index eb689b680f6..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/react-app.test.w_compile_tf-aws.md
+++ /dev/null
@@ -1,397 +0,0 @@
-# [react-app.test.w](../../../../../../examples/tests/sdk_tests/website/react-app.test.w) | compile | tf-aws
-
-## main.tf.json
-```json
-{
-  "//": {
-    "metadata": {
-      "backend": "local",
-      "stackName": "root",
-      "version": "0.17.0"
-    },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "data": {
-    "aws_iam_policy_document": {
-      "exReactApp_exReactApp-host_AllowDistributionReadOnly_449FAF0F": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/AllowDistributionReadOnly",
-            "uniqueId": "exReactApp_exReactApp-host_AllowDistributionReadOnly_449FAF0F"
-          }
-        },
-        "statement": [
-          {
-            "actions": [
-              "s3:GetObject"
-            ],
-            "condition": [
-              {
-                "test": "StringEquals",
-                "values": [
-                  "${aws_cloudfront_distribution.exReactApp_exReactApp-host_Distribution_FE9291B1.arn}"
-                ],
-                "variable": "AWS:SourceArn"
-              }
-            ],
-            "principals": [
-              {
-                "identifiers": [
-                  "cloudfront.amazonaws.com"
-                ],
-                "type": "Service"
-              }
-            ],
-            "resources": [
-              "${aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A.arn}/*"
-            ]
-          }
-        ]
-      }
-    },
-    "aws_region": {
-      "Region": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Region",
-            "uniqueId": "Region"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
-  "provider": {
-    "aws": [
-      {}
-    ]
-  },
-  "resource": {
-    "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
-          }
-        },
-        "lifecycle": {
-          "create_before_destroy": true
-        },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
-        "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
-        }
-      }
-    },
-    "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
-          }
-        },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/\":{\"get\":{\"operationId\":\"get\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get__0_53449ADC.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
-        "lifecycle": {
-          "create_before_destroy": true
-        },
-        "name": "api-c895068c"
-      }
-    },
-    "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
-          }
-        },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
-        "stage_name": "prod"
-      }
-    },
-    "aws_cloudfront_distribution": {
-      "exReactApp_exReactApp-host_Distribution_FE9291B1": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/Distribution",
-            "uniqueId": "exReactApp_exReactApp-host_Distribution_FE9291B1"
-          }
-        },
-        "default_cache_behavior": {
-          "allowed_methods": [
-            "GET",
-            "HEAD"
-          ],
-          "cached_methods": [
-            "GET",
-            "HEAD"
-          ],
-          "compress": true,
-          "default_ttl": 3600,
-          "forwarded_values": {
-            "cookies": {
-              "forward": "none"
-            },
-            "query_string": false
-          },
-          "max_ttl": 86400,
-          "min_ttl": 0,
-          "target_origin_id": "s3Origin",
-          "viewer_protocol_policy": "redirect-to-https"
-        },
-        "default_root_object": "index.html",
-        "enabled": true,
-        "origin": [
-          {
-            "domain_name": "${aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A.bucket_regional_domain_name}",
-            "origin_access_control_id": "${aws_cloudfront_origin_access_control.exReactApp_exReactApp-host_CloudfrontOac_B85B4BF9.id}",
-            "origin_id": "s3Origin"
-          }
-        ],
-        "price_class": "PriceClass_100",
-        "restrictions": {
-          "geo_restriction": {
-            "locations": [],
-            "restriction_type": "none"
-          }
-        },
-        "viewer_certificate": {
-          "cloudfront_default_certificate": true
-        }
-      }
-    },
-    "aws_cloudfront_origin_access_control": {
-      "exReactApp_exReactApp-host_CloudfrontOac_B85B4BF9": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/CloudfrontOac",
-            "uniqueId": "exReactApp_exReactApp-host_CloudfrontOac_B85B4BF9"
-          }
-        },
-        "name": "ex-React-c8e2f35e-cloudfront-oac",
-        "origin_access_control_origin_type": "s3",
-        "signing_behavior": "always",
-        "signing_protocol": "sigv4"
-      }
-    },
-    "aws_cloudwatch_log_group": {
-      "cloudApi_get__0_CloudwatchLogGroup_8157F45B": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/get__}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get__0_CloudwatchLogGroup_8157F45B"
-          }
-        },
-        "name": "/aws/lambda/get__-0-c83a3423",
-        "retention_in_days": 30
-      }
-    },
-    "aws_iam_role": {
-      "cloudApi_get__0_IamRole_BA7625E6": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/get__}0/IamRole",
-            "uniqueId": "cloudApi_get__0_IamRole_BA7625E6"
-          }
-        },
-        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
-      }
-    },
-    "aws_iam_role_policy": {
-      "cloudApi_get__0_IamRolePolicy_EA1F05B0": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/get__}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get__0_IamRolePolicy_EA1F05B0"
-          }
-        },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get__0_IamRole_BA7625E6.name}"
-      }
-    },
-    "aws_iam_role_policy_attachment": {
-      "cloudApi_get__0_IamRolePolicyAttachment_9A60D059": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/get__}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get__0_IamRolePolicyAttachment_9A60D059"
-          }
-        },
-        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get__0_IamRole_BA7625E6.name}"
-      }
-    },
-    "aws_lambda_function": {
-      "cloudApi_get__0_53449ADC": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/get__}0/Default",
-            "uniqueId": "cloudApi_get__0_53449ADC"
-          }
-        },
-        "architectures": [
-          "arm64"
-        ],
-        "environment": {
-          "variables": {
-            "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get__-0-c83a3423",
-            "WING_TARGET": "tf-aws"
-          }
-        },
-        "function_name": "get__-0-c83a3423",
-        "handler": "index.handler",
-        "memory_size": 1024,
-        "publish": true,
-        "role": "${aws_iam_role.cloudApi_get__0_IamRole_BA7625E6.arn}",
-        "runtime": "nodejs18.x",
-        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get__0_S3Object_806093F6.key}",
-        "timeout": 60,
-        "vpc_config": {
-          "security_group_ids": [],
-          "subnet_ids": []
-        }
-      }
-    },
-    "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-c2e3ffa8_37FA5D89": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-c2e3ffa8",
-            "uniqueId": "cloudApi_api_permission-GET-c2e3ffa8_37FA5D89"
-          }
-        },
-        "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get__0_53449ADC.function_name}",
-        "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/",
-        "statement_id": "AllowExecutionFromAPIGateway-GET-c2e3ffa8"
-      }
-    },
-    "aws_s3_bucket": {
-      "Code": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
-          }
-        },
-        "bucket_prefix": "code-c84a50b1-"
-      },
-      "exReactApp_exReactApp-host_WebsiteBucket_FE5E163A": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/WebsiteBucket",
-            "uniqueId": "exReactApp_exReactApp-host_WebsiteBucket_FE5E163A"
-          }
-        },
-        "bucket_prefix": "ex-reactapp-host-c8e2f35e-",
-        "force_destroy": false
-      }
-    },
-    "aws_s3_bucket_policy": {
-      "exReactApp_exReactApp-host_DistributionS3BucketPolicy_2BAB64DC": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/DistributionS3BucketPolicy",
-            "uniqueId": "exReactApp_exReactApp-host_DistributionS3BucketPolicy_2BAB64DC"
-          }
-        },
-        "bucket": "${aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A.id}",
-        "policy": "${data.aws_iam_policy_document.exReactApp_exReactApp-host_AllowDistributionReadOnly_449FAF0F.json}"
-      }
-    },
-    "aws_s3_bucket_website_configuration": {
-      "exReactApp_exReactApp-host_BucketWebsiteConfiguration_BDF89618": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/BucketWebsiteConfiguration",
-            "uniqueId": "exReactApp_exReactApp-host_BucketWebsiteConfiguration_BDF89618"
-          }
-        },
-        "bucket": "${aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A.bucket}",
-        "index_document": {
-          "suffix": "index.html"
-        }
-      }
-    },
-    "aws_s3_object": {
-      "cloudApi_get__0_S3Object_806093F6": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Api/get__}0/S3Object",
-            "uniqueId": "cloudApi_get__0_S3Object_806093F6"
-          }
-        },
-        "bucket": "${aws_s3_bucket.Code.bucket}",
-        "key": "<ASSET_KEY>",
-        "source": "<ASSET_SOURCE>"
-      },
-      "exReactApp_exReactApp-host_File--indexhtml_B6124CA6": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/File--index.html",
-            "uniqueId": "exReactApp_exReactApp-host_File--indexhtml_B6124CA6"
-          }
-        },
-        "bucket": "${aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A.bucket}",
-        "content_type": "text/html; charset=utf-8",
-        "depends_on": [
-          "aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A"
-        ],
-        "key": "/index.html",
-        "source": "<SOURCE>",
-        "source_hash": "${filemd5(<SOURCE>)}"
-      },
-      "exReactApp_exReactApp-host_File--indexjs_212AAA99": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/File--index.js",
-            "uniqueId": "exReactApp_exReactApp-host_File--indexjs_212AAA99"
-          }
-        },
-        "bucket": "${aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A.bucket}",
-        "content_type": "application/javascript; charset=utf-8",
-        "depends_on": [
-          "aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A"
-        ],
-        "key": "/index.js",
-        "source": "<SOURCE>",
-        "source_hash": "${filemd5(<SOURCE>)}"
-      },
-      "exReactApp_exReactApp-host_File-wingjs_43F0A844": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/ex.ReactApp/ex.ReactApp-host/File-wing.js",
-            "uniqueId": "exReactApp_exReactApp-host_File-wingjs_43F0A844"
-          }
-        },
-        "bucket": "${aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A.bucket}",
-        "content": "// This file is generated by wing\nwindow.wingEnv = {\n  \"apiUrl\": \"https://${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.cloudApi_api_stage_BBB283E4.stage_name}\",\n  \"anotherEnvVar\": \"preflight variable\"\n};",
-        "content_type": "text/javascript",
-        "depends_on": [
-          "aws_s3_bucket.exReactApp_exReactApp-host_WebsiteBucket_FE5E163A"
-        ],
-        "key": "wing.js"
-      }
-    }
-  }
-}
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/react-app.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/react-app.test.w_test_sim.md
deleted file mode 100644
index 7eea120dcc0..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/react-app.test.w_test_sim.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# [react-app.test.w](../../../../../../examples/tests/sdk_tests/website/react-app.test.w) | test | sim
-
-## stdout.log
-```log
-pass ─ react-app.test.wsim » root/env0/test:website is working
- 
- 
-Tests 1 passed (1)
-Test Files 1 passed (1)
-Duration <DURATION>
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_compile_tf-aws.md
index 71ac571fb19..27628368c3d 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_compile_tf-aws.md
@@ -7,13 +7,22 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Website": {
+              "Endpoint": {
+                "Url": "Website_Endpoint_Url_0CC0343F"
+              }
+            },
+            "website-2": {
+              "Endpoint": {
+                "Url": "website-2_Endpoint_Url_B3891500"
+              }
+            }
           }
         }
       }
@@ -21,11 +30,11 @@
   },
   "data": {
     "aws_iam_policy_document": {
-      "cloudWebsite_AllowDistributionReadOnly_89DC4FD0": {
+      "Website_AllowDistributionReadOnly_24CFF6C0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/AllowDistributionReadOnly",
-            "uniqueId": "cloudWebsite_AllowDistributionReadOnly_89DC4FD0"
+            "path": "root/Default/Default/Website/AllowDistributionReadOnly",
+            "uniqueId": "Website_AllowDistributionReadOnly_24CFF6C0"
           }
         },
         "statement": [
@@ -37,7 +46,7 @@
               {
                 "test": "StringEquals",
                 "values": [
-                  "${aws_cloudfront_distribution.cloudWebsite_Distribution_083B5AF9.arn}"
+                  "${aws_cloudfront_distribution.Website_Distribution_5E840E42.arn}"
                 ],
                 "variable": "AWS:SourceArn"
               }
@@ -51,7 +60,7 @@
               }
             ],
             "resources": [
-              "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.arn}/*"
+              "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.arn}/*"
             ]
           }
         ]
@@ -94,8 +103,11 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}"
+    },
+    "website-2_Endpoint_Url_B3891500": {
+      "value": "https://${aws_cloudfront_distribution.website-2_Distribution_F1FA4680.domain_name}"
     }
   },
   "provider": {
@@ -105,11 +117,11 @@
   },
   "resource": {
     "aws_cloudfront_distribution": {
-      "cloudWebsite_Distribution_083B5AF9": {
+      "Website_Distribution_5E840E42": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/Distribution",
-            "uniqueId": "cloudWebsite_Distribution_083B5AF9"
+            "path": "root/Default/Default/Website/Distribution",
+            "uniqueId": "Website_Distribution_5E840E42"
           }
         },
         "default_cache_behavior": {
@@ -138,8 +150,8 @@
         "enabled": true,
         "origin": [
           {
-            "domain_name": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket_regional_domain_name}",
-            "origin_access_control_id": "${aws_cloudfront_origin_access_control.cloudWebsite_CloudfrontOac_C956968B.id}",
+            "domain_name": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket_regional_domain_name}",
+            "origin_access_control_id": "${aws_cloudfront_origin_access_control.Website_CloudfrontOac_756836A4.id}",
             "origin_id": "s3Origin"
           }
         ],
@@ -205,14 +217,14 @@
       }
     },
     "aws_cloudfront_origin_access_control": {
-      "cloudWebsite_CloudfrontOac_C956968B": {
+      "Website_CloudfrontOac_756836A4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/CloudfrontOac",
-            "uniqueId": "cloudWebsite_CloudfrontOac_C956968B"
+            "path": "root/Default/Default/Website/CloudfrontOac",
+            "uniqueId": "Website_CloudfrontOac_756836A4"
           }
         },
-        "name": "cloud-We-c8e58765-cloudfront-oac",
+        "name": "Website-c80d509a-cloudfront-oac",
         "origin_access_control_origin_type": "s3",
         "signing_behavior": "always",
         "signing_protocol": "sigv4"
@@ -231,14 +243,14 @@
       }
     },
     "aws_s3_bucket": {
-      "cloudWebsite_WebsiteBucket_EB03D355": {
+      "Website_WebsiteBucket_3C0321F0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/WebsiteBucket",
-            "uniqueId": "cloudWebsite_WebsiteBucket_EB03D355"
+            "path": "root/Default/Default/Website/WebsiteBucket",
+            "uniqueId": "Website_WebsiteBucket_3C0321F0"
           }
         },
-        "bucket_prefix": "cloud-website-c8e58765-",
+        "bucket_prefix": "website-c80d509a-",
         "force_destroy": false
       },
       "website-2_WebsiteBucket_59576A0C": {
@@ -253,15 +265,15 @@
       }
     },
     "aws_s3_bucket_policy": {
-      "cloudWebsite_DistributionS3BucketPolicy_32B029AE": {
+      "Website_DistributionS3BucketPolicy_09AE0BCA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/DistributionS3BucketPolicy",
-            "uniqueId": "cloudWebsite_DistributionS3BucketPolicy_32B029AE"
+            "path": "root/Default/Default/Website/DistributionS3BucketPolicy",
+            "uniqueId": "Website_DistributionS3BucketPolicy_09AE0BCA"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.id}",
-        "policy": "${data.aws_iam_policy_document.cloudWebsite_AllowDistributionReadOnly_89DC4FD0.json}"
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.id}",
+        "policy": "${data.aws_iam_policy_document.Website_AllowDistributionReadOnly_24CFF6C0.json}"
       },
       "website-2_DistributionS3BucketPolicy_C89BC83B": {
         "//": {
@@ -275,14 +287,14 @@
       }
     },
     "aws_s3_bucket_website_configuration": {
-      "cloudWebsite_BucketWebsiteConfiguration_920E8E41": {
+      "Website_BucketWebsiteConfiguration_58F891B4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/BucketWebsiteConfiguration",
-            "uniqueId": "cloudWebsite_BucketWebsiteConfiguration_920E8E41"
+            "path": "root/Default/Default/Website/BucketWebsiteConfiguration",
+            "uniqueId": "Website_BucketWebsiteConfiguration_58F891B4"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "index_document": {
           "suffix": "index.html"
         }
@@ -301,38 +313,70 @@
       }
     },
     "aws_s3_object": {
-      "cloudWebsite_File--indexhtml_2A2AE13C": {
+      "Website_File--errorhtml_702870FC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Website/File--error.html",
+            "uniqueId": "Website_File--errorhtml_702870FC"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
+        ],
+        "key": "/error.html",
+        "source": "<SOURCE>",
+        "source_hash": "${filemd5(<SOURCE>)}"
+      },
+      "Website_File--indexhtml_864F8C36": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File--index.html",
-            "uniqueId": "cloudWebsite_File--indexhtml_2A2AE13C"
+            "path": "root/Default/Default/Website/File--index.html",
+            "uniqueId": "Website_File--indexhtml_864F8C36"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "content_type": "text/html; charset=utf-8",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "/index.html",
         "source": "<SOURCE>",
         "source_hash": "${filemd5(<SOURCE>)}"
       },
-      "cloudWebsite_File--inner-folder--otherhtml_72DA631C": {
+      "Website_File--inner-folder--otherhtml_3FCEBB4A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File--inner-folder--other.html",
-            "uniqueId": "cloudWebsite_File--inner-folder--otherhtml_72DA631C"
+            "path": "root/Default/Default/Website/File--inner-folder--other.html",
+            "uniqueId": "Website_File--inner-folder--otherhtml_3FCEBB4A"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "content_type": "text/html; charset=utf-8",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "/inner-folder/other.html",
         "source": "<SOURCE>",
         "source_hash": "${filemd5(<SOURCE>)}"
       },
+      "website-2_File--errorhtml_1E2B4001": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/website-2/File--error.html",
+            "uniqueId": "website-2_File--errorhtml_1E2B4001"
+          }
+        },
+        "bucket": "${aws_s3_bucket.website-2_WebsiteBucket_59576A0C.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.website-2_WebsiteBucket_59576A0C"
+        ],
+        "key": "/error.html",
+        "source": "<SOURCE>",
+        "source_hash": "${filemd5(<SOURCE>)}"
+      },
       "website-2_File--indexhtml_E2F4EB6E": {
         "//": {
           "metadata": {
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_test_sim.md
index 1d2db3c6f8f..7077d3f9453 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/two_websites.test.w_test_sim.md
@@ -2,10 +2,12 @@
 
 ## stdout.log
 ```log
+[INFO] deploying two websites | Website server listening on http://<IP>:<PORT>
+[INFO] deploying two websites | Website server listening on http://<IP>:<PORT>
 pass ─ two_websites.test.wsim » root/env0/test:deploying two websites
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_compile_tf-aws.md
index 8a01ed752ae..962bd1d1f03 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_compile_tf-aws.md
@@ -7,13 +7,17 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Website": {
+              "Endpoint": {
+                "Url": "Website_Endpoint_Url_0CC0343F"
+              }
+            }
           }
         }
       }
@@ -21,11 +25,11 @@
   },
   "data": {
     "aws_iam_policy_document": {
-      "cloudWebsite_AllowDistributionReadOnly_89DC4FD0": {
+      "Website_AllowDistributionReadOnly_24CFF6C0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/AllowDistributionReadOnly",
-            "uniqueId": "cloudWebsite_AllowDistributionReadOnly_89DC4FD0"
+            "path": "root/Default/Default/Website/AllowDistributionReadOnly",
+            "uniqueId": "Website_AllowDistributionReadOnly_24CFF6C0"
           }
         },
         "statement": [
@@ -37,7 +41,7 @@
               {
                 "test": "StringEquals",
                 "values": [
-                  "${aws_cloudfront_distribution.cloudWebsite_Distribution_083B5AF9.arn}"
+                  "${aws_cloudfront_distribution.Website_Distribution_5E840E42.arn}"
                 ],
                 "variable": "AWS:SourceArn"
               }
@@ -51,7 +55,7 @@
               }
             ],
             "resources": [
-              "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.arn}/*"
+              "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.arn}/*"
             ]
           }
         ]
@@ -59,8 +63,8 @@
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}"
     }
   },
   "provider": {
@@ -70,13 +74,25 @@
   },
   "resource": {
     "aws_cloudfront_distribution": {
-      "cloudWebsite_Distribution_083B5AF9": {
+      "Website_Distribution_5E840E42": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/Distribution",
-            "uniqueId": "cloudWebsite_Distribution_083B5AF9"
+            "path": "root/Default/Default/Website/Distribution",
+            "uniqueId": "Website_Distribution_5E840E42"
           }
         },
+        "custom_error_response": [
+          {
+            "error_code": 404,
+            "response_code": 200,
+            "response_page_path": "/error.html"
+          },
+          {
+            "error_code": 403,
+            "response_code": 200,
+            "response_page_path": "/error.html"
+          }
+        ],
         "default_cache_behavior": {
           "allowed_methods": [
             "GET",
@@ -103,8 +119,8 @@
         "enabled": true,
         "origin": [
           {
-            "domain_name": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket_regional_domain_name}",
-            "origin_access_control_id": "${aws_cloudfront_origin_access_control.cloudWebsite_CloudfrontOac_C956968B.id}",
+            "domain_name": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket_regional_domain_name}",
+            "origin_access_control_id": "${aws_cloudfront_origin_access_control.Website_CloudfrontOac_756836A4.id}",
             "origin_id": "s3Origin"
           }
         ],
@@ -121,117 +137,136 @@
       }
     },
     "aws_cloudfront_origin_access_control": {
-      "cloudWebsite_CloudfrontOac_C956968B": {
+      "Website_CloudfrontOac_756836A4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/CloudfrontOac",
-            "uniqueId": "cloudWebsite_CloudfrontOac_C956968B"
+            "path": "root/Default/Default/Website/CloudfrontOac",
+            "uniqueId": "Website_CloudfrontOac_756836A4"
           }
         },
-        "name": "cloud-We-c8e58765-cloudfront-oac",
+        "name": "Website-c80d509a-cloudfront-oac",
         "origin_access_control_origin_type": "s3",
         "signing_behavior": "always",
         "signing_protocol": "sigv4"
       }
     },
     "aws_s3_bucket": {
-      "cloudWebsite_WebsiteBucket_EB03D355": {
+      "Website_WebsiteBucket_3C0321F0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/WebsiteBucket",
-            "uniqueId": "cloudWebsite_WebsiteBucket_EB03D355"
+            "path": "root/Default/Default/Website/WebsiteBucket",
+            "uniqueId": "Website_WebsiteBucket_3C0321F0"
           }
         },
-        "bucket_prefix": "cloud-website-c8e58765-",
+        "bucket_prefix": "website-c80d509a-",
         "force_destroy": false
       }
     },
     "aws_s3_bucket_policy": {
-      "cloudWebsite_DistributionS3BucketPolicy_32B029AE": {
+      "Website_DistributionS3BucketPolicy_09AE0BCA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/DistributionS3BucketPolicy",
-            "uniqueId": "cloudWebsite_DistributionS3BucketPolicy_32B029AE"
+            "path": "root/Default/Default/Website/DistributionS3BucketPolicy",
+            "uniqueId": "Website_DistributionS3BucketPolicy_09AE0BCA"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.id}",
-        "policy": "${data.aws_iam_policy_document.cloudWebsite_AllowDistributionReadOnly_89DC4FD0.json}"
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.id}",
+        "policy": "${data.aws_iam_policy_document.Website_AllowDistributionReadOnly_24CFF6C0.json}"
       }
     },
     "aws_s3_bucket_website_configuration": {
-      "cloudWebsite_BucketWebsiteConfiguration_920E8E41": {
+      "Website_BucketWebsiteConfiguration_58F891B4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/BucketWebsiteConfiguration",
-            "uniqueId": "cloudWebsite_BucketWebsiteConfiguration_920E8E41"
+            "path": "root/Default/Default/Website/BucketWebsiteConfiguration",
+            "uniqueId": "Website_BucketWebsiteConfiguration_58F891B4"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "error_document": {
+          "key": "error.html"
+        },
         "index_document": {
           "suffix": "index.html"
         }
       }
     },
     "aws_s3_object": {
-      "cloudWebsite_File--indexhtml_2A2AE13C": {
+      "Website_File--errorhtml_702870FC": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Website/File--error.html",
+            "uniqueId": "Website_File--errorhtml_702870FC"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "content_type": "text/html; charset=utf-8",
+        "depends_on": [
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
+        ],
+        "key": "/error.html",
+        "source": "<SOURCE>",
+        "source_hash": "${filemd5(<SOURCE>)}"
+      },
+      "Website_File--indexhtml_864F8C36": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File--index.html",
-            "uniqueId": "cloudWebsite_File--indexhtml_2A2AE13C"
+            "path": "root/Default/Default/Website/File--index.html",
+            "uniqueId": "Website_File--indexhtml_864F8C36"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "content_type": "text/html; charset=utf-8",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "/index.html",
         "source": "<SOURCE>",
         "source_hash": "${filemd5(<SOURCE>)}"
       },
-      "cloudWebsite_File--inner-folder--otherhtml_72DA631C": {
+      "Website_File--inner-folder--otherhtml_3FCEBB4A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File--inner-folder--other.html",
-            "uniqueId": "cloudWebsite_File--inner-folder--otherhtml_72DA631C"
+            "path": "root/Default/Default/Website/File--inner-folder--other.html",
+            "uniqueId": "Website_File--inner-folder--otherhtml_3FCEBB4A"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "content_type": "text/html; charset=utf-8",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "/inner-folder/other.html",
         "source": "<SOURCE>",
         "source_hash": "${filemd5(<SOURCE>)}"
       },
-      "cloudWebsite_File-another-filehtml_C41CE440": {
+      "Website_File-another-filehtml_3A96640F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File-another-file.html",
-            "uniqueId": "cloudWebsite_File-another-filehtml_C41CE440"
+            "path": "root/Default/Default/Website/File-another-file.html",
+            "uniqueId": "Website_File-another-filehtml_3A96640F"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "content": "<html>Hello World!</html>",
         "content_type": "text/html",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "another-file.html"
       },
-      "cloudWebsite_File-configjson_591A81BA": {
+      "Website_File-configjson_1F1498B9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File-config.json",
-            "uniqueId": "cloudWebsite_File-configjson_591A81BA"
+            "path": "root/Default/Default/Website/File-config.json",
+            "uniqueId": "Website_File-configjson_1F1498B9"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "content": "{\"json\":1}",
         "content_type": "application/json",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "config.json"
       }
diff --git a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_test_sim.md
index 78da6569ac5..f9c7fd383a7 100644
--- a/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/sdk_tests/website/website.test.w_test_sim.md
@@ -2,10 +2,13 @@
 
 ## stdout.log
 ```log
+[INFO] access files on the website | Website server listening on http://<IP>:<PORT>
+[INFO] page not found | Website server listening on http://<IP>:<PORT>
 pass ─ website.test.wsim » root/env0/test:access files on the website
- 
- 
-Tests 1 passed (1)
+pass ─ website.test.wsim » root/env1/test:page not found             
+
+Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_compile_tf-aws.md
index e60a447c6d8..870b3b37f1d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_compile_tf-aws.md
@@ -1,5 +1,28 @@
 # [anon_function.test.w](../../../../../examples/tests/valid/anon_function.test.w) | compile | tf-aws
 
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const x = ({"a": (await (async () => {
+        return "b";
+      })())});
+      $helpers.assert($helpers.eq(x.a, "b"), "x.a == \"b\"");
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
 ## main.tf.json
 ```json
 {
@@ -7,22 +30,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,19 +42,53 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
     const myfunc = ((x) => {
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+      console.log(String.raw({ raw: ["", ""] }, x));
       x = (x + 1);
       if ((x > 3.14)) {
         return;
@@ -53,13 +97,14 @@ class $Root extends $stdlib.std.Resource {
     });
     (myfunc(1));
     (((x) => {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,1)))};
+      $helpers.assert($helpers.eq(x, 1), "x == 1");
     })(1));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "anon_function.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_test_sim.md
index dfe4b920723..f5dcf36dcb0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/anon_function.test.w_test_sim.md
@@ -5,10 +5,10 @@
 1
 2
 3
-pass ─ anon_function.test.wsim (no tests)
- 
- 
+pass ─ anon_function.test.wsim » root/env0/test:
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_compile_tf-aws.md
index 3926a229738..5628045bad3 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [api.test.w](../../../../../examples/tests/valid/api.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $counter, $std_Json }) {
   class $Closure1 {
     constructor({  }) {
@@ -13,18 +14,19 @@ module.exports = function({ $counter, $std_Json }) {
     async handle(request) {
       const count = (await $counter.inc());
       const bodyResponse = ({"count": count});
-      const resp = ({"body": ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([bodyResponse]), "headers": ({["content-type"]: "application/json"}), "status": 200});
+      const resp = ({"body": ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(bodyResponse), "headers": ({["content-type"]: "application/json"}), "status": 200});
       return resp;
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url }) {
   class $Closure2 {
     constructor({  }) {
@@ -34,17 +36,18 @@ module.exports = function({ $api_url }) {
     }
     async handle() {
       const url = $api_url;
-      {((cond) => {if (!cond) throw new Error("assertion failed: url.startsWith(\"http\")")})(url.startsWith("http"))};
+      $helpers.assert(url.startsWith("http"), "url.startsWith(\"http\")");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_3_api_url }) {
   class $Closure3 {
     constructor({  }) {
@@ -59,12 +62,13 @@ module.exports = function({ $__parent_this_3_api_url }) {
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.A-1.js
-```js
+## inflight.A-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -72,7 +76,7 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
 ## main.tf.json
@@ -82,19 +86,40 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "A": {
+              "Api": {
+                "Endpoint": {
+                  "Url": "A_Api_Endpoint_Url_37336ACA"
+                }
+              }
+            },
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -107,8 +132,11 @@ module.exports = function({  }) {
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "A_Api_Endpoint_Url_37336ACA": {
+      "value": "https://${aws_api_gateway_rest_api.A_Api_api_06466CBC.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.A_Api_api_stage_75CEFF9A.stage_name}"
+    },
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -118,117 +146,117 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "A_cloudApi_api_deployment_8CFEA08D": {
+      "A_Api_api_deployment_7EBFB334": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/api/deployment",
-            "uniqueId": "A_cloudApi_api_deployment_8CFEA08D"
+            "path": "root/Default/Default/A/Api/api/deployment",
+            "uniqueId": "A_Api_api_deployment_7EBFB334"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.A_cloudApi_api_37FCEF91.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.A_Api_api_06466CBC.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.A_cloudApi_api_37FCEF91.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.A_Api_api_06466CBC.body)}"
         }
       },
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "A_cloudApi_api_37FCEF91": {
+      "A_Api_api_06466CBC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/api/api",
-            "uniqueId": "A_cloudApi_api_37FCEF91"
+            "path": "root/Default/Default/A/Api/api/api",
+            "uniqueId": "A_Api_api_06466CBC"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/endpoint1\":{\"get\":{\"operationId\":\"get-endpoint1\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.A_cloudApi_get_endpoint1_0_C13D6808.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/endpoint1\":{\"get\":{\"operationId\":\"get-endpoint1\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_endpoint10-c8e91512/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c8c7a7a3"
+        "name": "api-c8c28c28"
       },
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/hello/world\":{\"get\":{\"operationId\":\"get-hello/world\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_hello_world_0_544AFF00.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/hello/world\":{\"get\":{\"operationId\":\"get-hello/world\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_hello_world0-c8808650/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "A_cloudApi_api_stage_6D822CCE": {
+      "A_Api_api_stage_75CEFF9A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/api/stage",
-            "uniqueId": "A_cloudApi_api_stage_6D822CCE"
+            "path": "root/Default/Default/A/Api/api/stage",
+            "uniqueId": "A_Api_api_stage_75CEFF9A"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.A_cloudApi_api_deployment_8CFEA08D.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.A_cloudApi_api_37FCEF91.id}",
+        "deployment_id": "${aws_api_gateway_deployment.A_Api_api_deployment_7EBFB334.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.A_Api_api_06466CBC.id}",
         "stage_name": "prod"
       },
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "A_cloudApi_get_endpoint1_0_CloudwatchLogGroup_0B430317": {
+      "A_Api_get_endpoint10_CloudwatchLogGroup_88A9F9FB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/get_endpoint1_}0/CloudwatchLogGroup",
-            "uniqueId": "A_cloudApi_get_endpoint1_0_CloudwatchLogGroup_0B430317"
+            "path": "root/Default/Default/A/Api/get_endpoint10/CloudwatchLogGroup",
+            "uniqueId": "A_Api_get_endpoint10_CloudwatchLogGroup_88A9F9FB"
           }
         },
-        "name": "/aws/lambda/get_endpoint1_-0-c83be382",
+        "name": "/aws/lambda/get_endpoint10-c8e91512",
         "retention_in_days": 30
       },
-      "cloudApi_get_hello_world_0_CloudwatchLogGroup_1B6F3287": {
+      "Api_get_hello_world0_CloudwatchLogGroup_6629DDA5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_hello_world_0_CloudwatchLogGroup_1B6F3287"
+            "path": "root/Default/Default/Api/get_hello_world0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_hello_world0_CloudwatchLogGroup_6629DDA5"
           }
         },
-        "name": "/aws/lambda/get_hello_world_-0-c88edd5b",
+        "name": "/aws/lambda/get_hello_world0-c8808650",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -239,79 +267,79 @@ module.exports = function({  }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     },
     "aws_iam_role": {
-      "A_cloudApi_get_endpoint1_0_IamRole_2E669099": {
+      "A_Api_get_endpoint10_IamRole_656A5EFF": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/get_endpoint1_}0/IamRole",
-            "uniqueId": "A_cloudApi_get_endpoint1_0_IamRole_2E669099"
+            "path": "root/Default/Default/A/Api/get_endpoint10/IamRole",
+            "uniqueId": "A_Api_get_endpoint10_IamRole_656A5EFF"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudApi_get_hello_world_0_IamRole_18803888": {
+      "Api_get_hello_world0_IamRole_BE6EA0B6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/IamRole",
-            "uniqueId": "cloudApi_get_hello_world_0_IamRole_18803888"
+            "path": "root/Default/Default/Api/get_hello_world0/IamRole",
+            "uniqueId": "Api_get_hello_world0_IamRole_BE6EA0B6"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "A_cloudApi_get_endpoint1_0_IamRolePolicy_E3F0FFA5": {
+      "A_Api_get_endpoint10_IamRolePolicy_CEEF8626": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/get_endpoint1_}0/IamRolePolicy",
-            "uniqueId": "A_cloudApi_get_endpoint1_0_IamRolePolicy_E3F0FFA5"
+            "path": "root/Default/Default/A/Api/get_endpoint10/IamRolePolicy",
+            "uniqueId": "A_Api_get_endpoint10_IamRolePolicy_CEEF8626"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.A_cloudApi_get_endpoint1_0_IamRole_2E669099.name}"
+        "role": "${aws_iam_role.A_Api_get_endpoint10_IamRole_656A5EFF.name}"
       },
-      "cloudApi_get_hello_world_0_IamRolePolicy_6EFA235E": {
+      "Api_get_hello_world0_IamRolePolicy_EA874D77": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_hello_world_0_IamRolePolicy_6EFA235E"
+            "path": "root/Default/Default/Api/get_hello_world0/IamRolePolicy",
+            "uniqueId": "Api_get_hello_world0_IamRolePolicy_EA874D77"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_hello_world_0_IamRole_18803888.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Api_get_hello_world0_IamRole_BE6EA0B6.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "A_cloudApi_get_endpoint1_0_IamRolePolicyAttachment_D9DB3699": {
+      "A_Api_get_endpoint10_IamRolePolicyAttachment_E367997D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/get_endpoint1_}0/IamRolePolicyAttachment",
-            "uniqueId": "A_cloudApi_get_endpoint1_0_IamRolePolicyAttachment_D9DB3699"
+            "path": "root/Default/Default/A/Api/get_endpoint10/IamRolePolicyAttachment",
+            "uniqueId": "A_Api_get_endpoint10_IamRolePolicyAttachment_E367997D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.A_cloudApi_get_endpoint1_0_IamRole_2E669099.name}"
+        "role": "${aws_iam_role.A_Api_get_endpoint10_IamRole_656A5EFF.name}"
       },
-      "cloudApi_get_hello_world_0_IamRolePolicyAttachment_80FC0127": {
+      "Api_get_hello_world0_IamRolePolicyAttachment_E570C504": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_hello_world_0_IamRolePolicyAttachment_80FC0127"
+            "path": "root/Default/Default/Api/get_hello_world0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_hello_world0_IamRolePolicyAttachment_E570C504"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_hello_world_0_IamRole_18803888.name}"
+        "role": "${aws_iam_role.Api_get_hello_world0_IamRole_BE6EA0B6.name}"
       }
     },
     "aws_lambda_function": {
-      "A_cloudApi_get_endpoint1_0_C13D6808": {
+      "A_Api_get_endpoint10_5345135D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/get_endpoint1_}0/Default",
-            "uniqueId": "A_cloudApi_get_endpoint1_0_C13D6808"
+            "path": "root/Default/Default/A/Api/get_endpoint10/Default",
+            "uniqueId": "A_Api_get_endpoint10_5345135D"
           }
         },
         "architectures": [
@@ -320,30 +348,30 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_endpoint1_-0-c83be382",
+            "WING_FUNCTION_NAME": "get_endpoint10-c8e91512",
             "WING_TARGET": "tf-aws",
-            "WING_TOKEN_HTTPS_TFTOKEN_TOKEN_31_EXECUTE_API_TFTOKEN_TOKEN_24_AMAZONAWS_COM_TFTOKEN_TOKEN_32": "${jsonencode(\"https://${aws_api_gateway_rest_api.A_cloudApi_api_37FCEF91.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.A_cloudApi_api_stage_6D822CCE.stage_name}\")}"
+            "WING_TOKEN_HTTPS_TFTOKEN_TOKEN_33_EXECUTE_API_TFTOKEN_TOKEN_25_AMAZONAWS_COM_TFTOKEN_TOKEN_34": "${jsonencode(\"https://${aws_api_gateway_rest_api.A_Api_api_06466CBC.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.A_Api_api_stage_75CEFF9A.stage_name}\")}"
           }
         },
-        "function_name": "get_endpoint1_-0-c83be382",
+        "function_name": "get_endpoint10-c8e91512",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.A_cloudApi_get_endpoint1_0_IamRole_2E669099.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.A_Api_get_endpoint10_IamRole_656A5EFF.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.A_cloudApi_get_endpoint1_0_S3Object_2ACC7AA8.key}",
+        "s3_key": "${aws_s3_object.A_Api_get_endpoint10_S3Object_C3F8C059.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudApi_get_hello_world_0_544AFF00": {
+      "Api_get_hello_world0_56F26C26": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/Default",
-            "uniqueId": "cloudApi_get_hello_world_0_544AFF00"
+            "path": "root/Default/Default/Api/get_hello_world0/Default",
+            "uniqueId": "Api_get_hello_world0_56F26C26"
           }
         },
         "architectures": [
@@ -351,20 +379,20 @@ module.exports = function({  }) {
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_hello_world_-0-c88edd5b",
+            "WING_FUNCTION_NAME": "get_hello_world0-c8808650",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_hello_world_-0-c88edd5b",
+        "function_name": "get_hello_world0-c8808650",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_hello_world_0_IamRole_18803888.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_hello_world0_IamRole_BE6EA0B6.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_hello_world_0_S3Object_A19D89E0.key}",
+        "s3_key": "${aws_s3_object.Api_get_hello_world0_S3Object_F6755FB0.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -373,30 +401,30 @@ module.exports = function({  }) {
       }
     },
     "aws_lambda_permission": {
-      "A_cloudApi_api_permission-GET-1454206f_5CDB71B7": {
+      "A_Api_api_permission-GET-1454206f_98E9910C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/api/permission-GET-1454206f",
-            "uniqueId": "A_cloudApi_api_permission-GET-1454206f_5CDB71B7"
+            "path": "root/Default/Default/A/Api/api/permission-GET-1454206f",
+            "uniqueId": "A_Api_api_permission-GET-1454206f_98E9910C"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.A_cloudApi_get_endpoint1_0_C13D6808.function_name}",
+        "function_name": "${aws_lambda_function.A_Api_get_endpoint10_5345135D.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.A_cloudApi_api_37FCEF91.execution_arn}/*/GET/endpoint1",
+        "source_arn": "${aws_api_gateway_rest_api.A_Api_api_06466CBC.execution_arn}/*/GET/endpoint1",
         "statement_id": "AllowExecutionFromAPIGateway-GET-1454206f"
       },
-      "cloudApi_api_permission-GET-ceca4943_9997DB29": {
+      "Api_api_permission-GET-ceca4943_731ED984": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-ceca4943",
-            "uniqueId": "cloudApi_api_permission-GET-ceca4943_9997DB29"
+            "path": "root/Default/Default/Api/api/permission-GET-ceca4943",
+            "uniqueId": "Api_api_permission-GET-ceca4943_731ED984"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_hello_world_0_544AFF00.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_hello_world0_56F26C26.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/hello/world",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/hello/world",
         "statement_id": "AllowExecutionFromAPIGateway-GET-ceca4943"
       }
     },
@@ -412,22 +440,22 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "A_cloudApi_get_endpoint1_0_S3Object_2ACC7AA8": {
+      "A_Api_get_endpoint10_S3Object_C3F8C059": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Api/get_endpoint1_}0/S3Object",
-            "uniqueId": "A_cloudApi_get_endpoint1_0_S3Object_2ACC7AA8"
+            "path": "root/Default/Default/A/Api/get_endpoint10/S3Object",
+            "uniqueId": "A_Api_get_endpoint10_S3Object_C3F8C059"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudApi_get_hello_world_0_S3Object_A19D89E0": {
+      "Api_get_hello_world0_S3Object_F6755FB0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/S3Object",
-            "uniqueId": "cloudApi_get_hello_world_0_S3Object_A19D89E0"
+            "path": "root/Default/Default/Api/get_hello_world0/S3Object",
+            "uniqueId": "Api_get_hello_world0_S3Object_F6755FB0"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -439,27 +467,29 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $counter: ${$stdlib.core.liftObject(counter)},
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
           })
@@ -468,7 +498,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -476,25 +506,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(counter, host, ["inc"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [counter, ["inc"]],
+          ],
+          "$inflight_init": [
+            [counter, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
           })
         `;
@@ -502,7 +533,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -510,30 +541,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
     class A extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
+        this.api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
         const __parent_this_3 = this;
-        class $Closure3 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure3 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure3-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
                 $__parent_this_3_api_url: ${$stdlib.core.liftObject(__parent_this_3.api.url)},
               })
             `;
@@ -541,7 +573,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure3Client = ${$Closure3._toInflightType(this)};
+                const $Closure3Client = ${$Closure3._toInflightType()};
                 const client = new $Closure3Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -549,28 +581,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure3._registerOnLiftObject(__parent_this_3.api.url, host, []);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_3.api.url, []],
+              ],
+              "$inflight_init": [
+                [__parent_this_3.api.url, []],
+              ],
+            });
           }
         }
         (this.api.get("/endpoint1", new $Closure3(this, "$Closure3")));
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -578,12 +611,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
-    const counter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
+    const counter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
     const handler = new $Closure1(this, "$Closure1");
     (api.get("/hello/world", handler));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:api url", new $Closure2(this, "$Closure2"));
@@ -593,6 +629,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "api.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_test_sim.md
index fdd01904a88..20c82a954e2 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ api.test.wsim » root/env0/test:api url
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_compile_tf-aws.md
index 56cd5a2e7f2..359500e3039 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [api_cors_custom.test.w](../../../../../examples/tests/valid/api_cors_custom.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url, $expect_Util, $http_Util }) {
   class $Closure2 {
     constructor({  }) {
@@ -42,12 +44,13 @@ module.exports = function({ $api_url, $expect_Util, $http_Util }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util }) {
   class $Closure3 {
     constructor({  }) {
@@ -68,12 +71,13 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util }) {
   class $Closure4 {
     constructor({  }) {
@@ -92,7 +96,7 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
 ## main.tf.json
@@ -102,19 +106,33 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -127,8 +145,8 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -138,103 +156,103 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/users\":{\"get\":{\"operationId\":\"get-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_users_0_2AE0E463.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'winglang.io'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type,Authorization,X-Custom-Header'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/users\":{\"get\":{\"operationId\":\"get-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_users0-c82bfbcd/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'winglang.io'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type,Authorization,X-Custom-Header'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_users_0_CloudwatchLogGroup_3B48E5DE": {
+      "Api_get_users0_CloudwatchLogGroup_6649CB35": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_users_0_CloudwatchLogGroup_3B48E5DE"
+            "path": "root/Default/Default/Api/get_users0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_users0_CloudwatchLogGroup_6649CB35"
           }
         },
-        "name": "/aws/lambda/get_users_-0-c81e9ef5",
+        "name": "/aws/lambda/get_users0-c82bfbcd",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_users_0_IamRole_195BA791": {
+      "Api_get_users0_IamRole_950ACE40": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRole",
-            "uniqueId": "cloudApi_get_users_0_IamRole_195BA791"
+            "path": "root/Default/Default/Api/get_users0/IamRole",
+            "uniqueId": "Api_get_users0_IamRole_950ACE40"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_users_0_IamRolePolicy_A314FA0E": {
+      "Api_get_users0_IamRolePolicy_1C96E6D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_users_0_IamRolePolicy_A314FA0E"
+            "path": "root/Default/Default/Api/get_users0/IamRolePolicy",
+            "uniqueId": "Api_get_users0_IamRolePolicy_1C96E6D8"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.name}"
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_users_0_IamRolePolicyAttachment_AF3BAAF7": {
+      "Api_get_users0_IamRolePolicyAttachment_EB78BB64": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_users_0_IamRolePolicyAttachment_AF3BAAF7"
+            "path": "root/Default/Default/Api/get_users0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_users0_IamRolePolicyAttachment_EB78BB64"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.name}"
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_users_0_2AE0E463": {
+      "Api_get_users0_F1BDFB04": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/Default",
-            "uniqueId": "cloudApi_get_users_0_2AE0E463"
+            "path": "root/Default/Default/Api/get_users0/Default",
+            "uniqueId": "Api_get_users0_F1BDFB04"
           }
         },
         "architectures": [
@@ -243,18 +261,18 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_users_-0-c81e9ef5",
+            "WING_FUNCTION_NAME": "get_users0-c82bfbcd",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_users_-0-c81e9ef5",
+        "function_name": "get_users0-c82bfbcd",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_users_0_S3Object_AE113D52.key}",
+        "s3_key": "${aws_s3_object.Api_get_users0_S3Object_5E4DF6D1.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -263,17 +281,17 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-41f0e61d_DD9B4FD0": {
+      "Api_api_permission-GET-41f0e61d_AD17285B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-41f0e61d",
-            "uniqueId": "cloudApi_api_permission-GET-41f0e61d_DD9B4FD0"
+            "path": "root/Default/Default/Api/api/permission-GET-41f0e61d",
+            "uniqueId": "Api_api_permission-GET-41f0e61d_AD17285B"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_users_0_2AE0E463.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_users0_F1BDFB04.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/users",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/users",
         "statement_id": "AllowExecutionFromAPIGateway-GET-41f0e61d"
       }
     },
@@ -289,11 +307,11 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_users_0_S3Object_AE113D52": {
+      "Api_get_users0_S3Object_5E4DF6D1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/S3Object",
-            "uniqueId": "cloudApi_get_users_0_S3Object_AE113D52"
+            "path": "root/Default/Default/Api/get_users0/S3Object",
+            "uniqueId": "Api_get_users0_S3Object_5E4DF6D1"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -305,14 +323,16 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const ex = $stdlib.ex;
 const http = $stdlib.http;
@@ -320,22 +340,22 @@ const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -343,19 +363,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $http_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.Util, "@winglang/sdk/http", "Util"))},
@@ -365,7 +390,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -373,25 +398,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $http_HttpMethod: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.HttpMethod, "@winglang/sdk/http", "HttpMethod"))},
@@ -402,7 +428,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -410,25 +436,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $http_HttpMethod: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.HttpMethod, "@winglang/sdk/http", "HttpMethod"))},
@@ -439,7 +466,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -447,17 +474,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure4._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api", { cors: true, corsOptions: ({"allowOrigin": ["winglang.io"], "allowMethods": [cloud.HttpMethod.GET, cloud.HttpMethod.POST, cloud.HttpMethod.OPTIONS], "allowHeaders": ["Content-Type", "Authorization", "X-Custom-Header"], "allowCredentials": true, "exposeHeaders": ["Content-Type"]}) });
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api", { cors: true, corsOptions: ({"allowOrigin": "winglang.io", "allowMethods": [cloud.HttpMethod.GET, cloud.HttpMethod.POST, cloud.HttpMethod.OPTIONS], "allowHeaders": ["Content-Type", "Authorization", "X-Custom-Header"], "allowCredentials": true, "exposeHeaders": ["Content-Type"]}) });
     (api.get("/users", new $Closure1(this, "$Closure1")));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:GET /users has cors headers", new $Closure2(this, "$Closure2"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:OPTIONS /users has cors headers", new $Closure3(this, "$Closure3"));
@@ -467,6 +495,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "api_cors_custom.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_test_sim.md
index 1857296bec2..610f10d07de 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_custom.test.w_test_sim.md
@@ -5,9 +5,9 @@
 pass ─ api_cors_custom.test.wsim » root/env0/test:GET --users has cors headers                              
 pass ─ api_cors_custom.test.wsim » root/env1/test:OPTIONS --users has cors headers                          
 pass ─ api_cors_custom.test.wsim » root/env2/test:OPTIONS --users responds with proper headers for requested
- 
- 
+
 Tests 3 passed (3)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_compile_tf-aws.md
index 493629f972d..22bb3845ffe 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [api_cors_default.test.w](../../../../../examples/tests/valid/api_cors_default.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_Util }) {
   class $Closure2 {
     constructor({  }) {
@@ -42,12 +44,13 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_Util }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod, $http_Util }) {
   class $Closure3 {
     constructor({  }) {
@@ -68,7 +71,7 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
 ## main.tf.json
@@ -78,19 +81,33 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -103,8 +120,8 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -114,103 +131,103 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/users\":{\"get\":{\"operationId\":\"get-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_users_0_2AE0E463.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'*'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,PUT,DELETE,HEAD,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type,Authorization,X-Requested-With'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/users\":{\"get\":{\"operationId\":\"get-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_users0-c82bfbcd/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'*'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,PUT,DELETE,HEAD,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type,Authorization,X-Requested-With'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_users_0_CloudwatchLogGroup_3B48E5DE": {
+      "Api_get_users0_CloudwatchLogGroup_6649CB35": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_users_0_CloudwatchLogGroup_3B48E5DE"
+            "path": "root/Default/Default/Api/get_users0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_users0_CloudwatchLogGroup_6649CB35"
           }
         },
-        "name": "/aws/lambda/get_users_-0-c81e9ef5",
+        "name": "/aws/lambda/get_users0-c82bfbcd",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_users_0_IamRole_195BA791": {
+      "Api_get_users0_IamRole_950ACE40": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRole",
-            "uniqueId": "cloudApi_get_users_0_IamRole_195BA791"
+            "path": "root/Default/Default/Api/get_users0/IamRole",
+            "uniqueId": "Api_get_users0_IamRole_950ACE40"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_users_0_IamRolePolicy_A314FA0E": {
+      "Api_get_users0_IamRolePolicy_1C96E6D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_users_0_IamRolePolicy_A314FA0E"
+            "path": "root/Default/Default/Api/get_users0/IamRolePolicy",
+            "uniqueId": "Api_get_users0_IamRolePolicy_1C96E6D8"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.name}"
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_users_0_IamRolePolicyAttachment_AF3BAAF7": {
+      "Api_get_users0_IamRolePolicyAttachment_EB78BB64": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_users_0_IamRolePolicyAttachment_AF3BAAF7"
+            "path": "root/Default/Default/Api/get_users0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_users0_IamRolePolicyAttachment_EB78BB64"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.name}"
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_users_0_2AE0E463": {
+      "Api_get_users0_F1BDFB04": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/Default",
-            "uniqueId": "cloudApi_get_users_0_2AE0E463"
+            "path": "root/Default/Default/Api/get_users0/Default",
+            "uniqueId": "Api_get_users0_F1BDFB04"
           }
         },
         "architectures": [
@@ -219,18 +236,18 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_users_-0-c81e9ef5",
+            "WING_FUNCTION_NAME": "get_users0-c82bfbcd",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_users_-0-c81e9ef5",
+        "function_name": "get_users0-c82bfbcd",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_users_0_S3Object_AE113D52.key}",
+        "s3_key": "${aws_s3_object.Api_get_users0_S3Object_5E4DF6D1.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -239,17 +256,17 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-41f0e61d_DD9B4FD0": {
+      "Api_api_permission-GET-41f0e61d_AD17285B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-41f0e61d",
-            "uniqueId": "cloudApi_api_permission-GET-41f0e61d_DD9B4FD0"
+            "path": "root/Default/Default/Api/api/permission-GET-41f0e61d",
+            "uniqueId": "Api_api_permission-GET-41f0e61d_AD17285B"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_users_0_2AE0E463.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_users0_F1BDFB04.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/users",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/users",
         "statement_id": "AllowExecutionFromAPIGateway-GET-41f0e61d"
       }
     },
@@ -265,11 +282,11 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_users_0_S3Object_AE113D52": {
+      "Api_get_users0_S3Object_5E4DF6D1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/S3Object",
-            "uniqueId": "cloudApi_get_users_0_S3Object_AE113D52"
+            "path": "root/Default/Default/Api/get_users0/S3Object",
+            "uniqueId": "Api_get_users0_S3Object_5E4DF6D1"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -281,14 +298,16 @@ module.exports = function({ $apiDefaultCors_url, $expect_Util, $http_HttpMethod,
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const ex = $stdlib.ex;
 const http = $stdlib.http;
@@ -296,22 +315,22 @@ const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -319,19 +338,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $apiDefaultCors_url: ${$stdlib.core.liftObject(apiDefaultCors.url)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $http_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.Util, "@winglang/sdk/http", "Util"))},
@@ -341,7 +365,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -349,25 +373,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(apiDefaultCors.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [apiDefaultCors.url, []],
+          ],
+          "$inflight_init": [
+            [apiDefaultCors.url, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $apiDefaultCors_url: ${$stdlib.core.liftObject(apiDefaultCors.url)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $http_HttpMethod: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.HttpMethod, "@winglang/sdk/http", "HttpMethod"))},
@@ -378,7 +403,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -386,17 +411,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(apiDefaultCors.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [apiDefaultCors.url, []],
+          ],
+          "$inflight_init": [
+            [apiDefaultCors.url, []],
+          ],
+        });
       }
     }
-    const apiDefaultCors = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api", { cors: true });
+    const apiDefaultCors = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api", { cors: true });
     (apiDefaultCors.get("/users", new $Closure1(this, "$Closure1")));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:GET /users has default cors headers", new $Closure2(this, "$Closure2"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:OPTIONS /users has default cors headers", new $Closure3(this, "$Closure3"));
@@ -405,6 +431,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "api_cors_default.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_test_sim.md
index dad644c6293..0fb2c4b733c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api_cors_default.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ api_cors_default.test.wsim » root/env0/test:GET --users has default cors headers    
 pass ─ api_cors_default.test.wsim » root/env1/test:OPTIONS --users has default cors headers
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_compile_tf-aws.md
index 8253017c484..712527ac8e7 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [api_valid_path.test.w](../../../../../examples/tests/valid/api_valid_path.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,7 +17,7 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -26,19 +27,38 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "api for root path": {
+              "Endpoint": {
+                "Url": "apiforrootpath_Endpoint_Url_A5988D30"
+              }
+            },
+            "default api": {
+              "Endpoint": {
+                "Url": "defaultapi_Endpoint_Url_20F55364"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -51,8 +71,11 @@ module.exports = function({  }) {
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "apiforrootpath_Endpoint_Url_A5988D30": {
+      "value": "https://${aws_api_gateway_rest_api.apiforrootpath_api_53DF977A.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.apiforrootpath_api_stage_C60BBF0F.stage_name}"
+    },
+    "defaultapi_Endpoint_Url_20F55364": {
+      "value": "https://${aws_api_gateway_rest_api.defaultapi_D23C5D48.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.defaultapi_stage_839E3FD0.stage_name}"
     }
   },
   "provider": {
@@ -62,103 +85,212 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "apiforrootpath_api_deployment_A1552CE9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/api for root path/api/deployment",
+            "uniqueId": "apiforrootpath_api_deployment_A1552CE9"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.apiforrootpath_api_53DF977A.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.apiforrootpath_api_53DF977A.body)}"
+        }
+      },
+      "defaultapi_deployment_2421A004": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/default api/api/deployment",
+            "uniqueId": "defaultapi_deployment_2421A004"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.defaultapi_D23C5D48.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "apiforrootpath_api_53DF977A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/api for root path/api/api",
+            "uniqueId": "apiforrootpath_api_53DF977A"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/test/path\":{\"get\":{\"operationId\":\"get-test/path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/alphanumer1cPa_th\":{\"get\":{\"operationId\":\"get-test/alphanumer1cPa_th\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/regular/path\":{\"get\":{\"operationId\":\"get-test/regular/path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/pa-th/{with}/two/{variable_s}/f?bla=5&b=6\":{\"get\":{\"operationId\":\"get-test/pa-th/:with/two/:variable_s/f?bla=5&b=6\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"with\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"variable_s\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/param/is/{last}\":{\"get\":{\"operationId\":\"get-test/param/is/:last\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"last\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/path/{param}\":{\"get\":{\"operationId\":\"get-test/path/:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{param}\":{\"get\":{\"operationId\":\"get-:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/t/{param}\":{\"get\":{\"operationId\":\"get-t/:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/regular/path/{param}\":{\"get\":{\"operationId\":\"get-test/regular/path/:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/segment1/{param1}/segment2?query1=value1?query2=value2\":{\"get\":{\"operationId\":\"get-test/segment1/:param1/segment2?query1=value1?query2=value2\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param1\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/segment1/segment2?query=value1&query2=value2\":{\"get\":{\"operationId\":\"get-test/segment1/segment2?query=value1&query2=value2\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/path.withDots\":{\"get\":{\"operationId\":\"get-test/path.withDots\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/path/.withDots/{param}/{param-dash}/x\":{\"get\":{\"operationId\":\"get-test/path/.withDots/:param/:param-dash/x\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"param-dash\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/\":{\"get\":{\"operationId\":\"get\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_0-c856f001/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8d24ab6"
+      },
+      "defaultapi_D23C5D48": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/default api/api/api",
+            "uniqueId": "defaultapi_D23C5D48"
+          }
+        },
+        "body": "{\"paths\":{\"/test/path\":{\"get\":{\"operationId\":\"get-test/path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/alphanumer1cPa_th\":{\"get\":{\"operationId\":\"get-test/alphanumer1cPa_th\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/regular/path\":{\"get\":{\"operationId\":\"get-test/regular/path\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/pa-th/{with}/two/{variable_s}/f?bla=5&b=6\":{\"get\":{\"operationId\":\"get-test/pa-th/:with/two/:variable_s/f?bla=5&b=6\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"with\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"variable_s\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/param/is/{last}\":{\"get\":{\"operationId\":\"get-test/param/is/:last\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"last\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/path/{param}\":{\"get\":{\"operationId\":\"get-test/path/:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{param}\":{\"get\":{\"operationId\":\"get-:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/t/{param}\":{\"get\":{\"operationId\":\"get-t/:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/regular/path/{param}\":{\"get\":{\"operationId\":\"get-test/regular/path/:param\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/segment1/{param1}/segment2?query1=value1?query2=value2\":{\"get\":{\"operationId\":\"get-test/segment1/:param1/segment2?query1=value1?query2=value2\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param1\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/segment1/segment2?query=value1&query2=value2\":{\"get\":{\"operationId\":\"get-test/segment1/segment2?query=value1&query2=value2\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/path.withDots\":{\"get\":{\"operationId\":\"get-test/path.withDots\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/test/path/.withDots/{param}/{param-dash}/x\":{\"get\":{\"operationId\":\"get-test/path/.withDots/:param/:param-dash/x\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[{\"name\":\"param\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"name\":\"param-dash\",\"in\":\"path\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_test_path0-c8261424/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{param}/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c80ca82f"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "apiforrootpath_api_stage_C60BBF0F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/api for root path/api/stage",
+            "uniqueId": "apiforrootpath_api_stage_C60BBF0F"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.apiforrootpath_api_deployment_A1552CE9.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.apiforrootpath_api_53DF977A.id}",
+        "stage_name": "prod"
+      },
+      "defaultapi_stage_839E3FD0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/default api/api/stage",
+            "uniqueId": "defaultapi_stage_839E3FD0"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.defaultapi_deployment_2421A004.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_test_path_0_CloudwatchLogGroup_46BEE0C9": {
+      "apiforrootpath_get_0_CloudwatchLogGroup_13F2460E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_test_path_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_test_path_0_CloudwatchLogGroup_46BEE0C9"
+            "path": "root/Default/Default/api for root path/get_0/CloudwatchLogGroup",
+            "uniqueId": "apiforrootpath_get_0_CloudwatchLogGroup_13F2460E"
           }
         },
-        "name": "/aws/lambda/get_test_path_-0-c8672abf",
+        "name": "/aws/lambda/get_0-c856f001",
+        "retention_in_days": 30
+      },
+      "defaultapi_get_test_path0_CloudwatchLogGroup_671C6A53": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/default api/get_test_path0/CloudwatchLogGroup",
+            "uniqueId": "defaultapi_get_test_path0_CloudwatchLogGroup_671C6A53"
+          }
+        },
+        "name": "/aws/lambda/get_test_path0-c8261424",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_test_path_0_IamRole_F541FB1C": {
+      "apiforrootpath_get_0_IamRole_D4539E0B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_test_path_}0/IamRole",
-            "uniqueId": "cloudApi_get_test_path_0_IamRole_F541FB1C"
+            "path": "root/Default/Default/api for root path/get_0/IamRole",
+            "uniqueId": "apiforrootpath_get_0_IamRole_D4539E0B"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "defaultapi_get_test_path0_IamRole_6EABF872": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/default api/get_test_path0/IamRole",
+            "uniqueId": "defaultapi_get_test_path0_IamRole_6EABF872"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_test_path_0_IamRolePolicy_965EA3B8": {
+      "apiforrootpath_get_0_IamRolePolicy_505D6447": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_test_path_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_test_path_0_IamRolePolicy_965EA3B8"
+            "path": "root/Default/Default/api for root path/get_0/IamRolePolicy",
+            "uniqueId": "apiforrootpath_get_0_IamRolePolicy_505D6447"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_test_path_0_IamRole_F541FB1C.name}"
+        "role": "${aws_iam_role.apiforrootpath_get_0_IamRole_D4539E0B.name}"
+      },
+      "defaultapi_get_test_path0_IamRolePolicy_56E9A36F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/default api/get_test_path0/IamRolePolicy",
+            "uniqueId": "defaultapi_get_test_path0_IamRolePolicy_56E9A36F"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.defaultapi_get_test_path0_IamRole_6EABF872.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_test_path_0_IamRolePolicyAttachment_2FD9902D": {
+      "apiforrootpath_get_0_IamRolePolicyAttachment_B829E8A4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/api for root path/get_0/IamRolePolicyAttachment",
+            "uniqueId": "apiforrootpath_get_0_IamRolePolicyAttachment_B829E8A4"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.apiforrootpath_get_0_IamRole_D4539E0B.name}"
+      },
+      "defaultapi_get_test_path0_IamRolePolicyAttachment_CB835A8E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_test_path_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_test_path_0_IamRolePolicyAttachment_2FD9902D"
+            "path": "root/Default/Default/default api/get_test_path0/IamRolePolicyAttachment",
+            "uniqueId": "defaultapi_get_test_path0_IamRolePolicyAttachment_CB835A8E"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_test_path_0_IamRole_F541FB1C.name}"
+        "role": "${aws_iam_role.defaultapi_get_test_path0_IamRole_6EABF872.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_test_path_0_ACACFBE3": {
+      "apiforrootpath_get_0_057FC713": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/api for root path/get_0/Default",
+            "uniqueId": "apiforrootpath_get_0_057FC713"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_0-c856f001",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_0-c856f001",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.apiforrootpath_get_0_IamRole_D4539E0B.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.apiforrootpath_get_0_S3Object_426DA1A7.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "defaultapi_get_test_path0_B7A07AB2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_test_path_}0/Default",
-            "uniqueId": "cloudApi_get_test_path_0_ACACFBE3"
+            "path": "root/Default/Default/default api/get_test_path0/Default",
+            "uniqueId": "defaultapi_get_test_path0_B7A07AB2"
           }
         },
         "architectures": [
@@ -167,18 +299,18 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_test_path_-0-c8672abf",
+            "WING_FUNCTION_NAME": "get_test_path0-c8261424",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_test_path_-0-c8672abf",
+        "function_name": "get_test_path0-c8261424",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_test_path_0_IamRole_F541FB1C.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.defaultapi_get_test_path0_IamRole_6EABF872.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_test_path_0_S3Object_AD9D956B.key}",
+        "s3_key": "${aws_s3_object.defaultapi_get_test_path0_S3Object_B2DEDF01.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -187,173 +319,186 @@ module.exports = function({  }) {
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-07205281_7BCD05F4": {
+      "apiforrootpath_api_permission-GET-c2e3ffa8_13544034": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-07205281",
-            "uniqueId": "cloudApi_api_permission-GET-07205281_7BCD05F4"
+            "path": "root/Default/Default/api for root path/api/permission-GET-c2e3ffa8",
+            "uniqueId": "apiforrootpath_api_permission-GET-c2e3ffa8_13544034"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.apiforrootpath_get_0_057FC713.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/t/{param}",
+        "source_arn": "${aws_api_gateway_rest_api.apiforrootpath_api_53DF977A.execution_arn}/*/GET/",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-c2e3ffa8"
+      },
+      "defaultapi_permission-GET-07205281_663F50CE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/default api/api/permission-GET-07205281",
+            "uniqueId": "defaultapi_permission-GET-07205281_663F50CE"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/t/{param}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-07205281"
       },
-      "cloudApi_api_permission-GET-16d10b32_CE016FD4": {
+      "defaultapi_permission-GET-16d10b32_22F0CCAD": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-16d10b32",
-            "uniqueId": "cloudApi_api_permission-GET-16d10b32_CE016FD4"
+            "path": "root/Default/Default/default api/api/permission-GET-16d10b32",
+            "uniqueId": "defaultapi_permission-GET-16d10b32_22F0CCAD"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/path/.withDots/{param}/{param-dash}/x",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/path/.withDots/{param}/{param-dash}/x",
         "statement_id": "AllowExecutionFromAPIGateway-GET-16d10b32"
       },
-      "cloudApi_api_permission-GET-1dad4331_94C4E99B": {
+      "defaultapi_permission-GET-1dad4331_915FA0B1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-1dad4331",
-            "uniqueId": "cloudApi_api_permission-GET-1dad4331_94C4E99B"
+            "path": "root/Default/Default/default api/api/permission-GET-1dad4331",
+            "uniqueId": "defaultapi_permission-GET-1dad4331_915FA0B1"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/{param}",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/{param}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-1dad4331"
       },
-      "cloudApi_api_permission-GET-4835e6c5_11B675C1": {
+      "defaultapi_permission-GET-4835e6c5_6396A6A0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-4835e6c5",
-            "uniqueId": "cloudApi_api_permission-GET-4835e6c5_11B675C1"
+            "path": "root/Default/Default/default api/api/permission-GET-4835e6c5",
+            "uniqueId": "defaultapi_permission-GET-4835e6c5_6396A6A0"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/path/{param}",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/path/{param}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-4835e6c5"
       },
-      "cloudApi_api_permission-GET-525feabe_D7999357": {
+      "defaultapi_permission-GET-525feabe_7C43C625": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-525feabe",
-            "uniqueId": "cloudApi_api_permission-GET-525feabe_D7999357"
+            "path": "root/Default/Default/default api/api/permission-GET-525feabe",
+            "uniqueId": "defaultapi_permission-GET-525feabe_7C43C625"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/param/is/{last}",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/param/is/{last}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-525feabe"
       },
-      "cloudApi_api_permission-GET-815194c4_CF55A67A": {
+      "defaultapi_permission-GET-815194c4_428713F1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-815194c4",
-            "uniqueId": "cloudApi_api_permission-GET-815194c4_CF55A67A"
+            "path": "root/Default/Default/default api/api/permission-GET-815194c4",
+            "uniqueId": "defaultapi_permission-GET-815194c4_428713F1"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/pa-th/{with}/two/{variable_s}/f?bla=5&b=6",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/pa-th/{with}/two/{variable_s}/f?bla=5&b=6",
         "statement_id": "AllowExecutionFromAPIGateway-GET-815194c4"
       },
-      "cloudApi_api_permission-GET-83a11f17_B40DCB9A": {
+      "defaultapi_permission-GET-83a11f17_64B234AF": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-83a11f17",
-            "uniqueId": "cloudApi_api_permission-GET-83a11f17_B40DCB9A"
+            "path": "root/Default/Default/default api/api/permission-GET-83a11f17",
+            "uniqueId": "defaultapi_permission-GET-83a11f17_64B234AF"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/path",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/path",
         "statement_id": "AllowExecutionFromAPIGateway-GET-83a11f17"
       },
-      "cloudApi_api_permission-GET-8d6a8a39_7FDACFF5": {
+      "defaultapi_permission-GET-8d6a8a39_2877CE15": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-8d6a8a39",
-            "uniqueId": "cloudApi_api_permission-GET-8d6a8a39_7FDACFF5"
+            "path": "root/Default/Default/default api/api/permission-GET-8d6a8a39",
+            "uniqueId": "defaultapi_permission-GET-8d6a8a39_2877CE15"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/regular/path",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/regular/path",
         "statement_id": "AllowExecutionFromAPIGateway-GET-8d6a8a39"
       },
-      "cloudApi_api_permission-GET-8dfdf611_E63657D8": {
+      "defaultapi_permission-GET-8dfdf611_AE7542CB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-8dfdf611",
-            "uniqueId": "cloudApi_api_permission-GET-8dfdf611_E63657D8"
+            "path": "root/Default/Default/default api/api/permission-GET-8dfdf611",
+            "uniqueId": "defaultapi_permission-GET-8dfdf611_AE7542CB"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/alphanumer1cPa_th",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/alphanumer1cPa_th",
         "statement_id": "AllowExecutionFromAPIGateway-GET-8dfdf611"
       },
-      "cloudApi_api_permission-GET-b171b58d_9FC71DD1": {
+      "defaultapi_permission-GET-b171b58d_067C9334": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-b171b58d",
-            "uniqueId": "cloudApi_api_permission-GET-b171b58d_9FC71DD1"
+            "path": "root/Default/Default/default api/api/permission-GET-b171b58d",
+            "uniqueId": "defaultapi_permission-GET-b171b58d_067C9334"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/segment1/segment2?query=value1&query2=value2",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/segment1/segment2?query=value1&query2=value2",
         "statement_id": "AllowExecutionFromAPIGateway-GET-b171b58d"
       },
-      "cloudApi_api_permission-GET-d0938f9f_D3A8DFED": {
+      "defaultapi_permission-GET-d0938f9f_6A7F8B88": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-d0938f9f",
-            "uniqueId": "cloudApi_api_permission-GET-d0938f9f_D3A8DFED"
+            "path": "root/Default/Default/default api/api/permission-GET-d0938f9f",
+            "uniqueId": "defaultapi_permission-GET-d0938f9f_6A7F8B88"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/regular/path/{param}",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/regular/path/{param}",
         "statement_id": "AllowExecutionFromAPIGateway-GET-d0938f9f"
       },
-      "cloudApi_api_permission-GET-ecbc2deb_13109BA2": {
+      "defaultapi_permission-GET-ecbc2deb_62CFBA33": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-ecbc2deb",
-            "uniqueId": "cloudApi_api_permission-GET-ecbc2deb_13109BA2"
+            "path": "root/Default/Default/default api/api/permission-GET-ecbc2deb",
+            "uniqueId": "defaultapi_permission-GET-ecbc2deb_62CFBA33"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/segment1/{param1}/segment2?query1=value1?query2=value2",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/segment1/{param1}/segment2?query1=value1?query2=value2",
         "statement_id": "AllowExecutionFromAPIGateway-GET-ecbc2deb"
       },
-      "cloudApi_api_permission-GET-f2bb7c42_70EF6671": {
+      "defaultapi_permission-GET-f2bb7c42_8625FCC2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-f2bb7c42",
-            "uniqueId": "cloudApi_api_permission-GET-f2bb7c42_70EF6671"
+            "path": "root/Default/Default/default api/api/permission-GET-f2bb7c42",
+            "uniqueId": "defaultapi_permission-GET-f2bb7c42_8625FCC2"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_test_path_0_ACACFBE3.function_name}",
+        "function_name": "${aws_lambda_function.defaultapi_get_test_path0_B7A07AB2.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/test/path.withDots",
+        "source_arn": "${aws_api_gateway_rest_api.defaultapi_D23C5D48.execution_arn}/*/GET/test/path.withDots",
         "statement_id": "AllowExecutionFromAPIGateway-GET-f2bb7c42"
       }
     },
@@ -369,11 +514,22 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_test_path_0_S3Object_AD9D956B": {
+      "apiforrootpath_get_0_S3Object_426DA1A7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/api for root path/get_0/S3Object",
+            "uniqueId": "apiforrootpath_get_0_S3Object_426DA1A7"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "defaultapi_get_test_path0_S3Object_B2DEDF01": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_test_path_}0/S3Object",
-            "uniqueId": "cloudApi_get_test_path_0_S3Object_AD9D956B"
+            "path": "root/Default/Default/default api/get_test_path0/S3Object",
+            "uniqueId": "defaultapi_get_test_path0_S3Object_B2DEDF01"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -385,34 +541,37 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
+const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -420,34 +579,39 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "default api");
     const handler = new $Closure1(this, "$Closure1");
-    const testInvalidPath = ((path) => {
+    const testInvalidPath = ((path, apiInstance) => {
       let error = "";
       const expected = String.raw({ raw: ["Invalid path ", ". Url parts can only contain alpha-numeric chars, \"-\", \"_\" and \".\". Params can only contain alpha-numeric chars and \"_\"."] }, path);
       try {
-        (api.get(path, handler));
+        ((apiInstance ?? api).get(path, handler));
       }
       catch ($error_e) {
         const e = $error_e.message;
         error = e;
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: error == expected")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(error,expected)))};
+      (expect.Util.equal(error, expected));
     });
-    const testValidPath = ((path) => {
+    const testValidPath = ((path, apiInstance) => {
       let error = "";
       try {
-        (api.get(path, handler));
+        ((apiInstance ?? api).get(path, handler));
       }
       catch ($error_e) {
         const e = $error_e.message;
         error = e;
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: error == \"\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(error,"")))};
+      (expect.Util.equal(error, ""));
     });
     (testInvalidPath("/test/:sup{er/:annoying//path"));
     (testInvalidPath("/test/{::another:annoying:path}"));
@@ -479,11 +643,12 @@ class $Root extends $stdlib.std.Resource {
     (testValidPath("/test/segment1/segment2?query=value1&query2=value2"));
     (testValidPath("/test/path.withDots"));
     (testValidPath("/test/path/.withDots/:param/:param-dash/x"));
+    (testValidPath("/", this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "api for root path")));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "api_valid_path.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_test_sim.md
index 2708fa123e2..ae9bb006ff3 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/api_valid_path.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ api_valid_path.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_compile_tf-aws.md
index b01a59c8870..a8b74bcff60 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [assert.test.w](../../../../../examples/tests/valid/assert.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $s1, $s2 }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,26 +12,26 @@ module.exports = function({ $s1, $s2 }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"\" == \"\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("","")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"\'\" == \"\'\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("'","'")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"\\\"\" == \"\\\"\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("\"","\"")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"`\" == \"`\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("`","`")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"``\" == \"``\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("``","``")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"`s1`\" == \"`s1`\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("`s1`","`s1`")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: s1 == s1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($s1,$s1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}\" == \"{s1}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", ""] }, $s1),String.raw({ raw: ["", ""] }, $s1))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}\" != \"{s2}\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", ""] }, $s1),String.raw({ raw: ["", ""] }, $s2))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"a{s1}\" == \"a{s1}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["a", ""] }, $s1),String.raw({ raw: ["a", ""] }, $s1))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"a{s1}\" != \"b{s1}\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["a", ""] }, $s1),String.raw({ raw: ["b", ""] }, $s1))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}a\" == \"{s1}a\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", "a"] }, $s1),String.raw({ raw: ["", "a"] }, $s1))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}a\" != \"{s1}b\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", "a"] }, $s1),String.raw({ raw: ["", "b"] }, $s1))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"`\'{s1}\" == \"`\'{s1}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["`'", ""] }, $s1),String.raw({ raw: ["`'", ""] }, $s1))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"a{s1}b{s2}c\" == \"a{s1}b{s2}c\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["a", "b", "c"] }, $s1, $s2),String.raw({ raw: ["a", "b", "c"] }, $s1, $s2))))};
+      $helpers.assert($helpers.eq("", ""), "\"\" == \"\"");
+      $helpers.assert($helpers.eq("'", "'"), "\"\'\" == \"\'\"");
+      $helpers.assert($helpers.eq("\"", "\""), "\"\\\"\" == \"\\\"\"");
+      $helpers.assert($helpers.eq("`", "`"), "\"`\" == \"`\"");
+      $helpers.assert($helpers.eq("``", "``"), "\"``\" == \"``\"");
+      $helpers.assert($helpers.eq("`s1`", "`s1`"), "\"`s1`\" == \"`s1`\"");
+      $helpers.assert($helpers.eq($s1, $s1), "s1 == s1");
+      $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, $s1), String.raw({ raw: ["", ""] }, $s1)), "\"{s1}\" == \"{s1}\"");
+      $helpers.assert($helpers.neq(String.raw({ raw: ["", ""] }, $s1), String.raw({ raw: ["", ""] }, $s2)), "\"{s1}\" != \"{s2}\"");
+      $helpers.assert($helpers.eq(String.raw({ raw: ["a", ""] }, $s1), String.raw({ raw: ["a", ""] }, $s1)), "\"a{s1}\" == \"a{s1}\"");
+      $helpers.assert($helpers.neq(String.raw({ raw: ["a", ""] }, $s1), String.raw({ raw: ["b", ""] }, $s1)), "\"a{s1}\" != \"b{s1}\"");
+      $helpers.assert($helpers.eq(String.raw({ raw: ["", "a"] }, $s1), String.raw({ raw: ["", "a"] }, $s1)), "\"{s1}a\" == \"{s1}a\"");
+      $helpers.assert($helpers.neq(String.raw({ raw: ["", "a"] }, $s1), String.raw({ raw: ["", "b"] }, $s1)), "\"{s1}a\" != \"{s1}b\"");
+      $helpers.assert($helpers.eq(String.raw({ raw: ["`'", ""] }, $s1), String.raw({ raw: ["`'", ""] }, $s1)), "\"`\'{s1}\" == \"`\'{s1}\"");
+      $helpers.assert($helpers.eq(String.raw({ raw: ["a", "b", "c"] }, $s1, $s2), String.raw({ raw: ["a", "b", "c"] }, $s1, $s2)), "\"a{s1}b{s2}c\" == \"a{s1}b{s2}c\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -40,22 +41,9 @@ module.exports = function({ $s1, $s2 }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -65,26 +53,28 @@ module.exports = function({ $s1, $s2 }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $s1: ${$stdlib.core.liftObject(s1)},
             $s2: ${$stdlib.core.liftObject(s2)},
           })
@@ -93,7 +83,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -101,40 +91,42 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(s1, host, []);
-          $Closure1._registerOnLiftObject(s2, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [s1, []],
+            [s2, []],
+          ],
+          "$inflight_init": [
+            [s1, []],
+            [s2, []],
+          ],
+        });
       }
     }
     const s1 = "foo";
     const s2 = "bar";
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"\" == \"\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("","")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"\'\" == \"\'\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("'","'")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"\\\"\" == \"\\\"\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("\"","\"")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"`\" == \"`\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("`","`")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"``\" == \"``\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("``","``")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"`s1`\" == \"`s1`\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("`s1`","`s1`")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1 == s1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s1,s1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}\" == \"{s1}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", ""] }, s1),String.raw({ raw: ["", ""] }, s1))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}\" != \"{s2}\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", ""] }, s1),String.raw({ raw: ["", ""] }, s2))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"a{s1}\" == \"a{s1}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["a", ""] }, s1),String.raw({ raw: ["a", ""] }, s1))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"a{s1}\" != \"b{s1}\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["a", ""] }, s1),String.raw({ raw: ["b", ""] }, s1))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}a\" == \"{s1}a\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", "a"] }, s1),String.raw({ raw: ["", "a"] }, s1))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"{s1}a\" != \"{s1}b\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", "a"] }, s1),String.raw({ raw: ["", "b"] }, s1))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"`\'{s1}\" == \"`\'{s1}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["`'", ""] }, s1),String.raw({ raw: ["`'", ""] }, s1))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"a{s1}b{s2}c\" == \"a{s1}b{s2}c\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["a", "b", "c"] }, s1, s2),String.raw({ raw: ["a", "b", "c"] }, s1, s2))))};
+    $helpers.assert($helpers.eq("", ""), "\"\" == \"\"");
+    $helpers.assert($helpers.eq("'", "'"), "\"\'\" == \"\'\"");
+    $helpers.assert($helpers.eq("\"", "\""), "\"\\\"\" == \"\\\"\"");
+    $helpers.assert($helpers.eq("`", "`"), "\"`\" == \"`\"");
+    $helpers.assert($helpers.eq("``", "``"), "\"``\" == \"``\"");
+    $helpers.assert($helpers.eq("`s1`", "`s1`"), "\"`s1`\" == \"`s1`\"");
+    $helpers.assert($helpers.eq(s1, s1), "s1 == s1");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, s1), String.raw({ raw: ["", ""] }, s1)), "\"{s1}\" == \"{s1}\"");
+    $helpers.assert($helpers.neq(String.raw({ raw: ["", ""] }, s1), String.raw({ raw: ["", ""] }, s2)), "\"{s1}\" != \"{s2}\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["a", ""] }, s1), String.raw({ raw: ["a", ""] }, s1)), "\"a{s1}\" == \"a{s1}\"");
+    $helpers.assert($helpers.neq(String.raw({ raw: ["a", ""] }, s1), String.raw({ raw: ["b", ""] }, s1)), "\"a{s1}\" != \"b{s1}\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["", "a"] }, s1), String.raw({ raw: ["", "a"] }, s1)), "\"{s1}a\" == \"{s1}a\"");
+    $helpers.assert($helpers.neq(String.raw({ raw: ["", "a"] }, s1), String.raw({ raw: ["", "b"] }, s1)), "\"{s1}a\" != \"{s1}b\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["`'", ""] }, s1), String.raw({ raw: ["`'", ""] }, s1)), "\"`\'{s1}\" == \"`\'{s1}\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["a", "b", "c"] }, s1, s2), String.raw({ raw: ["a", "b", "c"] }, s1, s2)), "\"a{s1}b{s2}c\" == \"a{s1}b{s2}c\"");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:assert works inflight", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "assert.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_test_sim.md
index 08506f3bff0..b89d691f0b6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/assert.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ assert.test.wsim » root/env0/test:assert works inflight
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/assertions.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/assertions.w_compile_tf-aws.md
deleted file mode 100644
index f7a0b8c9a1f..00000000000
--- a/tools/hangar/__snapshots__/test_corpus/valid/assertions.w_compile_tf-aws.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# [assertions.w](../../../../../examples/tests/valid/assertions.w) | compile | tf-aws
-
-## inflight.Assert-1.js
-```js
-"use strict";
-module.exports = function({  }) {
-  class Assert {
-    static async equalStr(a, b) {
-      try {
-        {((cond) => {if (!cond) throw new Error("assertion failed: a == b")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(a,b)))};
-      }
-      catch ($error_e) {
-        const e = $error_e.message;
-        throw new Error(String.raw({ raw: ["expected: ", " got: ", ""] }, b, a));
-      }
-    }
-    static async nil(a) {
-      try {
-        {((cond) => {if (!cond) throw new Error("assertion failed: a == nil")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(a,undefined)))};
-      }
-      catch ($error_e) {
-        const e = $error_e.message;
-        {console.log(e)};
-        throw new Error(String.raw({ raw: ["expected '", "' to be nil"] }, a));
-      }
-    }
-    static async equalNum(a, b) {
-      try {
-        {((cond) => {if (!cond) throw new Error("assertion failed: a == b")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(a,b)))};
-      }
-      catch ($error_e) {
-        const e = $error_e.message;
-        {console.log(e)};
-        throw new Error(String.raw({ raw: ["expected: ", " got: ", ""] }, b, a));
-      }
-    }
-  }
-  return Assert;
-}
-//# sourceMappingURL=./inflight.Assert-1.js.map
-```
-
-## preflight.js
-```js
-"use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  class Assert extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static _toInflightType(context) {
-      return `
-        require("./inflight.Assert-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const AssertClient = ${Assert._toInflightType(this)};
-          const client = new AssertClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return ["equalStr", "nil", "equalNum", "$inflight_init"];
-    }
-  }
-  return { Assert };
-};
-//# sourceMappingURL=preflight.js.map
-```
-
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_compile_tf-aws.md
index 52b40491ea4..e0374f97b56 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [asynchronous_model_implicit_await_in_functions.test.w](../../../../../examples/tests/valid/asynchronous_model_implicit_await_in_functions.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -10,17 +11,18 @@ module.exports = function({  }) {
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(s) {
+    async handle() {
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $strToStr }) {
   class $Closure2 {
     constructor({  }) {
@@ -28,14 +30,14 @@ module.exports = function({ $strToStr }) {
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(s) {
+    async handle() {
       (await $strToStr.invoke("one"));
-      {console.log((await $strToStr.invoke("two")))};
+      console.log(((await $strToStr.invoke("two")) ?? "no response"));
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -45,22 +47,9 @@ module.exports = function({ $strToStr }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -178,7 +167,7 @@ module.exports = function({ $strToStr }) {
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.func_IamRole_EED2D17C.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.func_S3Object_82AC2651.key}",
         "timeout": 60,
@@ -209,7 +198,7 @@ module.exports = function({ $strToStr }) {
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.strToStr_IamRole_3B9A4F9A.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.strToStr_S3Object_1E7679F7.key}",
         "timeout": 60,
@@ -255,15 +244,15 @@ module.exports = function({ $strToStr }) {
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
@@ -271,34 +260,36 @@ module.exports = function({ $strToStr }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -306,19 +297,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $strToStr: ${$stdlib.core.liftObject(strToStr)},
           })
         `;
@@ -326,7 +322,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -334,17 +330,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(strToStr, host, ["invoke"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [strToStr, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [strToStr, []],
+          ],
+        });
       }
     }
-    const q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+    const q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
     const strToStr = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "strToStr", new $Closure1(this, "$Closure1"));
     const func = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "func", new $Closure2(this, "$Closure2"));
   }
@@ -352,6 +349,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "asynchronous_model_implicit_await_in_functions.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_test_sim.md
index cde12e9d0d8..c106f02803d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/asynchronous_model_implicit_await_in_functions.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ asynchronous_model_implicit_await_in_functions.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/baz.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/baz.w_compile_tf-aws.md
index 15cf8414c1c..806f0755f05 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/baz.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/baz.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [baz.w](../../../../../examples/tests/valid/baz.w) | compile | tf-aws
 
-## inflight.Baz-1.js
-```js
+## inflight.Baz-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Baz {
     constructor({  }) {
@@ -10,44 +11,48 @@ module.exports = function({  }) {
   }
   return Baz;
 }
-//# sourceMappingURL=inflight.Baz-1.js.map
+//# sourceMappingURL=inflight.Baz-1.cjs.map
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  class Baz extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static baz() {
-      return "baz";
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Baz-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const BazClient = ${Baz._toInflightType(this)};
-          const client = new BazClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Baz extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
   }
-  return { Baz };
-};
-//# sourceMappingURL=preflight.js.map
+  static baz($scope) {
+    return "baz";
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Baz-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const BazClient = ${Baz._toInflightType()};
+        const client = new BazClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Baz };
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_compile_tf-aws.md
index d2fac3dedf7..2ddcec22ea9 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,26 +19,28 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const stdFs = $stdlib.fs;
 const stdFs2 = $stdlib.fs;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    {((cond) => {if (!cond) throw new Error("assertion failed: stdFs.dirname(\"/\") == \"/\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((stdFs.Util.dirname("/")),"/")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: stdFs2.dirname(\"/\") == \"/\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((stdFs2.Util.dirname("/")),"/")))};
+    $helpers.assert($helpers.eq((stdFs.Util.dirname("/")), "/"), "stdFs.dirname(\"/\") == \"/\"");
+    $helpers.assert($helpers.eq((stdFs2.Util.dirname("/")), "/"), "stdFs2.dirname(\"/\") == \"/\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_alias.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_test_sim.md
index 089c884d010..98da28351ec 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_alias.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_alias.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_compile_tf-aws.md
index 8720dfcbdd6..6d00372de57 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bring_awscdk.test.w](../../../../../examples/tests/valid/bring_awscdk.test.w) | compile | tf-aws
 
-## inflight.CdkDockerImageFunction-1.js
-```js
+## inflight.CdkDockerImageFunction-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class CdkDockerImageFunction {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return CdkDockerImageFunction;
 }
-//# sourceMappingURL=inflight.CdkDockerImageFunction-1.js.map
+//# sourceMappingURL=inflight.CdkDockerImageFunction-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -45,33 +33,38 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
-const awscdk = require("aws-cdk-lib");
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cdk = require("aws-cdk-lib");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class CdkDockerImageFunction extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.function = this.node.root.new("aws-cdk-lib.aws_lambda.DockerImageFunction", awscdk.aws_lambda.DockerImageFunction, this, "DockerImageFunction", ({"code": (awscdk.aws_lambda.DockerImageCode.fromImageAsset("./test.ts"))}));
+        const eventBridge = this.node.root.new("aws-cdk-lib.aws_events.EventBus", cdk.aws_events.EventBus, this, "EventBridge", { eventBusName: "test" });
+        const rule = this.node.root.new("aws-cdk-lib.aws_events.CfnRule", cdk.aws_events.CfnRule, this, "CfnRule", { name: "test", eventBusName: eventBridge.eventBusName, eventPattern: ({}), targets: [({"arn": "", "id": ""})] });
+        this.node.root.new("aws-cdk-lib.aws_events.Rule", cdk.aws_events.Rule, this, "Rule", { eventPattern: ({"detailType": [""]}) });
+        this.function = this.node.root.new("aws-cdk-lib.aws_lambda.DockerImageFunction", cdk.aws_lambda.DockerImageFunction, this, "DockerImageFunction", ({"code": (cdk.aws_lambda.DockerImageCode.fromImageAsset("./test.ts"))}));
       }
       static _toInflightType() {
         return `
-          require("./inflight.CdkDockerImageFunction-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.CdkDockerImageFunction-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const CdkDockerImageFunctionClient = ${CdkDockerImageFunction._toInflightType(this)};
+            const CdkDockerImageFunctionClient = ${CdkDockerImageFunction._toInflightType()};
             const client = new CdkDockerImageFunctionClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -79,16 +72,19 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    this.node.root.new("aws-cdk-lib.App", awscdk.App, );
+    this.node.root.new("aws-cdk-lib.App", cdk.App, );
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_awscdk.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_test_sim.md
index 35c2044d57f..c90650f9e03 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_awscdk.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_awscdk.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_compile_tf-aws.md
index b9d46545df9..fb60c5bbf3e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,28 +19,30 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cdk8s = require("cdk8s");
 const kplus = require("cdk8s-plus-27");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     const app = this.node.root.new("cdk8s.App", cdk8s.App, );
-    const chart = this.node.root.new("cdk8s.Chart", cdk8s.Chart, this, "cdk8s.Chart");
-    const deploy = ($scope => $scope.node.root.new("cdk8s-plus-27.Deployment", kplus.Deployment, $scope, "kplus.Deployment"))(chart);
+    const chart = this.node.root.new("cdk8s.Chart", cdk8s.Chart, this, "Chart");
+    const deploy = ($scope => $scope.node.root.new("cdk8s-plus-27.Deployment", kplus.Deployment, $scope, "Deployment"))(chart);
     (deploy.addContainer(({"image": "hashicorp/http-echo", "args": ["-text", "text"], "portNumber": 5678})));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_cdk8s.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_test_sim.md
index c772f3216ec..6be76f88276 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdk8s.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_cdk8s.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_compile_tf-aws.md
index 30aa3896a3d..313b72c26fe 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bring_cdktf.test.w](../../../../../examples/tests/valid/bring_cdktf.test.w) | compile | tf-aws
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -62,14 +50,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const aws = require("@cdktf/provider-aws");
 const cdktf = require("cdktf");
 class $Root extends $stdlib.std.Resource {
@@ -82,14 +72,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -97,16 +87,20 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    this.node.root.new("@cdktf/provider-aws.s3Bucket.S3Bucket", aws.s3Bucket.S3Bucket, this, "Bucket", { bucketPrefix: "hello", versioning: ({"enabled": true, "mfaDelete": true}) });
+    const bucket = this.node.root.new("@cdktf/provider-aws.s3Bucket.S3Bucket", aws.s3Bucket.S3Bucket, this, "Bucket", { bucketPrefix: "hello", versioning: ({"enabled": true, "mfaDelete": true}) });
+    $helpers.nodeof(bucket).color = "pink";
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_cdktf.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_test_sim.md
index 2a8a20e878c..dcf8f077bb6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_cdktf.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_cdktf.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_extend_non_entry.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_extend_non_entry.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..4c65ccbc197
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_extend_non_entry.test.w_compile_tf-aws.md
@@ -0,0 +1,100 @@
+# [bring_extend_non_entry.test.w](../../../../../examples/tests/valid/bring_extend_non_entry.test.w) | compile | tf-aws
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $cdk8s_Chart }) {
+  class Foo extends $cdk8s_Chart {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const lib = require("./preflight.extendnonentrypoint-1.cjs");
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const f = new lib.Foo(this, "Foo");
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_extend_non_entry.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
+## preflight.extendnonentrypoint-1.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cdk8s = require("cdk8s");
+class Foo extends (this?.node?.root?.typeForFqn("cdk8s.Chart") ?? cdk8s.Chart) {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+        $cdk8s_Chart: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(cdk8s.Chart, "cdk8s", "Chart"))},
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const FooClient = ${Foo._toInflightType()};
+        const client = new FooClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return $stdlib.core.mergeLiftDeps(super._liftMap, {
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Foo };
+//# sourceMappingURL=preflight.extendnonentrypoint-1.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_extend_non_entry.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_extend_non_entry.test.w_test_sim.md
new file mode 100644
index 00000000000..54a2c19f245
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_extend_non_entry.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [bring_extend_non_entry.test.w](../../../../../examples/tests/valid/bring_extend_non_entry.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ bring_extend_non_entry.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_compile_tf-aws.md
index caddd992fc7..aba835d1317 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bring_jsii.test.w](../../../../../examples/tests/valid/bring_jsii.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $greeting, $stuff_HelloWorld }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,14 +12,28 @@ module.exports = function({ $greeting, $stuff_HelloWorld }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: greeting == \"Hello, wingnuts\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($greeting,"Hello, wingnuts")))};
+      $helpers.assert($helpers.eq($greeting, "Hello, wingnuts"), "greeting == \"Hello, wingnuts\"");
       const helloInflight = new $stuff_HelloWorld();
-      {((cond) => {if (!cond) throw new Error("assertion failed: helloInflight.sayHello(\"wingnuts\") == greeting")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await helloInflight.sayHello("wingnuts")),$greeting)))};
+      $helpers.assert($helpers.eq((await helloInflight.sayHello("wingnuts")), $greeting), "helloInflight.sayHello(\"wingnuts\") == greeting");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.X-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class X {
+    constructor({  }) {
+    }
+  }
+  return X;
+}
+//# sourceMappingURL=inflight.X-1.cjs.map
 ```
 
 ## main.tf.json
@@ -28,22 +43,9 @@ module.exports = function({ $greeting, $stuff_HelloWorld }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -53,28 +55,31 @@ module.exports = function({ $greeting, $stuff_HelloWorld }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const stuff = require("jsii-code-samples");
+const jsii_fixture = require("jsii-fixture");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $greeting: ${$stdlib.core.liftObject(greeting)},
             $stuff_HelloWorld: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(stuff.HelloWorld, "jsii-code-samples", "HelloWorld"))},
           })
@@ -83,7 +88,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -91,24 +96,60 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+            [greeting, []],
+          ],
+          "$inflight_init": [
+            [greeting, []],
+          ],
+        });
+      }
+    }
+    class X extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      method() {
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.X-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const XClient = ${X._toInflightType()};
+            const client = new XClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(greeting, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const hello = new stuff.HelloWorld();
     const greeting = (hello.sayHello("wingnuts"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:sayHello", new $Closure1(this, "$Closure1"));
+    const jsiiClass = new jsii_fixture.JsiiClass(10);
+    $helpers.assert($helpers.eq((jsiiClass.applyClosure(5, ((x) => {
+      return (x * 2);
+    }))), 10), "jsiiClass.applyClosure(5, (x) => { return x * 2; }) == 10");
+    $helpers.assert($helpers.eq((jsiiClass.methodWithStructParam(({"field": "struct field"}))), "struct field"), "jsiiClass.methodWithStructParam({ field: \"struct field\" }) == \"struct field\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_jsii.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_test_sim.md
index a652a0a7ffa..fc829d60e28 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_jsii.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_jsii.test.wsim » root/env0/test:sayHello
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_compile_tf-aws.md
index 53abf987922..57561d5972f 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bring_local.test.w](../../../../../examples/tests/valid/bring_local.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_1_b }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $__parent_this_1_b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure1-3.js
-```js
+## inflight.$Closure1-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $store }) {
   class $Closure1 {
     constructor({  }) {
@@ -35,28 +37,50 @@ module.exports = function({ $store }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-3.js.map
+//# sourceMappingURL=inflight.$Closure1-3.cjs.map
 ```
 
-## inflight.Q-2.js
-```js
+## inflight.$Closure2-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $expect_Util, $file2_Q }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $expect_Util.equal((await $file2_Q.greet("bar")), "Hello bar"));
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-3.cjs.map
+```
+
+## inflight.Q-2.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Q {
     constructor({  }) {
     }
     static async greet(name) {
-      return (require("<ABSOLUTE_PATH>/util.js")["greet"])(name)
+      return (require("../../../subdir/util.ts")["greet"])(name)
     }
   }
   return Q;
 }
-//# sourceMappingURL=inflight.Q-2.js.map
+//# sourceMappingURL=inflight.Q-2.cjs.map
 ```
 
-## inflight.Store-1.js
-```js
+## inflight.Store-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Store {
     constructor({ $this_b }) {
@@ -68,12 +92,13 @@ module.exports = function({  }) {
   }
   return Store;
 }
-//# sourceMappingURL=inflight.Store-1.js.map
+//# sourceMappingURL=inflight.Store-1.cjs.map
 ```
 
-## inflight.Triangle-3.js
-```js
+## inflight.Triangle-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Triangle {
     constructor({  }) {
@@ -81,12 +106,13 @@ module.exports = function({  }) {
   }
   return Triangle;
 }
-//# sourceMappingURL=inflight.Triangle-3.js.map
+//# sourceMappingURL=inflight.Triangle-3.cjs.map
 ```
 
-## inflight.Util-1.js
-```js
+## inflight.Util-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Util {
     constructor({  }) {
@@ -94,12 +120,13 @@ module.exports = function({  }) {
   }
   return Util;
 }
-//# sourceMappingURL=inflight.Util-1.js.map
+//# sourceMappingURL=inflight.Util-1.cjs.map
 ```
 
-## inflight.Util-3.js
-```js
+## inflight.Util-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Util {
     constructor({  }) {
@@ -107,7 +134,7 @@ module.exports = function({  }) {
   }
   return Util;
 }
-//# sourceMappingURL=inflight.Util-3.js.map
+//# sourceMappingURL=inflight.Util-3.cjs.map
 ```
 
 ## main.tf.json
@@ -117,38 +144,25 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
+    "outputs": {}
   },
   "data": {
     "aws_lambda_invocation": {
-      "file1Store_cloudOnDeploy_Invocation_0E6A2A64": {
+      "Store_OnDeploy_Invocation_E9660D82": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.OnDeploy/Invocation",
-            "uniqueId": "file1Store_cloudOnDeploy_Invocation_0E6A2A64"
+            "path": "root/Default/Default/Store/OnDeploy/Invocation",
+            "uniqueId": "Store_OnDeploy_Invocation_E9660D82"
           }
         },
         "depends_on": [],
-        "function_name": "${aws_lambda_function.file1Store_cloudOnDeploy_Function_9539541F.function_name}",
+        "function_name": "${aws_lambda_function.Store_OnDeploy_Function_6D11EEE6.function_name}",
         "input": "{}"
       }
     }
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
   "provider": {
     "aws": [
       {}
@@ -156,58 +170,58 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "file1Store_cloudOnDeploy_Function_CloudwatchLogGroup_624FDE3C": {
+      "Store_OnDeploy_Function_CloudwatchLogGroup_74529587": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.OnDeploy/Function/CloudwatchLogGroup",
-            "uniqueId": "file1Store_cloudOnDeploy_Function_CloudwatchLogGroup_624FDE3C"
+            "path": "root/Default/Default/Store/OnDeploy/Function/CloudwatchLogGroup",
+            "uniqueId": "Store_OnDeploy_Function_CloudwatchLogGroup_74529587"
           }
         },
-        "name": "/aws/lambda/Function-c8b7b48c",
+        "name": "/aws/lambda/Function-c81a83fe",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "file1Store_cloudOnDeploy_Function_IamRole_233573CC": {
+      "Store_OnDeploy_Function_IamRole_CD090388": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.OnDeploy/Function/IamRole",
-            "uniqueId": "file1Store_cloudOnDeploy_Function_IamRole_233573CC"
+            "path": "root/Default/Default/Store/OnDeploy/Function/IamRole",
+            "uniqueId": "Store_OnDeploy_Function_IamRole_CD090388"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "file1Store_cloudOnDeploy_Function_IamRolePolicy_8C128884": {
+      "Store_OnDeploy_Function_IamRolePolicy_C32885AE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.OnDeploy/Function/IamRolePolicy",
-            "uniqueId": "file1Store_cloudOnDeploy_Function_IamRolePolicy_8C128884"
+            "path": "root/Default/Default/Store/OnDeploy/Function/IamRolePolicy",
+            "uniqueId": "Store_OnDeploy_Function_IamRolePolicy_C32885AE"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.file1Store_cloudBucket_86CE87B1.arn}\",\"${aws_s3_bucket.file1Store_cloudBucket_86CE87B1.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.file1Store_cloudOnDeploy_Function_IamRole_233573CC.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.Store_Bucket_42A4CEFB.arn}\",\"${aws_s3_bucket.Store_Bucket_42A4CEFB.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Store_OnDeploy_Function_IamRole_CD090388.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "file1Store_cloudOnDeploy_Function_IamRolePolicyAttachment_20F1BD40": {
+      "Store_OnDeploy_Function_IamRolePolicyAttachment_0AFCF1E8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.OnDeploy/Function/IamRolePolicyAttachment",
-            "uniqueId": "file1Store_cloudOnDeploy_Function_IamRolePolicyAttachment_20F1BD40"
+            "path": "root/Default/Default/Store/OnDeploy/Function/IamRolePolicyAttachment",
+            "uniqueId": "Store_OnDeploy_Function_IamRolePolicyAttachment_0AFCF1E8"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.file1Store_cloudOnDeploy_Function_IamRole_233573CC.name}"
+        "role": "${aws_iam_role.Store_OnDeploy_Function_IamRole_CD090388.name}"
       }
     },
     "aws_lambda_function": {
-      "file1Store_cloudOnDeploy_Function_9539541F": {
+      "Store_OnDeploy_Function_6D11EEE6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.OnDeploy/Function/Default",
-            "uniqueId": "file1Store_cloudOnDeploy_Function_9539541F"
+            "path": "root/Default/Default/Store/OnDeploy/Function/Default",
+            "uniqueId": "Store_OnDeploy_Function_6D11EEE6"
           }
         },
         "architectures": [
@@ -215,20 +229,20 @@ module.exports = function({  }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_94dc4b3e": "${aws_s3_bucket.file1Store_cloudBucket_86CE87B1.bucket}",
+            "BUCKET_NAME_af11ee62": "${aws_s3_bucket.Store_Bucket_42A4CEFB.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "Function-c8b7b48c",
+            "WING_FUNCTION_NAME": "Function-c81a83fe",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "Function-c8b7b48c",
+        "function_name": "Function-c81a83fe",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.file1Store_cloudOnDeploy_Function_IamRole_233573CC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Store_OnDeploy_Function_IamRole_CD090388.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.file1Store_cloudOnDeploy_Function_S3Object_CBBF816B.key}",
+        "s3_key": "${aws_s3_object.Store_OnDeploy_Function_S3Object_95484A56.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -246,23 +260,23 @@ module.exports = function({  }) {
         },
         "bucket_prefix": "code-c84a50b1-"
       },
-      "file1Store_cloudBucket_86CE87B1": {
+      "Store_Bucket_42A4CEFB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.Bucket/Default",
-            "uniqueId": "file1Store_cloudBucket_86CE87B1"
+            "path": "root/Default/Default/Store/Bucket/Default",
+            "uniqueId": "Store_Bucket_42A4CEFB"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8b6ef02-",
+        "bucket_prefix": "bucket-c843dbb0-",
         "force_destroy": false
       }
     },
     "aws_s3_object": {
-      "file1Store_cloudOnDeploy_Function_S3Object_CBBF816B": {
+      "Store_OnDeploy_Function_S3Object_95484A56": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/file1.Store/cloud.OnDeploy/Function/S3Object",
-            "uniqueId": "file1Store_cloudOnDeploy_Function_S3Object_CBBF816B"
+            "path": "root/Default/Default/Store/OnDeploy/Function/S3Object",
+            "uniqueId": "Store_OnDeploy_Function_S3Object_95484A56"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -274,40 +288,33 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.empty-1.js
-```js
-"use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  return {  };
-};
-//# sourceMappingURL=preflight.empty-1.js.map
-```
-
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
-const file1 = require("./preflight.store-2.js")({ $stdlib });
-const file2 = require("./preflight.subfile-3.js")({ $stdlib });
-const file3 = require("./preflight.empty-1.js")({ $stdlib });
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const file1 = require("./preflight.store-2.cjs");
+const file2 = require("./preflight.subfile-3.cjs");
+const file3 = require("./preflight.empty-1.cjs");
 const math = $stdlib.math;
+const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-3.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-3.cjs")({
             $store: ${$stdlib.core.liftObject(store)},
           })
         `;
@@ -315,7 +322,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -323,14 +330,51 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+            [store, ["store"]],
+          ],
+          "$inflight_init": [
+            [store, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(store, host, ["store"]);
-        }
-        super._registerOnLift(host, ops);
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-3.cjs")({
+            $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
+            $file2_Q: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(file2.Q, "", "Q"))},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [$stdlib.core.toLiftableModuleType(file2.Q, "", "Q"), ["greet"]],
+          ],
+          "$inflight_init": [
+            [$stdlib.core.toLiftableModuleType(file2.Q, "", "Q"), []],
+          ],
+        });
       }
     }
     class Triangle extends $stdlib.std.Resource {
@@ -342,14 +386,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Triangle-3.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Triangle-3.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const TriangleClient = ${Triangle._toInflightType(this)};
+            const TriangleClient = ${Triangle._toInflightType()};
             const client = new TriangleClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -357,8 +401,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Util extends $stdlib.std.Resource {
@@ -367,14 +414,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Util-3.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Util-3.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const UtilClient = ${Util._toInflightType(this)};
+            const UtilClient = ${Util._toInflightType()};
             const client = new UtilClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -382,176 +429,208 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    const store = new file1.Store(this, "file1.Store");
-    const q = new file2.Q(this, "file2.Q");
+    const store = new file1.Store(this, "Store");
+    const q = new file2.Q(this, "Q");
+    (expect.Util.equal((file2.Q.preflightGreet("foo")), "Hello foo"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:add data to store", new $Closure1(this, "$Closure1"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:greet", new $Closure2(this, "$Closure2"));
     const s = ({"x": 1, "y": 2});
     const c = file1.Color.BLUE;
-    {((cond) => {if (!cond) throw new Error("assertion failed: c != file1.Color.RED")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(c,file1.Color.RED)))};
+    $helpers.assert($helpers.neq(c, file1.Color.RED), "c != file1.Color.RED");
     const t = new Triangle(this, "Triangle");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_local.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
-## preflight.store-2.js
-```js
+## preflight.empty-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const file3 = require("./preflight.empty-1.js")({ $stdlib });
-  const math = $stdlib.math;
-  const cloud = $stdlib.cloud;
-  class Util extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Util-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const UtilClient = ${Util._toInflightType(this)};
-          const client = new UtilClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {  };
+//# sourceMappingURL=preflight.empty-1.cjs.map
+```
+
+## preflight.store-2.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const file3 = require("./preflight.empty-1.cjs");
+const math = $stdlib.math;
+const cloud = $stdlib.cloud;
+const Color =
+  (function (tmp) {
+    tmp["RED"] = "RED";
+    tmp["GREEN"] = "GREEN";
+    tmp["BLUE"] = "BLUE";
+    return tmp;
+  })({})
+;
+class Util extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
   }
-  class Store extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-      this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-      const __parent_this_1 = this;
-      class $Closure1 extends $stdlib.std.Resource {
-        _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
-        constructor($scope, $id, ) {
-          super($scope, $id);
-          (std.Node.of(this)).hidden = true;
-        }
-        static _toInflightType() {
-          return `
-            require("./inflight.$Closure1-1.js")({
-              $__parent_this_1_b: ${$stdlib.core.liftObject(__parent_this_1.b)},
-            })
-          `;
-        }
-        _toInflight() {
-          return `
-            (await (async () => {
-              const $Closure1Client = ${$Closure1._toInflightType(this)};
-              const client = new $Closure1Client({
-              });
-              if (client.$inflight_init) { await client.$inflight_init(); }
-              return client;
-            })())
-          `;
-        }
-        _supportedOps() {
-          return [...super._supportedOps(), "handle", "$inflight_init"];
-        }
-        _registerOnLift(host, ops) {
-          if (ops.includes("handle")) {
-            $Closure1._registerOnLiftObject(__parent_this_1.b, host, ["put"]);
-          }
-          super._registerOnLift(host, ops);
-        }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Util-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const UtilClient = ${Util._toInflightType()};
+        const client = new UtilClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+class Store extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+    this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const __parent_this_1 = this;
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
       }
-      const prefill = this.node.root.new("@winglang/sdk.cloud.OnDeploy", cloud.OnDeploy, this, "cloud.OnDeploy", new $Closure1(this, "$Closure1"));
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Store-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const StoreClient = ${Store._toInflightType(this)};
-          const client = new StoreClient({
-            $this_b: ${$stdlib.core.liftObject(this.b)},
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "store", "$inflight_init"];
-    }
-    _registerOnLift(host, ops) {
-      if (ops.includes("$inflight_init")) {
-        Store._registerOnLiftObject(this.b, host, []);
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $__parent_this_1_b: ${$stdlib.core.liftObject(__parent_this_1.b)},
+          })
+        `;
       }
-      if (ops.includes("store")) {
-        Store._registerOnLiftObject(this.b, host, ["put"]);
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [__parent_this_1.b, ["put"]],
+          ],
+          "$inflight_init": [
+            [__parent_this_1.b, []],
+          ],
+        });
       }
-      super._registerOnLift(host, ops);
     }
+    const prefill = this.node.root.new("@winglang/sdk.cloud.OnDeploy", cloud.OnDeploy, this, "OnDeploy", new $Closure1(this, "$Closure1"));
   }
-  const Color =
-    (function (tmp) {
-      tmp[tmp["RED"] = 0] = ",RED";
-      tmp[tmp["GREEN"] = 1] = ",GREEN";
-      tmp[tmp["BLUE"] = 2] = ",BLUE";
-      return tmp;
-    })({})
-  ;
-  return { Util, Store, Color };
-};
-//# sourceMappingURL=preflight.store-2.js.map
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Store-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const StoreClient = ${Store._toInflightType()};
+        const client = new StoreClient({
+          $this_b: ${$stdlib.core.liftObject(this.b)},
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "store": [
+        [this.b, ["put"]],
+      ],
+      "$inflight_init": [
+        [this.b, []],
+      ],
+    });
+  }
+}
+module.exports = { Util, Store, Color };
+//# sourceMappingURL=preflight.store-2.cjs.map
 ```
 
-## preflight.subfile-3.js
-```js
+## preflight.subfile-3.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const math = $stdlib.math;
-  class Q extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Q-2.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const QClient = ${Q._toInflightType(this)};
-          const client = new QClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "greet", "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const math = $stdlib.math;
+class Q extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
   }
-  return { Q };
-};
-//# sourceMappingURL=preflight.subfile-3.js.map
+  static preflightGreet(name) {
+    return ($extern("../../../subdir/util.ts")["preflightGreet"])(name)
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Q-2.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const QClient = ${Q._toInflightType()};
+        const client = new QClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+  static get _liftTypeMap() {
+    return ({
+      "greet": [
+      ],
+    });
+  }
+}
+module.exports = { Q };
+//# sourceMappingURL=preflight.subfile-3.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_test_sim.md
index 251bbfbb19f..7dd17b1936c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_local.test.w_test_sim.md
@@ -3,9 +3,10 @@
 ## stdout.log
 ```log
 pass ─ bring_local.test.wsim » root/env0/test:add data to store
- 
- 
-Tests 1 passed (1)
+pass ─ bring_local.test.wsim » root/env1/test:greet            
+
+Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_compile_tf-aws.md
index 0d7c54bec45..60c18b17f6a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bring_local_dir.test.w](../../../../../examples/tests/valid/bring_local_dir.test.w) | compile | tf-aws
 
-## inflight.Bar-3.js
-```js
+## inflight.Bar-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Bar {
     constructor({  }) {
@@ -10,12 +11,13 @@ module.exports = function({  }) {
   }
   return Bar;
 }
-//# sourceMappingURL=inflight.Bar-3.js.map
+//# sourceMappingURL=inflight.Bar-3.cjs.map
 ```
 
-## inflight.Foo-2.js
-```js
+## inflight.Foo-2.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -23,12 +25,13 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-2.js.map
+//# sourceMappingURL=inflight.Foo-2.cjs.map
 ```
 
-## inflight.Foo-3.js
-```js
+## inflight.Foo-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -36,12 +39,13 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-3.js.map
+//# sourceMappingURL=inflight.Foo-3.cjs.map
 ```
 
-## inflight.Widget-1.js
-```js
+## inflight.Widget-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Widget {
     constructor({  }) {
@@ -49,7 +53,7 @@ module.exports = function({  }) {
   }
   return Widget;
 }
-//# sourceMappingURL=inflight.Widget-1.js.map
+//# sourceMappingURL=inflight.Widget-1.cjs.map
 ```
 
 ## main.tf.json
@@ -59,22 +63,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -84,209 +75,228 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.file1-3.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const blah = require("./preflight.inner-2.js")({ $stdlib });
-  const cloud = $stdlib.cloud;
-  const util = $stdlib.util;
-  class Foo extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    foo() {
-      return "foo";
-    }
-    checkWidget(widget) {
-      return ((widget.compute()) + (blah.Widget.staticCompute()));
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Foo-2.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const FooClient = ${Foo._toInflightType(this)};
-          const client = new FooClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const w = require("./preflight.widget-1.cjs");
+const subdir = require("./preflight.subdir2-5.cjs");
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const widget1 = new w.Widget(this, "widget1");
+    $helpers.assert($helpers.eq((widget1.compute()), 42), "widget1.compute() == 42");
+    const foo = new subdir.Foo(this, "Foo");
+    $helpers.assert($helpers.eq((foo.foo()), "foo"), "foo.foo() == \"foo\"");
+    const bar = new subdir.Bar(this, "Bar");
+    $helpers.assert($helpers.eq((bar.bar()), "bar"), "bar.bar() == \"bar\"");
+    const widget2 = new subdir.inner.Widget(this, "widget2");
+    $helpers.assert($helpers.eq((widget2.compute()), 42), "widget2.compute() == 42");
+    $helpers.assert($helpers.eq((foo.checkWidget(widget2)), 1379), "foo.checkWidget(widget2) == 1379");
   }
-  return { Foo };
-};
-//# sourceMappingURL=preflight.file1-3.js.map
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_local_dir.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
 ```
 
-## preflight.file2-4.js
-```js
+## preflight.file1-3.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const util = $stdlib.util;
-  class Bar extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    bar() {
-      (util.Util.nanoid());
-      return "bar";
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Bar-3.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const BarClient = ${Bar._toInflightType(this)};
-          const client = new BarClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const blah = require("./preflight.inner-2.cjs");
+const cloud = $stdlib.cloud;
+const util = $stdlib.util;
+class Foo extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
   }
-  class Foo extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Foo-3.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const FooClient = ${Foo._toInflightType(this)};
-          const client = new FooClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+  foo() {
+    return "foo";
   }
-  return { Bar };
-};
-//# sourceMappingURL=preflight.file2-4.js.map
-```
-
-## preflight.inner-2.js
-```js
-"use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  return {
-    ...require("./preflight.widget-1.js")({ $stdlib }),
-  };
-};
-//# sourceMappingURL=preflight.inner-2.js.map
+  checkWidget(widget) {
+    return ((widget.compute()) + (blah.Widget.staticCompute(this)));
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Foo-2.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const FooClient = ${Foo._toInflightType()};
+        const client = new FooClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Foo };
+//# sourceMappingURL=preflight.file1-3.cjs.map
 ```
 
-## preflight.js
-```js
+## preflight.file2-4.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
-const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
-const $outdir = process.env.WING_SYNTH_DIR ?? ".";
-const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
-const w = require("./preflight.widget-1.js")({ $stdlib });
-const subdir = require("./preflight.subdir2-5.js")({ $stdlib });
-class $Root extends $stdlib.std.Resource {
-  constructor($scope, $id) {
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const util = $stdlib.util;
+class Bar extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
     super($scope, $id);
-    const widget1 = new w.Widget(this, "w.Widget");
-    {((cond) => {if (!cond) throw new Error("assertion failed: widget1.compute() == 42")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((widget1.compute()),42)))};
-    const foo = new subdir.Foo(this, "subdir.Foo");
-    {((cond) => {if (!cond) throw new Error("assertion failed: foo.foo() == \"foo\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((foo.foo()),"foo")))};
-    const bar = new subdir.Bar(this, "subdir.Bar");
-    {((cond) => {if (!cond) throw new Error("assertion failed: bar.bar() == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((bar.bar()),"bar")))};
-    const widget2 = new subdir.inner.Widget(this, "subdir.inner.Widget");
-    {((cond) => {if (!cond) throw new Error("assertion failed: widget2.compute() == 42")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((widget2.compute()),42)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: foo.checkWidget(widget2) == 1379")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((foo.checkWidget(widget2)),1379)))};
+  }
+  bar() {
+    (util.Util.nanoid());
+    return "bar";
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Bar-3.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const BarClient = ${Bar._toInflightType()};
+        const client = new BarClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
   }
 }
-const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
-const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_local_dir.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
-$APP.synth();
-//# sourceMappingURL=preflight.js.map
+class Foo extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Foo-3.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const FooClient = ${Foo._toInflightType()};
+        const client = new FooClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Bar };
+//# sourceMappingURL=preflight.file2-4.cjs.map
 ```
 
-## preflight.subdir2-5.js
-```js
+## preflight.inner-2.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  return {
-    inner: require("./preflight.inner-2.js")({ $stdlib }),
-    ...require("./preflight.file2-4.js")({ $stdlib }),
-    ...require("./preflight.file1-3.js")({ $stdlib }),
-  };
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {
+  ...require("./preflight.widget-1.cjs"),
 };
-//# sourceMappingURL=preflight.subdir2-5.js.map
+//# sourceMappingURL=preflight.inner-2.cjs.map
 ```
 
-## preflight.widget-1.js
-```js
+## preflight.subdir2-5.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  class Widget extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    compute() {
-      return 42;
-    }
-    static staticCompute() {
-      return 1337;
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Widget-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const WidgetClient = ${Widget._toInflightType(this)};
-          const client = new WidgetClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
-  }
-  return { Widget };
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {
+  get inner() { return require("./preflight.inner-2.cjs") },
+  ...require("./preflight.file2-4.cjs"),
+  ...require("./preflight.file1-3.cjs"),
 };
-//# sourceMappingURL=preflight.widget-1.js.map
+//# sourceMappingURL=preflight.subdir2-5.cjs.map
+```
+
+## preflight.widget-1.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Widget extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  compute() {
+    return 42;
+  }
+  static staticCompute($scope) {
+    return 1337;
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Widget-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const WidgetClient = ${Widget._toInflightType()};
+        const client = new WidgetClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Widget };
+//# sourceMappingURL=preflight.widget-1.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_test_sim.md
index 6d97c817af4..7080be68df0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_dir.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_local_dir.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_compile_tf-aws.md
index 7e1adf26ae1..9a8d4a73c93 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bring_local_normalization.test.w](../../../../../examples/tests/valid/bring_local_normalization.test.w) | compile | tf-aws
 
-## inflight.Bar-1.js
-```js
+## inflight.Bar-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Bar {
     constructor({  }) {
@@ -10,12 +11,13 @@ module.exports = function({  }) {
   }
   return Bar;
 }
-//# sourceMappingURL=inflight.Bar-1.js.map
+//# sourceMappingURL=inflight.Bar-1.cjs.map
 ```
 
-## inflight.Baz-2.js
-```js
+## inflight.Baz-2.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Baz {
     constructor({  }) {
@@ -23,12 +25,13 @@ module.exports = function({  }) {
   }
   return Baz;
 }
-//# sourceMappingURL=inflight.Baz-2.js.map
+//# sourceMappingURL=inflight.Baz-2.cjs.map
 ```
 
-## inflight.Foo-3.js
-```js
+## inflight.Foo-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -36,7 +39,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-3.js.map
+//# sourceMappingURL=inflight.Foo-3.cjs.map
 ```
 
 ## main.tf.json
@@ -46,22 +49,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -71,152 +61,169 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.bar-1.js
-```js
+## preflight.bar-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  class Bar extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static bar() {
-      return "bar";
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Bar-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const BarClient = ${Bar._toInflightType(this)};
-          const client = new BarClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Bar extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
   }
-  return { Bar };
-};
-//# sourceMappingURL=preflight.bar-1.js.map
-```
-
-## preflight.baz-2.js
-```js
-"use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  class Baz extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static baz() {
-      return "baz";
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Baz-2.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const BazClient = ${Baz._toInflightType(this)};
-          const client = new BazClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+  static bar($scope) {
+    return "bar";
+  }
+  static getSubdir($scope) {
+    return $helpers.resolveDirname(__dirname, "../../../subdir");
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
+      })
+    `;
   }
-  return { Baz };
-};
-//# sourceMappingURL=preflight.baz-2.js.map
+  _toInflight() {
+    return `
+      (await (async () => {
+        const BarClient = ${Bar._toInflightType()};
+        const client = new BarClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Bar };
+//# sourceMappingURL=preflight.bar-1.cjs.map
 ```
 
-## preflight.foo-3.js
-```js
+## preflight.baz-2.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const bar = require("./preflight.bar-1.js")({ $stdlib });
-  const baz = require("./preflight.baz-2.js")({ $stdlib });
-  class Foo extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static foo() {
-      return "foo";
-    }
-    static bar() {
-      return (bar.Bar.bar());
-    }
-    static baz() {
-      return (baz.Baz.baz());
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Foo-3.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const FooClient = ${Foo._toInflightType(this)};
-          const client = new FooClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Baz extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
   }
-  return { Foo };
-};
-//# sourceMappingURL=preflight.foo-3.js.map
+  static baz($scope) {
+    return "baz";
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Baz-2.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const BazClient = ${Baz._toInflightType()};
+        const client = new BazClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Baz };
+//# sourceMappingURL=preflight.baz-2.cjs.map
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
-const foo = require("./preflight.foo-3.js")({ $stdlib });
-const bar = require("./preflight.bar-1.js")({ $stdlib });
-const baz = require("./preflight.baz-2.js")({ $stdlib });
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const foo = require("./preflight.foo-3.cjs");
+const bar = require("./preflight.bar-1.cjs");
+const baz = require("./preflight.baz-2.cjs");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    {((cond) => {if (!cond) throw new Error("assertion failed: foo.Foo.foo() == \"foo\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((foo.Foo.foo()),"foo")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: foo.Foo.bar() == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((foo.Foo.bar()),"bar")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: foo.Foo.baz() == \"baz\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((foo.Foo.baz()),"baz")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: bar.Bar.bar() == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((bar.Bar.bar()),"bar")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: baz.Baz.baz() == \"baz\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((baz.Baz.baz()),"baz")))};
+    $helpers.assert($helpers.eq((foo.Foo.foo(this)), "foo"), "foo.Foo.foo() == \"foo\"");
+    $helpers.assert($helpers.eq((foo.Foo.bar(this)), "bar"), "foo.Foo.bar() == \"bar\"");
+    $helpers.assert($helpers.eq((foo.Foo.baz(this)), "baz"), "foo.Foo.baz() == \"baz\"");
+    $helpers.assert($helpers.eq((bar.Bar.bar(this)), "bar"), "bar.Bar.bar() == \"bar\"");
+    $helpers.assert($helpers.eq((baz.Baz.baz(this)), "baz"), "baz.Baz.baz() == \"baz\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_local_normalization.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
+```
+
+## preflight.foo-3.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const bar = require("./preflight.bar-1.cjs");
+const baz = require("./preflight.baz-2.cjs");
+class Foo extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static foo($scope) {
+    return "foo";
+  }
+  static bar($scope) {
+    return (bar.Bar.bar($scope));
+  }
+  static baz($scope) {
+    return (baz.Baz.baz($scope));
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Foo-3.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const FooClient = ${Foo._toInflightType()};
+        const client = new FooClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Foo };
+//# sourceMappingURL=preflight.foo-3.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_test_sim.md
index 363a75efde3..58ecf7058e6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_local_normalization.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_local_normalization.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_compile_tf-aws.md
index 4590cfd3297..2ac6ea6ecac 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,24 +19,26 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const projen = require("projen");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    {((cond) => {if (!cond) throw new Error("assertion failed: projen.LogLevel.OFF != projen.LogLevel.VERBOSE")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(projen.LogLevel.OFF,projen.LogLevel.VERBOSE)))};
+    $helpers.assert($helpers.neq(projen.LogLevel.OFF, projen.LogLevel.VERBOSE), "projen.LogLevel.OFF != projen.LogLevel.VERBOSE");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_projen.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_test_sim.md
index 6ff9e8dd8c5..2f57d3c8675 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_projen.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_projen.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_compile_tf-aws.md
index d56ddb10508..b7fc78e23b0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bring_wing_library.test.w](../../../../../examples/tests/valid/bring_wing_library.test.w) | compile | tf-aws
 
-## inflight.$Closure1-3.js
-```js
+## inflight.$Closure1-3.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fixture_Store }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,48 +12,57 @@ module.exports = function({ $fixture_Store }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: fixture.Store.makeKeyInflight(\"hello\") == \"data/hello.json\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $fixture_Store.makeKeyInflight("hello")),"data/hello.json")))};
+      $helpers.assert($helpers.eq((await $fixture_Store.makeKeyInflight("hello")), "data/hello.json"), "fixture.Store.makeKeyInflight(\"hello\") == \"data/hello.json\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-3.js.map
+//# sourceMappingURL=inflight.$Closure1-3.cjs.map
 ```
 
-## inflight.Store-2.js
-```js
+## inflight.Store-2.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $myutil_Util }) {
   class Store {
-    constructor({ $this_data }) {
+    constructor({ $this_data, $this_handlers }) {
       this.$this_data = $this_data;
+      this.$this_handlers = $this_handlers;
     }
     static async makeKeyInflight(name) {
-      return (require("<ABSOLUTE_PATH>/util.js")["makeKeyInflight"])(name)
+      return (require("@winglibs/testfixture/util.js")["makeKeyInflight"])(name)
     }
     async set(message) {
       (await this.$this_data.put("data.txt", (await $myutil_Util.double(message))));
+      for (const handler of this.$this_handlers) {
+        (await handler(message));
+      }
     }
   }
   return Store;
 }
-//# sourceMappingURL=inflight.Store-2.js.map
+//# sourceMappingURL=inflight.Store-2.cjs.map
 ```
 
-## inflight.Util-1.js
-```js
+## inflight.Util-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Util {
     constructor({  }) {
     }
+    static async makeKeyInflight(name) {
+      return (require("@winglibs/testfixture/util.js")["makeKeyInflight"])(name)
+    }
     static async double(msg) {
       return String.raw({ raw: ["", "", ""] }, msg, msg);
     }
   }
   return Util;
 }
-//# sourceMappingURL=inflight.Util-1.js.map
+//# sourceMappingURL=inflight.Util-1.cjs.map
 ```
 
 ## main.tf.json
@@ -62,22 +72,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -86,14 +83,14 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "fixtureStore_cloudBucket_0EE75A93": {
+      "Store_Bucket_42A4CEFB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/fixture.Store/cloud.Bucket/Default",
-            "uniqueId": "fixtureStore_cloudBucket_0EE75A93"
+            "path": "root/Default/Default/Store/Bucket/Default",
+            "uniqueId": "Store_Bucket_42A4CEFB"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8afb3a9-",
+        "bucket_prefix": "bucket-c843dbb0-",
         "force_destroy": false
       }
     }
@@ -101,46 +98,31 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.enums-1.js
-```js
-"use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const FavoriteNumbers =
-    (function (tmp) {
-      tmp[tmp["SEVEN"] = 0] = ",SEVEN";
-      tmp[tmp["FORTY_TWO"] = 1] = ",FORTY_TWO";
-      return tmp;
-    })({})
-  ;
-  return { FavoriteNumbers };
-};
-//# sourceMappingURL=preflight.enums-1.js.map
-```
-
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
-const fixture = require("./preflight.testfixture-5.js")({ $stdlib });
-const testfixture = require("./preflight.testfixture-5.js")({ $stdlib });
-const testfixture2 = require("./preflight.testfixture-5.js")({ $stdlib });
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const fixture = require("./preflight.testfixture-5.cjs");
+const testfixture = require("./preflight.testfixture-5.cjs");
+const testfixture2 = require("./preflight.testfixture-5.cjs");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-3.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-3.cjs")({
             $fixture_Store: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(fixture.Store, "", "Store"))},
           })
         `;
@@ -148,7 +130,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -156,141 +138,187 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject($stdlib.core.toLiftableModuleType(fixture.Store, "", "Store"), host, ["makeKeyInflight"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [$stdlib.core.toLiftableModuleType(fixture.Store, "", "Store"), ["makeKeyInflight"]],
+          ],
+          "$inflight_init": [
+            [$stdlib.core.toLiftableModuleType(fixture.Store, "", "Store"), []],
+          ],
+        });
       }
     }
-    new fixture.Store(this, "fixture.Store");
+    new fixture.Store(this, "Store");
     const fave_num = fixture.FavoriteNumbers.SEVEN;
     const fave_num2 = testfixture.FavoriteNumbers.SEVEN;
     const fave_num3 = testfixture2.FavoriteNumbers.SEVEN;
-    {((cond) => {if (!cond) throw new Error("assertion failed: fixture.Store.makeKey(\"hello\") == \"data/hello.json\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((fixture.Store.makeKey("hello")),"data/hello.json")))};
+    $helpers.assert($helpers.eq((fixture.Store.makeKey("hello")), "data/hello.json"), "fixture.Store.makeKey(\"hello\") == \"data/hello.json\"");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:makeKeyInflight", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bring_wing_library.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
-## preflight.store-3.js
-```js
+## preflight.enums-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const cloud = $stdlib.cloud;
-  const myutil = require("./preflight.util-2.js")({ $stdlib });
-  class Store extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-      this.data = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-    }
-    static makeKey(name) {
-      return (require("<ABSOLUTE_PATH>/util.js")["makeKey"])(name)
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Store-2.js")({
-          $myutil_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(myutil.Util, "", "Util"))},
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const StoreClient = ${Store._toInflightType(this)};
-          const client = new StoreClient({
-            $this_data: ${$stdlib.core.liftObject(this.data)},
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "makeKeyInflight", "set", "$inflight_init"];
-    }
-    _registerOnLift(host, ops) {
-      if (ops.includes("$inflight_init")) {
-        Store._registerOnLiftObject(this.data, host, []);
-      }
-      if (ops.includes("set")) {
-        Store._registerOnLiftObject($stdlib.core.toLiftableModuleType(myutil.Util, "", "Util"), host, ["double"]);
-        Store._registerOnLiftObject(this.data, host, ["put"]);
-      }
-      super._registerOnLift(host, ops);
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const FavoriteNumbers =
+  (function (tmp) {
+    tmp["SEVEN"] = "SEVEN";
+    tmp["FORTY_TWO"] = "FORTY_TWO";
+    return tmp;
+  })({})
+;
+module.exports = { FavoriteNumbers };
+//# sourceMappingURL=preflight.enums-1.cjs.map
+```
+
+## preflight.store-3.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+const myutil = require("./preflight.util-2.cjs");
+class Store extends $stdlib.std.Resource {
+  constructor($scope, $id, options) {
+    super($scope, $id);
+    this.data = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    this.handlers = [];
   }
-  return { Store };
-};
-//# sourceMappingURL=preflight.store-3.js.map
+  static makeKey(name) {
+    return ($extern("@winglibs/testfixture/util.js")["makeKey"])(name)
+  }
+  onSet(handler) {
+    this.handlers.push(handler);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Store-2.cjs")({
+        $myutil_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(myutil.Util, "", "Util"))},
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const StoreClient = ${Store._toInflightType()};
+        const client = new StoreClient({
+          $this_data: ${$stdlib.core.liftObject(this.data)},
+          $this_handlers: ${$stdlib.core.liftObject(this.handlers)},
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "set": [
+        [$stdlib.core.toLiftableModuleType(myutil.Util, "", "Util"), ["double"]],
+        [this.data, ["put"]],
+        [this.handlers, []],
+      ],
+      "$inflight_init": [
+        [$stdlib.core.toLiftableModuleType(myutil.Util, "", "Util"), []],
+        [this.data, []],
+        [this.handlers, []],
+      ],
+    });
+  }
+  static get _liftTypeMap() {
+    return ({
+      "makeKeyInflight": [
+      ],
+    });
+  }
+}
+module.exports = { Store };
+//# sourceMappingURL=preflight.store-3.cjs.map
 ```
 
-## preflight.subdir-4.js
-```js
+## preflight.subdir-4.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  return {
-    ...require("./preflight.util-2.js")({ $stdlib }),
-  };
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {
+  ...require("./preflight.util-2.cjs"),
 };
-//# sourceMappingURL=preflight.subdir-4.js.map
+//# sourceMappingURL=preflight.subdir-4.cjs.map
 ```
 
-## preflight.testfixture-5.js
-```js
+## preflight.testfixture-5.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  return {
-    subdir: require("./preflight.subdir-4.js")({ $stdlib }),
-    ...require("./preflight.store-3.js")({ $stdlib }),
-    ...require("./preflight.enums-1.js")({ $stdlib }),
-  };
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {
+  get subdir() { return require("./preflight.subdir-4.cjs") },
+  ...require("./preflight.store-3.cjs"),
+  ...require("./preflight.enums-1.cjs"),
 };
-//# sourceMappingURL=preflight.testfixture-5.js.map
+//# sourceMappingURL=preflight.testfixture-5.cjs.map
 ```
 
-## preflight.util-2.js
-```js
+## preflight.util-2.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  class Util extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Util-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const UtilClient = ${Util._toInflightType(this)};
-          const client = new UtilClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "double", "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Util extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
   }
-  return { Util };
-};
-//# sourceMappingURL=preflight.util-2.js.map
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Util-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const UtilClient = ${Util._toInflightType()};
+        const client = new UtilClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+  static get _liftTypeMap() {
+    return ({
+      "makeKeyInflight": [
+      ],
+      "double": [
+      ],
+    });
+  }
+}
+module.exports = { Util };
+//# sourceMappingURL=preflight.util-2.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_test_sim.md
index 6886589d5ae..9e39299d8b0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bring_wing_library.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bring_wing_library.test.wsim » root/env0/test:makeKeyInflight
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_compile_tf-aws.md
index b19593f3517..78bf0995b95 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [bucket_keys.test.w](../../../../../examples/tests/valid/bucket_keys.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure1 {
     constructor({  }) {
@@ -17,16 +18,16 @@ module.exports = function({ $b }) {
       (await $b.put("foo/bar/", "text"));
       (await $b.put("foo/bar/baz", "text"));
       const objs = (await $b.list());
-      {((cond) => {if (!cond) throw new Error("assertion failed: objs.at(0) == \"foo\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 0),"foo")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: objs.at(1) == \"foo/\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 1),"foo/")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: objs.at(2) == \"foo/bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 2),"foo/bar")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: objs.at(3) == \"foo/bar/\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 3),"foo/bar/")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: objs.at(4) == \"foo/bar/baz\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 4),"foo/bar/baz")))};
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 0), "foo"), "objs.at(0) == \"foo\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 1), "foo/"), "objs.at(1) == \"foo/\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 2), "foo/bar"), "objs.at(2) == \"foo/bar\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 3), "foo/bar/"), "objs.at(3) == \"foo/bar/\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(objs, 4), "foo/bar/baz"), "objs.at(4) == \"foo/bar/baz\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -36,22 +37,9 @@ module.exports = function({ $b }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -60,14 +48,14 @@ module.exports = function({ $b }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
@@ -75,27 +63,29 @@ module.exports = function({ $b }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -103,7 +93,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -111,23 +101,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, ["list", "put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, [].concat(["put"], ["list"])],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bucket_keys.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_test_sim.md
index 227af49156b..f2eb3f45b72 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bucket_keys.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ bucket_keys.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bypass_return.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/bypass_return.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..356c05c83b2
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bypass_return.test.w_compile_tf-aws.md
@@ -0,0 +1,51 @@
+# [bypass_return.test.w](../../../../../examples/tests/valid/bypass_return.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const simpleThrow = (() => {
+      throw new Error("not implemented");
+    });
+    const throwWithConditional = (() => {
+      if (false) {
+        return 1;
+      }
+      throw new Error("not implemented");
+    });
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "bypass_return.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/bypass_return.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/bypass_return.test.w_test_sim.md
new file mode 100644
index 00000000000..e4ff9e78f7d
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/bypass_return.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [bypass_return.test.w](../../../../../examples/tests/valid/bypass_return.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ bypass_return.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_compile_tf-aws.md
index 88a5ed601fe..bdda85c409b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [call_static_of_myself.test.w](../../../../../examples/tests/valid/call_static_of_myself.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Bar, $Foo, $foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -17,21 +18,22 @@ module.exports = function({ $Bar, $Foo, $foo }) {
         }
       }
       const bar = (await (async () => {const o = new $Bar(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: Foo.foo() == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $Foo.foo()),1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: Bar.bar() == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $Bar.bar()),2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: Zoo.zoo() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await Zoo.zoo()),3)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.callThis() == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $foo.callThis()),1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: bar.callThis() == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await bar.callThis()),2)))};
+      $helpers.assert($helpers.eq((await $Foo.foo()), 1), "Foo.foo() == 1");
+      $helpers.assert($helpers.eq((await $Bar.bar()), 2), "Bar.bar() == 2");
+      $helpers.assert($helpers.eq((await Zoo.zoo()), 3), "Zoo.zoo() == 3");
+      $helpers.assert($helpers.eq((await $foo.callThis()), 1), "foo.callThis() == 1");
+      $helpers.assert($helpers.eq((await bar.callThis()), 2), "bar.callThis() == 2");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Bar-1.js
-```js
+## inflight.Bar-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Bar {
     static async bar() {
@@ -43,12 +45,13 @@ module.exports = function({  }) {
   }
   return Bar;
 }
-//# sourceMappingURL=inflight.Bar-1.js.map
+//# sourceMappingURL=inflight.Bar-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -65,7 +68,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -75,22 +78,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -100,14 +90,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -117,14 +109,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -132,20 +124,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "bar", "callThis", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("callThis")) {
-          Foo._registerOnLiftObject(Foo, host, ["bar"]);
-        }
-        super._registerOnLift(host, ops);
-      }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("bar")) {
-          Foo._registerOnLiftObject(Foo, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "callThis": [
+            [Foo, ["bar"]],
+          ],
+          "$inflight_init": [
+            [Foo, []],
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "foo": [
+          ],
+          "bar": [
+            [Foo, ["foo"]],
+          ],
+        });
       }
     }
     class Bar extends $stdlib.std.Resource {
@@ -154,14 +150,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Bar-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BarClient = ${Bar._toInflightType(this)};
+            const BarClient = ${Bar._toInflightType()};
             const client = new BarClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -169,19 +165,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bar", "callThis", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "callThis": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "bar": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Bar: ${$stdlib.core.liftObject(Bar)},
             $Foo: ${$stdlib.core.liftObject(Foo)},
             $foo: ${$stdlib.core.liftObject(foo)},
@@ -191,7 +198,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -199,15 +206,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(Foo, host, ["foo"]);
-          $Closure1._registerOnLiftObject(foo, host, ["callThis"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [Foo, ["foo"]],
+            [foo, ["callThis"]],
+          ],
+          "$inflight_init": [
+            [Foo, []],
+            [foo, []],
+          ],
+        });
       }
     }
     const foo = new Foo(this, "Foo");
@@ -217,6 +226,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "call_static_of_myself.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_test_sim.md
index 22a714ce5b2..fcda50b6432 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/call_static_of_myself.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ call_static_of_myself.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_compile_tf-aws.md
index 049d4e8144a..695224e3999 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [calling_inflight_variants.test.w](../../../../../examples/tests/valid/calling_inflight_variants.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $foo }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,26 +32,27 @@ module.exports = function({ $foo }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.callFn(true) == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $foo.callFn(true)),1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.callFn(false) == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $foo.callFn(false)),2)))};
+      $helpers.assert($helpers.eq((await $foo.callFn(true)), 1), "foo.callFn(true) == 1");
+      $helpers.assert($helpers.eq((await $foo.callFn(false)), 2), "foo.callFn(false) == 2");
       (await $foo.callFn2());
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({ $this_inflight1 }) {
       this.$this_inflight1 = $this_inflight1;
     }
     async makeFn(x) {
-      if ((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,true))) {
+      if ($helpers.eq(x, true)) {
         return this.$this_inflight1;
       }
       else {
@@ -63,20 +66,20 @@ module.exports = function({  }) {
     async callFn2() {
       const one = (await this.$this_inflight1());
       const two = (await this.inflight2());
-      {((cond) => {if (!cond) throw new Error("assertion failed: one == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(one,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: two == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(two,2)))};
+      $helpers.assert($helpers.eq(one, 1), "one == 1");
+      $helpers.assert($helpers.eq(two, 2), "two == 2");
     }
     async $inflight_init() {
-      this.inflight2 = async () => {
+      this.inflight2 = (async () => {
         return 2;
-      };
+      });
       const ret = (await this.inflight2());
-      {((cond) => {if (!cond) throw new Error("assertion failed: ret == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(ret,2)))};
+      $helpers.assert($helpers.eq(ret, 2), "ret == 2");
     }
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -86,22 +89,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -111,37 +101,38 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class Foo extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure1-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
               })
             `;
           }
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this)};
+                const $Closure1Client = ${$Closure1._toInflightType()};
                 const client = new $Closure1Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -149,22 +140,27 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
+          get _liftMap() {
+            return ({
+              "handle": [
+              ],
+              "$inflight_init": [
+              ],
+            });
           }
         }
         this.inflight1 = new $Closure1(this, "$Closure1");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
               $this_inflight1: ${$stdlib.core.liftObject(this.inflight1)},
             });
@@ -173,37 +169,37 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "inflight2", "makeFn", "callFn", "callFn2", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(this, host, ["inflight2"]);
-          Foo._registerOnLiftObject(this.inflight1, host, []);
-        }
-        if (ops.includes("callFn")) {
-          Foo._registerOnLiftObject(this, host, ["makeFn"]);
-        }
-        if (ops.includes("callFn2")) {
-          Foo._registerOnLiftObject(this, host, ["inflight2"]);
-          Foo._registerOnLiftObject(this.inflight1, host, ["handle"]);
-        }
-        if (ops.includes("makeFn")) {
-          Foo._registerOnLiftObject(this, host, ["inflight2"]);
-          Foo._registerOnLiftObject(this.inflight1, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "makeFn": [
+            [this, ["inflight2"]],
+            [this.inflight1, ["handle"]],
+          ],
+          "callFn": [
+            [this, ["makeFn"]],
+          ],
+          "callFn2": [
+            [this, ["inflight2"]],
+            [this.inflight1, ["handle"]],
+          ],
+          "$inflight_init": [
+            [this, ["inflight2"]],
+            [this.inflight1, []],
+          ],
+          "inflight2": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $foo: ${$stdlib.core.liftObject(foo)},
           })
         `;
@@ -211,7 +207,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -219,14 +215,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(foo, host, ["callFn", "callFn2"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, [].concat(["callFn"], ["callFn2"])],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
       }
     }
     const foo = new Foo(this, "Foo");
@@ -236,6 +233,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "calling_inflight_variants.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_test_sim.md
index 13fc7a0531c..92c558b5f51 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/calling_inflight_variants.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ calling_inflight_variants.test.wsim » root/env0/test:calling different types of inflights
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_compile_tf-aws.md
index 8165ec46153..f7477a1faef 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_compile_tf-aws.md
@@ -1,9 +1,10 @@
 # [capture_containers.test.w](../../../../../examples/tests/valid/capture_containers.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $Object_keys_myMap__length, $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__0_, $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__1_, $__bang__in____arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arrOfMap__0___, $__obj__args_______if__obj_args______undefined__throw_new_Error__Json_property____args___does_not_exist____return_obj_args_____j___b__, $__world__in__myMap__, $_mySet_has__my___, $arr_length, $mySet_size }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $arr, $arrOfMap, $j, $myMap, $mySet }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -11,20 +12,20 @@ module.exports = function({ $Object_keys_myMap__length, $__arr__index_______if__
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: arr.at(0) == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__0_,"hello")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: arr.at(1) == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__1_,"world")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: arr.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($arr_length,2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: mySet.has(\"my\")")})($_mySet_has__my___)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: mySet.size == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($mySet_size,2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: myMap.has(\"world\")")})($__world__in__myMap__)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: myMap.size() == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($Object_keys_myMap__length,2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: arrOfMap.at(0).has(\"bang\")")})($__bang__in____arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arrOfMap__0___)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: j.get(\"b\") == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__obj__args_______if__obj_args______undefined__throw_new_Error__Json_property____args___does_not_exist____return_obj_args_____j___b__,"world")))};
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($arr, 0), "hello"), "arr.at(0) == \"hello\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($arr, 1), "world"), "arr.at(1) == \"world\"");
+      $helpers.assert($helpers.eq($arr.length, 2), "arr.length == 2");
+      $helpers.assert((await $mySet.has("my")), "mySet.has(\"my\")");
+      $helpers.assert($helpers.eq($mySet.size, 2), "mySet.size == 2");
+      $helpers.assert(("world" in ($myMap)), "myMap.has(\"world\")");
+      $helpers.assert($helpers.eq(Object.keys($myMap).length, 2), "myMap.size() == 2");
+      $helpers.assert(("bang" in (((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($arrOfMap, 0))), "arrOfMap.at(0).has(\"bang\")");
+      $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })($j, "b"), "world"), "j.get(\"b\") == \"world\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -34,22 +35,9 @@ module.exports = function({ $Object_keys_myMap__length, $__arr__index_______if__
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -59,43 +47,41 @@ module.exports = function({ $Object_keys_myMap__length, $__arr__index_______if__
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $Object_keys_myMap__length: ${$stdlib.core.liftObject(Object.keys(myMap).length)},
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr, 0))},
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arr__1_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr, 1))},
-            $__bang__in____arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______arrOfMap__0___: ${$stdlib.core.liftObject(("bang" in (((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arrOfMap, 0))))},
-            $__obj__args_______if__obj_args______undefined__throw_new_Error__Json_property____args___does_not_exist____return_obj_args_____j___b__: ${$stdlib.core.liftObject(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(j, "b"))},
-            $__world__in__myMap__: ${$stdlib.core.liftObject(("world" in (myMap)))},
-            $_mySet_has__my___: ${$stdlib.core.liftObject((mySet.has("my")))},
-            $arr_length: ${$stdlib.core.liftObject(arr.length)},
-            $mySet_size: ${$stdlib.core.liftObject(mySet.size)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $arr: ${$stdlib.core.liftObject(arr)},
+            $arrOfMap: ${$stdlib.core.liftObject(arrOfMap)},
+            $j: ${$stdlib.core.liftObject(j)},
+            $myMap: ${$stdlib.core.liftObject(myMap)},
+            $mySet: ${$stdlib.core.liftObject(mySet)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -103,22 +89,23 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(("bang" in (((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arrOfMap, 0))), host, []);
-          $Closure1._registerOnLiftObject(("world" in (myMap)), host, []);
-          $Closure1._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr, 0), host, []);
-          $Closure1._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr, 1), host, []);
-          $Closure1._registerOnLiftObject(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(j, "b"), host, []);
-          $Closure1._registerOnLiftObject((mySet.has("my")), host, []);
-          $Closure1._registerOnLiftObject(Object.keys(myMap).length, host, []);
-          $Closure1._registerOnLiftObject(arr.length, host, []);
-          $Closure1._registerOnLiftObject(mySet.size, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [arr, [].concat(["at"], ["length"])],
+            [arrOfMap, ["at"]],
+            [j, ["get"]],
+            [myMap, [].concat(["has"], ["size"])],
+            [mySet, [].concat(["has"], ["size"])],
+          ],
+          "$inflight_init": [
+            [arr, []],
+            [arrOfMap, []],
+            [j, []],
+            [myMap, []],
+            [mySet, []],
+          ],
+        });
       }
     }
     const arr = ["hello", "world"];
@@ -132,6 +119,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_containers.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_test_sim.md
index 16aa2555bf3..1a6c1aceab0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_containers.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_containers.test.wsim » root/env0/test:capture_containers
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_compile_tf-aws.md
index 471d5146e13..91071782782 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [capture_in_binary.test.w](../../../../../examples/tests/valid/capture_in_binary.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b, $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,13 +13,13 @@ module.exports = function({ $b, $x }) {
     }
     async handle() {
       (await $b.put("file", "foo"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: b.get(\"file\") == \"foo\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $b.get("file")),"foo")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: 12 == x")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(12,$x)))};
+      $helpers.assert($helpers.eq((await $b.get("file")), "foo"), "b.get(\"file\") == \"foo\"");
+      $helpers.assert($helpers.eq(12, $x), "12 == x");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -28,22 +29,9 @@ module.exports = function({ $b, $x }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -52,14 +40,14 @@ module.exports = function({ $b, $x }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
@@ -67,27 +55,29 @@ module.exports = function({ $b, $x }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
             $x: ${$stdlib.core.liftObject(x)},
           })
@@ -96,7 +86,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -104,18 +94,20 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, ["get", "put"]);
-          $Closure1._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, [].concat(["put"], ["get"])],
+            [x, []],
+          ],
+          "$inflight_init": [
+            [b, []],
+            [x, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const x = 12;
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:binary expressions", new $Closure1(this, "$Closure1"));
   }
@@ -123,6 +115,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_in_binary.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_test_sim.md
index bbc45a5118e..647d95c01d0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_in_binary.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_in_binary.test.wsim » root/env0/test:binary expressions
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_compile_tf-aws.md
index 7f93e26c548..14947547926 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_compile_tf-aws.md
@@ -1,9 +1,10 @@
 # [capture_mutables.test.w](../../../../../examples/tests/valid/capture_mutables.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $Object_keys_m__length, $aCloned_length, $a_length, $s_size }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $a, $aCloned, $m, $s }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -11,20 +12,21 @@ module.exports = function({ $Object_keys_m__length, $aCloned_length, $a_length,
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: a.length == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($a_length,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: s.size == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($s_size,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: m.size() == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($Object_keys_m__length,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: aCloned.length == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($aCloned_length,1)))};
+      $helpers.assert($helpers.eq($a.length, 1), "a.length == 1");
+      $helpers.assert($helpers.eq($s.size, 1), "s.size == 1");
+      $helpers.assert($helpers.eq(Object.keys($m).length, 1), "m.size() == 1");
+      $helpers.assert($helpers.eq($aCloned.length, 1), "aCloned.length == 1");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $handler }) {
   class $Closure2 {
     constructor({  }) {
@@ -38,7 +40,7 @@ module.exports = function({ $handler }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -48,22 +50,9 @@ module.exports = function({ $handler }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -73,37 +62,39 @@ module.exports = function({ $handler }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $Object_keys_m__length: ${$stdlib.core.liftObject(Object.keys(m).length)},
-            $aCloned_length: ${$stdlib.core.liftObject(aCloned.length)},
-            $a_length: ${$stdlib.core.liftObject(a.length)},
-            $s_size: ${$stdlib.core.liftObject(s.size)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $a: ${$stdlib.core.liftObject(a)},
+            $aCloned: ${$stdlib.core.liftObject(aCloned)},
+            $m: ${$stdlib.core.liftObject(m)},
+            $s: ${$stdlib.core.liftObject(s)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -111,28 +102,32 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(Object.keys(m).length, host, []);
-          $Closure1._registerOnLiftObject(a.length, host, []);
-          $Closure1._registerOnLiftObject(aCloned.length, host, []);
-          $Closure1._registerOnLiftObject(s.size, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [a, ["length"]],
+            [aCloned, ["length"]],
+            [m, ["size"]],
+            [s, ["size"]],
+          ],
+          "$inflight_init": [
+            [a, []],
+            [aCloned, []],
+            [m, []],
+            [s, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $handler: ${$stdlib.core.liftObject(handler)},
           })
         `;
@@ -140,7 +135,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -148,14 +143,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(handler, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [handler, ["handle"]],
+          ],
+          "$inflight_init": [
+            [handler, []],
+          ],
+        });
       }
     }
     const a = ["hello"];
@@ -169,6 +165,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_mutables.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_test_sim.md
index 0f05b849c94..c119551a667 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_mutables.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_mutables.test.wsim » root/env0/test:main
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_compile_tf-aws.md
index da3ed50c235..acdaed6230a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_compile_tf-aws.md
@@ -1,36 +1,37 @@
 # [capture_primitives.test.w](../../../../../examples/tests/valid/capture_primitives.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $myBool, $myDur_hours, $myDur_minutes, $myDur_seconds, $myNum, $mySecondBool, $myStr }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $myBool, $myDur, $myNum, $mySecondBool, $myStr }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(s) {
-      {console.log($myStr)};
+    async handle() {
+      console.log($myStr);
       const n = $myNum;
-      {console.log(String.raw({ raw: ["", ""] }, n))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: mySecondBool == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($mySecondBool,false)))};
+      console.log(String.raw({ raw: ["", ""] }, n));
+      $helpers.assert($helpers.eq($mySecondBool, false), "mySecondBool == false");
       if ($myBool) {
-        {console.log("bool=true")};
+        console.log("bool=true");
       }
       else {
-        {console.log("bool=false")};
+        console.log("bool=false");
       }
-      const min = $myDur_minutes;
-      const sec = $myDur_seconds;
-      const hr = $myDur_hours;
+      const min = $myDur.minutes;
+      const sec = $myDur.seconds;
+      const hr = $myDur.hours;
       const split = (await String.raw({ raw: ["min=", " sec=", " hr=", ""] }, min, sec, hr).split(" "));
-      {((cond) => {if (!cond) throw new Error("assertion failed: split.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(split.length,3)))};
+      $helpers.assert($helpers.eq(split.length, 3), "split.length == 3");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -40,22 +41,9 @@ module.exports = function({ $myBool, $myDur_hours, $myDur_minutes, $myDur_second
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -64,58 +52,58 @@ module.exports = function({ $myBool, $myDur_hours, $myDur_minutes, $myDur_second
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudFunction_CloudwatchLogGroup_7399B890": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "cloudFunction_CloudwatchLogGroup_7399B890"
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d2eca1",
+        "name": "/aws/lambda/Function-c852aba6",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudFunction_IamRole_5A4430DC": {
+      "Function_IamRole_678BE84C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRole",
-            "uniqueId": "cloudFunction_IamRole_5A4430DC"
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudFunction_IamRolePolicy_618BF987": {
+      "Function_IamRolePolicy_E3B26607": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicy",
-            "uniqueId": "cloudFunction_IamRolePolicy_618BF987"
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudFunction_IamRolePolicyAttachment_288B9653": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "cloudFunction_IamRolePolicyAttachment_288B9653"
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudFunction": {
+      "Function": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/Default",
-            "uniqueId": "cloudFunction"
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
           }
         },
         "architectures": [
@@ -124,18 +112,18 @@ module.exports = function({ $myBool, $myDur_hours, $myDur_minutes, $myDur_second
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d2eca1",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d2eca1",
+        "function_name": "Function-c852aba6",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudFunction_S3Object_71908BAD.key}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -155,11 +143,11 @@ module.exports = function({ $myBool, $myDur_hours, $myDur_minutes, $myDur_second
       }
     },
     "aws_s3_object": {
-      "cloudFunction_S3Object_71908BAD": {
+      "Function_S3Object_C62A0C2D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/S3Object",
-            "uniqueId": "cloudFunction_S3Object_71908BAD"
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -171,31 +159,31 @@ module.exports = function({ $myBool, $myDur_hours, $myDur_minutes, $myDur_second
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $myBool: ${$stdlib.core.liftObject(myBool)},
-            $myDur_hours: ${$stdlib.core.liftObject(myDur.hours)},
-            $myDur_minutes: ${$stdlib.core.liftObject(myDur.minutes)},
-            $myDur_seconds: ${$stdlib.core.liftObject(myDur.seconds)},
+            $myDur: ${$stdlib.core.liftObject(myDur)},
             $myNum: ${$stdlib.core.liftObject(myNum)},
             $mySecondBool: ${$stdlib.core.liftObject(mySecondBool)},
             $myStr: ${$stdlib.core.liftObject(myStr)},
@@ -205,7 +193,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -213,20 +201,23 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(myBool, host, []);
-          $Closure1._registerOnLiftObject(myDur.hours, host, []);
-          $Closure1._registerOnLiftObject(myDur.minutes, host, []);
-          $Closure1._registerOnLiftObject(myDur.seconds, host, []);
-          $Closure1._registerOnLiftObject(myNum, host, []);
-          $Closure1._registerOnLiftObject(mySecondBool, host, []);
-          $Closure1._registerOnLiftObject(myStr, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [myBool, []],
+            [myDur, [].concat(["minutes"], ["seconds"], ["hours"])],
+            [myNum, []],
+            [mySecondBool, []],
+            [myStr, []],
+          ],
+          "$inflight_init": [
+            [myBool, []],
+            [myDur, []],
+            [myNum, []],
+            [mySecondBool, []],
+            [myStr, []],
+          ],
+        });
       }
     }
     const myStr = "hello, string";
@@ -235,12 +226,12 @@ class $Root extends $stdlib.std.Resource {
     const mySecondBool = false;
     const myDur = (std.Duration.fromSeconds(600));
     const handler = new $Closure1(this, "$Closure1");
-    this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", handler);
+    this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", handler);
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_primitives.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_test_sim.md
index 01dd51403fe..92a88064e0e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_primitives.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_primitives.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_compile_tf-aws.md
index 4415617ef8c..2a4cce23d48 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [capture_reassigable_class_field.test.w](../../../../../examples/tests/valid/capture_reassigable_class_field.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -15,12 +16,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $counter }) {
   class $Closure2 {
     constructor({  }) {
@@ -34,12 +36,13 @@ module.exports = function({ $counter }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $counter, $kv, $util_Util }) {
   class $Closure3 {
     constructor({  }) {
@@ -53,22 +56,23 @@ module.exports = function({ $counter, $kv, $util_Util }) {
       (await $kv.get("k"));
       (await $kv.get("k"));
       (await $kv.get("k2"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: util.waitUntil((): bool => {\n    return counter.peek(\"k\") == 2;\n  })")})((await $util_Util.waitUntil(async () => {
-        return (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $counter.peek("k")),2));
-      })))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: util.waitUntil((): bool => {\n    return counter.peek(\"k2\") == 1;\n  })")})((await $util_Util.waitUntil(async () => {
-        return (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $counter.peek("k2")),1));
-      })))};
+      (await $util_Util.waitUntil((async () => {
+        return $helpers.eq((await $counter.peek("k")), 2);
+      })));
+      (await $util_Util.waitUntil((async () => {
+        return $helpers.eq((await $counter.peek("k2")), 1);
+      })));
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.KeyValueStore-1.js
-```js
+## inflight.KeyValueStore-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class KeyValueStore {
     constructor({ $this_bucket, $this_onUpdateCallback }) {
@@ -85,7 +89,7 @@ module.exports = function({  }) {
   }
   return KeyValueStore;
 }
-//# sourceMappingURL=inflight.KeyValueStore-1.js.map
+//# sourceMappingURL=inflight.KeyValueStore-1.cjs.map
 ```
 
 ## main.tf.json
@@ -95,22 +99,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -138,14 +129,14 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_bucket": {
-      "KeyValueStore_cloudBucket_D9D365FD": {
+      "KeyValueStore_Bucket_EBBCDEA3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/KeyValueStore/cloud.Bucket/Default",
-            "uniqueId": "KeyValueStore_cloudBucket_D9D365FD"
+            "path": "root/Default/Default/KeyValueStore/Bucket/Default",
+            "uniqueId": "KeyValueStore_Bucket_EBBCDEA3"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8a9ef69-",
+        "bucket_prefix": "bucket-c8da6031-",
         "force_destroy": false
       }
     }
@@ -153,14 +144,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
@@ -169,24 +162,23 @@ class $Root extends $stdlib.std.Resource {
     class KeyValueStore extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-        const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        this.bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure1-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
               })
             `;
           }
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this)};
+                const $Closure1Client = ${$Closure1._toInflightType()};
                 const client = new $Closure1Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -194,8 +186,13 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
+          get _liftMap() {
+            return ({
+              "handle": [
+              ],
+              "$inflight_init": [
+              ],
+            });
           }
         }
         this.onUpdateCallback = new $Closure1(this, "$Closure1");
@@ -205,14 +202,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.KeyValueStore-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.KeyValueStore-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const KeyValueStoreClient = ${KeyValueStore._toInflightType(this)};
+            const KeyValueStoreClient = ${KeyValueStore._toInflightType()};
             const client = new KeyValueStoreClient({
               $this_bucket: ${$stdlib.core.liftObject(this.bucket)},
               $this_onUpdateCallback: ${$stdlib.core.liftObject(this.onUpdateCallback)},
@@ -222,33 +219,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "get", "set", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          KeyValueStore._registerOnLiftObject(this.bucket, host, []);
-          KeyValueStore._registerOnLiftObject(this.onUpdateCallback, host, []);
-        }
-        if (ops.includes("get")) {
-          KeyValueStore._registerOnLiftObject(this.bucket, host, ["getJson"]);
-          KeyValueStore._registerOnLiftObject(this.onUpdateCallback, host, ["handle"]);
-        }
-        if (ops.includes("set")) {
-          KeyValueStore._registerOnLiftObject(this.bucket, host, ["putJson"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "get": [
+            [this.bucket, ["getJson"]],
+            [this.onUpdateCallback, ["handle"]],
+          ],
+          "set": [
+            [this.bucket, ["putJson"]],
+          ],
+          "$inflight_init": [
+            [this.bucket, []],
+            [this.onUpdateCallback, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $counter: ${$stdlib.core.liftObject(counter)},
           })
         `;
@@ -256,7 +251,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -264,25 +259,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(counter, host, ["inc"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [counter, ["inc"]],
+          ],
+          "$inflight_init": [
+            [counter, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $counter: ${$stdlib.core.liftObject(counter)},
             $kv: ${$stdlib.core.liftObject(kv)},
             $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
@@ -292,7 +288,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -300,15 +296,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(counter, host, ["peek"]);
-          $Closure3._registerOnLiftObject(kv, host, ["get", "set"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [counter, ["peek"]],
+            [kv, [].concat(["set"], ["get"])],
+          ],
+          "$inflight_init": [
+            [counter, []],
+            [kv, []],
+          ],
+        });
       }
     }
     const kv = new KeyValueStore(this, "KeyValueStore");
@@ -320,6 +318,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_reassigable_class_field.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_test_sim.md
index a6abf2f2716..0314ae38c62 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassigable_class_field.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_reassigable_class_field.test.wsim » root/env0/test:main
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_compile_tf-aws.md
index 96c8ca011ee..45dfc0c4221 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [capture_reassignable.test.w](../../../../../examples/tests/valid/capture_reassignable.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({ $x }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($x,5)))};
+      $helpers.assert($helpers.eq($x, 5), "x == 5");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $handler }) {
   class $Closure2 {
     constructor({  }) {
@@ -35,7 +37,7 @@ module.exports = function({ $handler }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -45,22 +47,9 @@ module.exports = function({ $handler }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -70,27 +59,29 @@ module.exports = function({ $handler }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -98,7 +89,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -106,25 +97,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, []],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $handler: ${$stdlib.core.liftObject(handler)},
           })
         `;
@@ -132,7 +124,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -140,14 +132,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(handler, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [handler, ["handle"]],
+          ],
+          "$inflight_init": [
+            [handler, []],
+          ],
+        });
       }
     }
     let x = 5;
@@ -158,6 +151,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_reassignable.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_test_sim.md
index a3335ace741..5bc9e343cb0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_reassignable.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_reassignable.test.wsim » root/env0/test:main
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_compile_tf-aws.md
index 122d7431464..18954b6e717 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_compile_tf-aws.md
@@ -1,9 +1,10 @@
 # [capture_resource_and_data.test.w](../../../../../examples/tests/valid/capture_resource_and_data.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $data_size, $queue, $res }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $data, $queue, $res }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -11,15 +12,15 @@ module.exports = function({ $data_size, $queue, $res }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: data.size == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($data_size,3)))};
+      $helpers.assert($helpers.eq($data.size, 3), "data.size == 3");
       (await $res.put("file.txt", "world"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: res.get(\"file.txt\") == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $res.get("file.txt")),"world")))};
+      $helpers.assert($helpers.eq((await $res.get("file.txt")), "world"), "res.get(\"file.txt\") == \"world\"");
       (await $queue.push("spirulina"));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -29,22 +30,9 @@ module.exports = function({ $data_size, $queue, $res }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -53,27 +41,27 @@ module.exports = function({ $data_size, $queue, $res }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
@@ -81,28 +69,30 @@ module.exports = function({ $data_size, $queue, $res }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $data_size: ${$stdlib.core.liftObject(data.size)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $data: ${$stdlib.core.liftObject(data)},
             $queue: ${$stdlib.core.liftObject(queue)},
             $res: ${$stdlib.core.liftObject(res)},
           })
@@ -111,7 +101,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -119,27 +109,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(data.size, host, []);
-          $Closure1._registerOnLiftObject(queue, host, ["push"]);
-          $Closure1._registerOnLiftObject(res, host, ["get", "put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [data, ["size"]],
+            [queue, ["push"]],
+            [res, [].concat(["put"], ["get"])],
+          ],
+          "$inflight_init": [
+            [data, []],
+            [queue, []],
+            [res, []],
+          ],
+        });
       }
     }
     const data = new Set([1, 2, 3]);
-    const res = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+    const res = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:resource and data", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_resource_and_data.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_test_sim.md
index 95640fdea2e..f48985d7293 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_and_data.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_resource_and_data.test.wsim » root/env0/test:resource and data
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_compile_tf-aws.md
index bc5af737595..d763246da9a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [capture_resource_with_no_inflight.test.w](../../../../../examples/tests/valid/capture_resource_with_no_inflight.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $a, $a_field }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,18 +12,19 @@ module.exports = function({ $a, $a_field }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"hey\" == a.field")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("hey",$a_field)))};
+      $helpers.assert($helpers.eq("hey", $a_field), "\"hey\" == a.field");
       (await $a.bar());
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.A-1.js
-```js
+## inflight.A-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({ $this_counter }) {
@@ -36,7 +38,7 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
 ## main.tf.json
@@ -46,22 +48,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -70,11 +59,11 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_dynamodb_table": {
-      "A_cloudCounter_1CAB7DAD": {
+      "A_Counter_2B28E8C1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/A/cloud.Counter/Default",
-            "uniqueId": "A_cloudCounter_1CAB7DAD"
+            "path": "root/Default/Default/A/Counter/Default",
+            "uniqueId": "A_Counter_2B28E8C1"
           }
         },
         "attribute": [
@@ -85,21 +74,23 @@ module.exports = function({  }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c88d0b81"
+        "name": "wing-counter-Counter-c87bf366"
       }
     }
   }
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -108,18 +99,18 @@ class $Root extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
         this.field = "hey";
-        this.counter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+        this.counter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
               $this_counter: ${$stdlib.core.liftObject(this.counter)},
             });
@@ -128,28 +119,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "incCounter", "bar", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          A._registerOnLiftObject(this.counter, host, []);
-        }
-        if (ops.includes("incCounter")) {
-          A._registerOnLiftObject(this.counter, host, ["inc"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "incCounter": [
+            [this.counter, ["inc"]],
+          ],
+          "bar": [
+          ],
+          "$inflight_init": [
+            [this.counter, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $a: ${$stdlib.core.liftObject(a)},
             $a_field: ${$stdlib.core.liftObject(a.field)},
           })
@@ -158,7 +149,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -166,15 +157,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(a, host, ["bar"]);
-          $Closure1._registerOnLiftObject(a.field, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [a, ["bar"]],
+            [a.field, []],
+          ],
+          "$inflight_init": [
+            [a, []],
+            [a.field, []],
+          ],
+        });
       }
     }
     const a = new A(this, "A");
@@ -184,6 +177,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_resource_with_no_inflight.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_test_sim.md
index 4e52da0de49..49fb7c629b7 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_resource_with_no_inflight.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ capture_resource_with_no_inflight.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_compile_tf-aws.md
index b6350a23411..12ec3390d08 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [capture_tokens.test.w](../../../../../examples/tests/valid/capture_tokens.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $r }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $r }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $MyResource, $api_url, $url }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,18 +32,19 @@ module.exports = function({ $MyResource, $api_url, $url }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: MyResource.isValidUrl(url)")})((await $MyResource.isValidUrl($url)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: MyResource.isValidUrl(api.url)")})((await $MyResource.isValidUrl($api_url)))};
+      $helpers.assert((await $MyResource.isValidUrl($url)), "MyResource.isValidUrl(url)");
+      $helpers.assert((await $MyResource.isValidUrl($api_url)), "MyResource.isValidUrl(api.url)");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.MyResource-1.js
-```js
+## inflight.MyResource-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyResource {
     constructor({ $this_api_url, $this_url }) {
@@ -49,16 +52,16 @@ module.exports = function({  }) {
       this.$this_url = $this_url;
     }
     static async isValidUrl(url) {
-      return (require("<ABSOLUTE_PATH>/url_utils.js")["isValidUrl"])(url)
+      return (require("../../../url_utils.ts")["isValidUrl"])(url)
     }
     async foo() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: MyResource.isValidUrl(this.url)")})((await MyResource.isValidUrl(this.$this_url)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: MyResource.isValidUrl(this.api.url)")})((await MyResource.isValidUrl(this.$this_api_url)))};
+      $helpers.assert((await MyResource.isValidUrl(this.$this_url)), "MyResource.isValidUrl(this.url)");
+      $helpers.assert((await MyResource.isValidUrl(this.$this_api_url)), "MyResource.isValidUrl(this.api.url)");
     }
   }
   return MyResource;
 }
-//# sourceMappingURL=inflight.MyResource-1.js.map
+//# sourceMappingURL=inflight.MyResource-1.cjs.map
 ```
 
 ## main.tf.json
@@ -68,19 +71,40 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            },
+            "MyResource": {
+              "Api": {
+                "Endpoint": {
+                  "Url": "MyResource_Api_Endpoint_Url_62C4AC1C"
+                }
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -93,8 +117,11 @@ module.exports = function({  }) {
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    },
+    "MyResource_Api_Endpoint_Url_62C4AC1C": {
+      "value": "https://${aws_api_gateway_rest_api.MyResource_Api_api_35C6C5EE.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.MyResource_Api_api_stage_4DA77656.stage_name}"
     }
   },
   "provider": {
@@ -104,86 +131,86 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "MyResource_cloudApi_api_deployment_6DBAED7F": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Api/api/deployment",
-            "uniqueId": "MyResource_cloudApi_api_deployment_6DBAED7F"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.MyResource_cloudApi_api_4CB9B8E3.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.MyResource_cloudApi_api_4CB9B8E3.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       },
-      "cloudApi_api_deployment_545514BF": {
+      "MyResource_Api_api_deployment_9749D61B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/MyResource/Api/api/deployment",
+            "uniqueId": "MyResource_Api_api_deployment_9749D61B"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.MyResource_Api_api_35C6C5EE.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.MyResource_Api_api_35C6C5EE.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "MyResource_cloudApi_api_4CB9B8E3": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Api/api/api",
-            "uniqueId": "MyResource_cloudApi_api_4CB9B8E3"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c8ef4b64"
+        "name": "api-c8f613f0"
       },
-      "cloudApi_api_2B334D75": {
+      "MyResource_Api_api_35C6C5EE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/MyResource/Api/api/api",
+            "uniqueId": "MyResource_Api_api_35C6C5EE"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c801136d"
       }
     },
     "aws_api_gateway_stage": {
-      "MyResource_cloudApi_api_stage_A26656F9": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Api/api/stage",
-            "uniqueId": "MyResource_cloudApi_api_stage_A26656F9"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.MyResource_cloudApi_api_deployment_6DBAED7F.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.MyResource_cloudApi_api_4CB9B8E3.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       },
-      "cloudApi_api_stage_BBB283E4": {
+      "MyResource_Api_api_stage_4DA77656": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/MyResource/Api/api/stage",
+            "uniqueId": "MyResource_Api_api_stage_4DA77656"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.MyResource_Api_api_deployment_9749D61B.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.MyResource_Api_api_35C6C5EE.id}",
         "stage_name": "prod"
       }
     }
@@ -191,14 +218,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -206,19 +235,19 @@ class $Root extends $stdlib.std.Resource {
     class MyResource extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
+        this.api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
         this.url = this.api.url;
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyResource-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyResource-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyResourceClient = ${MyResource._toInflightType(this)};
+            const MyResourceClient = ${MyResource._toInflightType()};
             const client = new MyResourceClient({
               $this_api_url: ${$stdlib.core.liftObject(this.api.url)},
               $this_url: ${$stdlib.core.liftObject(this.url)},
@@ -228,31 +257,36 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "isValidUrl", "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "foo": [
+            [MyResource, ["isValidUrl"]],
+            [this.api.url, []],
+            [this.url, []],
+          ],
+          "$inflight_init": [
+            [MyResource, []],
+            [this.api.url, []],
+            [this.url, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyResource._registerOnLiftObject(this.api.url, host, []);
-          MyResource._registerOnLiftObject(this.url, host, []);
-        }
-        if (ops.includes("foo")) {
-          MyResource._registerOnLiftObject(MyResource, host, ["isValidUrl"]);
-          MyResource._registerOnLiftObject(this.api.url, host, []);
-          MyResource._registerOnLiftObject(this.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "isValidUrl": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $r: ${$stdlib.core.liftObject(r)},
           })
         `;
@@ -260,7 +294,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -268,25 +302,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(r, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [r, ["foo"]],
+          ],
+          "$inflight_init": [
+            [r, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $MyResource: ${$stdlib.core.liftObject(MyResource)},
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $url: ${$stdlib.core.liftObject(url)},
@@ -296,7 +331,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -304,21 +339,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(MyResource, host, ["isValidUrl"]);
-          $Closure2._registerOnLiftObject(api.url, host, []);
-          $Closure2._registerOnLiftObject(url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [MyResource, ["isValidUrl"]],
+            [api.url, []],
+            [url, []],
+          ],
+          "$inflight_init": [
+            [MyResource, []],
+            [api.url, []],
+            [url, []],
+          ],
+        });
       }
     }
     const r = new MyResource(this, "MyResource");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight class", new $Closure1(this, "$Closure1"));
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
     const url = api.url;
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight globals", new $Closure2(this, "$Closure2"));
   }
@@ -326,6 +364,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "capture_tokens.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_test_sim.md
index 6aec300ccbb..0d22745ac8b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/capture_tokens.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ capture_tokens.test.wsim » root/env0/test:inflight class  
 pass ─ capture_tokens.test.wsim » root/env1/test:inflight globals
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_compile_tf-aws.md
index 38ea65ca4a5..01ee869a182 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [captures.test.w](../../../../../examples/tests/valid/captures.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket1, $bucket2, $bucket3 }) {
   class $Closure1 {
     constructor({  }) {
@@ -10,34 +11,55 @@ module.exports = function({ $bucket1, $bucket2, $bucket3 }) {
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(event) {
+    async handle() {
       (await $bucket1.put("file.txt", "data"));
       (await $bucket2.get("file.txt"));
       (await $bucket2.get("file2.txt"));
       (await $bucket3.get("file3.txt"));
       for (const stuff of (await $bucket1.list())) {
-        {console.log(stuff)};
+        console.log(stuff);
       }
-      {console.log((await $bucket2.publicUrl("file.txt")))};
+      console.log((await $bucket2.publicUrl("file.txt")));
       try {
         (await $bucket1.publicUrl("file.txt"));
       }
       catch ($error_error) {
         const error = $error_error.message;
-        {console.log(error)};
+        console.log(error);
       }
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $headers }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $handler }) {
   class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $handler());
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $headers }) {
+  class $Closure3 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
       Object.setPrototypeOf($obj, this);
@@ -47,9 +69,9 @@ module.exports = function({ $headers }) {
       return ({"status": 200, "headers": $headers, "body": "Hello, world!"});
     }
   }
-  return $Closure2;
+  return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
 ## main.tf.json
@@ -59,19 +81,33 @@ module.exports = function({ $headers }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -84,8 +120,8 @@ module.exports = function({ $headers }) {
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -95,47 +131,47 @@ module.exports = function({ $headers }) {
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/hello\":{\"get\":{\"operationId\":\"get-hello\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_hello_0_2F9F5F19.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/hello\":{\"get\":{\"operationId\":\"get-hello\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_hello0-c8557c1a/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
@@ -150,34 +186,34 @@ module.exports = function({ $headers }) {
         "name": "/aws/lambda/AnotherFunction-c88d2a81",
         "retention_in_days": 30
       },
-      "cloudApi_get_hello_0_CloudwatchLogGroup_332ABC56": {
+      "Api_get_hello0_CloudwatchLogGroup_1025B41C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_hello_0_CloudwatchLogGroup_332ABC56"
+            "path": "root/Default/Default/Api/get_hello0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_hello0_CloudwatchLogGroup_1025B41C"
           }
         },
-        "name": "/aws/lambda/get_hello_-0-c8ed7599",
+        "name": "/aws/lambda/get_hello0-c8557c1a",
         "retention_in_days": 30
       },
-      "cloudFunction_CloudwatchLogGroup_7399B890": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "cloudFunction_CloudwatchLogGroup_7399B890"
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d2eca1",
+        "name": "/aws/lambda/Function-c852aba6",
         "retention_in_days": 30
       },
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419"
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30
       }
     },
@@ -191,29 +227,29 @@ module.exports = function({ $headers }) {
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudApi_get_hello_0_IamRole_AF63D6EC": {
+      "Api_get_hello0_IamRole_1E6956F6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/IamRole",
-            "uniqueId": "cloudApi_get_hello_0_IamRole_AF63D6EC"
+            "path": "root/Default/Default/Api/get_hello0/IamRole",
+            "uniqueId": "Api_get_hello0_IamRole_1E6956F6"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudFunction_IamRole_5A4430DC": {
+      "Function_IamRole_678BE84C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRole",
-            "uniqueId": "cloudFunction_IamRole_5A4430DC"
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
@@ -227,38 +263,38 @@ module.exports = function({ $headers }) {
             "uniqueId": "AnotherFunction_IamRolePolicy_5A9BEFB1"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.cloudBucket.arn}\",\"${aws_s3_bucket.cloudBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.PublicBucket.arn}\",\"${aws_s3_bucket.PublicBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.PrivateBucket.arn}\",\"${aws_s3_bucket.PrivateBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.PublicBucket.arn}\",\"${aws_s3_bucket.PublicBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.PrivateBucket.arn}\",\"${aws_s3_bucket.PrivateBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
         "role": "${aws_iam_role.AnotherFunction_IamRole_74447271.name}"
       },
-      "cloudApi_get_hello_0_IamRolePolicy_0D701926": {
+      "Api_get_hello0_IamRolePolicy_CFA96C73": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_hello_0_IamRolePolicy_0D701926"
+            "path": "root/Default/Default/Api/get_hello0/IamRolePolicy",
+            "uniqueId": "Api_get_hello0_IamRolePolicy_CFA96C73"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_hello_0_IamRole_AF63D6EC.name}"
+        "role": "${aws_iam_role.Api_get_hello0_IamRole_1E6956F6.name}"
       },
-      "cloudFunction_IamRolePolicy_618BF987": {
+      "Function_IamRolePolicy_E3B26607": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicy",
-            "uniqueId": "cloudFunction_IamRolePolicy_618BF987"
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.cloudBucket.arn}\",\"${aws_s3_bucket.cloudBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.PublicBucket.arn}\",\"${aws_s3_bucket.PublicBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.PrivateBucket.arn}\",\"${aws_s3_bucket.PrivateBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.PublicBucket.arn}\",\"${aws_s3_bucket.PublicBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.PrivateBucket.arn}\",\"${aws_s3_bucket.PrivateBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       },
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.cloudQueue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.cloudBucket.arn}\",\"${aws_s3_bucket.cloudBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.PublicBucket.arn}\",\"${aws_s3_bucket.PublicBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.PrivateBucket.arn}\",\"${aws_s3_bucket.PrivateBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:PutObject*\",\"s3:Abort*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\",\"s3:GetBucketPublicAccessBlock\"],\"Resource\":[\"${aws_s3_bucket.PublicBucket.arn}\",\"${aws_s3_bucket.PublicBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.PrivateBucket.arn}\",\"${aws_s3_bucket.PrivateBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
@@ -272,48 +308,51 @@ module.exports = function({ $headers }) {
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
         "role": "${aws_iam_role.AnotherFunction_IamRole_74447271.name}"
       },
-      "cloudApi_get_hello_0_IamRolePolicyAttachment_65673571": {
+      "Api_get_hello0_IamRolePolicyAttachment_2CF40947": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_hello_0_IamRolePolicyAttachment_65673571"
+            "path": "root/Default/Default/Api/get_hello0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_hello0_IamRolePolicyAttachment_2CF40947"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_hello_0_IamRole_AF63D6EC.name}"
+        "role": "${aws_iam_role.Api_get_hello0_IamRole_1E6956F6.name}"
       },
-      "cloudFunction_IamRolePolicyAttachment_288B9653": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "cloudFunction_IamRolePolicyAttachment_288B9653"
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       },
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136"
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
           }
         },
         "batch_size": 5,
-        "event_source_arn": "${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "${aws_lambda_function.cloudQueue-SetConsumer0.function_name}"
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
@@ -330,8 +369,8 @@ module.exports = function({ $headers }) {
         "environment": {
           "variables": {
             "BUCKET_NAME_0c557d45": "${aws_s3_bucket.PrivateBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
             "BUCKET_NAME_21bd2572": "${aws_s3_bucket.PublicBucket.bucket}",
-            "BUCKET_NAME_d755b447": "${aws_s3_bucket.cloudBucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
             "WING_FUNCTION_NAME": "AnotherFunction-c88d2a81",
             "WING_TARGET": "tf-aws"
@@ -342,7 +381,7 @@ module.exports = function({ $headers }) {
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.AnotherFunction_IamRole_74447271.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.AnotherFunction_S3Object_6987727B.key}",
         "timeout": 60,
@@ -351,11 +390,11 @@ module.exports = function({ $headers }) {
           "subnet_ids": []
         }
       },
-      "cloudApi_get_hello_0_2F9F5F19": {
+      "Api_get_hello0_910B8B13": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/Default",
-            "uniqueId": "cloudApi_get_hello_0_2F9F5F19"
+            "path": "root/Default/Default/Api/get_hello0/Default",
+            "uniqueId": "Api_get_hello0_910B8B13"
           }
         },
         "architectures": [
@@ -364,29 +403,29 @@ module.exports = function({ $headers }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_hello_-0-c8ed7599",
+            "WING_FUNCTION_NAME": "get_hello0-c8557c1a",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_hello_-0-c8ed7599",
+        "function_name": "get_hello0-c8557c1a",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_hello_0_IamRole_AF63D6EC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_hello0_IamRole_1E6956F6.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_hello_0_S3Object_B8DCD8E8.key}",
+        "s3_key": "${aws_s3_object.Api_get_hello0_S3Object_6B43B0B3.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudFunction": {
+      "Function": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/Default",
-            "uniqueId": "cloudFunction"
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
           }
         },
         "architectures": [
@@ -395,32 +434,32 @@ module.exports = function({ $headers }) {
         "environment": {
           "variables": {
             "BUCKET_NAME_0c557d45": "${aws_s3_bucket.PrivateBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
             "BUCKET_NAME_21bd2572": "${aws_s3_bucket.PublicBucket.bucket}",
-            "BUCKET_NAME_d755b447": "${aws_s3_bucket.cloudBucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d2eca1",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d2eca1",
+        "function_name": "Function-c852aba6",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudFunction_S3Object_71908BAD.key}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0"
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
           }
         },
         "architectures": [
@@ -429,22 +468,22 @@ module.exports = function({ $headers }) {
         "environment": {
           "variables": {
             "BUCKET_NAME_0c557d45": "${aws_s3_bucket.PrivateBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
             "BUCKET_NAME_21bd2572": "${aws_s3_bucket.PublicBucket.bucket}",
-            "BUCKET_NAME_d755b447": "${aws_s3_bucket.cloudBucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
@@ -452,21 +491,31 @@ module.exports = function({ $headers }) {
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-df16733f_0EEF8FF5": {
+      "Api_api_permission-GET-df16733f_BE6D5FC5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-df16733f",
-            "uniqueId": "cloudApi_api_permission-GET-df16733f_0EEF8FF5"
+            "path": "root/Default/Default/Api/api/permission-GET-df16733f",
+            "uniqueId": "Api_api_permission-GET-df16733f_BE6D5FC5"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_hello_0_2F9F5F19.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_hello0_910B8B13.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/hello",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/hello",
         "statement_id": "AllowExecutionFromAPIGateway-GET-df16733f"
       }
     },
     "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      },
       "Code": {
         "//": {
           "metadata": {
@@ -495,16 +544,6 @@ module.exports = function({ $headers }) {
         },
         "bucket_prefix": "publicbucket-c8fea5d9-",
         "force_destroy": false
-      },
-      "cloudBucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
-          }
-        },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
       }
     },
     "aws_s3_bucket_policy": {
@@ -549,33 +588,33 @@ module.exports = function({ $headers }) {
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudApi_get_hello_0_S3Object_B8DCD8E8": {
+      "Api_get_hello0_S3Object_6B43B0B3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_}0/S3Object",
-            "uniqueId": "cloudApi_get_hello_0_S3Object_B8DCD8E8"
+            "path": "root/Default/Default/Api/get_hello0/S3Object",
+            "uniqueId": "Api_get_hello0_S3Object_6B43B0B3"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudFunction_S3Object_71908BAD": {
+      "Function_S3Object_C62A0C2D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/S3Object",
-            "uniqueId": "cloudFunction_S3Object_71908BAD"
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF"
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -584,15 +623,15 @@ module.exports = function({ $headers }) {
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
@@ -600,27 +639,29 @@ module.exports = function({ $headers }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bucket1: ${$stdlib.core.liftObject(bucket1)},
             $bucket2: ${$stdlib.core.liftObject(bucket2)},
             $bucket3: ${$stdlib.core.liftObject(bucket3)},
@@ -630,7 +671,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -638,35 +679,38 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket1, host, ["list", "publicUrl", "put"]);
-          $Closure1._registerOnLiftObject(bucket2, host, ["get", "publicUrl"]);
-          $Closure1._registerOnLiftObject(bucket3, host, ["get"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket1, [].concat(["put"], ["list"], ["publicUrl"])],
+            [bucket2, [].concat(["get"], ["publicUrl"])],
+            [bucket3, ["get"]],
+          ],
+          "$inflight_init": [
+            [bucket1, []],
+            [bucket2, []],
+            [bucket3, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
-            $headers: ${$stdlib.core.liftObject(headers)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $handler: ${$stdlib.core.liftObject(handler)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -674,33 +718,69 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+            [handler, ["handle"]],
+          ],
+          "$inflight_init": [
+            [handler, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(headers, host, []);
-        }
-        super._registerOnLift(host, ops);
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $headers: ${$stdlib.core.liftObject(headers)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [headers, []],
+          ],
+          "$inflight_init": [
+            [headers, []],
+          ],
+        });
       }
     }
-    const bucket1 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const bucket1 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const bucket2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "PublicBucket", ({"public": true}));
     const bucket3 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "PrivateBucket", { public: false });
-    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
     const handler = new $Closure1(this, "$Closure1");
-    (queue.setConsumer(handler, { batchSize: 5 }));
-    this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", handler, { env: ({}) });
+    (queue.setConsumer(new $Closure2(this, "$Closure2"), { batchSize: 5 }));
+    this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", handler, { env: ({}) });
     const emptyEnv = ({});
     this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "AnotherFunction", handler, { env: emptyEnv });
     const headers = ({["my-fancy-header"]: "my-fancy-value", ["not-even-real\""]: "wow` !"});
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
-    (api.get("/hello", new $Closure2(this, "$Closure2")));
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
+    (api.get("/hello", new $Closure3(this, "$Closure3")));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "captures.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_test_sim.md
index e91a07e7753..b87b6f0a7c7 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/captures.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ captures.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_compile_tf-aws.md
index 2759fa30490..1624c1c557f 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_compile_tf-aws.md
@@ -12,22 +12,9 @@
         ]
       },
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -36,11 +23,11 @@
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
         "bucket_prefix": "my-prefix-",
@@ -51,31 +38,33 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const util = $stdlib.util;
 const aws = require("@cdktf/provider-aws");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-    if ((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((util.Util.env("WING_TARGET")),"tf-aws"))) {
-      const s3Bucket = (b.node.findChild("Default"));
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    if ($helpers.eq((util.Util.env("WING_TARGET")), "tf-aws")) {
+      const s3Bucket = ($helpers.nodeof(b).findChild("Default"));
       (s3Bucket.addOverride("bucket_prefix", "my-prefix-"));
-      {console.log(s3Bucket.node.path)};
+      console.log($helpers.nodeof(s3Bucket).path);
     }
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "casting.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_test_sim.md
index f4c2718e970..d8b526adb96 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/casting.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ casting.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_compile_tf-aws.md
index dfdaf3834e9..281194d8046 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_compile_tf-aws.md
@@ -1,9 +1,10 @@
 # [class.test.w](../../../../../examples/tests/valid/class.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $c5 }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -11,21 +12,62 @@ module.exports = function({ $c5 }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: c5.x == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($c5.x,123)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: c5.y == 321")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($c5.y,321)))};
-      (await $c5.set(111));
-      {((cond) => {if (!cond) throw new Error("assertion failed: c5.y == 111")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($c5.y,111)))};
+      class C1 {
+      }
+      (await (async () => {const o = new C1(); await o.$inflight_init?.(); return o; })());
+      class C1Ext1 extends C1 {
+      }
+      class C1Ext2 extends C1Ext1 {
+        constructor(){
+          super();
+          this.super_$inflight_init = this.$inflight_init;
+          this.$inflight_init = async () => {
+            await this.super_$inflight_init?.();
+          }
+        }
+      }
+      class C1Ext3 extends C1Ext2 {
+      }
+      class C2 {
+        constructor(){
+          this.$inflight_init = async () => {
+            this.x = 1;
+          }
+        }
+      }
+      const c2 = (await (async () => {const o = new C2(); await o.$inflight_init?.(); return o; })());
+      $helpers.assert($helpers.eq(c2.x, 1), "c2.x == 1");
+      class C2Ext1 extends C2 {
+      }
+      const c2Ext1 = (await (async () => {const o = new C2Ext1(); await o.$inflight_init?.(); return o; })());
+      $helpers.assert($helpers.eq(c2Ext1.x, 1), "c2Ext1.x == 1");
+      class C2Ext2 extends C2 {
+      }
+      const c2Ext2 = (await (async () => {const o = new C2Ext2(); await o.$inflight_init?.(); return o; })());
+      $helpers.assert($helpers.eq(c2Ext2.x, 1), "c2Ext2.x == 1");
+      class C2Ext3 extends C2 {
+        constructor(){
+          super();
+          this.super_$inflight_init = this.$inflight_init;
+          this.$inflight_init = async () => {
+            await this.super_$inflight_init?.();
+          }
+        }
+      }
+      const c2Ext3 = (await (async () => {const o = new C2Ext3(); await o.$inflight_init?.(); return o; })());
+      $helpers.assert($helpers.eq(c2Ext3.x, 1), "c2Ext3.x == 1");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $student_hrlyWage, $student_major, $student_name }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $c5 }) {
   class $Closure2 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -33,20 +75,22 @@ module.exports = function({ $student_hrlyWage, $student_major, $student_name })
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: student.name == \"Tom\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($student_name,"Tom")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: student.major == \"MySpace\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($student_major,"MySpace")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: student.hrlyWage == 38")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($student_hrlyWage,38)))};
+      $helpers.assert($helpers.eq($c5.x, 123), "c5.x == 123");
+      $helpers.assert($helpers.eq($c5.y, 321), "c5.y == 321");
+      (await $c5.set(111));
+      $helpers.assert($helpers.eq($c5.y, 111), "c5.y == 111");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $ta_hrlyWage }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $student_hrlyWage, $student_major, $student_name }) {
   class $Closure3 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -54,18 +98,21 @@ module.exports = function({ $ta_hrlyWage }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: ta.hrlyWage == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($ta_hrlyWage,10)))};
+      $helpers.assert($helpers.eq($student_name, "Tom"), "student.name == \"Tom\"");
+      $helpers.assert($helpers.eq($student_major, "MySpace"), "student.major == \"MySpace\"");
+      $helpers.assert($helpers.eq($student_hrlyWage, 38), "student.hrlyWage == 38");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $B }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $ta_hrlyWage }) {
   class $Closure4 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -73,18 +120,39 @@ module.exports = function({ $B }) {
       return $obj;
     }
     async handle() {
-      const b = (await (async () => {const o = new $B("ba"); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: b.sound == \"ba\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(b.sound,"ba")))};
+      $helpers.assert($helpers.eq($ta_hrlyWage, 10), "ta.hrlyWage == 10");
     }
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.A-1.js
-```js
+## inflight.$Closure5-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $B }) {
+  class $Closure5 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const b = (await (async () => {const o = new $B("ba"); await o.$inflight_init?.(); return o; })());
+      $helpers.assert($helpers.eq(b.sound, "ba"), "b.sound == \"ba\"");
+    }
+  }
+  return $Closure5;
+}
+//# sourceMappingURL=inflight.$Closure5-1.cjs.map
+```
+
+## inflight.A-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor(sound){
@@ -95,12 +163,13 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## inflight.B-1.js
-```js
+## inflight.B-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class B extends $A {
     constructor(sound){
@@ -113,12 +182,13 @@ module.exports = function({ $A }) {
   }
   return B;
 }
-//# sourceMappingURL=inflight.B-1.js.map
+//# sourceMappingURL=inflight.B-1.cjs.map
 ```
 
-## inflight.Bam-1.js
-```js
+## inflight.Bam-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Boom }) {
   class Bam extends $Boom {
     constructor({  }) {
@@ -127,12 +197,13 @@ module.exports = function({ $Boom }) {
   }
   return Bam;
 }
-//# sourceMappingURL=inflight.Bam-1.js.map
+//# sourceMappingURL=inflight.Bam-1.cjs.map
 ```
 
-## inflight.Bar-1.js
-```js
+## inflight.Bar-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Bar {
     constructor({  }) {
@@ -140,12 +211,13 @@ module.exports = function({  }) {
   }
   return Bar;
 }
-//# sourceMappingURL=inflight.Bar-1.js.map
+//# sourceMappingURL=inflight.Bar-1.cjs.map
 ```
 
-## inflight.Baz-1.js
-```js
+## inflight.Baz-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Bar }) {
   class Baz extends $Bar {
     constructor({  }) {
@@ -154,12 +226,13 @@ module.exports = function({ $Bar }) {
   }
   return Baz;
 }
-//# sourceMappingURL=inflight.Baz-1.js.map
+//# sourceMappingURL=inflight.Baz-1.cjs.map
 ```
 
-## inflight.Boom-1.js
-```js
+## inflight.Boom-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Boom {
     constructor({  }) {
@@ -167,12 +240,13 @@ module.exports = function({  }) {
   }
   return Boom;
 }
-//# sourceMappingURL=inflight.Boom-1.js.map
+//# sourceMappingURL=inflight.Boom-1.cjs.map
 ```
 
-## inflight.C1-1.js
-```js
+## inflight.C1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class C1 {
     constructor({  }) {
@@ -180,12 +254,58 @@ module.exports = function({  }) {
   }
   return C1;
 }
-//# sourceMappingURL=inflight.C1-1.js.map
+//# sourceMappingURL=inflight.C1-1.cjs.map
 ```
 
-## inflight.C2-1.js
-```js
+## inflight.C1Ext1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $C1 }) {
+  class C1Ext1 extends $C1 {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return C1Ext1;
+}
+//# sourceMappingURL=inflight.C1Ext1-1.cjs.map
+```
+
+## inflight.C1Ext2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $C1Ext1 }) {
+  class C1Ext2 extends $C1Ext1 {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return C1Ext2;
+}
+//# sourceMappingURL=inflight.C1Ext2-1.cjs.map
+```
+
+## inflight.C1Ext3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $C1Ext2 }) {
+  class C1Ext3 extends $C1Ext2 {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return C1Ext3;
+}
+//# sourceMappingURL=inflight.C1Ext3-1.cjs.map
+```
+
+## inflight.C2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class C2 {
     constructor({  }) {
@@ -193,12 +313,58 @@ module.exports = function({  }) {
   }
   return C2;
 }
-//# sourceMappingURL=inflight.C2-1.js.map
+//# sourceMappingURL=inflight.C2-1.cjs.map
+```
+
+## inflight.C2Ext1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $C2 }) {
+  class C2Ext1 extends $C2 {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return C2Ext1;
+}
+//# sourceMappingURL=inflight.C2Ext1-1.cjs.map
+```
+
+## inflight.C2Ext2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $C2 }) {
+  class C2Ext2 extends $C2 {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return C2Ext2;
+}
+//# sourceMappingURL=inflight.C2Ext2-1.cjs.map
+```
+
+## inflight.C2Ext3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $C2 }) {
+  class C2Ext3 extends $C2 {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return C2Ext3;
+}
+//# sourceMappingURL=inflight.C2Ext3-1.cjs.map
 ```
 
-## inflight.C3-1.js
-```js
+## inflight.C3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class C3 {
     constructor({  }) {
@@ -206,12 +372,13 @@ module.exports = function({  }) {
   }
   return C3;
 }
-//# sourceMappingURL=inflight.C3-1.js.map
+//# sourceMappingURL=inflight.C3-1.cjs.map
 ```
 
-## inflight.C4-1.js
-```js
+## inflight.C4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class C4 {
     constructor({  }) {
@@ -219,12 +386,13 @@ module.exports = function({  }) {
   }
   return C4;
 }
-//# sourceMappingURL=inflight.C4-1.js.map
+//# sourceMappingURL=inflight.C4-1.cjs.map
 ```
 
-## inflight.C5-1.js
-```js
+## inflight.C5-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class C5 {
     constructor({  }) {
@@ -239,12 +407,27 @@ module.exports = function({  }) {
   }
   return C5;
 }
-//# sourceMappingURL=inflight.C5-1.js.map
+//# sourceMappingURL=inflight.C5-1.cjs.map
+```
+
+## inflight.DocClass-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class DocClass {
+    constructor({  }) {
+    }
+  }
+  return DocClass;
+}
+//# sourceMappingURL=inflight.DocClass-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Bar }) {
   class Foo extends $Bar {
     constructor({  }) {
@@ -255,12 +438,13 @@ module.exports = function({ $Bar }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## inflight.PaidStudent-1.js
-```js
+## inflight.PaidStudent-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Student }) {
   class PaidStudent extends $Student {
     constructor({  }) {
@@ -269,12 +453,13 @@ module.exports = function({ $Student }) {
   }
   return PaidStudent;
 }
-//# sourceMappingURL=inflight.PaidStudent-1.js.map
+//# sourceMappingURL=inflight.PaidStudent-1.cjs.map
 ```
 
-## inflight.Person-1.js
-```js
+## inflight.Person-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Person {
     constructor({  }) {
@@ -282,12 +467,13 @@ module.exports = function({  }) {
   }
   return Person;
 }
-//# sourceMappingURL=inflight.Person-1.js.map
+//# sourceMappingURL=inflight.Person-1.cjs.map
 ```
 
-## inflight.Student-1.js
-```js
+## inflight.Student-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Person }) {
   class Student extends $Person {
     constructor({  }) {
@@ -296,12 +482,13 @@ module.exports = function({ $Person }) {
   }
   return Student;
 }
-//# sourceMappingURL=inflight.Student-1.js.map
+//# sourceMappingURL=inflight.Student-1.cjs.map
 ```
 
-## inflight.TeacherAid-1.js
-```js
+## inflight.TeacherAid-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $PaidStudent }) {
   class TeacherAid extends $PaidStudent {
     constructor({  }) {
@@ -310,7 +497,7 @@ module.exports = function({ $PaidStudent }) {
   }
   return TeacherAid;
 }
-//# sourceMappingURL=inflight.TeacherAid-1.js.map
+//# sourceMappingURL=inflight.TeacherAid-1.cjs.map
 ```
 
 ## main.tf.json
@@ -320,22 +507,9 @@ module.exports = function({ $PaidStudent }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -345,14 +519,16 @@ module.exports = function({ $PaidStudent }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -363,14 +539,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.C1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const C1Client = ${C1._toInflightType(this)};
+            const C1Client = ${C1._toInflightType()};
             const client = new C1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -378,8 +554,98 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class C1Ext1 extends C1 {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C1Ext1-1.cjs")({
+            $C1: ${$stdlib.core.liftObject(C1)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const C1Ext1Client = ${C1Ext1._toInflightType()};
+            const client = new C1Ext1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class C1Ext2 extends C1Ext1 {
+      constructor($scope, $id, ) {
+        super($scope, $id, );
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C1Ext2-1.cjs")({
+            $C1Ext1: ${$stdlib.core.liftObject(C1Ext1)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const C1Ext2Client = ${C1Ext2._toInflightType()};
+            const client = new C1Ext2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class C1Ext3 extends C1Ext2 {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C1Ext3-1.cjs")({
+            $C1Ext2: ${$stdlib.core.liftObject(C1Ext2)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const C1Ext3Client = ${C1Ext3._toInflightType()};
+            const client = new C1Ext3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class C2 extends $stdlib.std.Resource {
@@ -389,14 +655,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.C2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C2-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const C2Client = ${C2._toInflightType(this)};
+            const C2Client = ${C2._toInflightType()};
             const client = new C2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -404,8 +670,130 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class C2Ext1 extends C2 {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C2Ext1-1.cjs")({
+            $C2: ${$stdlib.core.liftObject(C2)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const C2Ext1Client = ${C2Ext1._toInflightType()};
+            const client = new C2Ext1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class C2Ext2 extends C2 {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C2Ext2-1.cjs")({
+            $C2: ${$stdlib.core.liftObject(C2)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const C2Ext2Client = ${C2Ext2._toInflightType()};
+            const client = new C2Ext2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class C2Ext3 extends C2 {
+      constructor($scope, $id, ) {
+        super($scope, $id, );
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C2Ext3-1.cjs")({
+            $C2: ${$stdlib.core.liftObject(C2)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const C2Ext3Client = ${C2Ext3._toInflightType()};
+            const client = new C2Ext3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class C3 extends $stdlib.std.Resource {
@@ -418,14 +806,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.C3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C3-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const C3Client = ${C3._toInflightType(this)};
+            const C3Client = ${C3._toInflightType()};
             const client = new C3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -433,27 +821,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class C4 extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
       }
-      static m() {
+      static m($scope) {
         return 1;
       }
       static _toInflightType() {
         return `
-          require("./inflight.C4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C4-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const C4Client = ${C4._toInflightType(this)};
+            const C4Client = ${C4._toInflightType()};
             const client = new C4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -461,8 +852,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class C5 extends $stdlib.std.Resource {
@@ -471,14 +865,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.C5-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C5-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const C5Client = ${C5._toInflightType(this)};
+            const C5Client = ${C5._toInflightType()};
             const client = new C5Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -486,19 +880,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "x", "y", "set", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "set": [
+          ],
+          "$inflight_init": [
+          ],
+          "x": [
+          ],
+          "y": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $c5: ${$stdlib.core.liftObject(c5)},
           })
         `;
@@ -506,22 +909,23 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
-            const client = new $Closure1Client({
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(c5, host, ["set", "x", "y"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [c5, [].concat(["x"], ["y"], ["set"])],
+          ],
+          "$inflight_init": [
+            [c5, []],
+          ],
+        });
       }
     }
     class Person extends $stdlib.std.Resource {
@@ -531,14 +935,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Person-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Person-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const PersonClient = ${Person._toInflightType(this)};
+            const PersonClient = ${Person._toInflightType()};
             const client = new PersonClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -546,8 +950,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Student extends Person {
@@ -557,7 +964,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Student-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Student-1.cjs")({
             $Person: ${$stdlib.core.liftObject(Person)},
           })
         `;
@@ -565,7 +972,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const StudentClient = ${Student._toInflightType(this)};
+            const StudentClient = ${Student._toInflightType()};
             const client = new StudentClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -573,8 +980,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class PaidStudent extends Student {
@@ -584,7 +994,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.PaidStudent-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.PaidStudent-1.cjs")({
             $Student: ${$stdlib.core.liftObject(Student)},
           })
         `;
@@ -592,7 +1002,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const PaidStudentClient = ${PaidStudent._toInflightType(this)};
+            const PaidStudentClient = ${PaidStudent._toInflightType()};
             const client = new PaidStudentClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -600,19 +1010,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $student_hrlyWage: ${$stdlib.core.liftObject(student.hrlyWage)},
             $student_major: ${$stdlib.core.liftObject(student.major)},
             $student_name: ${$stdlib.core.liftObject(student.name)},
@@ -622,24 +1035,27 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
-            const client = new $Closure2Client({
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(student.hrlyWage, host, []);
-          $Closure2._registerOnLiftObject(student.major, host, []);
-          $Closure2._registerOnLiftObject(student.name, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [student.hrlyWage, []],
+            [student.major, []],
+            [student.name, []],
+          ],
+          "$inflight_init": [
+            [student.hrlyWage, []],
+            [student.major, []],
+            [student.name, []],
+          ],
+        });
       }
     }
     class TeacherAid extends PaidStudent {
@@ -649,7 +1065,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.TeacherAid-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.TeacherAid-1.cjs")({
             $PaidStudent: ${$stdlib.core.liftObject(PaidStudent)},
           })
         `;
@@ -657,7 +1073,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const TeacherAidClient = ${TeacherAid._toInflightType(this)};
+            const TeacherAidClient = ${TeacherAid._toInflightType()};
             const client = new TeacherAidClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -665,19 +1081,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
             $ta_hrlyWage: ${$stdlib.core.liftObject(ta.hrlyWage)},
           })
         `;
@@ -685,22 +1104,23 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
-            const client = new $Closure3Client({
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(ta.hrlyWage, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [ta.hrlyWage, []],
+          ],
+          "$inflight_init": [
+            [ta.hrlyWage, []],
+          ],
+        });
       }
     }
     class A extends $stdlib.std.Resource {
@@ -709,14 +1129,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -724,14 +1144,14 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "sound", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          A._registerOnLiftObject(this, host, ["sound"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [this, ["sound"]],
+          ],
+          "sound": [
+          ],
+        });
       }
     }
     class B extends A {
@@ -740,7 +1160,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.B-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -748,7 +1168,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BClient = ${B._toInflightType(this)};
+            const BClient = ${B._toInflightType()};
             const client = new BClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -756,19 +1176,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure5 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure5-1.cjs")({
             $B: ${$stdlib.core.liftObject(B)},
           })
         `;
@@ -776,16 +1199,21 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
-            const client = new $Closure4Client({
+            const $Closure5Client = ${$Closure5._toInflightType()};
+            const client = new $Closure5Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Bar extends $stdlib.std.Resource {
@@ -794,14 +1222,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Bar-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BarClient = ${Bar._toInflightType(this)};
+            const BarClient = ${Bar._toInflightType()};
             const client = new BarClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -809,8 +1237,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Foo extends Bar {
@@ -819,7 +1250,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $Bar: ${$stdlib.core.liftObject(Bar)},
           })
         `;
@@ -827,7 +1258,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -835,8 +1266,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "doStuff", "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "doStuff": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Baz extends Bar {
@@ -845,7 +1281,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Baz-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Baz-1.cjs")({
             $Bar: ${$stdlib.core.liftObject(Bar)},
           })
         `;
@@ -853,7 +1289,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BazClient = ${Baz._toInflightType(this)};
+            const BazClient = ${Baz._toInflightType()};
             const client = new BazClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -861,8 +1297,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Boom extends $stdlib.std.Resource {
@@ -871,14 +1310,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Boom-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Boom-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BoomClient = ${Boom._toInflightType(this)};
+            const BoomClient = ${Boom._toInflightType()};
             const client = new BoomClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -886,8 +1325,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Bam extends Boom {
@@ -896,7 +1338,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Bam-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Bam-1.cjs")({
             $Boom: ${$stdlib.core.liftObject(Boom)},
           })
         `;
@@ -904,7 +1346,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BamClient = ${Bam._toInflightType(this)};
+            const BamClient = ${Bam._toInflightType()};
             const client = new BamClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -912,24 +1354,65 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class DocClass extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        this.docField = 0;
+      }
+      docMethod() {
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.DocClass-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const DocClassClient = ${DocClass._toInflightType()};
+            const client = new DocClassClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     new C1(this, "C1");
     const c2 = new C2(this, "C2");
-    {((cond) => {if (!cond) throw new Error("assertion failed: c2.x == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(c2.x,1)))};
+    $helpers.assert($helpers.eq(c2.x, 1), "c2.x == 1");
+    const c2Ext1 = new C2Ext1(this, "C2Ext1");
+    $helpers.assert($helpers.eq(c2Ext1.x, 1), "c2Ext1.x == 1");
+    const c2Ext2 = new C2Ext2(this, "C2Ext2");
+    $helpers.assert($helpers.eq(c2Ext2.x, 1), "c2Ext2.x == 1");
+    const c2Ext3 = new C2Ext3(this, "C2Ext3");
+    $helpers.assert($helpers.eq(c2Ext3.x, 1), "c2Ext3.x == 1");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight classes with no ctor or ctor args", new $Closure1(this, "$Closure1"));
     const c3 = new C3(this, "C3", 1, 2);
-    {((cond) => {if (!cond) throw new Error("assertion failed: c3.x == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(c3.x,1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: c3.y == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(c3.y,2)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: C4.m() == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((C4.m()),1)))};
+    $helpers.assert($helpers.eq(c3.x, 1), "c3.x == 1");
+    $helpers.assert($helpers.eq(c3.y, 2), "c3.y == 2");
+    $helpers.assert($helpers.eq((C4.m(this)), 1), "C4.m() == 1");
     const c5 = new C5(this, "C5");
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:access inflight field", new $Closure1(this, "$Closure1"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:access inflight field", new $Closure2(this, "$Closure2"));
     const student = new PaidStudent(this, "PaidStudent", "Tom", "MySpace", 38);
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:check derived class instance variables", new $Closure2(this, "$Closure2"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:check derived class instance variables", new $Closure3(this, "$Closure3"));
     const ta = new TeacherAid(this, "TeacherAid", "John", "Rock'n Roll", 50);
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:devived class init body happens after super", new $Closure3(this, "$Closure3"));
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight super constructor", new $Closure4(this, "$Closure4"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:devived class init body happens after super", new $Closure4(this, "$Closure4"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight super constructor", new $Closure5(this, "$Closure5"));
     new Foo(this, "Foo");
     new Baz(this, "Baz");
   }
@@ -937,6 +1420,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "class.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_test_sim.md
index 551c628346b..adce05065dc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/class.test.w_test_sim.md
@@ -2,13 +2,14 @@
 
 ## stdout.log
 ```log
-pass ─ class.test.wsim » root/env0/test:access inflight field                      
-pass ─ class.test.wsim » root/env1/test:check derived class instance variables     
-pass ─ class.test.wsim » root/env2/test:devived class init body happens after super
-pass ─ class.test.wsim » root/env3/test:inflight super constructor                 
- 
- 
-Tests 4 passed (4)
+pass ─ class.test.wsim » root/env0/test:inflight classes with no ctor or ctor args 
+pass ─ class.test.wsim » root/env1/test:access inflight field                      
+pass ─ class.test.wsim » root/env2/test:check derived class instance variables     
+pass ─ class.test.wsim » root/env3/test:devived class init body happens after super
+pass ─ class.test.wsim » root/env4/test:inflight super constructor                 
+
+Tests 5 passed (5)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_compile_tf-aws.md
index ee7308f5822..a979018aad0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [closure_class.test.w](../../../../../examples/tests/valid/closure_class.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fn }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,18 +12,19 @@ module.exports = function({ $fn }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: fn() == 42")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $fn()),42)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: fn.another() == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $fn.another()),"hello")))};
+      $helpers.assert($helpers.eq((await $fn()), 42), "fn() == 42");
+      $helpers.assert($helpers.eq((await $fn.another()), "hello"), "fn.another() == \"hello\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyClosure-1.js
-```js
+## inflight.MyClosure-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyClosure {
     constructor({  }) {
@@ -39,7 +41,7 @@ module.exports = function({  }) {
   }
   return MyClosure;
 }
-//# sourceMappingURL=inflight.MyClosure-1.js.map
+//# sourceMappingURL=inflight.MyClosure-1.cjs.map
 ```
 
 ## main.tf.json
@@ -49,22 +51,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -74,32 +63,34 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class MyClosure extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyClosure-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyClosure-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyClosureClient = ${MyClosure._toInflightType(this)};
+            const MyClosureClient = ${MyClosure._toInflightType()};
             const client = new MyClosureClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -107,19 +98,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "another", "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "another": [
+          ],
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $fn: ${$stdlib.core.liftObject(fn)},
           })
         `;
@@ -127,7 +125,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -135,14 +133,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(fn, host, ["another", "handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, [].concat(["handle"], ["another"])],
+          ],
+          "$inflight_init": [
+            [fn, []],
+          ],
+        });
       }
     }
     const fn = new MyClosure(this, "MyClosure");
@@ -152,6 +151,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "closure_class.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_test_sim.md
index a5e02056376..6dbc1097b61 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/closure_class.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ closure_class.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_compile_tf-aws.md
index f477d77e62b..113c2ed00c5 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [construct-base.test.w](../../../../../examples/tests/valid/construct-base.test.w) | compile | tf-aws
 
-## inflight.WingResource-1.js
-```js
+## inflight.WingResource-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class WingResource {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return WingResource;
 }
-//# sourceMappingURL=inflight.WingResource-1.js.map
+//# sourceMappingURL=inflight.WingResource-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -44,11 +32,11 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_sqs_queue": {
-      "awssqsQueueSqsQueue": {
+      "SqsQueue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/aws.sqsQueue.SqsQueue",
-            "uniqueId": "awssqsQueueSqsQueue"
+            "path": "root/Default/Default/SqsQueue",
+            "uniqueId": "SqsQueue"
           }
         }
       }
@@ -57,14 +45,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const cx = require("constructs");
 const aws = require("@cdktf/provider-aws");
@@ -74,18 +64,18 @@ class $Root extends $stdlib.std.Resource {
     class WingResource extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        {console.log(String.raw({ raw: ["my id is ", ""] }, this.node.id))};
+        console.log(String.raw({ raw: ["my id is ", ""] }, $helpers.nodeof(this).id));
       }
       static _toInflightType() {
         return `
-          require("./inflight.WingResource-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.WingResource-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const WingResourceClient = ${WingResource._toInflightType(this)};
+            const WingResourceClient = ${WingResource._toInflightType()};
             const client = new WingResourceClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -93,28 +83,32 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const getPath = ((c) => {
-      return c.node.path;
+      return $helpers.nodeof(c).path;
     });
     const getDisplayName = ((r) => {
-      return (std.Node.of(r)).title;
+      return $helpers.nodeof(r).title;
     });
-    const q = this.node.root.new("@cdktf/provider-aws.sqsQueue.SqsQueue", aws.sqsQueue.SqsQueue, this, "aws.sqsQueue.SqsQueue");
+    const q = this.node.root.new("@cdktf/provider-aws.sqsQueue.SqsQueue", aws.sqsQueue.SqsQueue, this, "SqsQueue");
     const wr = new WingResource(this, "WingResource");
     const another_resource = wr;
-    {console.log(String.raw({ raw: ["path of sqs.queue: ", ""] }, (getPath(q))))};
-    {console.log(String.raw({ raw: ["path of wing resource: ", ""] }, (getPath(wr))))};
+    console.log(String.raw({ raw: ["path of sqs.queue: ", ""] }, (getPath(q))));
+    console.log(String.raw({ raw: ["path of wing resource: ", ""] }, (getPath(wr))));
     const title = ((getDisplayName(wr)) ?? "no display name");
-    {console.log(String.raw({ raw: ["display name of wing resource: ", ""] }, title))};
+    console.log(String.raw({ raw: ["display name of wing resource: ", ""] }, title));
+    console.log((cx.Node.of(wr)).path);
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "construct-base.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_test_sim.md
index 53c7c8f3103..11fbcf2067e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/construct-base.test.w_test_sim.md
@@ -3,13 +3,14 @@
 ## stdout.log
 ```log
 my id is WingResource
-path of sqs.queue: root/env0/aws.sqsQueue.SqsQueue
+path of sqs.queue: root/env0/SqsQueue
 path of wing resource: root/env0/WingResource
 display name of wing resource: no display name
+root/env0/WingResource
 pass ─ construct-base.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_compile_tf-aws.md
index 6e6a9a85c6d..34176ad7a2a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -66,14 +53,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -82,115 +71,115 @@ class $Root extends $stdlib.std.Resource {
     const bucket2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "bucket2");
     const bucket3 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "bucket3");
     const emptyArray = [];
-    {((cond) => {if (!cond) throw new Error("assertion failed: emptyArray.length == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(emptyArray.length,0)))};
+    $helpers.assert($helpers.eq(emptyArray.length, 0), "emptyArray.length == 0");
     const emptyArray2 = [];
-    {((cond) => {if (!cond) throw new Error("assertion failed: emptyArray2.length == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(emptyArray2.length,0)))};
+    $helpers.assert($helpers.eq(emptyArray2.length, 0), "emptyArray2.length == 0");
     const arr1 = [1, 2, 3];
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr1.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr1.length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr1.at(1) == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr1, 1),2)))};
+    $helpers.assert($helpers.eq(arr1.length, 3), "arr1.length == 3");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr1, 1), 2), "arr1.at(1) == 2");
     const arr2 = ["1", "2", "3"];
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr2.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr2.length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr2.at(1) == \"2\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr2, 1),"2")))};
+    $helpers.assert($helpers.eq(arr2.length, 3), "arr2.length == 3");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr2, 1), "2"), "arr2.at(1) == \"2\"");
     const arr3 = [1, 2, 3];
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr3.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr3.length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr3.at(1) == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr3, 1),2)))};
+    $helpers.assert($helpers.eq(arr3.length, 3), "arr3.length == 3");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr3, 1), 2), "arr3.at(1) == 2");
     const arr4 = [1, 2, 3];
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr4.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr4.length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr4.at(1) == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr4, 1),2)))};
+    $helpers.assert($helpers.eq(arr4.length, 3), "arr4.length == 3");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr4, 1), 2), "arr4.at(1) == 2");
     const arr5 = [bucket1, bucket2, bucket3];
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr5.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr5.length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr5.at(1) == bucket2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr5, 1),bucket2)))};
+    $helpers.assert($helpers.eq(arr5.length, 3), "arr5.length == 3");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr5, 1), bucket2), "arr5.at(1) == bucket2");
     const arr6 = [bucket1, bucket2, bucket3];
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr6.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr6.length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr6.at(1) == bucket2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr6, 1),bucket2)))};
+    $helpers.assert($helpers.eq(arr6.length, 3), "arr6.length == 3");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr6, 1), bucket2), "arr6.at(1) == bucket2");
     const arr7 = arr4;
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr7.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr7.length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr7.at(1) == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr7, 1),2)))};
+    $helpers.assert($helpers.eq(arr7.length, 3), "arr7.length == 3");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr7, 1), 2), "arr7.at(1) == 2");
     {
-      const $if_let_value = (emptyArray.at(0));
+      const $if_let_value = emptyArray.at(0);
       if ($if_let_value != undefined) {
         const val = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
-      const $if_let_value = (arr1.at(0));
+      const $if_let_value = arr1.at(0);
       if ($if_let_value != undefined) {
         const val = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: val == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(val,1)))};
+        $helpers.assert($helpers.eq(val, 1), "val == 1");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     const emptyMap = ({});
-    {((cond) => {if (!cond) throw new Error("assertion failed: emptyMap.size() == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(emptyMap).length,0)))};
+    $helpers.assert($helpers.eq(Object.keys(emptyMap).length, 0), "emptyMap.size() == 0");
     const emptyMap2 = ({});
-    {((cond) => {if (!cond) throw new Error("assertion failed: emptyMap2.size() == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(emptyMap2).length,0)))};
+    $helpers.assert($helpers.eq(Object.keys(emptyMap2).length, 0), "emptyMap2.size() == 0");
     const m1 = ({["a"]: 1, ["b"]: 2, ["c"]: 3});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m1.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m1).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m1.get(\"b\") == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m1, "b"),2)))};
+    $helpers.assert($helpers.eq(Object.keys(m1).length, 3), "m1.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m1, "b"), 2), "m1.get(\"b\") == 2");
     const m2 = ({["a"]: 1, ["b"]: 2, ["c"]: 3});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m2.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m2).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m2.get(\"b\") == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m2, "b"),2)))};
+    $helpers.assert($helpers.eq(Object.keys(m2).length, 3), "m2.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m2, "b"), 2), "m2.get(\"b\") == 2");
     const m3 = ({["a"]: 1, ["b"]: 2, ["c"]: 3});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m3.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m3).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m3.get(\"b\") == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m3, "b"),2)))};
+    $helpers.assert($helpers.eq(Object.keys(m3).length, 3), "m3.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m3, "b"), 2), "m3.get(\"b\") == 2");
     const m4 = ({["a"]: 1, ["b"]: 2, ["c"]: 3});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m4.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m4).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m4.get(\"b\") == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m4, "b"),2)))};
+    $helpers.assert($helpers.eq(Object.keys(m4).length, 3), "m4.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m4, "b"), 2), "m4.get(\"b\") == 2");
     const m5 = ({["a"]: bucket1, ["b"]: bucket2, ["c"]: bucket3});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m5.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m5).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m5.get(\"b\") == bucket2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m5, "b"),bucket2)))};
+    $helpers.assert($helpers.eq(Object.keys(m5).length, 3), "m5.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m5, "b"), bucket2), "m5.get(\"b\") == bucket2");
     const m6 = ({["a"]: bucket1, ["b"]: bucket2, ["c"]: bucket3});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m6.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m6).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m6.get(\"b\") == bucket2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m6, "b"),bucket2)))};
+    $helpers.assert($helpers.eq(Object.keys(m6).length, 3), "m6.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m6, "b"), bucket2), "m6.get(\"b\") == bucket2");
     const m7 = m1;
-    {((cond) => {if (!cond) throw new Error("assertion failed: m7.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m7).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m7.get(\"b\") == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m7, "b"),2)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m7.has(\"b\")")})(("b" in (m7)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m4.has(\"boom\") == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(("boom" in (m4)),false)))};
+    $helpers.assert($helpers.eq(Object.keys(m7).length, 3), "m7.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m7, "b"), 2), "m7.get(\"b\") == 2");
+    $helpers.assert(("b" in (m7)), "m7.has(\"b\")");
+    $helpers.assert($helpers.eq(("boom" in (m4)), false), "m4.has(\"boom\") == false");
     const m8 = ({["a"]: "a1", ["b"]: "b1", ["c"]: "c1"});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m8.keys().at(0) == \"a\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m8), 0),"a")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m8.keys().at(1) == \"b\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m8), 1),"b")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m8.keys().at(2) == \"c\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m8), 2),"c")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m8.values().at(0) == \"a1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m8), 0),"a1")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m8.values().at(1) == \"b1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m8), 1),"b1")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m8.values().at(2) == \"c1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m8), 2),"c1")))};
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m8), 0), "a"), "m8.keys().at(0) == \"a\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m8), 1), "b"), "m8.keys().at(1) == \"b\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m8), 2), "c"), "m8.keys().at(2) == \"c\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m8), 0), "a1"), "m8.values().at(0) == \"a1\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m8), 1), "b1"), "m8.values().at(1) == \"b1\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m8), 2), "c1"), "m8.values().at(2) == \"c1\"");
     for (const val of Object.keys(m8)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: !val.endsWith(\"1\")")})((!val.endsWith("1")))};
+      $helpers.assert((!val.endsWith("1")), "!val.endsWith(\"1\")");
     }
     for (const val of Object.values(m8)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: val.endsWith(\"1\")")})(val.endsWith("1"))};
+      $helpers.assert(val.endsWith("1"), "val.endsWith(\"1\")");
     }
     const m9 = ({["a"]: "a1", ["b"]: "b1", ["c"]: "c1"});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m9.keys().at(0) == \"a\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m9), 0),"a")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m9.keys().at(1) == \"b\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m9), 1),"b")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m9.keys().at(2) == \"c\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m9), 2),"c")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m9.values().at(0) == \"a1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m9), 0),"a1")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m9.values().at(1) == \"b1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m9), 1),"b1")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m9.values().at(2) == \"c1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m9), 2),"c1")))};
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m9), 0), "a"), "m9.keys().at(0) == \"a\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m9), 1), "b"), "m9.keys().at(1) == \"b\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.keys(m9), 2), "c"), "m9.keys().at(2) == \"c\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m9), 0), "a1"), "m9.values().at(0) == \"a1\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m9), 1), "b1"), "m9.values().at(1) == \"b1\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(Object.values(m9), 2), "c1"), "m9.values().at(2) == \"c1\"");
     for (const val of Object.keys(m9)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: !val.endsWith(\"1\")")})((!val.endsWith("1")))};
+      $helpers.assert((!val.endsWith("1")), "!val.endsWith(\"1\")");
     }
     for (const val of Object.values(m9)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: val.endsWith(\"1\")")})(val.endsWith("1"))};
+      $helpers.assert(val.endsWith("1"), "val.endsWith(\"1\")");
     }
     {
       const $if_let_value = (m9)["a"];
       if ($if_let_value != undefined) {
         const k = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: k == \"a1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(k,"a1")))};
+        $helpers.assert($helpers.eq(k, "a1"), "k == \"a1\"");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
       const $if_let_value = (m9)["def-fake"];
       if ($if_let_value != undefined) {
         const k = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     try {
@@ -198,40 +187,40 @@ class $Root extends $stdlib.std.Resource {
     }
     catch ($error_err) {
       const err = $error_err.message;
-      {((cond) => {if (!cond) throw new Error("assertion failed: err.contains(\"does not contain key: \\\"def-fake\\\"\")")})(err.includes("does not contain key: \"def-fake\""))};
+      $helpers.assert(err.includes("does not contain key: \"def-fake\""), "err.contains(\"does not contain key: \\\"def-fake\\\"\")");
     }
     const num9 = 9;
     const m10 = ({["a"]: 1, ["a"]: 2, [String.raw({ raw: ["", ""] }, (num9 + 1))]: 9, [String.raw({ raw: ["", ""] }, (num9 + 1))]: 10, [((() => {
       return String.raw({ raw: ["", "9"] }, num9);
     })())]: 99});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m10.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m10).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m10.get(\"a\") == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m10, "a"),2)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m10.get(\"10\") == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m10, "10"),10)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m10.get(\"99\") == 99")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m10, "99"),99)))};
+    $helpers.assert($helpers.eq(Object.keys(m10).length, 3), "m10.size() == 3");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m10, "a"), 2), "m10.get(\"a\") == 2");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m10, "10"), 10), "m10.get(\"10\") == 10");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(m10, "99"), 99), "m10.get(\"99\") == 99");
     const emptySet = new Set([]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: emptySet.size == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(emptySet.size,0)))};
+    $helpers.assert($helpers.eq(emptySet.size, 0), "emptySet.size == 0");
     const emptySet2 = new Set([]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: emptySet2.size == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(emptySet2.size,0)))};
+    $helpers.assert($helpers.eq(emptySet2.size, 0), "emptySet2.size == 0");
     const s2 = new Set([1, 2, 3]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: s2.size == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s2.size,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s2.has(1)")})((s2.has(1)))};
+    $helpers.assert($helpers.eq(s2.size, 3), "s2.size == 3");
+    $helpers.assert((s2.has(1)), "s2.has(1)");
     const s3 = new Set([1, 2, 3]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: s3.size == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s3.size,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s3.has(1)")})((s3.has(1)))};
+    $helpers.assert($helpers.eq(s3.size, 3), "s3.size == 3");
+    $helpers.assert((s3.has(1)), "s3.has(1)");
     const s4 = new Set([1, 2, 3]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: s4.size == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s4.size,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s4.has(1)")})((s4.has(1)))};
+    $helpers.assert($helpers.eq(s4.size, 3), "s4.size == 3");
+    $helpers.assert((s4.has(1)), "s4.has(1)");
     const s6 = new Set([bucket1, bucket2, bucket3]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: s6.size == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s6.size,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s6.has(bucket2)")})((s6.has(bucket2)))};
+    $helpers.assert($helpers.eq(s6.size, 3), "s6.size == 3");
+    $helpers.assert((s6.has(bucket2)), "s6.has(bucket2)");
     const s7 = s2;
-    {((cond) => {if (!cond) throw new Error("assertion failed: s7.size == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s7.size,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s7.has(1)")})((s7.has(1)))};
+    $helpers.assert($helpers.eq(s7.size, 3), "s7.size == 3");
+    $helpers.assert((s7.has(1)), "s7.has(1)");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "container_types.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_test_sim.md
index fca30effad7..782c73d1ef4 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/container_types.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ container_types.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_compile_tf-aws.md
index 80a886678b8..c52158d6b98 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [custom_obj_id.test.w](../../../../../examples/tests/valid/custom_obj_id.test.w) | compile | tf-aws
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -45,14 +33,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -62,14 +52,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -77,19 +67,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const foo1 = new Foo(this, "Foo");
     const bar2 = new Foo(this, "bar2");
-    {((cond) => {if (!cond) throw new Error("assertion failed: foo1.node.id == \"Foo\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(foo1.node.id,"Foo")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: bar2.node.id == \"bar2\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(bar2.node.id,"bar2")))};
+    $helpers.assert($helpers.eq($helpers.nodeof(foo1).id, "Foo"), "nodeof(foo1).id == \"Foo\"");
+    $helpers.assert($helpers.eq($helpers.nodeof(bar2).id, "bar2"), "nodeof(bar2).id == \"bar2\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "custom_obj_id.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_test_sim.md
index 085bc430315..72647da0401 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/custom_obj_id.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ custom_obj_id.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_compile_tf-aws.md
index edb8252a31d..25341c9e579 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [debug_env.test.w](../../../../../examples/tests/valid/debug_env.test.w) | compile | tf-aws
 
-## inflight.A-1.js
-```js
+## inflight.A-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -45,14 +33,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -60,18 +50,18 @@ class $Root extends $stdlib.std.Resource {
     class A extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -79,8 +69,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
   }
@@ -88,6 +81,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "debug_env.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_test_sim.md
index dfc5e12e7bf..22535dcf374 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/debug_env.test.w_test_sim.md
@@ -4,15 +4,15 @@
 ```log
 [symbol environment at debug_env.test.w:7:5]
 level 0: { this => A }
-level 1: { A => A [type], assert => (condition: bool): void, cloud => cloud [namespace], log => (message: str): void, std => std [namespace], unsafeCast => (value: any): any }
+level 1: { A => A [type], assert => (condition: bool, message: str?): void, cloud => cloud [namespace], log => (value: stringable): void, nodeof => preflight (construct: IConstruct): Node, std => std [namespace], this => Construct, unsafeCast => (value: any): any }
 ```
 
 ## stdout.log
 ```log
 pass ─ debug_env.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_compile_tf-aws.md
index dd20a9b8d23..812670d01cf 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [deep_equality.test.w](../../../../../examples/tests/valid/deep_equality.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $numA, $numB, $strA, $strB }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,21 +12,22 @@ module.exports = function({ $numA, $numB, $strA, $strB }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: numA == numA")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($numA,$numA)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: numA == numB")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($numA,$numB)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: strA == strA")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($strA,$strA)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: strA == strB")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($strA,$strB)))};
+      $helpers.assert($helpers.eq($numA, $numA), "numA == numA");
+      $helpers.assert($helpers.eq($numA, $numB), "numA == numB");
+      $helpers.assert($helpers.eq($strA, $strA), "strA == strA");
+      $helpers.assert($helpers.eq($strA, $strB), "strA == strB");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure10-1.js
-```js
+## inflight.$Closure10-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $arrayA, $arrayB, $arrayC }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $arrayA, $arrayB }) {
   class $Closure10 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -33,19 +35,20 @@ module.exports = function({ $arrayA, $arrayB, $arrayC }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: arrayA != arrayC")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($arrayA,$arrayC)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: !(arrayA != arrayB)")})((!(((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($arrayA,$arrayB))))};
+      $helpers.assert($helpers.eq($arrayA, $arrayA), "arrayA == arrayA");
+      $helpers.assert($helpers.eq($arrayA, $arrayB), "arrayA == arrayB");
     }
   }
   return $Closure10;
 }
-//# sourceMappingURL=inflight.$Closure10-1.js.map
+//# sourceMappingURL=inflight.$Closure10-1.cjs.map
 ```
 
-## inflight.$Closure11-1.js
-```js
+## inflight.$Closure11-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $cat1, $cat2 }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $arrayA, $arrayB, $arrayC }) {
   class $Closure11 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -53,19 +56,20 @@ module.exports = function({ $cat1, $cat2 }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: cat1 == cat1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($cat1,$cat1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: cat1 == cat2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($cat1,$cat2)))};
+      $helpers.assert($helpers.neq($arrayA, $arrayC), "arrayA != arrayC");
+      $helpers.assert((!$helpers.neq($arrayA, $arrayB)), "!(arrayA != arrayB)");
     }
   }
   return $Closure11;
 }
-//# sourceMappingURL=inflight.$Closure11-1.js.map
+//# sourceMappingURL=inflight.$Closure11-1.cjs.map
 ```
 
-## inflight.$Closure12-1.js
-```js
+## inflight.$Closure12-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $cat1, $cat2, $cat3 }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $cat1, $cat2 }) {
   class $Closure12 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -73,18 +77,40 @@ module.exports = function({ $cat1, $cat2, $cat3 }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: cat1 != cat3")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($cat1,$cat3)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: !(cat1 != cat2)")})((!(((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($cat1,$cat2))))};
+      $helpers.assert($helpers.eq($cat1, $cat1), "cat1 == cat1");
+      $helpers.assert($helpers.eq($cat1, $cat2), "cat1 == cat2");
     }
   }
   return $Closure12;
 }
-//# sourceMappingURL=inflight.$Closure12-1.js.map
+//# sourceMappingURL=inflight.$Closure12-1.cjs.map
+```
+
+## inflight.$Closure13-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $cat1, $cat2, $cat3 }) {
+  class $Closure13 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.neq($cat1, $cat3), "cat1 != cat3");
+      $helpers.assert((!$helpers.neq($cat1, $cat2)), "!(cat1 != cat2)");
+    }
+  }
+  return $Closure13;
+}
+//# sourceMappingURL=inflight.$Closure13-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $numA, $numC, $strA, $strC }) {
   class $Closure2 {
     constructor({  }) {
@@ -93,18 +119,19 @@ module.exports = function({ $numA, $numC, $strA, $strC }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: numA != numC")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($numA,$numC)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: strA != strC")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($strA,$strC)))};
+      $helpers.assert($helpers.neq($numA, $numC), "numA != numC");
+      $helpers.assert($helpers.neq($strA, $strC), "strA != strC");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $jsonA, $jsonB }) {
   class $Closure3 {
     constructor({  }) {
@@ -113,18 +140,19 @@ module.exports = function({ $jsonA, $jsonB }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: jsonA == jsonA")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($jsonA,$jsonA)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: jsonA == jsonB")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($jsonA,$jsonB)))};
+      $helpers.assert($helpers.eq($jsonA, $jsonA), "jsonA == jsonA");
+      $helpers.assert($helpers.eq($jsonA, $jsonB), "jsonA == jsonB");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $jsonA, $jsonB, $jsonC }) {
   class $Closure4 {
     constructor({  }) {
@@ -133,19 +161,20 @@ module.exports = function({ $jsonA, $jsonB, $jsonC }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: jsonA != jsonC")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($jsonA,$jsonC)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: !(jsonA != jsonB)")})((!(((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($jsonA,$jsonB))))};
+      $helpers.assert($helpers.neq($jsonA, $jsonC), "jsonA != jsonC");
+      $helpers.assert((!$helpers.neq($jsonA, $jsonB)), "!(jsonA != jsonB)");
     }
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.$Closure5-1.js
-```js
+## inflight.$Closure5-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $setA, $setB }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $std_Json }) {
   class $Closure5 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -153,19 +182,20 @@ module.exports = function({ $setA, $setB }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: setA == setA")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($setA,$setA)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: setA == setB")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($setA,$setB)))};
+      const j = ({"hello": 123, "world": [1, 2, 3]});
+      $helpers.assert($helpers.eq(Object.values(j), [123, [1, 2, 3]]), "Json.values(j) == [Json 123, Json [1, 2, 3]]");
     }
   }
   return $Closure5;
 }
-//# sourceMappingURL=inflight.$Closure5-1.js.map
+//# sourceMappingURL=inflight.$Closure5-1.cjs.map
 ```
 
-## inflight.$Closure6-1.js
-```js
+## inflight.$Closure6-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $setA, $setB, $setC }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $setA, $setB }) {
   class $Closure6 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -173,19 +203,20 @@ module.exports = function({ $setA, $setB, $setC }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: setA != setC")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($setA,$setC)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: !(setA != setB)")})((!(((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($setA,$setB))))};
+      $helpers.assert($helpers.eq($setA, $setA), "setA == setA");
+      $helpers.assert($helpers.eq($setA, $setB), "setA == setB");
     }
   }
   return $Closure6;
 }
-//# sourceMappingURL=inflight.$Closure6-1.js.map
+//# sourceMappingURL=inflight.$Closure6-1.cjs.map
 ```
 
-## inflight.$Closure7-1.js
-```js
+## inflight.$Closure7-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $mapA, $mapB }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $setA, $setB, $setC }) {
   class $Closure7 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -193,19 +224,20 @@ module.exports = function({ $mapA, $mapB }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: mapA == mapA")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($mapA,$mapA)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: mapA == mapB")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($mapA,$mapB)))};
+      $helpers.assert($helpers.neq($setA, $setC), "setA != setC");
+      $helpers.assert((!$helpers.neq($setA, $setB)), "!(setA != setB)");
     }
   }
   return $Closure7;
 }
-//# sourceMappingURL=inflight.$Closure7-1.js.map
+//# sourceMappingURL=inflight.$Closure7-1.cjs.map
 ```
 
-## inflight.$Closure8-1.js
-```js
+## inflight.$Closure8-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $mapA, $mapB, $mapC }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $mapA, $mapB }) {
   class $Closure8 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -213,19 +245,20 @@ module.exports = function({ $mapA, $mapB, $mapC }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: mapA != mapC")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($mapA,$mapC)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: !(mapA != mapB)")})((!(((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })($mapA,$mapB))))};
+      $helpers.assert($helpers.eq($mapA, $mapA), "mapA == mapA");
+      $helpers.assert($helpers.eq($mapA, $mapB), "mapA == mapB");
     }
   }
   return $Closure8;
 }
-//# sourceMappingURL=inflight.$Closure8-1.js.map
+//# sourceMappingURL=inflight.$Closure8-1.cjs.map
 ```
 
-## inflight.$Closure9-1.js
-```js
+## inflight.$Closure9-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $arrayA, $arrayB }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $mapA, $mapB, $mapC }) {
   class $Closure9 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -233,13 +266,13 @@ module.exports = function({ $arrayA, $arrayB }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: arrayA == arrayA")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($arrayA,$arrayA)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: arrayA == arrayB")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($arrayA,$arrayB)))};
+      $helpers.assert($helpers.neq($mapA, $mapC), "mapA != mapC");
+      $helpers.assert((!$helpers.neq($mapA, $mapB)), "!(mapA != mapB)");
     }
   }
   return $Closure9;
 }
-//# sourceMappingURL=inflight.$Closure9-1.js.map
+//# sourceMappingURL=inflight.$Closure9-1.cjs.map
 ```
 
 ## main.tf.json
@@ -249,22 +282,9 @@ module.exports = function({ $arrayA, $arrayB }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -274,26 +294,28 @@ module.exports = function({ $arrayA, $arrayB }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $numA: ${$stdlib.core.liftObject(numA)},
             $numB: ${$stdlib.core.liftObject(numB)},
             $strA: ${$stdlib.core.liftObject(strA)},
@@ -304,7 +326,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -312,28 +334,32 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(numA, host, []);
-          $Closure1._registerOnLiftObject(numB, host, []);
-          $Closure1._registerOnLiftObject(strA, host, []);
-          $Closure1._registerOnLiftObject(strB, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [numA, []],
+            [numB, []],
+            [strA, []],
+            [strB, []],
+          ],
+          "$inflight_init": [
+            [numA, []],
+            [numB, []],
+            [strA, []],
+            [strB, []],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $numA: ${$stdlib.core.liftObject(numA)},
             $numC: ${$stdlib.core.liftObject(numC)},
             $strA: ${$stdlib.core.liftObject(strA)},
@@ -344,7 +370,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -352,28 +378,32 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(numA, host, []);
-          $Closure2._registerOnLiftObject(numC, host, []);
-          $Closure2._registerOnLiftObject(strA, host, []);
-          $Closure2._registerOnLiftObject(strC, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [numA, []],
+            [numC, []],
+            [strA, []],
+            [strC, []],
+          ],
+          "$inflight_init": [
+            [numA, []],
+            [numC, []],
+            [strA, []],
+            [strC, []],
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $jsonA: ${$stdlib.core.liftObject(jsonA)},
             $jsonB: ${$stdlib.core.liftObject(jsonB)},
           })
@@ -382,7 +412,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -390,26 +420,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(jsonA, host, []);
-          $Closure3._registerOnLiftObject(jsonB, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [jsonA, []],
+            [jsonB, []],
+          ],
+          "$inflight_init": [
+            [jsonA, []],
+            [jsonB, []],
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
             $jsonA: ${$stdlib.core.liftObject(jsonA)},
             $jsonB: ${$stdlib.core.liftObject(jsonB)},
             $jsonC: ${$stdlib.core.liftObject(jsonC)},
@@ -419,7 +451,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -427,36 +459,38 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure4._registerOnLiftObject(jsonA, host, []);
-          $Closure4._registerOnLiftObject(jsonB, host, []);
-          $Closure4._registerOnLiftObject(jsonC, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure5 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [jsonA, []],
+            [jsonB, []],
+            [jsonC, []],
+          ],
+          "$inflight_init": [
+            [jsonA, []],
+            [jsonB, []],
+            [jsonC, []],
+          ],
+        });
+      }
+    }
+    class $Closure5 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure5-1.js")({
-            $setA: ${$stdlib.core.liftObject(setA)},
-            $setB: ${$stdlib.core.liftObject(setB)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure5-1.cjs")({
+            $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure5Client = ${$Closure5._toInflightType(this)};
+            const $Closure5Client = ${$Closure5._toInflightType()};
             const client = new $Closure5Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -464,36 +498,33 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure5._registerOnLiftObject(setA, host, []);
-          $Closure5._registerOnLiftObject(setB, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure6 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure6 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure6-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure6-1.cjs")({
             $setA: ${$stdlib.core.liftObject(setA)},
             $setB: ${$stdlib.core.liftObject(setB)},
-            $setC: ${$stdlib.core.liftObject(setC)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure6Client = ${$Closure6._toInflightType(this)};
+            const $Closure6Client = ${$Closure6._toInflightType()};
             const client = new $Closure6Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -501,27 +532,69 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+            [setA, []],
+            [setB, []],
+          ],
+          "$inflight_init": [
+            [setA, []],
+            [setB, []],
+          ],
+        });
+      }
+    }
+    class $Closure7 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure6._registerOnLiftObject(setA, host, []);
-          $Closure6._registerOnLiftObject(setB, host, []);
-          $Closure6._registerOnLiftObject(setC, host, []);
-        }
-        super._registerOnLift(host, ops);
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure7-1.cjs")({
+            $setA: ${$stdlib.core.liftObject(setA)},
+            $setB: ${$stdlib.core.liftObject(setB)},
+            $setC: ${$stdlib.core.liftObject(setC)},
+          })
+        `;
       }
-    }
-    class $Closure7 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure7Client = ${$Closure7._toInflightType()};
+            const client = new $Closure7Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [setA, []],
+            [setB, []],
+            [setC, []],
+          ],
+          "$inflight_init": [
+            [setA, []],
+            [setB, []],
+            [setC, []],
+          ],
+        });
+      }
+    }
+    class $Closure8 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure7-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure8-1.cjs")({
             $mapA: ${$stdlib.core.liftObject(mapA)},
             $mapB: ${$stdlib.core.liftObject(mapB)},
           })
@@ -530,34 +603,36 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure7Client = ${$Closure7._toInflightType(this)};
-            const client = new $Closure7Client({
+            const $Closure8Client = ${$Closure8._toInflightType()};
+            const client = new $Closure8Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure7._registerOnLiftObject(mapA, host, []);
-          $Closure7._registerOnLiftObject(mapB, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure8 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [mapA, []],
+            [mapB, []],
+          ],
+          "$inflight_init": [
+            [mapA, []],
+            [mapB, []],
+          ],
+        });
+      }
+    }
+    class $Closure9 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure8-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure9-1.cjs")({
             $mapA: ${$stdlib.core.liftObject(mapA)},
             $mapB: ${$stdlib.core.liftObject(mapB)},
             $mapC: ${$stdlib.core.liftObject(mapC)},
@@ -567,35 +642,38 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure8Client = ${$Closure8._toInflightType(this)};
-            const client = new $Closure8Client({
+            const $Closure9Client = ${$Closure9._toInflightType()};
+            const client = new $Closure9Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure8._registerOnLiftObject(mapA, host, []);
-          $Closure8._registerOnLiftObject(mapB, host, []);
-          $Closure8._registerOnLiftObject(mapC, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure9 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [mapA, []],
+            [mapB, []],
+            [mapC, []],
+          ],
+          "$inflight_init": [
+            [mapA, []],
+            [mapB, []],
+            [mapC, []],
+          ],
+        });
+      }
+    }
+    class $Closure10 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure9-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure10-1.cjs")({
             $arrayA: ${$stdlib.core.liftObject(arrayA)},
             $arrayB: ${$stdlib.core.liftObject(arrayB)},
           })
@@ -604,34 +682,36 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure9Client = ${$Closure9._toInflightType(this)};
-            const client = new $Closure9Client({
+            const $Closure10Client = ${$Closure10._toInflightType()};
+            const client = new $Closure10Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure9._registerOnLiftObject(arrayA, host, []);
-          $Closure9._registerOnLiftObject(arrayB, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure10 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [arrayA, []],
+            [arrayB, []],
+          ],
+          "$inflight_init": [
+            [arrayA, []],
+            [arrayB, []],
+          ],
+        });
+      }
+    }
+    class $Closure11 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure10-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure11-1.cjs")({
             $arrayA: ${$stdlib.core.liftObject(arrayA)},
             $arrayB: ${$stdlib.core.liftObject(arrayB)},
             $arrayC: ${$stdlib.core.liftObject(arrayC)},
@@ -641,35 +721,38 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure10Client = ${$Closure10._toInflightType(this)};
-            const client = new $Closure10Client({
+            const $Closure11Client = ${$Closure11._toInflightType()};
+            const client = new $Closure11Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure10._registerOnLiftObject(arrayA, host, []);
-          $Closure10._registerOnLiftObject(arrayB, host, []);
-          $Closure10._registerOnLiftObject(arrayC, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure11 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [arrayA, []],
+            [arrayB, []],
+            [arrayC, []],
+          ],
+          "$inflight_init": [
+            [arrayA, []],
+            [arrayB, []],
+            [arrayC, []],
+          ],
+        });
+      }
+    }
+    class $Closure12 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure11-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure12-1.cjs")({
             $cat1: ${$stdlib.core.liftObject(cat1)},
             $cat2: ${$stdlib.core.liftObject(cat2)},
           })
@@ -678,34 +761,36 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure11Client = ${$Closure11._toInflightType(this)};
-            const client = new $Closure11Client({
+            const $Closure12Client = ${$Closure12._toInflightType()};
+            const client = new $Closure12Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure11._registerOnLiftObject(cat1, host, []);
-          $Closure11._registerOnLiftObject(cat2, host, []);
-        }
-        super._registerOnLift(host, ops);
-      }
-    }
-    class $Closure12 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      get _liftMap() {
+        return ({
+          "handle": [
+            [cat1, []],
+            [cat2, []],
+          ],
+          "$inflight_init": [
+            [cat1, []],
+            [cat2, []],
+          ],
+        });
+      }
+    }
+    class $Closure13 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure12-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure13-1.cjs")({
             $cat1: ${$stdlib.core.liftObject(cat1)},
             $cat2: ${$stdlib.core.liftObject(cat2)},
             $cat3: ${$stdlib.core.liftObject(cat3)},
@@ -715,24 +800,27 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure12Client = ${$Closure12._toInflightType(this)};
-            const client = new $Closure12Client({
+            const $Closure13Client = ${$Closure13._toInflightType()};
+            const client = new $Closure13Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure12._registerOnLiftObject(cat1, host, []);
-          $Closure12._registerOnLiftObject(cat2, host, []);
-          $Closure12._registerOnLiftObject(cat3, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [cat1, []],
+            [cat2, []],
+            [cat3, []],
+          ],
+          "$inflight_init": [
+            [cat1, []],
+            [cat2, []],
+            [cat3, []],
+          ],
+        });
       }
     }
     const numA = 1;
@@ -748,31 +836,32 @@ class $Root extends $stdlib.std.Resource {
     const jsonC = [1, 2, 3];
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Json with the same value", new $Closure3(this, "$Closure3"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Json with different values", new $Closure4(this, "$Closure4"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Json.values equality", new $Closure5(this, "$Closure5"));
     const setA = new Set([1, 2, 3]);
     const setB = new Set([1, 2, 3]);
     const setC = new Set([4, 5, 6]);
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Set types with the same value", new $Closure5(this, "$Closure5"));
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Set types with different values", new $Closure6(this, "$Closure6"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Set types with the same value", new $Closure6(this, "$Closure6"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Set types with different values", new $Closure7(this, "$Closure7"));
     const mapA = ({["a"]: 1, ["b"]: 2});
     const mapB = ({["a"]: 1, ["b"]: 2});
     const mapC = ({["c"]: 10, ["b"]: 2});
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Map with the same value", new $Closure7(this, "$Closure7"));
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Map with different values", new $Closure8(this, "$Closure8"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Map with the same value", new $Closure8(this, "$Closure8"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Map with different values", new $Closure9(this, "$Closure9"));
     const arrayA = [1, 2, 3];
     const arrayB = [1, 2, 3];
     const arrayC = [4, 5, 6];
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Array with the same value", new $Closure9(this, "$Closure9"));
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Array with different values", new $Closure10(this, "$Closure10"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Array with the same value", new $Closure10(this, "$Closure10"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Array with different values", new $Closure11(this, "$Closure11"));
     const cat1 = ({"name": "Mittens", "age": 3});
     const cat2 = ({"name": "Mittens", "age": 3});
     const cat3 = ({"name": "Simba", "age": 5});
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Struct with the same value", new $Closure11(this, "$Closure11"));
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Struct with different values", new $Closure12(this, "$Closure12"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Struct with the same value", new $Closure12(this, "$Closure12"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Struct with different values", new $Closure13(this, "$Closure13"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "deep_equality.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_test_sim.md
index 687fd06e3d5..8e36bc18d3e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/deep_equality.test.w_test_sim.md
@@ -4,19 +4,20 @@
 ```log
 pass ─ deep_equality.test.wsim » root/env0/test:Primitive types with the same value  
 pass ─ deep_equality.test.wsim » root/env1/test:Primitive types with different values
-pass ─ deep_equality.test.wsim » root/env10/test:Struct with the same value          
-pass ─ deep_equality.test.wsim » root/env11/test:Struct with different values        
+pass ─ deep_equality.test.wsim » root/env10/test:Array with different values         
+pass ─ deep_equality.test.wsim » root/env11/test:Struct with the same value          
+pass ─ deep_equality.test.wsim » root/env12/test:Struct with different values        
 pass ─ deep_equality.test.wsim » root/env2/test:Json with the same value             
 pass ─ deep_equality.test.wsim » root/env3/test:Json with different values           
-pass ─ deep_equality.test.wsim » root/env4/test:Set types with the same value        
-pass ─ deep_equality.test.wsim » root/env5/test:Set types with different values      
-pass ─ deep_equality.test.wsim » root/env6/test:Map with the same value              
-pass ─ deep_equality.test.wsim » root/env7/test:Map with different values            
-pass ─ deep_equality.test.wsim » root/env8/test:Array with the same value            
-pass ─ deep_equality.test.wsim » root/env9/test:Array with different values          
- 
- 
-Tests 12 passed (12)
+pass ─ deep_equality.test.wsim » root/env4/test:Json.values equality                 
+pass ─ deep_equality.test.wsim » root/env5/test:Set types with the same value        
+pass ─ deep_equality.test.wsim » root/env6/test:Set types with different values      
+pass ─ deep_equality.test.wsim » root/env7/test:Map with the same value              
+pass ─ deep_equality.test.wsim » root/env8/test:Map with different values            
+pass ─ deep_equality.test.wsim » root/env9/test:Array with the same value            
+
+Tests 13 passed (13)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_compile_tf-aws.md
index 39bdba4511e..d6e7eeb4aac 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [double_reference.test.w](../../../../../examples/tests/valid/double_reference.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bar, $bar_foo, $initCount }) {
   class $Closure1 {
     constructor({  }) {
@@ -13,17 +14,18 @@ module.exports = function({ $bar, $bar_foo, $initCount }) {
     async handle() {
       (await $bar.callFoo());
       (await $bar_foo.method());
-      {((cond) => {if (!cond) throw new Error("assertion failed: initCount.peek() == /*1*/ 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $initCount.peek()),2)))};
+      $helpers.assert($helpers.eq((await $initCount.peek()), 2), "initCount.peek() == /*1*/ 2");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Bar-1.js
-```js
+## inflight.Bar-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Bar {
     constructor({ $this_foo }) {
@@ -35,12 +37,13 @@ module.exports = function({  }) {
   }
   return Bar;
 }
-//# sourceMappingURL=inflight.Bar-1.js.map
+//# sourceMappingURL=inflight.Bar-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $initCount }) {
   class Foo {
     constructor({  }) {
@@ -53,7 +56,7 @@ module.exports = function({ $initCount }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -63,22 +66,9 @@ module.exports = function({ $initCount }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -87,11 +77,11 @@ module.exports = function({ $initCount }) {
   },
   "resource": {
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -102,21 +92,23 @@ module.exports = function({ $initCount }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     }
   }
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -127,7 +119,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $initCount: ${$stdlib.core.liftObject(initCount)},
           })
         `;
@@ -135,7 +127,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -143,14 +135,14 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "method", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(initCount, host, ["inc"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "method": [
+          ],
+          "$inflight_init": [
+            [initCount, ["inc"]],
+          ],
+        });
       }
     }
     class Bar extends $stdlib.std.Resource {
@@ -160,14 +152,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Bar-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BarClient = ${Bar._toInflightType(this)};
+            const BarClient = ${Bar._toInflightType()};
             const client = new BarClient({
               $this_foo: ${$stdlib.core.liftObject(this.foo)},
             });
@@ -176,28 +168,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "callFoo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Bar._registerOnLiftObject(this.foo, host, []);
-        }
-        if (ops.includes("callFoo")) {
-          Bar._registerOnLiftObject(this.foo, host, ["method"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "callFoo": [
+            [this.foo, ["method"]],
+          ],
+          "$inflight_init": [
+            [this.foo, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bar: ${$stdlib.core.liftObject(bar)},
             $bar_foo: ${$stdlib.core.liftObject(bar.foo)},
             $initCount: ${$stdlib.core.liftObject(initCount)},
@@ -207,7 +197,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -215,19 +205,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bar, host, ["callFoo"]);
-          $Closure1._registerOnLiftObject(bar.foo, host, ["method"]);
-          $Closure1._registerOnLiftObject(initCount, host, ["peek"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bar, ["callFoo"]],
+            [bar.foo, ["method"]],
+            [initCount, ["peek"]],
+          ],
+          "$inflight_init": [
+            [bar, []],
+            [bar.foo, []],
+            [initCount, []],
+          ],
+        });
       }
     }
-    const initCount = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+    const initCount = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
     const bar = new Bar(this, "Bar");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:hello", new $Closure1(this, "$Closure1"));
   }
@@ -235,6 +228,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "double_reference.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_test_sim.md
index 7cfc1286185..c32554d087a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/double_reference.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ double_reference.test.wsim » root/env0/test:hello
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_compile_tf-aws.md
index 3cee8e76d3f..7fbcf885962 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [doubler.test.w](../../../../../examples/tests/valid/doubler.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle(m) {
-      return String.raw({ raw: ["Hello ", "!"] }, m);
+      return String.raw({ raw: ["Hello ", "!"] }, (m ?? "nil"));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $handler, $std_Json, $std_Number }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,20 +32,21 @@ module.exports = function({ $handler, $std_Json, $std_Number }) {
       return $obj;
     }
     async handle(x) {
-      const xStr = ((args) => { if (isNaN(args)) {throw new Error("unable to parse \"" + args + "\" as a number")}; return Number(args) })(x);
+      const xStr = ((args) => { if (isNaN(args)) {throw new Error("unable to parse \"" + args + "\" as a number")}; return Number(args) })((x ?? "NaN"));
       const y = (await $handler(xStr));
       const z = (await $handler(y));
-      return ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([z]);
+      return ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(z);
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure3 {
     constructor({  }) {
@@ -57,12 +60,13 @@ module.exports = function({  }) {
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f }) {
   class $Closure4 {
     constructor({  }) {
@@ -72,35 +76,38 @@ module.exports = function({ $f }) {
     }
     async handle() {
       const result = (await $f.invoke("2"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: result == \"8\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(result,"8")))};
+      $helpers.assert($helpers.eq(result, "8"), "result == \"8\"");
     }
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.Doubler-1.js
-```js
+## inflight.Doubler-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Doubler {
     constructor({ $this_func }) {
       this.$this_func = $this_func;
     }
     async invoke(message) {
-      (await this.$this_func.handle(message));
-      (await this.$this_func.handle(message));
+      const res1 = ((await this.$this_func.handle(message)) ?? "");
+      const res2 = ((await this.$this_func.handle(res1)) ?? "");
+      return res2;
     }
   }
   return Doubler;
 }
-//# sourceMappingURL=inflight.Doubler-1.js.map
+//# sourceMappingURL=inflight.Doubler-1.cjs.map
 ```
 
-## inflight.Doubler2-1.js
-```js
+## inflight.Doubler2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Doubler2 {
     constructor({  }) {
@@ -108,7 +115,7 @@ module.exports = function({  }) {
   }
   return Doubler2;
 }
-//# sourceMappingURL=inflight.Doubler2-1.js.map
+//# sourceMappingURL=inflight.Doubler2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -118,22 +125,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -142,58 +136,58 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "Doubler2_cloudFunction_CloudwatchLogGroup_517BCD05": {
+      "Doubler2_Function_CloudwatchLogGroup_53963378": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Doubler2/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "Doubler2_cloudFunction_CloudwatchLogGroup_517BCD05"
+            "path": "root/Default/Default/Doubler2/Function/CloudwatchLogGroup",
+            "uniqueId": "Doubler2_Function_CloudwatchLogGroup_53963378"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d4b6f0",
+        "name": "/aws/lambda/Function-c892ab6d",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "Doubler2_cloudFunction_IamRole_3E4BED38": {
+      "Doubler2_Function_IamRole_66AECEFB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Doubler2/cloud.Function/IamRole",
-            "uniqueId": "Doubler2_cloudFunction_IamRole_3E4BED38"
+            "path": "root/Default/Default/Doubler2/Function/IamRole",
+            "uniqueId": "Doubler2_Function_IamRole_66AECEFB"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "Doubler2_cloudFunction_IamRolePolicy_0E850719": {
+      "Doubler2_Function_IamRolePolicy_B68B51AD": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Doubler2/cloud.Function/IamRolePolicy",
-            "uniqueId": "Doubler2_cloudFunction_IamRolePolicy_0E850719"
+            "path": "root/Default/Default/Doubler2/Function/IamRolePolicy",
+            "uniqueId": "Doubler2_Function_IamRolePolicy_B68B51AD"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.Doubler2_cloudFunction_IamRole_3E4BED38.name}"
+        "role": "${aws_iam_role.Doubler2_Function_IamRole_66AECEFB.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "Doubler2_cloudFunction_IamRolePolicyAttachment_A02FB4B1": {
+      "Doubler2_Function_IamRolePolicyAttachment_4191B8F8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Doubler2/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "Doubler2_cloudFunction_IamRolePolicyAttachment_A02FB4B1"
+            "path": "root/Default/Default/Doubler2/Function/IamRolePolicyAttachment",
+            "uniqueId": "Doubler2_Function_IamRolePolicyAttachment_4191B8F8"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.Doubler2_cloudFunction_IamRole_3E4BED38.name}"
+        "role": "${aws_iam_role.Doubler2_Function_IamRole_66AECEFB.name}"
       }
     },
     "aws_lambda_function": {
-      "Doubler2_cloudFunction_402CDAA3": {
+      "Doubler2_Function_235483AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Doubler2/cloud.Function/Default",
-            "uniqueId": "Doubler2_cloudFunction_402CDAA3"
+            "path": "root/Default/Default/Doubler2/Function/Default",
+            "uniqueId": "Doubler2_Function_235483AB"
           }
         },
         "architectures": [
@@ -202,18 +196,18 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d4b6f0",
+            "WING_FUNCTION_NAME": "Function-c892ab6d",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d4b6f0",
+        "function_name": "Function-c892ab6d",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.Doubler2_cloudFunction_IamRole_3E4BED38.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Doubler2_Function_IamRole_66AECEFB.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.Doubler2_cloudFunction_S3Object_8029A145.key}",
+        "s3_key": "${aws_s3_object.Doubler2_Function_S3Object_4A795FD9.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -233,11 +227,11 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "Doubler2_cloudFunction_S3Object_8029A145": {
+      "Doubler2_Function_S3Object_4A795FD9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Doubler2/cloud.Function/S3Object",
-            "uniqueId": "Doubler2_cloudFunction_S3Object_8029A145"
+            "path": "root/Default/Default/Doubler2/Function/S3Object",
+            "uniqueId": "Doubler2_Function_S3Object_4A795FD9"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -249,14 +243,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -268,14 +264,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Doubler-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Doubler-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const DoublerClient = ${Doubler._toInflightType(this)};
+            const DoublerClient = ${Doubler._toInflightType()};
             const client = new DoublerClient({
               $this_func: ${$stdlib.core.liftObject(this.func)},
             });
@@ -284,35 +280,33 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "invoke", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Doubler._registerOnLiftObject(this.func, host, []);
-        }
-        if (ops.includes("invoke")) {
-          Doubler._registerOnLiftObject(this.func, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "invoke": [
+            [this.func, ["handle"]],
+          ],
+          "$inflight_init": [
+            [this.func, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -320,8 +314,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Doubler2 extends $stdlib.std.Resource {
@@ -329,16 +328,15 @@ class $Root extends $stdlib.std.Resource {
         super($scope, $id);
       }
       makeFunc(handler) {
-        const __parent_this_2 = this;
-        class $Closure2 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure2 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure2-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
                 $handler: ${$stdlib.core.liftObject(handler)},
                 $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
                 $std_Number: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Number, "@winglang/sdk/std", "Number"))},
@@ -348,7 +346,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure2Client = ${$Closure2._toInflightType(this)};
+                const $Closure2Client = ${$Closure2._toInflightType()};
                 const client = new $Closure2Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -356,28 +354,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure2._registerOnLiftObject(handler, host, ["handle"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [handler, ["handle"]],
+              ],
+              "$inflight_init": [
+                [handler, []],
+              ],
+            });
           }
         }
-        return this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", new $Closure2(this, "$Closure2"));
+        return this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", new $Closure2(this, "$Closure2"));
       }
       static _toInflightType() {
         return `
-          require("./inflight.Doubler2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Doubler2-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const Doubler2Client = ${Doubler2._toInflightType(this)};
+            const Doubler2Client = ${Doubler2._toInflightType()};
             const client = new Doubler2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -385,26 +384,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -412,19 +414,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
           })
         `;
@@ -432,7 +439,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -440,14 +447,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure4._registerOnLiftObject(f, host, ["invoke"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
     const fn = new Doubler(this, "Doubler", new $Closure1(this, "$Closure1"));
@@ -459,6 +467,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "doubler.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_test_sim.md
index 1d0f140be0c..e70f843f090 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/doubler.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ doubler.test.wsim » root/env0/test:f(2) == 8
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_compile_tf-aws.md
index 6c5b750e320..426be7f4c97 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [enums.test.w](../../../../../examples/tests/valid/enums.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $SomeEnum, $one, $two }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,13 +12,35 @@ module.exports = function({ $SomeEnum, $one, $two }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: one == SomeEnum.ONE")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($one,$SomeEnum.ONE)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: two == SomeEnum.TWO")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($two,$SomeEnum.TWO)))};
+      $helpers.assert($helpers.eq($one, $SomeEnum.ONE), "one == SomeEnum.ONE");
+      $helpers.assert($helpers.eq($two, $SomeEnum.TWO), "two == SomeEnum.TWO");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $SomeEnum }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, $SomeEnum.ONE), "ONE"), "\"{SomeEnum.ONE}\" == \"ONE\"");
+      $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, $SomeEnum.TWO), "TWO"), "\"{SomeEnum.TWO}\" == \"TWO\"");
+      $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, $SomeEnum.THREE), "THREE"), "\"{SomeEnum.THREE}\" == \"THREE\"");
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -27,22 +50,9 @@ module.exports = function({ $SomeEnum, $one, $two }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -52,26 +62,42 @@ module.exports = function({ $SomeEnum, $one, $two }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    const SomeEnum =
+      (function (tmp) {
+        tmp["ONE"] = "ONE";
+        tmp["TWO"] = "TWO";
+        tmp["THREE"] = "THREE";
+        return tmp;
+      })({})
+    ;
+    const DocumentedEnum =
+      (function (tmp) {
+        tmp["VARIANT"] = "VARIANT";
+        return tmp;
+      })({})
+    ;
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $SomeEnum: ${$stdlib.core.liftObject(SomeEnum)},
             $one: ${$stdlib.core.liftObject(one)},
             $two: ${$stdlib.core.liftObject(two)},
@@ -81,7 +107,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -89,33 +115,66 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+            [one, []],
+            [two, []],
+          ],
+          "$inflight_init": [
+            [one, []],
+            [two, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(one, host, []);
-          $Closure1._registerOnLiftObject(two, host, []);
-        }
-        super._registerOnLift(host, ops);
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $SomeEnum: ${$stdlib.core.liftObject(SomeEnum)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    const SomeEnum =
-      (function (tmp) {
-        tmp[tmp["ONE"] = 0] = ",ONE";
-        tmp[tmp["TWO"] = 1] = ",TWO";
-        tmp[tmp["THREE"] = 2] = ",THREE";
-        return tmp;
-      })({})
-    ;
+    const opt = undefined;
+    const three = SomeEnum.THREE;
     const one = SomeEnum.ONE;
     const two = SomeEnum.TWO;
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight", new $Closure1(this, "$Closure1"));
+    $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, SomeEnum.ONE), "ONE"), "\"{SomeEnum.ONE}\" == \"ONE\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, SomeEnum.TWO), "TWO"), "\"{SomeEnum.TWO}\" == \"TWO\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, SomeEnum.THREE), "THREE"), "\"{SomeEnum.THREE}\" == \"THREE\"");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:toStr inflight", new $Closure2(this, "$Closure2"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "enums.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_test_sim.md
index 815da02ba38..acf4b2e4fc7 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/enums.test.w_test_sim.md
@@ -2,10 +2,11 @@
 
 ## stdout.log
 ```log
-pass ─ enums.test.wsim » root/env0/test:inflight
- 
- 
-Tests 1 passed (1)
+pass ─ enums.test.wsim » root/env0/test:inflight      
+pass ─ enums.test.wsim » root/env1/test:toStr inflight
+
+Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/explicit_lift_qualification.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/explicit_lift_qualification.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..ba3a676f207
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/explicit_lift_qualification.test.w_compile_tf-aws.md
@@ -0,0 +1,453 @@
+# [explicit_lift_qualification.test.w](../../../../../examples/tests/valid/explicit_lift_qualification.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $foo }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $foo.mehtod());
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $bucket1 }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const b = $bucket1;
+      {
+        (await b.put("k3", "value3"));
+      }
+      $helpers.assert($helpers.eq((await $bucket1.get("k3")), "value3"), "bucket1.get(\"k3\") == \"value3\"");
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $inflight_closure }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $inflight_closure());
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
+```
+
+## inflight.$Closure4-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $bar }) {
+  class $Closure4 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const x = $bar;
+      {
+        $helpers.assert($helpers.eq((await x.method()), "ahoy there"), "x.method() == \"ahoy there\"");
+      }
+    }
+  }
+  return $Closure4;
+}
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
+```
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $bucket1, $bucket2, $bucket3, $maybe_bucket }) {
+  class Foo {
+    constructor({  }) {
+    }
+    async mehtod() {
+      {
+        const b1 = $bucket1;
+        (await b1.put("k2", "value2"));
+        $helpers.assert($helpers.eq((await b1.list()), ["k", "k2"]), "b1.list() == [\"k\", \"k2\"]");
+        (await b1.delete("k2"));
+        const b2 = $bucket2;
+        (await b2.put("k2", "value2"));
+        const b3 = $bucket3;
+        {
+          (await b3.put("k3", "value3"));
+        }
+        {
+          (await b3.list());
+        }
+      }
+      $helpers.assert($helpers.eq((await $bucket1.tryGet("k2")), undefined), "bucket1.tryGet(\"k2\") == nil");
+      $helpers.assert($helpers.eq((await $bucket2.get("k2")), "value2"), "bucket2.get(\"k2\") == \"value2\"");
+      $helpers.assert($helpers.eq((await $bucket3.get("k3")), "value3"), "bucket3.get(\"k3\") == \"value3\"");
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## inflight.PreflightClass-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class PreflightClass {
+    constructor({  }) {
+    }
+    async method() {
+      return "ahoy there";
+    }
+  }
+  return PreflightClass;
+}
+//# sourceMappingURL=inflight.PreflightClass-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_s3_bucket": {
+      "b1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b1/Default",
+            "uniqueId": "b1"
+          }
+        },
+        "bucket_prefix": "b1-c88fb896-",
+        "force_destroy": false
+      },
+      "b2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b2/Default",
+            "uniqueId": "b2"
+          }
+        },
+        "bucket_prefix": "b2-c844cd88-",
+        "force_destroy": false
+      },
+      "b3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b3/Default",
+            "uniqueId": "b3"
+          }
+        },
+        "bucket_prefix": "b3-c8a40138-",
+        "force_destroy": false
+      }
+    },
+    "aws_s3_object": {
+      "b1_S3Object-k_80FB6BEF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b1/S3Object-k",
+            "uniqueId": "b1_S3Object-k_80FB6BEF"
+          }
+        },
+        "bucket": "${aws_s3_bucket.b1.bucket}",
+        "content": "value",
+        "key": "k"
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+            $bucket1: ${$stdlib.core.liftObject(bucket1)},
+            $bucket2: ${$stdlib.core.liftObject(bucket2)},
+            $bucket3: ${$stdlib.core.liftObject(bucket3)},
+            $maybe_bucket: ${$stdlib.core.liftObject(maybe_bucket)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "mehtod": [
+            [(maybe_bucket ?? bucket3), ["list"]],
+            [bucket1, [].concat(["delete", "put", "list"], ["tryGet"])],
+            [bucket2, [].concat(["put"], ["get"])],
+            [bucket3, [].concat(["put"], ["get"])],
+            [maybe_bucket, []],
+          ],
+          "$inflight_init": [
+            [(maybe_bucket ?? bucket3), []],
+            [bucket1, []],
+            [bucket2, []],
+            [bucket3, []],
+            [maybe_bucket, []],
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $foo: ${$stdlib.core.liftObject(foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, ["mehtod"]],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $bucket1: ${$stdlib.core.liftObject(bucket1)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket1, [].concat(["put"], ["get"])],
+          ],
+          "$inflight_init": [
+            [bucket1, []],
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $inflight_closure: ${$stdlib.core.liftObject(inflight_closure)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [inflight_closure, ["handle"]],
+          ],
+          "$inflight_init": [
+            [inflight_closure, []],
+          ],
+        });
+      }
+    }
+    class PreflightClass extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.PreflightClass-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const PreflightClassClient = ${PreflightClass._toInflightType()};
+            const client = new PreflightClassClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "method": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
+            $bar: ${$stdlib.core.liftObject(bar)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bar, ["method"]],
+          ],
+          "$inflight_init": [
+            [bar, []],
+          ],
+        });
+      }
+    }
+    const bucket1 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b1");
+    (bucket1.addObject("k", "value"));
+    const bucket2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b2");
+    const bucket3 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b3");
+    const maybe_bucket = undefined;
+    const foo = new Foo(this, "Foo");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:explicit method lift qualification", new $Closure1(this, "$Closure1"));
+    const inflight_closure = new $Closure2(this, "$Closure2");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:explicit closure lift qualification", new $Closure3(this, "$Closure3"));
+    const bar = new PreflightClass(this, "PreflightClass");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:explicit interface lift qualification", new $Closure4(this, "$Closure4"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "explicit_lift_qualification.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/explicit_lift_qualification.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/explicit_lift_qualification.test.w_test_sim.md
new file mode 100644
index 00000000000..fae9212b66f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/explicit_lift_qualification.test.w_test_sim.md
@@ -0,0 +1,14 @@
+# [explicit_lift_qualification.test.w](../../../../../examples/tests/valid/explicit_lift_qualification.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ explicit_lift_qualification.test.wsim » root/env0/test:explicit method lift qualification   
+pass ─ explicit_lift_qualification.test.wsim » root/env1/test:explicit closure lift qualification  
+pass ─ explicit_lift_qualification.test.wsim » root/env2/test:explicit interface lift qualification
+
+Tests 3 passed (3)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_compile_tf-aws.md
index 95abd7cf03c..0ed26f1e9f0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,14 +19,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -51,15 +40,15 @@ class $Root extends $stdlib.std.Resource {
     const yf = ((-20.22) * xf);
     const zf = ((xf + yf) - (-0.01));
     const fxzy = (5 ** (2 ** 3));
-    {((cond) => {if (!cond) throw new Error("assertion failed: fxzy == 390625")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(fxzy,390625)))};
+    $helpers.assert($helpers.eq(fxzy, 390625), "fxzy == 390625");
     const xyzf = Math.trunc(501 / (99 + 1));
-    {((cond) => {if (!cond) throw new Error("assertion failed: xyzf == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(xyzf,5)))};
+    $helpers.assert($helpers.eq(xyzf, 5), "xyzf == 5");
     const xyznf = Math.trunc((-501) / (99 + 1));
-    {((cond) => {if (!cond) throw new Error("assertion failed: xyznf == -5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(xyznf,(-5))))};
+    $helpers.assert($helpers.eq(xyznf, (-5)), "xyznf == -5");
     const xyznfj = Math.trunc(501.9 / ((-99.1) - 0.91));
-    {((cond) => {if (!cond) throw new Error("assertion failed: xyznfj == -5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(xyznfj,(-5))))};
+    $helpers.assert($helpers.eq(xyznfj, (-5)), "xyznfj == -5");
     const xynfj = Math.trunc((-501.9) / ((-99.1) - 0.91));
-    {((cond) => {if (!cond) throw new Error("assertion failed: xynfj == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(xynfj,5)))};
+    $helpers.assert($helpers.eq(xynfj, 5), "xynfj == 5");
     const price = 12.34;
     const twentyThousand = 20000;
     const aBitMore = 20000.0001;
@@ -68,6 +57,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "expressions_binary_operators.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_test_sim.md
index 68e1ebea5c6..882687c2b30 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/expressions_binary_operators.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ expressions_binary_operators.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_compile_tf-aws.md
index 7207e8d5b3c..cb0d2ed7a5f 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_compile_tf-aws.md
@@ -1,5 +1,30 @@
 # [expressions_string_interpolation.test.w](../../../../../examples/tests/valid/expressions_string_interpolation.test.w) | compile | tf-aws
 
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $expect_Util, $number }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const i = 1336;
+      const s = String.raw({ raw: ["leet: ", ""] }, (i + $number));
+      (await $expect_Util.equal(s, "leet: 1337"));
+      (await $expect_Util.equal("leet: {i+number}", "leet: {i+number\}"));
+      (await $expect_Util.equal("", ""));
+      (await $expect_Util.equal("{}".length, 2));
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
 ## main.tf.json
 ```json
 {
@@ -7,22 +32,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,33 +44,93 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
+            $number: ${$stdlib.core.liftObject(number)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [number, []],
+          ],
+          "$inflight_init": [
+            [number, []],
+          ],
+        });
+      }
+    }
     const regularString = "str\n\"";
     const emptyString = "";
     const number = 1;
-    const coolString = String.raw({ raw: ["cool \"\{", "}\" test"] }, regularString);
-    const reallyCoolString = String.raw({ raw: ["", "", "\n", "\n\{empty_string}", "!"] }, number, emptyString, coolString, "string-in-string");
+    const coolString = String.raw({ raw: ["cool \"{", "}\" test"] }, regularString);
+    const reallyCoolString = String.raw({ raw: ["", "", "\n", "\n{empty_string}", "!"] }, number, emptyString, coolString, "string-in-string");
     const beginingWithCoolStrings = String.raw({ raw: ["", " ", " <- cool"] }, regularString, number);
     const endingWithCoolStrings = String.raw({ raw: ["cool -> ", " ", ""] }, regularString, number);
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"{1+1}\" == \"2\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", ""] }, (1 + 1)),"2")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"\\{1+1}\" == \"\\{1+1}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("{1+1}","{1+1}")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"\\{1+1}\" != \"2\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })("{1+1}","2")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"\\{1+1}\" != \"\\{2}\"")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })("{1+1}","{2}")))};
+    const nonInterpolated = "a non { { {interpolated } } } strin{ g }";
+    const nonInterpolatedJson = ({"a": nonInterpolated, "b": "this {one} too"});
+    (expect.Util.equal(String.raw({ raw: ["", ""] }, (1 + 1)), "2"));
+    (expect.Util.equal("{1+1}", "{1+1}"));
+    (expect.Util.notEqual("{1+1}", "2"));
+    (expect.Util.notEqual("{1+1}", "{2}"));
+    console.log(String.raw({ raw: ["{1+1\} ", ""] }, number));
+    console.log(nonInterpolated);
+    console.log(String.raw({ raw: ["this is '", "'"] }, nonInterpolated));
+    (expect.Util.equal("{number}", "{number\}"));
+    (expect.Util.equal("{1 + 1}", "{1 + 1\}"));
+    (expect.Util.equal("", ""));
+    (expect.Util.equal("{}", "{\}"));
+    (expect.Util.equal("a\nb\nc", "a\nb\nc"));
+    (expect.Util.equal("\{\}".length, 2));
+    (expect.Util.equal("{}".length, 2));
+    (expect.Util.equal("\\{".length, 2));
+    (expect.Util.equal("a\nb\nc".length, 5));
+    (expect.Util.equal(String.raw({ raw: ["", " {number}"] }, number), "1 {number}"));
+    const ml1 = "this\nis\nmultiline";
+    const ml2 = "this\nis\nmultiline";
+    const ml3 = "this\n\is\n\multiline";
+    (expect.Util.equal(ml1, ml2));
+    (expect.Util.equal(ml2, ml3));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:str interpolation with lifted expr", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "expressions_string_interpolation.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_test_sim.md
index 8718172251f..abad0b57bc2 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/expressions_string_interpolation.test.w_test_sim.md
@@ -2,10 +2,13 @@
 
 ## stdout.log
 ```log
-pass ─ expressions_string_interpolation.test.wsim (no tests)
- 
- 
+{1+1} 1
+a non { { {interpolated } } } strin{ g }
+this is 'a non { { {interpolated } } } strin{ g }'
+pass ─ expressions_string_interpolation.test.wsim » root/env0/test:str interpolation with lifted expr
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/extend_non_entrypoint.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/extend_non_entrypoint.w_compile_tf-aws.md
new file mode 100644
index 00000000000..794ec04a576
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/extend_non_entrypoint.w_compile_tf-aws.md
@@ -0,0 +1,58 @@
+# [extend_non_entrypoint.w](../../../../../examples/tests/valid/extend_non_entrypoint.w) | compile | tf-aws
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $cdk8s_Chart }) {
+  class Foo extends $cdk8s_Chart {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cdk8s = require("cdk8s");
+class Foo extends (this?.node?.root?.typeForFqn("cdk8s.Chart") ?? cdk8s.Chart) {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+        $cdk8s_Chart: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(cdk8s.Chart, "cdk8s", "Chart"))},
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const FooClient = ${Foo._toInflightType()};
+        const client = new FooClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return $stdlib.core.mergeLiftDeps(super._liftMap, {
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Foo };
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_compile_tf-aws.md
index 913ee0747d0..8c7d821d3a8 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [extern_implementation.test.w](../../../../../examples/tests/valid/extern_implementation.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,13 +17,14 @@ module.exports = function({ $f }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $Foo }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $func }) {
   class $Closure2 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -30,43 +32,64 @@ module.exports = function({ $Foo }) {
       return $obj;
     }
     async handle() {
-      (await $Foo.print("hey there"));
+      (await $func.invoke());
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $Foo }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $Foo.print("hey there"));
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
     }
     static async regexInflight(pattern, text) {
-      return (require("<ABSOLUTE_PATH>/external_js.js")["regexInflight"])(pattern, text)
+      return (require("../../../external_ts.ts")["regexInflight"])(pattern, text)
     }
     static async getUuid() {
-      return (require("<ABSOLUTE_PATH>/external_js.js")["getUuid"])()
+      return (require("../../../external_ts.ts")["getUuid"])()
     }
     static async getData() {
-      return (require("<ABSOLUTE_PATH>/external_js.js")["getData"])()
+      return (require("../../../external_ts.ts")["getData"])()
     }
     static async print(msg) {
-      return (require("<ABSOLUTE_PATH>/external_js.js")["print"])(msg)
+      return (require("../../../external_ts.ts")["print"])(msg)
     }
     async call() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: Foo.regexInflight(\"[a-z]+-\\\\d+\", \"abc-123\")")})((await Foo.regexInflight("[a-z]+-\\d+", "abc-123")))};
+      $helpers.assert((await Foo.regexInflight("[a-z]+-\\d+", "abc-123")), "Foo.regexInflight(\"[a-z]+-\\\\d+\", \"abc-123\")");
       const uuid = (await Foo.getUuid());
-      {((cond) => {if (!cond) throw new Error("assertion failed: uuid.length == 36")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(uuid.length,36)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: Foo.getData() == \"Cool data!\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await Foo.getData()),"Cool data!")))};
+      $helpers.assert($helpers.eq(uuid.length, 36), "uuid.length == 36");
+      $helpers.assert($helpers.eq((await Foo.getData()), "Cool data!"), "Foo.getData() == \"Cool data!\"");
     }
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -76,39 +99,144 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
       {}
     ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
+          }
+        },
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Function_IamRole_678BE84C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Function_IamRolePolicy_E3B26607": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      },
+      "my-bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/my-bucket/Default",
+            "uniqueId": "my-bucket"
+          }
+        },
+        "bucket_prefix": "my-bucket-c8fafcc6-",
+        "force_destroy": false
+      }
+    },
+    "aws_s3_object": {
+      "Function_S3Object_C62A0C2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
   }
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -118,18 +246,21 @@ class $Root extends $stdlib.std.Resource {
         super($scope, $id);
       }
       static getGreeting(name) {
-        return (require("<ABSOLUTE_PATH>/external_js.js")["getGreeting"])(name)
+        return ($extern("../../../external_ts.ts")["getGreeting"])(name)
+      }
+      static preflightBucket(bucket, id) {
+        return ($extern("../../../external_ts.ts")["preflightBucket"])(bucket, id)
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -137,25 +268,38 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "regexInflight", "getUuid", "getData", "print", "call", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "call": [
+            [Foo, [].concat(["regexInflight"], ["getUuid"], ["getData"])],
+          ],
+          "$inflight_init": [
+            [Foo, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("call")) {
-          Foo._registerOnLiftObject(Foo, host, ["getData", "getUuid", "regexInflight"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "regexInflight": [
+          ],
+          "getUuid": [
+          ],
+          "getData": [
+          ],
+          "print": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
           })
         `;
@@ -163,7 +307,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -171,33 +315,34 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(f, host, ["call"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["call"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
-            $Foo: ${$stdlib.core.liftObject(Foo)},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $func: ${$stdlib.core.liftObject(func)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -205,25 +350,64 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+            [func, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [func, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(Foo, host, ["print"]);
-        }
-        super._registerOnLift(host, ops);
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $Foo: ${$stdlib.core.liftObject(Foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [Foo, ["print"]],
+          ],
+          "$inflight_init": [
+            [Foo, []],
+          ],
+        });
       }
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: Foo.getGreeting(\"Wingding\") == \"Hello, Wingding!\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((Foo.getGreeting("Wingding")),"Hello, Wingding!")))};
+    $helpers.assert($helpers.eq((Foo.getGreeting("Wingding")), "Hello, Wingding!"), "Foo.getGreeting(\"Wingding\") == \"Hello, Wingding!\"");
     const f = new Foo(this, "Foo");
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:call", new $Closure1(this, "$Closure1"));
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:console", new $Closure2(this, "$Closure2"));
+    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "my-bucket");
+    (Foo.preflightBucket(bucket, "my-bucket"));
+    const func = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", new $Closure1(this, "$Closure1"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:call", new $Closure2(this, "$Closure2"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:console", new $Closure3(this, "$Closure3"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "extern_implementation.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_test_sim.md
index 168d0e4f8eb..dbabcbf6d8e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/extern_implementation.test.w_test_sim.md
@@ -2,12 +2,12 @@
 
 ## stdout.log
 ```log
+[INFO] console | printing hey there
 pass ─ extern_implementation.test.wsim » root/env0/test:call   
-pass ┌ extern_implementation.test.wsim » root/env1/test:console
-     └ printing hey there
- 
- 
+pass ─ extern_implementation.test.wsim » root/env1/test:console
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_compile_tf-aws.md
index db1ac5dba92..7cab4a39fc8 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [file_counter.test.w](../../../../../examples/tests/valid/file_counter.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket, $counter }) {
   class $Closure1 {
     constructor({  }) {
@@ -18,7 +19,7 @@ module.exports = function({ $bucket, $counter }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -28,22 +29,9 @@ module.exports = function({ $bucket, $counter }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -52,23 +40,23 @@ module.exports = function({ $bucket, $counter }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419"
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -79,63 +67,66 @@ module.exports = function({ $bucket, $counter }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.cloudQueue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.cloudBucket.arn}\",\"${aws_s3_bucket.cloudBucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136"
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
           }
         },
         "batch_size": 1,
-        "event_source_arn": "${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "${aws_lambda_function.cloudQueue-SetConsumer0.function_name}"
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0"
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
           }
         },
         "architectures": [
@@ -143,22 +134,22 @@ module.exports = function({ $bucket, $counter }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "${aws_s3_bucket.cloudBucket.bucket}",
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
@@ -166,32 +157,32 @@ module.exports = function({ $bucket, $counter }) {
       }
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "code-c84a50b1-"
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
+        "bucket_prefix": "code-c84a50b1-"
       }
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF"
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -200,43 +191,45 @@ module.exports = function({ $bucket, $counter }) {
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
-        "visibility_timeout_seconds": 10
+        "name": "Queue-c822c726",
+        "visibility_timeout_seconds": 30
       }
     }
   }
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bucket: ${$stdlib.core.liftObject(bucket)},
             $counter: ${$stdlib.core.liftObject(counter)},
           })
@@ -245,7 +238,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -253,20 +246,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket, host, ["put"]);
-          $Closure1._registerOnLiftObject(counter, host, ["inc"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket, ["put"]],
+            [counter, ["inc"]],
+          ],
+          "$inflight_init": [
+            [bucket, []],
+            [counter, []],
+          ],
+        });
       }
     }
-    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-    const counter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter", { initial: 100 });
-    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue", { timeout: (std.Duration.fromSeconds(10)) });
+    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const counter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter", { initial: 100 });
+    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
     const handler = new $Closure1(this, "$Closure1");
     (queue.setConsumer(handler));
   }
@@ -274,6 +269,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "file_counter.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_test_sim.md
index 71ce002e6e3..eff36861c73 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/file_counter.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ file_counter.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_compile_tf-aws.md
index bef164b9d05..133f07c0354 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [for_loop.test.w](../../../../../examples/tests/valid/for_loop.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -10,35 +11,36 @@ module.exports = function({  }) {
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(event) {
-      for (const x of ((s,e,i) => { function* iterator(start,end,inclusive) { let i = start; let limit = inclusive ? ((end < start) ? end - 1 : end + 1) : end; while (i < limit) yield i++; while (i > limit) yield i--; }; return iterator(s,e,i); })(0,10,false)) {
-        {((cond) => {if (!cond) throw new Error("assertion failed: x <= 0")})((x <= 0))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: x > 10")})((x > 10))};
-        {console.log(String.raw({ raw: ["", ""] }, x))};
+    async handle() {
+      for (const x of $helpers.range(0,10,false)) {
+        $helpers.assert((x <= 0), "x <= 0");
+        $helpers.assert((x > 10), "x > 10");
+        console.log(String.raw({ raw: ["", ""] }, x));
       }
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
     }
     async hello() {
       for (const p of ["hello"]) {
-        {console.log(p)};
+        console.log(p);
       }
     }
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -48,22 +50,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -72,58 +61,58 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudFunction_CloudwatchLogGroup_7399B890": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "cloudFunction_CloudwatchLogGroup_7399B890"
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d2eca1",
+        "name": "/aws/lambda/Function-c852aba6",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudFunction_IamRole_5A4430DC": {
+      "Function_IamRole_678BE84C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRole",
-            "uniqueId": "cloudFunction_IamRole_5A4430DC"
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudFunction_IamRolePolicy_618BF987": {
+      "Function_IamRolePolicy_E3B26607": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicy",
-            "uniqueId": "cloudFunction_IamRolePolicy_618BF987"
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudFunction_IamRolePolicyAttachment_288B9653": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "cloudFunction_IamRolePolicyAttachment_288B9653"
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudFunction": {
+      "Function": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/Default",
-            "uniqueId": "cloudFunction"
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
           }
         },
         "architectures": [
@@ -132,18 +121,18 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d2eca1",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d2eca1",
+        "function_name": "Function-c852aba6",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudFunction_S3Object_71908BAD.key}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -163,11 +152,11 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "cloudFunction_S3Object_71908BAD": {
+      "Function_S3Object_C62A0C2D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/S3Object",
-            "uniqueId": "cloudFunction_S3Object_71908BAD"
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -179,34 +168,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -214,8 +205,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Foo extends $stdlib.std.Resource {
@@ -224,14 +220,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -239,16 +235,21 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "hello", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "hello": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const words = ["wing", "lang", "dang"];
     const uniqueNumbers = new Set([1, 2, 3]);
     for (const word of words) {
       for (const number of uniqueNumbers) {
-        {((cond) => {if (!cond) throw new Error("assertion failed: number > 0")})((number > 0))};
-        {console.log(String.raw({ raw: ["", ": ", ""] }, word, number))};
+        $helpers.assert((number > 0), "number > 0");
+        console.log(String.raw({ raw: ["", ": ", ""] }, word, number));
       }
     }
     let i = 0;
@@ -257,137 +258,137 @@ class $Root extends $stdlib.std.Resource {
       let preBreakHits = 0;
       let postBreakHits = 0;
       for (const number of uniqueNumbers) {
-        {((cond) => {if (!cond) throw new Error("assertion failed: number > 0")})((number > 0))};
-        {console.log(String.raw({ raw: ["", ": ", ""] }, word, number))};
+        $helpers.assert((number > 0), "number > 0");
+        console.log(String.raw({ raw: ["", ": ", ""] }, word, number));
         preBreakHits = (preBreakHits + 1);
-        if ((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(number,2))) {
+        if ($helpers.eq(number, 2)) {
           break;
         }
         postBreakHits = (postBreakHits + 1);
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: preBreakHits == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(preBreakHits,2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: postBreakHits == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(postBreakHits,1)))};
+      $helpers.assert($helpers.eq(preBreakHits, 2), "preBreakHits == 2");
+      $helpers.assert($helpers.eq(postBreakHits, 1), "postBreakHits == 1");
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: i == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(i,3)))};
+    $helpers.assert($helpers.eq(i, 3), "i == 3");
     let j = 0;
     for (const word of words) {
       j = (j + 1);
       let preContinueHits = 0;
       let postContinueHits = 0;
       for (const number of uniqueNumbers) {
-        {((cond) => {if (!cond) throw new Error("assertion failed: number > 0")})((number > 0))};
-        {console.log(String.raw({ raw: ["", ": ", ""] }, word, number))};
+        $helpers.assert((number > 0), "number > 0");
+        console.log(String.raw({ raw: ["", ": ", ""] }, word, number));
         preContinueHits = (preContinueHits + 1);
         if ((number > 0)) {
           continue;
         }
         postContinueHits = (postContinueHits + 1);
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: preContinueHits == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(preContinueHits,3)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: postContinueHits == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(postContinueHits,0)))};
+      $helpers.assert($helpers.eq(preContinueHits, 3), "preContinueHits == 3");
+      $helpers.assert($helpers.eq(postContinueHits, 0), "postContinueHits == 0");
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: j == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(j,3)))};
-    {console.log("---\nfor x in 0..0 { ... }")};
-    for (const x of $stdlib.std.Range.of(0, 0, false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+    $helpers.assert($helpers.eq(j, 3), "j == 3");
+    console.log("---\nfor x in 0..0 { ... }");
+    for (const x of $helpers.range(0,0,false)) {
+      $helpers.assert(false, "false");
     }
-    {console.log("there's no value to iterate")};
-    {console.log("---\nfor x in 0..=0 { ... }")};
-    for (const x of $stdlib.std.Range.of(0, 0, true)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,0)))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("there's no value to iterate");
+    console.log("---\nfor x in 0..=0 { ... }");
+    for (const x of $helpers.range(0,0,true)) {
+      $helpers.assert($helpers.eq(x, 0), "x == 0");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 0..2 { ... }")};
-    for (const x of $stdlib.std.Range.of(0, 2, false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= 0")})((x >= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x < 2")})((x < 2))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..2 { ... }");
+    for (const x of $helpers.range(0,2,false)) {
+      $helpers.assert((x >= 0), "x >= 0");
+      $helpers.assert((x < 2), "x < 2");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 0..=2 { ... }")};
-    for (const x of $stdlib.std.Range.of(0, 2, true)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= 0")})((x >= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 2")})((x <= 2))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..=2 { ... }");
+    for (const x of $helpers.range(0,2,true)) {
+      $helpers.assert((x >= 0), "x >= 0");
+      $helpers.assert((x <= 2), "x <= 2");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 2..0 { ... }")};
-    for (const x of $stdlib.std.Range.of(2, 0, false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 2")})((x <= 2))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x > 0")})((x > 0))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 2..0 { ... }");
+    for (const x of $helpers.range(2,0,false)) {
+      $helpers.assert((x <= 2), "x <= 2");
+      $helpers.assert((x > 0), "x > 0");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 2..=0 { ... }")};
-    for (const x of $stdlib.std.Range.of(2, 0, true)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 2")})((x <= 2))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= 0")})((x >= 0))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 2..=0 { ... }");
+    for (const x of $helpers.range(2,0,true)) {
+      $helpers.assert((x <= 2), "x <= 2");
+      $helpers.assert((x >= 0), "x >= 0");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 0..-2 { ... }")};
-    for (const x of $stdlib.std.Range.of(0, (-2), false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 0")})((x <= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x > -2")})((x > (-2)))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..-2 { ... }");
+    for (const x of $helpers.range(0,(-2),false)) {
+      $helpers.assert((x <= 0), "x <= 0");
+      $helpers.assert((x > (-2)), "x > -2");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 0..=-2 { ... }")};
-    for (const x of $stdlib.std.Range.of(0, (-2), true)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 0")})((x <= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x > -3")})((x > (-3)))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..=-2 { ... }");
+    for (const x of $helpers.range(0,(-2),true)) {
+      $helpers.assert((x <= 0), "x <= 0");
+      $helpers.assert((x > (-3)), "x > -3");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in -2..0 { ... }")};
-    for (const x of $stdlib.std.Range.of((-2), 0, false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= -2")})((x >= (-2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x < 0")})((x < 0))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in -2..0 { ... }");
+    for (const x of $helpers.range((-2),0,false)) {
+      $helpers.assert((x >= (-2)), "x >= -2");
+      $helpers.assert((x < 0), "x < 0");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in -2..=0 { ... }")};
-    for (const x of $stdlib.std.Range.of((-2), 0, true)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= -2")})((x >= (-2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 0")})((x <= 0))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in -2..=0 { ... }");
+    for (const x of $helpers.range((-2),0,true)) {
+      $helpers.assert((x >= (-2)), "x >= -2");
+      $helpers.assert((x <= 0), "x <= 0");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
     const z = 2;
-    {console.log("---\nfor x in 0..z { ... } <=> x = 2")};
-    for (const x of $stdlib.std.Range.of(0, z, false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= 0")})((x >= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x < 2")})((x < 2))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..z { ... } <=> x = 2");
+    for (const x of $helpers.range(0,z,false)) {
+      $helpers.assert((x >= 0), "x >= 0");
+      $helpers.assert((x < 2), "x < 2");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 0..=z { ... } <=> x = 2")};
-    for (const x of $stdlib.std.Range.of(0, z, true)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= 0")})((x >= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 2")})((x <= 2))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..=z { ... } <=> x = 2");
+    for (const x of $helpers.range(0,z,true)) {
+      $helpers.assert((x >= 0), "x >= 0");
+      $helpers.assert((x <= 2), "x <= 2");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in z..0 { ... } <=> x = 2")};
-    for (const x of $stdlib.std.Range.of(z, 0, false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 2")})((x <= 2))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x > 0")})((x > 0))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in z..0 { ... } <=> x = 2");
+    for (const x of $helpers.range(z,0,false)) {
+      $helpers.assert((x <= 2), "x <= 2");
+      $helpers.assert((x > 0), "x > 0");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 0..(z*2) { ... } <=> x = 2")};
-    for (const x of $stdlib.std.Range.of(0, (z * 2), false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= 0")})((x >= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x < 4")})((x < 4))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..(z*2) { ... } <=> x = 2");
+    for (const x of $helpers.range(0,(z * 2),false)) {
+      $helpers.assert((x >= 0), "x >= 0");
+      $helpers.assert((x < 4), "x < 4");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in 0..=(z*2) { ... } <=> x = 2")};
-    for (const x of $stdlib.std.Range.of(0, (z * 2), true)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x >= 0")})((x >= 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 4")})((x <= 4))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in 0..=(z*2) { ... } <=> x = 2");
+    for (const x of $helpers.range(0,(z * 2),true)) {
+      $helpers.assert((x >= 0), "x >= 0");
+      $helpers.assert((x <= 4), "x <= 4");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    {console.log("---\nfor x in (z*2)..0 { ... } <=> x = 2")};
-    for (const x of $stdlib.std.Range.of((z * 2), 0, false)) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x <= 4")})((x <= 4))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: x > 0")})((x > 0))};
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+    console.log("---\nfor x in (z*2)..0 { ... } <=> x = 2");
+    for (const x of $helpers.range((z * 2),0,false)) {
+      $helpers.assert((x <= 4), "x <= 4");
+      $helpers.assert((x > 0), "x > 0");
+      console.log(String.raw({ raw: ["", ""] }, x));
     }
-    this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", new $Closure1(this, "$Closure1"));
+    this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "for_loop.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_test_sim.md
index c05cfaecda6..6ec8c0920cd 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/for_loop.test.w_test_sim.md
@@ -101,9 +101,9 @@ for x in (z*2)..0 { ... } <=> x = 2
 2
 1
 pass ─ for_loop.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_compile_tf-aws.md
index 9ab01f4e5c9..f942377bb06 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [forward_decl.test.w](../../../../../examples/tests/valid/forward_decl.test.w) | compile | tf-aws
 
-## inflight.R-1.js
-```js
+## inflight.R-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class R {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return R;
 }
-//# sourceMappingURL=inflight.R-1.js.map
+//# sourceMappingURL=inflight.R-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -45,14 +33,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -63,21 +53,21 @@ class $Root extends $stdlib.std.Resource {
       }
       method2() {
         (this.method1());
-        {console.log(String.raw({ raw: ["", ""] }, this.f))};
+        console.log(String.raw({ raw: ["", ""] }, this.f));
         (this.method2());
       }
       method1() {
       }
       static _toInflightType() {
         return `
-          require("./inflight.R-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.R-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const RClient = ${R._toInflightType(this)};
+            const RClient = ${R._toInflightType()};
             const client = new RClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -85,13 +75,16 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const x = "hi";
     if (true) {
-      {console.log(String.raw({ raw: ["", ""] }, x))};
+      console.log(String.raw({ raw: ["", ""] }, x));
       const y = new R(this, "R");
     }
   }
@@ -99,6 +92,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "forward_decl.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_test_sim.md
index e5566db7a57..4239f8ba5c7 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/forward_decl.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 hi
 pass ─ forward_decl.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_optional_arguments.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/function_optional_arguments.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..1c62e45a42f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_optional_arguments.test.w_compile_tf-aws.md
@@ -0,0 +1,138 @@
+# [function_optional_arguments.test.w](../../../../../examples/tests/valid/function_optional_arguments.test.w) | compile | tf-aws
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Foo {
+    constructor({  }) {
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static staticMethod($scope, opts) {
+        return String.raw({ raw: ["", " ", ""] }, (opts.opt1 ?? "none"), (opts.opt2 ?? 0));
+      }
+      method(opts) {
+        return String.raw({ raw: ["", " ", ""] }, (opts.opt1 ?? "none"), (opts.opt2 ?? 0));
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    const fn1 = ((opts) => {
+      return String.raw({ raw: ["", " ", ""] }, opts.opt1, opts.opt2);
+    });
+    $helpers.assert($helpers.eq((fn1(({"opt1": "hey", "opt2": 1}))), "hey 1"), "fn1({opt1: \"hey\", opt2: 1}) == \"hey 1\"");
+    $helpers.assert($helpers.eq((fn1({ opt1: "hey", opt2: 1 })), "hey 1"), "fn1(opt1: \"hey\", opt2: 1) == \"hey 1\"");
+    const fn2 = ((opts) => {
+      {
+        const $if_let_value = opts;
+        if ($if_let_value != undefined) {
+          const opts = $if_let_value;
+          return String.raw({ raw: ["", " ", ""] }, opts.opt1, opts.opt2);
+        }
+        else {
+          return "none";
+        }
+      }
+    });
+    $helpers.assert($helpers.eq((fn2(({"opt1": "hey", "opt2": 1}))), "hey 1"), "fn2({opt1: \"hey\", opt2: 1}) == \"hey 1\"");
+    $helpers.assert($helpers.eq((fn2({ opt1: "hey", opt2: 1 })), "hey 1"), "fn2(opt1: \"hey\", opt2: 1) == \"hey 1\"");
+    $helpers.assert($helpers.eq((fn2()), "none"), "fn2() == \"none\"");
+    const fn3 = ((opts) => {
+      return String.raw({ raw: ["", " ", ""] }, (opts.opt1 ?? "none"), (opts.opt2 ?? 0));
+    });
+    $helpers.assert($helpers.eq((fn3(({"opt1": "hey", "opt2": 1}))), "hey 1"), "fn3({opt1: \"hey\", opt2: 1}) == \"hey 1\"");
+    $helpers.assert($helpers.eq((fn3({ opt1: "hey", opt2: 1 })), "hey 1"), "fn3(opt1: \"hey\", opt2: 1) == \"hey 1\"");
+    $helpers.assert($helpers.eq((fn3({ opt1: "hey" })), "hey 0"), "fn3(opt1: \"hey\") == \"hey 0\"");
+    $helpers.assert($helpers.eq((fn3(({}))), "none 0"), "fn3({}) == \"none 0\"");
+    $helpers.assert($helpers.eq((fn3({  })), "none 0"), "fn3() == \"none 0\"");
+    const fn4 = ((opts) => {
+      {
+        const $if_let_value = opts;
+        if ($if_let_value != undefined) {
+          const opts = $if_let_value;
+          return String.raw({ raw: ["", " ", ""] }, (opts.opt1 ?? "none"), (opts.opt2 ?? 0));
+        }
+        else {
+          return "none";
+        }
+      }
+    });
+    $helpers.assert($helpers.eq((fn4(({"opt1": "hey", "opt2": 1}))), "hey 1"), "fn4({opt1: \"hey\", opt2: 1}) == \"hey 1\"");
+    $helpers.assert($helpers.eq((fn4({ opt1: "hey", opt2: 1 })), "hey 1"), "fn4(opt1: \"hey\", opt2: 1) == \"hey 1\"");
+    $helpers.assert($helpers.eq((fn4({ opt1: "hey" })), "hey 0"), "fn4(opt1: \"hey\") == \"hey 0\"");
+    $helpers.assert($helpers.eq((fn4(({}))), "none 0"), "fn4({}) == \"none 0\"");
+    $helpers.assert($helpers.eq((fn4()), "none"), "fn4() == \"none\"");
+    const foo = new Foo(this, "Foo");
+    $helpers.assert($helpers.eq((foo.method({  })), "none 0"), "foo.method() == \"none 0\"");
+    $helpers.assert($helpers.eq((Foo.staticMethod(this, {  })), "none 0"), "Foo.staticMethod() == \"none 0\"");
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "function_optional_arguments.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_optional_arguments.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/function_optional_arguments.test.w_test_sim.md
new file mode 100644
index 00000000000..4fb83a7fac8
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_optional_arguments.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [function_optional_arguments.test.w](../../../../../examples/tests/valid/function_optional_arguments.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ function_optional_arguments.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_compile_tf-aws.md
index 0606228e12c..9d84ab99e3f 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [function_returns_function.test.w](../../../../../examples/tests/valid/function_returns_function.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,20 +12,20 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      const iFn = async (s) => {
-        return async () => {
-          return (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"wing"));
-        };
-      };
+      const iFn = (async (s) => {
+        return (async () => {
+          return $helpers.eq(s, "wing");
+        });
+      });
       const wingInflightFn = (await iFn("wing"));
       const dingInflightFn = (await iFn("ding"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: wingInflightFn()")})((await wingInflightFn()))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: !dingInflightFn()")})((!(await dingInflightFn())))};
+      $helpers.assert((await wingInflightFn()), "wingInflightFn()");
+      $helpers.assert((!(await dingInflightFn())), "!dingInflightFn()");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -34,22 +35,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -59,34 +47,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -94,25 +84,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const fn = ((s) => {
       return (() => {
-        return (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"wing"));
+        return $helpers.eq(s, "wing");
       });
     });
     const wingFn = (fn("wing"));
     const dingFn = (fn("ding"));
-    {((cond) => {if (!cond) throw new Error("assertion failed: wingFn()")})((wingFn()))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: !dingFn()")})((!(dingFn())))};
+    $helpers.assert((wingFn()), "wingFn()");
+    $helpers.assert((!(dingFn())), "!dingFn()");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight functions can return other inflight functions", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "function_returns_function.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_test_sim.md
index b73898521c0..0b202809661 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_returns_function.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ function_returns_function.test.wsim » root/env0/test:inflight functions can return other inflight functions
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_compile_tf-aws.md
index fe0875f9d29..ca5805b236a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [function_type.test.w](../../../../../examples/tests/valid/function_type.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -15,12 +16,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure2 {
     constructor({  }) {
@@ -33,12 +35,13 @@ module.exports = function({  }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure3 {
     constructor({  }) {
@@ -51,12 +54,13 @@ module.exports = function({  }) {
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.C-1.js
-```js
+## inflight.C-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class C {
     constructor({  }) {
@@ -68,7 +72,7 @@ module.exports = function({  }) {
   }
   return C;
 }
-//# sourceMappingURL=inflight.C-1.js.map
+//# sourceMappingURL=inflight.C-1.cjs.map
 ```
 
 ## main.tf.json
@@ -78,22 +82,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -103,33 +94,35 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -137,26 +130,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -164,26 +162,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -191,8 +194,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class C extends $stdlib.std.Resource {
@@ -205,14 +213,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.C-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const CClient = ${C._toInflightType(this)};
+            const CClient = ${C._toInflightType()};
             const client = new CClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -220,8 +228,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "my_method3", "my_method4", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "my_method3": [
+          ],
+          "my_method4": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const my_func = ((callback) => {
@@ -240,6 +255,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "function_type.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_test_sim.md
index ba85b832eb5..8f0fcc4309c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_type.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ function_type.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_compile_tf-aws.md
index dbe992f4057..a963252161b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [function_variadic_arguments.test.w](../../../../../examples/tests/valid/function_variadic_arguments.test.w) | compile | tf-aws
 
-## inflight.A-1.js
-```js
+## inflight.A-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -10,12 +11,13 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## inflight.B-1.js
-```js
+## inflight.B-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class B extends $A {
     constructor({  }) {
@@ -24,7 +26,7 @@ module.exports = function({ $A }) {
   }
   return B;
 }
-//# sourceMappingURL=inflight.B-1.js.map
+//# sourceMappingURL=inflight.B-1.cjs.map
 ```
 
 ## main.tf.json
@@ -34,22 +36,9 @@ module.exports = function({ $A }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -93,14 +82,16 @@ module.exports = function({ $A }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -112,14 +103,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -127,18 +118,21 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class B extends A {
       constructor($scope, $id, msg) {
-        super($scope, $id);
+        super($scope, $id, msg);
         this.message = msg;
       }
       static _toInflightType() {
         return `
-          require("./inflight.B-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -146,7 +140,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BClient = ${B._toInflightType(this)};
+            const BClient = ${B._toInflightType()};
             const client = new BClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -154,27 +148,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const bucket1 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "bucket1");
     const bucket2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "bucket2");
     const bucket3 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "bucket3");
-    (bucket3.node.addDependency(bucket1, bucket2));
+    ($helpers.nodeof(bucket3).addDependency(bucket1, bucket2));
     const funcBucket = ((...buckets) => {
-      {((cond) => {if (!cond) throw new Error("assertion failed: buckets.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(buckets.length,2)))};
+      $helpers.assert($helpers.eq(buckets.length, 2), "buckets.length == 2");
     });
     (funcBucket(bucket1, bucket2));
     const func1 = ((x, y, ...args) => {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: y == \"something\" || y == nil")})(((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,"something")) || (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,undefined))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: args.length == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(args.length,4)))};
+      $helpers.assert($helpers.eq(x, 1), "x == 1");
+      $helpers.assert(($helpers.eq(y, "something") || $helpers.eq(y, undefined)), "y == \"something\" || y == nil");
+      $helpers.assert($helpers.eq(args.length, 4), "args.length == 4");
       for (const i of args) {
-        {((cond) => {if (!cond) throw new Error("assertion failed: i > 0 && i < 5")})(((i > 0) && (i < 5)))};
+        $helpers.assert(((i > 0) && (i < 5)), "i > 0 && i < 5");
       }
-      (args.push(10));
-      {((cond) => {if (!cond) throw new Error("assertion failed: args.at(4) == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(args, 4),10)))};
+      args.push(10);
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(args, 4), 10), "args.at(4) == 10");
     });
     (func1(1, "something", 1, 2, 3, 4));
     (func1(1, undefined, 1, 2, 3, 4));
@@ -185,8 +182,8 @@ class $Root extends $stdlib.std.Resource {
       }
       return total;
     });
-    {((cond) => {if (!cond) throw new Error("assertion failed: addNums(1, 2, 3) == 6")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((addNums(1, 2, 3)),6)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: addNums() == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((addNums()),0)))};
+    $helpers.assert($helpers.eq((addNums(1, 2, 3)), 6), "addNums(1, 2, 3) == 6");
+    $helpers.assert($helpers.eq((addNums()), 0), "addNums() == 0");
     const arityFunc = ((n, b, ...events) => {
       let error = false;
       try {
@@ -196,17 +193,17 @@ class $Root extends $stdlib.std.Resource {
         const ex = $error_ex.message;
         error = true;
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: error")})(error)};
+      $helpers.assert(error, "error");
     });
     (arityFunc(1, true, "a", "b", "c", "d"));
     const subTypeFunc = ((...events) => {
-      {((cond) => {if (!cond) throw new Error("assertion failed: events.at(0).message == \"this is A\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 0).message,"this is A")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: events.at(1).message == \"this is B\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 1).message,"this is B")))};
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 0).message, "this is A"), "events.at(0).message == \"this is A\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 1).message, "this is B"), "events.at(1).message == \"this is B\"");
     });
     (subTypeFunc(new A(this, "A", "this is A"), new B(this, "B", "this is B")));
     const jsonCastingFunc = ((...events) => {
-      {((cond) => {if (!cond) throw new Error("assertion failed: events.at(0) == \"str\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 0),"str")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: events.at(1) == \"json str\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 1),"json str")))};
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 0), "str"), "events.at(0) == \"str\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(events, 1), "json str"), "events.at(1) == \"json str\"");
     });
     const jsonStr = "json str";
     (jsonCastingFunc("str", jsonStr));
@@ -215,6 +212,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "function_variadic_arguments.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_test_sim.md
index e89827bae2a..870b89d2f8a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/function_variadic_arguments.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ function_variadic_arguments.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_compile_tf-aws.md
index 943dce6b24c..27941b931ba 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [hello.test.w](../../../../../examples/tests/valid/hello.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,7 +17,7 @@ module.exports = function({ $bucket }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -26,22 +27,9 @@ module.exports = function({ $bucket }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -50,71 +38,74 @@ module.exports = function({ $bucket }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419"
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.cloudQueue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.cloudBucket.arn}\",\"${aws_s3_bucket.cloudBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136"
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
           }
         },
         "batch_size": 1,
-        "event_source_arn": "${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "${aws_lambda_function.cloudQueue-SetConsumer0.function_name}"
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0"
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
           }
         },
         "architectures": [
@@ -122,21 +113,21 @@ module.exports = function({ $bucket }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
@@ -144,32 +135,32 @@ module.exports = function({ $bucket }) {
       }
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "code-c84a50b1-"
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
+        "bucket_prefix": "code-c84a50b1-"
       }
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF"
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -178,15 +169,15 @@ module.exports = function({ $bucket }) {
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
@@ -194,27 +185,29 @@ module.exports = function({ $bucket }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bucket: ${$stdlib.core.liftObject(bucket)},
           })
         `;
@@ -222,7 +215,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -230,24 +223,25 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket, ["put"]],
+          ],
+          "$inflight_init": [
+            [bucket, []],
+          ],
+        });
       }
     }
-    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
     (queue.setConsumer(new $Closure1(this, "$Closure1")));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "hello.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_test_sim.md
index 165dc9b8750..c5f72aebd01 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/hello.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ hello.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_compile_tf-aws.md
index 2024cd7831f..a354c770c40 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [identical_inflights.test.w](../../../../../examples/tests/valid/identical_inflights.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -15,12 +16,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure2 {
     constructor({  }) {
@@ -33,7 +35,7 @@ module.exports = function({  }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -43,22 +45,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -68,33 +57,35 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -102,26 +93,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -129,8 +125,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const x = new $Closure1(this, "$Closure1");
@@ -140,6 +141,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "identical_inflights.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_test_sim.md
index 58c1064704e..e1370c281f2 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/identical_inflights.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ identical_inflights.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_compile_tf-aws.md
index 72bb99e68ee..caf2cd8e6aa 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [impl_interface.test.w](../../../../../examples/tests/valid/impl_interface.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $x }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $i3 }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,17 +32,63 @@ module.exports = function({ $i3 }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: i3.method2(\"hello\") == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $i3.method2("hello")),"hello")))};
+      $helpers.assert($helpers.eq((await $i3.method2("hello")), "hello"), "i3.method2(\"hello\") == \"hello\"");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.A-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      class MyDog {
+        async bark() {
+          console.log("woof");
+        }
+      }
+      const dog = (await (async () => {const o = new MyDog(); await o.$inflight_init?.(); return o; })());
+      (await dog.bark());
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
+```
+
+## inflight.$Closure4-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class $Closure4 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+    }
+  }
+  return $Closure4;
+}
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
+```
+
+## inflight.A-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -54,12 +102,13 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## inflight.Dog-1.js
-```js
+## inflight.Dog-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Dog {
     constructor({  }) {
@@ -70,12 +119,93 @@ module.exports = function({  }) {
   }
   return Dog;
 }
-//# sourceMappingURL=inflight.Dog-1.js.map
+//# sourceMappingURL=inflight.Dog-1.cjs.map
 ```
 
-## inflight.Terrier-1.js
-```js
+## inflight.ImplInflightIfaceInInflightClass-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class ImplInflightIfaceInInflightClass {
+    async inflight_method() {
+      return;
+    }
+  }
+  return ImplInflightIfaceInInflightClass;
+}
+//# sourceMappingURL=inflight.ImplInflightIfaceInInflightClass-1.cjs.map
+```
+
+## inflight.ImplInflightIfaceInPreflightClass-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class ImplInflightIfaceInPreflightClass {
+    constructor({  }) {
+    }
+    async inflight_method() {
+      return;
+    }
+  }
+  return ImplInflightIfaceInPreflightClass;
+}
+//# sourceMappingURL=inflight.ImplInflightIfaceInPreflightClass-1.cjs.map
+```
+
+## inflight.ImplPreflightIfaceInPreflightClass-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class ImplPreflightIfaceInPreflightClass {
+    constructor({  }) {
+    }
+  }
+  return ImplPreflightIfaceInPreflightClass;
+}
+//# sourceMappingURL=inflight.ImplPreflightIfaceInPreflightClass-1.cjs.map
+```
+
+## inflight.ImplementInflightIfaceInPreflightClass-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class ImplementInflightIfaceInPreflightClass {
+    constructor({  }) {
+    }
+    async inflight_method() {
+      return;
+    }
+  }
+  return ImplementInflightIfaceInPreflightClass;
+}
+//# sourceMappingURL=inflight.ImplementInflightIfaceInPreflightClass-1.cjs.map
+```
+
+## inflight.ImplementJsiiIface-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class ImplementJsiiIface {
+    constructor({  }) {
+    }
+    async inflight_method() {
+      return;
+    }
+  }
+  return ImplementJsiiIface;
+}
+//# sourceMappingURL=inflight.ImplementJsiiIface-1.cjs.map
+```
+
+## inflight.Terrier-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Dog }) {
   class Terrier extends $Dog {
     constructor({  }) {
@@ -87,12 +217,13 @@ module.exports = function({ $Dog }) {
   }
   return Terrier;
 }
-//# sourceMappingURL=inflight.Terrier-1.js.map
+//# sourceMappingURL=inflight.Terrier-1.cjs.map
 ```
 
-## inflight.r-1.js
-```js
+## inflight.r-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class r {
     constructor({  }) {
@@ -103,7 +234,7 @@ module.exports = function({  }) {
   }
   return r;
 }
-//# sourceMappingURL=inflight.r-1.js.map
+//# sourceMappingURL=inflight.r-1.cjs.map
 ```
 
 ## main.tf.json
@@ -113,22 +244,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -138,33 +256,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
+const jsii_fixture = require("jsii-fixture");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class A extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -172,19 +293,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -192,7 +318,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -200,14 +326,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(x, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, ["handle"]],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
     class r extends $stdlib.std.Resource {
@@ -222,14 +349,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.r-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.r-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const rClient = ${r._toInflightType(this)};
+            const rClient = ${r._toInflightType()};
             const client = new rClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -237,19 +364,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "method2", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "method2": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $i3: ${$stdlib.core.liftObject(i3)},
           })
         `;
@@ -257,7 +389,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -265,14 +397,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(i3, host, ["method2"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [i3, ["method2"]],
+          ],
+          "$inflight_init": [
+            [i3, []],
+          ],
+        });
       }
     }
     class Dog extends $stdlib.std.Resource {
@@ -281,14 +414,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Dog-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Dog-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const DogClient = ${Dog._toInflightType(this)};
+            const DogClient = ${Dog._toInflightType()};
             const client = new DogClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -296,8 +429,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "eat", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "eat": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Terrier extends Dog {
@@ -306,7 +444,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Terrier-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Terrier-1.cjs")({
             $Dog: ${$stdlib.core.liftObject(Dog)},
           })
         `;
@@ -314,7 +452,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const TerrierClient = ${Terrier._toInflightType(this)};
+            const TerrierClient = ${Terrier._toInflightType()};
             const client = new TerrierClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -322,8 +460,231 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "eat", "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "eat": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class ImplementJsiiIface extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      method() {
+        return;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.ImplementJsiiIface-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const ImplementJsiiIfaceClient = ${ImplementJsiiIface._toInflightType()};
+            const client = new ImplementJsiiIfaceClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "inflight_method": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class ImplementInflightIfaceInPreflightClass extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.ImplementInflightIfaceInPreflightClass-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const ImplementInflightIfaceInPreflightClassClient = ${ImplementInflightIfaceInPreflightClass._toInflightType()};
+            const client = new ImplementInflightIfaceInPreflightClassClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "inflight_method": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class ImplInflightIfaceInInflightClass extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.ImplInflightIfaceInInflightClass-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const ImplInflightIfaceInInflightClassClient = ${ImplInflightIfaceInInflightClass._toInflightType()};
+            const client = new ImplInflightIfaceInInflightClassClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "inflight_method": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class ImplInflightIfaceInPreflightClass extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.ImplInflightIfaceInPreflightClass-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const ImplInflightIfaceInPreflightClassClient = ${ImplInflightIfaceInPreflightClass._toInflightType()};
+            const client = new ImplInflightIfaceInPreflightClassClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "inflight_method": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class ImplPreflightIfaceInPreflightClass extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      method() {
+        return;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.ImplPreflightIfaceInPreflightClass-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const ImplPreflightIfaceInPreflightClassClient = ${ImplPreflightIfaceInPreflightClass._toInflightType()};
+            const client = new ImplPreflightIfaceInPreflightClassClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const x = new A(this, "A");
@@ -331,16 +692,18 @@ class $Root extends $stdlib.std.Resource {
     const i3 = ((() => {
       return new r(this, "r");
     })());
-    {((cond) => {if (!cond) throw new Error("assertion failed: i3.method1(1) == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((i3.method1(1)),1)))};
+    $helpers.assert($helpers.eq((i3.method1(1)), 1), "i3.method1(1) == 1");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:can call inherited inflight interface method", new $Closure2(this, "$Closure2"));
-    {((cond) => {if (!cond) throw new Error("assertion failed: i3.method3([1, 2, 3]) == [1, 2, 3]")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((i3.method3([1, 2, 3])),[1, 2, 3])))};
+    $helpers.assert($helpers.eq((i3.method3([1, 2, 3])), [1, 2, 3]), "i3.method3([1, 2, 3]) == [1, 2, 3]");
     const z = new Dog(this, "Dog");
     const w = new Terrier(this, "Terrier");
+    const f = new $Closure3(this, "$Closure3");
+    new $Closure4(this, "$Closure4");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "impl_interface.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_test_sim.md
index 0bb0e670076..b71e90a3214 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/impl_interface.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ impl_interface.test.wsim » root/env0/test:can call inherited inflight interface method
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_compile_tf-aws.md
index a77ace1a5cc..3086f935883 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,26 +19,28 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     const d = (std.Duration.fromMinutes(5));
     const n = ((args) => { if (isNaN(args)) {throw new Error("unable to parse \"" + args + "\" as a number")}; return Number(args) })("12");
-    {((cond) => {if (!cond) throw new Error("assertion failed: d.seconds == 5 * 60")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(d.seconds,(5 * 60))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: n == 12")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(n,12)))};
+    $helpers.assert($helpers.eq(d.seconds, (5 * 60)), "d.seconds == 5 * 60");
+    $helpers.assert($helpers.eq(n, 12), "n == 12");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "implicit_std.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_test_sim.md
index 9f10430c008..cab24f5f239 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/implicit_std.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ implicit_std.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_compile_tf-aws.md
index 265acea6889..8ae55982b3c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [in_scope_construct.test.w](../../../../../examples/tests/valid/in_scope_construct.test.w) | compile | tf-aws
 
-## inflight.MyClass-1.js
-```js
+## inflight.MyClass-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyClass {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return MyClass;
 }
-//# sourceMappingURL=inflight.MyClass-1.js.map
+//# sourceMappingURL=inflight.MyClass-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -45,14 +33,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const c = require("constructs");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -63,14 +53,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyClass-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyClass-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyClassClient = ${MyClass._toInflightType(this)};
+            const MyClassClient = ${MyClass._toInflightType()};
             const client = new MyClassClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -78,16 +68,19 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    new MyClass(this.node.root.new("constructs.Construct", c.Construct, this, "c.Construct"), "MyClass");
+    new MyClass(this.node.root.new("constructs.Construct", c.Construct, this, "Construct"), "MyClass");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "in_scope_construct.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_test_sim.md
index cd850763733..fcf9c56575d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/in_scope_construct.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ in_scope_construct.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/indexing.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/indexing.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..11d7a61fd58
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/indexing.test.w_compile_tf-aws.md
@@ -0,0 +1,150 @@
+# [indexing.test.w](../../../../../examples/tests/valid/indexing.test.w) | compile | tf-aws
+
+## inflight.A-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class A {
+    constructor({  }) {
+    }
+  }
+  return A;
+}
+//# sourceMappingURL=inflight.A-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+const expect = $stdlib.expect;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class A extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        this.value = 5;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const AClient = ${A._toInflightType()};
+            const client = new AClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    const arr = [1, 2, 3];
+    $helpers.assert($helpers.eq($helpers.lookup(arr, 0), 1), "arr[0] == 1");
+    $helpers.assert($helpers.eq($helpers.lookup(arr, (2 - 5)), 1), "arr[2 - 5] == 1");
+    $helpers.assert($helpers.neq($helpers.lookup(arr, 0), $helpers.lookup(arr, 1)), "arr[0] != arr[1]");
+    try {
+      $helpers.lookup(arr, (-5));
+    }
+    catch ($error_e) {
+      const e = $error_e.message;
+      $helpers.assert($helpers.eq(e, "Index -5 out of bounds for array of length 3"), "e == \"Index -5 out of bounds for array of length 3\"");
+    }
+    try {
+      $helpers.lookup(arr, 5);
+    }
+    catch ($error_e) {
+      const e = $error_e.message;
+      $helpers.assert($helpers.eq(e, "Index 5 out of bounds for array of length 3"), "e == \"Index 5 out of bounds for array of length 3\"");
+    }
+    const map = ({["us-east-1"]: 5, ["us-west-2"]: 8});
+    (expect.Util.equal($helpers.lookup(map, "us-east-1"), 5));
+    try {
+      $helpers.lookup(map, "us-west-1");
+    }
+    catch ($error_e) {
+      const e = $error_e.message;
+      $helpers.assert($helpers.eq(e, "Key \"us-west-1\" not found"), "e == \"Key \\\"us-west-1\\\" not found\"");
+    }
+    const obj = ({"a": "string", "b": [4, 5, 6]});
+    (expect.Util.equal($helpers.lookup(obj, "a"), "string"));
+    (expect.Util.equal($helpers.lookup($helpers.lookup(obj, "b"), 0), 4));
+    try {
+      $helpers.lookup(obj, "c");
+    }
+    catch ($error_e) {
+      const e = $error_e.message;
+      $helpers.assert($helpers.eq(e, "Key \"c\" not found"), "e == \"Key \\\"c\\\" not found\"");
+    }
+    const mutjson = ({"a": "string", "b": [4, 5, 6]});
+    $helpers.assign(mutjson, "a", "=", true);
+    (expect.Util.equal($helpers.lookup(mutjson, "a"), true));
+    $helpers.assign(mutjson, "c", "=", 10);
+    try {
+      $helpers.lookup($helpers.lookup(mutjson, "b"), 4);
+    }
+    catch ($error_e) {
+      const e = $error_e.message;
+      $helpers.assert($helpers.eq(e, "Index 4 out of bounds for array of length 3"), "e == \"Index 4 out of bounds for array of length 3\"");
+    }
+    const mutarr = [1, 2, 3];
+    $helpers.assign(mutarr, (-3), "=", 5);
+    $helpers.assign(mutarr, (10 - 8), "=", 10);
+    (expect.Util.equal(mutarr, [5, 2, 10]));
+    const s = "hello world";
+    (expect.Util.equal($helpers.lookup(s, 4), "o"));
+    const a = new A(this, "A");
+    const mutarr2 = [a];
+    $helpers.lookup(mutarr2, 0).value = 10;
+    (expect.Util.equal(a.value, 10));
+    const nested = [[1, 2], [3, 4]];
+    $helpers.assert($helpers.eq($helpers.lookup($helpers.lookup(nested, 0), 0), 1), "nested[0][0] == 1");
+    $helpers.assert($helpers.eq($helpers.lookup($helpers.lookup(nested, (-1)), (-1)), 4), "nested[-1][-1] == 4");
+    $helpers.assign($helpers.lookup(nested, 0), 0, "=", 5);
+    $helpers.assert($helpers.eq($helpers.lookup($helpers.lookup(nested, 0), 0), 5), "nested[0][0] == 5");
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "indexing.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/indexing.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/indexing.test.w_test_sim.md
new file mode 100644
index 00000000000..d1e134bfff0
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/indexing.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [indexing.test.w](../../../../../examples/tests/valid/indexing.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ indexing.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_compile_tf-aws.md
index 38f663bc47c..ed9ebd76926 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inference.test.w](../../../../../examples/tests/valid/inference.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,7 +17,7 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -26,19 +27,33 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -51,8 +66,8 @@ module.exports = function({  }) {
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -62,103 +77,103 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/hello/world\":{\"get\":{\"operationId\":\"get-hello/world\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_hello_world_0_544AFF00.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/hello/world\":{\"get\":{\"operationId\":\"get-hello/world\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_hello_world0-c8808650/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_hello_world_0_CloudwatchLogGroup_1B6F3287": {
+      "Api_get_hello_world0_CloudwatchLogGroup_6629DDA5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_hello_world_0_CloudwatchLogGroup_1B6F3287"
+            "path": "root/Default/Default/Api/get_hello_world0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_hello_world0_CloudwatchLogGroup_6629DDA5"
           }
         },
-        "name": "/aws/lambda/get_hello_world_-0-c88edd5b",
+        "name": "/aws/lambda/get_hello_world0-c8808650",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_hello_world_0_IamRole_18803888": {
+      "Api_get_hello_world0_IamRole_BE6EA0B6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/IamRole",
-            "uniqueId": "cloudApi_get_hello_world_0_IamRole_18803888"
+            "path": "root/Default/Default/Api/get_hello_world0/IamRole",
+            "uniqueId": "Api_get_hello_world0_IamRole_BE6EA0B6"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_hello_world_0_IamRolePolicy_6EFA235E": {
+      "Api_get_hello_world0_IamRolePolicy_EA874D77": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_hello_world_0_IamRolePolicy_6EFA235E"
+            "path": "root/Default/Default/Api/get_hello_world0/IamRolePolicy",
+            "uniqueId": "Api_get_hello_world0_IamRolePolicy_EA874D77"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_hello_world_0_IamRole_18803888.name}"
+        "role": "${aws_iam_role.Api_get_hello_world0_IamRole_BE6EA0B6.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_hello_world_0_IamRolePolicyAttachment_80FC0127": {
+      "Api_get_hello_world0_IamRolePolicyAttachment_E570C504": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_hello_world_0_IamRolePolicyAttachment_80FC0127"
+            "path": "root/Default/Default/Api/get_hello_world0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_hello_world0_IamRolePolicyAttachment_E570C504"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_hello_world_0_IamRole_18803888.name}"
+        "role": "${aws_iam_role.Api_get_hello_world0_IamRole_BE6EA0B6.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_hello_world_0_544AFF00": {
+      "Api_get_hello_world0_56F26C26": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/Default",
-            "uniqueId": "cloudApi_get_hello_world_0_544AFF00"
+            "path": "root/Default/Default/Api/get_hello_world0/Default",
+            "uniqueId": "Api_get_hello_world0_56F26C26"
           }
         },
         "architectures": [
@@ -167,18 +182,18 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_hello_world_-0-c88edd5b",
+            "WING_FUNCTION_NAME": "get_hello_world0-c8808650",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_hello_world_-0-c88edd5b",
+        "function_name": "get_hello_world0-c8808650",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_hello_world_0_IamRole_18803888.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_hello_world0_IamRole_BE6EA0B6.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_hello_world_0_S3Object_A19D89E0.key}",
+        "s3_key": "${aws_s3_object.Api_get_hello_world0_S3Object_F6755FB0.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -187,17 +202,17 @@ module.exports = function({  }) {
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-ceca4943_9997DB29": {
+      "Api_api_permission-GET-ceca4943_731ED984": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-ceca4943",
-            "uniqueId": "cloudApi_api_permission-GET-ceca4943_9997DB29"
+            "path": "root/Default/Default/Api/api/permission-GET-ceca4943",
+            "uniqueId": "Api_api_permission-GET-ceca4943_731ED984"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_hello_world_0_544AFF00.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_hello_world0_56F26C26.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/hello/world",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/hello/world",
         "statement_id": "AllowExecutionFromAPIGateway-GET-ceca4943"
       }
     },
@@ -213,11 +228,11 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_hello_world_0_S3Object_A19D89E0": {
+      "Api_get_hello_world0_S3Object_F6755FB0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_hello_world_}0/S3Object",
-            "uniqueId": "cloudApi_get_hello_world_0_S3Object_A19D89E0"
+            "path": "root/Default/Default/Api/get_hello_world0/S3Object",
+            "uniqueId": "Api_get_hello_world0_S3Object_F6755FB0"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -229,34 +244,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -264,12 +281,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const preflightClosure = ((nice) => {
-      {console.log(nice)};
+      console.log(nice);
       return true;
     });
     const recursiveClosure = ((nice) => {
@@ -282,14 +304,14 @@ class $Root extends $stdlib.std.Resource {
     const num_array = emptyArray;
     const emptyArray2 = [];
     const clonedArray2 = [...(emptyArray2)];
-    (clonedArray2.push(1));
-    (clonedArray2.push(2));
-    (clonedArray2.push((((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(clonedArray2, 0) + ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(clonedArray2, 1))));
-    {((cond) => {if (!cond) throw new Error("assertion failed: clonedArray2.at(2) == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(clonedArray2, 2),3)))};
+    clonedArray2.push(1);
+    clonedArray2.push(2);
+    clonedArray2.push((((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(clonedArray2, 0) + ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(clonedArray2, 1)));
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(clonedArray2, 2), 3), "clonedArray2.at(2) == 3");
     const emptySet = new Set([((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(clonedArray2, 2)]);
     const clonedSet = new Set(emptySet);
     (clonedSet.add(4));
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
     const func = new $Closure1(this, "$Closure1");
     (api.get("/hello/world", func));
     const argReturn = ((n) => {
@@ -312,15 +334,20 @@ class $Root extends $stdlib.std.Resource {
         const $if_let_value = optionalString;
         if ($if_let_value != undefined) {
           const justString = $if_let_value;
-          {console.log(justString)};
+          console.log(justString);
         }
       }
     });
+    const takesOptionalClosure = ((fn) => {
+    });
+    (takesOptionalClosure(((a) => {
+      return "";
+    })));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inference.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_test_sim.md
index d3b65593560..059ceacafcd 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inference.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inference.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_compile_tf-aws.md
index 2d0c646ee9f..32e4f4a90e5 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight-subscribers.test.w](../../../../../examples/tests/valid/inflight-subscribers.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {console.log("hello, world")};
+      console.log("hello, world");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,12 +32,12 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {console.log("hello, world")};
+      console.log("hello, world");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -45,22 +47,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -69,110 +58,113 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419"
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30
       },
-      "cloudTopic-OnMessage0_CloudwatchLogGroup_EE5F97B3": {
+      "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "cloudTopic-OnMessage0_CloudwatchLogGroup_EE5F97B3"
+            "path": "root/Default/Default/Topic-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Topic-OnMessage0_CloudwatchLogGroup_DE4DF0A1"
           }
         },
-        "name": "/aws/lambda/cloud-Topic-OnMessage0-c81c4559",
+        "name": "/aws/lambda/Topic-OnMessage0-c85d7820",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudTopic-OnMessage0_IamRole_A9AB13E2": {
+      "Topic-OnMessage0_IamRole_64DD36FA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRole",
-            "uniqueId": "cloudTopic-OnMessage0_IamRole_A9AB13E2"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRole",
+            "uniqueId": "Topic-OnMessage0_IamRole_64DD36FA"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.cloudQueue.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       },
-      "cloudTopic-OnMessage0_IamRolePolicy_38E6FB0F": {
+      "Topic-OnMessage0_IamRolePolicy_F5EE09D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRolePolicy",
-            "uniqueId": "cloudTopic-OnMessage0_IamRolePolicy_38E6FB0F"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicy",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicy_F5EE09D8"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.name}"
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       },
-      "cloudTopic-OnMessage0_IamRolePolicyAttachment_0E97F0D4": {
+      "Topic-OnMessage0_IamRolePolicyAttachment_091E665D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "cloudTopic-OnMessage0_IamRolePolicyAttachment_0E97F0D4"
+            "path": "root/Default/Default/Topic-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Topic-OnMessage0_IamRolePolicyAttachment_091E665D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.name}"
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.name}"
       }
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136"
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
           }
         },
         "batch_size": 1,
-        "event_source_arn": "${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "${aws_lambda_function.cloudQueue-SetConsumer0.function_name}"
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0"
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
           }
         },
         "architectures": [
@@ -181,29 +173,29 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudTopic-OnMessage0": {
+      "Topic-OnMessage0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/Default",
-            "uniqueId": "cloudTopic-OnMessage0"
+            "path": "root/Default/Default/Topic-OnMessage0/Default",
+            "uniqueId": "Topic-OnMessage0"
           }
         },
         "architectures": [
@@ -212,18 +204,18 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Topic-OnMessage0-c81c4559",
+            "WING_FUNCTION_NAME": "Topic-OnMessage0-c85d7820",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Topic-OnMessage0-c81c4559",
+        "function_name": "Topic-OnMessage0-c85d7820",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudTopic-OnMessage0_IamRole_A9AB13E2.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Topic-OnMessage0_IamRole_64DD36FA.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudTopic-OnMessage0_S3Object_751FA064.key}",
+        "s3_key": "${aws_s3_object.Topic-OnMessage0_S3Object_D41E9C10.key}",
         "timeout": 180,
         "vpc_config": {
           "security_group_ids": [],
@@ -232,17 +224,17 @@ module.exports = function({  }) {
       }
     },
     "aws_lambda_permission": {
-      "cloudTopic-OnMessage0_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_91E7486D": {
+      "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b",
-            "uniqueId": "cloudTopic-OnMessage0_InvokePermission-c82b57aa3e58b626b884e8374e59ec192cf61df91b_91E7486D"
+            "path": "root/Default/Default/Topic-OnMessage0/InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2",
+            "uniqueId": "Topic-OnMessage0_InvokePermission-c8228fb70d825c2a5610c610e5246d5313ea6bd1a2_2E2D0106"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudTopic-OnMessage0.function_name}",
+        "function_name": "${aws_lambda_function.Topic-OnMessage0.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "source_arn": "${aws_sns_topic.Topic.arn}"
       }
     },
     "aws_s3_bucket": {
@@ -257,22 +249,22 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF"
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudTopic-OnMessage0_S3Object_751FA064": {
+      "Topic-OnMessage0_S3Object_D41E9C10": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic-OnMessage0/S3Object",
-            "uniqueId": "cloudTopic-OnMessage0_S3Object_751FA064"
+            "path": "root/Default/Default/Topic-OnMessage0/S3Object",
+            "uniqueId": "Topic-OnMessage0_S3Object_D41E9C10"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -281,39 +273,39 @@ module.exports = function({  }) {
       }
     },
     "aws_sns_topic": {
-      "cloudTopic": {
+      "Topic": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic/Default",
-            "uniqueId": "cloudTopic"
+            "path": "root/Default/Default/Topic/Default",
+            "uniqueId": "Topic"
           }
         },
-        "name": "cloud-Topic-c82b57aa"
+        "name": "Topic-c8228fb7"
       }
     },
     "aws_sns_topic_subscription": {
-      "cloudTopic_TopicSubscription0_D19DE229": {
+      "Topic_TopicSubscription0_0EA5CC90": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Topic/TopicSubscription0",
-            "uniqueId": "cloudTopic_TopicSubscription0_D19DE229"
+            "path": "root/Default/Default/Topic/TopicSubscription0",
+            "uniqueId": "Topic_TopicSubscription0_0EA5CC90"
           }
         },
-        "endpoint": "${aws_lambda_function.cloudTopic-OnMessage0.arn}",
+        "endpoint": "${aws_lambda_function.Topic-OnMessage0.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.cloudTopic.arn}"
+        "topic_arn": "${aws_sns_topic.Topic.arn}"
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
@@ -321,34 +313,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -356,26 +350,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -383,17 +382,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    (this.node.root.new("@winglang/sdk.cloud.Topic", cloud.Topic, this, "cloud.Topic").onMessage(new $Closure1(this, "$Closure1"), { timeout: (std.Duration.fromSeconds(180)) }));
-    (this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue").setConsumer(new $Closure2(this, "$Closure2"), { timeout: (std.Duration.fromSeconds(180)) }));
+    (this.node.root.new("@winglang/sdk.cloud.Topic", cloud.Topic, this, "Topic").onMessage(new $Closure1(this, "$Closure1"), { timeout: (std.Duration.fromSeconds(180)) }));
+    (this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue").setConsumer(new $Closure2(this, "$Closure2"), { timeout: (std.Duration.fromSeconds(180)) }));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight-subscribers.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_test_sim.md
index e78903ebc36..7f60a15a652 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight-subscribers.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight-subscribers.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_compile_tf-aws.md
index 62ea6ee285f..7f67e80adcf 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_capture_static.test.w](../../../../../examples/tests/valid/inflight_capture_static.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Preflight }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({ $Preflight }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: Preflight.staticMethod(123) == \"foo-123\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $Preflight.staticMethod(123)),"foo-123")))};
+      $helpers.assert($helpers.eq((await $Preflight.staticMethod(123)), "foo-123"), "Preflight.staticMethod(123) == \"foo-123\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $OuterInflight }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,17 +32,18 @@ module.exports = function({ $OuterInflight }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: OuterInflight.staticMethod(\"hello\") == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $OuterInflight.staticMethod("hello")),5)))};
+      $helpers.assert($helpers.eq((await $OuterInflight.staticMethod("hello")), 5), "OuterInflight.staticMethod(\"hello\") == 5");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure3 {
     constructor({  }) {
@@ -54,17 +57,18 @@ module.exports = function({  }) {
           return "hello";
         }
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: InnerInflight.staticMethod() == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await InnerInflight.staticMethod()),"hello")))};
+      $helpers.assert($helpers.eq((await InnerInflight.staticMethod()), "hello"), "InnerInflight.staticMethod() == \"hello\"");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $util_Util }) {
   class $Closure4 {
     constructor({  }) {
@@ -77,22 +81,23 @@ module.exports = function({ $util_Util }) {
         const $if_let_value = (await $util_Util.tryEnv("WING_TARGET"));
         if ($if_let_value != undefined) {
           const target = $if_let_value;
-          {console.log(String.raw({ raw: ["WING_TARGET=", ""] }, target))};
+          console.log(String.raw({ raw: ["WING_TARGET=", ""] }, target));
         }
         else {
-          {((cond) => {if (!cond) throw new Error("assertion failed: false /* target not defined*/")})(false)};
+          $helpers.assert(false, "false /* target not defined*/");
         }
       }
     }
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.OuterInflight-1.js
-```js
+## inflight.OuterInflight-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class OuterInflight {
     static async staticMethod(b) {
@@ -101,12 +106,13 @@ module.exports = function({  }) {
   }
   return OuterInflight;
 }
-//# sourceMappingURL=inflight.OuterInflight-1.js.map
+//# sourceMappingURL=inflight.OuterInflight-1.cjs.map
 ```
 
-## inflight.Preflight-1.js
-```js
+## inflight.Preflight-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Preflight {
     constructor({  }) {
@@ -117,7 +123,7 @@ module.exports = function({  }) {
   }
   return Preflight;
 }
-//# sourceMappingURL=inflight.Preflight-1.js.map
+//# sourceMappingURL=inflight.Preflight-1.cjs.map
 ```
 
 ## main.tf.json
@@ -127,22 +133,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -152,14 +145,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -170,14 +165,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Preflight-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Preflight-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const PreflightClient = ${Preflight._toInflightType(this)};
+            const PreflightClient = ${Preflight._toInflightType()};
             const client = new PreflightClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -185,8 +180,17 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "staticMethod", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "staticMethod": [
+          ],
+        });
       }
     }
     class OuterInflight extends $stdlib.std.Resource {
@@ -195,14 +199,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.OuterInflight-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.OuterInflight-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const OuterInflightClient = ${OuterInflight._toInflightType(this)};
+            const OuterInflightClient = ${OuterInflight._toInflightType()};
             const client = new OuterInflightClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -210,19 +214,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "staticMethod", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "staticMethod": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Preflight: ${$stdlib.core.liftObject(Preflight)},
           })
         `;
@@ -230,7 +243,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -238,25 +251,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(Preflight, host, ["staticMethod"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [Preflight, ["staticMethod"]],
+          ],
+          "$inflight_init": [
+            [Preflight, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $OuterInflight: ${$stdlib.core.liftObject(OuterInflight)},
           })
         `;
@@ -264,7 +278,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -272,26 +286,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -299,19 +318,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
             $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
           })
         `;
@@ -319,7 +343,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -327,8 +351,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:call static method of preflight", new $Closure1(this, "$Closure1"));
@@ -340,6 +369,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_capture_static.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_test_sim.md
index 2287014d706..a5a855d700f 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_capture_static.test.w_test_sim.md
@@ -2,14 +2,14 @@
 
 ## stdout.log
 ```log
+[INFO] call static method of a namespaced type | WING_TARGET=sim
 pass ─ inflight_capture_static.test.wsim » root/env0/test:call static method of preflight              
 pass ─ inflight_capture_static.test.wsim » root/env1/test:call static method of an outer inflight class
 pass ─ inflight_capture_static.test.wsim » root/env2/test:call static method of an inner inflight class
-pass ┌ inflight_capture_static.test.wsim » root/env3/test:call static method of a namespaced type      
-     └ WING_TARGET=sim
- 
- 
+pass ─ inflight_capture_static.test.wsim » root/env3/test:call static method of a namespaced type      
+
 Tests 4 passed (4)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_compile_tf-aws.md
index 26eeffd91e0..1b2a1dcf38c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_as_struct_members.test.w](../../../../../examples/tests/valid/inflight_class_as_struct_members.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $Foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $getBar }) {
   class $Closure2 {
     constructor({  }) {
@@ -31,17 +33,18 @@ module.exports = function({ $getBar }) {
     }
     async handle() {
       const bar = (await $getBar());
-      {((cond) => {if (!cond) throw new Error("assertion failed: bar.foo.get() == 42")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await bar.foo.get()),42)))};
+      $helpers.assert($helpers.eq((await bar.foo.get()), 42), "bar.foo.get() == 42");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     async get() {
@@ -50,7 +53,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -60,22 +63,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -85,14 +75,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -102,14 +94,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -117,19 +109,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "get", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "get": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -137,7 +134,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -145,19 +142,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $getBar: ${$stdlib.core.liftObject(getBar)},
           })
         `;
@@ -165,7 +167,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -173,14 +175,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(getBar, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [getBar, ["handle"]],
+          ],
+          "$inflight_init": [
+            [getBar, []],
+          ],
+        });
       }
     }
     const getBar = new $Closure1(this, "$Closure1");
@@ -190,6 +193,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_as_struct_members.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_test_sim.md
index b2467ec3dd4..f871a46688c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_as_struct_members.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_as_struct_members.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_compile_tf-aws.md
index 04fd8a598f4..b8eb8f5eb65 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_capture_const.test.w](../../../../../examples/tests/valid/inflight_class_capture_const.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo, $myConst }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,17 +13,18 @@ module.exports = function({ $Foo, $myConst }) {
     }
     async handle() {
       const x = (await (async () => {const o = new $Foo(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: x.getValue() == myConst")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await x.getValue()),$myConst)))};
+      $helpers.assert($helpers.eq((await x.getValue()), $myConst), "x.getValue() == myConst");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $myConst }) {
   class Foo {
     async getValue() {
@@ -31,7 +33,7 @@ module.exports = function({ $myConst }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -41,22 +43,9 @@ module.exports = function({ $myConst }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -66,14 +55,16 @@ module.exports = function({ $myConst }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -84,7 +75,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $myConst: ${$stdlib.core.liftObject(myConst)},
           })
         `;
@@ -92,7 +83,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -100,25 +91,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "getValue", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("getValue")) {
-          Foo._registerOnLiftObject(myConst, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "getValue": [
+            [myConst, []],
+          ],
+          "$inflight_init": [
+            [myConst, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
             $myConst: ${$stdlib.core.liftObject(myConst)},
           })
@@ -127,7 +119,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -135,14 +127,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(myConst, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [myConst, []],
+          ],
+          "$inflight_init": [
+            [myConst, []],
+          ],
+        });
       }
     }
     const myConst = "bang bang";
@@ -152,6 +145,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_capture_const.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_test_sim.md
index 0c0b6f99511..19f28bbfc1b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_const.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_capture_const.test.wsim » root/env0/test:inflight class captures const
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_compile_tf-aws.md
index 4b37d26c053..570536b9cec 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,14 +19,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -48,6 +37,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_capture_preflight_object.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_test_sim.md
index 2be4c0ce123..e9aae34f065 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_capture_preflight_object.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_capture_preflight_object.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_compile_tf-aws.md
index b859dc29ff2..e1d3da35aa7 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_definitions.test.w](../../../../../examples/tests/valid/inflight_class_definitions.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -17,17 +18,18 @@ module.exports = function({  }) {
         }
       }
       const c = (await (async () => {const o = new C(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: c.foo() == \"c1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await c.foo()),"c1")))};
+      $helpers.assert($helpers.eq((await c.foo()), "c1"), "c.foo() == \"c1\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $F }) {
   class $Closure2 {
     constructor({  }) {
@@ -41,12 +43,13 @@ module.exports = function({ $F }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $B, $a, $d, $fn, $innerD }) {
   class $Closure3 {
     constructor({  }) {
@@ -55,22 +58,23 @@ module.exports = function({ $B, $a, $d, $fn, $innerD }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: a.goo() == \"a2\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $a.goo()),"a2")))};
+      $helpers.assert($helpers.eq((await $a.goo()), "a2"), "a.goo() == \"a2\"");
       const b = (await (async () => {const o = new $B(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: b.foo() == \"b1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await b.foo()),"b1")))};
+      $helpers.assert($helpers.eq((await b.foo()), "b1"), "b.foo() == \"b1\"");
       (await $fn());
-      {((cond) => {if (!cond) throw new Error("assertion failed: d.callInner() == \"f1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $d.callInner()),"f1")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: innerD() == \"f1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $innerD()),"f1")))};
+      $helpers.assert($helpers.eq((await $d.callInner()), "f1"), "d.callInner() == \"f1\"");
+      $helpers.assert($helpers.eq((await $innerD()), "f1"), "innerD() == \"f1\"");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.A-1.js
-```js
+## inflight.A-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -81,12 +85,13 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## inflight.B-1.js
-```js
+## inflight.B-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class B {
     async foo() {
@@ -95,12 +100,13 @@ module.exports = function({  }) {
   }
   return B;
 }
-//# sourceMappingURL=inflight.B-1.js.map
+//# sourceMappingURL=inflight.B-1.cjs.map
 ```
 
-## inflight.D-1.js
-```js
+## inflight.D-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class D {
     constructor({ $this_inner }) {
@@ -112,12 +118,13 @@ module.exports = function({  }) {
   }
   return D;
 }
-//# sourceMappingURL=inflight.D-1.js.map
+//# sourceMappingURL=inflight.D-1.cjs.map
 ```
 
-## inflight.E-1.js
-```js
+## inflight.E-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class E {
     constructor({  }) {
@@ -125,12 +132,13 @@ module.exports = function({  }) {
   }
   return E;
 }
-//# sourceMappingURL=inflight.E-1.js.map
+//# sourceMappingURL=inflight.E-1.cjs.map
 ```
 
-## inflight.F-1.js
-```js
+## inflight.F-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class F {
     async foo() {
@@ -139,7 +147,7 @@ module.exports = function({  }) {
   }
   return F;
 }
-//# sourceMappingURL=inflight.F-1.js.map
+//# sourceMappingURL=inflight.F-1.cjs.map
 ```
 
 ## main.tf.json
@@ -149,22 +157,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -174,14 +169,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -194,14 +191,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -209,8 +206,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "goo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "goo": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class B extends $stdlib.std.Resource {
@@ -219,14 +221,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.B-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BClient = ${B._toInflightType(this)};
+            const BClient = ${B._toInflightType()};
             const client = new BClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -234,26 +236,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "foo": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -261,8 +268,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class D extends $stdlib.std.Resource {
@@ -277,14 +289,14 @@ class $Root extends $stdlib.std.Resource {
           }
           static _toInflightType() {
             return `
-              require("./inflight.E-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.E-1.cjs")({
               })
             `;
           }
           _toInflight() {
             return `
               (await (async () => {
-                const EClient = ${E._toInflightType(this)};
+                const EClient = ${E._toInflightType()};
                 const client = new EClient({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -292,26 +304,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "$inflight_init"];
+          get _liftMap() {
+            return ({
+              "$inflight_init": [
+              ],
+            });
           }
         }
         const pb = new E(this, "E");
-        {((cond) => {if (!cond) throw new Error("assertion failed: pb.foo() == \"e1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((pb.foo()),"e1")))};
+        $helpers.assert($helpers.eq((pb.foo()), "e1"), "pb.foo() == \"e1\"");
         class F extends $stdlib.std.Resource {
           constructor($scope, $id, ) {
             super($scope, $id);
           }
           static _toInflightType() {
             return `
-              require("./inflight.F-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.F-1.cjs")({
               })
             `;
           }
           _toInflight() {
             return `
               (await (async () => {
-                const FClient = ${F._toInflightType(this)};
+                const FClient = ${F._toInflightType()};
                 const client = new FClient({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -319,20 +334,24 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "foo", "$inflight_init"];
+          get _liftMap() {
+            return ({
+              "foo": [
+              ],
+              "$inflight_init": [
+              ],
+            });
           }
         }
-        const __parent_this_2 = this;
-        class $Closure2 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure2 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure2-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
                 $F: ${$stdlib.core.liftObject(F)},
               })
             `;
@@ -340,7 +359,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure2Client = ${$Closure2._toInflightType(this)};
+                const $Closure2Client = ${$Closure2._toInflightType()};
                 const client = new $Closure2Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -348,8 +367,13 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
+          get _liftMap() {
+            return ({
+              "handle": [
+              ],
+              "$inflight_init": [
+              ],
+            });
           }
         }
         this.inner = new $Closure2(this, "$Closure2");
@@ -359,14 +383,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.D-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.D-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const DClient = ${D._toInflightType(this)};
+            const DClient = ${D._toInflightType()};
             const client = new DClient({
               $this_inner: ${$stdlib.core.liftObject(this.inner)},
             });
@@ -375,28 +399,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "callInner", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          D._registerOnLiftObject(this.inner, host, []);
-        }
-        if (ops.includes("callInner")) {
-          D._registerOnLiftObject(this.inner, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "callInner": [
+            [this.inner, ["handle"]],
+          ],
+          "$inflight_init": [
+            [this.inner, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $B: ${$stdlib.core.liftObject(B)},
             $a: ${$stdlib.core.liftObject(a)},
             $d: ${$stdlib.core.liftObject(d)},
@@ -408,7 +430,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -416,21 +438,25 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(a, host, ["goo"]);
-          $Closure3._registerOnLiftObject(d, host, ["callInner"]);
-          $Closure3._registerOnLiftObject(fn, host, ["handle"]);
-          $Closure3._registerOnLiftObject(innerD, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [a, ["goo"]],
+            [d, ["callInner"]],
+            [fn, ["handle"]],
+            [innerD, ["handle"]],
+          ],
+          "$inflight_init": [
+            [a, []],
+            [d, []],
+            [fn, []],
+            [innerD, []],
+          ],
+        });
       }
     }
     const a = new A(this, "A");
-    {((cond) => {if (!cond) throw new Error("assertion failed: a.foo() == \"a1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((a.foo()),"a1")))};
+    $helpers.assert($helpers.eq((a.foo()), "a1"), "a.foo() == \"a1\"");
     const fn = new $Closure1(this, "$Closure1");
     const d = new D(this, "D");
     const innerD = (d.getInner());
@@ -440,6 +466,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_definitions.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_test_sim.md
index 4a9a6f79686..ad602343b8b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_definitions.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_definitions.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_compile_tf-aws.md
index 44ffad6ee19..f00e099cee6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_inner_capture_mutable.test.w](../../../../../examples/tests/valid/inflight_class_inner_capture_mutable.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -15,19 +16,19 @@ module.exports = function({  }) {
       let i = 10;
       class Inner {
         async dang() {
-          (await y.push(2));
+          y.push(2);
           i = (i + 1);
           return (((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(y, 0) + 10);
         }
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: new Inner().dang() == 11")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await (await (async () => {const o = new Inner(); await o.$inflight_init?.(); return o; })()).dang()),11)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: y.at(1) == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(y, 1),2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: i == 11")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(i,11)))};
+      $helpers.assert($helpers.eq((await (await (async () => {const o = new Inner(); await o.$inflight_init?.(); return o; })()).dang()), 11), "new Inner().dang() == 11");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(y, 1), 2), "y.at(1) == 2");
+      $helpers.assert($helpers.eq(i, 11), "i == 11");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -37,22 +38,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -62,34 +50,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -97,8 +87,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inner inflight class capture immutable", new $Closure1(this, "$Closure1"));
@@ -107,6 +102,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_inner_capture_mutable.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_test_sim.md
index 7a37dcfa1a8..8ccb923a446 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inner_capture_mutable.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_inner_capture_mutable.test.wsim » root/env0/test:inner inflight class capture immutable
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_compile_tf-aws.md
index 5c3c63fcdae..a4590c97062 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_inside_inflight_closure.test.w](../../../../../examples/tests/valid/inflight_class_inside_inflight_closure.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_1_b }) {
   class $Closure1 {
     constructor({  }) {
@@ -10,11 +11,11 @@ module.exports = function({ $__parent_this_1_b }) {
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(payload) {
+    async handle() {
       (await $__parent_this_1_b.put("k", "v"));
       class InflightClass {
         async method() {
-          {((cond) => {if (!cond) throw new Error("assertion failed: this.field == \"value\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.field,"value")))};
+          $helpers.assert($helpers.eq(this.field, "value"), "this.field == \"value\"");
         }
         constructor(){
           this.$inflight_init = async () => {
@@ -28,12 +29,13 @@ module.exports = function({ $__parent_this_1_b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $f }) {
   class $Closure2 {
     constructor({  }) {
@@ -47,12 +49,13 @@ module.exports = function({ $f }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure3 {
     constructor({  }) {
@@ -69,17 +72,18 @@ module.exports = function({  }) {
       }
       const foo = (await (async () => {const o = new Foo(); await o.$inflight_init?.(); return o; })());
       const y = (await foo.getX());
-      {((cond) => {if (!cond) throw new Error("assertion failed: y == 12")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,12)))};
+      $helpers.assert($helpers.eq(y, 12), "y == 12");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.PreflightClass-1.js
-```js
+## inflight.PreflightClass-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class PreflightClass {
     constructor({  }) {
@@ -87,7 +91,7 @@ module.exports = function({  }) {
   }
   return PreflightClass;
 }
-//# sourceMappingURL=inflight.PreflightClass-1.js.map
+//# sourceMappingURL=inflight.PreflightClass-1.cjs.map
 ```
 
 ## main.tf.json
@@ -97,22 +101,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -121,58 +112,58 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "PreflightClass_cloudFunction_CloudwatchLogGroup_0BDDEF5D": {
+      "PreflightClass_Function_CloudwatchLogGroup_06161414": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/PreflightClass/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "PreflightClass_cloudFunction_CloudwatchLogGroup_0BDDEF5D"
+            "path": "root/Default/Default/PreflightClass/Function/CloudwatchLogGroup",
+            "uniqueId": "PreflightClass_Function_CloudwatchLogGroup_06161414"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8db99e3",
+        "name": "/aws/lambda/Function-c8565504",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "PreflightClass_cloudFunction_IamRole_60AD4A3B": {
+      "PreflightClass_Function_IamRole_A6FFCAE6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/PreflightClass/cloud.Function/IamRole",
-            "uniqueId": "PreflightClass_cloudFunction_IamRole_60AD4A3B"
+            "path": "root/Default/Default/PreflightClass/Function/IamRole",
+            "uniqueId": "PreflightClass_Function_IamRole_A6FFCAE6"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "PreflightClass_cloudFunction_IamRolePolicy_B064DBB3": {
+      "PreflightClass_Function_IamRolePolicy_6D810369": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/PreflightClass/cloud.Function/IamRolePolicy",
-            "uniqueId": "PreflightClass_cloudFunction_IamRolePolicy_B064DBB3"
+            "path": "root/Default/Default/PreflightClass/Function/IamRolePolicy",
+            "uniqueId": "PreflightClass_Function_IamRolePolicy_6D810369"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.PreflightClass_cloudBucket_05421049.arn}\",\"${aws_s3_bucket.PreflightClass_cloudBucket_05421049.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.PreflightClass_cloudFunction_IamRole_60AD4A3B.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.PreflightClass_Bucket_93EC74D7.arn}\",\"${aws_s3_bucket.PreflightClass_Bucket_93EC74D7.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.PreflightClass_Function_IamRole_A6FFCAE6.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "PreflightClass_cloudFunction_IamRolePolicyAttachment_008B87A9": {
+      "PreflightClass_Function_IamRolePolicyAttachment_87F27E90": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/PreflightClass/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "PreflightClass_cloudFunction_IamRolePolicyAttachment_008B87A9"
+            "path": "root/Default/Default/PreflightClass/Function/IamRolePolicyAttachment",
+            "uniqueId": "PreflightClass_Function_IamRolePolicyAttachment_87F27E90"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.PreflightClass_cloudFunction_IamRole_60AD4A3B.name}"
+        "role": "${aws_iam_role.PreflightClass_Function_IamRole_A6FFCAE6.name}"
       }
     },
     "aws_lambda_function": {
-      "PreflightClass_cloudFunction_9F7C6688": {
+      "PreflightClass_Function_5A515406": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/PreflightClass/cloud.Function/Default",
-            "uniqueId": "PreflightClass_cloudFunction_9F7C6688"
+            "path": "root/Default/Default/PreflightClass/Function/Default",
+            "uniqueId": "PreflightClass_Function_5A515406"
           }
         },
         "architectures": [
@@ -180,20 +171,20 @@ module.exports = function({  }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_70ca4fed": "${aws_s3_bucket.PreflightClass_cloudBucket_05421049.bucket}",
+            "BUCKET_NAME_5318ec22": "${aws_s3_bucket.PreflightClass_Bucket_93EC74D7.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8db99e3",
+            "WING_FUNCTION_NAME": "Function-c8565504",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8db99e3",
+        "function_name": "Function-c8565504",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.PreflightClass_cloudFunction_IamRole_60AD4A3B.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.PreflightClass_Function_IamRole_A6FFCAE6.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.PreflightClass_cloudFunction_S3Object_D4E803CB.key}",
+        "s3_key": "${aws_s3_object.PreflightClass_Function_S3Object_84DFAC83.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -211,23 +202,23 @@ module.exports = function({  }) {
         },
         "bucket_prefix": "code-c84a50b1-"
       },
-      "PreflightClass_cloudBucket_05421049": {
+      "PreflightClass_Bucket_93EC74D7": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/PreflightClass/cloud.Bucket/Default",
-            "uniqueId": "PreflightClass_cloudBucket_05421049"
+            "path": "root/Default/Default/PreflightClass/Bucket/Default",
+            "uniqueId": "PreflightClass_Bucket_93EC74D7"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8bbe938-",
+        "bucket_prefix": "bucket-c8739e77-",
         "force_destroy": false
       }
     },
     "aws_s3_object": {
-      "PreflightClass_cloudFunction_S3Object_D4E803CB": {
+      "PreflightClass_Function_S3Object_84DFAC83": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/PreflightClass/cloud.Function/S3Object",
-            "uniqueId": "PreflightClass_cloudFunction_S3Object_D4E803CB"
+            "path": "root/Default/Default/PreflightClass/Function/S3Object",
+            "uniqueId": "PreflightClass_Function_S3Object_84DFAC83"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -239,14 +230,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -254,19 +247,19 @@ class $Root extends $stdlib.std.Resource {
     class PreflightClass extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       preflight_method() {
         const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure1-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
                 $__parent_this_1_b: ${$stdlib.core.liftObject(__parent_this_1.b)},
               })
             `;
@@ -274,7 +267,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this)};
+                const $Closure1Client = ${$Closure1._toInflightType()};
                 const client = new $Closure1Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -282,29 +275,30 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure1._registerOnLiftObject(__parent_this_1.b, host, ["put"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_1.b, ["put"]],
+              ],
+              "$inflight_init": [
+                [__parent_this_1.b, []],
+              ],
+            });
           }
         }
         const inflight_closure = new $Closure1(this, "$Closure1");
-        return this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", inflight_closure);
+        return this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", inflight_closure);
       }
       static _toInflightType() {
         return `
-          require("./inflight.PreflightClass-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.PreflightClass-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const PreflightClassClient = ${PreflightClass._toInflightType(this)};
+            const PreflightClassClient = ${PreflightClass._toInflightType()};
             const client = new PreflightClassClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -312,19 +306,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
           })
         `;
@@ -332,7 +329,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -340,32 +337,33 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(f, host, ["invoke"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -373,8 +371,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const p = new PreflightClass(this, "PreflightClass");
@@ -386,6 +389,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_inside_inflight_closure.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_test_sim.md
index 95ec597b4a4..ca111c882f6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_inside_inflight_closure.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ inflight_class_inside_inflight_closure.test.wsim » root/env0/test:it works                                           
 pass ─ inflight_class_inside_inflight_closure.test.wsim » root/env1/test:inflight class inside closure captures from closure
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_compile_tf-aws.md
index b69efc27734..d888f13496b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_modifiers.test.w](../../../../../examples/tests/valid/inflight_class_modifiers.test.w) | compile | tf-aws
 
-## inflight.C-1.js
-```js
+## inflight.C-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class C {
     async method() {
@@ -15,7 +16,7 @@ module.exports = function({  }) {
   }
   return C;
 }
-//# sourceMappingURL=inflight.C-1.js.map
+//# sourceMappingURL=inflight.C-1.cjs.map
 ```
 
 ## main.tf.json
@@ -25,22 +26,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -50,14 +38,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -67,14 +57,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.C-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const CClient = ${C._toInflightType(this)};
+            const CClient = ${C._toInflightType()};
             const client = new CClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -82,14 +72,16 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "field", "method", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          C._registerOnLiftObject(this, host, ["field"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "method": [
+          ],
+          "$inflight_init": [
+            [this, ["field"]],
+          ],
+          "field": [
+          ],
+        });
       }
     }
   }
@@ -97,6 +89,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_modifiers.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_test_sim.md
index d3f28902963..13f69179dc3 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_modifiers.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_modifiers.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_compile_tf-aws.md
index 7d6e9d224a9..0712ff6a4e8 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_outside_inflight_closure.test.w](../../../../../examples/tests/valid/inflight_class_outside_inflight_closure.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $BinaryOperation }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,17 +13,18 @@ module.exports = function({ $BinaryOperation }) {
     }
     async handle() {
       const op = (await (async () => {const o = new $BinaryOperation(10, 20); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: op.add() == 30")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await op.add()),30)))};
+      $helpers.assert($helpers.eq((await op.add()), 30), "op.add() == 30");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.BinaryOperation-1.js
-```js
+## inflight.BinaryOperation-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class BinaryOperation {
     async add() {
@@ -37,7 +39,7 @@ module.exports = function({  }) {
   }
   return BinaryOperation;
 }
-//# sourceMappingURL=inflight.BinaryOperation-1.js.map
+//# sourceMappingURL=inflight.BinaryOperation-1.cjs.map
 ```
 
 ## main.tf.json
@@ -47,22 +49,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -72,14 +61,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -90,14 +81,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.BinaryOperation-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.BinaryOperation-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BinaryOperationClient = ${BinaryOperation._toInflightType(this)};
+            const BinaryOperationClient = ${BinaryOperation._toInflightType()};
             const client = new BinaryOperationClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -105,28 +96,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "lhs", "rhs", "add", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          BinaryOperation._registerOnLiftObject(this, host, ["lhs", "rhs"]);
-        }
-        if (ops.includes("add")) {
-          BinaryOperation._registerOnLiftObject(this, host, ["lhs", "rhs"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "add": [
+            [this, [].concat(["lhs"], ["rhs"])],
+          ],
+          "$inflight_init": [
+            [this, [].concat(["lhs"], ["rhs"])],
+          ],
+          "lhs": [
+          ],
+          "rhs": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $BinaryOperation: ${$stdlib.core.liftObject(BinaryOperation)},
           })
         `;
@@ -134,7 +127,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -142,8 +135,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight class outside inflight closure", new $Closure1(this, "$Closure1"));
@@ -152,6 +150,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_outside_inflight_closure.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_test_sim.md
index d2ee66e0362..2ce3bcd566e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_outside_inflight_closure.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_outside_inflight_closure.test.wsim » root/env0/test:inflight class outside inflight closure
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_compile_tf-aws.md
index 7acf942f81d..2d2852e84dc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_structural_interace_handler.test.w](../../../../../examples/tests/valid/inflight_class_structural_interace_handler.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $NotGoo }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,23 +17,24 @@ module.exports = function({ $NotGoo }) {
           return 456;
         }
         async anotherMethod() {
-          {console.log("also fine")};
+          console.log("also fine");
         }
       }
       const y = (await (async () => {const o = new YesGoo(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: y.handle() == 456")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await y.handle()),456)))};
+      $helpers.assert($helpers.eq((await y.handle()), 456), "y.handle() == 456");
       const x = (await (async () => {const o = new $NotGoo(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: x.handle() == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await x.handle()),123)))};
+      $helpers.assert($helpers.eq((await x.handle()), 123), "x.handle() == 123");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.NotGoo-1.js
-```js
+## inflight.NotGoo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class NotGoo {
     async handle() {
@@ -41,7 +43,7 @@ module.exports = function({  }) {
   }
   return NotGoo;
 }
-//# sourceMappingURL=inflight.NotGoo-1.js.map
+//# sourceMappingURL=inflight.NotGoo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -51,22 +53,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -76,14 +65,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -94,14 +85,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.NotGoo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.NotGoo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const NotGooClient = ${NotGoo._toInflightType(this)};
+            const NotGooClient = ${NotGoo._toInflightType()};
             const client = new NotGooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -109,19 +100,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $NotGoo: ${$stdlib.core.liftObject(NotGoo)},
           })
         `;
@@ -129,7 +125,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -137,8 +133,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:structure interface types for 'handle'", new $Closure1(this, "$Closure1"));
@@ -147,6 +148,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_structural_interace_handler.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_test_sim.md
index 3f4ab4715dd..916e37f5c55 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_structural_interace_handler.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_structural_interace_handler.test.wsim » root/env0/test:structure interface types for 'handle'
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_compile_tf-aws.md
index 63526c4d182..c9a1079e75c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_class_without_init.test.w](../../../../../examples/tests/valid/inflight_class_without_init.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,18 +17,19 @@ module.exports = function({ $Foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -37,22 +39,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -62,14 +51,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -80,14 +71,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -95,19 +86,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -115,7 +109,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -123,8 +117,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight class without init", new $Closure1(this, "$Closure1"));
@@ -133,6 +132,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_class_without_init.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_test_sim.md
index 5c521848362..77ccf8e19df 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_class_without_init.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_class_without_init.test.wsim » root/env0/test:inflight class without init
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_as_super_param.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_as_super_param.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..dd11ada8e03
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_as_super_param.test.w_compile_tf-aws.md
@@ -0,0 +1,286 @@
+# [inflight_closure_as_super_param.test.w](../../../../../examples/tests/valid/inflight_closure_as_super_param.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      return "boom!";
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $c_h }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq((await $c_h()), "boom!"), "c.h() == \"boom!\"");
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.Base-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Base {
+    constructor({  }) {
+    }
+  }
+  return Base;
+}
+//# sourceMappingURL=inflight.Base-1.cjs.map
+```
+
+## inflight.Derived-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $Base }) {
+  class Derived extends $Base {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return Derived;
+}
+//# sourceMappingURL=inflight.Derived-1.cjs.map
+```
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Foo {
+    constructor({  }) {
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class Base extends $stdlib.std.Resource {
+      constructor($scope, $id, handler, f) {
+        super($scope, $id);
+        this.h = handler;
+        this.f_base = f;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Base-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const BaseClient = ${Base._toInflightType()};
+            const client = new BaseClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class Derived extends Base {
+      constructor($scope, $id, ) {
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
+          constructor($scope, $id, ) {
+            super($scope, $id);
+            $helpers.nodeof(this).hidden = true;
+          }
+          static _toInflightType() {
+            return `
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+              })
+            `;
+          }
+          _toInflight() {
+            return `
+              (await (async () => {
+                const $Closure1Client = ${$Closure1._toInflightType()};
+                const client = new $Closure1Client({
+                });
+                if (client.$inflight_init) { await client.$inflight_init(); }
+                return client;
+              })())
+            `;
+          }
+          get _liftMap() {
+            return ({
+              "handle": [
+              ],
+              "$inflight_init": [
+              ],
+            });
+          }
+        }
+        super($scope, $id, new $Closure1($scope, "$Closure1"), new Foo($scope, "in_root"));
+        this.f = new Foo(this, "in_derived");
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Derived-1.cjs")({
+            $Base: ${$stdlib.core.liftObject(Base)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const DerivedClient = ${Derived._toInflightType()};
+            const client = new DerivedClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $c_h: ${$stdlib.core.liftObject(c.h)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [c.h, ["handle"]],
+          ],
+          "$inflight_init": [
+            [c.h, []],
+          ],
+        });
+      }
+    }
+    const c = new Derived(this, "derived");
+    $helpers.assert($helpers.nodeof(c.f).path.endsWith("derived/in_derived"), "nodeof(c.f).path.endsWith(\"derived/in_derived\")");
+    $helpers.assert((!$helpers.nodeof(c.f_base).path.endsWith("derived/in_root")), "!nodeof(c.f_base).path.endsWith(\"derived/in_root\")");
+    const appPath = $helpers.nodeof(this).path;
+    $helpers.assert($helpers.eq($helpers.nodeof(c.f_base).path, String.raw({ raw: ["", "/in_root"] }, appPath)), "nodeof(c.f_base).path == \"{appPath}/in_root\"");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:boom!", new $Closure2(this, "$Closure2"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_closure_as_super_param.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_as_super_param.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_as_super_param.test.w_test_sim.md
new file mode 100644
index 00000000000..9c4b92869cc
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_as_super_param.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [inflight_closure_as_super_param.test.w](../../../../../examples/tests/valid/inflight_closure_as_super_param.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ inflight_closure_as_super_param.test.wsim » root/env0/test:boom!
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_autoid.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_autoid.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..6e531964898
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_autoid.test.w_compile_tf-aws.md
@@ -0,0 +1,159 @@
+# [inflight_closure_autoid.test.w](../../../../../examples/tests/valid/inflight_closure_autoid.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $i }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      return $i;
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $inflights }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      for (const i of $helpers.range(0,5,false)) {
+        $helpers.assert($helpers.eq((await ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($inflights, i)()), i), "inflights.at(i)() == i");
+      }
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $inflights: ${$stdlib.core.liftObject(inflights)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [inflights, ["at"]],
+          ],
+          "$inflight_init": [
+            [inflights, []],
+          ],
+        });
+      }
+    }
+    let inflights = [];
+    for (const i of $helpers.range(0,5,false)) {
+      class $Closure1 extends $stdlib.std.AutoIdResource {
+        _id = $stdlib.core.closureId();
+        constructor($scope, $id, ) {
+          super($scope, $id);
+          $helpers.nodeof(this).hidden = true;
+        }
+        static _toInflightType() {
+          return `
+            require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+              $i: ${$stdlib.core.liftObject(i)},
+            })
+          `;
+        }
+        _toInflight() {
+          return `
+            (await (async () => {
+              const $Closure1Client = ${$Closure1._toInflightType()};
+              const client = new $Closure1Client({
+              });
+              if (client.$inflight_init) { await client.$inflight_init(); }
+              return client;
+            })())
+          `;
+        }
+        get _liftMap() {
+          return ({
+            "handle": [
+              [i, []],
+            ],
+            "$inflight_init": [
+              [i, []],
+            ],
+          });
+        }
+      }
+      inflights.push(new $Closure1(this, "$Closure1"));
+    }
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight closure auto id", new $Closure2(this, "$Closure2"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_closure_autoid.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_autoid.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_autoid.test.w_test_sim.md
new file mode 100644
index 00000000000..f7efd24dd97
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_autoid.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [inflight_closure_autoid.test.w](../../../../../examples/tests/valid/inflight_closure_autoid.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ inflight_closure_autoid.test.wsim » root/env0/test:inflight closure auto id
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_compile_tf-aws.md
index 59e083c8b6b..cb6d209f39c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_closure_inside_preflight_closure.test.w](../../../../../examples/tests/valid/inflight_closure_inside_preflight_closure.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -15,12 +16,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -28,7 +30,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -38,22 +40,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -63,14 +52,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -78,23 +69,22 @@ class $Root extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
         const foo = (() => {
-          const __parent_this_1 = this;
-          class $Closure1 extends $stdlib.std.Resource {
-            _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+          class $Closure1 extends $stdlib.std.AutoIdResource {
+            _id = $stdlib.core.closureId();
             constructor($scope, $id, ) {
               super($scope, $id);
-              (std.Node.of(this)).hidden = true;
+              $helpers.nodeof(this).hidden = true;
             }
             static _toInflightType() {
               return `
-                require("./inflight.$Closure1-1.js")({
+                require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
                 })
               `;
             }
             _toInflight() {
               return `
                 (await (async () => {
-                  const $Closure1Client = ${$Closure1._toInflightType(this)};
+                  const $Closure1Client = ${$Closure1._toInflightType()};
                   const client = new $Closure1Client({
                   });
                   if (client.$inflight_init) { await client.$inflight_init(); }
@@ -102,8 +92,13 @@ class $Root extends $stdlib.std.Resource {
                 })())
               `;
             }
-            _supportedOps() {
-              return [...super._supportedOps(), "handle", "$inflight_init"];
+            get _liftMap() {
+              return ({
+                "handle": [
+                ],
+                "$inflight_init": [
+                ],
+              });
             }
           }
           new $Closure1(this, "$Closure1");
@@ -111,14 +106,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -126,8 +121,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     new Foo(this, "Foo");
@@ -136,6 +134,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_closure_inside_preflight_closure.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_test_sim.md
index 41cb5f84d37..a3062a3462d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_closure_inside_preflight_closure.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_closure_inside_preflight_closure.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_compile_tf-aws.md
index 16d9cf8bca7..4432a818dc0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_compile_tf-aws.md
@@ -1,20 +1,21 @@
 # [inflight_concat.test.w](../../../../../examples/tests/valid/inflight_concat.test.w) | compile | tf-aws
 
-## inflight.R-1.js
-```js
+## inflight.R-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class R {
-    constructor({ $_this_s1_concat___world___ }) {
-      this.$_this_s1_concat___world___ = $_this_s1_concat___world___;
+    constructor({ $this_s1 }) {
+      this.$this_s1 = $this_s1;
     }
     async foo() {
-      {console.log(this.$_this_s1_concat___world___)};
+      console.log((await this.$this_s1.concat(" world")));
     }
   }
   return R;
 }
-//# sourceMappingURL=inflight.R-1.js.map
+//# sourceMappingURL=inflight.R-1.cjs.map
 ```
 
 ## main.tf.json
@@ -24,22 +25,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -49,14 +37,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -68,33 +58,31 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.R-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.R-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const RClient = ${R._toInflightType(this)};
+            const RClient = ${R._toInflightType()};
             const client = new RClient({
-              $_this_s1_concat___world___: ${$stdlib.core.liftObject((this.s1.concat(" world")))},
+              $this_s1: ${$stdlib.core.liftObject(this.s1)},
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          R._registerOnLiftObject((this.s1.concat(" world")), host, []);
-        }
-        if (ops.includes("foo")) {
-          R._registerOnLiftObject((this.s1.concat(" world")), host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "foo": [
+            [this.s1, ["concat"]],
+          ],
+          "$inflight_init": [
+            [this.s1, []],
+          ],
+        });
       }
     }
     const r = new R(this, "R");
@@ -103,6 +91,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_concat.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_test_sim.md
index e046fc4e13e..ed4c1457dfe 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_concat.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inflight_concat.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_handler_singleton.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_handler_singleton.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..e41ad83c914
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_handler_singleton.test.w_compile_tf-aws.md
@@ -0,0 +1,678 @@
+# [inflight_handler_singleton.test.w](../../../../../examples/tests/valid/inflight_handler_singleton.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $foo }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const n = (await $foo.inc());
+      return String.raw({ raw: ["", ""] }, n);
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $foo }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const n = (await $foo.inc());
+      return String.raw({ raw: ["", "-fn2"] }, n);
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $expect_Util, $fn, $fn2, $sim }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const x = (await $fn.invoke(""));
+      const y = (await $fn.invoke(""));
+      const z = (await $fn2.invoke(""));
+      (await $expect_Util.equal(x, "100"));
+      if ($sim) {
+        (await $expect_Util.equal(y, "101"));
+        console.log("client has been reused");
+      }
+      (await $expect_Util.equal(z, "100-fn2"));
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
+```
+
+## inflight.$Closure4-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $foo, $std_Duration, $util_Util }) {
+  class $Closure4 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const n = (await $foo.inc());
+      (await $util_Util.sleep((await $std_Duration.fromSeconds(3))));
+      $helpers.assert($helpers.eq(n, (await $foo.get())), "n == foo.get()");
+    }
+  }
+  return $Closure4;
+}
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
+```
+
+## inflight.$Closure5-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $fn3, $std_Duration, $util_Util }) {
+  class $Closure5 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $fn3.invokeAsync(""));
+      (await $util_Util.sleep((await $std_Duration.fromSeconds(1))));
+      (await $fn3.invoke(""));
+    }
+  }
+  return $Closure5;
+}
+//# sourceMappingURL=inflight.$Closure5-1.cjs.map
+```
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Foo {
+    constructor({  }) {
+    }
+    async inc() {
+      this.n += 1;
+      return this.n;
+    }
+    async get() {
+      return this.n;
+    }
+    async $inflight_init() {
+      this.n = 99;
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
+          }
+        },
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30
+      },
+      "fn2_CloudwatchLogGroup_CEBA055E": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn2/CloudwatchLogGroup",
+            "uniqueId": "fn2_CloudwatchLogGroup_CEBA055E"
+          }
+        },
+        "name": "/aws/lambda/fn2-c892a4c6",
+        "retention_in_days": 30
+      },
+      "fn3_CloudwatchLogGroup_C39A85FE": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn3/CloudwatchLogGroup",
+            "uniqueId": "fn3_CloudwatchLogGroup_C39A85FE"
+          }
+        },
+        "name": "/aws/lambda/fn3-c856234e",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Function_IamRole_678BE84C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "fn2_IamRole_DE8D96D2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn2/IamRole",
+            "uniqueId": "fn2_IamRole_DE8D96D2"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "fn3_IamRole_B0C65815": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn3/IamRole",
+            "uniqueId": "fn3_IamRole_B0C65815"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Function_IamRolePolicy_E3B26607": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      },
+      "fn2_IamRolePolicy_3FE5A930": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn2/IamRolePolicy",
+            "uniqueId": "fn2_IamRolePolicy_3FE5A930"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.fn2_IamRole_DE8D96D2.name}"
+      },
+      "fn3_IamRolePolicy_AE0DB40A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn3/IamRolePolicy",
+            "uniqueId": "fn3_IamRolePolicy_AE0DB40A"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
+        "role": "${aws_iam_role.fn3_IamRole_B0C65815.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      },
+      "fn2_IamRolePolicyAttachment_FC7F59A6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn2/IamRolePolicyAttachment",
+            "uniqueId": "fn2_IamRolePolicyAttachment_FC7F59A6"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.fn2_IamRole_DE8D96D2.name}"
+      },
+      "fn3_IamRolePolicyAttachment_9C4A07E9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn3/IamRolePolicyAttachment",
+            "uniqueId": "fn3_IamRolePolicyAttachment_9C4A07E9"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.fn3_IamRole_B0C65815.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "fn2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn2/Default",
+            "uniqueId": "fn2"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "fn2-c892a4c6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "fn2-c892a4c6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.fn2_IamRole_DE8D96D2.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.fn2_S3Object_FA91A9FB.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "fn3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn3/Default",
+            "uniqueId": "fn3"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "fn3-c856234e",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "fn3-c856234e",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.fn3_IamRole_B0C65815.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.fn3_S3Object_4E99C117.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Function_S3Object_C62A0C2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "fn2_S3Object_FA91A9FB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn2/S3Object",
+            "uniqueId": "fn2_S3Object_FA91A9FB"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "fn3_S3Object_4E99C117": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/fn3/S3Object",
+            "uniqueId": "fn3_S3Object_4E99C117"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+const expect = $stdlib.expect;
+const util = $stdlib.util;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "inc": [
+          ],
+          "get": [
+          ],
+          "$inflight_init": [
+          ],
+          "n": [
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $foo: ${$stdlib.core.liftObject(foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, ["inc"]],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $foo: ${$stdlib.core.liftObject(foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, ["inc"]],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
+            $fn: ${$stdlib.core.liftObject(fn)},
+            $fn2: ${$stdlib.core.liftObject(fn2)},
+            $sim: ${$stdlib.core.liftObject(sim)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, ["invoke"]],
+            [fn2, ["invoke"]],
+            [sim, []],
+          ],
+          "$inflight_init": [
+            [fn, []],
+            [fn2, []],
+            [sim, []],
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
+            $foo: ${$stdlib.core.liftObject(foo)},
+            $std_Duration: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Duration, "@winglang/sdk/std", "Duration"))},
+            $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, [].concat(["inc"], ["get"])],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
+      }
+    }
+    class $Closure5 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure5-1.cjs")({
+            $fn3: ${$stdlib.core.liftObject(fn3)},
+            $std_Duration: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Duration, "@winglang/sdk/std", "Duration"))},
+            $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure5Client = ${$Closure5._toInflightType()};
+            const client = new $Closure5Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn3, [].concat(["invokeAsync"], ["invoke"])],
+          ],
+          "$inflight_init": [
+            [fn3, []],
+          ],
+        });
+      }
+    }
+    const foo = new Foo(this, "Foo");
+    const fn = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", new $Closure1(this, "$Closure1"));
+    const fn2 = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "fn2", new $Closure2(this, "$Closure2"));
+    const sim = $helpers.eq((util.Util.env("WING_TARGET")), "sim");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:single instance of Foo", new $Closure3(this, "$Closure3"));
+    const fn3 = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "fn3", new $Closure4(this, "$Closure4"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Foo state is not shared between function invocations", new $Closure5(this, "$Closure5"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_handler_singleton.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_handler_singleton.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_handler_singleton.test.w_test_sim.md
new file mode 100644
index 00000000000..ed5a765c34e
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_handler_singleton.test.w_test_sim.md
@@ -0,0 +1,14 @@
+# [inflight_handler_singleton.test.w](../../../../../examples/tests/valid/inflight_handler_singleton.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] single instance of Foo | client has been reused
+pass ─ inflight_handler_singleton.test.wsim » root/env0/test:single instance of Foo                              
+pass ─ inflight_handler_singleton.test.wsim » root/env1/test:Foo state is not shared between function invocations
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_compile_tf-aws.md
index 0a12cd4773e..657d4d9293a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflight_init.test.w](../../../../../examples/tests/valid/inflight_init.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,17 +13,18 @@ module.exports = function({ $Foo }) {
     }
     async handle() {
       const f = (await (async () => {const o = new $Foo(5); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: f.field1 == 6 && f.field2 == 5")})(((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.field1,6)) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.field2,5))))};
+      $helpers.assert(($helpers.eq(f.field1, 6) && $helpers.eq(f.field2, 5)), "f.field1 == 6 && f.field2 == 5");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $FooChild }) {
   class $Closure2 {
     constructor({  }) {
@@ -32,17 +34,18 @@ module.exports = function({ $FooChild }) {
     }
     async handle() {
       const f = (await (async () => {const o = new $FooChild(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: f.field1 == 6 && f.field2 == 5 && f.field3 == 4")})((((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.field1,6)) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.field2,5))) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.field3,4))))};
+      $helpers.assert((($helpers.eq(f.field1, 6) && $helpers.eq(f.field2, 5)) && $helpers.eq(f.field3, 4)), "f.field1 == 6 && f.field2 == 5 && f.field3 == 4");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure3 {
     constructor({  }) {
@@ -67,17 +70,18 @@ module.exports = function({  }) {
         }
       }
       const f = (await (async () => {const o = new FooChild(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: f.field == 1337")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.field,1337)))};
+      $helpers.assert($helpers.eq(f.field, 1337), "f.field == 1337");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $jsii_fixture_JsiiClass }) {
   class $Closure4 {
     constructor({  }) {
@@ -99,7 +103,7 @@ module.exports = function({ $jsii_fixture_JsiiClass }) {
         }
       }
       const f = (await (async () => {const o = new Foo(1, "Foo"); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: f.foo_str == \"Foo 1\" && f.field() == 1 && f.foo_num == 6")})((((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.foo_str,"Foo 1")) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await f.field()),1))) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f.foo_num,6))))};
+      $helpers.assert((($helpers.eq(f.foo_str, "Foo 1") && $helpers.eq((await f.field()), 1)) && $helpers.eq(f.foo_num, 6)), "f.foo_str == \"Foo 1\" && f.field() == 1 && f.foo_num == 6");
       class FooChild extends Foo {
         constructor(){
           super(2, "FooChild");
@@ -111,17 +115,18 @@ module.exports = function({ $jsii_fixture_JsiiClass }) {
         }
       }
       const f_child = (await (async () => {const o = new FooChild(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: f_child.foo_str == \"FooChild 2\" && f_child.field() == 2 && f_child.foo_num == 6 && f_child.child_field == 7")})(((((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f_child.foo_str,"FooChild 2")) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await f_child.field()),2))) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f_child.foo_num,6))) && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f_child.child_field,7))))};
+      $helpers.assert(((($helpers.eq(f_child.foo_str, "FooChild 2") && $helpers.eq((await f_child.field()), 2)) && $helpers.eq(f_child.foo_num, 6)) && $helpers.eq(f_child.child_field, 7)), "f_child.foo_str == \"FooChild 2\" && f_child.field() == 2 && f_child.foo_num == 6 && f_child.child_field == 7");
     }
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     async get_six() {
@@ -136,12 +141,13 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## inflight.FooChild-1.js
-```js
+## inflight.FooChild-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo }) {
   class FooChild extends $Foo {
     constructor(){
@@ -155,7 +161,7 @@ module.exports = function({ $Foo }) {
   }
   return FooChild;
 }
-//# sourceMappingURL=inflight.FooChild-1.js.map
+//# sourceMappingURL=inflight.FooChild-1.cjs.map
 ```
 
 ## main.tf.json
@@ -165,22 +171,9 @@ module.exports = function({ $Foo }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -190,14 +183,16 @@ module.exports = function({ $Foo }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const jsii_fixture = require("jsii-fixture");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -208,14 +203,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -223,14 +218,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "field1", "field2", "get_six", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(this, host, ["field1", "field2", "get_six"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "get_six": [
+          ],
+          "$inflight_init": [
+            [this, [].concat(["field1"], ["get_six"], ["field2"])],
+          ],
+          "field1": [
+          ],
+          "field2": [
+          ],
+        });
       }
     }
     class FooChild extends Foo {
@@ -239,7 +238,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.FooChild-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.FooChild-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -247,7 +246,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooChildClient = ${FooChild._toInflightType(this)};
+            const FooChildClient = ${FooChild._toInflightType()};
             const client = new FooChildClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -255,25 +254,25 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "field3", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          FooChild._registerOnLiftObject(this, host, ["field3"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+            [this, ["field3"]],
+          ],
+          "field3": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
           })
         `;
@@ -281,7 +280,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -289,19 +288,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $FooChild: ${$stdlib.core.liftObject(FooChild)},
           })
         `;
@@ -309,7 +313,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -317,26 +321,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -344,19 +353,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
             $jsii_fixture_JsiiClass: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(jsii_fixture.JsiiClass, "jsii-fixture", "JsiiClass"))},
           })
         `;
@@ -364,7 +378,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -372,8 +386,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight class init", new $Closure1(this, "$Closure1"));
@@ -385,6 +404,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflight_init.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_test_sim.md
index 05314f66c6e..ae07d39cff1 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflight_init.test.w_test_sim.md
@@ -6,9 +6,9 @@ pass ─ inflight_init.test.wsim » root/env0/test:inflight class init
 pass ─ inflight_init.test.wsim » root/env1/test:inflight calls parent's init                
 pass ─ inflight_init.test.wsim » root/env2/test:inflight calls parent's init when non exists
 pass ─ inflight_init.test.wsim » root/env3/test:inflight class inherits form JSII class     
- 
- 
+
 Tests 4 passed (4)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_compile_tf-aws.md
index 12d6ae7cd83..ef201514841 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inflights_calling_inflights.test.w](../../../../../examples/tests/valid/inflights_calling_inflights.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $globalBucket }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $globalBucket }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $storeInBucket }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,17 +32,24 @@ module.exports = function({ $storeInBucket }) {
       return $obj;
     }
     async handle(event) {
-      (await $storeInBucket(event, "file1"));
+      {
+        const $if_let_value = event;
+        if ($if_let_value != undefined) {
+          const event = $if_let_value;
+          (await $storeInBucket(event, "file1"));
+        }
+      }
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $func1, $globalBucket }) {
   class $Closure3 {
     constructor({  }) {
@@ -50,17 +59,18 @@ module.exports = function({ $func1, $globalBucket }) {
     }
     async handle() {
       (await $func1.invoke("hi1"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalBucket.get(\"file1\") == \"hi1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $globalBucket.get("file1")),"hi1")))};
+      $helpers.assert($helpers.eq((await $globalBucket.get("file1")), "hi1"), "globalBucket.get(\"file1\") == \"hi1\"");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $globalBucket }) {
   class $Closure4 {
     constructor({  }) {
@@ -75,12 +85,13 @@ module.exports = function({ $globalBucket }) {
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.$Closure5-1.js
-```js
+## inflight.$Closure5-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $x }) {
   class $Closure5 {
     constructor({  }) {
@@ -90,17 +101,18 @@ module.exports = function({ $x }) {
     }
     async handle() {
       const val = (await $x.foo());
-      {((cond) => {if (!cond) throw new Error("assertion failed: val == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(val,"hello")))};
+      $helpers.assert($helpers.eq(val, "hello"), "val == \"hello\"");
     }
   }
   return $Closure5;
 }
-//# sourceMappingURL=inflight.$Closure5-1.js.map
+//# sourceMappingURL=inflight.$Closure5-1.cjs.map
 ```
 
-## inflight.MyResource-1.js
-```js
+## inflight.MyResource-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyResource {
     constructor({ $this_closure }) {
@@ -112,7 +124,7 @@ module.exports = function({  }) {
   }
   return MyResource;
 }
-//# sourceMappingURL=inflight.MyResource-1.js.map
+//# sourceMappingURL=inflight.MyResource-1.cjs.map
 ```
 
 ## main.tf.json
@@ -122,22 +134,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -176,7 +175,7 @@ module.exports = function({  }) {
             "uniqueId": "func1_IamRolePolicy_B533BD74"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.cloudBucket.arn}\",\"${aws_s3_bucket.cloudBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
         "role": "${aws_iam_role.func1_IamRole_31EC29DC.name}"
       }
     },
@@ -205,7 +204,7 @@ module.exports = function({  }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
             "WING_FUNCTION_NAME": "func1-c899062d",
             "WING_TARGET": "tf-aws"
@@ -216,7 +215,7 @@ module.exports = function({  }) {
         "memory_size": 1024,
         "publish": true,
         "role": "${aws_iam_role.func1_IamRole_31EC29DC.arn}",
-        "runtime": "nodejs18.x",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
         "s3_key": "${aws_s3_object.func1_S3Object_33D0CBF3.key}",
         "timeout": 60,
@@ -227,24 +226,24 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "code-c84a50b1-"
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
+        "bucket_prefix": "code-c84a50b1-"
       }
     },
     "aws_s3_object": {
@@ -264,27 +263,29 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $globalBucket: ${$stdlib.core.liftObject(globalBucket)},
           })
         `;
@@ -292,7 +293,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -300,25 +301,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(globalBucket, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [globalBucket, ["put"]],
+          ],
+          "$inflight_init": [
+            [globalBucket, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $storeInBucket: ${$stdlib.core.liftObject(storeInBucket)},
           })
         `;
@@ -326,7 +328,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -334,25 +336,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(storeInBucket, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [storeInBucket, ["handle"]],
+          ],
+          "$inflight_init": [
+            [storeInBucket, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $func1: ${$stdlib.core.liftObject(func1)},
             $globalBucket: ${$stdlib.core.liftObject(globalBucket)},
           })
@@ -361,7 +364,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -369,30 +372,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(func1, host, ["invoke"]);
-          $Closure3._registerOnLiftObject(globalBucket, host, ["get"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [func1, ["invoke"]],
+            [globalBucket, ["get"]],
+          ],
+          "$inflight_init": [
+            [func1, []],
+            [globalBucket, []],
+          ],
+        });
       }
     }
     class MyResource extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        const __parent_this_4 = this;
-        class $Closure4 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure4 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure4-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
                 $globalBucket: ${$stdlib.core.liftObject(globalBucket)},
               })
             `;
@@ -400,7 +404,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure4Client = ${$Closure4._toInflightType(this)};
+                const $Closure4Client = ${$Closure4._toInflightType()};
                 const client = new $Closure4Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -408,28 +412,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure4._registerOnLiftObject(globalBucket, host, ["list"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [globalBucket, ["list"]],
+              ],
+              "$inflight_init": [
+                [globalBucket, []],
+              ],
+            });
           }
         }
         this.closure = new $Closure4(this, "$Closure4");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyResource-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyResource-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyResourceClient = ${MyResource._toInflightType(this)};
+            const MyResourceClient = ${MyResource._toInflightType()};
             const client = new MyResourceClient({
               $this_closure: ${$stdlib.core.liftObject(this.closure)},
             });
@@ -438,28 +443,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyResource._registerOnLiftObject(this.closure, host, []);
-        }
-        if (ops.includes("foo")) {
-          MyResource._registerOnLiftObject(this.closure, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "foo": [
+            [this.closure, ["handle"]],
+          ],
+          "$inflight_init": [
+            [this.closure, []],
+          ],
+        });
       }
     }
-    class $Closure5 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure5 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure5-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure5-1.cjs")({
             $x: ${$stdlib.core.liftObject(x)},
           })
         `;
@@ -467,7 +470,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure5Client = ${$Closure5._toInflightType(this)};
+            const $Closure5Client = ${$Closure5._toInflightType()};
             const client = new $Closure5Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -475,17 +478,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure5._registerOnLiftObject(x, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [x, ["foo"]],
+          ],
+          "$inflight_init": [
+            [x, []],
+          ],
+        });
       }
     }
-    const globalBucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const globalBucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const storeInBucket = new $Closure1(this, "$Closure1");
     const handler1 = new $Closure2(this, "$Closure2");
     const func1 = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "func1", handler1);
@@ -497,6 +501,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inflights_calling_inflights.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_test_sim.md
index c5d64454ce7..5e802771ac0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inflights_calling_inflights.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ inflights_calling_inflights.test.wsim » root/env0/test:inflights can call other inflights 
 pass ─ inflights_calling_inflights.test.wsim » root/env1/test:variable can be an inflight closure
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_compile_tf-aws.md
index cf23bd5605b..159a58075a1 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inherit_stdlib_class.test.w](../../../../../examples/tests/valid/inherit_stdlib_class.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({  }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url, $http_Util }) {
   class $Closure2 {
     constructor({  }) {
@@ -31,17 +33,18 @@ module.exports = function({ $api_url, $http_Util }) {
     }
     async handle() {
       const response = (await $http_Util.get(String.raw({ raw: ["", "/"] }, $api_url)));
-      {((cond) => {if (!cond) throw new Error("assertion failed: response.status == 200")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(response.status,200)))};
+      $helpers.assert($helpers.eq(response.status, 200), "response.status == 200");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.AnApi-1.js
-```js
+## inflight.AnApi-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $cloud_Api }) {
   class AnApi extends $cloud_Api {
     constructor({  }) {
@@ -50,7 +53,7 @@ module.exports = function({ $cloud_Api }) {
   }
   return AnApi;
 }
-//# sourceMappingURL=inflight.AnApi-1.js.map
+//# sourceMappingURL=inflight.AnApi-1.cjs.map
 ```
 
 ## main.tf.json
@@ -60,19 +63,33 @@ module.exports = function({ $cloud_Api }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "AnApi": {
+              "Endpoint": {
+                "Url": "AnApi_Endpoint_Url_A71EBCD8"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -85,8 +102,8 @@ module.exports = function({ $cloud_Api }) {
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "AnApi_Endpoint_Url_A71EBCD8": {
+      "value": "https://${aws_api_gateway_rest_api.AnApi_api_99502955.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.AnApi_api_stage_1FA14C2C.stage_name}"
     }
   },
   "provider": {
@@ -120,7 +137,7 @@ module.exports = function({ $cloud_Api }) {
             "uniqueId": "AnApi_api_99502955"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/\":{\"get\":{\"operationId\":\"get\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.AnApi_get__0_2BCA8D68.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/\":{\"get\":{\"operationId\":\"get\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_0-c86e4717/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
@@ -141,58 +158,58 @@ module.exports = function({ $cloud_Api }) {
       }
     },
     "aws_cloudwatch_log_group": {
-      "AnApi_get__0_CloudwatchLogGroup_56E53562": {
+      "AnApi_get_0_CloudwatchLogGroup_164A5EFA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/AnApi/get__}0/CloudwatchLogGroup",
-            "uniqueId": "AnApi_get__0_CloudwatchLogGroup_56E53562"
+            "path": "root/Default/Default/AnApi/get_0/CloudwatchLogGroup",
+            "uniqueId": "AnApi_get_0_CloudwatchLogGroup_164A5EFA"
           }
         },
-        "name": "/aws/lambda/get__-0-c8219157",
+        "name": "/aws/lambda/get_0-c86e4717",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "AnApi_get__0_IamRole_504C11BC": {
+      "AnApi_get_0_IamRole_B03773D7": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/AnApi/get__}0/IamRole",
-            "uniqueId": "AnApi_get__0_IamRole_504C11BC"
+            "path": "root/Default/Default/AnApi/get_0/IamRole",
+            "uniqueId": "AnApi_get_0_IamRole_B03773D7"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "AnApi_get__0_IamRolePolicy_C05FDE20": {
+      "AnApi_get_0_IamRolePolicy_452BE273": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/AnApi/get__}0/IamRolePolicy",
-            "uniqueId": "AnApi_get__0_IamRolePolicy_C05FDE20"
+            "path": "root/Default/Default/AnApi/get_0/IamRolePolicy",
+            "uniqueId": "AnApi_get_0_IamRolePolicy_452BE273"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.AnApi_get__0_IamRole_504C11BC.name}"
+        "role": "${aws_iam_role.AnApi_get_0_IamRole_B03773D7.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "AnApi_get__0_IamRolePolicyAttachment_C66993BE": {
+      "AnApi_get_0_IamRolePolicyAttachment_BA3B438B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/AnApi/get__}0/IamRolePolicyAttachment",
-            "uniqueId": "AnApi_get__0_IamRolePolicyAttachment_C66993BE"
+            "path": "root/Default/Default/AnApi/get_0/IamRolePolicyAttachment",
+            "uniqueId": "AnApi_get_0_IamRolePolicyAttachment_BA3B438B"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.AnApi_get__0_IamRole_504C11BC.name}"
+        "role": "${aws_iam_role.AnApi_get_0_IamRole_B03773D7.name}"
       }
     },
     "aws_lambda_function": {
-      "AnApi_get__0_2BCA8D68": {
+      "AnApi_get_0_3463C798": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/AnApi/get__}0/Default",
-            "uniqueId": "AnApi_get__0_2BCA8D68"
+            "path": "root/Default/Default/AnApi/get_0/Default",
+            "uniqueId": "AnApi_get_0_3463C798"
           }
         },
         "architectures": [
@@ -201,18 +218,18 @@ module.exports = function({ $cloud_Api }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get__-0-c8219157",
+            "WING_FUNCTION_NAME": "get_0-c86e4717",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get__-0-c8219157",
+        "function_name": "get_0-c86e4717",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.AnApi_get__0_IamRole_504C11BC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.AnApi_get_0_IamRole_B03773D7.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.AnApi_get__0_S3Object_0A63DC57.key}",
+        "s3_key": "${aws_s3_object.AnApi_get_0_S3Object_2979C1C2.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -229,7 +246,7 @@ module.exports = function({ $cloud_Api }) {
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.AnApi_get__0_2BCA8D68.function_name}",
+        "function_name": "${aws_lambda_function.AnApi_get_0_3463C798.function_name}",
         "principal": "apigateway.amazonaws.com",
         "source_arn": "${aws_api_gateway_rest_api.AnApi_api_99502955.execution_arn}/*/GET/",
         "statement_id": "AllowExecutionFromAPIGateway-GET-c2e3ffa8"
@@ -247,11 +264,11 @@ module.exports = function({ $cloud_Api }) {
       }
     },
     "aws_s3_object": {
-      "AnApi_get__0_S3Object_0A63DC57": {
+      "AnApi_get_0_S3Object_2979C1C2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/AnApi/get__}0/S3Object",
-            "uniqueId": "AnApi_get__0_S3Object_0A63DC57"
+            "path": "root/Default/Default/AnApi/get_0/S3Object",
+            "uniqueId": "AnApi_get_0_S3Object_2979C1C2"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -263,26 +280,28 @@ module.exports = function({ $cloud_Api }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const http = $stdlib.http;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class AnApi extends (this.node.root.typeForFqn("@winglang/sdk.cloud.Api") ?? cloud.Api) {
+    class AnApi extends (this?.node?.root?.typeForFqn("@winglang/sdk.cloud.Api") ?? cloud.Api) {
       constructor($scope, $id, ) {
         super($scope, $id);
       }
       static _toInflightType() {
         return `
-          require("./inflight.AnApi-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.AnApi-1.cjs")({
             $cloud_Api: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(cloud.Api, "@winglang/sdk/cloud", "Api"))},
           })
         `;
@@ -290,7 +309,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const AnApiClient = ${AnApi._toInflightType(this)};
+            const AnApiClient = ${AnApi._toInflightType()};
             const client = new AnApiClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -298,26 +317,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -325,19 +347,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $http_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.Util, "@winglang/sdk/http", "Util"))},
           })
@@ -346,7 +373,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -354,14 +381,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
     const api = new AnApi(this, "AnApi");
@@ -372,6 +400,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inherit_stdlib_class.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_test_sim.md
index fdde67ae700..377ace841f2 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inherit_stdlib_class.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inherit_stdlib_class.test.wsim » root/env0/test:can inherit std lib preflight class
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_compile_tf-aws.md
index 2de02844c7d..3784a8a054c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inheritance_class_inflight.test.w](../../../../../examples/tests/valid/inheritance_class_inflight.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $expect_Util, $foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -18,12 +19,13 @@ module.exports = function({ $expect_Util, $foo }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $FooBase }) {
   class Foo extends $FooBase {
     constructor({  }) {
@@ -38,12 +40,13 @@ module.exports = function({ $FooBase }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## inflight.FooBase-1.js
-```js
+## inflight.FooBase-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class FooBase {
     constructor({  }) {
@@ -57,7 +60,7 @@ module.exports = function({  }) {
   }
   return FooBase;
 }
-//# sourceMappingURL=inflight.FooBase-1.js.map
+//# sourceMappingURL=inflight.FooBase-1.cjs.map
 ```
 
 ## main.tf.json
@@ -67,22 +70,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -92,14 +82,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -110,14 +102,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.FooBase-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.FooBase-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooBaseClient = ${FooBase._toInflightType(this)};
+            const FooBaseClient = ${FooBase._toInflightType()};
             const client = new FooBaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -125,8 +117,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bug", "over_inflight", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "bug": [
+          ],
+          "over_inflight": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Foo extends FooBase {
@@ -135,7 +134,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $FooBase: ${$stdlib.core.liftObject(FooBase)},
           })
         `;
@@ -143,7 +142,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -151,19 +150,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bang", "over_inflight", "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "bang": [
+          ],
+          "over_inflight": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $foo: ${$stdlib.core.liftObject(foo)},
           })
@@ -172,7 +178,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -180,14 +186,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(foo, host, ["bang", "bug", "over_inflight"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, [].concat(["bang"], ["bug"], ["over_inflight"])],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
       }
     }
     const foo = new Foo(this, "Foo");
@@ -197,6 +204,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inheritance_class_inflight.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_test_sim.md
index d3ba25d00b1..73fc2965a51 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_inflight.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inheritance_class_inflight.test.wsim » root/env0/test:class inheritence
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_compile_tf-aws.md
index 5e333f76837..fd16413a92a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inheritance_class_preflight.test.w](../../../../../examples/tests/valid/inheritance_class_preflight.test.w) | compile | tf-aws
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $FooBase }) {
   class Foo extends $FooBase {
     constructor({  }) {
@@ -11,12 +12,13 @@ module.exports = function({ $FooBase }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## inflight.FooBase-1.js
-```js
+## inflight.FooBase-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class FooBase {
     constructor({  }) {
@@ -24,7 +26,7 @@ module.exports = function({  }) {
   }
   return FooBase;
 }
-//# sourceMappingURL=inflight.FooBase-1.js.map
+//# sourceMappingURL=inflight.FooBase-1.cjs.map
 ```
 
 ## main.tf.json
@@ -34,22 +36,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -59,14 +48,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -83,14 +74,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.FooBase-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.FooBase-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooBaseClient = ${FooBase._toInflightType(this)};
+            const FooBaseClient = ${FooBase._toInflightType()};
             const client = new FooBaseClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -98,8 +89,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Foo extends FooBase {
@@ -114,7 +108,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
             $FooBase: ${$stdlib.core.liftObject(FooBase)},
           })
         `;
@@ -122,7 +116,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -130,8 +124,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const foo = new Foo(this, "Foo");
@@ -143,6 +140,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inheritance_class_preflight.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_test_sim.md
index 3189b7025ce..fc9f5edd6d3 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_class_preflight.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inheritance_class_preflight.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_compile_tf-aws.md
index 84203d662be..7d55a61e604 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [inheritance_interface.test.w](../../../../../examples/tests/valid/inheritance_interface.test.w) | compile | tf-aws
 
-## inflight.Baz-1.js
-```js
+## inflight.Baz-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Baz {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return Baz;
 }
-//# sourceMappingURL=inflight.Baz-1.js.map
+//# sourceMappingURL=inflight.Baz-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -45,14 +33,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -69,14 +59,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Baz-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Baz-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BazClient = ${Baz._toInflightType(this)};
+            const BazClient = ${Baz._toInflightType()};
             const client = new BazClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -84,8 +74,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const baz = new Baz(this, "Baz");
@@ -96,6 +89,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "inheritance_interface.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_test_sim.md
index b61337c6d38..73618ce0585 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/inheritance_interface.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ inheritance_interface.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_compile_tf-aws.md
index f1981476e90..2df8723afdf 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_compile_tf-aws.md
@@ -1,5 +1,33 @@
 # [interface.test.w](../../../../../examples/tests/valid/interface.test.w) | compile | tf-aws
 
+## inflight.C-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class C {
+    constructor({  }) {
+    }
+  }
+  return C;
+}
+//# sourceMappingURL=inflight.C-1.cjs.map
+```
+
+## inflight.D-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class D {
+    constructor({  }) {
+    }
+  }
+  return D;
+}
+//# sourceMappingURL=inflight.D-1.cjs.map
+```
+
 ## main.tf.json
 ```json
 {
@@ -7,22 +35,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,22 +47,81 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
+    class C extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const CClient = ${C._toInflightType()};
+            const client = new CClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class D extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.D-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const DClient = ${D._toInflightType()};
+            const client = new DClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    const a = undefined;
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "interface.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_test_sim.md
index 0eb16e6eeec..886084dad2a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/interface.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ interface.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/intrinsics.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/intrinsics.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..8ac2e856142
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/intrinsics.test.w_compile_tf-aws.md
@@ -0,0 +1,414 @@
+# [intrinsics.test.w](../../../../../examples/tests/valid/intrinsics.test.w) | compile | tf-aws
+
+## inflight.$Closure1-2.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $echo }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq((await $echo("message")), "message"), "echo(\"message\") == \"message\"");
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-2.cjs.map
+```
+
+## inflight.$Closure2-2.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $func, $funcFunction }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $funcFunction("message"));
+      (await $func.invoke("message"));
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-2.cjs.map
+```
+
+## inflight.Bar-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Bar {
+    constructor({  }) {
+    }
+  }
+  return Bar;
+}
+//# sourceMappingURL=inflight.Bar-1.cjs.map
+```
+
+## inflight.Example-2.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $counter }) {
+  class Example {
+    constructor({  }) {
+    }
+    async getMessage() {
+      return "message";
+    }
+    async done() {
+      (await $counter.inc());
+    }
+  }
+  return Example;
+}
+//# sourceMappingURL=inflight.Example-2.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
+          }
+        },
+        "name": "/aws/lambda/Function-c852aba6",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "Function_IamRole_678BE84C": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Function_IamRolePolicy_E3B26607": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Function": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "Function-c852aba6",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Function_S3Object_C62A0C2D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
+## preflight.bar-1.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Bar extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static bar($scope) {
+    return "bar";
+  }
+  static getSubdir($scope) {
+    return $helpers.resolveDirname(__dirname, "../../../subdir");
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const BarClient = ${Bar._toInflightType()};
+        const client = new BarClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Bar };
+//# sourceMappingURL=preflight.bar-1.cjs.map
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const fs = $stdlib.fs;
+const expect = $stdlib.expect;
+const cloud = $stdlib.cloud;
+const util = $stdlib.util;
+const bar = require("./preflight.bar-1.cjs");
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Example extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Example-2.cjs")({
+            $counter: ${$stdlib.core.liftObject(counter)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const ExampleClient = ${Example._toInflightType()};
+            const client = new ExampleClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "getMessage": [
+          ],
+          "done": [
+            [counter, ["inc"]],
+          ],
+          "$inflight_init": [
+            [counter, []],
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-2.cjs")({
+            $echo: ${$stdlib.core.liftObject(echo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [echo, ["handle"]],
+          ],
+          "$inflight_init": [
+            [echo, []],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-2.cjs")({
+            $func: ${$stdlib.core.liftObject(func)},
+            $funcFunction: ${$stdlib.core.liftObject(funcFunction)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [func, ["invoke"]],
+            [funcFunction, []],
+          ],
+          "$inflight_init": [
+            [func, []],
+            [funcFunction, []],
+          ],
+        });
+      }
+    }
+    const path = "SHOULD_IGNORE";
+    const filename = "intrinsics.test.w";
+    const currentFile = (fs.Util.join($helpers.resolveDirname(__dirname, "../../.."), filename));
+    (expect.Util.equal(filename, (fs.Util.basename(currentFile))));
+    (expect.Util.equal($helpers.resolveDirname(__dirname, "../../.."), (fs.Util.dirname(currentFile))));
+    (expect.Util.equal((bar.Bar.getSubdir(this)), (fs.Util.join($helpers.resolveDirname(__dirname, "../../.."), "subdir"))));
+    const counter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
+    const echo = $stdlib.core.importInflight(`require('../../../inflight_ts/example1.ts')["default"]`);
+    const example = new Example(this, "Example");
+    const funcFunction = $stdlib.core.importInflight(`require('../../../inflight_ts/example2.ts')["main"]`, [({ obj: example, alias: "example" }), ({ obj: example, ops: ["getMessage", ], alias: "exampleCopy" }), ({ obj: [1, 2, 3], alias: "numbers" })]);
+    const func = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", funcFunction);
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:invoke default function", new $Closure1(this, "$Closure1"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:invoke inflight function", new $Closure2(this, "$Closure2"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "intrinsics.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/intrinsics.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/intrinsics.test.w_test_sim.md
new file mode 100644
index 00000000000..eb81f7059fc
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/intrinsics.test.w_test_sim.md
@@ -0,0 +1,17 @@
+# [intrinsics.test.w](../../../../../examples/tests/valid/intrinsics.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] invoke inflight function | "message" should be "message"
+[INFO] invoke inflight function | [ 1, 2, 3 ]
+[INFO] invoke inflight function | "message" should be "message"
+[INFO] invoke inflight function | [ 1, 2, 3 ]
+pass ─ intrinsics.test.wsim » root/env0/test:invoke default function 
+pass ─ intrinsics.test.wsim » root/env1/test:invoke inflight function
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_compile_tf-aws.md
index c7379dd2255..72edd480440 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [issue_2889.test.w](../../../../../examples/tests/valid/issue_2889.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $std_Json }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,18 +12,19 @@ module.exports = function({ $std_Json }) {
       return $obj;
     }
     async handle(req) {
-      const issues = (JSON.parse("[{\"foo\": \"bar\"}, {\"foo\": \"baz\"}, {\"foo\": \"qux\"}]"));
-      return ({"status": 200, "headers": ({["Content-Type"]: "application/json"}), "body": ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([issues])});
+      const issues = JSON.parse("[{\"foo\": \"bar\"}, {\"foo\": \"baz\"}, {\"foo\": \"qux\"}]");
+      return ({"status": 200, "headers": ({["Content-Type"]: "application/json"}), "body": ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(issues)});
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url, $http_Util, $std_Json }) {
   class $Closure2 {
     constructor({  }) {
@@ -32,14 +34,14 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
     }
     async handle() {
       const res = (await $http_Util.get(($api_url + "/foo")));
-      const body = (JSON.parse(res.body));
+      const body = JSON.parse(res.body);
       const a1 = ((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(body, 0);
-      {((cond) => {if (!cond) throw new Error("assertion failed: a1.get(\"foo\") == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(a1, "foo"),"bar")))};
+      $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(a1, "foo"), "bar"), "a1.get(\"foo\") == \"bar\"");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -49,19 +51,33 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_region": {
       "Region": {
         "//": {
@@ -74,8 +90,8 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
     }
   },
   "provider": {
@@ -85,103 +101,103 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/foo\":{\"get\":{\"operationId\":\"get-foo\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_foo_0_1FC193B8.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/foo\":{\"get\":{\"operationId\":\"get-foo\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_foo0-c8fedbc0/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_foo_0_CloudwatchLogGroup_ED1063ED": {
+      "Api_get_foo0_CloudwatchLogGroup_DB4D118A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_foo_0_CloudwatchLogGroup_ED1063ED"
+            "path": "root/Default/Default/Api/get_foo0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_foo0_CloudwatchLogGroup_DB4D118A"
           }
         },
-        "name": "/aws/lambda/get_foo_-0-c8c183c7",
+        "name": "/aws/lambda/get_foo0-c8fedbc0",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_foo_0_IamRole_B5D27436": {
+      "Api_get_foo0_IamRole_B1AE8E5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/IamRole",
-            "uniqueId": "cloudApi_get_foo_0_IamRole_B5D27436"
+            "path": "root/Default/Default/Api/get_foo0/IamRole",
+            "uniqueId": "Api_get_foo0_IamRole_B1AE8E5D"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_foo_0_IamRolePolicy_1AF0974B": {
+      "Api_get_foo0_IamRolePolicy_F8C7A0FA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_foo_0_IamRolePolicy_1AF0974B"
+            "path": "root/Default/Default/Api/get_foo0/IamRolePolicy",
+            "uniqueId": "Api_get_foo0_IamRolePolicy_F8C7A0FA"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_foo_0_IamRole_B5D27436.name}"
+        "role": "${aws_iam_role.Api_get_foo0_IamRole_B1AE8E5D.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_foo_0_IamRolePolicyAttachment_6C30798B": {
+      "Api_get_foo0_IamRolePolicyAttachment_1ED86FF6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_foo_0_IamRolePolicyAttachment_6C30798B"
+            "path": "root/Default/Default/Api/get_foo0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_foo0_IamRolePolicyAttachment_1ED86FF6"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_foo_0_IamRole_B5D27436.name}"
+        "role": "${aws_iam_role.Api_get_foo0_IamRole_B1AE8E5D.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_foo_0_1FC193B8": {
+      "Api_get_foo0_2DF5B57F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/Default",
-            "uniqueId": "cloudApi_get_foo_0_1FC193B8"
+            "path": "root/Default/Default/Api/get_foo0/Default",
+            "uniqueId": "Api_get_foo0_2DF5B57F"
           }
         },
         "architectures": [
@@ -190,18 +206,18 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_foo_-0-c8c183c7",
+            "WING_FUNCTION_NAME": "get_foo0-c8fedbc0",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_foo_-0-c8c183c7",
+        "function_name": "get_foo0-c8fedbc0",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_foo_0_IamRole_B5D27436.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_foo0_IamRole_B1AE8E5D.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_foo_0_S3Object_E859AED1.key}",
+        "s3_key": "${aws_s3_object.Api_get_foo0_S3Object_A8BEB597.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -210,17 +226,17 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-4273ae49_974F3EC5": {
+      "Api_api_permission-GET-4273ae49_725CFBAA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-4273ae49",
-            "uniqueId": "cloudApi_api_permission-GET-4273ae49_974F3EC5"
+            "path": "root/Default/Default/Api/api/permission-GET-4273ae49",
+            "uniqueId": "Api_api_permission-GET-4273ae49_725CFBAA"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_foo_0_1FC193B8.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_foo0_2DF5B57F.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/foo",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/foo",
         "statement_id": "AllowExecutionFromAPIGateway-GET-4273ae49"
       }
     },
@@ -236,11 +252,11 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_foo_0_S3Object_E859AED1": {
+      "Api_get_foo0_S3Object_A8BEB597": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_foo_}0/S3Object",
-            "uniqueId": "cloudApi_get_foo_0_S3Object_E859AED1"
+            "path": "root/Default/Default/Api/get_foo0/S3Object",
+            "uniqueId": "Api_get_foo0_S3Object_A8BEB597"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -252,28 +268,30 @@ module.exports = function({ $api_url, $http_Util, $std_Json }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const http = $stdlib.http;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
           })
         `;
@@ -281,7 +299,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -289,19 +307,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $http_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.Util, "@winglang/sdk/http", "Util"))},
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
@@ -311,7 +334,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -319,17 +342,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api");
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
     (api.get("/foo", new $Closure1(this, "$Closure1")));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:api should return a valid stringified json", new $Closure2(this, "$Closure2"));
   }
@@ -337,6 +361,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "issue_2889.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_test_sim.md
index a411146030e..8bdd9f6e875 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/issue_2889.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ issue_2889.test.wsim » root/env0/test:api should return a valid stringified json
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_compile_tf-aws.md
index 1bb183c73a0..97e4d34eb85 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [json.test.w](../../../../../examples/tests/valid/json.test.w) | compile | tf-aws
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -44,14 +32,24 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "B1InList": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/B1InList/Default",
+            "uniqueId": "B1InList"
+          }
+        },
+        "bucket_prefix": "b1inlist-c8cc4391-",
+        "force_destroy": false
+      },
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
@@ -59,14 +57,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -78,14 +78,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -93,8 +93,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const jsonNumber = 123;
@@ -103,12 +106,12 @@ class $Root extends $stdlib.std.Resource {
     const jsonMap = ({["1"]: 1, ["2"]: 2, ["3"]: 3});
     const jsonObj = ({"boom": 123});
     for (const j of [jsonNumber, jsonBool, jsonArray, jsonMap, jsonObj]) {
-      {((cond) => {if (!cond) throw new Error("assertion failed: j == Json.parse(Json.stringify(j))")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(j,(JSON.parse(((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([j]))))))};
+      $helpers.assert($helpers.eq(j, JSON.parse(((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(j))), "j == Json.parse(Json.stringify(j))");
     }
     const jsonMutObj = ({"hello": 123, "world": [1, "cat", 3], "boom boom": ({"hello": 1233})});
     const message = "Coolness";
-    ((obj, args) => { obj[args[0]] = args[1]; })(jsonMutObj, ["hello", message]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: jsonMutObj.get(\"hello\") == message")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonMutObj, "hello"),message)))};
+    ((obj, key, value) => { obj[key] = value; })(jsonMutObj, "hello", message);
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonMutObj, "hello"), message), "jsonMutObj.get(\"hello\") == message");
     const someNumber = 999;
     const jj = someNumber;
     const jj1 = ({"foo": someNumber});
@@ -117,48 +120,48 @@ class $Root extends $stdlib.std.Resource {
       return "hello";
     });
     const jj3 = (getStr());
-    {((cond) => {if (!cond) throw new Error("assertion failed: jj3 == Json \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(jj3,"hello")))};
+    $helpers.assert($helpers.eq(jj3, "hello"), "jj3 == Json \"hello\"");
     const f = new Foo(this, "Foo");
     const jj4 = f.SumStr;
-    {((cond) => {if (!cond) throw new Error("assertion failed: jj4 == Json \"wow!\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(jj4,"wow!")))};
+    $helpers.assert($helpers.eq(jj4, "wow!"), "jj4 == Json \"wow!\"");
     const someJson = ({"x": someNumber});
-    {((cond) => {if (!cond) throw new Error("assertion failed: someJson.get(\"x\") == someNumber")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(someJson, "x"),someNumber)))};
-    ((obj, args) => { obj[args[0]] = args[1]; })(someJson, ["x", 111]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: someJson.get(\"x\") == 111")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(someJson, "x"),111)))};
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(someJson, "x"), someNumber), "someJson.get(\"x\") == someNumber");
+    ((obj, key, value) => { obj[key] = value; })(someJson, "x", 111);
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(someJson, "x"), 111), "someJson.get(\"x\") == 111");
     const x = ({"cool": "beans"});
     const nestedJson = ({"a": "hello", "b": ({"c": "world", "d": ({"foo": "foo", "bar": 123})})});
-    ((obj, args) => { obj[args[0]] = args[1]; })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(nestedJson, "b"), "d"), ["foo", "tastic"]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: nestedJson.get(\"b\").get(\"d\").get(\"foo\") == \"tastic\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(nestedJson, "b"), "d"), "foo"),"tastic")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: nestedJson.get(\"b\").get(\"d\").get(\"bar\") == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(nestedJson, "b"), "d"), "bar"),123)))};
+    ((obj, key, value) => { obj[key] = value; })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(nestedJson, "b"), "d"), "foo", "tastic");
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(nestedJson, "b"), "d"), "foo"), "tastic"), "nestedJson.get(\"b\").get(\"d\").get(\"foo\") == \"tastic\"");
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(nestedJson, "b"), "d"), "bar"), 123), "nestedJson.get(\"b\").get(\"d\").get(\"bar\") == 123");
     const b = "buckle";
     const arr = [1, 2, b, "my", "shoe", 3, 4, ["shut", "the", "door"]];
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr.getAt(0) == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(arr, 0),1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr.getAt(2) == b")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(arr, 2),b)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr.getAt(7).getAt(0) == \"shut\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(arr, 7), 0),"shut")))};
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(arr, 0), 1), "arr.getAt(0) == 1");
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(arr, 2), b), "arr.getAt(2) == b");
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(arr, 7), 0), "shut"), "arr.getAt(7).getAt(0) == \"shut\"");
     ({"a": [1, 2, "world"], "b": [1, 2, "world"]});
     const emptyJson = ({});
     const emptyJsonArr = [];
     const emptyMutJson = ({});
     const emptyMutJsonArr = [];
-    ((obj, args) => { obj[args[0]] = args[1]; })(emptyMutJson, ["cool", ({"a": 1, "b": 2})]);
-    ((obj, args) => { obj[args[0]] = args[1]; })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(emptyMutJson, "cool"), ["a", 3]);
-    ((obj, args) => { obj[args[0]] = args[1]; })(emptyMutJsonArr, [0, ({"a": 1, "b": 2})]);
-    ((obj, args) => { obj[args[0]] = args[1]; })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(emptyMutJsonArr, 0), ["a", 3]);
+    ((obj, key, value) => { obj[key] = value; })(emptyMutJson, "cool", ({"a": 1, "b": 2}));
+    ((obj, key, value) => { obj[key] = value; })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(emptyMutJson, "cool"), "a", 3);
+    ((obj, idx, value) => { obj[idx] = value; })(emptyMutJsonArr, 0, ({"a": 1, "b": 2}));
+    ((obj, key, value) => { obj[key] = value; })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(emptyMutJsonArr, 0), "a", 3);
     const theTowerOfJson = ({"a": ({}), "b": ({"c": ({}), "d": [[[({})]]]}), "e": ({"f": ({"g": ({}), "h": [({}), []]})})});
-    ((obj, args) => { obj[args[0]] = args[1]; })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(theTowerOfJson, "e"), "f"), "h"), 0), ["a", 1]);
+    ((obj, key, value) => { obj[key] = value; })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(theTowerOfJson, "e"), "f"), "h"), 0), "a", 1);
     const thatSuperNestedValue = ((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(theTowerOfJson, "e"), "f"), "h"), 0), "a");
-    {((cond) => {if (!cond) throw new Error("assertion failed: num.fromJson(thatSuperNestedValue) == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((std.Number.fromJson(thatSuperNestedValue)),1)))};
+    $helpers.assert($helpers.eq((std.Number.fromJson(thatSuperNestedValue)), 1), "num.fromJson(thatSuperNestedValue) == 1");
     const unestedJsonArr = [1, 2, 3];
-    {((cond) => {if (!cond) throw new Error("assertion failed: unestedJsonArr.getAt(0) == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(unestedJsonArr, 0),1)))};
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(unestedJsonArr, 0), 1), "unestedJsonArr.getAt(0) == 1");
     const jsonElements = ({"strings": ({"single": "Hello", "array": ["Hello", "World", "!"]}), "numbers": ({"one": 1, "two": 2, "three": 3}), "bools": ({"t": true, "f": false})});
     {
       const $if_let_value = ((arg) => { if (typeof arg !== "string") {throw new Error("unable to parse " + typeof arg + " " + arg + " as a string")}; return JSON.parse(JSON.stringify(arg)) })(((jsonElements)?.["strings"])?.["single"]);
       if ($if_let_value != undefined) {
         const val = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: val == \"Hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(val,"Hello")))};
+        $helpers.assert($helpers.eq(val, "Hello"), "val == \"Hello\"");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
@@ -169,68 +172,80 @@ class $Root extends $stdlib.std.Resource {
           const $if_let_value = (vals)?.[0];
           if ($if_let_value != undefined) {
             const hello = $if_let_value;
-            {((cond) => {if (!cond) throw new Error("assertion failed: hello == \"Hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(hello,"Hello")))};
+            $helpers.assert($helpers.eq(hello, "Hello"), "hello == \"Hello\"");
           }
           else {
-            {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+            $helpers.assert(false, "false");
           }
         }
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
       const $if_let_value = ((arg) => { return (typeof arg === "number") ? JSON.parse(JSON.stringify(arg)) : undefined })(((jsonElements)?.["numbers"])?.["two"]);
       if ($if_let_value != undefined) {
         const two = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: two + 2 == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((two + 2),4)))};
+        $helpers.assert($helpers.eq((two + 2), 4), "two + 2 == 4");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
       const $if_let_value = ((arg) => { return (typeof arg === "boolean") ? JSON.parse(JSON.stringify(arg)) : undefined })(((jsonElements)?.["bools"])?.["t"]);
       if ($if_let_value != undefined) {
         const truth = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: truth")})(truth)};
+        $helpers.assert(truth, "truth");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
       const $if_let_value = ((((jsonElements)?.["strings"])?.["non"])?.["existant"])?.["element"];
       if ($if_let_value != undefined) {
         const val = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
       const $if_let_value = (((jsonElements)?.["cant"])?.[1000])?.[42];
       if ($if_let_value != undefined) {
         const val = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     const notSpecified = ({"foo": "bar"});
-    {((cond) => {if (!cond) throw new Error("assertion failed: notSpecified.get(\"foo\") == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(notSpecified, "foo"),"bar")))};
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(notSpecified, "foo"), "bar"), "notSpecified.get(\"foo\") == \"bar\"");
     const empty = ({});
-    {((cond) => {if (!cond) throw new Error("assertion failed: Json.has(empty, \"something\") == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((args) => { return args[0].hasOwnProperty(args[1]); })([empty, "something"]),false)))};
+    $helpers.assert($helpers.eq(((obj, key) => { return obj.hasOwnProperty(key); })(empty,"something"), false), "empty.has(\"something\") == false");
     const arrayStruct = [({"foo": "", "stuff": []})];
     const setStruct = new Set([({"foo": "", "stuff": []})]);
     const mapStruct = ({["1"]: ({"foo": "", "stuff": []})});
     const deepCollectionStruct = ({["1"]: [new Set([({"foo": "", "stuff": []})])]});
     const notJsonMissingField = ({"foo": "bar", "stuff": []});
+    const notJsonWithInnerArray = ({"foo": "bar", "stuff": [], "buckets": [this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "B1InList")]});
     const notJson = ({"foo": "bar", "stuff": [1, 2, 3], "maybe": ({"good": true, "inner_stuff": [({"hi": 1, "base": "base"})]})});
     let mutableJson = ({"foo": "bar", "stuff": [1, 2, 3], "maybe": ({"good": true, "inner_stuff": [({"hi": 1, "base": "base"})]})});
-    const hasBucket = ({"a": ({"a": this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket")})});
+    const hasBucket = ({"a": ({"a": this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket")})});
+    const numVar = 1;
+    const strVar = "s";
+    const punnedJson1 = ({"numVar": numVar, "strVar": strVar});
+    $helpers.assert($helpers.eq($helpers.lookup(punnedJson1, "numVar"), 1), "punnedJson1[\"numVar\"] == 1");
+    $helpers.assert($helpers.eq($helpers.lookup(punnedJson1, "strVar"), "s"), "punnedJson1[\"strVar\"] == \"s\"");
+    const punnedMutJson1 = ({"numVar": numVar});
+    ((obj, key, value) => { obj[key] = value; })(punnedMutJson1, "numVar", (((arg) => { if (typeof arg !== "number") {throw new Error("unable to parse " + typeof arg + " " + arg + " as a number")}; return JSON.parse(JSON.stringify(arg)) })($helpers.lookup(punnedMutJson1, "numVar")) + 1));
+    $helpers.assert($helpers.eq($helpers.lookup(punnedMutJson1, "numVar"), 2), "punnedMutJson1[\"numVar\"] == 2");
+    const structToPunFromJson = ({"numVar": numVar, "strVar": strVar});
+    $helpers.assert($helpers.eq(structToPunFromJson.numVar, 1), "structToPunFromJson.numVar == 1");
+    $helpers.assert($helpers.eq(structToPunFromJson.strVar, "s"), "structToPunFromJson.strVar == \"s\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "json.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_test_sim.md
index feeb2a40f00..d4a50f443e8 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ json.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_compile_tf-aws.md
index e85be6a40c5..180a6a15dbe 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [json_bucket.test.w](../../../../../examples/tests/valid/json_bucket.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b, $fileName }) {
   class $Closure1 {
     constructor({  }) {
@@ -10,19 +11,20 @@ module.exports = function({ $b, $fileName }) {
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(msg) {
+    async handle() {
       const x = (await $b.getJson($fileName));
-      {((cond) => {if (!cond) throw new Error("assertion failed: x.get(\"persons\").getAt(0).get(\"fears\").getAt(1) == \"failure\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(x, "persons"), 0), "fears"), 1),"failure")))};
+      $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error("Index out of bounds"); return obj[args] })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(x, "persons"), 0), "fears"), 1), "failure"), "x.get(\"persons\").getAt(0).get(\"fears\").getAt(1) == \"failure\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b, $fileName, $getJson, $j }) {
   class $Closure2 {
     constructor({  }) {
@@ -37,7 +39,7 @@ module.exports = function({ $b, $fileName, $getJson, $j }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -47,22 +49,9 @@ module.exports = function({ $b, $fileName, $getJson, $j }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -71,58 +60,58 @@ module.exports = function({ $b, $fileName, $getJson, $j }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudFunction_CloudwatchLogGroup_7399B890": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "cloudFunction_CloudwatchLogGroup_7399B890"
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d2eca1",
+        "name": "/aws/lambda/Function-c852aba6",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudFunction_IamRole_5A4430DC": {
+      "Function_IamRole_678BE84C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRole",
-            "uniqueId": "cloudFunction_IamRole_5A4430DC"
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudFunction_IamRolePolicy_618BF987": {
+      "Function_IamRolePolicy_E3B26607": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicy",
-            "uniqueId": "cloudFunction_IamRolePolicy_618BF987"
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.cloudBucket.arn}\",\"${aws_s3_bucket.cloudBucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudFunction_IamRolePolicyAttachment_288B9653": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "cloudFunction_IamRolePolicyAttachment_288B9653"
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudFunction": {
+      "Function": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/Default",
-            "uniqueId": "cloudFunction"
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
           }
         },
         "architectures": [
@@ -130,20 +119,20 @@ module.exports = function({ $b, $fileName, $getJson, $j }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_d755b447": "${aws_s3_bucket.cloudBucket.bucket}",
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d2eca1",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d2eca1",
+        "function_name": "Function-c852aba6",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudFunction_S3Object_71908BAD.key}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -152,32 +141,32 @@ module.exports = function({ $b, $fileName, $getJson, $j }) {
       }
     },
     "aws_s3_bucket": {
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "code-c84a50b1-"
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
+        "bucket_prefix": "code-c84a50b1-"
       }
     },
     "aws_s3_object": {
-      "cloudFunction_S3Object_71908BAD": {
+      "Function_S3Object_C62A0C2D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/S3Object",
-            "uniqueId": "cloudFunction_S3Object_71908BAD"
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -189,27 +178,29 @@ module.exports = function({ $b, $fileName, $getJson, $j }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
             $fileName: ${$stdlib.core.liftObject(fileName)},
           })
@@ -218,7 +209,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -226,26 +217,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, ["getJson"]);
-          $Closure1._registerOnLiftObject(fileName, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, ["getJson"]],
+            [fileName, []],
+          ],
+          "$inflight_init": [
+            [b, []],
+            [fileName, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
             $fileName: ${$stdlib.core.liftObject(fileName)},
             $getJson: ${$stdlib.core.liftObject(getJson)},
@@ -256,7 +249,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -264,29 +257,33 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(b, host, ["putJson"]);
-          $Closure2._registerOnLiftObject(fileName, host, []);
-          $Closure2._registerOnLiftObject(getJson, host, ["invoke"]);
-          $Closure2._registerOnLiftObject(j, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, ["putJson"]],
+            [fileName, []],
+            [getJson, ["invoke"]],
+            [j, []],
+          ],
+          "$inflight_init": [
+            [b, []],
+            [fileName, []],
+            [getJson, []],
+            [j, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const fileName = "file.json";
     const j = ({"persons": [({"age": 30, "name": "hasan", "fears": ["heights", "failure"]})]});
-    const getJson = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", new $Closure1(this, "$Closure1"));
+    const getJson = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", new $Closure1(this, "$Closure1"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:put", new $Closure2(this, "$Closure2"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "json_bucket.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_test_sim.md
index f36c9947673..75aa22c20bc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json_bucket.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ json_bucket.test.wsim » root/env0/test:put
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_compile_tf-aws.md
index 649e0469694..cbef2880146 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [json_static.test.w](../../../../../examples/tests/valid/json_static.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $jj, $std_Json }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,19 +12,20 @@ module.exports = function({ $jj, $std_Json }) {
       return $obj;
     }
     async handle() {
-      const ss = ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([$jj]);
-      {((cond) => {if (!cond) throw new Error("assertion failed: ss == \"\\{\\\"a\\\":123,\\\"b\\\":\\{\\\"c\\\":456,\\\"d\\\":789}}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(ss,"{\"a\":123,\"b\":{\"c\":456,\"d\":789}}")))};
+      const ss = ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })($jj);
+      $helpers.assert($helpers.eq(ss, "{\"a\":123,\"b\":{\"c\":456,\"d\":789}}"), "ss == \"\\{\\\"a\\\":123,\\\"b\\\":\\{\\\"c\\\":456,\\\"d\\\":789}}\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $std_Json }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
   class $Closure2 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -32,13 +34,13 @@ module.exports = function({ $std_Json }) {
     }
     async handle() {
       const hasCheck = ({"a": "hello", "b": "wing"});
-      {((cond) => {if (!cond) throw new Error("assertion failed: Json.has(hasCheck, \"a\") == true")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((args) => { return args[0].hasOwnProperty(args[1]); })([hasCheck, "a"]),true)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: Json.has(hasCheck, \"c\") == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((args) => { return args[0].hasOwnProperty(args[1]); })([hasCheck, "c"]),false)))};
+      $helpers.assert($helpers.eq(((obj, key) => { return obj.hasOwnProperty(key); })(hasCheck,"a"), true), "hasCheck.has(\"a\") == true");
+      $helpers.assert($helpers.eq(((obj, key) => { return obj.hasOwnProperty(key); })(hasCheck,"c"), false), "hasCheck.has(\"c\") == false");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -48,22 +50,9 @@ module.exports = function({ $std_Json }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -73,27 +62,29 @@ module.exports = function({ $std_Json }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $jj: ${$stdlib.core.liftObject(jj)},
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
           })
@@ -102,7 +93,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -110,33 +101,33 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(jj, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [jj, []],
+          ],
+          "$inflight_init": [
+            [jj, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
-            $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -144,40 +135,45 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const x = ({"a": 123, "b": ({"c": 456, "d": 789})});
-    const k = (Object.keys(x));
-    {((cond) => {if (!cond) throw new Error("assertion failed: k.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(k.length,2)))};
-    const v = (Object.values(x));
-    {((cond) => {if (!cond) throw new Error("assertion failed: v.at(0) == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(v, 0),123)))};
-    const m = (JSON.parse(JSON.stringify(x)));
-    ((obj, args) => { obj[args[0]] = args[1]; })(m, ["a", 321]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: m.get(\"a\") == 321")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(m, "a"),321)))};
+    const k = Object.keys(x);
+    $helpers.assert($helpers.eq(k.length, 2), "k.length == 2");
+    const v = Object.values(x);
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(v, 0), 123), "v.at(0) == 123");
+    const m = JSON.parse(JSON.stringify(x));
+    ((obj, key, value) => { obj[key] = value; })(m, "a", 321);
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(m, "a"), 321), "m.get(\"a\") == 321");
     const n = JSON.parse(JSON.stringify(m));
-    {((cond) => {if (!cond) throw new Error("assertion failed: m == n")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(m,n)))};
-    let k2 = (Object.keys(m));
-    {((cond) => {if (!cond) throw new Error("assertion failed: k2.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(k2.length,2)))};
-    ((args) => { delete (args[0])[args[1]]; })([m, "b"]);
-    k2 = (Object.keys(m));
-    {((cond) => {if (!cond) throw new Error("assertion failed: k2.length == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(k2.length,1)))};
+    $helpers.assert($helpers.eq(m, n), "m == n");
+    let k2 = Object.keys(m);
+    $helpers.assert($helpers.eq(k2.length, 2), "k2.length == 2");
+    ((json, key) => { delete json[key]; })(m, "b");
+    k2 = Object.keys(m);
+    $helpers.assert($helpers.eq(k2.length, 1), "k2.length == 1");
     const s = "{\"a\": 123, \"b\": {\"c\": 456, \"d\": 789}}";
-    const j = (JSON.parse(s));
-    {((cond) => {if (!cond) throw new Error("assertion failed: Json.keys(j).length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((Object.keys(j)).length,2)))};
+    const j = JSON.parse(s);
+    $helpers.assert($helpers.eq(Object.keys(j).length, 2), "Json.keys(j).length == 2");
     const invalidJson = "invalid";
     const tryParsed = (((args) => { try { return (args === undefined) ? undefined : JSON.parse(args); } catch (err) { return undefined; } })(invalidJson) ?? ({"key": "value"}));
-    {((cond) => {if (!cond) throw new Error("assertion failed: tryParsed.get(\"key\") == \"value\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(tryParsed, "key"),"value")))};
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(tryParsed, "key"), "value"), "tryParsed.get(\"key\") == \"value\"");
     const jj = ({"a": 123, "b": ({"c": 456, "d": 789})});
-    const ss = ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([jj]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: ss == \"\\{\\\"a\\\":123,\\\"b\\\":\\{\\\"c\\\":456,\\\"d\\\":789}}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(ss,"{\"a\":123,\"b\":{\"c\":456,\"d\":789}}")))};
-    const ss2 = ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([jj, { indent: 2 }]);
-    {((cond) => {if (!cond) throw new Error("assertion failed: ss2 == \"\\{\\n  \\\"a\\\": 123,\\n  \\\"b\\\": \\{\\n    \\\"c\\\": 456,\\n    \\\"d\\\": 789\\n  }\\n}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(ss2,"{\n  \"a\": 123,\n  \"b\": {\n    \"c\": 456,\n    \"d\": 789\n  }\n}")))};
+    const ss = ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(jj);
+    $helpers.assert($helpers.eq(ss, "{\"a\":123,\"b\":{\"c\":456,\"d\":789}}"), "ss == \"\\{\\\"a\\\":123,\\\"b\\\":\\{\\\"c\\\":456,\\\"d\\\":789}}\"");
+    const ss2 = ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(jj, { indent: 2 });
+    $helpers.assert($helpers.eq(ss2, "{\n  \"a\": 123,\n  \"b\": {\n    \"c\": 456,\n    \"d\": 789\n  }\n}"), "ss2 == \"\\{\\n  \\\"a\\\": 123,\\n  \\\"b\\\": \\{\\n    \\\"c\\\": 456,\\n    \\\"d\\\": 789\\n  }\\n}\"");
     const jsonOfMany = ({"a": 123, "b": "hello", "c": true});
-    {((cond) => {if (!cond) throw new Error("assertion failed: str.fromJson(jsonOfMany.get(\"b\")) == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((std.String.fromJson(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonOfMany, "b"))),"hello")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: num.fromJson(jsonOfMany.get(\"a\")) == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((std.Number.fromJson(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonOfMany, "a"))),123)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: bool.fromJson(jsonOfMany.get(\"c\"))")})((std.Boolean.fromJson(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonOfMany, "c"))))};
+    $helpers.assert($helpers.eq((std.String.fromJson(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonOfMany, "b"))), "hello"), "str.fromJson(jsonOfMany.get(\"b\")) == \"hello\"");
+    $helpers.assert($helpers.eq((std.Number.fromJson(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonOfMany, "a"))), 123), "num.fromJson(jsonOfMany.get(\"a\")) == 123");
+    $helpers.assert((std.Boolean.fromJson(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(jsonOfMany, "c"))), "bool.fromJson(jsonOfMany.get(\"c\"))");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Access Json static inflight", new $Closure1(this, "$Closure1"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:has key or not", new $Closure2(this, "$Closure2"));
   }
@@ -185,6 +181,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "json_static.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_test_sim.md
index d1cf685905c..6817855e73c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json_static.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ json_static.test.wsim » root/env0/test:Access Json static inflight
 pass ─ json_static.test.wsim » root/env1/test:has key or not             
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_compile_tf-aws.md
index 0fcd01cd803..7dfc3aa272d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,31 +19,33 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     const obj = ({"strValue": "test", "numValue": 1});
     const notStringifyStrValue = String.raw({ raw: ["string: ", ""] }, JSON.stringify(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue")));
-    {((cond) => {if (!cond) throw new Error("assertion failed: notStringifyStrValue == \"string: \\\"test\\\"\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(notStringifyStrValue,"string: \"test\"")))};
+    $helpers.assert($helpers.eq(notStringifyStrValue, "string: \"test\""), "notStringifyStrValue == \"string: \\\"test\\\"\"");
     const stringifyNumValue = String.raw({ raw: ["number: ", ""] }, JSON.stringify(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "numValue")));
-    {((cond) => {if (!cond) throw new Error("assertion failed: stringifyNumValue == \"number: 1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(stringifyNumValue,"number: 1")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"{obj}\" == Json.stringify(obj)")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", ""] }, JSON.stringify(obj)),((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([obj]))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"{obj.get(\"strValue\")}\" == Json.stringify(obj.get(\"strValue\"))")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["", ""] }, JSON.stringify(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"))),((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue")]))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: obj.get(\"strValue\") == Json.parse(Json.stringify(obj.get(\"strValue\")))")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"),(JSON.parse(((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue")]))))))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: obj.get(\"strValue\") == Json.parse(\"{obj.get(\"strValue\")}\")")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"),(JSON.parse(String.raw({ raw: ["", ""] }, JSON.stringify(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"))))))))};
+    $helpers.assert($helpers.eq(stringifyNumValue, "number: 1"), "stringifyNumValue == \"number: 1\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, JSON.stringify(obj)), ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(obj)), "\"{obj}\" == Json.stringify(obj)");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["", ""] }, JSON.stringify(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"))), ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"))), "\"{obj.get(\"strValue\")}\" == Json.stringify(obj.get(\"strValue\"))");
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"), JSON.parse(((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue")))), "obj.get(\"strValue\") == Json.parse(Json.stringify(obj.get(\"strValue\")))");
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"), JSON.parse(String.raw({ raw: ["", ""] }, JSON.stringify(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(obj, "strValue"))))), "obj.get(\"strValue\") == Json.parse(\"{obj.get(\"strValue\")}\")");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "json_string_interpolation.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_test_sim.md
index dca978e303c..976a50ed310 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/json_string_interpolation.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ json_string_interpolation.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_compile_tf-aws.md
index eaaa1a5aa90..458c3ebe66e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [lift_expr_with_this.test.w](../../../../../examples/tests/valid/lift_expr_with_this.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({ $foo_this_value }) {
@@ -12,17 +13,18 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo_this.value == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$foo_this_value,"hello")))};
+      $helpers.assert($helpers.eq(this.$foo_this_value, "hello"), "foo_this.value == \"hello\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -30,7 +32,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -40,22 +42,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -65,14 +54,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -83,14 +74,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -98,26 +89,29 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
               $foo_this_value: ${$stdlib.core.liftObject(foo_this.value)},
             });
@@ -126,17 +120,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          $Closure1._registerOnLiftObject(foo_this.value, host, []);
-        }
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(foo_this.value, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo_this.value, []],
+          ],
+          "$inflight_init": [
+            [foo_this.value, []],
+          ],
+        });
       }
     }
     const foo_this = new Foo(this, "Foo");
@@ -146,6 +138,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_expr_with_this.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_test_sim.md
index e7fa63b2f0d..9df490183f6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_expr_with_this.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ lift_expr_with_this.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_collection.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_collection.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..18db0e302fc
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_collection.test.w_compile_tf-aws.md
@@ -0,0 +1,1020 @@
+# [lift_inflight_closure_collection.test.w](../../../../../examples/tests/valid/lift_inflight_closure_collection.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b1 }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq((await $b1.get("k")), "v1"), "b1.get(\"k\") == \"v1\"");
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure10-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $f4 }) {
+  class $Closure10 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $f4.invoke());
+    }
+  }
+  return $Closure10;
+}
+//# sourceMappingURL=inflight.$Closure10-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b2 }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq((await $b2.get("k")), "v2"), "b2.get(\"k\") == \"v2\"");
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $ar }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      for (const c of $ar) {
+        (await c());
+      }
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
+```
+
+## inflight.$Closure4-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $f1 }) {
+  class $Closure4 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $f1.invoke());
+    }
+  }
+  return $Closure4;
+}
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
+```
+
+## inflight.$Closure5-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $map }) {
+  class $Closure5 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      for (const c of Object.values($map)) {
+        (await c());
+      }
+    }
+  }
+  return $Closure5;
+}
+//# sourceMappingURL=inflight.$Closure5-1.cjs.map
+```
+
+## inflight.$Closure6-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $f2 }) {
+  class $Closure6 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $f2.invoke());
+    }
+  }
+  return $Closure6;
+}
+//# sourceMappingURL=inflight.$Closure6-1.cjs.map
+```
+
+## inflight.$Closure7-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $set }) {
+  class $Closure7 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      for (const c of $set) {
+        (await c());
+      }
+    }
+  }
+  return $Closure7;
+}
+//# sourceMappingURL=inflight.$Closure7-1.cjs.map
+```
+
+## inflight.$Closure8-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $f3 }) {
+  class $Closure8 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $f3.invoke());
+    }
+  }
+  return $Closure8;
+}
+//# sourceMappingURL=inflight.$Closure8-1.cjs.map
+```
+
+## inflight.$Closure9-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $complex }) {
+  class $Closure9 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const i = 0;
+      const k = "k1";
+      for (const c of ((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($complex, i), k)) {
+        (await c());
+      }
+    }
+  }
+  return $Closure9;
+}
+//# sourceMappingURL=inflight.$Closure9-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "f1_CloudwatchLogGroup_9EB92E4A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f1/CloudwatchLogGroup",
+            "uniqueId": "f1_CloudwatchLogGroup_9EB92E4A"
+          }
+        },
+        "name": "/aws/lambda/f1-c8545025",
+        "retention_in_days": 30
+      },
+      "f2_CloudwatchLogGroup_D231AE41": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/CloudwatchLogGroup",
+            "uniqueId": "f2_CloudwatchLogGroup_D231AE41"
+          }
+        },
+        "name": "/aws/lambda/f2-c812cd39",
+        "retention_in_days": 30
+      },
+      "f3_CloudwatchLogGroup_6427B63E": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f3/CloudwatchLogGroup",
+            "uniqueId": "f3_CloudwatchLogGroup_6427B63E"
+          }
+        },
+        "name": "/aws/lambda/f3-c8555a7c",
+        "retention_in_days": 30
+      },
+      "f4_CloudwatchLogGroup_666851B0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f4/CloudwatchLogGroup",
+            "uniqueId": "f4_CloudwatchLogGroup_666851B0"
+          }
+        },
+        "name": "/aws/lambda/f4-c8745b6f",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "f1_IamRole_FD68C58F": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f1/IamRole",
+            "uniqueId": "f1_IamRole_FD68C58F"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "f2_IamRole_B66911B2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/IamRole",
+            "uniqueId": "f2_IamRole_B66911B2"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "f3_IamRole_72675FA1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f3/IamRole",
+            "uniqueId": "f3_IamRole_72675FA1"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      },
+      "f4_IamRole_E4904831": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f4/IamRole",
+            "uniqueId": "f4_IamRole_E4904831"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "f1_IamRolePolicy_DAEEDBF2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f1/IamRolePolicy",
+            "uniqueId": "f1_IamRolePolicy_DAEEDBF2"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b1.arn}\",\"${aws_s3_bucket.b1.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b2.arn}\",\"${aws_s3_bucket.b2.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.f1_IamRole_FD68C58F.name}"
+      },
+      "f2_IamRolePolicy_4B68F2E2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/IamRolePolicy",
+            "uniqueId": "f2_IamRolePolicy_4B68F2E2"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b1.arn}\",\"${aws_s3_bucket.b1.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b2.arn}\",\"${aws_s3_bucket.b2.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.f2_IamRole_B66911B2.name}"
+      },
+      "f3_IamRolePolicy_92FF1F39": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f3/IamRolePolicy",
+            "uniqueId": "f3_IamRolePolicy_92FF1F39"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b1.arn}\",\"${aws_s3_bucket.b1.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b2.arn}\",\"${aws_s3_bucket.b2.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.f3_IamRole_72675FA1.name}"
+      },
+      "f4_IamRolePolicy_089B6AE7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f4/IamRolePolicy",
+            "uniqueId": "f4_IamRolePolicy_089B6AE7"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b1.arn}\",\"${aws_s3_bucket.b1.arn}/*\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.b2.arn}\",\"${aws_s3_bucket.b2.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.f4_IamRole_E4904831.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "f1_IamRolePolicyAttachment_39B6759B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f1/IamRolePolicyAttachment",
+            "uniqueId": "f1_IamRolePolicyAttachment_39B6759B"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.f1_IamRole_FD68C58F.name}"
+      },
+      "f2_IamRolePolicyAttachment_E65452F9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/IamRolePolicyAttachment",
+            "uniqueId": "f2_IamRolePolicyAttachment_E65452F9"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.f2_IamRole_B66911B2.name}"
+      },
+      "f3_IamRolePolicyAttachment_1D6B7824": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f3/IamRolePolicyAttachment",
+            "uniqueId": "f3_IamRolePolicyAttachment_1D6B7824"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.f3_IamRole_72675FA1.name}"
+      },
+      "f4_IamRolePolicyAttachment_B486D2A0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f4/IamRolePolicyAttachment",
+            "uniqueId": "f4_IamRolePolicyAttachment_B486D2A0"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.f4_IamRole_E4904831.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "f1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f1/Default",
+            "uniqueId": "f1"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_12a95bb8": "${aws_s3_bucket.b1.bucket}",
+            "BUCKET_NAME_fa6445bb": "${aws_s3_bucket.b2.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "f1-c8545025",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "f1-c8545025",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.f1_IamRole_FD68C58F.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.f1_S3Object_9A84AD47.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "f2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/Default",
+            "uniqueId": "f2"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_12a95bb8": "${aws_s3_bucket.b1.bucket}",
+            "BUCKET_NAME_fa6445bb": "${aws_s3_bucket.b2.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "f2-c812cd39",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "f2-c812cd39",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.f2_IamRole_B66911B2.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.f2_S3Object_ABE842D7.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "f3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f3/Default",
+            "uniqueId": "f3"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_12a95bb8": "${aws_s3_bucket.b1.bucket}",
+            "BUCKET_NAME_fa6445bb": "${aws_s3_bucket.b2.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "f3-c8555a7c",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "f3-c8555a7c",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.f3_IamRole_72675FA1.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.f3_S3Object_ED65218A.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      },
+      "f4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f4/Default",
+            "uniqueId": "f4"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_12a95bb8": "${aws_s3_bucket.b1.bucket}",
+            "BUCKET_NAME_fa6445bb": "${aws_s3_bucket.b2.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "f4-c8745b6f",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "f4-c8745b6f",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.f4_IamRole_E4904831.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.f4_S3Object_E76D3595.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      },
+      "b1": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b1/Default",
+            "uniqueId": "b1"
+          }
+        },
+        "bucket_prefix": "b1-c88fb896-",
+        "force_destroy": false
+      },
+      "b2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b2/Default",
+            "uniqueId": "b2"
+          }
+        },
+        "bucket_prefix": "b2-c844cd88-",
+        "force_destroy": false
+      }
+    },
+    "aws_s3_object": {
+      "b1_S3Object-k_80FB6BEF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b1/S3Object-k",
+            "uniqueId": "b1_S3Object-k_80FB6BEF"
+          }
+        },
+        "bucket": "${aws_s3_bucket.b1.bucket}",
+        "content": "v1",
+        "key": "k"
+      },
+      "b2_S3Object-k_9106862E": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/b2/S3Object-k",
+            "uniqueId": "b2_S3Object-k_9106862E"
+          }
+        },
+        "bucket": "${aws_s3_bucket.b2.bucket}",
+        "content": "v2",
+        "key": "k"
+      },
+      "f1_S3Object_9A84AD47": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f1/S3Object",
+            "uniqueId": "f1_S3Object_9A84AD47"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "f2_S3Object_ABE842D7": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f2/S3Object",
+            "uniqueId": "f2_S3Object_ABE842D7"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "f3_S3Object_ED65218A": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f3/S3Object",
+            "uniqueId": "f3_S3Object_ED65218A"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      },
+      "f4_S3Object_E76D3595": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/f4/S3Object",
+            "uniqueId": "f4_S3Object_E76D3595"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $b1: ${$stdlib.core.liftObject(b1)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b1, ["get"]],
+          ],
+          "$inflight_init": [
+            [b1, []],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $b2: ${$stdlib.core.liftObject(b2)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b2, ["get"]],
+          ],
+          "$inflight_init": [
+            [b2, []],
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $ar: ${$stdlib.core.liftObject(ar)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [ar, []],
+          ],
+          "$inflight_init": [
+            [ar, []],
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
+            $f1: ${$stdlib.core.liftObject(f1)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f1, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [f1, []],
+          ],
+        });
+      }
+    }
+    class $Closure5 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure5-1.cjs")({
+            $map: ${$stdlib.core.liftObject(map)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure5Client = ${$Closure5._toInflightType()};
+            const client = new $Closure5Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [map, ["values"]],
+          ],
+          "$inflight_init": [
+            [map, []],
+          ],
+        });
+      }
+    }
+    class $Closure6 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure6-1.cjs")({
+            $f2: ${$stdlib.core.liftObject(f2)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure6Client = ${$Closure6._toInflightType()};
+            const client = new $Closure6Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f2, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [f2, []],
+          ],
+        });
+      }
+    }
+    class $Closure7 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure7-1.cjs")({
+            $set: ${$stdlib.core.liftObject(set)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure7Client = ${$Closure7._toInflightType()};
+            const client = new $Closure7Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [set, []],
+          ],
+          "$inflight_init": [
+            [set, []],
+          ],
+        });
+      }
+    }
+    class $Closure8 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure8-1.cjs")({
+            $f3: ${$stdlib.core.liftObject(f3)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure8Client = ${$Closure8._toInflightType()};
+            const client = new $Closure8Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f3, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [f3, []],
+          ],
+        });
+      }
+    }
+    class $Closure9 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure9-1.cjs")({
+            $complex: ${$stdlib.core.liftObject(complex)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure9Client = ${$Closure9._toInflightType()};
+            const client = new $Closure9Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [complex, ["at"]],
+          ],
+          "$inflight_init": [
+            [complex, []],
+          ],
+        });
+      }
+    }
+    class $Closure10 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure10-1.cjs")({
+            $f4: ${$stdlib.core.liftObject(f4)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure10Client = ${$Closure10._toInflightType()};
+            const client = new $Closure10Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f4, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [f4, []],
+          ],
+        });
+      }
+    }
+    const b1 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b1");
+    (b1.addObject("k", "v1"));
+    const b2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b2");
+    (b2.addObject("k", "v2"));
+    const c1 = new $Closure1(this, "$Closure1");
+    const c2 = new $Closure2(this, "$Closure2");
+    const ar = [c1, c2];
+    const f1 = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "f1", new $Closure3(this, "$Closure3"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:lift closure array", new $Closure4(this, "$Closure4"));
+    const map = ({["k1"]: c1, ["k2"]: c2});
+    const f2 = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "f2", new $Closure5(this, "$Closure5"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:lift closure map", new $Closure6(this, "$Closure6"));
+    const set = new Set([c1, c2]);
+    const f3 = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "f3", new $Closure7(this, "$Closure7"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:lift closure set", new $Closure8(this, "$Closure8"));
+    const complex = [({["k1"]: new Set([c1, c2])})];
+    const f4 = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "f4", new $Closure9(this, "$Closure9"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:lift closure in complex collection", new $Closure10(this, "$Closure10"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_inflight_closure_collection.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_collection.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_collection.test.w_test_sim.md
new file mode 100644
index 00000000000..7f3b19aee57
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_collection.test.w_test_sim.md
@@ -0,0 +1,15 @@
+# [lift_inflight_closure_collection.test.w](../../../../../examples/tests/valid/lift_inflight_closure_collection.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ lift_inflight_closure_collection.test.wsim » root/env0/test:lift closure array                
+pass ─ lift_inflight_closure_collection.test.wsim » root/env1/test:lift closure map                  
+pass ─ lift_inflight_closure_collection.test.wsim » root/env2/test:lift closure set                  
+pass ─ lift_inflight_closure_collection.test.wsim » root/env3/test:lift closure in complex collection
+
+Tests 4 passed (4)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_returning_object_issue6501.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_returning_object_issue6501.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..0e22d0f29a0
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_returning_object_issue6501.test.w_compile_tf-aws.md
@@ -0,0 +1,331 @@
+# [lift_inflight_closure_returning_object_issue6501.test.w](../../../../../examples/tests/valid/lift_inflight_closure_returning_object_issue6501.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $Foo }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      return (await (async () => {const o = new $Foo(); await o.$inflight_init?.(); return o; })());
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $foo }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq((await (await $foo()).do()), 1337), "foo().do() == 1337");
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      return $b;
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
+```
+
+## inflight.$Closure4-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b, $bar }) {
+  class $Closure4 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      {
+        (await (await $bar()).put("a", "value"));
+      }
+      $helpers.assert($helpers.eq((await $b.get("a")), "value"), "b.get(\"a\") == \"value\"");
+    }
+  }
+  return $Closure4;
+}
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
+```
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Foo {
+    async do() {
+      return 1337;
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "do": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $Foo: ${$stdlib.core.liftObject(Foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $foo: ${$stdlib.core.liftObject(foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, ["handle"]],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $b: ${$stdlib.core.liftObject(b)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, []],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
+            $b: ${$stdlib.core.liftObject(b)},
+            $bar: ${$stdlib.core.liftObject(bar)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, [].concat(["put"], ["get"])],
+            [bar, ["handle"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+            [bar, []],
+          ],
+        });
+      }
+    }
+    const foo = new $Closure1(this, "$Closure1");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test qualify closure returning an inflight object", new $Closure2(this, "$Closure2"));
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const bar = new $Closure3(this, "$Closure3");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test qualify closure returning a preflight object", new $Closure4(this, "$Closure4"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_inflight_closure_returning_object_issue6501.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_returning_object_issue6501.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_returning_object_issue6501.test.w_test_sim.md
new file mode 100644
index 00000000000..751766c54f1
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_inflight_closure_returning_object_issue6501.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [lift_inflight_closure_returning_object_issue6501.test.w](../../../../../examples/tests/valid/lift_inflight_closure_returning_object_issue6501.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ lift_inflight_closure_returning_object_issue6501.test.wsim » root/env0/test:test qualify closure returning an inflight object
+pass ─ lift_inflight_closure_returning_object_issue6501.test.wsim » root/env1/test:test qualify closure returning a preflight object
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_parent_fields.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_parent_fields.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..9854460a01c
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_parent_fields.test.w_compile_tf-aws.md
@@ -0,0 +1,270 @@
+# [lift_parent_fields.test.w](../../../../../examples/tests/valid/lift_parent_fields.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $c }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq((await $c.do()), "c b a"), "c.do() == \"c b a\"");
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.A-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class A {
+    constructor({ $this_a }) {
+      this.$this_a = $this_a;
+    }
+    async do() {
+      return this.$this_a;
+    }
+  }
+  return A;
+}
+//# sourceMappingURL=inflight.A-1.cjs.map
+```
+
+## inflight.B-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $A }) {
+  class B extends $A {
+    constructor({ $this_b, $this_a }) {
+      super({ $this_a });
+      this.$this_b = $this_b;
+    }
+    async do() {
+      return String.raw({ raw: ["", " ", ""] }, this.$this_b, (await super.do()));
+    }
+  }
+  return B;
+}
+//# sourceMappingURL=inflight.B-1.cjs.map
+```
+
+## inflight.C-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $B }) {
+  class C extends $B {
+    constructor({ $this_b, $this_c, $this_a }) {
+      super({ $this_b, $this_a });
+      this.$this_b = $this_b;
+      this.$this_c = $this_c;
+    }
+    async dummy() {
+      console.log(String.raw({ raw: ["", ""] }, this.$this_b));
+    }
+    async do() {
+      return String.raw({ raw: ["", " ", ""] }, this.$this_c, (await super.do()));
+    }
+  }
+  return C;
+}
+//# sourceMappingURL=inflight.C-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class A extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        this.a = "a";
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const AClient = ${A._toInflightType()};
+            const client = new AClient({
+              $this_a: ${$stdlib.core.liftObject(this.a)},
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "do": [
+            [this.a, []],
+          ],
+          "$inflight_init": [
+            [this.a, []],
+          ],
+        });
+      }
+    }
+    class B extends A {
+      constructor($scope, $id, ) {
+        super($scope, $id, );
+        this.b = "b";
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
+            $A: ${$stdlib.core.liftObject(A)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const BClient = ${B._toInflightType()};
+            const client = new BClient({
+              $this_b: ${$stdlib.core.liftObject(this.b)},
+              $this_a: ${$stdlib.core.liftObject(this.a)},
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "do": [
+            [this.b, []],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+          ],
+        });
+      }
+    }
+    class C extends B {
+      constructor($scope, $id, ) {
+        super($scope, $id, );
+        this.c = "c";
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C-1.cjs")({
+            $B: ${$stdlib.core.liftObject(B)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const CClient = ${C._toInflightType()};
+            const client = new CClient({
+              $this_b: ${$stdlib.core.liftObject(this.b)},
+              $this_c: ${$stdlib.core.liftObject(this.c)},
+              $this_a: ${$stdlib.core.liftObject(this.a)},
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "dummy": [
+            [this.b, []],
+          ],
+          "do": [
+            [this.c, []],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+            [this.c, []],
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $c: ${$stdlib.core.liftObject(c)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [c, ["do"]],
+          ],
+          "$inflight_init": [
+            [c, []],
+          ],
+        });
+      }
+    }
+    const c = new C(this, "C");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_parent_fields.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_parent_fields.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_parent_fields.test.w_test_sim.md
new file mode 100644
index 00000000000..5dfbba30923
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_parent_fields.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [lift_parent_fields.test.w](../../../../../examples/tests/valid/lift_parent_fields.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ lift_parent_fields.test.wsim » root/env0/test:test
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_compile_tf-aws.md
index 9a5bb53272a..008fd5cb20d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [lift_redefinition.test.w](../../../../../examples/tests/valid/lift_redefinition.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $y }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,14 +12,14 @@ module.exports = function({ $y }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: y == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($y,"hello")))};
+      $helpers.assert($helpers.eq($y, "hello"), "y == \"hello\"");
       const y = "z";
-      {((cond) => {if (!cond) throw new Error("assertion failed: y == \"z\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,"z")))};
+      $helpers.assert($helpers.eq(y, "z"), "y == \"z\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -28,22 +29,9 @@ module.exports = function({ $y }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -53,26 +41,28 @@ module.exports = function({ $y }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $y: ${$stdlib.core.liftObject(y)},
           })
         `;
@@ -80,7 +70,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -88,14 +78,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(y, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [y, []],
+          ],
+          "$inflight_init": [
+            [y, []],
+          ],
+        });
       }
     }
     const y = "hello";
@@ -105,6 +96,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_redefinition.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_test_sim.md
index 4e88c1d43b8..8b9912958b7 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_redefinition.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ lift_redefinition.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_shared_resource.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_shared_resource.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..39d5e3d398f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_shared_resource.test.w_compile_tf-aws.md
@@ -0,0 +1,435 @@
+# [lift_shared_resource.test.w](../../../../../examples/tests/valid/lift_shared_resource.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b1, $b2 }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $b1.list());
+      (await $b2.list());
+      return ({"status": 200});
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $api_url, $http_Util }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const res = (await $http_Util.get($api_url));
+      $helpers.assert($helpers.eq(res.status, 200), "res.status == 200");
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.MyBucket-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class MyBucket {
+    constructor({ $this_bucket }) {
+      this.$this_bucket = $this_bucket;
+    }
+    async list() {
+      (await this.$this_bucket.list());
+    }
+  }
+  return MyBucket;
+}
+//# sourceMappingURL=inflight.MyBucket-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+      "root": {
+        "Default": {
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
+    "aws_region": {
+      "Region": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Region",
+            "uniqueId": "Region"
+          }
+        }
+      }
+    }
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    }
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
+        }
+      }
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
+          }
+        },
+        "body": "{\"paths\":{\"/\":{\"get\":{\"operationId\":\"get\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_0-c86d29bb/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c8f613f0"
+      }
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod"
+      }
+    },
+    "aws_cloudwatch_log_group": {
+      "Api_get_0_CloudwatchLogGroup_196DE719": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_0_CloudwatchLogGroup_196DE719"
+          }
+        },
+        "name": "/aws/lambda/get_0-c86d29bb",
+        "retention_in_days": 30
+      }
+    },
+    "aws_iam_role": {
+      "Api_get_0_IamRole_2FAC475D": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/IamRole",
+            "uniqueId": "Api_get_0_IamRole_2FAC475D"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Api_get_0_IamRolePolicy_D9FB373B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/IamRolePolicy",
+            "uniqueId": "Api_get_0_IamRolePolicy_D9FB373B"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:List*\",\"s3:GetObject*\",\"s3:GetBucket*\"],\"Resource\":[\"${aws_s3_bucket.Bucket.arn}\",\"${aws_s3_bucket.Bucket.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Api_get_0_IamRolePolicyAttachment_AEF1DC01": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_0_IamRolePolicyAttachment_AEF1DC01"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Api_get_0_IamRole_2FAC475D.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Api_get_0_244A7BA4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/Default",
+            "uniqueId": "Api_get_0_244A7BA4"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "BUCKET_NAME_1357ca3a": "${aws_s3_bucket.Bucket.bucket}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "get_0-c86d29bb",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "get_0-c86d29bb",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Api_get_0_IamRole_2FAC475D.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Api_get_0_S3Object_D1844823.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Api_api_permission-GET-c2e3ffa8_5BF93889": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/permission-GET-c2e3ffa8",
+            "uniqueId": "Api_api_permission-GET-c2e3ffa8_5BF93889"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Api_get_0_244A7BA4.function_name}",
+        "principal": "apigateway.amazonaws.com",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/",
+        "statement_id": "AllowExecutionFromAPIGateway-GET-c2e3ffa8"
+      }
+    },
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      },
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      }
+    },
+    "aws_s3_object": {
+      "Api_get_0_S3Object_D1844823": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/get_0/S3Object",
+            "uniqueId": "Api_get_0_S3Object_D1844823"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+const http = $stdlib.http;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class MyBucket extends $stdlib.std.Resource {
+      constructor($scope, $id, bucket) {
+        super($scope, $id);
+        this.bucket = bucket;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.MyBucket-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const MyBucketClient = ${MyBucket._toInflightType()};
+            const client = new MyBucketClient({
+              $this_bucket: ${$stdlib.core.liftObject(this.bucket)},
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "list": [
+            [this.bucket, ["list"]],
+          ],
+          "$inflight_init": [
+            [this.bucket, []],
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $b1: ${$stdlib.core.liftObject(b1)},
+            $b2: ${$stdlib.core.liftObject(b2)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b1, ["list"]],
+            [b2, ["list"]],
+          ],
+          "$inflight_init": [
+            [b1, []],
+            [b2, []],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $api_url: ${$stdlib.core.liftObject(api.url)},
+            $http_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.Util, "@winglang/sdk/http", "Util"))},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
+      }
+    }
+    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const b1 = new MyBucket(this, "b1", bucket);
+    const b2 = new MyBucket(this, "b2", bucket);
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
+    (api.get("/", new $Closure1(this, "$Closure1")));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:call endpoint", new $Closure2(this, "$Closure2"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_shared_resource.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_shared_resource.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_shared_resource.test.w_test_sim.md
new file mode 100644
index 00000000000..4ba3201c7a0
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_shared_resource.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [lift_shared_resource.test.w](../../../../../examples/tests/valid/lift_shared_resource.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ lift_shared_resource.test.wsim » root/env0/test:call endpoint
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_compile_tf-aws.md
index 73595c55542..aead5f77bbb 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_compile_tf-aws.md
@@ -1,9 +1,10 @@
 # [lift_this.test.w](../../../../../examples/tests/valid/lift_this.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $f }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $f, $util_Util }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -11,17 +12,19 @@ module.exports = function({ $f }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: f.foo() == 21")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $f.foo()),21)))};
+      $helpers.assert($helpers.eq((await $f.foo()), 21), "f.foo() == 21");
+      $helpers.assert($helpers.eq((await $util_Util.env("BAR")), "123"), "util.env(\"BAR\") == \"123\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -38,7 +41,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -48,22 +51,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -73,14 +63,17 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -88,16 +81,21 @@ class $Root extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
       }
+      onLift(host, ops) {
+        if (ops.includes("bar")) {
+          (host.addEnvironment("BAR", "123"));
+        }
+      }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -105,33 +103,38 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "x", "bar", "foo", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("foo")) {
-          Foo._registerOnLiftObject(this, host, ["bar"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "bar": [
+          ],
+          "foo": [
+            [this, ["bar"]],
+          ],
+          "$inflight_init": [
+          ],
+          "x": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $f: ${$stdlib.core.liftObject(f)},
+            $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -139,14 +142,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(f, host, ["foo"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["foo"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
       }
     }
     const f = new Foo(this, "Foo");
@@ -156,6 +160,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_this.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_test_sim.md
index e98d3a362bb..45293518b57 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_this.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ lift_this.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_compile_tf-aws.md
index 4718dcddcdd..e36aa1d5837 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [lift_via_closure.test.w](../../../../../examples/tests/valid/lift_via_closure.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket2 }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $bucket2 }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fn }) {
   class $Closure2 {
     constructor({  }) {
@@ -35,12 +37,13 @@ module.exports = function({ $fn }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket2, $fn2, $fn2_bucket }) {
   class $Closure3 {
     constructor({  }) {
@@ -50,19 +53,20 @@ module.exports = function({ $bucket2, $fn2, $fn2_bucket }) {
     }
     async handle() {
       (await $fn2());
-      {((cond) => {if (!cond) throw new Error("assertion failed: fn2.bucket.get(\"hello\") == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $fn2_bucket.get("hello")),"world")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: fn2.listFiles().length == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $fn2.listFiles()).length,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: bucket2.get(\"b2\") == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $bucket2.get("b2")),"world")))};
+      $helpers.assert($helpers.eq((await $fn2_bucket.get("hello")), "world"), "fn2.bucket.get(\"hello\") == \"world\"");
+      $helpers.assert($helpers.eq((await $fn2.listFiles()).length, 1), "fn2.listFiles().length == 1");
+      $helpers.assert($helpers.eq((await $bucket2.get("b2")), "world"), "bucket2.get(\"b2\") == \"world\"");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.MyClosure-1.js
-```js
+## inflight.MyClosure-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket2 }) {
   class MyClosure {
     constructor({ $this_bucket }) {
@@ -72,11 +76,11 @@ module.exports = function({ $bucket2 }) {
       return $obj;
     }
     async handle() {
-      {console.log("handle called")};
+      console.log("handle called");
       (await this.putFile());
     }
     async putFile() {
-      {console.log("putFile called")};
+      console.log("putFile called");
       (await this.$this_bucket.put("hello", "world"));
     }
     async listFiles() {
@@ -86,7 +90,7 @@ module.exports = function({ $bucket2 }) {
   }
   return MyClosure;
 }
-//# sourceMappingURL=inflight.MyClosure-1.js.map
+//# sourceMappingURL=inflight.MyClosure-1.cjs.map
 ```
 
 ## main.tf.json
@@ -96,22 +100,9 @@ module.exports = function({ $bucket2 }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -120,24 +111,24 @@ module.exports = function({ $bucket2 }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "MyClosure_cloudBucket_4DAD12C0": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyClosure/cloud.Bucket/Default",
-            "uniqueId": "MyClosure_cloudBucket_4DAD12C0"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8b87a6b-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       },
-      "cloudBucket": {
+      "MyClosure_Bucket_874B5056": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/MyClosure/Bucket/Default",
+            "uniqueId": "MyClosure_Bucket_874B5056"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c8fe564c-",
         "force_destroy": false
       }
     }
@@ -145,27 +136,29 @@ module.exports = function({ $bucket2 }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bucket2: ${$stdlib.core.liftObject(bucket2)},
           })
         `;
@@ -173,7 +166,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -181,25 +174,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket2, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket2, ["put"]],
+          ],
+          "$inflight_init": [
+            [bucket2, []],
+          ],
+        });
       }
     }
     class MyClosure extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyClosure-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyClosure-1.cjs")({
             $bucket2: ${$stdlib.core.liftObject(bucket2)},
           })
         `;
@@ -207,7 +201,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const MyClosureClient = ${MyClosure._toInflightType(this)};
+            const MyClosureClient = ${MyClosure._toInflightType()};
             const client = new MyClosureClient({
               $this_bucket: ${$stdlib.core.liftObject(this.bucket)},
             });
@@ -216,35 +210,34 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "putFile", "listFiles", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyClosure._registerOnLiftObject(this.bucket, host, []);
-        }
-        if (ops.includes("handle")) {
-          MyClosure._registerOnLiftObject(this, host, ["putFile"]);
-        }
-        if (ops.includes("listFiles")) {
-          MyClosure._registerOnLiftObject(bucket2, host, ["put"]);
-          MyClosure._registerOnLiftObject(this.bucket, host, ["list"]);
-        }
-        if (ops.includes("putFile")) {
-          MyClosure._registerOnLiftObject(this.bucket, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [this, ["putFile"]],
+          ],
+          "putFile": [
+            [this.bucket, ["put"]],
+          ],
+          "listFiles": [
+            [bucket2, ["put"]],
+            [this.bucket, ["list"]],
+          ],
+          "$inflight_init": [
+            [bucket2, []],
+            [this.bucket, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $fn: ${$stdlib.core.liftObject(fn)},
           })
         `;
@@ -252,7 +245,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -260,25 +253,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(fn, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, ["handle"]],
+          ],
+          "$inflight_init": [
+            [fn, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $bucket2: ${$stdlib.core.liftObject(bucket2)},
             $fn2: ${$stdlib.core.liftObject(fn2)},
             $fn2_bucket: ${$stdlib.core.liftObject(fn2.bucket)},
@@ -288,7 +282,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -296,19 +290,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(bucket2, host, ["get"]);
-          $Closure3._registerOnLiftObject(fn2, host, ["handle", "listFiles"]);
-          $Closure3._registerOnLiftObject(fn2.bucket, host, ["get"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket2, ["get"]],
+            [fn2, [].concat(["handle"], ["listFiles"])],
+            [fn2.bucket, ["get"]],
+          ],
+          "$inflight_init": [
+            [bucket2, []],
+            [fn2, []],
+            [fn2.bucket, []],
+          ],
+        });
       }
     }
-    const bucket2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const bucket2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const fn = new $Closure1(this, "$Closure1");
     const fn2 = new MyClosure(this, "MyClosure");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:call synthetic closure class as a function", new $Closure2(this, "$Closure2"));
@@ -318,6 +315,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_via_closure.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_test_sim.md
index 0679f259533..fb9d3ab8cde 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure.test.w_test_sim.md
@@ -2,13 +2,13 @@
 
 ## stdout.log
 ```log
+[INFO] call non-synthetic closure as a function | handle called
+[INFO] call non-synthetic closure as a function | putFile called
 pass ─ lift_via_closure.test.wsim » root/env0/test:call synthetic closure class as a function
-pass ┌ lift_via_closure.test.wsim » root/env1/test:call non-synthetic closure as a function  
-     │ handle called
-     └ putFile called
- 
- 
+pass ─ lift_via_closure.test.wsim » root/env1/test:call non-synthetic closure as a function  
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_compile_tf-aws.md
index d13b4a40e66..55c83d2f17b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [lift_via_closure_explicit.test.w](../../../../../examples/tests/valid/lift_via_closure_explicit.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fn }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $fn }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.MyClosure-1.js
-```js
+## inflight.MyClosure-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyClosure {
     constructor({ $this_q }) {
@@ -36,7 +38,7 @@ module.exports = function({  }) {
   }
   return MyClosure;
 }
-//# sourceMappingURL=inflight.MyClosure-1.js.map
+//# sourceMappingURL=inflight.MyClosure-1.cjs.map
 ```
 
 ## main.tf.json
@@ -46,22 +48,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -70,15 +59,15 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_sqs_queue": {
-      "MyClosure_cloudQueue_465FD228": {
+      "MyClosure_Queue_7DFF9F76": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyClosure/cloud.Queue/Default",
-            "uniqueId": "MyClosure_cloudQueue_465FD228"
+            "path": "root/Default/Default/MyClosure/Queue/Default",
+            "uniqueId": "MyClosure_Queue_7DFF9F76"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c8cccb9b",
+        "name": "Queue-c832d7dc",
         "visibility_timeout_seconds": 30
       }
     }
@@ -86,34 +75,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class MyClosure extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyClosure-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyClosure-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyClosureClient = ${MyClosure._toInflightType(this)};
+            const MyClosureClient = ${MyClosure._toInflightType()};
             const client = new MyClosureClient({
               $this_q: ${$stdlib.core.liftObject(this.q)},
             });
@@ -122,28 +113,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyClosure._registerOnLiftObject(this.q, host, []);
-        }
-        if (ops.includes("handle")) {
-          MyClosure._registerOnLiftObject(this.q, host, ["push"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [this.q, ["push"]],
+          ],
+          "$inflight_init": [
+            [this.q, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $fn: ${$stdlib.core.liftObject(fn)},
           })
         `;
@@ -151,7 +140,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -159,14 +148,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(fn, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, ["handle"]],
+          ],
+          "$inflight_init": [
+            [fn, []],
+          ],
+        });
       }
     }
     const fn = new MyClosure(this, "MyClosure");
@@ -176,6 +166,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_via_closure_explicit.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_test_sim.md
index bd4b3a07b9a..342e666f018 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_via_closure_explicit.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ lift_via_closure_explicit.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_weird_order.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_weird_order.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..38549ae6e98
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_weird_order.test.w_compile_tf-aws.md
@@ -0,0 +1,202 @@
+# [lift_weird_order.test.w](../../../../../examples/tests/valid/lift_weird_order.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b, $c }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $b.do());
+      (await $c.do());
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.B-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class B {
+    constructor({  }) {
+    }
+    async do() {
+    }
+  }
+  return B;
+}
+//# sourceMappingURL=inflight.B-1.cjs.map
+```
+
+## inflight.C-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class C {
+    constructor({ $this_b }) {
+      this.$this_b = $this_b;
+    }
+    async do() {
+      (await this.$this_b.do());
+    }
+  }
+  return C;
+}
+//# sourceMappingURL=inflight.C-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class B extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const BClient = ${B._toInflightType()};
+            const client = new BClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "do": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class C extends $stdlib.std.Resource {
+      constructor($scope, $id, b) {
+        super($scope, $id);
+        this.b = b;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.C-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const CClient = ${C._toInflightType()};
+            const client = new CClient({
+              $this_b: ${$stdlib.core.liftObject(this.b)},
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "do": [
+            [this.b, ["do"]],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $b: ${$stdlib.core.liftObject(b)},
+            $c: ${$stdlib.core.liftObject(c)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, ["do"]],
+            [c, ["do"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+            [c, []],
+          ],
+        });
+      }
+    }
+    const b = new B(this, "B");
+    const c = new C(this, "C", b);
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:something", new $Closure1(this, "$Closure1"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_weird_order.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_weird_order.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_weird_order.test.w_test_sim.md
new file mode 100644
index 00000000000..823fe122e5f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_weird_order.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [lift_weird_order.test.w](../../../../../examples/tests/valid/lift_weird_order.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ lift_weird_order.test.wsim » root/env0/test:something
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_with_phase_ind.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_with_phase_ind.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..ca66b36a28a
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_with_phase_ind.test.w_compile_tf-aws.md
@@ -0,0 +1,108 @@
+# [lift_with_phase_ind.test.w](../../../../../examples/tests/valid/lift_with_phase_ind.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $ar, $math_Util }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($ar, 0), 1), "ar.at(0) == 1");
+      const i = (await $math_Util.floor(((await $math_Util.random()) * $ar.length)));
+      let x = ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($ar, i);
+      $helpers.assert(((x >= 1) && (x <= 3)), "x >= 1 && x <= 3");
+      x = ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($ar, ((1 - 1) + i));
+      $helpers.assert(((x >= 1) && (x <= 3)), "x >= 1 && x <= 3");
+      const mut_ar = [...($ar)];
+      mut_ar.push(4);
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const math = $stdlib.math;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $ar: ${$stdlib.core.liftObject(ar)},
+            $math_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(math.Util, "@winglang/sdk/math", "Util"))},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [ar, [].concat(["at"], ["length"], ["copyMut"])],
+          ],
+          "$inflight_init": [
+            [ar, []],
+          ],
+        });
+      }
+    }
+    const ar = [1, 2, 3];
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Use phase independent methods on lifted object", new $Closure1(this, "$Closure1"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "lift_with_phase_ind.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/lift_with_phase_ind.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/lift_with_phase_ind.test.w_test_sim.md
new file mode 100644
index 00000000000..36565f668af
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/lift_with_phase_ind.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [lift_with_phase_ind.test.w](../../../../../examples/tests/valid/lift_with_phase_ind.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ lift_with_phase_ind.test.wsim » root/env0/test:Use phase independent methods on lifted object
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/map_entries.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/map_entries.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..2af554c8351
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/map_entries.test.w_compile_tf-aws.md
@@ -0,0 +1,271 @@
+# [map_entries.test.w](../../../../../examples/tests/valid/map_entries.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $map }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq(Object.keys($map).length, 1), "map.size() == 1");
+      $helpers.assert(("foo" in ($map)), "map.has(\"foo\")");
+      $helpers.assert((!("bar" in ($map))), "!map.has(\"bar\")");
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $map }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })($map, "foo"), "hello"), "map.get(\"foo\") == \"hello\"");
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $map }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const entries = Object.entries($map).map(([key, value]) => ({ key, value }));
+      for (const x of Object.entries($map).map(([key, value]) => ({ key, value }))) {
+        $helpers.assert($helpers.eq(x.key, "foo"), "x.key == \"foo\"");
+        $helpers.assert($helpers.eq(x.value, "hello"), "x.value == \"hello\"");
+      }
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
+```
+
+## inflight.$Closure4-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class $Closure4 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      const map = ({["foo"]: "hello", ["bar"]: "world"});
+      $helpers.assert($helpers.eq(Object.entries(map).map(([key, value]) => ({ key, value })).length, 2), "map.entries().length == 2");
+    }
+  }
+  return $Closure4;
+}
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $map: ${$stdlib.core.liftObject(map)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [map, [].concat(["size"], ["has"])],
+          ],
+          "$inflight_init": [
+            [map, []],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $map: ${$stdlib.core.liftObject(map)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [map, ["get"]],
+          ],
+          "$inflight_init": [
+            [map, []],
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $map: ${$stdlib.core.liftObject(map)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [map, ["entries"]],
+          ],
+          "$inflight_init": [
+            [map, []],
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    const map = ({["foo"]: "hello"});
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:check if map has entries", new $Closure1(this, "$Closure1"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:get value from map", new $Closure2(this, "$Closure2"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:iterate map using entries() method", new $Closure3(this, "$Closure3"));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:check entries() when map has multiple entries", new $Closure4(this, "$Closure4"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "map_entries.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/map_entries.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/map_entries.test.w_test_sim.md
new file mode 100644
index 00000000000..43d97bb3ef1
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/map_entries.test.w_test_sim.md
@@ -0,0 +1,15 @@
+# [map_entries.test.w](../../../../../examples/tests/valid/map_entries.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ map_entries.test.wsim » root/env0/test:check if map has entries                     
+pass ─ map_entries.test.wsim » root/env1/test:get value from map                           
+pass ─ map_entries.test.wsim » root/env2/test:iterate map using entries() method           
+pass ─ map_entries.test.wsim » root/env3/test:check entries() when map has multiple entries
+
+Tests 4 passed (4)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_compile_tf-aws.md
index d5949919df6..c62dfd7a085 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -66,14 +53,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -85,43 +74,43 @@ class $Root extends $stdlib.std.Resource {
     const arr2 = [1, 2, 3];
     const arr3 = [bucket1, bucket2];
     const arr4 = arr1;
-    (arr1.push("a"));
-    (arr2.push(4));
-    (arr3.push(bucket3));
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr2.pop() == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((arr2.pop()),4)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr1.length == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr1.length,4)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: arr4.at(0) == \"a\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr4, 0),"a")))};
+    arr1.push("a");
+    arr2.push(4);
+    arr3.push(bucket3);
+    $helpers.assert($helpers.eq((arr2.pop()), 4), "arr2.pop() == 4");
+    $helpers.assert($helpers.eq(arr1.length, 4), "arr1.length == 4");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(arr4, 0), "a"), "arr4.at(0) == \"a\"");
     const s1 = new Set([1, 2, 3, 3]);
     const s2 = new Set(["hello", "world", "hello"]);
     const s3 = new Set([bucket1, bucket2, bucket2]);
     (s1.add(5));
     (s2.add("bye"));
     (s3.add(bucket3));
-    {((cond) => {if (!cond) throw new Error("assertion failed: s2.has(\"bye\")")})((s2.has("bye")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s2.has(\"hello\")")})((s2.has("hello")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s3.has(bucket2)")})((s3.has(bucket2)))};
+    $helpers.assert((s2.has("bye")), "s2.has(\"bye\")");
+    $helpers.assert((s2.has("hello")), "s2.has(\"hello\")");
+    $helpers.assert((s3.has(bucket2)), "s3.has(bucket2)");
     const m1 = ({["hello"]: "world"});
     const m2 = ({["hello"]: 123});
     const m3 = ({["b1"]: bucket1, ["b2"]: bucket2});
     const m4 = m1;
     const m5 = ({["goodbye"]: "world"});
     const m6 = ({["a"]: m1, ["b"]: m5});
-    {((cond) => {if (!cond) throw new Error("assertion failed: m1.has(\"hello\")")})(("hello" in (m1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m2.size() == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m2).length,1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m3.get(\"b1\") == bucket1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m3, "b1"),bucket1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m4.size() == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m4).length,1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m6.get(\"a\").get(\"hello\") == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m6, "a"), "hello"),"world")))};
+    $helpers.assert(("hello" in (m1)), "m1.has(\"hello\")");
+    $helpers.assert($helpers.eq(Object.keys(m2).length, 1), "m2.size() == 1");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m3, "b1"), bucket1), "m3.get(\"b1\") == bucket1");
+    $helpers.assert($helpers.eq(Object.keys(m4).length, 1), "m4.size() == 1");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m6, "a"), "hello"), "world"), "m6.get(\"a\").get(\"hello\") == \"world\"");
     ((obj, args) => { obj[args[0]] = args[1]; })(m1, ["hello", "goodbye"]);
     ((obj, args) => { obj[args[0]] = args[1]; })(m6, ["a", ({["foo"]: "bar"})]);
     ((map) => { for(const k in map){delete map[k]}; })(m2);
-    {((cond) => {if (!cond) throw new Error("assertion failed: m2.size() == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(m2).length,0)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m1.get(\"hello\") == \"goodbye\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m1, "hello"),"goodbye")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: m6.get(\"a\").get(\"foo\") == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m6, "a"), "foo"),"bar")))};
+    $helpers.assert($helpers.eq(Object.keys(m2).length, 0), "m2.size() == 0");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m1, "hello"), "goodbye"), "m1.get(\"hello\") == \"goodbye\"");
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(((obj, key) => { if (!(key in obj)) throw new Error(`MutMap does not contain key: "${key}"`); return obj[key]; })(m6, "a"), "foo"), "bar"), "m6.get(\"a\").get(\"foo\") == \"bar\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "mut_container_types.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_test_sim.md
index 9333900fedb..f2065cd47de 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/mut_container_types.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ mut_container_types.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/mutation_after_class_init.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/mutation_after_class_init.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..6b7558fe72e
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/mutation_after_class_init.test.w_compile_tf-aws.md
@@ -0,0 +1,540 @@
+# [mutation_after_class_init.test.w](../../../../../examples/tests/valid/mutation_after_class_init.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      console.log("dummy code");
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $__parent_this_2_consumer }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle(key) {
+      (await $__parent_this_2_consumer(key));
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.$Closure3-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $c }) {
+  class $Closure3 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle(m) {
+      console.log(String.raw({ raw: ["received ", ""] }, m));
+      (await $c.inc());
+    }
+  }
+  return $Closure3;
+}
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
+```
+
+## inflight.$Closure4-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $c, $q, $util_Util }) {
+  class $Closure4 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $q.push("message1"));
+      (await $util_Util.waitUntil((async () => {
+        return ((await $c.peek()) > 0);
+      })));
+    }
+  }
+  return $Closure4;
+}
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
+```
+
+## inflight.Queue-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Queue {
+    constructor({ $this_data }) {
+      this.$this_data = $this_data;
+    }
+    async push(m) {
+      (await this.$this_data.put(m, "empty"));
+    }
+  }
+  return Queue;
+}
+//# sourceMappingURL=inflight.Queue-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_cloudwatch_log_group": {
+      "Queue_Bucket_OnCreate-OnMessage0_CloudwatchLogGroup_BF038703": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "Queue_Bucket_OnCreate-OnMessage0_CloudwatchLogGroup_BF038703"
+          }
+        },
+        "name": "/aws/lambda/OnCreate-OnMessage0-c8cf52b9",
+        "retention_in_days": 30
+      }
+    },
+    "aws_dynamodb_table": {
+      "Counter": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
+          }
+        },
+        "attribute": [
+          {
+            "name": "id",
+            "type": "S"
+          }
+        ],
+        "billing_mode": "PAY_PER_REQUEST",
+        "hash_key": "id",
+        "name": "wing-counter-Counter-c824ef62"
+      }
+    },
+    "aws_iam_role": {
+      "Queue_Bucket_OnCreate-OnMessage0_IamRole_210FCAAB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate-OnMessage0/IamRole",
+            "uniqueId": "Queue_Bucket_OnCreate-OnMessage0_IamRole_210FCAAB"
+          }
+        },
+        "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
+      }
+    },
+    "aws_iam_role_policy": {
+      "Queue_Bucket_OnCreate-OnMessage0_IamRolePolicy_10E86967": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate-OnMessage0/IamRolePolicy",
+            "uniqueId": "Queue_Bucket_OnCreate-OnMessage0_IamRolePolicy_10E86967"
+          }
+        },
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue_Bucket_OnCreate-OnMessage0_IamRole_210FCAAB.name}"
+      }
+    },
+    "aws_iam_role_policy_attachment": {
+      "Queue_Bucket_OnCreate-OnMessage0_IamRolePolicyAttachment_C6B42DE8": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "Queue_Bucket_OnCreate-OnMessage0_IamRolePolicyAttachment_C6B42DE8"
+          }
+        },
+        "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+        "role": "${aws_iam_role.Queue_Bucket_OnCreate-OnMessage0_IamRole_210FCAAB.name}"
+      }
+    },
+    "aws_lambda_function": {
+      "Queue_Bucket_OnCreate-OnMessage0_F7EE1690": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate-OnMessage0/Default",
+            "uniqueId": "Queue_Bucket_OnCreate-OnMessage0_F7EE1690"
+          }
+        },
+        "architectures": [
+          "arm64"
+        ],
+        "environment": {
+          "variables": {
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
+            "NODE_OPTIONS": "--enable-source-maps",
+            "WING_FUNCTION_NAME": "OnCreate-OnMessage0-c8cf52b9",
+            "WING_TARGET": "tf-aws"
+          }
+        },
+        "function_name": "OnCreate-OnMessage0-c8cf52b9",
+        "handler": "index.handler",
+        "memory_size": 1024,
+        "publish": true,
+        "role": "${aws_iam_role.Queue_Bucket_OnCreate-OnMessage0_IamRole_210FCAAB.arn}",
+        "runtime": "nodejs20.x",
+        "s3_bucket": "${aws_s3_bucket.Code.bucket}",
+        "s3_key": "${aws_s3_object.Queue_Bucket_OnCreate-OnMessage0_S3Object_D3C5CDCB.key}",
+        "timeout": 60,
+        "vpc_config": {
+          "security_group_ids": [],
+          "subnet_ids": []
+        }
+      }
+    },
+    "aws_lambda_permission": {
+      "Queue_Bucket_OnCreate-OnMessage0_InvokePermission-c858cf97f3e1a27ecdbc73b06b0748fac8d80bfa4e_BD57ACF0": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate-OnMessage0/InvokePermission-c858cf97f3e1a27ecdbc73b06b0748fac8d80bfa4e",
+            "uniqueId": "Queue_Bucket_OnCreate-OnMessage0_InvokePermission-c858cf97f3e1a27ecdbc73b06b0748fac8d80bfa4e_BD57ACF0"
+          }
+        },
+        "action": "lambda:InvokeFunction",
+        "function_name": "${aws_lambda_function.Queue_Bucket_OnCreate-OnMessage0_F7EE1690.function_name}",
+        "principal": "sns.amazonaws.com",
+        "source_arn": "${aws_sns_topic.Queue_Bucket_OnCreate_DA88E2C3.arn}"
+      }
+    },
+    "aws_s3_bucket": {
+      "Code": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
+          }
+        },
+        "bucket_prefix": "code-c84a50b1-"
+      },
+      "Queue_Bucket_A87615FF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/Default",
+            "uniqueId": "Queue_Bucket_A87615FF"
+          }
+        },
+        "bucket_prefix": "bucket-c81048e6-",
+        "force_destroy": false
+      }
+    },
+    "aws_s3_bucket_notification": {
+      "Queue_Bucket_S3BucketNotification_B826201B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/S3BucketNotification",
+            "uniqueId": "Queue_Bucket_S3BucketNotification_B826201B"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Queue_Bucket_A87615FF.id}",
+        "depends_on": [
+          "aws_sns_topic_policy.Queue_Bucket_OnCreate_PublishPermission-c81048e6ea798f253db9714095de7ff4c76c443489_3E123A5B"
+        ],
+        "topic": [
+          {
+            "events": [
+              "s3:ObjectCreated:Put"
+            ],
+            "id": "on-oncreate-notification",
+            "topic_arn": "${aws_sns_topic.Queue_Bucket_OnCreate_DA88E2C3.arn}"
+          }
+        ]
+      }
+    },
+    "aws_s3_object": {
+      "Queue_Bucket_OnCreate-OnMessage0_S3Object_D3C5CDCB": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate-OnMessage0/S3Object",
+            "uniqueId": "Queue_Bucket_OnCreate-OnMessage0_S3Object_D3C5CDCB"
+          }
+        },
+        "bucket": "${aws_s3_bucket.Code.bucket}",
+        "key": "<ASSET_KEY>",
+        "source": "<ASSET_SOURCE>"
+      }
+    },
+    "aws_sns_topic": {
+      "Queue_Bucket_OnCreate_DA88E2C3": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate/Default",
+            "uniqueId": "Queue_Bucket_OnCreate_DA88E2C3"
+          }
+        },
+        "name": "OnCreate-c858cf97"
+      }
+    },
+    "aws_sns_topic_policy": {
+      "Queue_Bucket_OnCreate_PublishPermission-c81048e6ea798f253db9714095de7ff4c76c443489_3E123A5B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate/PublishPermission-c81048e6ea798f253db9714095de7ff4c76c443489",
+            "uniqueId": "Queue_Bucket_OnCreate_PublishPermission-c81048e6ea798f253db9714095de7ff4c76c443489_3E123A5B"
+          }
+        },
+        "arn": "${aws_sns_topic.Queue_Bucket_OnCreate_DA88E2C3.arn}",
+        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.Queue_Bucket_OnCreate_DA88E2C3.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.Queue_Bucket_A87615FF.arn}\"}}}]}"
+      }
+    },
+    "aws_sns_topic_subscription": {
+      "Queue_Bucket_OnCreate_TopicSubscription0_9E4D200B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Queue/Bucket/OnCreate/TopicSubscription0",
+            "uniqueId": "Queue_Bucket_OnCreate_TopicSubscription0_9E4D200B"
+          }
+        },
+        "endpoint": "${aws_lambda_function.Queue_Bucket_OnCreate-OnMessage0_F7EE1690.arn}",
+        "protocol": "lambda",
+        "topic_arn": "${aws_sns_topic.Queue_Bucket_OnCreate_DA88E2C3.arn}"
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+const util = $stdlib.util;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Queue extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        this.data = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
+          constructor($scope, $id, ) {
+            super($scope, $id);
+            $helpers.nodeof(this).hidden = true;
+          }
+          static _toInflightType() {
+            return `
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+              })
+            `;
+          }
+          _toInflight() {
+            return `
+              (await (async () => {
+                const $Closure1Client = ${$Closure1._toInflightType()};
+                const client = new $Closure1Client({
+                });
+                if (client.$inflight_init) { await client.$inflight_init(); }
+                return client;
+              })())
+            `;
+          }
+          get _liftMap() {
+            return ({
+              "handle": [
+              ],
+              "$inflight_init": [
+              ],
+            });
+          }
+        }
+        this.consumer = new $Closure1(this, "$Closure1");
+        const __parent_this_2 = this;
+        class $Closure2 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
+          constructor($scope, $id, ) {
+            super($scope, $id);
+            $helpers.nodeof(this).hidden = true;
+          }
+          static _toInflightType() {
+            return `
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+                $__parent_this_2_consumer: ${$stdlib.core.liftObject(__parent_this_2.consumer)},
+              })
+            `;
+          }
+          _toInflight() {
+            return `
+              (await (async () => {
+                const $Closure2Client = ${$Closure2._toInflightType()};
+                const client = new $Closure2Client({
+                });
+                if (client.$inflight_init) { await client.$inflight_init(); }
+                return client;
+              })())
+            `;
+          }
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_2.consumer, ["handle"]],
+              ],
+              "$inflight_init": [
+                [__parent_this_2.consumer, []],
+              ],
+            });
+          }
+        }
+        (this.data.onCreate(new $Closure2(this, "$Closure2")));
+      }
+      setConsumer(fn) {
+        this.consumer = fn;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Queue-1.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const QueueClient = ${Queue._toInflightType()};
+            const client = new QueueClient({
+              $this_data: ${$stdlib.core.liftObject(this.data)},
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "push": [
+            [this.data, ["put"]],
+          ],
+          "$inflight_init": [
+            [this.data, []],
+          ],
+        });
+      }
+    }
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
+            $c: ${$stdlib.core.liftObject(c)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure3Client = ${$Closure3._toInflightType()};
+            const client = new $Closure3Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [c, ["inc"]],
+          ],
+          "$inflight_init": [
+            [c, []],
+          ],
+        });
+      }
+    }
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
+            $c: ${$stdlib.core.liftObject(c)},
+            $q: ${$stdlib.core.liftObject(q)},
+            $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure4Client = ${$Closure4._toInflightType()};
+            const client = new $Closure4Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [c, ["peek"]],
+            [q, ["push"]],
+          ],
+          "$inflight_init": [
+            [c, []],
+            [q, []],
+          ],
+        });
+      }
+    }
+    const q = new Queue(this, "Queue");
+    const c = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
+    (q.setConsumer(new $Closure3(this, "$Closure3")));
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:hi", new $Closure4(this, "$Closure4"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "mutation_after_class_init.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/mutation_after_class_init.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/mutation_after_class_init.test.w_test_sim.md
new file mode 100644
index 00000000000..51c14388605
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/mutation_after_class_init.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [mutation_after_class_init.test.w](../../../../../examples/tests/valid/mutation_after_class_init.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] hi | received message1
+pass ─ mutation_after_class_init.test.wsim » root/env0/test:hi
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_compile_tf-aws.md
index a8db71073a8..16866ffa5cc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_compile_tf-aws.md
@@ -1,9 +1,10 @@
 # [new_in_static.test.w](../../../../../examples/tests/valid/new_in_static.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-2.cjs
+```cjs
 "use strict";
-module.exports = function({ $bucket }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $bucket, $bucket3 }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -11,17 +12,76 @@ module.exports = function({ $bucket }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: bucket.list().length == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $bucket.list()).length,0)))};
+      $helpers.assert($helpers.eq((await $bucket.list()).length, 0), "bucket.list().length == 0");
+      $helpers.assert($helpers.eq((await $bucket3.list()).length, 0), "bucket3.list().length == 0");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-2.cjs.map
 ```
 
-## inflight.MyClass-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Foo {
+    constructor({  }) {
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## inflight.Foo-2.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $FooParent }) {
+  class Foo extends $FooParent {
+    constructor({  }) {
+      super({  });
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-2.cjs.map
+```
+
+## inflight.FooParent-2.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class FooParent {
+    constructor({  }) {
+    }
+  }
+  return FooParent;
+}
+//# sourceMappingURL=inflight.FooParent-2.cjs.map
+```
+
+## inflight.LibClass-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class LibClass {
+    constructor({  }) {
+    }
+  }
+  return LibClass;
+}
+//# sourceMappingURL=inflight.LibClass-1.cjs.map
+```
+
+## inflight.MyClass-2.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyClass {
     constructor({  }) {
@@ -29,7 +89,7 @@ module.exports = function({  }) {
   }
   return MyClass;
 }
-//# sourceMappingURL=inflight.MyClass-1.js.map
+//# sourceMappingURL=inflight.MyClass-2.cjs.map
 ```
 
 ## main.tf.json
@@ -39,22 +99,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -63,6 +110,26 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_s3_bucket": {
+      "Construct_Bucket_2C7B19D9": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Construct/Bucket/Default",
+            "uniqueId": "Construct_Bucket_2C7B19D9"
+          }
+        },
+        "bucket_prefix": "bucket-c8186214-",
+        "force_destroy": false
+      },
+      "Construct_MyClass_implicit-scope-bucket_177A1CDF": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Construct/MyClass/implicit-scope-bucket/Default",
+            "uniqueId": "Construct_MyClass_implicit-scope-bucket_177A1CDF"
+          }
+        },
+        "bucket_prefix": "implicit-scope-bucket-c8ebd2a7-",
+        "force_destroy": false
+      },
       "b1": {
         "//": {
           "metadata": {
@@ -83,14 +150,14 @@ module.exports = function({  }) {
         "bucket_prefix": "b2-c844cd88-",
         "force_destroy": false
       },
-      "cConstruct_cloudBucket_63D47E7B": {
+      "implicit-scope-bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/c.Construct/cloud.Bucket/Default",
-            "uniqueId": "cConstruct_cloudBucket_63D47E7B"
+            "path": "root/Default/Default/implicit-scope-bucket/Default",
+            "uniqueId": "implicit-scope-bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8e0ff1c-",
+        "bucket_prefix": "implicit-scope-bucket-c811b94a-",
         "force_destroy": false
       }
     }
@@ -98,16 +165,20 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const c = require("constructs");
+const jsii_fixture = require("jsii-fixture");
+const new_in_static_lib = require("./preflight.newinstaticlib-1.cjs");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -115,22 +186,35 @@ class $Root extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
       }
-      static createBucket(scope) {
-        return ($scope => $scope.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, $scope, "cloud.Bucket"))(scope);
+      static createBucket($scope, scope) {
+        return ($scope => $scope.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, $scope, "Bucket"))(scope);
       }
-      static createMyClass(scope) {
+      static createMyClass($scope, scope) {
         return new MyClass(scope, "MyClass");
       }
+      static createMyClassWithImplicitScope($scope, id) {
+        return new MyClass($scope, String.raw({ raw: ["implicit-scope-myclass-", ""] }, id));
+      }
+      static createBucketWithImplicitScope($scope) {
+        return ($scope => $scope.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, $scope, "implicit-scope-bucket"))($scope);
+      }
+      instanceMethod() {
+        const my = (MyClass.createMyClassWithImplicitScope(this, "from-instance-method"));
+        const bucket = (MyClass.createBucketWithImplicitScope(this));
+      }
+      static staticMehtodThatCallsAnotherStaticMethod($scope) {
+        return (MyClass.createMyClassWithImplicitScope($scope, "from-outer-static-method"));
+      }
       static _toInflightType() {
         return `
-          require("./inflight.MyClass-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyClass-2.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyClassClient = ${MyClass._toInflightType(this)};
+            const MyClassClient = ${MyClass._toInflightType()};
             const client = new MyClassClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -138,27 +222,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-2.cjs")({
             $bucket: ${$stdlib.core.liftObject(bucket)},
+            $bucket3: ${$stdlib.core.liftObject(bucket3)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -166,14 +254,76 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket, ["list"]],
+            [bucket3, ["list"]],
+          ],
+          "$inflight_init": [
+            [bucket, []],
+            [bucket3, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket, host, ["list"]);
-        }
-        super._registerOnLift(host, ops);
+    }
+    class FooParent extends $stdlib.std.Resource {
+      constructor($scope, $id, myclass) {
+        super($scope, $id);
+        this.field = myclass;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.FooParent-2.cjs")({
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooParentClient = ${FooParent._toInflightType()};
+            const client = new FooParentClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+    class Foo extends FooParent {
+      constructor($scope, $id, ) {
+        super($scope, $id, undefined);
+        (MyClass.createMyClassWithImplicitScope(this, "from-ctor"));
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-2.cjs")({
+            $FooParent: ${$stdlib.core.liftObject(FooParent)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const createBucket = (() => {
@@ -182,16 +332,93 @@ class $Root extends $stdlib.std.Resource {
     if (true) {
       this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b2");
     }
-    const scope = this.node.root.new("constructs.Construct", c.Construct, this, "c.Construct");
-    const bucket = (MyClass.createBucket(scope));
+    const scope = this.node.root.new("constructs.Construct", c.Construct, this, "Construct");
+    const bucket = (MyClass.createBucket(this, scope));
     const bucket2 = (createBucket());
-    const my = (MyClass.createMyClass(scope));
-    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:play with bucket", new $Closure1(this, "$Closure1"));
+    const my = (MyClass.createMyClass(this, scope));
+    const my2 = (MyClass.createMyClassWithImplicitScope(this, "from-root"));
+    const bucket3 = (MyClass.createBucketWithImplicitScope(this));
+    const my3 = (MyClass.staticMehtodThatCallsAnotherStaticMethod(this));
+    (my.instanceMethod());
+    $helpers.assert($helpers.eq((jsii_fixture.JsiiClass.staticMethod("foo")), "Got foo"), "jsii_fixture.JsiiClass.staticMethod(\"foo\") == \"Got foo\"");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:play with buckets", new $Closure1(this, "$Closure1"));
+    const f = new Foo(this, "Foo");
+    const lib_f = (new_in_static_lib.LibClass.createFoo(this, "lib-foo"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "new_in_static.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
+```
+
+## preflight.newinstaticlib-1.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Foo extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const FooClient = ${Foo._toInflightType()};
+        const client = new FooClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+class LibClass extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static createFoo($scope, id) {
+    return new Foo($scope, id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.LibClass-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const LibClassClient = ${LibClass._toInflightType()};
+        const client = new LibClassClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Foo, LibClass };
+//# sourceMappingURL=preflight.newinstaticlib-1.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_test_sim.md
index 925676cc7a7..9e0aba51e6b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/new_in_static.test.w_test_sim.md
@@ -2,10 +2,10 @@
 
 ## stdout.log
 ```log
-pass ─ new_in_static.test.wsim » root/env0/test:play with bucket
- 
- 
+pass ─ new_in_static.test.wsim » root/env0/test:play with buckets
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/new_in_static_lib.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/new_in_static_lib.w_compile_tf-aws.md
new file mode 100644
index 00000000000..2600606fde2
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/new_in_static_lib.w_compile_tf-aws.md
@@ -0,0 +1,100 @@
+# [new_in_static_lib.w](../../../../../examples/tests/valid/new_in_static_lib.w) | compile | tf-aws
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class Foo {
+    constructor({  }) {
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## inflight.LibClass-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({  }) {
+  class LibClass {
+    constructor({  }) {
+    }
+  }
+  return LibClass;
+}
+//# sourceMappingURL=inflight.LibClass-1.cjs.map
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class Foo extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const FooClient = ${Foo._toInflightType()};
+        const client = new FooClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+class LibClass extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static createFoo($scope, id) {
+    return new Foo($scope, id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.LibClass-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const LibClassClient = ${LibClass._toInflightType()};
+        const client = new LibClassClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { Foo, LibClass };
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_compile_tf-aws.md
index 955184ceb0e..aeee02c5419 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [new_jsii.test.w](../../../../../examples/tests/valid/new_jsii.test.w) | compile | tf-aws
 
-## inflight.CustomScope-1.js
-```js
+## inflight.CustomScope-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class CustomScope {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return CustomScope;
 }
-//# sourceMappingURL=inflight.CustomScope-1.js.map
+//# sourceMappingURL=inflight.CustomScope-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -44,14 +32,14 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "CustomScope_cloudBucket_17614466": {
+      "CustomScope_Bucket_8BBB89A4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/CustomScope/cloud.Bucket/Default",
-            "uniqueId": "CustomScope_cloudBucket_17614466"
+            "path": "root/Default/Default/CustomScope/Bucket/Default",
+            "uniqueId": "CustomScope_Bucket_8BBB89A4"
           }
         },
-        "bucket_prefix": "cloud-bucket-c89807a1-",
+        "bucket_prefix": "bucket-c830af09-",
         "force_destroy": false
       }
     }
@@ -59,14 +47,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -78,14 +68,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.CustomScope-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.CustomScope-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const CustomScopeClient = ${CustomScope._toInflightType(this)};
+            const CustomScopeClient = ${CustomScope._toInflightType()};
             const client = new CustomScopeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -93,18 +83,21 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     let count = 0;
-    ($scope => $scope.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, $scope, "cloud.Bucket"))(new CustomScope(this, "CustomScope"));
-    {((cond) => {if (!cond) throw new Error("assertion failed: count == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(count,1)))};
+    ($scope => $scope.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, $scope, "Bucket"))(new CustomScope(this, "CustomScope"));
+    $helpers.assert($helpers.eq(count, 1), "count == 1");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "new_jsii.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_test_sim.md
index 2c331060228..63647112800 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/new_jsii.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ new_jsii.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_compile_tf-aws.md
index 3b5a57c5345..7a58f2cd9c0 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [nil.test.w](../../../../../examples/tests/valid/nil.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,18 +12,19 @@ module.exports = function({ $foo }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.returnNil(true)? == true")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((((await $foo.returnNil(true))) != null),true)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.returnNil(false)? == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((((await $foo.returnNil(false))) != null),false)))};
+      $helpers.assert($helpers.eq((((await $foo.returnNil(true))) != null), true), "foo.returnNil(true)? == true");
+      $helpers.assert($helpers.eq((((await $foo.returnNil(false))) != null), false), "foo.returnNil(false)? == false");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $foo }) {
   class $Closure2 {
     constructor({  }) {
@@ -31,23 +33,24 @@ module.exports = function({ $foo }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.getOptionalValue()? == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((((await $foo.getOptionalValue())) != null),false)))};
+      $helpers.assert($helpers.eq((((await $foo.getOptionalValue())) != null), false), "foo.getOptionalValue()? == false");
       (await $foo.setOptionalValue("hello"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.getOptionalValue()? == true")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((((await $foo.getOptionalValue())) != null),true)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.getOptionalValue() != nil")})((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })((await $foo.getOptionalValue()),undefined)))};
+      $helpers.assert($helpers.eq((((await $foo.getOptionalValue())) != null), true), "foo.getOptionalValue()? == true");
+      $helpers.assert($helpers.neq((await $foo.getOptionalValue()), undefined), "foo.getOptionalValue() != nil");
       (await $foo.setOptionalValue(undefined));
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.getOptionalValue()? == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((((await $foo.getOptionalValue())) != null),false)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: foo.getOptionalValue() == nil")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $foo.getOptionalValue()),undefined)))};
+      $helpers.assert($helpers.eq((((await $foo.getOptionalValue())) != null), false), "foo.getOptionalValue()? == false");
+      $helpers.assert($helpers.eq((await $foo.getOptionalValue()), undefined), "foo.getOptionalValue() == nil");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -70,7 +73,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -80,22 +83,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -105,14 +95,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -123,14 +115,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -138,19 +130,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "optionalVar", "returnNil", "setOptionalValue", "getOptionalValue", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "returnNil": [
+          ],
+          "setOptionalValue": [
+          ],
+          "getOptionalValue": [
+          ],
+          "$inflight_init": [
+          ],
+          "optionalVar": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $foo: ${$stdlib.core.liftObject(foo)},
           })
         `;
@@ -158,7 +161,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -166,25 +169,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(foo, host, ["returnNil"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, ["returnNil"]],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $foo: ${$stdlib.core.liftObject(foo)},
           })
         `;
@@ -192,7 +196,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -200,14 +204,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(foo, host, ["getOptionalValue", "setOptionalValue"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [foo, [].concat(["getOptionalValue"], ["setOptionalValue"])],
+          ],
+          "$inflight_init": [
+            [foo, []],
+          ],
+        });
       }
     }
     const foo = new Foo(this, "Foo");
@@ -218,6 +223,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "nil.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_test_sim.md
index 46e244094ed..3488992d6b3 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/nil.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ nil.test.wsim » root/env0/test:nil return                
 pass ─ nil.test.wsim » root/env1/test:optional instance variable
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/on_lift.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/on_lift.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..167265a0c23
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/on_lift.test.w_compile_tf-aws.md
@@ -0,0 +1,173 @@
+# [on_lift.test.w](../../../../../examples/tests/valid/on_lift.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $Foo, $foo }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $foo.m1());
+      (await $Foo.m2());
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $util_Util }) {
+  class Foo {
+    constructor({  }) {
+    }
+    async m1() {
+      console.log("I'm expecting ABC to be set");
+      $helpers.assert($helpers.eq((await $util_Util.env("ABC")), "123"), "util.env(\"ABC\") == \"123\"");
+    }
+    static async m2() {
+      console.log("I'm expecting XYZ to be set");
+      $helpers.assert($helpers.eq((await $util_Util.env("XYZ")), "789"), "util.env(\"XYZ\") == \"789\"");
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const util = $stdlib.util;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      onLift(host, ops) {
+        if (ops.includes("m1")) {
+          (host.addEnvironment("ABC", "123"));
+        }
+      }
+      static onLiftType(host, ops) {
+        if (ops.includes("m2")) {
+          (host.addEnvironment("XYZ", "789"));
+        }
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+            $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "m1": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "m2": [
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $Foo: ${$stdlib.core.liftObject(Foo)},
+            $foo: ${$stdlib.core.liftObject(foo)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [Foo, ["m2"]],
+            [foo, ["m1"]],
+          ],
+          "$inflight_init": [
+            [Foo, []],
+            [foo, []],
+          ],
+        });
+      }
+    }
+    const foo = new Foo(this, "Foo");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:onLift and onLiftType allow capabilities to be granted to inflight hosts", new $Closure1(this, "$Closure1"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "on_lift.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/on_lift.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/on_lift.test.w_test_sim.md
new file mode 100644
index 00000000000..8aebecebc89
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/on_lift.test.w_test_sim.md
@@ -0,0 +1,14 @@
+# [on_lift.test.w](../../../../../examples/tests/valid/on_lift.test.w) | test | sim
+
+## stdout.log
+```log
+[INFO] onLift and onLiftType allow capabilities to be granted to inflight hosts | I'm expecting ABC to be set
+[INFO] onLift and onLiftType allow capabilities to be granted to inflight hosts | I'm expecting XYZ to be set
+pass ─ on_lift.test.wsim » root/env0/test:onLift and onLiftType allow capabilities to be granted to inflight hosts
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_compile_tf-aws.md
index c6ee6c43c50..0fe1fc6a2e6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [optionals.test.w](../../../../../examples/tests/valid/optionals.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__payloadWithBucket_c_____null_, $__payloadWithoutOptions_b_____null_, $payloadWithBucket_c }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,7 +12,7 @@ module.exports = function({ $__payloadWithBucket_c_____null_, $__payloadWithoutO
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: payloadWithoutOptions.b? == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__payloadWithoutOptions_b_____null_,false)))};
+      $helpers.assert($helpers.eq($__payloadWithoutOptions_b_____null_, false), "payloadWithoutOptions.b? == false");
       if ($__payloadWithBucket_c_____null_) {
         (await $payloadWithBucket_c?.put?.("x.txt", "something"));
       }
@@ -19,12 +20,13 @@ module.exports = function({ $__payloadWithBucket_c_____null_, $__payloadWithoutO
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Node-1.js
-```js
+## inflight.Node-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Node {
     constructor({  }) {
@@ -32,12 +34,13 @@ module.exports = function({  }) {
   }
   return Node;
 }
-//# sourceMappingURL=inflight.Node-1.js.map
+//# sourceMappingURL=inflight.Node-1.cjs.map
 ```
 
-## inflight.Sub-1.js
-```js
+## inflight.Sub-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Super }) {
   class Sub extends $Super {
     constructor({  }) {
@@ -46,26 +49,28 @@ module.exports = function({ $Super }) {
   }
   return Sub;
 }
-//# sourceMappingURL=inflight.Sub-1.js.map
+//# sourceMappingURL=inflight.Sub-1.cjs.map
 ```
 
-## inflight.Sub1-1.js
-```js
+## inflight.SubSub-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $Super }) {
-  class Sub1 extends $Super {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $Sub }) {
+  class SubSub extends $Sub {
     constructor({  }) {
       super({  });
     }
   }
-  return Sub1;
+  return SubSub;
 }
-//# sourceMappingURL=inflight.Sub1-1.js.map
+//# sourceMappingURL=inflight.SubSub-1.cjs.map
 ```
 
-## inflight.Super-1.js
-```js
+## inflight.Super-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Super {
     constructor({  }) {
@@ -73,7 +78,7 @@ module.exports = function({  }) {
   }
   return Super;
 }
-//# sourceMappingURL=inflight.Super-1.js.map
+//# sourceMappingURL=inflight.Super-1.cjs.map
 ```
 
 ## main.tf.json
@@ -83,22 +88,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -122,18 +114,21 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
+    const Person = $stdlib.std.Struct._createJsonSchema({$id:"/Person",type:"object",properties:{age:{type:"number"},name:{type:"string"},},required:["age","name",]});
     class Super extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
@@ -141,14 +136,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Super-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Super-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const SuperClient = ${Super._toInflightType(this)};
+            const SuperClient = ${Super._toInflightType()};
             const client = new SuperClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -156,8 +151,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Sub extends Super {
@@ -167,7 +165,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Sub-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Sub-1.cjs")({
             $Super: ${$stdlib.core.liftObject(Super)},
           })
         `;
@@ -175,7 +173,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const SubClient = ${Sub._toInflightType(this)};
+            const SubClient = ${Sub._toInflightType()};
             const client = new SubClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -183,35 +181,41 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class Sub1 extends Super {
+    class SubSub extends Sub {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.name = "Sub";
+        this.name = "SubSub";
       }
       static _toInflightType() {
         return `
-          require("./inflight.Sub1-1.js")({
-            $Super: ${$stdlib.core.liftObject(Super)},
+          require("${$helpers.normalPath(__dirname)}/inflight.SubSub-1.cjs")({
+            $Sub: ${$stdlib.core.liftObject(Sub)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const Sub1Client = ${Sub1._toInflightType(this)};
-            const client = new Sub1Client({
+            const SubSubClient = ${SubSub._toInflightType()};
+            const client = new SubSubClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Node extends $stdlib.std.Resource {
@@ -223,14 +227,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Node-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Node-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const NodeClient = ${Node._toInflightType(this)};
+            const NodeClient = ${Node._toInflightType()};
             const client = new NodeClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -238,19 +242,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $__payloadWithBucket_c_____null_: ${$stdlib.core.liftObject(((payloadWithBucket.c) != null))},
             $__payloadWithoutOptions_b_____null_: ${$stdlib.core.liftObject(((payloadWithoutOptions.b) != null))},
             $payloadWithBucket_c: ${$stdlib.core.liftObject(payloadWithBucket.c)},
@@ -260,7 +267,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -268,33 +275,37 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(((payloadWithBucket.c) != null), host, []);
-          $Closure1._registerOnLiftObject(((payloadWithoutOptions.b) != null), host, []);
-          $Closure1._registerOnLiftObject(payloadWithBucket.c, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [((payloadWithBucket.c) != null), []],
+            [((payloadWithoutOptions.b) != null), []],
+            [payloadWithBucket.c, ["put"]],
+          ],
+          "$inflight_init": [
+            [((payloadWithBucket.c) != null), []],
+            [((payloadWithoutOptions.b) != null), []],
+            [payloadWithBucket.c, []],
+          ],
+        });
       }
     }
     const x = 4;
-    {((cond) => {if (!cond) throw new Error("assertion failed: x? == true")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((x) != null),true)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: !x? == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((!((x) != null)),false)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: x ?? 5 == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x ?? 5),4)))};
+    $helpers.assert($helpers.eq(((x) != null), true), "x? == true");
+    $helpers.assert($helpers.eq((!((x) != null)), false), "!x? == false");
+    $helpers.assert($helpers.eq((x ?? 5), 4), "x ?? 5 == 4");
     const y = (x ?? 5);
-    {((cond) => {if (!cond) throw new Error("assertion failed: y == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,4)))};
+    $helpers.assert($helpers.eq(y, 4), "y == 4");
     const optionalSup = new Super(this, "Super");
     const s = (optionalSup ?? new Sub(this, "Sub"));
-    {((cond) => {if (!cond) throw new Error("assertion failed: s.name == \"Super\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s.name,"Super")))};
+    $helpers.assert($helpers.eq(s.name, "Super"), "s.name == \"Super\"");
+    const s2 = (optionalSup ?? (optionalSup ?? new SubSub(this, "SubSub")));
     let name = ({"first": "John", "last": "Doe"});
     {
       const $if_let_value = name;
       if ($if_let_value != undefined) {
         const n = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: n.first == \"John\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(n.first,"John")))};
+        $helpers.assert($helpers.eq(n.first, "John"), "n.first == \"John\"");
       }
     }
     name = undefined;
@@ -302,10 +313,10 @@ class $Root extends $stdlib.std.Resource {
       const $if_let_value = name;
       if ($if_let_value != undefined) {
         const n = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: true")})(true)};
+        $helpers.assert(true, "true");
       }
     }
     const tryParseName = ((fullName) => {
@@ -313,7 +324,7 @@ class $Root extends $stdlib.std.Resource {
       if ((parts.length < 1)) {
         return undefined;
       }
-      return ({"first": ((parts.at(0)) ?? ""), "last": ((parts.at(1)) ?? "")});
+      return ({"first": (parts.at(0) ?? ""), "last": (parts.at(1) ?? "")});
     });
     const json_obj = ({"ghost": "spooky"});
     let something_else = false;
@@ -321,19 +332,19 @@ class $Root extends $stdlib.std.Resource {
       const $if_let_value = ((arg) => { return (typeof arg === "boolean") ? JSON.parse(JSON.stringify(arg)) : undefined })(json_obj);
       if ($if_let_value != undefined) {
         const y = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: y == true || y == false")})(((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,true)) || (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,false))))};
+        $helpers.assert(($helpers.eq(y, true) || $helpers.eq(y, false)), "y == true || y == false");
       }
       else {
         const $elif_let_value0 = ((arg) => { return (typeof arg === "number") ? JSON.parse(JSON.stringify(arg)) : undefined })(json_obj);
         if ($elif_let_value0 != undefined) {
           const y = $elif_let_value0;
-          {((cond) => {if (!cond) throw new Error("assertion failed: y + 0 == y")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((y + 0),y)))};
+          $helpers.assert($helpers.eq((y + 0), y), "y + 0 == y");
         }
         else {
           const $elif_let_value1 = ((arg) => { return (typeof arg === "string") ? JSON.parse(JSON.stringify(arg)) : undefined })(json_obj);
           if ($elif_let_value1 != undefined) {
             const y = $elif_let_value1;
-            {((cond) => {if (!cond) throw new Error("assertion failed: y.length >= 0")})((y.length >= 0))};
+            $helpers.assert((y.length >= 0), "y.length >= 0");
           }
           else {
             something_else = true;
@@ -341,15 +352,15 @@ class $Root extends $stdlib.std.Resource {
         }
       }
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: something_else")})(something_else)};
+    $helpers.assert(something_else, "something_else");
     const a = 1;
     {
       const $if_let_value = a;
       if ($if_let_value != undefined) {
         let z = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: z == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(z,1)))};
+        $helpers.assert($helpers.eq(z, 1), "z == 1");
         z = 2;
-        {((cond) => {if (!cond) throw new Error("assertion failed: z == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(z,2)))};
+        $helpers.assert($helpers.eq(z, 2), "z == 2");
       }
     }
     const b = 1;
@@ -357,22 +368,22 @@ class $Root extends $stdlib.std.Resource {
       const $if_let_value = b;
       if ($if_let_value != undefined) {
         const z = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: z == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(z,1)))};
+        $helpers.assert($helpers.eq(z, 1), "z == 1");
       }
     }
     {
       const $if_let_value = (tryParseName("Good Name"));
       if ($if_let_value != undefined) {
         const parsedName = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: parsedName.first == \"Good\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(parsedName.first,"Good")))};
+        $helpers.assert($helpers.eq(parsedName.first, "Good"), "parsedName.first == \"Good\"");
         {
           const $if_let_value = parsedName.last;
           if ($if_let_value != undefined) {
             const lastName = $if_let_value;
-            {((cond) => {if (!cond) throw new Error("assertion failed: lastName == \"Name\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(lastName,"Name")))};
+            $helpers.assert($helpers.eq(lastName, "Name"), "lastName == \"Name\"");
           }
           else {
-            {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+            $helpers.assert(false, "false");
           }
         }
       }
@@ -381,9 +392,9 @@ class $Root extends $stdlib.std.Resource {
       const $if_let_value = (tryParseName("BadName"));
       if ($if_let_value != undefined) {
         const parsedName = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: parsedName.first == \"BadName\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(parsedName.first,"BadName")))};
-        if ((((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })(parsedName.last,""))) {
-          {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert($helpers.eq(parsedName.first, "BadName"), "parsedName.first == \"BadName\"");
+        if ($helpers.neq(parsedName.last, "")) {
+          $helpers.assert(false, "false");
         }
       }
     }
@@ -392,10 +403,10 @@ class $Root extends $stdlib.std.Resource {
       const $if_let_value = falsy;
       if ($if_let_value != undefined) {
         const f = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: f == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f,false)))};
+        $helpers.assert($helpers.eq(f, false), "f == false");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     const shadow = "root";
@@ -403,16 +414,16 @@ class $Root extends $stdlib.std.Resource {
       const $if_let_value = shadow;
       if ($if_let_value != undefined) {
         const shadow = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: shadow == \"root\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(shadow,"root")))};
+        $helpers.assert($helpers.eq(shadow, "root"), "shadow == \"root\"");
         const shadow1 = "nested";
         {
           const $if_let_value = shadow1;
           if ($if_let_value != undefined) {
             const shadow1 = $if_let_value;
-            {((cond) => {if (!cond) throw new Error("assertion failed: shadow1 == \"nested\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(shadow1,"nested")))};
+            $helpers.assert($helpers.eq(shadow1, "nested"), "shadow1 == \"nested\"");
           }
           else {
-            {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+            $helpers.assert(false, "false");
           }
         }
       }
@@ -429,18 +440,18 @@ class $Root extends $stdlib.std.Resource {
         }
       }
     });
-    {((cond) => {if (!cond) throw new Error("assertion failed: fun(\"hello\") == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((fun("hello")),"hello")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: fun(nil) == \"default\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((fun(undefined)),"default")))};
+    $helpers.assert($helpers.eq((fun("hello")), "hello"), "fun(\"hello\") == \"hello\"");
+    $helpers.assert($helpers.eq((fun(undefined)), "default"), "fun(nil) == \"default\"");
     const tree = new Node(this, "eight", 8, new Node(this, "three", 3, new Node(this, "one", 1, undefined, undefined), new Node(this, "six", 6, undefined, undefined)), new Node(this, "ten", 10, undefined, new Node(this, "fourteen", 14, new Node(this, "thirteen", 13, undefined, undefined), undefined)));
     const thirteen = tree.right?.right?.left?.value;
     const notThere = tree.right?.right?.right;
-    {((cond) => {if (!cond) throw new Error("assertion failed: thirteen == 13")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(thirteen,13)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: notThere == nil")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(notThere,undefined)))};
+    $helpers.assert($helpers.eq(thirteen, 13), "thirteen == 13");
+    $helpers.assert($helpers.eq(notThere, undefined), "notThere == nil");
     {
       const $if_let_value = tree.left?.left;
       if ($if_let_value != undefined) {
         const o = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: o.value == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(o.value,1)))};
+        $helpers.assert($helpers.eq(o.value, 1), "o.value == 1");
       }
     }
     const payloadWithoutOptions = ({"a": "a"});
@@ -452,21 +463,82 @@ class $Root extends $stdlib.std.Resource {
       const $if_let_value = str1;
       if ($if_let_value != undefined) {
         const s1 = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
       else {
         const $elif_let_value0 = str2;
         if ($elif_let_value0 != undefined) {
           const s2 = $elif_let_value0;
-          {((cond) => {if (!cond) throw new Error("assertion failed: true")})(true)};
+          $helpers.assert(true, "true");
         }
       }
     }
+    let fn = (() => {
+      return (() => {
+        return 1337;
+      });
+    });
+    {
+      const $if_let_value = (fn());
+      if ($if_let_value != undefined) {
+        const f = $if_let_value;
+        $helpers.assert($helpers.eq((f()), 1337), "f() == 1337");
+      }
+      else {
+        $helpers.assert(false, "false");
+      }
+    }
+    fn = (() => {
+      return undefined;
+    });
+    {
+      const $if_let_value = (fn());
+      if ($if_let_value != undefined) {
+        const f = $if_let_value;
+        $helpers.assert(false, "false");
+      }
+      else {
+        $helpers.assert(true, "true");
+      }
+    }
+    const maybeVar = 123;
+    $helpers.assert($helpers.eq($helpers.unwrap(maybeVar), 123), "maybeVar! == 123");
+    const maybeVarNull = undefined;
+    try {
+      const err = $helpers.unwrap(maybeVarNull);
+      $helpers.assert(false, "false");
+    }
+    catch ($error_e) {
+      const e = $error_e.message;
+      $helpers.assert($helpers.eq(e, "Unexpected nil"), "e == \"Unexpected nil\"");
+    }
+    const maybeFn = ((b) => {
+      if (b) {
+        return ["hi"];
+      }
+    });
+    try {
+      $helpers.unwrap((maybeFn(false)));
+      $helpers.assert(false, "false");
+    }
+    catch ($error_e) {
+      const e = $error_e.message;
+      $helpers.assert($helpers.eq(e, "Unexpected nil"), "e == \"Unexpected nil\"");
+    }
+    $helpers.assert($helpers.eq($helpers.unwrap((maybeFn(true))), ["hi"]), "maybeFn(true)! == [\"hi\"]");
+    const maybeVarBool = true;
+    $helpers.assert($helpers.eq((!$helpers.unwrap(maybeVarBool)), false), "!maybeVarBool! == false");
+    const person = $helpers.unwrap(Person._tryParseJson(((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(({"name": "john", "age": 30}))));
+    $helpers.assert(($helpers.eq(person.name, "john") && $helpers.eq(person.age, 30)), "person.name == \"john\" && person.age == 30");
+    const maybeX = 0;
+    $helpers.assert($helpers.eq($helpers.unwrap(maybeX), 0), "maybeX! == 0");
+    const maybeY = "";
+    $helpers.assert($helpers.eq($helpers.unwrap(maybeY), ""), "maybeY! == \"\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "optionals.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_test_sim.md
index f80514dba26..b834cd3b8cc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/optionals.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ optionals.test.wsim » root/env0/test:t
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/parameters/nested/parameters.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/parameters/nested/parameters.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..811e2fa2337
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/parameters/nested/parameters.test.w_compile_tf-aws.md
@@ -0,0 +1,48 @@
+# [parameters.test.w](../../../../../../../examples/tests/valid/parameters/nested/parameters.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const MyParams = $stdlib.std.Struct._createJsonSchema({$id:"/MyParams",type:"object",properties:{houses:{type:"array",items:{type:"object",properties:{address:{type:"string"},residents:{type:"array",items:{type:"object",properties:{age:{type:"number"},name:{type:"string"},},required:["age","name",]}},},required:["address","residents",]}},},required:["houses",]});
+    const app = $helpers.nodeof(this).app;
+    const myParams = MyParams._fromJson((app.parameters.read({ schema: MyParams })));
+    $helpers.assert($helpers.eq(myParams.houses.length, 2), "myParams.houses.length == 2");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(myParams.houses, 0).address, "123 Main St"), "myParams.houses.at(0).address == \"123 Main St\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(myParams.houses, 0).residents.length, 2), "myParams.houses.at(0).residents.length == 2");
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "parameters.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/parameters/nested/parameters.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/parameters/nested/parameters.test.w_test_sim.md
new file mode 100644
index 00000000000..f02f4dc461b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/parameters/nested/parameters.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [parameters.test.w](../../../../../../../examples/tests/valid/parameters/nested/parameters.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ parameters.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/parameters/simple/parameters.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/parameters/simple/parameters.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..3d38905013f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/parameters/simple/parameters.test.w_compile_tf-aws.md
@@ -0,0 +1,57 @@
+# [parameters.test.w](../../../../../../../examples/tests/valid/parameters/simple/parameters.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const MyParams = $stdlib.std.Struct._createJsonSchema({$id:"/MyParams",type:"object",properties:{foo:{type:"string"},meaningOfLife:{type:"number"},},required:["meaningOfLife",]});
+    const app = $helpers.nodeof(this).app;
+    const myParams = MyParams._fromJson((app.parameters.read({ schema: MyParams })));
+    {
+      const $if_let_value = myParams.foo;
+      if ($if_let_value != undefined) {
+        const foo = $if_let_value;
+        $helpers.assert(false, "false");
+      }
+      else {
+        $helpers.assert(true, "true");
+      }
+    }
+    const meaningOfLife = myParams.meaningOfLife;
+    $helpers.assert($helpers.eq(meaningOfLife, 42), "meaningOfLife == 42");
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "parameters.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/parameters/simple/parameters.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/parameters/simple/parameters.test.w_test_sim.md
new file mode 100644
index 00000000000..689cc2c78d9
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/parameters/simple/parameters.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [parameters.test.w](../../../../../../../examples/tests/valid/parameters/simple/parameters.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ parameters.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/phase_independent_method_on_string.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/phase_independent_method_on_string.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..32663fe374b
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/phase_independent_method_on_string.test.w_compile_tf-aws.md
@@ -0,0 +1,199 @@
+# [phase_independent_method_on_string.test.w](../../../../../examples/tests/valid/phase_independent_method_on_string.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $api_url, $expect_Util, $tokenLength, $urlRegex }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $expect_Util.equal((await $urlRegex.test($api_url)), true));
+      (await $expect_Util.equal($api_url.startsWith("http"), true));
+      (await $expect_Util.notEqual($api_url.length, $tokenLength));
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {
+      "root": {
+        "Default": {
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
+    "aws_region": {
+      "Region": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Region",
+            "uniqueId": "Region"
+          }
+        }
+      }
+    }
+  },
+  "output": {
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    }
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_api_gateway_deployment": {
+      "Api_api_deployment_7FB64CC4": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
+          }
+        },
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "triggers": {
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
+        }
+      }
+    },
+    "aws_api_gateway_rest_api": {
+      "Api_api_91C07D84": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
+          }
+        },
+        "body": "{\"paths\":{\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                {\\\"statusCode\\\": 404}\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
+        "lifecycle": {
+          "create_before_destroy": true
+        },
+        "name": "api-c8f613f0"
+      }
+    },
+    "aws_api_gateway_stage": {
+      "Api_api_stage_E0FA39D6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
+          }
+        },
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
+        "stage_name": "prod"
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+const expect = $stdlib.expect;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $api_url: ${$stdlib.core.liftObject(api.url)},
+            $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
+            $tokenLength: ${$stdlib.core.liftObject(tokenLength)},
+            $urlRegex: ${$stdlib.core.liftObject(urlRegex)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, [].concat(["startsWith"], ["length"])],
+            [tokenLength, []],
+            [urlRegex, ["test"]],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+            [tokenLength, []],
+            [urlRegex, []],
+          ],
+        });
+      }
+    }
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api");
+    const urlRegex = (std.Regex.compile("https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256\}\\.[a-zA-Z0-9()]{1,6\}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)"));
+    (expect.Util.equal((urlRegex.test(api.url)), false));
+    const tokenLength = api.url.length;
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:phase independent method on string evaluated inflight", new $Closure1(this, "$Closure1"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "phase_independent_method_on_string.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/phase_independent_method_on_string.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/phase_independent_method_on_string.test.w_test_sim.md
new file mode 100644
index 00000000000..44582d5dfaf
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/phase_independent_method_on_string.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [phase_independent_method_on_string.test.w](../../../../../examples/tests/valid/phase_independent_method_on_string.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ phase_independent_method_on_string.test.wsim » root/env0/test:phase independent method on string evaluated inflight
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_compile_tf-aws.md
index 9152b959d53..441e37501dd 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,14 +19,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -48,16 +37,16 @@ class $Root extends $stdlib.std.Resource {
     const f = ((d) => {
     });
     const stringy = String.raw({ raw: ["", ":", ""] }, dur.minutes, dur.seconds);
-    {console.log(stringy)};
-    if ((stringy.includes("60") && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })((stringy.split(":")), 0),"60")))) {
-      {console.log(String.raw({ raw: ["", "!"] }, stringy.length))};
+    console.log(stringy);
+    if ((stringy.includes("60") && $helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })((stringy.split(":")), 0), "60"))) {
+      console.log(String.raw({ raw: ["", "!"] }, stringy.length));
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: num.fromStr(\"123\") == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((args) => { if (isNaN(args)) {throw new Error("unable to parse \"" + args + "\" as a number")}; return Number(args) })("123"),123)))};
+    $helpers.assert($helpers.eq(((args) => { if (isNaN(args)) {throw new Error("unable to parse \"" + args + "\" as a number")}; return Number(args) })("123"), 123), "num.fromStr(\"123\") == 123");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "primitive_methods.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_test_sim.md
index 1937e1887d4..5da46d1dd84 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/primitive_methods.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 1:60
 pass ─ primitive_methods.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_compile_tf-aws.md
index 72d4004480b..562f60a538d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [print.test.w](../../../../../examples/tests/valid/print.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,18 +12,19 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {console.log("inflight log 1.1")};
-      {console.log("inflight log 1.2")};
+      console.log("inflight log 1.1");
+      console.log("inflight log 1.2");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure2 {
     constructor({  }) {
@@ -31,13 +33,13 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {console.log("inflight log 2.1")};
-      {console.log("inflight log 2.2")};
+      console.log("inflight log 2.1");
+      console.log("inflight log 2.2");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -47,22 +49,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -72,34 +61,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -107,26 +98,31 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -134,11 +130,16 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    {console.log("preflight log")};
+    console.log("preflight log");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:log1", new $Closure1(this, "$Closure1"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:log2", new $Closure2(this, "$Closure2"));
   }
@@ -146,6 +147,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "print.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_test_sim.md
index 95971eb96ae..0e44a128cde 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/print.test.w_test_sim.md
@@ -4,15 +4,15 @@
 ```log
 preflight log
 preflight log
-pass ┌ print.test.wsim » root/env0/test:log1
-     │ inflight log 1.1
-     └ inflight log 1.2
-pass ┌ print.test.wsim » root/env1/test:log2
-     │ inflight log 2.1
-     └ inflight log 2.2
- 
- 
+[INFO] log1 | inflight log 1.1
+[INFO] log1 | inflight log 1.2
+[INFO] log2 | inflight log 2.1
+[INFO] log2 | inflight log 2.2
+pass ─ print.test.wsim » root/env0/test:log1
+pass ─ print.test.wsim » root/env1/test:log2
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_compile_tf-aws.md
index ddb5128bd14..e19b9812b63 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [reassignment.test.w](../../../../../examples/tests/valid/reassignment.test.w) | compile | tf-aws
 
-## inflight.R-1.js
-```js
+## inflight.R-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class R {
     constructor({  }) {
@@ -10,7 +11,7 @@ module.exports = function({  }) {
   }
   return R;
 }
-//# sourceMappingURL=inflight.R-1.js.map
+//# sourceMappingURL=inflight.R-1.cjs.map
 ```
 
 ## main.tf.json
@@ -20,22 +21,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -45,14 +33,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -69,14 +59,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.R-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.R-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const RClient = ${R._toInflightType(this)};
+            const RClient = ${R._toInflightType()};
             const client = new RClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -84,34 +74,37 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     let x = 5;
-    {((cond) => {if (!cond) throw new Error("assertion failed: x == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,5)))};
+    $helpers.assert($helpers.eq(x, 5), "x == 5");
     x = (x + 1);
-    {((cond) => {if (!cond) throw new Error("assertion failed: x == 6")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,6)))};
+    $helpers.assert($helpers.eq(x, 6), "x == 6");
     let z = 1;
     z += 2;
-    {((cond) => {if (!cond) throw new Error("assertion failed: z == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(z,3)))};
+    $helpers.assert($helpers.eq(z, 3), "z == 3");
     z -= 1;
-    {((cond) => {if (!cond) throw new Error("assertion failed: z == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(z,2)))};
+    $helpers.assert($helpers.eq(z, 2), "z == 2");
     const r = new R(this, "R");
     (r.inc());
-    {((cond) => {if (!cond) throw new Error("assertion failed: r.f == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(r.f,2)))};
+    $helpers.assert($helpers.eq(r.f, 2), "r.f == 2");
     const f = ((arg) => {
       arg = 0;
       return arg;
     });
     const y = 1;
-    {((cond) => {if (!cond) throw new Error("assertion failed: f(y) == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((f(y)),0)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: y == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y,1)))};
+    $helpers.assert($helpers.eq((f(y)), 0), "f(y) == 0");
+    $helpers.assert($helpers.eq(y, 1), "y == 1");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "reassignment.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_test_sim.md
index 16ad2ec8b8d..0aaa0052c92 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/reassignment.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ reassignment.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_compile_tf-aws.md
index df7252c0d68..3f9fcd0a62b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [redis.test.w](../../../../../examples/tests/valid/redis.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $r }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $r }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $queue, $r, $r2, $util_Util }) {
   class $Closure2 {
     constructor({  }) {
@@ -32,17 +34,17 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
     async handle() {
       (await $r2.set("wing", "does redis again"));
       const value2 = (await $r2.get("wing"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: value2 == \"does redis again\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(value2,"does redis again")))};
+      $helpers.assert($helpers.eq(value2, "does redis again"), "value2 == \"does redis again\"");
       (await $queue.push("world!"));
-      (await $util_Util.waitUntil(async () => {
-        return (((a,b) => { try { return require('assert').notDeepStrictEqual(a,b) === undefined; } catch { return false; } })((await $r.get("hello")),undefined));
-      }));
-      {((cond) => {if (!cond) throw new Error("assertion failed: \"world!\" == \"{r.get(\"hello\")}\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("world!",String.raw({ raw: ["", ""] }, (await $r.get("hello"))))))};
+      (await $util_Util.waitUntil((async () => {
+        return $helpers.neq((await $r.get("hello")), undefined);
+      })));
+      $helpers.assert($helpers.eq("world!", String.raw({ raw: ["", ""] }, ((await $r.get("hello")) ?? "nil"))), "\"world!\" == \"{r.get(\"hello\") ?? \"nil\"}\"");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -52,17 +54,9 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
+    "outputs": {}
   },
   "data": {
     "aws_region": {
@@ -76,11 +70,6 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
       }
     }
   },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
-  },
   "provider": {
     "aws": [
       {}
@@ -88,14 +77,14 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419"
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30
       }
     },
@@ -110,24 +99,25 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
       }
     },
     "aws_elasticache_cluster": {
-      "exRedis_RedisCluster_3C9A5882": {
+      "Redis_RedisCluster_F55D8A3B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Redis/RedisCluster",
-            "uniqueId": "exRedis_RedisCluster_3C9A5882"
+            "path": "root/Default/Default/Redis/RedisCluster",
+            "uniqueId": "Redis_RedisCluster_F55D8A3B"
           }
         },
         "availability_zone": "${aws_subnet.PrivateSubnet.availability_zone}",
-        "cluster_id": "ex-redis-c8a27ec9",
+        "cluster_id": "redis-c8cdb969",
         "engine": "redis",
         "engine_version": "6.2",
         "node_type": "cache.t4g.small",
         "num_cache_nodes": 1,
         "parameter_group_name": "default.redis6.x",
         "security_group_ids": [
-          "${aws_security_group.exRedis_securityGroup_3948C3F2.id}"
+          "${aws_security_group.Redis_KEN21securityGroup_139152DE.id}",
+          "${aws_security_group.Redis_KEN24securityGroup_6EFFC29B.id}"
         ],
-        "subnet_group_name": "${aws_elasticache_subnet_group.exRedis_RedisSubnetGroup_EE9BBE48.name}"
+        "subnet_group_name": "${aws_elasticache_subnet_group.Redis_RedisSubnetGroup_E7D796E2.name}"
       },
       "r2_RedisCluster_C6087F40": {
         "//": {
@@ -144,22 +134,24 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
         "num_cache_nodes": 1,
         "parameter_group_name": "default.redis6.x",
         "security_group_ids": [
-          "${aws_security_group.r2_securityGroup_35A75C2E.id}"
+          "${aws_security_group.r2_KEN35securityGroup_DF1EB5F4.id}",
+          "${aws_security_group.r2_KEN38securityGroup_41F37500.id}"
         ],
         "subnet_group_name": "${aws_elasticache_subnet_group.r2_RedisSubnetGroup_C415566B.name}"
       }
     },
     "aws_elasticache_subnet_group": {
-      "exRedis_RedisSubnetGroup_EE9BBE48": {
+      "Redis_RedisSubnetGroup_E7D796E2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Redis/RedisSubnetGroup",
-            "uniqueId": "exRedis_RedisSubnetGroup_EE9BBE48"
+            "path": "root/Default/Default/Redis/RedisSubnetGroup",
+            "uniqueId": "Redis_RedisSubnetGroup_E7D796E2"
           }
         },
-        "name": "ex-redis-c8a27ec9-subnetGroup",
+        "name": "redis-c8cdb969-subnetGroup",
         "subnet_ids": [
-          "${aws_subnet.PrivateSubnet.id}"
+          "${aws_subnet.PrivateSubnet.id}",
+          "${aws_subnet.PrivateSubnet2.id}"
         ]
       },
       "r2_RedisSubnetGroup_C415566B": {
@@ -171,43 +163,44 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
         },
         "name": "r2-c882797c-subnetGroup",
         "subnet_ids": [
-          "${aws_subnet.PrivateSubnet.id}"
+          "${aws_subnet.PrivateSubnet.id}",
+          "${aws_subnet.PrivateSubnet2.id}"
         ]
       }
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.cloudQueue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"elasticache:Describe*\"],\"Resource\":[\"${aws_elasticache_cluster.exRedis_RedisCluster_3C9A5882.arn}\"],\"Effect\":\"Allow\"},{\"Effect\":\"Allow\",\"Action\":[\"ec2:CreateNetworkInterface\",\"ec2:DescribeNetworkInterfaces\",\"ec2:DeleteNetworkInterface\",\"ec2:DescribeSubnets\",\"ec2:DescribeSecurityGroups\"],\"Resource\":\"*\"},{\"Effect\":\"Allow\",\"Action\":[\"ec2:CreateNetworkInterface\",\"ec2:DescribeNetworkInterfaces\",\"ec2:DeleteNetworkInterface\",\"ec2:DescribeSubnets\",\"ec2:DescribeSecurityGroups\"],\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"elasticache:Describe*\"],\"Resource\":[\"${aws_elasticache_cluster.Redis_RedisCluster_F55D8A3B.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"ec2:CreateNetworkInterface\",\"ec2:DescribeNetworkInterfaces\",\"ec2:DeleteNetworkInterface\",\"ec2:DescribeSubnets\",\"ec2:DescribeSecurityGroups\"],\"Resource\":[\"*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_internet_gateway": {
@@ -225,24 +218,27 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
       }
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136"
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
           }
         },
         "batch_size": 1,
-        "event_source_arn": "${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "${aws_lambda_function.cloudQueue-SetConsumer0.function_name}"
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0"
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
           }
         },
         "architectures": [
@@ -251,26 +247,28 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "REDIS_CLUSTER_ID_89baf91f": "${aws_elasticache_cluster.exRedis_RedisCluster_3C9A5882.cluster_id}",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "REDIS_CLUSTER_ID_3542402a": "${aws_elasticache_cluster.Redis_RedisCluster_F55D8A3B.cluster_id}",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [
-            "${aws_security_group.exRedis_securityGroup_3948C3F2.id}"
+            "${aws_security_group.Redis_KEN21securityGroup_139152DE.id}",
+            "${aws_security_group.Redis_KEN24securityGroup_6EFFC29B.id}"
           ],
           "subnet_ids": [
-            "${aws_subnet.PrivateSubnet.id}"
+            "${aws_subnet.PrivateSubnet.id}",
+            "${aws_subnet.PrivateSubnet2.id}"
           ]
         }
       }
@@ -306,7 +304,6 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
             "destination_prefix_list_id": null,
             "egress_only_gateway_id": null,
             "gateway_id": null,
-            "instance_id": null,
             "ipv6_cidr_block": null,
             "local_gateway_id": null,
             "nat_gateway_id": "${aws_nat_gateway.NATGateway.id}",
@@ -321,6 +318,35 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
         },
         "vpc_id": "${aws_vpc.VPC.id}"
       },
+      "PrivateRouteTable2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/PrivateRouteTable2",
+            "uniqueId": "PrivateRouteTable2"
+          }
+        },
+        "route": [
+          {
+            "carrier_gateway_id": null,
+            "cidr_block": "0.0.0.0/0",
+            "core_network_arn": null,
+            "destination_prefix_list_id": null,
+            "egress_only_gateway_id": null,
+            "gateway_id": null,
+            "ipv6_cidr_block": null,
+            "local_gateway_id": null,
+            "nat_gateway_id": "${aws_nat_gateway.NATGateway.id}",
+            "network_interface_id": null,
+            "transit_gateway_id": null,
+            "vpc_endpoint_id": null,
+            "vpc_peering_connection_id": null
+          }
+        ],
+        "tags": {
+          "Name": "Default-c82bf964-private-route-table-2"
+        },
+        "vpc_id": "${aws_vpc.VPC.id}"
+      },
       "PublicRouteTable": {
         "//": {
           "metadata": {
@@ -336,7 +362,6 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
             "destination_prefix_list_id": null,
             "egress_only_gateway_id": null,
             "gateway_id": "${aws_internet_gateway.InternetGateway.id}",
-            "instance_id": null,
             "ipv6_cidr_block": null,
             "local_gateway_id": null,
             "nat_gateway_id": null,
@@ -363,6 +388,16 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
         "route_table_id": "${aws_route_table.PrivateRouteTable.id}",
         "subnet_id": "${aws_subnet.PrivateSubnet.id}"
       },
+      "PrivateRouteTableAssociation2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/PrivateRouteTableAssociation2",
+            "uniqueId": "PrivateRouteTableAssociation2"
+          }
+        },
+        "route_table_id": "${aws_route_table.PrivateRouteTable2.id}",
+        "subnet_id": "${aws_subnet.PrivateSubnet2.id}"
+      },
       "PublicRouteTableAssociation": {
         "//": {
           "metadata": {
@@ -386,11 +421,11 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
       }
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF"
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -399,11 +434,11 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
       }
     },
     "aws_security_group": {
-      "exRedis_securityGroup_3948C3F2": {
+      "Redis_KEN21securityGroup_139152DE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Redis/securityGroup",
-            "uniqueId": "exRedis_securityGroup_3948C3F2"
+            "path": "root/Default/Default/Redis/KEN.21]}securityGroup",
+            "uniqueId": "Redis_KEN21securityGroup_139152DE"
           }
         },
         "egress": [
@@ -436,14 +471,54 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
             "to_port": 6379
           }
         ],
-        "name": "89baf91f-securityGroup",
+        "name": "3542402a-securityGroup",
+        "vpc_id": "${aws_vpc.VPC.id}"
+      },
+      "Redis_KEN24securityGroup_6EFFC29B": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Redis/KEN.24]}securityGroup",
+            "uniqueId": "Redis_KEN24securityGroup_6EFFC29B"
+          }
+        },
+        "egress": [
+          {
+            "cidr_blocks": [
+              "0.0.0.0/0"
+            ],
+            "description": null,
+            "from_port": 0,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "-1",
+            "security_groups": null,
+            "self": null,
+            "to_port": 0
+          }
+        ],
+        "ingress": [
+          {
+            "cidr_blocks": [
+              "${aws_subnet.PrivateSubnet2.cidr_block}"
+            ],
+            "description": null,
+            "from_port": 6379,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "tcp",
+            "security_groups": null,
+            "self": true,
+            "to_port": 6379
+          }
+        ],
+        "name": "3542402a-securityGroup",
         "vpc_id": "${aws_vpc.VPC.id}"
       },
-      "r2_securityGroup_35A75C2E": {
+      "r2_KEN35securityGroup_DF1EB5F4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/r2/securityGroup",
-            "uniqueId": "r2_securityGroup_35A75C2E"
+            "path": "root/Default/Default/r2/KEN.35]}securityGroup",
+            "uniqueId": "r2_KEN35securityGroup_DF1EB5F4"
           }
         },
         "egress": [
@@ -478,18 +553,58 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
         ],
         "name": "30c8c4ae-securityGroup",
         "vpc_id": "${aws_vpc.VPC.id}"
+      },
+      "r2_KEN38securityGroup_41F37500": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/r2/KEN.38]}securityGroup",
+            "uniqueId": "r2_KEN38securityGroup_41F37500"
+          }
+        },
+        "egress": [
+          {
+            "cidr_blocks": [
+              "0.0.0.0/0"
+            ],
+            "description": null,
+            "from_port": 0,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "-1",
+            "security_groups": null,
+            "self": null,
+            "to_port": 0
+          }
+        ],
+        "ingress": [
+          {
+            "cidr_blocks": [
+              "${aws_subnet.PrivateSubnet2.cidr_block}"
+            ],
+            "description": null,
+            "from_port": 6379,
+            "ipv6_cidr_blocks": null,
+            "prefix_list_ids": null,
+            "protocol": "tcp",
+            "security_groups": null,
+            "self": true,
+            "to_port": 6379
+          }
+        ],
+        "name": "30c8c4ae-securityGroup",
+        "vpc_id": "${aws_vpc.VPC.id}"
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     },
@@ -508,6 +623,20 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
         },
         "vpc_id": "${aws_vpc.VPC.id}"
       },
+      "PrivateSubnet2": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/PrivateSubnet2",
+            "uniqueId": "PrivateSubnet2"
+          }
+        },
+        "availability_zone": "${data.aws_region.Region.name}b",
+        "cidr_block": "10.0.8.0/22",
+        "tags": {
+          "Name": "Default-c82bf964-private-subnet-2"
+        },
+        "vpc_id": "${aws_vpc.VPC.id}"
+      },
       "PublicSubnet": {
         "//": {
           "metadata": {
@@ -543,29 +672,31 @@ module.exports = function({ $queue, $r, $r2, $util_Util }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const util = $stdlib.util;
 const ex = $stdlib.ex;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $r: ${$stdlib.core.liftObject(r)},
           })
         `;
@@ -573,7 +704,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -581,25 +712,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(r, host, ["set"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [r, ["set"]],
+          ],
+          "$inflight_init": [
+            [r, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $queue: ${$stdlib.core.liftObject(queue)},
             $r: ${$stdlib.core.liftObject(r)},
             $r2: ${$stdlib.core.liftObject(r2)},
@@ -610,7 +742,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -618,21 +750,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(queue, host, ["push"]);
-          $Closure2._registerOnLiftObject(r, host, ["get"]);
-          $Closure2._registerOnLiftObject(r2, host, ["get", "set"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [queue, ["push"]],
+            [r, ["get"]],
+            [r2, [].concat(["set"], ["get"])],
+          ],
+          "$inflight_init": [
+            [queue, []],
+            [r, []],
+            [r2, []],
+          ],
+        });
       }
     }
-    const r = this.node.root.new("@winglang/sdk.ex.Redis", ex.Redis, this, "ex.Redis");
+    const r = this.node.root.new("@winglang/sdk.ex.Redis", ex.Redis, this, "Redis");
     const r2 = this.node.root.new("@winglang/sdk.ex.Redis", ex.Redis, this, "r2");
-    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
     (queue.setConsumer(new $Closure1(this, "$Closure1"), { timeout: (std.Duration.fromSeconds(3)) }));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:testing Redis", new $Closure2(this, "$Closure2"));
   }
@@ -640,6 +775,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "redis.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_test_sim.md
index 0916ba9bac0..5a56e97045d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/redis.test.w_test_sim.md
@@ -1,17 +1,11 @@
 # [redis.test.w](../../../../../examples/tests/valid/redis.test.w) | test | sim
 
-## stderr.log
-```log
-Error: No such object: redis@sha256:e50c7e23f79ae81351beacb20e004720d4bed657415e68c2b1a2b5557c075ce0
-
-```
-
 ## stdout.log
 ```log
 pass ─ redis.test.wsim » root/env0/test:testing Redis
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_compile_tf-aws.md
index f63adee8e22..15d32e4e829 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [resource.test.w](../../../../../examples/tests/valid/resource.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bucket, $res, $res_foo }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,21 +13,22 @@ module.exports = function({ $bucket, $res, $res_foo }) {
     }
     async handle() {
       const s = (await $res.myMethod());
-      {console.log(s)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: s == \"counter is: 201\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"counter is: 201")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: bucket.list().length == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $bucket.list()).length,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: res.foo.inflightField == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($res_foo.inflightField,123)))};
+      console.log(s);
+      $helpers.assert($helpers.eq(s, "counter is: 201"), "s == \"counter is: 201\"");
+      $helpers.assert($helpers.eq((await $bucket.list()).length, 1), "bucket.list().length == 1");
+      $helpers.assert($helpers.eq($res_foo.inflightField, 123), "res.foo.inflightField == 123");
       (await $res.testTypeAccess());
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_2_b }) {
   class $Closure2 {
     constructor({  }) {
@@ -40,12 +42,13 @@ module.exports = function({ $__parent_this_2_b }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_3_b }) {
   class $Closure3 {
     constructor({  }) {
@@ -59,12 +62,13 @@ module.exports = function({ $__parent_this_3_b }) {
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_4_q }) {
   class $Closure4 {
     constructor({  }) {
@@ -78,13 +82,14 @@ module.exports = function({ $__parent_this_4_q }) {
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.$Closure5-1.js
-```js
+## inflight.$Closure5-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $bigOlPublisher }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $bigOlPublisher, $util_Util }) {
   class $Closure5 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -93,17 +98,22 @@ module.exports = function({ $bigOlPublisher }) {
     }
     async handle() {
       (await $bigOlPublisher.publish("foo"));
-      const count = (await $bigOlPublisher.getObjectCount());
+      (await $util_Util.waitUntil((async () => {
+        const count = (await $bigOlPublisher.getObjectCount());
+        return $helpers.eq(count, 2);
+      })));
+      $helpers.assert($helpers.eq((await $bigOlPublisher.getObjectCount()), 2), "bigOlPublisher.getObjectCount() == 2");
     }
   }
   return $Closure5;
 }
-//# sourceMappingURL=inflight.$Closure5-1.js.map
+//# sourceMappingURL=inflight.$Closure5-1.cjs.map
 ```
 
-## inflight.Bar-1.js
-```js
+## inflight.Bar-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Foo, $MyEnum }) {
   class Bar {
     constructor({ $this_b, $this_e, $this_foo }) {
@@ -122,20 +132,21 @@ module.exports = function({ $Foo, $MyEnum }) {
     }
     async testTypeAccess() {
       if (true) {
-        {((cond) => {if (!cond) throw new Error("assertion failed: Bar.barStatic() == \"bar static\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await Bar.barStatic()),"bar static")))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: Foo.fooStatic() == \"foo static\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $Foo.fooStatic()),"foo static")))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: this.e == MyEnum.B")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$this_e,$MyEnum.B)))};
+        $helpers.assert($helpers.eq((await Bar.barStatic()), "bar static"), "Bar.barStatic() == \"bar static\"");
+        $helpers.assert($helpers.eq((await $Foo.fooStatic()), "foo static"), "Foo.fooStatic() == \"foo static\"");
+        $helpers.assert($helpers.eq(this.$this_e, $MyEnum.B), "this.e == MyEnum.B");
       }
     }
   }
   return Bar;
 }
-//# sourceMappingURL=inflight.Bar-1.js.map
+//# sourceMappingURL=inflight.Bar-1.cjs.map
 ```
 
-## inflight.BigPublisher-1.js
-```js
+## inflight.BigPublisher-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class BigPublisher {
     constructor({ $this_b, $this_b2, $this_q, $this_t }) {
@@ -155,12 +166,13 @@ module.exports = function({  }) {
   }
   return BigPublisher;
 }
-//# sourceMappingURL=inflight.BigPublisher-1.js.map
+//# sourceMappingURL=inflight.BigPublisher-1.cjs.map
 ```
 
-## inflight.Dummy-1.js
-```js
+## inflight.Dummy-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Dummy {
     constructor({  }) {
@@ -168,12 +180,13 @@ module.exports = function({  }) {
   }
   return Dummy;
 }
-//# sourceMappingURL=inflight.Dummy-1.js.map
+//# sourceMappingURL=inflight.Dummy-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({ $this_c }) {
@@ -196,12 +209,13 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
-## inflight.ScopeAndIdTestClass-1.js
-```js
+## inflight.ScopeAndIdTestClass-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class ScopeAndIdTestClass {
     constructor({  }) {
@@ -209,7 +223,7 @@ module.exports = function({  }) {
   }
   return ScopeAndIdTestClass;
 }
-//# sourceMappingURL=inflight.ScopeAndIdTestClass-1.js.map
+//# sourceMappingURL=inflight.ScopeAndIdTestClass-1.cjs.map
 ```
 
 ## main.tf.json
@@ -219,22 +233,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -243,43 +244,43 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "BigPublisher_b2_oncreate-OnMessage0_CloudwatchLogGroup_E98CA40A": {
+      "BigPublisher_Queue-SetConsumer0_CloudwatchLogGroup_59DF8618": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "BigPublisher_b2_oncreate-OnMessage0_CloudwatchLogGroup_E98CA40A"
+            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "BigPublisher_Queue-SetConsumer0_CloudwatchLogGroup_59DF8618"
           }
         },
-        "name": "/aws/lambda/oncreate-OnMessage0-c8946df1",
+        "name": "/aws/lambda/Queue-SetConsumer0-c8931d51",
         "retention_in_days": 30
       },
-      "BigPublisher_cloudQueue-SetConsumer0_CloudwatchLogGroup_36322340": {
+      "BigPublisher_Topic-OnMessage0_CloudwatchLogGroup_7B9F7944": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "BigPublisher_cloudQueue-SetConsumer0_CloudwatchLogGroup_36322340"
+            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "BigPublisher_Topic-OnMessage0_CloudwatchLogGroup_7B9F7944"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8aaa844",
+        "name": "/aws/lambda/Topic-OnMessage0-c8bea057",
         "retention_in_days": 30
       },
-      "BigPublisher_cloudTopic-OnMessage0_CloudwatchLogGroup_4012D30C": {
+      "BigPublisher_b2_OnCreate-OnMessage0_CloudwatchLogGroup_8914F373": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "BigPublisher_cloudTopic-OnMessage0_CloudwatchLogGroup_4012D30C"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "BigPublisher_b2_OnCreate-OnMessage0_CloudwatchLogGroup_8914F373"
           }
         },
-        "name": "/aws/lambda/cloud-Topic-OnMessage0-c85e2df7",
+        "name": "/aws/lambda/OnCreate-OnMessage0-c8ab841c",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "Bar_Foo_cloudCounter_DF879883": {
+      "Bar_Foo_Counter_0BF3941D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Bar/Foo/cloud.Counter/Default",
-            "uniqueId": "Bar_Foo_cloudCounter_DF879883"
+            "path": "root/Default/Default/Bar/Foo/Counter/Default",
+            "uniqueId": "Bar_Foo_Counter_0BF3941D"
           }
         },
         "attribute": [
@@ -290,121 +291,124 @@ module.exports = function({  }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c8ef80ad"
+        "name": "wing-counter-Counter-c8066681"
       }
     },
     "aws_iam_role": {
-      "BigPublisher_b2_oncreate-OnMessage0_IamRole_FF154497": {
+      "BigPublisher_Queue-SetConsumer0_IamRole_D38B87EE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/IamRole",
-            "uniqueId": "BigPublisher_b2_oncreate-OnMessage0_IamRole_FF154497"
+            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/IamRole",
+            "uniqueId": "BigPublisher_Queue-SetConsumer0_IamRole_D38B87EE"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "BigPublisher_cloudQueue-SetConsumer0_IamRole_80E6DDE5": {
+      "BigPublisher_Topic-OnMessage0_IamRole_FEF4CFBB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "BigPublisher_cloudQueue-SetConsumer0_IamRole_80E6DDE5"
+            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/IamRole",
+            "uniqueId": "BigPublisher_Topic-OnMessage0_IamRole_FEF4CFBB"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "BigPublisher_cloudTopic-OnMessage0_IamRole_818FEA46": {
+      "BigPublisher_b2_OnCreate-OnMessage0_IamRole_2B7C8C04": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/IamRole",
-            "uniqueId": "BigPublisher_cloudTopic-OnMessage0_IamRole_818FEA46"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/IamRole",
+            "uniqueId": "BigPublisher_b2_OnCreate-OnMessage0_IamRole_2B7C8C04"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "BigPublisher_b2_oncreate-OnMessage0_IamRolePolicy_983EC08F": {
+      "BigPublisher_Queue-SetConsumer0_IamRolePolicy_AC1DBF7E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/IamRolePolicy",
-            "uniqueId": "BigPublisher_b2_oncreate-OnMessage0_IamRolePolicy_983EC08F"
+            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "BigPublisher_Queue-SetConsumer0_IamRolePolicy_AC1DBF7E"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:SendMessage\"],\"Resource\":[\"${aws_sqs_queue.BigPublisher_cloudQueue_2EE8871A.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.BigPublisher_b2_oncreate-OnMessage0_IamRole_FF154497.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.BigPublisher_Queue_2C024F97.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.BigPublisher_Bucket_F4CC95F6.arn}\",\"${aws_s3_bucket.BigPublisher_Bucket_F4CC95F6.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BigPublisher_Queue-SetConsumer0_IamRole_D38B87EE.name}"
       },
-      "BigPublisher_cloudQueue-SetConsumer0_IamRolePolicy_14C69404": {
+      "BigPublisher_Topic-OnMessage0_IamRolePolicy_6D3D4F05": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "BigPublisher_cloudQueue-SetConsumer0_IamRolePolicy_14C69404"
+            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/IamRolePolicy",
+            "uniqueId": "BigPublisher_Topic-OnMessage0_IamRolePolicy_6D3D4F05"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.BigPublisher_cloudQueue_2EE8871A.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.BigPublisher_cloudBucket_ABF95118.arn}\",\"${aws_s3_bucket.BigPublisher_cloudBucket_ABF95118.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.BigPublisher_cloudQueue-SetConsumer0_IamRole_80E6DDE5.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.BigPublisher_Bucket_F4CC95F6.arn}\",\"${aws_s3_bucket.BigPublisher_Bucket_F4CC95F6.arn}/*\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BigPublisher_Topic-OnMessage0_IamRole_FEF4CFBB.name}"
       },
-      "BigPublisher_cloudTopic-OnMessage0_IamRolePolicy_D8E5365A": {
+      "BigPublisher_b2_OnCreate-OnMessage0_IamRolePolicy_7D531F15": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/IamRolePolicy",
-            "uniqueId": "BigPublisher_cloudTopic-OnMessage0_IamRolePolicy_D8E5365A"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/IamRolePolicy",
+            "uniqueId": "BigPublisher_b2_OnCreate-OnMessage0_IamRolePolicy_7D531F15"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"s3:PutObject*\",\"s3:Abort*\"],\"Resource\":[\"${aws_s3_bucket.BigPublisher_cloudBucket_ABF95118.arn}\",\"${aws_s3_bucket.BigPublisher_cloudBucket_ABF95118.arn}/*\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.BigPublisher_cloudTopic-OnMessage0_IamRole_818FEA46.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:GetQueueUrl\"],\"Resource\":[\"${aws_sqs_queue.BigPublisher_Queue_2C024F97.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"sqs:SendMessage\"],\"Resource\":[\"${aws_sqs_queue.BigPublisher_Queue_2C024F97.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.BigPublisher_b2_OnCreate-OnMessage0_IamRole_2B7C8C04.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "BigPublisher_b2_oncreate-OnMessage0_IamRolePolicyAttachment_7DE224FF": {
+      "BigPublisher_Queue-SetConsumer0_IamRolePolicyAttachment_263D5243": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "BigPublisher_b2_oncreate-OnMessage0_IamRolePolicyAttachment_7DE224FF"
+            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "BigPublisher_Queue-SetConsumer0_IamRolePolicyAttachment_263D5243"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.BigPublisher_b2_oncreate-OnMessage0_IamRole_FF154497.name}"
+        "role": "${aws_iam_role.BigPublisher_Queue-SetConsumer0_IamRole_D38B87EE.name}"
       },
-      "BigPublisher_cloudQueue-SetConsumer0_IamRolePolicyAttachment_21DA4843": {
+      "BigPublisher_Topic-OnMessage0_IamRolePolicyAttachment_9752C0C1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "BigPublisher_cloudQueue-SetConsumer0_IamRolePolicyAttachment_21DA4843"
+            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "BigPublisher_Topic-OnMessage0_IamRolePolicyAttachment_9752C0C1"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.BigPublisher_cloudQueue-SetConsumer0_IamRole_80E6DDE5.name}"
+        "role": "${aws_iam_role.BigPublisher_Topic-OnMessage0_IamRole_FEF4CFBB.name}"
       },
-      "BigPublisher_cloudTopic-OnMessage0_IamRolePolicyAttachment_22B5615B": {
+      "BigPublisher_b2_OnCreate-OnMessage0_IamRolePolicyAttachment_56FA395A": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "BigPublisher_cloudTopic-OnMessage0_IamRolePolicyAttachment_22B5615B"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "BigPublisher_b2_OnCreate-OnMessage0_IamRolePolicyAttachment_56FA395A"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.BigPublisher_cloudTopic-OnMessage0_IamRole_818FEA46.name}"
+        "role": "${aws_iam_role.BigPublisher_b2_OnCreate-OnMessage0_IamRole_2B7C8C04.name}"
       }
     },
     "aws_lambda_event_source_mapping": {
-      "BigPublisher_cloudQueue_EventSourceMapping_D1299C34": {
+      "BigPublisher_Queue_EventSourceMapping_D3253A7F": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue/EventSourceMapping",
-            "uniqueId": "BigPublisher_cloudQueue_EventSourceMapping_D1299C34"
+            "path": "root/Default/Default/BigPublisher/Queue/EventSourceMapping",
+            "uniqueId": "BigPublisher_Queue_EventSourceMapping_D3253A7F"
           }
         },
         "batch_size": 1,
-        "event_source_arn": "${aws_sqs_queue.BigPublisher_cloudQueue_2EE8871A.arn}",
-        "function_name": "${aws_lambda_function.BigPublisher_cloudQueue-SetConsumer0_903099C9.function_name}"
+        "event_source_arn": "${aws_sqs_queue.BigPublisher_Queue_2C024F97.arn}",
+        "function_name": "${aws_lambda_function.BigPublisher_Queue-SetConsumer0_55896C65.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
-      "BigPublisher_b2_oncreate-OnMessage0_3ECAAB35": {
+      "BigPublisher_Queue-SetConsumer0_55896C65": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/Default",
-            "uniqueId": "BigPublisher_b2_oncreate-OnMessage0_3ECAAB35"
+            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/Default",
+            "uniqueId": "BigPublisher_Queue-SetConsumer0_55896C65"
           }
         },
         "architectures": [
@@ -412,31 +416,31 @@ module.exports = function({  }) {
         ],
         "environment": {
           "variables": {
+            "BUCKET_NAME_82fe1f9e": "${aws_s3_bucket.BigPublisher_Bucket_F4CC95F6.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "QUEUE_URL_b0ba884c": "${aws_sqs_queue.BigPublisher_cloudQueue_2EE8871A.url}",
-            "WING_FUNCTION_NAME": "oncreate-OnMessage0-c8946df1",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c8931d51",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "oncreate-OnMessage0-c8946df1",
+        "function_name": "Queue-SetConsumer0-c8931d51",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.BigPublisher_b2_oncreate-OnMessage0_IamRole_FF154497.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.BigPublisher_Queue-SetConsumer0_IamRole_D38B87EE.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.BigPublisher_b2_oncreate-OnMessage0_S3Object_1489E104.key}",
-        "timeout": 60,
+        "s3_key": "${aws_s3_object.BigPublisher_Queue-SetConsumer0_S3Object_21F398A2.key}",
+        "timeout": "${aws_sqs_queue.BigPublisher_Queue_2C024F97.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "BigPublisher_cloudQueue-SetConsumer0_903099C9": {
+      "BigPublisher_Topic-OnMessage0_A623A9EA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "BigPublisher_cloudQueue-SetConsumer0_903099C9"
+            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/Default",
+            "uniqueId": "BigPublisher_Topic-OnMessage0_A623A9EA"
           }
         },
         "architectures": [
@@ -444,31 +448,31 @@ module.exports = function({  }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_7ef741f5": "${aws_s3_bucket.BigPublisher_cloudBucket_ABF95118.bucket}",
+            "BUCKET_NAME_82fe1f9e": "${aws_s3_bucket.BigPublisher_Bucket_F4CC95F6.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8aaa844",
+            "WING_FUNCTION_NAME": "Topic-OnMessage0-c8bea057",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8aaa844",
+        "function_name": "Topic-OnMessage0-c8bea057",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.BigPublisher_cloudQueue-SetConsumer0_IamRole_80E6DDE5.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.BigPublisher_Topic-OnMessage0_IamRole_FEF4CFBB.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.BigPublisher_cloudQueue-SetConsumer0_S3Object_BC15A90B.key}",
-        "timeout": "${aws_sqs_queue.BigPublisher_cloudQueue_2EE8871A.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.BigPublisher_Topic-OnMessage0_S3Object_3B80DE9B.key}",
+        "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "BigPublisher_cloudTopic-OnMessage0_EB3C5802": {
+      "BigPublisher_b2_OnCreate-OnMessage0_F967A96B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/Default",
-            "uniqueId": "BigPublisher_cloudTopic-OnMessage0_EB3C5802"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/Default",
+            "uniqueId": "BigPublisher_b2_OnCreate-OnMessage0_F967A96B"
           }
         },
         "architectures": [
@@ -476,20 +480,20 @@ module.exports = function({  }) {
         ],
         "environment": {
           "variables": {
-            "BUCKET_NAME_7ef741f5": "${aws_s3_bucket.BigPublisher_cloudBucket_ABF95118.bucket}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Topic-OnMessage0-c85e2df7",
+            "QUEUE_URL_cb1bcecf": "${aws_sqs_queue.BigPublisher_Queue_2C024F97.url}",
+            "WING_FUNCTION_NAME": "OnCreate-OnMessage0-c8ab841c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Topic-OnMessage0-c85e2df7",
+        "function_name": "OnCreate-OnMessage0-c8ab841c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.BigPublisher_cloudTopic-OnMessage0_IamRole_818FEA46.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.BigPublisher_b2_OnCreate-OnMessage0_IamRole_2B7C8C04.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.BigPublisher_cloudTopic-OnMessage0_S3Object_A4DC7356.key}",
+        "s3_key": "${aws_s3_object.BigPublisher_b2_OnCreate-OnMessage0_S3Object_75F3ED03.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -498,32 +502,42 @@ module.exports = function({  }) {
       }
     },
     "aws_lambda_permission": {
-      "BigPublisher_b2_oncreate-OnMessage0_InvokePermission-c849e824f9ffcc17825860cf0b7344a60826b3ba1a_9E58F097": {
+      "BigPublisher_Topic-OnMessage0_InvokePermission-c884cd53ef51dde6112319447c29f4ea9473f19e6a_EFD91A7E": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/InvokePermission-c849e824f9ffcc17825860cf0b7344a60826b3ba1a",
-            "uniqueId": "BigPublisher_b2_oncreate-OnMessage0_InvokePermission-c849e824f9ffcc17825860cf0b7344a60826b3ba1a_9E58F097"
+            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/InvokePermission-c884cd53ef51dde6112319447c29f4ea9473f19e6a",
+            "uniqueId": "BigPublisher_Topic-OnMessage0_InvokePermission-c884cd53ef51dde6112319447c29f4ea9473f19e6a_EFD91A7E"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.BigPublisher_b2_oncreate-OnMessage0_3ECAAB35.function_name}",
+        "function_name": "${aws_lambda_function.BigPublisher_Topic-OnMessage0_A623A9EA.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.BigPublisher_b2_oncreate_44F68983.arn}"
+        "source_arn": "${aws_sns_topic.BigPublisher_Topic_F8E12E52.arn}"
       },
-      "BigPublisher_cloudTopic-OnMessage0_InvokePermission-c86b6469dec0edbe23d2827b4ea7006182eb0072ec_1514C2B7": {
+      "BigPublisher_b2_OnCreate-OnMessage0_InvokePermission-c8957161bd24a9a75910007bdeef4fc517fd85b21a_AB564705": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/InvokePermission-c86b6469dec0edbe23d2827b4ea7006182eb0072ec",
-            "uniqueId": "BigPublisher_cloudTopic-OnMessage0_InvokePermission-c86b6469dec0edbe23d2827b4ea7006182eb0072ec_1514C2B7"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/InvokePermission-c8957161bd24a9a75910007bdeef4fc517fd85b21a",
+            "uniqueId": "BigPublisher_b2_OnCreate-OnMessage0_InvokePermission-c8957161bd24a9a75910007bdeef4fc517fd85b21a_AB564705"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.BigPublisher_cloudTopic-OnMessage0_EB3C5802.function_name}",
+        "function_name": "${aws_lambda_function.BigPublisher_b2_OnCreate-OnMessage0_F967A96B.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.BigPublisher_cloudTopic_61DC7B63.arn}"
+        "source_arn": "${aws_sns_topic.BigPublisher_b2_OnCreate_25B21222.arn}"
       }
     },
     "aws_s3_bucket": {
+      "BigPublisher_Bucket_F4CC95F6": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/BigPublisher/Bucket/Default",
+            "uniqueId": "BigPublisher_Bucket_F4CC95F6"
+          }
+        },
+        "bucket_prefix": "bucket-c8856dc5-",
+        "force_destroy": false
+      },
       "BigPublisher_b2_702AC841": {
         "//": {
           "metadata": {
@@ -534,14 +548,14 @@ module.exports = function({  }) {
         "bucket_prefix": "b2-c851683a-",
         "force_destroy": false
       },
-      "BigPublisher_cloudBucket_ABF95118": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Bucket/Default",
-            "uniqueId": "BigPublisher_cloudBucket_ABF95118"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c82f13dc-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       },
       "Code": {
@@ -552,16 +566,6 @@ module.exports = function({  }) {
           }
         },
         "bucket_prefix": "code-c84a50b1-"
-      },
-      "cloudBucket": {
-        "//": {
-          "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
-          }
-        },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
       }
     },
     "aws_s3_bucket_notification": {
@@ -574,7 +578,7 @@ module.exports = function({  }) {
         },
         "bucket": "${aws_s3_bucket.BigPublisher_b2_702AC841.id}",
         "depends_on": [
-          "aws_sns_topic_policy.BigPublisher_b2_oncreate_PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad_8A5E9A05"
+          "aws_sns_topic_policy.BigPublisher_b2_OnCreate_PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad_4DA82EC3"
         ],
         "topic": [
           {
@@ -582,39 +586,39 @@ module.exports = function({  }) {
               "s3:ObjectCreated:Put"
             ],
             "id": "on-oncreate-notification",
-            "topic_arn": "${aws_sns_topic.BigPublisher_b2_oncreate_44F68983.arn}"
+            "topic_arn": "${aws_sns_topic.BigPublisher_b2_OnCreate_25B21222.arn}"
           }
         ]
       }
     },
     "aws_s3_object": {
-      "BigPublisher_b2_oncreate-OnMessage0_S3Object_1489E104": {
+      "BigPublisher_Queue-SetConsumer0_S3Object_21F398A2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/S3Object",
-            "uniqueId": "BigPublisher_b2_oncreate-OnMessage0_S3Object_1489E104"
+            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/S3Object",
+            "uniqueId": "BigPublisher_Queue-SetConsumer0_S3Object_21F398A2"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "BigPublisher_cloudQueue-SetConsumer0_S3Object_BC15A90B": {
+      "BigPublisher_Topic-OnMessage0_S3Object_3B80DE9B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "BigPublisher_cloudQueue-SetConsumer0_S3Object_BC15A90B"
+            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/S3Object",
+            "uniqueId": "BigPublisher_Topic-OnMessage0_S3Object_3B80DE9B"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "BigPublisher_cloudTopic-OnMessage0_S3Object_A4DC7356": {
+      "BigPublisher_b2_OnCreate-OnMessage0_S3Object_75F3ED03": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/S3Object",
-            "uniqueId": "BigPublisher_cloudTopic-OnMessage0_S3Object_A4DC7356"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/S3Object",
+            "uniqueId": "BigPublisher_b2_OnCreate-OnMessage0_S3Object_75F3ED03"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -623,71 +627,71 @@ module.exports = function({  }) {
       }
     },
     "aws_sns_topic": {
-      "BigPublisher_b2_oncreate_44F68983": {
+      "BigPublisher_Topic_F8E12E52": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate/Default",
-            "uniqueId": "BigPublisher_b2_oncreate_44F68983"
+            "path": "root/Default/Default/BigPublisher/Topic/Default",
+            "uniqueId": "BigPublisher_Topic_F8E12E52"
           }
         },
-        "name": "oncreate-c849e824"
+        "name": "Topic-c884cd53"
       },
-      "BigPublisher_cloudTopic_61DC7B63": {
+      "BigPublisher_b2_OnCreate_25B21222": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic/Default",
-            "uniqueId": "BigPublisher_cloudTopic_61DC7B63"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate/Default",
+            "uniqueId": "BigPublisher_b2_OnCreate_25B21222"
           }
         },
-        "name": "cloud-Topic-c86b6469"
+        "name": "OnCreate-c8957161"
       }
     },
     "aws_sns_topic_policy": {
-      "BigPublisher_b2_oncreate_PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad_8A5E9A05": {
+      "BigPublisher_b2_OnCreate_PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad_4DA82EC3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate/PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad",
-            "uniqueId": "BigPublisher_b2_oncreate_PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad_8A5E9A05"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate/PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad",
+            "uniqueId": "BigPublisher_b2_OnCreate_PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad_4DA82EC3"
           }
         },
-        "arn": "${aws_sns_topic.BigPublisher_b2_oncreate_44F68983.arn}",
-        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.BigPublisher_b2_oncreate_44F68983.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.BigPublisher_b2_702AC841.arn}\"}}}]}"
+        "arn": "${aws_sns_topic.BigPublisher_b2_OnCreate_25B21222.arn}",
+        "policy": "{\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"s3.amazonaws.com\"},\"Action\":\"sns:Publish\",\"Resource\":\"${aws_sns_topic.BigPublisher_b2_OnCreate_25B21222.arn}\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"${aws_s3_bucket.BigPublisher_b2_702AC841.arn}\"}}}]}"
       }
     },
     "aws_sns_topic_subscription": {
-      "BigPublisher_b2_oncreate_TopicSubscription0_692E956B": {
+      "BigPublisher_Topic_TopicSubscription0_5DDBA778": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/b2/oncreate/TopicSubscription0",
-            "uniqueId": "BigPublisher_b2_oncreate_TopicSubscription0_692E956B"
+            "path": "root/Default/Default/BigPublisher/Topic/TopicSubscription0",
+            "uniqueId": "BigPublisher_Topic_TopicSubscription0_5DDBA778"
           }
         },
-        "endpoint": "${aws_lambda_function.BigPublisher_b2_oncreate-OnMessage0_3ECAAB35.arn}",
+        "endpoint": "${aws_lambda_function.BigPublisher_Topic-OnMessage0_A623A9EA.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.BigPublisher_b2_oncreate_44F68983.arn}"
+        "topic_arn": "${aws_sns_topic.BigPublisher_Topic_F8E12E52.arn}"
       },
-      "BigPublisher_cloudTopic_TopicSubscription0_8CB7D4D8": {
+      "BigPublisher_b2_OnCreate_TopicSubscription0_E6A5285C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Topic/TopicSubscription0",
-            "uniqueId": "BigPublisher_cloudTopic_TopicSubscription0_8CB7D4D8"
+            "path": "root/Default/Default/BigPublisher/b2/OnCreate/TopicSubscription0",
+            "uniqueId": "BigPublisher_b2_OnCreate_TopicSubscription0_E6A5285C"
           }
         },
-        "endpoint": "${aws_lambda_function.BigPublisher_cloudTopic-OnMessage0_EB3C5802.arn}",
+        "endpoint": "${aws_lambda_function.BigPublisher_b2_OnCreate-OnMessage0_F967A96B.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.BigPublisher_cloudTopic_61DC7B63.arn}"
+        "topic_arn": "${aws_sns_topic.BigPublisher_b2_OnCreate_25B21222.arn}"
       }
     },
     "aws_sqs_queue": {
-      "BigPublisher_cloudQueue_2EE8871A": {
+      "BigPublisher_Queue_2C024F97": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/BigPublisher/cloud.Queue/Default",
-            "uniqueId": "BigPublisher_cloudQueue_2EE8871A"
+            "path": "root/Default/Default/BigPublisher/Queue/Default",
+            "uniqueId": "BigPublisher_Queue_2C024F97"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c890dd9f",
+        "name": "Queue-c852a48d",
         "visibility_timeout_seconds": 30
       }
     }
@@ -695,33 +699,44 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
+const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
+    const MyEnum =
+      (function (tmp) {
+        tmp["A"] = "A";
+        tmp["B"] = "B";
+        tmp["C"] = "C";
+        return tmp;
+      })({})
+    ;
     class Foo extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.c = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+        this.c = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
               $this_c: ${$stdlib.core.liftObject(this.c)},
             });
@@ -730,20 +745,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "inflightField", "fooInc", "fooGet", "fooStatic", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "fooInc": [
+            [this.c, ["inc"]],
+          ],
+          "fooGet": [
+            [this.c, ["peek"]],
+          ],
+          "$inflight_init": [
+            [this.c, [].concat(["inc"], ["dec"])],
+          ],
+          "inflightField": [
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(this.c, host, ["dec", "inc"]);
-        }
-        if (ops.includes("fooGet")) {
-          Foo._registerOnLiftObject(this.c, host, ["peek"]);
-        }
-        if (ops.includes("fooInc")) {
-          Foo._registerOnLiftObject(this.c, host, ["inc"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "fooStatic": [
+          ],
+        });
       }
     }
     class Bar extends $stdlib.std.Resource {
@@ -756,7 +777,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Bar-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
             $Foo: ${$stdlib.core.liftObject(Foo)},
             $MyEnum: ${$stdlib.core.liftObject(MyEnum)},
           })
@@ -765,7 +786,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BarClient = ${Bar._toInflightType(this)};
+            const BarClient = ${Bar._toInflightType()};
             const client = new BarClient({
               $this_b: ${$stdlib.core.liftObject(this.b)},
               $this_e: ${$stdlib.core.liftObject(this.e)},
@@ -776,37 +797,43 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "barStatic", "myMethod", "testTypeAccess", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "myMethod": [
+            [Foo, ["fooStatic"]],
+            [this.b, [].concat(["put"], ["get"])],
+            [this.foo, [].concat(["fooInc"], ["fooGet"])],
+          ],
+          "testTypeAccess": [
+            [Bar, ["barStatic"]],
+            [Foo, ["fooStatic"]],
+            [this.e, []],
+          ],
+          "$inflight_init": [
+            [Bar, []],
+            [Foo, []],
+            [this.b, []],
+            [this.e, []],
+            [this.foo, []],
+          ],
+        });
       }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Bar._registerOnLiftObject(this.b, host, []);
-          Bar._registerOnLiftObject(this.e, host, []);
-          Bar._registerOnLiftObject(this.foo, host, []);
-        }
-        if (ops.includes("myMethod")) {
-          Bar._registerOnLiftObject(Foo, host, ["fooStatic"]);
-          Bar._registerOnLiftObject(this.b, host, ["get", "put"]);
-          Bar._registerOnLiftObject(this.foo, host, ["fooGet", "fooInc"]);
-        }
-        if (ops.includes("testTypeAccess")) {
-          Bar._registerOnLiftObject(Bar, host, ["barStatic"]);
-          Bar._registerOnLiftObject(Foo, host, ["fooStatic"]);
-          Bar._registerOnLiftObject(this.e, host, []);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "barStatic": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bucket: ${$stdlib.core.liftObject(bucket)},
             $res: ${$stdlib.core.liftObject(res)},
             $res_foo: ${$stdlib.core.liftObject(res.foo)},
@@ -816,7 +843,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -824,35 +851,38 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bucket, host, ["list"]);
-          $Closure1._registerOnLiftObject(res, host, ["myMethod", "testTypeAccess"]);
-          $Closure1._registerOnLiftObject(res.foo, host, ["inflightField"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bucket, ["list"]],
+            [res, [].concat(["myMethod"], ["testTypeAccess"])],
+            [res.foo, ["inflightField"]],
+          ],
+          "$inflight_init": [
+            [bucket, []],
+            [res, []],
+            [res.foo, []],
+          ],
+        });
       }
     }
     class BigPublisher extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
         this.b2 = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "b2");
-        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
-        this.t = this.node.root.new("@winglang/sdk.cloud.Topic", cloud.Topic, this, "cloud.Topic");
+        this.q = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
+        this.t = this.node.root.new("@winglang/sdk.cloud.Topic", cloud.Topic, this, "Topic");
         const __parent_this_2 = this;
-        class $Closure2 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure2 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure2-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
                 $__parent_this_2_b: ${$stdlib.core.liftObject(__parent_this_2.b)},
               })
             `;
@@ -860,7 +890,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure2Client = ${$Closure2._toInflightType(this)};
+                const $Closure2Client = ${$Closure2._toInflightType()};
                 const client = new $Closure2Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -868,27 +898,28 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure2._registerOnLiftObject(__parent_this_2.b, host, ["put"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_2.b, ["put"]],
+              ],
+              "$inflight_init": [
+                [__parent_this_2.b, []],
+              ],
+            });
           }
         }
         (this.t.onMessage(new $Closure2(this, "$Closure2")));
         const __parent_this_3 = this;
-        class $Closure3 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure3 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure3-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
                 $__parent_this_3_b: ${$stdlib.core.liftObject(__parent_this_3.b)},
               })
             `;
@@ -896,7 +927,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure3Client = ${$Closure3._toInflightType(this)};
+                const $Closure3Client = ${$Closure3._toInflightType()};
                 const client = new $Closure3Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -904,27 +935,28 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure3._registerOnLiftObject(__parent_this_3.b, host, ["put"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_3.b, ["put"]],
+              ],
+              "$inflight_init": [
+                [__parent_this_3.b, []],
+              ],
+            });
           }
         }
         (this.q.setConsumer(new $Closure3(this, "$Closure3")));
         const __parent_this_4 = this;
-        class $Closure4 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure4 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure4-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
                 $__parent_this_4_q: ${$stdlib.core.liftObject(__parent_this_4.q)},
               })
             `;
@@ -932,7 +964,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure4Client = ${$Closure4._toInflightType(this)};
+                const $Closure4Client = ${$Closure4._toInflightType()};
                 const client = new $Closure4Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -940,28 +972,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure4._registerOnLiftObject(__parent_this_4.q, host, ["push"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_4.q, ["push"]],
+              ],
+              "$inflight_init": [
+                [__parent_this_4.q, []],
+              ],
+            });
           }
         }
         (this.b2.onCreate(new $Closure4(this, "$Closure4")));
       }
       static _toInflightType() {
         return `
-          require("./inflight.BigPublisher-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.BigPublisher-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const BigPublisherClient = ${BigPublisher._toInflightType(this)};
+            const BigPublisherClient = ${BigPublisher._toInflightType()};
             const client = new BigPublisherClient({
               $this_b: ${$stdlib.core.liftObject(this.b)},
               $this_b2: ${$stdlib.core.liftObject(this.b2)},
@@ -973,44 +1006,43 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "publish", "getObjectCount", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          BigPublisher._registerOnLiftObject(this.b, host, []);
-          BigPublisher._registerOnLiftObject(this.b2, host, []);
-          BigPublisher._registerOnLiftObject(this.q, host, []);
-          BigPublisher._registerOnLiftObject(this.t, host, []);
-        }
-        if (ops.includes("getObjectCount")) {
-          BigPublisher._registerOnLiftObject(this.b, host, ["list"]);
-        }
-        if (ops.includes("publish")) {
-          BigPublisher._registerOnLiftObject(this.b2, host, ["put"]);
-          BigPublisher._registerOnLiftObject(this.q, host, ["push"]);
-          BigPublisher._registerOnLiftObject(this.t, host, ["publish"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "publish": [
+            [this.b2, ["put"]],
+            [this.q, ["push"]],
+            [this.t, ["publish"]],
+          ],
+          "getObjectCount": [
+            [this.b, ["list"]],
+          ],
+          "$inflight_init": [
+            [this.b, []],
+            [this.b2, []],
+            [this.q, []],
+            [this.t, []],
+          ],
+        });
       }
     }
-    class $Closure5 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure5 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure5-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure5-1.cjs")({
             $bigOlPublisher: ${$stdlib.core.liftObject(bigOlPublisher)},
+            $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure5Client = ${$Closure5._toInflightType(this)};
+            const $Closure5Client = ${$Closure5._toInflightType()};
             const client = new $Closure5Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -1018,33 +1050,34 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure5._registerOnLiftObject(bigOlPublisher, host, ["getObjectCount", "publish"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bigOlPublisher, [].concat(["publish"], ["getObjectCount"])],
+          ],
+          "$inflight_init": [
+            [bigOlPublisher, []],
+          ],
+        });
       }
     }
     class Dummy extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
       }
-      static getInstance(scope) {
+      static getInstance($scope, scope) {
         return new Dummy(scope, "StaticDummy");
       }
       static _toInflightType() {
         return `
-          require("./inflight.Dummy-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Dummy-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const DummyClient = ${Dummy._toInflightType(this)};
+            const DummyClient = ${Dummy._toInflightType()};
             const client = new DummyClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -1052,35 +1085,38 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class ScopeAndIdTestClass extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
         const d1 = new Dummy(this, "Dummy");
-        {((cond) => {if (!cond) throw new Error("assertion failed: d1.node.path.endsWith(\"/ScopeAndIdTestClass/Dummy\")")})(d1.node.path.endsWith("/ScopeAndIdTestClass/Dummy"))};
+        $helpers.assert($helpers.nodeof(d1).path.endsWith("/ScopeAndIdTestClass/Dummy"), "nodeof(d1).path.endsWith(\"/ScopeAndIdTestClass/Dummy\")");
         const d2 = new Dummy(d1, "Dummy");
-        {((cond) => {if (!cond) throw new Error("assertion failed: d2.node.path.endsWith(\"/ScopeAndIdTestClass/Dummy/Dummy\")")})(d2.node.path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy"))};
-        const d3 = new Dummy((Dummy.getInstance(d2)), "Dummy");
-        {((cond) => {if (!cond) throw new Error("assertion failed: d3.node.path.endsWith(\"/ScopeAndIdTestClass/Dummy/Dummy/StaticDummy/Dummy\")")})(d3.node.path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy/StaticDummy/Dummy"))};
-        for (const i of $stdlib.std.Range.of(0, 3, false)) {
+        $helpers.assert($helpers.nodeof(d2).path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy"), "nodeof(d2).path.endsWith(\"/ScopeAndIdTestClass/Dummy/Dummy\")");
+        const d3 = new Dummy((Dummy.getInstance(this, d2)), "Dummy");
+        $helpers.assert($helpers.nodeof(d3).path.endsWith("/ScopeAndIdTestClass/Dummy/Dummy/StaticDummy/Dummy"), "nodeof(d3).path.endsWith(\"/ScopeAndIdTestClass/Dummy/Dummy/StaticDummy/Dummy\")");
+        for (const i of $helpers.range(0,3,false)) {
           const x = new Dummy(this, String.raw({ raw: ["tc", ""] }, i));
           const expected_path = String.raw({ raw: ["/ScopeAndIdTestClass/tc", ""] }, i);
-          {((cond) => {if (!cond) throw new Error("assertion failed: x.node.path.endsWith(expected_path)")})(x.node.path.endsWith(expected_path))};
+          $helpers.assert($helpers.nodeof(x).path.endsWith(expected_path), "nodeof(x).path.endsWith(expected_path)");
         }
       }
       static _toInflightType() {
         return `
-          require("./inflight.ScopeAndIdTestClass-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.ScopeAndIdTestClass-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const ScopeAndIdTestClassClient = ${ScopeAndIdTestClass._toInflightType(this)};
+            const ScopeAndIdTestClassClient = ${ScopeAndIdTestClass._toInflightType()};
             const client = new ScopeAndIdTestClassClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -1088,19 +1124,14 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    const MyEnum =
-      (function (tmp) {
-        tmp[tmp["A"] = 0] = ",A";
-        tmp[tmp["B"] = 1] = ",B";
-        tmp[tmp["C"] = 2] = ",C";
-        return tmp;
-      })({})
-    ;
-    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const bucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const res = new Bar(this, "Bar", "Arr", bucket, MyEnum.B);
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
     const bigOlPublisher = new BigPublisher(this, "BigPublisher");
@@ -1111,6 +1142,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "resource.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_test_sim.md
index 5352c15aca0..18104bec687 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource.test.w_test_sim.md
@@ -2,12 +2,12 @@
 
 ## stdout.log
 ```log
-pass ┌ resource.test.wsim » root/env0/test:test             
-     └ counter is: 201
+[INFO] test | counter is: 201
+pass ─ resource.test.wsim » root/env0/test:test             
 pass ─ resource.test.wsim » root/env1/test:dependency cycles
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_compile_tf-aws.md
index 3db2d068844..f4c393d508d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [resource_as_inflight_literal.test.w](../../../../../examples/tests/valid/resource_as_inflight_literal.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fn }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({ $fn }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: fn.invoke(\"test\") == \"hello world!\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $fn.invoke("test")),"hello world!")))};
+      $helpers.assert($helpers.eq((await $fn.invoke("test")), "hello world!"), "fn.invoke(\"test\") == \"hello world!\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -29,13 +31,13 @@ module.exports = function({  }) {
       Object.setPrototypeOf($obj, this);
       return $obj;
     }
-    async handle(message) {
+    async handle() {
       return "hello world!";
     }
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -45,22 +47,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -69,58 +58,58 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudFunction_CloudwatchLogGroup_7399B890": {
+      "Function_CloudwatchLogGroup_ABDCF4C4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "cloudFunction_CloudwatchLogGroup_7399B890"
+            "path": "root/Default/Default/Function/CloudwatchLogGroup",
+            "uniqueId": "Function_CloudwatchLogGroup_ABDCF4C4"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8d2eca1",
+        "name": "/aws/lambda/Function-c852aba6",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudFunction_IamRole_5A4430DC": {
+      "Function_IamRole_678BE84C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRole",
-            "uniqueId": "cloudFunction_IamRole_5A4430DC"
+            "path": "root/Default/Default/Function/IamRole",
+            "uniqueId": "Function_IamRole_678BE84C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudFunction_IamRolePolicy_618BF987": {
+      "Function_IamRolePolicy_E3B26607": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicy",
-            "uniqueId": "cloudFunction_IamRolePolicy_618BF987"
+            "path": "root/Default/Default/Function/IamRolePolicy",
+            "uniqueId": "Function_IamRolePolicy_E3B26607"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudFunction_IamRolePolicyAttachment_288B9653": {
+      "Function_IamRolePolicyAttachment_CACE1358": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "cloudFunction_IamRolePolicyAttachment_288B9653"
+            "path": "root/Default/Default/Function/IamRolePolicyAttachment",
+            "uniqueId": "Function_IamRolePolicyAttachment_CACE1358"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.name}"
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudFunction": {
+      "Function": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/Default",
-            "uniqueId": "cloudFunction"
+            "path": "root/Default/Default/Function/Default",
+            "uniqueId": "Function"
           }
         },
         "architectures": [
@@ -129,18 +118,18 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8d2eca1",
+            "WING_FUNCTION_NAME": "Function-c852aba6",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8d2eca1",
+        "function_name": "Function-c852aba6",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudFunction_IamRole_5A4430DC.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Function_IamRole_678BE84C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudFunction_S3Object_71908BAD.key}",
+        "s3_key": "${aws_s3_object.Function_S3Object_C62A0C2D.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -160,11 +149,11 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "cloudFunction_S3Object_71908BAD": {
+      "Function_S3Object_C62A0C2D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Function/S3Object",
-            "uniqueId": "cloudFunction_S3Object_71908BAD"
+            "path": "root/Default/Default/Function/S3Object",
+            "uniqueId": "Function_S3Object_C62A0C2D"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -176,33 +165,35 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class Foo extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -210,19 +201,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $fn: ${$stdlib.core.liftObject(fn)},
           })
         `;
@@ -230,7 +226,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -238,23 +234,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(fn, host, ["invoke"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, ["invoke"]],
+          ],
+          "$inflight_init": [
+            [fn, []],
+          ],
+        });
       }
     }
-    const fn = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", new Foo(this, "Foo"));
+    const fn = this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", new Foo(this, "Foo"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "resource_as_inflight_literal.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_test_sim.md
index 4df3353e7bc..89e58c8e77c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_as_inflight_literal.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ resource_as_inflight_literal.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_compile_tf-aws.md
index c8114e7e026..42248faa995 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [resource_call_static.test.w](../../../../../examples/tests/valid/resource_call_static.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Another }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({ $Another }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: Another.myStaticMethod() == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $Another.myStaticMethod()),0)))};
+      $helpers.assert($helpers.eq((await $Another.myStaticMethod()), 0), "Another.myStaticMethod() == 0");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Another-1.js
-```js
+## inflight.Another-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $globalCounter }) {
   class Another {
     constructor({  }) {
@@ -32,7 +34,7 @@ module.exports = function({ $globalCounter }) {
   }
   return Another;
 }
-//# sourceMappingURL=inflight.Another-1.js.map
+//# sourceMappingURL=inflight.Another-1.cjs.map
 ```
 
 ## main.tf.json
@@ -42,22 +44,9 @@ module.exports = function({ $globalCounter }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -66,11 +55,11 @@ module.exports = function({ $globalCounter }) {
   },
   "resource": {
     "aws_dynamodb_table": {
-      "cloudCounter": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -81,21 +70,23 @@ module.exports = function({ $globalCounter }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c824ef62"
       }
     }
   }
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -106,7 +97,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Another-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Another-1.cjs")({
             $globalCounter: ${$stdlib.core.liftObject(globalCounter)},
           })
         `;
@@ -114,7 +105,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const AnotherClient = ${Another._toInflightType(this)};
+            const AnotherClient = ${Another._toInflightType()};
             const client = new AnotherClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -122,25 +113,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "myStaticMethod", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+            [globalCounter, []],
+          ],
+        });
       }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("myStaticMethod")) {
-          Another._registerOnLiftObject(globalCounter, host, ["peek"]);
-        }
-        super._registerOnLift(host, ops);
+      static get _liftTypeMap() {
+        return ({
+          "myStaticMethod": [
+            [globalCounter, ["peek"]],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $Another: ${$stdlib.core.liftObject(Another)},
           })
         `;
@@ -148,7 +144,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -156,23 +152,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(Another, host, ["myStaticMethod"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [Another, ["myStaticMethod"]],
+          ],
+          "$inflight_init": [
+            [Another, []],
+          ],
+        });
       }
     }
-    const globalCounter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+    const globalCounter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:access cloud resource through static methods only", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "resource_call_static.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_test_sim.md
index c249dbf0793..0a9ec8d0fc2 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_call_static.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ resource_call_static.test.wsim » root/env0/test:access cloud resource through static methods only
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_compile_tf-aws.md
index 0619e0148d4..1a3e83f0e53 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [resource_captures.test.w](../../../../../examples/tests/valid/resource_captures.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $r }) {
   class $Closure1 {
     constructor({  }) {
@@ -26,12 +27,13 @@ module.exports = function({ $r }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Another-1.js
-```js
+## inflight.Another-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Another {
     constructor({  }) {
@@ -45,12 +47,13 @@ module.exports = function({  }) {
   }
   return Another;
 }
-//# sourceMappingURL=inflight.Another-1.js.map
+//# sourceMappingURL=inflight.Another-1.cjs.map
 ```
 
-## inflight.First-1.js
-```js
+## inflight.First-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class First {
     constructor({  }) {
@@ -58,85 +61,81 @@ module.exports = function({  }) {
   }
   return First;
 }
-//# sourceMappingURL=inflight.First-1.js.map
+//# sourceMappingURL=inflight.First-1.cjs.map
 ```
 
-## inflight.MyResource-1.js
-```js
+## inflight.MyResource-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class MyResource {
-    constructor({ $___this_setOfStr_has__s3____, $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__0_, $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__1_, $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k1__, $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k2__, $_this_myOptStr_______, $_this_setOfStr_has__s1___, $_this_setOfStr_has__s2___, $this_another, $this_another_first_myResource, $this_another_myField, $this_arrayOfStr_length, $this_extBucket, $this_extNum, $this_myBool, $this_myNum, $this_myQueue, $this_myResource, $this_myStr }) {
-      this.$___this_setOfStr_has__s3____ = $___this_setOfStr_has__s3____;
-      this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__0_ = $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__0_;
-      this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__1_ = $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__1_;
-      this.$__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k1__ = $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k1__;
-      this.$__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k2__ = $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k2__;
-      this.$_this_myOptStr_______ = $_this_myOptStr_______;
-      this.$_this_setOfStr_has__s1___ = $_this_setOfStr_has__s1___;
-      this.$_this_setOfStr_has__s2___ = $_this_setOfStr_has__s2___;
+    constructor({ $this_another, $this_another_first_myResource, $this_another_myField, $this_arrayOfStr, $this_extBucket, $this_extNum, $this_mapOfNum, $this_myBool, $this_myNum, $this_myOptStr, $this_myQueue, $this_myResource, $this_myStr, $this_setOfStr }) {
       this.$this_another = $this_another;
       this.$this_another_first_myResource = $this_another_first_myResource;
       this.$this_another_myField = $this_another_myField;
-      this.$this_arrayOfStr_length = $this_arrayOfStr_length;
+      this.$this_arrayOfStr = $this_arrayOfStr;
       this.$this_extBucket = $this_extBucket;
       this.$this_extNum = $this_extNum;
+      this.$this_mapOfNum = $this_mapOfNum;
       this.$this_myBool = $this_myBool;
       this.$this_myNum = $this_myNum;
+      this.$this_myOptStr = $this_myOptStr;
       this.$this_myQueue = $this_myQueue;
       this.$this_myResource = $this_myResource;
       this.$this_myStr = $this_myStr;
+      this.$this_setOfStr = $this_setOfStr;
     }
     async testNoCapture() {
       const arr = [1, 2, 3];
-      {((cond) => {if (!cond) throw new Error("assertion failed: arr.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(arr.length,3)))};
-      {console.log(String.raw({ raw: ["array.len=", ""] }, arr.length))};
+      $helpers.assert($helpers.eq(arr.length, 3), "arr.length == 3");
+      console.log(String.raw({ raw: ["array.len=", ""] }, arr.length));
     }
     async testCaptureCollectionsOfData() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.arrayOfStr.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$this_arrayOfStr_length,2)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.arrayOfStr.at(0) == \"s1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__0_,"s1")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.arrayOfStr.at(1) == \"s2\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__1_,"s2")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.mapOfNum.get(\"k1\") == 11")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k1__,11)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.mapOfNum.get(\"k2\") == 22")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k2__,22)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.setOfStr.has(\"s1\")")})(this.$_this_setOfStr_has__s1___)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.setOfStr.has(\"s2\")")})(this.$_this_setOfStr_has__s2___)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: !this.setOfStr.has(\"s3\")")})(this.$___this_setOfStr_has__s3____)};
+      $helpers.assert($helpers.eq(this.$this_arrayOfStr.length, 2), "this.arrayOfStr.length == 2");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.$this_arrayOfStr, 0), "s1"), "this.arrayOfStr.at(0) == \"s1\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.$this_arrayOfStr, 1), "s2"), "this.arrayOfStr.at(1) == \"s2\"");
+      $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.$this_mapOfNum, "k1"), 11), "this.mapOfNum.get(\"k1\") == 11");
+      $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.$this_mapOfNum, "k2"), 22), "this.mapOfNum.get(\"k2\") == 22");
+      $helpers.assert((await this.$this_setOfStr.has("s1")), "this.setOfStr.has(\"s1\")");
+      $helpers.assert((await this.$this_setOfStr.has("s2")), "this.setOfStr.has(\"s2\")");
+      $helpers.assert((!(await this.$this_setOfStr.has("s3"))), "!this.setOfStr.has(\"s3\")");
     }
     async testCapturePrimitives() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.myStr == \"myString\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$this_myStr,"myString")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.myNum == 42")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$this_myNum,42)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.myBool == true")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$this_myBool,true)))};
+      $helpers.assert($helpers.eq(this.$this_myStr, "myString"), "this.myStr == \"myString\"");
+      $helpers.assert($helpers.eq(this.$this_myNum, 42), "this.myNum == 42");
+      $helpers.assert($helpers.eq(this.$this_myBool, true), "this.myBool == true");
     }
     async testCaptureOptional() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.myOptStr ?? \"\" == \"myOptString\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$_this_myOptStr_______,"myOptString")))};
+      $helpers.assert($helpers.eq((this.$this_myOptStr ?? ""), "myOptString"), "this.myOptStr ?? \"\" == \"myOptString\"");
     }
     async testCaptureResource() {
       (await this.$this_myResource.put("f1.txt", "f1"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.myResource.get(\"f1.txt\") == \"f1\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await this.$this_myResource.get("f1.txt")),"f1")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.myResource.list().length == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await this.$this_myResource.list()).length,1)))};
+      $helpers.assert($helpers.eq((await this.$this_myResource.get("f1.txt")), "f1"), "this.myResource.get(\"f1.txt\") == \"f1\"");
+      $helpers.assert($helpers.eq((await this.$this_myResource.list()).length, 1), "this.myResource.list().length == 1");
     }
     async testNestedInflightField() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.another.myField == \"hello!\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$this_another_myField,"hello!")))};
-      {console.log(String.raw({ raw: ["field=", ""] }, this.$this_another_myField))};
+      $helpers.assert($helpers.eq(this.$this_another_myField, "hello!"), "this.another.myField == \"hello!\"");
+      console.log(String.raw({ raw: ["field=", ""] }, this.$this_another_myField));
     }
     async testNestedResource() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.another.first.myResource.list().length == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await this.$this_another_first_myResource.list()).length,0)))};
+      $helpers.assert($helpers.eq((await this.$this_another_first_myResource.list()).length, 0), "this.another.first.myResource.list().length == 0");
       (await this.$this_another_first_myResource.put("hello", this.$this_myStr));
-      {console.log(String.raw({ raw: ["this.another.first.myResource:", ""] }, (await this.$this_another_first_myResource.get("hello"))))};
+      console.log(String.raw({ raw: ["this.another.first.myResource:", ""] }, (await this.$this_another_first_myResource.get("hello"))));
     }
     async testExpressionRecursive() {
       (await this.$this_myQueue.push(this.$this_myStr));
     }
     async testExternal() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.extBucket.list().length == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await this.$this_extBucket.list()).length,0)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.extNum == 12")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.$this_extNum,12)))};
+      $helpers.assert($helpers.eq((await this.$this_extBucket.list()).length, 0), "this.extBucket.list().length == 0");
+      $helpers.assert($helpers.eq(this.$this_extNum, 12), "this.extNum == 12");
     }
     async testUserDefinedResource() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.another.meaningOfLife() == 42")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await this.$this_another.meaningOfLife()),42)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.another.anotherFunc() == \"42\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await this.$this_another.anotherFunc()),"42")))};
+      $helpers.assert($helpers.eq((await this.$this_another.meaningOfLife()), 42), "this.another.meaningOfLife() == 42");
+      $helpers.assert($helpers.eq((await this.$this_another.anotherFunc()), "42"), "this.another.anotherFunc() == \"42\"");
     }
     async testInflightField() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: this.inflightField == 123")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(this.inflightField,123)))};
+      $helpers.assert($helpers.eq(this.inflightField, 123), "this.inflightField == 123");
     }
     async $inflight_init() {
       this.inflightField = 123;
@@ -144,7 +143,7 @@ module.exports = function({  }) {
   }
   return MyResource;
 }
-//# sourceMappingURL=inflight.MyResource-1.js.map
+//# sourceMappingURL=inflight.MyResource-1.cjs.map
 ```
 
 ## main.tf.json
@@ -154,22 +153,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -178,11 +164,11 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_dynamodb_table": {
-      "MyResource_cloudCounter_0782991D": {
+      "MyResource_Counter_D9D84476": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Counter/Default",
-            "uniqueId": "MyResource_cloudCounter_0782991D"
+            "path": "root/Default/Default/MyResource/Counter/Default",
+            "uniqueId": "MyResource_Counter_D9D84476"
           }
         },
         "attribute": [
@@ -193,51 +179,51 @@ module.exports = function({  }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c87187fa"
+        "name": "wing-counter-Counter-c8736322"
       }
     },
     "aws_s3_bucket": {
-      "MyResource_Another_First_cloudBucket_5C44A510": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/Another/First/cloud.Bucket/Default",
-            "uniqueId": "MyResource_Another_First_cloudBucket_5C44A510"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8e81a49-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       },
-      "MyResource_cloudBucket_B5E6C951": {
+      "MyResource_Another_First_Bucket_1DA21BC0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Bucket/Default",
-            "uniqueId": "MyResource_cloudBucket_B5E6C951"
+            "path": "root/Default/Default/MyResource/Another/First/Bucket/Default",
+            "uniqueId": "MyResource_Another_First_Bucket_1DA21BC0"
           }
         },
-        "bucket_prefix": "cloud-bucket-c8f3d54f-",
+        "bucket_prefix": "bucket-c859322f-",
         "force_destroy": false
       },
-      "cloudBucket": {
+      "MyResource_Bucket_0DE6FCB5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/MyResource/Bucket/Default",
+            "uniqueId": "MyResource_Bucket_0DE6FCB5"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c87b43ba-",
         "force_destroy": false
       }
     },
     "aws_sqs_queue": {
-      "MyResource_cloudQueue_E7A2C0F4": {
+      "MyResource_Queue_C2F2FBE5": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Queue/Default",
-            "uniqueId": "MyResource_cloudQueue_E7A2C0F4"
+            "path": "root/Default/Default/MyResource/Queue/Default",
+            "uniqueId": "MyResource_Queue_C2F2FBE5"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c8185458",
+        "name": "Queue-c84748c7",
         "visibility_timeout_seconds": 30
       }
     }
@@ -245,14 +231,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -260,18 +248,18 @@ class $Root extends $stdlib.std.Resource {
     class First extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.myResource = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.myResource = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.First-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.First-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FirstClient = ${First._toInflightType(this)};
+            const FirstClient = ${First._toInflightType()};
             const client = new FirstClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -279,8 +267,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Another extends $stdlib.std.Resource {
@@ -291,14 +282,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Another-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Another-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AnotherClient = ${Another._toInflightType(this)};
+            const AnotherClient = ${Another._toInflightType()};
             const client = new AnotherClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -306,14 +297,21 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "meaningOfLife", "anotherFunc", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "meaningOfLife": [
+          ],
+          "anotherFunc": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class MyResource extends $stdlib.std.Resource {
       constructor($scope, $id, externalBucket, externalNum) {
         super($scope, $id);
-        this.myResource = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.myResource = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
         this.myStr = "myString";
         this.myNum = 42;
         this.myBool = true;
@@ -322,126 +320,115 @@ class $Root extends $stdlib.std.Resource {
         this.mapOfNum = ({["k1"]: 11, ["k2"]: 22});
         this.setOfStr = new Set(["s1", "s2", "s1"]);
         this.another = new Another(this, "Another");
-        this.myQueue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+        this.myQueue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
         this.extBucket = externalBucket;
         this.extNum = externalNum;
-        this.unusedResource = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+        this.unusedResource = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
       }
       helloPreflight() {
         return this.another;
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyResource-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyResource-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyResourceClient = ${MyResource._toInflightType(this)};
+            const MyResourceClient = ${MyResource._toInflightType()};
             const client = new MyResourceClient({
-              $___this_setOfStr_has__s3____: ${$stdlib.core.liftObject((!(this.setOfStr.has("s3"))))},
-              $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arrayOfStr, 0))},
-              $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______this_arrayOfStr__1_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arrayOfStr, 1))},
-              $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k1__: ${$stdlib.core.liftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.mapOfNum, "k1"))},
-              $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______this_mapOfNum___k2__: ${$stdlib.core.liftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.mapOfNum, "k2"))},
-              $_this_myOptStr_______: ${$stdlib.core.liftObject((this.myOptStr ?? ""))},
-              $_this_setOfStr_has__s1___: ${$stdlib.core.liftObject((this.setOfStr.has("s1")))},
-              $_this_setOfStr_has__s2___: ${$stdlib.core.liftObject((this.setOfStr.has("s2")))},
               $this_another: ${$stdlib.core.liftObject(this.another)},
               $this_another_first_myResource: ${$stdlib.core.liftObject(this.another.first.myResource)},
               $this_another_myField: ${$stdlib.core.liftObject(this.another.myField)},
-              $this_arrayOfStr_length: ${$stdlib.core.liftObject(this.arrayOfStr.length)},
+              $this_arrayOfStr: ${$stdlib.core.liftObject(this.arrayOfStr)},
               $this_extBucket: ${$stdlib.core.liftObject(this.extBucket)},
               $this_extNum: ${$stdlib.core.liftObject(this.extNum)},
+              $this_mapOfNum: ${$stdlib.core.liftObject(this.mapOfNum)},
               $this_myBool: ${$stdlib.core.liftObject(this.myBool)},
               $this_myNum: ${$stdlib.core.liftObject(this.myNum)},
+              $this_myOptStr: ${$stdlib.core.liftObject(this.myOptStr)},
               $this_myQueue: ${$stdlib.core.liftObject(this.myQueue)},
               $this_myResource: ${$stdlib.core.liftObject(this.myResource)},
               $this_myStr: ${$stdlib.core.liftObject(this.myStr)},
+              $this_setOfStr: ${$stdlib.core.liftObject(this.setOfStr)},
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
             return client;
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "inflightField", "testNoCapture", "testCaptureCollectionsOfData", "testCapturePrimitives", "testCaptureOptional", "testCaptureResource", "testNestedInflightField", "testNestedResource", "testExpressionRecursive", "testExternal", "testUserDefinedResource", "testInflightField", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyResource._registerOnLiftObject((!(this.setOfStr.has("s3"))), host, []);
-          MyResource._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arrayOfStr, 0), host, []);
-          MyResource._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arrayOfStr, 1), host, []);
-          MyResource._registerOnLiftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.mapOfNum, "k1"), host, []);
-          MyResource._registerOnLiftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.mapOfNum, "k2"), host, []);
-          MyResource._registerOnLiftObject((this.myOptStr ?? ""), host, []);
-          MyResource._registerOnLiftObject((this.setOfStr.has("s1")), host, []);
-          MyResource._registerOnLiftObject((this.setOfStr.has("s2")), host, []);
-          MyResource._registerOnLiftObject(this.another, host, []);
-          MyResource._registerOnLiftObject(this.another.first.myResource, host, []);
-          MyResource._registerOnLiftObject(this.another.myField, host, []);
-          MyResource._registerOnLiftObject(this.arrayOfStr.length, host, []);
-          MyResource._registerOnLiftObject(this.extBucket, host, []);
-          MyResource._registerOnLiftObject(this.extNum, host, []);
-          MyResource._registerOnLiftObject(this.myBool, host, []);
-          MyResource._registerOnLiftObject(this.myNum, host, []);
-          MyResource._registerOnLiftObject(this.myQueue, host, []);
-          MyResource._registerOnLiftObject(this.myResource, host, []);
-          MyResource._registerOnLiftObject(this.myStr, host, []);
-        }
-        if (ops.includes("testCaptureCollectionsOfData")) {
-          MyResource._registerOnLiftObject((!(this.setOfStr.has("s3"))), host, []);
-          MyResource._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arrayOfStr, 0), host, []);
-          MyResource._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(this.arrayOfStr, 1), host, []);
-          MyResource._registerOnLiftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.mapOfNum, "k1"), host, []);
-          MyResource._registerOnLiftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(this.mapOfNum, "k2"), host, []);
-          MyResource._registerOnLiftObject((this.setOfStr.has("s1")), host, []);
-          MyResource._registerOnLiftObject((this.setOfStr.has("s2")), host, []);
-          MyResource._registerOnLiftObject(this.arrayOfStr.length, host, []);
-        }
-        if (ops.includes("testCaptureOptional")) {
-          MyResource._registerOnLiftObject((this.myOptStr ?? ""), host, []);
-        }
-        if (ops.includes("testCapturePrimitives")) {
-          MyResource._registerOnLiftObject(this.myBool, host, []);
-          MyResource._registerOnLiftObject(this.myNum, host, []);
-          MyResource._registerOnLiftObject(this.myStr, host, []);
-        }
-        if (ops.includes("testCaptureResource")) {
-          MyResource._registerOnLiftObject(this.myResource, host, ["get", "list", "put"]);
-        }
-        if (ops.includes("testExpressionRecursive")) {
-          MyResource._registerOnLiftObject(this.myQueue, host, ["push"]);
-          MyResource._registerOnLiftObject(this.myStr, host, []);
-        }
-        if (ops.includes("testExternal")) {
-          MyResource._registerOnLiftObject(this.extBucket, host, ["list"]);
-          MyResource._registerOnLiftObject(this.extNum, host, []);
-        }
-        if (ops.includes("testNestedInflightField")) {
-          MyResource._registerOnLiftObject(this.another.myField, host, []);
-        }
-        if (ops.includes("testNestedResource")) {
-          MyResource._registerOnLiftObject(this.another.first.myResource, host, ["get", "list", "put"]);
-          MyResource._registerOnLiftObject(this.myStr, host, []);
-        }
-        if (ops.includes("testUserDefinedResource")) {
-          MyResource._registerOnLiftObject(this.another, host, ["anotherFunc", "meaningOfLife"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "testNoCapture": [
+          ],
+          "testCaptureCollectionsOfData": [
+            [this.arrayOfStr, [].concat(["length"], ["at"])],
+            [this.mapOfNum, ["get"]],
+            [this.setOfStr, ["has"]],
+          ],
+          "testCapturePrimitives": [
+            [this.myBool, []],
+            [this.myNum, []],
+            [this.myStr, []],
+          ],
+          "testCaptureOptional": [
+            [this.myOptStr, []],
+          ],
+          "testCaptureResource": [
+            [this.myResource, [].concat(["put"], ["get"], ["list"])],
+          ],
+          "testNestedInflightField": [
+            [this.another.myField, []],
+          ],
+          "testNestedResource": [
+            [this.another.first.myResource, [].concat(["list"], ["put"], ["get"])],
+            [this.myStr, []],
+          ],
+          "testExpressionRecursive": [
+            [this.myQueue, ["push"]],
+            [this.myStr, []],
+          ],
+          "testExternal": [
+            [this.extBucket, ["list"]],
+            [this.extNum, []],
+          ],
+          "testUserDefinedResource": [
+            [this.another, [].concat(["meaningOfLife"], ["anotherFunc"])],
+          ],
+          "testInflightField": [
+          ],
+          "$inflight_init": [
+            [this.another, []],
+            [this.another.first.myResource, []],
+            [this.another.myField, []],
+            [this.arrayOfStr, []],
+            [this.extBucket, []],
+            [this.extNum, []],
+            [this.mapOfNum, []],
+            [this.myBool, []],
+            [this.myNum, []],
+            [this.myOptStr, []],
+            [this.myQueue, []],
+            [this.myResource, []],
+            [this.myStr, []],
+            [this.setOfStr, []],
+          ],
+          "inflightField": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $r: ${$stdlib.core.liftObject(r)},
           })
         `;
@@ -449,7 +436,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -457,17 +444,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(r, host, ["testCaptureCollectionsOfData", "testCaptureOptional", "testCapturePrimitives", "testCaptureResource", "testExpressionRecursive", "testExternal", "testInflightField", "testNestedInflightField", "testNestedResource", "testNoCapture", "testUserDefinedResource"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [r, [].concat(["testNoCapture"], ["testCaptureCollectionsOfData"], ["testCapturePrimitives"], ["testCaptureOptional"], ["testCaptureResource"], ["testNestedInflightField"], ["testNestedResource"], ["testExpressionRecursive"], ["testExternal"], ["testUserDefinedResource"], ["testInflightField"])],
+          ],
+          "$inflight_init": [
+            [r, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const r = new MyResource(this, "MyResource", b, 12);
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
@@ -475,6 +463,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "resource_captures.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_test_sim.md
index 6a77f57356b..56369191ec2 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures.test.w_test_sim.md
@@ -2,13 +2,13 @@
 
 ## stdout.log
 ```log
-pass ┌ resource_captures.test.wsim » root/env0/test:test
-     │ array.len=3
-     │ field=hello!
-     └ this.another.first.myResource:myString
- 
- 
+[INFO] test | array.len=3
+[INFO] test | field=hello!
+[INFO] test | this.another.first.myResource:myString
+pass ─ resource_captures.test.wsim » root/env0/test:test
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_compile_tf-aws.md
index 3854531206f..81a9d2c67bd 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [resource_captures_globals.test.w](../../../../../examples/tests/valid/resource_captures_globals.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $res }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $res }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Another }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,17 +32,18 @@ module.exports = function({ $Another }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: Another.myStaticMethod() == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $Another.myStaticMethod()),0)))};
+      $helpers.assert($helpers.eq((await $Another.myStaticMethod()), 0), "Another.myStaticMethod() == 0");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.Another-1.js
-```js
+## inflight.Another-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $globalCounter }) {
   class Another {
     constructor({  }) {
@@ -53,17 +56,18 @@ module.exports = function({ $globalCounter }) {
       return (await $globalCounter.peek());
     }
     async $inflight_init() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalCounter.peek() == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $globalCounter.peek()),0)))};
+      $helpers.assert($helpers.eq((await $globalCounter.peek()), 0), "globalCounter.peek() == 0");
     }
   }
   return Another;
 }
-//# sourceMappingURL=inflight.Another-1.js.map
+//# sourceMappingURL=inflight.Another-1.cjs.map
 ```
 
-## inflight.First-1.js
-```js
+## inflight.First-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class First {
     constructor({  }) {
@@ -71,40 +75,46 @@ module.exports = function({  }) {
   }
   return First;
 }
-//# sourceMappingURL=inflight.First-1.js.map
+//# sourceMappingURL=inflight.First-1.cjs.map
 ```
 
-## inflight.MyResource-1.js
-```js
+## inflight.MyResource-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $Another, $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______globalArrayOfStr__0_, $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______globalMapOfNum___a__, $_globalSetOfStr_has__a___, $globalAnother, $globalAnother_first_myResource, $globalAnother_myField, $globalBool, $globalBucket, $globalNum, $globalStr }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $Another, $globalAnother, $globalAnother_first_myResource, $globalAnother_myField, $globalArrayOfStr, $globalBool, $globalBucket, $globalMapOfNum, $globalNum, $globalSetOfStr, $globalStr, $util_Util }) {
   class MyResource {
-    constructor({ $this_localTopic }) {
+    constructor({ $this_localCounter, $this_localTopic }) {
+      this.$this_localCounter = $this_localCounter;
       this.$this_localTopic = $this_localTopic;
     }
     async myPut() {
       (await this.$this_localTopic.publish("hello"));
       (await $globalBucket.put("key", "value"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalStr == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($globalStr,"hello")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalBool == true")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($globalBool,true)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalNum == 42")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($globalNum,42)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalArrayOfStr.at(0) == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______globalArrayOfStr__0_,"hello")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalMapOfNum.get(\"a\") == -5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______globalMapOfNum___a__,(-5))))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalSetOfStr.has(\"a\")")})($_globalSetOfStr_has__a___)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalAnother.myField == \"hello!\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($globalAnother_myField,"hello!")))};
+      $helpers.assert($helpers.eq($globalStr, "hello"), "globalStr == \"hello\"");
+      $helpers.assert($helpers.eq($globalBool, true), "globalBool == true");
+      $helpers.assert($helpers.eq($globalNum, 42), "globalNum == 42");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })($globalArrayOfStr, 0), "hello"), "globalArrayOfStr.at(0) == \"hello\"");
+      $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })($globalMapOfNum, "a"), (-5)), "globalMapOfNum.get(\"a\") == -5");
+      $helpers.assert((await $globalSetOfStr.has("a")), "globalSetOfStr.has(\"a\")");
+      $helpers.assert($helpers.eq($globalAnother_myField, "hello!"), "globalAnother.myField == \"hello!\"");
       (await $globalAnother_first_myResource.put("key", "value"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: globalAnother.myMethod() > 0")})(((await $globalAnother.myMethod()) > 0))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: Another.myStaticMethod() > 0")})(((await $Another.myStaticMethod()) > 0))};
+      $helpers.assert(((await $globalAnother.myMethod()) > 0), "globalAnother.myMethod() > 0");
+      $helpers.assert(((await $Another.myStaticMethod()) > 0), "Another.myStaticMethod() > 0");
+      (await $util_Util.waitUntil((async () => {
+        return ((await this.$this_localCounter.peek()) > 0);
+      })));
     }
   }
   return MyResource;
 }
-//# sourceMappingURL=inflight.MyResource-1.js.map
+//# sourceMappingURL=inflight.MyResource-1.cjs.map
 ```
 
-## inflight.R-1.js
-```js
+## inflight.R-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
   class R {
     constructor({  }) {
@@ -119,7 +129,7 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
   }
   return R;
 }
-//# sourceMappingURL=inflight.R-1.js.map
+//# sourceMappingURL=inflight.R-1.cjs.map
 ```
 
 ## main.tf.json
@@ -129,22 +139,9 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -153,23 +150,23 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "MyResource_cloudTopic-OnMessage0_CloudwatchLogGroup_51183C3F": {
+      "MyResource_Topic-OnMessage0_CloudwatchLogGroup_AE327804": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic-OnMessage0/CloudwatchLogGroup",
-            "uniqueId": "MyResource_cloudTopic-OnMessage0_CloudwatchLogGroup_51183C3F"
+            "path": "root/Default/Default/MyResource/Topic-OnMessage0/CloudwatchLogGroup",
+            "uniqueId": "MyResource_Topic-OnMessage0_CloudwatchLogGroup_AE327804"
           }
         },
-        "name": "/aws/lambda/cloud-Topic-OnMessage0-c8316e5b",
+        "name": "/aws/lambda/Topic-OnMessage0-c8bb74dc",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "MyResource_cloudCounter_0782991D": {
+      "Counter": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Counter/Default",
-            "uniqueId": "MyResource_cloudCounter_0782991D"
+            "path": "root/Default/Default/Counter/Default",
+            "uniqueId": "Counter"
           }
         },
         "attribute": [
@@ -180,13 +177,13 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c87187fa"
+        "name": "wing-counter-Counter-c824ef62"
       },
-      "cloudCounter": {
+      "MyResource_Counter_D9D84476": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Counter/Default",
-            "uniqueId": "cloudCounter"
+            "path": "root/Default/Default/MyResource/Counter/Default",
+            "uniqueId": "MyResource_Counter_D9D84476"
           }
         },
         "attribute": [
@@ -197,50 +194,50 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "wing-counter-cloud.Counter-c866f225"
+        "name": "wing-counter-Counter-c8736322"
       }
     },
     "aws_iam_role": {
-      "MyResource_cloudTopic-OnMessage0_IamRole_961468EB": {
+      "MyResource_Topic-OnMessage0_IamRole_CFB3A523": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic-OnMessage0/IamRole",
-            "uniqueId": "MyResource_cloudTopic-OnMessage0_IamRole_961468EB"
+            "path": "root/Default/Default/MyResource/Topic-OnMessage0/IamRole",
+            "uniqueId": "MyResource_Topic-OnMessage0_IamRole_CFB3A523"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "MyResource_cloudTopic-OnMessage0_IamRolePolicy_FFC9A778": {
+      "MyResource_Topic-OnMessage0_IamRolePolicy_0A01161C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic-OnMessage0/IamRolePolicy",
-            "uniqueId": "MyResource_cloudTopic-OnMessage0_IamRolePolicy_FFC9A778"
+            "path": "root/Default/Default/MyResource/Topic-OnMessage0/IamRolePolicy",
+            "uniqueId": "MyResource_Topic-OnMessage0_IamRolePolicy_0A01161C"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.cloudCounter.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.MyResource_cloudCounter_0782991D.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.MyResource_cloudTopic-OnMessage0_IamRole_961468EB.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.MyResource_Counter_D9D84476.arn}\"],\"Effect\":\"Allow\"},{\"Action\":[\"dynamodb:UpdateItem\"],\"Resource\":[\"${aws_dynamodb_table.Counter.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.MyResource_Topic-OnMessage0_IamRole_CFB3A523.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "MyResource_cloudTopic-OnMessage0_IamRolePolicyAttachment_26007303": {
+      "MyResource_Topic-OnMessage0_IamRolePolicyAttachment_D50F7CD0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic-OnMessage0/IamRolePolicyAttachment",
-            "uniqueId": "MyResource_cloudTopic-OnMessage0_IamRolePolicyAttachment_26007303"
+            "path": "root/Default/Default/MyResource/Topic-OnMessage0/IamRolePolicyAttachment",
+            "uniqueId": "MyResource_Topic-OnMessage0_IamRolePolicyAttachment_D50F7CD0"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.MyResource_cloudTopic-OnMessage0_IamRole_961468EB.name}"
+        "role": "${aws_iam_role.MyResource_Topic-OnMessage0_IamRole_CFB3A523.name}"
       }
     },
     "aws_lambda_function": {
-      "MyResource_cloudTopic-OnMessage0_F8F986EA": {
+      "MyResource_Topic-OnMessage0_E4479D24": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic-OnMessage0/Default",
-            "uniqueId": "MyResource_cloudTopic-OnMessage0_F8F986EA"
+            "path": "root/Default/Default/MyResource/Topic-OnMessage0/Default",
+            "uniqueId": "MyResource_Topic-OnMessage0_E4479D24"
           }
         },
         "architectures": [
@@ -248,21 +245,21 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_49baa65c": "${aws_dynamodb_table.cloudCounter.name}",
-            "DYNAMODB_TABLE_NAME_5afed199": "${aws_dynamodb_table.MyResource_cloudCounter_0782991D.name}",
+            "DYNAMODB_TABLE_NAME_2aca4cc2": "${aws_dynamodb_table.MyResource_Counter_D9D84476.name}",
+            "DYNAMODB_TABLE_NAME_6cb5a3a4": "${aws_dynamodb_table.Counter.name}",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Topic-OnMessage0-c8316e5b",
+            "WING_FUNCTION_NAME": "Topic-OnMessage0-c8bb74dc",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Topic-OnMessage0-c8316e5b",
+        "function_name": "Topic-OnMessage0-c8bb74dc",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.MyResource_cloudTopic-OnMessage0_IamRole_961468EB.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.MyResource_Topic-OnMessage0_IamRole_CFB3A523.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.MyResource_cloudTopic-OnMessage0_S3Object_720C2491.key}",
+        "s3_key": "${aws_s3_object.MyResource_Topic-OnMessage0_S3Object_80106925.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -271,56 +268,56 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
       }
     },
     "aws_lambda_permission": {
-      "MyResource_cloudTopic-OnMessage0_InvokePermission-c8f2c43e88c72aa87b4192974983c81bf653de52bf_913E405C": {
+      "MyResource_Topic-OnMessage0_InvokePermission-c83f0429eb66f0735813ef826c23f64489a7bdf635_2A49C462": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic-OnMessage0/InvokePermission-c8f2c43e88c72aa87b4192974983c81bf653de52bf",
-            "uniqueId": "MyResource_cloudTopic-OnMessage0_InvokePermission-c8f2c43e88c72aa87b4192974983c81bf653de52bf_913E405C"
+            "path": "root/Default/Default/MyResource/Topic-OnMessage0/InvokePermission-c83f0429eb66f0735813ef826c23f64489a7bdf635",
+            "uniqueId": "MyResource_Topic-OnMessage0_InvokePermission-c83f0429eb66f0735813ef826c23f64489a7bdf635_2A49C462"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.MyResource_cloudTopic-OnMessage0_F8F986EA.function_name}",
+        "function_name": "${aws_lambda_function.MyResource_Topic-OnMessage0_E4479D24.function_name}",
         "principal": "sns.amazonaws.com",
-        "source_arn": "${aws_sns_topic.MyResource_cloudTopic_1F3310C3.arn}"
+        "source_arn": "${aws_sns_topic.MyResource_Topic_08B3CB09.arn}"
       }
     },
     "aws_s3_bucket": {
-      "Another_First_cloudBucket_DB822B7C": {
+      "Another_First_Bucket_490007B4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Another/First/cloud.Bucket/Default",
-            "uniqueId": "Another_First_cloudBucket_DB822B7C"
+            "path": "root/Default/Default/Another/First/Bucket/Default",
+            "uniqueId": "Another_First_Bucket_490007B4"
           }
         },
-        "bucket_prefix": "cloud-bucket-c84d72a1-",
+        "bucket_prefix": "bucket-c8b9b2e9-",
         "force_destroy": false
       },
-      "Code": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Code",
-            "uniqueId": "Code"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "code-c84a50b1-"
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
       },
-      "cloudBucket": {
+      "Code": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Code",
+            "uniqueId": "Code"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
-        "force_destroy": false
+        "bucket_prefix": "code-c84a50b1-"
       }
     },
     "aws_s3_object": {
-      "MyResource_cloudTopic-OnMessage0_S3Object_720C2491": {
+      "MyResource_Topic-OnMessage0_S3Object_80106925": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic-OnMessage0/S3Object",
-            "uniqueId": "MyResource_cloudTopic-OnMessage0_S3Object_720C2491"
+            "path": "root/Default/Default/MyResource/Topic-OnMessage0/S3Object",
+            "uniqueId": "MyResource_Topic-OnMessage0_S3Object_80106925"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -329,60 +326,63 @@ module.exports = function({ $_parentThis_localCounter, $globalCounter }) {
       }
     },
     "aws_sns_topic": {
-      "MyResource_cloudTopic_1F3310C3": {
+      "MyResource_Topic_08B3CB09": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic/Default",
-            "uniqueId": "MyResource_cloudTopic_1F3310C3"
+            "path": "root/Default/Default/MyResource/Topic/Default",
+            "uniqueId": "MyResource_Topic_08B3CB09"
           }
         },
-        "name": "cloud-Topic-c8f2c43e"
+        "name": "Topic-c83f0429"
       }
     },
     "aws_sns_topic_subscription": {
-      "MyResource_cloudTopic_TopicSubscription0_4C261870": {
+      "MyResource_Topic_TopicSubscription0_46151CAE": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/MyResource/cloud.Topic/TopicSubscription0",
-            "uniqueId": "MyResource_cloudTopic_TopicSubscription0_4C261870"
+            "path": "root/Default/Default/MyResource/Topic/TopicSubscription0",
+            "uniqueId": "MyResource_Topic_TopicSubscription0_46151CAE"
           }
         },
-        "endpoint": "${aws_lambda_function.MyResource_cloudTopic-OnMessage0_F8F986EA.arn}",
+        "endpoint": "${aws_lambda_function.MyResource_Topic-OnMessage0_E4479D24.arn}",
         "protocol": "lambda",
-        "topic_arn": "${aws_sns_topic.MyResource_cloudTopic_1F3310C3.arn}"
+        "topic_arn": "${aws_sns_topic.MyResource_Topic_08B3CB09.arn}"
       }
     }
   }
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
+const util = $stdlib.util;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
     class First extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.myResource = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+        this.myResource = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
       }
       static _toInflightType() {
         return `
-          require("./inflight.First-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.First-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FirstClient = ${First._toInflightType(this)};
+            const FirstClient = ${First._toInflightType()};
             const client = new FirstClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -390,8 +390,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Another extends $stdlib.std.Resource {
@@ -402,7 +405,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Another-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Another-1.cjs")({
             $globalCounter: ${$stdlib.core.liftObject(globalCounter)},
           })
         `;
@@ -410,7 +413,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const AnotherClient = ${Another._toInflightType(this)};
+            const AnotherClient = ${Another._toInflightType()};
             const client = new AnotherClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -418,39 +421,38 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "myMethod", "myStaticMethod", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Another._registerOnLiftObject(globalCounter, host, ["peek"]);
-        }
-        if (ops.includes("myMethod")) {
-          Another._registerOnLiftObject(globalCounter, host, ["inc", "peek"]);
-        }
-        super._registerOnLift(host, ops);
-      }
-      static _registerOnLift(host, ops) {
-        if (ops.includes("myStaticMethod")) {
-          Another._registerOnLiftObject(globalCounter, host, ["peek"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "myMethod": [
+            [globalCounter, [].concat(["inc"], ["peek"])],
+          ],
+          "$inflight_init": [
+            [globalCounter, ["peek"]],
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "myStaticMethod": [
+            [globalCounter, ["peek"]],
+          ],
+        });
       }
     }
     class MyResource extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
-        this.localTopic = this.node.root.new("@winglang/sdk.cloud.Topic", cloud.Topic, this, "cloud.Topic");
-        this.localCounter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+        this.localTopic = this.node.root.new("@winglang/sdk.cloud.Topic", cloud.Topic, this, "Topic");
+        this.localCounter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
         const $parentThis = this;
         class R extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
           }
           static _toInflightType() {
             return `
-              require("./inflight.R-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.R-1.cjs")({
                 $_parentThis_localCounter: ${$stdlib.core.liftObject($parentThis.localCounter)},
                 $globalCounter: ${$stdlib.core.liftObject(globalCounter)},
               })
@@ -459,7 +461,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const RClient = ${R._toInflightType(this)};
+                const RClient = ${R._toInflightType()};
                 const client = new RClient({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -467,41 +469,45 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              R._registerOnLiftObject($parentThis.localCounter, host, ["inc"]);
-              R._registerOnLiftObject(globalCounter, host, ["inc"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [$parentThis.localCounter, ["inc"]],
+                [globalCounter, ["inc"]],
+              ],
+              "$inflight_init": [
+                [$parentThis.localCounter, []],
+                [globalCounter, []],
+              ],
+            });
           }
         }
         (this.localTopic.onMessage(new R(this, "R")));
       }
       static _toInflightType() {
         return `
-          require("./inflight.MyResource-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.MyResource-1.cjs")({
             $Another: ${$stdlib.core.liftObject(Another)},
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index______globalArrayOfStr__0_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(globalArrayOfStr, 0))},
-            $__obj__key_______if____key_in_obj___throw_new_Error__Map_does_not_contain_key_____key______return_obj_key______globalMapOfNum___a__: ${$stdlib.core.liftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(globalMapOfNum, "a"))},
-            $_globalSetOfStr_has__a___: ${$stdlib.core.liftObject((globalSetOfStr.has("a")))},
             $globalAnother: ${$stdlib.core.liftObject(globalAnother)},
             $globalAnother_first_myResource: ${$stdlib.core.liftObject(globalAnother.first.myResource)},
             $globalAnother_myField: ${$stdlib.core.liftObject(globalAnother.myField)},
+            $globalArrayOfStr: ${$stdlib.core.liftObject(globalArrayOfStr)},
             $globalBool: ${$stdlib.core.liftObject(globalBool)},
             $globalBucket: ${$stdlib.core.liftObject(globalBucket)},
+            $globalMapOfNum: ${$stdlib.core.liftObject(globalMapOfNum)},
             $globalNum: ${$stdlib.core.liftObject(globalNum)},
+            $globalSetOfStr: ${$stdlib.core.liftObject(globalSetOfStr)},
             $globalStr: ${$stdlib.core.liftObject(globalStr)},
+            $util_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(util.Util, "@winglang/sdk/util", "Util"))},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const MyResourceClient = ${MyResource._toInflightType(this)};
+            const MyResourceClient = ${MyResource._toInflightType()};
             const client = new MyResourceClient({
+              $this_localCounter: ${$stdlib.core.liftObject(this.localCounter)},
               $this_localTopic: ${$stdlib.core.liftObject(this.localTopic)},
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -509,39 +515,50 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "myPut", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          MyResource._registerOnLiftObject(this.localTopic, host, []);
-        }
-        if (ops.includes("myPut")) {
-          MyResource._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(globalArrayOfStr, 0), host, []);
-          MyResource._registerOnLiftObject(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(globalMapOfNum, "a"), host, []);
-          MyResource._registerOnLiftObject((globalSetOfStr.has("a")), host, []);
-          MyResource._registerOnLiftObject(Another, host, ["myStaticMethod"]);
-          MyResource._registerOnLiftObject(globalAnother, host, ["myMethod"]);
-          MyResource._registerOnLiftObject(globalAnother.first.myResource, host, ["put"]);
-          MyResource._registerOnLiftObject(globalAnother.myField, host, []);
-          MyResource._registerOnLiftObject(globalBool, host, []);
-          MyResource._registerOnLiftObject(globalBucket, host, ["put"]);
-          MyResource._registerOnLiftObject(globalNum, host, []);
-          MyResource._registerOnLiftObject(globalStr, host, []);
-          MyResource._registerOnLiftObject(this.localTopic, host, ["publish"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "myPut": [
+            [Another, ["myStaticMethod"]],
+            [globalAnother, ["myMethod"]],
+            [globalAnother.first.myResource, ["put"]],
+            [globalAnother.myField, []],
+            [globalArrayOfStr, ["at"]],
+            [globalBool, []],
+            [globalBucket, ["put"]],
+            [globalMapOfNum, ["get"]],
+            [globalNum, []],
+            [globalSetOfStr, ["has"]],
+            [globalStr, []],
+            [this.localCounter, ["peek"]],
+            [this.localTopic, ["publish"]],
+          ],
+          "$inflight_init": [
+            [Another, []],
+            [globalAnother, []],
+            [globalAnother.first.myResource, []],
+            [globalAnother.myField, []],
+            [globalArrayOfStr, []],
+            [globalBool, []],
+            [globalBucket, []],
+            [globalMapOfNum, []],
+            [globalNum, []],
+            [globalSetOfStr, []],
+            [globalStr, []],
+            [this.localCounter, []],
+            [this.localTopic, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $res: ${$stdlib.core.liftObject(res)},
           })
         `;
@@ -549,7 +566,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -557,25 +574,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(res, host, ["myPut"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [res, ["myPut"]],
+          ],
+          "$inflight_init": [
+            [res, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $Another: ${$stdlib.core.liftObject(Another)},
           })
         `;
@@ -583,7 +601,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -591,18 +609,19 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(Another, host, ["myStaticMethod"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [Another, ["myStaticMethod"]],
+          ],
+          "$inflight_init": [
+            [Another, []],
+          ],
+        });
       }
     }
-    const globalBucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-    const globalCounter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "cloud.Counter");
+    const globalBucket = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const globalCounter = this.node.root.new("@winglang/sdk.cloud.Counter", cloud.Counter, this, "Counter");
     const globalStr = "hello";
     const globalBool = true;
     const globalNum = 42;
@@ -618,6 +637,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "resource_captures_globals.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_test_sim.md
index 70daf4c6dbf..64ed0d891a8 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/resource_captures_globals.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ resource_captures_globals.test.wsim » root/env0/test:test                                             
 pass ─ resource_captures_globals.test.wsim » root/env1/test:access cloud resource through static methods only
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_compile_tf-aws.md
index 29417b4927e..1cbc516d9b3 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,14 +19,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -48,6 +37,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "service.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_test_sim.md
index 9ad917396e9..a61ab18a8fa 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/service.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ service.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_compile_tf-aws.md
index e3b1b75f468..c1a060431ee 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [shadowing.test.w](../../../../../examples/tests/valid/shadowing.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $bar }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,24 +13,25 @@ module.exports = function({ $bar }) {
     }
     async handle() {
       const result = [];
-      (await result.push($bar));
+      result.push($bar);
       if (true) {
         const bar = "world";
-        (await result.push(bar));
+        result.push(bar);
       }
       const foo = "bang";
-      (await result.push(foo));
+      result.push(foo);
       return [...(result)];
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $fn }) {
   class $Closure2 {
     constructor({  }) {
@@ -39,15 +41,15 @@ module.exports = function({ $fn }) {
     }
     async handle() {
       const result = (await $fn());
-      {((cond) => {if (!cond) throw new Error("assertion failed: result.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(result.length,3)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: result.at(0) == \"hola!\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(result, 0),"hola!")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: result.at(1) == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(result, 1),"world")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: result.at(2) == \"bang\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(result, 2),"bang")))};
+      $helpers.assert($helpers.eq(result.length, 3), "result.length == 3");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(result, 0), "hola!"), "result.at(0) == \"hola!\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(result, 1), "world"), "result.at(1) == \"world\"");
+      $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(result, 2), "bang"), "result.at(2) == \"bang\"");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -57,22 +59,9 @@ module.exports = function({ $fn }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -82,27 +71,29 @@ module.exports = function({ $fn }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $bar: ${$stdlib.core.liftObject(bar)},
           })
         `;
@@ -110,7 +101,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -118,25 +109,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(bar, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bar, []],
+          ],
+          "$inflight_init": [
+            [bar, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $fn: ${$stdlib.core.liftObject(fn)},
           })
         `;
@@ -144,7 +136,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -152,14 +144,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(fn, host, ["handle"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [fn, ["handle"]],
+          ],
+          "$inflight_init": [
+            [fn, []],
+          ],
+        });
       }
     }
     const bar = "hola!";
@@ -171,6 +164,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "shadowing.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_test_sim.md
index 51f745a3c42..3120eb6a40a 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/shadowing.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ shadowing.test.wsim » root/env0/test:capture shadow interaction
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/sim_resource.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/sim_resource.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..0a5d8eb39a4
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/sim_resource.test.w_compile_tf-aws.md
@@ -0,0 +1,153 @@
+# [sim_resource.test.w](../../../../../examples/tests/valid/sim_resource.test.w) | compile | tf-aws
+
+## inflight.ResourceBackend-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $MyEnum }) {
+  class ResourceBackend {
+    async onStop() {
+    }
+    async emptyMethod() {
+    }
+    async methodWithNums(a, b) {
+      return 0;
+    }
+    async methodWithStrs(a, b) {
+      return "";
+    }
+    async methodWithBools(a, b) {
+      return false;
+    }
+    async methodWithOptionals(a, b) {
+    }
+    async methodWithJsons(a, b) {
+      return ({});
+    }
+    async methodWithEnums(a, b) {
+      return $MyEnum.A;
+    }
+    async methodWithArrays(a, b) {
+      return [];
+    }
+    async methodWithMaps(a, b) {
+      return ({});
+    }
+    async methodWithStructs(a, b) {
+      return ({"a": 0, "b": ""});
+    }
+    async methodWithVariadics(a, ...b) {
+    }
+    async methodWithComplexTypes(a) {
+      return ({});
+    }
+  }
+  return ResourceBackend;
+}
+//# sourceMappingURL=inflight.ResourceBackend-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const sim = $stdlib.sim;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const MyEnum =
+      (function (tmp) {
+        tmp["A"] = "A";
+        tmp["B"] = "B";
+        tmp["C"] = "C";
+        return tmp;
+      })({})
+    ;
+    class ResourceBackend extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.ResourceBackend-1.cjs")({
+            $MyEnum: ${$stdlib.core.liftObject(MyEnum)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const ResourceBackendClient = ${ResourceBackend._toInflightType()};
+            const client = new ResourceBackendClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "onStop": [
+          ],
+          "emptyMethod": [
+          ],
+          "methodWithNums": [
+          ],
+          "methodWithStrs": [
+          ],
+          "methodWithBools": [
+          ],
+          "methodWithOptionals": [
+          ],
+          "methodWithJsons": [
+          ],
+          "methodWithEnums": [
+          ],
+          "methodWithArrays": [
+          ],
+          "methodWithMaps": [
+          ],
+          "methodWithStructs": [
+          ],
+          "methodWithVariadics": [
+          ],
+          "methodWithComplexTypes": [
+          ],
+          "$inflight_init": [
+          ],
+        });
+      }
+    }
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "sim_resource.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/sim_resource.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/sim_resource.test.w_test_sim.md
new file mode 100644
index 00000000000..c98b7128e56
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/sim_resource.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [sim_resource.test.w](../../../../../examples/tests/valid/sim_resource.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ sim_resource.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_compile_tf-aws.md
index d58657843a8..d4d62ba28dc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [statements_if.test.w](../../../../../examples/tests/valid/statements_if.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -13,29 +14,29 @@ module.exports = function({  }) {
     async handle() {
       if (true) {
         const x = 2;
-        if ((true && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 2),4)))) {
-          if ((true && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 3),4)))) {
-            {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        if ((true && $helpers.eq((x + 2), 4))) {
+          if ((true && $helpers.eq((x + 3), 4))) {
+            $helpers.assert(false, "false");
           }
-          else if ((true && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 3),6)))) {
-            {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+          else if ((true && $helpers.eq((x + 3), 6))) {
+            $helpers.assert(false, "false");
           }
-          else if ((false || (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 3),5)))) {
-            {((cond) => {if (!cond) throw new Error("assertion failed: true")})(true)};
+          else if ((false || $helpers.eq((x + 3), 5))) {
+            $helpers.assert(true, "true");
           }
           else {
-            {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+            $helpers.assert(false, "false");
           }
         }
         else {
-          {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+          $helpers.assert(false, "false");
         }
       }
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -45,22 +46,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -70,34 +58,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -105,40 +95,95 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     if (true) {
       const x = 2;
       const f = false;
-      if ((true && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 2),4)))) {
-        if ((true && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 3),4)))) {
-          {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+      if ((true && $helpers.eq((x + 2), 4))) {
+        if ((true && $helpers.eq((x + 3), 4))) {
+          $helpers.assert(false, "false");
         }
-        else if ((true && (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 3),6)))) {
-          {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        else if ((true && $helpers.eq((x + 3), 6))) {
+          $helpers.assert(false, "false");
         }
-        else if ((false || (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((x + 3),5)))) {
-          {((cond) => {if (!cond) throw new Error("assertion failed: true")})(true)};
+        else if ((false || $helpers.eq((x + 3), 5))) {
+          $helpers.assert(true, "true");
         }
         else if ((!f)) {
-          {((cond) => {if (!cond) throw new Error("assertion failed: !!!f")})((!(!(!f))))};
+          $helpers.assert((!(!(!f))), "!!!f");
         }
         else {
-          {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+          $helpers.assert(false, "false");
         }
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
+    if (true) {
+      const a = undefined;
+      const b = "b";
+      const c = "c";
+      {
+        const $if_let_value = a;
+        if ($if_let_value != undefined) {
+          const d = $if_let_value;
+          $helpers.assert(false, "false");
+        }
+        else if (((b) != null)) {
+          $helpers.assert(true, "true");
+        }
+        else {
+          const $elif_let_value1 = c;
+          if ($elif_let_value1 != undefined) {
+            const e = $elif_let_value1;
+            $helpers.assert(false, "false");
+          }
+          else {
+            $helpers.assert(false, "false");
+          }
+        }
+      }
+    }
+    if (true) {
+      const a = undefined;
+      const b = undefined;
+      const c = "c";
+      {
+        const $if_let_value = a;
+        if ($if_let_value != undefined) {
+          const d = $if_let_value;
+          $helpers.assert(false, "false");
+        }
+        else {
+          const $elif_let_value0 = c;
+          if ($elif_let_value0 != undefined) {
+            const e = $elif_let_value0;
+            $helpers.assert(true, "true");
+          }
+          else if (((b) != null)) {
+            $helpers.assert(false, "false");
+          }
+          else {
+            $helpers.assert(false, "false");
+          }
+        }
+      }
+    }
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "statements_if.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_test_sim.md
index e2dcfbe4d59..bcbffd2255f 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/statements_if.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ statements_if.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_compile_tf-aws.md
index f0963f41d34..78aaec16adc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,14 +19,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -52,6 +41,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "statements_variable_declarations.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_test_sim.md
index b5f4495cc4c..ae42407cd49 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/statements_variable_declarations.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ statements_variable_declarations.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_compile_tf-aws.md
index de2ed4ce613..eb12cc98e9c 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [static_members.test.w](../../../../../examples/tests/valid/static_members.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -20,18 +21,19 @@ module.exports = function({  }) {
         }
       }
       const inflightClass = (await (async () => {const o = new InflightClass(); await o.$inflight_init?.(); return o; })());
-      {((cond) => {if (!cond) throw new Error("assertion failed: inflightClass.inflightMethod() == \"Inflight method\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await inflightClass.inflightMethod()),"Inflight method")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: InflightClass.staticInflightMethod() == \"Static inflight method\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await InflightClass.staticInflightMethod()),"Static inflight method")))};
+      $helpers.assert($helpers.eq((await inflightClass.inflightMethod()), "Inflight method"), "inflightClass.inflightMethod() == \"Inflight method\"");
+      $helpers.assert($helpers.eq((await InflightClass.staticInflightMethod()), "Static inflight method"), "InflightClass.staticInflightMethod() == \"Static inflight method\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -42,7 +44,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -52,22 +54,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -77,14 +66,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -94,19 +85,19 @@ class $Root extends $stdlib.std.Resource {
         super($scope, $id);
         this.instanceField = 100;
       }
-      static m() {
+      static m($scope) {
         return 99;
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -114,26 +105,35 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "get123", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "get123": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -141,19 +141,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const foo = new Foo(this, "Foo");
-    {((cond) => {if (!cond) throw new Error("assertion failed: foo.instanceField == 100")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(foo.instanceField,100)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: Foo.m() == 99")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((Foo.m()),99)))};
+    $helpers.assert($helpers.eq(foo.instanceField, 100), "foo.instanceField == 100");
+    $helpers.assert($helpers.eq((Foo.m(this)), 99), "Foo.m() == 99");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:test", new $Closure1(this, "$Closure1"));
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "static_members.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_test_sim.md
index 3378f0ac3cb..dfd4a07d794 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/static_members.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ static_members.test.wsim » root/env0/test:test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_compile_tf-aws.md
index 2f25310761d..b7b54c36a69 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [std_containers.test.w](../../../../../examples/tests/valid/std_containers.test.w) | compile | tf-aws
 
-## inflight.Animal-1.js
-```js
+## inflight.Animal-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Animal {
     constructor({  }) {
@@ -10,12 +11,13 @@ module.exports = function({  }) {
   }
   return Animal;
 }
-//# sourceMappingURL=inflight.Animal-1.js.map
+//# sourceMappingURL=inflight.Animal-1.cjs.map
 ```
 
-## inflight.Cat-1.js
-```js
+## inflight.Cat-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Animal }) {
   class Cat extends $Animal {
     constructor({  }) {
@@ -24,12 +26,13 @@ module.exports = function({ $Animal }) {
   }
   return Cat;
 }
-//# sourceMappingURL=inflight.Cat-1.js.map
+//# sourceMappingURL=inflight.Cat-1.cjs.map
 ```
 
-## inflight.Dog-1.js
-```js
+## inflight.Dog-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Animal }) {
   class Dog extends $Animal {
     constructor({  }) {
@@ -38,7 +41,7 @@ module.exports = function({ $Animal }) {
   }
   return Dog;
 }
-//# sourceMappingURL=inflight.Dog-1.js.map
+//# sourceMappingURL=inflight.Dog-1.cjs.map
 ```
 
 ## main.tf.json
@@ -48,22 +51,9 @@ module.exports = function({ $Animal }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -73,14 +63,16 @@ module.exports = function({ $Animal }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -90,14 +82,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Animal-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Animal-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AnimalClient = ${Animal._toInflightType(this)};
+            const AnimalClient = ${Animal._toInflightType()};
             const client = new AnimalClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -105,8 +97,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Cat extends Animal {
@@ -115,7 +110,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Cat-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Cat-1.cjs")({
             $Animal: ${$stdlib.core.liftObject(Animal)},
           })
         `;
@@ -123,7 +118,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const CatClient = ${Cat._toInflightType(this)};
+            const CatClient = ${Cat._toInflightType()};
             const client = new CatClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -131,8 +126,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class Dog extends Animal {
@@ -141,7 +139,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Dog-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Dog-1.cjs")({
             $Animal: ${$stdlib.core.liftObject(Animal)},
           })
         `;
@@ -149,7 +147,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DogClient = ${Dog._toInflightType(this)};
+            const DogClient = ${Dog._toInflightType()};
             const client = new DogClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -157,50 +155,53 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const sArray = ["one", "two"];
     const mutArray = [...(sArray)];
-    (mutArray.push("three"));
+    mutArray.push("three");
     const immutArray = [...(mutArray)];
     const s = ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(sArray, 1);
-    {((cond) => {if (!cond) throw new Error("assertion failed: s == \"two\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"two")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: sArray.at(1) == \"two\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(sArray, 1),"two")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: sArray.length == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(sArray.length,2)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: immutArray.length == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(immutArray.length,3)))};
+    $helpers.assert($helpers.eq(s, "two"), "s == \"two\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(sArray, 1), "two"), "sArray.at(1) == \"two\"");
+    $helpers.assert($helpers.eq(sArray.length, 2), "sArray.length == 2");
+    $helpers.assert($helpers.eq(immutArray.length, 3), "immutArray.length == 3");
     const sArray2 = ["if", "you", "build", "it"];
     const sArray3 = ["he", "will", "come", "for", "you"];
     const mergedArray = (sArray2.concat(sArray3));
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedArray.length == 9")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(mergedArray.length,9)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedArray.at(5) == \"will\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(mergedArray, 5),"will")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedArray.contains(\"build\")")})(mergedArray.includes("build"))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: !mergedArray.contains(\"bring\")")})((!mergedArray.includes("bring")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedArray.indexOf(\"you\") == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(mergedArray.indexOf("you"),1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedArray.join(\" \") == \"if you build it he will come for you\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((mergedArray.join(" ")),"if you build it he will come for you")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedArray.join() == \"if,you,build,it,he,will,come,for,you\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((mergedArray.join()),"if,you,build,it,he,will,come,for,you")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedArray.lastIndexOf(\"you\") == 8")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(mergedArray.lastIndexOf("you"),8)))};
+    $helpers.assert($helpers.eq(mergedArray.length, 9), "mergedArray.length == 9");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(mergedArray, 5), "will"), "mergedArray.at(5) == \"will\"");
+    $helpers.assert(mergedArray.includes("build"), "mergedArray.contains(\"build\")");
+    $helpers.assert((!mergedArray.includes("bring")), "!mergedArray.contains(\"bring\")");
+    $helpers.assert($helpers.eq(mergedArray.indexOf("you"), 1), "mergedArray.indexOf(\"you\") == 1");
+    $helpers.assert($helpers.eq((mergedArray.join(" ")), "if you build it he will come for you"), "mergedArray.join(\" \") == \"if you build it he will come for you\"");
+    $helpers.assert($helpers.eq((mergedArray.join()), "if,you,build,it,he,will,come,for,you"), "mergedArray.join() == \"if,you,build,it,he,will,come,for,you\"");
+    $helpers.assert($helpers.eq(mergedArray.lastIndexOf("you"), 8), "mergedArray.lastIndexOf(\"you\") == 8");
     const mutArray2 = ["how", "does", "that", "look"];
     const mergedMutArray = (mutArray.concat(mutArray2));
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedMutArray.length == 7")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(mergedMutArray.length,7)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: mergedMutArray.at(5) == \"that\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(mergedMutArray, 5),"that")))};
+    $helpers.assert($helpers.eq(mergedMutArray.length, 7), "mergedMutArray.length == 7");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(mergedMutArray, 5), "that"), "mergedMutArray.at(5) == \"that\"");
     const sSet = new Set(["one", "two"]);
     const mutSet = new Set(sSet);
     (mutSet.add("three"));
     const immutSet = new Set(mutSet);
-    {((cond) => {if (!cond) throw new Error("assertion failed: sSet.has(\"one\")")})((sSet.has("one")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: sSet.size == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(sSet.size,2)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: immutSet.size == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(immutSet.size,3)))};
+    $helpers.assert((sSet.has("one")), "sSet.has(\"one\")");
+    $helpers.assert($helpers.eq(sSet.size, 2), "sSet.size == 2");
+    $helpers.assert($helpers.eq(immutSet.size, 3), "immutSet.size == 3");
     const sMap = ({["one"]: 1, ["two"]: 2});
     const nestedMap = ({["a"]: ({["b"]: ({"c": "hello"})})});
     const mutMap = {...(sMap)};
     ((obj, args) => { obj[args[0]] = args[1]; })(mutMap, ["five", 5]);
     const immutMap = ({...(mutMap)});
-    {((cond) => {if (!cond) throw new Error("assertion failed: sMap.get(\"one\") == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(sMap, "one"),1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: sMap.size() == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(sMap).length,2)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: immutMap.size() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(Object.keys(immutMap).length,3)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: nestedMap.get(\"a\").get(\"b\").get(\"c\") == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(nestedMap, "a"), "b"), "c"),"hello")))};
+    $helpers.assert($helpers.eq(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(sMap, "one"), 1), "sMap.get(\"one\") == 1");
+    $helpers.assert($helpers.eq(Object.keys(sMap).length, 2), "sMap.size() == 2");
+    $helpers.assert($helpers.eq(Object.keys(immutMap).length, 3), "immutMap.size() == 3");
+    $helpers.assert($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(((obj, key) => { if (!(key in obj)) throw new Error(`Map does not contain key: "${key}"`); return obj[key]; })(nestedMap, "a"), "b"), "c"), "hello"), "nestedMap.get(\"a\").get(\"b\").get(\"c\") == \"hello\"");
     const heterogeneousArray = [new Cat(this, "C1"), new Dog(this, "D1")];
     const heterogeneousDoubleArray = [[new Cat(this, "C2")], [new Cat(this, "C3"), new Dog(this, "D2")], [new Animal(this, "A1")]];
     const heterogeneousSet = new Set([new Cat(this, "C4"), new Dog(this, "D3")]);
@@ -210,6 +211,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "std_containers.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_test_sim.md
index 6840bba96cc..92cabdbe567 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/std_containers.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ std_containers.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_compile_tf-aws.md
index ff09cf09de5..a2d9f9663d6 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_compile_tf-aws.md
@@ -1,9 +1,10 @@
 # [std_string.test.w](../../../../../examples/tests/valid/std_string.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index_______s1_split________1_, $_s1_concat_s2__, $s1_indexOf__s__ }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $s1, $s2 }) {
   class $Closure1 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -11,14 +12,14 @@ module.exports = function({ $__arr__index_______if__index___0____index____arr_le
       return $obj;
     }
     async handle() {
-      {console.log(String.raw({ raw: ["index of \"s\" in s1 is ", ""] }, $s1_indexOf__s__))};
-      {console.log($__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index_______s1_split________1_)};
-      {console.log($_s1_concat_s2__)};
+      console.log(String.raw({ raw: ["index of \"s\" in s1 is ", ""] }, $s1.indexOf("s")));
+      console.log(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })((await $s1.split(" ")), 1));
+      console.log((await $s1.concat($s2)));
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -28,22 +29,9 @@ module.exports = function({ $__arr__index_______if__index___0____index____arr_le
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -53,36 +41,37 @@ module.exports = function({ $__arr__index_______if__index___0____index____arr_le
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
-            $__arr__index_______if__index___0____index____arr_length__throw_new_Error__Index_out_of_bounds____return_arr_index_______s1_split________1_: ${$stdlib.core.liftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })((s1.split(" ")), 1))},
-            $_s1_concat_s2__: ${$stdlib.core.liftObject((s1.concat(s2)))},
-            $s1_indexOf__s__: ${$stdlib.core.liftObject(s1.indexOf("s"))},
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $s1: ${$stdlib.core.liftObject(s1)},
+            $s2: ${$stdlib.core.liftObject(s2)},
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -90,42 +79,49 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })((s1.split(" ")), 1), host, []);
-          $Closure1._registerOnLiftObject((s1.concat(s2)), host, []);
-          $Closure1._registerOnLiftObject(s1.indexOf("s"), host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [s1, [].concat(["indexOf"], ["split"], ["concat"])],
+            [s2, []],
+          ],
+          "$inflight_init": [
+            [s1, []],
+            [s2, []],
+          ],
+        });
       }
     }
     const s1 = "some string";
     const s2 = "s are immutable";
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.length == 11")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s1.length,11)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.at(7) == \"r\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((args) => { if (7 >= s1.length || 7 + s1.length < 0) {throw new Error("index out of bounds")}; return s1.at(7) })(7),"r")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.concat(s2) == \"some strings are immutable\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((s1.concat(s2)),"some strings are immutable")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.contains(\"some\")")})(s1.includes("some"))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: !\"some\".contains(s1)")})((!"some".includes(s1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.endsWith(\"string\")")})(s1.endsWith("string"))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.indexOf(\"s\") == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s1.indexOf("s"),0)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"Some String\".lowercase() == \"some string\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("Some String".toLocaleLowerCase(),"some string")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.split(\" \").at(0) == \"some\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })((s1.split(" ")), 0),"some")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.startsWith(\"some\")")})(s1.startsWith("some"))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.substring(5) == \"string\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((s1.substring(5)),"string")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: s1.substring(5, 7) == \"st\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((s1.substring(5, 7)),"st")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"   some string   \".trim() == \"some string\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(("   some string   ".trim()),"some string")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"Some String\".uppercase() == \"SOME STRING\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })("Some String".toLocaleUpperCase(),"SOME STRING")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \"hello\" + \" world\" == \"hello world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(("hello" + " world"),"hello world")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: \n\"hello {\"funky\"}\n world\" == \"hello funky\\n world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(String.raw({ raw: ["hello ", "\n world"] }, "funky"),"hello funky\n world")))};
+    $helpers.assert($helpers.eq(s1.length, 11), "s1.length == 11");
+    $helpers.assert($helpers.eq(((args) => { if (7 >= s1.length || 7 + s1.length < 0) {throw new Error("index out of bounds")}; return s1.at(7) })(7), "r"), "s1.at(7) == \"r\"");
+    $helpers.assert($helpers.eq((s1.concat(s2)), "some strings are immutable"), "s1.concat(s2) == \"some strings are immutable\"");
+    $helpers.assert(s1.includes("some"), "s1.contains(\"some\")");
+    $helpers.assert((!"some".includes(s1)), "!\"some\".contains(s1)");
+    $helpers.assert(s1.endsWith("string"), "s1.endsWith(\"string\")");
+    $helpers.assert($helpers.eq(s1.indexOf("s"), 0), "s1.indexOf(\"s\") == 0");
+    $helpers.assert($helpers.eq("Some String".toLocaleLowerCase(), "some string"), "\"Some String\".lowercase() == \"some string\"");
+    $helpers.assert($helpers.eq(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })((s1.split(" ")), 0), "some"), "s1.split(\" \").at(0) == \"some\"");
+    $helpers.assert(s1.startsWith("some"), "s1.startsWith(\"some\")");
+    $helpers.assert($helpers.eq((s1.substring(5)), "string"), "s1.substring(5) == \"string\"");
+    $helpers.assert($helpers.eq((s1.substring(5, 7)), "st"), "s1.substring(5, 7) == \"st\"");
+    $helpers.assert($helpers.eq(("   some string   ".trim()), "some string"), "\"   some string   \".trim() == \"some string\"");
+    $helpers.assert($helpers.eq("Some String".toLocaleUpperCase(), "SOME STRING"), "\"Some String\".uppercase() == \"SOME STRING\"");
+    $helpers.assert($helpers.eq(("hello" + " world"), "hello world"), "\"hello\" + \" world\" == \"hello world\"");
+    $helpers.assert($helpers.eq(String.raw({ raw: ["hello ", "\n world"] }, "funky"), "hello funky\n world"), "\n\"hello {\"funky\"}\n world\" == \"hello funky\\n world\"");
+    let initial = "hey, ";
+    initial += "you";
+    $helpers.assert($helpers.eq(initial, "hey, you"), "initial == \"hey, you\"");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:string", new $Closure1(this, "$Closure1"));
+    const s3 = "hello\nworld";
+    const s4 = "hello\nworld";
+    $helpers.assert($helpers.eq(s3, s4), "s3 == s4");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "std_string.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_test_sim.md
index 30625bd3362..ecf64aece0e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/std_string.test.w_test_sim.md
@@ -2,13 +2,13 @@
 
 ## stdout.log
 ```log
-pass ┌ std_string.test.wsim » root/env0/test:string
-     │ index of "s" in s1 is 0
-     │ string
-     └ some strings are immutable
- 
- 
+[INFO] string | index of "s" in s1 is 0
+[INFO] string | string
+[INFO] string | some strings are immutable
+pass ─ std_string.test.wsim » root/env0/test:string
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/store.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/store.w_compile_tf-aws.md
index 9681f3b1770..5afb35fc2ee 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/store.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/store.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [store.w](../../../../../examples/tests/valid/store.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_1_b }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $__parent_this_1_b }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Store-1.js
-```js
+## inflight.Store-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Store {
     constructor({ $this_b }) {
@@ -33,12 +35,13 @@ module.exports = function({  }) {
   }
   return Store;
 }
-//# sourceMappingURL=inflight.Store-1.js.map
+//# sourceMappingURL=inflight.Store-1.cjs.map
 ```
 
-## inflight.Util-1.js
-```js
+## inflight.Util-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Util {
     constructor({  }) {
@@ -46,134 +49,138 @@ module.exports = function({  }) {
   }
   return Util;
 }
-//# sourceMappingURL=inflight.Util-1.js.map
+//# sourceMappingURL=inflight.Util-1.cjs.map
 ```
 
-## preflight.empty-1.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  return {  };
-};
-//# sourceMappingURL=preflight.empty-1.js.map
-```
-
-## preflight.js
-```js
-"use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const file3 = require("./preflight.empty-1.js")({ $stdlib });
-  const math = $stdlib.math;
-  const cloud = $stdlib.cloud;
-  class Util extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Util-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const UtilClient = ${Util._toInflightType(this)};
-          const client = new UtilClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const file3 = require("./preflight.empty-1.cjs");
+const math = $stdlib.math;
+const cloud = $stdlib.cloud;
+const Color =
+  (function (tmp) {
+    tmp["RED"] = "RED";
+    tmp["GREEN"] = "GREEN";
+    tmp["BLUE"] = "BLUE";
+    return tmp;
+  })({})
+;
+class Util extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Util-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const UtilClient = ${Util._toInflightType()};
+        const client = new UtilClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
   }
-  class Store extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-      this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
-      const __parent_this_1 = this;
-      class $Closure1 extends $stdlib.std.Resource {
-        _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
-        constructor($scope, $id, ) {
-          super($scope, $id);
-          (std.Node.of(this)).hidden = true;
-        }
-        static _toInflightType() {
-          return `
-            require("./inflight.$Closure1-1.js")({
-              $__parent_this_1_b: ${$stdlib.core.liftObject(__parent_this_1.b)},
-            })
-          `;
-        }
-        _toInflight() {
-          return `
-            (await (async () => {
-              const $Closure1Client = ${$Closure1._toInflightType(this)};
-              const client = new $Closure1Client({
-              });
-              if (client.$inflight_init) { await client.$inflight_init(); }
-              return client;
-            })())
-          `;
-        }
-        _supportedOps() {
-          return [...super._supportedOps(), "handle", "$inflight_init"];
-        }
-        _registerOnLift(host, ops) {
-          if (ops.includes("handle")) {
-            $Closure1._registerOnLiftObject(__parent_this_1.b, host, ["put"]);
-          }
-          super._registerOnLift(host, ops);
-        }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+class Store extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+    this.b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const __parent_this_1 = this;
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
       }
-      const prefill = this.node.root.new("@winglang/sdk.cloud.OnDeploy", cloud.OnDeploy, this, "cloud.OnDeploy", new $Closure1(this, "$Closure1"));
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.Store-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const StoreClient = ${Store._toInflightType(this)};
-          const client = new StoreClient({
-            $this_b: ${$stdlib.core.liftObject(this.b)},
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "store", "$inflight_init"];
-    }
-    _registerOnLift(host, ops) {
-      if (ops.includes("$inflight_init")) {
-        Store._registerOnLiftObject(this.b, host, []);
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $__parent_this_1_b: ${$stdlib.core.liftObject(__parent_this_1.b)},
+          })
+        `;
       }
-      if (ops.includes("store")) {
-        Store._registerOnLiftObject(this.b, host, ["put"]);
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [__parent_this_1.b, ["put"]],
+          ],
+          "$inflight_init": [
+            [__parent_this_1.b, []],
+          ],
+        });
       }
-      super._registerOnLift(host, ops);
     }
+    const prefill = this.node.root.new("@winglang/sdk.cloud.OnDeploy", cloud.OnDeploy, this, "OnDeploy", new $Closure1(this, "$Closure1"));
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.Store-1.cjs")({
+      })
+    `;
+  }
+  _toInflight() {
+    return `
+      (await (async () => {
+        const StoreClient = ${Store._toInflightType()};
+        const client = new StoreClient({
+          $this_b: ${$stdlib.core.liftObject(this.b)},
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
   }
-  const Color =
-    (function (tmp) {
-      tmp[tmp["RED"] = 0] = ",RED";
-      tmp[tmp["GREEN"] = 1] = ",GREEN";
-      tmp[tmp["BLUE"] = 2] = ",BLUE";
-      return tmp;
-    })({})
-  ;
-  return { Util, Store, Color };
-};
-//# sourceMappingURL=preflight.js.map
+  get _liftMap() {
+    return ({
+      "store": [
+        [this.b, ["put"]],
+      ],
+      "$inflight_init": [
+        [this.b, []],
+      ],
+    });
+  }
+}
+module.exports = { Util, Store, Color };
+//# sourceMappingURL=preflight.cjs.map
+```
+
+## preflight.empty-1.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {  };
+//# sourceMappingURL=preflight.empty-1.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/stringify.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/stringify.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..20a9e71037f
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/stringify.test.w_compile_tf-aws.md
@@ -0,0 +1,55 @@
+# [stringify.test.w](../../../../../examples/tests/valid/stringify.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const MyEnum =
+      (function (tmp) {
+        tmp["A"] = "A";
+        tmp["B"] = "B";
+        tmp["C"] = "C";
+        return tmp;
+      })({})
+    ;
+    console.log("my string");
+    console.log(42);
+    console.log(true);
+    console.log(({"cool": "beans"}));
+    console.log(MyEnum.A);
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "stringify.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/stringify.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/stringify.test.w_test_sim.md
new file mode 100644
index 00000000000..63c636c9625
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/stringify.test.w_test_sim.md
@@ -0,0 +1,17 @@
+# [stringify.test.w](../../../../../examples/tests/valid/stringify.test.w) | test | sim
+
+## stdout.log
+```log
+my string
+42
+true
+{ cool: 'beans' }
+A
+pass ─ stringify.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_compile_tf-aws.md
index e685b4b0fdc..9c8950ca3e1 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [struct_from_json.test.w](../../../../../examples/tests/valid/struct_from_json.test.w) | compile | tf-aws
 
-## inflight.$Closure1-2.js
-```js
+## inflight.$Closure1-2.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $cloud_BucketProps, $j }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,18 +12,19 @@ module.exports = function({ $cloud_BucketProps, $j }) {
       return $obj;
     }
     async handle() {
-      const x = ((json, validateOptions) => ($cloud_BucketProps._fromJson(json, validateOptions)))($j);
-      {((cond) => {if (!cond) throw new Error("assertion failed: x.public == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x.public,false)))};
+      const x = $cloud_BucketProps._fromJson($j);
+      $helpers.assert($helpers.eq(x.public, false), "x.public == false");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-2.js.map
+//# sourceMappingURL=inflight.$Closure1-2.cjs.map
 ```
 
-## inflight.$Closure2-2.js
-```js
+## inflight.$Closure2-2.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Student }) {
   class $Closure2 {
     constructor({  }) {
@@ -32,37 +34,38 @@ module.exports = function({ $Student }) {
     }
     async handle() {
       const jStudent3 = ({"firstName": "struct", "lastName": "greatest", "enrolled": true, "schoolId": "s3-inflight", "dob": ({"month": 4, "day": 1, "year": 1999}), "coursesTaken": [({"grade": "B", "dateTaken": ({"month": 5, "day": 10, "year": 2021}), "course": ({"name": "COMP 101", "credits": 2})}), ({"grade": "A", "dateTaken": ({"month": 5, "day": 10, "year": 2021}), "course": ({"name": "COMP 121", "credits": 4})})]});
-      const studentInflight1 = ((json, validateOptions) => ($Student._fromJson(json, validateOptions)))(jStudent3);
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.firstName == \"struct\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.firstName,"struct")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.lastName == \"greatest\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.lastName,"greatest")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.enrolled")})(studentInflight1.enrolled)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.schoolId == \"s3-inflight\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.schoolId,"s3-inflight")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.dob.month == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.dob.month,4)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.dob.day == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.dob.day,1)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.dob.year == 1999")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.dob.year,1999)))};
+      const studentInflight1 = $Student._fromJson(jStudent3);
+      $helpers.assert($helpers.eq(studentInflight1.firstName, "struct"), "studentInflight1.firstName == \"struct\"");
+      $helpers.assert($helpers.eq(studentInflight1.lastName, "greatest"), "studentInflight1.lastName == \"greatest\"");
+      $helpers.assert(studentInflight1.enrolled, "studentInflight1.enrolled");
+      $helpers.assert($helpers.eq(studentInflight1.schoolId, "s3-inflight"), "studentInflight1.schoolId == \"s3-inflight\"");
+      $helpers.assert($helpers.eq(studentInflight1.dob.month, 4), "studentInflight1.dob.month == 4");
+      $helpers.assert($helpers.eq(studentInflight1.dob.day, 1), "studentInflight1.dob.day == 1");
+      $helpers.assert($helpers.eq(studentInflight1.dob.year, 1999), "studentInflight1.dob.year == 1999");
       {
         const $if_let_value = studentInflight1.coursesTaken;
         if ($if_let_value != undefined) {
           const coursesTaken = $if_let_value;
           const course1 = ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(coursesTaken, 0);
           const course2 = ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(coursesTaken, 1);
-          {((cond) => {if (!cond) throw new Error("assertion failed: course1.grade == \"B\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(course1.grade,"B")))};
-          {((cond) => {if (!cond) throw new Error("assertion failed: course2.grade == \"A\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(course2.grade,"A")))};
+          $helpers.assert($helpers.eq(course1.grade, "B"), "course1.grade == \"B\"");
+          $helpers.assert($helpers.eq(course2.grade, "A"), "course2.grade == \"A\"");
         }
         else {
-          {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+          $helpers.assert(false, "false");
         }
       }
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-2.js.map
+//# sourceMappingURL=inflight.$Closure2-2.cjs.map
 ```
 
-## inflight.$Closure3-2.js
-```js
+## inflight.$Closure3-2.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Student, $jStudent1 }) {
   class $Closure3 {
     constructor({  }) {
@@ -71,25 +74,26 @@ module.exports = function({ $Student, $jStudent1 }) {
       return $obj;
     }
     async handle() {
-      const studentInflight1 = ((json, validateOptions) => ($Student._fromJson(json, validateOptions)))($jStudent1);
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.firstName == \"John\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.firstName,"John")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.lastName == \"Smith\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.lastName,"Smith")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.enrolled")})(studentInflight1.enrolled)};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.schoolId == \"s1-xyz\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.schoolId,"s1-xyz")))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.dob.month == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.dob.month,10)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.dob.day == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.dob.day,10)))};
-      {((cond) => {if (!cond) throw new Error("assertion failed: studentInflight1.dob.year == 2005")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(studentInflight1.dob.year,2005)))};
+      const studentInflight1 = $Student._fromJson($jStudent1);
+      $helpers.assert($helpers.eq(studentInflight1.firstName, "John"), "studentInflight1.firstName == \"John\"");
+      $helpers.assert($helpers.eq(studentInflight1.lastName, "Smith"), "studentInflight1.lastName == \"Smith\"");
+      $helpers.assert(studentInflight1.enrolled, "studentInflight1.enrolled");
+      $helpers.assert($helpers.eq(studentInflight1.schoolId, "s1-xyz"), "studentInflight1.schoolId == \"s1-xyz\"");
+      $helpers.assert($helpers.eq(studentInflight1.dob.month, 10), "studentInflight1.dob.month == 10");
+      $helpers.assert($helpers.eq(studentInflight1.dob.day, 10), "studentInflight1.dob.day == 10");
+      $helpers.assert($helpers.eq(studentInflight1.dob.year, 2005), "studentInflight1.dob.year == 2005");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-2.js.map
+//# sourceMappingURL=inflight.$Closure3-2.cjs.map
 ```
 
-## inflight.$Closure4-2.js
-```js
+## inflight.$Closure4-2.cjs
+```cjs
 "use strict";
-module.exports = function({ $MyStruct, $_schema_asStr___, $expectedSchema, $jMyStruct, $std_Json }) {
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $MyStruct, $expectedSchema, $jMyStruct, $schema, $std_Json }) {
   class $Closure4 {
     constructor({  }) {
       const $obj = (...args) => this.handle(...args);
@@ -97,19 +101,20 @@ module.exports = function({ $MyStruct, $_schema_asStr___, $expectedSchema, $jMyS
       return $obj;
     }
     async handle() {
-      const s = ($MyStruct);
+      const s = $MyStruct;
       (await s.validate($jMyStruct));
-      {((cond) => {if (!cond) throw new Error("assertion failed: schema.asStr() == Json.stringify(expectedSchema)")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($_schema_asStr___,((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([$expectedSchema]))))};
+      $helpers.assert($helpers.eq((await $schema.asStr()), ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })($expectedSchema)), "schema.asStr() == Json.stringify(expectedSchema)");
     }
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-2.js.map
+//# sourceMappingURL=inflight.$Closure4-2.cjs.map
 ```
 
-## inflight.$Closure5-2.js
-```js
+## inflight.$Closure5-2.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $Student, $std_Boolean, $std_Number, $std_String }) {
   class $Closure5 {
     constructor({  }) {
@@ -121,17 +126,18 @@ module.exports = function({ $Student, $std_Boolean, $std_Number, $std_String })
       (await $std_String.fromJson(10, { unsafe: true }));
       (await $std_Boolean.fromJson(10, { unsafe: true }));
       (await $std_Number.fromJson("cool", { unsafe: true }));
-      ((json, validateOptions) => ($Student._fromJson(json, validateOptions)))(({"obviously": "not a student"}), { unsafe: true });
+      $Student._fromJson(({"obviously": "not a student"}), { unsafe: true });
     }
   }
   return $Closure5;
 }
-//# sourceMappingURL=inflight.$Closure5-2.js.map
+//# sourceMappingURL=inflight.$Closure5-2.cjs.map
 ```
 
-## inflight.UsesStructInImportedFile-1.js
-```js
+## inflight.UsesStructInImportedFile-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class UsesStructInImportedFile {
     constructor({  }) {
@@ -139,7 +145,7 @@ module.exports = function({  }) {
   }
   return UsesStructInImportedFile;
 }
-//# sourceMappingURL=inflight.UsesStructInImportedFile-1.js.map
+//# sourceMappingURL=inflight.UsesStructInImportedFile-1.cjs.map
 ```
 
 ## main.tf.json
@@ -149,22 +155,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -174,37 +167,38 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
-const externalStructs = require("./preflight.structs-1.js")({ $stdlib });
-const otherExternalStructs = require("./preflight.structs2-2.js")({ $stdlib });
+const externalStructs = require("./preflight.structs-1.cjs");
+const otherExternalStructs = require("./preflight.structs2-2.cjs");
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    const Bar = $stdlib.std.Struct._createJsonSchema({id:"/Bar",type:"object",properties:{b:{type:"number"},f:{type:"string"},},required:["b","f",]});
-    const Foo = $stdlib.std.Struct._createJsonSchema({id:"/Foo",type:"object",properties:{f:{type:"string"},},required:["f",]});
-    const Foosible = $stdlib.std.Struct._createJsonSchema({id:"/Foosible",type:"object",properties:{f:{type:"string"},},required:[]});
-    const MyStruct = $stdlib.std.Struct._createJsonSchema({id:"/MyStruct",type:"object",properties:{m1:{type:"object",properties:{val:{type:"number"},},required:["val",]},m2:{type:"object",properties:{val:{type:"string"},},required:["val",]},},required:["m1","m2",]});
-    const SomeStruct = $stdlib.std.Struct._createJsonSchema({id:"/SomeStruct",type:"object",properties:{foo:{type:"string"},},required:["foo",]});
-    const Student = $stdlib.std.Struct._createJsonSchema({id:"/Student",type:"object",properties:{additionalData:{type:"object"},advisor:{type:"object",properties:{dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},employeeID:{type:"string"},firstName:{type:"string"},lastName:{type:"string"},},required:["dob","employeeID","firstName","lastName",]},coursesTaken:{type:"array",items:{type:"object",properties:{course:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]},dateTaken:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},grade:{type:"string"},},required:["course","dateTaken","grade",]}},dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},enrolled:{type:"boolean"},enrolledCourses:{type:"array",uniqueItems:true,items:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]}},firstName:{type:"string"},lastName:{type:"string"},schoolId:{type:"string"},},required:["dob","enrolled","firstName","lastName","schoolId",]});
-    const cloud_BucketProps = $stdlib.std.Struct._createJsonSchema({id:"/BucketProps",type:"object",properties:{public:{type:"boolean"},},required:[]});
-    const externalStructs_MyOtherStruct = $stdlib.std.Struct._createJsonSchema({id:"/MyOtherStruct",type:"object",properties:{data:{type:"object",properties:{val:{type:"number"},},required:["val",]},},required:["data",]});
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    const Bar = $stdlib.std.Struct._createJsonSchema({$id:"/Bar",type:"object",properties:{b:{type:"number"},f:{type:"string"},},required:["b","f",]});
+    const Foo = $stdlib.std.Struct._createJsonSchema({$id:"/Foo",type:"object",properties:{f:{type:"string"},},required:["f",]});
+    const Foosible = $stdlib.std.Struct._createJsonSchema({$id:"/Foosible",type:"object",properties:{f:{type:"string"},},required:[]});
+    const MyStruct = $stdlib.std.Struct._createJsonSchema({$id:"/MyStruct",type:"object",properties:{m1:{type:"object",properties:{val:{type:"number"},},required:["val",]},m2:{type:"object",properties:{val:{type:"string"},},required:["val",]},},required:["m1","m2",]});
+    const Student = $stdlib.std.Struct._createJsonSchema({$id:"/Student",type:"object",properties:{additionalData:{type:["object","string","boolean","number","array"]},advisor:{type:"object",properties:{dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},employeeID:{type:"string"},firstName:{type:"string"},lastName:{type:"string"},},required:["dob","employeeID","firstName","lastName",]},coursesTaken:{type:"array",items:{type:"object",properties:{course:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]},dateTaken:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},grade:{type:"string"},},required:["course","dateTaken","grade",]}},dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},enrolled:{type:"boolean"},enrolledCourses:{type:"array",uniqueItems:true,items:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]}},firstName:{type:"string"},lastName:{type:"string"},schoolId:{type:"string"},},required:["dob","enrolled","firstName","lastName","schoolId",]});
+    const cloud_BucketProps = $stdlib.std.Struct._createJsonSchema({$id:"/BucketProps",type:"object",properties:{public:{type:"boolean"},},required:[]});
+    const externalStructs_MyOtherStruct = $stdlib.std.Struct._createJsonSchema({$id:"/MyOtherStruct",type:"object",properties:{data:{type:"object",properties:{val:{type:"number"},},required:["val",]},},required:["data",]});
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-2.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-2.cjs")({
             $cloud_BucketProps: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(cloud_BucketProps, "@winglang/sdk/cloud", "BucketProps"))},
             $j: ${$stdlib.core.liftObject(j)},
           })
@@ -213,7 +207,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -221,25 +215,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(j, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [j, []],
+          ],
+          "$inflight_init": [
+            [j, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-2.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-2.cjs")({
             $Student: ${$stdlib.core.liftObject(Student)},
           })
         `;
@@ -247,7 +242,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -255,19 +250,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-2.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-2.cjs")({
             $Student: ${$stdlib.core.liftObject(Student)},
             $jStudent1: ${$stdlib.core.liftObject(jStudent1)},
           })
@@ -276,7 +276,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -284,29 +284,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(jStudent1, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [jStudent1, []],
+          ],
+          "$inflight_init": [
+            [jStudent1, []],
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-2.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-2.cjs")({
             $MyStruct: ${$stdlib.core.liftObject(MyStruct)},
-            $_schema_asStr___: ${$stdlib.core.liftObject((schema.asStr()))},
             $expectedSchema: ${$stdlib.core.liftObject(expectedSchema)},
             $jMyStruct: ${$stdlib.core.liftObject(jMyStruct)},
+            $schema: ${$stdlib.core.liftObject(schema)},
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
           })
         `;
@@ -314,7 +315,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -322,27 +323,30 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure4._registerOnLiftObject((schema.asStr()), host, []);
-          $Closure4._registerOnLiftObject(expectedSchema, host, []);
-          $Closure4._registerOnLiftObject(jMyStruct, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [expectedSchema, []],
+            [jMyStruct, []],
+            [schema, ["asStr"]],
+          ],
+          "$inflight_init": [
+            [expectedSchema, []],
+            [jMyStruct, []],
+            [schema, []],
+          ],
+        });
       }
     }
-    class $Closure5 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure5 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure5-2.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure5-2.cjs")({
             $Student: ${$stdlib.core.liftObject(Student)},
             $std_Boolean: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Boolean, "@winglang/sdk/std", "Boolean"))},
             $std_Number: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Number, "@winglang/sdk/std", "Number"))},
@@ -353,7 +357,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure5Client = ${$Closure5._toInflightType(this)};
+            const $Closure5Client = ${$Closure5._toInflightType()};
             const client = new $Closure5Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -361,57 +365,62 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const j = ({"public": false});
-    const x = ((json, validateOptions) => (cloud_BucketProps._fromJson(json, validateOptions)))(j);
-    {((cond) => {if (!cond) throw new Error("assertion failed: x.public == false")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x.public,false)))};
+    const x = cloud_BucketProps._fromJson(j);
+    $helpers.assert($helpers.eq(x.public, false), "x.public == false");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight jsii struct conversion", new $Closure1(this, "$Closure1"));
     const jFoo = ({"f": "bar"});
-    {((cond) => {if (!cond) throw new Error("assertion failed: Foo.fromJson(jFoo).f == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((json, validateOptions) => (Foo._fromJson(json, validateOptions)))(jFoo).f,"bar")))};
+    $helpers.assert($helpers.eq(Foo._fromJson(jFoo).f, "bar"), "Foo.fromJson(jFoo).f == \"bar\"");
     const jFoosible = ({});
     const jFoosible2 = ({"f": "bar"});
     {
-      const $if_let_value = ((json, validateOptions) => (Foosible._fromJson(json, validateOptions)))(jFoosible).f;
+      const $if_let_value = Foosible._fromJson(jFoosible).f;
       if ($if_let_value != undefined) {
         const f = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     {
-      const $if_let_value = ((json, validateOptions) => (Foosible._fromJson(json, validateOptions)))(jFoosible2).f;
+      const $if_let_value = Foosible._fromJson(jFoosible2).f;
       if ($if_let_value != undefined) {
         const f = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: f == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(f,"bar")))};
+        $helpers.assert($helpers.eq(f, "bar"), "f == \"bar\"");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     const jBar = ({"f": "bar", "b": 10});
-    const b = ((json, validateOptions) => (Bar._fromJson(json, validateOptions)))(jBar);
-    {((cond) => {if (!cond) throw new Error("assertion failed: b.f == \"bar\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(b.f,"bar")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: b.b == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(b.b,10)))};
+    const b = Bar._fromJson(jBar);
+    $helpers.assert($helpers.eq(b.f, "bar"), "b.f == \"bar\"");
+    $helpers.assert($helpers.eq(b.b, 10), "b.b == 10");
     const jStudent1 = ({"firstName": "John", "lastName": "Smith", "enrolled": true, "schoolId": "s1-xyz", "dob": ({"month": 10, "day": 10, "year": 2005}), "enrolledCourses": []});
-    const student1 = ((json, validateOptions) => (Student._fromJson(json, validateOptions)))(jStudent1);
-    {((cond) => {if (!cond) throw new Error("assertion failed: student1.firstName == \"John\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student1.firstName,"John")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student1.lastName == \"Smith\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student1.lastName,"Smith")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student1.enrolled")})(student1.enrolled)};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student1.schoolId == \"s1-xyz\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student1.schoolId,"s1-xyz")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student1.dob.month == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student1.dob.month,10)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student1.dob.day == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student1.dob.day,10)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student1.dob.year == 2005")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student1.dob.year,2005)))};
+    const student1 = Student._fromJson(jStudent1);
+    $helpers.assert($helpers.eq(student1.firstName, "John"), "student1.firstName == \"John\"");
+    $helpers.assert($helpers.eq(student1.lastName, "Smith"), "student1.lastName == \"Smith\"");
+    $helpers.assert(student1.enrolled, "student1.enrolled");
+    $helpers.assert($helpers.eq(student1.schoolId, "s1-xyz"), "student1.schoolId == \"s1-xyz\"");
+    $helpers.assert($helpers.eq(student1.dob.month, 10), "student1.dob.month == 10");
+    $helpers.assert($helpers.eq(student1.dob.day, 10), "student1.dob.day == 10");
+    $helpers.assert($helpers.eq(student1.dob.year, 2005), "student1.dob.year == 2005");
     const jStudent2 = ({"advisor": ({"firstName": "Tom", "lastName": "Baker", "dob": ({"month": 1, "day": 1, "year": 1983}), "employeeID": "emp123"}), "firstName": "Sally", "lastName": "Reynolds", "enrolled": false, "schoolId": "s2-xyz", "dob": ({"month": 5, "day": 31, "year": 1987}), "enrolledCourses": [({"name": "COMP 101", "credits": 2}), ({"name": "COMP 121", "credits": 4})], "coursesTaken": [({"grade": "F", "dateTaken": ({"month": 5, "day": 10, "year": 2021}), "course": ({"name": "COMP 101", "credits": 2})}), ({"grade": "D", "dateTaken": ({"month": 5, "day": 10, "year": 2021}), "course": ({"name": "COMP 121", "credits": 4})})]});
-    const student2 = ((json, validateOptions) => (Student._fromJson(json, validateOptions)))(jStudent2);
-    {((cond) => {if (!cond) throw new Error("assertion failed: student2.firstName == \"Sally\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student2.firstName,"Sally")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student2.lastName == \"Reynolds\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student2.lastName,"Reynolds")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: !student2.enrolled")})((!student2.enrolled))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student2.schoolId == \"s2-xyz\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student2.schoolId,"s2-xyz")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student2.dob.month == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student2.dob.month,5)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student2.dob.day == 31")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student2.dob.day,31)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: student2.dob.year == 1987")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student2.dob.year,1987)))};
+    const student2 = Student._fromJson(jStudent2);
+    $helpers.assert($helpers.eq(student2.firstName, "Sally"), "student2.firstName == \"Sally\"");
+    $helpers.assert($helpers.eq(student2.lastName, "Reynolds"), "student2.lastName == \"Reynolds\"");
+    $helpers.assert((!student2.enrolled), "!student2.enrolled");
+    $helpers.assert($helpers.eq(student2.schoolId, "s2-xyz"), "student2.schoolId == \"s2-xyz\"");
+    $helpers.assert($helpers.eq(student2.dob.month, 5), "student2.dob.month == 5");
+    $helpers.assert($helpers.eq(student2.dob.day, 31), "student2.dob.day == 31");
+    $helpers.assert($helpers.eq(student2.dob.year, 1987), "student2.dob.year == 1987");
     {
       const $if_let_value = student2.enrolledCourses;
       if ($if_let_value != undefined) {
@@ -419,142 +428,132 @@ class $Root extends $stdlib.std.Resource {
         const courses = [...(enrolledCourses)];
         const s2Course1 = ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(courses, 0);
         const s2Course2 = ((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(courses, 1);
-        {((cond) => {if (!cond) throw new Error("assertion failed: s2Course1.name == \"COMP 101\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s2Course1.name,"COMP 101")))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: s2Course1.credits == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s2Course1.credits,2)))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: s2Course2.name == \"COMP 121\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s2Course2.name,"COMP 121")))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: s2Course2.credits == 4")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s2Course2.credits,4)))};
+        $helpers.assert($helpers.eq(s2Course1.name, "COMP 101"), "s2Course1.name == \"COMP 101\"");
+        $helpers.assert($helpers.eq(s2Course1.credits, 2), "s2Course1.credits == 2");
+        $helpers.assert($helpers.eq(s2Course2.name, "COMP 121"), "s2Course2.name == \"COMP 121\"");
+        $helpers.assert($helpers.eq(s2Course2.credits, 4), "s2Course2.credits == 4");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     const jStudent3 = ({"enrolled": false, "schoolId": "w/e", "firstName": student2.firstName, "lastName": student2.lastName, "dob": ({"month": 1, "day": 1, "year": 1959}), "additionalData": ({"notes": "wow such notes", "legacy": false, "emergencyContactsNumbers": ["123-345-9928"]})});
-    const student3 = ((json, validateOptions) => (Student._fromJson(json, validateOptions)))(jStudent3);
+    const student3 = Student._fromJson(jStudent3);
     {
       const $if_let_value = student3.additionalData;
       if ($if_let_value != undefined) {
         const additionalData = $if_let_value;
         const notes = ((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(additionalData, "notes");
-        {((cond) => {if (!cond) throw new Error("assertion failed: notes == \"wow such notes\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(notes,"wow such notes")))};
+        $helpers.assert($helpers.eq(notes, "wow such notes"), "notes == \"wow such notes\"");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     const invalidStudent = ({"firstName": "I dont have", "lastName": "Any other info"});
     {
-      const $if_let_value = ((json) => (Student._tryFromJson(json)))(invalidStudent);
+      const $if_let_value = Student._tryFromJson(invalidStudent);
       if ($if_let_value != undefined) {
         const student = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: true")})(true)};
+        $helpers.assert(true, "true");
       }
     }
     {
-      const $if_let_value = ((json) => (Student._tryFromJson(json)))(jStudent2);
+      const $if_let_value = Student._tryFromJson(jStudent2);
       if ($if_let_value != undefined) {
         const student = $if_let_value;
-        {((cond) => {if (!cond) throw new Error("assertion failed: student.firstName == \"Sally\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student.firstName,"Sally")))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: student.lastName == \"Reynolds\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student.lastName,"Reynolds")))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: !student.enrolled")})((!student.enrolled))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: student.schoolId == \"s2-xyz\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student.schoolId,"s2-xyz")))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: student.dob.month == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student.dob.month,5)))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: student.dob.day == 31")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student.dob.day,31)))};
-        {((cond) => {if (!cond) throw new Error("assertion failed: student.dob.year == 1987")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(student.dob.year,1987)))};
+        $helpers.assert($helpers.eq(student.firstName, "Sally"), "student.firstName == \"Sally\"");
+        $helpers.assert($helpers.eq(student.lastName, "Reynolds"), "student.lastName == \"Reynolds\"");
+        $helpers.assert((!student.enrolled), "!student.enrolled");
+        $helpers.assert($helpers.eq(student.schoolId, "s2-xyz"), "student.schoolId == \"s2-xyz\"");
+        $helpers.assert($helpers.eq(student.dob.month, 5), "student.dob.month == 5");
+        $helpers.assert($helpers.eq(student.dob.day, 31), "student.dob.day == 31");
+        $helpers.assert($helpers.eq(student.dob.year, 1987), "student.dob.year == 1987");
       }
       else {
-        {((cond) => {if (!cond) throw new Error("assertion failed: false")})(false)};
+        $helpers.assert(false, "false");
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:flight school student :)", new $Closure2(this, "$Closure2"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:lifting a student", new $Closure3(this, "$Closure3"));
     const jj1 = ({"data": ({"val": 10})});
-    const externalBar = ((json, validateOptions) => (externalStructs_MyOtherStruct._fromJson(json, validateOptions)))(jj1);
-    {((cond) => {if (!cond) throw new Error("assertion failed: externalBar.data.val == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(externalBar.data.val,10)))};
+    const externalBar = externalStructs_MyOtherStruct._fromJson(jj1);
+    $helpers.assert($helpers.eq(externalBar.data.val, 10), "externalBar.data.val == 10");
     const jMyStruct = ({"m1": ({"val": 10}), "m2": ({"val": "10"})});
-    const myStruct = ((json, validateOptions) => (MyStruct._fromJson(json, validateOptions)))(jMyStruct);
-    {((cond) => {if (!cond) throw new Error("assertion failed: myStruct.m1.val == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(myStruct.m1.val,10)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: myStruct.m2.val == \"10\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(myStruct.m2.val,"10")))};
-    const schema = (MyStruct);
+    const myStruct = MyStruct._fromJson(jMyStruct);
+    $helpers.assert($helpers.eq(myStruct.m1.val, 10), "myStruct.m1.val == 10");
+    $helpers.assert($helpers.eq(myStruct.m2.val, "10"), "myStruct.m2.val == \"10\"");
+    const schema = MyStruct;
     (schema.validate(jMyStruct));
-    const expectedSchema = ({"id": "/MyStruct", "type": "object", "properties": ({"m1": ({"type": "object", "properties": ({"val": ({"type": "number"})}), "required": ["val"]}), "m2": ({"type": "object", "properties": ({"val": ({"type": "string"})}), "required": ["val"]})}), "required": ["m1", "m2"]});
-    {((cond) => {if (!cond) throw new Error("assertion failed: schema.asStr() == Json.stringify(expectedSchema)")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((schema.asStr()),((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([expectedSchema]))))};
+    const expectedSchema = ({"$id": "/MyStruct", "type": "object", "properties": ({"m1": ({"type": "object", "properties": ({"val": ({"type": "number"})}), "required": ["val"]}), "m2": ({"type": "object", "properties": ({"val": ({"type": "string"})}), "required": ["val"]})}), "required": ["m1", "m2"]});
+    $helpers.assert($helpers.eq((schema.asStr()), ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(expectedSchema)), "schema.asStr() == Json.stringify(expectedSchema)");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight schema usage", new $Closure4(this, "$Closure4"));
     (std.String.fromJson(10, { unsafe: true }));
     (std.Boolean.fromJson(10, { unsafe: true }));
     (std.Number.fromJson("cool", { unsafe: true }));
-    ((json, validateOptions) => (Student._fromJson(json, validateOptions)))(({"obviously": "not a student"}), { unsafe: true });
+    Student._fromJson(({"obviously": "not a student"}), { unsafe: true });
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:unsafe flight", new $Closure5(this, "$Closure5"));
-    new otherExternalStructs.UsesStructInImportedFile(this, "otherExternalStructs.UsesStructInImportedFile");
+    new otherExternalStructs.UsesStructInImportedFile(this, "UsesStructInImportedFile");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "struct_from_json.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
-## preflight.structs-1.js
-```js
+## preflight.structs-1.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const Bar = $stdlib.std.Struct._createJsonSchema({id:"/Bar",type:"object",properties:{b:{type:"number"},f:{type:"string"},},required:["b","f",]});
-  const Foo = $stdlib.std.Struct._createJsonSchema({id:"/Foo",type:"object",properties:{f:{type:"string"},},required:["f",]});
-  const Foosible = $stdlib.std.Struct._createJsonSchema({id:"/Foosible",type:"object",properties:{f:{type:"string"},},required:[]});
-  const MyStruct = $stdlib.std.Struct._createJsonSchema({id:"/MyStruct",type:"object",properties:{m1:{type:"object",properties:{val:{type:"number"},},required:["val",]},m2:{type:"object",properties:{val:{type:"string"},},required:["val",]},},required:["m1","m2",]});
-  const SomeStruct = $stdlib.std.Struct._createJsonSchema({id:"/SomeStruct",type:"object",properties:{foo:{type:"string"},},required:["foo",]});
-  const Student = $stdlib.std.Struct._createJsonSchema({id:"/Student",type:"object",properties:{additionalData:{type:"object"},advisor:{type:"object",properties:{dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},employeeID:{type:"string"},firstName:{type:"string"},lastName:{type:"string"},},required:["dob","employeeID","firstName","lastName",]},coursesTaken:{type:"array",items:{type:"object",properties:{course:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]},dateTaken:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},grade:{type:"string"},},required:["course","dateTaken","grade",]}},dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},enrolled:{type:"boolean"},enrolledCourses:{type:"array",uniqueItems:true,items:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]}},firstName:{type:"string"},lastName:{type:"string"},schoolId:{type:"string"},},required:["dob","enrolled","firstName","lastName","schoolId",]});
-  const cloud_BucketProps = $stdlib.std.Struct._createJsonSchema({id:"/BucketProps",type:"object",properties:{public:{type:"boolean"},},required:[]});
-  const externalStructs_MyOtherStruct = $stdlib.std.Struct._createJsonSchema({id:"/MyOtherStruct",type:"object",properties:{data:{type:"object",properties:{val:{type:"number"},},required:["val",]},},required:["data",]});
-  return {  };
-};
-//# sourceMappingURL=preflight.structs-1.js.map
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+module.exports = {  };
+//# sourceMappingURL=preflight.structs-1.cjs.map
 ```
 
-## preflight.structs2-2.js
-```js
+## preflight.structs2-2.cjs
+```cjs
 "use strict";
-module.exports = function({ $stdlib }) {
-  const std = $stdlib.std;
-  const Bar = $stdlib.std.Struct._createJsonSchema({id:"/Bar",type:"object",properties:{b:{type:"number"},f:{type:"string"},},required:["b","f",]});
-  const Foo = $stdlib.std.Struct._createJsonSchema({id:"/Foo",type:"object",properties:{f:{type:"string"},},required:["f",]});
-  const Foosible = $stdlib.std.Struct._createJsonSchema({id:"/Foosible",type:"object",properties:{f:{type:"string"},},required:[]});
-  const MyStruct = $stdlib.std.Struct._createJsonSchema({id:"/MyStruct",type:"object",properties:{m1:{type:"object",properties:{val:{type:"number"},},required:["val",]},m2:{type:"object",properties:{val:{type:"string"},},required:["val",]},},required:["m1","m2",]});
-  const SomeStruct = $stdlib.std.Struct._createJsonSchema({id:"/SomeStruct",type:"object",properties:{foo:{type:"string"},},required:["foo",]});
-  const Student = $stdlib.std.Struct._createJsonSchema({id:"/Student",type:"object",properties:{additionalData:{type:"object"},advisor:{type:"object",properties:{dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},employeeID:{type:"string"},firstName:{type:"string"},lastName:{type:"string"},},required:["dob","employeeID","firstName","lastName",]},coursesTaken:{type:"array",items:{type:"object",properties:{course:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]},dateTaken:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},grade:{type:"string"},},required:["course","dateTaken","grade",]}},dob:{type:"object",properties:{day:{type:"number"},month:{type:"number"},year:{type:"number"},},required:["day","month","year",]},enrolled:{type:"boolean"},enrolledCourses:{type:"array",uniqueItems:true,items:{type:"object",properties:{credits:{type:"number"},name:{type:"string"},},required:["credits","name",]}},firstName:{type:"string"},lastName:{type:"string"},schoolId:{type:"string"},},required:["dob","enrolled","firstName","lastName","schoolId",]});
-  const cloud_BucketProps = $stdlib.std.Struct._createJsonSchema({id:"/BucketProps",type:"object",properties:{public:{type:"boolean"},},required:[]});
-  const externalStructs_MyOtherStruct = $stdlib.std.Struct._createJsonSchema({id:"/MyOtherStruct",type:"object",properties:{data:{type:"object",properties:{val:{type:"number"},},required:["val",]},},required:["data",]});
-  class UsesStructInImportedFile extends $stdlib.std.Resource {
-    constructor($scope, $id, ) {
-      super($scope, $id);
-      this.someStruct = ((json, validateOptions) => (SomeStruct._fromJson(json, validateOptions)))(({"foo": "123"}));
-    }
-    static _toInflightType() {
-      return `
-        require("./inflight.UsesStructInImportedFile-1.js")({
-        })
-      `;
-    }
-    _toInflight() {
-      return `
-        (await (async () => {
-          const UsesStructInImportedFileClient = ${UsesStructInImportedFile._toInflightType(this)};
-          const client = new UsesStructInImportedFileClient({
-          });
-          if (client.$inflight_init) { await client.$inflight_init(); }
-          return client;
-        })())
-      `;
-    }
-    _supportedOps() {
-      return [...super._supportedOps(), "$inflight_init"];
-    }
+const $stdlib = require('@winglang/sdk');
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const SomeStruct = $stdlib.std.Struct._createJsonSchema({$id:"/SomeStruct",type:"object",properties:{foo:{type:"string"},},required:["foo",]});
+class UsesStructInImportedFile extends $stdlib.std.Resource {
+  constructor($scope, $id, ) {
+    super($scope, $id);
+    this.someStruct = SomeStruct._fromJson(({"foo": "123"}));
+  }
+  static _toInflightType() {
+    return `
+      require("${$helpers.normalPath(__dirname)}/inflight.UsesStructInImportedFile-1.cjs")({
+      })
+    `;
   }
-  return { UsesStructInImportedFile };
-};
-//# sourceMappingURL=preflight.structs2-2.js.map
+  _toInflight() {
+    return `
+      (await (async () => {
+        const UsesStructInImportedFileClient = ${UsesStructInImportedFile._toInflightType()};
+        const client = new UsesStructInImportedFileClient({
+        });
+        if (client.$inflight_init) { await client.$inflight_init(); }
+        return client;
+      })())
+    `;
+  }
+  get _liftMap() {
+    return ({
+      "$inflight_init": [
+      ],
+    });
+  }
+}
+module.exports = { UsesStructInImportedFile };
+//# sourceMappingURL=preflight.structs2-2.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_test_sim.md
index 75debeddbed..f00330424d9 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/struct_from_json.test.w_test_sim.md
@@ -7,9 +7,9 @@ pass ─ struct_from_json.test.wsim » root/env1/test:flight school student :)
 pass ─ struct_from_json.test.wsim » root/env2/test:lifting a student              
 pass ─ struct_from_json.test.wsim » root/env3/test:inflight schema usage          
 pass ─ struct_from_json.test.wsim » root/env4/test:unsafe flight                  
- 
- 
+
 Tests 5 passed (5)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_compile_tf-aws.md
index 993a5877665..162436a039d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [structs.test.w](../../../../../examples/tests/valid/structs.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,17 +13,18 @@ module.exports = function({  }) {
     }
     async handle() {
       const s2 = ({"a": "foo"});
-      {((cond) => {if (!cond) throw new Error("assertion failed: s2.a == \"foo\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s2.a,"foo")))};
+      $helpers.assert($helpers.eq(s2.a, "foo"), "s2.a == \"foo\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({ $this_data_field0 }) {
@@ -34,7 +36,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -44,22 +46,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -69,14 +58,17 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -87,14 +79,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
               $this_data_field0: ${$stdlib.core.liftObject(this.data.field0)},
             });
@@ -103,35 +95,33 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "getStuff", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("$inflight_init")) {
-          Foo._registerOnLiftObject(this.data.field0, host, []);
-        }
-        if (ops.includes("getStuff")) {
-          Foo._registerOnLiftObject(this.data.field0, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "getStuff": [
+            [this.data.field0, []],
+          ],
+          "$inflight_init": [
+            [this.data.field0, []],
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -139,22 +129,40 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
+    const a = undefined;
     const x = ({"field0": "Sup"});
     const y = ({"field0": "hello", "field1": 1, "field2": "world", "field3": ({"field0": "foo"})});
-    {((cond) => {if (!cond) throw new Error("assertion failed: x.field0 == \"Sup\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x.field0,"Sup")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: y.field1 == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y.field1,1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: y.field3.field0 == \"foo\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(y.field3.field0,"foo")))};
+    $helpers.assert($helpers.eq(x.field0, "Sup"), "x.field0 == \"Sup\"");
+    $helpers.assert($helpers.eq(y.field1, 1), "y.field1 == 1");
+    $helpers.assert($helpers.eq(y.field3.field0, "foo"), "y.field3.field0 == \"foo\"");
     const s = ({"a": "Boom baby"});
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:struct definitions are phase independant", new $Closure1(this, "$Closure1"));
+    const aNode = ({"val": "someval"});
+    const bNode = ({"val": "otherval", "next": aNode});
+    (expect.Util.equal(((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(bNode), "{\"val\":\"otherval\",\"next\":{\"val\":\"someval\"\}\}"));
+    const numField = 1337;
+    const strField = "leet";
+    const boolField = true;
+    const structField = ({"numField": numField});
+    const someStruct3 = ({"boolField": boolField, "strField": strField, "otherField": "good", "structField": structField});
+    $helpers.assert($helpers.eq(someStruct3.boolField, true), "someStruct3.boolField == true");
+    $helpers.assert($helpers.eq(someStruct3.strField, "leet"), "someStruct3.strField == \"leet\"");
+    $helpers.assert($helpers.eq(someStruct3.structField.numField, 1337), "someStruct3.structField.numField == 1337");
+    $helpers.assert($helpers.eq(someStruct3.otherField, "good"), "someStruct3.otherField == \"good\"");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "structs.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_test_sim.md
index b92d5593e2f..02ca8cffbb9 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/structs.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ structs.test.wsim » root/env0/test:struct definitions are phase independant
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_compile_tf-aws.md
index 82314840b0e..32581de0f4b 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [super_call.test.w](../../../../../examples/tests/valid/super_call.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $InflightB, $expect_Util }) {
   class $Closure1 {
     constructor({  }) {
@@ -17,12 +18,13 @@ module.exports = function({ $InflightB, $expect_Util }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $expect_Util, $extended }) {
   class $Closure2 {
     constructor({  }) {
@@ -36,12 +38,13 @@ module.exports = function({ $expect_Util, $extended }) {
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.A-1.js
-```js
+## inflight.A-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -49,12 +52,13 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
-## inflight.B-1.js
-```js
+## inflight.B-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $A }) {
   class B extends $A {
     constructor({  }) {
@@ -63,12 +67,13 @@ module.exports = function({ $A }) {
   }
   return B;
 }
-//# sourceMappingURL=inflight.B-1.js.map
+//# sourceMappingURL=inflight.B-1.cjs.map
 ```
 
-## inflight.BaseClass-1.js
-```js
+## inflight.BaseClass-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class BaseClass {
     constructor({  }) {
@@ -79,12 +84,13 @@ module.exports = function({ $b }) {
   }
   return BaseClass;
 }
-//# sourceMappingURL=inflight.BaseClass-1.js.map
+//# sourceMappingURL=inflight.BaseClass-1.cjs.map
 ```
 
-## inflight.C-1.js
-```js
+## inflight.C-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $B }) {
   class C extends $B {
     constructor({  }) {
@@ -93,12 +99,13 @@ module.exports = function({ $B }) {
   }
   return C;
 }
-//# sourceMappingURL=inflight.C-1.js.map
+//# sourceMappingURL=inflight.C-1.cjs.map
 ```
 
-## inflight.D-1.js
-```js
+## inflight.D-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $C }) {
   class D extends $C {
     constructor({  }) {
@@ -107,12 +114,13 @@ module.exports = function({ $C }) {
   }
   return D;
 }
-//# sourceMappingURL=inflight.D-1.js.map
+//# sourceMappingURL=inflight.D-1.cjs.map
 ```
 
-## inflight.E-1.js
-```js
+## inflight.E-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $D }) {
   class E extends $D {
     constructor({  }) {
@@ -121,12 +129,13 @@ module.exports = function({ $D }) {
   }
   return E;
 }
-//# sourceMappingURL=inflight.E-1.js.map
+//# sourceMappingURL=inflight.E-1.cjs.map
 ```
 
-## inflight.ExtendedClass-1.js
-```js
+## inflight.ExtendedClass-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $BaseClass, $b }) {
   class ExtendedClass extends $BaseClass {
     constructor({  }) {
@@ -139,12 +148,13 @@ module.exports = function({ $BaseClass, $b }) {
   }
   return ExtendedClass;
 }
-//# sourceMappingURL=inflight.ExtendedClass-1.js.map
+//# sourceMappingURL=inflight.ExtendedClass-1.cjs.map
 ```
 
-## inflight.InflightA-1.js
-```js
+## inflight.InflightA-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class InflightA {
     async description() {
@@ -153,12 +163,13 @@ module.exports = function({  }) {
   }
   return InflightA;
 }
-//# sourceMappingURL=inflight.InflightA-1.js.map
+//# sourceMappingURL=inflight.InflightA-1.cjs.map
 ```
 
-## inflight.InflightB-1.js
-```js
+## inflight.InflightB-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $InflightA }) {
   class InflightB extends $InflightA {
     async description() {
@@ -167,7 +178,7 @@ module.exports = function({ $InflightA }) {
   }
   return InflightB;
 }
-//# sourceMappingURL=inflight.InflightB-1.js.map
+//# sourceMappingURL=inflight.InflightB-1.cjs.map
 ```
 
 ## main.tf.json
@@ -177,22 +188,9 @@ module.exports = function({ $InflightA }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -201,14 +199,14 @@ module.exports = function({ $InflightA }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
@@ -216,14 +214,16 @@ module.exports = function({ $InflightA }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const expect = $stdlib.expect;
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
@@ -236,14 +236,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -251,8 +251,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class B extends A {
@@ -264,7 +267,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.B-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.B-1.cjs")({
             $A: ${$stdlib.core.liftObject(A)},
           })
         `;
@@ -272,7 +275,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BClient = ${B._toInflightType(this)};
+            const BClient = ${B._toInflightType()};
             const client = new BClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -280,8 +283,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class C extends B {
@@ -293,7 +299,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.C-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.C-1.cjs")({
             $B: ${$stdlib.core.liftObject(B)},
           })
         `;
@@ -301,7 +307,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const CClient = ${C._toInflightType(this)};
+            const CClient = ${C._toInflightType()};
             const client = new CClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -309,8 +315,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class D extends C {
@@ -319,7 +328,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.D-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.D-1.cjs")({
             $C: ${$stdlib.core.liftObject(C)},
           })
         `;
@@ -327,7 +336,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const DClient = ${D._toInflightType(this)};
+            const DClient = ${D._toInflightType()};
             const client = new DClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -335,8 +344,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class E extends D {
@@ -348,7 +360,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.E-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.E-1.cjs")({
             $D: ${$stdlib.core.liftObject(D)},
           })
         `;
@@ -356,7 +368,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const EClient = ${E._toInflightType(this)};
+            const EClient = ${E._toInflightType()};
             const client = new EClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -364,8 +376,11 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class InflightA extends $stdlib.std.Resource {
@@ -374,14 +389,14 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.InflightA-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.InflightA-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const InflightAClient = ${InflightA._toInflightType(this)};
+            const InflightAClient = ${InflightA._toInflightType()};
             const client = new InflightAClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -389,8 +404,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "description", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "description": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class InflightB extends InflightA {
@@ -399,7 +419,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.InflightB-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.InflightB-1.cjs")({
             $InflightA: ${$stdlib.core.liftObject(InflightA)},
           })
         `;
@@ -407,7 +427,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const InflightBClient = ${InflightB._toInflightType(this)};
+            const InflightBClient = ${InflightB._toInflightType()};
             const client = new InflightBClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -415,19 +435,24 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "description", "$inflight_init"];
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "description": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $InflightB: ${$stdlib.core.liftObject(InflightB)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
           })
@@ -436,7 +461,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -444,8 +469,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     class BaseClass extends $stdlib.std.Resource {
@@ -454,7 +484,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.BaseClass-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.BaseClass-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -462,7 +492,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const BaseClassClient = ${BaseClass._toInflightType(this)};
+            const BaseClassClient = ${BaseClass._toInflightType()};
             const client = new BaseClassClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -470,14 +500,15 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "do", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("do")) {
-          BaseClass._registerOnLiftObject(b, host, ["get"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "do": [
+            [b, ["get"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
     class ExtendedClass extends BaseClass {
@@ -486,7 +517,7 @@ class $Root extends $stdlib.std.Resource {
       }
       static _toInflightType() {
         return `
-          require("./inflight.ExtendedClass-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.ExtendedClass-1.cjs")({
             $BaseClass: ${$stdlib.core.liftObject(BaseClass)},
             $b: ${$stdlib.core.liftObject(b)},
           })
@@ -495,7 +526,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const ExtendedClassClient = ${ExtendedClass._toInflightType(this)};
+            const ExtendedClassClient = ${ExtendedClass._toInflightType()};
             const client = new ExtendedClassClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -503,25 +534,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "do", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("do")) {
-          ExtendedClass._registerOnLiftObject(b, host, ["put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return $stdlib.core.mergeLiftDeps(super._liftMap, {
+          "do": [
+            [b, ["put"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $extended: ${$stdlib.core.liftObject(extended)},
           })
@@ -530,7 +562,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -538,20 +570,21 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(extended, host, ["do"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [extended, ["do"]],
+          ],
+          "$inflight_init": [
+            [extended, []],
+          ],
+        });
       }
     }
     const e = new E(this, "E");
     (expect.Util.equal((e.description()), "E extends C extends B"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:super call inflight", new $Closure1(this, "$Closure1"));
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     const extended = new ExtendedClass(this, "ExtendedClass");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:super call sets binding permissions", new $Closure2(this, "$Closure2"));
   }
@@ -559,6 +592,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "super_call.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_test_sim.md
index f51ae0aaeb0..0c804d97d9d 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/super_call.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ super_call.test.wsim » root/env0/test:super call inflight                
 pass ─ super_call.test.wsim » root/env1/test:super call sets binding permissions
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_compile_tf-aws.md
index a7e33c46692..7ec26fa5fea 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [symbol_shadow.test.w](../../../../../examples/tests/valid/symbol_shadow.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $s }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({ $s }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: s == \"inner\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($s,"inner")))};
+      $helpers.assert($helpers.eq($s, "inner"), "s == \"inner\"");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $s }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,17 +32,18 @@ module.exports = function({ $s }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: s == \"inResource\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($s,"inResource")))};
+      $helpers.assert($helpers.eq($s, "inResource"), "s == \"inResource\"");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $s }) {
   class $Closure3 {
     constructor({  }) {
@@ -49,17 +52,18 @@ module.exports = function({ $s }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: s == \"top\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })($s,"top")))};
+      $helpers.assert($helpers.eq($s, "top"), "s == \"top\"");
     }
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure4 {
     constructor({  }) {
@@ -69,17 +73,18 @@ module.exports = function({  }) {
     }
     async handle() {
       const s = "insideInflight";
-      {((cond) => {if (!cond) throw new Error("assertion failed: s == \"insideInflight\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"insideInflight")))};
+      $helpers.assert($helpers.eq(s, "insideInflight"), "s == \"insideInflight\"");
     }
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
-## inflight.A-1.js
-```js
+## inflight.A-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class A {
     constructor({  }) {
@@ -87,7 +92,7 @@ module.exports = function({  }) {
   }
   return A;
 }
-//# sourceMappingURL=inflight.A-1.js.map
+//# sourceMappingURL=inflight.A-1.cjs.map
 ```
 
 ## main.tf.json
@@ -97,22 +102,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -122,14 +114,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -138,17 +132,16 @@ class $Root extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
         const s = "inResource";
-        {((cond) => {if (!cond) throw new Error("assertion failed: s == \"inResource\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"inResource")))};
-        const __parent_this_2 = this;
-        class $Closure2 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        $helpers.assert($helpers.eq(s, "inResource"), "s == \"inResource\"");
+        class $Closure2 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure2-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
                 $s: ${$stdlib.core.liftObject(s)},
               })
             `;
@@ -156,7 +149,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure2Client = ${$Closure2._toInflightType(this)};
+                const $Closure2Client = ${$Closure2._toInflightType()};
                 const client = new $Closure2Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -164,28 +157,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure2._registerOnLiftObject(s, host, []);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [s, []],
+              ],
+              "$inflight_init": [
+                [s, []],
+              ],
+            });
           }
         }
         this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight in resource should capture the right scoped var", new $Closure2(this, "$Closure2"));
       }
       static _toInflightType() {
         return `
-          require("./inflight.A-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.A-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const AClient = ${A._toInflightType(this)};
+            const AClient = ${A._toInflightType()};
             const client = new AClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -193,19 +187,22 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $s: ${$stdlib.core.liftObject(s)},
           })
         `;
@@ -213,7 +210,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -221,32 +218,33 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(s, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [s, []],
+          ],
+          "$inflight_init": [
+            [s, []],
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -254,23 +252,28 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     const s = "top";
     if (true) {
       const s = "inner";
-      {((cond) => {if (!cond) throw new Error("assertion failed: s == \"inner\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"inner")))};
-      class $Closure1 extends $stdlib.std.Resource {
-        _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+      $helpers.assert($helpers.eq(s, "inner"), "s == \"inner\"");
+      class $Closure1 extends $stdlib.std.AutoIdResource {
+        _id = $stdlib.core.closureId();
         constructor($scope, $id, ) {
           super($scope, $id);
-          (std.Node.of(this)).hidden = true;
+          $helpers.nodeof(this).hidden = true;
         }
         static _toInflightType() {
           return `
-            require("./inflight.$Closure1-1.js")({
+            require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
               $s: ${$stdlib.core.liftObject(s)},
             })
           `;
@@ -278,7 +281,7 @@ class $Root extends $stdlib.std.Resource {
         _toInflight() {
           return `
             (await (async () => {
-              const $Closure1Client = ${$Closure1._toInflightType(this)};
+              const $Closure1Client = ${$Closure1._toInflightType()};
               const client = new $Closure1Client({
               });
               if (client.$inflight_init) { await client.$inflight_init(); }
@@ -286,19 +289,20 @@ class $Root extends $stdlib.std.Resource {
             })())
           `;
         }
-        _supportedOps() {
-          return [...super._supportedOps(), "handle", "$inflight_init"];
-        }
-        _registerOnLift(host, ops) {
-          if (ops.includes("handle")) {
-            $Closure1._registerOnLiftObject(s, host, []);
-          }
-          super._registerOnLift(host, ops);
+        get _liftMap() {
+          return ({
+            "handle": [
+              [s, []],
+            ],
+            "$inflight_init": [
+              [s, []],
+            ],
+          });
         }
       }
       this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight nested should not capture the shadowed var", new $Closure1(this, "$Closure1"));
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: s == \"top\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(s,"top")))};
+    $helpers.assert($helpers.eq(s, "top"), "s == \"top\"");
     new A(this, "A");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:inflight on top should capture top", new $Closure3(this, "$Closure3"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:insideInflight should capture the right scope", new $Closure4(this, "$Closure4"));
@@ -307,6 +311,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "symbol_shadow.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_test_sim.md
index fab5fc91a3a..a4846ce4cef 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/symbol_shadow.test.w_test_sim.md
@@ -6,9 +6,9 @@ pass ─ symbol_shadow.test.wsim » root/env0/test:inflight nested should not ca
 pass ─ symbol_shadow.test.wsim » root/env1/A/test:inflight in resource should capture the right scoped var
 pass ─ symbol_shadow.test.wsim » root/env2/test:inflight on top should capture top                        
 pass ─ symbol_shadow.test.wsim » root/env3/test:insideInflight should capture the right scope             
- 
- 
+
 Tests 4 passed (4)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_compile_tf-aws.md
index c518522355b..57b28e91c18 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -31,11 +18,11 @@
   },
   "resource": {
     "aws_dynamodb_table": {
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -46,31 +33,36 @@
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "simple-tableex.Table-c840a49c"
+        "name": "simple-tableTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     }
   }
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const ex = $stdlib.ex;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    const t = this.node.root.new("@winglang/sdk.ex.Table", ex.Table, this, "ex.Table", { name: "simple-table", primaryKey: "id", columns: ({["id"]: ex.ColumnType.STRING, ["name"]: ex.ColumnType.STRING, ["age"]: ex.ColumnType.NUMBER}) });
+    const t = this.node.root.new("@winglang/sdk.ex.Table", ex.Table, this, "Table", { name: "simple-table", primaryKey: "id", columns: ({["id"]: ex.ColumnType.STRING, ["name"]: ex.ColumnType.STRING, ["age"]: ex.ColumnType.NUMBER}) });
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "table.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_test_sim.md
index d234ddbc2ae..4d87d3440bd 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/table.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ table.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_compile_tf-aws.md
index 52d5064c500..036ebaba3e5 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [test_bucket.test.w](../../../../../examples/tests/valid/test_bucket.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,19 +12,20 @@ module.exports = function({ $b }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: b.list().length == 0")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $b.list()).length,0)))};
+      $helpers.assert($helpers.eq((await $b.list()).length, 0), "b.list().length == 0");
       (await $b.put("hello.txt", "world"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: b.list().length == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $b.list()).length,1)))};
+      $helpers.assert($helpers.eq((await $b.list()).length, 1), "b.list().length == 1");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $b }) {
   class $Closure2 {
     constructor({  }) {
@@ -33,12 +35,12 @@ module.exports = function({ $b }) {
     }
     async handle() {
       (await $b.put("hello.txt", "world"));
-      {((cond) => {if (!cond) throw new Error("assertion failed: b.get(\"hello.txt\") == \"world\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((await $b.get("hello.txt")),"world")))};
+      $helpers.assert($helpers.eq((await $b.get("hello.txt")), "world"), "b.get(\"hello.txt\") == \"world\"");
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
 ## main.tf.json
@@ -48,22 +50,9 @@ module.exports = function({ $b }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -72,14 +61,14 @@ module.exports = function({ $b }) {
   },
   "resource": {
     "aws_s3_bucket": {
-      "cloudBucket": {
+      "Bucket": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Bucket/Default",
-            "uniqueId": "cloudBucket"
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
           }
         },
-        "bucket_prefix": "cloud-bucket-c87175e7-",
+        "bucket_prefix": "bucket-c88fdc5f-",
         "force_destroy": false
       }
     }
@@ -87,27 +76,29 @@ module.exports = function({ $b }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -115,7 +106,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -123,25 +114,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(b, host, ["list", "put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, [].concat(["list"], ["put"])],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $b: ${$stdlib.core.liftObject(b)},
           })
         `;
@@ -149,7 +141,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -157,17 +149,18 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(b, host, ["get", "put"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, [].concat(["put"], ["get"])],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
       }
     }
-    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "cloud.Bucket");
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:put", new $Closure1(this, "$Closure1"));
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:get", new $Closure2(this, "$Closure2"));
   }
@@ -175,6 +168,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "test_bucket.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_test_sim.md
index 956c60d031c..4a38902caec 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/test_bucket.test.w_test_sim.md
@@ -4,9 +4,9 @@
 ```log
 pass ─ test_bucket.test.wsim » root/env0/test:put
 pass ─ test_bucket.test.wsim » root/env1/test:get
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_compile_tf-aws.md
index 1fcc608a87d..48e551a1e6e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [test_without_bring.test.w](../../../../../examples/tests/valid/test_without_bring.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,12 +12,12 @@ module.exports = function({  }) {
       return $obj;
     }
     async handle() {
-      {((cond) => {if (!cond) throw new Error("assertion failed: true")})(true)};
+      $helpers.assert(true, "true");
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -26,22 +27,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -51,33 +39,35 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -85,8 +75,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:hello test", new $Closure1(this, "$Closure1"));
@@ -95,6 +90,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "test_without_bring.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_test_sim.md
index c5d863bcf58..7f219b6764e 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/test_without_bring.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ test_without_bring.test.wsim » root/env0/test:hello test
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/this.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/this.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..879ac5c835e
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/this.test.w_compile_tf-aws.md
@@ -0,0 +1,49 @@
+# [this.test.w](../../../../../examples/tests/valid/this.test.w) | compile | tf-aws
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const expect = $stdlib.expect;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    const path = $helpers.nodeof(this).path;
+    for (const c of $helpers.nodeof(this).children) {
+      console.log($helpers.nodeof(c).path);
+    }
+    (expect.Util.notNil($helpers.nodeof(this)));
+    (expect.Util.equal(((arr, index) => { if (index < 0 || index >= arr.length) throw new Error("Index out of bounds"); return arr[index]; })(($helpers.nodeof(this).path.split("/")), 0), "root"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "this.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/this.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/this.test.w_test_sim.md
new file mode 100644
index 00000000000..de768938614
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/this.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [this.test.w](../../../../../examples/tests/valid/this.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ this.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/to_inflight.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/to_inflight.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..4e535330401
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/to_inflight.test.w_compile_tf-aws.md
@@ -0,0 +1,116 @@
+# [to_inflight.test.w](../../../../../examples/tests/valid/to_inflight.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $b.list());
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $b: ${$stdlib.core.liftObject(b)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [b, ["list"]],
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
+      }
+    }
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const x = new $Closure1(this, "$Closure1");
+    const js = (std.Resource.toInflight(x));
+    $helpers.assert(js.includes("client"), "js.contains(\"client\")");
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "to_inflight.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/to_inflight.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/to_inflight.test.w_test_sim.md
new file mode 100644
index 00000000000..e77d70b0ea8
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/to_inflight.test.w_test_sim.md
@@ -0,0 +1,12 @@
+# [to_inflight.test.w](../../../../../examples/tests/valid/to_inflight.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ to_inflight.test.wsim (no tests)
+
+Tests 1 passed (1)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_compile_tf-aws.md
index b27f05f3be0..95648e798ba 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,14 +19,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -50,14 +39,14 @@ class $Root extends $stdlib.std.Resource {
     }
     catch ($error_e) {
       const e = $error_e.message;
-      {((cond) => {if (!cond) throw new Error("assertion failed: e == \"hello\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(e,"hello")))};
+      $helpers.assert($helpers.eq(e, "hello"), "e == \"hello\"");
       x = "caught";
     }
     finally {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == \"caught\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,"caught")))};
+      $helpers.assert($helpers.eq(x, "caught"), "x == \"caught\"");
       x = "finally";
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: x == \"finally\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,"finally")))};
+    $helpers.assert($helpers.eq(x, "finally"), "x == \"finally\"");
     try {
       x = "I got here";
     }
@@ -66,10 +55,10 @@ class $Root extends $stdlib.std.Resource {
       x = "caught";
     }
     finally {
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == \"I got here\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,"I got here")))};
+      $helpers.assert($helpers.eq(x, "I got here"), "x == \"I got here\"");
       x = "finally";
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: x == \"finally\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,"finally")))};
+    $helpers.assert($helpers.eq(x, "finally"), "x == \"finally\"");
     try {
       try {
         throw new Error("hello");
@@ -77,7 +66,7 @@ class $Root extends $stdlib.std.Resource {
       finally {
         x = "finally with no catch";
       }
-      {((cond) => {if (!cond) throw new Error("assertion failed: x == \"finally with no catch\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,"finally with no catch")))};
+      $helpers.assert($helpers.eq(x, "finally with no catch"), "x == \"finally with no catch\"");
     }
     catch {
     }
@@ -86,34 +75,34 @@ class $Root extends $stdlib.std.Resource {
     finally {
       x = "finally with no catch and no exception";
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: x == \"finally with no catch and no exception\"")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(x,"finally with no catch and no exception")))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: (():num => { try {} finally {return 1;}})() == 1")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((() => {
+    $helpers.assert($helpers.eq(x, "finally with no catch and no exception"), "x == \"finally with no catch and no exception\"");
+    $helpers.assert($helpers.eq(((() => {
       try {
       }
       finally {
         return 1;
       }
-    })()),1)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: (():num => { try {throw \"\";} catch {return 2;}})() == 2")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((() => {
+    })()), 1), "(():num => { try {} finally {return 1;}})() == 1");
+    $helpers.assert($helpers.eq(((() => {
       try {
         throw new Error("");
       }
       catch {
         return 2;
       }
-    })()),2)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: (():num => { try {return 3;} finally {}})() == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((() => {
+    })()), 2), "(():num => { try {throw \"\";} catch {return 2;}})() == 2");
+    $helpers.assert($helpers.eq(((() => {
       try {
         return 3;
       }
       finally {
       }
-    })()),3)))};
+    })()), 3), "(():num => { try {return 3;} finally {}})() == 3");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "try_catch.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_test_sim.md
index d1ceb008ce5..d67d81d2f34 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/try_catch.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ try_catch.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/unused_lift.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/unused_lift.test.w_compile_tf-aws.md
new file mode 100644
index 00000000000..b235736da4c
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/unused_lift.test.w_compile_tf-aws.md
@@ -0,0 +1,284 @@
+# [unused_lift.test.w](../../../../../examples/tests/valid/unused_lift.test.w) | compile | tf-aws
+
+## inflight.$Closure1-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $f }) {
+  class $Closure1 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $f.m());
+    }
+  }
+  return $Closure1;
+}
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
+```
+
+## inflight.$Closure2-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $bar }) {
+  class $Closure2 {
+    constructor({  }) {
+      const $obj = (...args) => this.handle(...args);
+      Object.setPrototypeOf($obj, this);
+      return $obj;
+    }
+    async handle() {
+      (await $bar.m());
+    }
+  }
+  return $Closure2;
+}
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
+```
+
+## inflight.Bar-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b }) {
+  class Bar {
+    constructor({  }) {
+    }
+    static async access_b() {
+      (await $b.list());
+    }
+    async m() {
+    }
+  }
+  return Bar;
+}
+//# sourceMappingURL=inflight.Bar-1.cjs.map
+```
+
+## inflight.Foo-1.cjs
+```cjs
+"use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
+module.exports = function({ $b }) {
+  class Foo {
+    constructor({  }) {
+    }
+    async access_b() {
+      (await $b.list());
+    }
+    async m() {
+    }
+  }
+  return Foo;
+}
+//# sourceMappingURL=inflight.Foo-1.cjs.map
+```
+
+## main.tf.json
+```json
+{
+  "//": {
+    "metadata": {
+      "backend": "local",
+      "stackName": "root",
+      "version": "0.20.3"
+    },
+    "outputs": {}
+  },
+  "provider": {
+    "aws": [
+      {}
+    ]
+  },
+  "resource": {
+    "aws_s3_bucket": {
+      "Bucket": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/Default/Bucket/Default",
+            "uniqueId": "Bucket"
+          }
+        },
+        "bucket_prefix": "bucket-c88fdc5f-",
+        "force_destroy": false
+      }
+    }
+  }
+}
+```
+
+## preflight.cjs
+```cjs
+"use strict";
+const $stdlib = require('@winglang/sdk');
+const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
+const $outdir = process.env.WING_SYNTH_DIR ?? ".";
+const $wing_is_test = process.env.WING_IS_TEST === "true";
+const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
+const cloud = $stdlib.cloud;
+class $Root extends $stdlib.std.Resource {
+  constructor($scope, $id) {
+    super($scope, $id);
+    class Foo extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
+            $b: ${$stdlib.core.liftObject(b)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const FooClient = ${Foo._toInflightType()};
+            const client = new FooClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "access_b": [
+            [b, ["list"]],
+          ],
+          "m": [
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
+      }
+    }
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
+            $f: ${$stdlib.core.liftObject(f)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure1Client = ${$Closure1._toInflightType()};
+            const client = new $Closure1Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [f, ["m"]],
+          ],
+          "$inflight_init": [
+            [f, []],
+          ],
+        });
+      }
+    }
+    class Bar extends $stdlib.std.Resource {
+      constructor($scope, $id, ) {
+        super($scope, $id);
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.Bar-1.cjs")({
+            $b: ${$stdlib.core.liftObject(b)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const BarClient = ${Bar._toInflightType()};
+            const client = new BarClient({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "m": [
+          ],
+          "$inflight_init": [
+            [b, []],
+          ],
+        });
+      }
+      static get _liftTypeMap() {
+        return ({
+          "access_b": [
+            [b, ["list"]],
+          ],
+        });
+      }
+    }
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
+      constructor($scope, $id, ) {
+        super($scope, $id);
+        $helpers.nodeof(this).hidden = true;
+      }
+      static _toInflightType() {
+        return `
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
+            $bar: ${$stdlib.core.liftObject(bar)},
+          })
+        `;
+      }
+      _toInflight() {
+        return `
+          (await (async () => {
+            const $Closure2Client = ${$Closure2._toInflightType()};
+            const client = new $Closure2Client({
+            });
+            if (client.$inflight_init) { await client.$inflight_init(); }
+            return client;
+          })())
+        `;
+      }
+      get _liftMap() {
+        return ({
+          "handle": [
+            [bar, ["m"]],
+          ],
+          "$inflight_init": [
+            [bar, []],
+          ],
+        });
+      }
+    }
+    const b = this.node.root.new("@winglang/sdk.cloud.Bucket", cloud.Bucket, this, "Bucket");
+    const f = new Foo(this, "Foo");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Use class but not method that access lifted object", new $Closure1(this, "$Closure1"));
+    const bar = new Bar(this, "Bar");
+    this.node.root.new("@winglang/sdk.std.Test", std.Test, this, "test:Use class but not static method that access lifted object", new $Closure2(this, "$Closure2"));
+  }
+}
+const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
+const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "unused_lift.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
+$APP.synth();
+//# sourceMappingURL=preflight.cjs.map
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/unused_lift.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/unused_lift.test.w_test_sim.md
new file mode 100644
index 00000000000..cf23512dbfe
--- /dev/null
+++ b/tools/hangar/__snapshots__/test_corpus/valid/unused_lift.test.w_test_sim.md
@@ -0,0 +1,13 @@
+# [unused_lift.test.w](../../../../../examples/tests/valid/unused_lift.test.w) | test | sim
+
+## stdout.log
+```log
+pass ─ unused_lift.test.wsim » root/env0/test:Use class but not method that access lifted object       
+pass ─ unused_lift.test.wsim » root/env1/test:Use class but not static method that access lifted object
+
+Tests 2 passed (2)
+Snapshots 1 skipped
+Test Files 1 passed (1)
+Duration <DURATION>
+```
+
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_compile_tf-aws.md
index 747c64cf86f..f374ccee292 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [use_inflight_method_inside_init_closure.test.w](../../../../../examples/tests/valid/use_inflight_method_inside_init_closure.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $__parent_this_1 }) {
   class $Closure1 {
     constructor({  }) {
@@ -16,12 +17,13 @@ module.exports = function({ $__parent_this_1 }) {
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.Foo-1.js
-```js
+## inflight.Foo-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class Foo {
     constructor({  }) {
@@ -31,7 +33,7 @@ module.exports = function({  }) {
   }
   return Foo;
 }
-//# sourceMappingURL=inflight.Foo-1.js.map
+//# sourceMappingURL=inflight.Foo-1.cjs.map
 ```
 
 ## main.tf.json
@@ -41,22 +43,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -65,58 +54,58 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "Foo_cloudFunction_CloudwatchLogGroup_B531638C": {
+      "Foo_Function_CloudwatchLogGroup_1EA3CEF7": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Foo/cloud.Function/CloudwatchLogGroup",
-            "uniqueId": "Foo_cloudFunction_CloudwatchLogGroup_B531638C"
+            "path": "root/Default/Default/Foo/Function/CloudwatchLogGroup",
+            "uniqueId": "Foo_Function_CloudwatchLogGroup_1EA3CEF7"
           }
         },
-        "name": "/aws/lambda/cloud-Function-c8858302",
+        "name": "/aws/lambda/Function-c8e9a190",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "Foo_cloudFunction_IamRole_037E9FB3": {
+      "Foo_Function_IamRole_F86A3AD2": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Foo/cloud.Function/IamRole",
-            "uniqueId": "Foo_cloudFunction_IamRole_037E9FB3"
+            "path": "root/Default/Default/Foo/Function/IamRole",
+            "uniqueId": "Foo_Function_IamRole_F86A3AD2"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "Foo_cloudFunction_IamRolePolicy_70B25789": {
+      "Foo_Function_IamRolePolicy_6E60CEA6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Foo/cloud.Function/IamRolePolicy",
-            "uniqueId": "Foo_cloudFunction_IamRolePolicy_70B25789"
+            "path": "root/Default/Default/Foo/Function/IamRolePolicy",
+            "uniqueId": "Foo_Function_IamRolePolicy_6E60CEA6"
           }
         },
         "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"none:null\",\"Resource\":\"*\"}]}",
-        "role": "${aws_iam_role.Foo_cloudFunction_IamRole_037E9FB3.name}"
+        "role": "${aws_iam_role.Foo_Function_IamRole_F86A3AD2.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "Foo_cloudFunction_IamRolePolicyAttachment_E775DFDC": {
+      "Foo_Function_IamRolePolicyAttachment_3B82E0B3": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Foo/cloud.Function/IamRolePolicyAttachment",
-            "uniqueId": "Foo_cloudFunction_IamRolePolicyAttachment_E775DFDC"
+            "path": "root/Default/Default/Foo/Function/IamRolePolicyAttachment",
+            "uniqueId": "Foo_Function_IamRolePolicyAttachment_3B82E0B3"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.Foo_cloudFunction_IamRole_037E9FB3.name}"
+        "role": "${aws_iam_role.Foo_Function_IamRole_F86A3AD2.name}"
       }
     },
     "aws_lambda_function": {
-      "Foo_cloudFunction_E4309ED7": {
+      "Foo_Function_A6241043": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Foo/cloud.Function/Default",
-            "uniqueId": "Foo_cloudFunction_E4309ED7"
+            "path": "root/Default/Default/Foo/Function/Default",
+            "uniqueId": "Foo_Function_A6241043"
           }
         },
         "architectures": [
@@ -125,18 +114,18 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Function-c8858302",
+            "WING_FUNCTION_NAME": "Function-c8e9a190",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Function-c8858302",
+        "function_name": "Function-c8e9a190",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.Foo_cloudFunction_IamRole_037E9FB3.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Foo_Function_IamRole_F86A3AD2.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.Foo_cloudFunction_S3Object_B910EE1D.key}",
+        "s3_key": "${aws_s3_object.Foo_Function_S3Object_790E7779.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -156,11 +145,11 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "Foo_cloudFunction_S3Object_B910EE1D": {
+      "Foo_Function_S3Object_790E7779": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/Foo/cloud.Function/S3Object",
-            "uniqueId": "Foo_cloudFunction_S3Object_B910EE1D"
+            "path": "root/Default/Default/Foo/Function/S3Object",
+            "uniqueId": "Foo_Function_S3Object_790E7779"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -172,14 +161,16 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
@@ -188,15 +179,15 @@ class $Root extends $stdlib.std.Resource {
       constructor($scope, $id, ) {
         super($scope, $id);
         const __parent_this_1 = this;
-        class $Closure1 extends $stdlib.std.Resource {
-          _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+        class $Closure1 extends $stdlib.std.AutoIdResource {
+          _id = $stdlib.core.closureId();
           constructor($scope, $id, ) {
             super($scope, $id);
-            (std.Node.of(this)).hidden = true;
+            $helpers.nodeof(this).hidden = true;
           }
           static _toInflightType() {
             return `
-              require("./inflight.$Closure1-1.js")({
+              require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
                 $__parent_this_1: ${$stdlib.core.liftObject(__parent_this_1)},
               })
             `;
@@ -204,7 +195,7 @@ class $Root extends $stdlib.std.Resource {
           _toInflight() {
             return `
               (await (async () => {
-                const $Closure1Client = ${$Closure1._toInflightType(this)};
+                const $Closure1Client = ${$Closure1._toInflightType()};
                 const client = new $Closure1Client({
                 });
                 if (client.$inflight_init) { await client.$inflight_init(); }
@@ -212,28 +203,29 @@ class $Root extends $stdlib.std.Resource {
               })())
             `;
           }
-          _supportedOps() {
-            return [...super._supportedOps(), "handle", "$inflight_init"];
-          }
-          _registerOnLift(host, ops) {
-            if (ops.includes("handle")) {
-              $Closure1._registerOnLiftObject(__parent_this_1, host, ["bar"]);
-            }
-            super._registerOnLift(host, ops);
+          get _liftMap() {
+            return ({
+              "handle": [
+                [__parent_this_1, ["bar"]],
+              ],
+              "$inflight_init": [
+                [__parent_this_1, []],
+              ],
+            });
           }
         }
-        this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "cloud.Function", new $Closure1(this, "$Closure1"));
+        this.node.root.new("@winglang/sdk.cloud.Function", cloud.Function, this, "Function", new $Closure1(this, "$Closure1"));
       }
       static _toInflightType() {
         return `
-          require("./inflight.Foo-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.Foo-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const FooClient = ${Foo._toInflightType(this)};
+            const FooClient = ${Foo._toInflightType()};
             const client = new FooClient({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -241,8 +233,13 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "bar", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "bar": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
     new Foo(this, "Foo");
@@ -251,6 +248,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "use_inflight_method_inside_init_closure.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_test_sim.md
index 3388857542b..35210f5c8d4 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/use_inflight_method_inside_init_closure.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ use_inflight_method_inside_init_closure.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_compile_tf-aws.md
index 0c25c36a591..8cbcb5f95bd 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [website_with_api.test.w](../../../../../examples/tests/valid/website_with_api.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $std_Json, $usersTable }) {
   class $Closure1 {
     constructor({  }) {
@@ -11,17 +12,18 @@ module.exports = function({ $std_Json, $usersTable }) {
       return $obj;
     }
     async handle(req) {
-      return ({"body": ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([({"users": (await $usersTable.list())})]), "status": 200});
+      return ({"body": ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(({"users": (await $usersTable.list())})), "status": 200});
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
-## inflight.$Closure2-1.js
-```js
+## inflight.$Closure2-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $std_Json, $usersTable }) {
   class $Closure2 {
     constructor({  }) {
@@ -30,22 +32,23 @@ module.exports = function({ $std_Json, $usersTable }) {
       return $obj;
     }
     async handle(req) {
-      const body = (JSON.parse((req.body ?? "")));
-      if ((((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "name"),"")) || (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "age"),""))) || (((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "id"),"")))) {
-        return ({"body": ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([({"error": "incomplete details"})]), "status": 400});
+      const body = JSON.parse((req.body ?? ""));
+      if ((($helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "name"), "") || $helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "age"), "")) || $helpers.eq(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "id"), ""))) {
+        return ({"body": ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(({"error": "incomplete details"})), "status": 400});
       }
-      (await $usersTable.insert(((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "id")]), body));
-      return ({"body": ((args) => { return JSON.stringify(args[0], null, args[1]?.indent) })([({"user": ((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "id")})]), "status": 201});
+      (await $usersTable.insert(((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "id")), body));
+      return ({"body": ((json, opts) => { return JSON.stringify(json, null, opts?.indent) })(({"user": ((obj, args) => { if (obj[args] === undefined) throw new Error(`Json property "${args}" does not exist`); return obj[args] })(body, "id")})), "status": 201});
     }
   }
   return $Closure2;
 }
-//# sourceMappingURL=inflight.$Closure2-1.js.map
+//# sourceMappingURL=inflight.$Closure2-1.cjs.map
 ```
 
-## inflight.$Closure3-1.js
-```js
+## inflight.$Closure3-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util }) {
   class $Closure3 {
     constructor({  }) {
@@ -66,12 +69,13 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
   }
   return $Closure3;
 }
-//# sourceMappingURL=inflight.$Closure3-1.js.map
+//# sourceMappingURL=inflight.$Closure3-1.cjs.map
 ```
 
-## inflight.$Closure4-1.js
-```js
+## inflight.$Closure4-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util }) {
   class $Closure4 {
     constructor({  }) {
@@ -89,7 +93,7 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
   }
   return $Closure4;
 }
-//# sourceMappingURL=inflight.$Closure4-1.js.map
+//# sourceMappingURL=inflight.$Closure4-1.cjs.map
 ```
 
 ## main.tf.json
@@ -99,25 +103,44 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
     "outputs": {
       "root": {
         "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
+          "Default": {
+            "Api": {
+              "Endpoint": {
+                "Url": "Api_Endpoint_Url_473FEE9F"
+              }
+            },
+            "Website": {
+              "Endpoint": {
+                "Url": "Website_Endpoint_Url_0CC0343F"
+              }
+            }
           }
         }
       }
     }
   },
   "data": {
+    "aws_caller_identity": {
+      "account": {
+        "//": {
+          "metadata": {
+            "path": "root/Default/account",
+            "uniqueId": "account"
+          }
+        }
+      }
+    },
     "aws_iam_policy_document": {
-      "cloudWebsite_AllowDistributionReadOnly_89DC4FD0": {
+      "Website_AllowDistributionReadOnly_24CFF6C0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/AllowDistributionReadOnly",
-            "uniqueId": "cloudWebsite_AllowDistributionReadOnly_89DC4FD0"
+            "path": "root/Default/Default/Website/AllowDistributionReadOnly",
+            "uniqueId": "Website_AllowDistributionReadOnly_24CFF6C0"
           }
         },
         "statement": [
@@ -129,7 +152,7 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
               {
                 "test": "StringEquals",
                 "values": [
-                  "${aws_cloudfront_distribution.cloudWebsite_Distribution_083B5AF9.arn}"
+                  "${aws_cloudfront_distribution.Website_Distribution_5E840E42.arn}"
                 ],
                 "variable": "AWS:SourceArn"
               }
@@ -143,7 +166,7 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
               }
             ],
             "resources": [
-              "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.arn}/*"
+              "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.arn}/*"
             ]
           }
         ]
@@ -161,8 +184,11 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
     }
   },
   "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
+    "Api_Endpoint_Url_473FEE9F": {
+      "value": "https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}"
+    },
+    "Website_Endpoint_Url_0CC0343F": {
+      "value": "https://${aws_cloudfront_distribution.Website_Distribution_5E840E42.domain_name}"
     }
   },
   "provider": {
@@ -172,56 +198,56 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
   },
   "resource": {
     "aws_api_gateway_deployment": {
-      "cloudApi_api_deployment_545514BF": {
+      "Api_api_deployment_7FB64CC4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/deployment",
-            "uniqueId": "cloudApi_api_deployment_545514BF"
+            "path": "root/Default/Default/Api/api/deployment",
+            "uniqueId": "Api_api_deployment_7FB64CC4"
           }
         },
         "lifecycle": {
           "create_before_destroy": true
         },
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "triggers": {
-          "redeployment": "${sha256(aws_api_gateway_rest_api.cloudApi_api_2B334D75.body)}"
+          "redeployment": "${sha256(aws_api_gateway_rest_api.Api_api_91C07D84.body)}"
         }
       }
     },
     "aws_api_gateway_rest_api": {
-      "cloudApi_api_2B334D75": {
+      "Api_api_91C07D84": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/api",
-            "uniqueId": "cloudApi_api_2B334D75"
+            "path": "root/Default/Default/Api/api/api",
+            "uniqueId": "Api_api_91C07D84"
           }
         },
-        "body": "{\"openapi\":\"3.0.3\",\"paths\":{\"/users\":{\"get\":{\"operationId\":\"get-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_get_users_0_2AE0E463.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}},\"post\":{\"operationId\":\"post-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.cloudApi_post_users_0_55074C5B.arn}/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'*'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}}}",
+        "body": "{\"paths\":{\"/users\":{\"get\":{\"operationId\":\"get-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:get_users0-c82bfbcd/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}},\"post\":{\"operationId\":\"post-users\",\"responses\":{\"200\":{\"description\":\"200 response\",\"content\":{},\"headers\":{\"Access-Control-Allow-Origin\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Methods\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Allow-Headers\":{\"schema\":{\"type\":\"string\"}},\"Access-Control-Max-Age\":{\"schema\":{\"type\":\"string\"}}}}},\"parameters\":[],\"x-amazon-apigateway-integration\":{\"uri\":\"arn:aws:apigateway:${data.aws_region.Region.name}:lambda:path/2015-03-31/functions/arn:aws:lambda:${data.aws_region.Region.name}:${data.aws_caller_identity.account.account_id}:function:post_users0-c8ae30d9/invocations\",\"type\":\"aws_proxy\",\"httpMethod\":\"POST\",\"responses\":{\"default\":{\"statusCode\":\"200\"}},\"passthroughBehavior\":\"when_no_match\",\"contentHandling\":\"CONVERT_TO_TEXT\"}}},\"/{proxy+}\":{\"x-amazon-apigateway-any-method\":{\"produces\":[\"application/json\"],\"x-amazon-apigateway-integration\":{\"type\":\"mock\",\"requestTemplates\":{\"application/json\":\"\\n                #if ($context.httpMethod == \\\"OPTIONS\\\")\\n                    {\\\"statusCode\\\": 204}\\n                #else\\n                    {\\\"statusCode\\\": 404}\\n                #end\\n              \"},\"passthroughBehavior\":\"never\",\"responses\":{\"204\":{\"statusCode\":\"204\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\",\"method.response.header.Access-Control-Allow-Origin\":\"'*'\",\"method.response.header.Access-Control-Allow-Methods\":\"'GET,POST,OPTIONS'\",\"method.response.header.Access-Control-Allow-Headers\":\"'Content-Type'\"},\"responseTemplates\":{\"application/json\":\"{}\"}},\"404\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}},\"default\":{\"statusCode\":\"404\",\"responseParameters\":{\"method.response.header.Content-Type\":\"'application/json'\"},\"responseTemplates\":{\"application/json\":\"{\\\"statusCode\\\": 404, \\\"message\\\": \\\"Error: Resource not found\\\"}\"}}}},\"responses\":{\"204\":{\"description\":\"204 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"},\"Access-Control-Allow-Origin\":{\"type\":\"string\"},\"Access-Control-Allow-Methods\":{\"type\":\"string\"},\"Access-Control-Allow-Headers\":{\"type\":\"string\"}}},\"404\":{\"description\":\"404 response\",\"headers\":{\"Content-Type\":{\"type\":\"string\"}}}}}}},\"openapi\":\"3.0.3\"}",
         "lifecycle": {
           "create_before_destroy": true
         },
-        "name": "api-c895068c"
+        "name": "api-c8f613f0"
       }
     },
     "aws_api_gateway_stage": {
-      "cloudApi_api_stage_BBB283E4": {
+      "Api_api_stage_E0FA39D6": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/stage",
-            "uniqueId": "cloudApi_api_stage_BBB283E4"
+            "path": "root/Default/Default/Api/api/stage",
+            "uniqueId": "Api_api_stage_E0FA39D6"
           }
         },
-        "deployment_id": "${aws_api_gateway_deployment.cloudApi_api_deployment_545514BF.id}",
-        "rest_api_id": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}",
+        "deployment_id": "${aws_api_gateway_deployment.Api_api_deployment_7FB64CC4.id}",
+        "rest_api_id": "${aws_api_gateway_rest_api.Api_api_91C07D84.id}",
         "stage_name": "prod"
       }
     },
     "aws_cloudfront_distribution": {
-      "cloudWebsite_Distribution_083B5AF9": {
+      "Website_Distribution_5E840E42": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/Distribution",
-            "uniqueId": "cloudWebsite_Distribution_083B5AF9"
+            "path": "root/Default/Default/Website/Distribution",
+            "uniqueId": "Website_Distribution_5E840E42"
           }
         },
         "default_cache_behavior": {
@@ -250,8 +276,8 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
         "enabled": true,
         "origin": [
           {
-            "domain_name": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket_regional_domain_name}",
-            "origin_access_control_id": "${aws_cloudfront_origin_access_control.cloudWebsite_CloudfrontOac_C956968B.id}",
+            "domain_name": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket_regional_domain_name}",
+            "origin_access_control_id": "${aws_cloudfront_origin_access_control.Website_CloudfrontOac_756836A4.id}",
             "origin_id": "s3Origin"
           }
         ],
@@ -268,47 +294,47 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
       }
     },
     "aws_cloudfront_origin_access_control": {
-      "cloudWebsite_CloudfrontOac_C956968B": {
+      "Website_CloudfrontOac_756836A4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/CloudfrontOac",
-            "uniqueId": "cloudWebsite_CloudfrontOac_C956968B"
+            "path": "root/Default/Default/Website/CloudfrontOac",
+            "uniqueId": "Website_CloudfrontOac_756836A4"
           }
         },
-        "name": "cloud-We-c8e58765-cloudfront-oac",
+        "name": "Website-c80d509a-cloudfront-oac",
         "origin_access_control_origin_type": "s3",
         "signing_behavior": "always",
         "signing_protocol": "sigv4"
       }
     },
     "aws_cloudwatch_log_group": {
-      "cloudApi_get_users_0_CloudwatchLogGroup_3B48E5DE": {
+      "Api_get_users0_CloudwatchLogGroup_6649CB35": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_get_users_0_CloudwatchLogGroup_3B48E5DE"
+            "path": "root/Default/Default/Api/get_users0/CloudwatchLogGroup",
+            "uniqueId": "Api_get_users0_CloudwatchLogGroup_6649CB35"
           }
         },
-        "name": "/aws/lambda/get_users_-0-c81e9ef5",
+        "name": "/aws/lambda/get_users0-c82bfbcd",
         "retention_in_days": 30
       },
-      "cloudApi_post_users_0_CloudwatchLogGroup_5D0DD061": {
+      "Api_post_users0_CloudwatchLogGroup_9A416640": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_users_}0/CloudwatchLogGroup",
-            "uniqueId": "cloudApi_post_users_0_CloudwatchLogGroup_5D0DD061"
+            "path": "root/Default/Default/Api/post_users0/CloudwatchLogGroup",
+            "uniqueId": "Api_post_users0_CloudwatchLogGroup_9A416640"
           }
         },
-        "name": "/aws/lambda/post_users_-0-c8954ba2",
+        "name": "/aws/lambda/post_users0-c8ae30d9",
         "retention_in_days": 30
       }
     },
     "aws_dynamodb_table": {
-      "exTable": {
+      "Table": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/ex.Table/Default",
-            "uniqueId": "exTable"
+            "path": "root/Default/Default/Table/Default",
+            "uniqueId": "Table"
           }
         },
         "attribute": [
@@ -319,79 +345,82 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
         ],
         "billing_mode": "PAY_PER_REQUEST",
         "hash_key": "id",
-        "name": "users-tableex.Table-c840a49c"
+        "name": "users-tableTable-c89b2d37",
+        "point_in_time_recovery": {
+          "enabled": true
+        }
       }
     },
     "aws_iam_role": {
-      "cloudApi_get_users_0_IamRole_195BA791": {
+      "Api_get_users0_IamRole_950ACE40": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRole",
-            "uniqueId": "cloudApi_get_users_0_IamRole_195BA791"
+            "path": "root/Default/Default/Api/get_users0/IamRole",
+            "uniqueId": "Api_get_users0_IamRole_950ACE40"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       },
-      "cloudApi_post_users_0_IamRole_DBAAEFC8": {
+      "Api_post_users0_IamRole_B6E18B7C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_users_}0/IamRole",
-            "uniqueId": "cloudApi_post_users_0_IamRole_DBAAEFC8"
+            "path": "root/Default/Default/Api/post_users0/IamRole",
+            "uniqueId": "Api_post_users0_IamRole_B6E18B7C"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudApi_get_users_0_IamRolePolicy_A314FA0E": {
+      "Api_get_users0_IamRolePolicy_1C96E6D8": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_get_users_0_IamRolePolicy_A314FA0E"
+            "path": "root/Default/Default/Api/get_users0/IamRolePolicy",
+            "uniqueId": "Api_get_users0_IamRolePolicy_1C96E6D8"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:Scan\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:Scan\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.name}"
       },
-      "cloudApi_post_users_0_IamRolePolicy_BD08D837": {
+      "Api_post_users0_IamRolePolicy_32ED25A9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_users_}0/IamRolePolicy",
-            "uniqueId": "cloudApi_post_users_0_IamRolePolicy_BD08D837"
+            "path": "root/Default/Default/Api/post_users0/IamRolePolicy",
+            "uniqueId": "Api_post_users0_IamRolePolicy_32ED25A9"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.exTable.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudApi_post_users_0_IamRole_DBAAEFC8.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"dynamodb:PutItem\"],\"Resource\":[\"${aws_dynamodb_table.Table.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Api_post_users0_IamRole_B6E18B7C.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudApi_get_users_0_IamRolePolicyAttachment_AF3BAAF7": {
+      "Api_get_users0_IamRolePolicyAttachment_EB78BB64": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_get_users_0_IamRolePolicyAttachment_AF3BAAF7"
+            "path": "root/Default/Default/Api/get_users0/IamRolePolicyAttachment",
+            "uniqueId": "Api_get_users0_IamRolePolicyAttachment_EB78BB64"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.name}"
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.name}"
       },
-      "cloudApi_post_users_0_IamRolePolicyAttachment_34C726E1": {
+      "Api_post_users0_IamRolePolicyAttachment_F08ACD31": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_users_}0/IamRolePolicyAttachment",
-            "uniqueId": "cloudApi_post_users_0_IamRolePolicyAttachment_34C726E1"
+            "path": "root/Default/Default/Api/post_users0/IamRolePolicyAttachment",
+            "uniqueId": "Api_post_users0_IamRolePolicyAttachment_F08ACD31"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudApi_post_users_0_IamRole_DBAAEFC8.name}"
+        "role": "${aws_iam_role.Api_post_users0_IamRole_B6E18B7C.name}"
       }
     },
     "aws_lambda_function": {
-      "cloudApi_get_users_0_2AE0E463": {
+      "Api_get_users0_F1BDFB04": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/Default",
-            "uniqueId": "cloudApi_get_users_0_2AE0E463"
+            "path": "root/Default/Default/Api/get_users0/Default",
+            "uniqueId": "Api_get_users0_F1BDFB04"
           }
         },
         "architectures": [
@@ -399,33 +428,33 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"id\":0,\"name\":0,\"age\":1}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "id",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"id\":0,\"name\":0,\"age\":1}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "get_users_-0-c81e9ef5",
+            "WING_FUNCTION_NAME": "get_users0-c82bfbcd",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "get_users_-0-c81e9ef5",
+        "function_name": "get_users0-c82bfbcd",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_get_users_0_IamRole_195BA791.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_get_users0_IamRole_950ACE40.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_get_users_0_S3Object_AE113D52.key}",
+        "s3_key": "${aws_s3_object.Api_get_users0_S3Object_5E4DF6D1.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
         }
       },
-      "cloudApi_post_users_0_55074C5B": {
+      "Api_post_users0_7459F559": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_users_}0/Default",
-            "uniqueId": "cloudApi_post_users_0_55074C5B"
+            "path": "root/Default/Default/Api/post_users0/Default",
+            "uniqueId": "Api_post_users0_7459F559"
           }
         },
         "architectures": [
@@ -433,22 +462,22 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
         ],
         "environment": {
           "variables": {
-            "DYNAMODB_TABLE_NAME_d5d44f18": "${aws_dynamodb_table.exTable.name}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_COLUMNS": "{\"id\":0,\"name\":0,\"age\":1}",
-            "DYNAMODB_TABLE_NAME_d5d44f18_PRIMARY_KEY": "id",
+            "DYNAMODB_TABLE_NAME_e7245baa": "${aws_dynamodb_table.Table.name}",
+            "DYNAMODB_TABLE_NAME_e7245baa_COLUMNS": "{\"id\":0,\"name\":0,\"age\":1}",
+            "DYNAMODB_TABLE_NAME_e7245baa_PRIMARY_KEY": "id",
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "post_users_-0-c8954ba2",
+            "WING_FUNCTION_NAME": "post_users0-c8ae30d9",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "post_users_-0-c8954ba2",
+        "function_name": "post_users0-c8ae30d9",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudApi_post_users_0_IamRole_DBAAEFC8.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Api_post_users0_IamRole_B6E18B7C.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudApi_post_users_0_S3Object_6B0A181C.key}",
+        "s3_key": "${aws_s3_object.Api_post_users0_S3Object_8FA5AEB9.key}",
         "timeout": 60,
         "vpc_config": {
           "security_group_ids": [],
@@ -457,30 +486,30 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
       }
     },
     "aws_lambda_permission": {
-      "cloudApi_api_permission-GET-41f0e61d_DD9B4FD0": {
+      "Api_api_permission-GET-41f0e61d_AD17285B": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-GET-41f0e61d",
-            "uniqueId": "cloudApi_api_permission-GET-41f0e61d_DD9B4FD0"
+            "path": "root/Default/Default/Api/api/permission-GET-41f0e61d",
+            "uniqueId": "Api_api_permission-GET-41f0e61d_AD17285B"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_get_users_0_2AE0E463.function_name}",
+        "function_name": "${aws_lambda_function.Api_get_users0_F1BDFB04.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/GET/users",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/GET/users",
         "statement_id": "AllowExecutionFromAPIGateway-GET-41f0e61d"
       },
-      "cloudApi_api_permission-POST-41f0e61d_743604B6": {
+      "Api_api_permission-POST-41f0e61d_3C9809C9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/api/permission-POST-41f0e61d",
-            "uniqueId": "cloudApi_api_permission-POST-41f0e61d_743604B6"
+            "path": "root/Default/Default/Api/api/permission-POST-41f0e61d",
+            "uniqueId": "Api_api_permission-POST-41f0e61d_3C9809C9"
           }
         },
         "action": "lambda:InvokeFunction",
-        "function_name": "${aws_lambda_function.cloudApi_post_users_0_55074C5B.function_name}",
+        "function_name": "${aws_lambda_function.Api_post_users0_7459F559.function_name}",
         "principal": "apigateway.amazonaws.com",
-        "source_arn": "${aws_api_gateway_rest_api.cloudApi_api_2B334D75.execution_arn}/*/POST/users",
+        "source_arn": "${aws_api_gateway_rest_api.Api_api_91C07D84.execution_arn}/*/POST/users",
         "statement_id": "AllowExecutionFromAPIGateway-POST-41f0e61d"
       }
     },
@@ -494,94 +523,94 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
         },
         "bucket_prefix": "code-c84a50b1-"
       },
-      "cloudWebsite_WebsiteBucket_EB03D355": {
+      "Website_WebsiteBucket_3C0321F0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/WebsiteBucket",
-            "uniqueId": "cloudWebsite_WebsiteBucket_EB03D355"
+            "path": "root/Default/Default/Website/WebsiteBucket",
+            "uniqueId": "Website_WebsiteBucket_3C0321F0"
           }
         },
-        "bucket_prefix": "cloud-website-c8e58765-",
+        "bucket_prefix": "website-c80d509a-",
         "force_destroy": false
       }
     },
     "aws_s3_bucket_policy": {
-      "cloudWebsite_DistributionS3BucketPolicy_32B029AE": {
+      "Website_DistributionS3BucketPolicy_09AE0BCA": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/DistributionS3BucketPolicy",
-            "uniqueId": "cloudWebsite_DistributionS3BucketPolicy_32B029AE"
+            "path": "root/Default/Default/Website/DistributionS3BucketPolicy",
+            "uniqueId": "Website_DistributionS3BucketPolicy_09AE0BCA"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.id}",
-        "policy": "${data.aws_iam_policy_document.cloudWebsite_AllowDistributionReadOnly_89DC4FD0.json}"
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.id}",
+        "policy": "${data.aws_iam_policy_document.Website_AllowDistributionReadOnly_24CFF6C0.json}"
       }
     },
     "aws_s3_bucket_website_configuration": {
-      "cloudWebsite_BucketWebsiteConfiguration_920E8E41": {
+      "Website_BucketWebsiteConfiguration_58F891B4": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/BucketWebsiteConfiguration",
-            "uniqueId": "cloudWebsite_BucketWebsiteConfiguration_920E8E41"
+            "path": "root/Default/Default/Website/BucketWebsiteConfiguration",
+            "uniqueId": "Website_BucketWebsiteConfiguration_58F891B4"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "index_document": {
           "suffix": "index.html"
         }
       }
     },
     "aws_s3_object": {
-      "cloudApi_get_users_0_S3Object_AE113D52": {
+      "Api_get_users0_S3Object_5E4DF6D1": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/get_users_}0/S3Object",
-            "uniqueId": "cloudApi_get_users_0_S3Object_AE113D52"
+            "path": "root/Default/Default/Api/get_users0/S3Object",
+            "uniqueId": "Api_get_users0_S3Object_5E4DF6D1"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudApi_post_users_0_S3Object_6B0A181C": {
+      "Api_post_users0_S3Object_8FA5AEB9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Api/post_users_}0/S3Object",
-            "uniqueId": "cloudApi_post_users_0_S3Object_6B0A181C"
+            "path": "root/Default/Default/Api/post_users0/S3Object",
+            "uniqueId": "Api_post_users0_S3Object_8FA5AEB9"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
         "key": "<ASSET_KEY>",
         "source": "<ASSET_SOURCE>"
       },
-      "cloudWebsite_File--indexhtml_2A2AE13C": {
+      "Website_File--indexhtml_864F8C36": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File--index.html",
-            "uniqueId": "cloudWebsite_File--indexhtml_2A2AE13C"
+            "path": "root/Default/Default/Website/File--index.html",
+            "uniqueId": "Website_File--indexhtml_864F8C36"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
         "content_type": "text/html; charset=utf-8",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "/index.html",
         "source": "<SOURCE>",
         "source_hash": "${filemd5(<SOURCE>)}"
       },
-      "cloudWebsite_File-configjson_591A81BA": {
+      "Website_File-configjson_1F1498B9": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Website/File-config.json",
-            "uniqueId": "cloudWebsite_File-configjson_591A81BA"
+            "path": "root/Default/Default/Website/File-config.json",
+            "uniqueId": "Website_File-configjson_1F1498B9"
           }
         },
-        "bucket": "${aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355.bucket}",
-        "content": "{\"apiUrl\":\"https://${aws_api_gateway_rest_api.cloudApi_api_2B334D75.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.cloudApi_api_stage_BBB283E4.stage_name}\"}",
+        "bucket": "${aws_s3_bucket.Website_WebsiteBucket_3C0321F0.bucket}",
+        "content": "{\"apiUrl\":\"https://${aws_api_gateway_rest_api.Api_api_91C07D84.id}.execute-api.${data.aws_region.Region.name}.amazonaws.com/${aws_api_gateway_stage.Api_api_stage_E0FA39D6.stage_name}\"}",
         "content_type": "application/json",
         "depends_on": [
-          "aws_s3_bucket.cloudWebsite_WebsiteBucket_EB03D355"
+          "aws_s3_bucket.Website_WebsiteBucket_3C0321F0"
         ],
         "key": "config.json"
       }
@@ -590,14 +619,16 @@ module.exports = function({ $api_url, $expect_Util, $http_HttpMethod, $http_Util
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 const ex = $stdlib.ex;
 const http = $stdlib.http;
@@ -605,15 +636,15 @@ const expect = $stdlib.expect;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
             $usersTable: ${$stdlib.core.liftObject(usersTable)},
           })
@@ -622,7 +653,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -630,25 +661,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure1._registerOnLiftObject(usersTable, host, ["list"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [usersTable, ["list"]],
+          ],
+          "$inflight_init": [
+            [usersTable, []],
+          ],
+        });
       }
     }
-    class $Closure2 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure2 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure2-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure2-1.cjs")({
             $std_Json: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(std.Json, "@winglang/sdk/std", "Json"))},
             $usersTable: ${$stdlib.core.liftObject(usersTable)},
           })
@@ -657,7 +689,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure2Client = ${$Closure2._toInflightType(this)};
+            const $Closure2Client = ${$Closure2._toInflightType()};
             const client = new $Closure2Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -665,25 +697,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure2._registerOnLiftObject(usersTable, host, ["insert"]);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [usersTable, ["insert"]],
+          ],
+          "$inflight_init": [
+            [usersTable, []],
+          ],
+        });
       }
     }
-    class $Closure3 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure3 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure3-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure3-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $http_HttpMethod: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.HttpMethod, "@winglang/sdk/http", "HttpMethod"))},
@@ -694,7 +727,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure3Client = ${$Closure3._toInflightType(this)};
+            const $Closure3Client = ${$Closure3._toInflightType()};
             const client = new $Closure3Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -702,25 +735,26 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure3._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
-    class $Closure4 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure4 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure4-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure4-1.cjs")({
             $api_url: ${$stdlib.core.liftObject(api.url)},
             $expect_Util: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(expect.Util, "@winglang/sdk/expect", "Util"))},
             $http_HttpMethod: ${$stdlib.core.liftObject($stdlib.core.toLiftableModuleType(http.HttpMethod, "@winglang/sdk/http", "HttpMethod"))},
@@ -731,7 +765,7 @@ class $Root extends $stdlib.std.Resource {
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure4Client = ${$Closure4._toInflightType(this)};
+            const $Closure4Client = ${$Closure4._toInflightType()};
             const client = new $Closure4Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -739,19 +773,20 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
-      }
-      _registerOnLift(host, ops) {
-        if (ops.includes("handle")) {
-          $Closure4._registerOnLiftObject(api.url, host, []);
-        }
-        super._registerOnLift(host, ops);
+      get _liftMap() {
+        return ({
+          "handle": [
+            [api.url, []],
+          ],
+          "$inflight_init": [
+            [api.url, []],
+          ],
+        });
       }
     }
-    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "cloud.Api", { cors: true, corsOptions: ({"allowOrigin": ["*"], "allowMethods": [cloud.HttpMethod.GET, cloud.HttpMethod.POST, cloud.HttpMethod.OPTIONS], "allowHeaders": ["Content-Type"], "allowCredentials": false, "exposeHeaders": ["Content-Type"], "maxAge": (std.Duration.fromSeconds(600))}) });
-    const website = this.node.root.new("@winglang/sdk.cloud.Website", cloud.Website, this, "cloud.Website", { path: "./website_with_api" });
-    const usersTable = this.node.root.new("@winglang/sdk.ex.Table", ex.Table, this, "ex.Table", { name: "users-table", primaryKey: "id", columns: ({["id"]: ex.ColumnType.STRING, ["name"]: ex.ColumnType.STRING, ["age"]: ex.ColumnType.NUMBER}) });
+    const api = this.node.root.new("@winglang/sdk.cloud.Api", cloud.Api, this, "Api", { cors: true, corsOptions: ({"allowOrigin": "*", "allowMethods": [cloud.HttpMethod.GET, cloud.HttpMethod.POST, cloud.HttpMethod.OPTIONS], "allowHeaders": ["Content-Type"], "allowCredentials": false, "exposeHeaders": ["Content-Type"], "maxAge": (std.Duration.fromSeconds(600))}) });
+    const website = this.node.root.new("@winglang/sdk.cloud.Website", cloud.Website, this, "Website", { path: "./website_with_api" });
+    const usersTable = this.node.root.new("@winglang/sdk.ex.Table", ex.Table, this, "Table", { name: "users-table", primaryKey: "id", columns: ({["id"]: ex.ColumnType.STRING, ["name"]: ex.ColumnType.STRING, ["age"]: ex.ColumnType.NUMBER}) });
     const getHandler = new $Closure1(this, "$Closure1");
     const postHandler = new $Closure2(this, "$Closure2");
     (api.get("/users", getHandler));
@@ -764,6 +799,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "website_with_api.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_test_sim.md
index 41fe94cfb02..9168eb92697 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/website_with_api.test.w_test_sim.md
@@ -2,11 +2,13 @@
 
 ## stdout.log
 ```log
+[INFO] GET --users | Website server listening on http://<IP>:<PORT>
+[INFO] OPTIONS --users | Website server listening on http://<IP>:<PORT>
 pass ─ website_with_api.test.wsim » root/env0/test:GET --users    
 pass ─ website_with_api.test.wsim » root/env1/test:OPTIONS --users
- 
- 
+
 Tests 2 passed (2)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_compile_tf-aws.md
index a5fe663989f..da069f993dc 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_compile_tf-aws.md
@@ -7,22 +7,9 @@
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -32,14 +19,16 @@
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
@@ -57,7 +46,7 @@ class $Root extends $stdlib.std.Resource {
         break;
       }
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: z == 3")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(z,3)))};
+    $helpers.assert($helpers.eq(z, 3), "z == 3");
     while (true) {
       break;
     }
@@ -65,18 +54,18 @@ class $Root extends $stdlib.std.Resource {
     let i = 0;
     while ((i < 10)) {
       i = (i + 1);
-      if ((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })((i % 2),0))) {
+      if ($helpers.eq((i % 2), 0)) {
         continue;
       }
       v = (v + 1);
     }
-    {((cond) => {if (!cond) throw new Error("assertion failed: i == 10")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(i,10)))};
-    {((cond) => {if (!cond) throw new Error("assertion failed: v == 5")})((((a,b) => { try { return require('assert').deepStrictEqual(a,b) === undefined; } catch { return false; } })(v,5)))};
+    $helpers.assert($helpers.eq(i, 10), "i == 10");
+    $helpers.assert($helpers.eq(v, 5), "v == 5");
   }
 }
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "while.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_test_sim.md
index 73beb4e3522..3b57ebab756 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/while.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ while.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_compile_tf-aws.md b/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_compile_tf-aws.md
index 69cc1768d96..5baaa695c11 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_compile_tf-aws.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_compile_tf-aws.md
@@ -1,8 +1,9 @@
 # [while_loop_await.test.w](../../../../../examples/tests/valid/while_loop_await.test.w) | compile | tf-aws
 
-## inflight.$Closure1-1.js
-```js
+## inflight.$Closure1-1.cjs
+```cjs
 "use strict";
+const $helpers = require("@winglang/sdk/lib/helpers");
 module.exports = function({  }) {
   class $Closure1 {
     constructor({  }) {
@@ -12,17 +13,17 @@ module.exports = function({  }) {
     }
     async handle(body) {
       const i = 0;
-      const iterator = async (j) => {
+      const iterator = (async (j) => {
         return (j + 1);
-      };
+      });
       while (((await iterator(i)) < 3)) {
-        {console.log(String.raw({ raw: ["", ""] }, i))};
+        console.log(String.raw({ raw: ["", ""] }, i));
       }
     }
   }
   return $Closure1;
 }
-//# sourceMappingURL=inflight.$Closure1-1.js.map
+//# sourceMappingURL=inflight.$Closure1-1.cjs.map
 ```
 
 ## main.tf.json
@@ -32,22 +33,9 @@ module.exports = function({  }) {
     "metadata": {
       "backend": "local",
       "stackName": "root",
-      "version": "0.17.0"
+      "version": "0.20.3"
     },
-    "outputs": {
-      "root": {
-        "Default": {
-          "cloud.TestRunner": {
-            "TestFunctionArns": "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS"
-          }
-        }
-      }
-    }
-  },
-  "output": {
-    "WING_TEST_RUNNER_FUNCTION_IDENTIFIERS": {
-      "value": "[]"
-    }
+    "outputs": {}
   },
   "provider": {
     "aws": [
@@ -56,71 +44,74 @@ module.exports = function({  }) {
   },
   "resource": {
     "aws_cloudwatch_log_group": {
-      "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419": {
+      "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
-            "uniqueId": "cloudQueue-SetConsumer0_CloudwatchLogGroup_FCFCF419"
+            "path": "root/Default/Default/Queue-SetConsumer0/CloudwatchLogGroup",
+            "uniqueId": "Queue-SetConsumer0_CloudwatchLogGroup_56C2891C"
           }
         },
-        "name": "/aws/lambda/cloud-Queue-SetConsumer0-c8b576c9",
+        "name": "/aws/lambda/Queue-SetConsumer0-c83c303c",
         "retention_in_days": 30
       }
     },
     "aws_iam_role": {
-      "cloudQueue-SetConsumer0_IamRole_968DB138": {
+      "Queue-SetConsumer0_IamRole_7F9ED9ED": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRole",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRole_968DB138"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRole",
+            "uniqueId": "Queue-SetConsumer0_IamRole_7F9ED9ED"
           }
         },
         "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":\"sts:AssumeRole\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Effect\":\"Allow\"}]}"
       }
     },
     "aws_iam_role_policy": {
-      "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517": {
+      "Queue-SetConsumer0_IamRolePolicy_0299B5AB": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicy",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicy_3E29E517"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicy",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicy_0299B5AB"
           }
         },
-        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.cloudQueue.arn}\"],\"Effect\":\"Allow\"}]}",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"sqs:ReceiveMessage\",\"sqs:ChangeMessageVisibility\",\"sqs:GetQueueUrl\",\"sqs:DeleteMessage\",\"sqs:GetQueueAttributes\"],\"Resource\":[\"${aws_sqs_queue.Queue.arn}\"],\"Effect\":\"Allow\"}]}",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_iam_role_policy_attachment": {
-      "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A": {
+      "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
-            "uniqueId": "cloudQueue-SetConsumer0_IamRolePolicyAttachment_B207137A"
+            "path": "root/Default/Default/Queue-SetConsumer0/IamRolePolicyAttachment",
+            "uniqueId": "Queue-SetConsumer0_IamRolePolicyAttachment_4A4C5C5D"
           }
         },
         "policy_arn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.name}"
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.name}"
       }
     },
     "aws_lambda_event_source_mapping": {
-      "cloudQueue_EventSourceMapping_41814136": {
+      "Queue_EventSourceMapping_8332F7DC": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/EventSourceMapping",
-            "uniqueId": "cloudQueue_EventSourceMapping_41814136"
+            "path": "root/Default/Default/Queue/EventSourceMapping",
+            "uniqueId": "Queue_EventSourceMapping_8332F7DC"
           }
         },
         "batch_size": 1,
-        "event_source_arn": "${aws_sqs_queue.cloudQueue.arn}",
-        "function_name": "${aws_lambda_function.cloudQueue-SetConsumer0.function_name}"
+        "event_source_arn": "${aws_sqs_queue.Queue.arn}",
+        "function_name": "${aws_lambda_function.Queue-SetConsumer0.function_name}",
+        "function_response_types": [
+          "ReportBatchItemFailures"
+        ]
       }
     },
     "aws_lambda_function": {
-      "cloudQueue-SetConsumer0": {
+      "Queue-SetConsumer0": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/Default",
-            "uniqueId": "cloudQueue-SetConsumer0"
+            "path": "root/Default/Default/Queue-SetConsumer0/Default",
+            "uniqueId": "Queue-SetConsumer0"
           }
         },
         "architectures": [
@@ -129,19 +120,19 @@ module.exports = function({  }) {
         "environment": {
           "variables": {
             "NODE_OPTIONS": "--enable-source-maps",
-            "WING_FUNCTION_NAME": "cloud-Queue-SetConsumer0-c8b576c9",
+            "WING_FUNCTION_NAME": "Queue-SetConsumer0-c83c303c",
             "WING_TARGET": "tf-aws"
           }
         },
-        "function_name": "cloud-Queue-SetConsumer0-c8b576c9",
+        "function_name": "Queue-SetConsumer0-c83c303c",
         "handler": "index.handler",
         "memory_size": 1024,
         "publish": true,
-        "role": "${aws_iam_role.cloudQueue-SetConsumer0_IamRole_968DB138.arn}",
-        "runtime": "nodejs18.x",
+        "role": "${aws_iam_role.Queue-SetConsumer0_IamRole_7F9ED9ED.arn}",
+        "runtime": "nodejs20.x",
         "s3_bucket": "${aws_s3_bucket.Code.bucket}",
-        "s3_key": "${aws_s3_object.cloudQueue-SetConsumer0_S3Object_52D070FF.key}",
-        "timeout": "${aws_sqs_queue.cloudQueue.visibility_timeout_seconds}",
+        "s3_key": "${aws_s3_object.Queue-SetConsumer0_S3Object_2AD0A795.key}",
+        "timeout": "${aws_sqs_queue.Queue.visibility_timeout_seconds}",
         "vpc_config": {
           "security_group_ids": [],
           "subnet_ids": []
@@ -160,11 +151,11 @@ module.exports = function({  }) {
       }
     },
     "aws_s3_object": {
-      "cloudQueue-SetConsumer0_S3Object_52D070FF": {
+      "Queue-SetConsumer0_S3Object_2AD0A795": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue-SetConsumer0/S3Object",
-            "uniqueId": "cloudQueue-SetConsumer0_S3Object_52D070FF"
+            "path": "root/Default/Default/Queue-SetConsumer0/S3Object",
+            "uniqueId": "Queue-SetConsumer0_S3Object_2AD0A795"
           }
         },
         "bucket": "${aws_s3_bucket.Code.bucket}",
@@ -173,15 +164,15 @@ module.exports = function({  }) {
       }
     },
     "aws_sqs_queue": {
-      "cloudQueue": {
+      "Queue": {
         "//": {
           "metadata": {
-            "path": "root/Default/Default/cloud.Queue/Default",
-            "uniqueId": "cloudQueue"
+            "path": "root/Default/Default/Queue/Default",
+            "uniqueId": "Queue"
           }
         },
         "message_retention_seconds": 3600,
-        "name": "cloud-Queue-c86e03d8",
+        "name": "Queue-c822c726",
         "visibility_timeout_seconds": 30
       }
     }
@@ -189,34 +180,36 @@ module.exports = function({  }) {
 }
 ```
 
-## preflight.js
-```js
+## preflight.cjs
+```cjs
 "use strict";
 const $stdlib = require('@winglang/sdk');
 const $platforms = ((s) => !s ? [] : s.split(';'))(process.env.WING_PLATFORMS);
 const $outdir = process.env.WING_SYNTH_DIR ?? ".";
 const $wing_is_test = process.env.WING_IS_TEST === "true";
 const std = $stdlib.std;
+const $helpers = $stdlib.helpers;
+const $extern = $helpers.createExternRequire(__dirname);
 const cloud = $stdlib.cloud;
 class $Root extends $stdlib.std.Resource {
   constructor($scope, $id) {
     super($scope, $id);
-    class $Closure1 extends $stdlib.std.Resource {
-      _hash = require('crypto').createHash('md5').update(this._toInflight()).digest('hex');
+    class $Closure1 extends $stdlib.std.AutoIdResource {
+      _id = $stdlib.core.closureId();
       constructor($scope, $id, ) {
         super($scope, $id);
-        (std.Node.of(this)).hidden = true;
+        $helpers.nodeof(this).hidden = true;
       }
       static _toInflightType() {
         return `
-          require("./inflight.$Closure1-1.js")({
+          require("${$helpers.normalPath(__dirname)}/inflight.$Closure1-1.cjs")({
           })
         `;
       }
       _toInflight() {
         return `
           (await (async () => {
-            const $Closure1Client = ${$Closure1._toInflightType(this)};
+            const $Closure1Client = ${$Closure1._toInflightType()};
             const client = new $Closure1Client({
             });
             if (client.$inflight_init) { await client.$inflight_init(); }
@@ -224,11 +217,16 @@ class $Root extends $stdlib.std.Resource {
           })())
         `;
       }
-      _supportedOps() {
-        return [...super._supportedOps(), "handle", "$inflight_init"];
+      get _liftMap() {
+        return ({
+          "handle": [
+          ],
+          "$inflight_init": [
+          ],
+        });
       }
     }
-    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "cloud.Queue");
+    const queue = this.node.root.new("@winglang/sdk.cloud.Queue", cloud.Queue, this, "Queue");
     const handler = new $Closure1(this, "$Closure1");
     (queue.setConsumer(handler));
   }
@@ -236,6 +234,6 @@ class $Root extends $stdlib.std.Resource {
 const $PlatformManager = new $stdlib.platform.PlatformManager({platformPaths: $platforms});
 const $APP = $PlatformManager.createApp({ outdir: $outdir, name: "while_loop_await.test", rootConstruct: $Root, isTestEnvironment: $wing_is_test, entrypointDir: process.env['WING_SOURCE_DIR'], rootId: process.env['WING_ROOT_ID'] });
 $APP.synth();
-//# sourceMappingURL=preflight.js.map
+//# sourceMappingURL=preflight.cjs.map
 ```
 
diff --git a/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_test_sim.md b/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_test_sim.md
index 771d4cbb115..e86209acc21 100644
--- a/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_test_sim.md
+++ b/tools/hangar/__snapshots__/test_corpus/valid/while_loop_await.test.w_test_sim.md
@@ -3,9 +3,9 @@
 ## stdout.log
 ```log
 pass ─ while_loop_await.test.wsim (no tests)
- 
- 
+
 Tests 1 passed (1)
+Snapshots 1 skipped
 Test Files 1 passed (1)
 Duration <DURATION>
 ```
diff --git a/tools/hangar/__snapshots__/tree_json.ts.snap b/tools/hangar/__snapshots__/tree_json.ts.snap
index 0d85a4ea311..2714d9cf470 100644
--- a/tools/hangar/__snapshots__/tree_json.ts.snap
+++ b/tools/hangar/__snapshots__/tree_json.ts.snap
@@ -11,48 +11,50 @@ exports[`tree.json for an app with many resources 1`] = `
               "Code": {
                 "constructInfo": {
                   "fqn": "cdktf.TerraformResource",
-                  "version": "0.17.0",
+                  "version": "0.20.3",
                 },
+                "display": {},
                 "id": "Code",
                 "path": "root/Default/Code",
               },
               "Default": {
                 "children": {
-                  "$Closure1": {
+                  "$Closure1_0": {
                     "constructInfo": {
-                      "fqn": "@winglang/sdk.std.Resource",
+                      "fqn": "@winglang/sdk.std.AutoIdResource",
                       "version": "0.0.0",
                     },
                     "display": {
                       "hidden": true,
                     },
-                    "id": "$Closure1",
-                    "path": "root/Default/Default/$Closure1",
+                    "id": "$Closure1_0",
+                    "path": "root/Default/Default/$Closure1_0",
                   },
-                  "$Closure5": {
+                  "$Closure5_0": {
                     "constructInfo": {
-                      "fqn": "@winglang/sdk.std.Resource",
+                      "fqn": "@winglang/sdk.std.AutoIdResource",
                       "version": "0.0.0",
                     },
                     "display": {
                       "hidden": true,
                     },
-                    "id": "$Closure5",
-                    "path": "root/Default/Default/$Closure5",
+                    "id": "$Closure5_0",
+                    "path": "root/Default/Default/$Closure5_0",
                   },
                   "Bar": {
                     "children": {
                       "Foo": {
                         "children": {
-                          "cloud.Counter": {
+                          "Counter": {
                             "children": {
                               "Default": {
                                 "constructInfo": {
                                   "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
+                                  "version": "0.20.3",
                                 },
+                                "display": {},
                                 "id": "Default",
-                                "path": "root/Default/Default/Bar/Foo/cloud.Counter/Default",
+                                "path": "root/Default/Default/Bar/Foo/Counter/Default",
                               },
                             },
                             "constructInfo": {
@@ -63,8 +65,8 @@ exports[`tree.json for an app with many resources 1`] = `
                               "description": "A distributed atomic counter",
                               "title": "Counter",
                             },
-                            "id": "cloud.Counter",
-                            "path": "root/Default/Default/Bar/Foo/cloud.Counter",
+                            "id": "Counter",
+                            "path": "root/Default/Default/Bar/Foo/Counter",
                           },
                         },
                         "constructInfo": {
@@ -86,194 +88,49 @@ exports[`tree.json for an app with many resources 1`] = `
                   },
                   "BigPublisher": {
                     "children": {
-                      "$Closure2": {
+                      "$Closure2_0": {
                         "constructInfo": {
-                          "fqn": "@winglang/sdk.std.Resource",
+                          "fqn": "@winglang/sdk.std.AutoIdResource",
                           "version": "0.0.0",
                         },
                         "display": {
                           "hidden": true,
                         },
-                        "id": "$Closure2",
-                        "path": "root/Default/Default/BigPublisher/$Closure2",
+                        "id": "$Closure2_0",
+                        "path": "root/Default/Default/BigPublisher/$Closure2_0",
                       },
-                      "$Closure3": {
+                      "$Closure3_0": {
                         "constructInfo": {
-                          "fqn": "@winglang/sdk.std.Resource",
+                          "fqn": "@winglang/sdk.std.AutoIdResource",
                           "version": "0.0.0",
                         },
                         "display": {
                           "hidden": true,
                         },
-                        "id": "$Closure3",
-                        "path": "root/Default/Default/BigPublisher/$Closure3",
+                        "id": "$Closure3_0",
+                        "path": "root/Default/Default/BigPublisher/$Closure3_0",
                       },
-                      "$Closure4": {
+                      "$Closure4_0": {
                         "constructInfo": {
-                          "fqn": "@winglang/sdk.std.Resource",
+                          "fqn": "@winglang/sdk.std.AutoIdResource",
                           "version": "0.0.0",
                         },
                         "display": {
                           "hidden": true,
                         },
-                        "id": "$Closure4",
-                        "path": "root/Default/Default/BigPublisher/$Closure4",
+                        "id": "$Closure4_0",
+                        "path": "root/Default/Default/BigPublisher/$Closure4_0",
                       },
-                      "b2": {
+                      "Bucket": {
                         "children": {
                           "Default": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
-                            },
-                            "id": "Default",
-                            "path": "root/Default/Default/BigPublisher/b2/Default",
-                          },
-                          "S3BucketNotification": {
-                            "constructInfo": {
-                              "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
-                            },
-                            "id": "S3BucketNotification",
-                            "path": "root/Default/Default/BigPublisher/b2/S3BucketNotification",
-                          },
-                          "oncreate": {
-                            "children": {
-                              "Default": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "Default",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate/Default",
-                              },
-                              "PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate/PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad",
-                              },
-                              "TopicSubscription0": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "TopicSubscription0",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate/TopicSubscription0",
-                              },
-                            },
-                            "constructInfo": {
-                              "fqn": "@winglang/sdk.cloud.Topic",
-                              "version": "0.0.0",
-                            },
-                            "display": {
-                              "description": "A pub/sub notification topic",
-                              "title": "Topic",
-                            },
-                            "id": "oncreate",
-                            "path": "root/Default/Default/BigPublisher/b2/oncreate",
-                          },
-                          "oncreate-OnMessage0": {
-                            "children": {
-                              "Asset": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformAsset",
-                                  "version": "0.17.0",
-                                },
-                                "id": "Asset",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/Asset",
-                              },
-                              "CloudwatchLogGroup": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "CloudwatchLogGroup",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/CloudwatchLogGroup",
-                              },
-                              "Default": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "Default",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/Default",
-                              },
-                              "IamRole": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "IamRole",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/IamRole",
-                              },
-                              "IamRolePolicy": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "IamRolePolicy",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/IamRolePolicy",
-                              },
-                              "IamRolePolicyAttachment": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "IamRolePolicyAttachment",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/IamRolePolicyAttachment",
-                              },
-                              "InvokePermission-c849e824f9ffcc17825860cf0b7344a60826b3ba1a": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "InvokePermission-c849e824f9ffcc17825860cf0b7344a60826b3ba1a",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/InvokePermission-c849e824f9ffcc17825860cf0b7344a60826b3ba1a",
-                              },
-                              "S3Object": {
-                                "constructInfo": {
-                                  "fqn": "cdktf.TerraformResource",
-                                  "version": "0.17.0",
-                                },
-                                "id": "S3Object",
-                                "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0/S3Object",
-                              },
-                            },
-                            "constructInfo": {
-                              "fqn": "@winglang/sdk.cloud.Function",
-                              "version": "0.0.0",
-                            },
-                            "display": {
-                              "description": "A cloud function (FaaS)",
-                              "title": "Function",
-                            },
-                            "id": "oncreate-OnMessage0",
-                            "path": "root/Default/Default/BigPublisher/b2/oncreate-OnMessage0",
-                          },
-                        },
-                        "constructInfo": {
-                          "fqn": "@winglang/sdk.cloud.Bucket",
-                          "version": "0.0.0",
-                        },
-                        "display": {
-                          "description": "A cloud object store",
-                          "title": "Bucket",
-                        },
-                        "id": "b2",
-                        "path": "root/Default/Default/BigPublisher/b2",
-                      },
-                      "cloud.Bucket": {
-                        "children": {
-                          "Default": {
-                            "constructInfo": {
-                              "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "Default",
-                            "path": "root/Default/Default/BigPublisher/cloud.Bucket/Default",
+                            "path": "root/Default/Default/BigPublisher/Bucket/Default",
                           },
                         },
                         "constructInfo": {
@@ -284,26 +141,28 @@ exports[`tree.json for an app with many resources 1`] = `
                           "description": "A cloud object store",
                           "title": "Bucket",
                         },
-                        "id": "cloud.Bucket",
-                        "path": "root/Default/Default/BigPublisher/cloud.Bucket",
+                        "id": "Bucket",
+                        "path": "root/Default/Default/BigPublisher/Bucket",
                       },
-                      "cloud.Queue": {
+                      "Queue": {
                         "children": {
                           "Default": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "Default",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue/Default",
+                            "path": "root/Default/Default/BigPublisher/Queue/Default",
                           },
                           "EventSourceMapping": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "EventSourceMapping",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue/EventSourceMapping",
+                            "path": "root/Default/Default/BigPublisher/Queue/EventSourceMapping",
                           },
                         },
                         "constructInfo": {
@@ -314,66 +173,73 @@ exports[`tree.json for an app with many resources 1`] = `
                           "description": "A distributed message queue",
                           "title": "Queue",
                         },
-                        "id": "cloud.Queue",
-                        "path": "root/Default/Default/BigPublisher/cloud.Queue",
+                        "id": "Queue",
+                        "path": "root/Default/Default/BigPublisher/Queue",
                       },
-                      "cloud.Queue-SetConsumer0": {
+                      "Queue-SetConsumer0": {
                         "children": {
                           "Asset": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformAsset",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "Asset",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/Asset",
+                            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/Asset",
                           },
                           "CloudwatchLogGroup": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "CloudwatchLogGroup",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/CloudwatchLogGroup",
+                            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/CloudwatchLogGroup",
                           },
                           "Default": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "Default",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/Default",
+                            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/Default",
                           },
                           "IamRole": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "IamRole",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/IamRole",
+                            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/IamRole",
                           },
                           "IamRolePolicy": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "IamRolePolicy",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/IamRolePolicy",
+                            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/IamRolePolicy",
                           },
                           "IamRolePolicyAttachment": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "IamRolePolicyAttachment",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/IamRolePolicyAttachment",
+                            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/IamRolePolicyAttachment",
                           },
                           "S3Object": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "S3Object",
-                            "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0/S3Object",
+                            "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0/S3Object",
                           },
                         },
                         "constructInfo": {
@@ -384,26 +250,28 @@ exports[`tree.json for an app with many resources 1`] = `
                           "description": "A cloud function (FaaS)",
                           "title": "Function",
                         },
-                        "id": "cloud.Queue-SetConsumer0",
-                        "path": "root/Default/Default/BigPublisher/cloud.Queue-SetConsumer0",
+                        "id": "Queue-SetConsumer0",
+                        "path": "root/Default/Default/BigPublisher/Queue-SetConsumer0",
                       },
-                      "cloud.Topic": {
+                      "Topic": {
                         "children": {
                           "Default": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "Default",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic/Default",
+                            "path": "root/Default/Default/BigPublisher/Topic/Default",
                           },
                           "TopicSubscription0": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "TopicSubscription0",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic/TopicSubscription0",
+                            "path": "root/Default/Default/BigPublisher/Topic/TopicSubscription0",
                           },
                         },
                         "constructInfo": {
@@ -414,74 +282,82 @@ exports[`tree.json for an app with many resources 1`] = `
                           "description": "A pub/sub notification topic",
                           "title": "Topic",
                         },
-                        "id": "cloud.Topic",
-                        "path": "root/Default/Default/BigPublisher/cloud.Topic",
+                        "id": "Topic",
+                        "path": "root/Default/Default/BigPublisher/Topic",
                       },
-                      "cloud.Topic-OnMessage0": {
+                      "Topic-OnMessage0": {
                         "children": {
                           "Asset": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformAsset",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "Asset",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/Asset",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/Asset",
                           },
                           "CloudwatchLogGroup": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "CloudwatchLogGroup",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/CloudwatchLogGroup",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/CloudwatchLogGroup",
                           },
                           "Default": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "Default",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/Default",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/Default",
                           },
                           "IamRole": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "IamRole",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/IamRole",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/IamRole",
                           },
                           "IamRolePolicy": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "IamRolePolicy",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/IamRolePolicy",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/IamRolePolicy",
                           },
                           "IamRolePolicyAttachment": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "IamRolePolicyAttachment",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/IamRolePolicyAttachment",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/IamRolePolicyAttachment",
                           },
-                          "InvokePermission-c86b6469dec0edbe23d2827b4ea7006182eb0072ec": {
+                          "InvokePermission-c884cd53ef51dde6112319447c29f4ea9473f19e6a": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
-                            "id": "InvokePermission-c86b6469dec0edbe23d2827b4ea7006182eb0072ec",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/InvokePermission-c86b6469dec0edbe23d2827b4ea7006182eb0072ec",
+                            "display": {},
+                            "id": "InvokePermission-c884cd53ef51dde6112319447c29f4ea9473f19e6a",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/InvokePermission-c884cd53ef51dde6112319447c29f4ea9473f19e6a",
                           },
                           "S3Object": {
                             "constructInfo": {
                               "fqn": "cdktf.TerraformResource",
-                              "version": "0.17.0",
+                              "version": "0.20.3",
                             },
+                            "display": {},
                             "id": "S3Object",
-                            "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0/S3Object",
+                            "path": "root/Default/Default/BigPublisher/Topic-OnMessage0/S3Object",
                           },
                         },
                         "constructInfo": {
@@ -492,8 +368,167 @@ exports[`tree.json for an app with many resources 1`] = `
                           "description": "A cloud function (FaaS)",
                           "title": "Function",
                         },
-                        "id": "cloud.Topic-OnMessage0",
-                        "path": "root/Default/Default/BigPublisher/cloud.Topic-OnMessage0",
+                        "id": "Topic-OnMessage0",
+                        "path": "root/Default/Default/BigPublisher/Topic-OnMessage0",
+                      },
+                      "b2": {
+                        "children": {
+                          "Default": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "Default",
+                            "path": "root/Default/Default/BigPublisher/b2/Default",
+                          },
+                          "OnCreate": {
+                            "children": {
+                              "Default": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "Default",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate/Default",
+                              },
+                              "PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate/PublishPermission-c851683a81379a8ef8351c83fe31924055584271ad",
+                              },
+                              "TopicSubscription0": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "TopicSubscription0",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate/TopicSubscription0",
+                              },
+                            },
+                            "constructInfo": {
+                              "fqn": "@winglang/sdk.cloud.Topic",
+                              "version": "0.0.0",
+                            },
+                            "display": {
+                              "description": "A pub/sub notification topic",
+                              "title": "Topic",
+                            },
+                            "id": "OnCreate",
+                            "path": "root/Default/Default/BigPublisher/b2/OnCreate",
+                          },
+                          "OnCreate-OnMessage0": {
+                            "children": {
+                              "Asset": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformAsset",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "Asset",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/Asset",
+                              },
+                              "CloudwatchLogGroup": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "CloudwatchLogGroup",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/CloudwatchLogGroup",
+                              },
+                              "Default": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "Default",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/Default",
+                              },
+                              "IamRole": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "IamRole",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/IamRole",
+                              },
+                              "IamRolePolicy": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "IamRolePolicy",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/IamRolePolicy",
+                              },
+                              "IamRolePolicyAttachment": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "IamRolePolicyAttachment",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/IamRolePolicyAttachment",
+                              },
+                              "InvokePermission-c8957161bd24a9a75910007bdeef4fc517fd85b21a": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "InvokePermission-c8957161bd24a9a75910007bdeef4fc517fd85b21a",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/InvokePermission-c8957161bd24a9a75910007bdeef4fc517fd85b21a",
+                              },
+                              "S3Object": {
+                                "constructInfo": {
+                                  "fqn": "cdktf.TerraformResource",
+                                  "version": "0.20.3",
+                                },
+                                "display": {},
+                                "id": "S3Object",
+                                "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0/S3Object",
+                              },
+                            },
+                            "constructInfo": {
+                              "fqn": "@winglang/sdk.cloud.Function",
+                              "version": "0.0.0",
+                            },
+                            "display": {
+                              "description": "A cloud function (FaaS)",
+                              "title": "Function",
+                            },
+                            "id": "OnCreate-OnMessage0",
+                            "path": "root/Default/Default/BigPublisher/b2/OnCreate-OnMessage0",
+                          },
+                          "S3BucketNotification": {
+                            "constructInfo": {
+                              "fqn": "cdktf.TerraformResource",
+                              "version": "0.20.3",
+                            },
+                            "display": {},
+                            "id": "S3BucketNotification",
+                            "path": "root/Default/Default/BigPublisher/b2/S3BucketNotification",
+                          },
+                        },
+                        "constructInfo": {
+                          "fqn": "@winglang/sdk.cloud.Bucket",
+                          "version": "0.0.0",
+                        },
+                        "display": {
+                          "description": "A cloud object store",
+                          "title": "Bucket",
+                        },
+                        "id": "b2",
+                        "path": "root/Default/Default/BigPublisher/b2",
                       },
                     },
                     "constructInfo": {
@@ -504,6 +539,29 @@ exports[`tree.json for an app with many resources 1`] = `
                     "id": "BigPublisher",
                     "path": "root/Default/Default/BigPublisher",
                   },
+                  "Bucket": {
+                    "children": {
+                      "Default": {
+                        "constructInfo": {
+                          "fqn": "cdktf.TerraformResource",
+                          "version": "0.20.3",
+                        },
+                        "display": {},
+                        "id": "Default",
+                        "path": "root/Default/Default/Bucket/Default",
+                      },
+                    },
+                    "constructInfo": {
+                      "fqn": "@winglang/sdk.cloud.Bucket",
+                      "version": "0.0.0",
+                    },
+                    "display": {
+                      "description": "A cloud object store",
+                      "title": "Bucket",
+                    },
+                    "id": "Bucket",
+                    "path": "root/Default/Default/Bucket",
+                  },
                   "ScopeAndIdTestClass": {
                     "children": {
                       "Dummy": {
@@ -584,28 +642,6 @@ exports[`tree.json for an app with many resources 1`] = `
                     "id": "ScopeAndIdTestClass",
                     "path": "root/Default/Default/ScopeAndIdTestClass",
                   },
-                  "cloud.Bucket": {
-                    "children": {
-                      "Default": {
-                        "constructInfo": {
-                          "fqn": "cdktf.TerraformResource",
-                          "version": "0.17.0",
-                        },
-                        "id": "Default",
-                        "path": "root/Default/Default/cloud.Bucket/Default",
-                      },
-                    },
-                    "constructInfo": {
-                      "fqn": "@winglang/sdk.cloud.Bucket",
-                      "version": "0.0.0",
-                    },
-                    "display": {
-                      "description": "A cloud object store",
-                      "title": "Bucket",
-                    },
-                    "id": "cloud.Bucket",
-                    "path": "root/Default/Default/cloud.Bucket",
-                  },
                   "test:dependency cycles": {
                     "constructInfo": {
                       "fqn": "@winglang/sdk.std.Test",
@@ -613,6 +649,7 @@ exports[`tree.json for an app with many resources 1`] = `
                     },
                     "display": {
                       "description": "A cloud unit test.",
+                      "hidden": true,
                       "title": "Test",
                     },
                     "id": "test:dependency cycles",
@@ -625,6 +662,7 @@ exports[`tree.json for an app with many resources 1`] = `
                     },
                     "display": {
                       "description": "A cloud unit test.",
+                      "hidden": true,
                       "title": "Test",
                     },
                     "id": "test:test",
@@ -639,66 +677,59 @@ exports[`tree.json for an app with many resources 1`] = `
                 "id": "Default",
                 "path": "root/Default/Default",
               },
-              "aws": {
-                "constructInfo": {
-                  "fqn": "cdktf.TerraformProvider",
-                  "version": "0.17.0",
-                },
-                "id": "aws",
-                "path": "root/Default/aws",
-              },
-              "cloud.TestRunner": {
-                "children": {
-                  "TestFunctionArns": {
-                    "constructInfo": {
-                      "fqn": "cdktf.TerraformOutput",
-                      "version": "0.17.0",
-                    },
-                    "id": "TestFunctionArns",
-                    "path": "root/Default/cloud.TestRunner/TestFunctionArns",
-                  },
-                },
+              "ParameterRegistrar": {
                 "constructInfo": {
-                  "fqn": "@winglang/sdk.std.TestRunner",
+                  "fqn": "@winglang/sdk.platform.ParameterRegistrar",
                   "version": "0.0.0",
                 },
                 "display": {
-                  "description": "A suite of APIs for running tests and collecting results.",
                   "hidden": true,
-                  "title": "TestRunner",
                 },
-                "id": "cloud.TestRunner",
-                "path": "root/Default/cloud.TestRunner",
+                "id": "ParameterRegistrar",
+                "path": "root/Default/ParameterRegistrar",
+              },
+              "aws": {
+                "constructInfo": {
+                  "fqn": "cdktf.TerraformProvider",
+                  "version": "0.20.3",
+                },
+                "display": {},
+                "id": "aws",
+                "path": "root/Default/aws",
               },
             },
             "constructInfo": {
               "fqn": "@winglang/sdk.core.App",
               "version": "0.0.0",
             },
+            "display": {},
             "id": "Default",
             "path": "root/Default",
           },
           "backend": {
             "constructInfo": {
               "fqn": "cdktf.LocalBackend",
-              "version": "0.17.0",
+              "version": "0.20.3",
             },
+            "display": {},
             "id": "backend",
             "path": "root/backend",
           },
         },
         "constructInfo": {
           "fqn": "cdktf.TerraformStack",
-          "version": "0.17.0",
+          "version": "0.20.3",
         },
+        "display": {},
         "id": "root",
         "path": "root",
       },
     },
     "constructInfo": {
       "fqn": "cdktf.App",
-      "version": "0.17.0",
+      "version": "0.20.3",
     },
+    "display": {},
     "id": "App",
     "path": "",
   },
diff --git a/tools/hangar/package.json b/tools/hangar/package.json
index 33a16375061..852e2807ca2 100644
--- a/tools/hangar/package.json
+++ b/tools/hangar/package.json
@@ -3,10 +3,12 @@
   "version": "0.0.0",
   "description": "wing test suite",
   "scripts": {
+    "vitest": "vitest run",
     "test": "vitest run --update",
     "test:generate": "tsx src/generate_tests.ts",
+    "test:doc_examples": "vitest run src/test_corpus/doc_examples",
     "test:watch": "vitest watch",
-    "bench": "vitest bench --run"
+    "bench": "vitest bench --run && tsx src/benchmarking/compare_script.ts"
   },
   "author": "Wing Cloud",
   "license": "Apache-2.0",
@@ -18,13 +20,14 @@
     "@winglang/compiler": "workspace:^",
     "@winglang/sdk": "workspace:^",
     "@winglang/platform-awscdk": "workspace:^",
-    "cdktf": "^0.17.3",
+    "@winglang/compatibility-spy": "workspace:^",
+    "cdktf": "^0.20.3",
     "execa": "^7.2.0",
     "fflate": "^0.8.1",
     "npm": "^9.8.1",
-    "octokit": "^3.1.0",
-    "tsx": "^3.12.8",
-    "vitest": "^0.34.5",
+    "octokit": "^3.1.2",
+    "tsx": "^4.7.0",
+    "vitest": "^1.6.0",
     "winglang": "workspace:^",
     "yaml": "^2.3.2"
   },
diff --git a/tools/hangar/src/benchmarking/cli.bench.ts b/tools/hangar/src/benchmarking/cli.bench.ts
index 526dc90b18a..95cf88979be 100644
--- a/tools/hangar/src/benchmarking/cli.bench.ts
+++ b/tools/hangar/src/benchmarking/cli.bench.ts
@@ -1,9 +1,17 @@
 import { basename } from "path";
 import { bench, describe } from "vitest";
 import { runWingCommand } from "../utils";
-import { benchmarksTestDir, walkdir } from "../paths";
+import { join } from "path";
+import { rename } from "fs/promises";
+import { benchmarksTestDir, walkdir, resultsDir } from "../paths";
 
 describe("compile", async () => {
+  // if there is a report.json file in ../../results, rename it to report.previous.json
+  // this is so we can compare the current run with the last run
+  const currentReportPath = join(resultsDir, "report.json");
+  const lastReportPath = join(resultsDir, "report.previous.json");
+  await rename(currentReportPath, lastReportPath).catch(() => {});
+
   bench("version", async () => {
     await runWingCommand({
       cwd: benchmarksTestDir,
diff --git a/tools/hangar/src/benchmarking/compare.ts b/tools/hangar/src/benchmarking/compare.ts
index 1f19a7c66e5..328ece76770 100644
--- a/tools/hangar/src/benchmarking/compare.ts
+++ b/tools/hangar/src/benchmarking/compare.ts
@@ -1,8 +1,10 @@
 import { readFileSync, appendFileSync } from "fs";
 import { parseRoundedJson } from "./util";
-import { getBenchForBranch, upsertPRComment } from "./github";
+import { upsertPRComment } from "./github";
 import { createTable } from "./table_report";
 
+const MINIMUM_INTERESTING_PERCENTAGE = 3;
+
 interface ProcessedBenchData {
   mean: number;
   moe: number;
@@ -10,6 +12,20 @@ interface ProcessedBenchData {
   name: string;
 }
 
+interface Deltas {
+  meanBefore: number;
+  moeBefore: number;
+  meanAfter: number;
+  moeAfter: number;
+  maxSD: number;
+  meanDiff: number;
+  meanPercentDiff: number;
+}
+
+interface DifferentialBenches {
+  [testName: string]: Deltas;
+}
+
 function avgBenches(
   benchList: any[]
 ): Record<string, ProcessedBenchData | undefined> {
@@ -49,27 +65,19 @@ function avgBenches(
 function getLocalBench(filename: string) {
   try {
     const benchData = parseRoundedJson(readFileSync(filename, "utf-8"));
-    return [benchData.testResults.compile];
+    return [benchData.files[0].groups[0].benchmarks];
   } catch (e) {
     console.warn(`Could not find local bench file ${filename}`);
     return [];
   }
 }
 
-async function getDataFromSource(source: string) {
-  if (source.startsWith(".") || source.startsWith("/")) {
-    return getLocalBench(source);
-  } else {
-    return await getBenchForBranch(source);
-  }
-}
-
 export async function compareBenchmarks(
   previousSource: string,
   targetSource: string
-) {
-  const previousResult = await getDataFromSource(previousSource);
-  const targetResult = await getDataFromSource(targetSource);
+): Promise<DifferentialBenches> {
+  const previousResult = getLocalBench(previousSource);
+  const targetResult = getLocalBench(targetSource);
 
   const previousBench = avgBenches(previousResult);
   const targetBench = avgBenches(targetResult);
@@ -86,22 +94,23 @@ export async function compareBenchmarks(
     }
   };
 
-  const differences: Record<string, any> = {};
+  const differences: DifferentialBenches = {};
 
   for (const [itemName, newData] of Object.entries(targetBench)) {
     const oldData = previousBench[itemName];
 
-    differences[itemName] = {};
+    differences[itemName] = {} as Deltas;
+
     differences[itemName].moeBefore = oldData?.moe ?? NaN;
     differences[itemName].meanBefore = oldData?.mean ?? NaN;
 
     differences[itemName].moeAfter = newData?.moe ?? NaN;
     differences[itemName].meanAfter = newData?.mean ?? NaN;
 
-    differences[itemName].maxSD = Math.max(
+    differences[itemName].maxSD = Math.round(Math.max(
       newData?.sd ?? NaN,
       oldData?.sd ?? NaN
-    ) * 1.5;
+    ) * 1.5);
 
     differences[itemName].meanDiff =
       Math.round(
@@ -121,6 +130,8 @@ export async function compareBenchmarks(
   markdown += `| :-- | --: | --: | --: |\n`;
   let colors = "";
 
+  let hasInterestingResults = false;
+
   for (const key in differences) {
     const diff = differences[key];
     let prependSign = "";
@@ -132,8 +143,10 @@ export async function compareBenchmarks(
       appendColor = "🟩";
     }
 
-    if (Math.abs(diff.meanDiff) <= diff.maxSD) {
+    if (diff.meanPercentDiff <= MINIMUM_INTERESTING_PERCENTAGE) {
       appendColor = "⬜";
+    } else {
+      hasInterestingResults = true;
     }
 
     colors += appendColor;
@@ -172,7 +185,7 @@ export async function compareBenchmarks(
 
     const prNumber = parseInt(process.env.BENCH_PR ?? "");
 
-    if (prNumber) {
+    if (hasInterestingResults && prNumber) {
       const comment = `\
 ## Benchmarks
 
@@ -207,3 +220,20 @@ ${createTable(targetResult[0])}
 
   return differences;
 }
+
+export async function checkThreshold(differences: DifferentialBenches, threshold: number) {
+  let hasFailures = false;
+  for (const testName in differences) {
+    const diff = differences[testName];
+    if (diff.meanPercentDiff > threshold) {
+      console.error(
+        `(Above ${threshold}%) "${testName}" increased by ${diff.meanPercentDiff}%`
+      );
+      hasFailures = true;
+    }
+  }
+
+  if (hasFailures) {
+    process.exit(1);
+  }
+}
\ No newline at end of file
diff --git a/tools/hangar/src/benchmarking/compare_script.ts b/tools/hangar/src/benchmarking/compare_script.ts
new file mode 100644
index 00000000000..8a2a2079b64
--- /dev/null
+++ b/tools/hangar/src/benchmarking/compare_script.ts
@@ -0,0 +1,28 @@
+// Use `pnpm bench` (or `turbo bench`) to run this script
+
+import { checkThreshold, compareBenchmarks } from "./compare";
+import { resultsDir } from "../paths";
+import { join } from "path";
+import { existsSync } from "fs";
+
+(async () => {
+  const currentReportSource = join(resultsDir, "report.json");
+  const previousReportSource = join(resultsDir, "report.previous.json");
+
+  if (!existsSync(previousReportSource)) {
+    return;
+  }
+
+  const differences = await compareBenchmarks(
+    currentReportSource,
+    previousReportSource
+  );
+
+  // check if we should fail the build
+  const failThreshold = process.env.BENCH_FAIL_THRESHOLD_PERCENT;
+
+  if (failThreshold !== undefined) {
+    const threshold = parseFloat(failThreshold);
+    await checkThreshold(differences, threshold);
+  }
+})();
diff --git a/tools/hangar/src/benchmarking/github.ts b/tools/hangar/src/benchmarking/github.ts
index 833a04d514b..804dafd1272 100644
--- a/tools/hangar/src/benchmarking/github.ts
+++ b/tools/hangar/src/benchmarking/github.ts
@@ -1,6 +1,4 @@
 import { Octokit } from "octokit";
-import { unzipSync } from "fflate";
-import { parseRoundedJson } from "./util";
 
 export const CURRENT_REPO_FULL = process.env.GITHUB_REPOSITORY ?? "winglang/wing";
 export const CURRENT_REPO_OWNER = CURRENT_REPO_FULL.split("/")[0];
@@ -54,60 +52,3 @@ export async function upsertPRComment(
     });
   }
 }
-
-export async function getBenchForBranch(
-  branch: string,
-  count: number = 1
-): Promise<any[]> {
-  const octokit = getOctokit();
-
-  const {
-    data: { workflow_runs },
-  } = await octokit.actions.listWorkflowRuns({
-    ...CURRENT_REPO,
-    workflow_id: "build.yml",
-    branch,
-    status: "completed",
-    per_page: 30,
-  });
-
-  const benchResults = [];
-
-  for (const run of workflow_runs.filter((r) => r.conclusion === "success")) {
-    const {
-      data: { artifacts },
-    } = await octokit.actions.listWorkflowRunArtifacts({
-      ...CURRENT_REPO,
-      run_id: run.id,
-    });
-
-    let bench = artifacts.find((artifact) => artifact.name === "benchmarks");
-
-    if (bench) {
-      const { url } = await octokit.actions.downloadArtifact({
-        ...CURRENT_REPO,
-        artifact_id: bench.id,
-        archive_format: "zip",
-      });
-
-      // fetch and unzip
-      const zipData = await fetch(url).then((res) => res.arrayBuffer());
-      // arraybuffer to uint8array
-      const unzipped = unzipSync(new Uint8Array(zipData));
-
-      // get the file
-      const benchFile = unzipped["report.json"];
-
-      if (benchFile) {
-        const benchData = new TextDecoder().decode(benchFile);
-        const benchJson = parseRoundedJson(benchData);
-        benchResults.push(benchJson.testResults.compile);
-        if (benchResults.length === count) {
-          break;
-        }
-      }
-    }
-  }
-
-  return benchResults;
-}
diff --git a/tools/hangar/src/benchmarking/reporter.ts b/tools/hangar/src/benchmarking/reporter.ts
deleted file mode 100644
index 00445c2600e..00000000000
--- a/tools/hangar/src/benchmarking/reporter.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Reporter, BenchmarkReportsMap } from "vitest/reporters";
-import { join } from "path";
-import { hangarDir } from "../paths";
-import { renameSync, existsSync } from "fs";
-import { printTable } from "./table_report";
-import { compareBenchmarks } from "./compare";
-
-export default class WingJsonReporter
-  extends BenchmarkReportsMap.json
-  implements Reporter
-{
-  async writeReport(report: string): Promise<void> {
-    // If there is an existing report, move it
-    const currentReportPath = join(hangarDir, "results", "report.json");
-    const lastReportPath = join(hangarDir, "results", "last_report.json");
-
-    try {
-      renameSync(currentReportPath, lastReportPath);
-    } catch (_) {}
-
-    await super.writeReport(report);
-
-    const jsonData = JSON.parse(report, (_, value) => {
-      if (typeof value === "number") {
-        return Math.round(value * 100) / 100;
-      }
-      return value;
-    });
-
-    await printTable(jsonData);
-
-    let previousReportSource = process.env.BENCH_COMPARE_PREVIOUS;
-
-    if (!previousReportSource && existsSync(lastReportPath)) {
-      previousReportSource = lastReportPath;
-    }
-
-    if (previousReportSource) {
-      const differences = await compareBenchmarks(
-        previousReportSource,
-        currentReportPath
-      );
-
-      // check if we should fail the build
-      const failThreshold = process.env.BENCH_FAIL_THRESHOLD_PERCENT;
-
-      if (failThreshold) {
-        let hasFailures = false;
-        const threshold = parseFloat(failThreshold);
-        for (const testName in differences) {
-          const diff = differences[testName];
-          if (diff.meanPercentDiff > threshold) {
-            console.error(
-              `(Above ${threshold}%) "${testName}" increased by ${diff.meanPercentDiff}%`
-            );
-            hasFailures = true;
-          }
-        }
-
-        if (hasFailures) {
-          process.exit(1);
-        }
-      }
-    }
-  }
-}
diff --git a/tools/hangar/src/compatibility-spy.test.ts b/tools/hangar/src/compatibility-spy.test.ts
new file mode 100644
index 00000000000..f20cf25f5e2
--- /dev/null
+++ b/tools/hangar/src/compatibility-spy.test.ts
@@ -0,0 +1,44 @@
+import { test } from "vitest";
+import { compatibilityTestFiles, tmpDir, compatibilityTestsDir } from "./paths";
+import { runWingCommand } from "./utils";
+import { join, relative } from "path";
+import { rmSync, readFileSync } from "fs";
+
+compatibilityTestFiles.forEach((wingFile) => {
+  test(wingFile, async ({ expect }) => {
+    // "@winglang/compatibility-spy" will be installed in the tmpDir
+    const platforms = ["sim", "node_modules/@winglang/compatibility-spy/lib"];
+    const args = ["test", "-o", "out.json"];
+
+    const absoluteWingFile = join(compatibilityTestsDir, wingFile);
+    const relativeWingFile = relative(tmpDir, absoluteWingFile);
+
+    await runWingCommand({
+      cwd: tmpDir,
+      wingFile: relativeWingFile,
+      platforms,
+      args,
+      expectFailure: false,
+    });
+
+    const usageContext = JSON.parse(
+      readFileSync(join(tmpDir, "out.json")).toString()
+    );
+    // sanitize the output
+    usageContext.duration = "<DURATION>";
+
+    for (const testFile in usageContext.results) {
+      for (const singleTest in usageContext.results[testFile]) {
+        usageContext.results[testFile][singleTest].traces.forEach(
+          (trace: Record<string, unknown>) => {
+            trace.timestamp = "<TIMESTAMP>";
+          }
+        );
+      }
+    }
+
+    rmSync(join(tmpDir, "out.json"), { recursive: true, force: true });
+
+    expect(usageContext).toMatchSnapshot();
+  });
+});
diff --git a/tools/hangar/src/error.test.ts b/tools/hangar/src/error.test.ts
index dd93d851020..011c331af26 100644
--- a/tools/hangar/src/error.test.ts
+++ b/tools/hangar/src/error.test.ts
@@ -2,6 +2,7 @@ import * as path from "path";
 import { test } from "vitest";
 import { errorTestDir, errorWingFiles, tmpDir } from "./paths";
 import { runWingCommand } from "./utils";
+import { parseMetaCommentFromPath, shouldSkipTest } from "./meta_comment";
 
 errorWingFiles.forEach((wingFile) => {
   test(wingFile, async ({ expect }) => {
@@ -13,6 +14,13 @@ errorWingFiles.forEach((wingFile) => {
       path.join(errorTestDir, wingFile)
     );
 
+    const metaComment = parseMetaCommentFromPath(
+      path.join(errorTestDir, wingFile)
+    );
+    if (shouldSkipTest(metaComment)) {
+      return;
+    }
+
     const out = await runWingCommand({
       cwd: tmpDir,
       wingFile: relativeWingFile,
diff --git a/tools/hangar/src/esm.test.ts b/tools/hangar/src/esm.test.ts
new file mode 100644
index 00000000000..808340ba6f7
--- /dev/null
+++ b/tools/hangar/src/esm.test.ts
@@ -0,0 +1,18 @@
+import { expect, it } from "vitest";
+import { join } from "path";
+import { validTestDir } from "./paths";
+import { runWingCommand } from "./utils";
+
+it("tests module package type", async () => {
+  const appFile = join(validTestDir, "esm", "module_type.test.w");
+
+  const out = await runWingCommand({
+    cwd: validTestDir,
+    wingFile: join(validTestDir, "esm", "module_type.test.w"),
+    platforms: ["sim"],
+    args: ["test"],
+    expectFailure: false,
+  });
+
+  expect(out.stdout).toMatchSnapshot();
+});
diff --git a/tools/hangar/src/generate_tests.ts b/tools/hangar/src/generate_tests.ts
index c863edac72f..7d74ae8b554 100644
--- a/tools/hangar/src/generate_tests.ts
+++ b/tools/hangar/src/generate_tests.ts
@@ -1,13 +1,20 @@
 import { mkdirSync, readdirSync, rmSync, writeFileSync } from "fs";
-import { sdkTestsDir, validTestDir } from "./paths";
+import {
+  appWithParamsDir,
+  sdkTestsDir,
+  validTestDir,
+  validDocExamplesDir,
+} from "./paths";
 import { join, extname } from "path";
-import { parseMetaCommentFromPath } from "./meta_comment";
+import { parseMetaCommentFromPath, shouldSkipTest } from "./meta_comment";
 
 const generatedTestDir = join(__dirname, "test_corpus", "valid");
 const generatedSDKTestDir = join(__dirname, "test_corpus", "sdk_tests");
+const generatedWingExamplesDir = join(__dirname, "test_corpus", "doc_examples");
 
 rmSync(generatedTestDir, { recursive: true, force: true });
 rmSync(generatedSDKTestDir, { recursive: true, force: true });
+rmSync(generatedWingExamplesDir, { recursive: true, force: true });
 
 interface GenerateTestsOptions {
   sourceDir: string;
@@ -15,6 +22,7 @@ interface GenerateTestsOptions {
   isRecursive?: boolean;
   level?: number;
   includeJavaScriptInSnapshots?: boolean;
+  skipMarkdownSnapshot?: boolean;
 }
 
 function generateTests(options: GenerateTestsOptions) {
@@ -24,6 +32,7 @@ function generateTests(options: GenerateTestsOptions) {
     isRecursive = true,
     level = 0,
     includeJavaScriptInSnapshots = true,
+    skipMarkdownSnapshot = false,
   } = options;
   for (const fileInfo of readdirSync(sourceDir, { withFileTypes: true })) {
     if (fileInfo.isDirectory() && isRecursive) {
@@ -38,6 +47,7 @@ function generateTests(options: GenerateTestsOptions) {
         isRecursive,
         level: level + 1,
         includeJavaScriptInSnapshots,
+        skipMarkdownSnapshot,
       });
       continue;
     }
@@ -49,18 +59,7 @@ function generateTests(options: GenerateTestsOptions) {
 
     const metaComment = parseMetaCommentFromPath(join(sourceDir, filename));
 
-    let skipText = "";
-
-    if (metaComment?.skip) {
-      continue;
-    }
-
-    if (
-      metaComment?.skipPlatforms?.includes(process.platform) &&
-      process.env.CI
-    ) {
-      skipText = ".skip";
-    }
+    let skipText = shouldSkipTest(metaComment) ? ".skip" : "";
 
     // ensure windows paths are escaped
     const escapedSourceDir = sourceDir.replace(/\\/g, "\\\\");
@@ -76,13 +75,13 @@ function generateTests(options: GenerateTestsOptions) {
   test${skipText}("wing compile -t tf-aws", async () => {
     await compileTest("${escapedSourceDir}", "${filename}", ${JSON.stringify(
       metaComment?.env
-    )}, ${includeJavaScriptInSnapshots});
+    )}, ${includeJavaScriptInSnapshots}, ${skipMarkdownSnapshot});
   });
   
   test${skipText}("wing test -t sim", async () => {
     await testTest("${escapedSourceDir}", "${filename}", ${JSON.stringify(
       metaComment?.env
-    )}, ${includeJavaScriptInSnapshots});
+    )}, ${skipMarkdownSnapshot});
   });`;
 
     mkdirSync(destination, { recursive: true });
@@ -90,12 +89,25 @@ function generateTests(options: GenerateTestsOptions) {
   }
 }
 
+generateTests({
+  sourceDir: validDocExamplesDir,
+  destination: generatedWingExamplesDir,
+  isRecursive: true,
+  includeJavaScriptInSnapshots: false,
+  skipMarkdownSnapshot: true,
+});
 generateTests({
   sourceDir: validTestDir,
   destination: generatedTestDir,
   isRecursive: false,
   includeJavaScriptInSnapshots: true,
 });
+generateTests({
+  sourceDir: appWithParamsDir,
+  destination: generatedTestDir,
+  isRecursive: true,
+  includeJavaScriptInSnapshots: true,
+});
 generateTests({
   sourceDir: sdkTestsDir,
   destination: generatedSDKTestDir,
diff --git a/tools/hangar/src/generated_test_targets.ts b/tools/hangar/src/generated_test_targets.ts
index 73c532900f5..5707c0072ac 100644
--- a/tools/hangar/src/generated_test_targets.ts
+++ b/tools/hangar/src/generated_test_targets.ts
@@ -13,7 +13,8 @@ export async function compileTest(
   sourceDir: string,
   wingFile: string,
   env?: Record<string, string>,
-  includeJavaScriptInSnapshots: boolean = true
+  includeJavaScriptInSnapshots: boolean = true,
+  skipMarkdownSnapshot: boolean = false
 ) {
   const fileMap: Record<string, string> = {};
   const wingBasename = basename(wingFile);
@@ -55,27 +56,33 @@ export async function compileTest(
     if (!include.find((f) => subpath.includes(f))) {
       continue;
     }
-    if (subpath.endsWith(".js") && !includeJavaScriptInSnapshots) {
+    if (
+      (subpath.endsWith(".js") || subpath.endsWith(".cjs")) &&
+      !includeJavaScriptInSnapshots
+    ) {
       continue;
     }
     let fileContents = await fs.readFile(dotFile, "utf8");
 
-    // remove requires with absolute paths
-    fileContents = fileContents.replace(
-      /require\("(\/|\w:).*\/(.+)"\)/g,
-      'require("<ABSOLUTE_PATH>/$2")'
-    );
+    // ensure no absolute requires are included in the snapshot
+    if (/require\("(\/|\w:).*\/(.+)"\)/g.test(fileContents)) {
+      throw new Error(`Found absolute path in ${dotFile}`);
+    }
 
     fileMap[subpath] = fileContents;
   }
 
-  await createMarkdownSnapshot(fileMap, absoluteWingPath, "compile", "tf-aws");
+  if (!skipMarkdownSnapshot) {
+    await createMarkdownSnapshot(fileMap, absoluteWingPath, "compile", "tf-aws");
+  }
+  
 }
 
 export async function testTest(
   sourceDir: string,
   wingFile: string,
-  env?: Record<string, string>
+  env?: Record<string, string>,
+  skipMarkdownSnapshot: boolean = false
 ) {
   const fileMap: Record<string, string> = {};
   const platforms = ["sim"];
@@ -96,13 +103,17 @@ export async function testTest(
     wingFile,
     args,
     expectFailure: false,
-    env,
+    env: {
+      WING_HIDE_CONTAINER_LOGS: "1",
+      ...env,
+    },
   });
 
   if (out.stderr) fileMap["stderr.log"] = out.stderr;
   if (out.stdout) fileMap["stdout.log"] = out.stdout;
-
-  await createMarkdownSnapshot(fileMap, absoluteWingPath, "test", "sim");
+  if (!skipMarkdownSnapshot) {
+    await createMarkdownSnapshot(fileMap, absoluteWingPath, "test", "sim");
+  }
 }
 
 function isEntrypointFile(path: string) {
diff --git a/tools/hangar/src/invalid.test.ts b/tools/hangar/src/invalid.test.ts
index e105ce0a01c..b0609dd99d9 100644
--- a/tools/hangar/src/invalid.test.ts
+++ b/tools/hangar/src/invalid.test.ts
@@ -1,6 +1,6 @@
 import * as path from "path";
 import { test } from "vitest";
-import { invalidTestDir, invalidWingFiles, tmpDir } from "./paths";
+import { invalidDocExampleWingFiles, invalidTestDir, invalidWingFiles, tmpDir } from "./paths";
 import { runWingCommand } from "./utils";
 import { parseMetaCommentFromPath } from "./meta_comment";
 
@@ -32,3 +32,39 @@ invalidWingFiles.forEach((wingFile) => {
     }
   });
 });
+
+invalidDocExampleWingFiles.forEach((wingFile) => {
+  test(wingFile, async ({ expect }) => {
+    const platforms = ["sim"];
+    const args = ["test"];
+
+    const absoluteWingFile = path.join(invalidTestDir, wingFile);
+    const relativeWingFile = path.relative(tmpDir, absoluteWingFile);
+
+    const out = await runWingCommand({
+      cwd: tmpDir,
+      wingFile: relativeWingFile,
+      platforms,
+      args,
+      expectFailure: true
+    });
+
+    expect(out.stdout).toMatchSnapshot();
+  });
+})
+
+const invalidLibDir = path.join(invalidTestDir, "lib");
+test("invalid compile directory", async ({ expect }) => {
+  const platforms = ["sim"];
+  const args = ["compile"];
+
+  const out = await runWingCommand({
+    cwd: tmpDir,
+    wingFile: invalidLibDir,
+    platforms,
+    args,
+    expectFailure: true,
+  });
+
+  expect(out.stderr).toMatchSnapshot();
+});
diff --git a/tools/hangar/src/meta_comment.ts b/tools/hangar/src/meta_comment.ts
index c04358fba6c..89843275a20 100644
--- a/tools/hangar/src/meta_comment.ts
+++ b/tools/hangar/src/meta_comment.ts
@@ -36,7 +36,7 @@ export interface MetaComment {
 
   /**
    * Environment variables to set for this test
-   * 
+   *
    * @default - No environment variables will be set
    */
   env?: Record<string, string>;
@@ -57,3 +57,10 @@ export function parseMetaComment(content: string) {
 
   return YAML.parse(rawYaml) as MetaComment;
 }
+
+export function shouldSkipTest(metadata: MetaComment | undefined) {
+  return (
+    metadata?.skip ||
+    (metadata?.skipPlatforms?.includes(process.platform) && process.env.CI)
+  );
+}
diff --git a/tools/hangar/src/package.setup.ts b/tools/hangar/src/package.setup.ts
index 76b8f757486..e0c9db1866c 100644
--- a/tools/hangar/src/package.setup.ts
+++ b/tools/hangar/src/package.setup.ts
@@ -19,12 +19,12 @@ const shellEnv = {
 };
 
 const getInstallArgs = async () => {
-  if(process.env.HANGAR_WINGLANG_PACKAGE) {
+  if (process.env.HANGAR_WINGLANG_PACKAGE) {
     return [
       "install",
       "--no-package-lock",
       "--install-links=false",
-      process.env.HANGAR_WINGLANG_PACKAGE!
+      process.env.HANGAR_WINGLANG_PACKAGE!,
     ];
   }
 
@@ -48,6 +48,8 @@ const getInstallArgs = async () => {
     "file:../../../apps/wing",
     "file:../../../libs/wingsdk",
     "file:../../../libs/awscdk",
+    "file:../../../libs/compatibility-spy",
+    "file:../../../libs/@wingcloud/framework",
   ];
 };
 
@@ -68,19 +70,23 @@ export default async function () {
     cwd: tmpDir,
   });
 
-  const allowedInstallHooks: RegExp[] = []; // Leaving this mechanism in place in case we need it in the future
-
   const installHooks =
-    installResult.stdout.match(/>.*/g)?.filter((hook) => {
-      return !allowedInstallHooks.some((allowedHook) => {
-        return allowedHook.test(hook);
-      });
-    }) ?? [];
+    installResult.stdout
+      .match(/^> .+ \w+$/g)
+      ?.map((line) => line.toString().trim()) ?? [];
+
+  // trusted install hooks we are expecting to expose to users
+  const allowedInstallHooks = ["> esbuild@0.19.12 postinstall"];
+  const badInstallHooks = installHooks.filter(
+    (hook) => !allowedInstallHooks.includes(hook)
+  );
 
   assert.equal(
-    installHooks.length,
+    badInstallHooks.length,
     0,
-    `Install contains unexpected script hooks: \n${installHooks}`
+    `Install contains unexpected script hooks: \n${badInstallHooks
+      .map((h) => `"${h}"`)
+      .join("\n")}`
   );
   assert.equal(
     installResult.exitCode,
diff --git a/tools/hangar/src/paths.ts b/tools/hangar/src/paths.ts
index c66a728e018..24b866c7189 100644
--- a/tools/hangar/src/paths.ts
+++ b/tools/hangar/src/paths.ts
@@ -2,21 +2,30 @@ import * as path from "path";
 import * as fs from "fs";
 
 export const repoRoot = path.resolve(__dirname, "../../..");
-export const testDir = path.join(repoRoot, "examples/tests");
+export const examplesDir = path.join(repoRoot, "examples");
+export const testDir = path.join(examplesDir, "tests");
 export const validTestDir = path.join(testDir, "valid");
+export const appWithParamsDir = path.join(validTestDir, "parameters");
 export const sdkTestsDir = path.join(testDir, "sdk_tests");
+export const compatibilityTestsDir = path.join(testDir, "sdk_tests/counter");
 export const platformsDir = path.join(validTestDir, "platforms");
 export const sdkTests = path.join(testDir, "sdk_tests");
 export const invalidTestDir = path.join(testDir, "invalid");
 export const benchmarksTestDir = path.join(validTestDir, "benchmarks");
 export const errorTestDir = path.join(testDir, "error");
-export const hangarDir = path.join(repoRoot, "tools/hangar");
+export const hangarDir = path.join(repoRoot, "tools", "hangar");
+export const resultsDir = path.join(hangarDir, "results");
 export const tmpDir = path.join(hangarDir, "tmp");
 export const npmCacheDir = path.join(tmpDir, ".npm");
-export const wingSdkDir = path.join(tmpDir, "node_modules/@winglang/sdk");
+export const tmpNodeModulesDir = path.join(tmpDir, "node_modules");
+export const wingSdkDir = path.join(tmpNodeModulesDir, "@winglang/sdk");
+export const docsRoot = path.join(repoRoot, "docs");
+export const docsExamplesDir = path.join(testDir, "doc_examples");
+export const invalidDocExamplesDir = path.join(docsExamplesDir, "invalid");
+export const validDocExamplesDir = path.join(docsExamplesDir, "valid");
 
 export const npmBin = path.join(hangarDir, "node_modules/.bin/npm");
-export const wingBin = path.join(tmpDir, "node_modules/.bin/wing");
+export const wingBin = path.join(tmpNodeModulesDir, ".bin/wing");
 
 export const snapshotDir = path.join(hangarDir, "__snapshots__");
 
@@ -33,6 +42,16 @@ export const errorWingFiles = fs
   .filter((f) => f.endsWith(".w"))
   .filter((f) => !f.endsWith("skip.w"));
 
+export const compatibilityTestFiles = fs
+  .readdirSync(compatibilityTestsDir)
+  .filter((f) => f.endsWith(".w"))
+  .filter((f) => !f.endsWith("skip.w"));
+
+export const invalidDocExampleWingFiles = fs
+  .readdirSync(invalidDocExamplesDir)
+  .filter((f) => f.endsWith(".w"))
+  .filter((f) => !f.endsWith("skip.w"));
+
 /** Recursively walk a directory, yielding each file path. */
 export async function* walkdir(dir: string): AsyncGenerator<string> {
   for await (const d of await fs.promises.opendir(dir)) {
diff --git a/tools/hangar/src/platform.test.ts b/tools/hangar/src/platform.test.ts
index 7020a859365..e8a919752be 100644
--- a/tools/hangar/src/platform.test.ts
+++ b/tools/hangar/src/platform.test.ts
@@ -7,6 +7,7 @@ import {
   sanitize_json_paths,
   tfResourcesOfCount,
 } from "./utils";
+import { tmpdir } from "os";
 import { Testing } from "cdktf";
 
 describe("Multiple platforms", () => {
@@ -38,6 +39,134 @@ describe("Multiple platforms", () => {
   });
 })
 
+describe("Platform with parameters", () => {
+  const platformParameters = {
+    type: "object",
+    required: ["a", "b", "c"],
+    properties: {
+      a: { type: "string" },
+      b: { type: "number" },
+      c: { type: "boolean" },
+      optionals: {
+        type: "object",
+        properties: {
+          seeNoEvil: { type: "boolean" },
+          hearNoEvil: { type: "boolean" },
+          speakNoEvil: {
+            type: "boolean"
+          },
+        },
+        allOf: [
+          {
+            "$comment": "If see no evil, then we need to know if we hear or speak evil",
+            if: { properties: { seeNoEvil: { const: true } } },
+            then: { required: ["hearNoEvil", "speakNoEvil"] }
+          },
+          {
+            "$comment": "If we hear or speak evil, then we need to know if we see or speak evil",
+            if: { properties: { hearNoEvil: { const: true } } },
+            then: { required: ["seeNoEvil", "speakNoEvil"] }
+          },
+          {
+            "$comment": "If we see or speak evil, then we need to know if we speak or hear evil",
+            if: { properties: { seeNoEvil: { const: true } } },
+            then: { required: ["speakNoEvil", "hearNoEvil"] }
+          }
+        ]
+      }
+    }
+  }
+
+  const platformCode = `
+  exports.Platform = class Platform {
+    target = "*";
+  
+    parameters = ${JSON.stringify(platformParameters)};
+  }
+` 
+  const app = "main.w";
+  const appFile = path.join(platformsDir, app);
+  const tempdir = fs.mkdtempSync(path.join(tmpdir(), "platform-parameters"));
+  const platformWithParametersFile = path.join(tempdir, "platform-with-parameters.js");
+  fs.writeFileSync(platformWithParametersFile, platformCode);
+
+  test("will compile if all required parameters are provided", async () => {
+    // GIVEN
+    const platforms = ["tf-aws", platformWithParametersFile];
+    const params = {
+      a: "some-value",
+      b: 123,
+      c: false,
+    }
+    const paramFile = path.join(tempdir, "params.json");
+    fs.writeFileSync(paramFile, JSON.stringify(params));
+
+    const args = ["compile", "--values", paramFile];
+    
+    // WHEN
+    const output = await runWingCommand({
+      cwd: tmpDir,
+      platforms,
+      wingFile: appFile,
+      args,
+      expectFailure: false
+    });
+
+    // THEN
+    expect(output.stderr).toBe("");
+  });
+
+  test("will throw if missing required parameters", async () => {
+    // GIVEN
+    const args = ["compile"];
+    const platforms = ["tf-aws", platformWithParametersFile];
+    
+    // WHEN
+    const output = await runWingCommand({
+      cwd: tmpDir,
+      platforms,
+      wingFile: appFile,
+      args,
+      expectFailure: true
+    });
+
+    // THEN
+    expect(output.stderr).toContain("Parameter validation errors:");
+    expect(output.stderr).toContain("must have required property 'a'");
+    expect(output.stderr).toContain("must have required property 'b'");
+    expect(output.stderr).toContain("must have required property 'c'");
+  });
+
+  test("will throw if missing conditionally required parameters", async () => {
+    // GIVEN
+    const platforms = ["tf-aws", platformWithParametersFile];
+    const params = {
+      a: "some-value",
+      b: 123,
+      c: false,
+      optionals: {
+        seeNoEvil: true
+      }
+    }
+    const paramFile = path.join(tempdir, "params.json");
+    fs.writeFileSync(paramFile, JSON.stringify(params));    
+    const args = ["compile", "--values", paramFile];
+    // WHEN
+    const output = await runWingCommand({
+      cwd: tmpDir,
+      platforms,
+      wingFile: appFile,
+      args,
+      expectFailure: true
+    });
+
+    // THEN
+    expect(output.stderr).toContain("Parameter validation errors:");
+    expect(output.stderr).toContain("must have required property 'hearNoEvil'");
+    expect(output.stderr).toContain("must have required property 'speakNoEvil'");
+  });
+});
+
 describe("Platform examples", () => {
   const app = "main.w";
   const appFile = path.join(platformsDir, app);
@@ -273,3 +402,157 @@ describe("Platform examples", () => {
     });
   });
 });
+
+describe("Implicit platform files", () => {
+  const platformParameters = {
+    type: "object",
+    properties: {
+      foo: {
+        type: "string",
+      }
+    },
+    required: ["foo"]
+  }
+
+  // Simple platform with a required parameter
+  const platformCode = `
+  exports.Platform = class Platform {
+    target = "*";
+    parameters = ${JSON.stringify(platformParameters)};
+  }
+  `
+
+  describe("can be defined", () => {
+    test("in the source directory", async () => {
+      // GIVEN
+      const wingCode = `
+        bring cloud;
+
+        let b = new cloud.Bucket();
+      `
+      const args = ["compile"];
+      const tempdir = fs.mkdtempSync(path.join(tmpdir(), "platform-parameters"));
+      
+      fs.writeFileSync(path.join(tempdir, "main.w"), wingCode);
+      fs.writeFileSync(path.join(tempdir, "wplatform.js"), platformCode);
+
+      // WHEN
+      const output = await runWingCommand({
+        cwd: tempdir,
+        wingFile: path.join(tempdir, "main.w"),
+        args,
+        expectFailure: true
+      });
+
+      // THEN
+      expect(output.stderr).toContain("Parameter validation errors:");
+      expect(output.stderr).toContain("- must have required property 'foo'");
+    })
+
+    test("with a .wplatform.js extension", async () => {
+      // GIVEN
+      const wingCode = `
+        bring cloud;
+
+        let b = new cloud.Bucket();
+      `
+      const args = ["compile"];
+      const tempdir = fs.mkdtempSync(path.join(tmpdir(), "platform-parameters"));
+      
+      fs.writeFileSync(path.join(tempdir, "main.w"), wingCode);
+      fs.writeFileSync(path.join(tempdir, "whatever.wplatform.js"), platformCode);
+
+      // WHEN
+      const output = await runWingCommand({
+        cwd: tempdir,
+        wingFile: path.join(tempdir, "main.w"),
+        args,
+        expectFailure: true
+      });
+
+      console.log("STDOUT: ", output.stdout);
+      console.log("STDERR: ", output.stderr);
+
+      // THEN
+      expect(output.stderr).toContain("Parameter validation errors:");
+      expect(output.stderr).toContain("- must have required property 'foo'");
+    });
+
+    test("imported directory", async () => {
+      // GIVEN
+      const wingCode = `
+        bring cloud;
+        bring "./lib" as myLib;
+
+        let b = new cloud.Bucket();
+      `
+      
+      const args = ["compile"];
+      const tempdir = fs.mkdtempSync(path.join(tmpdir(), "platform-parameters"));
+      fs.mkdirSync(path.join(tempdir, "lib"));
+      fs.writeFileSync(path.join(tempdir, "main.w"), wingCode);
+      fs.writeFileSync(path.join(tempdir, "lib", "dummy.w"), "");
+      fs.writeFileSync(path.join(tempdir, "lib", "wplatform.js"), platformCode);
+
+      // WHEN
+      const output = await runWingCommand({
+        cwd: tempdir,
+        wingFile: path.join(tempdir, "main.w"),
+        args,
+        expectFailure: true
+      });
+
+      // THEN
+      expect(output.stderr).toContain("Parameter validation errors:");
+      expect(output.stderr).toContain("- must have required property 'foo'");
+    });
+
+    test("in multiple imported directories", async () => {
+      // GIVEN
+      const wingCode = `
+        bring cloud;
+        bring "./lib" as myLib;
+        bring "./lib2" as myLib2;
+
+        let b = new cloud.Bucket();
+      `
+      const otherPlatformCode = `
+        exports.Platform = class Platform {
+          target = "*";
+          parameters = {
+            type: "object",
+            properties: {
+              bar: {
+                type: "string",
+              }
+            },
+            required: ["bar"]
+          }
+        }
+      `
+      const args = ["compile"];
+      const tempdir = fs.mkdtempSync(path.join(tmpdir(), "platform-parameters"));
+      fs.mkdirSync(path.join(tempdir, "lib"));
+      fs.mkdirSync(path.join(tempdir, "lib2"));
+      fs.writeFileSync(path.join(tempdir, "main.w"), wingCode);
+      fs.writeFileSync(path.join(tempdir, "lib", "dummy.w"), "");
+      fs.writeFileSync(path.join(tempdir, "lib", "wplatform.js"), platformCode);
+      fs.writeFileSync(path.join(tempdir, "lib2", "dummy.w"), "");
+      fs.writeFileSync(path.join(tempdir, "lib2", "wplatform.js"), otherPlatformCode);
+
+
+      // WHEN
+      const output = await runWingCommand({
+        cwd: tempdir,
+        wingFile: path.join(tempdir, "main.w"),
+        args,
+        expectFailure: true
+      });
+
+      // THEN
+      expect(output.stderr).toContain("Parameter validation errors:");
+      expect(output.stderr).toContain("- must have required property 'foo'");
+      expect(output.stderr).toContain("- must have required property 'bar'");
+    });
+  })
+})
diff --git a/tools/hangar/src/unsupported.test.ts b/tools/hangar/src/unsupported.test.ts
index b6b55d8808a..7f9774cb5c2 100644
--- a/tools/hangar/src/unsupported.test.ts
+++ b/tools/hangar/src/unsupported.test.ts
@@ -30,7 +30,7 @@ test("unsupported resource in target", async ({ expect }) => {
     },
   });
 
-  expect(sanitizeOutput(result.stderr)).toMatchInlineSnapshot('"runtime error: A Google Cloud region must be specified through the GOOGLE_REGION environment variable."');
+  expect(sanitizeOutput(result.stderr)).toMatchInlineSnapshot('"Error: A Google Cloud region must be specified through the GOOGLE_REGION environment variable."');
 });
 
 function sanitizeOutput(inputString: string): string {
diff --git a/tools/hangar/src/utils.ts b/tools/hangar/src/utils.ts
index 4e1acc806da..998b0dd788d 100644
--- a/tools/hangar/src/utils.ts
+++ b/tools/hangar/src/utils.ts
@@ -52,21 +52,35 @@ export async function runWingCommand(options: RunWingCommandOptions) {
   };
 }
 
-function sanitizeOutput(output: string) {
-  return output
+export function sanitizeOutput(output: string) {
+  return (
+    output
       // Normalize line endings
       .replaceAll("\r\n", "\n")
       // Normalize windows slashes
-      .replace(/\\+([a-zA-Z0-9]+?)/g, "/$1")
+      .replace(/\\+([a-zA-Z0-9\.]{1})/g, "/$1")
       // Remove line/column numbers from rust sources
       .replace(/(src\/.+\.rs):\d+:\d+/g, "$1:LINE:COL")
       // Remove absolute stacktraces
       .replace(/\(\/.+:\d+:\d+\)/g, "(<ABSOLUTE>:LINE:COL)")
       // Remove absolute paths
-      .replace(/(?<=[\s"])(\/|\w:)\S+\/(.+)/g, "<ABSOLUTE>/$2")
+      .replace(/(?<=[\s"])(\/|\w:)\S+\/(\S+)/g, "<ABSOLUTE>/$2")
+      // remove references to random state files
+      .replace(/\/.state\/[^ '"]+/g, "/.state/<STATE_FILE>")
       // Remove duration from test results
       .replace(/Duration \d+m[\d.]+s/g, "Duration <DURATION>")
-  ;
+      // Remove changing ports
+      .replace(/port \d+/g, "port <PORT>")
+      // Remove IP addresses with a port
+      .replace(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+/g, "<IP>:<PORT>")
+      // Remove timestamps
+      .replace(/\b\d{2}:\d{2}:\d{2}.\d{3}\b/g, "<TIMESTAMP>")
+      .replace(/\b\d{4}-\d{2}-\d{2}\b/g, "<TIMESTAMP>")
+      .replace(
+        /\b(?:(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sept|Oct|Nov|Dec)\w* )?(\d{1,2})(?:st|nd|th)?[,]? (?:(?:(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sept|Oct|Nov|Dec)\w*)?[,]? )?(\d{2,4})\b/g,
+        "<TIMESTAMP>"
+      )
+  );
 }
 
 export function sanitize_json_paths(path: string) {
diff --git a/tools/hangar/turbo.json b/tools/hangar/turbo.json
index 75aa33465b1..1f9456b9ad6 100644
--- a/tools/hangar/turbo.json
+++ b/tools/hangar/turbo.json
@@ -10,20 +10,29 @@
         "src/generated_test_targets.ts"
       ],
       "dependsOn": [
+        "@winglang/docs#compile",
         "examples-valid#topo",
         "examples-invalid#topo",
         "examples-error#topo",
-        "examples-sdk#topo"
+        "examples-sdk#topo",
+        "examples-docs#topo"
       ],
       "outputs": ["src/test_corpus/**"]
     },
     "test": {
       "dependsOn": ["^package", "test:generate"],
-      "inputs": ["src/**"]
+      "env": ["CI"]
+    },
+    "test:doc_examples": {
+      "dependsOn": [
+        "^package", 
+        "test:generate"
+      ],
+      "env": ["CI"]
     },
     "bench": {
       "dependsOn": ["^package", "examples-valid#topo"],
-      "inputs": ["src/**"]
+      "env": ["CI"]
     }
   }
 }
diff --git a/tools/hangar/vitest.config.ts b/tools/hangar/vitest.config.ts
index 9f956c87d16..12eab0466d6 100644
--- a/tools/hangar/vitest.config.ts
+++ b/tools/hangar/vitest.config.ts
@@ -6,10 +6,7 @@ export default defineConfig({
     exclude: [...configDefaults.exclude, "**/tmp/**"],
     reporters: ["verbose"],
     benchmark: {
-      reporters: ["default", "./src/benchmarking/reporter" as any],
-      outputFile: {
-        json: join(__dirname, "results", "report.json"),
-      },
+      outputJson: join(__dirname, "results", "report.json"),
     },
     isolate: false,
     testTimeout: 200_000,
diff --git a/turbo.json b/turbo.json
index b30fb67fc7c..bca55b8171e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -50,6 +50,23 @@
       ],
       "outputs": ["**/__snapshots__/**", "**/*.snap"]
     },
+    "bench": {
+      "dependsOn": ["compile"],
+      "inputs": [
+        "*.ts",
+        "*.js",
+        "*.cjs",
+        "*.json",
+        "*.toml",
+        "*.lock",
+        "src/**/*.rs",
+        "src/**/*.ts",
+        "src/**/*.tsx",
+        "src/**/*.test.ts",
+        "src/**/*.test.tsx",
+        "test/**"
+      ]
+    },
     "test:playwright": {
       "dependsOn": ["compile"],
       "inputs": [
@@ -101,6 +118,7 @@
       "inputs": ["*.md", "LICENSE"]
     },
     "topo": {
+      "inputs": ["**", "!node_modules/**", "!**/target/**"],
       "dependsOn": ["^topo"]
     },
     "dev": {
diff --git a/wing.code-workspace b/wing.code-workspace
index 1bedc45849d..d32f86a8be6 100644
--- a/wing.code-workspace
+++ b/wing.code-workspace
@@ -1,64 +1,72 @@
 {
   "folders": [
     {
-      "name": "ROOT",
-      "path": "./"
+      "name": "Console App",
+      "path": "./apps/wing-console/console/app"
     },
     {
-      "name": "CLI",
-      "path": "./apps/wing"
+      "name": "Console Server",
+      "path": "./apps/wing-console/console/server"
+    },
+    {
+      "name": "Console UI",
+      "path": "./apps/wing-console/console/ui"
     },
     {
       "name": "Compiler",
       "path": "./libs/wingcompiler"
     },
     {
-      "name": "SDK",
-      "path": "./libs/wingsdk"
+      "name": "API Docs Generator",
+      "path": "./apps/jsii-docgen"
     },
     {
-      "name": "SDK Tests",
-      "path": "./examples/tests/sdk_tests"
+      "name": "ROOT",
+      "path": "./"
+    },
+    {
+      "name": "SDK",
+      "path": "./libs/wingsdk"
     },
     {
       "name": "Docs",
       "path": "./docs/docs"
     },
     {
-      "name": "Console App",
-      "path": "./apps/wing-console/console/app"
+      "name": "Tests: Error",
+      "path": "./examples/tests/error"
     },
     {
-      "name": "Console Server",
-      "path": "./apps/wing-console/console/server"
+      "name": "Tests: Invalid",
+      "path": "./examples/tests/invalid"
     },
     {
-      "name": "Console UI",
-      "path": "./apps/wing-console/console/ui"
+      "name": "SDK Tests",
+      "path": "./examples/tests/sdk_tests"
     },
     {
-      "name": "VSCode",
-      "path": "./apps/vscode-wing"
+      "name": "Tests: Valid",
+      "path": "./examples/tests/valid"
     },
     {
-      "name": "API Docs Generator",
-      "path": "./apps/jsii-docgen"
+      "name": "VSCode",
+      "path": "./apps/vscode-wing"
     },
     {
       "name": "API Checker",
       "path": "./apps/wing-api-checker"
     },
     {
-      "name": "Tests: Valid",
-      "path": "./examples/tests/valid"
+      "name": "CLI",
+      "path": "./apps/wing"
     },
     {
-      "name": "Tests: Invalid",
-      "path": "./examples/tests/invalid"
+      "name": "CLIv2",
+      "path": "./apps/wingcli-v2"
     },
     {
-      "name": "Tests: Error",
-      "path": "./examples/tests/error"
+      "name": "Tunnel Server",
+      "path": "./libs/wingtunnels"
     }
   ],
   "settings": {}